summaryrefslogtreecommitdiff
path: root/src/main/java/lv/enes/mc/eris_alchemy/utils/IngredientProvider.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/lv/enes/mc/eris_alchemy/utils/IngredientProvider.java')
-rw-r--r--src/main/java/lv/enes/mc/eris_alchemy/utils/IngredientProvider.java3
1 files changed, 1 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;
8import net.minecraft.resources.ResourceLocation; 8import net.minecraft.resources.ResourceLocation;
9import net.minecraft.tags.TagKey; 9import net.minecraft.tags.TagKey;
10import net.minecraft.world.item.crafting.Ingredient; 10import net.minecraft.world.item.crafting.Ingredient;
11import net.minecraft.world.item.crafting.ShapedRecipe;
12 11
13import java.lang.reflect.Type; 12import java.lang.reflect.Type;
14import java.util.function.Supplier; 13import java.util.function.Supplier;
@@ -16,7 +15,7 @@ import java.util.function.Supplier;
16public class IngredientProvider implements JsonDeserializer<Supplier<Ingredient>> { 15public class IngredientProvider implements JsonDeserializer<Supplier<Ingredient>> {
17 public static Supplier<Ingredient> deserialize(JsonElement el) { 16 public static Supplier<Ingredient> deserialize(JsonElement el) {
18 if (el.isJsonObject()) { 17 if (el.isJsonObject()) {
19 return () -> Ingredient.of(ShapedRecipe.itemStackFromJson(el.getAsJsonObject())); 18 return () -> ItemUtils.itemStackFromJson(el.getAsJsonObject()).map(Ingredient::of).orElse(Ingredient.EMPTY);
20 } else if (el.isJsonPrimitive() && el.getAsJsonPrimitive().isString()) { 19 } else if (el.isJsonPrimitive() && el.getAsJsonPrimitive().isString()) {
21 return deserialize(el.getAsString().strip()); 20 return deserialize(el.getAsString().strip());
22 } else { 21 } else {