From 270b3869c8d7d102dc1d5def4ba3179d9822298c Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 20 Aug 2016 15:58:37 +0200 Subject: [PATCH] Apply textures --- .../gui/sidebutton/SideButtonType.java | 4 +- .../refinedstorage/proxy/ClientProxy.java | 8 +-- .../refinedstorage/proxy/CommonProxy.java | 8 +-- .../blockstates/fluid_grid.json | 58 ++++++++++++++++++ .../refinedstorage/blockstates/grid.json | 31 +++++++++- .../textures/blocks/fluid_grid_side.png | Bin 0 -> 741 bytes .../assets/refinedstorage/textures/icons.png | Bin 3172 -> 2918 bytes 7 files changed, 96 insertions(+), 13 deletions(-) create mode 100755 src/main/resources/assets/refinedstorage/blockstates/fluid_grid.json create mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/fluid_grid_side.png 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 0000000000000000000000000000000000000000..2a73ad9252d284a1fc810300906a404dd50fb32b GIT binary patch literal 741 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