diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java index 3b20e16bf..cc6f95504 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java @@ -161,6 +161,8 @@ public class ProxyCommon { registerBlock(RSBlocks.EXTERNAL_STORAGE); registerBlock(RSBlocks.CONSTRUCTOR); registerBlock(RSBlocks.DESTRUCTOR); + registerBlock(RSBlocks.READER); + registerBlock(RSBlocks.WRITER); registerBlock(RSBlocks.DETECTOR); registerBlock(RSBlocks.RELAY); registerBlock(RSBlocks.INTERFACE); @@ -170,8 +172,6 @@ public class ProxyCommon { registerBlock(RSBlocks.NETWORK_TRANSMITTER); registerBlock(RSBlocks.NETWORK_RECEIVER); registerBlock(RSBlocks.DISK_MANIPULATOR); - registerBlock(RSBlocks.READER); - registerBlock(RSBlocks.WRITER); registerItem(RSItems.QUARTZ_ENRICHED_IRON); registerItem(RSItems.STORAGE_DISK); diff --git a/src/main/resources/assets/refinedstorage/blockstates/cable.json b/src/main/resources/assets/refinedstorage/blockstates/cable.json index beb3576c3..64cbe3784 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/cable.json +++ b/src/main/resources/assets/refinedstorage/blockstates/cable.json @@ -2,8 +2,8 @@ "forge_marker": 1, "defaults": { "textures": { - "all": "refinedstorage:blocks/cable_new", - "particle": "refinedstorage:blocks/cable_new" + "cable": "refinedstorage:blocks/cable", + "particle": "refinedstorage:blocks/cable" }, "model": "refinedstorage:cable_core", "uvlock": true @@ -11,7 +11,7 @@ "variants": { "inventory": [ { - "model": "refinedstorage:cable", + "model": "refinedstorage:cable_item", "transform": "forge:default-block" } ], diff --git a/src/main/resources/assets/refinedstorage/blockstates/constructor.json b/src/main/resources/assets/refinedstorage/blockstates/constructor.json index 1fdf5f515..ef2dec264 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/constructor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/constructor.json @@ -2,10 +2,10 @@ "forge_marker": 1, "defaults": { "textures": { - "all": "refinedstorage:blocks/cable_new", - "particle": "refinedstorage:blocks/cable_new", + "cable": "refinedstorage:blocks/cable", + "particle": "refinedstorage:blocks/cable", "front": "refinedstorage:blocks/constructor_disconnected", - "line": "refinedstorage:blocks/importer_exporter_external_storage" + "line": "refinedstorage:blocks/generic_grey" }, "model": "refinedstorage:cable_core", "uvlock": true @@ -13,7 +13,7 @@ "variants": { "inventory": [ { - "model": "refinedstorage:constructor_destructor", + "model": "refinedstorage:constructor_destructor_item", "transform": "forge:default-block" } ], @@ -28,22 +28,27 @@ }, "direction": { "north": { - "submodel": "refinedstorage:constructor_destructor_north" + "submodel": "refinedstorage:constructor_destructor" }, "east": { - "submodel": "refinedstorage:constructor_destructor_east" + "submodel": "refinedstorage:constructor_destructor", + "y": 90 }, "south": { - "submodel": "refinedstorage:constructor_destructor_south" + "submodel": "refinedstorage:constructor_destructor", + "x": 180 }, "west": { - "submodel": "refinedstorage:constructor_destructor_west" + "submodel": "refinedstorage:constructor_destructor", + "y": 270 }, "up": { - "submodel": "refinedstorage:constructor_destructor_up" + "submodel": "refinedstorage:constructor_destructor", + "x": 270 }, "down": { - "submodel": "refinedstorage:constructor_destructor_down" + "submodel": "refinedstorage:constructor_destructor", + "x": 90 } }, "north": { diff --git a/src/main/resources/assets/refinedstorage/blockstates/destructor.json b/src/main/resources/assets/refinedstorage/blockstates/destructor.json index 3f747a799..0d1f1abbc 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/destructor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/destructor.json @@ -2,10 +2,10 @@ "forge_marker": 1, "defaults": { "textures": { - "all": "refinedstorage:blocks/cable_new", - "particle": "refinedstorage:blocks/cable_new", + "cable": "refinedstorage:blocks/cable", + "particle": "refinedstorage:blocks/cable", "front": "refinedstorage:blocks/destructor_disconnected", - "line": "refinedstorage:blocks/importer_exporter_external_storage" + "line": "refinedstorage:blocks/generic_grey" }, "model": "refinedstorage:cable_core", "uvlock": true @@ -13,7 +13,7 @@ "variants": { "inventory": [ { - "model": "refinedstorage:constructor_destructor", + "model": "refinedstorage:constructor_destructor_item", "transform": "forge:default-block" } ], @@ -28,22 +28,27 @@ }, "direction": { "north": { - "submodel": "refinedstorage:constructor_destructor_north" + "submodel": "refinedstorage:constructor_destructor" }, "east": { - "submodel": "refinedstorage:constructor_destructor_east" + "submodel": "refinedstorage:constructor_destructor", + "y": 90 }, "south": { - "submodel": "refinedstorage:constructor_destructor_south" + "submodel": "refinedstorage:constructor_destructor", + "x": 180 }, "west": { - "submodel": "refinedstorage:constructor_destructor_west" + "submodel": "refinedstorage:constructor_destructor", + "y": 270 }, "up": { - "submodel": "refinedstorage:constructor_destructor_up" + "submodel": "refinedstorage:constructor_destructor", + "x": 270 }, "down": { - "submodel": "refinedstorage:constructor_destructor_down" + "submodel": "refinedstorage:constructor_destructor", + "x": 90 } }, "north": { diff --git a/src/main/resources/assets/refinedstorage/blockstates/detector.json b/src/main/resources/assets/refinedstorage/blockstates/detector.json index 17a4dfe0f..867e88c19 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/detector.json +++ b/src/main/resources/assets/refinedstorage/blockstates/detector.json @@ -3,7 +3,10 @@ "defaults": { "textures": { "particle": "refinedstorage:blocks/detector_top", - "torch": "refinedstorage:blocks/detector_side_off" + "torch": "refinedstorage:blocks/detector_side_off", + "side": "refinedstorage:blocks/detector_side_off", + "top": "refinedstorage:blocks/detector_top", + "bottom": "refinedstorage:blocks/detector_bottom" }, "model": "refinedstorage:detector" }, diff --git a/src/main/resources/assets/refinedstorage/blockstates/exporter.json b/src/main/resources/assets/refinedstorage/blockstates/exporter.json index 7e6635729..1e812ba91 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/exporter.json +++ b/src/main/resources/assets/refinedstorage/blockstates/exporter.json @@ -2,9 +2,9 @@ "forge_marker": 1, "defaults": { "textures": { - "all": "refinedstorage:blocks/cable_new", - "particle": "refinedstorage:blocks/cable_new", - "line": "refinedstorage:blocks/importer_exporter_external_storage" + "cable": "refinedstorage:blocks/cable", + "particle": "refinedstorage:blocks/cable", + "line": "refinedstorage:blocks/generic_grey" }, "model": "refinedstorage:cable_core", "uvlock": true @@ -12,28 +12,33 @@ "variants": { "inventory": [ { - "model": "refinedstorage:exporter", + "model": "refinedstorage:exporter_item", "transform": "forge:default-block" } ], "direction": { "north": { - "submodel": "refinedstorage:exporter_north" + "submodel": "refinedstorage:exporter" }, "east": { - "submodel": "refinedstorage:exporter_east" + "submodel": "refinedstorage:exporter", + "y": 90 }, "south": { - "submodel": "refinedstorage:exporter_south" + "submodel": "refinedstorage:exporter", + "x": 180 }, "west": { - "submodel": "refinedstorage:exporter_west" + "submodel": "refinedstorage:exporter", + "y": 270 }, "up": { - "submodel": "refinedstorage:exporter_up" + "submodel": "refinedstorage:exporter", + "x": 270 }, "down": { - "submodel": "refinedstorage:exporter_down" + "submodel": "refinedstorage:exporter", + "x": 90 } }, "north": { diff --git a/src/main/resources/assets/refinedstorage/blockstates/external_storage.json b/src/main/resources/assets/refinedstorage/blockstates/external_storage.json index 77b5e06b4..28be7b002 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/external_storage.json +++ b/src/main/resources/assets/refinedstorage/blockstates/external_storage.json @@ -2,9 +2,9 @@ "forge_marker": 1, "defaults": { "textures": { - "all": "refinedstorage:blocks/cable_new", - "particle": "refinedstorage:blocks/cable_new", - "line": "refinedstorage:blocks/importer_exporter_external_storage" + "cable": "refinedstorage:blocks/cable", + "particle": "refinedstorage:blocks/cable", + "line": "refinedstorage:blocks/generic_grey" }, "model": "refinedstorage:cable_core", "uvlock": true @@ -12,28 +12,33 @@ "variants": { "inventory": [ { - "model": "refinedstorage:external_storage", + "model": "refinedstorage:external_storage_item", "transform": "forge:default-block" } ], "direction": { "north": { - "submodel": "refinedstorage:external_storage_north" + "submodel": "refinedstorage:external_storage" }, "east": { - "submodel": "refinedstorage:external_storage_east" + "submodel": "refinedstorage:external_storage", + "y": 90 }, "south": { - "submodel": "refinedstorage:external_storage_south" + "submodel": "refinedstorage:external_storage", + "x": 180 }, "west": { - "submodel": "refinedstorage:external_storage_west" + "submodel": "refinedstorage:external_storage", + "y": 270 }, "up": { - "submodel": "refinedstorage:external_storage_up" + "submodel": "refinedstorage:external_storage", + "x": 270 }, "down": { - "submodel": "refinedstorage:external_storage_down" + "submodel": "refinedstorage:external_storage", + "x": 90 } }, "north": { diff --git a/src/main/resources/assets/refinedstorage/blockstates/importer.json b/src/main/resources/assets/refinedstorage/blockstates/importer.json index 8f547066c..843130466 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/importer.json +++ b/src/main/resources/assets/refinedstorage/blockstates/importer.json @@ -2,9 +2,9 @@ "forge_marker": 1, "defaults": { "textures": { - "all": "refinedstorage:blocks/cable_new", - "particle": "refinedstorage:blocks/cable_new", - "line": "refinedstorage:blocks/importer_exporter_external_storage" + "cable": "refinedstorage:blocks/cable", + "particle": "refinedstorage:blocks/cable", + "line": "refinedstorage:blocks/generic_grey" }, "model": "refinedstorage:cable_core", "uvlock": true @@ -12,28 +12,33 @@ "variants": { "inventory": [ { - "model": "refinedstorage:importer", + "model": "refinedstorage:importer_item", "transform": "forge:default-block" } ], "direction": { "north": { - "submodel": "refinedstorage:importer_north" + "submodel": "refinedstorage:importer" }, "east": { - "submodel": "refinedstorage:importer_east" + "submodel": "refinedstorage:importer", + "y": 90 }, "south": { - "submodel": "refinedstorage:importer_south" + "submodel": "refinedstorage:importer", + "x": 180 }, "west": { - "submodel": "refinedstorage:importer_west" + "submodel": "refinedstorage:importer", + "y": 270 }, "up": { - "submodel": "refinedstorage:importer_up" + "submodel": "refinedstorage:importer", + "x": 270 }, "down": { - "submodel": "refinedstorage:importer_down" + "submodel": "refinedstorage:importer", + "x": 90 } }, "north": { diff --git a/src/main/resources/assets/refinedstorage/blockstates/reader.json b/src/main/resources/assets/refinedstorage/blockstates/reader.json index a0eca150f..8be3cbe63 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/reader.json +++ b/src/main/resources/assets/refinedstorage/blockstates/reader.json @@ -2,10 +2,10 @@ "forge_marker": 1, "defaults": { "textures": { - "all": "refinedstorage:blocks/cable_new", - "particle": "refinedstorage:blocks/cable_new", + "cable": "refinedstorage:blocks/cable", + "particle": "refinedstorage:blocks/cable", "front": "refinedstorage:blocks/reader", - "line": "refinedstorage:blocks/importer_exporter_external_storage" + "line": "refinedstorage:blocks/generic_grey" }, "model": "refinedstorage:cable_core", "uvlock": true @@ -13,7 +13,7 @@ "variants": { "inventory": [ { - "model": "refinedstorage:constructor_destructor", + "model": "refinedstorage:constructor_destructor_item", "transform": "forge:default-block" } ], @@ -25,22 +25,27 @@ }, "direction": { "north": { - "submodel": "refinedstorage:constructor_destructor_north" + "submodel": "refinedstorage:constructor_destructor" }, "east": { - "submodel": "refinedstorage:constructor_destructor_east" + "submodel": "refinedstorage:constructor_destructor", + "y": 90 }, "south": { - "submodel": "refinedstorage:constructor_destructor_south" + "submodel": "refinedstorage:constructor_destructor", + "x": 180 }, "west": { - "submodel": "refinedstorage:constructor_destructor_west" + "submodel": "refinedstorage:constructor_destructor", + "y": 270 }, "up": { - "submodel": "refinedstorage:constructor_destructor_up" + "submodel": "refinedstorage:constructor_destructor", + "x": 270 }, "down": { - "submodel": "refinedstorage:constructor_destructor_down" + "submodel": "refinedstorage:constructor_destructor", + "x": 90 } }, "north": { diff --git a/src/main/resources/assets/refinedstorage/blockstates/solderer.json b/src/main/resources/assets/refinedstorage/blockstates/solderer.json index 950752060..0b5a7a7b9 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/solderer.json +++ b/src/main/resources/assets/refinedstorage/blockstates/solderer.json @@ -3,7 +3,13 @@ "defaults": { "model": "refinedstorage:solderer", "textures": { - "particle": "refinedstorage:blocks/solderer_top" + "particle": "refinedstorage:blocks/solderer_top", + "side": "refinedstorage:blocks/solderer_side", + "top": "refinedstorage:blocks/solderer_top", + "bottom": "refinedstorage:blocks/solderer_bottom", + "middle": "refinedstorage:blocks/solderer_middle", + "roof": "refinedstorage:blocks/solderer_roof", + "elements": "refinedstorage:blocks/solderer_elements" }, "uvlock": false }, diff --git a/src/main/resources/assets/refinedstorage/blockstates/writer.json b/src/main/resources/assets/refinedstorage/blockstates/writer.json index 100f2fb1f..5d0bc8776 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/writer.json +++ b/src/main/resources/assets/refinedstorage/blockstates/writer.json @@ -2,10 +2,10 @@ "forge_marker": 1, "defaults": { "textures": { - "all": "refinedstorage:blocks/cable_new", - "particle": "refinedstorage:blocks/cable_new", + "cable": "refinedstorage:blocks/cable", + "particle": "refinedstorage:blocks/cable", "front": "refinedstorage:blocks/writer", - "line": "refinedstorage:blocks/importer_exporter_external_storage" + "line": "refinedstorage:blocks/generic_grey" }, "model": "refinedstorage:cable_core", "uvlock": true @@ -13,7 +13,7 @@ "variants": { "inventory": [ { - "model": "refinedstorage:constructor_destructor", + "model": "refinedstorage:constructor_destructor_item", "transform": "forge:default-block" } ], @@ -25,22 +25,27 @@ }, "direction": { "north": { - "submodel": "refinedstorage:constructor_destructor_north" + "submodel": "refinedstorage:constructor_destructor" }, "east": { - "submodel": "refinedstorage:constructor_destructor_east" + "submodel": "refinedstorage:constructor_destructor", + "y": 90 }, "south": { - "submodel": "refinedstorage:constructor_destructor_south" + "submodel": "refinedstorage:constructor_destructor", + "x": 180 }, "west": { - "submodel": "refinedstorage:constructor_destructor_west" + "submodel": "refinedstorage:constructor_destructor", + "y": 270 }, "up": { - "submodel": "refinedstorage:constructor_destructor_up" + "submodel": "refinedstorage:constructor_destructor", + "x": 270 }, "down": { - "submodel": "refinedstorage:constructor_destructor_down" + "submodel": "refinedstorage:constructor_destructor", + "x": 90 } }, "north": { diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_core.json b/src/main/resources/assets/refinedstorage/models/block/cable_core.json index e32888b86..b0f288ff4 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_core.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_core.json @@ -1,8 +1,5 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "refinedstorage:blocks/cable_new" - }, "elements": [ { "name": "Core", @@ -18,7 +15,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, @@ -27,7 +24,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, @@ -36,7 +33,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, @@ -45,7 +42,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, @@ -54,7 +51,7 @@ ] }, "up": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, @@ -63,7 +60,7 @@ ] }, "down": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_down.json b/src/main/resources/assets/refinedstorage/models/block/cable_down.json index b4ecfef4f..b84972390 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_down.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_down.json @@ -1,8 +1,5 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "refinedstorage:blocks/cable_new" - }, "elements": [ { "name": "Down", @@ -18,7 +15,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 10.0, @@ -27,7 +24,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 10.0, @@ -36,7 +33,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 10.0, @@ -45,7 +42,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 10.0, @@ -54,7 +51,7 @@ ] }, "up": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, @@ -63,7 +60,7 @@ ] }, "down": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_east.json b/src/main/resources/assets/refinedstorage/models/block/cable_east.json index 1b6b50894..31926757d 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_east.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_east.json @@ -1,8 +1,5 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "refinedstorage:blocks/cable_new" - }, "elements": [ { "name": "East", @@ -18,7 +15,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#cable", "uv": [ 0.0, 6.0, @@ -27,7 +24,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, @@ -36,7 +33,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#cable", "uv": [ 10.0, 6.0, @@ -45,7 +42,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, @@ -54,7 +51,7 @@ ] }, "up": { - "texture": "#0", + "texture": "#cable", "uv": [ 10.0, 6.0, @@ -63,7 +60,7 @@ ] }, "down": { - "texture": "#0", + "texture": "#cable", "uv": [ 10.0, 6.0, diff --git a/src/main/resources/assets/refinedstorage/models/block/cable.json b/src/main/resources/assets/refinedstorage/models/block/cable_item.json similarity index 84% rename from src/main/resources/assets/refinedstorage/models/block/cable.json rename to src/main/resources/assets/refinedstorage/models/block/cable_item.json index c6ae3adf3..c9b1da58d 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_item.json @@ -1,8 +1,5 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "refinedstorage:blocks/cable_new" - }, "elements": [ { "name": "Core", @@ -18,7 +15,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, @@ -27,7 +24,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, @@ -36,7 +33,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, @@ -45,7 +42,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, @@ -54,7 +51,7 @@ ] }, "up": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, @@ -63,7 +60,7 @@ ] }, "down": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, @@ -87,7 +84,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#cable", "uv": [ 0.0, 6.0, @@ -96,7 +93,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, @@ -105,7 +102,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#cable", "uv": [ 10.0, 6.0, @@ -114,7 +111,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, @@ -123,7 +120,7 @@ ] }, "up": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, @@ -133,7 +130,7 @@ "rotation": 270 }, "down": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 10.0, @@ -158,7 +155,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#cable", "uv": [ 10.0, 6.0, @@ -167,7 +164,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, @@ -176,7 +173,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#cable", "uv": [ 0.0, 6.0, @@ -185,7 +182,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, @@ -194,7 +191,7 @@ ] }, "up": { - "texture": "#0", + "texture": "#cable", "uv": [ 10.0, 6.0, @@ -204,7 +201,7 @@ "rotation": 90 }, "down": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 10.0, diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_north.json b/src/main/resources/assets/refinedstorage/models/block/cable_north.json index 316187294..c4dff5b28 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_north.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_north.json @@ -1,8 +1,5 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "refinedstorage:blocks/cable_new" - }, "elements": [ { "name": "North", @@ -18,7 +15,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, @@ -27,7 +24,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#cable", "uv": [ 10.0, 6.0, @@ -36,7 +33,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, @@ -45,7 +42,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#cable", "uv": [ 0.0, 6.0, @@ -54,7 +51,7 @@ ] }, "up": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 0.0, @@ -63,7 +60,7 @@ ] }, "down": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 10.0, diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_south.json b/src/main/resources/assets/refinedstorage/models/block/cable_south.json index f3509482e..2a1b2f843 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_south.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_south.json @@ -1,8 +1,5 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "refinedstorage:blocks/cable_new" - }, "elements": [ { "name": "South", @@ -18,7 +15,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, @@ -27,7 +24,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#cable", "uv": [ 0.0, 6.0, @@ -36,7 +33,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, @@ -45,7 +42,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#cable", "uv": [ 10.0, 6.0, @@ -54,7 +51,7 @@ ] }, "up": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 10.0, @@ -63,7 +60,7 @@ ] }, "down": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 0.0, diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_up.json b/src/main/resources/assets/refinedstorage/models/block/cable_up.json index d12e83542..4b27d1227 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_up.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_up.json @@ -1,8 +1,5 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "refinedstorage:blocks/cable_new" - }, "elements": [ { "name": "Up", @@ -18,7 +15,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 0.0, @@ -27,7 +24,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 16.0, @@ -36,7 +33,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 0.0, @@ -45,7 +42,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 16.0, @@ -54,7 +51,7 @@ ] }, "up": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, @@ -63,7 +60,7 @@ ] }, "down": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_west.json b/src/main/resources/assets/refinedstorage/models/block/cable_west.json index 6d573f2e7..a003ffbe9 100755 --- a/src/main/resources/assets/refinedstorage/models/block/cable_west.json +++ b/src/main/resources/assets/refinedstorage/models/block/cable_west.json @@ -1,8 +1,5 @@ { "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - "0": "refinedstorage:blocks/cable_new" - }, "elements": [ { "name": "West", @@ -18,7 +15,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#cable", "uv": [ 10.0, 6.0, @@ -27,7 +24,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, @@ -36,7 +33,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#cable", "uv": [ 0.0, 6.0, @@ -45,7 +42,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#cable", "uv": [ 6.0, 6.0, @@ -54,7 +51,7 @@ ] }, "up": { - "texture": "#0", + "texture": "#cable", "uv": [ 10.0, 6.0, @@ -64,7 +61,7 @@ "rotation": 90 }, "down": { - "texture": "#0", + "texture": "#cable", "uv": [ 10.0, 10.0, diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor.json index cf4ce7318..79bfd0e91 100755 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor.json +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor.json @@ -138,217 +138,6 @@ ] } } - }, - { - "name": "Core", - "from": [ - 6.0, - 6.0, - 6.0 - ], - "to": [ - 10.0, - 10.0, - 10.0 - ], - "faces": { - "north": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "east": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "south": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "west": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "up": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "down": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - } - } - }, - { - "name": "East", - "from": [ - 10.0, - 6.0, - 6.0 - ], - "to": [ - 16.0, - 10.0, - 10.0 - ], - "faces": { - "north": { - "texture": "#all", - "uv": [ - 0.0, - 6.0, - 6.0, - 10.0 - ] - }, - "east": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "south": { - "texture": "#all", - "uv": [ - 10.0, - 6.0, - 16.0, - 10.0 - ] - }, - "west": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "up": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 0.0 - ], - "rotation": 270 - }, - "down": { - "texture": "#all", - "uv": [ - 6.0, - 10.0, - 10.0, - 16.0 - ], - "rotation": 270 - } - } - }, - { - "name": "West", - "from": [ - 0.0, - 6.0, - 6.0 - ], - "to": [ - 6.0, - 10.0, - 10.0 - ], - "faces": { - "north": { - "texture": "#all", - "uv": [ - 10.0, - 6.0, - 16.0, - 10.0 - ] - }, - "east": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "south": { - "texture": "#all", - "uv": [ - 0.0, - 6.0, - 6.0, - 10.0 - ] - }, - "west": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "up": { - "texture": "#all", - "uv": [ - 10.0, - 6.0, - 6.0, - 0.0 - ], - "rotation": 90 - }, - "down": { - "texture": "#all", - "uv": [ - 6.0, - 10.0, - 10.0, - 16.0 - ], - "rotation": 90 - } - } } ] -} +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_down.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_down.json deleted file mode 100755 index 72d06794f..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_down.json +++ /dev/null @@ -1,143 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "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": [ - 0.0, - 0.0, - 0.0 - ], - "to": [ - 16.0, - 2.0, - 16.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "down": { - "texture": "#front", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_east.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_east.json deleted file mode 100755 index 6efd16250..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_east.json +++ /dev/null @@ -1,143 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "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, - 0.0, - 0.0 - ], - "to": [ - 16.0, - 16.0, - 16.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "east": { - "texture": "#front", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_item.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_item.json new file mode 100755 index 000000000..7f3b4117f --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_item.json @@ -0,0 +1,354 @@ +{ + "__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": [ + 0.0, + 0.0, + 0.0 + ], + "to": [ + 16.0, + 16.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#front", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 16.0, + 16.0 + ] + } + } + }, + { + "name": "Core", + "from": [ + 6.0, + 6.0, + 6.0 + ], + "to": [ + 10.0, + 10.0, + 10.0 + ], + "faces": { + "north": { + "texture": "#cable", + "uv": [ + 6.0, + 6.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#cable", + "uv": [ + 6.0, + 6.0, + 10.0, + 10.0 + ] + }, + "south": { + "texture": "#cable", + "uv": [ + 6.0, + 6.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#cable", + "uv": [ + 6.0, + 6.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 + ] + } + } + }, + { + "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": [ + 6.0, + 6.0, + 10.0, + 0.0 + ], + "rotation": 270 + }, + "down": { + "texture": "#cable", + "uv": [ + 6.0, + 10.0, + 10.0, + 16.0 + ], + "rotation": 270 + } + } + }, + { + "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": [ + 6.0, + 10.0, + 10.0, + 16.0 + ], + "rotation": 90 + } + } + } + ] +} diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_north.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_north.json deleted file mode 100755 index 79bfd0e91..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_north.json +++ /dev/null @@ -1,143 +0,0 @@ -{ - "__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": [ - 0.0, - 0.0, - 0.0 - ], - "to": [ - 16.0, - 16.0, - 2.0 - ], - "faces": { - "north": { - "texture": "#front", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_south.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_south.json deleted file mode 100755 index 7e33dad1a..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_south.json +++ /dev/null @@ -1,143 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "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": [ - 0.0, - 0.0, - 14.0 - ], - "to": [ - 16.0, - 16.0, - 16.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "south": { - "texture": "#front", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_up.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_up.json deleted file mode 100755 index 1aa14b6c6..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_up.json +++ /dev/null @@ -1,143 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "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": [ - 0.0, - 14.0, - 0.0 - ], - "to": [ - 16.0, - 16.0, - 16.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 10.0 - ] - }, - "up": { - "texture": "#front", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_west.json b/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_west.json deleted file mode 100755 index d897e8201..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_west.json +++ /dev/null @@ -1,143 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "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, - 0.0, - 0.0 - ], - "to": [ - 2.0, - 16.0, - 16.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "west": { - "texture": "#front", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/detector.json b/src/main/resources/assets/refinedstorage/models/block/detector.json index 336ac0aba..ce8f506b6 100755 --- a/src/main/resources/assets/refinedstorage/models/block/detector.json +++ b/src/main/resources/assets/refinedstorage/models/block/detector.json @@ -1,10 +1,5 @@ { "__comment": "Model made by CyanideX", - "textures": { - "2": "refinedstorage:blocks/detector_side_off", - "3": "refinedstorage:blocks/detector_top", - "4": "refinedstorage:blocks/detector_bottom" - }, "elements": [ { "name": "Element", @@ -158,7 +153,7 @@ ], "faces": { "north": { - "texture": "#2", + "texture": "#side", "uv": [ 0.0, 11.0, @@ -167,7 +162,7 @@ ] }, "east": { - "texture": "#2", + "texture": "#side", "uv": [ 0.0, 11.0, @@ -176,7 +171,7 @@ ] }, "south": { - "texture": "#2", + "texture": "#side", "uv": [ 0.0, 11.0, @@ -185,7 +180,7 @@ ] }, "west": { - "texture": "#2", + "texture": "#side", "uv": [ 0.0, 11.0, @@ -194,7 +189,7 @@ ] }, "up": { - "texture": "#3", + "texture": "#top", "uv": [ 0.0, 0.0, @@ -203,7 +198,7 @@ ] }, "down": { - "texture": "#4", + "texture": "#bottom", "uv": [ 0.0, 0.0, diff --git a/src/main/resources/assets/refinedstorage/models/block/disk.json b/src/main/resources/assets/refinedstorage/models/block/disk.json index b569d609c..08d5a1e01 100755 --- a/src/main/resources/assets/refinedstorage/models/block/disk.json +++ b/src/main/resources/assets/refinedstorage/models/block/disk.json @@ -2,7 +2,7 @@ "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", "textures": { "0": "refinedstorage:blocks/disk" - }, + }, "elements": [ { "name": "disk", @@ -72,7 +72,7 @@ ] } } - }, + }, { "name": "led", "from": [ @@ -141,6 +141,6 @@ ] } } - } + } ] } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/exporter.json b/src/main/resources/assets/refinedstorage/models/block/exporter.json index 7172c3f4d..fe7aa9f05 100755 --- a/src/main/resources/assets/refinedstorage/models/block/exporter.json +++ b/src/main/resources/assets/refinedstorage/models/block/exporter.json @@ -207,217 +207,6 @@ ] } } - }, - { - "name": "Core", - "from": [ - 6.0, - 6.0, - 6.0 - ], - "to": [ - 10.0, - 10.0, - 10.0 - ], - "faces": { - "north": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "east": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "south": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "west": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "up": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "down": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - } - } - }, - { - "name": "East", - "from": [ - 10.0, - 6.0, - 6.0 - ], - "to": [ - 16.0, - 10.0, - 10.0 - ], - "faces": { - "north": { - "texture": "#all", - "uv": [ - 0.0, - 6.0, - 6.0, - 10.0 - ] - }, - "east": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "south": { - "texture": "#all", - "uv": [ - 10.0, - 6.0, - 16.0, - 10.0 - ] - }, - "west": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "up": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 0.0 - ], - "rotation": 270 - }, - "down": { - "texture": "#all", - "uv": [ - 6.0, - 10.0, - 10.0, - 16.0 - ], - "rotation": 270 - } - } - }, - { - "name": "West", - "from": [ - 0.0, - 6.0, - 6.0 - ], - "to": [ - 6.0, - 10.0, - 10.0 - ], - "faces": { - "north": { - "texture": "#all", - "uv": [ - 10.0, - 6.0, - 16.0, - 10.0 - ] - }, - "east": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "south": { - "texture": "#all", - "uv": [ - 0.0, - 6.0, - 6.0, - 10.0 - ] - }, - "west": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "up": { - "texture": "#all", - "uv": [ - 10.0, - 6.0, - 6.0, - 0.0 - ], - "rotation": 90 - }, - "down": { - "texture": "#all", - "uv": [ - 6.0, - 10.0, - 10.0, - 16.0 - ], - "rotation": 90 - } - } } ] -} +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/exporter_down.json b/src/main/resources/assets/refinedstorage/models/block/exporter_down.json deleted file mode 100755 index 05555347b..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/exporter_down.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - }, - "elements": [ - { - "name": "Line1", - "from": [ - 6.0, - 0.0, - 6.0 - ], - "to": [ - 10.0, - 2.0, - 10.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - } - } - }, - { - "name": "Line2", - "from": [ - 5.0, - 2.0, - 5.0 - ], - "to": [ - 11.0, - 4.0, - 11.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - } - } - }, - { - "name": "Line3", - "from": [ - 3.0, - 4.0, - 3.0 - ], - "to": [ - 13.0, - 6.0, - 13.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/exporter_east.json b/src/main/resources/assets/refinedstorage/models/block/exporter_east.json deleted file mode 100755 index 61b89b7bf..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/exporter_east.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - }, - "elements": [ - { - "name": "Line1", - "from": [ - 14.0, - 6.0, - 6.0 - ], - "to": [ - 16.0, - 10.0, - 10.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - } - } - }, - { - "name": "Line2", - "from": [ - 12.0, - 5.0, - 5.0 - ], - "to": [ - 14.0, - 11.0, - 11.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - } - } - }, - { - "name": "Line3", - "from": [ - 10.0, - 3.0, - 3.0 - ], - "to": [ - 12.0, - 13.0, - 13.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/exporter_item.json b/src/main/resources/assets/refinedstorage/models/block/exporter_item.json new file mode 100755 index 000000000..80cded529 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/exporter_item.json @@ -0,0 +1,423 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "name": "Line1", + "from": [ + 6.0, + 6.0, + 0.0 + ], + "to": [ + 10.0, + 10.0, + 2.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 2.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 4.0, + 4.0 + ] + } + } + }, + { + "name": "Line2", + "from": [ + 5.0, + 5.0, + 2.0 + ], + "to": [ + 11.0, + 11.0, + 4.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 2.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 2.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 2.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 2.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 6.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 6.0 + ] + } + } + }, + { + "name": "Line3", + "from": [ + 3.0, + 3.0, + 4.0 + ], + "to": [ + 13.0, + 13.0, + 6.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 2.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 10.0, + 10.0 + ] + } + } + }, + { + "name": "Core", + "from": [ + 6.0, + 6.0, + 6.0 + ], + "to": [ + 10.0, + 10.0, + 10.0 + ], + "faces": { + "north": { + "texture": "#cable", + "uv": [ + 6.0, + 6.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#cable", + "uv": [ + 6.0, + 6.0, + 10.0, + 10.0 + ] + }, + "south": { + "texture": "#cable", + "uv": [ + 6.0, + 6.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#cable", + "uv": [ + 6.0, + 6.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 + ] + } + } + }, + { + "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": [ + 6.0, + 6.0, + 10.0, + 0.0 + ], + "rotation": 270 + }, + "down": { + "texture": "#cable", + "uv": [ + 6.0, + 10.0, + 10.0, + 16.0 + ], + "rotation": 270 + } + } + }, + { + "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": [ + 6.0, + 10.0, + 10.0, + 16.0 + ], + "rotation": 90 + } + } + } + ] +} diff --git a/src/main/resources/assets/refinedstorage/models/block/exporter_north.json b/src/main/resources/assets/refinedstorage/models/block/exporter_north.json deleted file mode 100755 index 88ad85d27..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/exporter_north.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - }, - "elements": [ - { - "name": "Line1", - "from": [ - 6.0, - 6.0, - 0.0 - ], - "to": [ - 10.0, - 10.0, - 2.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - } - } - }, - { - "name": "Line2", - "from": [ - 5.0, - 5.0, - 2.0 - ], - "to": [ - 11.0, - 11.0, - 4.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - } - } - }, - { - "name": "Line3", - "from": [ - 3.0, - 3.0, - 4.0 - ], - "to": [ - 13.0, - 13.0, - 6.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/exporter_south.json b/src/main/resources/assets/refinedstorage/models/block/exporter_south.json deleted file mode 100755 index 6863b4cd4..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/exporter_south.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - }, - "elements": [ - { - "name": "Line1", - "from": [ - 6.0, - 6.0, - 14.0 - ], - "to": [ - 10.0, - 10.0, - 16.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - } - } - }, - { - "name": "Line2", - "from": [ - 5.0, - 5.0, - 12.0 - ], - "to": [ - 11.0, - 11.0, - 14.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - } - } - }, - { - "name": "Line3", - "from": [ - 3.0, - 3.0, - 10.0 - ], - "to": [ - 13.0, - 13.0, - 12.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/exporter_up.json b/src/main/resources/assets/refinedstorage/models/block/exporter_up.json deleted file mode 100755 index 754316fc9..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/exporter_up.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - }, - "elements": [ - { - "name": "Line1", - "from": [ - 6.0, - 14.0, - 6.0 - ], - "to": [ - 10.0, - 16.0, - 10.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - } - } - }, - { - "name": "Line2", - "from": [ - 5.0, - 12.0, - 5.0 - ], - "to": [ - 11.0, - 14.0, - 11.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - } - } - }, - { - "name": "Line3", - "from": [ - 3.0, - 10.0, - 3.0 - ], - "to": [ - 13.0, - 12.0, - 13.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/exporter_west.json b/src/main/resources/assets/refinedstorage/models/block/exporter_west.json deleted file mode 100755 index 73c706393..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/exporter_west.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - }, - "elements": [ - { - "name": "Line1", - "from": [ - 0.0, - 6.0, - 6.0 - ], - "to": [ - 2.0, - 10.0, - 10.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - } - } - }, - { - "name": "Line2", - "from": [ - 2.0, - 5.0, - 5.0 - ], - "to": [ - 4.0, - 11.0, - 11.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - } - } - }, - { - "name": "Line3", - "from": [ - 4.0, - 3.0, - 3.0 - ], - "to": [ - 6.0, - 13.0, - 13.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/external_storage.json b/src/main/resources/assets/refinedstorage/models/block/external_storage.json index 5112bdc85..5641b825d 100755 --- a/src/main/resources/assets/refinedstorage/models/block/external_storage.json +++ b/src/main/resources/assets/refinedstorage/models/block/external_storage.json @@ -138,217 +138,6 @@ ] } } - }, - { - "name": "Core", - "from": [ - 6.0, - 6.0, - 6.0 - ], - "to": [ - 10.0, - 10.0, - 10.0 - ], - "faces": { - "north": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "east": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "south": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "west": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "up": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "down": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - } - } - }, - { - "name": "East", - "from": [ - 10.0, - 6.0, - 6.0 - ], - "to": [ - 16.0, - 10.0, - 10.0 - ], - "faces": { - "north": { - "texture": "#all", - "uv": [ - 0.0, - 6.0, - 6.0, - 10.0 - ] - }, - "east": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "south": { - "texture": "#all", - "uv": [ - 10.0, - 6.0, - 16.0, - 10.0 - ] - }, - "west": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "up": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 0.0 - ], - "rotation": 270 - }, - "down": { - "texture": "#all", - "uv": [ - 6.0, - 10.0, - 10.0, - 16.0 - ], - "rotation": 270 - } - } - }, - { - "name": "West", - "from": [ - 0.0, - 6.0, - 6.0 - ], - "to": [ - 6.0, - 10.0, - 10.0 - ], - "faces": { - "north": { - "texture": "#all", - "uv": [ - 10.0, - 6.0, - 16.0, - 10.0 - ] - }, - "east": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "south": { - "texture": "#all", - "uv": [ - 0.0, - 6.0, - 6.0, - 10.0 - ] - }, - "west": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "up": { - "texture": "#all", - "uv": [ - 10.0, - 6.0, - 6.0, - 0.0 - ], - "rotation": 90 - }, - "down": { - "texture": "#all", - "uv": [ - 6.0, - 10.0, - 10.0, - 16.0 - ], - "rotation": 90 - } - } } ] -} +} \ No newline at end of file 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 deleted file mode 100755 index d1c17e5c9..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/external_storage_down.json +++ /dev/null @@ -1,145 +0,0 @@ -{ - "__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 deleted file mode 100755 index cf78c5e9e..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/external_storage_east.json +++ /dev/null @@ -1,145 +0,0 @@ -{ - "__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_item.json b/src/main/resources/assets/refinedstorage/models/block/external_storage_item.json new file mode 100755 index 000000000..9eb087fc2 --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/external_storage_item.json @@ -0,0 +1,354 @@ +{ + "__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": "#cable", + "uv": [ + 6.0, + 6.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#cable", + "uv": [ + 6.0, + 6.0, + 10.0, + 10.0 + ] + }, + "south": { + "texture": "#cable", + "uv": [ + 6.0, + 6.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#cable", + "uv": [ + 6.0, + 6.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 + ] + } + } + }, + { + "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": [ + 6.0, + 6.0, + 10.0, + 0.0 + ], + "rotation": 270 + }, + "down": { + "texture": "#cable", + "uv": [ + 6.0, + 10.0, + 10.0, + 16.0 + ], + "rotation": 270 + } + } + }, + { + "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": [ + 6.0, + 10.0, + 10.0, + 16.0 + ], + "rotation": 90 + } + } + } + ] +} 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 deleted file mode 100755 index d1505e33b..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/external_storage_north.json +++ /dev/null @@ -1,145 +0,0 @@ -{ - "__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 deleted file mode 100755 index e39d324f8..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/external_storage_south.json +++ /dev/null @@ -1,145 +0,0 @@ -{ - "__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 deleted file mode 100755 index dbd8dc2c2..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/external_storage_up.json +++ /dev/null @@ -1,145 +0,0 @@ -{ - "__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 deleted file mode 100755 index f0915c0f0..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/external_storage_west.json +++ /dev/null @@ -1,145 +0,0 @@ -{ - "__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/models/block/importer.json b/src/main/resources/assets/refinedstorage/models/block/importer.json index a6e5117f1..4fb264bd3 100755 --- a/src/main/resources/assets/refinedstorage/models/block/importer.json +++ b/src/main/resources/assets/refinedstorage/models/block/importer.json @@ -207,217 +207,6 @@ ] } } - }, - { - "name": "Core", - "from": [ - 6.0, - 6.0, - 6.0 - ], - "to": [ - 10.0, - 10.0, - 10.0 - ], - "faces": { - "north": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "east": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "south": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "west": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "up": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "down": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - } - } - }, - { - "name": "East", - "from": [ - 10.0, - 6.0, - 6.0 - ], - "to": [ - 16.0, - 10.0, - 10.0 - ], - "faces": { - "north": { - "texture": "#all", - "uv": [ - 0.0, - 6.0, - 6.0, - 10.0 - ] - }, - "east": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "south": { - "texture": "#all", - "uv": [ - 10.0, - 6.0, - 16.0, - 10.0 - ] - }, - "west": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "up": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 0.0 - ], - "rotation": 270 - }, - "down": { - "texture": "#all", - "uv": [ - 6.0, - 10.0, - 10.0, - 16.0 - ], - "rotation": 270 - } - } - }, - { - "name": "West", - "from": [ - 0.0, - 6.0, - 6.0 - ], - "to": [ - 6.0, - 10.0, - 10.0 - ], - "faces": { - "north": { - "texture": "#all", - "uv": [ - 10.0, - 6.0, - 16.0, - 10.0 - ] - }, - "east": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "south": { - "texture": "#all", - "uv": [ - 0.0, - 6.0, - 6.0, - 10.0 - ] - }, - "west": { - "texture": "#all", - "uv": [ - 6.0, - 6.0, - 10.0, - 10.0 - ] - }, - "up": { - "texture": "#all", - "uv": [ - 10.0, - 6.0, - 6.0, - 0.0 - ], - "rotation": 90 - }, - "down": { - "texture": "#all", - "uv": [ - 6.0, - 10.0, - 10.0, - 16.0 - ], - "rotation": 90 - } - } } ] -} +} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/importer_down.json b/src/main/resources/assets/refinedstorage/models/block/importer_down.json deleted file mode 100755 index de37d821f..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/importer_down.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - }, - "elements": [ - { - "name": "Line1", - "from": [ - 6.0, - 4.0, - 6.0 - ], - "to": [ - 10.0, - 6.0, - 10.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - } - } - }, - { - "name": "Line2", - "from": [ - 5.0, - 2.0, - 5.0 - ], - "to": [ - 11.0, - 4.0, - 11.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - } - } - }, - { - "name": "Line3", - "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, - 2.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/importer_east.json b/src/main/resources/assets/refinedstorage/models/block/importer_east.json deleted file mode 100755 index 1db248799..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/importer_east.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - }, - "elements": [ - { - "name": "Line1", - "from": [ - 10.0, - 6.0, - 6.0 - ], - "to": [ - 12.0, - 10.0, - 10.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - } - } - }, - { - "name": "Line2", - "from": [ - 12.0, - 5.0, - 5.0 - ], - "to": [ - 14.0, - 11.0, - 11.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 6.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 6.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 6.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 6.0 - ] - } - } - }, - { - "name": "Line3", - "from": [ - 14.0, - 3.0, - 3.0 - ], - "to": [ - 16.0, - 13.0, - 13.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 10.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 10.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 10.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 10.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/importer_item.json b/src/main/resources/assets/refinedstorage/models/block/importer_item.json new file mode 100755 index 000000000..56a6ec1ce --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/importer_item.json @@ -0,0 +1,423 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "elements": [ + { + "name": "Line1", + "from": [ + 6.0, + 6.0, + 4.0 + ], + "to": [ + 10.0, + 10.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": [ + 5.0, + 5.0, + 2.0 + ], + "to": [ + 11.0, + 11.0, + 4.0 + ], + "faces": { + "north": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 6.0 + ] + }, + "east": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 6.0 + ] + }, + "south": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 6.0 + ] + }, + "west": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 2.0, + 6.0 + ] + }, + "up": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 2.0 + ] + }, + "down": { + "texture": "#line", + "uv": [ + 0.0, + 0.0, + 6.0, + 2.0 + ] + } + } + }, + { + "name": "Line3", + "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": "#cable", + "uv": [ + 6.0, + 6.0, + 10.0, + 10.0 + ] + }, + "east": { + "texture": "#cable", + "uv": [ + 6.0, + 6.0, + 10.0, + 10.0 + ] + }, + "south": { + "texture": "#cable", + "uv": [ + 6.0, + 6.0, + 10.0, + 10.0 + ] + }, + "west": { + "texture": "#cable", + "uv": [ + 6.0, + 6.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 + ] + } + } + }, + { + "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": [ + 6.0, + 6.0, + 10.0, + 0.0 + ], + "rotation": 270 + }, + "down": { + "texture": "#cable", + "uv": [ + 6.0, + 10.0, + 10.0, + 16.0 + ], + "rotation": 270 + } + } + }, + { + "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": [ + 6.0, + 10.0, + 10.0, + 16.0 + ], + "rotation": 90 + } + } + } + ] +} diff --git a/src/main/resources/assets/refinedstorage/models/block/importer_north.json b/src/main/resources/assets/refinedstorage/models/block/importer_north.json deleted file mode 100755 index b1e2236ed..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/importer_north.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - }, - "elements": [ - { - "name": "Line1", - "from": [ - 6.0, - 6.0, - 4.0 - ], - "to": [ - 10.0, - 10.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": [ - 5.0, - 5.0, - 2.0 - ], - "to": [ - 11.0, - 11.0, - 4.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 6.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 6.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - } - } - }, - { - "name": "Line3", - "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/importer_south.json b/src/main/resources/assets/refinedstorage/models/block/importer_south.json deleted file mode 100755 index b75805235..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/importer_south.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - }, - "elements": [ - { - "name": "Line1", - "from": [ - 6.0, - 6.0, - 10.0 - ], - "to": [ - 10.0, - 10.0, - 12.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": [ - 5.0, - 5.0, - 12.0 - ], - "to": [ - 11.0, - 11.0, - 14.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 6.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 6.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - } - } - }, - { - "name": "Line3", - "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/importer_up.json b/src/main/resources/assets/refinedstorage/models/block/importer_up.json deleted file mode 100755 index 78a01c181..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/importer_up.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - }, - "elements": [ - { - "name": "Line1", - "from": [ - 6.0, - 10.0, - 6.0 - ], - "to": [ - 10.0, - 12.0, - 10.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - } - } - }, - { - "name": "Line2", - "from": [ - 5.0, - 12.0, - 5.0 - ], - "to": [ - 11.0, - 14.0, - 11.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - } - } - }, - { - "name": "Line3", - "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, - 2.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/importer_west.json b/src/main/resources/assets/refinedstorage/models/block/importer_west.json deleted file mode 100755 index a1640073e..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/importer_west.json +++ /dev/null @@ -1,214 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "textures": { - }, - "elements": [ - { - "name": "Line1", - "from": [ - 4.0, - 6.0, - 6.0 - ], - "to": [ - 6.0, - 10.0, - 10.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - } - } - }, - { - "name": "Line2", - "from": [ - 2.0, - 5.0, - 5.0 - ], - "to": [ - 4.0, - 11.0, - 11.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 6.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 6.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 6.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 6.0 - ] - } - } - }, - { - "name": "Line3", - "from": [ - 0.0, - 3.0, - 3.0 - ], - "to": [ - 2.0, - 13.0, - 13.0 - ], - "faces": { - "north": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 10.0 - ] - }, - "east": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - }, - "south": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 10.0 - ] - }, - "west": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - }, - "up": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 10.0 - ] - }, - "down": { - "texture": "#line", - "uv": [ - 0.0, - 0.0, - 2.0, - 10.0 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/models/block/solderer.json b/src/main/resources/assets/refinedstorage/models/block/solderer.json index 3d88548fa..839fc5103 100755 --- a/src/main/resources/assets/refinedstorage/models/block/solderer.json +++ b/src/main/resources/assets/refinedstorage/models/block/solderer.json @@ -1,13 +1,5 @@ { "__comment": "Model made by CyanideX", - "textures": { - "0": "refinedstorage:blocks/solderer_side", - "1": "refinedstorage:blocks/solderer_top", - "2": "refinedstorage:blocks/solderer_bottom", - "3": "refinedstorage:blocks/solderer_middle", - "4": "refinedstorage:blocks/solderer_roof", - "5": "refinedstorage:blocks/solderer_elements" - }, "elements": [ { "name": "Bottom", @@ -23,7 +15,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 11.0, @@ -32,7 +24,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 11.0, @@ -41,7 +33,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 11.0, @@ -50,7 +42,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 11.0, @@ -59,7 +51,7 @@ ] }, "up": { - "texture": "#1", + "texture": "#top", "uv": [ 0.0, 0.0, @@ -68,7 +60,7 @@ ] }, "down": { - "texture": "#2", + "texture": "#bottom", "uv": [ 0.0, 0.0, @@ -92,7 +84,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#side", "uv": [ 1.0, 10.0, @@ -101,7 +93,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#side", "uv": [ 1.0, 10.0, @@ -110,7 +102,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#side", "uv": [ 1.0, 10.0, @@ -119,7 +111,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#side", "uv": [ 1.0, 10.0, @@ -128,7 +120,7 @@ ] }, "up": { - "texture": "#3", + "texture": "#middle", "uv": [ 2.0, 2.0, @@ -137,7 +129,7 @@ ] }, "down": { - "texture": "#3", + "texture": "#middle", "uv": [ 2.0, 2.0, @@ -161,7 +153,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 9.0, @@ -170,7 +162,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 9.0, @@ -179,7 +171,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 9.0, @@ -188,7 +180,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 9.0, @@ -197,7 +189,7 @@ ] }, "up": { - "texture": "#3", + "texture": "#middle", "uv": [ 0.0, 0.0, @@ -206,7 +198,7 @@ ] }, "down": { - "texture": "#2", + "texture": "#bottom", "uv": [ 0.0, 0.0, @@ -230,7 +222,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -239,7 +231,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -248,7 +240,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -257,7 +249,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -266,7 +258,7 @@ ] }, "up": { - "texture": "#1", + "texture": "#top", "uv": [ 0.0, 0.0, @@ -275,7 +267,7 @@ ] }, "down": { - "texture": "#4", + "texture": "#roof", "uv": [ 0.0, 0.0, @@ -299,7 +291,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#side", "uv": [ 4.0, 8.0, @@ -308,7 +300,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#side", "uv": [ 4.0, 8.0, @@ -317,7 +309,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#side", "uv": [ 4.0, 8.0, @@ -326,7 +318,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#side", "uv": [ 4.0, 8.0, @@ -335,7 +327,7 @@ ] }, "up": { - "texture": "#5", + "texture": "#elements", "uv": [ 6.0, 4.0, @@ -344,7 +336,7 @@ ] }, "down": { - "texture": "#5", + "texture": "#elements", "uv": [ 6.0, 4.0, @@ -368,7 +360,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#side", "uv": [ 1.0, 3.0, @@ -377,7 +369,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#side", "uv": [ 14.0, 3.0, @@ -386,7 +378,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#side", "uv": [ 1.0, 3.0, @@ -395,7 +387,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#side", "uv": [ 14.0, 3.0, @@ -404,7 +396,7 @@ ] }, "up": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -413,7 +405,7 @@ ] }, "down": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -437,7 +429,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#side", "uv": [ 2.0, 3.0, @@ -446,7 +438,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#side", "uv": [ 2.0, 3.0, @@ -455,7 +447,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#side", "uv": [ 13.0, 3.0, @@ -464,7 +456,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#side", "uv": [ 2.0, 3.0, @@ -473,7 +465,7 @@ ] }, "up": { - "texture": "#5", + "texture": "#elements", "uv": [ 2.0, 2.0, @@ -482,7 +474,7 @@ ] }, "down": { - "texture": "#5", + "texture": "#elements", "uv": [ 3.0, 2.0, @@ -506,7 +498,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#side", "uv": [ 2.0, 3.0, @@ -515,7 +507,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#side", "uv": [ 2.0, 3.0, @@ -524,7 +516,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#side", "uv": [ 14.0, 3.0, @@ -533,7 +525,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#side", "uv": [ 2.0, 3.0, @@ -542,7 +534,7 @@ ] }, "up": { - "texture": "#5", + "texture": "#elements", "uv": [ 2.0, 2.0, @@ -551,7 +543,7 @@ ] }, "down": { - "texture": "#5", + "texture": "#elements", "uv": [ 3.0, 2.0, @@ -575,7 +567,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#side", "uv": [ 3.0, 1.0, @@ -584,7 +576,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#side", "uv": [ 1.0, 0.0, @@ -593,7 +585,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#side", "uv": [ 3.0, 1.0, @@ -602,7 +594,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#side", "uv": [ 1.0, 0.0, @@ -611,7 +603,7 @@ ] }, "up": { - "texture": "#0", + "texture": "#side", "uv": [ 3.0, 1.0, @@ -620,7 +612,7 @@ ] }, "down": { - "texture": "#0", + "texture": "#side", "uv": [ 3.0, 14.0, @@ -644,7 +636,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#side", "uv": [ 1.0, 3.0, @@ -653,7 +645,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#side", "uv": [ 14.0, 3.0, @@ -662,7 +654,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#side", "uv": [ 1.0, 3.0, @@ -671,7 +663,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#side", "uv": [ 14.0, 3.0, @@ -680,7 +672,7 @@ ] }, "up": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -689,7 +681,7 @@ ] }, "down": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -713,7 +705,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#side", "uv": [ 1.0, 3.0, @@ -722,7 +714,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#side", "uv": [ 14.0, 3.0, @@ -731,7 +723,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#side", "uv": [ 1.0, 3.0, @@ -740,7 +732,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#side", "uv": [ 14.0, 3.0, @@ -749,7 +741,7 @@ ] }, "up": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -758,7 +750,7 @@ ] }, "down": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -782,7 +774,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#side", "uv": [ 1.0, 3.0, @@ -791,7 +783,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#side", "uv": [ 14.0, 3.0, @@ -800,7 +792,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#side", "uv": [ 1.0, 3.0, @@ -809,7 +801,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#side", "uv": [ 14.0, 3.0, @@ -818,7 +810,7 @@ ] }, "up": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -827,7 +819,7 @@ ] }, "down": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -851,7 +843,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#side", "uv": [ 13.0, 5.0, @@ -860,7 +852,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#side", "uv": [ 12.0, 5.0, @@ -869,7 +861,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#side", "uv": [ 13.0, 5.0, @@ -878,7 +870,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#side", "uv": [ 12.0, 7.0, @@ -887,7 +879,7 @@ ] }, "up": { - "texture": "#0", + "texture": "#side", "uv": [ 12.0, 6.0, @@ -896,7 +888,7 @@ ] }, "down": { - "texture": "#0", + "texture": "#side", "uv": [ 12.0, 6.0, @@ -920,7 +912,7 @@ ], "faces": { "north": { - "texture": "#0", + "texture": "#side", "uv": [ 3.0, 5.0, @@ -929,7 +921,7 @@ ] }, "east": { - "texture": "#0", + "texture": "#side", "uv": [ 2.0, 5.0, @@ -938,7 +930,7 @@ ] }, "south": { - "texture": "#0", + "texture": "#side", "uv": [ 3.0, 5.0, @@ -947,7 +939,7 @@ ] }, "west": { - "texture": "#0", + "texture": "#side", "uv": [ 2.0, 5.0, @@ -956,7 +948,7 @@ ] }, "up": { - "texture": "#0", + "texture": "#side", "uv": [ 0.0, 0.0, @@ -965,7 +957,7 @@ ] }, "down": { - "texture": "#0", + "texture": "#side", "uv": [ 3.0, 8.0, diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/cable.png b/src/main/resources/assets/refinedstorage/textures/blocks/cable.png index a1246790e..19d20839e 100755 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/cable.png and b/src/main/resources/assets/refinedstorage/textures/blocks/cable.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/cable_new.png b/src/main/resources/assets/refinedstorage/textures/blocks/cable_new.png deleted file mode 100755 index 19d20839e..000000000 Binary files a/src/main/resources/assets/refinedstorage/textures/blocks/cable_new.png and /dev/null differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/cable_old.png b/src/main/resources/assets/refinedstorage/textures/blocks/cable_old.png new file mode 100755 index 000000000..a1246790e Binary files /dev/null and b/src/main/resources/assets/refinedstorage/textures/blocks/cable_old.png differ diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/importer_exporter_external_storage.png b/src/main/resources/assets/refinedstorage/textures/blocks/generic_grey.png similarity index 100% rename from src/main/resources/assets/refinedstorage/textures/blocks/importer_exporter_external_storage.png rename to src/main/resources/assets/refinedstorage/textures/blocks/generic_grey.png