Add reserialize packet option

QuiltMC · Apr 3, 2024 · 7b04bbf · 7b04bbf
1 parent 30da53b
commit 7b04bbf
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 0 deletions.
diff --git a/library/core/networking/src/main/java/org/quiltmc/qsl/networking/impl/NetworkingImpl.java b/library/core/networking/src/main/java/org/quiltmc/qsl/networking/impl/NetworkingImpl.java
@@ -66,6 +66,12 @@ public final class NetworkingImpl {
 	 */
 	public static final Identifier EARLY_REGISTRATION_CHANNEL_FABRIC = new Identifier("fabric-networking-api-v1", "early_registration");
 
+	/**
+	 * Forces reserialization of packets.
+	 */
+	// TODO: Remove for 1.20.5. This is done there already.
+	public static final boolean RESERIALIZE_CUSTOM_PAYLOADS = Boolean.parseBoolean(System.getProperty("quilt.networking.reserialize_custom_payloads"));
+
 	public static void init(ModContainer mod) {
 		// Login setup
 		ServerLoginConnectionEvents.QUERY_START.register((handler, server, sender, synchronizer) -> {

diff --git a/...etworking/src/main/java/org/quiltmc/qsl/networking/mixin/CustomPayloadC2SPacketMixin.java b/...etworking/src/main/java/org/quiltmc/qsl/networking/mixin/CustomPayloadC2SPacketMixin.java
@@ -25,6 +25,7 @@
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
@@ -34,6 +35,7 @@
 import net.minecraft.util.Identifier;
 
 import org.quiltmc.qsl.networking.api.PacketByteBufs;
+import org.quiltmc.qsl.networking.impl.NetworkingImpl;
 import org.quiltmc.qsl.networking.impl.payload.PacketByteBufPayload;
 
 @Mixin(CustomPayloadC2SPacket.class)
@@ -54,4 +56,15 @@ private static void inject(Identifier id, PacketByteBuf buf, CallbackInfoReturna
 		cir.setReturnValue(new PacketByteBufPayload(id, copied));
 		buf.skipBytes(buf.readableBytes());
 	}
+
+	@ModifyArg(method = "apply(Lnet/minecraft/network/listener/ServerCommonPacketListener;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/listener/ServerCommonPacketListener;onCustomPayload(Lnet/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket;)V"))
+	public CustomPayloadC2SPacket reserialize(CustomPayloadC2SPacket packet) {
+		if (NetworkingImpl.RESERIALIZE_CUSTOM_PAYLOADS) {
+			PacketByteBuf buf = PacketByteBufs.create();
+			packet.write(buf);
+			return new CustomPayloadC2SPacket(buf);
+		}
+
+		return packet;
+	}
 }
diff --git a/...etworking/src/main/java/org/quiltmc/qsl/networking/mixin/CustomPayloadS2CPacketMixin.java b/...etworking/src/main/java/org/quiltmc/qsl/networking/mixin/CustomPayloadS2CPacketMixin.java
@@ -25,15 +25,18 @@
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import net.minecraft.network.PacketByteBuf;
+import net.minecraft.network.packet.c2s.common.CustomPayloadC2SPacket;
 import net.minecraft.network.packet.payload.CustomPayload;
 import net.minecraft.network.packet.s2c.common.CustomPayloadS2CPacket;
 import net.minecraft.util.Identifier;
 
 import org.quiltmc.qsl.networking.api.PacketByteBufs;
+import org.quiltmc.qsl.networking.impl.NetworkingImpl;
 import org.quiltmc.qsl.networking.impl.payload.PacketByteBufPayload;
 
 @Mixin(CustomPayloadS2CPacket.class)
@@ -54,4 +57,15 @@ private static void inject(Identifier id, PacketByteBuf buf, CallbackInfoReturna
 		cir.setReturnValue(new PacketByteBufPayload(id, copied));
 		buf.skipBytes(buf.readableBytes());
 	}
+
+	@ModifyArg(method = "apply(Lnet/minecraft/network/listener/ClientCommonPacketListener;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/listener/ClientCommonPacketListener;onCustomPayload(Lnet/minecraft/network/packet/s2c/common/CustomPayloadS2CPacket;)V"))
+	public CustomPayloadS2CPacket reserialize(CustomPayloadS2CPacket packet) {
+		if (NetworkingImpl.RESERIALIZE_CUSTOM_PAYLOADS) {
+			PacketByteBuf buf = PacketByteBufs.create();
+			packet.write(buf);
+			return new CustomPayloadS2CPacket(buf);
+		}
+
+		return packet;
+	}
 }