diff --git a/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java b/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java index bcfb2bf97b..e20e30983e 100644 --- a/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java +++ b/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java @@ -118,7 +118,13 @@ public class CraftingHelper ingredients.add(Ingredient.merge(vanilla)); if (ingredients.size() == 0) + { + if (allowEmpty) + { + return Ingredient.EMPTY; + } throw new JsonSyntaxException("Item array cannot be empty, at least one item must be defined"); + } if (ingredients.size() == 1) return ingredients.get(0); diff --git a/src/main/java/net/minecraftforge/common/crafting/DifferenceIngredient.java b/src/main/java/net/minecraftforge/common/crafting/DifferenceIngredient.java index b1e6d74ba2..85f70012f1 100644 --- a/src/main/java/net/minecraftforge/common/crafting/DifferenceIngredient.java +++ b/src/main/java/net/minecraftforge/common/crafting/DifferenceIngredient.java @@ -120,8 +120,8 @@ public class DifferenceIngredient extends AbstractIngredient @Override public DifferenceIngredient parse(JsonObject json) { - Ingredient base = Ingredient.fromJson(json.get("base")); - Ingredient without = Ingredient.fromJson(json.get("subtracted")); + Ingredient base = Ingredient.fromJson(json.get("base"), false); + Ingredient without = Ingredient.fromJson(json.get("subtracted"), false); return new DifferenceIngredient(base, without); } diff --git a/src/main/java/net/minecraftforge/common/crafting/IntersectionIngredient.java b/src/main/java/net/minecraftforge/common/crafting/IntersectionIngredient.java index 3eb8326c44..ab01f217d3 100644 --- a/src/main/java/net/minecraftforge/common/crafting/IntersectionIngredient.java +++ b/src/main/java/net/minecraftforge/common/crafting/IntersectionIngredient.java @@ -152,7 +152,12 @@ public class IntersectionIngredient extends AbstractIngredient JsonArray children = GsonHelper.getAsJsonArray(json, "children"); if (children.size() < 2) throw new JsonSyntaxException("Must have at least two children for an intersection ingredient"); - return new IntersectionIngredient(IntStream.range(0, children.size()).mapToObj(i -> Ingredient.fromJson(children.get(i))).toList()); + + return new IntersectionIngredient( + IntStream.range(0, children.size()) + .mapToObj(i -> Ingredient.fromJson(children.get(i), false)) + .toList() + ); } @Override