Improve Future compatibility

src/main/java/meteordevelopment/meteorclient/asm/Asm.java

@@ -7,6 +7,7 @@
 
 import meteordevelopment.meteorclient.asm.transformers.CanvasWorldRendererTransformer;
 import meteordevelopment.meteorclient.asm.transformers.GameRendererTransformer;
+import meteordevelopment.meteorclient.asm.transformers.PacketInflaterTransformer;
 import net.fabricmc.loader.api.FabricLoader;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
@@ -41,6 +42,7 @@ public static void init() {
         INSTANCE = new Asm(System.getProperty("meteor.asm.export") != null);
         INSTANCE.add(new GameRendererTransformer());
         INSTANCE.add(new CanvasWorldRendererTransformer());
+        INSTANCE.add(new PacketInflaterTransformer());
     }
 
     private void add(AsmTransformer transformer) {

src/main/java/meteordevelopment/meteorclient/asm/AsmTransformer.java

@@ -26,6 +26,11 @@ protected MethodNode getMethod(ClassNode klass, MethodInfo methodInfo) {
         return null;
     }
 
+    protected static void error(String message) {
+        System.err.println(message);
+        throw new RuntimeException(message);
+    }
+
     protected static String mapClassName(String name) {
         return FabricLoader.getInstance().getMappingResolver().mapClassName("intermediary", name.replace('/', '.'));
     }

src/main/java/meteordevelopment/meteorclient/asm/transformers/GameRendererTransformer.java

@@ -24,10 +24,11 @@ public GameRendererTransformer() {
     public void transform(ClassNode klass) {
         // Modify GameRenderer.getFov()
         MethodNode method = getMethod(klass, getFovMethod);
-        if (method == null) throw new RuntimeException("[Meteor Client] Could not find method GameRenderer.getFov()");
+        if (method == null) error("[Meteor Client] Could not find method GameRenderer.getFov()");
 
         int injectionCount = 0;
 
+        //noinspection DataFlowIssue
         for (AbstractInsnNode insn : method.instructions) {
             if (insn instanceof LdcInsnNode in && in.cst instanceof Double && (double) in.cst == 90) {
                 InsnList insns = new InsnList();
@@ -52,7 +53,7 @@ else if (
             }
         }
 
-        if (injectionCount < 2) throw new RuntimeException("[Meteor Client] Failed to modify GameRenderer.getFov()");
+        if (injectionCount < 2) error("[Meteor Client] Failed to modify GameRenderer.getFov()");
     }
 
     private void generateEventCall(InsnList insns, AbstractInsnNode loadPreviousFov) {

src/main/java/meteordevelopment/meteorclient/asm/transformers/PacketInflaterTransformer.java

@@ -0,0 +1,62 @@
+/*
+ * This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client).
+ * Copyright (c) Meteor Development.
+ */
+
+package meteordevelopment.meteorclient.asm.transformers;
+
+import meteordevelopment.meteorclient.asm.AsmTransformer;
+import meteordevelopment.meteorclient.asm.Descriptor;
+import meteordevelopment.meteorclient.asm.MethodInfo;
+import meteordevelopment.meteorclient.systems.modules.misc.AntiPacketKick;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
+import org.objectweb.asm.tree.*;
+
+// Future compatibility
+// Future uses @ModifyConstant which does not chain when multiple mods do it and mixins / mixinextra can't target throw
+// statements. So using a custom ASM transformer we wrap the throw statement inside another if statement.
+public class PacketInflaterTransformer extends AsmTransformer {
+    private final MethodInfo decodeMethod;
+
+    public PacketInflaterTransformer() {
+        super(mapClassName("net/minecraft/class_2532"));
+
+        decodeMethod = new MethodInfo("net/minecraft/class_2532", "decode", new Descriptor("Lio/netty/channel/ChannelHandlerContext;", "Lio/netty/buffer/ByteBuf;", "Ljava/util/List;", "V"), true);
+    }
+
+    @Override
+    public void transform(ClassNode klass) {
+        MethodNode method = getMethod(klass, decodeMethod);
+        if (method == null) error("[Meteor Client] Could not find method PacketInflater.decode()");
+
+        int newCount = 0;
+        LabelNode label = new LabelNode(new Label());
+
+        //noinspection DataFlowIssue
+        for (AbstractInsnNode insn : method.instructions) {
+            if (insn instanceof TypeInsnNode typeInsn && typeInsn.getOpcode() == Opcodes.NEW && typeInsn.desc.equals("io/netty/handler/codec/DecoderException")) {
+                newCount++;
+
+                if (newCount == 2) {
+                    InsnList list = new InsnList();
+
+                    list.add(new MethodInsnNode(Opcodes.INVOKESTATIC, "meteordevelopment/meteorclient/systems/modules/Modules", "get", "()Lmeteordevelopment/meteorclient/systems/modules/Modules;", false));
+                    list.add(new LdcInsnNode(Type.getType(AntiPacketKick.class)));
+                    list.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "meteordevelopment/meteorclient/systems/modules/Modules", "isActive", "(Ljava/lang/Class;)Z", false));
+
+                    list.add(new JumpInsnNode(Opcodes.IFNE, label));
+
+                    method.instructions.insertBefore(insn, list);
+                }
+            }
+            else if (newCount == 2 && insn.getOpcode() == Opcodes.ATHROW) {
+                method.instructions.insert(insn, label);
+                return;
+            }
+        }
+
+        error("[Meteor Client] Failed to modify PacketInflater.decode()");
+    }
+}

src/main/resources/meteor-client.mixins.json

@@ -118,7 +118,6 @@
     "MouseMixin",
     "MultiplayerScreenMixin",
     "PacketByteBufMixin",
-    "PacketInflaterMixin",
     "ParticleManagerMixin",
     "PlayerArmorSlotMixin",
     "PlayerEntityMixin",