More renames / fixes

src/main/java/refinedstorage/block/BlockBase.java

@@ -108,7 +108,7 @@ public abstract class BlockBase extends Block {
 
             EnumFacing facing = getDirectionType().getFrom(pos, player);
 
-            if (player.isSneaking() && getDirectionType() == EnumDirectionType.ANY) {
+            if (player.isSneaking() && getDirectionType() == EnumPlacementType.ANY) {
                 facing = facing.getOpposite();
             }
 
@@ -145,7 +145,7 @@ public abstract class BlockBase extends Block {
         world.setBlockToAir(pos);
     }
 
-    public EnumDirectionType getDirectionType() {
+    public EnumPlacementType getDirectionType() {
-        return EnumDirectionType.HORIZONTAL;
+        return EnumPlacementType.HORIZONTAL;
     }
 }

src/main/java/refinedstorage/block/BlockCable.java

@@ -76,7 +76,7 @@ public class BlockCable extends BlockNode {
     }
 
     @Override
-    public EnumDirectionType getDirectionType() {
+    public EnumPlacementType getDirectionType() {
         return null;
     }
 }

src/main/java/refinedstorage/block/BlockConstructor.java

@@ -32,7 +32,7 @@ public class BlockConstructor extends BlockNode {
     }
 
     @Override
-    public EnumDirectionType getDirectionType() {
+    public EnumPlacementType getDirectionType() {
-        return EnumDirectionType.ANY;
+        return EnumPlacementType.ANY;
     }
 }

src/main/java/refinedstorage/block/BlockCrafter.java

@@ -32,11 +32,11 @@ public class BlockCrafter extends BlockNode {
     }
 
     @Override
-    public EnumDirectionType getDirectionType() {
+    public EnumPlacementType getDirectionType() {
-        return EnumDirectionType.ANY;
+        return EnumPlacementType.ANY;
     }
 
-    public boolean canRetrieveConnectivityUpdate() {
+    public boolean hasConnectivityState() {
         return true;
     }
 }

src/main/java/refinedstorage/block/BlockCraftingMonitor.java

@@ -31,7 +31,7 @@ public class BlockCraftingMonitor extends BlockNode {
         return true;
     }
 
-    public boolean canRetrieveConnectivityUpdate() {
+    public boolean hasConnectivityState() {
         return true;
     }
 }

src/main/java/refinedstorage/block/BlockDestructor.java

@@ -32,7 +32,7 @@ public class BlockDestructor extends BlockNode {
     }
 
     @Override
-    public EnumDirectionType getDirectionType() {
+    public EnumPlacementType getDirectionType() {
-        return EnumDirectionType.ANY;
+        return EnumPlacementType.ANY;
     }
 }

src/main/java/refinedstorage/block/BlockDetector.java

@@ -71,7 +71,7 @@ public class BlockDetector extends BlockNode {
     }
 
     @Override
-    public EnumDirectionType getDirectionType() {
+    public EnumPlacementType getDirectionType() {
-        return EnumDirectionType.ANY;
+        return EnumPlacementType.ANY;
     }
 }

src/main/java/refinedstorage/block/BlockExporter.java

@@ -32,7 +32,7 @@ public class BlockExporter extends BlockNode {
     }
     
     @Override
-    public EnumDirectionType getDirectionType() {
+    public EnumPlacementType getDirectionType() {
-        return EnumDirectionType.ANY;
+        return EnumPlacementType.ANY;
     }
 }

src/main/java/refinedstorage/block/BlockExternalStorage.java

@@ -46,7 +46,7 @@ public class BlockExternalStorage extends BlockNode {
     }
 
     @Override
-    public EnumDirectionType getDirectionType() {
+    public EnumPlacementType getDirectionType() {
-        return EnumDirectionType.ANY;
+        return EnumPlacementType.ANY;
     }
 }

src/main/java/refinedstorage/block/BlockGrid.java

@@ -71,7 +71,7 @@ public class BlockGrid extends BlockNode {
         return new ItemBlockBase(this, true);
     }
 
-    public boolean canRetrieveConnectivityUpdate() {
+    public boolean hasConnectivityState() {
         return true;
     }
 }

src/main/java/refinedstorage/block/BlockImporter.java

@@ -32,7 +32,7 @@ public class BlockImporter extends BlockNode {
     }
 
     @Override
-    public EnumDirectionType getDirectionType() {
+    public EnumPlacementType getDirectionType() {
-        return EnumDirectionType.ANY;
+        return EnumPlacementType.ANY;
     }
 }

src/main/java/refinedstorage/block/BlockInterface.java

@@ -32,7 +32,7 @@ public class BlockInterface extends BlockNode {
     }
 
     @Override
-    public EnumDirectionType getDirectionType() {
+    public EnumPlacementType getDirectionType() {
         return null;
     }
 }

src/main/java/refinedstorage/block/BlockMachineCasing.java

@@ -6,7 +6,7 @@ public class BlockMachineCasing extends BlockBase {
     }
 
     @Override
-    public EnumDirectionType getDirectionType() {
+    public EnumPlacementType getDirectionType() {
         return null;
     }
 }

src/main/java/refinedstorage/block/BlockNode.java

@@ -25,7 +25,7 @@ public abstract class BlockNode extends BlockBase {
         return true;
     }
 
-    public boolean canRetrieveConnectivityUpdate() {
+    public boolean hasConnectivityState() {
         return false;
     }
 
@@ -33,7 +33,7 @@ public abstract class BlockNode extends BlockBase {
     protected BlockStateContainer.Builder createBlockStateBuilder() {
         BlockStateContainer.Builder builder = super.createBlockStateBuilder();
 
-        if (canRetrieveConnectivityUpdate()) {
+        if (hasConnectivityState()) {
             builder.add(CONNECTED);
         }
 
@@ -47,7 +47,7 @@ public abstract class BlockNode extends BlockBase {
 
     @Override
     public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) {
-        if (canRetrieveConnectivityUpdate()) {
+        if (hasConnectivityState()) {
             return super.getActualState(state, world, pos).withProperty(CONNECTED, ((TileNode) world.getTileEntity(pos)).isConnected());
         }
 

src/main/java/refinedstorage/block/BlockQuartzEnrichedIron.java

@@ -6,7 +6,7 @@ public class BlockQuartzEnrichedIron extends BlockBase {
     }
 
     @Override
-    public EnumDirectionType getDirectionType() {
+    public EnumPlacementType getDirectionType() {
         return null;
     }
 }

src/main/java/refinedstorage/block/BlockRelay.java

@@ -32,11 +32,11 @@ public class BlockRelay extends BlockNode {
     }
 
     @Override
-    public EnumDirectionType getDirectionType() {
+    public EnumPlacementType getDirectionType() {
         return null;
     }
 
-    public boolean canRetrieveConnectivityUpdate() {
+    public boolean hasConnectivityState() {
         return true;
     }
 }

src/main/java/refinedstorage/block/BlockStorage.java

@@ -30,7 +30,7 @@ public class BlockStorage extends BlockNode {
     public BlockStorage() {
         super("storage");
 
-        setHardness(2.8F);
+        setHardness(5.8F);
     }
 
     @Override
@@ -108,7 +108,7 @@ public class BlockStorage extends BlockNode {
     }
 
     @Override
-    public EnumDirectionType getDirectionType() {
+    public EnumPlacementType getDirectionType() {
         return null;
     }
 }

src/main/java/refinedstorage/block/BlockWirelessTransmitter.java

@@ -31,7 +31,7 @@ public class BlockWirelessTransmitter extends BlockNode {
         return true;
     }
 
-    public boolean canRetrieveConnectivityUpdate() {
+    public boolean hasConnectivityState() {
         return true;
     }
 }

src/main/java/refinedstorage/block/EnumPlacementType.java

@@ -5,7 +5,7 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 
-public enum EnumDirectionType {
+public enum EnumPlacementType {
     ANY(
         EnumFacing.VALUES
     ),
@@ -18,7 +18,7 @@ public enum EnumDirectionType {
 
     public final EnumFacing[] allowed;
 
-    EnumDirectionType(EnumFacing... allowed) {
+    EnumPlacementType(EnumFacing... allowed) {
         this.allowed = allowed;
     }
 

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

@@ -30,10 +30,10 @@ public abstract class TileNode extends TileBase implements INetworkNode, ISynchr
         return isConnected() && canUpdate();
     }
 
-    private boolean canRetrieveConnectivityUpdate() {
+    private boolean canSendConnectivityUpdate() {
         Block block = getBlockType();
 
-        return block instanceof BlockNode ? ((BlockNode) block).canRetrieveConnectivityUpdate() : false;
+        return block instanceof BlockNode ? ((BlockNode) block).hasConnectivityState() : false;
     }
 
     @Override
@@ -45,7 +45,7 @@ public abstract class TileNode extends TileBase implements INetworkNode, ISynchr
                 onConnectionChange(network, update);
             }
 
-            if (active != isActive() && canRetrieveConnectivityUpdate()) {
+            if (active != isActive() && canSendConnectivityUpdate()) {
                 RefinedStorageUtils.updateBlock(worldObj, pos);
 
                 active = isActive();
@@ -147,7 +147,7 @@ public abstract class TileNode extends TileBase implements INetworkNode, ISynchr
     public NBTTagCompound writeUpdate(NBTTagCompound tag) {
         super.writeUpdate(tag);
 
-        if (canRetrieveConnectivityUpdate()) {
+        if (canSendConnectivityUpdate()) {
             tag.setBoolean(NBT_CONNECTED, isActive());
         }
 
@@ -157,7 +157,7 @@ public abstract class TileNode extends TileBase implements INetworkNode, ISynchr
     public void readUpdate(NBTTagCompound tag) {
         super.readUpdate(tag);
 
-        if (canRetrieveConnectivityUpdate()) {
+        if (canSendConnectivityUpdate()) {
             connected = tag.getBoolean(NBT_CONNECTED);
         }
     }