MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed loading of InfusionRecipe Categories

Browse source
This commit is contained in:
Frank 2023-04-29 15:42:59 +02:00
parent c8790686a4
commit 5480da909e
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/org/betterx/betterend/recipe/builders/InfusionRecipe.java
View file

@ -59,8 +59,10 @@ public class InfusionRecipe implements Recipe<InfusionRitual>, UnknownReceipBook
this.id = id; this.id = id;
this.input = input; this.input = input;
this.output = output; this.output = output;
this.catalysts = new Ingredient[8]; this.catalysts = new Ingredient[]{
Arrays.fill(catalysts, Ingredient.EMPTY); Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY,
Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY
};
} }
public static Builder create(String id, ItemLike output) { public static Builder create(String id, ItemLike output) {
@ -266,13 +268,19 @@ public class InfusionRecipe implements Recipe<InfusionRitual>, UnknownReceipBook
JsonObject o = el.getAsJsonObject(); JsonObject o = el.getAsJsonObject();
//directly read as ingredient //directly read as ingredient
if (o.has("tag")) { if (o.has("tag")) {
return ItemUtil.fromJsonIngredientWithNBT(o); final Ingredient res = ItemUtil.fromJsonIngredientWithNBT(o);
if (res == null) return Ingredient.EMPTY;
return res;
} else { } else {
return Ingredient.of(ItemUtil.fromJsonRecipeWithNBT(o)); final Ingredient res = Ingredient.of(ItemUtil.fromJsonRecipeWithNBT(o));
if (res == null) return Ingredient.EMPTY;
return res;
} }
} else if (el.isJsonArray()) { } else if (el.isJsonArray()) {
//this is an Ingredient-Array, so read as such //this is an Ingredient-Array, so read as such
return Ingredient.fromJson(el); final Ingredient res = Ingredient.fromJson(el);
if (res == null) return Ingredient.EMPTY;
return res;
} else if (obj.isJsonPrimitive()) { } else if (obj.isJsonPrimitive()) {
String s = GsonHelper.getAsString(obj, key, ""); String s = GsonHelper.getAsString(obj, key, "");
ItemStack catalyst = ItemUtil.fromStackString(s); ItemStack catalyst = ItemUtil.fromStackString(s);
@ -283,7 +291,7 @@ public class InfusionRecipe implements Recipe<InfusionRitual>, UnknownReceipBook
throw new IllegalStateException("Invalid catalyst ingredient for " + key + ": " + el.toString()); throw new IllegalStateException("Invalid catalyst ingredient for " + key + ": " + el.toString());
} }
} }
return null; return Ingredient.EMPTY;
} }
@Override @Override