diff --git a/src/main/java/refinedstorage/block/BlockBase.java b/src/main/java/refinedstorage/block/BlockBase.java index 8c8adaffb..91d6b79d6 100755 --- a/src/main/java/refinedstorage/block/BlockBase.java +++ b/src/main/java/refinedstorage/block/BlockBase.java @@ -44,7 +44,7 @@ public abstract class BlockBase extends Block { protected BlockStateContainer.Builder createBlockStateBuilder() { BlockStateContainer.Builder builder = new BlockStateContainer.Builder(this); - if (getDirectionType() != null) { + if (getPlacementType() != null) { builder.add(DIRECTION); } @@ -72,7 +72,7 @@ public abstract class BlockBase extends Block { @Override public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { - if (getDirectionType() != null) { + if (getPlacementType() != null) { return state.withProperty(DIRECTION, ((TileBase) world.getTileEntity(pos)).getDirection()); } @@ -86,10 +86,10 @@ public abstract class BlockBase extends Block { @Override public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis) { - if (!world.isRemote && getDirectionType() != null) { + if (!world.isRemote && getPlacementType() != null) { TileBase tile = (TileBase) world.getTileEntity(pos); - tile.setDirection(getDirectionType().getNext(tile.getDirection())); + tile.setDirection(getPlacementType().getNext(tile.getDirection())); RefinedStorageUtils.updateBlock(world, pos); @@ -103,12 +103,12 @@ public abstract class BlockBase extends Block { public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack) { super.onBlockPlacedBy(world, pos, state, player, stack); - if (getDirectionType() != null) { + if (getPlacementType() != null) { TileBase tile = (TileBase) world.getTileEntity(pos); - EnumFacing facing = getDirectionType().getFrom(pos, player); + EnumFacing facing = getPlacementType().getFrom(pos, player); - if (player.isSneaking() && getDirectionType() == EnumPlacementType.ANY) { + if (player.isSneaking() && getPlacementType() == EnumPlacementType.ANY) { facing = facing.getOpposite(); } @@ -145,7 +145,7 @@ public abstract class BlockBase extends Block { world.setBlockToAir(pos); } - public EnumPlacementType getDirectionType() { + public EnumPlacementType getPlacementType() { return EnumPlacementType.HORIZONTAL; } } diff --git a/src/main/java/refinedstorage/block/BlockCable.java b/src/main/java/refinedstorage/block/BlockCable.java index d92a9a262..9b525d662 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 EnumPlacementType getDirectionType() { + public EnumPlacementType getPlacementType() { return null; } } diff --git a/src/main/java/refinedstorage/block/BlockConstructor.java b/src/main/java/refinedstorage/block/BlockConstructor.java index a4bbf3c81..d7d2ebd88 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 EnumPlacementType getDirectionType() { + public EnumPlacementType getPlacementType() { return EnumPlacementType.ANY; } } diff --git a/src/main/java/refinedstorage/block/BlockCrafter.java b/src/main/java/refinedstorage/block/BlockCrafter.java index 3e745a5a8..ad95c3552 100755 --- a/src/main/java/refinedstorage/block/BlockCrafter.java +++ b/src/main/java/refinedstorage/block/BlockCrafter.java @@ -32,7 +32,7 @@ public class BlockCrafter extends BlockNode { } @Override - public EnumPlacementType getDirectionType() { + public EnumPlacementType getPlacementType() { return EnumPlacementType.ANY; } diff --git a/src/main/java/refinedstorage/block/BlockDestructor.java b/src/main/java/refinedstorage/block/BlockDestructor.java index 742b3474c..6a2ef7fb2 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 EnumPlacementType getDirectionType() { + public EnumPlacementType getPlacementType() { return EnumPlacementType.ANY; } } diff --git a/src/main/java/refinedstorage/block/BlockDetector.java b/src/main/java/refinedstorage/block/BlockDetector.java index 5ccdac680..3b438f9b4 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 EnumPlacementType getDirectionType() { + public EnumPlacementType getPlacementType() { return EnumPlacementType.ANY; } } diff --git a/src/main/java/refinedstorage/block/BlockExporter.java b/src/main/java/refinedstorage/block/BlockExporter.java index be9eea66c..ca4a03b69 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 EnumPlacementType getDirectionType() { + public EnumPlacementType getPlacementType() { return EnumPlacementType.ANY; } } diff --git a/src/main/java/refinedstorage/block/BlockExternalStorage.java b/src/main/java/refinedstorage/block/BlockExternalStorage.java index f761caedb..fa8c09cc1 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 EnumPlacementType getDirectionType() { + public EnumPlacementType getPlacementType() { return EnumPlacementType.ANY; } } diff --git a/src/main/java/refinedstorage/block/BlockImporter.java b/src/main/java/refinedstorage/block/BlockImporter.java index 4219f5047..aa4b5d4f6 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 EnumPlacementType getDirectionType() { + public EnumPlacementType getPlacementType() { return EnumPlacementType.ANY; } } diff --git a/src/main/java/refinedstorage/block/BlockInterface.java b/src/main/java/refinedstorage/block/BlockInterface.java index c42441736..77be4f4d5 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 EnumPlacementType getDirectionType() { + public EnumPlacementType getPlacementType() { return null; } } diff --git a/src/main/java/refinedstorage/block/BlockMachineCasing.java b/src/main/java/refinedstorage/block/BlockMachineCasing.java index ddc77253c..ecce72c97 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 EnumPlacementType getDirectionType() { + public EnumPlacementType getPlacementType() { return null; } } diff --git a/src/main/java/refinedstorage/block/BlockQuartzEnrichedIron.java b/src/main/java/refinedstorage/block/BlockQuartzEnrichedIron.java index a4b2fbd54..c9346d30c 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 EnumPlacementType getDirectionType() { + public EnumPlacementType getPlacementType() { return null; } } diff --git a/src/main/java/refinedstorage/block/BlockRelay.java b/src/main/java/refinedstorage/block/BlockRelay.java index 5fbdafb55..eaf456546 100755 --- a/src/main/java/refinedstorage/block/BlockRelay.java +++ b/src/main/java/refinedstorage/block/BlockRelay.java @@ -32,7 +32,7 @@ public class BlockRelay extends BlockNode { } @Override - public EnumPlacementType getDirectionType() { + public EnumPlacementType getPlacementType() { return null; } diff --git a/src/main/java/refinedstorage/block/BlockStorage.java b/src/main/java/refinedstorage/block/BlockStorage.java index b8e7f5878..02e4b7a5b 100755 --- a/src/main/java/refinedstorage/block/BlockStorage.java +++ b/src/main/java/refinedstorage/block/BlockStorage.java @@ -108,7 +108,7 @@ public class BlockStorage extends BlockNode { } @Override - public EnumPlacementType getDirectionType() { + public EnumPlacementType getPlacementType() { return null; } }