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 000000000..da3778785 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/16k_crafting_cpu.png differ 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 000000000..862080615 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/1k_crafting_cpu.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/4k_crafting_cpu.png b/src/main/resources/assets/refinedstorage/textures/blocks/4k_crafting_cpu.png new file mode 100755 index 000000000..461601e9f Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/4k_crafting_cpu.png differ 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 000000000..5b110fccc Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/64k_crafting_cpu.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 new file mode 100755 index 000000000..77eb4187d Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_connected.png 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 new file mode 100755 index 000000000..81c84e384 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/crafting_monitor_disconnected.png differ 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 000000000..3309b67b3 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/creative_crafting_cpu.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_connected.png new file mode 100755 index 000000000..e23835e50 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_connected.png differ 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 000000000..a7c43db8e Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/wireless_transmitter_disconnected.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 new file mode 100755 index 000000000..ff3a5fe9f Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/range_upgrade.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 new file mode 100755 index 000000000..261eaf13f Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/speed_upgrade.png differ