Fix a crash when loading without any other mods present.

2 files changed, 16 insertions, 2 deletions

diff --git a/src/main/java/lv/enes/mc/eris_alchemy/utils/IngredientProvider.java b/src/main/java/lv/enes/mc/eris_alchemy/utils/IngredientProvider.java
index e859114..6390c88 100644
--- a/src/main/java/lv/enes/mc/eris_alchemy/utils/IngredientProvider.java
+++ b/src/main/java/lv/enes/mc/eris_alchemy/utils/IngredientProvider.java
@@ -8,7 +8,6 @@ import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.crafting.Ingredient;
-import net.minecraft.world.item.crafting.ShapedRecipe;
 
 import java.lang.reflect.Type;
 import java.util.function.Supplier;
@@ -16,7 +15,7 @@ import java.util.function.Supplier;
 public class IngredientProvider implements JsonDeserializer<Supplier<Ingredient>> {
         public static Supplier<Ingredient> deserialize(JsonElement el) {
                 if (el.isJsonObject()) {
-                        return () -> Ingredient.of(ShapedRecipe.itemStackFromJson(el.getAsJsonObject()));
+                        return () -> ItemUtils.itemStackFromJson(el.getAsJsonObject()).map(Ingredient::of).orElse(Ingredient.EMPTY);
                 } else if (el.isJsonPrimitive() && el.getAsJsonPrimitive().isString()) {
                         return deserialize(el.getAsString().strip());
                 } else {
diff --git a/src/main/java/lv/enes/mc/eris_alchemy/utils/ItemUtils.java b/src/main/java/lv/enes/mc/eris_alchemy/utils/ItemUtils.java
index 7ac7358..0801d11 100644
--- a/src/main/java/lv/enes/mc/eris_alchemy/utils/ItemUtils.java
+++ b/src/main/java/lv/enes/mc/eris_alchemy/utils/ItemUtils.java
@@ -1,12 +1,18 @@
 package lv.enes.mc.eris_alchemy.utils;
 
+import com.google.gson.JsonObject;
+import com.google.gson.JsonSyntaxException;
+import lv.enes.mc.eris_alchemy.ErisAlchemy;
 import net.minecraft.core.Holder;
 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.crafting.ShapedRecipe;
 import net.minecraft.world.level.ItemLike;
 
+import java.util.Optional;
+
 public final class ItemUtils {
         public static Item get(ResourceLocation id) {
                 return BuiltInRegistries.ITEM.get(id);
@@ -24,5 +30,14 @@ public final class ItemUtils {
                 return getId(stack.getItem());
         }
 
+        public static Optional<ItemStack> itemStackFromJson(JsonObject json) {
+                try {
+                        return Optional.of(ShapedRecipe.itemStackFromJson(json));
+                } catch (JsonSyntaxException ex) {
+                        ErisAlchemy.LOGGER.error("Exception while trying to parse item stack from JSON", ex);
+                        return Optional.empty();
+                }
+        }
+
         private ItemUtils() {}
 }