Stop using NetworkManager

diff --git a/src/main/java/com/irtimaled/bbor/client/ClientProxy.java b/src/main/java/com/irtimaled/bbor/client/ClientProxy.java
index 40225c63c3724ff8ad67f880a4ced6478ad773ef..6786be54b44fb902547d1915dc898926fdf05ab9 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/ClientProxy.java
+++ b/src/main/java/com/irtimaled/bbor/client/ClientProxy.java
@@ -10,11 +10,9 @@ import com.irtimaled.bbor.config.ConfigManager;
 import com.irtimaled.bbor.config.Setting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.network.NetworkManager;
 import net.minecraft.world.dimension.DimensionType;
 
 import java.net.InetSocketAddress;
-import java.net.SocketAddress;
 
 public class ClientProxy extends CommonProxy {
     public static final String Name = "Bounding Box Outline Reloaded";
@@ -45,7 +43,7 @@ public class ClientProxy extends CommonProxy {
     public void init() {
         super.init();
         EventBus.subscribe(Render.class, e -> render(e.getPartialTicks()));
-        EventBus.subscribe(ConnectedToRemoteServer.class, e -> connectedToServer(e.getNetworkManager()));
+        EventBus.subscribe(ConnectedToRemoteServer.class, e -> connectedToServer(e.getInternetAddress()));
         EventBus.subscribe(DisconnectedFromRemoteServer.class, e -> disconnectedFromServer());
         EventBus.subscribe(InitializeClientReceived.class, e -> setWorldData(e.getSeed(), e.getSpawnX(), e.getSpawnZ()));
         EventBus.subscribe(AddBoundingBoxReceived.class, e -> runOnCache(e.getDimensionType(), cache -> cache.addBoundingBoxes(e.getKey(), e.getBoundingBoxes())));
@@ -64,12 +62,8 @@ public class ClientProxy extends CommonProxy {
         }
     }
 
-    private void connectedToServer(NetworkManager networkManager) {
-        SocketAddress remoteAddress = networkManager.getRemoteAddress();
-        if (remoteAddress instanceof InetSocketAddress) {
-            InetSocketAddress socketAddress = (InetSocketAddress) remoteAddress;
-            NBTFileParser.loadLocalDatFiles(socketAddress.getHostName(), socketAddress.getPort(), this::setWorldData, this::getOrCreateCache);
-        }
+    private void connectedToServer(InetSocketAddress internetAddress) {
+        NBTFileParser.loadLocalDatFiles(internetAddress.getHostName(), internetAddress.getPort(), this::setWorldData, this::getOrCreateCache);
     }
 
     private void disconnectedFromServer() {

diff --git a/src/main/java/com/irtimaled/bbor/client/events/ConnectedToRemoteServer.java b/src/main/java/com/irtimaled/bbor/client/events/ConnectedToRemoteServer.java
index e5368692c2c6acef22813b59342e99f8e0f68c69..e40991c4afffc28872ab62bf1f7cde1ff2476c8d 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/events/ConnectedToRemoteServer.java
+++ b/src/main/java/com/irtimaled/bbor/client/events/ConnectedToRemoteServer.java
@@ -1,15 +1,15 @@
 package com.irtimaled.bbor.client.events;
 
-import net.minecraft.network.NetworkManager;
+import java.net.InetSocketAddress;
 
 public class ConnectedToRemoteServer {
-    private final NetworkManager networkManager;
+    private final InetSocketAddress internetAddress;
 
-    public ConnectedToRemoteServer(NetworkManager networkManager) {
-        this.networkManager = networkManager;
+    public ConnectedToRemoteServer(InetSocketAddress internetAddress) {
+        this.internetAddress = internetAddress;
     }
 
-    public NetworkManager getNetworkManager() {
-        return networkManager;
+    public InetSocketAddress getInternetAddress() {
+        return internetAddress;
     }
 }

diff --git a/src/main/java/com/irtimaled/bbor/mixin/client/network/MixinNetHandlerLoginClient.java b/src/main/java/com/irtimaled/bbor/mixin/client/network/MixinNetHandlerLoginClient.java
index 222f2fa6f3c6b05a2c4fe2f45e1394d3279791d1..757ec45e7ebd4277133beef5a14eacbf8f5a8329 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/mixin/client/network/MixinNetHandlerLoginClient.java
+++ b/src/main/java/com/irtimaled/bbor/mixin/client/network/MixinNetHandlerLoginClient.java
@@ -12,6 +12,9 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+
 @Mixin(NetHandlerLoginClient.class)
 public abstract class MixinNetHandlerLoginClient {
     @Shadow
@@ -20,7 +23,10 @@ public abstract class MixinNetHandlerLoginClient {
 
     @Inject(method = "handleLoginSuccess", at = @At(value = "RETURN"))
     private void handleLoginSuccess(CallbackInfo ci) {
-        EventBus.publish(new ConnectedToRemoteServer(this.networkManager));
+        SocketAddress remoteAddress = this.networkManager.getRemoteAddress();
+        if (remoteAddress instanceof InetSocketAddress) {
+            EventBus.publish(new ConnectedToRemoteServer((InetSocketAddress)remoteAddress));
+        }
     }
 
     @Inject(method = "onDisconnect", at=@At("HEAD"))