From 752a3aeaeafa24a8a890d9c62f81819e746a6a90 Mon Sep 17 00:00:00 2001 From: GearShocky Date: Wed, 29 Dec 2021 02:23:00 +0600 Subject: [PATCH] Chemical generator model complete; Fixed pattern monitor displaying incorrectly when placed on the ceiling; Fixed z-fighting on some models with decorative frames by giving them 0.5 pixel width; Changed framed carbon fibre block texture to one without frame for the time being; Fixed that one UV mistake i made on drive viewer model; Fixed a typo i made in drive rack's model that caused it's particles to display incorrectly. --- .../blockstates/chemical_generator.json | 121 ++++++++ .../blockstates/energy_counter.json | 45 +++ .../blockstates/matter_panel.json | 2 +- .../models/block/chemical_generator_idle.json | 262 +++++++++++++++++ .../block/chemical_generator_working.json | 262 +++++++++++++++++ .../models/block/drive_rack.json | 2 +- .../models/block/drive_viewer_idle.json | 26 +- .../models/block/drive_viewer_working.json | 26 +- .../models/block/matter_bottler_error.json | 47 ++- .../models/block/matter_bottler_idle.json | 47 ++- .../models/block/matter_bottler_working.json | 47 ++- .../models/block/matter_replicator.json | 275 ++++++++++++++++++ .../block/matter_replicator_working.json | 26 +- .../models/block/matter_scanner_error.json | 6 +- .../models/block/matter_scanner_idle.json | 6 +- .../models/block/matter_scanner_working.json | 6 +- .../models/item/chemical_generator.json | 3 + .../textures/block/chemical_generator.png | Bin 0 -> 455 bytes .../block/decorative/carbon_fibre_block.png | Bin 192 -> 150 bytes 19 files changed, 1069 insertions(+), 140 deletions(-) create mode 100644 src/main/resources/assets/overdrive_that_matters/blockstates/chemical_generator.json create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/chemical_generator_idle.json create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/chemical_generator_working.json create mode 100644 src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator.json create mode 100644 src/main/resources/assets/overdrive_that_matters/models/item/chemical_generator.json create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/block/chemical_generator.png diff --git a/src/main/resources/assets/overdrive_that_matters/blockstates/chemical_generator.json b/src/main/resources/assets/overdrive_that_matters/blockstates/chemical_generator.json new file mode 100644 index 000000000..f3b481528 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/blockstates/chemical_generator.json @@ -0,0 +1,121 @@ +{ + "multipart": [ + { + "when": { + "facing": "north", + "worker": "idle" + }, + "apply": { + "model": "overdrive_that_matters:block/chemical_generator_idle" + } + }, + { + "when": { + "facing": "north", + "worker": "working" + }, + "apply": { + "model": "overdrive_that_matters:block/chemical_generator_working" + } + }, + { + "when": { + "facing": "north", + "worker": "error" + }, + "apply": { + "model": "overdrive_that_matters:block/chemical_generator_error" + } + }, + { + "when": { + "facing": "south", + "worker": "idle" + }, + "apply": { + "model": "overdrive_that_matters:block/chemical_generator_idle", + "y": 180 + } + }, + { + "when": { + "facing": "south", + "worker": "working" + }, + "apply": { + "model": "overdrive_that_matters:block/chemical_generator_working", + "y": 180 + } + }, + { + "when": { + "facing": "south", + "worker": "error" + }, + "apply": { + "model": "overdrive_that_matters:block/chemical_generator_error", + "y": 180 + } + }, + { + "when": { + "facing": "west", + "worker": "idle" + }, + "apply": { + "model": "overdrive_that_matters:block/chemical_generator_idle", + "y": 270 + } + }, + { + "when": { + "facing": "west", + "worker": "working" + }, + "apply": { + "model": "overdrive_that_matters:block/chemical_generator_working", + "y": 270 + } + }, + { + "when": { + "facing": "west", + "worker": "error" + }, + "apply": { + "model": "overdrive_that_matters:block/chemical_generator_error", + "y": 270 + } + }, + { + "when": { + "facing": "east", + "worker": "idle" + }, + "apply": { + "model": "overdrive_that_matters:block/chemical_generator_idle", + "y": 90 + } + }, + { + "when": { + "facing": "east", + "worker": "working" + }, + "apply": { + "model": "overdrive_that_matters:block/chemical_generator_working", + "y": 90 + } + }, + { + "when": { + "facing": "east", + "worker": "error" + }, + "apply": { + "model": "overdrive_that_matters:block/chemical_generator_error", + "y": 90 + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/blockstates/energy_counter.json b/src/main/resources/assets/overdrive_that_matters/blockstates/energy_counter.json index 5bb27f8bc..5615b33fe 100644 --- a/src/main/resources/assets/overdrive_that_matters/blockstates/energy_counter.json +++ b/src/main/resources/assets/overdrive_that_matters/blockstates/energy_counter.json @@ -39,6 +39,7 @@ "y": 90 } }, + { "when": { "if": "north", @@ -77,6 +78,50 @@ "model": "overdrive_that_matters:block/energy_counter_up", "y": 90 } + }, + + { + "when": { + "if": "up", + "input": "south" + }, + "apply": { + "model": "overdrive_that_matters:block/energy_counter_up", + "x": 90 + } + }, + { + "when": { + "if": "down", + "input": "south" + }, + "apply": { + "model": "overdrive_that_matters:block/energy_counter_up", + "y": 180, + "x": 270 + } + }, + { + "when": { + "if": "west", + "input": "south" + }, + "apply": { + "model": "overdrive_that_matters:block/energy_counter_up", + "y": 270, + "x": 90 + } + }, + { + "when": { + "if": "east", + "input": "south" + }, + "apply": { + "model": "overdrive_that_matters:block/energy_counter_up", + "y": 270, + "x": 90 + } } ] } \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/blockstates/matter_panel.json b/src/main/resources/assets/overdrive_that_matters/blockstates/matter_panel.json index 91d2d79bd..781d76141 100644 --- a/src/main/resources/assets/overdrive_that_matters/blockstates/matter_panel.json +++ b/src/main/resources/assets/overdrive_that_matters/blockstates/matter_panel.json @@ -9,7 +9,7 @@ }, "facing=down": { "model": "overdrive_that_matters:block/matter_panel", - "x": 180 + "x": 270 }, "facing=west": { "model": "overdrive_that_matters:block/matter_panel", diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/chemical_generator_idle.json b/src/main/resources/assets/overdrive_that_matters/models/block/chemical_generator_idle.json new file mode 100644 index 000000000..1864f2bb0 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/chemical_generator_idle.json @@ -0,0 +1,262 @@ +{ + "parent": "block/block", + "textures": { + "0": "overdrive_that_matters:block/chemical_generator", + "particle": "overdrive_that_matters:block/chemical_generator" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 2, 2], + "faces": { + "north": {"uv": [0, 7, 4, 8], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 1], "texture": "#0"}, + "south": {"uv": [0, 7.5, 4, 8], "texture": "#0"}, + "west": {"uv": [0, 0, 0.25, 1], "texture": "#0"}, + "up": {"uv": [0, 7, 4, 7.5], "texture": "#0"}, + "down": {"uv": [0, 7.5, 4, 8], "texture": "#0"} + } + }, + { + "from": [3, 1, 2], + "to": [5, 2, 14], + "faces": { + "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}, + "east": {"uv": [1, 6, 4, 6.5], "texture": "#0"}, + "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}, + "west": {"uv": [1, 6, 4, 6.5], "texture": "#0"}, + "up": {"uv": [1, 6, 4, 7], "rotation": 90, "texture": "#0"}, + "down": {"uv": [1, 6, 4, 7], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [11, 1, 2], + "to": [13, 2, 14], + "faces": { + "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}, + "east": {"uv": [1, 6, 4, 6.5], "texture": "#0"}, + "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}, + "west": {"uv": [1, 6, 4, 6.5], "texture": "#0"}, + "up": {"uv": [1, 6, 4, 7], "rotation": 90, "texture": "#0"}, + "down": {"uv": [1, 6, 4, 7], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [0, 0, 14], + "to": [16, 2, 16], + "faces": { + "north": {"uv": [0, 7.5, 4, 8], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 1], "texture": "#0"}, + "south": {"uv": [0, 7, 4, 8], "texture": "#0"}, + "west": {"uv": [0, 0, 0.25, 1], "texture": "#0"}, + "up": {"uv": [0, 7, 4, 7.5], "texture": "#0"}, + "down": {"uv": [0, 7.5, 4, 8], "texture": "#0"} + } + }, + { + "from": [14, 2, 14], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0.75, 0, 1, 7], "texture": "#0"}, + "east": {"uv": [0.5, 0, 1, 7], "texture": "#0"}, + "south": {"uv": [0.5, 0, 0, 7], "texture": "#0"}, + "west": {"uv": [0.25, 0, 0.5, 7], "texture": "#0"}, + "up": {"uv": [0.5, 0, 0, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"} + } + }, + { + "from": [14, 14, 2], + "to": [16, 16, 14], + "faces": { + "north": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, + "east": {"uv": [0.5, 8, 3.5, 7], "texture": "#0"}, + "south": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, + "west": {"uv": [0.5, 7, 3.5, 7.5], "texture": "#0"}, + "up": {"uv": [4.5, 1, 4, 7], "texture": "#0"}, + "down": {"uv": [1, 1, 0.75, 7], "texture": "#0"} + } + }, + { + "from": [14, 2, 0], + "to": [16, 16, 2], + "faces": { + "north": {"uv": [0, 0, 0.5, 7], "texture": "#0"}, + "east": {"uv": [1, 0, 0.5, 7], "texture": "#0"}, + "south": {"uv": [0.75, 0, 1, 7], "texture": "#0"}, + "west": {"uv": [4.25, 0, 4.5, 7], "texture": "#0"}, + "up": {"uv": [0.5, 0, 0, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"} + } + }, + { + "from": [0, 2, 14], + "to": [2, 16, 16], + "faces": { + "north": {"uv": [0.75, 0, 1, 7], "texture": "#0"}, + "east": {"uv": [4.25, 0, 4.5, 7], "texture": "#0"}, + "south": {"uv": [0, 0, 0.5, 7], "texture": "#0"}, + "west": {"uv": [1, 0, 0.5, 7], "texture": "#0"}, + "up": {"uv": [0, 0, 0.5, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"} + } + }, + { + "from": [0, 14, 2], + "to": [2, 16, 14], + "faces": { + "north": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, + "east": {"uv": [0.5, 7, 3.5, 7.5], "texture": "#0"}, + "south": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, + "west": {"uv": [0.5, 7, 3.5, 8], "rotation": 180, "texture": "#0"}, + "up": {"uv": [0, 1, 0.5, 7], "texture": "#0"}, + "down": {"uv": [0.75, 1, 1, 7], "texture": "#0"} + } + }, + { + "from": [2, 5, 1], + "to": [14, 7, 2], + "faces": { + "north": {"uv": [1, 6, 4, 7], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 0.5], "texture": "#missing"}, + "south": {"uv": [1, 6, 4, 7], "texture": "#0"}, + "west": {"uv": [0, 0, 0.25, 0.5], "texture": "#missing"}, + "up": {"uv": [1, 6, 4, 6.5], "texture": "#0"}, + "down": {"uv": [1, 6, 4, 6.5], "texture": "#0"} + } + }, + { + "from": [2, 5, 14], + "to": [14, 7, 15], + "faces": { + "north": {"uv": [1, 6, 4, 7], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 0.5], "texture": "#missing"}, + "south": {"uv": [1, 6, 4, 7], "texture": "#0"}, + "west": {"uv": [0, 0, 0.25, 0.5], "texture": "#missing"}, + "up": {"uv": [1, 6, 4, 6.5], "texture": "#0"}, + "down": {"uv": [1, 6, 4, 6.5], "texture": "#0"} + } + }, + { + "from": [1, 8, 2], + "to": [2, 10, 14], + "faces": { + "north": {"uv": [0, 0, 0.25, 0.5], "texture": "#missing"}, + "east": {"uv": [0, 0, 3, 0.5], "texture": "#missing"}, + "south": {"uv": [0, 0, 0.25, 0.5], "texture": "#missing"}, + "west": {"uv": [1, 6, 4, 7], "texture": "#0"}, + "up": {"uv": [1, 6, 4, 6.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [1, 6, 4, 6.5], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [14, 8, 2], + "to": [15, 10, 14], + "faces": { + "north": {"uv": [0, 0, 0.25, 0.5], "texture": "#missing"}, + "east": {"uv": [1, 6, 4, 7], "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 0.5], "texture": "#missing"}, + "west": {"uv": [0, 0, 3, 0.5], "texture": "#missing"}, + "up": {"uv": [1, 6, 4, 6.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [1, 6, 4, 6.5], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [0, 2, 0], + "to": [2, 16, 2], + "faces": { + "north": {"uv": [0.5, 0, 0, 7], "texture": "#0"}, + "east": {"uv": [4.25, 0, 4.5, 7], "texture": "#0"}, + "south": {"uv": [0.75, 0, 1, 7], "texture": "#0"}, + "west": {"uv": [0.5, 0, 1, 7], "texture": "#0"}, + "up": {"uv": [0, 0, 0.5, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"} + } + }, + { + "from": [0, 2, 3], + "to": [16, 8, 9], + "faces": { + "north": {"uv": [0, 8, 4, 11], "texture": "#0"}, + "east": {"uv": [4, 8, 5.5, 11], "texture": "#0"}, + "south": {"uv": [0, 8, 4, 11], "texture": "#0"}, + "west": {"uv": [4, 8, 5.5, 11], "texture": "#0"}, + "up": {"uv": [0, 8, 4, 11], "texture": "#0"}, + "down": {"uv": [0, 8, 4, 11], "texture": "#0"} + } + }, + { + "from": [0, 2, 10], + "to": [2, 8, 13], + "faces": { + "north": {"uv": [12.5, 3.5, 13, 6], "rotation": 180, "texture": "#0"}, + "east": {"uv": [13, 3.5, 13.5, 6.5], "texture": "#0"}, + "south": {"uv": [12.5, 3.5, 13, 6.5], "texture": "#0"}, + "west": {"uv": [11.75, 3.5, 12.5, 6.5], "texture": "#0"}, + "up": {"uv": [11.75, 2.5, 12.5, 3.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [11.75, 2.5, 12.5, 3.5], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [8, 2, 10], + "to": [16, 8, 14], + "faces": { + "north": {"uv": [0, 11, 2, 14], "texture": "#0"}, + "east": {"uv": [2, 11, 3, 14], "texture": "#0"}, + "south": {"uv": [0, 11, 2, 14], "texture": "#0"}, + "west": {"uv": [2, 11, 3, 14], "texture": "#0"}, + "up": {"uv": [2, 14, 4, 16], "texture": "#0"}, + "down": {"uv": [0, 14, 2, 16], "texture": "#0"} + } + }, + { + "from": [3, 4, 11], + "to": [7, 8, 13], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "east": {"uv": [2, 4, 2.5, 6], "texture": "#0"}, + "south": {"uv": [1, 4, 2, 6], "texture": "#0"}, + "west": {"uv": [2, 4, 2.5, 6], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 0.5], "texture": "#missing"}, + "down": {"uv": [2, 4, 2.5, 6], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [2, 8, 1], + "to": [14, 15, 15], + "faces": { + "north": {"uv": [5.5, 7, 8.5, 10.5], "texture": "#0"}, + "east": {"uv": [8.5, 7, 12, 10.5], "texture": "#0"}, + "south": {"uv": [12, 7, 15, 10.5], "texture": "#0"}, + "west": {"uv": [8.5, 7, 12, 10.5], "texture": "#0"}, + "up": {"uv": [5.5, 0, 8.5, 7], "rotation": 180, "texture": "#0"}, + "down": {"uv": [8.5, 0, 11.5, 7], "texture": "#0"} + } + }, + { + "from": [2, 3, 9], + "to": [14, 8, 11], + "faces": { + "north": {"uv": [8.75, 0.5, 11, 6.25], "texture": "#0"}, + "east": {"uv": [8.75, 0.5, 11.25, 6.25], "texture": "#0"}, + "south": {"uv": [9, 1, 11, 5.75], "texture": "#0"}, + "west": {"uv": [9, 0.5, 11, 5.75], "texture": "#0"}, + "up": {"uv": [9, 6, 11, 0.5], "texture": "#0"}, + "down": {"uv": [8.75, 0.5, 11.25, 6.5], "texture": "#0"} + } + }, + { + "from": [9, 4, 0], + "to": [13, 8, 1], + "rotation": {"angle": 22.5, "axis": "x", "origin": [12, 6, 0.5]}, + "faces": { + "north": {"uv": [2, 0, 3, 2], "texture": "#0"}, + "east": {"uv": [3, 2, 4, 2.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [3, 2.5, 4, 4.5], "texture": "#0"}, + "west": {"uv": [3, 2, 4, 2.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [3, 2, 4, 2.5], "texture": "#0"}, + "down": {"uv": [3, 2, 4, 2.5], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/chemical_generator_working.json b/src/main/resources/assets/overdrive_that_matters/models/block/chemical_generator_working.json new file mode 100644 index 000000000..12bc4e40d --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/chemical_generator_working.json @@ -0,0 +1,262 @@ +{ + "parent": "block/block", + "textures": { + "0": "overdrive_that_matters:block/chemical_generator", + "particle": "overdrive_that_matters:block/chemical_generator" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 2, 2], + "faces": { + "north": {"uv": [0, 7, 4, 8], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 1], "texture": "#0"}, + "south": {"uv": [0, 7.5, 4, 8], "texture": "#0"}, + "west": {"uv": [0, 0, 0.25, 1], "texture": "#0"}, + "up": {"uv": [0, 7, 4, 7.5], "texture": "#0"}, + "down": {"uv": [0, 7.5, 4, 8], "texture": "#0"} + } + }, + { + "from": [3, 1, 2], + "to": [5, 2, 14], + "faces": { + "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}, + "east": {"uv": [1, 6, 4, 6.5], "texture": "#0"}, + "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}, + "west": {"uv": [1, 6, 4, 6.5], "texture": "#0"}, + "up": {"uv": [1, 6, 4, 7], "rotation": 90, "texture": "#0"}, + "down": {"uv": [1, 6, 4, 7], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [11, 1, 2], + "to": [13, 2, 14], + "faces": { + "north": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}, + "east": {"uv": [1, 6, 4, 6.5], "texture": "#0"}, + "south": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}, + "west": {"uv": [1, 6, 4, 6.5], "texture": "#0"}, + "up": {"uv": [1, 6, 4, 7], "rotation": 90, "texture": "#0"}, + "down": {"uv": [1, 6, 4, 7], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [0, 0, 14], + "to": [16, 2, 16], + "faces": { + "north": {"uv": [0, 7.5, 4, 8], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 1], "texture": "#0"}, + "south": {"uv": [0, 7, 4, 8], "texture": "#0"}, + "west": {"uv": [0, 0, 0.25, 1], "texture": "#0"}, + "up": {"uv": [0, 7, 4, 7.5], "texture": "#0"}, + "down": {"uv": [0, 7.5, 4, 8], "texture": "#0"} + } + }, + { + "from": [14, 2, 14], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0.75, 0, 1, 7], "texture": "#0"}, + "east": {"uv": [0.5, 0, 1, 7], "texture": "#0"}, + "south": {"uv": [0.5, 0, 0, 7], "texture": "#0"}, + "west": {"uv": [0.25, 0, 0.5, 7], "texture": "#0"}, + "up": {"uv": [0.5, 0, 0, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"} + } + }, + { + "from": [14, 14, 2], + "to": [16, 16, 14], + "faces": { + "north": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, + "east": {"uv": [0.5, 8, 3.5, 7], "texture": "#0"}, + "south": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, + "west": {"uv": [0.5, 7, 3.5, 7.5], "texture": "#0"}, + "up": {"uv": [4.5, 1, 4, 7], "texture": "#0"}, + "down": {"uv": [1, 1, 0.75, 7], "texture": "#0"} + } + }, + { + "from": [14, 2, 0], + "to": [16, 16, 2], + "faces": { + "north": {"uv": [0, 0, 0.5, 7], "texture": "#0"}, + "east": {"uv": [1, 0, 0.5, 7], "texture": "#0"}, + "south": {"uv": [0.75, 0, 1, 7], "texture": "#0"}, + "west": {"uv": [4.25, 0, 4.5, 7], "texture": "#0"}, + "up": {"uv": [0.5, 0, 0, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"} + } + }, + { + "from": [0, 2, 14], + "to": [2, 16, 16], + "faces": { + "north": {"uv": [0.75, 0, 1, 7], "texture": "#0"}, + "east": {"uv": [4.25, 0, 4.5, 7], "texture": "#0"}, + "south": {"uv": [0, 0, 0.5, 7], "texture": "#0"}, + "west": {"uv": [1, 0, 0.5, 7], "texture": "#0"}, + "up": {"uv": [0, 0, 0.5, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"} + } + }, + { + "from": [0, 14, 2], + "to": [2, 16, 14], + "faces": { + "north": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, + "east": {"uv": [0.5, 7, 3.5, 7.5], "texture": "#0"}, + "south": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, + "west": {"uv": [0.5, 7, 3.5, 8], "rotation": 180, "texture": "#0"}, + "up": {"uv": [0, 1, 0.5, 7], "texture": "#0"}, + "down": {"uv": [0.75, 1, 1, 7], "texture": "#0"} + } + }, + { + "from": [2, 5, 1], + "to": [14, 7, 2], + "faces": { + "north": {"uv": [1, 6, 4, 7], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 0.5], "texture": "#missing"}, + "south": {"uv": [1, 6, 4, 7], "texture": "#0"}, + "west": {"uv": [0, 0, 0.25, 0.5], "texture": "#missing"}, + "up": {"uv": [1, 6, 4, 6.5], "texture": "#0"}, + "down": {"uv": [1, 6, 4, 6.5], "texture": "#0"} + } + }, + { + "from": [2, 5, 14], + "to": [14, 7, 15], + "faces": { + "north": {"uv": [1, 6, 4, 7], "texture": "#0"}, + "east": {"uv": [0, 0, 0.25, 0.5], "texture": "#missing"}, + "south": {"uv": [1, 6, 4, 7], "texture": "#0"}, + "west": {"uv": [0, 0, 0.25, 0.5], "texture": "#missing"}, + "up": {"uv": [1, 6, 4, 6.5], "texture": "#0"}, + "down": {"uv": [1, 6, 4, 6.5], "texture": "#0"} + } + }, + { + "from": [1, 8, 2], + "to": [2, 10, 14], + "faces": { + "north": {"uv": [0, 0, 0.25, 0.5], "texture": "#missing"}, + "east": {"uv": [0, 0, 3, 0.5], "texture": "#missing"}, + "south": {"uv": [0, 0, 0.25, 0.5], "texture": "#missing"}, + "west": {"uv": [1, 6, 4, 7], "texture": "#0"}, + "up": {"uv": [1, 6, 4, 6.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [1, 6, 4, 6.5], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [14, 8, 2], + "to": [15, 10, 14], + "faces": { + "north": {"uv": [0, 0, 0.25, 0.5], "texture": "#missing"}, + "east": {"uv": [1, 6, 4, 7], "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 0.5], "texture": "#missing"}, + "west": {"uv": [0, 0, 3, 0.5], "texture": "#missing"}, + "up": {"uv": [1, 6, 4, 6.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [1, 6, 4, 6.5], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [0, 2, 0], + "to": [2, 16, 2], + "faces": { + "north": {"uv": [0.5, 0, 0, 7], "texture": "#0"}, + "east": {"uv": [4.25, 0, 4.5, 7], "texture": "#0"}, + "south": {"uv": [0.75, 0, 1, 7], "texture": "#0"}, + "west": {"uv": [0.5, 0, 1, 7], "texture": "#0"}, + "up": {"uv": [0, 0, 0.5, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"} + } + }, + { + "from": [0, 2, 3], + "to": [16, 8, 9], + "faces": { + "north": {"uv": [0, 8, 4, 11], "texture": "#0"}, + "east": {"uv": [4, 8, 5.5, 11], "texture": "#0"}, + "south": {"uv": [0, 8, 4, 11], "texture": "#0"}, + "west": {"uv": [4, 8, 5.5, 11], "texture": "#0"}, + "up": {"uv": [0, 8, 4, 11], "texture": "#0"}, + "down": {"uv": [0, 8, 4, 11], "texture": "#0"} + } + }, + { + "from": [0, 2, 10], + "to": [2, 8, 13], + "faces": { + "north": {"uv": [12.5, 3.5, 13, 6], "rotation": 180, "texture": "#0"}, + "east": {"uv": [13, 3.5, 13.5, 6.5], "texture": "#0"}, + "south": {"uv": [12.5, 3.5, 13, 6.5], "texture": "#0"}, + "west": {"uv": [11.75, 3.5, 12.5, 6.5], "texture": "#0"}, + "up": {"uv": [11.75, 2.5, 12.5, 3.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [11.75, 2.5, 12.5, 3.5], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [8, 2, 10], + "to": [16, 8, 14], + "faces": { + "north": {"uv": [0, 11, 2, 14], "texture": "#0"}, + "east": {"uv": [2, 11, 3, 14], "texture": "#0"}, + "south": {"uv": [0, 11, 2, 14], "texture": "#0"}, + "west": {"uv": [2, 11, 3, 14], "texture": "#0"}, + "up": {"uv": [2, 14, 4, 16], "texture": "#0"}, + "down": {"uv": [0, 14, 2, 16], "texture": "#0"} + } + }, + { + "from": [3, 4, 11], + "to": [7, 8, 13], + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "east": {"uv": [2, 4, 2.5, 6], "texture": "#0"}, + "south": {"uv": [1, 4, 2, 6], "texture": "#0"}, + "west": {"uv": [2, 4, 2.5, 6], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 0.5], "texture": "#missing"}, + "down": {"uv": [2, 4, 2.5, 6], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [2, 8, 1], + "to": [14, 15, 15], + "faces": { + "north": {"uv": [5.5, 7, 8.5, 10.5], "texture": "#0"}, + "east": {"uv": [8.5, 7, 12, 10.5], "texture": "#0"}, + "south": {"uv": [12, 7, 15, 10.5], "texture": "#0"}, + "west": {"uv": [8.5, 7, 12, 10.5], "texture": "#0"}, + "up": {"uv": [5.5, 0, 8.5, 7], "rotation": 180, "texture": "#0"}, + "down": {"uv": [8.5, 0, 11.5, 7], "texture": "#0"} + } + }, + { + "from": [2, 3, 9], + "to": [14, 8, 11], + "faces": { + "north": {"uv": [8.75, 0.5, 11, 6.25], "texture": "#0"}, + "east": {"uv": [8.75, 0.5, 11.25, 6.25], "texture": "#0"}, + "south": {"uv": [9, 1, 11, 5.75], "texture": "#0"}, + "west": {"uv": [9, 0.5, 11, 5.75], "texture": "#0"}, + "up": {"uv": [9, 6, 11, 0.5], "texture": "#0"}, + "down": {"uv": [8.75, 0.5, 11.25, 6.5], "texture": "#0"} + } + }, + { + "from": [9, 4, 0], + "to": [13, 8, 1], + "rotation": {"angle": 22.5, "axis": "x", "origin": [12, 6, 0.5]}, + "faces": { + "north": {"uv": [1, 0, 2, 2], "texture": "#0"}, + "east": {"uv": [3, 2, 4, 2.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [3, 2.5, 4, 4.5], "texture": "#0"}, + "west": {"uv": [3, 2, 4, 2.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [3, 2, 4, 2.5], "texture": "#0"}, + "down": {"uv": [3, 2, 4, 2.5], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/drive_rack.json b/src/main/resources/assets/overdrive_that_matters/models/block/drive_rack.json index 93b6686b9..55b75bfe1 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/drive_rack.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/drive_rack.json @@ -2,7 +2,7 @@ "parent": "block/block", "textures": { "0": "overdrive_that_matters:block/drive_rack", - "particle": "verdrive_that_matters:block/drive_rack" + "particle": "overdrive_that_matters:block/drive_rack" }, "elements": [ { diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/drive_viewer_idle.json b/src/main/resources/assets/overdrive_that_matters/models/block/drive_viewer_idle.json index 0f4e574ce..f85d1f5d7 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/drive_viewer_idle.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/drive_viewer_idle.json @@ -117,7 +117,7 @@ "rotation": {"angle": 0, "axis": "y", "origin": [-5, 0, 0]}, "faces": { "north": {"uv": [6.5, 8, 8, 11.5], "texture": "#texture"}, - "east": {"uv": [5.75, 8, 6.5, 11], "texture": "#texture"}, + "east": {"uv": [5.75, 8, 6.5, 11.5], "texture": "#texture"}, "south": {"uv": [6.5, 8, 8, 11.5], "texture": "#texture"}, "west": {"uv": [5.75, 8, 6.5, 11.5], "texture": "#texture"}, "up": {"uv": [6.5, 6.5, 8, 8], "rotation": 180, "texture": "#texture"}, @@ -139,54 +139,54 @@ }, { "name": "frame", - "from": [1, 14, 1], + "from": [0.5, 14, 1], "to": [1, 15, 15], "faces": { "north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, "east": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"}, "south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, "west": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"}, - "up": {"uv": [0, 0, 0, 7], "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 7], "texture": "#missing"} + "up": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"}, + "down": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"} } }, { "name": "frame", - "from": [1, 9, 1], + "from": [0.5, 9, 1], "to": [1, 10, 15], "faces": { "north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, "east": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"}, "south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, "west": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"}, - "up": {"uv": [0, 0, 0, 7], "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 7], "texture": "#missing"} + "up": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"}, + "down": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"} } }, { "name": "frame", "from": [15, 9, 1], - "to": [15, 10, 15], + "to": [15.5, 10, 15], "faces": { "north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, "east": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"}, "south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, "west": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"}, - "up": {"uv": [0, 0, 0, 7], "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 7], "texture": "#missing"} + "up": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"}, + "down": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"} } }, { "name": "frame", "from": [15, 14, 1], - "to": [15, 15, 15], + "to": [15.5, 15, 15], "faces": { "north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, "east": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"}, "south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, "west": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"}, - "up": {"uv": [0, 0, 0, 7], "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 7], "texture": "#missing"} + "up": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"}, + "down": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"} } }, { diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/drive_viewer_working.json b/src/main/resources/assets/overdrive_that_matters/models/block/drive_viewer_working.json index d89b0f83b..15ffd43ca 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/drive_viewer_working.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/drive_viewer_working.json @@ -117,7 +117,7 @@ "rotation": {"angle": 0, "axis": "y", "origin": [-5, 0, 0]}, "faces": { "north": {"uv": [6.5, 8, 8, 11.5], "texture": "#texture"}, - "east": {"uv": [5.75, 8, 6.5, 11], "texture": "#texture"}, + "east": {"uv": [5.75, 8, 6.5, 11.5], "texture": "#texture"}, "south": {"uv": [6.5, 8, 8, 11.5], "texture": "#texture"}, "west": {"uv": [5.75, 8, 6.5, 11.5], "texture": "#texture"}, "up": {"uv": [6.5, 6.5, 8, 8], "rotation": 180, "texture": "#texture"}, @@ -139,54 +139,54 @@ }, { "name": "frame", - "from": [1, 14, 1], + "from": [0.5, 14, 1], "to": [1, 15, 15], "faces": { "north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, "east": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"}, "south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, "west": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"}, - "up": {"uv": [0, 0, 0, 7], "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 7], "texture": "#missing"} + "up": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"}, + "down": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"} } }, { "name": "frame", - "from": [1, 9, 1], + "from": [0.5, 9, 1], "to": [1, 10, 15], "faces": { "north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, "east": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"}, "south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, "west": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"}, - "up": {"uv": [0, 0, 0, 7], "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 7], "texture": "#missing"} + "up": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"}, + "down": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"} } }, { "name": "frame", "from": [15, 9, 1], - "to": [15, 10, 15], + "to": [15.5, 10, 15], "faces": { "north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, "east": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"}, "south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, "west": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"}, - "up": {"uv": [0, 0, 0, 7], "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 7], "texture": "#missing"} + "up": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"}, + "down": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"} } }, { "name": "frame", "from": [15, 14, 1], - "to": [15, 15, 15], + "to": [15.5, 15, 15], "faces": { "north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, "east": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"}, "south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}, "west": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"}, - "up": {"uv": [0, 0, 0, 7], "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 7], "texture": "#missing"} + "up": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"}, + "down": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"} } }, { diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_error.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_error.json index 740d95133..8e99dc5b3 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_error.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_error.json @@ -238,79 +238,66 @@ { "name": "frame", "from": [0, 8, 15], - "to": [0, 16, 16], - "faces": { - "north": {"uv": [0, 0, 0, 8], "texture": "#missing"}, - "east": {"uv": [15.75, 0, 16, 4], "texture": "#texture"}, - "south": {"uv": [0, 0, 0, 8], "texture": "#missing"}, - "west": {"uv": [15.75, 0, 16, 4], "texture": "#texture"}, - "up": {"uv": [0, 0, 0, 1], "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 1], "texture": "#missing"} - } - }, - { - "name": "frame", - "from": [0, 8, 16], "to": [1, 16, 16], "faces": { "north": {"uv": [15.75, 0, 16, 4], "texture": "#texture"}, - "east": {"uv": [0, 0, 0, 8], "texture": "#missing"}, + "east": {"uv": [15.75, 0, 16, 4], "texture": "#texture"}, "south": {"uv": [15.75, 0, 16, 4], "texture": "#texture"}, - "west": {"uv": [0, 0, 0, 8], "texture": "#missing"}, - "up": {"uv": [0, 0, 0.5, 0], "texture": "#missing"}, - "down": {"uv": [0, 0, 0.5, 0], "texture": "#missing"} + "west": {"uv": [15.75, 0, 16, 4], "texture": "#texture"}, + "up": {"uv": [15.75, 0, 16, 0.5], "texture": "#texture"}, + "down": {"uv": [0, 0, 0, 1], "texture": "#missing"} } }, { "name": "rame", "from": [0, 11, 12], - "to": [0, 12, 15], + "to": [0.5, 12, 15], "faces": { "north": {"uv": [0, 0, 0, 1], "texture": "#missing"}, "east": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, "south": {"uv": [0, 0, 0, 1], "texture": "#missing"}, "west": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, - "up": {"uv": [0, 0, 0, 3], "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 3], "texture": "#missing"} + "up": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, + "down": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"} } }, { "name": "frame", "from": [0, 15, 12], - "to": [0, 16, 15], + "to": [0.5, 16, 15], "faces": { "north": {"uv": [0, 0, 0, 1], "texture": "#missing"}, "east": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, "south": {"uv": [0, 0, 0, 1], "texture": "#missing"}, - "west": {"uv": [15.75, 0.5, 16, 1.5], "texture": "#texture"}, - "up": {"uv": [0, 0, 0, 3], "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 3], "texture": "#missing"} + "west": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, + "up": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, + "down": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"} } }, { "name": "frame", - "from": [1, 11, 16], + "from": [1, 11, 15.5], "to": [10, 12, 16], "faces": { "north": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, "east": {"uv": [0, 0, 0, 1], "texture": "#missing"}, "south": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, "west": {"uv": [0, 0, 0, 1], "texture": "#missing"}, - "up": {"uv": [0, 0, 4.5, 0], "texture": "#missing"}, - "down": {"uv": [0, 0, 4.5, 0], "texture": "#missing"} + "up": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, + "down": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"} } }, { "name": "frame", - "from": [1, 15, 16], + "from": [1, 15, 15.5], "to": [10, 16, 16], "faces": { "north": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, "east": {"uv": [0, 0, 0, 1], "texture": "#missing"}, "south": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, "west": {"uv": [0, 0, 0, 1], "texture": "#missing"}, - "up": {"uv": [0, 0, 4.5, 0], "texture": "#missing"}, - "down": {"uv": [0, 0, 4.5, 0], "texture": "#missing"} + "up": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, + "down": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"} } } ] diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_idle.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_idle.json index 48ae78528..9a0cf768f 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_idle.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_idle.json @@ -238,79 +238,66 @@ { "name": "frame", "from": [0, 8, 15], - "to": [0, 16, 16], - "faces": { - "north": {"uv": [0, 0, 0, 8], "texture": "#missing"}, - "east": {"uv": [15.75, 0, 16, 4], "texture": "#texture"}, - "south": {"uv": [0, 0, 0, 8], "texture": "#missing"}, - "west": {"uv": [15.75, 0, 16, 4], "texture": "#texture"}, - "up": {"uv": [0, 0, 0, 1], "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 1], "texture": "#missing"} - } - }, - { - "name": "frame", - "from": [0, 8, 16], "to": [1, 16, 16], "faces": { "north": {"uv": [15.75, 0, 16, 4], "texture": "#texture"}, - "east": {"uv": [0, 0, 0, 8], "texture": "#missing"}, + "east": {"uv": [15.75, 0, 16, 4], "texture": "#texture"}, "south": {"uv": [15.75, 0, 16, 4], "texture": "#texture"}, - "west": {"uv": [0, 0, 0, 8], "texture": "#missing"}, - "up": {"uv": [0, 0, 0.5, 0], "texture": "#missing"}, - "down": {"uv": [0, 0, 0.5, 0], "texture": "#missing"} + "west": {"uv": [15.75, 0, 16, 4], "texture": "#texture"}, + "up": {"uv": [15.75, 0, 16, 0.5], "texture": "#texture"}, + "down": {"uv": [0, 0, 0, 1], "texture": "#missing"} } }, { "name": "rame", "from": [0, 11, 12], - "to": [0, 12, 15], + "to": [0.5, 12, 15], "faces": { "north": {"uv": [0, 0, 0, 1], "texture": "#missing"}, "east": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, "south": {"uv": [0, 0, 0, 1], "texture": "#missing"}, "west": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, - "up": {"uv": [0, 0, 0, 3], "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 3], "texture": "#missing"} + "up": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, + "down": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"} } }, { "name": "frame", "from": [0, 15, 12], - "to": [0, 16, 15], + "to": [0.5, 16, 15], "faces": { "north": {"uv": [0, 0, 0, 1], "texture": "#missing"}, "east": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, "south": {"uv": [0, 0, 0, 1], "texture": "#missing"}, - "west": {"uv": [15.75, 0.5, 16, 1.5], "texture": "#texture"}, - "up": {"uv": [0, 0, 0, 3], "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 3], "texture": "#missing"} + "west": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, + "up": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, + "down": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"} } }, { "name": "frame", - "from": [1, 11, 16], + "from": [1, 11, 15.5], "to": [10, 12, 16], "faces": { "north": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, "east": {"uv": [0, 0, 0, 1], "texture": "#missing"}, "south": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, "west": {"uv": [0, 0, 0, 1], "texture": "#missing"}, - "up": {"uv": [0, 0, 4.5, 0], "texture": "#missing"}, - "down": {"uv": [0, 0, 4.5, 0], "texture": "#missing"} + "up": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, + "down": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"} } }, { "name": "frame", - "from": [1, 15, 16], + "from": [1, 15, 15.5], "to": [10, 16, 16], "faces": { "north": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, "east": {"uv": [0, 0, 0, 1], "texture": "#missing"}, "south": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, "west": {"uv": [0, 0, 0, 1], "texture": "#missing"}, - "up": {"uv": [0, 0, 4.5, 0], "texture": "#missing"}, - "down": {"uv": [0, 0, 4.5, 0], "texture": "#missing"} + "up": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, + "down": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"} } } ] diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_working.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_working.json index c34fba539..4f6aaffc5 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_working.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_working.json @@ -238,79 +238,66 @@ { "name": "frame", "from": [0, 8, 15], - "to": [0, 16, 16], - "faces": { - "north": {"uv": [0, 0, 0, 8], "texture": "#missing"}, - "east": {"uv": [15.75, 0, 16, 4], "texture": "#texture"}, - "south": {"uv": [0, 0, 0, 8], "texture": "#missing"}, - "west": {"uv": [15.75, 0, 16, 4], "texture": "#texture"}, - "up": {"uv": [0, 0, 0, 1], "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 1], "texture": "#missing"} - } - }, - { - "name": "frame", - "from": [0, 8, 16], "to": [1, 16, 16], "faces": { "north": {"uv": [15.75, 0, 16, 4], "texture": "#texture"}, - "east": {"uv": [0, 0, 0, 8], "texture": "#missing"}, + "east": {"uv": [15.75, 0, 16, 4], "texture": "#texture"}, "south": {"uv": [15.75, 0, 16, 4], "texture": "#texture"}, - "west": {"uv": [0, 0, 0, 8], "texture": "#missing"}, - "up": {"uv": [0, 0, 0.5, 0], "texture": "#missing"}, - "down": {"uv": [0, 0, 0.5, 0], "texture": "#missing"} + "west": {"uv": [15.75, 0, 16, 4], "texture": "#texture"}, + "up": {"uv": [15.75, 0, 16, 0.5], "texture": "#texture"}, + "down": {"uv": [0, 0, 0, 1], "texture": "#missing"} } }, { "name": "rame", "from": [0, 11, 12], - "to": [0, 12, 15], + "to": [0.5, 12, 15], "faces": { "north": {"uv": [0, 0, 0, 1], "texture": "#missing"}, "east": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, "south": {"uv": [0, 0, 0, 1], "texture": "#missing"}, "west": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, - "up": {"uv": [0, 0, 0, 3], "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 3], "texture": "#missing"} + "up": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, + "down": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"} } }, { "name": "frame", "from": [0, 15, 12], - "to": [0, 16, 15], + "to": [0.5, 16, 15], "faces": { "north": {"uv": [0, 0, 0, 1], "texture": "#missing"}, "east": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, "south": {"uv": [0, 0, 0, 1], "texture": "#missing"}, - "west": {"uv": [15.75, 0.5, 16, 1.5], "texture": "#texture"}, - "up": {"uv": [0, 0, 0, 3], "texture": "#missing"}, - "down": {"uv": [0, 0, 0, 3], "texture": "#missing"} + "west": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, + "up": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, + "down": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"} } }, { "name": "frame", - "from": [1, 11, 16], + "from": [1, 11, 15.5], "to": [10, 12, 16], "faces": { "north": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, "east": {"uv": [0, 0, 0, 1], "texture": "#missing"}, "south": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, "west": {"uv": [0, 0, 0, 1], "texture": "#missing"}, - "up": {"uv": [0, 0, 4.5, 0], "texture": "#missing"}, - "down": {"uv": [0, 0, 4.5, 0], "texture": "#missing"} + "up": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, + "down": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"} } }, { "name": "frame", - "from": [1, 15, 16], + "from": [1, 15, 15.5], "to": [10, 16, 16], "faces": { "north": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, "east": {"uv": [0, 0, 0, 1], "texture": "#missing"}, "south": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, "west": {"uv": [0, 0, 0, 1], "texture": "#missing"}, - "up": {"uv": [0, 0, 4.5, 0], "texture": "#missing"}, - "down": {"uv": [0, 0, 4.5, 0], "texture": "#missing"} + "up": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"}, + "down": {"uv": [15.75, 0.5, 16, 2], "texture": "#texture"} } } ] 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.json new file mode 100644 index 000000000..0ead5fb39 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator.json @@ -0,0 +1,275 @@ +{ + "credit": "Made with Blockbench", + "ambientocclusion": false, + "texture_size": [32, 64], + "textures": { + "particle": "matter_replicator", + "texture": "matter_replicator" + }, + "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.5, 16, 16], + "faces": { + "north": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, + "east": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, + "south": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, + "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, 1], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [15.5, 11, 15], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, + "east": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, + "south": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, + "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, 1], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [15.5, 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": [14.5, 0, 16, 0.75], "texture": "#texture"}, + "down": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"} + } + }, + { + "name": "frame", + "from": [0, 15, 6], + "to": [0.5, 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": [14.5, 0, 16, 0.75], "texture": "#texture"} + } + }, + { + "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_working.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_working.json index 5237b2829..10ef6d720 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_working.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_working.json @@ -113,53 +113,53 @@ { "name": "frame", "from": [0, 11, 15], - "to": [0, 16, 16], + "to": [0.5, 16, 16], "faces": { - "north": {"uv": [0, 0, 0, 5], "texture": "#missing"}, + "north": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, "east": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, - "south": {"uv": [0, 0, 0, 5], "texture": "#missing"}, + "south": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, "west": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, - "up": {"uv": [0, 0, 0, 1], "texture": "#missing"}, + "up": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, "down": {"uv": [0, 0, 0, 1], "texture": "#missing"} } }, { "name": "frame", - "from": [16, 11, 15], + "from": [15.5, 11, 15], "to": [16, 16, 16], "faces": { - "north": {"uv": [0, 0, 0, 5], "texture": "#missing"}, + "north": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, "east": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, - "south": {"uv": [0, 0, 0, 5], "texture": "#missing"}, + "south": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, "west": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, - "up": {"uv": [0, 0, 0, 1], "texture": "#missing"}, + "up": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, "down": {"uv": [0, 0, 0, 1], "texture": "#missing"} } }, { "name": "frame", - "from": [16, 15, 6], + "from": [15.5, 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"} + "up": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, + "down": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"} } }, { "name": "frame", "from": [0, 15, 6], - "to": [0, 16, 15], + "to": [0.5, 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"} + "down": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"} } }, { 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 index 8195cded3..a28f2ce64 100644 --- 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 @@ -192,11 +192,11 @@ { "name": "rail", "from": [2, 14, 11], - "to": [14, 14, 13], + "to": [14, 14.5, 13], "faces": { - "north": {"uv": [0, 0, 12, 0], "texture": "#missing"}, + "north": {"uv": [10, 9, 16, 9.25], "texture": "#texture"}, "east": {"uv": [0, 0, 2, 0], "texture": "#missing"}, - "south": {"uv": [0, 0, 12, 0], "texture": "#missing"}, + "south": {"uv": [10, 9.25, 16, 9.5], "texture": "#texture"}, "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"} 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 index 1b2e7a36e..7ede39e67 100644 --- 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 @@ -192,11 +192,11 @@ { "name": "rail", "from": [2, 14, 11], - "to": [14, 14, 13], + "to": [14, 14.5, 13], "faces": { - "north": {"uv": [0, 0, 12, 0], "texture": "#missing"}, + "north": {"uv": [10, 9, 16, 9.25], "texture": "#texture"}, "east": {"uv": [0, 0, 2, 0], "texture": "#missing"}, - "south": {"uv": [0, 0, 12, 0], "texture": "#missing"}, + "south": {"uv": [10, 9.25, 16, 9.5], "texture": "#texture"}, "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"} diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_scanner_working.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_scanner_working.json index 122b412d2..a97c13b7b 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/matter_scanner_working.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_scanner_working.json @@ -192,11 +192,11 @@ { "name": "rail", "from": [2, 14, 11], - "to": [14, 14, 13], + "to": [14, 14.5, 13], "faces": { - "north": {"uv": [0, 0, 12, 0], "texture": "#missing"}, + "north": {"uv": [10, 9, 16, 9.25], "texture": "#texture"}, "east": {"uv": [0, 0, 2, 0], "texture": "#missing"}, - "south": {"uv": [0, 0, 12, 0], "texture": "#missing"}, + "south": {"uv": [10, 9.25, 16, 9.5], "texture": "#texture"}, "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"} diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/chemical_generator.json b/src/main/resources/assets/overdrive_that_matters/models/item/chemical_generator.json new file mode 100644 index 000000000..db3ae8209 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/item/chemical_generator.json @@ -0,0 +1,3 @@ +{ + "parent": "overdrive_that_matters:block/chemical_generator_working" +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/chemical_generator.png b/src/main/resources/assets/overdrive_that_matters/textures/block/chemical_generator.png new file mode 100644 index 0000000000000000000000000000000000000000..3f3dfc4f2efe2119fe2e0a9266c2f5b0caef92ae GIT binary patch literal 455 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3-p)I`?e@QjEnx?oJHr&dIz4a#+$GeH|GX zHuiJ>Nn{1`RRVlMTun_)6A}{s-(dLvz*9_2Y%2r9e+Gu!rvCc+`v3p`-@bhtsPNbk z|85|~QxfDC3>1U`2BG`s&H=?a3p^r=85sBugD~Uq{1quci$y$L978<3?@qog)MUWp zBAloD;s5{FX|tVHFKGC+pk4Cq*BzXTJGxAAFPAKk{}orlrX(wWxXfrMg(}Svw{m)lO-51iRP&~jX7kfka2WtSg!jp@voE0^5 zSmrzpKTsZcAS0BE%VbfNP8iekxCW1Mrj|Y>gC(soP5135JXn%o?5KBe$CLyA_&JZx zIUO%-;~=lGZ)XgLS;JMcNe)ho%S0B0^3`2)UoywAe?fg=qx0*R-7M#}9av@Hm@aDg zQg1d>$(31EwvIwe=2_Rxxp5|X$MxorL&Bf_?v>lnxvi8(vXteIMD1IV{|YlonEuSD nc`Gts_(@RBUjuvn8PBD&drh2oYKiLt1C7Dc)z4*}Q$iB}!E(7Q literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/carbon_fibre_block.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/carbon_fibre_block.png index 25b6e00e4a9a1cf96594979be6bac154b4bbccab..bbd603cefec8335914cd5e7b240e2ec04fc03f05 100644 GIT binary patch delta 92 zcmX@WIE`_FV<=~UPl&6Sn3$ZLoVK=hRBg+91_lPs0*}aI1_o|^5N4e8lX)pnP|VZC sF+}2WazcmzlQJ8J>JftpN=`fs_W#&_ZsxaI093)?>FVdQ&MBb@01=B9dH?_b delta 134 zcmbQncz|(&V?BR>Pl&6jscB$fpqQALoSdAtwzi12#2W?%2F?PH$YKTtZUGQxT&ujd z6ewur>Eak7aXC3bKtv=#L?k64A*9TRQHhZ)(O~VH6ADa%fk)I20m+1fwhjw{rQCXl hI0OY7teht>GMv^DnX9pJe=X1y22WQ%mvv4FO#r7*BU=Cf