Improve recipe ingredient validation

NathanWolf · NathanWolf · commit c750269e21da · 2025-04-27T15:54:59.000-07:00
diff --git a/Magic/src/main/java/com/elmakers/mine/bukkit/crafting/MagicBlastingRecipe.java b/Magic/src/main/java/com/elmakers/mine/bukkit/crafting/MagicBlastingRecipe.java
@@ -13,7 +13,12 @@ protected MagicBlastingRecipe(String key, MagicController controller) {
 
     @Override
     protected Recipe createRecipe(ItemStack item) {
-        return CompatibilityLib.getCompatibilityUtils().createBlastingRecipe(key, item, ingredient.getItemStack(1), ignoreDamage, experience, cookingTime);
+        ItemStack ingredientItem = ingredient == null ? null : ingredient.getItemStack();
+        if (CompatibilityLib.getItemUtils().isEmpty(ingredientItem)) {
+            controller.getLogger().warning("Invalid " + getType() + " recipe ingredient " + ingredient.getKey());
+            return null;
+        }
+        return CompatibilityLib.getCompatibilityUtils().createBlastingRecipe(key, item, ingredientItem, ignoreDamage, experience, cookingTime);
     }
 
     @Override
diff --git a/Magic/src/main/java/com/elmakers/mine/bukkit/crafting/MagicCampfireRecipe.java b/Magic/src/main/java/com/elmakers/mine/bukkit/crafting/MagicCampfireRecipe.java
@@ -13,7 +13,12 @@ protected MagicCampfireRecipe(String key, MagicController controller) {
 
     @Override
     protected Recipe createRecipe(ItemStack item) {
-        return CompatibilityLib.getCompatibilityUtils().createCampfireRecipe(key, item, ingredient.getItemStack(1), ignoreDamage, experience, cookingTime);
+        ItemStack ingredientItem = ingredient == null ? null : ingredient.getItemStack();
+        if (CompatibilityLib.getItemUtils().isEmpty(ingredientItem)) {
+            controller.getLogger().warning("Invalid "  + getType() + " recipe ingredient " + ingredientKey);
+            return null;
+        }
+        return CompatibilityLib.getCompatibilityUtils().createCampfireRecipe(key, item, ingredientItem, ignoreDamage, experience, cookingTime);
     }
 
     @Override
diff --git a/Magic/src/main/java/com/elmakers/mine/bukkit/crafting/MagicCookingRecipe.java b/Magic/src/main/java/com/elmakers/mine/bukkit/crafting/MagicCookingRecipe.java
@@ -11,6 +11,7 @@
 public abstract class MagicCookingRecipe extends MagicRecipe {
     protected Recipe recipe;
     protected ItemData ingredient;
+    protected String ingredientKey;
     protected String group;
     protected float experience;
     protected int cookingTime;
@@ -27,10 +28,10 @@ public ItemStack load(ConfigurationSection configuration) {
         }
         cookingTime = configuration.getInt("cooking_time") / 50;
         experience = (float)configuration.getDouble("experience");
-        String materialKey = configuration.getString("ingredient");
-        ingredient = controller.getOrCreateItem(materialKey);
+        ingredientKey = configuration.getString("ingredient");
+        ingredient = controller.getOrCreateItem(ingredientKey);
         if (ingredient == null) {
-            controller.getLogger().warning("Could not create " + getType() + " recipe ingredient: " + materialKey);
+            controller.getLogger().warning("Could not create " + getType() + " recipe ingredient: " + ingredientKey);
             return null;
         }
         recipe = createRecipe(item);
diff --git a/Magic/src/main/java/com/elmakers/mine/bukkit/crafting/MagicFurnaceRecipe.java b/Magic/src/main/java/com/elmakers/mine/bukkit/crafting/MagicFurnaceRecipe.java
@@ -13,7 +13,12 @@ protected MagicFurnaceRecipe(String key, MagicController controller) {
 
     @Override
     protected Recipe createRecipe(ItemStack item) {
-        return CompatibilityLib.getCompatibilityUtils().createFurnaceRecipe(key, item, ingredient.getItemStack(1), ignoreDamage, experience, cookingTime);
+        ItemStack ingredientItem = ingredient == null ? null : ingredient.getItemStack();
+        if (CompatibilityLib.getItemUtils().isEmpty(ingredientItem)) {
+            controller.getLogger().warning("Invalid " + getType() + " recipe ingredient " + ingredientKey);
+            return null;
+        }
+        return CompatibilityLib.getCompatibilityUtils().createFurnaceRecipe(key, item, ingredientItem, ignoreDamage, experience, cookingTime);
     }
 
     @Override
diff --git a/Magic/src/main/java/com/elmakers/mine/bukkit/crafting/MagicShapedRecipe.java b/Magic/src/main/java/com/elmakers/mine/bukkit/crafting/MagicShapedRecipe.java
@@ -70,8 +70,13 @@ public ItemStack load(ConfigurationSection configuration) {
                             input = new ItemStack(Material.AIR);
                         }
                         ItemData ingredient = controller.createItemData(input);
+                        ItemStack ingredientItem = ingredient == null ? null : ingredient.getItemStack();
+                        if (CompatibilityLib.getItemUtils().isEmpty(ingredientItem)) {
+                            controller.getLogger().warning("Invalid " + getType() + " recipe ingredient " + ingredientKey);
+                            return null;
+                        }
                         ingredients.put(ingredientKey, ingredient);
-                        if (!CompatibilityLib.getCompatibilityUtils().setRecipeIngredient(this.recipe, ingredientKey, ingredient.getItemStack(1), ignoreDamage)) {
+                        if (!CompatibilityLib.getCompatibilityUtils().setRecipeIngredient(this.recipe, ingredientKey, ingredientItem, ignoreDamage)) {
                             controller.getLogger().warning("Unable to set recipe ingredient from vanilla ingredient: " + input);
                             return null;
                         }
@@ -111,11 +116,12 @@ public ItemStack load(ConfigurationSection configuration) {
                         continue;
                     }
                     ItemData ingredient = controller.getOrCreateItem(materialKey);
-                    if (ingredient == null) {
-                        controller.getLogger().warning("Invalid recipe ingredient " + materialKey);
+                    ItemStack ingredientItem = ingredient == null ? null : ingredient.getItemStack();
+                    if (CompatibilityLib.getItemUtils().isEmpty(ingredientItem)) {
+                        controller.getLogger().warning("Invalid " + getType() + " recipe ingredient " + materialKey);
                         return null;
                     }
-                    if (!CompatibilityLib.getCompatibilityUtils().setRecipeIngredient(shaped, key.charAt(0), ingredient.getItemStack(1), ignoreDamage)) {
+                    if (!CompatibilityLib.getCompatibilityUtils().setRecipeIngredient(shaped, key.charAt(0), ingredientItem, ignoreDamage)) {
                         controller.getLogger().warning("Unable to set recipe ingredient " + materialKey);
                         return null;
                     }
diff --git a/Magic/src/main/java/com/elmakers/mine/bukkit/crafting/MagicShapelessRecipe.java b/Magic/src/main/java/com/elmakers/mine/bukkit/crafting/MagicShapelessRecipe.java
@@ -32,12 +32,13 @@ public ItemStack load(ConfigurationSection configuration) {
         List<ItemStack> ingredients = new ArrayList<>();
         Collection<String> ingredientKeys = ConfigurationUtils.getStringList(configuration, "ingredients");
         for (String ingredientKey : ingredientKeys) {
-            ItemData ingredientItem = controller.getOrCreateItem(ingredientKey);
-            if (ingredientItem == null) {
-                controller.getLogger().warning("Could not create " + getType() + " recipe ingredient: " + ingredientKey);
+            ItemData ingredient = controller.getOrCreateItem(ingredientKey);
+            ItemStack ingredientItem = ingredient == null ? null : ingredient.getItemStack();
+            if (CompatibilityLib.getItemUtils().isEmpty(ingredientItem)) {
+                controller.getLogger().warning("Invalid " + getType() + " recipe ingredient " + ingredientKey);
                 return null;
             }
-            ingredients.add(ingredientItem.getItemStack());
+            ingredients.add(ingredientItem);
         }
         recipe = CompatibilityLib.getCompatibilityUtils().createShapelessRecipe(key, item, ingredients, ignoreDamage);
         if (recipe != null && group != null && !group.isEmpty()) {
diff --git a/Magic/src/main/java/com/elmakers/mine/bukkit/crafting/MagicSmithingRecipe.java b/Magic/src/main/java/com/elmakers/mine/bukkit/crafting/MagicSmithingRecipe.java
@@ -26,17 +26,19 @@ public ItemStack load(ConfigurationSection configuration) {
         }
         String materialKey = configuration.getString("ingredient");
         ingredient = controller.getOrCreateItem(materialKey);
-        if (ingredient == null) {
-            controller.getLogger().warning("Could not create smithing recipe ingredient: " + materialKey);
+        ItemStack ingredientItem = ingredient == null ? null : ingredient.getItemStack();
+        if (CompatibilityLib.getItemUtils().isEmpty(ingredientItem)) {
+            controller.getLogger().warning("Invalid " + getType() + " recipe ingredient " + materialKey);
             return null;
         }
         materialKey = configuration.getString("addition");
         addition = controller.getOrCreateItem(materialKey);
-        if (addition == null) {
-            controller.getLogger().warning("Could not create smithing recipe addition: " + materialKey);
+        ItemStack additionItem = addition == null ? null : ingredient.getItemStack();
+        if (CompatibilityLib.getItemUtils().isEmpty(additionItem)) {
+            controller.getLogger().warning("Invalid " + getType() + " recipe addition ingredient " + materialKey);
             return null;
         }
-        recipe = CompatibilityLib.getCompatibilityUtils().createSmithingRecipe(key, item, ingredient.getItemStack(1), addition.getItemStack(1));
+        recipe = CompatibilityLib.getCompatibilityUtils().createSmithingRecipe(key, item, ingredientItem, additionItem);
         if (recipe != null && group != null && !group.isEmpty()) {
             CompatibilityLib.getCompatibilityUtils().setRecipeGroup(recipe, group);
         }
diff --git a/Magic/src/main/java/com/elmakers/mine/bukkit/crafting/MagicSmokingRecipe.java b/Magic/src/main/java/com/elmakers/mine/bukkit/crafting/MagicSmokingRecipe.java
@@ -13,7 +13,12 @@ protected MagicSmokingRecipe(String key, MagicController controller) {
 
     @Override
     protected Recipe createRecipe(ItemStack item) {
-        return CompatibilityLib.getCompatibilityUtils().createSmokingRecipe(key, item, ingredient.getItemStack(1), ignoreDamage, experience, cookingTime);
+        ItemStack ingredientItem = ingredient == null ? null : ingredient.getItemStack();
+        if (CompatibilityLib.getItemUtils().isEmpty(ingredientItem)) {
+            controller.getLogger().warning("Invalid " + getType() + " recipe ingredient " + ingredientKey);
+            return null;
+        }
+        return CompatibilityLib.getCompatibilityUtils().createSmokingRecipe(key, item, ingredientItem, ignoreDamage, experience, cookingTime);
     }
 
     @Override
diff --git a/Magic/src/main/java/com/elmakers/mine/bukkit/crafting/MagicStonecuttingRecipe.java b/Magic/src/main/java/com/elmakers/mine/bukkit/crafting/MagicStonecuttingRecipe.java
@@ -25,11 +25,12 @@ public ItemStack load(ConfigurationSection configuration) {
         }
         String materialKey = configuration.getString("ingredient");
         ingredient = controller.getOrCreateItem(materialKey);
-        if (ingredient == null) {
-            controller.getLogger().warning("Could not create stonecutting recipe ingredient: " + materialKey);
+        ItemStack ingredientItem = ingredient == null ? null : ingredient.getItemStack();
+        if (CompatibilityLib.getItemUtils().isEmpty(ingredientItem)) {
+            controller.getLogger().warning("Invalid " + getType() + " recipe ingredient " + materialKey);
             return null;
         }
-        recipe = CompatibilityLib.getCompatibilityUtils().createStonecuttingRecipe(key, item, ingredient.getItemStack(1), ignoreDamage);
+        recipe = CompatibilityLib.getCompatibilityUtils().createStonecuttingRecipe(key, item, ingredientItem, ignoreDamage);
         if (recipe != null && group != null && !group.isEmpty()) {
             CompatibilityLib.getCompatibilityUtils().setRecipeGroup(recipe, group);
         }

Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,12 @@ public ItemStack load(ConfigurationSection configuration) {`
`25`	`25`	`}`
`26`	`26`	`String materialKey = configuration.getString("ingredient");`
`27`	`27`	`ingredient = controller.getOrCreateItem(materialKey);`
`28`		`- if (ingredient == null) {`
`29`		`- controller.getLogger().warning("Could not create stonecutting recipe ingredient: " + materialKey);`
	`28`	`+ ItemStack ingredientItem = ingredient == null ? null : ingredient.getItemStack();`
	`29`	`+ if (CompatibilityLib.getItemUtils().isEmpty(ingredientItem)) {`
	`30`	`+ controller.getLogger().warning("Invalid " + getType() + " recipe ingredient " + materialKey);`
`30`	`31`	`return null;`
`31`	`32`	`}`
`32`		`- recipe = CompatibilityLib.getCompatibilityUtils().createStonecuttingRecipe(key, item, ingredient.getItemStack(1), ignoreDamage);`
	`33`	`+ recipe = CompatibilityLib.getCompatibilityUtils().createStonecuttingRecipe(key, item, ingredientItem, ignoreDamage);`
`33`	`34`	`if (recipe != null && group != null && !group.isEmpty()) {`
`34`	`35`	`CompatibilityLib.getCompatibilityUtils().setRecipeGroup(recipe, group);`
`35`	`36`	`}`