diff --git a/src/main/java/refinedstorage/gui/sidebutton/SideButtonType.java b/src/main/java/refinedstorage/gui/sidebutton/SideButtonType.java index 4072419ab..441fe4024 100755 --- a/src/main/java/refinedstorage/gui/sidebutton/SideButtonType.java +++ b/src/main/java/refinedstorage/gui/sidebutton/SideButtonType.java @@ -6,7 +6,6 @@ import refinedstorage.tile.config.IType; import refinedstorage.tile.data.TileDataManager; import refinedstorage.tile.data.TileDataParameter; -// @TODO: Add icons public class SideButtonType extends SideButton { private TileDataParameter type; @@ -21,6 +20,9 @@ public class SideButtonType extends SideButton { @Override public void draw(GuiBase gui, int x, int y) { + gui.bindTexture("icons.png"); + + gui.drawTexture(x, y + 1, 16 * type.getValue(), 128, 16, 16); } @Override diff --git a/src/main/java/refinedstorage/proxy/ClientProxy.java b/src/main/java/refinedstorage/proxy/ClientProxy.java index 47e87b205..f020eb554 100755 --- a/src/main/java/refinedstorage/proxy/ClientProxy.java +++ b/src/main/java/refinedstorage/proxy/ClientProxy.java @@ -9,7 +9,6 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; -import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -246,16 +245,11 @@ public class ClientProxy extends CommonProxy { ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_INTERDIMENSIONAL, new ModelResourceLocation("refinedstorage:interdimensional_upgrade", "inventory")); // Blocks - 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")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.PATTERN.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.FLUID.getId(), new ModelResourceLocation("refinedstorage:grid", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.GRID), EnumGridType.FLUID.getId(), new ModelResourceLocation("refinedstorage:fluid_grid", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.MACHINE_CASING), 0, new ModelResourceLocation("refinedstorage:machine_casing", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.EXPORTER), 0, new ModelResourceLocation("refinedstorage:exporter", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.IMPORTER), 0, new ModelResourceLocation("refinedstorage:importer", "inventory")); diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java index 96da659e5..5582bb1da 100755 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -95,6 +95,7 @@ public class CommonProxy { registerBlock(RefinedStorageBlocks.PROCESSING_PATTERN_ENCODER); registerBlock(RefinedStorageBlocks.DISK_DRIVE); registerBlock(RefinedStorageBlocks.STORAGE); + registerBlock(RefinedStorageBlocks.FLUID_STORAGE); registerBlock(RefinedStorageBlocks.SOLDERER); registerBlock(RefinedStorageBlocks.CABLE); registerBlock(RefinedStorageBlocks.IMPORTER); @@ -105,18 +106,19 @@ public class CommonProxy { registerBlock(RefinedStorageBlocks.DETECTOR); registerBlock(RefinedStorageBlocks.RELAY); registerBlock(RefinedStorageBlocks.INTERFACE); + registerBlock(RefinedStorageBlocks.FLUID_INTERFACE); registerBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER); registerBlock(RefinedStorageBlocks.MACHINE_CASING); registerBlock(RefinedStorageBlocks.NETWORK_TRANSMITTER); registerBlock(RefinedStorageBlocks.NETWORK_RECEIVER); - registerBlock(RefinedStorageBlocks.FLUID_INTERFACE); - registerBlock(RefinedStorageBlocks.FLUID_STORAGE); registerItem(RefinedStorageItems.QUARTZ_ENRICHED_IRON); registerItem(RefinedStorageItems.STORAGE_DISK); + registerItem(RefinedStorageItems.FLUID_STORAGE_DISK); registerItem(RefinedStorageItems.STORAGE_HOUSING); registerItem(RefinedStorageItems.PATTERN); registerItem(RefinedStorageItems.STORAGE_PART); + registerItem(RefinedStorageItems.FLUID_STORAGE_PART); registerItem(RefinedStorageItems.WIRELESS_GRID); registerItem(RefinedStorageItems.PROCESSOR); registerItem(RefinedStorageItems.CORE); @@ -124,8 +126,6 @@ public class CommonProxy { registerItem(RefinedStorageItems.UPGRADE); registerItem(RefinedStorageItems.GRID_FILTER); registerItem(RefinedStorageItems.NETWORK_CARD); - registerItem(RefinedStorageItems.FLUID_STORAGE_DISK); - registerItem(RefinedStorageItems.FLUID_STORAGE_PART); OreDictionary.registerOre("itemSilicon", RefinedStorageItems.SILICON); diff --git a/src/main/resources/assets/refinedstorage/blockstates/fluid_grid.json b/src/main/resources/assets/refinedstorage/blockstates/fluid_grid.json new file mode 100755 index 000000000..54c9bd0cf --- /dev/null +++ b/src/main/resources/assets/refinedstorage/blockstates/fluid_grid.json @@ -0,0 +1,58 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "refinedstorage:blocks/fluid_grid_side", + "top": "refinedstorage:blocks/fluid_grid_side", + "front": "refinedstorage:blocks/fluid_grid_disconnected" + } + }, + "variants": { + "inventory": [ + { + "transform": "forge:default-block", + "y": 0 + } + ], + "connected": { + "true": { + "textures": { + "front": "refinedstorage:blocks/fluid_grid_connected" + } + }, + "false": { + } + }, + "type": { + "normal": { + }, + "crafting": { + }, + "pattern": { + }, + "fluid": { + } + }, + "direction": { + "north": { + "y": 0 + }, + "east": { + "y": 90 + }, + "south": { + "y": 180 + }, + "west": { + "y": 270 + }, + "up": { + "x": 270 + }, + "down": { + "x": 90 + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/grid.json b/src/main/resources/assets/refinedstorage/blockstates/grid.json index d7f25ab10..7f4dc9ac1 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/grid.json +++ b/src/main/resources/assets/refinedstorage/blockstates/grid.json @@ -18,10 +18,39 @@ "connected": { "true": { "textures": { - "front": "refinedstorage:blocks/grid_connected" + "front_fluid_grid": "refinedstorage:blocks/fluid_grid_connected", + "front_other": "refinedstorage:blocks/grid_connected" } }, "false": { + "textures": { + "front_fluid_grid": "refinedstorage:blocks/fluid_grid_disconnected", + "front_other": "refinedstorage:blocks/grid_disconnected" + } + } + }, + "type": { + "normal": { + "textures": { + "front": "#front_other" + } + }, + "crafting": { + "textures": { + "front": "#front_other" + } + }, + "pattern": { + "textures": { + "front": "#front_other" + } + }, + "fluid": { + "textures": { + "front": "#front_fluid_grid", + "side": "refinedstorage:blocks/fluid_grid_side", + "top": "refinedstorage:blocks/fluid_grid_side" + } } }, "direction": { diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/fluid_grid_side.png b/src/main/resources/assets/refinedstorage/textures/blocks/fluid_grid_side.png new file mode 100755 index 000000000..2a73ad925 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/fluid_grid_side.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/icons.png b/src/main/resources/assets/refinedstorage/textures/icons.png index 9657e27de..4ebdc05d5 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/icons.png and b/src/main/resources/assets/refinedstorage/textures/icons.png differ