add smithing and stonecutting recipe to recipe_id and recipe_result (#…

…2452)
DenizenScript · Mar 30, 2023 · 10079a9 · 10079a9
1 parent 843eb27
commit 10079a9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java b/plugin/src/main/java/com/denizenscript/denizen/tags/core/ServerTagBase.java
@@ -196,7 +196,7 @@ public void register() {
         // @description
         // Returns a list of all recipe IDs on the server.
         // Returns a list in the Namespace:Key format, for example "minecraft:gold_nugget".
-        // Optionally, specify a recipe type (CRAFTING, FURNACE, COOKING, BLASTING, SHAPED, SHAPELESS, SMOKING, CAMPFIRE, STONECUTTING, BREWING)
+        // Optionally, specify a recipe type (CRAFTING, FURNACE, COOKING, BLASTING, SHAPED, SHAPELESS, SMOKING, CAMPFIRE, STONECUTTING, SMITHING, BREWING)
         // to limit to just recipes of that type.
         // Brewing recipes are only supported on Paper, and only custom ones are available.
         // Note: this will produce an error if all recipes of any one type have been removed from the server, due to an error in Spigot.
@@ -228,8 +228,9 @@ public void register() {
         // This is formatted equivalently to the item script recipe input, with "material:" for non-exact matches, and a full ItemTag for exact matches.
         // Note that this won't represent all recipes perfectly (primarily those with multiple input choices per slot).
         // Brewing recipes are only supported on Paper, and only custom ones are available.
-        // For furnace-style recipes, this will return a list with only 1 item.
+        // For furnace-style and stonecutting recipes, this will return a list with only 1 item.
         // For shaped recipes, this will include 'air' for slots that are part of the shape but don't require an item.
+        // For smithing recipes, this will return a list with the 'base' item and the 'addition'.
         // -->
         tagProcessor.registerTag(ListTag.class, ElementTag.class, "recipe_items", (attribute, object, input) -> {
             NamespacedKey recipeKey = Utilities.parseNamespacedKey(input.asString());
@@ -268,6 +269,13 @@ else if (recipe instanceof ShapelessRecipe shapelessRecipe) {
             else if (recipe instanceof CookingRecipe<?> cookingRecipe) {
                 addChoice.accept(cookingRecipe.getInputChoice());
             }
+            else if (recipe instanceof StonecuttingRecipe stonecuttingRecipe) {
+                addChoice.accept(stonecuttingRecipe.getInputChoice());
+            }
+            else if (recipe instanceof SmithingRecipe smithingRecipe) {
+                addChoice.accept(smithingRecipe.getBase());
+                addChoice.accept(smithingRecipe.getAddition());
+            }
             else if (brewingRecipe != null) {
                 addChoice.accept(brewingRecipe.ingredient());
                 addChoice.accept(brewingRecipe.input());

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/Utilities.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/Utilities.java
@@ -112,7 +112,8 @@ public static boolean isRecipeOfType(Recipe recipe, String type) {
                         (type.equals("shaped") && recipe instanceof ShapedRecipe) ||
                         (type.equals("shapeless") && recipe instanceof ShapelessRecipe) ||
                         (type.equals("smoking") && recipe instanceof SmokingRecipe) ||
-                        (type.equals("stonecutting") && recipe instanceof StonecuttingRecipe));
+                        (type.equals("stonecutting") && recipe instanceof StonecuttingRecipe) ||
+                        (type.equals("smithing") && recipe instanceof SmithingRecipe));
     }
 
     public static boolean canReadFile(File f) {