From 83f52d15c7eb46ec1998bf90a5ced60ad582eb96 Mon Sep 17 00:00:00 2001 From: Pelotrio <45769595+Pelotrio@users.noreply.github.com> Date: Sat, 11 Nov 2023 01:57:56 +0100 Subject: [PATCH] Removed the redundant static IWailaDataAccessor _accessor to not leak the world object --- .../crazypants/enderio/waila/WailaCompat.java | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index 66682914..67186712 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -125,8 +125,6 @@ public class WailaCompat implements IWailaDataProvider { public static final WailaCompat INSTANCE = new WailaCompat(); - private static IWailaDataAccessor _accessor = null; - public static void load(IWailaRegistrar registrar) { registrar.registerStackProvider(INSTANCE, IFacade.class); registrar.registerStackProvider(INSTANCE, BlockDarkSteelAnvil.class); @@ -190,8 +188,6 @@ public class WailaCompat implements IWailaDataProvider { public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - _accessor = accessor; - EntityPlayer player = accessor.getPlayer(); MovingObjectPosition pos = accessor.getPosition(); int x = pos.blockX, y = pos.blockY, z = pos.blockZ; @@ -267,7 +263,7 @@ public class WailaCompat implements IWailaDataProvider { } if (te instanceof IConduitBundle) { - getWailaBodyConduitBundle(itemStack, currenttip); + getWailaBodyConduitBundle(itemStack, currenttip, accessor); } else if (te instanceof IInternalPoweredTile && block == accessor.getBlock() && !(te instanceof TileCapBank)) { IInternalPoweredTile power = (IInternalPoweredTile) te; @@ -297,13 +293,13 @@ public class WailaCompat implements IWailaDataProvider { return currenttip; } - private void getWailaBodyConduitBundle(ItemStack itemStack, List currenttip) { + private void getWailaBodyConduitBundle(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor) { if (itemStack == null) { return; } if (itemStack.getItem() == EnderIO.itemPowerConduit || itemStack.getItem() == EnderIO.itemPowerConduitEndergy) { - NBTTagCompound nbtRoot = _accessor.getNBTData(); + NBTTagCompound nbtRoot = accessor.getNBTData(); if (nbtRoot.hasKey("storedEnergyRF")) { int stored = nbtRoot.getInteger("storedEnergyRF"); int max = nbtRoot.getInteger("maxStoredRF"); @@ -320,7 +316,7 @@ public class WailaCompat implements IWailaDataProvider { } } else if (itemStack.getItem() == EnderIO.itemLiquidConduit) { - NBTTagCompound nbtRoot = _accessor.getNBTData(); + NBTTagCompound nbtRoot = accessor.getNBTData(); if (nbtRoot.hasKey("fluidLocked") && nbtRoot.hasKey("FluidName")) { boolean fluidTypeLocked = nbtRoot.getBoolean("fluidLocked"); FluidStack fluid = FluidStack.loadFluidStackFromNBT(nbtRoot); @@ -352,7 +348,7 @@ public class WailaCompat implements IWailaDataProvider { } } else if (itemStack.getItem() == EnderIO.itemMEConduit) { - NBTTagCompound nbtRoot = _accessor.getNBTData(); + NBTTagCompound nbtRoot = accessor.getNBTData(); if (nbtRoot.hasKey("isDense")) { boolean isDenseUltra = nbtRoot.getBoolean("isDenseUltra"); boolean isDense = nbtRoot.getBoolean("isDense"); @@ -411,7 +407,4 @@ public class WailaCompat implements IWailaDataProvider { return tag; } - public static NBTTagCompound getNBTData() { - return _accessor.getNBTData(); - } }