From fd58c729d839073c193d7c2af663a1968dad52ab Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Mon, 11 Nov 2024 20:11:03 -0500
Subject: [PATCH] Fix smithing recipes on 1.21.1

---
 .../inventory/JavaContainerSetContentTranslator.java | 12 ++++++++++++
 .../inventory/JavaContainerSetSlotTranslator.java    |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaContainerSetContentTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaContainerSetContentTranslator.java
index 36d382d69..f2445856d 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaContainerSetContentTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaContainerSetContentTranslator.java
@@ -31,6 +31,7 @@ import org.geysermc.geyser.inventory.Inventory;
 import org.geysermc.geyser.session.GeyserSession;
 import org.geysermc.geyser.translator.inventory.InventoryTranslator;
 import org.geysermc.geyser.translator.inventory.PlayerInventoryTranslator;
+import org.geysermc.geyser.translator.inventory.SmithingInventoryTranslator;
 import org.geysermc.geyser.translator.protocol.PacketTranslator;
 import org.geysermc.geyser.translator.protocol.Translator;
 import org.geysermc.geyser.util.InventoryUtils;
@@ -74,6 +75,17 @@ public class JavaContainerSetContentTranslator extends PacketTranslator<Clientbo
 
         session.getPlayerInventory().setCursor(GeyserItemStack.from(packet.getCarriedItem()), session);
         InventoryUtils.updateCursor(session);
+
+        if (session.getInventoryTranslator() instanceof SmithingInventoryTranslator) {
+            // On 1.21.1, the recipe output is sometimes only updated here.
+            // This can be replicated with shift-clicking the last item into the smithing table.
+            // It seems that something in Via 5.1.1 causes 1.21.3 clients - even Java ones -
+            // to make the server send a slot update.
+            // That plus shift-clicking means that the state ID becomes outdated and forces
+            // a complete inventory update.
+            JavaContainerSetSlotTranslator.updateSmithingTableOutput(session, SmithingInventoryTranslator.OUTPUT,
+                packet.getItems()[SmithingInventoryTranslator.OUTPUT], inventory);
+        }
     }
 
     private void updateInventory(GeyserSession session, Inventory inventory, int containerId) {
diff --git a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaContainerSetSlotTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaContainerSetSlotTranslator.java
index fa2e3a544..fe61c8579 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaContainerSetSlotTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/protocol/java/inventory/JavaContainerSetSlotTranslator.java
@@ -224,7 +224,7 @@ public class JavaContainerSetSlotTranslator extends PacketTranslator<Clientbound
         }, 150, TimeUnit.MILLISECONDS));
     }
 
-    private static void updateSmithingTableOutput(GeyserSession session, int slot, ItemStack output, Inventory inventory) {
+    static void updateSmithingTableOutput(GeyserSession session, int slot, ItemStack output, Inventory inventory) {
         if (slot != SmithingInventoryTranslator.OUTPUT) {
             return;
         }