diff options
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.java | 3 |
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; | |||
| 8 | import net.minecraft.resources.ResourceLocation; | 8 | import net.minecraft.resources.ResourceLocation; |
| 9 | import net.minecraft.tags.TagKey; | 9 | import net.minecraft.tags.TagKey; |
| 10 | import net.minecraft.world.item.crafting.Ingredient; | 10 | import net.minecraft.world.item.crafting.Ingredient; |
| 11 | import net.minecraft.world.item.crafting.ShapedRecipe; | ||
| 12 | 11 | ||
| 13 | import java.lang.reflect.Type; | 12 | import java.lang.reflect.Type; |
| 14 | import java.util.function.Supplier; | 13 | import java.util.function.Supplier; |
| @@ -16,7 +15,7 @@ import java.util.function.Supplier; | |||
| 16 | public class IngredientProvider implements JsonDeserializer<Supplier<Ingredient>> { | 15 | public 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 { |