Better fix for #1326 and #1307

src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java

@@ -343,9 +343,7 @@ public class ProxyCommon {
             TileBase tileInstance = tile.newInstance();
 
             if (tileInstance instanceof TileNode) {
-                String nodeId = ((TileNode) tileInstance).createNode(null, null).getId();
+                API.instance().getNetworkNodeRegistry().add(((TileNode) tileInstance).getNodeId(), (tag, world, pos) -> {
-
-                API.instance().getNetworkNodeRegistry().add(nodeId, (tag, world, pos) -> {
                     NetworkNode node = ((TileNode) tileInstance).createNode(world, pos);
 
                     node.read(tag);

src/main/java/com/raoulvdberge/refinedstorage/tile/TileCable.java

@@ -12,4 +12,9 @@ public class TileCable extends TileNode<NetworkNodeCable> {
     public NetworkNodeCable createNode(World world, BlockPos pos) {
         return new NetworkNodeCable(world, pos);
     }
+
+    @Override
+    public String getNodeId() {
+        return NetworkNodeCable.ID;
+    }
 }

src/main/java/com/raoulvdberge/refinedstorage/tile/TileConstructor.java

@@ -39,4 +39,9 @@ public class TileConstructor extends TileNode<NetworkNodeConstructor> {
     public NetworkNodeConstructor createNode(World world, BlockPos pos) {
         return new NetworkNodeConstructor(world, pos);
     }
+
+    @Override
+    public String getNodeId() {
+        return NetworkNodeConstructor.ID;
+    }
 }

src/main/java/com/raoulvdberge/refinedstorage/tile/TileCrafter.java

@@ -12,4 +12,9 @@ public class TileCrafter extends TileNode<NetworkNodeCrafter> {
     public NetworkNodeCrafter createNode(World world, BlockPos pos) {
         return new NetworkNodeCrafter(world, pos);
     }
+
+    @Override
+    public String getNodeId() {
+        return NetworkNodeCrafter.ID;
+    }
 }

src/main/java/com/raoulvdberge/refinedstorage/tile/TileDestructor.java

@@ -42,4 +42,9 @@ public class TileDestructor extends TileNode<NetworkNodeDestructor> {
     public NetworkNodeDestructor createNode(World world, BlockPos pos) {
         return new NetworkNodeDestructor(world, pos);
     }
+
+    @Override
+    public String getNodeId() {
+        return NetworkNodeDestructor.ID;
+    }
 }

src/main/java/com/raoulvdberge/refinedstorage/tile/TileDetector.java

@@ -88,4 +88,9 @@ public class TileDetector extends TileNode<NetworkNodeDetector> {
     public NetworkNodeDetector createNode(World world, BlockPos pos) {
         return new NetworkNodeDetector(world, pos);
     }
+
+    @Override
+    public String getNodeId() {
+        return NetworkNodeDetector.ID;
+    }
 }

src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskDrive.java

@@ -176,4 +176,9 @@ public class TileDiskDrive extends TileNode<NetworkNodeDiskDrive> {
     public NetworkNodeDiskDrive createNode(World world, BlockPos pos) {
         return new NetworkNodeDiskDrive(world, pos);
     }
+
+    @Override
+    public String getNodeId() {
+        return NetworkNodeDiskDrive.ID;
+    }
 }

src/main/java/com/raoulvdberge/refinedstorage/tile/TileDiskManipulator.java

@@ -86,4 +86,9 @@ public class TileDiskManipulator extends TileNode<NetworkNodeDiskManipulator> {
     public NetworkNodeDiskManipulator createNode(World world, BlockPos pos) {
         return new NetworkNodeDiskManipulator(world, pos);
     }
+
+    @Override
+    public String getNodeId() {
+        return NetworkNodeDiskManipulator.ID;
+    }
 }

src/main/java/com/raoulvdberge/refinedstorage/tile/TileExporter.java

@@ -83,4 +83,9 @@ public class TileExporter extends TileNode<NetworkNodeExporter> {
     public NetworkNodeExporter createNode(World world, BlockPos pos) {
         return new NetworkNodeExporter(world, pos);
     }
+
+    @Override
+    public String getNodeId() {
+        return NetworkNodeExporter.ID;
+    }
 }

src/main/java/com/raoulvdberge/refinedstorage/tile/TileExternalStorage.java

@@ -69,4 +69,9 @@ public class TileExternalStorage extends TileNode<NetworkNodeExternalStorage> {
     public NetworkNodeExternalStorage createNode(World world, BlockPos pos) {
         return new NetworkNodeExternalStorage(world, pos);
     }
+
+    @Override
+    public String getNodeId() {
+        return NetworkNodeExternalStorage.ID;
+    }
 }

src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidInterface.java

@@ -57,4 +57,9 @@ public class TileFluidInterface extends TileNode<NetworkNodeFluidInterface> {
     public NetworkNodeFluidInterface createNode(World world, BlockPos pos) {
         return new NetworkNodeFluidInterface(world, pos);
     }
+
+    @Override
+    public String getNodeId() {
+        return NetworkNodeFluidInterface.ID;
+    }
 }

src/main/java/com/raoulvdberge/refinedstorage/tile/TileFluidStorage.java

@@ -38,5 +38,10 @@ public class TileFluidStorage extends TileNode<NetworkNodeFluidStorage> {
     public NetworkNodeFluidStorage createNode(World world, BlockPos pos) {
         return new NetworkNodeFluidStorage(world, pos);
     }
+
+    @Override
+    public String getNodeId() {
+        return NetworkNodeFluidStorage.ID;
+    }
 }
 

src/main/java/com/raoulvdberge/refinedstorage/tile/TileImporter.java

@@ -26,4 +26,9 @@ public class TileImporter extends TileNode<NetworkNodeImporter> {
     public NetworkNodeImporter createNode(World world, BlockPos pos) {
         return new NetworkNodeImporter(world, pos);
     }
+
+    @Override
+    public String getNodeId() {
+        return NetworkNodeImporter.ID;
+    }
 }

src/main/java/com/raoulvdberge/refinedstorage/tile/TileInterface.java

@@ -38,4 +38,9 @@ public class TileInterface extends TileNode<NetworkNodeInterface> {
     public NetworkNodeInterface createNode(World world, BlockPos pos) {
         return new NetworkNodeInterface(world, pos);
     }
+
+    @Override
+    public String getNodeId() {
+        return NetworkNodeInterface.ID;
+    }
 }

src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkReceiver.java

@@ -12,4 +12,9 @@ public class TileNetworkReceiver extends TileNode<NetworkNodeNetworkReceiver> {
     public NetworkNodeNetworkReceiver createNode(World world, BlockPos pos) {
         return new NetworkNodeNetworkReceiver(world, pos);
     }
+
+    @Override
+    public String getNodeId() {
+        return NetworkNodeNetworkReceiver.ID;
+    }
 }

src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkTransmitter.java

@@ -49,6 +49,11 @@ public class TileNetworkTransmitter extends TileNode<NetworkNodeNetworkTransmitt
         return new NetworkNodeNetworkTransmitter(world, pos);
     }
 
+    @Override
+    public String getNodeId() {
+        return NetworkNodeNetworkTransmitter.ID;
+    }
+
     @Override
     public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing) {
         return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(capability, facing);

src/main/java/com/raoulvdberge/refinedstorage/tile/TileNode.java

@@ -102,8 +102,8 @@ public abstract class TileNode<N extends NetworkNode> extends TileBase implement
         INetworkNodeManager manager = API.instance().getNetworkNodeManager(world);
 
         NetworkNode node = (NetworkNode) manager.getNode(pos);
-        
+
-        if (node == null) {
+        if (node == null || !node.getId().equals(getNodeId())) {
             manager.setNode(pos, node = createNode(world, pos));
             manager.markForSaving();
         }
@@ -112,16 +112,7 @@ public abstract class TileNode<N extends NetworkNode> extends TileBase implement
             doLegacyCheck(node);
         }
 
-        N castedNode;
+        return (N) node;
-
-        try {
-            castedNode = (N) node;
-        } catch (ClassCastException e) {
-            manager.setNode(pos, castedNode = createNode(world, pos));
-            manager.markForSaving();
-        }
-
-        return castedNode;
     }
 
     private void doLegacyCheck(NetworkNode node) {
@@ -149,6 +140,8 @@ public abstract class TileNode<N extends NetworkNode> extends TileBase implement
 
     public abstract N createNode(World world, BlockPos pos);
 
+    public abstract String getNodeId();
+
     @Override
     public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing side) {
         if (capability == CapabilityNetworkNodeProxy.NETWORK_NODE_PROXY_CAPABILITY) {

src/main/java/com/raoulvdberge/refinedstorage/tile/TileReader.java

@@ -139,4 +139,9 @@ public class TileReader extends TileNode<NetworkNodeReader> {
     public NetworkNodeReader createNode(World world, BlockPos pos) {
         return new NetworkNodeReader(world, pos);
     }
+
+    @Override
+    public String getNodeId() {
+        return NetworkNodeReader.ID;
+    }
 }

src/main/java/com/raoulvdberge/refinedstorage/tile/TileRelay.java

@@ -12,4 +12,9 @@ public class TileRelay extends TileNode<NetworkNodeRelay> {
     public NetworkNodeRelay createNode(World world, BlockPos pos) {
         return new NetworkNodeRelay(world, pos);
     }
+
+    @Override
+    public String getNodeId() {
+        return NetworkNodeRelay.ID;
+    }
 }

src/main/java/com/raoulvdberge/refinedstorage/tile/TileSecurityManager.java

@@ -12,4 +12,9 @@ public class TileSecurityManager extends TileNode<NetworkNodeSecurityManager> {
     public NetworkNodeSecurityManager createNode(World world, BlockPos pos) {
         return new NetworkNodeSecurityManager(world, pos);
     }
+
+    @Override
+    public String getNodeId() {
+        return NetworkNodeSecurityManager.ID;
+    }
 }

src/main/java/com/raoulvdberge/refinedstorage/tile/TileSolderer.java

@@ -95,4 +95,9 @@ public class TileSolderer extends TileNode<NetworkNodeSolderer> {
     public NetworkNodeSolderer createNode(World world, BlockPos pos) {
         return new NetworkNodeSolderer(world, pos);
     }
+
+    @Override
+    public String getNodeId() {
+        return NetworkNodeSolderer.ID;
+    }
 }

src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorage.java

@@ -38,4 +38,9 @@ public class TileStorage extends TileNode<NetworkNodeStorage> {
     public NetworkNodeStorage createNode(World world, BlockPos pos) {
         return new NetworkNodeStorage(world, pos);
     }
+
+    @Override
+    public String getNodeId() {
+        return NetworkNodeStorage.ID;
+    }
 }

src/main/java/com/raoulvdberge/refinedstorage/tile/TileStorageMonitor.java

@@ -35,6 +35,11 @@ public class TileStorageMonitor extends TileNode<NetworkNodeStorageMonitor> {
         return new NetworkNodeStorageMonitor(world, pos);
     }
 
+    @Override
+    public String getNodeId() {
+        return NetworkNodeStorageMonitor.ID;
+    }
+
     @Override
     public NBTTagCompound writeUpdate(NBTTagCompound tag) {
         super.writeUpdate(tag);

src/main/java/com/raoulvdberge/refinedstorage/tile/TileWirelessTransmitter.java

@@ -26,4 +26,9 @@ public class TileWirelessTransmitter extends TileNode<NetworkNodeWirelessTransmi
     public NetworkNodeWirelessTransmitter createNode(World world, BlockPos pos) {
         return new NetworkNodeWirelessTransmitter(world, pos);
     }
+
+    @Override
+    public String getNodeId() {
+        return NetworkNodeWirelessTransmitter.ID;
+    }
 }

src/main/java/com/raoulvdberge/refinedstorage/tile/TileWriter.java

@@ -113,4 +113,9 @@ public class TileWriter extends TileNode<NetworkNodeWriter> {
     public NetworkNodeWriter createNode(World world, BlockPos pos) {
         return new NetworkNodeWriter(world, pos);
     }
+
+    @Override
+    public String getNodeId() {
+        return NetworkNodeWriter.ID;
+    }
 }

src/main/java/com/raoulvdberge/refinedstorage/tile/craftingmonitor/TileCraftingMonitor.java

@@ -41,4 +41,9 @@ public class TileCraftingMonitor extends TileNode<NetworkNodeCraftingMonitor> {
     public NetworkNodeCraftingMonitor createNode(World world, BlockPos pos) {
         return new NetworkNodeCraftingMonitor(world, pos);
     }
+
+    @Override
+    public String getNodeId() {
+        return NetworkNodeCraftingMonitor.ID;
+    }
 }

src/main/java/com/raoulvdberge/refinedstorage/tile/grid/TileGrid.java

@@ -146,4 +146,9 @@ public class TileGrid extends TileNode<NetworkNodeGrid> {
     public NetworkNodeGrid createNode(World world, BlockPos pos) {
         return new NetworkNodeGrid(world, pos);
     }
+
+    @Override
+    public String getNodeId() {
+        return NetworkNodeGrid.ID;
+    }
 }