From e36917e6c26a9221eed627f78734fabc9f0c97b0 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Fri, 16 Aug 2024 20:52:15 +0200
Subject: [PATCH] Update to VV container id types

---
 .../rewriter/BlockItemPacketRewriter1_11.java          |  4 ++--
 .../rewriter/BlockItemPacketRewriter1_12.java          |  5 +++--
 .../rewriter/ItemPacketRewriter1_13_2.java             |  4 ++--
 .../rewriter/BlockItemPacketRewriter1_13.java          |  4 ++--
 .../protocol/v1_17_1to1_17/Protocol1_17_1To1_17.java   | 10 +++++-----
 .../v1_17_1to1_17/storage/InventoryStateIds.java       |  4 ++--
 .../rewriter/BlockItemPacketRewriter1_17.java          |  6 +++---
 7 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_11to1_10/rewriter/BlockItemPacketRewriter1_11.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_11to1_10/rewriter/BlockItemPacketRewriter1_11.java
index bb05ac61..b679efc7 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_11to1_10/rewriter/BlockItemPacketRewriter1_11.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_11to1_10/rewriter/BlockItemPacketRewriter1_11.java
@@ -60,7 +60,7 @@ public class BlockItemPacketRewriter1_11 extends LegacyBlockItemRewriter<Clientb
         protocol.registerClientbound(ClientboundPackets1_9_3.CONTAINER_SET_SLOT, new PacketHandlers() {
             @Override
             public void register() {
-                map(Types.UNSIGNED_BYTE); // 0 - Window ID
+                map(Types.BYTE); // 0 - Window ID
                 map(Types.SHORT); // 1 - Slot ID
                 map(Types.ITEM1_8); // 2 - Slot Value
 
@@ -118,7 +118,7 @@ public class BlockItemPacketRewriter1_11 extends LegacyBlockItemRewriter<Clientb
         protocol.registerServerbound(ServerboundPackets1_9_3.CONTAINER_CLICK, new PacketHandlers() {
             @Override
             public void register() {
-                map(Types.UNSIGNED_BYTE); // 0 - Window ID
+                map(Types.BYTE); // 0 - Window ID
                 map(Types.SHORT); // 1 - Slot
                 map(Types.BYTE); // 2 - Button
                 map(Types.SHORT); // 3 - Action number
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_12to1_11_1/rewriter/BlockItemPacketRewriter1_12.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_12to1_11_1/rewriter/BlockItemPacketRewriter1_12.java
index 3c44d7b7..dfc03891 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_12to1_11_1/rewriter/BlockItemPacketRewriter1_12.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_12to1_11_1/rewriter/BlockItemPacketRewriter1_12.java
@@ -95,7 +95,7 @@ public class BlockItemPacketRewriter1_12 extends LegacyBlockItemRewriter<Clientb
         protocol.registerServerbound(ServerboundPackets1_9_3.CONTAINER_CLICK, new PacketHandlers() {
             @Override
             public void register() {
-                map(Types.UNSIGNED_BYTE); // 0 - Window ID
+                map(Types.BYTE); // 0 - Window ID
                 map(Types.SHORT); // 1 - Slot
                 map(Types.BYTE); // 2 - Button
                 map(Types.SHORT); // 3 - Action number
@@ -112,7 +112,8 @@ public class BlockItemPacketRewriter1_12 extends LegacyBlockItemRewriter<Clientb
 
                         // Apologize (may happen in some cases, maybe if inventory is full?)
                         PacketWrapper confirm = wrapper.create(ServerboundPackets1_12.CONTAINER_ACK);
-                        confirm.write(Types.UNSIGNED_BYTE, wrapper.get(Types.UNSIGNED_BYTE, 0));
+                        byte containerId = wrapper.get(Types.BYTE, 0);
+                        confirm.write(Types.BYTE, containerId);
                         confirm.write(Types.SHORT, wrapper.get(Types.SHORT, 1));
                         confirm.write(Types.BOOLEAN, false); // Success - not used
 
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_13_2to1_13_1/rewriter/ItemPacketRewriter1_13_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_13_2to1_13_1/rewriter/ItemPacketRewriter1_13_2.java
index e772d9c4..8c595602 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_13_2to1_13_1/rewriter/ItemPacketRewriter1_13_2.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_13_2to1_13_1/rewriter/ItemPacketRewriter1_13_2.java
@@ -30,7 +30,7 @@ public class ItemPacketRewriter1_13_2 {
         protocol.registerClientbound(ClientboundPackets1_13.CONTAINER_SET_SLOT, new PacketHandlers() {
             @Override
             public void register() {
-                map(Types.UNSIGNED_BYTE); // 0 - Window ID
+                map(Types.BYTE); // 0 - Window ID
                 map(Types.SHORT); // 1 - Slot ID
                 map(Types.ITEM1_13_2, Types.ITEM1_13); // 2 - Slot Value
             }
@@ -117,7 +117,7 @@ public class ItemPacketRewriter1_13_2 {
         protocol.registerServerbound(ServerboundPackets1_13.CONTAINER_CLICK, new PacketHandlers() {
             @Override
             public void register() {
-                map(Types.UNSIGNED_BYTE); // 0 - Window ID
+                map(Types.BYTE); // 0 - Window ID
                 map(Types.SHORT); // 1 - Slot
                 map(Types.BYTE); // 2 - Button
                 map(Types.SHORT); // 3 - Action number
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_13to1_12_2/rewriter/BlockItemPacketRewriter1_13.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_13to1_12_2/rewriter/BlockItemPacketRewriter1_13.java
index ae064349..8d9e641f 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_13to1_12_2/rewriter/BlockItemPacketRewriter1_13.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_13to1_12_2/rewriter/BlockItemPacketRewriter1_13.java
@@ -270,7 +270,7 @@ public class BlockItemPacketRewriter1_13 extends BackwardsItemRewriter<Clientbou
         protocol.registerClientbound(ClientboundPackets1_13.CONTAINER_SET_SLOT, new PacketHandlers() {
             @Override
             public void register() {
-                map(Types.UNSIGNED_BYTE);
+                map(Types.BYTE);
                 map(Types.SHORT);
                 map(Types.ITEM1_13, Types.ITEM1_8);
 
@@ -464,7 +464,7 @@ public class BlockItemPacketRewriter1_13 extends BackwardsItemRewriter<Clientbou
         protocol.registerServerbound(ServerboundPackets1_12_1.CONTAINER_CLICK, new PacketHandlers() {
             @Override
             public void register() {
-                map(Types.UNSIGNED_BYTE);
+                map(Types.BYTE);
                 map(Types.SHORT);
                 map(Types.BYTE);
                 map(Types.SHORT);
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_17_1to1_17/Protocol1_17_1To1_17.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_17_1to1_17/Protocol1_17_1To1_17.java
index 54edd02d..a24614ff 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_17_1to1_17/Protocol1_17_1To1_17.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_17_1to1_17/Protocol1_17_1To1_17.java
@@ -58,17 +58,17 @@ public final class Protocol1_17_1To1_17 extends BackwardsProtocol<ClientboundPac
 
         registerClientbound(ClientboundPackets1_17_1.CONTAINER_CLOSE, wrapper -> {
             short containerId = wrapper.passthrough(Types.UNSIGNED_BYTE);
-            wrapper.user().get(InventoryStateIds.class).removeStateId(containerId);
+            wrapper.user().get(InventoryStateIds.class).removeStateId((byte) containerId);
         });
         registerClientbound(ClientboundPackets1_17_1.CONTAINER_SET_SLOT, wrapper -> {
-            short containerId = wrapper.passthrough(Types.UNSIGNED_BYTE);
+            byte containerId = wrapper.passthrough(Types.BYTE);
             int stateId = wrapper.read(Types.VAR_INT);
             wrapper.user().get(InventoryStateIds.class).setStateId(containerId, stateId);
         });
         registerClientbound(ClientboundPackets1_17_1.CONTAINER_SET_CONTENT, wrapper -> {
             short containerId = wrapper.passthrough(Types.UNSIGNED_BYTE);
             int stateId = wrapper.read(Types.VAR_INT);
-            wrapper.user().get(InventoryStateIds.class).setStateId(containerId, stateId);
+            wrapper.user().get(InventoryStateIds.class).setStateId((byte) containerId, stateId);
 
             // Length is encoded as a var int in 1.17.1
             wrapper.write(Types.ITEM1_13_2_SHORT_ARRAY, wrapper.read(Types.ITEM1_13_2_ARRAY));
@@ -89,10 +89,10 @@ public final class Protocol1_17_1To1_17 extends BackwardsProtocol<ClientboundPac
 
         registerServerbound(ServerboundPackets1_17.CONTAINER_CLOSE, wrapper -> {
             short containerId = wrapper.passthrough(Types.UNSIGNED_BYTE);
-            wrapper.user().get(InventoryStateIds.class).removeStateId(containerId);
+            wrapper.user().get(InventoryStateIds.class).removeStateId((byte) containerId);
         });
         registerServerbound(ServerboundPackets1_17.CONTAINER_CLICK, wrapper -> {
-            short containerId = wrapper.passthrough(Types.UNSIGNED_BYTE);
+            byte containerId = wrapper.passthrough(Types.BYTE);
             int stateId = wrapper.user().get(InventoryStateIds.class).removeStateId(containerId);
             wrapper.write(Types.VAR_INT, stateId == Integer.MAX_VALUE ? 0 : stateId);
         });
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_17_1to1_17/storage/InventoryStateIds.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_17_1to1_17/storage/InventoryStateIds.java
index d24c723f..497849be 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_17_1to1_17/storage/InventoryStateIds.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_17_1to1_17/storage/InventoryStateIds.java
@@ -29,11 +29,11 @@ public final class InventoryStateIds implements StorableObject {
         ids.defaultReturnValue(Integer.MAX_VALUE);
     }
 
-    public void setStateId(short containerId, int id) {
+    public void setStateId(byte containerId, int id) {
         ids.put(containerId, id);
     }
 
-    public int removeStateId(short containerId) {
+    public int removeStateId(byte containerId) {
         return ids.remove(containerId);
     }
 }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_17to1_16_4/rewriter/BlockItemPacketRewriter1_17.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_17to1_16_4/rewriter/BlockItemPacketRewriter1_17.java
index eee094a4..d65d5d10 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_17to1_16_4/rewriter/BlockItemPacketRewriter1_17.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_17to1_16_4/rewriter/BlockItemPacketRewriter1_17.java
@@ -91,7 +91,7 @@ public final class BlockItemPacketRewriter1_17 extends BackwardsItemRewriter<Cli
         protocol.registerServerbound(ServerboundPackets1_16_2.CONTAINER_CLICK, new PacketHandlers() {
             @Override
             public void register() {
-                map(Types.UNSIGNED_BYTE);
+                map(Types.BYTE);
                 handler(wrapper -> {
                     short slot = wrapper.passthrough(Types.SHORT); // Slot
                     byte button = wrapper.passthrough(Types.BYTE); // Button
@@ -139,7 +139,7 @@ public final class BlockItemPacketRewriter1_17 extends BackwardsItemRewriter<Cli
         });
 
         protocol.registerClientbound(ClientboundPackets1_17.CONTAINER_SET_SLOT, wrapper -> {
-            short windowId = wrapper.passthrough(Types.UNSIGNED_BYTE);
+            byte windowId = wrapper.passthrough(Types.BYTE);
             short slot = wrapper.passthrough(Types.SHORT);
 
             Item carried = wrapper.read(Types.ITEM1_13_2);
@@ -164,7 +164,7 @@ public final class BlockItemPacketRewriter1_17 extends BackwardsItemRewriter<Cli
             }
 
             // Handle ping packet replacement
-            short inventoryId = wrapper.read(Types.UNSIGNED_BYTE);
+            byte inventoryId = wrapper.read(Types.BYTE);
             short confirmationId = wrapper.read(Types.SHORT);
             boolean accepted = wrapper.read(Types.BOOLEAN);
             if (inventoryId == 0 && accepted && wrapper.user().get(PingRequests.class).removeId(confirmationId)) {