From c8790686a43d6adc0be55d59823cfc83d769412d Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 29 Apr 2023 15:16:35 +0200 Subject: [PATCH] Register InfusionRecipe Type --- src/main/java/org/betterx/betterend/BetterEnd.java | 2 ++ .../betterx/betterend/recipe/builders/InfusionRecipe.java | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/betterx/betterend/BetterEnd.java b/src/main/java/org/betterx/betterend/BetterEnd.java index a9bc9b73..bfbc8623 100644 --- a/src/main/java/org/betterx/betterend/BetterEnd.java +++ b/src/main/java/org/betterx/betterend/BetterEnd.java @@ -8,6 +8,7 @@ import org.betterx.betterend.commands.CommandRegistry; import org.betterx.betterend.config.Configs; import org.betterx.betterend.effects.EndPotions; import org.betterx.betterend.integration.Integrations; +import org.betterx.betterend.recipe.builders.InfusionRecipe; import org.betterx.betterend.registry.*; import org.betterx.betterend.util.BonemealPlants; import org.betterx.betterend.util.LootTableUtil; @@ -46,6 +47,7 @@ public class BetterEnd implements ModInitializer { EndItems.ensureStaticallyLoaded(); EndEnchantments.register(); EndPotions.register(); + InfusionRecipe.register(); EndStructures.register(); BonemealPlants.init(); GeneratorOptions.init(); diff --git a/src/main/java/org/betterx/betterend/recipe/builders/InfusionRecipe.java b/src/main/java/org/betterx/betterend/recipe/builders/InfusionRecipe.java index f2f7fe9a..6069b186 100644 --- a/src/main/java/org/betterx/betterend/recipe/builders/InfusionRecipe.java +++ b/src/main/java/org/betterx/betterend/recipe/builders/InfusionRecipe.java @@ -272,8 +272,7 @@ public class InfusionRecipe implements Recipe, UnknownReceipBook } } else if (el.isJsonArray()) { //this is an Ingredient-Array, so read as such - JsonObject o = el.getAsJsonObject(); - return ItemUtil.fromJsonIngredientWithNBT(o); + return Ingredient.fromJson(el); } else if (obj.isJsonPrimitive()) { String s = GsonHelper.getAsString(obj, key, ""); ItemStack catalyst = ItemUtil.fromStackString(s); @@ -333,4 +332,8 @@ public class InfusionRecipe implements Recipe, UnknownReceipBook } } } + + public static void register() { + //we call this to make sure that TYPE is initialized + } }