From b3594d776957ffb087026704952443861ddcfb82 Mon Sep 17 00:00:00 2001 From: Serenibyss <10861407+serenibyss@users.noreply.github.com> Date: Mon, 17 Jul 2023 01:22:40 -0500 Subject: Fix potential issue with applecore ItemFoodProxy (#2137) * Fix potential issue with applecore ItemFoodProxy * Fix the worst class loader issue ive ever encountered --- .../java/gregtech/api/items/GT_MetaGenerated_Item.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java index 14da8254ef..9257c7c835 100644 --- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java +++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java @@ -45,6 +45,7 @@ import gregtech.api.util.GT_Utility; import gregtech.common.render.items.GT_GeneratedMaterial_Renderer; import squeek.applecore.api.food.FoodValues; import squeek.applecore.api.food.IEdible; +import squeek.applecore.api.food.ItemFoodProxy; /** * @author Gregorius Techneticies @@ -332,14 +333,7 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements if (tStat != null) { if (AppleCore.isModLoaded()) { aPlayer.getFoodStats() - .func_151686_a( - (ItemFood) GT_Utility.callConstructor( - "squeek.applecore.api.food.ItemFoodProxy.ItemFoodProxy", - 0, - null, - true, - this), - aStack); + .func_151686_a(getFoodProxy(this), aStack); } else { aPlayer.getFoodStats() .addStats(tStat.getFoodLevel(this, aStack, aPlayer), tStat.getSaturation(this, aStack, aPlayer)); @@ -349,6 +343,11 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item implements return aStack; } + @Optional.Method(modid = Mods.Names.APPLE_CORE) + private static ItemFood getFoodProxy(Object edible) { + return new ItemFoodProxy((IEdible) edible); + } + @Override @Optional.Method(modid = Mods.Names.APPLE_CORE) public FoodValues getFoodValues(ItemStack aStack) { -- cgit