diff options
| author | Serenibyss <10861407+serenibyss@users.noreply.github.com> | 2023-07-17 01:22:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-17 08:22:40 +0200 |
| commit | b3594d776957ffb087026704952443861ddcfb82 (patch) | |
| tree | d30c787e5792d095db63d75ad99bb0cbf30ddc28 /src/main/java/gregtech | |
| parent | 462bf05145ed2fbd6751866e25f9069c9d48b27b (diff) | |
| download | GT5-Unofficial-b3594d776957ffb087026704952443861ddcfb82.tar.gz GT5-Unofficial-b3594d776957ffb087026704952443861ddcfb82.tar.bz2 GT5-Unofficial-b3594d776957ffb087026704952443861ddcfb82.zip | |
Fix potential issue with applecore ItemFoodProxy (#2137)
* Fix potential issue with applecore ItemFoodProxy
* Fix the worst class loader issue ive ever encountered
Diffstat (limited to 'src/main/java/gregtech')
| -rw-r--r-- | src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java | 15 |
1 files changed, 7 insertions, 8 deletions
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) { |