MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Register InfusionRecipe Type

Browse source
This commit is contained in:
Frank 2023-04-29 15:16:35 +02:00
parent 89e6b2348e
commit c8790686a4
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/betterx/betterend/BetterEnd.java
View file

@ -8,6 +8,7 @@ import org.betterx.betterend.commands.CommandRegistry;
import org.betterx.betterend.config.Configs; import org.betterx.betterend.config.Configs;
import org.betterx.betterend.effects.EndPotions; import org.betterx.betterend.effects.EndPotions;
import org.betterx.betterend.integration.Integrations; import org.betterx.betterend.integration.Integrations;
import org.betterx.betterend.recipe.builders.InfusionRecipe;
import org.betterx.betterend.registry.*; import org.betterx.betterend.registry.*;
import org.betterx.betterend.util.BonemealPlants; import org.betterx.betterend.util.BonemealPlants;
import org.betterx.betterend.util.LootTableUtil; import org.betterx.betterend.util.LootTableUtil;
@ -46,6 +47,7 @@ public class BetterEnd implements ModInitializer {
EndItems.ensureStaticallyLoaded(); EndItems.ensureStaticallyLoaded();
EndEnchantments.register(); EndEnchantments.register();
EndPotions.register(); EndPotions.register();
InfusionRecipe.register();
EndStructures.register(); EndStructures.register();
BonemealPlants.init(); BonemealPlants.init();
GeneratorOptions.init(); GeneratorOptions.init();

7
src/main/java/org/betterx/betterend/recipe/builders/InfusionRecipe.java
View file

@ -272,8 +272,7 @@ public class InfusionRecipe implements Recipe<InfusionRitual>, UnknownReceipBook
} }
} else if (el.isJsonArray()) { } else if (el.isJsonArray()) {
//this is an Ingredient-Array, so read as such //this is an Ingredient-Array, so read as such
JsonObject o = el.getAsJsonObject(); return Ingredient.fromJson(el);
return ItemUtil.fromJsonIngredientWithNBT(o);
} else if (obj.isJsonPrimitive()) { } else if (obj.isJsonPrimitive()) {
String s = GsonHelper.getAsString(obj, key, ""); String s = GsonHelper.getAsString(obj, key, "");
ItemStack catalyst = ItemUtil.fromStackString(s); ItemStack catalyst = ItemUtil.fromStackString(s);
@ -333,4 +332,8 @@ public class InfusionRecipe implements Recipe<InfusionRitual>, UnknownReceipBook
} }
} }
} }
public static void register() {
//we call this to make sure that TYPE is initialized
}
} }