From 611d73ff110086acf491bbad5b04bff26e9bea53 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Fri, 8 Jul 2016 14:56:45 +0200 Subject: [PATCH] More renames / fixes --- src/main/java/refinedstorage/block/BlockBase.java | 6 +++--- src/main/java/refinedstorage/block/BlockCable.java | 2 +- .../java/refinedstorage/block/BlockConstructor.java | 4 ++-- src/main/java/refinedstorage/block/BlockCrafter.java | 6 +++--- .../refinedstorage/block/BlockCraftingMonitor.java | 2 +- .../java/refinedstorage/block/BlockDestructor.java | 4 ++-- src/main/java/refinedstorage/block/BlockDetector.java | 4 ++-- src/main/java/refinedstorage/block/BlockExporter.java | 4 ++-- .../refinedstorage/block/BlockExternalStorage.java | 4 ++-- src/main/java/refinedstorage/block/BlockGrid.java | 2 +- src/main/java/refinedstorage/block/BlockImporter.java | 4 ++-- src/main/java/refinedstorage/block/BlockInterface.java | 2 +- .../java/refinedstorage/block/BlockMachineCasing.java | 2 +- src/main/java/refinedstorage/block/BlockNode.java | 6 +++--- .../refinedstorage/block/BlockQuartzEnrichedIron.java | 2 +- src/main/java/refinedstorage/block/BlockRelay.java | 4 ++-- src/main/java/refinedstorage/block/BlockStorage.java | 4 ++-- .../refinedstorage/block/BlockWirelessTransmitter.java | 2 +- .../{EnumDirectionType.java => EnumPlacementType.java} | 4 ++-- src/main/java/refinedstorage/tile/TileNode.java | 10 +++++----- 20 files changed, 39 insertions(+), 39 deletions(-) rename src/main/java/refinedstorage/block/{EnumDirectionType.java => EnumPlacementType.java} (93%) diff --git a/src/main/java/refinedstorage/block/BlockBase.java b/src/main/java/refinedstorage/block/BlockBase.java index 5d0f430fe..8c8adaffb 100755 --- a/src/main/java/refinedstorage/block/BlockBase.java +++ b/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() { - return EnumDirectionType.HORIZONTAL; + public EnumPlacementType getDirectionType() { + return EnumPlacementType.HORIZONTAL; } } diff --git a/src/main/java/refinedstorage/block/BlockCable.java b/src/main/java/refinedstorage/block/BlockCable.java index f4ca7a69e..d92a9a262 100755 --- a/src/main/java/refinedstorage/block/BlockCable.java +++ b/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; } } diff --git a/src/main/java/refinedstorage/block/BlockConstructor.java b/src/main/java/refinedstorage/block/BlockConstructor.java index a168528cc..a4bbf3c81 100755 --- a/src/main/java/refinedstorage/block/BlockConstructor.java +++ b/src/main/java/refinedstorage/block/BlockConstructor.java @@ -32,7 +32,7 @@ public class BlockConstructor extends BlockNode { } @Override - public EnumDirectionType getDirectionType() { - return EnumDirectionType.ANY; + public EnumPlacementType getDirectionType() { + return EnumPlacementType.ANY; } } diff --git a/src/main/java/refinedstorage/block/BlockCrafter.java b/src/main/java/refinedstorage/block/BlockCrafter.java index 61e8112ae..3e745a5a8 100755 --- a/src/main/java/refinedstorage/block/BlockCrafter.java +++ b/src/main/java/refinedstorage/block/BlockCrafter.java @@ -32,11 +32,11 @@ public class BlockCrafter extends BlockNode { } @Override - public EnumDirectionType getDirectionType() { - return EnumDirectionType.ANY; + public EnumPlacementType getDirectionType() { + return EnumPlacementType.ANY; } - public boolean canRetrieveConnectivityUpdate() { + public boolean hasConnectivityState() { return true; } } diff --git a/src/main/java/refinedstorage/block/BlockCraftingMonitor.java b/src/main/java/refinedstorage/block/BlockCraftingMonitor.java index 9ebc2b354..b52779ff9 100755 --- a/src/main/java/refinedstorage/block/BlockCraftingMonitor.java +++ b/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; } } diff --git a/src/main/java/refinedstorage/block/BlockDestructor.java b/src/main/java/refinedstorage/block/BlockDestructor.java index 68bc16581..742b3474c 100755 --- a/src/main/java/refinedstorage/block/BlockDestructor.java +++ b/src/main/java/refinedstorage/block/BlockDestructor.java @@ -32,7 +32,7 @@ public class BlockDestructor extends BlockNode { } @Override - public EnumDirectionType getDirectionType() { - return EnumDirectionType.ANY; + public EnumPlacementType getDirectionType() { + return EnumPlacementType.ANY; } } diff --git a/src/main/java/refinedstorage/block/BlockDetector.java b/src/main/java/refinedstorage/block/BlockDetector.java index 136ed8753..5ccdac680 100755 --- a/src/main/java/refinedstorage/block/BlockDetector.java +++ b/src/main/java/refinedstorage/block/BlockDetector.java @@ -71,7 +71,7 @@ public class BlockDetector extends BlockNode { } @Override - public EnumDirectionType getDirectionType() { - return EnumDirectionType.ANY; + public EnumPlacementType getDirectionType() { + return EnumPlacementType.ANY; } } diff --git a/src/main/java/refinedstorage/block/BlockExporter.java b/src/main/java/refinedstorage/block/BlockExporter.java index cc8b00838..be9eea66c 100755 --- a/src/main/java/refinedstorage/block/BlockExporter.java +++ b/src/main/java/refinedstorage/block/BlockExporter.java @@ -32,7 +32,7 @@ public class BlockExporter extends BlockNode { } @Override - public EnumDirectionType getDirectionType() { - return EnumDirectionType.ANY; + public EnumPlacementType getDirectionType() { + return EnumPlacementType.ANY; } } diff --git a/src/main/java/refinedstorage/block/BlockExternalStorage.java b/src/main/java/refinedstorage/block/BlockExternalStorage.java index 36774f896..f761caedb 100755 --- a/src/main/java/refinedstorage/block/BlockExternalStorage.java +++ b/src/main/java/refinedstorage/block/BlockExternalStorage.java @@ -46,7 +46,7 @@ public class BlockExternalStorage extends BlockNode { } @Override - public EnumDirectionType getDirectionType() { - return EnumDirectionType.ANY; + public EnumPlacementType getDirectionType() { + return EnumPlacementType.ANY; } } diff --git a/src/main/java/refinedstorage/block/BlockGrid.java b/src/main/java/refinedstorage/block/BlockGrid.java index 884bfde6a..c45c5b0ad 100755 --- a/src/main/java/refinedstorage/block/BlockGrid.java +++ b/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; } } diff --git a/src/main/java/refinedstorage/block/BlockImporter.java b/src/main/java/refinedstorage/block/BlockImporter.java index 1797c9ad2..4219f5047 100755 --- a/src/main/java/refinedstorage/block/BlockImporter.java +++ b/src/main/java/refinedstorage/block/BlockImporter.java @@ -32,7 +32,7 @@ public class BlockImporter extends BlockNode { } @Override - public EnumDirectionType getDirectionType() { - return EnumDirectionType.ANY; + public EnumPlacementType getDirectionType() { + return EnumPlacementType.ANY; } } diff --git a/src/main/java/refinedstorage/block/BlockInterface.java b/src/main/java/refinedstorage/block/BlockInterface.java index a676d38b5..c42441736 100755 --- a/src/main/java/refinedstorage/block/BlockInterface.java +++ b/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; } } diff --git a/src/main/java/refinedstorage/block/BlockMachineCasing.java b/src/main/java/refinedstorage/block/BlockMachineCasing.java index 0bf5029c3..ddc77253c 100755 --- a/src/main/java/refinedstorage/block/BlockMachineCasing.java +++ b/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; } } diff --git a/src/main/java/refinedstorage/block/BlockNode.java b/src/main/java/refinedstorage/block/BlockNode.java index ae6cacf76..86e274f97 100755 --- a/src/main/java/refinedstorage/block/BlockNode.java +++ b/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()); } diff --git a/src/main/java/refinedstorage/block/BlockQuartzEnrichedIron.java b/src/main/java/refinedstorage/block/BlockQuartzEnrichedIron.java index ed496efb5..a4b2fbd54 100755 --- a/src/main/java/refinedstorage/block/BlockQuartzEnrichedIron.java +++ b/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; } } diff --git a/src/main/java/refinedstorage/block/BlockRelay.java b/src/main/java/refinedstorage/block/BlockRelay.java index 30cf38828..5fbdafb55 100755 --- a/src/main/java/refinedstorage/block/BlockRelay.java +++ b/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; } } diff --git a/src/main/java/refinedstorage/block/BlockStorage.java b/src/main/java/refinedstorage/block/BlockStorage.java index 16510f3cc..b8e7f5878 100755 --- a/src/main/java/refinedstorage/block/BlockStorage.java +++ b/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; } } diff --git a/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java b/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java index 65344bb0f..211fe4307 100755 --- a/src/main/java/refinedstorage/block/BlockWirelessTransmitter.java +++ b/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; } } diff --git a/src/main/java/refinedstorage/block/EnumDirectionType.java b/src/main/java/refinedstorage/block/EnumPlacementType.java similarity index 93% rename from src/main/java/refinedstorage/block/EnumDirectionType.java rename to src/main/java/refinedstorage/block/EnumPlacementType.java index 4b6b707bf..c90feb8e0 100755 --- a/src/main/java/refinedstorage/block/EnumDirectionType.java +++ b/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; } diff --git a/src/main/java/refinedstorage/tile/TileNode.java b/src/main/java/refinedstorage/tile/TileNode.java index 8ee2dcd13..17b3fecfe 100755 --- a/src/main/java/refinedstorage/tile/TileNode.java +++ b/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); } }