From 31fd57a58d19829071859ef292fee706873d31fb Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Sat, 12 Feb 2022 21:44:51 -0500
Subject: [PATCH] Also apply villager fix for consoles

---
 .../MerchantInventoryTranslator.java          | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/org/geysermc/geyser/translator/inventory/MerchantInventoryTranslator.java b/core/src/main/java/org/geysermc/geyser/translator/inventory/MerchantInventoryTranslator.java
index 84f904d98..248bd35b7 100644
--- a/core/src/main/java/org/geysermc/geyser/translator/inventory/MerchantInventoryTranslator.java
+++ b/core/src/main/java/org/geysermc/geyser/translator/inventory/MerchantInventoryTranslator.java
@@ -33,6 +33,7 @@ import com.nukkitx.protocol.bedrock.data.entity.EntityLinkData;
 import com.nukkitx.protocol.bedrock.data.inventory.ContainerSlotType;
 import com.nukkitx.protocol.bedrock.data.inventory.ItemStackRequest;
 import com.nukkitx.protocol.bedrock.data.inventory.StackRequestSlotInfoData;
+import com.nukkitx.protocol.bedrock.data.inventory.stackrequestactions.AutoCraftRecipeStackRequestActionData;
 import com.nukkitx.protocol.bedrock.data.inventory.stackrequestactions.CraftRecipeStackRequestActionData;
 import com.nukkitx.protocol.bedrock.packet.ItemStackResponsePacket;
 import com.nukkitx.protocol.bedrock.packet.SetEntityLinkPacket;
@@ -147,6 +148,25 @@ public class MerchantInventoryTranslator extends BaseInventoryTranslator {
         // We set the net ID to the trade index + 1. This doesn't appear to cause issues and means we don't have to
         // store a map of net ID to trade index on our end.
         int tradeChoice = ((CraftRecipeStackRequestActionData) request.getActions()[0]).getRecipeNetworkId() - 1;
+        return handleTrade(session, inventory, request, tradeChoice);
+    }
+
+    @Override
+    public ItemStackResponsePacket.Response translateAutoCraftingRequest(GeyserSession session, Inventory inventory, ItemStackRequest request) {
+        if (session.getUpstream().getProtocolVersion() < Bedrock_v486.V486_CODEC.getProtocolVersion()) {
+            // We're not crafting here
+            // Called at least by consoles when pressing a trade option button
+            return translateRequest(session, inventory, request);
+        }
+
+        // 1.18.10 update - seems impossible to call without consoles/controller input
+        // We set the net ID to the trade index + 1. This doesn't appear to cause issues and means we don't have to
+        // store a map of net ID to trade index on our end.
+        int tradeChoice = ((AutoCraftRecipeStackRequestActionData) request.getActions()[0]).getRecipeNetworkId() - 1;
+        return handleTrade(session, inventory, request, tradeChoice);
+    }
+
+    private ItemStackResponsePacket.Response handleTrade(GeyserSession session, Inventory inventory, ItemStackRequest request, int tradeChoice) {
         ServerboundSelectTradePacket packet = new ServerboundSelectTradePacket(tradeChoice);
         session.sendDownstreamPacket(packet);
 
@@ -177,13 +197,6 @@ public class MerchantInventoryTranslator extends BaseInventoryTranslator {
         }
     }
 
-    @Override
-    public ItemStackResponsePacket.Response translateAutoCraftingRequest(GeyserSession session, Inventory inventory, ItemStackRequest request) {
-        // We're not crafting here
-        // Called at least by consoles when pressing a trade option button
-        return translateRequest(session, inventory, request);
-    }
-
     @Override
     public void updateInventory(GeyserSession session, Inventory inventory) {
         updater.updateInventory(this, session, inventory);