Reassign item on handleItemToClient calls

kennytv · kennytv · commit be5344b3e4c6 · 2025-08-22T20:10:10.000+02:00
Needed in rewriters before 1.20 with a recent change; the rest weren't technically necessary
diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/BackwardsItemRewriter.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/BackwardsItemRewriter.java
@@ -132,7 +132,7 @@ public BackwardsItemRewriter(T protocol, Type<Item> itemType, Type<Item[]> itemA
     public @Nullable Item handleItemToServer(UserConnection connection, @Nullable Item item) {
         if (item == null) return null;
 
-        super.handleItemToServer(connection, item);
+        item = super.handleItemToServer(connection, item);
         if (item.tag() != null) {
             Tag originalId = item.tag().remove(nbtTagName("id"));
             if (originalId instanceof IntTag) {
diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/BackwardsItemRewriterBase.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/BackwardsItemRewriterBase.java
@@ -47,7 +47,7 @@ protected BackwardsItemRewriterBase(T protocol, Type<Item> itemType, Type<Item[]
     @Override
     public @Nullable Item handleItemToServer(UserConnection connection, @Nullable Item item) {
         if (item == null) return null;
-        super.handleItemToServer(connection, item);
+        item = super.handleItemToServer(connection, item);
 
         restoreDisplayTag(item);
         return item;
diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/LegacyBlockItemRewriter.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/LegacyBlockItemRewriter.java
@@ -208,9 +208,9 @@ public void register() {
     }
 
     @Override
-    public @Nullable Item handleItemToServer(UserConnection connection, @Nullable final Item item) {
+    public @Nullable Item handleItemToServer(UserConnection connection, @Nullable Item item) {
         if (item == null) return null;
-        super.handleItemToServer(connection, item);
+        item = super.handleItemToServer(connection, item);
         if (item.tag() != null) {
             Tag originalId = item.tag().remove(nbtTagName("id"));
             if (originalId instanceof IntTag) {
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_11_1to1_11/rewriter/ItemPacketRewriter1_11_1.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_11_1to1_11/rewriter/ItemPacketRewriter1_11_1.java
@@ -71,7 +71,7 @@ public Item handleItemToClient(UserConnection connection, Item item) {
     @Override
     public Item handleItemToServer(UserConnection connection, Item item) {
         if (item == null) return null;
-        super.handleItemToServer(connection, item);
+        item = super.handleItemToServer(connection, item);
 
         enchantmentRewriter.handleToServer(item);
         return item;
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
@@ -280,7 +280,7 @@ public Item handleItemToClient(UserConnection connection, Item item) {
     @Override
     public Item handleItemToServer(UserConnection connection, Item item) {
         if (item == null) return null;
-        super.handleItemToServer(connection, item);
+        item = super.handleItemToServer(connection, item);
 
         CompoundTag tag = item.tag();
         if (tag == null) return item;
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
@@ -238,7 +238,7 @@ private boolean handleNbtToClient(CompoundTag compoundTag, CompoundTag backupTag
     @Override
     public @Nullable Item handleItemToServer(UserConnection connection, Item item) {
         if (item == null) return null;
-        super.handleItemToServer(connection, item);
+        item = super.handleItemToServer(connection, item);
 
         if (item.tag() != null) {
             if (item.tag().remove("Via|LongArrayTags") instanceof CompoundTag tag) {
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_13_1to1_13/Protocol1_13_1To1_13.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_13_1to1_13/Protocol1_13_1To1_13.java
@@ -90,16 +90,11 @@ public String transform(PacketWrapper wrapper, String inputValue) {
             }
         });
 
-        registerServerbound(ServerboundPackets1_13.EDIT_BOOK, new PacketHandlers() {
-            @Override
-            public void register() {
-                map(Types.ITEM1_13);
-                map(Types.BOOLEAN);
-                handler(wrapper -> {
-                    itemRewriter.handleItemToServer(wrapper.user(), wrapper.get(Types.ITEM1_13, 0));
-                    wrapper.write(Types.VAR_INT, 0);
-                });
-            }
+        registerServerbound(ServerboundPackets1_13.EDIT_BOOK, wrapper -> {
+            final Item item = itemRewriter.handleItemToServer(wrapper.user(), wrapper.read(Types.ITEM1_13));
+            wrapper.write(Types.ITEM1_13, item);
+            wrapper.passthrough(Types.BOOLEAN);
+            wrapper.write(Types.VAR_INT, 0);
         });
 
         registerClientbound(ClientboundPackets1_13.OPEN_SCREEN, new PacketHandlers() {
@@ -181,8 +176,8 @@ public void register() {
                 if (wrapper.passthrough(Types.BOOLEAN)) {
                     wrapper.passthrough(Types.COMPONENT); // Title
                     wrapper.passthrough(Types.COMPONENT); // Description
-                    Item icon = wrapper.passthrough(Types.ITEM1_13);
-                    itemRewriter.handleItemToClient(wrapper.user(), icon);
+                    Item icon = itemRewriter.handleItemToClient(wrapper.user(), wrapper.read(Types.ITEM1_13));
+                    wrapper.write(Types.ITEM1_13, icon);
                     wrapper.passthrough(Types.VAR_INT); // Frame type
                     int flags = wrapper.passthrough(Types.INT); // Flags
                     if ((flags & 1) != 0)
@@ -201,7 +196,9 @@ public void register() {
         });
 
         tagRewriter.register(ClientboundPackets1_13.UPDATE_TAGS, RegistryType.ITEM);
-        new StatisticsRewriter<>(this).register(ClientboundPackets1_13.AWARD_STATS);
+        new StatisticsRewriter<>(this).
+
+            register(ClientboundPackets1_13.AWARD_STATS);
     }
 
     @Override
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_13_1to1_13/rewriter/ItemPacketRewriter1_13_1.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_13_1to1_13/rewriter/ItemPacketRewriter1_13_1.java
@@ -43,18 +43,12 @@ public void registerPackets() {
 
                 int size = wrapper.passthrough(Types.UNSIGNED_BYTE);
                 for (int i = 0; i < size; i++) {
-                    //Input Item
-                    Item input = wrapper.passthrough(Types.ITEM1_13);
-                    handleItemToClient(wrapper.user(), input);
-                    //Output Item
-                    Item output = wrapper.passthrough(Types.ITEM1_13);
-                    handleItemToClient(wrapper.user(), output);
+                    passthroughClientboundItem(wrapper); // Input
+                    passthroughClientboundItem(wrapper); // Output
 
                     boolean secondItem = wrapper.passthrough(Types.BOOLEAN); //Has second item
                     if (secondItem) {
-                        //Second Item
-                        Item second = wrapper.passthrough(Types.ITEM1_13);
-                        handleItemToClient(wrapper.user(), second);
+                        passthroughClientboundItem(wrapper); // Second item
                     }
 
                     wrapper.passthrough(Types.BOOLEAN); //Trade disabled
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
@@ -260,8 +260,8 @@ public void register() {
 
                 handler(wrapper -> {
                     final Item[] items = wrapper.get(Types.ITEM1_8_SHORT_ARRAY, 0);
-                    for (Item item : items) {
-                        handleItemToClient(wrapper.user(), item);
+                    for (int i = 0; i < items.length; i++) {
+                        items[i] = handleItemToClient(wrapper.user(), items[i]);
                     }
                 });
             }
@@ -272,9 +272,7 @@ public void register() {
             public void register() {
                 map(Types.BYTE);
                 map(Types.SHORT);
-                map(Types.ITEM1_13, Types.ITEM1_8);
-
-                handler(wrapper -> handleItemToClient(wrapper.user(), wrapper.get(Types.ITEM1_8, 0)));
+                handler(wrapper -> passthroughClientboundItem(wrapper));
             }
         });
 
@@ -427,9 +425,7 @@ public void register() {
             public void register() {
                 map(Types.VAR_INT);
                 map(Types.VAR_INT);
-                map(Types.ITEM1_13, Types.ITEM1_8);
-
-                handler(wrapper -> handleItemToClient(wrapper.user(), wrapper.get(Types.ITEM1_8, 0)));
+                handler(wrapper -> passthroughClientboundItem(wrapper));
             }
         });
 
@@ -505,7 +501,7 @@ public Item handleItemToClient(UserConnection connection, Item item) {
 
         if (rawId == null) {
             // Look for custom mappings
-            super.handleItemToClient(connection, item);
+            item = super.handleItemToClient(connection, item);
 
             // Handle one-way special case
             if (item.identifier() == -1) {
@@ -798,7 +794,7 @@ public Item handleItemToServer(UserConnection connection, Item item) {
         // Handle custom mappings
         int identifier = item.identifier();
         item.setIdentifier(rawId);
-        super.handleItemToServer(connection, item);
+        item = super.handleItemToServer(connection, item);
 
         // Mapped with original data, we can return here
         if (item.identifier() != rawId && item.identifier() != -1) return item;
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_14to1_13_2/rewriter/BlockItemPacketRewriter1_14.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_14to1_13_2/rewriter/BlockItemPacketRewriter1_14.java
@@ -223,9 +223,8 @@ protected void registerPackets() {
             public void register() {
                 map(Types.VAR_INT); // 0 - Entity ID
                 map(Types.VAR_INT); // 1 - Slot ID
-                map(Types.ITEM1_13_2); // 2 - Item
 
-                handler(wrapper -> handleItemToClient(wrapper.user(), wrapper.get(Types.ITEM1_13_2, 0)));
+                handler(wrapper -> passthroughClientboundItem(wrapper));
 
                 handler(wrapper -> {
                     int entityId = wrapper.get(Types.VAR_INT, 0);
@@ -460,7 +459,7 @@ protected void registerRewrites() {
     @Override
     public Item handleItemToClient(UserConnection connection, Item item) {
         if (item == null) return null;
-        super.handleItemToClient(connection, item);
+        item = super.handleItemToClient(connection, item);
 
         // Lore now uses JSON
         final CompoundTag display = item.tag() != null ? item.tag().getCompoundTag("display") : null;
@@ -516,7 +515,7 @@ public Item handleItemToServer(UserConnection connection, Item item) {
         enchantmentRewriter.handleToServer(item);
 
         // Call this last to check for the backup lore above
-        super.handleItemToServer(connection, item);
+        item = super.handleItemToServer(connection, item);
         return item;
     }
 }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_16to1_15_2/rewriter/BlockItemPacketRewriter1_16.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_16to1_15_2/rewriter/BlockItemPacketRewriter1_16.java
@@ -262,7 +262,7 @@ protected void registerRewrites() {
     public Item handleItemToClient(UserConnection connection, Item item) {
         if (item == null) return null;
 
-        super.handleItemToClient(connection, item);
+        item = super.handleItemToClient(connection, item);
 
         CompoundTag tag = item.tag();
         if (item.identifier() == 771 && tag != null) {
@@ -297,7 +297,7 @@ public Item handleItemToServer(UserConnection connection, Item item) {
         if (item == null) return null;
 
         int identifier = item.identifier();
-        super.handleItemToServer(connection, item);
+        item = super.handleItemToServer(connection, item);
 
         CompoundTag tag = item.tag();
         if (identifier == 771 && tag != null) {
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_18to1_17_1/rewriter/BlockItemPacketRewriter1_18.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_18to1_17_1/rewriter/BlockItemPacketRewriter1_18.java
@@ -112,7 +112,7 @@ public void register() {
                         int data = wrapper.passthrough(Types.VAR_INT);
                         wrapper.set(Types.VAR_INT, 0, protocol.getMappingData().getNewBlockStateId(data));
                     } else if (mappings.isItemParticle(id)) {
-                        handleItemToClient(wrapper.user(), wrapper.passthrough(Types.ITEM1_13_2));
+                        passthroughClientboundItem(wrapper);
                     }
 
                     int newId = protocol.getMappingData().getNewParticleId(id);
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_3to1_19_1/rewriter/BlockItemPacketRewriter1_19_3.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19_3to1_19_1/rewriter/BlockItemPacketRewriter1_19_3.java
@@ -77,32 +77,32 @@ public void register() {
                         final int ingredients = wrapper.passthrough(Types.VAR_INT);
                         for (int j = 0; j < ingredients; j++) {
                             final Item[] items = wrapper.passthrough(Types.ITEM1_13_2_ARRAY); // Ingredients
-                            for (final Item item : items) {
-                                handleItemToClient(wrapper.user(), item);
+                            for (int k = 0; k < items.length; k++) {
+                                items[k] = handleItemToClient(wrapper.user(), items[k]);
                             }
                         }
-                        handleItemToClient(wrapper.user(), wrapper.passthrough(Types.ITEM1_13_2)); // Result
+                        passthroughClientboundItem(wrapper); // Result
                     }
                     case "crafting_shaped" -> {
                         final int ingredients = wrapper.passthrough(Types.VAR_INT) * wrapper.passthrough(Types.VAR_INT);
                         wrapper.passthrough(Types.STRING); // Group
                         wrapper.read(Types.VAR_INT); // Crafting book category
                         for (int j = 0; j < ingredients; j++) {
                             final Item[] items = wrapper.passthrough(Types.ITEM1_13_2_ARRAY); // Ingredients
-                            for (final Item item : items) {
-                                handleItemToClient(wrapper.user(), item);
+                            for (int k = 0; k < items.length; k++) {
+                                items[k] = handleItemToClient(wrapper.user(), items[k]);
                             }
                         }
-                        handleItemToClient(wrapper.user(), wrapper.passthrough(Types.ITEM1_13_2)); // Result
+                        passthroughClientboundItem(wrapper); // Result
                     }
                     case "smelting", "campfire_cooking", "blasting", "smoking" -> {
                         wrapper.passthrough(Types.STRING); // Group
                         wrapper.read(Types.VAR_INT); // Crafting book category
                         final Item[] items = wrapper.passthrough(Types.ITEM1_13_2_ARRAY); // Ingredients
-                        for (final Item item : items) {
-                            handleItemToClient(wrapper.user(), item);
+                        for (int j = 0; j < items.length; j++) {
+                            items[j] = handleItemToClient(wrapper.user(), items[j]);
                         }
-                        handleItemToClient(wrapper.user(), wrapper.passthrough(Types.ITEM1_13_2)); // Result
+                        passthroughClientboundItem(wrapper); // Result
                         wrapper.passthrough(Types.FLOAT); // EXP
                         wrapper.passthrough(Types.VAR_INT); // Cooking time
                     }
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19to1_18_2/rewriter/BlockItemPacketRewriter1_19.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_19to1_18_2/rewriter/BlockItemPacketRewriter1_19.java
@@ -77,12 +77,12 @@ public void register() {
                     final int size = wrapper.read(Types.VAR_INT);
                     wrapper.write(Types.UNSIGNED_BYTE, (short) size);
                     for (int i = 0; i < size; i++) {
-                        handleItemToClient(wrapper.user(), wrapper.passthrough(Types.ITEM1_13_2)); // First item
-                        handleItemToClient(wrapper.user(), wrapper.passthrough(Types.ITEM1_13_2)); // Result
+                        passthroughClientboundItem(wrapper); // First item
+                        passthroughClientboundItem(wrapper); // Result
 
-                        final Item secondItem = wrapper.read(Types.ITEM1_13_2);
+                        Item secondItem = wrapper.read(Types.ITEM1_13_2);
                         if (secondItem != null) {
-                            handleItemToClient(wrapper.user(), secondItem);
+                            secondItem = handleItemToClient(wrapper.user(), secondItem);
                             wrapper.write(Types.BOOLEAN, true);
                             wrapper.write(Types.ITEM1_13_2, secondItem);
                         } else {
@@ -217,11 +217,11 @@ protected void registerRewrites() {
     }
 
     @Override
-    public Item handleItemToClient(final UserConnection connection, final Item item) {
+    public Item handleItemToClient(final UserConnection connection, Item item) {
         if (item == null) return null;
 
         final int identifier = item.identifier();
-        super.handleItemToClient(connection, item);
+        item = super.handleItemToClient(connection, item);
 
         if (identifier != 834) {
             return item;
@@ -246,10 +246,10 @@ public Item handleItemToClient(final UserConnection connection, final Item item)
     }
 
     @Override
-    public Item handleItemToServer(final UserConnection connection, final Item item) {
+    public Item handleItemToServer(final UserConnection connection, Item item) {
         if (item == null) return null;
 
-        super.handleItemToServer(connection, item);
+        item = super.handleItemToServer(connection, item);
 
         CompoundTag tag = item.tag();
         if (item.identifier() == 834 && tag != null) {
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_2to1_20/rewriter/BlockItemPacketRewriter1_20_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_2to1_20/rewriter/BlockItemPacketRewriter1_20_2.java
@@ -161,7 +161,7 @@ public void registerPackets() {
                 if (wrapper.passthrough(Types.BOOLEAN)) {
                     wrapper.passthrough(Types.COMPONENT); // Title
                     wrapper.passthrough(Types.COMPONENT); // Description
-                    wrapper.write(Types.ITEM1_13_2, handleItemToClient(wrapper.user(), wrapper.read(Types.ITEM1_20_2))); // Icon
+                    passthroughClientboundItem(wrapper); // Icon
                     wrapper.passthrough(Types.VAR_INT); // Frame type
                     final int flags = wrapper.passthrough(Types.INT); // Flags
                     if ((flags & 1) != 0) {
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_3to1_20_2/Protocol1_20_3To1_20_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_3to1_20_2/Protocol1_20_3To1_20_2.java
@@ -29,6 +29,7 @@
 import com.viaversion.viaversion.api.connection.UserConnection;
 import com.viaversion.viaversion.api.minecraft.BlockPosition;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_20_3;
+import com.viaversion.viaversion.api.minecraft.item.Item;
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.packet.provider.PacketTypesProvider;
 import com.viaversion.viaversion.api.protocol.packet.provider.SimplePacketTypesProvider;
@@ -151,7 +152,8 @@ public void handleArgument(final PacketWrapper wrapper, final String argumentTyp
                 if (wrapper.passthrough(Types.BOOLEAN)) {
                     convertComponent(wrapper); // Title
                     convertComponent(wrapper); // Description
-                    itemRewriter.handleItemToClient(wrapper.user(), wrapper.passthrough(Types.ITEM1_20_2)); // Icon
+                    final Item icon = itemRewriter.handleItemToClient(wrapper.user(), wrapper.read(Types.ITEM1_20_2));
+                    wrapper.write(Types.ITEM1_20_2, icon);
                     wrapper.passthrough(Types.VAR_INT); // Frame type
                     final int flags = wrapper.passthrough(Types.INT);
                     if ((flags & 1) != 0) {
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
@@ -348,7 +348,7 @@ private static int colorId(final String color) {
     }
 
     @Override
-    public @Nullable Item handleItemToClient(final UserConnection connection, final Item item) {
+    public @Nullable Item handleItemToClient(final UserConnection connection, Item item) {
         if (item.isEmpty()) {
             // Back to null for the older protocols
             return null;
@@ -358,7 +358,7 @@ private static int colorId(final String color) {
         item.dataContainer().setIdLookup(protocol, true);
         enchantmentRewriter.handleToClient(item);
 
-        super.handleItemToClient(connection, item);
+        item = super.handleItemToClient(connection, item);
 
         // Text components since we skip the usual rewrite method
         updateTextComponent(connection, item, StructuredDataKey.ITEM_NAME, "item_name");
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20to1_19_4/rewriter/BlockItemPacketRewriter1_20.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_20to1_19_4/rewriter/BlockItemPacketRewriter1_20.java
@@ -112,7 +112,7 @@ public void register() {
                 if (wrapper.passthrough(Types.BOOLEAN)) {
                     wrapper.passthrough(Types.COMPONENT); // Title
                     wrapper.passthrough(Types.COMPONENT); // Description
-                    handleItemToClient(wrapper.user(), wrapper.passthrough(Types.ITEM1_13_2)); // Icon
+                    passthroughClientboundItem(wrapper); // Icon
                     wrapper.passthrough(Types.VAR_INT); // Frame type
                     int flags = wrapper.passthrough(Types.INT); // Flags
                     if ((flags & 1) != 0) {
@@ -153,12 +153,12 @@ public void register() {
     }
 
     @Override
-    public @Nullable Item handleItemToClient(UserConnection connection, @Nullable final Item item) {
+    public @Nullable Item handleItemToClient(UserConnection connection, @Nullable Item item) {
         if (item == null) {
             return null;
         }
 
-        super.handleItemToClient(connection, item);
+        item = super.handleItemToClient(connection, item);
 
         // Remove new trim tags
         final CompoundTag trimTag;
@@ -177,12 +177,12 @@ public void register() {
     }
 
     @Override
-    public @Nullable Item handleItemToServer(UserConnection connection, @Nullable final Item item) {
+    public @Nullable Item handleItemToServer(UserConnection connection, @Nullable Item item) {
         if (item == null) {
             return null;
         }
 
-        super.handleItemToServer(connection, item);
+        item = super.handleItemToServer(connection, item);
 
         // Add back original trim tag
         final Tag trimTag;
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/BlockItemPacketRewriter1_21_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/rewriter/BlockItemPacketRewriter1_21_2.java
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/storage/RecipeStorage.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_2to1_21/storage/RecipeStorage.java
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_4to1_21_2/rewriter/BlockItemPacketRewriter1_21_4.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21_4to1_21_2/rewriter/BlockItemPacketRewriter1_21_4.java
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21to1_20_5/rewriter/BlockItemPacketRewriter1_21.java b/common/src/main/java/com/viaversion/viabackwards/protocol/v1_21to1_20_5/rewriter/BlockItemPacketRewriter1_21.java
