From d0d1562155d9a16b5902e6f87600a41e1e031df1 Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 18 Jul 2013 20:10:45 +1000 Subject: [PATCH] Hi, I'm Mojang and I make hundreds of millions of dollars a year. I still like to think I am an Indy company, so I randomly remove existing game features and don't provide replacements. Removes Texture Pack setting --- .../md_5/bungee/api/config/ListenerInfo.java | 5 ----- .../md_5/bungee/api/config/TexturePackInfo.java | 17 ----------------- .../bungee/api/connection/ProxiedPlayer.java | 8 -------- .../md_5/bungee/api/plugin/PluginManager.java | 4 ++-- .../java/net/md_5/bungee/UserConnection.java | 7 ------- .../java/net/md_5/bungee/config/YamlConfig.java | 6 +----- .../bungee/connection/DownstreamBridge.java | 5 ----- .../md_5/bungee/connection/UpstreamBridge.java | 7 ------- 8 files changed, 3 insertions(+), 56 deletions(-) delete mode 100644 api/src/main/java/net/md_5/bungee/api/config/TexturePackInfo.java diff --git a/api/src/main/java/net/md_5/bungee/api/config/ListenerInfo.java b/api/src/main/java/net/md_5/bungee/api/config/ListenerInfo.java index 122cd119..bb1c3f90 100644 --- a/api/src/main/java/net/md_5/bungee/api/config/ListenerInfo.java +++ b/api/src/main/java/net/md_5/bungee/api/config/ListenerInfo.java @@ -48,11 +48,6 @@ public class ListenerInfo * transferred depending on the host they connect to. */ private final Map forcedHosts; - /** - * Get the texture pack used for servers connected to this proxy. May be - * null. - */ - private final TexturePackInfo texturePack; /** * Class used to build tab lists for this player. */ diff --git a/api/src/main/java/net/md_5/bungee/api/config/TexturePackInfo.java b/api/src/main/java/net/md_5/bungee/api/config/TexturePackInfo.java deleted file mode 100644 index 3021ba41..00000000 --- a/api/src/main/java/net/md_5/bungee/api/config/TexturePackInfo.java +++ /dev/null @@ -1,17 +0,0 @@ -package net.md_5.bungee.api.config; - -import lombok.Data; - -@Data -public class TexturePackInfo -{ - - /** - * The URL of the texture pack. - */ - private final String url; - /** - * The square dimension of this texture pack. - */ - private final int size; -} diff --git a/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java b/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java index ad978aed..4c1965b5 100644 --- a/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java +++ b/api/src/main/java/net/md_5/bungee/api/connection/ProxiedPlayer.java @@ -2,7 +2,6 @@ package net.md_5.bungee.api.connection; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.config.ServerInfo; -import net.md_5.bungee.api.config.TexturePackInfo; import net.md_5.bungee.api.tab.TabListHandler; /** @@ -72,13 +71,6 @@ public interface ProxiedPlayer extends Connection, CommandSender */ void chat(String message); - /** - * Send a request to change the players texture pack. - * - * @param pack the pack to request - */ - void setTexturePack(TexturePackInfo pack); - /** * Sets the new tab list for the user. At this stage it is not advisable to * change after the user has logged in! diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java index 552c50d9..a46477ff 100644 --- a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java +++ b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java @@ -181,7 +181,7 @@ public class PluginManager for ( String dependName : plugin.getDepends() ) { PluginDescription depend = toLoad.get( dependName ); - Boolean dependStatus = depend != null ? pluginStatuses.get( depend ) : Boolean.FALSE; + Boolean dependStatus = ( depend != null ) ? pluginStatuses.get( depend ) : Boolean.FALSE; if ( dependStatus == null ) { @@ -207,7 +207,7 @@ public class PluginManager { ProxyServer.getInstance().getLogger().log( Level.WARNING, "{0} (required by {1}) is unavailable", new Object[] { - depend.getName(), plugin.getName() + String.valueOf( depend.getName() ), plugin.getName() } ); status = false; } diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java index ca592b08..0f5fec03 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java @@ -22,7 +22,6 @@ import lombok.Setter; import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.config.ServerInfo; -import net.md_5.bungee.api.config.TexturePackInfo; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.event.PermissionCheckEvent; import net.md_5.bungee.api.event.ServerConnectEvent; @@ -347,12 +346,6 @@ public final class UserConnection implements ProxiedPlayer return name; } - @Override - public void setTexturePack(TexturePackInfo pack) - { - unsafe().sendPacket( new PacketFAPluginMessage( "MC|TPack", ( pack.getUrl() + "\00" + pack.getSize() ).getBytes() ) ); - } - @Override public Unsafe unsafe() { diff --git a/proxy/src/main/java/net/md_5/bungee/config/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/config/YamlConfig.java index 74435e31..7d522b75 100644 --- a/proxy/src/main/java/net/md_5/bungee/config/YamlConfig.java +++ b/proxy/src/main/java/net/md_5/bungee/config/YamlConfig.java @@ -21,7 +21,6 @@ import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.config.ConfigurationAdapter; import net.md_5.bungee.api.config.ListenerInfo; import net.md_5.bungee.api.config.ServerInfo; -import net.md_5.bungee.api.config.TexturePackInfo; import net.md_5.bungee.api.tab.TabListHandler; import net.md_5.bungee.tab.Global; import net.md_5.bungee.tab.GlobalPing; @@ -207,9 +206,6 @@ public class YamlConfig implements ConfigurationAdapter int tabListSize = get( "tab_size", 60, val ); InetSocketAddress address = Util.getAddr( host ); Map forced = new CaseInsensitiveMap<>( get( "forced_hosts", forcedDef, val ) ); - String textureURL = get( "texture_url", null, val ); - int textureSize = get( "texture_size", 16, val ); - TexturePackInfo texture = ( textureURL == null ) ? null : new TexturePackInfo( textureURL, textureSize ); String tabListName = get( "tab_list", "GLOBAL_PING", val ); DefaultTabList value = DefaultTabList.valueOf( tabListName.toUpperCase() ); if ( value == null ) @@ -217,7 +213,7 @@ public class YamlConfig implements ConfigurationAdapter value = DefaultTabList.GLOBAL_PING; } - ListenerInfo info = new ListenerInfo( address, motd, maxPlayers, tabListSize, defaultServer, fallbackServer, forceDefault, forced, texture, value.clazz ); + ListenerInfo info = new ListenerInfo( address, motd, maxPlayers, tabListSize, defaultServer, fallbackServer, forceDefault, forced, value.clazz ); ret.add( info ); } diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java index 2b56f5b5..4399f516 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java @@ -195,11 +195,6 @@ public class DownstreamBridge extends PacketHandler throw new CancelSendSignal(); } - if ( pluginMessage.getTag().equals( "MC|TPack" ) && con.getPendingConnection().getListener().getTexturePack() != null ) - { - throw new CancelSendSignal(); - } - if ( pluginMessage.getTag().equals( "BungeeCord" ) ) { ByteArrayDataOutput out = ByteStreams.newDataOutput(); diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java index 75c546a7..60d6741e 100644 --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java @@ -5,7 +5,6 @@ import net.md_5.bungee.EntityMap; import net.md_5.bungee.UserConnection; import net.md_5.bungee.Util; import net.md_5.bungee.api.ProxyServer; -import net.md_5.bungee.api.config.TexturePackInfo; import net.md_5.bungee.api.event.ChatEvent; import net.md_5.bungee.api.event.PlayerDisconnectEvent; import net.md_5.bungee.api.event.PluginMessageEvent; @@ -30,12 +29,6 @@ public class UpstreamBridge extends PacketHandler BungeeCord.getInstance().addConnection( con ); con.getTabList().onConnect(); con.unsafe().sendPacket( BungeeCord.getInstance().registerChannels() ); - - TexturePackInfo texture = con.getPendingConnection().getListener().getTexturePack(); - if ( texture != null ) - { - con.setTexturePack( texture ); - } } @Override