Version 2.0.0

tonimatasdev · tonimatasdev · commit 76f735f7793a · 2025-02-11T21:50:09.000+01:00
diff --git a/common/src/main/java/dev/tonimatas/packetfixer/mixins/ClientboundCustomPayloadPacketMixin.java b/common/src/main/java/dev/tonimatas/packetfixer/mixins/ClientboundCustomPayloadPacketMixin.java
@@ -7,14 +7,14 @@
 import org.spongepowered.asm.mixin.injection.Constant;
 import org.spongepowered.asm.mixin.injection.ModifyConstant;
 
-@Mixin(value = ClientboundCustomPayloadPacket.class, priority = 9999)
+@Mixin(ClientboundCustomPayloadPacket.class)
 public class ClientboundCustomPayloadPacketMixin {
-    @ModifyConstant(method = {"<init>(Lnet/minecraft/network/FriendlyByteBuf;)V", "<init>(Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/network/FriendlyByteBuf;)V"}, constant = @Constant(intValue = 1048576))
+    @ModifyConstant(method = {"<init>(Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/network/FriendlyByteBuf;)V", "<init>(Lnet/minecraft/network/FriendlyByteBuf;)V"}, constant = @Constant(intValue = 1048576))
     private int newSize(int value) {
         return Config.getPacketSize();
     }
 
-    @ModifyConstant(method = {"<init>(Lnet/minecraft/network/FriendlyByteBuf;)V", "<init>(Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/network/FriendlyByteBuf;)V"}, constant = @Constant(stringValue = "Payload may not be larger than 1048576 bytes"))
+    @ModifyConstant(method = {"<init>(Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/network/FriendlyByteBuf;)V", "<init>(Lnet/minecraft/network/FriendlyByteBuf;)V"}, constant = @Constant(stringValue = "Payload may not be larger than 1048576 bytes"))
     private String newSize(String value) {
         return PacketFixer.getPayloadMessage();
     }
diff --git a/common/src/main/java/dev/tonimatas/packetfixer/mixins/ClientboundCustomQueryPacketMixin.java b/common/src/main/java/dev/tonimatas/packetfixer/mixins/ClientboundCustomQueryPacketMixin.java
@@ -7,7 +7,7 @@
 import org.spongepowered.asm.mixin.injection.Constant;
 import org.spongepowered.asm.mixin.injection.ModifyConstant;
 
-@Mixin(value = ClientboundCustomQueryPacket.class, priority = 9999)
+@Mixin(ClientboundCustomQueryPacket.class)
 public class ClientboundCustomQueryPacketMixin {
     @ModifyConstant(method = "<init>(Lnet/minecraft/network/FriendlyByteBuf;)V", constant = @Constant(intValue = 1048576))
     private int newSize(int value) {
diff --git a/common/src/main/java/dev/tonimatas/packetfixer/mixins/ClientboundLevelChunkPacketDataMixin.java b/common/src/main/java/dev/tonimatas/packetfixer/mixins/ClientboundLevelChunkPacketDataMixin.java
@@ -0,0 +1,20 @@
+package dev.tonimatas.packetfixer.mixins;
+
+import dev.tonimatas.packetfixer.util.Config;
+import net.minecraft.network.protocol.game.ClientboundLevelChunkPacketData;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.Constant;
+import org.spongepowered.asm.mixin.injection.ModifyConstant;
+
+@Mixin(ClientboundLevelChunkPacketData.class)
+public class ClientboundLevelChunkPacketDataMixin {
+    @ModifyConstant(method = "<init>(Lnet/minecraft/network/FriendlyByteBuf;II)V", constant = @Constant(intValue = 2097152))
+    private int init$size(int value) {
+        return Config.getChunkPacketData();
+    }
+    
+    @ModifyConstant(method = "<init>(Lnet/minecraft/network/FriendlyByteBuf;II)V", constant = @Constant(stringValue = "Chunk Packet trying to allocate too much memory on read."))
+    private String init$message(String constant) {
+        return constant + " (" + Config.getChunkPacketData() + ") Modify it in the Packet Fixer config.";
+    }
+}
diff --git a/common/src/main/java/dev/tonimatas/packetfixer/mixins/CompressionDecoderMixin.java b/common/src/main/java/dev/tonimatas/packetfixer/mixins/CompressionDecoderMixin.java
@@ -3,10 +3,9 @@
 import dev.tonimatas.packetfixer.util.Config;
 import net.minecraft.network.CompressionDecoder;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.Constant;
-import org.spongepowered.asm.mixin.injection.ModifyConstant;
+import org.spongepowered.asm.mixin.injection.*;
 
-@Mixin(value = CompressionDecoder.class, priority = 9999)
+@Mixin(CompressionDecoder.class)
 public class CompressionDecoderMixin {
     @ModifyConstant(method = "decode", constant = @Constant(intValue = 8388608))
     private int newSize(int value) {
diff --git a/common/src/main/java/dev/tonimatas/packetfixer/mixins/ConnectionMixin.java b/common/src/main/java/dev/tonimatas/packetfixer/mixins/ConnectionMixin.java
@@ -0,0 +1,14 @@
+package dev.tonimatas.packetfixer.mixins;
+
+import dev.tonimatas.packetfixer.util.Config;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.Constant;
+import org.spongepowered.asm.mixin.injection.ModifyConstant;
+
+@Mixin(targets = "net.minecraft.network.Connection$1")
+public class ConnectionMixin {
+    @ModifyConstant(method = "initChannel", constant = @Constant(intValue = 30))
+    private int timeout(int value) {
+        return Config.getTimeout();
+    }
+}
diff --git a/common/src/main/java/dev/tonimatas/packetfixer/mixins/FriendlyByteBufMixin.java b/common/src/main/java/dev/tonimatas/packetfixer/mixins/FriendlyByteBufMixin.java
@@ -6,25 +6,30 @@
 import org.spongepowered.asm.mixin.injection.Constant;
 import org.spongepowered.asm.mixin.injection.ModifyConstant;
 
-@Mixin(value = FriendlyByteBuf.class, priority = 9999)
+@Mixin(FriendlyByteBuf.class)
 public abstract class FriendlyByteBufMixin {
     @ModifyConstant(method = "readNbt()Lnet/minecraft/nbt/CompoundTag;", constant = @Constant(longValue = 2097152L))
-    public long newSize(long value) {
+    private long newSize(long value) {
         return Config.getNbtMaxSize();
     }
-    
-    @ModifyConstant(method = "readUtf()Ljava/lang/String;", constant = @Constant(intValue = 32767))
-    public int newSize(int value) {
-        return Config.getStringSize();
+
+    @ModifyConstant(method = "readVarInt", constant = @Constant(intValue = 5))
+    private int readInt$size(int value) {
+        return Config.getVarIntSize();
+    }
+
+    @ModifyConstant(method = "readVarInt", constant = @Constant(stringValue = "VarInt too big"))
+    private String readInt$size(String constant) {
+        return "VarInt too big. Packet Fixer configured to " + Config.getVarIntSize() + ". You can modify it in the Packet Fixer config.";
     }
 
-    @ModifyConstant(method = "writeUtf(Ljava/lang/String;)Lnet/minecraft/network/FriendlyByteBuf;", constant = @Constant(intValue = 32767))
-    public int newSize$1(int value) {
-        return Config.getStringSize();
+    @ModifyConstant(method = "readVarLong", constant = @Constant(intValue = 10))
+    private int readLong$size(int constant) {
+        return Config.getVarLong();
     }
 
-    @ModifyConstant(method = "readResourceLocation", constant = @Constant(intValue = 32767))
-    public int newSize$2(int value) {
-        return Config.getStringSize();
+    @ModifyConstant(method = "readVarLong", constant = @Constant(stringValue = "VarLong too big"))
+    private String readLong$size(String constant) {
+        return "VarInt too big. Packet Fixer configured to " + Config.getVarLong() + ". You can modify it in the Packet Fixer config.";
     }
 }
diff --git a/common/src/main/java/dev/tonimatas/packetfixer/mixins/MixinConfigPlugin.java b/common/src/main/java/dev/tonimatas/packetfixer/mixins/MixinConfigPlugin.java
@@ -1,8 +1,6 @@
 package dev.tonimatas.packetfixer.mixins;
 
 import dev.tonimatas.packetfixer.util.Config;
-import dev.tonimatas.packetfixer.util.Hooks;
-import dev.tonimatas.packetfixer.util.MixinCheck;
 import org.objectweb.asm.tree.ClassNode;
 import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
 import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
@@ -25,18 +23,6 @@ public String getRefMapperConfig() {
     @SuppressWarnings("UnreachableCode")
     @Override
     public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
-        boolean connectivity = Hooks.isModLoaded("connectivity");
-        boolean krypton = Hooks.isModLoaded("krypton") || Hooks.isModLoaded("pluto");
-        boolean immersivePortals = Hooks.isModLoaded("immersive_portals");
-        boolean theVault = Hooks.isModLoaded("the_vault");
-
-        if (MixinCheck.with(mixinClassName, "CompressionDecoderMixin")) return !connectivity;
-        if (MixinCheck.with(mixinClassName, "compat.connectivity.CompressionDecoderMixin")) return connectivity;
-        if (MixinCheck.with(mixinClassName, "Varint21FrameDecoderMixin") || MixinCheck.with(mixinClassName, "Varint21LengthFieldPrependerMixin")) return !krypton;
-        if (MixinCheck.with(mixinClassName, "ClientboundCustomPayloadPacketMixin")) return (!immersivePortals && !theVault);
-        if (MixinCheck.with(mixinClassName, "ServerboundCustomPayloadPacketMixin")) return !theVault;
-        if (MixinCheck.with(mixinClassName, "ClientboundCustomQueryPacketMixin")) return !theVault;
-        if (MixinCheck.with(mixinClassName, "ServerboundCustomQueryPacketMixin")) return !theVault;
         return true;
     }
 
diff --git a/common/src/main/java/dev/tonimatas/packetfixer/mixins/PacketEncoderMixin.java b/common/src/main/java/dev/tonimatas/packetfixer/mixins/PacketEncoderMixin.java
@@ -6,7 +6,7 @@
 import org.spongepowered.asm.mixin.injection.Constant;
 import org.spongepowered.asm.mixin.injection.ModifyConstant;
 
-@Mixin(value = PacketEncoder.class, priority = 9999)
+@Mixin(PacketEncoder.class)
 public class PacketEncoderMixin {
     @ModifyConstant(method = "encode(Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/network/protocol/Packet;Lio/netty/buffer/ByteBuf;)V", constant = @Constant(intValue = 8388608))
     private int newSize(int value) {
diff --git a/common/src/main/java/dev/tonimatas/packetfixer/mixins/ServerboundCustomPayloadPacketMixin.java b/common/src/main/java/dev/tonimatas/packetfixer/mixins/ServerboundCustomPayloadPacketMixin.java
@@ -7,7 +7,7 @@
 import org.spongepowered.asm.mixin.injection.Constant;
 import org.spongepowered.asm.mixin.injection.ModifyConstant;
 
-@Mixin(value = ServerboundCustomPayloadPacket.class, priority = 9999)
+@Mixin(ServerboundCustomPayloadPacket.class)
 public class ServerboundCustomPayloadPacketMixin {
     @ModifyConstant(method = "<init>(Lnet/minecraft/network/FriendlyByteBuf;)V", constant = @Constant(intValue = 32767))
     private int newSize(int value) {
diff --git a/common/src/main/java/dev/tonimatas/packetfixer/mixins/ServerboundCustomQueryPacketMixin.java b/common/src/main/java/dev/tonimatas/packetfixer/mixins/ServerboundCustomQueryPacketMixin.java
@@ -7,7 +7,7 @@
 import org.spongepowered.asm.mixin.injection.Constant;
 import org.spongepowered.asm.mixin.injection.ModifyConstant;
 
-@Mixin(value = ServerboundCustomQueryPacket.class, priority = 9999)
+@Mixin(ServerboundCustomQueryPacket.class)
 public class ServerboundCustomQueryPacketMixin {
     @ModifyConstant(method = "<init>(Lnet/minecraft/network/FriendlyByteBuf;)V", constant = @Constant(intValue = 1048576))
     private int newSize(int value) {
@@ -18,4 +18,4 @@ private int newSize(int value) {
     private String newSize(String value) {
         return PacketFixer.getPayloadMessage();
     }
-}
+}
diff --git a/common/src/main/java/dev/tonimatas/packetfixer/mixins/Varint21FrameDecoderMixin.java b/common/src/main/java/dev/tonimatas/packetfixer/mixins/Varint21FrameDecoderMixin.java
@@ -7,9 +7,9 @@
 import org.spongepowered.asm.mixin.injection.ModifyConstant;
 
 @Mixin(Varint21FrameDecoder.class)
-public class Varint21FrameDecoderMixin {
+public abstract class Varint21FrameDecoderMixin {
     @ModifyConstant(method = "decode", constant = @Constant(intValue = 3))
     private int newSize(int value) {
         return Config.getVarInt21Size();
     }
-}
+}
diff --git a/common/src/main/java/dev/tonimatas/packetfixer/mixins/Varint21LengthFieldPrependerMixin.java b/common/src/main/java/dev/tonimatas/packetfixer/mixins/Varint21LengthFieldPrependerMixin.java
@@ -6,7 +6,7 @@
 import org.spongepowered.asm.mixin.injection.Constant;
 import org.spongepowered.asm.mixin.injection.ModifyConstant;
 
-@Mixin(value = Varint21LengthFieldPrepender.class, priority = 9999)
+@Mixin(Varint21LengthFieldPrepender.class)
 public class Varint21LengthFieldPrependerMixin {
     @ModifyConstant(method = "encode(Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;Lio/netty/buffer/ByteBuf;)V", constant = @Constant(intValue = 3))
     private int newSize(int value) {
diff --git a/common/src/main/java/dev/tonimatas/packetfixer/mixins/compat/connectivity/CompressionDecoderMixin.java b/common/src/main/java/dev/tonimatas/packetfixer/mixins/compat/connectivity/CompressionDecoderMixin.java
diff --git a/common/src/main/java/dev/tonimatas/packetfixer/util/Config.java b/common/src/main/java/dev/tonimatas/packetfixer/util/Config.java
@@ -22,52 +22,80 @@ public static void runProperties() {
 
             if (!propertiesFile.exists()) {
                 propertiesFile.createNewFile();
-
-                properties.setProperty("nbtMaxSize", Long.toString(2097152 * 100));
-                properties.setProperty("packetSize", Integer.toString(1048576 * 100));
-                properties.setProperty("decoderSize", Integer.toString(8388608 * 100));
-                properties.setProperty("stringSize", Integer.toString(32767 * 100));
-                properties.setProperty("varInt21", Integer.toString(8));
+                
+                properties.setProperty("allSizesUnlimited", "true");
+                properties.setProperty("nbtMaxSize", Long.toString(2097152));
+                properties.setProperty("packetSize", Integer.toString(1048576));
+                properties.setProperty("decoderSize", Integer.toString(8388608));
+                properties.setProperty("varInt21", Integer.toString(3));
+                properties.setProperty("varInt", Integer.toString(5));
+                properties.setProperty("varLong", Integer.toString(10));
+                checkVariable("chunkPacketData", Integer.toString(2097152));
+                properties.setProperty("timeout", Integer.toString(90));
 
                 save(propertiesFile);
             }
 
             properties.load(Files.newInputStream(propertiesFile.toPath()));
 
-            checkVariable("nbtMaxSize", Long.toString(2097152 * 100));
-            checkVariable("packetSize", Integer.toString(1048576 * 100));
-            checkVariable("decoderSize", Integer.toString(8388608 * 100));
-            checkVariable("stringSize", Integer.toString(32767 * 100));
-            checkVariable("varInt21", Integer.toString(8));
+            checkVariable("allSizesUnlimited", "true");
+            checkVariable("nbtMaxSize", Long.toString(2097152));
+            checkVariable("packetSize", Integer.toString(1048576));
+            checkVariable("decoderSize", Integer.toString(8388608));
+            checkVariable("varInt21", Integer.toString(3));
+            checkVariable("varInt", Integer.toString(5));
+            checkVariable("varLong", Integer.toString(10));
+            checkVariable("chunkPacketData", Integer.toString(2097152));
+            checkVariable("timeout", Integer.toString(90));
             save(propertiesFile);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
     }
 
+    private static boolean getUnlimitedPacketSize() {
+        if (properties == null) runProperties();
+        return Boolean.parseBoolean(properties.getProperty("allSizesUnlimited"));
+    }
+
     public static long getNbtMaxSize() {
         if (properties == null) runProperties();
-        return Long.parseLong(properties.getProperty("nbtMaxSize"));
+        return getUnlimitedPacketSize() ? Long.MAX_VALUE : Long.parseLong(properties.getProperty("nbtMaxSize"));
     }
 
     public static int getPacketSize() {
         if (properties == null) runProperties();
-        return Integer.parseInt(properties.getProperty("packetSize"));
+        return getUnlimitedPacketSize() ? Integer.MAX_VALUE : Integer.parseInt(properties.getProperty("packetSize"));
     }
 
     public static int getDecoderSize() {
         if (properties == null) runProperties();
-        return Integer.parseInt(properties.getProperty("decoderSize"));
+        return getUnlimitedPacketSize() ? Integer.MAX_VALUE : Integer.parseInt(properties.getProperty("decoderSize"));
     }
 
     public static int getVarInt21Size() {
         if (properties == null) runProperties();
-        return Integer.parseInt(properties.getProperty("varInt21"));
+        return getUnlimitedPacketSize() ? Integer.MAX_VALUE : Integer.parseInt(properties.getProperty("varInt21"));
     }
 
-    public static int getStringSize() {
+    public static int getVarIntSize() {
+        if (properties == null) runProperties();
+        return getUnlimitedPacketSize() ? Integer.MAX_VALUE : Integer.parseInt(properties.getProperty("varInt"));
+    }
+    
+    public static int getVarLong() {
+        if (properties == null) runProperties();
+        return getUnlimitedPacketSize() ? Integer.MAX_VALUE : Integer.parseInt(properties.getProperty("varLong"));
+    }
+    
+    public static int getChunkPacketData() {
+        if (properties == null) runProperties();
+        return getUnlimitedPacketSize() ? Integer.MAX_VALUE : Integer.parseInt(properties.getProperty("chunkPacketData"));
+    }
+    
+    public static int getTimeout() {
         if (properties == null) runProperties();
-        return Integer.parseInt(properties.getProperty("stringSize"));
+        return Integer.parseInt(properties.getProperty("timeout"));
     }
 
     private static void checkVariable(String variable, String defaultValue) {
@@ -79,7 +107,7 @@ private static void checkVariable(String variable, String defaultValue) {
     private static void save(File propertiesFile) throws IOException {
         properties.store(Files.newOutputStream(propertiesFile.toPath()),
                 "Packet Fixer config file.\n" +
-                        "Default values (minecraft default): nbtMaxSize 2097152, packetSize 1048576, decoderSize 2097152 and varInt21Size 3.\n" +
-                        "Max values are " + Integer.MAX_VALUE + " for packetSize/decoderSize/varInt21/stringSize and " + Long.MAX_VALUE + " for nbtMaxSize.");
+                        "Default values (minecraft default): nbtMaxSize 2097152, packetSize 1048576, decoderSize 8388608 and varInt21Size 3.\n" +
+                        "Max values are " + Integer.MAX_VALUE + " for packetSize/decoderSize/varInt21 and " + Long.MAX_VALUE + " for nbtMaxSize.");
     }
 }
diff --git a/common/src/main/resources/packetfixer-common.mixins.json b/common/src/main/resources/packetfixer-common.mixins.json
@@ -7,18 +7,19 @@
   "mixins": [
     "ClientboundCustomPayloadPacketMixin",
     "ClientboundCustomQueryPacketMixin",
+    "ClientboundLevelChunkPacketDataMixin",
     "CompressionDecoderMixin",
+    "ConnectionMixin",
     "FriendlyByteBufMixin",
     "PacketEncoderMixin",
     "ServerboundCustomPayloadPacketMixin",
     "ServerboundCustomQueryPacketMixin",
     "Varint21FrameDecoderMixin",
-    "Varint21LengthFieldPrependerMixin",
-    "compat.connectivity.CompressionDecoderMixin"
+    "Varint21LengthFieldPrependerMixin"
   ],
   "client": [
   ],
   "injectors": {
-    "defaultRequire": 1
+    "defaultRequire": 0
   }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 # Mod Properties
-modVersion=1.4.3
+modVersion=2.0.0
 
 # Minecraft
 minecraftVersion=1.18.2
