Update realms library to 1.3.1, and implement network latch when conn…

…ecting to Realms. Tested and working.
MinecraftForge · Jul 12, 2014 · c2119eb · c2119eb
1 parent 692d955
commit c2119eb
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 3 deletions.
diff --git a/jsons/1.7.10-dev.json b/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/jsons/1.7.10-rel.json b/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/jsons/1.7.10.json b/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/patches/minecraft/net/minecraft/realms/RealmsConnect.java.patch b/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/src/main/java/cpw/mods/fml/client/FMLClientHandler.java b/src/main/java/cpw/mods/fml/client/FMLClientHandler.java
@@ -820,10 +820,17 @@ public void connectToServer(GuiScreen guiMultiplayer, ServerData serverEntry)
         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>(netHandlerPlayClient);
     }

diff --git a/src/main/java/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java b/src/main/java/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java
@@ -454,6 +454,7 @@ public void completeClientHandshake()
 
     public void abortClientHandshake(String type)
     {
+        FMLLog.log(Level.INFO, "Aborting client handshake \"%s\"", type);
         FMLCommonHandler.instance().waitForPlayClient();
         completeClientSideConnection(ConnectionType.valueOf(type));
     }