Allow smithing recipes to work again in 1.18.10

candrawardana · Feb 9, 2022 · 559c5d6 · 559c5d6
1 parent 0479af7
commit 559c5d6
Showing 1 changed file with 25 additions and 0 deletions.
diff --git a/...c/main/java/org/geysermc/geyser/translator/protocol/java/JavaUpdateRecipesTranslator.java b/...c/main/java/org/geysermc/geyser/translator/protocol/java/JavaUpdateRecipesTranslator.java
@@ -31,12 +31,14 @@
 import com.github.steveice10.mc.protocol.data.game.recipe.RecipeType;
 import com.github.steveice10.mc.protocol.data.game.recipe.data.ShapedRecipeData;
 import com.github.steveice10.mc.protocol.data.game.recipe.data.ShapelessRecipeData;
+import com.github.steveice10.mc.protocol.data.game.recipe.data.SmithingRecipeData;
 import com.github.steveice10.mc.protocol.data.game.recipe.data.StoneCuttingRecipeData;
 import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundUpdateRecipesPacket;
 import com.nukkitx.nbt.NbtMap;
 import com.nukkitx.protocol.bedrock.data.inventory.CraftingData;
 import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
 import com.nukkitx.protocol.bedrock.packet.CraftingDataPacket;
+import com.nukkitx.protocol.bedrock.v486.Bedrock_v486;
 import it.unimi.dsi.fastutil.ints.*;
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -76,6 +78,8 @@ public void translate(GeyserSession session, ClientboundUpdateRecipesPacket pack
         // Get the last known network ID (first used for the pregenerated recipes) and increment from there.
         int netId = InventoryUtils.LAST_RECIPE_NET_ID + 1;
 
+        boolean applySmithingRecipes = session.getUpstream().getProtocolVersion() >= Bedrock_v486.V486_CODEC.getProtocolVersion();
+
         Int2ObjectMap<Recipe> recipeMap = new Int2ObjectOpenHashMap<>(Registries.RECIPES.forVersion(session.getUpstream().getProtocolVersion()));
         Int2ObjectMap<List<StoneCuttingRecipeData>> unsortedStonecutterData = new Int2ObjectOpenHashMap<>();
         CraftingDataPacket craftingDataPacket = new CraftingDataPacket();
@@ -128,6 +132,27 @@ public void translate(GeyserSession session, ClientboundUpdateRecipesPacket pack
                     data.add(stoneCuttingData);
                     // Save for processing after all recipes have been received
                 }
+                case SMITHING -> {
+                    // Required to translate these as of 1.18.10, or else they cannot be crafted
+                    if (!applySmithingRecipes) {
+                        continue;
+                    }
+
+                    SmithingRecipeData recipeData = (SmithingRecipeData) recipe.getData();
+                    ItemData output = ItemTranslator.translateToBedrock(session, recipeData.getResult());
+                    for (ItemStack base : recipeData.getBase().getOptions()) {
+                        ItemData bedrockBase = ItemTranslator.translateToBedrock(session, base);
+
+                        for (ItemStack addition : recipeData.getAddition().getOptions()) {
+                            ItemData bedrockAddition = ItemTranslator.translateToBedrock(session, addition);
+
+                            UUID uuid = UUID.randomUUID();
+                            craftingDataPacket.getCraftingData().add(CraftingData.fromShapeless(uuid.toString(),
+                                    Arrays.asList(bedrockBase, bedrockAddition),
+                                    Collections.singletonList(output), uuid, "smithing_table", 2, netId++));
+                        }
+                    }
+                }
                 default -> {
                     List<CraftingData> craftingData = recipeTypes.get(recipe.getType());
                     if (craftingData != null) {