update deps

Added a new method `onWorldUnload` to `ClientNetworkManager` to destroy and clear any network instances when the world event `Unload` is triggered. The addition of this event handler was necessary to prevent the possibility of any network instances persisting on the client side beyond the World lifetime, thus potentially causing memory leaks.

build.gradle

@@ -1,4 +1,4 @@
-//version: 1696952014
+//version: 1699290261
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -646,7 +646,7 @@ repositories {
 
 def mixinProviderGroup = "io.github.legacymoddingmc"
 def mixinProviderModule = "unimixins"
-def mixinProviderVersion = "0.1.7.1"
+def mixinProviderVersion = "0.1.13"
 def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}"
 def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev"
 ext.mixinProviderSpec = mixinProviderSpec
@@ -798,7 +798,7 @@ dependencies {
         java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
     }
     if (modId != 'hodgepodge') {
-        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.7')
+        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.17')
     }
 
     java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
@@ -1187,9 +1187,8 @@ publishing {
             version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
         }
     }
-
     repositories {
-        if (usesMavenPublishing.toBoolean()) {
+        if (usesMavenPublishing.toBoolean() && System.getenv("MAVEN_USER") != null) {
             maven {
                 url = mavenPublishUrl
                 allowInsecureProtocol = mavenPublishUrl.startsWith("http://") // Mostly for the GTNH maven

dependencies.gradle

@@ -2,21 +2,21 @@
 
 dependencies {
     api('com.github.GTNewHorizons:EnderCore:0.2.18:dev')
-    implementation('com.github.GTNewHorizons:ForestryMC:4.6.14:dev')
-    implementation('com.github.GTNewHorizons:NotEnoughItems:2.4.5-GTNH:dev')
+    implementation('com.github.GTNewHorizons:ForestryMC:4.7.0:dev')
+    implementation('com.github.GTNewHorizons:NotEnoughItems:2.4.12-GTNH:dev')
     implementation("com.github.GTNewHorizons:GTNHLib:0.0.13:dev")
     api('com.github.GTNewHorizons:BuildCraft:7.1.36:dev')
     api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748
     shadowImplementation('cglib:cglib-nodep:3.3.0')
 
-    compileOnly('com.github.GTNewHorizons:waila:1.6.0:api') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-262-GTNH:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:waila:1.6.3:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-282-GTNH:api') {transitive = false}
     compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.16:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.36:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:Railcraft:9.15.0:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.83:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:Railcraft:9.15.1:api') {transitive = false}
     compileOnly('com.github.GTNewHorizons:StorageDrawers:1.12.1-GTNH:api') {transitive = false}
-    implementation('com.github.GTNewHorizons:Chisel:2.11.4-GTNH:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.17-GTNH:api') {transitive = false}
+    implementation('com.github.GTNewHorizons:Chisel:2.12.2-GTNH:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.19-GTNH:api') {transitive = false}
     compileOnly('curse.maven:minefactory-reloaded-66672:2366150') // https://www.curseforge.com/minecraft/mc-mods/minefactory-reloaded/files/2366150
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
     compileOnly('curse.maven:ee3-65509:2305023') // https://www.curseforge.com/minecraft/mc-mods/ee3/files/2305023

src/main/java/crazypants/enderio/machine/capbank/network/ClientNetworkManager.java

@@ -4,13 +4,20 @@ import java.util.HashMap;
 import java.util.Map;
 
 import net.minecraft.world.World;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.world.WorldEvent;
 
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import crazypants.enderio.machine.capbank.TileCapBank;
 
 public class ClientNetworkManager {
 
     private static final ClientNetworkManager instance = new ClientNetworkManager();
 
+    static {
+        MinecraftForge.EVENT_BUS.register(instance);
+    }
+
     public static ClientNetworkManager getInstance() {
         return instance;
     }
@@ -53,4 +60,12 @@ public class ClientNetworkManager {
         CapBankClientNetwork network = getOrCreateNetwork(id);
         network.addMember(tileCapBank);
     }
+
+    @SubscribeEvent
+    public void onWorldUnload(WorldEvent.Unload event) {
+        if (event.world.isRemote) {
+            networks.forEach((id, network) -> network.destroyNetwork());
+            networks.clear();
+        }
+    }
 }

src/main/java/crazypants/enderio/machine/obelisk/ObeliskSpecialRenderer.java

@@ -114,7 +114,7 @@ public class ObeliskSpecialRenderer<T extends TileEntity> extends TileEntitySpec
 
     protected void renderItemStack(T te, World world, double x, double y, double z, float tick) {
         if (ei == null) {
-            ei = new EntityItem(world, 0, 0, 0, getFloatingItem(te));
+            ei = new EntityItem(null, 0, 0, 0, getFloatingItem(te));
         }
 
         ei.setEntityItemStack(getFloatingItem(te));

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<String> getWailaBody(ItemStack itemStack, List<String> 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<String> currenttip) {
+    private void getWailaBodyConduitBundle(ItemStack itemStack, List<String> 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();
-    }
 }