1 files changed, 21 insertions, 13 deletions

diff --git a/src/main/java/lv/enes/mc/eris_alchemy/recipe/SimplifiedRecipe.java b/src/main/java/lv/enes/mc/eris_alchemy/recipe/SimplifiedRecipe.java
index b63e4c5..e1022b2 100644
--- a/src/main/java/lv/enes/mc/eris_alchemy/recipe/SimplifiedRecipe.java
+++ b/src/main/java/lv/enes/mc/eris_alchemy/recipe/SimplifiedRecipe.java
@@ -16,14 +16,12 @@ import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.item.crafting.Recipe;
-import net.minecraft.world.item.crafting.ShapedRecipe;
 
 import java.lang.reflect.Type;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
@@ -113,8 +111,9 @@ public record SimplifiedRecipe(
                                 throw new JsonParseException("Recipe must have 'output' and 'input' fields");
                         }
 
-                        var output = parseOutputOrRemainder(obj.get("output"));
-                        var remainder = parseRemainders(obj.get("remainder"));
+                        var output = parseOutputOrRemainder(obj.get("output")).orElseGet(Items.AIR::getDefaultInstance);
+                        var remainder = parseRemainders(obj.get("remainder"))
+                                        .orElseGet(() -> List.of(Items.AIR.getDefaultInstance()));
                         var input = parseInputs(obj.get("input"));
                         return new SimplifiedRecipe(output, remainder, input, false);
                 }
@@ -127,24 +126,33 @@ public record SimplifiedRecipe(
                         return List.of(IngredientProvider.deserialize(el));
                 }
 
-                private ItemStack parseOutputOrRemainder(JsonElement el) {
+                private Optional<ItemStack> parseOutputOrRemainder(JsonElement el) {
                         if (el.isJsonObject()) {
-                                return ShapedRecipe.itemStackFromJson(el.getAsJsonObject());
+                                return ItemUtils.itemStackFromJson(el.getAsJsonObject());
                         } else if (el.isJsonPrimitive() && el.getAsJsonPrimitive().isString()) {
                                 var id = new ResourceLocation(el.getAsString());
-                                return BuiltInRegistries.ITEM.get(id).getDefaultInstance();
+                                return Optional.of(BuiltInRegistries.ITEM.get(id).getDefaultInstance());
                         } else {
                                 throw new JsonParseException("Recipe's output or remainder must be an object or a string");
                         }
                 }
 
-                private List<ItemStack> parseRemainders(JsonElement el) {
+                private Optional<List<ItemStack>> parseRemainders(JsonElement el) {
                         if (el == null) {
-                                return List.of();
+                                return Optional.of(List.of());
                         } else if (el.isJsonArray()) {
-                                return el.getAsJsonArray().asList().stream().map(this::parseOutputOrRemainder).toList();
+                                var optList = el.getAsJsonArray().asList().stream().map(this::parseOutputOrRemainder).toList();
+                                var retList = new ArrayList<ItemStack>();
+                                for (var opt : optList) {
+                                        if (opt.isPresent()) {
+                                                retList.add(opt.get());
+                                        } else {
+                                                return Optional.empty();
+                                        }
+                                }
+                                return Optional.of(retList);
                         } else {
-                                return List.of(parseOutputOrRemainder(el));
+                                return parseOutputOrRemainder(el).map(List::of);
                         }
                 }
         }