diff --git a/src/main/java/refinedstorage/block/BlockCraftingMonitor.java b/src/main/java/refinedstorage/block/BlockCraftingMonitor.java index b52779ff9..ad465fa74 100755 --- a/src/main/java/refinedstorage/block/BlockCraftingMonitor.java +++ b/src/main/java/refinedstorage/block/BlockCraftingMonitor.java @@ -30,8 +30,4 @@ public class BlockCraftingMonitor extends BlockNode { return true; } - - public boolean hasConnectivityState() { - return true; - } } diff --git a/src/main/java/refinedstorage/block/BlockGrid.java b/src/main/java/refinedstorage/block/BlockGrid.java index b2a852313..90d172b24 100755 --- a/src/main/java/refinedstorage/block/BlockGrid.java +++ b/src/main/java/refinedstorage/block/BlockGrid.java @@ -70,13 +70,4 @@ public class BlockGrid extends BlockNode { public Item createItem() { return new ItemBlockBase(this, true); } - - public boolean hasConnectivityState() { - return true; - } - - @Override - public EnumPlacementType getPlacementType() { - return EnumPlacementType.ANY; - } } diff --git a/src/main/java/refinedstorage/block/EnumStorageType.java b/src/main/java/refinedstorage/block/EnumStorageType.java index c1447a724..9426057b1 100755 --- a/src/main/java/refinedstorage/block/EnumStorageType.java +++ b/src/main/java/refinedstorage/block/EnumStorageType.java @@ -47,6 +47,6 @@ public enum EnumStorageType implements IStringSerializable { return type; } } - return TYPE_1K; + return TYPE_CREATIVE; } } diff --git a/src/main/java/refinedstorage/item/ItemBlockStorage.java b/src/main/java/refinedstorage/item/ItemBlockStorage.java index e4f1fc270..c30000c81 100755 --- a/src/main/java/refinedstorage/item/ItemBlockStorage.java +++ b/src/main/java/refinedstorage/item/ItemBlockStorage.java @@ -1,6 +1,7 @@ package refinedstorage.item; import net.minecraft.client.resources.I18n; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; @@ -64,6 +65,15 @@ public class ItemBlockStorage extends ItemBlockBase { return stack.getTagCompound() != null && stack.getTagCompound().hasKey(TileStorage.NBT_STORAGE); } + @Override + public void onUpdate(ItemStack stack, World world, Entity entity, int slot, boolean selected) { + super.onUpdate(stack, world, entity, slot, selected); + + if (!stack.hasTagCompound()) { + initNBT(stack); + } + } + @Override public void onCreated(ItemStack stack, World world, EntityPlayer player) { super.onCreated(stack, world, player); diff --git a/src/main/java/refinedstorage/item/ItemStorageDisk.java b/src/main/java/refinedstorage/item/ItemStorageDisk.java index 05e65ac0b..59b028fee 100755 --- a/src/main/java/refinedstorage/item/ItemStorageDisk.java +++ b/src/main/java/refinedstorage/item/ItemStorageDisk.java @@ -2,6 +2,7 @@ package refinedstorage.item; import net.minecraft.client.resources.I18n; import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.Item; @@ -39,14 +40,25 @@ public class ItemStorageDisk extends ItemBase { @Override public void getSubItems(Item item, CreativeTabs tab, List list) { - for (int i = 0; i < 6; ++i) { - list.add(i == TYPE_DEBUG ? createDebugDisk() : NBTStorage.createStackWithNBT(new ItemStack(item, 1, i))); + for (int i = 0; i < 5; ++i) { + list.add(NBTStorage.createStackWithNBT(new ItemStack(item, 1, i))); } } - private ItemStack createDebugDisk() { - ItemStack debugDisk = new ItemStack(RefinedStorageItems.STORAGE_DISK, 1, ItemStorageDisk.TYPE_DEBUG); + @Override + public void onUpdate(ItemStack stack, World world, Entity entity, int slot, boolean selected) { + super.onUpdate(stack, world, entity, slot, selected); + if (!stack.hasTagCompound()) { + if (stack.getItemDamage() == 5) { + applyDebugDiskData(stack); + } else { + NBTStorage.createStackWithNBT(stack); + } + } + } + + private void applyDebugDiskData(ItemStack stack) { if (debugDiskTag == null) { debugDiskTag = NBTStorage.createNBT(); @@ -76,9 +88,7 @@ public class ItemStorageDisk extends ItemBase { storage.writeToNBT(); } - debugDisk.setTagCompound(debugDiskTag.copy()); - - return debugDisk; + stack.setTagCompound(debugDiskTag.copy()); } @Override diff --git a/src/main/java/refinedstorage/proxy/ClientProxy.java b/src/main/java/refinedstorage/proxy/ClientProxy.java index 3234aa838..5901c622c 100755 --- a/src/main/java/refinedstorage/proxy/ClientProxy.java +++ b/src/main/java/refinedstorage/proxy/ClientProxy.java @@ -107,6 +107,10 @@ public class ClientProxy extends CommonProxy { .build() ); + ModelLoader.setCustomStateMapper(RefinedStorageBlocks.GRID, (new StateMap.Builder()) + .ignore(RefinedStorageBlocks.GRID.TYPE) + .build()); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CABLE), 0, new ModelResourceLocation("refinedstorage:cable", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.NORMAL.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.CRAFTING.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory")); diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java index 8f41bb7a9..0a468e408 100755 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -86,10 +86,11 @@ public class CommonProxy { registerBlock(RefinedStorageBlocks.PROCESSING_PATTERN_ENCODER); registerBlock(RefinedStorageBlocks.DISK_DRIVE); registerBlock(RefinedStorageBlocks.STORAGE); - registerBlock(RefinedStorageBlocks.EXTERNAL_STORAGE); registerBlock(RefinedStorageBlocks.SOLDERER); + registerBlock(RefinedStorageBlocks.CABLE); registerBlock(RefinedStorageBlocks.IMPORTER); registerBlock(RefinedStorageBlocks.EXPORTER); + registerBlock(RefinedStorageBlocks.EXTERNAL_STORAGE); registerBlock(RefinedStorageBlocks.CONSTRUCTOR); registerBlock(RefinedStorageBlocks.DESTRUCTOR); registerBlock(RefinedStorageBlocks.DETECTOR); @@ -98,7 +99,6 @@ public class CommonProxy { registerBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER); registerBlock(RefinedStorageBlocks.MACHINE_CASING); registerBlock(RefinedStorageBlocks.QUARTZ_ENRICHED_IRON); - registerBlock(RefinedStorageBlocks.CABLE); registerItem(RefinedStorageItems.QUARTZ_ENRICHED_IRON); registerItem(RefinedStorageItems.STORAGE_DISK); diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/refinedstorage/tile/TileDiskDrive.java index 885899209..47cc20e7d 100755 --- a/src/main/java/refinedstorage/tile/TileDiskDrive.java +++ b/src/main/java/refinedstorage/tile/TileDiskDrive.java @@ -252,15 +252,17 @@ public class TileDiskDrive extends TileNode implements IStorageProvider, IStorag ItemStack disk = disks.getStackInSlot(i); if (disk != null) { + int capacity = EnumStorageType.getById(disk.getItemDamage()).getCapacity(); + + if (capacity == -1) { + return 0; + } + stored += NBTStorage.getStoredFromNBT(disk.getTagCompound()); storedMax += EnumStorageType.getById(disk.getItemDamage()).getCapacity(); } } - if (storedMax == 0) { - return 0; - } - return (int) Math.floor((stored / storedMax) * 7f); } diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java index 8335446c1..3e6df548f 100755 --- a/src/main/java/refinedstorage/tile/grid/TileGrid.java +++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java @@ -335,6 +335,7 @@ public class TileGrid extends TileNode implements IGrid { public void writeContainerData(ByteBuf buf) { super.writeContainerData(buf); + buf.writeBoolean(isConnected()); buf.writeInt(sortingDirection); buf.writeInt(sortingType); buf.writeInt(searchBoxMode); @@ -344,6 +345,7 @@ public class TileGrid extends TileNode implements IGrid { public void readContainerData(ByteBuf buf) { super.readContainerData(buf); + connected = buf.readBoolean(); sortingDirection = buf.readInt(); sortingType = buf.readInt(); searchBoxMode = buf.readInt(); diff --git a/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json b/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json index a75cb3868..dd86afd54 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json @@ -4,31 +4,17 @@ "model": "orientable", "textures": { "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side" + "top": "refinedstorage:blocks/side", + "front": "refinedstorage:blocks/crafting_monitor" } }, "variants": { "inventory": [ { - "textures": { - "front": "refinedstorage:blocks/crafting_monitor_disconnected" - }, "transform": "forge:default-block", "y": 0 } ], - "connected": { - "true": { - "textures": { - "front": "refinedstorage:blocks/crafting_monitor_connected" - } - }, - "false": { - "textures": { - "front": "refinedstorage:blocks/crafting_monitor_disconnected" - } - } - }, "direction": { "north": { "y": 0 diff --git a/src/main/resources/assets/refinedstorage/blockstates/grid.json b/src/main/resources/assets/refinedstorage/blockstates/grid.json index 00bd86d73..e8da5155c 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/grid.json +++ b/src/main/resources/assets/refinedstorage/blockstates/grid.json @@ -4,39 +4,17 @@ "model": "orientable", "textures": { "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side" + "top": "refinedstorage:blocks/side", + "front": "refinedstorage:blocks/grid" } }, "variants": { "inventory": [ { - "textures": { - "front": "refinedstorage:blocks/grid_disconnected" - }, "transform": "forge:default-block", "y": 0 } ], - "type": { - "normal": { - }, - "crafting": { - }, - "pattern": { - } - }, - "connected": { - "true": { - "textures": { - "front": "refinedstorage:blocks/grid_connected" - } - }, - "false": { - "textures": { - "front": "refinedstorage:blocks/grid_disconnected" - } - } - }, "direction": { "north": { "y": 0 diff --git a/src/main/resources/assets/refinedstorage/blockstates/processing_pattern_encoder.json b/src/main/resources/assets/refinedstorage/blockstates/processing_pattern_encoder.json index fc867cefa..a3c98690b 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/processing_pattern_encoder.json +++ b/src/main/resources/assets/refinedstorage/blockstates/processing_pattern_encoder.json @@ -6,10 +6,10 @@ "particle": "refinedstorage:blocks/processing_pattern_encoder", "down": "refinedstorage:blocks/side", "up": "refinedstorage:blocks/processing_pattern_encoder", - "north": "refinedstorage:blocks/side", - "east": "refinedstorage:blocks/side", - "south": "refinedstorage:blocks/side", - "west": "refinedstorage:blocks/side" + "north": "refinedstorage:blocks/processing_pattern_encoder_side", + "east": "refinedstorage:blocks/processing_pattern_encoder_side", + "south": "refinedstorage:blocks/processing_pattern_encoder_side", + "west": "refinedstorage:blocks/processing_pattern_encoder_side" } }, "variants": { diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/16k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/16k_storage_block.png index 3349e82b2..8ff144587 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/16k_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/16k_storage_block.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/1k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/1k_storage_block.png index f3fce9a15..f2fa1ec83 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/1k_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/1k_storage_block.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/4k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/4k_storage_block.png index 287b2d63f..8a77c23ae 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/4k_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/4k_storage_block.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/64k_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/64k_storage_block.png index e7136c7b8..9e41d73a7 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/64k_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/64k_storage_block.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/cable.png b/src/main/resources/assets/refinedstorage/textures/blocks/cable.png index 4688d64fd..bd28f0ac4 100644 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/cable.png and b/src/main/resources/assets/refinedstorage/textures/blocks/cable.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/constructor.png b/src/main/resources/assets/refinedstorage/textures/blocks/constructor.png index 633c4f6d3..cf3da9ef6 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/constructor.png and b/src/main/resources/assets/refinedstorage/textures/blocks/constructor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_0.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_0.png index 6326694bc..d51bea7e9 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/controller_0.png and b/src/main/resources/assets/refinedstorage/textures/blocks/controller_0.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/controller_8.png b/src/main/resources/assets/refinedstorage/textures/blocks/controller_8.png index 026dc3183..7e798a96e 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/controller_8.png and b/src/main/resources/assets/refinedstorage/textures/blocks/controller_8.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_connected.png index dfbb17253..e3a6efd07 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_connected.png and b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_disconnected.png index 6e61a7b46..8fdad8afb 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/crafter_disconnected.png and b/src/main/resources/assets/refinedstorage/textures/blocks/crafter_disconnected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor.png new file mode 100755 index 000000000..0d5423992 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_connected.png deleted file mode 100644 index 97fd64127..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_connected.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_disconnected.png deleted file mode 100644 index 47726405b..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_disconnected.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/creative_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/creative_storage_block.png index 954e5f1d3..96c077edf 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/creative_storage_block.png and b/src/main/resources/assets/refinedstorage/textures/blocks/creative_storage_block.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/destructor.png b/src/main/resources/assets/refinedstorage/textures/blocks/destructor.png index 966e61a91..b53384008 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/destructor.png and b/src/main/resources/assets/refinedstorage/textures/blocks/destructor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid.png new file mode 100644 index 000000000..b6dbbd026 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/grid.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_connected.png deleted file mode 100644 index 6bdf7cb7c..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/grid_connected.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/grid_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/grid_disconnected.png deleted file mode 100644 index 1dfb3e6a1..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/grid_disconnected.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/interface.png b/src/main/resources/assets/refinedstorage/textures/blocks/interface.png index f1eb74b71..ba08d5f5c 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/interface.png and b/src/main/resources/assets/refinedstorage/textures/blocks/interface.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/processing_pattern_encoder.png b/src/main/resources/assets/refinedstorage/textures/blocks/processing_pattern_encoder.png index aa522deae..540cfc314 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/processing_pattern_encoder.png and b/src/main/resources/assets/refinedstorage/textures/blocks/processing_pattern_encoder.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/processing_pattern_encoder_side.png b/src/main/resources/assets/refinedstorage/textures/blocks/processing_pattern_encoder_side.png new file mode 100755 index 000000000..7876508cf Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/processing_pattern_encoder_side.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected.png index 9c0456f61..0a01159b2 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected.png and b/src/main/resources/assets/refinedstorage/textures/blocks/relay_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/relay_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/relay_disconnected.png index ad284051d..4a56b7cae 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/relay_disconnected.png and b/src/main/resources/assets/refinedstorage/textures/blocks/relay_disconnected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/side.png b/src/main/resources/assets/refinedstorage/textures/blocks/side.png index 70d85da04..623c4942b 100644 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/side.png and b/src/main/resources/assets/refinedstorage/textures/blocks/side.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/16k_storage_disk.png b/src/main/resources/assets/refinedstorage/textures/items/16k_storage_disk.png index efb0e4ba0..a9aa58bd9 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/16k_storage_disk.png and b/src/main/resources/assets/refinedstorage/textures/items/16k_storage_disk.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/16k_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/16k_storage_part.png index 943560600..6e1dc29b7 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/16k_storage_part.png and b/src/main/resources/assets/refinedstorage/textures/items/16k_storage_part.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/1k_storage_disk.png b/src/main/resources/assets/refinedstorage/textures/items/1k_storage_disk.png index b8b732a28..ee912463a 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/1k_storage_disk.png and b/src/main/resources/assets/refinedstorage/textures/items/1k_storage_disk.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/1k_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/1k_storage_part.png index b7f942c3b..6174d3413 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/1k_storage_part.png and b/src/main/resources/assets/refinedstorage/textures/items/1k_storage_part.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/4k_storage_disk.png b/src/main/resources/assets/refinedstorage/textures/items/4k_storage_disk.png index 3db0e473f..cd312ae75 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/4k_storage_disk.png and b/src/main/resources/assets/refinedstorage/textures/items/4k_storage_disk.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/4k_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/4k_storage_part.png index 1350ca28b..1e23c7dee 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/4k_storage_part.png and b/src/main/resources/assets/refinedstorage/textures/items/4k_storage_part.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/64k_storage_disk.png b/src/main/resources/assets/refinedstorage/textures/items/64k_storage_disk.png index 05c07e2cd..66d064de0 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/64k_storage_disk.png and b/src/main/resources/assets/refinedstorage/textures/items/64k_storage_disk.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/64k_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/64k_storage_part.png index 6bdf0db68..50d392b51 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/64k_storage_part.png and b/src/main/resources/assets/refinedstorage/textures/items/64k_storage_part.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/advanced_printed_processor.png b/src/main/resources/assets/refinedstorage/textures/items/advanced_printed_processor.png index cea47f5d1..f22e5945d 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/advanced_printed_processor.png and b/src/main/resources/assets/refinedstorage/textures/items/advanced_printed_processor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/advanced_processor.png b/src/main/resources/assets/refinedstorage/textures/items/advanced_processor.png index 92b8688d9..6ddce529a 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/advanced_processor.png and b/src/main/resources/assets/refinedstorage/textures/items/advanced_processor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/basic_printed_processor.png b/src/main/resources/assets/refinedstorage/textures/items/basic_printed_processor.png index 09636faaa..4591f0289 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/basic_printed_processor.png and b/src/main/resources/assets/refinedstorage/textures/items/basic_printed_processor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/basic_processor.png b/src/main/resources/assets/refinedstorage/textures/items/basic_processor.png index 6a5ec3f50..41d9784c3 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/basic_processor.png and b/src/main/resources/assets/refinedstorage/textures/items/basic_processor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/construction_core.png b/src/main/resources/assets/refinedstorage/textures/items/construction_core.png index 8b2b6974d..dea53d83a 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/construction_core.png and b/src/main/resources/assets/refinedstorage/textures/items/construction_core.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/crafting_upgrade.png b/src/main/resources/assets/refinedstorage/textures/items/crafting_upgrade.png index c1a269bb0..93cf8f7b8 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/crafting_upgrade.png and b/src/main/resources/assets/refinedstorage/textures/items/crafting_upgrade.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/creative_storage_disk.png b/src/main/resources/assets/refinedstorage/textures/items/creative_storage_disk.png index 3e50b7ec2..870c48ab4 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/creative_storage_disk.png and b/src/main/resources/assets/refinedstorage/textures/items/creative_storage_disk.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/debug_storage_disk.png b/src/main/resources/assets/refinedstorage/textures/items/debug_storage_disk.png deleted file mode 100755 index b3b3eefbc..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/items/debug_storage_disk.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/destruction_core.png b/src/main/resources/assets/refinedstorage/textures/items/destruction_core.png index c3e9635d4..16af3013a 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/destruction_core.png and b/src/main/resources/assets/refinedstorage/textures/items/destruction_core.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/improved_printed_processor.png b/src/main/resources/assets/refinedstorage/textures/items/improved_printed_processor.png index 2442ceafe..6bf3586dc 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/improved_printed_processor.png and b/src/main/resources/assets/refinedstorage/textures/items/improved_printed_processor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/improved_processor.png b/src/main/resources/assets/refinedstorage/textures/items/improved_processor.png index a21526f3d..488a3228d 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/improved_processor.png and b/src/main/resources/assets/refinedstorage/textures/items/improved_processor.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/pattern.png b/src/main/resources/assets/refinedstorage/textures/items/pattern.png index 98129707b..e4c5d8ba0 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/pattern.png and b/src/main/resources/assets/refinedstorage/textures/items/pattern.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/printed_silicon.png b/src/main/resources/assets/refinedstorage/textures/items/printed_silicon.png index 9b02997e8..b1c09018f 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/printed_silicon.png and b/src/main/resources/assets/refinedstorage/textures/items/printed_silicon.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/range_upgrade.png b/src/main/resources/assets/refinedstorage/textures/items/range_upgrade.png index d55910b20..d538d5475 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/range_upgrade.png and b/src/main/resources/assets/refinedstorage/textures/items/range_upgrade.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/silicon.png b/src/main/resources/assets/refinedstorage/textures/items/silicon.png index 89cdf136c..c5f837dc7 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/silicon.png and b/src/main/resources/assets/refinedstorage/textures/items/silicon.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/speed_upgrade.png b/src/main/resources/assets/refinedstorage/textures/items/speed_upgrade.png index cb9b18fde..b0a0dc690 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/speed_upgrade.png and b/src/main/resources/assets/refinedstorage/textures/items/speed_upgrade.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/stack_upgrade.png b/src/main/resources/assets/refinedstorage/textures/items/stack_upgrade.png index bb5e48847..78e4d461f 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/stack_upgrade.png and b/src/main/resources/assets/refinedstorage/textures/items/stack_upgrade.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/storage_housing.png b/src/main/resources/assets/refinedstorage/textures/items/storage_housing.png index 148b2cbc1..5f2f99fee 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/storage_housing.png and b/src/main/resources/assets/refinedstorage/textures/items/storage_housing.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/upgrade.png b/src/main/resources/assets/refinedstorage/textures/items/upgrade.png index c7662f5ee..d2c17551f 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/upgrade.png and b/src/main/resources/assets/refinedstorage/textures/items/upgrade.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_connected.png b/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_connected.png index f0332e9ea..1359f98fc 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_connected.png and b/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_disconnected.png b/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_disconnected.png index 9f506593c..0659e66a1 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_disconnected.png and b/src/main/resources/assets/refinedstorage/textures/items/wireless_grid_disconnected.png differ