From 3611f8f542b3f716cef9dadfa81df69f8a09bdd7 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 9 Jul 2016 02:18:54 +0200 Subject: [PATCH] Add model for external storage --- CHANGELOG.md | 3 + .../java/refinedstorage/block/BlockCable.java | 1 + .../block/BlockExternalStorage.java | 2 +- .../refinedstorage/proxy/CommonProxy.java | 6 +- .../refinedstorage/blockstates/exporter.json | 2 +- .../blockstates/external_storage.json | 67 +++- .../refinedstorage/blockstates/importer.json | 2 +- .../models/block/external_storage.json | 350 ++++++++++++++++++ .../models/block/external_storage_down.json | 145 ++++++++ .../models/block/external_storage_east.json | 145 ++++++++ .../models/block/external_storage_north.json | 145 ++++++++ .../models/block/external_storage_south.json | 145 ++++++++ .../models/block/external_storage_up.json | 145 ++++++++ .../models/block/external_storage_west.json | 145 ++++++++ ...=> importer_exporter_external_storage.png} | Bin 15 files changed, 1285 insertions(+), 18 deletions(-) create mode 100755 src/main/resources/assets/refinedstorage/models/block/external_storage.json create mode 100755 src/main/resources/assets/refinedstorage/models/block/external_storage_down.json create mode 100755 src/main/resources/assets/refinedstorage/models/block/external_storage_east.json create mode 100755 src/main/resources/assets/refinedstorage/models/block/external_storage_north.json create mode 100755 src/main/resources/assets/refinedstorage/models/block/external_storage_south.json create mode 100755 src/main/resources/assets/refinedstorage/models/block/external_storage_up.json create mode 100755 src/main/resources/assets/refinedstorage/models/block/external_storage_west.json rename src/main/resources/assets/refinedstorage/textures/blocks/{importer_exporter.png => importer_exporter_external_storage.png} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a1b97e75..e7c4a732c 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,9 @@ - Limited some blocks to only have a direction on the x-axis - Decreased amount of block updates significantly - Added new textures +- Added model for External Storage +- Added model for Importer +- Added model for Exporter ### 0.8.5 **Bugfixes** diff --git a/src/main/java/refinedstorage/block/BlockCable.java b/src/main/java/refinedstorage/block/BlockCable.java index d54f413fd..e301b8b24 100755 --- a/src/main/java/refinedstorage/block/BlockCable.java +++ b/src/main/java/refinedstorage/block/BlockCable.java @@ -64,6 +64,7 @@ public class BlockCable extends BlockNode { TileEntity tile = world.getTileEntity(pos); if (tile instanceof INetworkMaster || tile instanceof INetworkNode) { + // Do not render a cable extension to on this position when we have a direction (like an exporter, importer or external storage) if (getPlacementType() != null) { return ((TileBase) world.getTileEntity(basePos)).getFacingTile() != tile; } diff --git a/src/main/java/refinedstorage/block/BlockExternalStorage.java b/src/main/java/refinedstorage/block/BlockExternalStorage.java index 0efacdf56..e98738beb 100755 --- a/src/main/java/refinedstorage/block/BlockExternalStorage.java +++ b/src/main/java/refinedstorage/block/BlockExternalStorage.java @@ -7,7 +7,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import refinedstorage.tile.externalstorage.TileExternalStorage; -public class BlockExternalStorage extends BlockNode { +public class BlockExternalStorage extends BlockCable { public BlockExternalStorage() { super("external_storage"); } diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java index 2f05bcda5..8f41bb7a9 100755 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -294,20 +294,20 @@ public class CommonProxy { 'H', new ItemStack(Blocks.CHEST), 'C', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), 'D', new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), - 'M', new ItemStack(RefinedStorageBlocks.MACHINE_CASING), + 'M', new ItemStack(RefinedStorageBlocks.CABLE), 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) ); // Importer GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.IMPORTER), - new ItemStack(RefinedStorageBlocks.MACHINE_CASING), + new ItemStack(RefinedStorageBlocks.CABLE), new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) ); // Exporter GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.EXPORTER), - new ItemStack(RefinedStorageBlocks.MACHINE_CASING), + new ItemStack(RefinedStorageBlocks.CABLE), new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED) ); diff --git a/src/main/resources/assets/refinedstorage/blockstates/exporter.json b/src/main/resources/assets/refinedstorage/blockstates/exporter.json index 9abffeaa3..8cb54ce29 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/exporter.json +++ b/src/main/resources/assets/refinedstorage/blockstates/exporter.json @@ -4,7 +4,7 @@ "textures": { "all": "refinedstorage:blocks/cable", "particle": "refinedstorage:blocks/cable", - "line": "refinedstorage:blocks/importer_exporter" + "line": "refinedstorage:blocks/importer_exporter_external_storage" }, "model": "refinedstorage:cable_core", "uvlock": true diff --git a/src/main/resources/assets/refinedstorage/blockstates/external_storage.json b/src/main/resources/assets/refinedstorage/blockstates/external_storage.json index aaa1ade42..d5499367e 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/external_storage.json +++ b/src/main/resources/assets/refinedstorage/blockstates/external_storage.json @@ -1,38 +1,81 @@ { "forge_marker": 1, "defaults": { - "model": "orientable", "textures": { - "side": "refinedstorage:blocks/side", - "top": "refinedstorage:blocks/side", - "front": "refinedstorage:blocks/external_storage" - } + "all": "refinedstorage:blocks/cable", + "particle": "refinedstorage:blocks/cable", + "line": "refinedstorage:blocks/importer_exporter_external_storage" + }, + "model": "refinedstorage:cable_core", + "uvlock": true }, "variants": { "inventory": [ { - "y": 0, + "model": "refinedstorage:external_storage", "transform": "forge:default-block" } ], "direction": { "north": { - "y": 0 + "submodel": "refinedstorage:external_storage_north" }, "east": { - "y": 90 + "submodel": "refinedstorage:external_storage_east" }, "south": { - "y": 180 + "submodel": "refinedstorage:external_storage_south" }, "west": { - "y": 270 + "submodel": "refinedstorage:external_storage_west" }, "up": { - "x": 270 + "submodel": "refinedstorage:external_storage_up" }, "down": { - "x": 90 + "submodel": "refinedstorage:external_storage_down" + } + }, + "north": { + "true": { + "submodel": "refinedstorage:cable_north" + }, + "false": { + } + }, + "east": { + "true": { + "submodel": "refinedstorage:cable_east" + }, + "false": { + } + }, + "south": { + "true": { + "submodel": "refinedstorage:cable_south" + }, + "false": { + } + }, + "west": { + "true": { + "submodel": "refinedstorage:cable_west" + }, + "false": { + } + }, + "up": { + "true": { + "submodel": "refinedstorage:cable_up" + }, + "false": { + } + }, + "down": { + "true": { + "submodel": "refinedstorage:cable_down" + }, + "false": { } } } diff --git a/src/main/resources/assets/refinedstorage/blockstates/importer.json b/src/main/resources/assets/refinedstorage/blockstates/importer.json index d6415b88e..a131e1e27 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/importer.json +++ b/src/main/resources/assets/refinedstorage/blockstates/importer.json @@ -4,7 +4,7 @@ "textures": { "all": "refinedstorage:blocks/cable", "particle": "refinedstorage:blocks/cable", - "line": "refinedstorage:blocks/importer_exporter" + "line": "refinedstorage:blocks/importer_exporter_external_storage" }, "model": "refinedstorage:cable_core", "uvlock": true diff --git a/src/main/resources/assets/refinedstorage/models/block/external_storage.json b/src/main/resources/assets/refinedstorage/models/block/external_storage.json new file mode 100755 index 000000000..efc98ae02 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/external_storage.json @@ -0,0 +1,350 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "name": "Line1", + "from": [ + 7.0, + 7.0, + 2.0 + ], + "to": [ + 9.0, + 9.0, + 6.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 3.0, + 3.0, + 0.0 + ], + "to": [ + 13.0, + 13.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + } + } + }, + { + "name": "Core", + "from": [ + 6.0, + 6.0, + 6.0 + ], + "to": [ + 10.0, + 10.0, + 10.0 + ], + "faces": { + "north": { + "texture": "#all", + "uv": [ + 4.0, + 4.0, + 8.0, + 8.0 + ] + }, + "east": { + "texture": "#all", + "uv": [ + 0.0, + 4.0, + 4.0, + 8.0 + ] + }, + "south": { + "texture": "#all", + "uv": [ + 12.0, + 4.0, + 16.0, + 8.0 + ] + }, + "west": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 12.0, + 8.0 + ] + }, + "up": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 4.0, + 0.0 + ] + }, + "down": { + "texture": "#all", + "uv": [ + 12.0, + 0.0, + 8.0, + 4.0 + ] + } + } + }, + { + "name": "East", + "from": [ + 10.0, + 6.0, + 6.0 + ], + "to": [ + 16.0, + 10.0, + 10.0 + ], + "faces": { + "north": { + "texture": "#all", + "uv": [ + 4.0, + 4.0, + 8.0, + 8.0 + ] + }, + "east": { + "texture": "#all", + "uv": [ + 0.0, + 4.0, + 4.0, + 8.0 + ] + }, + "south": { + "texture": "#all", + "uv": [ + 12.0, + 4.0, + 16.0, + 8.0 + ] + }, + "west": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 12.0, + 8.0 + ] + }, + "up": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 4.0, + 0.0 + ] + }, + "down": { + "texture": "#all", + "uv": [ + 12.0, + 0.0, + 8.0, + 4.0 + ] + } + } + }, + { + "name": "West", + "from": [ + 0.0, + 6.0, + 6.0 + ], + "to": [ + 6.0, + 10.0, + 10.0 + ], + "faces": { + "north": { + "texture": "#all", + "uv": [ + 4.0, + 4.0, + 8.0, + 8.0 + ] + }, + "east": { + "texture": "#all", + "uv": [ + 0.0, + 4.0, + 4.0, + 8.0 + ] + }, + "south": { + "texture": "#all", + "uv": [ + 12.0, + 4.0, + 16.0, + 8.0 + ] + }, + "west": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 12.0, + 8.0 + ] + }, + "up": { + "texture": "#all", + "uv": [ + 8.0, + 4.0, + 4.0, + 0.0 + ] + }, + "down": { + "texture": "#all", + "uv": [ + 12.0, + 0.0, + 8.0, + 4.0 + ] + } + } + } + ] +} diff --git a/src/main/resources/assets/refinedstorage/models/block/external_storage_down.json b/src/main/resources/assets/refinedstorage/models/block/external_storage_down.json new file mode 100755 index 000000000..d1c17e5c9 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/external_storage_down.json @@ -0,0 +1,145 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + }, + "elements": [ + { + "name": "Line1", + "from": [ + 7.0, + 2.0, + 7.0 + ], + "to": [ + 9.0, + 6.0, + 9.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 3.0, + 0.0, + 3.0 + ], + "to": [ + 13.0, + 2.0, + 13.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/external_storage_east.json b/src/main/resources/assets/refinedstorage/models/block/external_storage_east.json new file mode 100755 index 000000000..cf78c5e9e --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/external_storage_east.json @@ -0,0 +1,145 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + }, + "elements": [ + { + "name": "Line1", + "from": [ + 10.0, + 7.0, + 7.0 + ], + "to": [ + 14.0, + 9.0, + 9.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 14.0, + 3.0, + 3.0 + ], + "to": [ + 16.0, + 13.0, + 13.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/external_storage_north.json b/src/main/resources/assets/refinedstorage/models/block/external_storage_north.json new file mode 100755 index 000000000..d1505e33b --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/external_storage_north.json @@ -0,0 +1,145 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + }, + "elements": [ + { + "name": "Line1", + "from": [ + 7.0, + 7.0, + 2.0 + ], + "to": [ + 9.0, + 9.0, + 6.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 3.0, + 3.0, + 0.0 + ], + "to": [ + 13.0, + 13.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/external_storage_south.json b/src/main/resources/assets/refinedstorage/models/block/external_storage_south.json new file mode 100755 index 000000000..e39d324f8 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/external_storage_south.json @@ -0,0 +1,145 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + }, + "elements": [ + { + "name": "Line1", + "from": [ + 7.0, + 7.0, + 10.0 + ], + "to": [ + 9.0, + 9.0, + 14.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 3.0, + 3.0, + 14.0 + ], + "to": [ + 13.0, + 13.0, + 16.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/external_storage_up.json b/src/main/resources/assets/refinedstorage/models/block/external_storage_up.json new file mode 100755 index 000000000..dbd8dc2c2 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/external_storage_up.json @@ -0,0 +1,145 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + }, + "elements": [ + { + "name": "Line1", + "from": [ + 7.0, + 10.0, + 7.0 + ], + "to": [ + 9.0, + 14.0, + 9.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 3.0, + 14.0, + 3.0 + ], + "to": [ + 13.0, + 16.0, + 13.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/external_storage_west.json b/src/main/resources/assets/refinedstorage/models/block/external_storage_west.json new file mode 100755 index 000000000..f0915c0f0 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/external_storage_west.json @@ -0,0 +1,145 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + }, + "elements": [ + { + "name": "Line1", + "from": [ + 2.0, + 7.0, + 7.0 + ], + "to": [ + 6.0, + 9.0, + 9.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 4.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 0.0, + 3.0, + 3.0 + ], + "to": [ + 2.0, + 13.0, + 13.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 10.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/importer_exporter.png b/src/main/resources/assets/refinedstorage/textures/blocks/importer_exporter_external_storage.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/importer_exporter.png rename to src/main/resources/assets/refinedstorage/textures/blocks/importer_exporter_external_storage.png