Another try at fixing CompatPacket

zbx1425 · Aug 12, 2024 · 768287b · 768287b
1 parent 847baaa
commit 768287b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/fabric/src/main/java/cn/zbx1425/worldcomment/fabric/CompatPacket.java b/fabric/src/main/java/cn/zbx1425/worldcomment/fabric/CompatPacket.java
@@ -35,16 +35,14 @@ public Type<? extends CustomPacketPayload> type() {
     public final StreamCodec<ByteBuf, Payload> STREAM_CODEC = new StreamCodec<>() {
         @Override
         public void encode(ByteBuf dest, Payload src) {
-            src.buffer.readerIndex(0);
-            dest.writeInt(src.buffer.readableBytes());
-            dest.writeBytes(src.buffer, 0, src.buffer.readableBytes());
+            dest.writeBytes(src.buffer);
         }
 
         @Override
         public Payload decode(ByteBuf src) {
-            final int length = src.readInt();
-            FriendlyByteBuf result = new FriendlyByteBuf(src.readBytes(length));
-            return new Payload(result);
+            ByteBuf data = src.retainedDuplicate();
+            src.readerIndex(src.readerIndex() + src.readableBytes());
+            return new Payload(new FriendlyByteBuf(data));
         }
     };
 }

diff --git a/neoforge/src/main/java/cn/zbx1425/worldcomment/neoforge/CompatPacket.java b/neoforge/src/main/java/cn/zbx1425/worldcomment/neoforge/CompatPacket.java
@@ -35,16 +35,14 @@ public Type<? extends CustomPacketPayload> type() {
     public final StreamCodec<ByteBuf, Payload> STREAM_CODEC = new StreamCodec<>() {
         @Override
         public void encode(ByteBuf dest, Payload src) {
-            src.buffer.readerIndex(0);
-            dest.writeInt(src.buffer.readableBytes());
-            dest.writeBytes(src.buffer, 0, src.buffer.readableBytes());
+            dest.writeBytes(src.buffer);
         }
 
         @Override
         public Payload decode(ByteBuf src) {
-            final int length = src.readInt();
-            FriendlyByteBuf result = new FriendlyByteBuf(src.readBytes(length));
-            return new Payload(result);
+            ByteBuf data = src.retainedDuplicate();
+            src.readerIndex(src.readerIndex() + src.readableBytes());
+            return new Payload(new FriendlyByteBuf(data));
         }
     };
 }