Version 2.0.0

tonimatasdev · tonimatasdev · commit b5f891d08949 · 2025-02-11T22:06:12.000+01:00
diff --git a/common/src/main/java/dev/tonimatas/packetfixer/PacketFixer.java b/common/src/main/java/dev/tonimatas/packetfixer/PacketFixer.java
@@ -1,9 +1,14 @@
 package dev.tonimatas.packetfixer;
 
+import dev.tonimatas.packetfixer.util.Config;
 import org.apache.logging.log4j.LogManager;
 
 public class PacketFixer {
     public static void init() {
         LogManager.getLogger().info("PacketFixer has been initialized successfully.");
     }
+
+	public static String getPayloadMessage() {
+		return "Payload may not be larger than " + Config.getPacketSize() + " bytes. You can modify it in the Packet Fixer config.";
+	}
 }
diff --git a/common/src/main/java/dev/tonimatas/packetfixer/mixins/ClientboundCustomPayloadPacketMixin.java b/common/src/main/java/dev/tonimatas/packetfixer/mixins/ClientboundCustomPayloadPacketMixin.java
@@ -1,20 +1,21 @@
 package dev.tonimatas.packetfixer.mixins;
 
+import dev.tonimatas.packetfixer.PacketFixer;
 import dev.tonimatas.packetfixer.util.Config;
 import net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.Constant;
 import org.spongepowered.asm.mixin.injection.ModifyConstant;
 
-@Mixin(value = ClientboundCustomPayloadPacket.class, priority = 999)
+@Mixin(ClientboundCustomPayloadPacket.class)
 public class ClientboundCustomPayloadPacketMixin {
-    @ModifyConstant(method = {"read", "<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", "read"}, constant = @Constant(intValue = 1048576))
     private int newSize(int value) {
         return Config.getPacketSize();
     }
 
-    @ModifyConstant(method = {"read", "<init>(Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/network/FriendlyByteBuf;)V"}, constant = @Constant(stringValue = "Payload may not be larger than 1048576 bytes"))
-    private String newSize(String constant) {
-        return "Payload may not be larger than " + Config.getPacketSize() + " bytes. You can modify it in the Packet Fixer config.";
+    @ModifyConstant(method = {"<init>(Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/network/FriendlyByteBuf;)V", "read"}, 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
@@ -1,21 +1,21 @@
 package dev.tonimatas.packetfixer.mixins;
 
+import dev.tonimatas.packetfixer.PacketFixer;
 import dev.tonimatas.packetfixer.util.Config;
 import net.minecraft.network.protocol.login.ClientboundCustomQueryPacket;
-import org.apache.logging.log4j.LogManager;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.Constant;
 import org.spongepowered.asm.mixin.injection.ModifyConstant;
 
-@Mixin(value = ClientboundCustomQueryPacket.class, priority = 999)
+@Mixin(ClientboundCustomQueryPacket.class)
 public class ClientboundCustomQueryPacketMixin {
     @ModifyConstant(method = "read", constant = @Constant(intValue = 1048576))
     private int newSize(int value) {
         return Config.getPacketSize();
     }
 
     @ModifyConstant(method = "read", constant = @Constant(stringValue = "Payload may not be larger than 1048576 bytes"))
-    private String newSize(String constant) {
-        return "Payload may not be larger than " + Config.getPacketSize() + " bytes. You can modify it in the Packet Fixer config.";
+    private String newSize(String value) {
+        return PacketFixer.getPayloadMessage();
     }
 }
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.ClientboundLevelChunkPacket;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.Constant;
+import org.spongepowered.asm.mixin.injection.ModifyConstant;
+
+@Mixin(ClientboundLevelChunkPacket.class)
+public class ClientboundLevelChunkPacketDataMixin {
+    @ModifyConstant(method = "read", constant = @Constant(intValue = 2097152))
+    private int init$size(int value) {
+        return Config.getChunkPacketData();
+    }
+
+    @ModifyConstant(method = "read", 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
@@ -6,7 +6,7 @@
 import org.spongepowered.asm.mixin.injection.Constant;
 import org.spongepowered.asm.mixin.injection.ModifyConstant;
 
-@Mixin(value = CompressionDecoder.class, priority = 999)
+@Mixin(CompressionDecoder.class)
 public class CompressionDecoderMixin {
     @ModifyConstant(method = "decode", constant = @Constant(intValue = 2097152))
     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
@@ -7,9 +7,29 @@
 import org.spongepowered.asm.mixin.injection.ModifyConstant;
 
 @Mixin(FriendlyByteBuf.class)
-public class FriendlyByteBufMixin {
+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 = "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 = "readVarLong", constant = @Constant(intValue = 10))
+    private int readLong$size(int constant) {
+        return Config.getVarLong();
+    }
+
+    @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,15 +23,6 @@ public String getRefMapperConfig() {
     @SuppressWarnings("UnreachableCode")
     @Override
     public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
-        boolean randomPatches = Hooks.isModLoaded("randompatches");
-        boolean krypton = Hooks.isModLoaded("krypton") || Hooks.isModLoaded("pluto");
-
-        if (MixinCheck.with(mixinClassName, "ServerboundCustomPayloadPacketMixin")) return !randomPatches;
-        if (MixinCheck.with(mixinClassName, "FriendlyByteBufMixin")) return !randomPatches;
-        if (MixinCheck.with(mixinClassName, "CompressionDecoderMixin")) return !randomPatches;
-        if (MixinCheck.with(mixinClassName, "Varint21FrameDecoderMixin") || 
-                MixinCheck.with(mixinClassName, "Varint21LengthFieldPrependerMixin")) return !krypton;
-        
         return true;
     }
 
@@ -49,10 +38,11 @@ public List<String> getMixins() {
 
     @Override
     public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
+
     }
 
     @Override
     public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
 
     }
-}
+}
diff --git a/common/src/main/java/dev/tonimatas/packetfixer/mixins/ServerboundCustomPayloadPacketMixin.java b/common/src/main/java/dev/tonimatas/packetfixer/mixins/ServerboundCustomPayloadPacketMixin.java
@@ -1,21 +1,21 @@
 package dev.tonimatas.packetfixer.mixins;
 
+import dev.tonimatas.packetfixer.PacketFixer;
 import dev.tonimatas.packetfixer.util.Config;
 import net.minecraft.network.protocol.game.ServerboundCustomPayloadPacket;
-import org.apache.logging.log4j.LogManager;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.Constant;
 import org.spongepowered.asm.mixin.injection.ModifyConstant;
 
-@Mixin(value = ServerboundCustomPayloadPacket.class, priority = 999)
+@Mixin(ServerboundCustomPayloadPacket.class)
 public class ServerboundCustomPayloadPacketMixin {
     @ModifyConstant(method = "read", constant = @Constant(intValue = 32767))
     private int newSize(int value) {
         return Config.getPacketSize();
     }
 
     @ModifyConstant(method = "read", constant = @Constant(stringValue = "Payload may not be larger than 32767 bytes"))
-    private String newSize(String constant) {
-        return "Payload may not be larger than " + Config.getPacketSize() + " bytes. You can modify it in the Packet Fixer config.";
+    private String newSize(String value) {
+        return PacketFixer.getPayloadMessage();
     }
 }
diff --git a/common/src/main/java/dev/tonimatas/packetfixer/mixins/ServerboundCustomQueryPacketMixin.java b/common/src/main/java/dev/tonimatas/packetfixer/mixins/ServerboundCustomQueryPacketMixin.java
@@ -1,21 +1,21 @@
 package dev.tonimatas.packetfixer.mixins;
 
+import dev.tonimatas.packetfixer.PacketFixer;
 import dev.tonimatas.packetfixer.util.Config;
 import net.minecraft.network.protocol.login.ServerboundCustomQueryPacket;
-import org.apache.logging.log4j.LogManager;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.Constant;
 import org.spongepowered.asm.mixin.injection.ModifyConstant;
 
-@Mixin(value = ServerboundCustomQueryPacket.class, priority = 999)
+@Mixin(ServerboundCustomQueryPacket.class)
 public class ServerboundCustomQueryPacketMixin {
     @ModifyConstant(method = "read", constant = @Constant(intValue = 1048576))
     private int newSize(int value) {
         return Config.getPacketSize();
     }
 
     @ModifyConstant(method = "read", constant = @Constant(stringValue = "Payload may not be larger than 1048576 bytes"))
-    private String newSize(String constant) {
-        return "Payload may not be larger than " + Config.getPacketSize() + " bytes. You can modify it in the Packet Fixer config.";
+    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/util/Config.java b/common/src/main/java/dev/tonimatas/packetfixer/util/Config.java
@@ -22,45 +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("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("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 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("timeout"));
     }
 
     private static void checkVariable(String variable, String defaultValue) {
@@ -72,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" +
+                        "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,7 +7,9 @@
   "mixins": [
     "ClientboundCustomPayloadPacketMixin",
     "ClientboundCustomQueryPacketMixin",
+    "ClientboundLevelChunkPacketDataMixin",
     "CompressionDecoderMixin",
+    "ConnectionMixin",
     "FriendlyByteBufMixin",
     "ServerboundCustomPayloadPacketMixin",
     "ServerboundCustomQueryPacketMixin",
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.2
+modVersion=2.0.0
 
 
 # Minecraft properties

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,14 @@`
`1`	`1`	`package dev.tonimatas.packetfixer;`
`2`	`2`
	`3`	`+import dev.tonimatas.packetfixer.util.Config;`
`3`	`4`	`import org.apache.logging.log4j.LogManager;`
`4`	`5`
`5`	`6`	`public class PacketFixer {`
`6`	`7`	`public static void init() {`
`7`	`8`	`LogManager.getLogger().info("PacketFixer has been initialized successfully.");`
`8`	`9`	`}`
	`10`	`+`
	`11`	`+ public static String getPayloadMessage() {`
	`12`	`+ return "Payload may not be larger than " + Config.getPacketSize() + " bytes. You can modify it in the Packet Fixer config.";`
	`13`	`+ }`
`9`	`14`	`}`