From e6e019896f6b58e86f8c2b33b97d24dcf2e16f59 Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Fri, 11 Jul 2014 17:56:07 -0700 Subject: [PATCH] Update realms library to 1.3.1, and implement network latch when connecting to Realms. Tested and working. --- fml/jsons/1.7.10-dev.json | 2 +- fml/jsons/1.7.10-rel.json | 2 +- fml/jsons/1.7.10.json | 2 +- .../net/minecraft/realms/RealmsConnect.java.patch | 10 ++++++++++ .../java/cpw/mods/fml/client/FMLClientHandler.java | 7 +++++++ .../common/network/handshake/NetworkDispatcher.java | 1 + 6 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 fml/patches/minecraft/net/minecraft/realms/RealmsConnect.java.patch diff --git a/fml/jsons/1.7.10-dev.json b/fml/jsons/1.7.10-dev.json index 99d5040c1f..c4e77881eb 100644 --- a/fml/jsons/1.7.10-dev.json +++ b/fml/jsons/1.7.10-dev.json @@ -79,7 +79,7 @@ "name": "lzma:lzma:0.0.1" }, { - "name": "com.mojang:realms:1.2.10" + "name": "com.mojang:realms:1.3.1" }, { "name": "org.apache.commons:commons-compress:1.8.1" diff --git a/fml/jsons/1.7.10-rel.json b/fml/jsons/1.7.10-rel.json index 98c7a86750..aa76b2a8ec 100644 --- a/fml/jsons/1.7.10-rel.json +++ b/fml/jsons/1.7.10-rel.json @@ -117,7 +117,7 @@ "serverreq":true }, { - "name": "com.mojang:realms:1.2.10" + "name": "com.mojang:realms:1.3.1" }, { "name": "org.apache.commons:commons-compress:1.8.1" diff --git a/fml/jsons/1.7.10.json b/fml/jsons/1.7.10.json index a916225fde..083d69d46a 100644 --- a/fml/jsons/1.7.10.json +++ b/fml/jsons/1.7.10.json @@ -8,7 +8,7 @@ "assets": "1.7.10", "libraries": [ { - "name": "com.mojang:realms:1.2.10" + "name": "com.mojang:realms:1.3.1" }, { "name": "org.apache.commons:commons-compress:1.8.1" diff --git a/fml/patches/minecraft/net/minecraft/realms/RealmsConnect.java.patch b/fml/patches/minecraft/net/minecraft/realms/RealmsConnect.java.patch new file mode 100644 index 0000000000..10a6a682f5 --- /dev/null +++ b/fml/patches/minecraft/net/minecraft/realms/RealmsConnect.java.patch @@ -0,0 +1,10 @@ +--- ../src-base/minecraft/net/minecraft/realms/RealmsConnect.java ++++ ../src-work/minecraft/net/minecraft/realms/RealmsConnect.java +@@ -40,6 +40,7 @@ + + try + { ++ cpw.mods.fml.client.FMLClientHandler.instance().connectToRealmsServer(p_connect_1_, p_connect_2_); + inetaddress = InetAddress.getByName(p_connect_1_); + + if (RealmsConnect.this.aborted) diff --git a/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java b/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java index 558a425f49..889b6d380e 100644 --- a/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java +++ b/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java @@ -820,10 +820,17 @@ public class FMLClientHandler implements IFMLSidedHandler playClientBlock = new CountDownLatch(1); } + public void connectToRealmsServer(String host, int port) + { + playClientBlock = new CountDownLatch(1); + } + private CountDownLatch playClientBlock; public void setPlayClient(NetHandlerPlayClient netHandlerPlayClient) { + if (playClientBlock == null) + playClientBlock = new CountDownLatch(1); playClientBlock.countDown(); this.currentPlayClient = new WeakReference(netHandlerPlayClient); } diff --git a/fml/src/main/java/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java b/fml/src/main/java/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java index f23897d66c..26ff077d19 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java +++ b/fml/src/main/java/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java @@ -454,6 +454,7 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler imple public void abortClientHandshake(String type) { + FMLLog.log(Level.INFO, "Aborting client handshake \"%s\"", type); FMLCommonHandler.instance().waitForPlayClient(); completeClientSideConnection(ConnectionType.valueOf(type)); }