From 6002c9c7a167df137fb802bbbe7a38bc84de7fdb Mon Sep 17 00:00:00 2001
From: chris <github@onechris.mozmail.com>
Date: Wed, 31 Jul 2024 21:22:22 +0200
Subject: [PATCH] Only add a tag to the bedrock item if it is needed (#4925)

---
 .../java/JavaUpdateRecipesTranslator.java     | 35 ++++++++++++++-----
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaUpdateRecipesTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaUpdateRecipesTranslator.java
index 7c36c505b..689e0448a 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaUpdateRecipesTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/JavaUpdateRecipesTranslator.java
@@ -49,6 +49,8 @@ import org.geysermc.geyser.inventory.recipe.GeyserShapedRecipe;
 import org.geysermc.geyser.inventory.recipe.GeyserShapelessRecipe;
 import org.geysermc.geyser.inventory.recipe.GeyserStonecutterData;
 import org.geysermc.geyser.inventory.recipe.TrimRecipe;
+import org.geysermc.geyser.item.type.BedrockRequiresTagItem;
+import org.geysermc.geyser.item.type.Item;
 import org.geysermc.geyser.registry.Registries;
 import org.geysermc.geyser.registry.type.ItemMapping;
 import org.geysermc.geyser.session.GeyserSession;
@@ -443,13 +445,18 @@ public class JavaUpdateRecipesTranslator extends PacketTranslator<ClientboundUpd
         }
 
         List<String> translateShulkerBoxRecipe(GeyserShapelessRecipe recipe) {
-            ItemData output = ItemTranslator.translateToBedrock(session, recipe.result());
+            ItemStack result = recipe.result();
+            ItemData output = ItemTranslator.translateToBedrock(session, result);
             if (!output.isValid()) {
                 // Likely modded item that Bedrock will complain about if it persists
                 return null;
             }
-            // Strip NBT - tools won't appear in the recipe book otherwise
-            // output = output.toBuilder().tag(null).build(); // TODO confirm???
+
+            Item javaItem = Registries.JAVA_ITEMS.get(result.getId());
+            if (!(javaItem instanceof BedrockRequiresTagItem)) {
+                // Strip NBT - tools won't appear in the recipe book otherwise
+                output = output.toBuilder().tag(null).build();
+            }
             ItemDescriptorWithCount[][] inputCombinations = combinations(session, recipe.ingredients());
             if (inputCombinations == null) {
                 return null;
@@ -467,13 +474,18 @@ public class JavaUpdateRecipesTranslator extends PacketTranslator<ClientboundUpd
         }
 
         List<String> translateShapelessRecipe(GeyserShapelessRecipe recipe) {
-            ItemData output = ItemTranslator.translateToBedrock(session, recipe.result());
+            ItemStack result = recipe.result();
+            ItemData output = ItemTranslator.translateToBedrock(session, result);
             if (!output.isValid()) {
                 // Likely modded item that Bedrock will complain about if it persists
                 return null;
             }
-            // Strip NBT - tools won't appear in the recipe book otherwise
-            //output = output.toBuilder().tag(null).build(); // TODO confirm this is still true???
+
+            Item javaItem = Registries.JAVA_ITEMS.get(result.getId());
+            if (!(javaItem instanceof BedrockRequiresTagItem)) {
+                // Strip NBT - tools won't appear in the recipe book otherwise
+                output = output.toBuilder().tag(null).build();
+            }
             ItemDescriptorWithCount[][] inputCombinations = combinations(session, recipe.ingredients());
             if (inputCombinations == null) {
                 return null;
@@ -491,13 +503,18 @@ public class JavaUpdateRecipesTranslator extends PacketTranslator<ClientboundUpd
         }
 
         List<String> translateShapedRecipe(GeyserShapedRecipe recipe) {
-            ItemData output = ItemTranslator.translateToBedrock(session, recipe.result());
+            ItemStack result = recipe.result();
+            ItemData output = ItemTranslator.translateToBedrock(session, result);
             if (!output.isValid()) {
                 // Likely modded item that Bedrock will complain about if it persists
                 return null;
             }
-            // See above
-            //output = output.toBuilder().tag(null).build();
+
+            Item javaItem = Registries.JAVA_ITEMS.get(result.getId());
+            if (!(javaItem instanceof BedrockRequiresTagItem)) {
+                // Strip NBT - tools won't appear in the recipe book otherwise
+                output = output.toBuilder().tag(null).build();
+            }
             ItemDescriptorWithCount[][] inputCombinations = combinations(session, recipe.ingredients());
             if (inputCombinations == null) {
                 return null;