From 928fdc889f054c0446a7e223e40b915cb572fa2c Mon Sep 17 00:00:00 2001 From: GearShocky Date: Wed, 18 Aug 2021 18:09:35 +0600 Subject: [PATCH] Added active/inactive/halted variants of the blocks. Added previously missed matter panel. --- .../models/block/matter_decomposer_idle.json | 82 ++++++ ...er.json => matter_decomposer_working.json} | 0 .../models/block/matter_panel.json | 19 +- .../models/block/matter_replicator_error.json | 274 ++++++++++++++++++ .../models/block/matter_replicator_idle.json | 274 ++++++++++++++++++ ...or.json => matter_replicator_working.json} | 0 .../models/block/matter_scanner_error.json | 227 +++++++++++++++ .../models/block/matter_scanner_idle.json | 227 +++++++++++++++ ...anner.json => matter_scanner_working.json} | 0 .../models/block/pattern_storage_pattern.json | 20 ++ .../textures/gui/matter_panel.png | Bin 12164 -> 3209 bytes 11 files changed, 1116 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_idle.json rename src/main/resources/assets/overdrive_that_matters/models/block/{matter_decomposer.json => matter_decomposer_working.json} (100%) create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_error.json create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_idle.json rename src/main/resources/assets/overdrive_that_matters/models/block/{matter_replicator.json => matter_replicator_working.json} (100%) create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/matter_scanner_error.json create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/matter_scanner_idle.json rename src/main/resources/assets/overdrive_that_matters/models/block/{matter_scanner.json => matter_scanner_working.json} (100%) create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/pattern_storage_pattern.json diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_idle.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_idle.json new file mode 100644 index 000000000..b6285d2fb --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_idle.json @@ -0,0 +1,82 @@ +{ + "parent": "block/block", + "texture_size": [64, 64], + "textures": { + "texture": "overdrive_that_matters:block/matter_decomposer_offline", + "particle": "overdrive_that_matters:block/matter_decomposer_offline" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 3, 16], + "faces": { + "north": {"uv": [0, 11.25, 4, 12], "texture": "#texture"}, + "east": {"uv": [0, 11.25, 4, 12], "texture": "#texture"}, + "south": {"uv": [0, 11.25, 4, 12], "texture": "#texture"}, + "west": {"uv": [0, 11.25, 4, 12], "texture": "#texture"}, + "up": {"uv": [0, 7.25, 4, 11.25], "texture": "#texture"}, + "down": {"uv": [0, 12, 4, 16], "texture": "#texture"} + } + }, + { + "from": [8, 3, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [4, 7.25, 6, 10.5], "texture": "#texture"}, + "east": {"uv": [4, 10.5, 8, 13.75], "texture": "#texture"}, + "south": {"uv": [6, 7.25, 8, 10.5], "texture": "#texture"}, + "west": {"uv": [8, 10.5, 12, 13.75], "texture": "#texture"}, + "up": {"uv": [4, 13.75, 8, 15.25], "rotation": 90, "texture": "#texture"}, + "down": {"uv": [0, 7.25, 2, 11.25], "texture": "#texture"} + } + }, + { + "from": [1, 3, 1], + "to": [7, 14, 7], + "faces": { + "north": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#texture"}, + "east": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#texture"}, + "south": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#texture"}, + "west": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#texture"}, + "up": {"uv": [0, 3, 1.5, 4.5], "texture": "#texture"}, + "down": {"uv": [0, 3, 1.5, 4.5], "texture": "#texture"} + } + }, + { + "from": [1, 3, 9], + "to": [7, 14, 15], + "faces": { + "north": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#texture"}, + "east": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#texture"}, + "south": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#texture"}, + "west": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#texture"}, + "up": {"uv": [0, 3, 1.5, 4.5], "texture": "#texture"}, + "down": {"uv": [0, 3, 1.5, 4.5], "texture": "#texture"} + } + }, + { + "from": [3, 13, 11], + "to": [8, 15, 13], + "faces": { + "north": {"uv": [1.75, 6, 2.25, 7.25], "rotation": 270, "texture": "#texture"}, + "east": {"uv": [0.5, 3.5, 1, 3.75], "texture": "#texture"}, + "south": {"uv": [1.75, 6, 2.25, 7.25], "rotation": 90, "texture": "#texture"}, + "west": {"uv": [1.75, 6.75, 2.25, 7.25], "rotation": 90, "texture": "#texture"}, + "up": {"uv": [2.25, 6, 2.75, 7.25], "rotation": 90, "texture": "#texture"}, + "down": {"uv": [1.5, 5.25, 1.75, 7.25], "texture": "#texture"} + } + }, + { + "from": [3, 13, 3], + "to": [8, 15, 5], + "faces": { + "north": {"uv": [1.75, 6, 2.25, 7.25], "rotation": 270, "texture": "#texture"}, + "east": {"uv": [0.5, 3.5, 1, 3.75], "texture": "#texture"}, + "south": {"uv": [1.75, 6, 2.25, 7.25], "rotation": 90, "texture": "#texture"}, + "west": {"uv": [1.75, 6.75, 2.25, 7.25], "rotation": 90, "texture": "#texture"}, + "up": {"uv": [2.25, 6, 2.75, 7.25], "rotation": 90, "texture": "#texture"}, + "down": {"uv": [1.5, 5.25, 1.75, 7.25], "texture": "#texture"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_working.json similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer.json rename to src/main/resources/assets/overdrive_that_matters/models/block/matter_decomposer_working.json diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_panel.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_panel.json index 8b5bccd0a..1cb704ba5 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/matter_panel.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_panel.json @@ -1,16 +1,21 @@ { "parent": "block/block", - "elements": [ + "texture_size": [32, 32], + "textures": { + "texture": "overdrive_that_matters:block/matter_panel", + "particle": "overdrive_that_matters:block/matter_panel" + }, +"elements": [ { "from": [ 0, 0, 0 ], "to": [ 16, 16, 6 ], "faces": { - "down": { "texture": "#side" }, - "up": { "texture": "#side" }, - "north": { "texture": "#back" }, - "south": { "texture": "#front" }, - "west": { "texture": "#side" }, - "east": { "texture": "#side" } + "down": {"uv": [ 8, 0, 16, 3 ], "texture": "#texture" }, + "up": {"uv": [ 8, 0, 16, 3 ], "rotation": 180, "texture": "#texture" }, + "north": {"uv": [ 0, 8, 8, 16 ], "texture": "#texture" }, + "south": {"uv": [ 0, 0, 8, 8 ], "texture": "#texture" }, + "west": {"uv": [ 8, 0, 16, 3 ], "rotation": 90, "texture": "#texture" }, + "east": {"uv": [ 8, 0, 16, 3 ], "rotation": 270, "texture": "#texture" } } } ] diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_error.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_error.json new file mode 100644 index 000000000..9a886840e --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_error.json @@ -0,0 +1,274 @@ +{ + "parent": "block/block", + "texture_size": [32, 64], + "textures": { + "particle": "overdrive_that_matters:block/matter_replicator_halted", + "texture": "overdrive_that_matters:block/matter_replicator_halted" + }, + "elements": [ + { + "name": "body", + "from": [15, 0, 0], + "to": [16, 11, 16], + "faces": { + "north": {"uv": [0, 1.25, 0.5, 4], "texture": "#texture"}, + "east": {"uv": [0, 5.25, 8, 8], "texture": "#texture"}, + "south": {"uv": [15.5, 1.25, 16, 4], "texture": "#texture"}, + "west": {"uv": [8, 9, 16, 11.75], "texture": "#texture"}, + "up": {"uv": [0, 8, 0.5, 12], "rotation": 180, "texture": "#texture"}, + "down": {"uv": [8, 8, 8.5, 12], "texture": "#texture"} + } + }, + { + "name": "body", + "from": [0, 0, 0], + "to": [1, 11, 16], + "faces": { + "north": {"uv": [7.5, 1.25, 8, 4], "texture": "#texture"}, + "east": {"uv": [8, 9, 16, 11.75], "texture": "#texture"}, + "south": {"uv": [8, 1.25, 8.5, 4], "texture": "#texture"}, + "west": {"uv": [8, 5.25, 16, 8], "texture": "#texture"}, + "up": {"uv": [7.5, 8, 8, 12], "rotation": 180, "texture": "#texture"}, + "down": {"uv": [15.5, 8, 16, 12], "texture": "#texture"} + } + }, + { + "name": "controlpanel", + "from": [0, 11, 1], + "to": [8, 16, 6], + "faces": { + "north": {"uv": [4, 13.25, 8, 14.5], "texture": "#texture"}, + "east": {"uv": [0, 0, 5, 5], "texture": "#missing"}, + "south": {"uv": [4, 12, 8, 13.25], "texture": "#texture"}, + "west": {"uv": [8.5, 4, 11, 5.25], "texture": "#texture"}, + "up": {"uv": [4, 12, 8, 13.25], "texture": "#texture"}, + "down": {"uv": [0, 0, 8, 5], "texture": "#missing"} + } + }, + { + "name": "computer", + "from": [8, 11, 0], + "to": [16, 16, 6], + "faces": { + "north": {"uv": [0, 0, 4, 1.25], "texture": "#texture"}, + "east": {"uv": [5, 4, 8, 5.25], "texture": "#texture"}, + "south": {"uv": [0, 12.25, 4, 13.5], "texture": "#texture"}, + "west": {"uv": [0, 12, 4, 13.5], "texture": "#texture"}, + "up": {"uv": [0, 12, 4, 13.5], "texture": "#texture"}, + "down": {"uv": [0, 0, 8, 6], "texture": "#missing"} + } + }, + { + "name": "canister", + "from": [3, 11, 11], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [10, 12, 16, 13], "rotation": 180, "texture": "#texture"}, + "east": {"uv": [8, 12, 10, 13], "texture": "#texture"}, + "south": {"uv": [10, 12, 16, 13], "texture": "#texture"}, + "west": {"uv": [8, 12, 10, 13], "texture": "#texture"}, + "up": {"uv": [10, 12, 16, 13], "texture": "#texture"}, + "down": {"uv": [0, 0, 6, 1], "texture": "#missing"} + } + }, + { + "name": "canister", + "from": [3, 11, 6], + "to": [15, 15, 10], + "faces": { + "north": {"uv": [0, 0, 6, 1], "texture": "#missing"}, + "east": {"uv": [8, 12, 10, 13], "texture": "#texture"}, + "south": {"uv": [10, 12, 16, 13], "texture": "#texture"}, + "west": {"uv": [8, 12, 10, 13], "texture": "#texture"}, + "up": {"uv": [10, 12, 16, 13], "texture": "#texture"}, + "down": {"uv": [0, 0, 6, 1], "texture": "#missing"} + } + }, + { + "name": "pipe", + "from": [1, 11, 7], + "to": [3, 14, 9], + "faces": { + "north": {"uv": [0, 14, 1, 14.75], "texture": "#texture"}, + "east": {"uv": [0, 0, 1, 0.75], "texture": "#missing"}, + "south": {"uv": [0, 14, 1, 14.75], "texture": "#texture"}, + "west": {"uv": [0, 14, 1, 14.75], "texture": "#texture"}, + "up": {"uv": [0, 13.5, 1, 14], "texture": "#texture"}, + "down": {"uv": [0, 0, 1, 0.5], "texture": "#missing"} + } + }, + { + "name": "pipe", + "from": [1, 11, 12], + "to": [3, 14, 14], + "faces": { + "north": {"uv": [0, 14, 1, 14.75], "texture": "#texture"}, + "east": {"uv": [0, 0, 1, 0.75], "texture": "#missing"}, + "south": {"uv": [0, 14, 1, 14.75], "texture": "#texture"}, + "west": {"uv": [0, 14, 1, 14.75], "texture": "#texture"}, + "up": {"uv": [0, 13.5, 1, 14], "texture": "#texture"}, + "down": {"uv": [0, 0, 1, 0.5], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [0, 11, 15], + "to": [0, 16, 16], + "faces": { + "north": {"uv": [0, 0, 0, 5], "texture": "#missing"}, + "east": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, + "south": {"uv": [0, 0, 0, 5], "texture": "#missing"}, + "west": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, + "up": {"uv": [0, 0, 0, 1], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 1], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [16, 11, 15], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 0, 5], "texture": "#missing"}, + "east": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, + "south": {"uv": [0, 0, 0, 5], "texture": "#missing"}, + "west": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, + "up": {"uv": [0, 0, 0, 1], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 1], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [16, 15, 6], + "to": [16, 16, 15], + "faces": { + "north": {"uv": [0, 0, 0, 1], "texture": "#missing"}, + "east": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, + "south": {"uv": [0, 0, 0, 1], "texture": "#missing"}, + "west": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, + "up": {"uv": [0, 0, 0, 9], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 9], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [0, 15, 6], + "to": [0, 16, 15], + "faces": { + "north": {"uv": [0, 0, 0, 1], "texture": "#missing"}, + "east": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, + "south": {"uv": [0, 0, 0, 1], "texture": "#missing"}, + "west": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, + "up": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, + "down": {"uv": [0, 0, 0, 9], "texture": "#missing"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 16], + "faces": { + "north": {"uv": [0.5, 3.75, 7.5, 4], "texture": "#texture"}, + "east": {"uv": [0, 0, 8, 0.25], "texture": "#missing"}, + "south": {"uv": [8.5, 3.75, 15.5, 4], "texture": "#texture"}, + "west": {"uv": [0, 0, 8, 0.25], "texture": "#missing"}, + "up": {"uv": [0.5, 8, 7.5, 12], "rotation": 180, "texture": "#texture"}, + "down": {"uv": [8.5, 8, 15.5, 12], "texture": "#texture"} + } + }, + { + "from": [8, 7, 0], + "to": [15, 11, 1], + "faces": { + "north": {"uv": [0.5, 1.25, 4, 2.25], "texture": "#texture"}, + "east": {"uv": [0, 0, 0.5, 0.75], "texture": "#missing"}, + "south": {"uv": [0, 0, 3.5, 1], "texture": "#texture"}, + "west": {"uv": [3.5, 1.25, 4, 2], "texture": "#texture"}, + "up": {"uv": [0, 0, 3.5, 0.25], "texture": "#missing"}, + "down": {"uv": [0.5, 2, 4, 2.25], "texture": "#texture"} + } + }, + { + "from": [1, 9, 0], + "to": [8, 11, 1], + "faces": { + "north": {"uv": [4, 1.25, 7.5, 1.75], "texture": "#texture"}, + "east": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, + "south": {"uv": [4, 1.25, 7, 1.75], "texture": "#texture"}, + "west": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, + "up": {"uv": [4, 11.75, 7.5, 12], "texture": "#texture"}, + "down": {"uv": [1.5, 3.5, 5, 3.75], "texture": "#texture"} + } + }, + { + "from": [1, 1, 0], + "to": [2, 9, 1], + "faces": { + "north": {"uv": [7, 1.75, 7.5, 3.75], "texture": "#texture"}, + "east": {"uv": [7, 1.75, 7.5, 3.75], "texture": "#texture"}, + "south": {"uv": [7, 1.75, 7.5, 3.75], "texture": "#texture"}, + "west": {"uv": [0, 0, 0.5, 2], "texture": "#missing"}, + "up": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}, + "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"} + } + }, + { + "from": [14, 1, 0], + "to": [15, 7, 1], + "faces": { + "north": {"uv": [0.5, 2.25, 1, 3.75], "texture": "#texture"}, + "east": {"uv": [0, 0, 0.5, 1.75], "texture": "#missing"}, + "south": {"uv": [0.5, 2.25, 1, 3.75], "texture": "#texture"}, + "west": {"uv": [0.5, 2.25, 1, 3.75], "texture": "#texture"}, + "up": {"uv": [0.5, 3.25, 1, 3.5], "texture": "#texture"}, + "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"} + } + }, + { + "from": [2, 1, 0], + "to": [14, 2, 1], + "faces": { + "north": {"uv": [1, 3.5, 7, 3.75], "texture": "#texture"}, + "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}, + "south": {"uv": [1, 3.5, 7, 3.75], "texture": "#texture"}, + "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}, + "up": {"uv": [1, 3.5, 7, 3.75], "texture": "#texture"}, + "down": {"uv": [0, 0, 6, 0.25], "texture": "#missing"} + } + }, + { + "from": [1, 10, 1], + "to": [15, 11, 15], + "faces": { + "north": {"uv": [0, 0, 7, 0.25], "texture": "#missing"}, + "east": {"uv": [0, 0, 7, 0.25], "texture": "#missing"}, + "south": {"uv": [0, 0, 7, 0.25], "texture": "#missing"}, + "west": {"uv": [0, 0, 7, 0.25], "texture": "#missing"}, + "up": {"uv": [0.5, 8.25, 7.5, 11.75], "rotation": 180, "texture": "#texture"}, + "down": {"uv": [8.5, 8.25, 15.5, 11.75], "texture": "#texture"} + } + }, + { + "from": [1, 1, 15], + "to": [15, 11, 16], + "faces": { + "north": {"uv": [8.5, 9, 15.5, 11.5], "texture": "#texture"}, + "east": {"uv": [0, 0, 0.5, 2.5], "texture": "#missing"}, + "south": {"uv": [8.5, 1.25, 15.5, 3.75], "texture": "#texture"}, + "west": {"uv": [0, 0, 0.5, 2.5], "texture": "#missing"}, + "up": {"uv": [0.5, 8, 7.5, 8.25], "texture": "#texture"}, + "down": {"uv": [0, 0, 7, 0.25], "texture": "#missing"} + } + }, + { + "from": [3, 1, 3], + "to": [13, 2, 13], + "faces": { + "north": {"uv": [10.5, 13, 16, 13.25], "texture": "#texture"}, + "east": {"uv": [10.5, 13, 16, 13.25], "texture": "#texture"}, + "south": {"uv": [10.5, 13, 16, 13.25], "texture": "#texture"}, + "west": {"uv": [10.5, 13, 16, 13.25], "texture": "#texture"}, + "up": {"uv": [10.5, 13, 16, 15.75], "texture": "#texture"}, + "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_idle.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_idle.json new file mode 100644 index 000000000..23709f312 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_idle.json @@ -0,0 +1,274 @@ +{ + "parent": "block/block", + "texture_size": [32, 64], + "textures": { + "particle": "overdrive_that_matters:block/matter_replicator_offline", + "texture": "overdrive_that_matters:block/matter_replicator_offline" + }, + "elements": [ + { + "name": "body", + "from": [15, 0, 0], + "to": [16, 11, 16], + "faces": { + "north": {"uv": [0, 1.25, 0.5, 4], "texture": "#texture"}, + "east": {"uv": [0, 5.25, 8, 8], "texture": "#texture"}, + "south": {"uv": [15.5, 1.25, 16, 4], "texture": "#texture"}, + "west": {"uv": [8, 9, 16, 11.75], "texture": "#texture"}, + "up": {"uv": [0, 8, 0.5, 12], "rotation": 180, "texture": "#texture"}, + "down": {"uv": [8, 8, 8.5, 12], "texture": "#texture"} + } + }, + { + "name": "body", + "from": [0, 0, 0], + "to": [1, 11, 16], + "faces": { + "north": {"uv": [7.5, 1.25, 8, 4], "texture": "#texture"}, + "east": {"uv": [8, 9, 16, 11.75], "texture": "#texture"}, + "south": {"uv": [8, 1.25, 8.5, 4], "texture": "#texture"}, + "west": {"uv": [8, 5.25, 16, 8], "texture": "#texture"}, + "up": {"uv": [7.5, 8, 8, 12], "rotation": 180, "texture": "#texture"}, + "down": {"uv": [15.5, 8, 16, 12], "texture": "#texture"} + } + }, + { + "name": "controlpanel", + "from": [0, 11, 1], + "to": [8, 16, 6], + "faces": { + "north": {"uv": [4, 13.25, 8, 14.5], "texture": "#texture"}, + "east": {"uv": [0, 0, 5, 5], "texture": "#missing"}, + "south": {"uv": [4, 12, 8, 13.25], "texture": "#texture"}, + "west": {"uv": [8.5, 4, 11, 5.25], "texture": "#texture"}, + "up": {"uv": [4, 12, 8, 13.25], "texture": "#texture"}, + "down": {"uv": [0, 0, 8, 5], "texture": "#missing"} + } + }, + { + "name": "computer", + "from": [8, 11, 0], + "to": [16, 16, 6], + "faces": { + "north": {"uv": [0, 0, 4, 1.25], "texture": "#texture"}, + "east": {"uv": [5, 4, 8, 5.25], "texture": "#texture"}, + "south": {"uv": [0, 12.25, 4, 13.5], "texture": "#texture"}, + "west": {"uv": [0, 12, 4, 13.5], "texture": "#texture"}, + "up": {"uv": [0, 12, 4, 13.5], "texture": "#texture"}, + "down": {"uv": [0, 0, 8, 6], "texture": "#missing"} + } + }, + { + "name": "canister", + "from": [3, 11, 11], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [10, 12, 16, 13], "rotation": 180, "texture": "#texture"}, + "east": {"uv": [8, 12, 10, 13], "texture": "#texture"}, + "south": {"uv": [10, 12, 16, 13], "texture": "#texture"}, + "west": {"uv": [8, 12, 10, 13], "texture": "#texture"}, + "up": {"uv": [10, 12, 16, 13], "texture": "#texture"}, + "down": {"uv": [0, 0, 6, 1], "texture": "#missing"} + } + }, + { + "name": "canister", + "from": [3, 11, 6], + "to": [15, 15, 10], + "faces": { + "north": {"uv": [0, 0, 6, 1], "texture": "#missing"}, + "east": {"uv": [8, 12, 10, 13], "texture": "#texture"}, + "south": {"uv": [10, 12, 16, 13], "texture": "#texture"}, + "west": {"uv": [8, 12, 10, 13], "texture": "#texture"}, + "up": {"uv": [10, 12, 16, 13], "texture": "#texture"}, + "down": {"uv": [0, 0, 6, 1], "texture": "#missing"} + } + }, + { + "name": "pipe", + "from": [1, 11, 7], + "to": [3, 14, 9], + "faces": { + "north": {"uv": [0, 14, 1, 14.75], "texture": "#texture"}, + "east": {"uv": [0, 0, 1, 0.75], "texture": "#missing"}, + "south": {"uv": [0, 14, 1, 14.75], "texture": "#texture"}, + "west": {"uv": [0, 14, 1, 14.75], "texture": "#texture"}, + "up": {"uv": [0, 13.5, 1, 14], "texture": "#texture"}, + "down": {"uv": [0, 0, 1, 0.5], "texture": "#missing"} + } + }, + { + "name": "pipe", + "from": [1, 11, 12], + "to": [3, 14, 14], + "faces": { + "north": {"uv": [0, 14, 1, 14.75], "texture": "#texture"}, + "east": {"uv": [0, 0, 1, 0.75], "texture": "#missing"}, + "south": {"uv": [0, 14, 1, 14.75], "texture": "#texture"}, + "west": {"uv": [0, 14, 1, 14.75], "texture": "#texture"}, + "up": {"uv": [0, 13.5, 1, 14], "texture": "#texture"}, + "down": {"uv": [0, 0, 1, 0.5], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [0, 11, 15], + "to": [0, 16, 16], + "faces": { + "north": {"uv": [0, 0, 0, 5], "texture": "#missing"}, + "east": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, + "south": {"uv": [0, 0, 0, 5], "texture": "#missing"}, + "west": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, + "up": {"uv": [0, 0, 0, 1], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 1], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [16, 11, 15], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 0, 5], "texture": "#missing"}, + "east": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, + "south": {"uv": [0, 0, 0, 5], "texture": "#missing"}, + "west": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, + "up": {"uv": [0, 0, 0, 1], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 1], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [16, 15, 6], + "to": [16, 16, 15], + "faces": { + "north": {"uv": [0, 0, 0, 1], "texture": "#missing"}, + "east": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, + "south": {"uv": [0, 0, 0, 1], "texture": "#missing"}, + "west": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, + "up": {"uv": [0, 0, 0, 9], "texture": "#missing"}, + "down": {"uv": [0, 0, 0, 9], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [0, 15, 6], + "to": [0, 16, 15], + "faces": { + "north": {"uv": [0, 0, 0, 1], "texture": "#missing"}, + "east": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, + "south": {"uv": [0, 0, 0, 1], "texture": "#missing"}, + "west": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, + "up": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, + "down": {"uv": [0, 0, 0, 9], "texture": "#missing"} + } + }, + { + "from": [1, 0, 0], + "to": [15, 1, 16], + "faces": { + "north": {"uv": [0.5, 3.75, 7.5, 4], "texture": "#texture"}, + "east": {"uv": [0, 0, 8, 0.25], "texture": "#missing"}, + "south": {"uv": [8.5, 3.75, 15.5, 4], "texture": "#texture"}, + "west": {"uv": [0, 0, 8, 0.25], "texture": "#missing"}, + "up": {"uv": [0.5, 8, 7.5, 12], "rotation": 180, "texture": "#texture"}, + "down": {"uv": [8.5, 8, 15.5, 12], "texture": "#texture"} + } + }, + { + "from": [8, 7, 0], + "to": [15, 11, 1], + "faces": { + "north": {"uv": [0.5, 1.25, 4, 2.25], "texture": "#texture"}, + "east": {"uv": [0, 0, 0.5, 0.75], "texture": "#missing"}, + "south": {"uv": [0, 0, 3.5, 1], "texture": "#texture"}, + "west": {"uv": [3.5, 1.25, 4, 2], "texture": "#texture"}, + "up": {"uv": [0, 0, 3.5, 0.25], "texture": "#missing"}, + "down": {"uv": [0.5, 2, 4, 2.25], "texture": "#texture"} + } + }, + { + "from": [1, 9, 0], + "to": [8, 11, 1], + "faces": { + "north": {"uv": [4, 1.25, 7.5, 1.75], "texture": "#texture"}, + "east": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, + "south": {"uv": [4, 1.25, 7, 1.75], "texture": "#texture"}, + "west": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, + "up": {"uv": [4, 11.75, 7.5, 12], "texture": "#texture"}, + "down": {"uv": [1.5, 3.5, 5, 3.75], "texture": "#texture"} + } + }, + { + "from": [1, 1, 0], + "to": [2, 9, 1], + "faces": { + "north": {"uv": [7, 1.75, 7.5, 3.75], "texture": "#texture"}, + "east": {"uv": [7, 1.75, 7.5, 3.75], "texture": "#texture"}, + "south": {"uv": [7, 1.75, 7.5, 3.75], "texture": "#texture"}, + "west": {"uv": [0, 0, 0.5, 2], "texture": "#missing"}, + "up": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}, + "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"} + } + }, + { + "from": [14, 1, 0], + "to": [15, 7, 1], + "faces": { + "north": {"uv": [0.5, 2.25, 1, 3.75], "texture": "#texture"}, + "east": {"uv": [0, 0, 0.5, 1.75], "texture": "#missing"}, + "south": {"uv": [0.5, 2.25, 1, 3.75], "texture": "#texture"}, + "west": {"uv": [0.5, 2.25, 1, 3.75], "texture": "#texture"}, + "up": {"uv": [0.5, 3.25, 1, 3.5], "texture": "#texture"}, + "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"} + } + }, + { + "from": [2, 1, 0], + "to": [14, 2, 1], + "faces": { + "north": {"uv": [1, 3.5, 7, 3.75], "texture": "#texture"}, + "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}, + "south": {"uv": [1, 3.5, 7, 3.75], "texture": "#texture"}, + "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}, + "up": {"uv": [1, 3.5, 7, 3.75], "texture": "#texture"}, + "down": {"uv": [0, 0, 6, 0.25], "texture": "#missing"} + } + }, + { + "from": [1, 10, 1], + "to": [15, 11, 15], + "faces": { + "north": {"uv": [0, 0, 7, 0.25], "texture": "#missing"}, + "east": {"uv": [0, 0, 7, 0.25], "texture": "#missing"}, + "south": {"uv": [0, 0, 7, 0.25], "texture": "#missing"}, + "west": {"uv": [0, 0, 7, 0.25], "texture": "#missing"}, + "up": {"uv": [0.5, 8.25, 7.5, 11.75], "rotation": 180, "texture": "#texture"}, + "down": {"uv": [8.5, 8.25, 15.5, 11.75], "texture": "#texture"} + } + }, + { + "from": [1, 1, 15], + "to": [15, 11, 16], + "faces": { + "north": {"uv": [8.5, 9, 15.5, 11.5], "texture": "#texture"}, + "east": {"uv": [0, 0, 0.5, 2.5], "texture": "#missing"}, + "south": {"uv": [8.5, 1.25, 15.5, 3.75], "texture": "#texture"}, + "west": {"uv": [0, 0, 0.5, 2.5], "texture": "#missing"}, + "up": {"uv": [0.5, 8, 7.5, 8.25], "texture": "#texture"}, + "down": {"uv": [0, 0, 7, 0.25], "texture": "#missing"} + } + }, + { + "from": [3, 1, 3], + "to": [13, 2, 13], + "faces": { + "north": {"uv": [10.5, 13, 16, 13.25], "texture": "#texture"}, + "east": {"uv": [10.5, 13, 16, 13.25], "texture": "#texture"}, + "south": {"uv": [10.5, 13, 16, 13.25], "texture": "#texture"}, + "west": {"uv": [10.5, 13, 16, 13.25], "texture": "#texture"}, + "up": {"uv": [10.5, 13, 16, 15.75], "texture": "#texture"}, + "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_working.json similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator.json rename to src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_working.json diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_scanner_error.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_scanner_error.json new file mode 100644 index 000000000..7b92c11ee --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_scanner_error.json @@ -0,0 +1,227 @@ +{ + "parent": "block/block", + "texture_size": [32, 64], + "textures": { + "texture": "overdrive_that_matters:block/matter_scanner_halted", + "particle": "overdrive_that_matters:block/matter_scanner_halted" + }, + "elements": [ + { + "name": "platform", + "from": [0, 4, 0], + "to": [16, 8, 16], + "faces": { + "north": {"uv": [0, 4, 8, 5], "texture": "#texture"}, + "east": {"uv": [0, 4, 8, 5], "texture": "#texture"}, + "south": {"uv": [0, 4, 8, 5], "texture": "#texture"}, + "west": {"uv": [0, 4, 8, 5], "texture": "#texture"}, + "up": {"uv": [0, 0, 8, 4], "texture": "#texture"}, + "down": {"uv": [0, 5, 8, 9], "texture": "#texture"} + } + }, + { + "name": "base", + "from": [0, 0, 0], + "to": [16, 2, 16], + "faces": { + "north": {"uv": [0, 9, 8, 9.5], "texture": "#texture"}, + "east": {"uv": [0, 9, 8, 9.5], "texture": "#texture"}, + "south": {"uv": [0, 9, 8, 9.5], "texture": "#texture"}, + "west": {"uv": [0, 9, 8, 9.5], "texture": "#texture"}, + "up": {"uv": [8, 5, 16, 9], "texture": "#texture"}, + "down": {"uv": [0, 9.5, 8, 13.5], "texture": "#texture"} + } + }, + { + "name": "pane", + "from": [1, 2, 1], + "to": [15, 4, 15], + "faces": { + "north": {"uv": [8.5, 4.5, 15.5, 5], "texture": "#texture"}, + "east": {"uv": [8.5, 4.5, 15.5, 5], "texture": "#texture"}, + "south": {"uv": [8.5, 4.5, 15.5, 5], "texture": "#texture"}, + "west": {"uv": [8.5, 4.5, 15.5, 5], "texture": "#texture"}, + "up": {"uv": [0, 0, 14, 14], "texture": "#missing"}, + "down": {"uv": [0, 0, 14, 14], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [0, 14, 1], + "to": [1, 15, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "east": {"uv": [11, 0, 11.5, 3.5], "rotation": 90, "texture": "#texture"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [11, 0, 11.5, 3.5], "rotation": 90, "texture": "#texture"}, + "up": {"uv": [11, 0, 11.5, 3.5], "texture": "#texture"}, + "down": {"uv": [11, 0, 11.5, 3.5], "texture": "#texture"} + } + }, + { + "name": "frame", + "from": [15, 8, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "east": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "south": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "west": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "up": {"uv": [10, 0.5, 10.5, 0.75], "texture": "#texture"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [0, 8, 0], + "to": [1, 16, 1], + "faces": { + "north": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "east": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "south": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "west": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "up": {"uv": [10, 0.5, 10.5, 0.75], "texture": "#texture"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [0, 8, 15], + "to": [1, 16, 16], + "faces": { + "north": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "east": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "south": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "west": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "up": {"uv": [10, 0.5, 10.5, 0.75], "texture": "#texture"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [15, 8, 15], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "east": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "south": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "west": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "up": {"uv": [10, 0.5, 10.5, 0.75], "texture": "#texture"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [15, 14, 1], + "to": [16, 15, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "east": {"uv": [11, 0, 11.5, 3.5], "rotation": 90, "texture": "#texture"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [11, 0, 11.5, 3.5], "rotation": 90, "texture": "#texture"}, + "up": {"uv": [11, 0, 11.5, 3.5], "texture": "#texture"}, + "down": {"uv": [11, 0, 11.5, 3.5], "texture": "#texture"} + } + }, + { + "name": "panel", + "from": [10, 5, -4], + "to": [14, 9, -3], + "rotation": {"angle": 22.5, "axis": "x", "origin": [0, 0, 0]}, + "faces": { + "north": {"uv": [8, 0, 10, 1], "texture": "#texture"}, + "east": {"uv": [8, 1, 10, 1.25], "rotation": 90, "texture": "#texture"}, + "south": {"uv": [8, 1.25, 10, 2.25], "texture": "#texture"}, + "west": {"uv": [8, 1, 10, 1.25], "rotation": 270, "texture": "#texture"}, + "up": {"uv": [8, 1, 10, 1.25], "texture": "#texture"}, + "down": {"uv": [8, 1, 10, 1.25], "rotation": 180, "texture": "#texture"} + } + }, + { + "name": "railholder", + "from": [0, 13, 11], + "to": [2, 14, 13], + "faces": { + "north": {"uv": [8, 9.75, 9, 10], "texture": "#texture"}, + "east": {"uv": [8, 9.75, 9, 10], "texture": "#texture"}, + "south": {"uv": [8, 9.75, 9, 10], "texture": "#texture"}, + "west": {"uv": [8, 10, 9, 10.25], "texture": "#texture"}, + "up": {"uv": [8, 9, 9, 9.5], "texture": "#texture"}, + "down": {"uv": [8, 10, 9, 10.5], "texture": "#texture"} + } + }, + { + "name": "railholder", + "from": [1, 14, 11], + "to": [2, 15, 13], + "faces": { + "north": {"uv": [8, 9.25, 8.5, 9.5], "texture": "#texture"}, + "east": {"uv": [8, 9.5, 9, 9.75], "texture": "#texture"}, + "south": {"uv": [8, 9.5, 8.5, 9.75], "texture": "#texture"}, + "west": {"uv": [8, 9.5, 9, 9.75], "texture": "#texture"}, + "up": {"uv": [8, 9, 9, 9.25], "texture": "#texture"}, + "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"} + } + }, + { + "name": "railholder", + "from": [14, 14, 11], + "to": [15, 15, 13], + "faces": { + "north": {"uv": [8, 9.25, 8.5, 9.5], "texture": "#texture"}, + "east": {"uv": [8, 9.25, 9, 9.5], "texture": "#texture"}, + "south": {"uv": [8, 9.5, 8.5, 9.75], "texture": "#texture"}, + "west": {"uv": [8, 9.5, 9, 9.75], "texture": "#texture"}, + "up": {"uv": [8, 9, 9, 9.25], "texture": "#texture"}, + "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"} + } + }, + { + "name": "railholder", + "from": [14, 13, 11], + "to": [16, 14, 13], + "faces": { + "north": {"uv": [8, 9.75, 9, 10], "texture": "#texture"}, + "east": {"uv": [8, 9.75, 9, 10], "texture": "#texture"}, + "south": {"uv": [8, 9.75, 9, 10], "texture": "#texture"}, + "west": {"uv": [8, 10, 9, 10.25], "texture": "#texture"}, + "up": {"uv": [8, 9, 9, 9.5], "texture": "#texture"}, + "down": {"uv": [8, 10, 9, 10.5], "texture": "#texture"} + } + }, + { + "name": "rail", + "from": [2, 14, 11], + "to": [14, 14, 13], + "faces": { + "north": {"uv": [0, 0, 12, 0], "texture": "#missing"}, + "east": {"uv": [0, 0, 2, 0], "texture": "#missing"}, + "south": {"uv": [0, 0, 12, 0], "texture": "#missing"}, + "west": {"uv": [0, 0, 2, 0], "texture": "#missing"}, + "up": {"uv": [10, 9, 16, 9.5], "texture": "#texture"}, + "down": {"uv": [10, 9, 16, 9.5], "texture": "#texture"} + } + }, + { + "name": "scanner", + "from": [3, 13, 9], + "to": [6, 15, 14], + "faces": { + "north": {"uv": [8, 12.25, 9.5, 12.75], "texture": "#texture"}, + "east": {"uv": [9.5, 11, 10.5, 12.25], "rotation": 90, "texture": "#texture"}, + "south": {"uv": [8, 12.25, 9.5, 12.75], "texture": "#texture"}, + "west": {"uv": [9.5, 11, 10.5, 12.25], "rotation": 90, "texture": "#texture"}, + "up": {"uv": [8, 11, 9.5, 12.25], "texture": "#texture"}, + "down": {"uv": [10.5, 11, 12, 12.25], "texture": "#texture"} + } + } + ], + "groups": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + { + "name": "rail", + "origin": [0, 0, 0], + "color": 0, + "children": [10, 11, 12, 13, 14, 15] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_scanner_idle.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_scanner_idle.json new file mode 100644 index 000000000..6faf674ff --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_scanner_idle.json @@ -0,0 +1,227 @@ +{ + "parent": "block/block", + "texture_size": [32, 64], + "textures": { + "texture": "overdrive_that_matters:block/matter_scanner_offline", + "particle": "overdrive_that_matters:block/matter_scanner_offline" + }, + "elements": [ + { + "name": "platform", + "from": [0, 4, 0], + "to": [16, 8, 16], + "faces": { + "north": {"uv": [0, 4, 8, 5], "texture": "#texture"}, + "east": {"uv": [0, 4, 8, 5], "texture": "#texture"}, + "south": {"uv": [0, 4, 8, 5], "texture": "#texture"}, + "west": {"uv": [0, 4, 8, 5], "texture": "#texture"}, + "up": {"uv": [0, 0, 8, 4], "texture": "#texture"}, + "down": {"uv": [0, 5, 8, 9], "texture": "#texture"} + } + }, + { + "name": "base", + "from": [0, 0, 0], + "to": [16, 2, 16], + "faces": { + "north": {"uv": [0, 9, 8, 9.5], "texture": "#texture"}, + "east": {"uv": [0, 9, 8, 9.5], "texture": "#texture"}, + "south": {"uv": [0, 9, 8, 9.5], "texture": "#texture"}, + "west": {"uv": [0, 9, 8, 9.5], "texture": "#texture"}, + "up": {"uv": [8, 5, 16, 9], "texture": "#texture"}, + "down": {"uv": [0, 9.5, 8, 13.5], "texture": "#texture"} + } + }, + { + "name": "pane", + "from": [1, 2, 1], + "to": [15, 4, 15], + "faces": { + "north": {"uv": [8.5, 4.5, 15.5, 5], "texture": "#texture"}, + "east": {"uv": [8.5, 4.5, 15.5, 5], "texture": "#texture"}, + "south": {"uv": [8.5, 4.5, 15.5, 5], "texture": "#texture"}, + "west": {"uv": [8.5, 4.5, 15.5, 5], "texture": "#texture"}, + "up": {"uv": [0, 0, 14, 14], "texture": "#missing"}, + "down": {"uv": [0, 0, 14, 14], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [0, 14, 1], + "to": [1, 15, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "east": {"uv": [11, 0, 11.5, 3.5], "rotation": 90, "texture": "#texture"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [11, 0, 11.5, 3.5], "rotation": 90, "texture": "#texture"}, + "up": {"uv": [11, 0, 11.5, 3.5], "texture": "#texture"}, + "down": {"uv": [11, 0, 11.5, 3.5], "texture": "#texture"} + } + }, + { + "name": "frame", + "from": [15, 8, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "east": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "south": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "west": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "up": {"uv": [10, 0.5, 10.5, 0.75], "texture": "#texture"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [0, 8, 0], + "to": [1, 16, 1], + "faces": { + "north": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "east": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "south": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "west": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "up": {"uv": [10, 0.5, 10.5, 0.75], "texture": "#texture"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [0, 8, 15], + "to": [1, 16, 16], + "faces": { + "north": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "east": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "south": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "west": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "up": {"uv": [10, 0.5, 10.5, 0.75], "texture": "#texture"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [15, 8, 15], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "east": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "south": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "west": {"uv": [10, 0, 10.5, 2], "texture": "#texture"}, + "up": {"uv": [10, 0.5, 10.5, 0.75], "texture": "#texture"}, + "down": {"uv": [0, 0, 1, 1], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [15, 14, 1], + "to": [16, 15, 15], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "east": {"uv": [11, 0, 11.5, 3.5], "rotation": 90, "texture": "#texture"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "west": {"uv": [11, 0, 11.5, 3.5], "rotation": 90, "texture": "#texture"}, + "up": {"uv": [11, 0, 11.5, 3.5], "texture": "#texture"}, + "down": {"uv": [11, 0, 11.5, 3.5], "texture": "#texture"} + } + }, + { + "name": "panel", + "from": [10, 5, -4], + "to": [14, 9, -3], + "rotation": {"angle": 22.5, "axis": "x", "origin": [0, 0, 0]}, + "faces": { + "north": {"uv": [8, 0, 10, 1], "texture": "#texture"}, + "east": {"uv": [8, 1, 10, 1.25], "rotation": 90, "texture": "#texture"}, + "south": {"uv": [8, 1.25, 10, 2.25], "texture": "#texture"}, + "west": {"uv": [8, 1, 10, 1.25], "rotation": 270, "texture": "#texture"}, + "up": {"uv": [8, 1, 10, 1.25], "texture": "#texture"}, + "down": {"uv": [8, 1, 10, 1.25], "rotation": 180, "texture": "#texture"} + } + }, + { + "name": "railholder", + "from": [0, 13, 11], + "to": [2, 14, 13], + "faces": { + "north": {"uv": [8, 9.75, 9, 10], "texture": "#texture"}, + "east": {"uv": [8, 9.75, 9, 10], "texture": "#texture"}, + "south": {"uv": [8, 9.75, 9, 10], "texture": "#texture"}, + "west": {"uv": [8, 10, 9, 10.25], "texture": "#texture"}, + "up": {"uv": [8, 9, 9, 9.5], "texture": "#texture"}, + "down": {"uv": [8, 10, 9, 10.5], "texture": "#texture"} + } + }, + { + "name": "railholder", + "from": [1, 14, 11], + "to": [2, 15, 13], + "faces": { + "north": {"uv": [8, 9.25, 8.5, 9.5], "texture": "#texture"}, + "east": {"uv": [8, 9.5, 9, 9.75], "texture": "#texture"}, + "south": {"uv": [8, 9.5, 8.5, 9.75], "texture": "#texture"}, + "west": {"uv": [8, 9.5, 9, 9.75], "texture": "#texture"}, + "up": {"uv": [8, 9, 9, 9.25], "texture": "#texture"}, + "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"} + } + }, + { + "name": "railholder", + "from": [14, 14, 11], + "to": [15, 15, 13], + "faces": { + "north": {"uv": [8, 9.25, 8.5, 9.5], "texture": "#texture"}, + "east": {"uv": [8, 9.25, 9, 9.5], "texture": "#texture"}, + "south": {"uv": [8, 9.5, 8.5, 9.75], "texture": "#texture"}, + "west": {"uv": [8, 9.5, 9, 9.75], "texture": "#texture"}, + "up": {"uv": [8, 9, 9, 9.25], "texture": "#texture"}, + "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"} + } + }, + { + "name": "railholder", + "from": [14, 13, 11], + "to": [16, 14, 13], + "faces": { + "north": {"uv": [8, 9.75, 9, 10], "texture": "#texture"}, + "east": {"uv": [8, 9.75, 9, 10], "texture": "#texture"}, + "south": {"uv": [8, 9.75, 9, 10], "texture": "#texture"}, + "west": {"uv": [8, 10, 9, 10.25], "texture": "#texture"}, + "up": {"uv": [8, 9, 9, 9.5], "texture": "#texture"}, + "down": {"uv": [8, 10, 9, 10.5], "texture": "#texture"} + } + }, + { + "name": "rail", + "from": [2, 14, 11], + "to": [14, 14, 13], + "faces": { + "north": {"uv": [0, 0, 12, 0], "texture": "#missing"}, + "east": {"uv": [0, 0, 2, 0], "texture": "#missing"}, + "south": {"uv": [0, 0, 12, 0], "texture": "#missing"}, + "west": {"uv": [0, 0, 2, 0], "texture": "#missing"}, + "up": {"uv": [10, 9, 16, 9.5], "texture": "#texture"}, + "down": {"uv": [10, 9, 16, 9.5], "texture": "#texture"} + } + }, + { + "name": "scanner", + "from": [3, 13, 9], + "to": [6, 15, 14], + "faces": { + "north": {"uv": [8, 12.25, 9.5, 12.75], "texture": "#texture"}, + "east": {"uv": [9.5, 11, 10.5, 12.25], "rotation": 90, "texture": "#texture"}, + "south": {"uv": [8, 12.25, 9.5, 12.75], "texture": "#texture"}, + "west": {"uv": [9.5, 11, 10.5, 12.25], "rotation": 90, "texture": "#texture"}, + "up": {"uv": [8, 11, 9.5, 12.25], "texture": "#texture"}, + "down": {"uv": [10.5, 11, 12, 12.25], "texture": "#texture"} + } + } + ], + "groups": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + { + "name": "rail", + "origin": [0, 0, 0], + "color": 0, + "children": [10, 11, 12, 13, 14, 15] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_scanner.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_scanner_working.json similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/models/block/matter_scanner.json rename to src/main/resources/assets/overdrive_that_matters/models/block/matter_scanner_working.json diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/pattern_storage_pattern.json b/src/main/resources/assets/overdrive_that_matters/models/block/pattern_storage_pattern.json new file mode 100644 index 000000000..52099239b --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/pattern_storage_pattern.json @@ -0,0 +1,20 @@ +{ + "texture_size": [32, 32], + "textures": { + "texture": "overdrive_that_matters:item/pattern_drive_tier0" + }, + "elements": [ + { + "from": [15, 2, 2], + "to": [15.3, 14, 14], + "faces": { + "north": {"uv": [1, 1, 2, 15], "texture": "#texture"}, + "east": {"uv": [15, 1, 1, 15], "texture": "#texture"}, + "south": {"uv": [14, 1, 15, 15], "texture": "#texture"}, + "west": {"uv": [1, 1, 15, 15], "texture": "#texture"}, + "up": {"uv": [1, 1, 15, 2], "rotation": 90, "texture": "#texture"}, + "down": {"uv": [1, 14, 15, 15], "texture": "#texture"} + } + } + ], +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/matter_panel.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/matter_panel.png index c32d1892d6e14ef5ec8e5660bbf53acb831ba0aa..89198eb62deb9fac6d5833484e247ccffe05811b 100644 GIT binary patch delta 2321 zcmb_dc~lek7M^SclAsWRYzBtN5>OUViy}*apa}>>7J;(AkU#`NNFs~S%&>!kpkt+I z%ciZg)&)dGL=7s4QWV6hd5G{1JP{N`Q9%@V1KRU?dfq>M@BQX?&Ufy2zx(~}+?hF( z8(E}RrU&5w0Equ3H~;`JIYM`LF2~&+0p6xpwLctV&3)B>sb-i1YKl($Jmv zclVxXm>G!kvASq>KknKp!JS(q8{+bl|CH`Y&2@j;P)Tvto=6_fzBcV?@ATrLyfG0#;O3@ zsgV8`gdH6RjtA`srIt6n*!uHK-`5KVo5;y0qxSHM1J}p~N@sHh`kP0y=KcKq@ne;a zFHe%jE)1S{mR?m*IlT+ty0z&{=lpLtUAfNX;0M<}bT?pP%lTc8@~6DxGCD^0O?bIh zWXbd+e20$+YToMWk9b|4dm+tK;f(HlO-z~gsouOwNeX<@&sFwS#eSSG%)~`gB-L*; z90$+`qs`qG;DO@8!ouFYd)wRF0|Nu??d?&>R|C> z$jgM zib+b9(h)n5uJcK|gD;T^lSGU9wYJuF>*+``sErhXw3x+q7MEjMqS)Kpfi0BEk|gQQ zztd*(?8r?rWjI(wctYr6M*9^AXfQwMKKnU3FRqhu-y7O&Gs-nSxXw#oeL9e z#6S`er1`Gc9LR8jUduF;phzra>)o zgbNVR-86487*R22m(HPrYQ$>TbnYmy+~MLaF}87-9(TMjboIJQz@n)z<-KS;_aAuZ zySH_a<15j4F=KG%>FfnPi_vZH3Hy=q4R10)C1w-NH$!7pUh$#aC$#PG>Y$$W`32`_ zyReUYO=ORsY^Z2CmIDmi6Q1JPmTK?t?DjU>M5L}+8i)*cTy(!$BtdX zhK(4yoTk9Yx9pp}hBw&8M@?%;TRF_z@~#0D#1k{`ynkQcB{QTvfFg#@<0Jy@Y9ZM| zaSWJB%A%puoO#1#KInd#RfJD4sv>si&pO$b!ja6YD*0N~raG>hJsy8m@e0pw^=Rx& zjW;izS;3gfoSMcoq_me|%al`{iv_iSN#p5*nVys=UI^o=`tz{eyKN`yVR`K4 zX*<7rn=zarIdnz`REqa{Vm1~P$sEUBi>Y>BQN~hN;+sG!e&*dbiO&6@;Jd3Osgm;n z2Xo}he`SCzlhJWL@TD=+Q#Av)qeS*Ce8TDG2-}KK_@%w};K;;StUrk@?+&4Y;{`tJ zFmj;;Qx7Fd%z~+KE*Bqs6aJ?@sdzR|SG9_yD8bP#q=VHt{i z;C?@uSPh{2p$nnWvL(>WrU+}Y^s?4n(nE)Q`gO!{p7r-c z0+o#J~K z{Wn(7U%SPE113Fz3RUzwf3#w9%s49iO>#j^4!oyBmm z)WC+)+Z%ARp;2~nYdtY`GE_i0HCMOtc@9^5X{=9oLe=mnKJ25y@$cm|mZ#Ko$2z&% zL9<5VC|o(~d8&W68w2QBLxtm35Si;q1n_VkR-?-eQz)nbSZBFFZOH$arvKahcJn;p Y(z+``?t9f5^cM+l(EzstV(Vg93A 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