From d4deba9932f6213d24df5be069fc36b5ef8ff3f9 Mon Sep 17 00:00:00 2001
From: raoulvdberge <raoulvdberge@gmail.com>
Date: Mon, 9 Jul 2018 10:36:30 +0200
Subject: [PATCH] Minor fixes.

---
 .../com/raoulvdberge/refinedstorage/block/BlockBase.java    | 4 ++--
 .../com/raoulvdberge/refinedstorage/block/BlockCable.java   | 2 +-
 .../raoulvdberge/refinedstorage/block/BlockController.java  | 2 +-
 .../raoulvdberge/refinedstorage/block/BlockDetector.java    | 2 +-
 .../raoulvdberge/refinedstorage/block/BlockDiskDrive.java   | 4 ++--
 .../refinedstorage/block/BlockDiskManipulator.java          | 4 ++--
 .../refinedstorage/block/BlockFluidStorage.java             | 2 +-
 .../com/raoulvdberge/refinedstorage/block/BlockGrid.java    | 2 +-
 .../com/raoulvdberge/refinedstorage/block/BlockNode.java    | 6 +++---
 .../refinedstorage/block/BlockPortableGrid.java             | 2 +-
 .../com/raoulvdberge/refinedstorage/block/BlockStorage.java | 2 +-
 .../com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java  | 2 +-
 12 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java
index cdae4fcf4..9fa9430f9 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockBase.java
@@ -41,7 +41,7 @@ public abstract class BlockBase extends Block {
         return "block." + info.getModId() + ":" + info.getId();
     }
 
-    protected BlockStateContainer.Builder createStateBuilder() {
+    protected BlockStateContainer.Builder createBlockStateBuilder() {
         BlockStateContainer.Builder builder = new BlockStateContainer.Builder(this);
 
         if (getDirection() != null) {
@@ -53,7 +53,7 @@ public abstract class BlockBase extends Block {
 
     @Override
     protected BlockStateContainer createBlockState() {
-        return createStateBuilder().build();
+        return createBlockStateBuilder().build();
     }
 
     public Item createItem() {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java
index 36cfba31e..7add8d06d 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java
@@ -71,7 +71,7 @@ public class BlockCable extends BlockNode {
 
     @Override
     protected BlockStateContainer createBlockState() {
-        return super.createStateBuilder()
+        return super.createBlockStateBuilder()
             .add(NORTH)
             .add(EAST)
             .add(SOUTH)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java
index dc827d031..7c4dcc371 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java
@@ -40,7 +40,7 @@ public class BlockController extends BlockNodeProxy {
 
     @Override
     protected BlockStateContainer createBlockState() {
-        return createStateBuilder()
+        return createBlockStateBuilder()
             .add(TYPE)
             .add(ENERGY_TYPE)
             .build();
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java
index 0f7537d5f..975ec9bcb 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDetector.java
@@ -27,7 +27,7 @@ public class BlockDetector extends BlockNode {
 
     @Override
     protected BlockStateContainer createBlockState() {
-        return createStateBuilder()
+        return createBlockStateBuilder()
             .add(POWERED)
             .build();
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskDrive.java
index deb859e7d..25df2464f 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskDrive.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskDrive.java
@@ -37,8 +37,8 @@ public class BlockDiskDrive extends BlockNode {
     }
 
     @Override
-    protected BlockStateContainer.Builder createStateBuilder() {
-        return super.createStateBuilder().add(DISK_STATE);
+    protected BlockStateContainer.Builder createBlockStateBuilder() {
+        return super.createBlockStateBuilder().add(DISK_STATE);
     }
 
     @Override
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java
index a5d1218f3..8974ab31a 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java
@@ -37,8 +37,8 @@ public class BlockDiskManipulator extends BlockNode {
     }
 
     @Override
-    protected BlockStateContainer.Builder createStateBuilder() {
-        return super.createStateBuilder().add(DISK_STATE);
+    protected BlockStateContainer.Builder createBlockStateBuilder() {
+        return super.createBlockStateBuilder().add(DISK_STATE);
     }
 
     @Override
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java
index 68f0cf30b..329377a0b 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java
@@ -39,7 +39,7 @@ public class BlockFluidStorage extends BlockNode {
 
     @Override
     protected BlockStateContainer createBlockState() {
-        return createStateBuilder()
+        return createBlockStateBuilder()
             .add(TYPE)
             .build();
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java
index ce63bc494..952f07372 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java
@@ -43,7 +43,7 @@ public class BlockGrid extends BlockNode {
 
     @Override
     protected BlockStateContainer createBlockState() {
-        return createStateBuilder()
+        return createBlockStateBuilder()
             .add(TYPE)
             .build();
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNode.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNode.java
index e2d087ca0..754330c24 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNode.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockNode.java
@@ -57,8 +57,8 @@ public abstract class BlockNode extends BlockNodeProxy {
     }
 
     @Override
-    protected BlockStateContainer.Builder createStateBuilder() {
-        BlockStateContainer.Builder builder = super.createStateBuilder();
+    protected BlockStateContainer.Builder createBlockStateBuilder() {
+        BlockStateContainer.Builder builder = super.createBlockStateBuilder();
 
         if (hasConnectivityState()) {
             builder.add(CONNECTED);
@@ -69,7 +69,7 @@ public abstract class BlockNode extends BlockNodeProxy {
 
     @Override
     protected BlockStateContainer createBlockState() {
-        return createStateBuilder().build();
+        return createBlockStateBuilder().build();
     }
 
     @Override
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockPortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockPortableGrid.java
index 92938b9b6..5500f962e 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockPortableGrid.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockPortableGrid.java
@@ -91,7 +91,7 @@ public class BlockPortableGrid extends BlockBase {
 
     @Override
     protected BlockStateContainer createBlockState() {
-        return createStateBuilder()
+        return createBlockStateBuilder()
             .add(TYPE)
             .add(DISK_STATE)
             .add(CONNECTED)
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java
index 8fdbc56e8..24c769590 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java
@@ -39,7 +39,7 @@ public class BlockStorage extends BlockNode {
 
     @Override
     protected BlockStateContainer createBlockState() {
-        return createStateBuilder()
+        return createBlockStateBuilder()
             .add(TYPE)
             .build();
     }
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java
index 1d5dbf138..2377f5136 100755
--- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java
@@ -349,7 +349,7 @@ public class ProxyCommon {
     private void registerTile(IBlockInfo info) {
         Class<? extends TileBase> clazz = info.createTileEntity().getClass();
 
-        GameRegistry.registerTileEntity(clazz, new ResourceLocation(RS.ID, info.getId()));
+        GameRegistry.registerTileEntity(clazz, new ResourceLocation(info.getModId(), info.getId()));
 
         try {
             TileBase tileInstance = clazz.newInstance();