From 1bec48499b437752fdb154bb703e945eb6f2cdb6 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Mon, 11 Apr 2016 19:07:54 +0200 Subject: [PATCH] Add models for all new blocks and items (crappy textures are temporary) --- .../refinedstorage/proxy/ClientProxy.java | 27 +++++++-- .../blockstates/crafting_cpu.json | 36 ++++++++++++ .../blockstates/crafting_monitor.json | 53 ++++++++++++++++++ .../blockstates/wireless_transmitter.json | 53 ++++++++++++++++++ .../models/item/range_upgrade.json | 6 ++ .../models/item/speed_upgrade.json | 6 ++ .../textures/blocks/16k_crafting_cpu.png | Bin 0 -> 265 bytes .../textures/blocks/1k_crafting_cpu.png | Bin 0 -> 255 bytes .../textures/blocks/4k_crafting_cpu.png | Bin 0 -> 257 bytes .../textures/blocks/64k_crafting_cpu.png | Bin 0 -> 255 bytes .../blocks/crafting_monitor_connected.png | Bin 0 -> 201 bytes .../blocks/crafting_monitor_disconnected.png | Bin 0 -> 197 bytes .../textures/blocks/creative_crafting_cpu.png | Bin 0 -> 250 bytes .../blocks/wireless_transmitter_connected.png | Bin 0 -> 224 bytes .../wireless_transmitter_disconnected.png | Bin 0 -> 244 bytes .../textures/items/range_upgrade.png | Bin 0 -> 235 bytes .../textures/items/speed_upgrade.png | Bin 0 -> 214 bytes 17 files changed, 177 insertions(+), 4 deletions(-) create mode 100755 src/main/resources/assets/refinedstorage/blockstates/crafting_cpu.json create mode 100755 src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json create mode 100755 src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json create mode 100755 src/main/resources/assets/refinedstorage/models/item/range_upgrade.json create mode 100755 src/main/resources/assets/refinedstorage/models/item/speed_upgrade.json create mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/16k_crafting_cpu.png create mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/1k_crafting_cpu.png create mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/4k_crafting_cpu.png create mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/64k_crafting_cpu.png create mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_connected.png create mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_disconnected.png create mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/creative_crafting_cpu.png create mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_connected.png create mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_disconnected.png create mode 100755 src/main/resources/assets/refinedstorage/textures/items/range_upgrade.png create mode 100755 src/main/resources/assets/refinedstorage/textures/items/speed_upgrade.png diff --git a/src/main/java/refinedstorage/proxy/ClientProxy.java b/src/main/java/refinedstorage/proxy/ClientProxy.java index 52073fe70..0e660007c 100755 --- a/src/main/java/refinedstorage/proxy/ClientProxy.java +++ b/src/main/java/refinedstorage/proxy/ClientProxy.java @@ -12,10 +12,7 @@ import refinedstorage.RefinedStorageItems; import refinedstorage.block.EnumControllerType; import refinedstorage.block.EnumGridType; import refinedstorage.block.EnumStorageType; -import refinedstorage.item.ItemCore; -import refinedstorage.item.ItemProcessor; -import refinedstorage.item.ItemStorageDisk; -import refinedstorage.item.ItemStoragePart; +import refinedstorage.item.*; public class ClientProxy extends CommonProxy { @Override @@ -53,6 +50,11 @@ public class ClientProxy extends CommonProxy { new ResourceLocation("refinedstorage:destruction_core") ); + ModelBakery.registerItemVariants(RefinedStorageItems.UPGRADE, + new ResourceLocation("refinedstorage:range_upgrade"), + new ResourceLocation("refinedstorage:speed_upgrade") + ); + // Items ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_DISK, ItemStorageDisk.TYPE_1K, new ModelResourceLocation("refinedstorage:1k_storage_disk", "inventory")); ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_DISK, ItemStorageDisk.TYPE_4K, new ModelResourceLocation("refinedstorage:4k_storage_disk", "inventory")); @@ -84,6 +86,9 @@ public class ClientProxy extends CommonProxy { ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PATTERN, 0, new ModelResourceLocation("refinedstorage:pattern", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_RANGE, new ModelResourceLocation("refinedstorage:range_upgrade", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_SPEED, new ModelResourceLocation("refinedstorage:speed_upgrade", "inventory")); + // Blocks 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")); @@ -102,6 +107,8 @@ public class ClientProxy extends CommonProxy { ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.DETECTOR), 0, new ModelResourceLocation("refinedstorage:detector", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.RELAY), 0, new ModelResourceLocation("refinedstorage:relay", "inventory")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.INTERFACE), 0, new ModelResourceLocation("refinedstorage:interface", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.WIRELESS_TRANSMITTER), 0, new ModelResourceLocation("refinedstorage:wireless_transmitter", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_MONITOR), 0, new ModelResourceLocation("refinedstorage:crafting_monitor", "inventory")); ModelLoader.setCustomStateMapper(RefinedStorageBlocks.STORAGE, (new StateMap.Builder()) .ignore(RefinedStorageBlocks.STORAGE.DIRECTION) @@ -109,10 +116,22 @@ public class ClientProxy extends CommonProxy { .build() ); + ModelLoader.setCustomStateMapper(RefinedStorageBlocks.CRAFTING_CPU, (new StateMap.Builder()) + .ignore(RefinedStorageBlocks.STORAGE.DIRECTION) + .ignore(RefinedStorageBlocks.STORAGE.CONNECTED) + .build() + ); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_1K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=1k")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_4K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=4k")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_16K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=16k")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_64K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=64k")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumStorageType.TYPE_CREATIVE.getId(), new ModelResourceLocation("refinedstorage:storage", "type=creative")); + + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_CPU), EnumStorageType.TYPE_1K.getId(), new ModelResourceLocation("refinedstorage:crafting_cpu", "type=1k")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_CPU), EnumStorageType.TYPE_4K.getId(), new ModelResourceLocation("refinedstorage:crafting_cpu", "type=4k")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_CPU), EnumStorageType.TYPE_16K.getId(), new ModelResourceLocation("refinedstorage:crafting_cpu", "type=16k")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_CPU), EnumStorageType.TYPE_64K.getId(), new ModelResourceLocation("refinedstorage:crafting_cpu", "type=64k")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTING_CPU), EnumStorageType.TYPE_CREATIVE.getId(), new ModelResourceLocation("refinedstorage:crafting_cpu", "type=creative")); } } diff --git a/src/main/resources/assets/refinedstorage/blockstates/crafting_cpu.json b/src/main/resources/assets/refinedstorage/blockstates/crafting_cpu.json new file mode 100755 index 000000000..c7099e4a3 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/blockstates/crafting_cpu.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "type": { + "1k": { + "textures": { + "all": "refinedstorage:blocks/1k_crafting_cpu" + } + }, + "4k": { + "textures": { + "all": "refinedstorage:blocks/4k_crafting_cpu" + } + }, + "16k": { + "textures": { + "all": "refinedstorage:blocks/16k_crafting_cpu" + } + }, + "64k": { + "textures": { + "all": "refinedstorage:blocks/64k_crafting_cpu" + } + }, + "creative": { + "textures": { + "all": "refinedstorage:blocks/creative_crafting_cpu" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json b/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json new file mode 100755 index 000000000..a75cb3868 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/blockstates/crafting_monitor.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side" + } + }, + "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 + }, + "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/wireless_transmitter.json b/src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json new file mode 100755 index 000000000..da440692b --- /dev/null +++ b/src/main/resources/assets/refinedstorage/blockstates/wireless_transmitter.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "orientable", + "textures": { + "side": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side" + } + }, + "variants": { + "inventory": [ + { + "textures": { + "front": "refinedstorage:blocks/wireless_transmitter_disconnected" + }, + "transform": "forge:default-block", + "y": 0 + } + ], + "connected": { + "true": { + "textures": { + "front": "refinedstorage:blocks/wireless_transmitter_connected" + } + }, + "false": { + "textures": { + "front": "refinedstorage:blocks/wireless_transmitter_disconnected" + } + } + }, + "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/models/item/range_upgrade.json b/src/main/resources/assets/refinedstorage/models/item/range_upgrade.json new file mode 100755 index 000000000..4def4cc94 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/range_upgrade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/range_upgrade" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/item/speed_upgrade.json b/src/main/resources/assets/refinedstorage/models/item/speed_upgrade.json new file mode 100755 index 000000000..c0f55ac22 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/speed_upgrade.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/speed_upgrade" + } +} diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/16k_crafting_cpu.png b/src/main/resources/assets/refinedstorage/textures/blocks/16k_crafting_cpu.png new file mode 100755 index 0000000000000000000000000000000000000000..da37787859cd003c8e55489490a7057d509fe9bf GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ35DWj_o@k*40}kfB|Cef?O^>0^y zdC*@Jc~C}x*OL35NdxDv9;Vlo)*Jp>GDQEZN<9;j!)_q!aOLr_LmMp~GXImRId;S= zv{W)UO-JK^*AmJ5eS0F44)|SoerA>3wuNFp?p(UX{os)}8@FStJkS*kp00i_>zopr E0D!JtUH||9 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/1k_crafting_cpu.png b/src/main/resources/assets/refinedstorage/textures/blocks/1k_crafting_cpu.png new file mode 100755 index 0000000000000000000000000000000000000000..8620806151699a37a2718860c328e59f321e0b8d GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJFss1{}=Q|GmQ#48A3=wM%!LJSE_jd!2}vLhp>7W)5La zQoDHn9-Y;k`||ed!;e-bBt%bRT_#jmeE7n>J2ypoY8CtXb_&(sFjyk^ufFS=m4tHb u0vF+j2|Wj;B3d&Q7O!N;th^WWn(0#LT=By}Z;C1rt33 zJf_-o`Op>5k`)nsq+1;(?9WoGSB$aZA!J8GHQv@%)j~m79FZ wM+6S(GrcV-7Aau9&%9JdJ!I*E!V`1EnP!?lU8J>76KFewr>mdKI;Vst0L&j&f&c&j literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/64k_crafting_cpu.png b/src/main/resources/assets/refinedstorage/textures/blocks/64k_crafting_cpu.png new file mode 100755 index 0000000000000000000000000000000000000000..5b110fccc8407ad40c5669ed1cb4eeae09e3c807 GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ`>juD`vkO6~0$3m_NC!fivi**>xA^N(JsB;njDhq+M(GW8cD?+H)*bw)p3@(gwyw uOY*0tcl|7GILTZTkThYMv~#6*w)x){?T-c~ktIO889ZJ6T-G@yGywqTn^(jD literal 0 HcmV?d00001 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 new file mode 100755 index 0000000000000000000000000000000000000000..77eb4187db360def453833a4ac93b1c08d62e46b GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJqYX(y47qb!cus6$ pJZodp!uH~2rV?YP)W84i3|ko2ub*|mnG0#LT=By}Z;C1rt33 zJ{o{t-V3)p|Nm!Z$Y|XkYxPL#GtdMEPgg&ebxsLQ09-6M4gdfE literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/creative_crafting_cpu.png b/src/main/resources/assets/refinedstorage/textures/blocks/creative_crafting_cpu.png new file mode 100755 index 0000000000000000000000000000000000000000..3309b67b3fe7d5d84c4078c1582be047da549b40 GIT binary patch literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ0#LT=By}Z;C1rt33 zJu~}Dk zFjSnq`N2kC=*=6JHwA7EcH9=4YwUzf51yJUVEI6eyZp+vW7&>d86O$Ut!EWqavx|o NgQu&X%Q~loCIGn_MJxaS literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_disconnected.png new file mode 100755 index 0000000000000000000000000000000000000000..a7c43db8ee9ae2d924c34f51db4a825d0d48f10d GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ4!oO3s|_8=Q69!(q}sF0#LT=By}Z;C1rt33 zJa1L3|csRz%52NbFB ahR9D7SzP%e<7_|B9tKZWKbLh*2~7Z&?Na~% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/refinedstorage/textures/items/speed_upgrade.png b/src/main/resources/assets/refinedstorage/textures/items/speed_upgrade.png new file mode 100755 index 0000000000000000000000000000000000000000..261eaf13f58ec91c759604153dcfd20b05ce78b0 GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJQJ$DjlB!j1`pUXO@geCy# C>p%wp literal 0 HcmV?d00001