Make <1.21.2 container id types consistent with Vanilla again

kennytv · kennytv · commit a0b0ed4b68f8 · 2025-03-11T10:36:49.000+01:00
... that's to say, to make them inconsistent thanks to special ids:
Byte:
- CONTAINER_SET_SLOT
- CONTAINER_CLICK
- PLACE_GHOST_RECIPE
- PLACE_RECIPE
- CONTAINER_BUTTON_CLICK
- CONTAINER_CLOSE (serverbound)
- CONTAINER_ACK (serverbound)
Unsigned byte (unchanged):
- OPEN_SCREEN
- CONTAINER_SET_CONTENT
- CONTAINER_SET_DATA
- HORSE_SCREEN_OPEN
- CONTAINER_CLOSE (clientbound)
- CONTAINER_ACK (clientbound)
Short (unchanged):
- SET_CREATIVE_MODE_SLOT

This doesn't change much in practice, but means it matches the Vanilla reading
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/rewriter/ItemPacketRewriter1_12.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_11_1to1_12/rewriter/ItemPacketRewriter1_12.java
@@ -45,7 +45,7 @@ public void registerPackets() {
         protocol.registerServerbound(ServerboundPackets1_12.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
@@ -58,11 +58,11 @@ public void register() {
                             handleItemToServer(wrapper.user(), item);
                             return;
                         }
-                        byte button = wrapper.get(Types.BYTE, 0);
+                        byte button = wrapper.get(Types.BYTE, 1);
                         int mode = wrapper.get(Types.VAR_INT, 0);
                         // QUICK_MOVE PATCH (Shift + (click/double click))
                         if (mode == 1 && button == 0 && item == null) {
-                            short windowId = wrapper.get(Types.UNSIGNED_BYTE, 0);
+                            short windowId = wrapper.get(Types.BYTE, 0);
                             short slotId = wrapper.get(Types.SHORT, 0);
                             short actionId = wrapper.get(Types.SHORT, 1);
                             InventoryQuickMoveProvider provider = Via.getManager().getProviders().get(InventoryQuickMoveProvider.class);
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/Protocol1_12_2To1_13.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/Protocol1_12_2To1_13.java
@@ -353,7 +353,7 @@ public void register() {
         registerClientbound(ClientboundPackets1_12_1.PLACE_GHOST_RECIPE, new PacketHandlers() {
             @Override
             public void register() {
-                map(Types.UNSIGNED_BYTE);
+                map(Types.BYTE);
                 handler(wrapper -> wrapper.write(Types.STRING, "viaversion:legacy/" + wrapper.read(Types.VAR_INT)));
             }
         });
@@ -594,7 +594,7 @@ public String transform(PacketWrapper wrapper, String inputValue) {
         registerServerbound(ServerboundPackets1_13.PLACE_RECIPE, new PacketHandlers() {
             @Override
             public void register() {
-                map(Types.UNSIGNED_BYTE); // Window id
+                map(Types.BYTE); // Window id
 
                 handler(wrapper -> {
                     String s = wrapper.read(Types.STRING);
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/rewriter/ItemPacketRewriter1_13.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_12_2to1_13/rewriter/ItemPacketRewriter1_13.java
@@ -59,7 +59,7 @@ public void registerPackets() {
         protocol.registerClientbound(ClientboundPackets1_12_1.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, Types.ITEM1_13); // 2 - Slot Value
 
@@ -185,7 +185,7 @@ public void register() {
         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/viaversion/protocols/v1_13_1to1_13_2/rewriter/ItemPacketRewriter1_13_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_1to1_13_2/rewriter/ItemPacketRewriter1_13_2.java
@@ -30,7 +30,7 @@ public static void register(Protocol1_13_1To1_13_2 protocol) {
         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, Types.ITEM1_13_2); // 2 - Slot Value
             }
@@ -116,7 +116,7 @@ public void register() {
         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/viaversion/protocols/v1_13_2to1_14/rewriter/ItemPacketRewriter1_14.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_13_2to1_14/rewriter/ItemPacketRewriter1_14.java
@@ -194,7 +194,7 @@ public void register() {
             // Selecting trade now moves the items, we need to resync the inventory
             PacketWrapper resyncPacket = wrapper.create(ServerboundPackets1_13.CONTAINER_CLICK);
             EntityTracker1_14 tracker = wrapper.user().getEntityTracker(Protocol1_13_2To1_14.class);
-            resyncPacket.write(Types.UNSIGNED_BYTE, ((short) tracker.getLatestTradeWindowId())); // 0 - Window ID
+            resyncPacket.write(Types.BYTE, ((byte) tracker.getLatestTradeWindowId())); // 0 - Window ID
             resyncPacket.write(Types.SHORT, ((short) -999)); // 1 - Slot
             resyncPacket.write(Types.BYTE, (byte) 2); // 2 - Button - End left click
             resyncPacket.write(Types.SHORT, ((short) ThreadLocalRandom.current().nextInt())); // 3 - Action number
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/rewriter/ItemPacketRewriter1_16.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_15_2to1_16/rewriter/ItemPacketRewriter1_16.java
@@ -51,7 +51,7 @@ public void registerPackets() {
         // clear cursor item to prevent client to try dropping it during navigation between multiple inventories causing arm swing
         PacketHandler cursorRemapper = wrapper -> {
             PacketWrapper clearPacket = wrapper.create(ClientboundPackets1_16.CONTAINER_SET_SLOT);
-            clearPacket.write(Types.UNSIGNED_BYTE, (short) -1);
+            clearPacket.write(Types.BYTE, (byte) -1);
             clearPacket.write(Types.SHORT, (short) -1);
             clearPacket.write(Types.ITEM1_13_2, null);
             clearPacket.send(Protocol1_15_2To1_16.class);
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_4to1_17/rewriter/ItemPacketRewriter1_17.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_16_4to1_17/rewriter/ItemPacketRewriter1_17.java
@@ -56,7 +56,7 @@ public void registerPackets() {
         protocol.registerServerbound(ServerboundPackets1_17.CONTAINER_CLICK, new PacketHandlers() {
             @Override
             public void register() {
-                map(Types.UNSIGNED_BYTE); // Window Id
+                map(Types.BYTE); // Window Id
                 map(Types.SHORT); // Slot
                 map(Types.BYTE); // Button
                 handler(wrapper -> wrapper.write(Types.SHORT, (short) 0)); // Action id - doesn't matter, as the sent out confirmation packet will be cancelled
@@ -110,10 +110,10 @@ public void register() {
             // Check extra bit for fast dismissal
             if ((id & (1 << 30)) != 0) {
                 // Decode our requested inventory acknowledgement
-                short inventoryId = (short) ((id >> 16) & 0xFF);
+                byte inventoryId = (byte) ((id >> 16) & 0xFF);
                 short confirmationId = (short) (id & 0xFFFF);
                 PacketWrapper packet = wrapper.create(ServerboundPackets1_16_2.CONTAINER_ACK);
-                packet.write(Types.UNSIGNED_BYTE, inventoryId);
+                packet.write(Types.BYTE, inventoryId);
                 packet.write(Types.SHORT, confirmationId);
                 packet.write(Types.BOOLEAN, true); // Accept
                 packet.sendToServer(Protocol1_16_4To1_17.class);
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_17to1_17_1/Protocol1_17To1_17_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_17to1_17_1/Protocol1_17To1_17_1.java
@@ -50,7 +50,7 @@ protected void registerPackets() {
         registerClientbound(ClientboundPackets1_17.CONTAINER_SET_SLOT, new PacketHandlers() {
             @Override
             public void register() {
-                map(Types.UNSIGNED_BYTE); // Container id
+                map(Types.BYTE); // Container id
                 create(Types.VAR_INT, 0); // Add arbitrary state id
             }
         });
@@ -73,7 +73,7 @@ public void register() {
         registerServerbound(ServerboundPackets1_17.CONTAINER_CLICK, new PacketHandlers() {
             @Override
             public void register() {
-                map(Types.UNSIGNED_BYTE); // Container id
+                map(Types.BYTE); // Container id
                 read(Types.VAR_INT); // Remove state id
             }
         });
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_5to1_21/rewriter/BlockItemPacketRewriter1_21.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_5to1_21/rewriter/BlockItemPacketRewriter1_21.java
@@ -78,9 +78,9 @@ public void registerPackets() {
         registerCooldown(ClientboundPackets1_20_5.COOLDOWN);
         registerSetContent1_17_1(ClientboundPackets1_20_5.CONTAINER_SET_CONTENT);
         protocol.registerClientbound(ClientboundPackets1_20_5.CONTAINER_SET_SLOT, wrapper -> {
-            final short containerId = wrapper.passthrough(Types.UNSIGNED_BYTE); // Container id
+            final byte containerId = wrapper.passthrough(Types.BYTE);
             wrapper.passthrough(Types.VAR_INT); // State id
-            final short slotId = wrapper.passthrough(Types.SHORT); // Slot id
+            final short slotId = wrapper.passthrough(Types.SHORT);
             final Item item = handleItemToClient(wrapper.user(), wrapper.read(itemType()));
             wrapper.write(mappedItemType(), item);
 
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/BlockItemPacketRewriter1_21_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/BlockItemPacketRewriter1_21_2.java
@@ -112,7 +112,7 @@ public void registerPackets() {
         });
 
         protocol.registerClientbound(ClientboundPackets1_21.CONTAINER_SET_CONTENT, wrapper -> {
-            updateContainerId(wrapper);
+            unsignedByteToVarInt(wrapper);
             wrapper.passthrough(Types.VAR_INT); // State id
             final Item[] items = wrapper.read(itemArrayType());
             wrapper.write(mappedItemArrayType(), items);
@@ -122,7 +122,7 @@ public void registerPackets() {
             passthroughClientboundItem(wrapper);
         });
         protocol.registerClientbound(ClientboundPackets1_21.CONTAINER_SET_SLOT, wrapper -> {
-            updateContainerId(wrapper);
+            byteToVarInt(wrapper);
             final int containerId = wrapper.get(Types.VAR_INT, 0);
             if (containerId == -1) { // cursor item
                 wrapper.setPacketType(ClientboundPackets1_21_2.SET_CURSOR_ITEM);
@@ -142,13 +142,13 @@ public void registerPackets() {
             }
             passthroughClientboundItem(wrapper);
         });
-        protocol.registerClientbound(ClientboundPackets1_21.CONTAINER_CLOSE, this::updateContainerId);
-        protocol.registerClientbound(ClientboundPackets1_21.CONTAINER_SET_DATA, this::updateContainerId);
-        protocol.registerClientbound(ClientboundPackets1_21.HORSE_SCREEN_OPEN, this::updateContainerId);
+        protocol.registerClientbound(ClientboundPackets1_21.CONTAINER_CLOSE, this::unsignedByteToVarInt);
+        protocol.registerClientbound(ClientboundPackets1_21.CONTAINER_SET_DATA, this::unsignedByteToVarInt);
+        protocol.registerClientbound(ClientboundPackets1_21.HORSE_SCREEN_OPEN, this::unsignedByteToVarInt);
         protocol.registerClientbound(ClientboundPackets1_21.SET_CARRIED_ITEM, ClientboundPackets1_21_2.SET_HELD_SLOT);
-        protocol.registerServerbound(ServerboundPackets1_21_2.CONTAINER_CLOSE, this::updateContainerIdServerbound);
+        protocol.registerServerbound(ServerboundPackets1_21_2.CONTAINER_CLOSE, this::varIntToByte);
         protocol.registerServerbound(ServerboundPackets1_21_2.CONTAINER_CLICK, wrapper -> {
-            updateContainerIdServerbound(wrapper);
+            varIntToByte(wrapper);
             wrapper.passthrough(Types.VAR_INT); // State id
             wrapper.passthrough(Types.SHORT); // Slot
             wrapper.passthrough(Types.BYTE); // Button
@@ -161,7 +161,7 @@ public void registerPackets() {
             passthroughServerboundItem(wrapper);
         });
         protocol.registerClientbound(ClientboundPackets1_21.PLACE_GHOST_RECIPE, wrapper -> {
-            this.updateContainerId(wrapper);
+            this.byteToVarInt(wrapper);
 
             final String recipeKey = wrapper.read(Types.STRING);
             final RecipeRewriter1_21_2.Recipe recipe = wrapper.user().get(RecipeRewriter1_21_2.class).recipe(recipeKey);
@@ -174,7 +174,7 @@ public void registerPackets() {
             recipe.writeRecipeDisplay(wrapper);
         });
         protocol.registerServerbound(ServerboundPackets1_21_2.PLACE_RECIPE, wrapper -> {
-            this.updateContainerIdServerbound(wrapper);
+            this.varIntToByte(wrapper);
             convertServerboundRecipeDisplayId(wrapper);
         });
         protocol.registerServerbound(ServerboundPackets1_21_2.RECIPE_BOOK_SEEN_RECIPE, this::convertServerboundRecipeDisplayId);
@@ -519,18 +519,19 @@ public Item handleItemToServer(final UserConnection connection, final Item item)
         return item;
     }
 
-    private void updateContainerId(final PacketWrapper wrapper) {
-        // Container id handling was always a bit whack with most reading them as unsigned bytes, some as bytes, some already as var ints.
-        // In VV, they're generally read as unsigned bytes to not have to look the type up every time, but we need to make sure they're
-        // properly converted to ints when used
+    private void unsignedByteToVarInt(final PacketWrapper wrapper) {
         final short containerId = wrapper.read(Types.UNSIGNED_BYTE);
-        final int intId = (byte) containerId;
-        wrapper.write(Types.VAR_INT, intId);
+        wrapper.write(Types.VAR_INT, (int) containerId);
     }
 
-    private void updateContainerIdServerbound(final PacketWrapper wrapper) {
+    private void byteToVarInt(final PacketWrapper wrapper) {
+        final byte containerId = wrapper.read(Types.BYTE);
+        wrapper.write(Types.VAR_INT, (int) containerId);
+    }
+
+    private void varIntToByte(final PacketWrapper wrapper) {
         final int containerId = wrapper.read(Types.VAR_INT);
-        wrapper.write(Types.UNSIGNED_BYTE, (short) containerId);
+        wrapper.write(Types.BYTE, (byte) containerId);
     }
 
     public static void updateItemData(final Item item) {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/rewriter/ItemPacketRewriter1_9.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/rewriter/ItemPacketRewriter1_9.java
@@ -106,7 +106,7 @@ public void register() {
         protocol.registerClientbound(ClientboundPackets1_8.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
                 handler(wrapper -> {
@@ -121,7 +121,7 @@ public void register() {
                         EntityTracker1_9 entityTracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class);
 
                         short slotID = wrapper.get(Types.SHORT, 0);
-                        byte windowId = wrapper.get(Types.UNSIGNED_BYTE, 0).byteValue();
+                        byte windowId = wrapper.get(Types.BYTE, 0);
 
                         // Store item in slot
                         inventoryTracker.setItemId(windowId, slotID, stack == null ? 0 : stack.identifier());
@@ -154,7 +154,7 @@ public void register() {
 
                 handler(wrapper -> {
                     Item[] stacks = wrapper.get(Types.ITEM1_8_SHORT_ARRAY, 0);
-                    Short windowId = wrapper.get(Types.UNSIGNED_BYTE, 0);
+                    short windowId = wrapper.get(Types.UNSIGNED_BYTE, 0);
 
                     InventoryTracker inventoryTracker = wrapper.user().get(InventoryTracker.class);
                     EntityTracker1_9 entityTracker = wrapper.user().getEntityTracker(Protocol1_8To1_9.class);
@@ -207,7 +207,8 @@ public void register() {
                 handler(wrapper -> {
                     InventoryTracker inventoryTracker = wrapper.user().get(InventoryTracker.class);
                     inventoryTracker.setInventory(null);
-                    inventoryTracker.resetInventory(wrapper.get(Types.UNSIGNED_BYTE, 0));
+                    short windowId = wrapper.get(Types.UNSIGNED_BYTE, 0);
+                    inventoryTracker.resetInventory(windowId);
                 });
             }
         });
@@ -245,7 +246,7 @@ public void register() {
                         short slotID = wrapper.get(Types.SHORT, 0);
 
                         // Update item in slot
-                        inventoryTracker.setItemId((short) 0, slotID, stack == null ? 0 : stack.identifier());
+                        inventoryTracker.setItemId(0, slotID, stack == null ? 0 : stack.identifier());
 
                         // Sync shield item in offhand with main hand
                         entityTracker.syncShieldWithSword();
@@ -260,7 +261,7 @@ public void register() {
                     if (throwItem) {
                         // Send a packet wiping the slot
                         wrapper.create(ClientboundPackets1_9.CONTAINER_SET_SLOT, w -> {
-                            w.write(Types.UNSIGNED_BYTE, (short) 0);
+                            w.write(Types.BYTE, (byte) 0);
                             w.write(Types.SHORT, slot);
                             w.write(Types.ITEM1_8, null);
                         }).send(Protocol1_8To1_9.class);
@@ -275,7 +276,7 @@ public void register() {
 
             @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.BYTE); // 2 - Button
                 map(Types.SHORT); // 3 - Action
@@ -285,10 +286,10 @@ public void register() {
                     Item stack = wrapper.get(Types.ITEM1_8, 0);
 
                     if (Via.getConfig().isShowShieldWhenSwordInHand()) {
-                        Short windowId = wrapper.get(Types.UNSIGNED_BYTE, 0);
-                        byte mode = wrapper.get(Types.BYTE, 1);
+                        byte windowId = wrapper.get(Types.BYTE, 0);
+                        byte mode = wrapper.get(Types.BYTE, 2);
                         short hoverSlot = wrapper.get(Types.SHORT, 0);
-                        byte button = wrapper.get(Types.BYTE, 0);
+                        byte button = wrapper.get(Types.BYTE, 1);
 
                         // Move items in inventory to track the sword location
                         InventoryTracker inventoryTracker = wrapper.user().get(InventoryTracker.class);
@@ -299,7 +300,7 @@ public void register() {
                 });
                 // Brewing patch and elytra throw patch
                 handler(wrapper -> {
-                    final short windowID = wrapper.get(Types.UNSIGNED_BYTE, 0);
+                    final byte windowID = wrapper.get(Types.BYTE, 0);
                     final short slot = wrapper.get(Types.SHORT, 0);
                     boolean throwItem = (slot == 45 && windowID == 0);
                     InventoryTracker inventoryTracker = wrapper.user().get(InventoryTracker.class);
@@ -315,7 +316,7 @@ public void register() {
                     if (throwItem) {
                         // Send a packet wiping the slot
                         wrapper.create(ClientboundPackets1_9.CONTAINER_SET_SLOT, w -> {
-                            w.write(Types.UNSIGNED_BYTE, windowID);
+                            w.write(Types.BYTE, windowID);
                             w.write(Types.SHORT, slot);
                             w.write(Types.ITEM1_8, null);
                         }).scheduleSend(Protocol1_8To1_9.class);
@@ -334,13 +335,13 @@ public void register() {
 
                 @Override
                 public void register() {
-                    map(Types.UNSIGNED_BYTE); // 0 - Window ID
+                    map(Types.BYTE); // 0 - Window ID
 
                     // Inventory tracking
                     handler(wrapper -> {
                         InventoryTracker inventoryTracker = wrapper.user().get(InventoryTracker.class);
                         inventoryTracker.setInventory(null);
-                        inventoryTracker.resetInventory(wrapper.get(Types.UNSIGNED_BYTE, 0));
+                        inventoryTracker.resetInventory(wrapper.get(Types.BYTE, 0));
                     });
                 }
             });
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/storage/EntityTracker1_9.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/storage/EntityTracker1_9.java
@@ -128,7 +128,7 @@ public boolean hasSwordInHand() {
 
         // Get item in new selected slot
         int inventorySlot = this.heldItemSlot + 36; // Hotbar slot index to inventory slot
-        int itemIdentifier = inventoryTracker.getItemId((short) 0, (short) inventorySlot);
+        int itemIdentifier = inventoryTracker.getItemId(0, (short) inventorySlot);
 
         return Protocol1_8To1_9.isSword(itemIdentifier);
     }
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/storage/InventoryTracker.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_8to1_9/storage/InventoryTracker.java
diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/ItemRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/ItemRewriter.java

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ public boolean hasSwordInHand() {`
`128`	`128`
`129`	`129`	`// Get item in new selected slot`
`130`	`130`	`int inventorySlot = this.heldItemSlot + 36; // Hotbar slot index to inventory slot`
`131`		`- int itemIdentifier = inventoryTracker.getItemId((short) 0, (short) inventorySlot);`
	`131`	`+ int itemIdentifier = inventoryTracker.getItemId(0, (short) inventorySlot);`
`132`	`132`
`133`	`133`	`return Protocol1_8To1_9.isSword(itemIdentifier);`
`134`	`134`	`}`