diff --git a/src/main/java/refinedstorage/proxy/ClientProxy.java b/src/main/java/refinedstorage/proxy/ClientProxy.java index d5695a78e..47e87b205 100755 --- a/src/main/java/refinedstorage/proxy/ClientProxy.java +++ b/src/main/java/refinedstorage/proxy/ClientProxy.java @@ -27,10 +27,7 @@ import org.lwjgl.opengl.GL11; import refinedstorage.RefinedStorage; import refinedstorage.RefinedStorageBlocks; import refinedstorage.RefinedStorageItems; -import refinedstorage.block.BlockCable; -import refinedstorage.block.EnumControllerType; -import refinedstorage.block.EnumGridType; -import refinedstorage.block.EnumItemStorageType; +import refinedstorage.block.*; import refinedstorage.item.*; import java.util.List; @@ -160,6 +157,21 @@ public class ClientProxy extends CommonProxy { new ResourceLocation("refinedstorage:64k_storage_part") ); + ModelBakery.registerItemVariants(RefinedStorageItems.FLUID_STORAGE_DISK, + new ResourceLocation("refinedstorage:64k_fluid_storage_disk"), + new ResourceLocation("refinedstorage:128k_fluid_storage_disk"), + new ResourceLocation("refinedstorage:256k_fluid_storage_disk"), + new ResourceLocation("refinedstorage:512k_fluid_storage_disk"), + new ResourceLocation("refinedstorage:creative_fluid_storage_disk") + ); + + ModelBakery.registerItemVariants(RefinedStorageItems.FLUID_STORAGE_PART, + new ResourceLocation("refinedstorage:64k_fluid_storage_part"), + new ResourceLocation("refinedstorage:128k_fluid_storage_part"), + new ResourceLocation("refinedstorage:256k_fluid_storage_part"), + new ResourceLocation("refinedstorage:512k_fluid_storage_part") + ); + ModelBakery.registerItemVariants(RefinedStorageItems.PROCESSOR, new ResourceLocation("refinedstorage:basic_printed_processor"), new ResourceLocation("refinedstorage:improved_printed_processor"), @@ -195,6 +207,17 @@ public class ClientProxy extends CommonProxy { ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_16K, new ModelResourceLocation("refinedstorage:16k_storage_part", "inventory")); ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.STORAGE_PART, ItemStoragePart.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_storage_part", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.FLUID_STORAGE_DISK, ItemFluidStorageDisk.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_fluid_storage_disk", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.FLUID_STORAGE_DISK, ItemFluidStorageDisk.TYPE_128K, new ModelResourceLocation("refinedstorage:128k_fluid_storage_disk", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.FLUID_STORAGE_DISK, ItemFluidStorageDisk.TYPE_256K, new ModelResourceLocation("refinedstorage:256k_fluid_storage_disk", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.FLUID_STORAGE_DISK, ItemFluidStorageDisk.TYPE_512K, new ModelResourceLocation("refinedstorage:512k_fluid_storage_disk", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.FLUID_STORAGE_DISK, ItemFluidStorageDisk.TYPE_CREATIVE, new ModelResourceLocation("refinedstorage:creative_fluid_storage_disk", "inventory")); + + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.FLUID_STORAGE_PART, ItemFluidStoragePart.TYPE_64K, new ModelResourceLocation("refinedstorage:64k_fluid_storage_part", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.FLUID_STORAGE_PART, ItemFluidStoragePart.TYPE_128K, new ModelResourceLocation("refinedstorage:128k_fluid_storage_part", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.FLUID_STORAGE_PART, ItemFluidStoragePart.TYPE_256K, new ModelResourceLocation("refinedstorage:256k_fluid_storage_part", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.FLUID_STORAGE_PART, ItemFluidStoragePart.TYPE_512K, new ModelResourceLocation("refinedstorage:512k_fluid_storage_part", "inventory")); + ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_BASIC, new ModelResourceLocation("refinedstorage:basic_printed_processor", "inventory")); ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_IMPROVED, new ModelResourceLocation("refinedstorage:improved_printed_processor", "inventory")); ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PROCESSOR, ItemProcessor.TYPE_PRINTED_ADVANCED, new ModelResourceLocation("refinedstorage:advanced_printed_processor", "inventory")); @@ -246,6 +269,7 @@ 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.FLUID_INTERFACE), 0, new ModelResourceLocation("refinedstorage:fluid_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.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.CRAFTER), 0, new ModelResourceLocation("refinedstorage:crafter", "inventory")); @@ -257,5 +281,10 @@ public class ClientProxy extends CommonProxy { ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumItemStorageType.TYPE_16K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=16k")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumItemStorageType.TYPE_64K.getId(), new ModelResourceLocation("refinedstorage:storage", "type=64k")); ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.STORAGE), EnumItemStorageType.TYPE_CREATIVE.getId(), new ModelResourceLocation("refinedstorage:storage", "type=creative")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.FLUID_STORAGE), EnumFluidStorageType.TYPE_64K.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=64k")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.FLUID_STORAGE), EnumFluidStorageType.TYPE_128K.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=128k")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.FLUID_STORAGE), EnumFluidStorageType.TYPE_256K.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=256k")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.FLUID_STORAGE), EnumFluidStorageType.TYPE_512K.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=512k")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RefinedStorageBlocks.FLUID_STORAGE), EnumFluidStorageType.TYPE_CREATIVE.getId(), new ModelResourceLocation("refinedstorage:fluid_storage", "type=creative")); } } diff --git a/src/main/resources/assets/refinedstorage/blockstates/fluid_interface.json b/src/main/resources/assets/refinedstorage/blockstates/fluid_interface.json new file mode 100755 index 000000000..e51a496b8 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/blockstates/fluid_interface.json @@ -0,0 +1,25 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "textures": { + "all": "refinedstorage:blocks/fluid_interface_disconnected" + } + }, + "variants": { + "inventory": [ + { + "transform": "forge:default-block" + } + ], + "connected": { + "true": { + "textures": { + "all": "refinedstorage:blocks/fluid_interface_connected" + } + }, + "false": { + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/blockstates/fluid_storage.json b/src/main/resources/assets/refinedstorage/blockstates/fluid_storage.json new file mode 100755 index 000000000..a6dfa7feb --- /dev/null +++ b/src/main/resources/assets/refinedstorage/blockstates/fluid_storage.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "cube_all", + "transform": "forge:default-block" + }, + "variants": { + "type": { + "64k": { + "textures": { + "all": "refinedstorage:blocks/64k_fluid_storage_block" + } + }, + "128k": { + "textures": { + "all": "refinedstorage:blocks/128k_fluid_storage_block" + } + }, + "256k": { + "textures": { + "all": "refinedstorage:blocks/256k_fluid_storage_block" + } + }, + "512k": { + "textures": { + "all": "refinedstorage:blocks/512k_fluid_storage_block" + } + }, + "creative": { + "textures": { + "all": "refinedstorage:blocks/creative_fluid_storage_block" + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/item/128k_fluid_storage_disk.json b/src/main/resources/assets/refinedstorage/models/item/128k_fluid_storage_disk.json new file mode 100755 index 000000000..8503c025d --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/128k_fluid_storage_disk.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/128k_fluid_storage_disk" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/item/128k_fluid_storage_part.json b/src/main/resources/assets/refinedstorage/models/item/128k_fluid_storage_part.json new file mode 100755 index 000000000..6a0f26529 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/128k_fluid_storage_part.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/128k_fluid_storage_part" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/item/256k_fluid_storage_disk.json b/src/main/resources/assets/refinedstorage/models/item/256k_fluid_storage_disk.json new file mode 100755 index 000000000..b01ab7929 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/256k_fluid_storage_disk.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/256k_fluid_storage_disk" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/item/256k_fluid_storage_part.json b/src/main/resources/assets/refinedstorage/models/item/256k_fluid_storage_part.json new file mode 100755 index 000000000..c15cbf508 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/256k_fluid_storage_part.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/256k_fluid_storage_part" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/item/512k_fluid_storage_disk.json b/src/main/resources/assets/refinedstorage/models/item/512k_fluid_storage_disk.json new file mode 100755 index 000000000..c915ab76b --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/512k_fluid_storage_disk.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/512k_fluid_storage_disk" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/item/512k_fluid_storage_part.json b/src/main/resources/assets/refinedstorage/models/item/512k_fluid_storage_part.json new file mode 100755 index 000000000..04771a814 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/512k_fluid_storage_part.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/512k_fluid_storage_part" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/item/64k_fluid_storage_disk.json b/src/main/resources/assets/refinedstorage/models/item/64k_fluid_storage_disk.json new file mode 100755 index 000000000..7d84a85f7 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/64k_fluid_storage_disk.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/64k_fluid_storage_disk" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/item/64k_fluid_storage_part.json b/src/main/resources/assets/refinedstorage/models/item/64k_fluid_storage_part.json new file mode 100755 index 000000000..1e8e6fc0b --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/64k_fluid_storage_part.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/64k_fluid_storage_part" + } +} diff --git a/src/main/resources/assets/refinedstorage/models/item/creative_fluid_storage_disk.json b/src/main/resources/assets/refinedstorage/models/item/creative_fluid_storage_disk.json new file mode 100755 index 000000000..90d5cf800 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/item/creative_fluid_storage_disk.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "refinedstorage:items/creative_fluid_storage_disk" + } +} diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/128k_fluid_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/128k_fluid_storage_block.png new file mode 100755 index 000000000..4bf722d41 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/128k_fluid_storage_block.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/256k_fluid_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/256k_fluid_storage_block.png new file mode 100755 index 000000000..93ab532fb Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/256k_fluid_storage_block.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/512k_fluid_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/512k_fluid_storage_block.png new file mode 100755 index 000000000..d759dc3e1 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/512k_fluid_storage_block.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/64k_fluid_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/64k_fluid_storage_block.png new file mode 100755 index 000000000..bc7093ac4 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/64k_fluid_storage_block.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/creative_fluid_storage_block.png b/src/main/resources/assets/refinedstorage/textures/blocks/creative_fluid_storage_block.png new file mode 100755 index 000000000..87e71fcc0 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/creative_fluid_storage_block.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/fluid_interface_connected.png b/src/main/resources/assets/refinedstorage/textures/blocks/fluid_interface_connected.png new file mode 100755 index 000000000..52dd35e12 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/fluid_interface_connected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/fluid_interface_disconnected.png b/src/main/resources/assets/refinedstorage/textures/blocks/fluid_interface_disconnected.png new file mode 100755 index 000000000..b57031f9b Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/fluid_interface_disconnected.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/128k_fluid_storage_disk.png b/src/main/resources/assets/refinedstorage/textures/items/128k_fluid_storage_disk.png new file mode 100755 index 000000000..4bf722d41 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/128k_fluid_storage_disk.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/128k_fluid_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/128k_fluid_storage_part.png new file mode 100755 index 000000000..4bf722d41 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/128k_fluid_storage_part.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/256k_fluid_storage_disk.png b/src/main/resources/assets/refinedstorage/textures/items/256k_fluid_storage_disk.png new file mode 100755 index 000000000..93ab532fb Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/256k_fluid_storage_disk.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/256k_fluid_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/256k_fluid_storage_part.png new file mode 100755 index 000000000..93ab532fb Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/256k_fluid_storage_part.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/512k_fluid_storage_disk.png b/src/main/resources/assets/refinedstorage/textures/items/512k_fluid_storage_disk.png new file mode 100755 index 000000000..d759dc3e1 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/512k_fluid_storage_disk.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/512k_fluid_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/512k_fluid_storage_part.png new file mode 100755 index 000000000..d759dc3e1 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/512k_fluid_storage_part.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/64k_fluid_storage_disk.png b/src/main/resources/assets/refinedstorage/textures/items/64k_fluid_storage_disk.png new file mode 100755 index 000000000..bc7093ac4 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/64k_fluid_storage_disk.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/64k_fluid_storage_part.png b/src/main/resources/assets/refinedstorage/textures/items/64k_fluid_storage_part.png new file mode 100755 index 000000000..bc7093ac4 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/64k_fluid_storage_part.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/items/creative_fluid_storage_disk.png b/src/main/resources/assets/refinedstorage/textures/items/creative_fluid_storage_disk.png new file mode 100755 index 000000000..87e71fcc0 Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/items/creative_fluid_storage_disk.png differ