Fixes for WorldSaveData dimension handling (#1398) and fluid in pipes…

src/main/java/gregtech/api/pipenet/PipeNet.java

@@ -19,7 +19,7 @@
 
 public abstract class PipeNet<NodeDataType> implements INBTSerializable<NBTTagCompound> {
 
-    protected final WorldPipeNet<NodeDataType, PipeNet<NodeDataType>> worldData;
+    protected WorldPipeNet<NodeDataType, PipeNet<NodeDataType>> worldData;
     private final Map<BlockPos, Node<NodeDataType>> nodeByBlockPos = new HashMap<>();
     private final Map<BlockPos, Node<NodeDataType>> unmodifiableNodeByBlockPos = Collections.unmodifiableMap(nodeByBlockPos);
     private final Map<ChunkPos, Integer> ownedChunks = new HashMap<>();
@@ -31,6 +31,12 @@ public PipeNet(WorldPipeNet<NodeDataType, ? extends PipeNet> world) {
         this.worldData = (WorldPipeNet<NodeDataType, PipeNet<NodeDataType>>) world;
     }
 
+    void setWorldData(WorldPipeNet<NodeDataType, ? extends PipeNet> worldData) {
+        this.worldData = (WorldPipeNet<NodeDataType, PipeNet<NodeDataType>>) worldData;
+        // Duplicated from WorldPipeNet.onWorldSet()
+        onConnectionsUpdate();
+    }
+
     public Set<ChunkPos> getContainedChunks() {
         return Collections.unmodifiableSet(ownedChunks.keySet());
     }

src/main/java/gregtech/api/pipenet/WorldPipeNet.java

@@ -9,27 +9,38 @@
 import net.minecraft.world.storage.WorldSavedData;
 import net.minecraftforge.common.util.Constants.NBT;
 
+import java.lang.ref.WeakReference;
 import java.util.*;
 
+import gregtech.api.util.GTLog;
+
 public abstract class WorldPipeNet<NodeDataType, T extends PipeNet<NodeDataType>> extends WorldSavedData {
 
-    private World world;
-    protected boolean isFirstTick = true;
+    private WeakReference<World> worldRef = new WeakReference<>(null);
     protected List<T> pipeNets = new ArrayList<>();
     protected Map<ChunkPos, List<T>> pipeNetsByChunk = new HashMap<>();
+    protected WorldPipeNet<NodeDataType, T> oldData = null;
+    protected boolean checkedForOldData = false;
+
+    public static String getDataID(final String baseID, final World world) {
+        if (world == null || world.isRemote)
+            throw new RuntimeException("WorldPipeNet should only be created on the server!");
+        final int dimension = world.provider.getDimension();
+        return baseID + '.' + dimension;
+    }
 
     public WorldPipeNet(String name) {
         super(name);
     }
 
     public World getWorld() {
-        return world;
+        return this.worldRef.get();
     }
 
     protected void setWorldAndInit(World world) {
-        if (isFirstTick) {
-            this.world = world;
-            this.isFirstTick = false;
+        // Reset the world as the dimensions are loaded/unloaded
+        if (world != this.worldRef.get()) {
+            this.worldRef = new WeakReference<World>(world);
             onWorldSet();
         }
     }
@@ -122,6 +133,46 @@ protected void removePipeNet(T pipeNet) {
 
     protected abstract T createNetInstance();
 
+    /*
+     * This method is invoked during tile loading
+     *
+     * It's purpose is to move pipenets from the old data file to new one based on matching block position
+     */
+    public void checkForOldData(final BlockPos blockPos) {
+        // No old data
+        if (this.oldData == null || this.oldData.pipeNets.isEmpty())
+            return;
+
+        // We have new data at this position so don't try to fix
+        if (getNetFromPos(blockPos) != null)
+            return;
+
+        // See if we have a pipenet for this block pos in the old data
+        T foundOldData = null;
+        final List<T> oldPipeNets = this.oldData.pipeNetsByChunk.getOrDefault(new ChunkPos(blockPos), Collections.emptyList());
+        for (T pipeNet : oldPipeNets) {
+            if (pipeNet.containsNode(blockPos)) {
+                if (foundOldData != null)
+                {
+                    // We have 2 pipenets at this position?
+                    GTLog.logger.warn("Found duplicate pipenets in old data at " + blockPos + " [" + foundOldData + ',' + pipeNet + ']');
+                    return;
+                }
+                foundOldData = pipeNet;
+            }
+        }
+        // Nothing found
+        if (foundOldData == null)
+            return;
+        // Move the old data into the new data
+        GTLog.logger.info("Fixing old data for " + foundOldData + " found at " + blockPos);
+        this.oldData.removePipeNet(foundOldData);
+        this.oldData.markDirty();
+        this.addPipeNetSilently(foundOldData);
+        this.markDirty();
+        foundOldData.setWorldData(this);
+    }
+
     @Override
     public void readFromNBT(NBTTagCompound nbt) {
         this.pipeNets = new ArrayList<>();

src/main/java/gregtech/api/pipenet/tickable/TickableWorldPipeNetEventHandler.java

@@ -27,16 +27,25 @@ public static void registerTickablePipeNet(Function<World, TickableWorldPipeNet<
 
     @SubscribeEvent
     public static void onWorldTick(WorldTickEvent event) {
-        getPipeNetsForWorld(event.world).forEach(TickableWorldPipeNet::update);
+        final World world = event.world;
+        if (world == null || world.isRemote)
+            return;
+        getPipeNetsForWorld(world).forEach(TickableWorldPipeNet::update);
     }
 
     @SubscribeEvent
     public static void onChunkLoad(ChunkEvent.Load event) {
-        getPipeNetsForWorld(event.getWorld()).forEach(it -> it.onChunkLoaded(event.getChunk()));
+        final World world = event.getWorld();
+        if (world == null || world.isRemote)
+            return;
+        getPipeNetsForWorld(world).forEach(it -> it.onChunkLoaded(event.getChunk()));
     }
 
     @SubscribeEvent
     public static void onChunkUnload(ChunkEvent.Unload event) {
-        getPipeNetsForWorld(event.getWorld()).forEach(it -> it.onChunkUnloaded(event.getChunk()));
+        final World world = event.getWorld();
+        if (world == null || world.isRemote)
+            return;
+        getPipeNetsForWorld(world).forEach(it -> it.onChunkUnloaded(event.getChunk()));
     }
 }

src/main/java/gregtech/api/pipenet/tile/TileEntityPipeBase.java

@@ -283,6 +283,11 @@ public void readFromNBT(NBTTagCompound compound) {
     @Override
     public void onLoad() {
         super.onLoad();
+        final World world = getWorld();
+        final BlockPipe<PipeType, NodeDataType, ?> pipeBlock = getPipeBlock();
+        if (world != null && !world.isRemote && pipeBlock != null) {
+            pipeBlock.getWorldPipeNet(world).checkForOldData(getPos());
+        }
         this.coverableImplementation.onLoad();
     }
 

src/main/java/gregtech/common/pipelike/cable/BlockCable.java

@@ -105,6 +105,8 @@ public int getActiveNodeConnections(IBlockAccess world, BlockPos nodePos, IPipeT
 
     @Override
     public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn) {
+        if (worldIn.isRemote)
+            return;
         Insulation insulation = getPipeTileEntity(worldIn, pos).getPipeType();
         boolean damageOnLossless = ConfigHolder.doLosslessWiresDamage;
         if (!worldIn.isRemote && insulation.insulationLevel == -1 && entityIn instanceof EntityLivingBase) {

src/main/java/gregtech/common/pipelike/cable/net/WorldENet.java

@@ -6,14 +6,23 @@
 
 public class WorldENet extends WorldPipeNet<WireProperties, EnergyNet> {
 
-    private static final String DATA_ID = "gregtech.e_net";
+    private static final String DATA_ID_BASE = "gregtech.e_net";
 
     public static WorldENet getWorldENet(World world) {
+        final String DATA_ID = getDataID(DATA_ID_BASE, world);
+        // First look for saved data
         WorldENet eNetWorldData = (WorldENet) world.loadData(WorldENet.class, DATA_ID);
+        // No saved data, create it and queue it to be saved
         if (eNetWorldData == null) {
             eNetWorldData = new WorldENet(DATA_ID);
             world.setData(DATA_ID, eNetWorldData);
         }
+        // See if we have old data
+        if (!eNetWorldData.checkedForOldData) {
+            eNetWorldData.oldData = (WorldENet) world.loadData(WorldENet.class, DATA_ID_BASE);
+            eNetWorldData.checkedForOldData = true;
+        }
+        // Initialise
         eNetWorldData.setWorldAndInit(world);
         return eNetWorldData;
     }

src/main/java/gregtech/common/pipelike/fluidpipe/BlockFluidPipe.java

@@ -139,6 +139,8 @@ public boolean canPushIntoFluidHandler(IPipeTile<FluidPipeType, FluidPipePropert
 
     @Override
     public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, IBlockState state, Entity entityIn) {
+        if (worldIn.isRemote)
+            return;
         if (entityIn instanceof EntityLivingBase && entityIn.world.getWorldTime() % 20 == 0L) {
             EntityLivingBase entityLiving = (EntityLivingBase) entityIn;
             FluidPipeNet pipeNet = getWorldPipeNet(worldIn).getNetFromPos(pos);

src/main/java/gregtech/common/pipelike/fluidpipe/net/FluidPipeNet.java

@@ -154,4 +154,19 @@ protected FluidPipeProperties readNodeData(NBTTagCompound tagCompound) {
         return new FluidPipeProperties(maxTemperature, throughput, gasProof);
     }
 
+    @Override
+    public NBTTagCompound serializeNBT() {
+        final NBTTagCompound nbt = super.serializeNBT();
+        nbt.setTag("FluidNetTank", this.fluidNetTank.writeToNBT(new NBTTagCompound()));
+        return nbt;
+    }
+
+    @Override
+    public void deserializeNBT(final NBTTagCompound nbt) {
+        super.deserializeNBT(nbt);
+        final NBTTagCompound tankData = nbt.getCompoundTag("FluidNetTank");
+        // Guard against old data that didn't have this tag
+        if (tankData != null)
+            this.fluidNetTank.readFromNBT(tankData);
+    }
 }

src/main/java/gregtech/common/pipelike/fluidpipe/net/WorldFluidPipeNet.java

@@ -6,14 +6,23 @@
 
 public class WorldFluidPipeNet extends WorldPipeNet<FluidPipeProperties, FluidPipeNet> {
 
-    private static final String DATA_ID = "gregtech.fluid_pipe_net";
+    private static final String DATA_ID_BASE = "gregtech.fluid_pipe_net";
 
     public static WorldFluidPipeNet getWorldPipeNet(World world) {
+        final String DATA_ID = getDataID(DATA_ID_BASE, world);
+        // First look for saved data
         WorldFluidPipeNet netWorldData = (WorldFluidPipeNet) world.loadData(WorldFluidPipeNet.class, DATA_ID);
+        // No saved data, create it and queue it to be saved
         if (netWorldData == null) {
             netWorldData = new WorldFluidPipeNet(DATA_ID);
             world.setData(DATA_ID, netWorldData);
         }
+        // See if we have old data
+        if (!netWorldData.checkedForOldData) {
+            netWorldData.oldData = (WorldFluidPipeNet) world.loadData(WorldFluidPipeNet.class, DATA_ID_BASE);
+            netWorldData.checkedForOldData = true;
+        }
+        // Initialise
         netWorldData.setWorldAndInit(world);
         return netWorldData;
     }

src/main/java/gregtech/common/pipelike/inventory/net/WorldInventoryPipeNet.java

@@ -6,9 +6,10 @@
 
 public class WorldInventoryPipeNet extends TickableWorldPipeNet<EmptyNodeData, InventoryPipeNet> {
 
-    private static final String DATA_ID = "gregtech.inventory_pipe_net";
+    private static final String DATA_ID_BASE = "gregtech.inventory_pipe_net";
 
     public static WorldInventoryPipeNet getWorldPipeNet(World world) {
+        final String DATA_ID = getDataID(DATA_ID_BASE, world);
         WorldInventoryPipeNet netWorldData = (WorldInventoryPipeNet) world.loadData(WorldInventoryPipeNet.class, DATA_ID);
         if (netWorldData == null) {
             netWorldData = new WorldInventoryPipeNet(DATA_ID);