From d8d30e1f82288d0900b57e3898b674b4c21a5e2e Mon Sep 17 00:00:00 2001 From: cpw Date: Mon, 25 Mar 2019 17:20:10 -0400 Subject: [PATCH] Defer configuration of channel until it is actually available during connection. Closes #5626 Signed-off-by: cpw --- .../client/gui/GuiConnecting.java.patch | 10 ------- .../network/NetworkManager.java.patch | 30 +++++++++++++++++-- .../fml/network/NetworkHooks.java | 5 ++-- 3 files changed, 30 insertions(+), 15 deletions(-) delete mode 100644 patches/minecraft/net/minecraft/client/gui/GuiConnecting.java.patch diff --git a/patches/minecraft/net/minecraft/client/gui/GuiConnecting.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiConnecting.java.patch deleted file mode 100644 index e777bfa1fc..0000000000 --- a/patches/minecraft/net/minecraft/client/gui/GuiConnecting.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/net/minecraft/client/gui/GuiConnecting.java -+++ b/net/minecraft/client/gui/GuiConnecting.java -@@ -62,6 +62,7 @@ - GuiConnecting.this.field_146371_g.func_150719_a(new NetHandlerLoginClient(GuiConnecting.this.field_146371_g, GuiConnecting.this.field_146297_k, GuiConnecting.this.field_146374_i, (p_209549_1_) -> { - GuiConnecting.this.func_209514_a(p_209549_1_); - })); -+ net.minecraftforge.fml.network.NetworkHooks.registerClientLoginChannel(GuiConnecting.this.field_146371_g); - GuiConnecting.this.field_146371_g.func_179290_a(new CPacketHandshake(p_146367_1_, p_146367_2_, EnumConnectionState.LOGIN)); - GuiConnecting.this.field_146371_g.func_179290_a(new CPacketLoginStart(GuiConnecting.this.field_146297_k.func_110432_I().func_148256_e())); - } catch (UnknownHostException unknownhostexception) { diff --git a/patches/minecraft/net/minecraft/network/NetworkManager.java.patch b/patches/minecraft/net/minecraft/network/NetworkManager.java.patch index f6707ba386..245facaf88 100644 --- a/patches/minecraft/net/minecraft/network/NetworkManager.java.patch +++ b/patches/minecraft/net/minecraft/network/NetworkManager.java.patch @@ -1,14 +1,40 @@ --- a/net/minecraft/network/NetworkManager.java +++ b/net/minecraft/network/NetworkManager.java -@@ -264,6 +264,7 @@ +@@ -75,6 +75,7 @@ + private float field_211397_t; + private int field_211398_u; + private boolean field_211399_v; ++ private java.util.function.Consumer activationHandler; + + public NetworkManager(EnumPacketDirection p_i46004_1_) { + this.field_179294_g = p_i46004_1_; +@@ -84,6 +85,7 @@ + super.channelActive(p_channelActive_1_); + this.field_150746_k = p_channelActive_1_.channel(); + this.field_150743_l = this.field_150746_k.remoteAddress(); ++ if (activationHandler != null) activationHandler.accept(this); + + try { + this.func_150723_a(EnumConnectionState.HANDSHAKING); +@@ -264,7 +266,9 @@ @OnlyIn(Dist.CLIENT) public static NetworkManager func_181124_a(InetAddress p_181124_0_, int p_181124_1_, boolean p_181124_2_) { + if (p_181124_0_ instanceof java.net.Inet6Address) System.setProperty("java.net.preferIPv4Stack", "false"); final NetworkManager networkmanager = new NetworkManager(EnumPacketDirection.CLIENTBOUND); ++ networkmanager.activationHandler = net.minecraftforge.fml.network.NetworkHooks::registerClientLoginChannel; Class oclass; LazyLoadBase lazyloadbase; -@@ -383,6 +384,14 @@ + if (Epoll.isAvailable() && p_181124_2_) { +@@ -292,6 +296,7 @@ + @OnlyIn(Dist.CLIENT) + public static NetworkManager func_150722_a(SocketAddress p_150722_0_) { + final NetworkManager networkmanager = new NetworkManager(EnumPacketDirection.CLIENTBOUND); ++ networkmanager.activationHandler = net.minecraftforge.fml.network.NetworkHooks::registerClientLoginChannel; + (new Bootstrap()).group(field_179296_e.func_179281_c()).handler(new ChannelInitializer() { + protected void initChannel(Channel p_initChannel_1_) throws Exception { + p_initChannel_1_.pipeline().addLast("packet_handler", networkmanager); +@@ -383,6 +388,14 @@ return this.field_211397_t; } diff --git a/src/main/java/net/minecraftforge/fml/network/NetworkHooks.java b/src/main/java/net/minecraftforge/fml/network/NetworkHooks.java index 4d9f27aaf6..d8bc0c2746 100644 --- a/src/main/java/net/minecraftforge/fml/network/NetworkHooks.java +++ b/src/main/java/net/minecraftforge/fml/network/NetworkHooks.java @@ -75,15 +75,14 @@ public class NetworkHooks FMLHandshakeHandler.registerHandshake(manager, NetworkDirection.LOGIN_TO_CLIENT); } - public static void registerClientLoginChannel(NetworkManager manager) + public synchronized static void registerClientLoginChannel(NetworkManager manager) { - if (manager == null || manager.channel() == null) return; manager.channel().attr(FMLNetworkConstants.FML_NETVERSION).set(FMLNetworkConstants.NOVERSION); FMLHandshakeHandler.registerHandshake(manager, NetworkDirection.LOGIN_TO_SERVER); } public static void handleClientLoginSuccess(NetworkManager manager) { - if (manager == null || manager.channel() == null) return; + if (manager == null || manager.channel() == null) throw new NullPointerException("ARGH! Network Manager is null (" + manager != null ? "CHANNEL" : "MANAGER"+")" ); if (getConnectionType(()->manager) == ConnectionType.VANILLA) { LOGGER.info("Connected to a vanilla server. Catching up missing behaviour."); ConfigTracker.INSTANCE.loadDefaultServerConfigs();