Fix warning message for unsupported experimental data. Closes #105

Earthcomputer · Oct 11, 2020 · 4e49016 · 4e49016
1 parent ddf7e06
commit 4e49016
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/main/java/net/earthcomputer/multiconnect/impl/Utils.java b/src/main/java/net/earthcomputer/multiconnect/impl/Utils.java
@@ -19,12 +19,12 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.entity.data.TrackedDataHandler;
 import net.minecraft.entity.data.TrackedDataHandlerRegistry;
 import net.minecraft.item.Item;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.NbtOps;
+import net.minecraft.network.ClientConnection;
 import net.minecraft.network.Packet;
 import net.minecraft.tag.Tag;
 import net.minecraft.text.TranslatableText;
@@ -207,9 +207,9 @@ public static <T> void translateDynamicRegistries(TransformerByteBuf buf, Codec<
             return;
         }
         if (!allowablePredicate.test(oldRegistries)) {
-            ClientPlayNetworkHandler networkHandler = MinecraftClient.getInstance().getNetworkHandler();
-            if (networkHandler != null) {
-                networkHandler.getConnection().disconnect(new TranslatableText("multiconnect.unsupportedExperimentalCodec"));
+            ClientConnection connection = buf.getConnection();
+            if (connection != null) {
+                connection.disconnect(new TranslatableText("multiconnect.unsupportedExperimentalCodec"));
             }
             return;
         }

diff --git a/src/main/java/net/earthcomputer/multiconnect/transformer/TransformerByteBuf.java b/src/main/java/net/earthcomputer/multiconnect/transformer/TransformerByteBuf.java
@@ -37,7 +37,7 @@ public final class TransformerByteBuf extends PacketByteBuf {
     private final TranslatorRegistry translatorRegistry;
 
     private boolean transformationEnabled = false;
-    private Deque<StackFrame> stack = new ArrayDeque<>();
+    private final Deque<StackFrame> stack = new ArrayDeque<>();
     private boolean forceSuper = false;
 
     public TransformerByteBuf(ByteBuf delegate, ChannelHandlerContext context) {
@@ -50,6 +50,10 @@ public TransformerByteBuf(ByteBuf delegate, ChannelHandlerContext context, Trans
         this.translatorRegistry = translatorRegistry;
     }
 
+    public ClientConnection getConnection() {
+        return context.channel().pipeline().get(ClientConnection.class);
+    }
+
     @SuppressWarnings("unchecked")
     public TransformerByteBuf readTopLevelType(Class<?> type) {
         transformationEnabled = true;