diff --git a/CHANGELOG.md b/CHANGELOG.md index ed6de2301..7766c6348 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Fixed External Storage disconnecting on world reload - Fixed External Storage not updating correctly - Fixed wireless signal starting from Controller instead of per Wireless Transmitter individually +- Fixed Controller's redstone state not saving - Huge performance improvements to large storage networks **Features** diff --git a/src/main/java/refinedstorage/block/BlockBase.java b/src/main/java/refinedstorage/block/BlockBase.java index 1c576b62d..5d0f430fe 100755 --- a/src/main/java/refinedstorage/block/BlockBase.java +++ b/src/main/java/refinedstorage/block/BlockBase.java @@ -56,7 +56,7 @@ public abstract class BlockBase extends Block { return createBlockStateBuilder().build(); } - public Item createItemForBlock() { + public Item createItem() { return new ItemBlockBase(this, false); } @@ -73,11 +73,7 @@ public abstract class BlockBase extends Block { @Override public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) { if (getDirectionType() != null) { - TileEntity tile = world.getTileEntity(pos); - - if (tile instanceof TileBase) { - return state.withProperty(DIRECTION, ((TileBase) tile).getDirection()); - } + return state.withProperty(DIRECTION, ((TileBase) world.getTileEntity(pos)).getDirection()); } return state; @@ -91,15 +87,13 @@ public abstract class BlockBase extends Block { @Override public boolean rotateBlock(World world, BlockPos pos, EnumFacing axis) { if (!world.isRemote && getDirectionType() != null) { - TileEntity tile = world.getTileEntity(pos); + TileBase tile = (TileBase) world.getTileEntity(pos); - if (tile instanceof TileBase) { - ((TileBase) tile).setDirection(getDirectionType().getNext(((TileBase) tile).getDirection())); + tile.setDirection(getDirectionType().getNext(tile.getDirection())); - RefinedStorageUtils.updateBlock(world, pos); + RefinedStorageUtils.updateBlock(world, pos); - return true; - } + return true; } return false; @@ -110,17 +104,15 @@ public abstract class BlockBase extends Block { super.onBlockPlacedBy(world, pos, state, player, stack); if (getDirectionType() != null) { - TileEntity tile = world.getTileEntity(pos); + TileBase tile = (TileBase) world.getTileEntity(pos); - if (tile instanceof TileBase) { - EnumFacing facing = getDirectionType().getFrom(pos, player); + EnumFacing facing = getDirectionType().getFrom(pos, player); - if (player.isSneaking() && getDirectionType() == EnumDirectionType.ANY) { - facing = facing.getOpposite(); - } - - ((TileBase) tile).setDirection(facing); + if (player.isSneaking() && getDirectionType() == EnumDirectionType.ANY) { + facing = facing.getOpposite(); } + + tile.setDirection(facing); } } diff --git a/src/main/java/refinedstorage/block/BlockCable.java b/src/main/java/refinedstorage/block/BlockCable.java index fd348511e..b10302ee8 100755 --- a/src/main/java/refinedstorage/block/BlockCable.java +++ b/src/main/java/refinedstorage/block/BlockCable.java @@ -55,7 +55,7 @@ public class BlockCable extends BlockNode { .withProperty(DOWN, hasConnectionWith(world, pos.down())); } - public static boolean hasConnectionWith(IBlockAccess world, BlockPos pos) { + private boolean hasConnectionWith(IBlockAccess world, BlockPos pos) { return world.getBlockState(pos).getBlock() == RefinedStorageBlocks.CONTROLLER || world.getTileEntity(pos) instanceof INetworkNode; } diff --git a/src/main/java/refinedstorage/block/BlockController.java b/src/main/java/refinedstorage/block/BlockController.java index 8d72de977..78b742047 100755 --- a/src/main/java/refinedstorage/block/BlockController.java +++ b/src/main/java/refinedstorage/block/BlockController.java @@ -145,7 +145,7 @@ public class BlockController extends BlockBase { } @Override - public Item createItemForBlock() { + public Item createItem() { return new ItemBlockController(); } } diff --git a/src/main/java/refinedstorage/block/BlockGrid.java b/src/main/java/refinedstorage/block/BlockGrid.java index de5df87f5..90d172b24 100755 --- a/src/main/java/refinedstorage/block/BlockGrid.java +++ b/src/main/java/refinedstorage/block/BlockGrid.java @@ -67,7 +67,7 @@ public class BlockGrid extends BlockNode { } @Override - public Item createItemForBlock() { + public Item createItem() { return new ItemBlockBase(this, true); } } diff --git a/src/main/java/refinedstorage/block/BlockStorage.java b/src/main/java/refinedstorage/block/BlockStorage.java index 2c3cd5043..7d77256e5 100755 --- a/src/main/java/refinedstorage/block/BlockStorage.java +++ b/src/main/java/refinedstorage/block/BlockStorage.java @@ -101,7 +101,7 @@ public class BlockStorage extends BlockNode { } @Override - public Item createItemForBlock() { + public Item createItem() { return new ItemBlockStorage(); } diff --git a/src/main/java/refinedstorage/inventory/BasicItemHandler.java b/src/main/java/refinedstorage/inventory/BasicItemHandler.java index 8dc37528c..07edaa151 100755 --- a/src/main/java/refinedstorage/inventory/BasicItemHandler.java +++ b/src/main/java/refinedstorage/inventory/BasicItemHandler.java @@ -23,7 +23,7 @@ public class BasicItemHandler extends ItemStackHandler { public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { if (validators.length > 0) { for (IItemValidator validator : validators) { - if (validator.valid(stack)) { + if (validator.isValid(stack)) { return super.insertItem(slot, stack, simulate); } } diff --git a/src/main/java/refinedstorage/inventory/BasicItemValidator.java b/src/main/java/refinedstorage/inventory/BasicItemValidator.java index 4e0e68159..8938a002c 100755 --- a/src/main/java/refinedstorage/inventory/BasicItemValidator.java +++ b/src/main/java/refinedstorage/inventory/BasicItemValidator.java @@ -17,7 +17,7 @@ public class BasicItemValidator implements IItemValidator { } @Override - public boolean valid(ItemStack stack) { + public boolean isValid(ItemStack stack) { if (stack.getItem() == item) { if (damage != -1 && stack.getItemDamage() != damage) { return false; diff --git a/src/main/java/refinedstorage/inventory/IItemValidator.java b/src/main/java/refinedstorage/inventory/IItemValidator.java index a3b2a59cc..c86888705 100755 --- a/src/main/java/refinedstorage/inventory/IItemValidator.java +++ b/src/main/java/refinedstorage/inventory/IItemValidator.java @@ -3,5 +3,5 @@ package refinedstorage.inventory; import net.minecraft.item.ItemStack; public interface IItemValidator { - boolean valid(ItemStack stack); + boolean isValid(ItemStack stack); } diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java index f112f4e48..2f05bcda5 100755 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -486,7 +486,7 @@ public class CommonProxy { private void registerBlock(BlockBase block) { GameRegistry.register(block); - GameRegistry.register(block.createItemForBlock()); + GameRegistry.register(block.createItem()); } private void registerItem(Item item) { diff --git a/src/main/java/refinedstorage/tile/TileCrafter.java b/src/main/java/refinedstorage/tile/TileCrafter.java index 84925ae67..73089b872 100755 --- a/src/main/java/refinedstorage/tile/TileCrafter.java +++ b/src/main/java/refinedstorage/tile/TileCrafter.java @@ -24,7 +24,7 @@ import refinedstorage.item.ItemUpgrade; public class TileCrafter extends TileNode implements ICraftingPatternContainer { private BasicItemHandler patterns = new BasicItemHandler(9, this, new IItemValidator() { @Override - public boolean valid(ItemStack stack) { + public boolean isValid(ItemStack stack) { return stack.getItem() == RefinedStorageItems.PATTERN && ItemPattern.isValid(stack); } }) { diff --git a/src/main/java/refinedstorage/tile/TileSolderer.java b/src/main/java/refinedstorage/tile/TileSolderer.java index 8f354d898..723aef9a7 100755 --- a/src/main/java/refinedstorage/tile/TileSolderer.java +++ b/src/main/java/refinedstorage/tile/TileSolderer.java @@ -78,8 +78,7 @@ public class TileSolderer extends TileNode { recipe = null; progress = 0; - // Don't set working to false yet, wait till the next update because we may have - // another stack waiting. + // Don't set working to false yet, wait till the next update because we may have another stack waiting. markDirty(); }