diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java index abfc3ba4d..e98a8340b 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockCable.java @@ -85,7 +85,7 @@ public class BlockCable extends BlockNode { @Override @SideOnly(Side.CLIENT) public void registerModels(IModelRegistration modelRegistration) { - modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory")); + modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "down=false,east=true,north=false,south=false,up=false,west=true")); registerCover(modelRegistration); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java index cc87207b3..94f1e924d 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockConstructor.java @@ -30,7 +30,7 @@ public class BlockConstructor extends BlockCable { @Override @SideOnly(Side.CLIENT) public void registerModels(IModelRegistration modelRegistration) { - modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory")); + modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "connected=false,direction=north,down=false,east=true,north=false,south=false,up=false,west=true")); registerCoverAndFullbright(modelRegistration, RS.ID + ":blocks/constructor/cutouts/connected"); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java index 9e81fbd7c..f05302160 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockDestructor.java @@ -29,7 +29,7 @@ public class BlockDestructor extends BlockCable { @Override @SideOnly(Side.CLIENT) public void registerModels(IModelRegistration modelRegistration) { - modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory")); + modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "connected=false,direction=north,down=false,east=true,north=false,south=false,up=false,west=true")); registerCoverAndFullbright(modelRegistration, RS.ID + ":blocks/destructor/cutouts/connected"); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExporter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExporter.java index 75757df97..835ffd71a 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExporter.java @@ -28,7 +28,7 @@ public class BlockExporter extends BlockCable { @Override @SideOnly(Side.CLIENT) public void registerModels(IModelRegistration modelRegistration) { - modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory")); + modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "direction=north,down=false,east=true,north=false,south=false,up=false,west=true")); registerCover(modelRegistration); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java index 297eec6b4..1f129cfd5 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockExternalStorage.java @@ -31,7 +31,7 @@ public class BlockExternalStorage extends BlockCable { @Override @SideOnly(Side.CLIENT) public void registerModels(IModelRegistration modelRegistration) { - modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory")); + modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "direction=north,down=false,east=true,north=false,south=false,up=false,west=true")); registerCover(modelRegistration); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockImporter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockImporter.java index c2a45bb24..004ac1b7a 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockImporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockImporter.java @@ -28,7 +28,7 @@ public class BlockImporter extends BlockCable { @Override @SideOnly(Side.CLIENT) public void registerModels(IModelRegistration modelRegistration) { - modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory")); + modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "direction=north,down=false,east=true,north=false,south=false,up=false,west=true")); registerCover(modelRegistration); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockReader.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockReader.java index 29c81cbd6..fee9b8fbe 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockReader.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockReader.java @@ -32,7 +32,7 @@ public class BlockReader extends BlockCable { @Override @SideOnly(Side.CLIENT) public void registerModels(IModelRegistration modelRegistration) { - modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory")); + modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "connected=false,direction=north,down=false,east=true,north=false,south=false,up=false,west=true")); registerCoverAndFullbright(modelRegistration, RS.ID + ":blocks/reader/cutouts/connected"); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWriter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWriter.java index 3e9674744..3ad1438ec 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWriter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWriter.java @@ -33,7 +33,7 @@ public class BlockWriter extends BlockCable { @Override @SideOnly(Side.CLIENT) public void registerModels(IModelRegistration modelRegistration) { - modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory")); + modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "connected=false,direction=north,down=false,east=true,north=false,south=false,up=false,west=true")); registerCoverAndFullbright(modelRegistration, RS.ID + ":blocks/writer/cutouts/connected"); } diff --git a/src/main/resources/assets/refinedstorage/blockstates/cable.json b/src/main/resources/assets/refinedstorage/blockstates/cable.json index 94df0b6f5..565df7358 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/cable.json +++ b/src/main/resources/assets/refinedstorage/blockstates/cable.json @@ -6,15 +6,10 @@ "particle": "refinedstorage:blocks/cable" }, "model": "refinedstorage:cable_core", - "uvlock": true + "uvlock": true, + "transform": "forge:default-block" }, "variants": { - "inventory": [ - { - "model": "refinedstorage:cable_item", - "transform": "forge:default-block" - } - ], "north": { "true": { "submodel": "refinedstorage:cable_extension" diff --git a/src/main/resources/assets/refinedstorage/blockstates/constructor.json b/src/main/resources/assets/refinedstorage/blockstates/constructor.json index fc8690265..60c4bfcd1 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/constructor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/constructor.json @@ -9,15 +9,10 @@ "border": "refinedstorage:blocks/cable_part_border" }, "model": "refinedstorage:cable_core", - "uvlock": true + "uvlock": true, + "transform": "forge:default-block" }, "variants": { - "inventory": [ - { - "model": "refinedstorage:constructor_destructor_item", - "transform": "forge:default-block" - } - ], "connected": { "true": { "textures": { diff --git a/src/main/resources/assets/refinedstorage/blockstates/destructor.json b/src/main/resources/assets/refinedstorage/blockstates/destructor.json index ec11cf45b..69dbef3b7 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/destructor.json +++ b/src/main/resources/assets/refinedstorage/blockstates/destructor.json @@ -9,15 +9,10 @@ "border": "refinedstorage:blocks/cable_part_border" }, "model": "refinedstorage:cable_core", - "uvlock": true + "uvlock": true, + "transform": "forge:default-block" }, "variants": { - "inventory": [ - { - "model": "refinedstorage:constructor_destructor_item", - "transform": "forge:default-block" - } - ], "connected": { "true": { "textures": { diff --git a/src/main/resources/assets/refinedstorage/blockstates/exporter.json b/src/main/resources/assets/refinedstorage/blockstates/exporter.json index 5825cab57..7cbee5034 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/exporter.json +++ b/src/main/resources/assets/refinedstorage/blockstates/exporter.json @@ -7,15 +7,10 @@ "border": "refinedstorage:blocks/cable_part_border" }, "model": "refinedstorage:cable_core", - "uvlock": false + "uvlock": false, + "transform": "forge:default-block" }, "variants": { - "inventory": [ - { - "model": "refinedstorage:exporter_item", - "transform": "forge:default-block" - } - ], "direction": { "north": { "submodel": "refinedstorage:exporter" diff --git a/src/main/resources/assets/refinedstorage/blockstates/external_storage.json b/src/main/resources/assets/refinedstorage/blockstates/external_storage.json index 55a3ae417..fe82cc54f 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/external_storage.json +++ b/src/main/resources/assets/refinedstorage/blockstates/external_storage.json @@ -7,7 +7,8 @@ "border": "refinedstorage:blocks/cable_part_border" }, "model": "refinedstorage:cable_core", - "uvlock": false + "uvlock": false, + "transform": "forge:default-block" }, "variants": { "inventory": [ diff --git a/src/main/resources/assets/refinedstorage/blockstates/importer.json b/src/main/resources/assets/refinedstorage/blockstates/importer.json index ed2b56dfc..c901bee1e 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/importer.json +++ b/src/main/resources/assets/refinedstorage/blockstates/importer.json @@ -7,15 +7,10 @@ "border": "refinedstorage:blocks/cable_part_border" }, "model": "refinedstorage:cable_core", - "uvlock": false + "uvlock": false, + "transform": "forge:default-block" }, "variants": { - "inventory": [ - { - "model": "refinedstorage:importer_item", - "transform": "forge:default-block" - } - ], "direction": { "north": { "submodel": "refinedstorage:importer" diff --git a/src/main/resources/assets/refinedstorage/blockstates/reader.json b/src/main/resources/assets/refinedstorage/blockstates/reader.json index 1bd099a9b..baddfd76e 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/reader.json +++ b/src/main/resources/assets/refinedstorage/blockstates/reader.json @@ -9,15 +9,10 @@ "border": "refinedstorage:blocks/cable_part_border" }, "model": "refinedstorage:cable_core", - "uvlock": true + "uvlock": true, + "transform": "forge:default-block" }, "variants": { - "inventory": [ - { - "model": "refinedstorage:constructor_destructor_item", - "transform": "forge:default-block" - } - ], "connected": { "true": { "textures": { diff --git a/src/main/resources/assets/refinedstorage/blockstates/writer.json b/src/main/resources/assets/refinedstorage/blockstates/writer.json index c9a7cd782..7816a3090 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/writer.json +++ b/src/main/resources/assets/refinedstorage/blockstates/writer.json @@ -9,15 +9,10 @@ "border": "refinedstorage:blocks/cable_part_border" }, "model": "refinedstorage:cable_core", - "uvlock": true + "uvlock": true, + "transform": "forge:default-block" }, "variants": { - "inventory": [ - { - "model": "refinedstorage:constructor_destructor_item", - "transform": "forge:default-block" - } - ], "connected": { "true": { "textures": { diff --git a/src/main/resources/assets/refinedstorage/models/block/cable_item.json b/src/main/resources/assets/refinedstorage/models/block/cable_item.json deleted file mode 100755 index c9b1da58d..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/cable_item.json +++ /dev/null @@ -1,216 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "elements": [ - { - "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 - } - } - } - ] -} \ 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 deleted file mode 100755 index d71e60431..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/constructor_destructor_item.json +++ /dev/null @@ -1,369 +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": { - "east": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "south": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - }, - "west": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "up": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - }, - "down": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - } - } - }, - { - "name": "Line2", - "from": [ - 2.0, - 2.0, - 0.0 - ], - "to": [ - 14.0, - 14.0, - 2.0 - ], - "faces": { - "north": { - "texture": "#front", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "east": { - "texture": "#border", - "uv": [ - 14.0, - 0.0, - 16.0, - 16.0 - ] - }, - "south": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 16.0, - 16.0 - ] - }, - "west": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 16.0 - ] - }, - "up": { - "texture": "#border", - "uv": [ - 2.0, - 0.0, - 14.0, - 2.0 - ] - }, - "down": { - "texture": "#border", - "uv": [ - 2.0, - 14.0, - 14.0, - 16.0 - ] - } - } - }, - { - "name": "Line3", - "from": [ - 2.0, - 2.0, - 0.0 - ], - "to": [ - 14.0, - 14.0, - 2.0 - ], - "faces": { - "north": { - "texture": "#cutout", - "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/exporter_item.json b/src/main/resources/assets/refinedstorage/models/block/exporter_item.json deleted file mode 100755 index eda8e9618..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/exporter_item.json +++ /dev/null @@ -1,423 +0,0 @@ -{ - "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", - "elements": [ - { - "name": "Line1", - "from": [ - 6, - 6, - 0 - ], - "to": [ - 10, - 10, - 2 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 4, - 4 - ], - "texture": "#border" - }, - "east": { - "uv": [ - 0, - 0, - 2, - 4 - ], - "texture": "#border" - }, - "south": { - "uv": [ - 0, - 0, - 4, - 4 - ], - "texture": "#border" - }, - "west": { - "uv": [ - 0, - 0, - 2, - 4 - ], - "texture": "#border" - }, - "up": { - "uv": [ - 0, - 0, - 4, - 2 - ], - "texture": "#border" - }, - "down": { - "uv": [ - 0, - 0, - 4, - 2 - ], - "texture": "#border" - } - } - }, - { - "name": "Line2", - "from": [ - 5, - 5, - 2 - ], - "to": [ - 11, - 11, - 4 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 6, - 6 - ], - "texture": "#border" - }, - "east": { - "uv": [ - 0, - 0, - 2, - 6 - ], - "texture": "#border" - }, - "south": { - "uv": [ - 0, - 0, - 6, - 6 - ], - "texture": "#border" - }, - "west": { - "uv": [ - 0, - 0, - 2, - 6 - ], - "texture": "#border" - }, - "up": { - "uv": [ - 0, - 0, - 6, - 2 - ], - "texture": "#border" - }, - "down": { - "uv": [ - 0, - 0, - 6, - 2 - ], - "texture": "#border" - } - } - }, - { - "name": "Line3", - "from": [ - 3, - 3, - 4 - ], - "to": [ - 13, - 13, - 6 - ], - "faces": { - "north": { - "uv": [ - 0, - 0, - 10, - 10 - ], - "texture": "#border" - }, - "east": { - "uv": [ - 0, - 0, - 2, - 10 - ], - "texture": "#border" - }, - "south": { - "uv": [ - 0, - 0, - 10, - 10 - ], - "texture": "#border" - }, - "west": { - "uv": [ - 0, - 0, - 2, - 10 - ], - "texture": "#border" - }, - "up": { - "uv": [ - 0, - 0, - 10, - 2 - ], - "texture": "#border" - }, - "down": { - "uv": [ - 0, - 0, - 10, - 2 - ], - "texture": "#border" - } - } - }, - { - "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_item.json b/src/main/resources/assets/refinedstorage/models/block/external_storage_item.json deleted file mode 100755 index 20959516f..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/external_storage_item.json +++ /dev/null @@ -1,345 +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": { - "east": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "south": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - }, - "west": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "up": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - }, - "down": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - } - } - }, - { - "name": "Line2", - "from": [ - 3.0, - 3.0, - 0.0 - ], - "to": [ - 13.0, - 13.0, - 2.0 - ], - "faces": { - "north": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - }, - "east": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 10.0 - ] - }, - "south": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - }, - "west": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 10.0 - ] - }, - "up": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "down": { - "texture": "#border", - "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_item.json b/src/main/resources/assets/refinedstorage/models/block/importer_item.json deleted file mode 100755 index 8602e5779..000000000 --- a/src/main/resources/assets/refinedstorage/models/block/importer_item.json +++ /dev/null @@ -1,423 +0,0 @@ -{ - "__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": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - }, - "east": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - }, - "south": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 4.0 - ] - }, - "west": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 4.0 - ] - }, - "up": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 4.0, - 2.0 - ] - }, - "down": { - "texture": "#border", - "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": "#border", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - }, - "east": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 6.0 - ] - }, - "south": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 6.0, - 6.0 - ] - }, - "west": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 6.0 - ] - }, - "up": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 6.0, - 2.0 - ] - }, - "down": { - "texture": "#border", - "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": "#border", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - }, - "east": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 10.0 - ] - }, - "south": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 10.0, - 10.0 - ] - }, - "west": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 2.0, - 10.0 - ] - }, - "up": { - "texture": "#border", - "uv": [ - 0.0, - 0.0, - 10.0, - 2.0 - ] - }, - "down": { - "texture": "#border", - "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 - } - } - } - ] -}