Forge port 1.20.2

forge/src/main/java/net/tonimatasdev/packetfixerforge/mixin/ClientboundCustomPayloadPacketMixin.java

@@ -1,15 +1,15 @@
 package net.tonimatasdev.packetfixerforge.mixin;
 
 
-import net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket;
+import net.minecraft.network.protocol.common.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 = 9999)
 public class ClientboundCustomPayloadPacketMixin {
-    @ModifyConstant(method = "<init>*", constant = @Constant(intValue = 1048576))
-    private int newSize(int value) {
+    @ModifyConstant(method = "readUnknownPayload", constant = @Constant(intValue = 1048576))
+    private static int newSize(int value) {
         return Integer.MAX_VALUE;
     }
 }

forge/src/main/java/net/tonimatasdev/packetfixerforge/mixin/ClientboundCustomQueryPacketMixin.java

@@ -7,8 +7,8 @@
 
 @Mixin(value = ClientboundCustomQueryPacket.class, priority = 9999)
 public class ClientboundCustomQueryPacketMixin {
-    @ModifyConstant(method = "<init>(Lnet/minecraft/network/FriendlyByteBuf;)V", constant = @Constant(intValue = 1048576))
-    private int newSize(int value) {
+    @ModifyConstant(method = "readUnknownPayload", constant = @Constant(intValue = 1048576))
+    private static int newSize(int value) {
         return Integer.MAX_VALUE;
     }
 }

forge/src/main/java/net/tonimatasdev/packetfixerforge/mixin/NbtAccounterMixin.java

@@ -15,7 +15,12 @@ public abstract class NbtAccounterMixin {
     //}
 
     // >= 1.19
-    @Redirect(method = "accountBytes", at = @At(value = "FIELD", target = "Lnet/minecraft/nbt/NbtAccounter;quota:J", opcode = Opcodes.GETFIELD))
+    //@Redirect(method = "accountBytes", at = @At(value = "FIELD", target = "Lnet/minecraft/nbt/NbtAccounter;quota:J", opcode = Opcodes.GETFIELD))
+    //public long accountBits(NbtAccounter instance) {
+    //    return Long.MAX_VALUE;
+    //}
+
+    @Redirect(method = "accountBytes(J)V", at = @At(value = "FIELD", target = "Lnet/minecraft/nbt/NbtAccounter;quota:J", opcode = Opcodes.GETFIELD))
     public long accountBits(NbtAccounter instance) {
         return Long.MAX_VALUE;
     }

forge/src/main/java/net/tonimatasdev/packetfixerforge/mixin/ServerboundCustomPayloadPacketMixin.java

@@ -1,14 +1,14 @@
 package net.tonimatasdev.packetfixerforge.mixin;
 
-import net.minecraft.network.protocol.game.ServerboundCustomPayloadPacket;
+import net.minecraft.network.protocol.common.ServerboundCustomPayloadPacket;
 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 = 9999)
 public class ServerboundCustomPayloadPacketMixin {
-    @ModifyConstant(method = "<init>(Lnet/minecraft/network/FriendlyByteBuf;)V", constant = @Constant(intValue = 32767))
-    private int newSize(int value) {
+    @ModifyConstant(method = "readUnknownPayload", constant = @Constant(intValue = 32767))
+    private static int newSize(int value) {
         return Integer.MAX_VALUE;
     }
 }

forge/src/main/java/net/tonimatasdev/packetfixerforge/mixin/ServerboundCustomQueryPacketMixin.java

@@ -1,22 +1,27 @@
 package net.tonimatasdev.packetfixerforge.mixin;
 
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.protocol.login.ServerboundCustomQueryPacket;
+import net.minecraft.network.protocol.login.ServerboundCustomQueryAnswerPacket;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.ModifyVariable;
+import org.spongepowered.asm.mixin.injection.Constant;
+import org.spongepowered.asm.mixin.injection.ModifyConstant;
 
-@Mixin(value = ServerboundCustomQueryPacket.class, priority = 9999)
+@Mixin(value = ServerboundCustomQueryAnswerPacket.class, priority = 9999)
 public class ServerboundCustomQueryPacketMixin {
     // <= 1.18
     //@ModifyConstant(method = "<init>(Lnet/minecraft/network/FriendlyByteBuf;)V", constant = @Constant(intValue = 1048576))
     //private int newSize(int value) {
     //    return Integer.MAX_VALUE;
     //}
 
-    // >= 1.19
-    @ModifyVariable(method = "<init>(Lnet/minecraft/network/FriendlyByteBuf;)V", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/network/FriendlyByteBuf;readNullable(Lnet/minecraft/network/FriendlyByteBuf$Reader;)Ljava/lang/Object;"), index = 1, argsOnly = true)
-    private FriendlyByteBuf redirectReadNullable(FriendlyByteBuf value) {
-        return new FriendlyByteBuf(value.readBytes(value.readableBytes()));
+    // 1.19 to 1.20.1
+    //@ModifyVariable(method = "<init>(Lnet/minecraft/network/FriendlyByteBuf;)V", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/network/FriendlyByteBuf;readNullable(Lnet/minecraft/network/FriendlyByteBuf$Reader;)Ljava/lang/Object;"), index = 1, argsOnly = true)
+    //private FriendlyByteBuf redirectReadNullable(FriendlyByteBuf value) {
+    //    return new FriendlyByteBuf(value.readBytes(value.readableBytes()));
+    //}
+
+    // >= 1.20.2
+    @ModifyConstant(method = "readUnknownPayload", constant = @Constant(intValue = 1048576))
+    private static int newSize(int value) {
+        return Integer.MAX_VALUE;
     }
 }

gradle.properties

@@ -7,8 +7,8 @@ modVersion=1.1.7
 # --------------------------------- 1.20.1
 
 minecraftVersion=1.20.2
-forgeVersion=47.1.44
-forgeVersionRange=47
+forgeVersion=48.0.0
+forgeVersionRange=48
 loaderVersion=0.14.22
 yarnMappings=1.20.2+build.1
 

settings.gradle.kts

@@ -8,5 +8,5 @@ pluginManagement {
     }
 }
 
-include("fabric", /*"forge"*/)
+include("fabric", "forge")
 rootProject.name = "PacketFixer"