diff --git a/src/main/java/storagecraft/block/BlockController.java b/src/main/java/storagecraft/block/BlockController.java index 1c6fee332..084b6068b 100644 --- a/src/main/java/storagecraft/block/BlockController.java +++ b/src/main/java/storagecraft/block/BlockController.java @@ -13,7 +13,7 @@ import storagecraft.tile.TileController; public class BlockController extends BlockBase implements ITileEntityProvider { private IIcon sideIcon; - private IIcon[] icons = new IIcon[6]; + private IIcon[] icons = new IIcon[8]; public BlockController() { @@ -48,7 +48,7 @@ public class BlockController extends BlockBase implements ITileEntityProvider @Override public void registerBlockIcons(IIconRegister register) { - for (int i = 0; i <= 5; ++i) + for (int i = 0; i <= 7; ++i) { icons[i] = register.registerIcon("storagecraft:controller" + i); } @@ -66,7 +66,7 @@ public class BlockController extends BlockBase implements ITileEntityProvider TileController controller = (TileController) world.getTileEntity(x, y, z); - return icons[(int) ((float) controller.getEnergyStored(null) / (float) controller.getMaxEnergyStored(null) * 5f)]; + return icons[(int) ((float) controller.getEnergyStored(null) / (float) controller.getMaxEnergyStored(null) * 7f)]; } @Override diff --git a/src/main/java/storagecraft/block/BlockDetector.java b/src/main/java/storagecraft/block/BlockDetector.java index 9ee28e389..58d7d21b0 100644 --- a/src/main/java/storagecraft/block/BlockDetector.java +++ b/src/main/java/storagecraft/block/BlockDetector.java @@ -12,7 +12,8 @@ import storagecraft.tile.TileDetector; public class BlockDetector extends BlockBase implements ITileEntityProvider { - private IIcon frontIcon; + private IIcon poweredIcon; + private IIcon unpoweredIcon; private IIcon sideIcon; public BlockDetector() @@ -60,31 +61,32 @@ public class BlockDetector extends BlockBase implements ITileEntityProvider @Override public void registerBlockIcons(IIconRegister register) { - frontIcon = register.registerIcon("storagecraft:detector"); + poweredIcon = register.registerIcon("storagecraft:detectorPowered"); + unpoweredIcon = register.registerIcon("storagecraft:detectorUnpowered"); sideIcon = register.registerIcon("storagecraft:generic"); } @Override public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { - TileDetector tile = (TileDetector) world.getTileEntity(x, y, z); - - if (side == tile.getDirection().ordinal()) + if (side == 0 || side == 1) { - return frontIcon; + return sideIcon; } - return sideIcon; + TileDetector tile = (TileDetector) world.getTileEntity(x, y, z); + + return tile.providesPower() ? poweredIcon : unpoweredIcon; } @Override public IIcon getIcon(int side, int meta) { - if (side == 3) + if (side == 0 || side == 1) { - return frontIcon; + return sideIcon; } - return sideIcon; + return unpoweredIcon; } } diff --git a/src/main/resources/assets/storagecraft/textures/blocks/cable.png b/src/main/resources/assets/storagecraft/textures/blocks/cable.png index eb2fc313a..61f2f1c59 100644 Binary files a/src/main/resources/assets/storagecraft/textures/blocks/cable.png and b/src/main/resources/assets/storagecraft/textures/blocks/cable.png differ diff --git a/src/main/resources/assets/storagecraft/textures/blocks/cablePowered.png b/src/main/resources/assets/storagecraft/textures/blocks/cablePowered.png index 9c041ffbf..a31527424 100644 Binary files a/src/main/resources/assets/storagecraft/textures/blocks/cablePowered.png and b/src/main/resources/assets/storagecraft/textures/blocks/cablePowered.png differ diff --git a/src/main/resources/assets/storagecraft/textures/blocks/cableUnpowered.png b/src/main/resources/assets/storagecraft/textures/blocks/cableUnpowered.png index 56f9299cf..e01936ac3 100644 Binary files a/src/main/resources/assets/storagecraft/textures/blocks/cableUnpowered.png and b/src/main/resources/assets/storagecraft/textures/blocks/cableUnpowered.png differ diff --git a/src/main/resources/assets/storagecraft/textures/blocks/controller0.png b/src/main/resources/assets/storagecraft/textures/blocks/controller0.png index 8621e8954..9a47a1cb3 100644 Binary files a/src/main/resources/assets/storagecraft/textures/blocks/controller0.png and b/src/main/resources/assets/storagecraft/textures/blocks/controller0.png differ diff --git a/src/main/resources/assets/storagecraft/textures/blocks/controller1.png b/src/main/resources/assets/storagecraft/textures/blocks/controller1.png index 8460387be..0b1c41ed6 100644 Binary files a/src/main/resources/assets/storagecraft/textures/blocks/controller1.png and b/src/main/resources/assets/storagecraft/textures/blocks/controller1.png differ diff --git a/src/main/resources/assets/storagecraft/textures/blocks/controller2.png b/src/main/resources/assets/storagecraft/textures/blocks/controller2.png index 52bcff594..1b52fd5d8 100644 Binary files a/src/main/resources/assets/storagecraft/textures/blocks/controller2.png and b/src/main/resources/assets/storagecraft/textures/blocks/controller2.png differ diff --git a/src/main/resources/assets/storagecraft/textures/blocks/controller3.png b/src/main/resources/assets/storagecraft/textures/blocks/controller3.png index 572291cd7..6b4e8170e 100644 Binary files a/src/main/resources/assets/storagecraft/textures/blocks/controller3.png and b/src/main/resources/assets/storagecraft/textures/blocks/controller3.png differ diff --git a/src/main/resources/assets/storagecraft/textures/blocks/controller4.png b/src/main/resources/assets/storagecraft/textures/blocks/controller4.png index 4d390f27d..17859d5df 100644 Binary files a/src/main/resources/assets/storagecraft/textures/blocks/controller4.png and b/src/main/resources/assets/storagecraft/textures/blocks/controller4.png differ diff --git a/src/main/resources/assets/storagecraft/textures/blocks/controller5.png b/src/main/resources/assets/storagecraft/textures/blocks/controller5.png index e04b8e879..bd180b11f 100644 Binary files a/src/main/resources/assets/storagecraft/textures/blocks/controller5.png and b/src/main/resources/assets/storagecraft/textures/blocks/controller5.png differ diff --git a/src/main/resources/assets/storagecraft/textures/blocks/controller6.png b/src/main/resources/assets/storagecraft/textures/blocks/controller6.png new file mode 100644 index 000000000..ac2c10e8d Binary files /dev/null and b/src/main/resources/assets/storagecraft/textures/blocks/controller6.png differ diff --git a/src/main/resources/assets/storagecraft/textures/blocks/controller7.png b/src/main/resources/assets/storagecraft/textures/blocks/controller7.png new file mode 100644 index 000000000..153f0788a Binary files /dev/null and b/src/main/resources/assets/storagecraft/textures/blocks/controller7.png differ diff --git a/src/main/resources/assets/storagecraft/textures/blocks/detector.png b/src/main/resources/assets/storagecraft/textures/blocks/detector.png deleted file mode 100644 index e2245e98d..000000000 Binary files a/src/main/resources/assets/storagecraft/textures/blocks/detector.png and /dev/null differ diff --git a/src/main/resources/assets/storagecraft/textures/blocks/detectorPowered.png b/src/main/resources/assets/storagecraft/textures/blocks/detectorPowered.png new file mode 100644 index 000000000..f3eee74e4 Binary files /dev/null and b/src/main/resources/assets/storagecraft/textures/blocks/detectorPowered.png differ diff --git a/src/main/resources/assets/storagecraft/textures/blocks/detectorUnpowered.png b/src/main/resources/assets/storagecraft/textures/blocks/detectorUnpowered.png new file mode 100644 index 000000000..c8deb097d Binary files /dev/null and b/src/main/resources/assets/storagecraft/textures/blocks/detectorUnpowered.png differ diff --git a/src/main/resources/assets/storagecraft/textures/blocks/drive.png b/src/main/resources/assets/storagecraft/textures/blocks/drive.png index 80e45906c..6f12665f4 100644 Binary files a/src/main/resources/assets/storagecraft/textures/blocks/drive.png and b/src/main/resources/assets/storagecraft/textures/blocks/drive.png differ diff --git a/src/main/resources/assets/storagecraft/textures/blocks/exporter.png b/src/main/resources/assets/storagecraft/textures/blocks/exporter.png index 01add7154..25c94c70b 100644 Binary files a/src/main/resources/assets/storagecraft/textures/blocks/exporter.png and b/src/main/resources/assets/storagecraft/textures/blocks/exporter.png differ diff --git a/src/main/resources/assets/storagecraft/textures/blocks/generic.png b/src/main/resources/assets/storagecraft/textures/blocks/generic.png index e7a20fa9d..8bb944397 100644 Binary files a/src/main/resources/assets/storagecraft/textures/blocks/generic.png and b/src/main/resources/assets/storagecraft/textures/blocks/generic.png differ diff --git a/src/main/resources/assets/storagecraft/textures/blocks/gridConnected.png b/src/main/resources/assets/storagecraft/textures/blocks/gridConnected.png index b33779790..75f670eca 100644 Binary files a/src/main/resources/assets/storagecraft/textures/blocks/gridConnected.png and b/src/main/resources/assets/storagecraft/textures/blocks/gridConnected.png differ diff --git a/src/main/resources/assets/storagecraft/textures/blocks/gridDisconnected.png b/src/main/resources/assets/storagecraft/textures/blocks/gridDisconnected.png index 1aafc81b5..a6e8c93d7 100644 Binary files a/src/main/resources/assets/storagecraft/textures/blocks/gridDisconnected.png and b/src/main/resources/assets/storagecraft/textures/blocks/gridDisconnected.png differ diff --git a/src/main/resources/assets/storagecraft/textures/blocks/importer.png b/src/main/resources/assets/storagecraft/textures/blocks/importer.png index b8040d7f6..8b57ae5b2 100644 Binary files a/src/main/resources/assets/storagecraft/textures/blocks/importer.png and b/src/main/resources/assets/storagecraft/textures/blocks/importer.png differ diff --git a/src/main/resources/assets/storagecraft/textures/blocks/storageProxy.png b/src/main/resources/assets/storagecraft/textures/blocks/storageProxy.png index c67ed47a2..17508298c 100644 Binary files a/src/main/resources/assets/storagecraft/textures/blocks/storageProxy.png and b/src/main/resources/assets/storagecraft/textures/blocks/storageProxy.png differ diff --git a/src/main/resources/assets/storagecraft/textures/items/storageCell0.png b/src/main/resources/assets/storagecraft/textures/items/storageCell0.png index 78745bef8..66abeaa2d 100644 Binary files a/src/main/resources/assets/storagecraft/textures/items/storageCell0.png and b/src/main/resources/assets/storagecraft/textures/items/storageCell0.png differ diff --git a/src/main/resources/assets/storagecraft/textures/items/storageCell1.png b/src/main/resources/assets/storagecraft/textures/items/storageCell1.png index 482a02cff..c52279ef4 100644 Binary files a/src/main/resources/assets/storagecraft/textures/items/storageCell1.png and b/src/main/resources/assets/storagecraft/textures/items/storageCell1.png differ diff --git a/src/main/resources/assets/storagecraft/textures/items/storageCell2.png b/src/main/resources/assets/storagecraft/textures/items/storageCell2.png index 8a52ec786..a520fa5db 100644 Binary files a/src/main/resources/assets/storagecraft/textures/items/storageCell2.png and b/src/main/resources/assets/storagecraft/textures/items/storageCell2.png differ diff --git a/src/main/resources/assets/storagecraft/textures/items/storageCell3.png b/src/main/resources/assets/storagecraft/textures/items/storageCell3.png index 563c0e5da..9c2a2d408 100644 Binary files a/src/main/resources/assets/storagecraft/textures/items/storageCell3.png and b/src/main/resources/assets/storagecraft/textures/items/storageCell3.png differ diff --git a/src/main/resources/assets/storagecraft/textures/items/storageCell4.png b/src/main/resources/assets/storagecraft/textures/items/storageCell4.png index d7946e064..0012bb723 100644 Binary files a/src/main/resources/assets/storagecraft/textures/items/storageCell4.png and b/src/main/resources/assets/storagecraft/textures/items/storageCell4.png differ diff --git a/src/main/resources/assets/storagecraft/textures/items/wirelessGridConnected.png b/src/main/resources/assets/storagecraft/textures/items/wirelessGridConnected.png index 11e8921dc..f040ed9fe 100644 Binary files a/src/main/resources/assets/storagecraft/textures/items/wirelessGridConnected.png and b/src/main/resources/assets/storagecraft/textures/items/wirelessGridConnected.png differ diff --git a/src/main/resources/assets/storagecraft/textures/items/wirelessGridDisconnected.png b/src/main/resources/assets/storagecraft/textures/items/wirelessGridDisconnected.png index 3f8c258f0..ef1b1174d 100644 Binary files a/src/main/resources/assets/storagecraft/textures/items/wirelessGridDisconnected.png and b/src/main/resources/assets/storagecraft/textures/items/wirelessGridDisconnected.png differ