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

Fixed some crashes

Browse source
This commit is contained in:
Frank 2023-12-19 18:54:04 +01:00
parent f286263c05
commit f5fd809485
1 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -83,7 +83,7 @@ public class InfusionRecipe implements Recipe<InfusionRitual>, UnknownReceipBook
this(input, output, 1, new Ingredient[]{ this(input, output, 1, new Ingredient[]{
Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY,
Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY, Ingredient.EMPTY
}, (String) null); }, "");
} }
private InfusionRecipe( private InfusionRecipe(
@ -93,7 +93,7 @@ public class InfusionRecipe implements Recipe<InfusionRitual>, UnknownReceipBook
Ingredient[] catalysts, Ingredient[] catalysts,
Optional<String> group Optional<String> group
) { ) {
this(input, output, time, catalysts, group.orElse(null)); this(input, output, time, catalysts, group.orElse(""));
} }
private InfusionRecipe(Ingredient input, ItemStack output, int time, Ingredient[] catalysts, String group) { private InfusionRecipe(Ingredient input, ItemStack output, int time, Ingredient[] catalysts, String group) {
@ -210,14 +210,14 @@ public class InfusionRecipe implements Recipe<InfusionRitual>, UnknownReceipBook
Optional<Ingredient> north_west Optional<Ingredient> north_west
) { ) {
Ingredient[] result = new Ingredient[8]; Ingredient[] result = new Ingredient[8];
result[Catalysts.NORTH.index] = north.orElse(null); result[Catalysts.NORTH.index] = north.orElse(Ingredient.EMPTY);
result[Catalysts.NORTH_EAST.index] = north_east.orElse(null); result[Catalysts.NORTH_EAST.index] = north_east.orElse(Ingredient.EMPTY);
result[Catalysts.EAST.index] = east.orElse(null); result[Catalysts.EAST.index] = east.orElse(Ingredient.EMPTY);
result[Catalysts.SOUTH_EAST.index] = south_east.orElse(null); result[Catalysts.SOUTH_EAST.index] = south_east.orElse(Ingredient.EMPTY);
result[Catalysts.SOUTH.index] = south.orElse(null); result[Catalysts.SOUTH.index] = south.orElse(Ingredient.EMPTY);
result[Catalysts.SOUTH_WEST.index] = south_west.orElse(null); result[Catalysts.SOUTH_WEST.index] = south_west.orElse(Ingredient.EMPTY);
result[Catalysts.WEST.index] = west.orElse(null); result[Catalysts.WEST.index] = west.orElse(Ingredient.EMPTY);
result[Catalysts.NORTH_WEST.index] = north_west.orElse(null); result[Catalysts.NORTH_WEST.index] = north_west.orElse(Ingredient.EMPTY);
return result; return result;
} }
@ -240,7 +240,13 @@ public class InfusionRecipe implements Recipe<InfusionRitual>, UnknownReceipBook
@Override @Override
protected InfusionRecipe createRecipe(ResourceLocation id) { protected InfusionRecipe createRecipe(ResourceLocation id) {
checkRecipe(); checkRecipe();
return new InfusionRecipe(this.primaryInput, this.output, this.time, this.catalysts, this.group); return new InfusionRecipe(
this.primaryInput,
this.output,
this.time,
this.catalysts,
this.group == null ? "" : this.group
);
} }
@Override @Override