From ba2e50cc880258533294f36117255f00f137e058 Mon Sep 17 00:00:00 2001
From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com>
Date: Mon, 8 Apr 2024 13:31:13 +0200
Subject: [PATCH] Fix StructuredDataConverter#removeItemBackupTag

---
 .../BlockItemPacketRewriter1_20_5.java         |  6 +++---
 .../rewriter/StructuredDataConverter.java      | 18 +++++++++++-------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
index 1b75e8ec9..060e115b6 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/BlockItemPacketRewriter1_20_5.java
@@ -851,7 +851,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
                 return;
             }
 
-            final int ingredientId = StructuredDataConverter.getBackupItemId(materialCompoundTag, toMappedItemId(ingredientTag.getValue()));
+            final int ingredientId = StructuredDataConverter.removeItemBackupTag(materialCompoundTag, toMappedItemId(ingredientTag.getValue()));
             if (ingredientId == -1) {
                 return;
             }
@@ -900,7 +900,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
                 return;
             }
 
-            final int templateItemId = StructuredDataConverter.getBackupItemId(patternCompoundTag, toMappedItemId(templateItem));
+            final int templateItemId = StructuredDataConverter.removeItemBackupTag(patternCompoundTag, toMappedItemId(templateItem));
             if (templateItemId == -1) {
                 return;
             }
@@ -1085,7 +1085,7 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
             return null;
         }
 
-        final int itemId = StructuredDataConverter.getBackupItemId(item, unmappedItemId(id));
+        final int itemId = StructuredDataConverter.removeItemBackupTag(item, unmappedItemId(id));
         if (itemId == -1) {
             return null;
         }
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/StructuredDataConverter.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/StructuredDataConverter.java
index 6128b05d9..995018733 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/StructuredDataConverter.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_5to1_20_3/rewriter/StructuredDataConverter.java
@@ -81,7 +81,7 @@ public final class StructuredDataConverter {
 
     // Can't do nicely
     private static final String BACKUP_TAG_KEY = "VV|DataComponents";
-    private static final String ITEM_TAG_KEY = "VV|id";
+    private static final String ITEM_BACKUP_TAG_KEY = "VV|id";
 
     private final Map<StructuredDataKey<?>, DataConverter<?>> rewriters = new Reference2ObjectOpenHashMap<>();
 
@@ -461,7 +461,7 @@ public final class StructuredDataConverter {
 
                 final String ingredientName = toMappedItemName(material.itemId());
                 if (ingredientName.isEmpty()) {
-                    getBackupTag(materialTag).putInt(ITEM_TAG_KEY, material.itemId());
+                    getBackupTag(materialTag).putInt(ITEM_BACKUP_TAG_KEY, material.itemId());
                 }
                 materialTag.putString("ingredient", ingredientName);
                 materialTag.put("item_model_index", new FloatTag(material.itemModelIndex()));
@@ -487,7 +487,7 @@ public final class StructuredDataConverter {
                 patternTag.putString("assetId", pattern.assetName());
                 final String itemName = toMappedItemName(pattern.itemId());
                 if (itemName.isEmpty()) {
-                    getBackupTag(patternTag).putInt(ITEM_TAG_KEY, pattern.itemId());
+                    getBackupTag(patternTag).putInt(ITEM_BACKUP_TAG_KEY, pattern.itemId());
                 }
                 patternTag.putString("templateItem", itemName);
                 patternTag.put("description", pattern.description());
@@ -642,12 +642,16 @@ public final class StructuredDataConverter {
         return backupTag;
     }
 
-    static int getBackupItemId(final CompoundTag tag, final int unmappedId) {
+    static int removeItemBackupTag(final CompoundTag tag, final int unmappedId) {
         if (unmappedId != -1) {
             return unmappedId;
         }
-        final IntTag itemIdTag = tag.getIntTag(ITEM_TAG_KEY);
-        return itemIdTag != null ? itemIdTag.getTagId() : -1;
+        final IntTag itemBackupTag = tag.getIntTag(ITEM_BACKUP_TAG_KEY);
+        if (itemBackupTag != null) {
+            tag.remove(ITEM_BACKUP_TAG_KEY);
+            return itemBackupTag.asInt();
+        }
+        return -1;
     }
 
     private void convertBlockPredicates(final CompoundTag tag, final AdventureModePredicate data, final String key, final int hideFlag) {
@@ -727,7 +731,7 @@ public final class StructuredDataConverter {
             final String name = toMappedItemName(item.identifier());
             savedItem.putString("id", name);
             if (name.isEmpty()) {
-                savedItem.putInt(ITEM_TAG_KEY, item.identifier());
+                savedItem.putInt(ITEM_BACKUP_TAG_KEY, item.identifier());
             }
             savedItem.putByte("Count", (byte) item.amount());