diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt index 79d53c4f2..d6a078fb8 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt @@ -197,6 +197,7 @@ object DataGen { block(MBlocks.GRAVITATION_STABILIZER_LENS) block(MBlocks.STORAGE_POWER_SUPPLIER) + block(MBlocks.MATTER_RECYCLER) } with(itemModelProvider) { @@ -246,6 +247,8 @@ object DataGen { generated(MItems.PATTERN_DRIVE_CREATIVE) + generated(MItems.MATTER_DUST) + for (item in MItems.CARGO_CRATES) { // block(item, "${item.registryName!!.path}_closed") } @@ -258,6 +261,7 @@ object DataGen { block(MItems.PLATE_PRESS, "plate_press_idle") block(MItems.STORAGE_POWER_SUPPLIER, "storage_power_supplier") + block(MItems.MATTER_RECYCLER, "matter_recycler_working") } blockStateProvider.lambda { provider -> diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_error.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_error.json new file mode 100644 index 000000000..4e34c1f7d --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_error.json @@ -0,0 +1,231 @@ +{ + "parent": "block/block", + "textures": { + "0": "overdrive_that_matters:block/matter_recycler", + "particle": "overdrive_that_matters:block/matter_recycler" + }, + "elements": [ + { + "name": "body", + "from": [0, 0, 0], + "to": [16, 10, 11], + "faces": { + "north": {"uv": [0, 9.5, 8, 12], "texture": "#0"}, + "east": {"uv": [14.5, 1, 9, 3.5], "texture": "#0"}, + "south": {"uv": [0, 12, 8, 14.5], "texture": "#0"}, + "west": {"uv": [9, 1, 14.5, 3.5], "texture": "#0"}, + "up": {"uv": [8, 5.5, 16, 8.25], "texture": "#0"}, + "down": {"uv": [8, 12, 16, 14.75], "texture": "#0"} + } + }, + { + "name": "body", + "from": [0, 5, 11], + "to": [16, 10, 16], + "faces": { + "north": {"uv": [0, 0, 8, 1.5], "texture": "#missing"}, + "east": {"uv": [16, 9.5, 13.5, 10.75], "texture": "#0"}, + "south": {"uv": [0, 14.5, 8, 15.75], "texture": "#0"}, + "west": {"uv": [13.5, 9.5, 16, 10.75], "texture": "#0"}, + "up": {"uv": [8, 8.25, 16, 9.5], "texture": "#0"}, + "down": {"uv": [8, 14.75, 16, 16], "texture": "#0"} + } + }, + { + "name": "hopper", + "from": [3, 10, 3], + "to": [13, 11, 13], + "faces": { + "north": {"uv": [0, 4.25, 5, 4.5], "texture": "#0"}, + "east": {"uv": [0, 4.25, 5, 4.5], "texture": "#0"}, + "south": {"uv": [0, 4.25, 5, 4.5], "texture": "#0"}, + "west": {"uv": [0, 4.25, 5, 4.5], "texture": "#0"}, + "up": {"uv": [0, 0, 5, 2.5], "texture": "#missing"}, + "down": {"uv": [0, 0, 5, 2.5], "texture": "#missing"} + } + }, + { + "name": "hopper", + "from": [2, 11, 2], + "to": [14, 13, 14], + "faces": { + "north": {"uv": [0, 4, 6, 4.5], "texture": "#0"}, + "east": {"uv": [0, 4, 6, 4.5], "texture": "#0"}, + "south": {"uv": [0, 4, 6, 4.5], "texture": "#0"}, + "west": {"uv": [0, 4, 6, 4.5], "texture": "#0"}, + "up": {"uv": [0, 0, 6, 3], "texture": "#missing"}, + "down": {"uv": [0.5, 0.25, 6.5, 3.25], "texture": "#0"} + } + }, + { + "name": "hopper", + "from": [1, 13, 1], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [0, 3.5, 7, 4], "texture": "#0"}, + "east": {"uv": [0, 3.5, 7, 4], "texture": "#0"}, + "south": {"uv": [0, 3.5, 7, 4], "texture": "#0"}, + "west": {"uv": [0, 3.5, 7, 4], "texture": "#0"}, + "up": {"uv": [0, 0, 7, 3.5], "texture": "#0"}, + "down": {"uv": [0, 0, 7, 3.5], "texture": "#0"} + } + }, + { + "name": "frame", + "from": [15, 10, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "east": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "south": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "west": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "up": {"uv": [7, 2.25, 7.5, 2.5], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [15, 10, 15], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "east": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "south": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "west": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "up": {"uv": [7, 2.25, 7.5, 2.5], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [0, 10, 15], + "to": [1, 16, 16], + "faces": { + "north": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "east": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "south": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "west": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "up": {"uv": [7, 2.25, 7.5, 2.5], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [0, 10, 0], + "to": [1, 16, 1], + "faces": { + "north": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "east": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "south": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "west": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "up": {"uv": [7, 2.25, 7.5, 2.5], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [0.3, 13, 1], + "to": [0.8, 14, 15], + "faces": { + "north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "east": {"uv": [9, 3.5, 16, 3.75], "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "west": {"uv": [9, 3.5, 16, 3.75], "texture": "#0"}, + "up": {"uv": [9, 3.5, 16, 3.625], "rotation": 90, "texture": "#0"}, + "down": {"uv": [9, 3.5, 16, 3.625], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "frame", + "from": [15.2, 13, 1], + "to": [15.7, 14, 15], + "faces": { + "north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "east": {"uv": [9, 3.5, 16, 3.75], "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "west": {"uv": [9, 3.5, 16, 3.75], "texture": "#0"}, + "up": {"uv": [9, 3.5, 16, 3.625], "rotation": 90, "texture": "#0"}, + "down": {"uv": [9, 3.5, 16, 3.625], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "frame", + "from": [0, 0, 11], + "to": [0.5, 1, 16], + "faces": { + "north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "east": {"uv": [7.5, 2.25, 8, 3.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [7.5, 3.25, 7.75, 3.5], "texture": "#0"}, + "west": {"uv": [7.5, 3.5, 8, 2.25], "rotation": 90, "texture": "#0"}, + "up": {"uv": [7.5, 2.25, 7.75, 3.5], "texture": "#0"}, + "down": {"uv": [7.5, 3.5, 7.75, 2.25], "texture": "#0"} + } + }, + { + "name": "frame", + "from": [0, 1, 15], + "to": [0.5, 5, 16], + "faces": { + "north": {"uv": [8, 2.25, 8.25, 3.25], "texture": "#0"}, + "east": {"uv": [8, 2.25, 8.5, 3.25], "texture": "#0"}, + "south": {"uv": [8, 2.25, 8.25, 3.25], "texture": "#0"}, + "west": {"uv": [8, 2.25, 8.5, 3.25], "texture": "#0"}, + "up": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "down": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [15.5, 0, 11], + "to": [16, 1, 16], + "faces": { + "north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "east": {"uv": [7.5, 2.25, 8, 3.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [7.5, 3.25, 7.75, 3.5], "texture": "#0"}, + "west": {"uv": [7.5, 3.5, 8, 2.25], "rotation": 90, "texture": "#0"}, + "up": {"uv": [7.5, 2.25, 7.75, 3.5], "texture": "#0"}, + "down": {"uv": [7.5, 3.5, 7.75, 2.25], "texture": "#0"} + } + }, + { + "name": "frame", + "from": [15.5, 1, 15], + "to": [16, 5, 16], + "faces": { + "north": {"uv": [8, 2.25, 8.25, 3.25], "texture": "#0"}, + "east": {"uv": [8, 2.25, 8.5, 3.25], "texture": "#0"}, + "south": {"uv": [8, 2.25, 8.25, 3.25], "texture": "#0"}, + "west": {"uv": [8, 2.25, 8.5, 3.25], "texture": "#0"}, + "up": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "down": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"} + } + }, + { + "name": "canister", + "from": [1, 1, 11], + "to": [15, 5, 15], + "faces": { + "north": {"uv": [0, 0, 7, 1], "texture": "#missing"}, + "east": {"uv": [0, 7.5, 2, 8.5], "texture": "#0"}, + "south": {"uv": [0, 8.5, 7, 9.5], "texture": "#0"}, + "west": {"uv": [0, 7.5, 2, 8.5], "texture": "#0"}, + "up": {"uv": [0, 0, 7, 1], "texture": "#missing"}, + "down": {"uv": [0, 8.5, 7, 9.5], "texture": "#0"} + } + }, + { + "name": "screen", + "from": [9, 8.4, -0.4], + "to": [13, 12.4, 0.6], + "rotation": {"angle": 22.5, "axis": "x", "origin": [4, 10, -0.5]}, + "faces": { + "north": {"uv": [11, 0, 13, 1], "texture": "#0"}, + "east": {"uv": [7, 1, 9, 1.25], "rotation": 90, "texture": "#0"}, + "south": {"uv": [7, 1.25, 9, 2.25], "texture": "#0"}, + "west": {"uv": [7, 1, 9, 1.25], "rotation": 90, "texture": "#0"}, + "up": {"uv": [7, 1, 9, 1.25], "texture": "#0"}, + "down": {"uv": [7, 1, 9, 1.25], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_idle.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_idle.json new file mode 100644 index 000000000..1344f2dce --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_idle.json @@ -0,0 +1,231 @@ +{ + "parent": "block/block", + "textures": { + "0": "overdrive_that_matters:block/matter_recycler", + "particle": "overdrive_that_matters:block/matter_recycler" + }, + "elements": [ + { + "name": "body", + "from": [0, 0, 0], + "to": [16, 10, 11], + "faces": { + "north": {"uv": [0, 9.5, 8, 12], "texture": "#0"}, + "east": {"uv": [14.5, 1, 9, 3.5], "texture": "#0"}, + "south": {"uv": [0, 12, 8, 14.5], "texture": "#0"}, + "west": {"uv": [9, 1, 14.5, 3.5], "texture": "#0"}, + "up": {"uv": [8, 5.5, 16, 8.25], "texture": "#0"}, + "down": {"uv": [8, 12, 16, 14.75], "texture": "#0"} + } + }, + { + "name": "body", + "from": [0, 5, 11], + "to": [16, 10, 16], + "faces": { + "north": {"uv": [0, 0, 8, 1.5], "texture": "#missing"}, + "east": {"uv": [16, 9.5, 13.5, 10.75], "texture": "#0"}, + "south": {"uv": [0, 14.5, 8, 15.75], "texture": "#0"}, + "west": {"uv": [13.5, 9.5, 16, 10.75], "texture": "#0"}, + "up": {"uv": [8, 8.25, 16, 9.5], "texture": "#0"}, + "down": {"uv": [8, 14.75, 16, 16], "texture": "#0"} + } + }, + { + "name": "hopper", + "from": [3, 10, 3], + "to": [13, 11, 13], + "faces": { + "north": {"uv": [0, 4.25, 5, 4.5], "texture": "#0"}, + "east": {"uv": [0, 4.25, 5, 4.5], "texture": "#0"}, + "south": {"uv": [0, 4.25, 5, 4.5], "texture": "#0"}, + "west": {"uv": [0, 4.25, 5, 4.5], "texture": "#0"}, + "up": {"uv": [0, 0, 5, 2.5], "texture": "#missing"}, + "down": {"uv": [0, 0, 5, 2.5], "texture": "#missing"} + } + }, + { + "name": "hopper", + "from": [2, 11, 2], + "to": [14, 13, 14], + "faces": { + "north": {"uv": [0, 4, 6, 4.5], "texture": "#0"}, + "east": {"uv": [0, 4, 6, 4.5], "texture": "#0"}, + "south": {"uv": [0, 4, 6, 4.5], "texture": "#0"}, + "west": {"uv": [0, 4, 6, 4.5], "texture": "#0"}, + "up": {"uv": [0, 0, 6, 3], "texture": "#missing"}, + "down": {"uv": [0.5, 0.25, 6.5, 3.25], "texture": "#0"} + } + }, + { + "name": "hopper", + "from": [1, 13, 1], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [0, 3.5, 7, 4], "texture": "#0"}, + "east": {"uv": [0, 3.5, 7, 4], "texture": "#0"}, + "south": {"uv": [0, 3.5, 7, 4], "texture": "#0"}, + "west": {"uv": [0, 3.5, 7, 4], "texture": "#0"}, + "up": {"uv": [0, 0, 7, 3.5], "texture": "#0"}, + "down": {"uv": [0, 0, 7, 3.5], "texture": "#0"} + } + }, + { + "name": "frame", + "from": [15, 10, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "east": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "south": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "west": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "up": {"uv": [7, 2.25, 7.5, 2.5], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [15, 10, 15], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "east": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "south": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "west": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "up": {"uv": [7, 2.25, 7.5, 2.5], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [0, 10, 15], + "to": [1, 16, 16], + "faces": { + "north": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "east": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "south": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "west": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "up": {"uv": [7, 2.25, 7.5, 2.5], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [0, 10, 0], + "to": [1, 16, 1], + "faces": { + "north": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "east": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "south": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "west": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "up": {"uv": [7, 2.25, 7.5, 2.5], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [0.3, 13, 1], + "to": [0.8, 14, 15], + "faces": { + "north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "east": {"uv": [9, 3.5, 16, 3.75], "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "west": {"uv": [9, 3.5, 16, 3.75], "texture": "#0"}, + "up": {"uv": [9, 3.5, 16, 3.625], "rotation": 90, "texture": "#0"}, + "down": {"uv": [9, 3.5, 16, 3.625], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "frame", + "from": [15.2, 13, 1], + "to": [15.7, 14, 15], + "faces": { + "north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "east": {"uv": [9, 3.5, 16, 3.75], "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "west": {"uv": [9, 3.5, 16, 3.75], "texture": "#0"}, + "up": {"uv": [9, 3.5, 16, 3.625], "rotation": 90, "texture": "#0"}, + "down": {"uv": [9, 3.5, 16, 3.625], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "frame", + "from": [0, 0, 11], + "to": [0.5, 1, 16], + "faces": { + "north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "east": {"uv": [7.5, 2.25, 8, 3.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [7.5, 3.25, 7.75, 3.5], "texture": "#0"}, + "west": {"uv": [7.5, 3.5, 8, 2.25], "rotation": 90, "texture": "#0"}, + "up": {"uv": [7.5, 2.25, 7.75, 3.5], "texture": "#0"}, + "down": {"uv": [7.5, 3.5, 7.75, 2.25], "texture": "#0"} + } + }, + { + "name": "frame", + "from": [0, 1, 15], + "to": [0.5, 5, 16], + "faces": { + "north": {"uv": [8, 2.25, 8.25, 3.25], "texture": "#0"}, + "east": {"uv": [8, 2.25, 8.5, 3.25], "texture": "#0"}, + "south": {"uv": [8, 2.25, 8.25, 3.25], "texture": "#0"}, + "west": {"uv": [8, 2.25, 8.5, 3.25], "texture": "#0"}, + "up": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "down": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [15.5, 0, 11], + "to": [16, 1, 16], + "faces": { + "north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "east": {"uv": [7.5, 2.25, 8, 3.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [7.5, 3.25, 7.75, 3.5], "texture": "#0"}, + "west": {"uv": [7.5, 3.5, 8, 2.25], "rotation": 90, "texture": "#0"}, + "up": {"uv": [7.5, 2.25, 7.75, 3.5], "texture": "#0"}, + "down": {"uv": [7.5, 3.5, 7.75, 2.25], "texture": "#0"} + } + }, + { + "name": "frame", + "from": [15.5, 1, 15], + "to": [16, 5, 16], + "faces": { + "north": {"uv": [8, 2.25, 8.25, 3.25], "texture": "#0"}, + "east": {"uv": [8, 2.25, 8.5, 3.25], "texture": "#0"}, + "south": {"uv": [8, 2.25, 8.25, 3.25], "texture": "#0"}, + "west": {"uv": [8, 2.25, 8.5, 3.25], "texture": "#0"}, + "up": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "down": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"} + } + }, + { + "name": "canister", + "from": [1, 1, 11], + "to": [15, 5, 15], + "faces": { + "north": {"uv": [0, 0, 7, 1], "texture": "#missing"}, + "east": {"uv": [0, 7.5, 2, 8.5], "texture": "#0"}, + "south": {"uv": [0, 8.5, 7, 9.5], "texture": "#0"}, + "west": {"uv": [0, 7.5, 2, 8.5], "texture": "#0"}, + "up": {"uv": [0, 0, 7, 1], "texture": "#missing"}, + "down": {"uv": [0, 8.5, 7, 9.5], "texture": "#0"} + } + }, + { + "name": "screen", + "from": [9, 8.4, -0.4], + "to": [13, 12.4, 0.6], + "rotation": {"angle": 22.5, "axis": "x", "origin": [4, 10, -0.5]}, + "faces": { + "north": {"uv": [9, 0, 11, 1], "texture": "#0"}, + "east": {"uv": [7, 1, 9, 1.25], "rotation": 90, "texture": "#0"}, + "south": {"uv": [7, 1.25, 9, 2.25], "texture": "#0"}, + "west": {"uv": [7, 1, 9, 1.25], "rotation": 90, "texture": "#0"}, + "up": {"uv": [7, 1, 9, 1.25], "texture": "#0"}, + "down": {"uv": [7, 1, 9, 1.25], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_working.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_working.json new file mode 100644 index 000000000..f84d27999 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_recycler_working.json @@ -0,0 +1,231 @@ +{ + "parent": "block/block", + "textures": { + "0": "overdrive_that_matters:block/matter_recycler", + "particle": "overdrive_that_matters:block/matter_recycler" + }, + "elements": [ + { + "name": "body", + "from": [0, 0, 0], + "to": [16, 10, 11], + "faces": { + "north": {"uv": [0, 9.5, 8, 12], "texture": "#0"}, + "east": {"uv": [13.5, 9.5, 8, 12], "texture": "#0"}, + "south": {"uv": [0, 12, 8, 14.5], "texture": "#0"}, + "west": {"uv": [8, 9.5, 13.5, 12], "texture": "#0"}, + "up": {"uv": [8, 5.5, 16, 8.25], "texture": "#0"}, + "down": {"uv": [8, 12, 16, 14.75], "texture": "#0"} + } + }, + { + "name": "body", + "from": [0, 5, 11], + "to": [16, 10, 16], + "faces": { + "north": {"uv": [0, 0, 8, 1.5], "texture": "#missing"}, + "east": {"uv": [16, 9.5, 13.5, 10.75], "texture": "#0"}, + "south": {"uv": [0, 14.5, 8, 15.75], "texture": "#0"}, + "west": {"uv": [13.5, 9.5, 16, 10.75], "texture": "#0"}, + "up": {"uv": [8, 8.25, 16, 9.5], "texture": "#0"}, + "down": {"uv": [8, 14.75, 16, 16], "texture": "#0"} + } + }, + { + "name": "hopper", + "from": [3, 10, 3], + "to": [13, 11, 13], + "faces": { + "north": {"uv": [0, 4.25, 5, 4.5], "texture": "#0"}, + "east": {"uv": [0, 4.25, 5, 4.5], "texture": "#0"}, + "south": {"uv": [0, 4.25, 5, 4.5], "texture": "#0"}, + "west": {"uv": [0, 4.25, 5, 4.5], "texture": "#0"}, + "up": {"uv": [0, 0, 5, 2.5], "texture": "#missing"}, + "down": {"uv": [0, 0, 5, 2.5], "texture": "#missing"} + } + }, + { + "name": "hopper", + "from": [2, 11, 2], + "to": [14, 13, 14], + "faces": { + "north": {"uv": [0, 4, 6, 4.5], "texture": "#0"}, + "east": {"uv": [0, 4, 6, 4.5], "texture": "#0"}, + "south": {"uv": [0, 4, 6, 4.5], "texture": "#0"}, + "west": {"uv": [0, 4, 6, 4.5], "texture": "#0"}, + "up": {"uv": [0, 0, 6, 3], "texture": "#missing"}, + "down": {"uv": [0.5, 0.25, 6.5, 3.25], "texture": "#0"} + } + }, + { + "name": "hopper", + "from": [1, 13, 1], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [0, 3.5, 7, 4], "texture": "#0"}, + "east": {"uv": [0, 3.5, 7, 4], "texture": "#0"}, + "south": {"uv": [0, 3.5, 7, 4], "texture": "#0"}, + "west": {"uv": [0, 3.5, 7, 4], "texture": "#0"}, + "up": {"uv": [0, 0, 7, 3.5], "texture": "#0"}, + "down": {"uv": [0, 0, 7, 3.5], "texture": "#0"} + } + }, + { + "name": "frame", + "from": [15, 10, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "east": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "south": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "west": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "up": {"uv": [7, 2.25, 7.5, 2.5], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [15, 10, 15], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "east": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "south": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "west": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "up": {"uv": [7, 2.25, 7.5, 2.5], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [0, 10, 15], + "to": [1, 16, 16], + "faces": { + "north": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "east": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "south": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "west": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "up": {"uv": [7, 2.25, 7.5, 2.5], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [0, 10, 0], + "to": [1, 16, 1], + "faces": { + "north": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "east": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "south": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "west": {"uv": [7, 2.25, 7.5, 3.75], "texture": "#0"}, + "up": {"uv": [7, 2.25, 7.5, 2.5], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [0.3, 13, 1], + "to": [0.8, 14, 15], + "faces": { + "north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "east": {"uv": [9, 3.5, 16, 3.75], "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "west": {"uv": [9, 3.5, 16, 3.75], "texture": "#0"}, + "up": {"uv": [9, 3.5, 16, 3.625], "rotation": 90, "texture": "#0"}, + "down": {"uv": [9, 3.5, 16, 3.625], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "frame", + "from": [15.2, 13, 1], + "to": [15.7, 14, 15], + "faces": { + "north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "east": {"uv": [9, 3.5, 16, 3.75], "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "west": {"uv": [9, 3.5, 16, 3.75], "texture": "#0"}, + "up": {"uv": [9, 3.5, 16, 3.625], "rotation": 90, "texture": "#0"}, + "down": {"uv": [9, 3.5, 16, 3.625], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "frame", + "from": [0, 0, 11], + "to": [0.5, 1, 16], + "faces": { + "north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "east": {"uv": [7.5, 2.25, 8, 3.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [7.5, 3.25, 7.75, 3.5], "texture": "#0"}, + "west": {"uv": [7.5, 3.5, 8, 2.25], "rotation": 90, "texture": "#0"}, + "up": {"uv": [7.5, 2.25, 7.75, 3.5], "texture": "#0"}, + "down": {"uv": [7.5, 3.5, 7.75, 2.25], "texture": "#0"} + } + }, + { + "name": "frame", + "from": [0, 1, 15], + "to": [0.5, 5, 16], + "faces": { + "north": {"uv": [8, 2.25, 8.25, 3.25], "texture": "#0"}, + "east": {"uv": [8, 2.25, 8.5, 3.25], "texture": "#0"}, + "south": {"uv": [8, 2.25, 8.25, 3.25], "texture": "#0"}, + "west": {"uv": [8, 2.25, 8.5, 3.25], "texture": "#0"}, + "up": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "down": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [15.5, 0, 11], + "to": [16, 1, 16], + "faces": { + "north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "east": {"uv": [7.5, 2.25, 8, 3.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [7.5, 3.25, 7.75, 3.5], "texture": "#0"}, + "west": {"uv": [7.5, 3.5, 8, 2.25], "rotation": 90, "texture": "#0"}, + "up": {"uv": [7.5, 2.25, 7.75, 3.5], "texture": "#0"}, + "down": {"uv": [7.5, 3.5, 7.75, 2.25], "texture": "#0"} + } + }, + { + "name": "frame", + "from": [15.5, 1, 15], + "to": [16, 5, 16], + "faces": { + "north": {"uv": [8, 2.25, 8.25, 3.25], "texture": "#0"}, + "east": {"uv": [8, 2.25, 8.5, 3.25], "texture": "#0"}, + "south": {"uv": [8, 2.25, 8.25, 3.25], "texture": "#0"}, + "west": {"uv": [8, 2.25, 8.5, 3.25], "texture": "#0"}, + "up": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "down": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"} + } + }, + { + "name": "canister", + "from": [1, 1, 11], + "to": [15, 5, 15], + "faces": { + "north": {"uv": [0, 0, 7, 1], "texture": "#missing"}, + "east": {"uv": [0, 7.5, 2, 8.5], "texture": "#0"}, + "south": {"uv": [0, 8.5, 7, 9.5], "texture": "#0"}, + "west": {"uv": [0, 7.5, 2, 8.5], "texture": "#0"}, + "up": {"uv": [0, 0, 7, 1], "texture": "#missing"}, + "down": {"uv": [0, 8.5, 7, 9.5], "texture": "#0"} + } + }, + { + "name": "screen", + "from": [9, 8.4, -0.4], + "to": [13, 12.4, 0.6], + "rotation": {"angle": 22.5, "axis": "x", "origin": [4, 10, -0.5]}, + "faces": { + "north": {"uv": [7, 0, 9, 1], "texture": "#0"}, + "east": {"uv": [7, 1, 9, 1.25], "rotation": 90, "texture": "#0"}, + "south": {"uv": [7, 1.25, 9, 2.25], "texture": "#0"}, + "west": {"uv": [7, 1, 9, 1.25], "rotation": 90, "texture": "#0"}, + "up": {"uv": [7, 1, 9, 1.25], "texture": "#0"}, + "down": {"uv": [7, 1, 9, 1.25], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler.png new file mode 100644 index 000000000..69d034775 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/gravitation_field_limiter.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/gravitation_field_limiter.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/item/gravitation_field_limiter.png rename to src/main/resources/assets/overdrive_that_matters/textures/item/component/gravitation_field_limiter.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/gravitation_field_sensor.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/gravitation_field_sensor.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/item/gravitation_field_sensor.png rename to src/main/resources/assets/overdrive_that_matters/textures/item/component/gravitation_field_sensor.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/component/matter_capacitor_parts.png b/src/main/resources/assets/overdrive_that_matters/textures/item/component/matter_capacitor_parts.png index 3d368b089..3a9c59816 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/component/matter_capacitor_parts.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/component/matter_capacitor_parts.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_parts.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_parts.png deleted file mode 100644 index 3a9c59816..000000000 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_parts.png and /dev/null differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_dust.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_dust.png new file mode 100644 index 000000000..5194c771f Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_dust.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/singularity_scanner.png b/src/main/resources/assets/overdrive_that_matters/textures/item/singularity_scanner.png index b194eb08b..5dfd067e4 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/singularity_scanner.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/singularity_scanner.png differ