Use ResourceLocation for network node IDs

src/main/java/com/raoulvdberge/refinedstorage/api/network/node/INetworkNode.java

@@ -3,6 +3,7 @@ package com.raoulvdberge.refinedstorage.api.network.node;
 import com.raoulvdberge.refinedstorage.api.network.INetwork;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -85,5 +86,5 @@ public interface INetworkNode {
     /**
      * @return the id of this node as specified in {@link INetworkNodeRegistry}
      */
-    String getId();
+    ResourceLocation getId();
 }

src/main/java/com/raoulvdberge/refinedstorage/api/network/node/INetworkNodeRegistry.java

@@ -1,5 +1,7 @@
 package com.raoulvdberge.refinedstorage.api.network.node;
 
+import net.minecraft.util.ResourceLocation;
+
 import javax.annotation.Nullable;
 
 /**
@@ -12,7 +14,7 @@ public interface INetworkNodeRegistry {
      * @param id      the id, as specified in {@link INetworkNode#getId()}
      * @param factory the factory
      */
-    void add(String id, INetworkNodeFactory factory);
+    void add(ResourceLocation id, INetworkNodeFactory factory);
 
     /**
      * Returns a factory from the registry.
@@ -21,5 +23,5 @@ public interface INetworkNodeRegistry {
      * @return the factory, or null if no factory was found
      */
     @Nullable
-    INetworkNodeFactory get(String id);
+    INetworkNodeFactory get(ResourceLocation id);
 }

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeManager.java

@@ -6,6 +6,7 @@ import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeManager;
 import com.raoulvdberge.refinedstorage.apiimpl.API;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.nbt.ListNBT;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.storage.WorldSavedData;
@@ -47,7 +48,7 @@ public class NetworkNodeManager extends WorldSavedData implements INetworkNodeMa
             for (int i = 0; i < nodesTag.size(); ++i) {
                 CompoundNBT nodeTag = nodesTag.getCompound(i);
 
-                String id = nodeTag.getString(NBT_NODE_ID);
+                ResourceLocation id = new ResourceLocation(nodeTag.getString(NBT_NODE_ID));
                 CompoundNBT data = nodeTag.getCompound(NBT_NODE_DATA);
                 BlockPos pos = BlockPos.fromLong(nodeTag.getLong(NBT_NODE_POS));
 
@@ -80,7 +81,7 @@ public class NetworkNodeManager extends WorldSavedData implements INetworkNodeMa
             try {
                 CompoundNBT nodeTag = new CompoundNBT();
 
-                nodeTag.putString(NBT_NODE_ID, node.getId());
+                nodeTag.putString(NBT_NODE_ID, node.getId().toString());
                 nodeTag.putLong(NBT_NODE_POS, node.getPos().toLong());
                 nodeTag.put(NBT_NODE_DATA, node.write(new CompoundNBT()));
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeRegistry.java

@@ -2,22 +2,23 @@ package com.raoulvdberge.refinedstorage.apiimpl.network;
 
 import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeFactory;
 import com.raoulvdberge.refinedstorage.api.network.node.INetworkNodeRegistry;
+import net.minecraft.util.ResourceLocation;
 
 import javax.annotation.Nullable;
 import java.util.HashMap;
 import java.util.Map;
 
 public class NetworkNodeRegistry implements INetworkNodeRegistry {
-    private Map<String, INetworkNodeFactory> factories = new HashMap<>();
+    private final Map<ResourceLocation, INetworkNodeFactory> factories = new HashMap<>();
 
     @Override
-    public void add(String id, INetworkNodeFactory factory) {
+    public void add(ResourceLocation id, INetworkNodeFactory factory) {
         factories.put(id, factory);
     }
 
     @Override
     @Nullable
-    public INetworkNodeFactory get(String id) {
+    public INetworkNodeFactory get(ResourceLocation id) {
         return factories.get(id);
     }
 }

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/CableNetworkNode.java

@@ -4,6 +4,7 @@ import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.apiimpl.network.node.cover.CoverManager;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.util.Direction;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.Constants;
@@ -12,7 +13,7 @@ import net.minecraftforge.items.IItemHandler;
 import javax.annotation.Nullable;
 
 public class CableNetworkNode extends NetworkNode implements ICoverable {
-    public static final String ID = "cable";
+    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "cable");
 
     private static final String NBT_COVERS = "Covers";
 
@@ -28,7 +29,7 @@ public class CableNetworkNode extends NetworkNode implements ICoverable {
     }
 
     @Override
-    public String getId() {
+    public ResourceLocation getId() {
         return ID;
     }
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/GridNetworkNode.java

@@ -1,5 +1,6 @@
 package com.raoulvdberge.refinedstorage.apiimpl.network.node;
 
+import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.RSItems;
 import com.raoulvdberge.refinedstorage.api.network.INetwork;
 import com.raoulvdberge.refinedstorage.api.network.grid.*;
@@ -38,6 +39,7 @@ import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.item.crafting.IRecipeType;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.util.NonNullList;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TranslationTextComponent;
@@ -58,7 +60,7 @@ import java.util.List;
 import java.util.Set;
 
 public class GridNetworkNode extends NetworkNode implements IGridNetworkAware, IType {
-    public static final String ID = "grid";
+    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "grid");
 
     public static final String NBT_VIEW_TYPE = "ViewType";
     public static final String NBT_SORTING_DIRECTION = "SortingDirection";
@@ -751,7 +753,7 @@ public class GridNetworkNode extends NetworkNode implements IGridNetworkAware, I
     }
 
     @Override
-    public String getId() {
+    public ResourceLocation getId() {
         return ID;
     }
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java

@@ -23,7 +23,6 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.UUID;
 
-// TODO: getId: return a ResourceLocation.
 public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor {
     private static final String NBT_OWNER = "Owner";
     private static final String NBT_VERSION = "Version";
@@ -33,7 +32,6 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor {
     protected INetwork network;
     protected World world;
     protected BlockPos pos;
-    private BlockState cachedBlockState;
     protected int ticks;
     protected RedstoneMode redstoneMode = RedstoneMode.IGNORE;
     @Nullable

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeConstructor.java

@@ -26,6 +26,7 @@ import net.minecraft.item.Items;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.server.management.PlayerProfileCache;
 import net.minecraft.util.Direction;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.SoundCategory;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
@@ -44,7 +45,7 @@ import javax.annotation.Nullable;
 import java.util.UUID;
 
 public class NetworkNodeConstructor extends NetworkNode implements IComparable, IType, ICoverable {
-    public static final String ID = "constructor";
+    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "constructor");
 
     private static final String NBT_COMPARE = "Compare";
     private static final String NBT_TYPE = "Type";
@@ -292,7 +293,7 @@ public class NetworkNodeConstructor extends NetworkNode implements IComparable,
     }
 
     @Override
-    public String getId() {
+    public ResourceLocation getId() {
         return ID;
     }
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafter.java

@@ -17,6 +17,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.INameable;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.server.ServerWorld;
@@ -47,7 +48,7 @@ public class NetworkNodeCrafter extends NetworkNode implements ICraftingPatternC
         }
     }
 
-    public static final String ID = "crafter";
+    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "crafter");
 
     public static final String DEFAULT_NAME = "gui.refinedstorage:crafter";
 
@@ -209,7 +210,7 @@ public class NetworkNodeCrafter extends NetworkNode implements ICraftingPatternC
     }
 
     @Override
-    public String getId() {
+    public ResourceLocation getId() {
         return ID;
     }
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCrafterManager.java

@@ -6,11 +6,12 @@ import com.raoulvdberge.refinedstorage.block.NodeBlock;
 import com.raoulvdberge.refinedstorage.tile.TileCrafterManager;
 import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 public class NetworkNodeCrafterManager extends NetworkNode {
-    public static final String ID = "crafter_manager";
+    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "crafter_manager");
 
     private static final String NBT_SIZE = "Size";
     private static final String NBT_SEARCH_BOX_MODE = "SearchBoxMode";
@@ -28,7 +29,7 @@ public class NetworkNodeCrafterManager extends NetworkNode {
     }
 
     @Override
-    public String getId() {
+    public ResourceLocation getId() {
         return ID;
     }
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeCraftingMonitor.java

@@ -11,6 +11,7 @@ import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -21,7 +22,7 @@ import java.util.Optional;
 import java.util.UUID;
 
 public class NetworkNodeCraftingMonitor extends NetworkNode implements ICraftingMonitor {
-    public static final String ID = "crafting_monitor";
+    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "crafting_monitor");
 
     private static final String NBT_TAB_SELECTED = "TabSelected";
     private static final String NBT_TAB_PAGE = "TabPage";
@@ -39,7 +40,7 @@ public class NetworkNodeCraftingMonitor extends NetworkNode implements ICrafting
     }
 
     @Override
-    public String getId() {
+    public ResourceLocation getId() {
         return ID;
     }
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDestructor.java

@@ -24,6 +24,7 @@ import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.server.management.PlayerProfileCache;
 import net.minecraft.util.Direction;
 import net.minecraft.util.NonNullList;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
@@ -45,7 +46,7 @@ import java.util.List;
 import java.util.UUID;
 
 public class NetworkNodeDestructor extends NetworkNode implements IComparable, IWhitelistBlacklist, IType, ICoverable {
-    public static final String ID = "destructor";
+    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "destructor");
 
     private static final String NBT_COMPARE = "Compare";
     private static final String NBT_MODE = "Mode";
@@ -238,7 +239,7 @@ public class NetworkNodeDestructor extends NetworkNode implements IComparable, I
     }
 
     @Override
-    public String getId() {
+    public ResourceLocation getId() {
         return ID;
     }
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDetector.java

@@ -15,6 +15,7 @@ import com.raoulvdberge.refinedstorage.util.StackUtils;
 import com.raoulvdberge.refinedstorage.util.WorldUtils;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidStack;
@@ -22,7 +23,7 @@ import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.IItemHandlerModifiable;
 
 public class NetworkNodeDetector extends NetworkNode implements IComparable, IType {
-    public static final String ID = "detector";
+    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "detector");
 
     private static final int SPEED = 5;
 
@@ -94,7 +95,7 @@ public class NetworkNodeDetector extends NetworkNode implements IComparable, ITy
     }
 
     @Override
-    public String getId() {
+    public ResourceLocation getId() {
         return ID;
     }
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExporter.java

@@ -17,6 +17,7 @@ import com.raoulvdberge.refinedstorage.util.WorldUtils;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.util.Direction;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.Constants;
@@ -31,7 +32,7 @@ import net.minecraftforge.items.wrapper.CombinedInvWrapper;
 import javax.annotation.Nullable;
 
 public class NetworkNodeExporter extends NetworkNode implements IComparable, IType, ICoverable {
-    public static final String ID = "exporter";
+    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "exporter");
 
     private static final String NBT_COMPARE = "Compare";
     private static final String NBT_TYPE = "Type";
@@ -166,7 +167,7 @@ public class NetworkNodeExporter extends NetworkNode implements IComparable, ITy
 
 
     @Override
-    public String getId() {
+    public ResourceLocation getId() {
         return ID;
     }
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExternalStorage.java

@@ -26,6 +26,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Direction;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.Constants;
@@ -38,7 +39,7 @@ import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 public class NetworkNodeExternalStorage extends NetworkNode implements IStorageProvider, IStorageScreen, IComparable, IWhitelistBlacklist, IPrioritizable, IType, IAccessType, IExternalStorageContext, ICoverable {
-    public static final String ID = "external_storage";
+    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "external_storage");
 
     private static final String NBT_PRIORITY = "Priority";
     private static final String NBT_COMPARE = "Compare";
@@ -109,7 +110,7 @@ public class NetworkNodeExternalStorage extends NetworkNode implements IStorageP
     }
 
     @Override
-    public String getId() {
+    public ResourceLocation getId() {
         return ID;
     }
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeFluidInterface.java

@@ -18,6 +18,7 @@ import com.raoulvdberge.refinedstorage.util.StackUtils;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.util.Direction;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.server.ServerWorld;
@@ -30,7 +31,7 @@ import net.minecraftforge.items.wrapper.CombinedInvWrapper;
 import org.apache.commons.lang3.tuple.Pair;
 
 public class NetworkNodeFluidInterface extends NetworkNode {
-    public static final String ID = "fluid_interface";
+    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "fluid_interface");
 
     public static final int TANK_CAPACITY = 16_000;
 
@@ -207,7 +208,7 @@ public class NetworkNodeFluidInterface extends NetworkNode {
     }
 
     @Override
-    public String getId() {
+    public ResourceLocation getId() {
         return ID;
     }
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java

@@ -19,6 +19,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Direction;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.Constants;
@@ -32,7 +33,7 @@ import net.minecraftforge.items.wrapper.CombinedInvWrapper;
 import javax.annotation.Nullable;
 
 public class NetworkNodeImporter extends NetworkNode implements IComparable, IWhitelistBlacklist, IType, ICoverable {
-    public static final String ID = "importer";
+    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "importer");
 
     private static final String NBT_COMPARE = "Compare";
     private static final String NBT_MODE = "Mode";
@@ -164,7 +165,7 @@ public class NetworkNodeImporter extends NetworkNode implements IComparable, IWh
     }
 
     @Override
-    public String getId() {
+    public ResourceLocation getId() {
         return ID;
     }
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeInterface.java

@@ -17,6 +17,7 @@ import com.raoulvdberge.refinedstorage.util.StackUtils;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.util.Direction;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.server.ServerWorld;
@@ -24,7 +25,7 @@ import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.wrapper.CombinedInvWrapper;
 
 public class NetworkNodeInterface extends NetworkNode implements IComparable {
-    public static final String ID = "interface";
+    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "interface");
 
     private static final String NBT_COMPARE = "Compare";
 
@@ -172,7 +173,7 @@ public class NetworkNodeInterface extends NetworkNode implements IComparable {
     }
 
     @Override
-    public String getId() {
+    public ResourceLocation getId() {
         return ID;
     }
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkReceiver.java

@@ -1,11 +1,12 @@
 package com.raoulvdberge.refinedstorage.apiimpl.network.node;
 
 import com.raoulvdberge.refinedstorage.RS;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 public class NetworkNodeNetworkReceiver extends NetworkNode {
-    public static final String ID = "network_receiver";
+    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "network_receiver");
 
     public NetworkNodeNetworkReceiver(World world, BlockPos pos) {
         super(world, pos);
@@ -22,7 +23,7 @@ public class NetworkNodeNetworkReceiver extends NetworkNode {
     }
 
     @Override
-    public String getId() {
+    public ResourceLocation getId() {
         return ID;
     }
 }

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeNetworkTransmitter.java

@@ -9,6 +9,7 @@ import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode;
 import com.raoulvdberge.refinedstorage.util.StackUtils;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.items.IItemHandler;
@@ -16,7 +17,7 @@ import net.minecraftforge.items.IItemHandler;
 import javax.annotation.Nullable;
 
 public class NetworkNodeNetworkTransmitter extends NetworkNode {
-    public static final String ID = "network_transmitter";
+    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "network_transmitter");
 
     private ItemHandlerBase networkCard = new ItemHandlerBase(1, new ListenerNetworkNode(this), new ItemValidatorBasic(RSItems.NETWORK_CARD)) {
         @Override
@@ -62,7 +63,7 @@ public class NetworkNodeNetworkTransmitter extends NetworkNode {
     }
 
     @Override
-    public String getId() {
+    public ResourceLocation getId() {
         return ID;
     }
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeReader.java

@@ -8,6 +8,7 @@ import com.raoulvdberge.refinedstorage.tile.TileReader;
 import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.util.Direction;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.Constants;
@@ -15,7 +16,7 @@ import net.minecraftforge.common.util.Constants;
 import javax.annotation.Nullable;
 
 public class NetworkNodeReader extends NetworkNode implements IReader, IGuiReaderWriter, ICoverable {
-    public static final String ID = "reader";
+    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "reader");
 
     private static final String NBT_CHANNEL = "Channel";
     private static final String NBT_COVERS = "Covers";
@@ -87,7 +88,7 @@ public class NetworkNodeReader extends NetworkNode implements IReader, IGuiReade
     }
 
     @Override
-    public String getId() {
+    public ResourceLocation getId() {
         return ID;
     }
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeRelay.java

@@ -3,13 +3,14 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.node;
 import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.tile.config.RedstoneMode;
 import net.minecraft.util.Direction;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 import javax.annotation.Nullable;
 
 public class NetworkNodeRelay extends NetworkNode {
-    public static final String ID = "relay";
+    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "relay");
 
     public NetworkNodeRelay(World world, BlockPos pos) {
         super(world, pos);
@@ -33,7 +34,7 @@ public class NetworkNodeRelay extends NetworkNode {
     }
 
     @Override
-    public String getId() {
+    public ResourceLocation getId() {
         return ID;
     }
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeSecurityManager.java

@@ -13,6 +13,7 @@ import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode;
 import com.raoulvdberge.refinedstorage.util.StackUtils;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.items.IItemHandler;
@@ -24,7 +25,7 @@ import java.util.List;
 import java.util.UUID;
 
 public class NetworkNodeSecurityManager extends NetworkNode implements ISecurityCardContainer {
-    public static final String ID = "security_manager";
+    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "security_manager");
 
     private List<ISecurityCard> cards = new ArrayList<>();
     private ISecurityCard globalCard;
@@ -112,7 +113,7 @@ public class NetworkNodeSecurityManager extends NetworkNode implements ISecurity
     }
 
     @Override
-    public String getId() {
+    public ResourceLocation getId() {
         return ID;
     }
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeStorageMonitor.java

@@ -1,5 +1,6 @@
 package com.raoulvdberge.refinedstorage.apiimpl.network.node;
 
+import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.api.network.security.Permission;
 import com.raoulvdberge.refinedstorage.api.util.Action;
 import com.raoulvdberge.refinedstorage.api.util.IComparer;
@@ -14,8 +15,8 @@ import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.inventory.InventoryHelper;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.Direction;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import org.apache.commons.lang3.tuple.Pair;
@@ -26,7 +27,7 @@ import java.util.Map;
 public class NetworkNodeStorageMonitor extends NetworkNode implements IComparable {
     public static final int DEPOSIT_ALL_MAX_DELAY = 500;
 
-    public static final String ID = "storage_monitor";
+    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "storage_monitor");
 
     private static final String NBT_COMPARE = "Compare";
 
@@ -145,7 +146,7 @@ public class NetworkNodeStorageMonitor extends NetworkNode implements IComparabl
     }
 
     @Override
-    public String getId() {
+    public ResourceLocation getId() {
         return ID;
     }
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWirelessTransmitter.java

@@ -9,6 +9,7 @@ import com.raoulvdberge.refinedstorage.item.UpgradeItem;
 import com.raoulvdberge.refinedstorage.util.StackUtils;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.util.Direction;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.items.IItemHandler;
@@ -16,7 +17,7 @@ import net.minecraftforge.items.IItemHandler;
 import javax.annotation.Nullable;
 
 public class NetworkNodeWirelessTransmitter extends NetworkNode implements IWirelessTransmitter {
-    public static final String ID = "wireless_transmitter";
+    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "wireless_transmitter");
 
     private ItemHandlerUpgrade upgrades = new ItemHandlerUpgrade(4, new ListenerNetworkNode(this)/* TODO , ItemUpgrade.TYPE_RANGE*/);
 
@@ -37,7 +38,7 @@ public class NetworkNodeWirelessTransmitter extends NetworkNode implements IWire
     }
 
     @Override
-    public String getId() {
+    public ResourceLocation getId() {
         return ID;
     }
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeWriter.java

@@ -11,6 +11,7 @@ import com.raoulvdberge.refinedstorage.tile.TileWriter;
 import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.util.Direction;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.Constants;
@@ -18,7 +19,7 @@ import net.minecraftforge.common.util.Constants;
 import javax.annotation.Nullable;
 
 public class NetworkNodeWriter extends NetworkNode implements IWriter, IGuiReaderWriter, ICoverable {
-    public static final String ID = "writer";
+    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "writer");
 
     private static final String NBT_CHANNEL = "Channel";
     private static final String NBT_COVERS = "Covers";
@@ -119,7 +120,7 @@ public class NetworkNodeWriter extends NetworkNode implements IWriter, IGuiReade
     }
 
     @Override
-    public String getId() {
+    public ResourceLocation getId() {
         return ID;
     }
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java

@@ -22,6 +22,7 @@ import com.raoulvdberge.refinedstorage.util.StackUtils;
 import com.raoulvdberge.refinedstorage.util.WorldUtils;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.server.ServerWorld;
@@ -55,7 +56,7 @@ public class DiskDriveNetworkNode extends NetworkNode implements IStorageProvide
 
     public static final Predicate<ItemStack> VALIDATOR_STORAGE_DISK = s -> s.getItem() instanceof IStorageDiskProvider && ((IStorageDiskProvider) s.getItem()).isValid(s);
 
-    public static final String ID = "disk_drive";
+    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "disk_drive");
 
     private static final String NBT_PRIORITY = "Priority";
     private static final String NBT_COMPARE = "Compare";
@@ -194,7 +195,7 @@ public class DiskDriveNetworkNode extends NetworkNode implements IStorageProvide
     }
 
     @Override
-    public String getId() {
+    public ResourceLocation getId() {
         return ID;
     }
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskmanipulator/NetworkNodeDiskManipulator.java

@@ -22,6 +22,7 @@ import com.raoulvdberge.refinedstorage.util.StackUtils;
 import com.raoulvdberge.refinedstorage.util.WorldUtils;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.server.ServerWorld;
@@ -38,7 +39,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 public class NetworkNodeDiskManipulator extends NetworkNode implements IComparable, IWhitelistBlacklist, IType, IStorageDiskContainerContext {
-    public static final String ID = "disk_manipulator";
+    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "disk_manipulator");
 
     public static final int IO_MODE_INSERT = 0;
     public static final int IO_MODE_EXTRACT = 1;
@@ -469,7 +470,7 @@ public class NetworkNodeDiskManipulator extends NetworkNode implements IComparab
     }
 
     @Override
-    public String getId() {
+    public ResourceLocation getId() {
         return ID;
     }
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/NetworkNodeFluidStorage.java

@@ -27,6 +27,7 @@ import com.raoulvdberge.refinedstorage.util.AccessTypeUtils;
 import net.minecraft.block.BlockState;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.server.ServerWorld;
@@ -36,7 +37,7 @@ import java.util.List;
 import java.util.UUID;
 
 public class NetworkNodeFluidStorage extends NetworkNode implements IStorageScreen, IStorageProvider, IComparable, IWhitelistBlacklist, IPrioritizable, IAccessType, IStorageDiskContainerContext {
-    public static final String ID = "fluid_storage";
+    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "fluid_storage");
 
     private static final String NBT_PRIORITY = "Priority";
     private static final String NBT_COMPARE = "Compare";
@@ -87,7 +88,7 @@ public class NetworkNodeFluidStorage extends NetworkNode implements IStorageScre
     }
 
     @Override
-    public String getId() {
+    public ResourceLocation getId() {
         return ID;
     }
 

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/storage/NetworkNodeStorage.java

@@ -28,6 +28,7 @@ import com.raoulvdberge.refinedstorage.util.StackUtils;
 import net.minecraft.block.BlockState;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.server.ServerWorld;
@@ -37,7 +38,7 @@ import java.util.List;
 import java.util.UUID;
 
 public class NetworkNodeStorage extends NetworkNode implements IStorageScreen, IStorageProvider, IComparable, IWhitelistBlacklist, IPrioritizable, IAccessType, IStorageDiskContainerContext {
-    public static final String ID = "storage";
+    public static final ResourceLocation ID = new ResourceLocation(RS.ID, "storage");
 
     private static final String NBT_PRIORITY = "Priority";
     private static final String NBT_COMPARE = "Compare";
@@ -87,7 +88,7 @@ public class NetworkNodeStorage extends NetworkNode implements IStorageScreen, I
     }
 
     @Override
-    public String getId() {
+    public ResourceLocation getId() {
         return ID;
     }
 

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

@@ -51,6 +51,7 @@ import net.minecraft.network.datasync.DataSerializers;
 import net.minecraft.tileentity.ITickableTileEntity;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Direction;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.Capability;
@@ -267,11 +268,6 @@ public class ControllerTile extends BaseTile implements ITickableTileEntity, INe
         }
     }
 
-    @Override
-    public String getId() {
-        return null;
-    }
-
     @Override
     public IItemGridHandler getItemGridHandler() {
         return itemGridHandler;
@@ -562,6 +558,11 @@ public class ControllerTile extends BaseTile implements ITickableTileEntity, INe
         return tag;
     }
 
+    @Override
+    public ResourceLocation getId() {
+        return null;
+    }
+
     @Override
     public CompoundNBT writeUpdate(CompoundNBT tag) {
         super.writeUpdate(tag);