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

Small fix

Browse source
This commit is contained in:
Aleksey 2020-12-27 16:01:09 +03:00
parent 9e067499eb
commit 67340033bc
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ru/betterend/recipe/builders/AlloyingRecipe.java
View file

@ -238,8 +238,8 @@ public class AlloyingRecipe implements Recipe<Inventory> {
JsonArray ingredients = JsonHelper.getArray(json, "ingredients");
Ingredient primaryInput = Ingredient.fromJson(ingredients.get(0));
Ingredient secondaryInput = Ingredient.fromJson(ingredients.get(1));
JsonObject result = JsonHelper.getObject(json, "result");
String group = JsonHelper.getString(json, "group", "");
JsonObject result = JsonHelper.getObject(json, "result");
ItemStack output = ItemUtil.fromJsonRecipe(result);
if (output == null) {
throw new IllegalStateException("Output item does not exists!");

12
src/main/java/ru/betterend/util/ItemUtil.java
View file

@ -31,13 +31,17 @@ public class ItemUtil {
public static ItemStack fromStackString(String stackString) {
if (stackString == null || stackString.equals("")) return null;
String[] parts = stackString.split(":");
if (parts.length < 2) return null;
if (parts.length == 2) {
Identifier itemId = new Identifier(stackString);
Item item = Registry.ITEM.getOrEmpty(itemId).orElse(null);
if (item == null) return null;
return new ItemStack(item);
}
Identifier itemId = new Identifier(parts[0], parts[1]);
Item item = Registry.ITEM.getOrEmpty(itemId).orElse(null);
if (item == null) return null;
if (parts.length > 2) {
return new ItemStack(item, Integer.valueOf(parts[2]));
}
return new ItemStack(item);
return new ItemStack(item, Integer.valueOf(parts[2]));
}
@Nullable