From bb927b31f719ae1599e20b36dda37c61bd9e6be4 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Fri, 14 Jun 2024 00:58:32 +0200
Subject: [PATCH] Some fixups Informative commit message I know

---
 .../api/rewriters/BackwardsStructuredItemRewriter.java      | 6 +++---
 .../rewriter/BlockItemPacketRewriter1_20_5.java             | 6 ++++++
 .../v1_21to1_20_5/rewriter/BlockItemPacketRewriter1_21.java | 3 ---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/BackwardsStructuredItemRewriter.java b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/BackwardsStructuredItemRewriter.java
index 9b24c27f..fe65e04a 100644
--- a/common/src/main/java/com/viaversion/viabackwards/api/rewriters/BackwardsStructuredItemRewriter.java
+++ b/common/src/main/java/com/viaversion/viabackwards/api/rewriters/BackwardsStructuredItemRewriter.java
@@ -90,7 +90,7 @@ public class BackwardsStructuredItemRewriter<C extends ClientboundPacketType, S
                 item.setIdentifier(mappingData.getNewItemId(item.identifier()));
             }
 
-            updateItemComponents(connection, dataContainer, this::handleItemToClient, mappingData != null ? mappingData::getNewItemId : null);
+            updateItemComponents(connection, dataContainer, this::handleItemToClient, mappingData != null ? mappingData::getNewItemId : null, mappingData != null ? mappingData::getNewBlockId : null);
             return item;
         }
 
@@ -110,7 +110,7 @@ public class BackwardsStructuredItemRewriter<C extends ClientboundPacketType, S
             tag.putBoolean(nbtTagName("customName"), true);
         }
 
-        updateItemComponents(connection, dataContainer, this::handleItemToClient, mappingData::getNewItemId);
+        updateItemComponents(connection, dataContainer, this::handleItemToClient, mappingData::getNewItemId, mappingData::getNewBlockId);
         return item;
     }
 
@@ -144,7 +144,7 @@ public class BackwardsStructuredItemRewriter<C extends ClientboundPacketType, S
         }
 
         restoreTextComponents(item);
-        updateItemComponents(connection, dataContainer, this::handleItemToServer, mappingData != null ? mappingData::getOldItemId : null);
+        updateItemComponents(connection, dataContainer, this::handleItemToServer, mappingData != null ? mappingData::getOldItemId : null, mappingData != null ? mappingData::getOldBlockId : null);
         return item;
     }
 
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
index e6820aa4..642690e0 100644
--- 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
@@ -40,6 +40,7 @@ import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.api.type.types.chunk.ChunkType1_20_2;
 import com.viaversion.viaversion.api.type.types.version.Types1_20_3;
 import com.viaversion.viaversion.api.type.types.version.Types1_20_5;
+import com.viaversion.viaversion.libs.fastutil.ints.Int2IntFunction;
 import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ServerboundPacket1_20_3;
 import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.packet.ServerboundPackets1_20_3;
 import com.viaversion.viaversion.protocols.v1_20_2to1_20_3.rewriter.RecipeRewriter1_20_3;
@@ -353,6 +354,11 @@ public final class BlockItemPacketRewriter1_20_5 extends BackwardsStructuredItem
         return oldItem;
     }
 
+    @Override
+    protected void updateItemComponents(final UserConnection connection, final StructuredDataContainer container, final ItemHandler itemHandler, @Nullable final Int2IntFunction idRewriter, @Nullable final Int2IntFunction blockIdRewriter) {
+        // Items and data within components are handled in this protocol
+    }
+
     @Override
     public Item handleItemToServer(final UserConnection connection, @Nullable final Item item) {
         if (item == null) {
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
index 70228869..3687f7e1 100644
--- 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
@@ -127,7 +127,6 @@ public final class BlockItemPacketRewriter1_21 extends BackwardsStructuredItemRe
 
         final StructuredDataContainer data = item.dataContainer();
         data.setIdLookup(protocol, true);
-        data.replaceKey(StructuredDataKey.FOOD1_21, StructuredDataKey.FOOD1_20_5);
 
         // Enchantments
         final EnchantmentsPaintingsStorage storage = connection.get(EnchantmentsPaintingsStorage.class);
@@ -163,8 +162,6 @@ public final class BlockItemPacketRewriter1_21 extends BackwardsStructuredItemRe
         final StructuredDataContainer dataContainer = item.dataContainer();
         dataContainer.setIdLookup(protocol, false);
 
-        dataContainer.replaceKey(StructuredDataKey.FOOD1_20_5, StructuredDataKey.FOOD1_21);
-
         // Rewrite enchantments
         final EnchantmentsPaintingsStorage storage = connection.get(EnchantmentsPaintingsStorage.class);
         rewriteEnchantmentToServer(storage, item, StructuredDataKey.ENCHANTMENTS);