From 1dd498d51dec0d6b2551b75e58206b632065a7e3 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 12 Nov 2016 22:16:34 +0100 Subject: [PATCH] Additional model cleanup. --- .../refinedstorage/blockstates/cable.json | 17 +- .../blockstates/constructor.json | 17 +- .../blockstates/destructor.json | 17 +- .../refinedstorage/blockstates/exporter.json | 17 +- .../blockstates/external_storage.json | 17 +- .../refinedstorage/blockstates/importer.json | 17 +- .../refinedstorage/blockstates/reader.json | 17 +- .../refinedstorage/blockstates/writer.json | 17 +- .../models/block/cable_down.json | 74 --------- .../models/block/cable_east.json | 74 --------- ...{cable_north.json => cable_extension.json} | 146 +++++++++--------- .../models/block/cable_south.json | 74 --------- .../refinedstorage/models/block/cable_up.json | 74 --------- .../models/block/cable_west.json | 76 --------- 14 files changed, 161 insertions(+), 493 deletions(-) delete mode 100755 src/main/resources/assets/refinedstorage/models/block/cable_down.json delete mode 100755 src/main/resources/assets/refinedstorage/models/block/cable_east.json rename src/main/resources/assets/refinedstorage/models/block/{cable_north.json => cable_extension.json} (94%) delete mode 100755 src/main/resources/assets/refinedstorage/models/block/cable_south.json delete mode 100755 src/main/resources/assets/refinedstorage/models/block/cable_up.json delete mode 100755 src/main/resources/assets/refinedstorage/models/block/cable_west.json diff --git a/src/main/resources/assets/refinedstorage/blockstates/cable.json b/src/main/resources/assets/refinedstorage/blockstates/cable.json index 64cbe3784..94df0b6f5 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/cable.json +++ b/src/main/resources/assets/refinedstorage/blockstates/cable.json @@ -17,42 +17,47 @@ ], "north": { "true": { - "submodel": "refinedstorage:cable_north" + "submodel": "refinedstorage:cable_extension" }, "false": { } }, "east": { "true": { - "submodel": "refinedstorage:cable_east" + "submodel": "refinedstorage:cable_extension", + "y": 90 }, "false": { } }, "south": { "true": { - "submodel": "refinedstorage:cable_south" + "submodel": "refinedstorage:cable_extension", + "x": 180 }, "false": { } }, "west": { "true": { - "submodel": "refinedstorage:cable_west" + "submodel": "refinedstorage:cable_extension", + "y": 270 }, "false": { } }, "up": { "true": { - "submodel": "refinedstorage:cable_up" + "submodel": "refinedstorage:cable_extension", + "x": 270 }, "false": { } }, "down": { "true": { - "submodel": "refinedstorage:cable_down" + "submodel": "refinedstorage:cable_extension", + "x": 90 }, "false": { } diff --git a/src/main/resources/assets/refinedstorage/blockstates/constructor.json b/src/main/resources/assets/refinedstorage/blockstates/constructor.json index ef2dec264..c53921f67 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/constructor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/constructor.json @@ -53,42 +53,47 @@ }, "north": { "true": { - "submodel": "refinedstorage:cable_north" + "submodel": "refinedstorage:cable_extension" }, "false": { } }, "east": { "true": { - "submodel": "refinedstorage:cable_east" + "submodel": "refinedstorage:cable_extension", + "y": 90 }, "false": { } }, "south": { "true": { - "submodel": "refinedstorage:cable_south" + "submodel": "refinedstorage:cable_extension", + "x": 180 }, "false": { } }, "west": { "true": { - "submodel": "refinedstorage:cable_west" + "submodel": "refinedstorage:cable_extension", + "y": 270 }, "false": { } }, "up": { "true": { - "submodel": "refinedstorage:cable_up" + "submodel": "refinedstorage:cable_extension", + "x": 270 }, "false": { } }, "down": { "true": { - "submodel": "refinedstorage:cable_down" + "submodel": "refinedstorage:cable_extension", + "x": 90 }, "false": { } diff --git a/src/main/resources/assets/refinedstorage/blockstates/destructor.json b/src/main/resources/assets/refinedstorage/blockstates/destructor.json index 0d1f1abbc..29c98c6c2 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/destructor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/destructor.json @@ -53,42 +53,47 @@ }, "north": { "true": { - "submodel": "refinedstorage:cable_north" + "submodel": "refinedstorage:cable_extension" }, "false": { } }, "east": { "true": { - "submodel": "refinedstorage:cable_east" + "submodel": "refinedstorage:cable_extension", + "y": 90 }, "false": { } }, "south": { "true": { - "submodel": "refinedstorage:cable_south" + "submodel": "refinedstorage:cable_extension", + "x": 180 }, "false": { } }, "west": { "true": { - "submodel": "refinedstorage:cable_west" + "submodel": "refinedstorage:cable_extension", + "y": 270 }, "false": { } }, "up": { "true": { - "submodel": "refinedstorage:cable_up" + "submodel": "refinedstorage:cable_extension", + "x": 270 }, "false": { } }, "down": { "true": { - "submodel": "refinedstorage:cable_down" + "submodel": "refinedstorage:cable_extension", + "x": 90 }, "false": { } diff --git a/src/main/resources/assets/refinedstorage/blockstates/exporter.json b/src/main/resources/assets/refinedstorage/blockstates/exporter.json index 1e812ba91..89b10c1ac 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/exporter.json +++ b/src/main/resources/assets/refinedstorage/blockstates/exporter.json @@ -43,42 +43,47 @@ }, "north": { "true": { - "submodel": "refinedstorage:cable_north" + "submodel": "refinedstorage:cable_extension" }, "false": { } }, "east": { "true": { - "submodel": "refinedstorage:cable_east" + "submodel": "refinedstorage:cable_extension", + "y": 90 }, "false": { } }, "south": { "true": { - "submodel": "refinedstorage:cable_south" + "submodel": "refinedstorage:cable_extension", + "x": 180 }, "false": { } }, "west": { "true": { - "submodel": "refinedstorage:cable_west" + "submodel": "refinedstorage:cable_extension", + "y": 270 }, "false": { } }, "up": { "true": { - "submodel": "refinedstorage:cable_up" + "submodel": "refinedstorage:cable_extension", + "x": 270 }, "false": { } }, "down": { "true": { - "submodel": "refinedstorage:cable_down" + "submodel": "refinedstorage:cable_extension", + "x": 90 }, "false": { } diff --git a/src/main/resources/assets/refinedstorage/blockstates/external_storage.json b/src/main/resources/assets/refinedstorage/blockstates/external_storage.json index 28be7b002..5df432fd9 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/external_storage.json +++ b/src/main/resources/assets/refinedstorage/blockstates/external_storage.json @@ -43,42 +43,47 @@ }, "north": { "true": { - "submodel": "refinedstorage:cable_north" + "submodel": "refinedstorage:cable_extension" }, "false": { } }, "east": { "true": { - "submodel": "refinedstorage:cable_east" + "submodel": "refinedstorage:cable_extension", + "y": 90 }, "false": { } }, "south": { "true": { - "submodel": "refinedstorage:cable_south" + "submodel": "refinedstorage:cable_extension", + "x": 180 }, "false": { } }, "west": { "true": { - "submodel": "refinedstorage:cable_west" + "submodel": "refinedstorage:cable_extension", + "y": 270 }, "false": { } }, "up": { "true": { - "submodel": "refinedstorage:cable_up" + "submodel": "refinedstorage:cable_extension", + "x": 270 }, "false": { } }, "down": { "true": { - "submodel": "refinedstorage:cable_down" + "submodel": "refinedstorage:cable_extension", + "x": 90 }, "false": { } diff --git a/src/main/resources/assets/refinedstorage/blockstates/importer.json b/src/main/resources/assets/refinedstorage/blockstates/importer.json index 843130466..a28c4e432 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/importer.json +++ b/src/main/resources/assets/refinedstorage/blockstates/importer.json @@ -43,42 +43,47 @@ }, "north": { "true": { - "submodel": "refinedstorage:cable_north" + "submodel": "refinedstorage:cable_extension" }, "false": { } }, "east": { "true": { - "submodel": "refinedstorage:cable_east" + "submodel": "refinedstorage:cable_extension", + "y": 90 }, "false": { } }, "south": { "true": { - "submodel": "refinedstorage:cable_south" + "submodel": "refinedstorage:cable_extension", + "x": 180 }, "false": { } }, "west": { "true": { - "submodel": "refinedstorage:cable_west" + "submodel": "refinedstorage:cable_extension", + "y": 270 }, "false": { } }, "up": { "true": { - "submodel": "refinedstorage:cable_up" + "submodel": "refinedstorage:cable_extension", + "x": 270 }, "false": { } }, "down": { "true": { - "submodel": "refinedstorage:cable_down" + "submodel": "refinedstorage:cable_extension", + "x": 90 }, "false": { } diff --git a/src/main/resources/assets/refinedstorage/blockstates/reader.json b/src/main/resources/assets/refinedstorage/blockstates/reader.json index 8be3cbe63..0314e4e24 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/reader.json +++ b/src/main/resources/assets/refinedstorage/blockstates/reader.json @@ -50,42 +50,47 @@ }, "north": { "true": { - "submodel": "refinedstorage:cable_north" + "submodel": "refinedstorage:cable_extension" }, "false": { } }, "east": { "true": { - "submodel": "refinedstorage:cable_east" + "submodel": "refinedstorage:cable_extension", + "y": 90 }, "false": { } }, "south": { "true": { - "submodel": "refinedstorage:cable_south" + "submodel": "refinedstorage:cable_extension", + "x": 180 }, "false": { } }, "west": { "true": { - "submodel": "refinedstorage:cable_west" + "submodel": "refinedstorage:cable_extension", + "y": 270 }, "false": { } }, "up": { "true": { - "submodel": "refinedstorage:cable_up" + "submodel": "refinedstorage:cable_extension", + "x": 270 }, "false": { } }, "down": { "true": { - "submodel": "refinedstorage:cable_down" + "submodel": "refinedstorage:cable_extension", + "x": 90 }, "false": { } diff --git a/src/main/resources/assets/refinedstorage/blockstates/writer.json b/src/main/resources/assets/refinedstorage/blockstates/writer.json index 5d0bc8776..5f2090120 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/writer.json +++ b/src/main/resources/assets/refinedstorage/blockstates/writer.json @@ -50,42 +50,47 @@ }, "north": { "true": { - "submodel": "refinedstorage:cable_north" + "submodel": "refinedstorage:cable_extension" }, "false": { } }, "east": { "true": { - "submodel": "refinedstorage:cable_east" + "submodel": "refinedstorage:cable_extension", + "y": 90 }, "false": { } }, "south": { "true": { - "submodel": "refinedstorage:cable_south" + "submodel": "refinedstorage:cable_extension", + "x": 180 }, "false": { } }, "west": { "true": { - "submodel": "refinedstorage:cable_west" + "submodel": "refinedstorage:cable_extension", + "y": 270 }, "false": { } }, "up": { "true": { - "submodel": "refinedstorage:cable_up" + "submodel": "refinedstorage:cable_extension", + "x": 270 }, "false": { } }, "down": { "true": { - "submodel": "refinedstorage:cable_down" + "submodel": "refinedstorage:cable_extension", + "x": 90 }, "false": { } diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_down.json b/src/main/resources/assets/refinedstorage/models/block/cable_down.json deleted file mode 100755 index b84972390..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/cable_down.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "elements": [ - { - "name": "Down", - "from": [ - 6.0, - 0.0, - 6.0 - ], - "to": [ - 10.0, - 6.0, - 10.0 - ], - "faces": { - "north": { - "texture": "#cable", - "uv": [ - 6.0, - 10.0, - 10.0, - 16.0 - ] - }, - "east": { - "texture": "#cable", - "uv": [ - 6.0, - 10.0, - 10.0, - 16.0 - ] - }, - "south": { - "texture": "#cable", - "uv": [ - 6.0, - 10.0, - 10.0, - 16.0 - ] - }, - "west": { - "texture": "#cable", - "uv": [ - 6.0, - 10.0, - 10.0, - 16.0 - ] - }, - "up": { - "texture": "#cable", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "down": { - "texture": "#cable", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_east.json b/src/main/resources/assets/refinedstorage/models/block/cable_east.json deleted file mode 100755 index 31926757d..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/cable_east.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "elements": [ - { - "name": "East", - "from": [ - 10.0, - 6.0, - 6.0 - ], - "to": [ - 16.0, - 10.0, - 10.0 - ], - "faces": { - "north": { - "texture": "#cable", - "uv": [ - 0.0, - 6.0, - 6.0, - 10.0 - ] - }, - "east": { - "texture": "#cable", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "south": { - "texture": "#cable", - "uv": [ - 10.0, - 6.0, - 16.0, - 10.0 - ] - }, - "west": { - "texture": "#cable", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "up": { - "texture": "#cable", - "uv": [ - 10.0, - 6.0, - 16.0, - 10.0 - ] - }, - "down": { - "texture": "#cable", - "uv": [ - 10.0, - 6.0, - 16.0, - 10.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_north.json b/src/main/resources/assets/refinedstorage/models/block/cable_extension.json similarity index 94% rename from src/main/resources/assets/refinedstorage/models/block/cable_north.json rename to src/main/resources/assets/refinedstorage/models/block/cable_extension.json index c4dff5b28..28ae042ae 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_north.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_extension.json @@ -1,74 +1,74 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "elements": [ - { - "name": "North", - "from": [ - 6.0, - 6.0, - 0.0 - ], - "to": [ - 10.0, - 10.0, - 6.0 - ], - "faces": { - "north": { - "texture": "#cable", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "east": { - "texture": "#cable", - "uv": [ - 10.0, - 6.0, - 16.0, - 10.0 - ] - }, - "south": { - "texture": "#cable", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "west": { - "texture": "#cable", - "uv": [ - 0.0, - 6.0, - 6.0, - 10.0 - ] - }, - "up": { - "texture": "#cable", - "uv": [ - 6.0, - 0.0, - 10.0, - 6.0 - ] - }, - "down": { - "texture": "#cable", - "uv": [ - 6.0, - 10.0, - 10.0, - 16.0 - ] - } - } - } - ] +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "name": "North", + "from": [ + 6.0, + 6.0, + 0.0 + ], + "to": [ + 10.0, + 10.0, + 6.0 + ], + "faces": { + "north": { + "texture": "#cable", + "uv": [ + 6.0, + 6.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#cable", + "uv": [ + 10.0, + 6.0, + 16.0, + 10.0 + ] + }, + "south": { + "texture": "#cable", + "uv": [ + 6.0, + 6.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#cable", + "uv": [ + 0.0, + 6.0, + 6.0, + 10.0 + ] + }, + "up": { + "texture": "#cable", + "uv": [ + 6.0, + 0.0, + 10.0, + 6.0 + ] + }, + "down": { + "texture": "#cable", + "uv": [ + 6.0, + 10.0, + 10.0, + 16.0 + ] + } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_south.json b/src/main/resources/assets/refinedstorage/models/block/cable_south.json deleted file mode 100755 index 2a1b2f843..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/cable_south.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "elements": [ - { - "name": "South", - "from": [ - 6.0, - 6.0, - 10.0 - ], - "to": [ - 10.0, - 10.0, - 16.0 - ], - "faces": { - "north": { - "texture": "#cable", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "east": { - "texture": "#cable", - "uv": [ - 0.0, - 6.0, - 6.0, - 10.0 - ] - }, - "south": { - "texture": "#cable", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "west": { - "texture": "#cable", - "uv": [ - 10.0, - 6.0, - 16.0, - 10.0 - ] - }, - "up": { - "texture": "#cable", - "uv": [ - 6.0, - 10.0, - 10.0, - 16.0 - ] - }, - "down": { - "texture": "#cable", - "uv": [ - 6.0, - 0.0, - 10.0, - 6.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_up.json b/src/main/resources/assets/refinedstorage/models/block/cable_up.json deleted file mode 100755 index 4b27d1227..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/cable_up.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "elements": [ - { - "name": "Up", - "from": [ - 6.0, - 10.0, - 6.0 - ], - "to": [ - 10.0, - 16.0, - 10.0 - ], - "faces": { - "north": { - "texture": "#cable", - "uv": [ - 6.0, - 0.0, - 10.0, - 6.0 - ] - }, - "east": { - "texture": "#cable", - "uv": [ - 6.0, - 16.0, - 10.0, - 10.0 - ] - }, - "south": { - "texture": "#cable", - "uv": [ - 6.0, - 0.0, - 10.0, - 6.0 - ] - }, - "west": { - "texture": "#cable", - "uv": [ - 6.0, - 16.0, - 10.0, - 10.0 - ] - }, - "up": { - "texture": "#cable", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "down": { - "texture": "#cable", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_west.json b/src/main/resources/assets/refinedstorage/models/block/cable_west.json deleted file mode 100755 index a003ffbe9..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/cable_west.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "elements": [ - { - "name": "West", - "from": [ - 0.0, - 6.0, - 6.0 - ], - "to": [ - 6.0, - 10.0, - 10.0 - ], - "faces": { - "north": { - "texture": "#cable", - "uv": [ - 10.0, - 6.0, - 16.0, - 10.0 - ] - }, - "east": { - "texture": "#cable", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "south": { - "texture": "#cable", - "uv": [ - 0.0, - 6.0, - 6.0, - 10.0 - ] - }, - "west": { - "texture": "#cable", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "up": { - "texture": "#cable", - "uv": [ - 10.0, - 6.0, - 6.0, - 0.0 - ], - "rotation": 90 - }, - "down": { - "texture": "#cable", - "uv": [ - 10.0, - 10.0, - 6.0, - 16.0 - ], - "rotation": 90 - } - } - } - ] -} \ No newline at end of file