diff --git a/src/main/resources/assets/overdrive_that_matters/blockstates/drive_viewer.json b/src/main/resources/assets/overdrive_that_matters/blockstates/drive_viewer.json new file mode 100644 index 000000000..d6e019a94 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/blockstates/drive_viewer.json @@ -0,0 +1,39 @@ +{ + "multipart": [ + { + "when": { + "facing": "north" + }, + "apply": { + "model": "overdrive_that_matters:block/drive_viewer" + } + }, + { + "when": { + "facing": "south" + }, + "apply": { + "model": "overdrive_that_matters:block/drive_viewer", + "y": 180 + } + }, + { + "when": { + "facing": "west" + }, + "apply": { + "model": "overdrive_that_matters:block/drive_viewer", + "y": 270 + } + }, + { + "when": { + "facing": "east" + }, + "apply": { + "model": "overdrive_that_matters:block/drive_viewer", + "y": 90 + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/lang/en_us.json b/src/main/resources/assets/overdrive_that_matters/lang/en_us.json index b106bc513..25ae77010 100644 --- a/src/main/resources/assets/overdrive_that_matters/lang/en_us.json +++ b/src/main/resources/assets/overdrive_that_matters/lang/en_us.json @@ -144,6 +144,17 @@ "otm.container.matter_panel.task": "Ongoing replication task", "otm.container.matter_panel.task_line": "%s: %s | %s / %s", + "block.overdrive_that_matters.crate_red": "Red container block", + "block.overdrive_that_matters.crate_blue": "Blue container block", + "block.overdrive_that_matters.crate_green": "Green container block", + "block.overdrive_that_matters.crate_yellow": "Yellow container block", + "block.overdrive_that_matters.crate_black": "Black container block", + "block.overdrive_that_matters.crate_pink": "Pink container block", + "block.overdrive_that_matters.crate_purple": "Purple container block", + "block.overdrive_that_matters.carbon_fibre_block": "Carbon fibre block", + "block.overdrive_that_matters.tritanium_block": "Tritanium block", + "block.overdrive_that_matters.tritanium_striped_block": "Tritanium striped block", + "item.overdrive_that_matters.pill_android": "Android pill", "item.overdrive_that_matters.pill_humane": "Humane pill", diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/carbon_fiber.json b/src/main/resources/assets/overdrive_that_matters/models/block/carbon_fiber.json deleted file mode 100644 index 5040f93c8..000000000 --- a/src/main/resources/assets/overdrive_that_matters/models/block/carbon_fiber.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/texture_connector", - "textures": { - "all": "overdrive_that_matters:block/carbon_fiber", - "base": "overdrive_that_matters:block/carbon_fiber_borderless" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/container_block.json b/src/main/resources/assets/overdrive_that_matters/models/block/container_block.json deleted file mode 100644 index e4f7228df..000000000 --- a/src/main/resources/assets/overdrive_that_matters/models/block/container_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "block/texture_connector_container", - "textures": { - "all": "overdrive_that_matters:block/container_block", - "base": "overdrive_that_matters:block/container_block_borderless" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/drive_viewer.json b/src/main/resources/assets/overdrive_that_matters/models/block/drive_viewer.json new file mode 100644 index 000000000..c702895ca --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/drive_viewer.json @@ -0,0 +1,326 @@ +{ + "parent": "block/block", + "textures": { + "particle": "overdrive_that_matters:block/drive_viewer", + "drive": "overdrive_that_matters:item/portable_condensation_drive_crude", + "texture": "overdrive_that_matters:block/drive_viewer" + }, + "elements": [ + { + "name": "shell", + "from": [5, 13, 5], + "to": [11, 16, 11], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, + "faces": { + "north": {"uv": [0, 6, 6, 9], "texture": "#drive"}, + "east": {"uv": [0, 6, 6, 9], "texture": "#drive"}, + "south": {"uv": [0, 6, 6, 9], "texture": "#drive"}, + "west": {"uv": [0, 6, 6, 9], "texture": "#drive"}, + "up": {"uv": [0, 0, 6, 6], "texture": "#drive"}, + "down": {"uv": [0, 9, 6, 15], "texture": "#drive"} + } + }, + { + "name": "handle", + "from": [9, 16, 7], + "to": [10, 17, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, + "faces": { + "north": {"uv": [8, 13, 9, 14], "texture": "#drive"}, + "east": {"uv": [12, 13, 14, 14], "texture": "#drive"}, + "south": {"uv": [11, 13, 12, 14], "texture": "#drive"}, + "west": {"uv": [12, 13, 14, 14], "texture": "#drive"}, + "up": {"uv": [0, 0, 1, 2], "texture": "#drive"}, + "down": {"uv": [0, 0, 1, 2], "texture": "#drive"} + } + }, + { + "name": "handle", + "from": [6, 16, 7], + "to": [7, 17, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, + "faces": { + "north": {"uv": [11, 13, 12, 14], "texture": "#drive"}, + "east": {"uv": [12, 13, 14, 14], "texture": "#drive"}, + "south": {"uv": [8, 13, 9, 14], "texture": "#drive"}, + "west": {"uv": [12, 13, 14, 14], "texture": "#drive"}, + "up": {"uv": [0, 0, 1, 2], "texture": "#drive"}, + "down": {"uv": [0, 0, 1, 2], "texture": "#drive"} + } + }, + { + "name": "handle", + "from": [6, 17, 7], + "to": [10, 18, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 2, 0]}, + "faces": { + "north": {"uv": [8, 12, 12, 13], "texture": "#drive"}, + "east": {"uv": [12, 12, 14, 13], "texture": "#drive"}, + "south": {"uv": [8, 12, 12, 13], "texture": "#drive"}, + "west": {"uv": [12, 12, 14, 13], "texture": "#drive"}, + "up": {"uv": [8, 10, 12, 12], "texture": "#drive"}, + "down": {"uv": [8, 11, 12, 13], "texture": "#drive"} + } + }, + { + "name": "frame", + "from": [10, 12.8, 4], + "to": [12, 16.2, 6], + "rotation": {"angle": -45, "axis": "y", "origin": [11, 9, 5]}, + "faces": { + "north": {"uv": [6, 2, 8, 5], "texture": "#drive"}, + "east": {"uv": [6, 2, 8, 5], "texture": "#drive"}, + "south": {"uv": [6, 2, 8, 5], "texture": "#drive"}, + "west": {"uv": [6, 2, 8, 5], "texture": "#drive"}, + "up": {"uv": [6, 0, 8, 2], "rotation": 180, "texture": "#drive"}, + "down": {"uv": [6, 0, 8, 2], "rotation": 180, "texture": "#drive"} + } + }, + { + "name": "frame", + "from": [10, 12.8, 10], + "to": [12, 16.2, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [11, 9, 11]}, + "faces": { + "north": {"uv": [6, 2, 8, 5], "texture": "#drive"}, + "east": {"uv": [6, 2, 8, 5], "texture": "#drive"}, + "south": {"uv": [6, 2, 8, 5], "texture": "#drive"}, + "west": {"uv": [6, 2, 8, 5], "texture": "#drive"}, + "up": {"uv": [6, 0, 8, 2], "rotation": 270, "texture": "#drive"}, + "down": {"uv": [6, 0, 8, 2], "rotation": 90, "texture": "#drive"} + } + }, + { + "name": "frame", + "from": [4, 12.8, 10], + "to": [6, 16.2, 12], + "rotation": {"angle": -45, "axis": "y", "origin": [5, 9, 11]}, + "faces": { + "north": {"uv": [6, 2, 8, 5], "texture": "#drive"}, + "east": {"uv": [6, 2, 8, 5], "texture": "#drive"}, + "south": {"uv": [6, 2, 8, 5], "texture": "#drive"}, + "west": {"uv": [6, 2, 8, 5], "texture": "#drive"}, + "up": {"uv": [6, 0, 8, 2], "rotation": 270, "texture": "#drive"}, + "down": {"uv": [6, 0, 8, 2], "rotation": 90, "texture": "#drive"} + } + }, + { + "name": "frame", + "from": [4, 12.8, 4], + "to": [6, 16.2, 6], + "rotation": {"angle": -45, "axis": "y", "origin": [5, 9, 5]}, + "faces": { + "north": {"uv": [6, 2, 8, 5], "texture": "#drive"}, + "east": {"uv": [6, 2, 8, 5], "texture": "#drive"}, + "south": {"uv": [6, 2, 8, 5], "texture": "#drive"}, + "west": {"uv": [6, 2, 8, 5], "texture": "#drive"}, + "up": {"uv": [6, 0, 8, 2], "rotation": 270, "texture": "#drive"}, + "down": {"uv": [6, 0, 8, 2], "rotation": 90, "texture": "#drive"} + } + }, + { + "name": "body", + "from": [0, 0, 0], + "to": [16, 8, 16], + "faces": { + "north": {"uv": [0, 12, 4, 16], "texture": "#texture"}, + "east": {"uv": [12, 8, 16, 12], "texture": "#texture"}, + "south": {"uv": [4, 12, 8, 16], "texture": "#texture"}, + "west": {"uv": [12, 8, 16, 12], "texture": "#texture"}, + "up": {"uv": [12, 0, 16, 8], "texture": "#texture"}, + "down": {"uv": [8, 0, 12, 8], "texture": "#texture"} + } + }, + { + "name": "screen", + "from": [6, 12.2, -0.7], + "to": [10, 16.2, 0.3], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 14.5, 0.5]}, + "faces": { + "north": {"uv": [7, 0, 8, 2], "texture": "#texture"}, + "east": {"uv": [7, 2, 8, 2.5], "rotation": 90, "texture": "#texture"}, + "south": {"uv": [7, 2.5, 8, 4.5], "texture": "#texture"}, + "west": {"uv": [7, 2, 8, 2.5], "rotation": 90, "texture": "#texture"}, + "up": {"uv": [7, 2, 8, 2.5], "texture": "#texture"}, + "down": {"uv": [7, 2, 8, 2.5], "texture": "#texture"} + } + }, + { + "name": "container", + "from": [2, 8, 2], + "to": [14, 14, 14], + "faces": { + "north": {"uv": [0, 6, 3, 9], "texture": "#texture"}, + "east": {"uv": [0, 6, 3, 9], "texture": "#texture"}, + "south": {"uv": [0, 6, 3, 9], "texture": "#texture"}, + "west": {"uv": [0, 6, 3, 9], "texture": "#texture"}, + "up": {"uv": [0, 0, 3, 6], "texture": "#texture"}, + "down": {"uv": [0, 0, 12, 12], "texture": "#missing"} + } + }, + { + "name": "weirdpanel", + "from": [4, 8, 13], + "to": [12, 15, 15], + "faces": { + "north": {"uv": [9, 10, 11, 13.5], "texture": "#texture"}, + "east": {"uv": [8.5, 10, 9, 13.5], "texture": "#texture"}, + "south": {"uv": [9, 10, 11, 13.5], "texture": "#texture"}, + "west": {"uv": [8.5, 10, 9, 13.5], "texture": "#texture"}, + "up": {"uv": [9, 9, 11, 10], "texture": "#texture"}, + "down": {"uv": [0, 0, 2, 1], "texture": "#missing"} + } + }, + { + "name": "pipe", + "from": [14, 8, 6], + "to": [15, 13, 8], + "faces": { + "north": {"uv": [11, 9, 11.25, 11.5], "texture": "#texture"}, + "east": {"uv": [11, 9, 11.5, 11.5], "texture": "#texture"}, + "south": {"uv": [11, 9, 11.25, 11.5], "texture": "#texture"}, + "west": {"uv": [0, 0, 0.5, 2.5], "texture": "#missing"}, + "up": {"uv": [11, 9, 11.5, 9.5], "rotation": 90, "texture": "#texture"}, + "down": {"uv": [0, 0, 0.25, 1], "texture": "#missing"} + } + }, + { + "name": "pipe", + "from": [14, 8, 9], + "to": [15, 13, 11], + "faces": { + "north": {"uv": [11, 9, 11.25, 11.5], "texture": "#texture"}, + "east": {"uv": [11, 9, 11.5, 11.5], "texture": "#texture"}, + "south": {"uv": [11, 9, 11.25, 11.5], "texture": "#texture"}, + "west": {"uv": [0, 0, 0.5, 2.5], "texture": "#missing"}, + "up": {"uv": [11, 9, 11.5, 9.5], "rotation": 90, "texture": "#texture"}, + "down": {"uv": [0, 0, 0.25, 1], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [0, 8, 0], + "to": [1, 16, 1], + "faces": { + "north": {"uv": [11.75, 8, 12, 12], "texture": "#texture"}, + "east": {"uv": [11.75, 8, 12, 12], "texture": "#texture"}, + "south": {"uv": [11.75, 8, 12, 12], "texture": "#texture"}, + "west": {"uv": [11.75, 8, 12, 12], "texture": "#texture"}, + "up": {"uv": [11.5, 8, 11.75, 8.5], "texture": "#texture"}, + "down": {"uv": [0, 0, 0.25, 0.5], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [15, 8, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [11.75, 8, 12, 12], "texture": "#texture"}, + "east": {"uv": [11.75, 8, 12, 12], "texture": "#texture"}, + "south": {"uv": [11.75, 8, 12, 12], "texture": "#texture"}, + "west": {"uv": [11.75, 8, 12, 12], "texture": "#texture"}, + "up": {"uv": [11.5, 8, 11.75, 8.5], "texture": "#texture"}, + "down": {"uv": [0, 0, 0.25, 0.5], "texture": "#missing"} + } + }, + { + "name": "screenholder", + "from": [5, 8, 0], + "to": [11, 15, 3], + "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"}, + "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"}, + "down": {"uv": [0, 0, 1.5, 1.5], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [15, 8, 15], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [11.75, 8, 12, 12], "texture": "#texture"}, + "east": {"uv": [11.75, 8, 12, 12], "texture": "#texture"}, + "south": {"uv": [11.75, 8, 12, 12], "texture": "#texture"}, + "west": {"uv": [11.75, 8, 12, 12], "texture": "#texture"}, + "up": {"uv": [11.5, 8, 11.75, 8.5], "texture": "#texture"}, + "down": {"uv": [0, 0, 0.25, 0.5], "texture": "#missing"} + } + }, + { + "name": "frame", + "from": [1, 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"} + } + }, + { + "name": "frame", + "from": [1, 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"} + } + }, + { + "name": "frame", + "from": [15, 9, 1], + "to": [15, 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"} + } + }, + { + "name": "frame", + "from": [15, 14, 1], + "to": [15, 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"} + } + }, + { + "name": "frame", + "from": [0, 8, 15], + "to": [1, 16, 16], + "faces": { + "north": {"uv": [11.75, 8, 12, 12], "texture": "#texture"}, + "east": {"uv": [11.75, 8, 12, 12], "texture": "#texture"}, + "south": {"uv": [11.75, 8, 12, 12], "texture": "#texture"}, + "west": {"uv": [11.75, 8, 12, 12], "texture": "#texture"}, + "up": {"uv": [11.5, 8, 11.75, 8.5], "texture": "#texture"}, + "down": {"uv": [0, 0, 0.25, 0.5], "texture": "#missing"} + } + } + ], + "groups": [ + { + "name": "Drive", + "origin": [5, 7, 5], + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6, 7] + }, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22] +} \ No newline at end of file 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 new file mode 100644 index 000000000..4961bc2ac --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_idle.json @@ -0,0 +1,317 @@ +{ + "parent": "block/block", + "texture_size": [32, 16], + "textures": { + "particle": "overdrive_that_matters:block/matter_bottler_offline", + "battery_texture": "overdrive_that_matters:block/matterybank_core", + "texture": "overdrive_that_matters:block/matter_bottler_offline" + }, + "elements": [ + { + "name": "battery1", + "from": [7, 9.5, 1.5], + "to": [9, 15.5, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 12.5, 4]}, + "faces": { + "north": {"uv": [8, 7, 11, 9], "rotation": 90, "texture": "#battery_texture"}, + "east": {"uv": [8, 7, 11, 2], "rotation": 90, "texture": "#battery_texture"}, + "south": {"uv": [8, 0, 11, 2], "rotation": 90, "texture": "#battery_texture"}, + "west": {"uv": [8, 2, 11, 7], "rotation": 90, "texture": "#battery_texture"}, + "up": {"uv": [1.5, 3, 2.5, 8], "rotation": 180, "texture": "#battery_texture"}, + "down": {"uv": [11, 2, 12, 7], "texture": "#battery_texture"} + } + }, + { + "name": "battery2", + "from": [4, 9.5, 1.5], + "to": [6, 15.5, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 12.5, 4]}, + "faces": { + "north": {"uv": [8, 7, 11, 9], "rotation": 90, "texture": "#battery_texture"}, + "east": {"uv": [8, 7, 11, 2], "rotation": 90, "texture": "#battery_texture"}, + "south": {"uv": [8, 0, 11, 2], "rotation": 90, "texture": "#battery_texture"}, + "west": {"uv": [8, 2, 11, 7], "rotation": 90, "texture": "#battery_texture"}, + "up": {"uv": [1.5, 3, 2.5, 8], "rotation": 180, "texture": "#battery_texture"}, + "down": {"uv": [11, 2, 12, 7], "texture": "#battery_texture"} + } + }, + { + "name": "battery3", + "from": [1, 9.5, 1.5], + "to": [3, 15.5, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 12.5, 4]}, + "faces": { + "north": {"uv": [8, 7, 11, 9], "rotation": 90, "texture": "#battery_texture"}, + "east": {"uv": [8, 7, 11, 2], "rotation": 90, "texture": "#battery_texture"}, + "south": {"uv": [8, 0, 11, 2], "rotation": 90, "texture": "#battery_texture"}, + "west": {"uv": [8, 2, 11, 7], "rotation": 90, "texture": "#battery_texture"}, + "up": {"uv": [1.5, 3, 2.5, 8], "rotation": 180, "texture": "#battery_texture"}, + "down": {"uv": [11, 2, 12, 7], "texture": "#battery_texture"} + } + }, + { + "name": "body", + "from": [0, 0, 0], + "to": [16, 10, 12], + "faces": { + "north": {"uv": [0, 3, 4, 8], "texture": "#texture"}, + "east": {"uv": [5, 3, 8, 8], "texture": "#texture"}, + "south": {"uv": [4, 11, 8, 16], "texture": "#texture"}, + "west": {"uv": [8, 3, 5, 8], "texture": "#texture"}, + "up": {"uv": [0, 10.5, 3.75, 15.5], "texture": "#texture"}, + "down": {"uv": [0, 10, 4, 16], "texture": "#texture"} + } + }, + { + "name": "body", + "from": [10, 10, 2], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 1.5, 3], "texture": "#texture"}, + "east": {"uv": [4, 0, 7.5, 3], "texture": "#texture"}, + "south": {"uv": [2.5, 0, 4, 3], "texture": "#texture"}, + "west": {"uv": [12.5, 6, 16, 9], "texture": "#texture"}, + "up": {"uv": [7.5, 0, 11, 3], "rotation": 270, "texture": "#texture"}, + "down": {"uv": [0, 0, 3, 14], "texture": "#missing"} + } + }, + { + "name": "body", + "from": [0, 10, 7], + "to": [10, 16, 12], + "faces": { + "north": {"uv": [8, 13, 10.5, 16], "texture": "#texture"}, + "east": {"uv": [0, 0, 2.5, 6], "texture": "#missing"}, + "south": {"uv": [4, 8, 6.5, 11], "texture": "#texture"}, + "west": {"uv": [10.5, 13, 11.75, 16], "texture": "#texture"}, + "up": {"uv": [8, 10.5, 10.5, 13], "texture": "#texture"}, + "down": {"uv": [0, 0, 5, 5], "texture": "#missing"} + } + }, + { + "name": "capacitorsocket", + "from": [0, 10, 0], + "to": [10, 11, 7], + "faces": { + "north": {"uv": [11, 0, 13.5, 0.5], "texture": "#texture"}, + "east": {"uv": [11.75, 0, 13.5, 0.5], "texture": "#texture"}, + "south": {"uv": [0, 0, 5, 1], "texture": "#missing"}, + "west": {"uv": [11, 0, 12.75, 0.5], "texture": "#texture"}, + "up": {"uv": [11, 0.5, 13.5, 4], "rotation": 180, "texture": "#texture"}, + "down": {"uv": [0, 0, 5, 7], "texture": "#missing"} + } + }, + { + "name": "body", + "from": [0, 0, 12], + "to": [16, 8, 16], + "faces": { + "north": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "east": {"uv": [4, 4, 5, 8], "texture": "#texture"}, + "south": {"uv": [8, 4, 12, 8], "texture": "#texture"}, + "west": {"uv": [5, 4, 4, 8], "texture": "#texture"}, + "up": {"uv": [0, 10, 4, 12], "rotation": 180, "texture": "#texture"}, + "down": {"uv": [0, 8, 4, 10], "texture": "#texture"} + } + }, + { + "name": "body", + "from": [10, 8, 12], + "to": [16, 10, 16], + "faces": { + "north": {"uv": [0, 0, 3, 2], "texture": "#missing"}, + "east": {"uv": [4, 3, 5, 4], "texture": "#texture"}, + "south": {"uv": [4, 3, 5, 4], "texture": "#texture"}, + "west": {"uv": [4, 3, 5, 4], "texture": "#texture"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#missing"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#missing"} + } + }, + { + "name": "claw1", + "from": [7.2, 8.80866, -0.03806], + "to": [8.8, 13.80866, 1.96194], + "rotation": {"angle": 22.5, "axis": "x", "origin": [5, 11.30866, 0.96194]}, + "faces": { + "north": {"uv": [15, 9, 15.5, 11.5], "texture": "#texture"}, + "east": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"}, + "south": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"}, + "west": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"}, + "up": {"uv": [15, 11.5, 15.5, 12.5], "texture": "#texture"}, + "down": {"uv": [15.5, 11.5, 16, 12.5], "texture": "#texture"} + } + }, + { + "name": "claw2", + "from": [4.2, 8.80866, -0.03806], + "to": [5.8, 13.80866, 1.96194], + "rotation": {"angle": 22.5, "axis": "x", "origin": [5, 11.30866, 0.96194]}, + "faces": { + "north": {"uv": [15, 9, 15.5, 11.5], "texture": "#texture"}, + "east": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"}, + "south": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"}, + "west": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"}, + "up": {"uv": [15, 11.5, 15.5, 12.5], "texture": "#texture"}, + "down": {"uv": [15.5, 11.5, 16, 12.5], "texture": "#texture"} + } + }, + { + "name": "claw3", + "from": [1.2, 8.80866, -0.03806], + "to": [2.8, 13.80866, 1.96194], + "rotation": {"angle": 22.5, "axis": "x", "origin": [5, 11.30866, 0.96194]}, + "faces": { + "north": {"uv": [15, 9, 15.5, 11.5], "texture": "#texture"}, + "east": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"}, + "south": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"}, + "west": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"}, + "up": {"uv": [15, 11.5, 15.5, 12.5], "texture": "#texture"}, + "down": {"uv": [15.5, 11.5, 16, 12.5], "texture": "#texture"} + } + }, + { + "name": "screen", + "from": [11.2, 11.49895, 1.49163], + "to": [14.8, 15.49895, 2.49163], + "rotation": {"angle": 22.5, "axis": "x", "origin": [13, 15.49895, -0.00837]}, + "faces": { + "north": {"uv": [14.5, 0, 15.5, 2], "texture": "#texture"}, + "east": {"uv": [14.5, 2, 15.5, 2.5], "rotation": 90, "texture": "#texture"}, + "south": {"uv": [14.5, 2.5, 15.5, 4.5], "texture": "#texture"}, + "west": {"uv": [14.5, 2, 15.5, 2.5], "rotation": 90, "texture": "#texture"}, + "up": {"uv": [14.5, 2, 15.5, 2.5], "texture": "#texture"}, + "down": {"uv": [14.5, 2, 15.5, 2.5], "texture": "#texture"} + } + }, + { + "name": "canister", + "from": [2, 12, 12], + "to": [10, 15, 15], + "faces": { + "north": {"uv": [0, 0, 4, 3], "texture": "#missing"}, + "east": {"uv": [0, 0, 1.5, 3], "texture": "#missing"}, + "south": {"uv": [14, 4.5, 16, 6], "texture": "#texture"}, + "west": {"uv": [13.25, 4.5, 14, 6], "texture": "#texture"}, + "up": {"uv": [14, 4.5, 16, 6], "texture": "#texture"}, + "down": {"uv": [14, 4.5, 16, 6], "texture": "#texture"} + } + }, + { + "name": "canister", + "from": [2, 8, 12], + "to": [10, 11, 15], + "faces": { + "north": {"uv": [0, 0, 4, 3], "texture": "#missing"}, + "east": {"uv": [0, 0, 1.5, 3], "texture": "#missing"}, + "south": {"uv": [14, 4.5, 16, 6], "texture": "#texture"}, + "west": {"uv": [13.25, 4.5, 14, 6], "texture": "#texture"}, + "up": {"uv": [14, 4.5, 16, 6], "texture": "#texture"}, + "down": {"uv": [0, 0, 4, 3], "texture": "#missing"} + } + }, + { + "name": "tube", + "from": [1, 13, 12], + "to": [2, 14, 14], + "faces": { + "north": {"uv": [0, 0, 0.5, 1], "texture": "#missing"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "south": {"uv": [14.5, 11.5, 15, 12.5], "texture": "#texture"}, + "west": {"uv": [14.5, 10.5, 15, 12.5], "rotation": 270, "texture": "#texture"}, + "up": {"uv": [14.5, 10.5, 15, 12.5], "texture": "#texture"}, + "down": {"uv": [14.5, 10.5, 15, 12.5], "rotation": 180, "texture": "#texture"} + } + }, + { + "name": "tube", + "from": [1, 9, 12], + "to": [2, 10, 14], + "faces": { + "north": {"uv": [0, 0, 0.5, 1], "texture": "#missing"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "south": {"uv": [14.5, 11.5, 15, 12.5], "texture": "#texture"}, + "west": {"uv": [14.5, 10.5, 15, 12.5], "rotation": 270, "texture": "#texture"}, + "up": {"uv": [14.5, 10.5, 15, 12.5], "texture": "#texture"}, + "down": {"uv": [14.5, 10.5, 15, 12.5], "rotation": 180, "texture": "#texture"} + } + }, + { + "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"}, + "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"} + } + }, + { + "name": "rame", + "from": [0, 11, 12], + "to": [0, 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"} + } + }, + { + "name": "frame", + "from": [0, 15, 12], + "to": [0, 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"} + } + }, + { + "name": "frame", + "from": [1, 11, 16], + "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"} + } + }, + { + "name": "frame", + "from": [1, 15, 16], + "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"} + } + } + ] +} \ No newline at end of file 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 new file mode 100644 index 000000000..c34fba539 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_bottler_working.json @@ -0,0 +1,317 @@ +{ + "parent": "block/block", + "texture_size": [32, 16], + "textures": { + "particle": "overdrive_that_matters:block/matter_bottler", + "battery_texture": "overdrive_that_matters:block/matterybank_core", + "texture": "overdrive_that_matters:block/matter_bottler" + }, + "elements": [ + { + "name": "battery1", + "from": [7, 9.5, 1.5], + "to": [9, 15.5, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 12.5, 4]}, + "faces": { + "north": {"uv": [8, 7, 11, 9], "rotation": 90, "texture": "#battery_texture"}, + "east": {"uv": [8, 7, 11, 2], "rotation": 90, "texture": "#battery_texture"}, + "south": {"uv": [8, 0, 11, 2], "rotation": 90, "texture": "#battery_texture"}, + "west": {"uv": [8, 2, 11, 7], "rotation": 90, "texture": "#battery_texture"}, + "up": {"uv": [1.5, 3, 2.5, 8], "rotation": 180, "texture": "#battery_texture"}, + "down": {"uv": [11, 2, 12, 7], "texture": "#battery_texture"} + } + }, + { + "name": "battery2", + "from": [4, 9.5, 1.5], + "to": [6, 15.5, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 12.5, 4]}, + "faces": { + "north": {"uv": [8, 7, 11, 9], "rotation": 90, "texture": "#battery_texture"}, + "east": {"uv": [8, 7, 11, 2], "rotation": 90, "texture": "#battery_texture"}, + "south": {"uv": [8, 0, 11, 2], "rotation": 90, "texture": "#battery_texture"}, + "west": {"uv": [8, 2, 11, 7], "rotation": 90, "texture": "#battery_texture"}, + "up": {"uv": [1.5, 3, 2.5, 8], "rotation": 180, "texture": "#battery_texture"}, + "down": {"uv": [11, 2, 12, 7], "texture": "#battery_texture"} + } + }, + { + "name": "battery3", + "from": [1, 9.5, 1.5], + "to": [3, 15.5, 6.5], + "rotation": {"angle": 0, "axis": "y", "origin": [5, 12.5, 4]}, + "faces": { + "north": {"uv": [8, 7, 11, 9], "rotation": 90, "texture": "#battery_texture"}, + "east": {"uv": [8, 7, 11, 2], "rotation": 90, "texture": "#battery_texture"}, + "south": {"uv": [8, 0, 11, 2], "rotation": 90, "texture": "#battery_texture"}, + "west": {"uv": [8, 2, 11, 7], "rotation": 90, "texture": "#battery_texture"}, + "up": {"uv": [1.5, 3, 2.5, 8], "rotation": 180, "texture": "#battery_texture"}, + "down": {"uv": [11, 2, 12, 7], "texture": "#battery_texture"} + } + }, + { + "name": "body", + "from": [0, 0, 0], + "to": [16, 10, 12], + "faces": { + "north": {"uv": [0, 3, 4, 8], "texture": "#texture"}, + "east": {"uv": [5, 3, 8, 8], "texture": "#texture"}, + "south": {"uv": [4, 11, 8, 16], "texture": "#texture"}, + "west": {"uv": [8, 3, 5, 8], "texture": "#texture"}, + "up": {"uv": [0, 10.5, 3.75, 15.5], "texture": "#texture"}, + "down": {"uv": [0, 10, 4, 16], "texture": "#texture"} + } + }, + { + "name": "body", + "from": [10, 10, 2], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 1.5, 3], "texture": "#texture"}, + "east": {"uv": [4, 0, 7.5, 3], "texture": "#texture"}, + "south": {"uv": [2.5, 0, 4, 3], "texture": "#texture"}, + "west": {"uv": [12.5, 6, 16, 9], "texture": "#texture"}, + "up": {"uv": [7.5, 0, 11, 3], "rotation": 270, "texture": "#texture"}, + "down": {"uv": [0, 0, 3, 14], "texture": "#missing"} + } + }, + { + "name": "body", + "from": [0, 10, 7], + "to": [10, 16, 12], + "faces": { + "north": {"uv": [8, 13, 10.5, 16], "texture": "#texture"}, + "east": {"uv": [0, 0, 2.5, 6], "texture": "#missing"}, + "south": {"uv": [4, 8, 6.5, 11], "texture": "#texture"}, + "west": {"uv": [10.5, 13, 11.75, 16], "texture": "#texture"}, + "up": {"uv": [8, 10.5, 10.5, 13], "texture": "#texture"}, + "down": {"uv": [0, 0, 5, 5], "texture": "#missing"} + } + }, + { + "name": "capacitorsocket", + "from": [0, 10, 0], + "to": [10, 11, 7], + "faces": { + "north": {"uv": [11, 0, 13.5, 0.5], "texture": "#texture"}, + "east": {"uv": [11.75, 0, 13.5, 0.5], "texture": "#texture"}, + "south": {"uv": [0, 0, 5, 1], "texture": "#missing"}, + "west": {"uv": [11, 0, 12.75, 0.5], "texture": "#texture"}, + "up": {"uv": [11, 0.5, 13.5, 4], "rotation": 180, "texture": "#texture"}, + "down": {"uv": [0, 0, 5, 7], "texture": "#missing"} + } + }, + { + "name": "body", + "from": [0, 0, 12], + "to": [16, 8, 16], + "faces": { + "north": {"uv": [0, 0, 8, 8], "texture": "#missing"}, + "east": {"uv": [4, 4, 5, 8], "texture": "#texture"}, + "south": {"uv": [8, 4, 12, 8], "texture": "#texture"}, + "west": {"uv": [5, 4, 4, 8], "texture": "#texture"}, + "up": {"uv": [0, 10, 4, 12], "rotation": 180, "texture": "#texture"}, + "down": {"uv": [0, 8, 4, 10], "texture": "#texture"} + } + }, + { + "name": "body", + "from": [10, 8, 12], + "to": [16, 10, 16], + "faces": { + "north": {"uv": [0, 0, 3, 2], "texture": "#missing"}, + "east": {"uv": [4, 3, 5, 4], "texture": "#texture"}, + "south": {"uv": [4, 3, 5, 4], "texture": "#texture"}, + "west": {"uv": [4, 3, 5, 4], "texture": "#texture"}, + "up": {"uv": [0, 0, 3, 4], "texture": "#missing"}, + "down": {"uv": [0, 0, 3, 4], "texture": "#missing"} + } + }, + { + "name": "claw1", + "from": [7.2, 8.80866, -0.03806], + "to": [8.8, 13.80866, 1.96194], + "rotation": {"angle": 22.5, "axis": "x", "origin": [5, 11.30866, 0.96194]}, + "faces": { + "north": {"uv": [15, 9, 15.5, 11.5], "texture": "#texture"}, + "east": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"}, + "south": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"}, + "west": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"}, + "up": {"uv": [15, 11.5, 15.5, 12.5], "texture": "#texture"}, + "down": {"uv": [15.5, 11.5, 16, 12.5], "texture": "#texture"} + } + }, + { + "name": "claw2", + "from": [4.2, 8.80866, -0.03806], + "to": [5.8, 13.80866, 1.96194], + "rotation": {"angle": 22.5, "axis": "x", "origin": [5, 11.30866, 0.96194]}, + "faces": { + "north": {"uv": [15, 9, 15.5, 11.5], "texture": "#texture"}, + "east": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"}, + "south": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"}, + "west": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"}, + "up": {"uv": [15, 11.5, 15.5, 12.5], "texture": "#texture"}, + "down": {"uv": [15.5, 11.5, 16, 12.5], "texture": "#texture"} + } + }, + { + "name": "claw3", + "from": [1.2, 8.80866, -0.03806], + "to": [2.8, 13.80866, 1.96194], + "rotation": {"angle": 22.5, "axis": "x", "origin": [5, 11.30866, 0.96194]}, + "faces": { + "north": {"uv": [15, 9, 15.5, 11.5], "texture": "#texture"}, + "east": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"}, + "south": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"}, + "west": {"uv": [15.5, 9, 16, 11.5], "texture": "#texture"}, + "up": {"uv": [15, 11.5, 15.5, 12.5], "texture": "#texture"}, + "down": {"uv": [15.5, 11.5, 16, 12.5], "texture": "#texture"} + } + }, + { + "name": "screen", + "from": [11.2, 11.49895, 1.49163], + "to": [14.8, 15.49895, 2.49163], + "rotation": {"angle": 22.5, "axis": "x", "origin": [13, 15.49895, -0.00837]}, + "faces": { + "north": {"uv": [14.5, 0, 15.5, 2], "texture": "#texture"}, + "east": {"uv": [14.5, 2, 15.5, 2.5], "rotation": 90, "texture": "#texture"}, + "south": {"uv": [14.5, 2.5, 15.5, 4.5], "texture": "#texture"}, + "west": {"uv": [14.5, 2, 15.5, 2.5], "rotation": 90, "texture": "#texture"}, + "up": {"uv": [14.5, 2, 15.5, 2.5], "texture": "#texture"}, + "down": {"uv": [14.5, 2, 15.5, 2.5], "texture": "#texture"} + } + }, + { + "name": "canister", + "from": [2, 12, 12], + "to": [10, 15, 15], + "faces": { + "north": {"uv": [0, 0, 4, 3], "texture": "#missing"}, + "east": {"uv": [0, 0, 1.5, 3], "texture": "#missing"}, + "south": {"uv": [14, 4.5, 16, 6], "texture": "#texture"}, + "west": {"uv": [13.25, 4.5, 14, 6], "texture": "#texture"}, + "up": {"uv": [14, 4.5, 16, 6], "texture": "#texture"}, + "down": {"uv": [14, 4.5, 16, 6], "texture": "#texture"} + } + }, + { + "name": "canister", + "from": [2, 8, 12], + "to": [10, 11, 15], + "faces": { + "north": {"uv": [0, 0, 4, 3], "texture": "#missing"}, + "east": {"uv": [0, 0, 1.5, 3], "texture": "#missing"}, + "south": {"uv": [14, 4.5, 16, 6], "texture": "#texture"}, + "west": {"uv": [13.25, 4.5, 14, 6], "texture": "#texture"}, + "up": {"uv": [14, 4.5, 16, 6], "texture": "#texture"}, + "down": {"uv": [0, 0, 4, 3], "texture": "#missing"} + } + }, + { + "name": "tube", + "from": [1, 13, 12], + "to": [2, 14, 14], + "faces": { + "north": {"uv": [0, 0, 0.5, 1], "texture": "#missing"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "south": {"uv": [14.5, 11.5, 15, 12.5], "texture": "#texture"}, + "west": {"uv": [14.5, 10.5, 15, 12.5], "rotation": 270, "texture": "#texture"}, + "up": {"uv": [14.5, 10.5, 15, 12.5], "texture": "#texture"}, + "down": {"uv": [14.5, 10.5, 15, 12.5], "rotation": 180, "texture": "#texture"} + } + }, + { + "name": "tube", + "from": [1, 9, 12], + "to": [2, 10, 14], + "faces": { + "north": {"uv": [0, 0, 0.5, 1], "texture": "#missing"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#missing"}, + "south": {"uv": [14.5, 11.5, 15, 12.5], "texture": "#texture"}, + "west": {"uv": [14.5, 10.5, 15, 12.5], "rotation": 270, "texture": "#texture"}, + "up": {"uv": [14.5, 10.5, 15, 12.5], "texture": "#texture"}, + "down": {"uv": [14.5, 10.5, 15, 12.5], "rotation": 180, "texture": "#texture"} + } + }, + { + "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"}, + "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"} + } + }, + { + "name": "rame", + "from": [0, 11, 12], + "to": [0, 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"} + } + }, + { + "name": "frame", + "from": [0, 15, 12], + "to": [0, 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"} + } + }, + { + "name": "frame", + "from": [1, 11, 16], + "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"} + } + }, + { + "name": "frame", + "from": [1, 15, 16], + "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"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/texture_connector_container.json b/src/main/resources/assets/overdrive_that_matters/models/block/texture_connector_container.json deleted file mode 100644 index 961f47d62..000000000 --- a/src/main/resources/assets/overdrive_that_matters/models/block/texture_connector_container.json +++ /dev/null @@ -1,665 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "#all", - "down": "#all", - "up": "#all", - "north": "#all", - "east": "#all", - "south": "#all", - "west": "#all", - "all": "#all" - }, - "elements": [ - { - "from": [ - 0, - 0, - 0 - ], - "to": [ - 16, - 16, - 16 - ], - "faces": { - "down": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#base", - "cullface": "down" - }, - "up": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#base", - "cullface": "up" - }, - "north": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#base", - "cullface": "north" - }, - "south": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#base", - "cullface": "south" - }, - "west": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#base", - "cullface": "west" - }, - "east": { - "uv": [ - 0, - 0, - 16, - 16 - ], - "texture": "#base", - "cullface": "east" - } - } - }, - { - "from": [ - 0, - 0, - -0.005 - ], - "to": [ - 2, - 16, - -0.005 - ], - "faces": { - "north": { - "texture": "#all", - "cullface": "west", - "uv": [ - 14, - 0, - 16, - 16 - ] - } - } - }, - { - "from": [ - 14, - 0, - -0.005 - ], - "to": [ - 16, - 16, - -0.005 - ], - "faces": { - "north": { - "texture": "#all", - "cullface": "east", - "uv": [ - 0, - 0, - 2, - 16 - ] - } - } - }, - { - "from": [ - 0, - 0, - -0.005 - ], - "to": [ - 16, - 1, - -0.005 - ], - "faces": { - "north": { - "texture": "#all", - "cullface": "down", - "uv": [ - 0, - 15, - 15, - 16 - ] - } - } - }, - { - "from": [ - 0, - 15, - -0.005 - ], - "to": [ - 16, - 16, - -0.005 - ], - "faces": { - "north": { - "texture": "#all", - "cullface": "up", - "uv": [ - 0, - 0, - 16, - 1 - ] - } - } - }, - { - "from": [ - 0, - 0, - 16.005 - ], - "to": [ - 2, - 16, - 16.005 - ], - "faces": { - "south": { - "texture": "#all", - "cullface": "west", - "uv": [ - 0, - 0, - 2, - 16 - ] - } - } - }, - { - "from": [ - 14, - 0, - 16.005 - ], - "to": [ - 16, - 16, - 16.005 - ], - "faces": { - "south": { - "texture": "#all", - "cullface": "east", - "uv": [ - 14, - 0, - 16, - 16 - ] - } - } - }, - { - "from": [ - 0, - 0, - 16.005 - ], - "to": [ - 16, - 1, - 16.005 - ], - "faces": { - "south": { - "texture": "#all", - "cullface": "down", - "uv": [ - 0, - 15, - 15, - 16 - ] - } - } - }, - { - "from": [ - 0, - 15, - 16.005 - ], - "to": [ - 16, - 16, - 16.005 - ], - "faces": { - "south": { - "texture": "#all", - "cullface": "up", - "uv": [ - 0, - 0, - 16, - 1 - ] - } - } - }, - { - "from": [ - 0, - 16.005, - 0 - ], - "to": [ - 16, - 16.005, - 2 - ], - "faces": { - "up": { - "texture": "#all", - "cullface": "north", - "uv": [ - 0, - 0, - 16, - 2 - ] - } - } - }, - { - "from": [ - 0, - 16.005, - 14 - ], - "to": [ - 16, - 16.005, - 16 - ], - "faces": { - "up": { - "texture": "#all", - "cullface": "south", - "uv": [ - 0, - 14, - 16, - 16 - ] - } - } - }, - { - "from": [ - 0, - 16.005, - 0 - ], - "to": [ - 2, - 16.005, - 16 - ], - "faces": { - "up": { - "texture": "#all", - "cullface": "west", - "uv": [ - 0, - 0, - 2, - 16 - ] - } - } - }, - { - "from": [ - 14, - 16.005, - 0 - ], - "to": [ - 16, - 16.005, - 16 - ], - "faces": { - "up": { - "texture": "#all", - "cullface": "east", - "uv": [ - 14, - 0, - 16, - 16 - ] - } - } - }, - { - "from": [ - 0, - -0.005, - 0 - ], - "to": [ - 16, - -0.005, - 2 - ], - "faces": { - "down": { - "texture": "#all", - "cullface": "north", - "uv": [ - 0, - 14, - 16, - 16 - ] - } - } - }, - { - "from": [ - 0, - -0.005, - 14 - ], - "to": [ - 16, - -0.005, - 16 - ], - "faces": { - "down": { - "texture": "#all", - "cullface": "south", - "uv": [ - 0, - 0, - 16, - 2 - ] - } - } - }, - { - "from": [ - 0, - -0.005, - 0 - ], - "to": [ - 2, - -0.005, - 16 - ], - "faces": { - "down": { - "texture": "#all", - "cullface": "west", - "uv": [ - 0, - 0, - 2, - 16 - ] - } - } - }, - { - "from": [ - 14, - -0.005, - 0 - ], - "to": [ - 16, - -0.005, - 16 - ], - "faces": { - "down": { - "texture": "#all", - "cullface": "east", - "uv": [ - 14, - 0, - 16, - 16 - ] - } - } - }, - { - "from": [ - -0.005, - 0, - 0 - ], - "to": [ - -0.005, - 16, - 2 - ], - "faces": { - "west": { - "texture": "#all", - "cullface": "north", - "uv": [ - 0, - 0, - 2, - 16 - ] - } - } - }, - { - "from": [ - -0.005, - 0, - 14 - ], - "to": [ - -0.005, - 16, - 16 - ], - "faces": { - "west": { - "texture": "#all", - "cullface": "south", - "uv": [ - 14, - 0, - 16, - 16 - ] - } - } - }, - { - "from": [ - -0.005, - 0, - 0 - ], - "to": [ - -0.005, - 1, - 16 - ], - "faces": { - "west": { - "texture": "#all", - "cullface": "down", - "uv": [ - 0, - 15, - 16, - 16 - ] - } - } - }, - { - "from": [ - -0.005, - 15, - 0 - ], - "to": [ - -0.005, - 16, - 16 - ], - "faces": { - "west": { - "texture": "#all", - "cullface": "up", - "uv": [ - 0, - 0, - 16, - 1 - ] - } - } - }, - { - "from": [ - 16.005, - 0, - 0 - ], - "to": [ - 16.005, - 16, - 2 - ], - "faces": { - "east": { - "texture": "#all", - "cullface": "north", - "uv": [ - 14, - 0, - 16, - 16 - ] - } - } - }, - { - "from": [ - 16.005, - 0, - 14 - ], - "to": [ - 16.005, - 16, - 16 - ], - "faces": { - "east": { - "texture": "#all", - "cullface": "south", - "uv": [ - 0, - 0, - 2, - 16 - ] - } - } - }, - { - "from": [ - 16.005, - 0, - 0 - ], - "to": [ - 16.005, - 1, - 16 - ], - "faces": { - "east": { - "texture": "#all", - "cullface": "down", - "uv": [ - 0, - 15, - 16, - 16 - ] - } - } - }, - { - "from": [ - 16.005, - 15, - 0 - ], - "to": [ - 16.005, - 16, - 16 - ], - "faces": { - "east": { - "texture": "#all", - "cullface": "up", - "uv": [ - 0, - 0, - 16, - 1 - ] - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/tritanium_striped_block.json b/src/main/resources/assets/overdrive_that_matters/models/block/tritanium_striped_block.json new file mode 100644 index 000000000..17bb9f711 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/tritanium_striped_block.json @@ -0,0 +1,7 @@ +{ + "parent": "block/cube_column", + "textures": { + "end": "overdrive_that_matters:block/decorative/tritanium_block", + "side": "overdrive_that_matters:block/decorative/tritanium_striped_block" + } +} diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/carbon_fibre_block.json b/src/main/resources/assets/overdrive_that_matters/models/item/carbon_fibre_block.json new file mode 100644 index 000000000..2dbba184f --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/item/carbon_fibre_block.json @@ -0,0 +1,3 @@ +{ + "parent": "overdrive_that_matters:block/carbon_fibre_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/crate_black.json b/src/main/resources/assets/overdrive_that_matters/models/item/crate_black.json new file mode 100644 index 000000000..4a27e0196 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/item/crate_black.json @@ -0,0 +1,3 @@ +{ + "parent": "overdrive_that_matters:block/crate_black" +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/crate_blue.json b/src/main/resources/assets/overdrive_that_matters/models/item/crate_blue.json new file mode 100644 index 000000000..1a456b254 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/item/crate_blue.json @@ -0,0 +1,3 @@ +{ + "parent": "overdrive_that_matters:block/crate_blue" +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/crate_green.json b/src/main/resources/assets/overdrive_that_matters/models/item/crate_green.json new file mode 100644 index 000000000..235d1b179 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/item/crate_green.json @@ -0,0 +1,3 @@ +{ + "parent": "overdrive_that_matters:block/crate_green" +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/crate_pink.json b/src/main/resources/assets/overdrive_that_matters/models/item/crate_pink.json new file mode 100644 index 000000000..9809caa2d --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/item/crate_pink.json @@ -0,0 +1,3 @@ +{ + "parent": "overdrive_that_matters:block/crate_pink" +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/crate_purple.json b/src/main/resources/assets/overdrive_that_matters/models/item/crate_purple.json new file mode 100644 index 000000000..9ef4b4b22 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/item/crate_purple.json @@ -0,0 +1,3 @@ +{ + "parent": "overdrive_that_matters:block/crate_purple" +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/crate_red.json b/src/main/resources/assets/overdrive_that_matters/models/item/crate_red.json new file mode 100644 index 000000000..f8767bc72 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/item/crate_red.json @@ -0,0 +1,3 @@ +{ + "parent": "overdrive_that_matters:block/crate_red" +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/crate_yellow.json b/src/main/resources/assets/overdrive_that_matters/models/item/crate_yellow.json new file mode 100644 index 000000000..aa0d8fe17 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/item/crate_yellow.json @@ -0,0 +1,3 @@ +{ + "parent": "overdrive_that_matters:block/crate_yellow" +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/drive_viewer.json b/src/main/resources/assets/overdrive_that_matters/models/item/drive_viewer.json new file mode 100644 index 000000000..8d3cca642 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/item/drive_viewer.json @@ -0,0 +1,3 @@ +{ + "parent": "overdrive_that_matters:block/drive_viewer" +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/matter_bottler.json b/src/main/resources/assets/overdrive_that_matters/models/item/matter_bottler.json new file mode 100644 index 000000000..023f3810e --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/item/matter_bottler.json @@ -0,0 +1,3 @@ +{ + "parent": "overdrive_that_matters:block/matter_bottler_working" +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/portable_condensation_drive.json b/src/main/resources/assets/overdrive_that_matters/models/item/portable_condensation_drive.json new file mode 100644 index 000000000..edb78d3ac --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/item/portable_condensation_drive.json @@ -0,0 +1,248 @@ +{ + "textures": { + "texture": "overdrive_that_matters:item/portable_condensation_drive_normal" + }, + "elements": [ + { + "name": "shell", + "from": [5, 0, 5], + "to": [11, 3, 11], + "faces": { + "north": {"uv": [0, 6, 6, 9], "texture": "#texture"}, + "east": {"uv": [0, 6, 6, 9], "texture": "#texture"}, + "south": {"uv": [0, 6, 6, 9], "texture": "#texture"}, + "west": {"uv": [0, 6, 6, 9], "texture": "#texture"}, + "up": {"uv": [0, 0, 6, 6], "texture": "#texture"}, + "down": {"uv": [0, 9, 6, 15], "texture": "#texture"} + } + }, + { + "name": "shell", + "from": [5, 11, 5], + "to": [11, 14, 11], + "faces": { + "north": {"uv": [0, 6, 6, 9], "texture": "#texture"}, + "east": {"uv": [0, 6, 6, 9], "texture": "#texture"}, + "south": {"uv": [0, 6, 6, 9], "texture": "#texture"}, + "west": {"uv": [0, 6, 6, 9], "texture": "#texture"}, + "up": {"uv": [0, 0, 6, 6], "texture": "#texture"}, + "down": {"uv": [0, 9, 6, 15], "texture": "#texture"} + } + }, + { + "name": "coreholder", + "from": [6, 3, 6], + "to": [10, 4, 10], + "faces": { + "north": {"uv": [1, 4, 5, 5], "texture": "#texture"}, + "east": {"uv": [1, 4, 5, 5], "texture": "#texture"}, + "south": {"uv": [1, 4, 5, 5], "texture": "#texture"}, + "west": {"uv": [1, 4, 5, 5], "texture": "#texture"}, + "up": {"uv": [8, 6, 12, 10], "texture": "#texture"}, + "down": {"uv": [0, 0, 4, 4], "texture": "#missing"} + } + }, + { + "name": "coreholder", + "from": [6, 10, 6], + "to": [10, 11, 10], + "faces": { + "north": {"uv": [1, 4, 5, 5], "texture": "#texture"}, + "east": {"uv": [1, 4, 5, 5], "texture": "#texture"}, + "south": {"uv": [1, 4, 5, 5], "texture": "#texture"}, + "west": {"uv": [1, 4, 5, 5], "texture": "#texture"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "down": {"uv": [8, 6, 12, 10], "texture": "#texture"} + } + }, + { + "name": "handle", + "from": [9, 14, 7], + "to": [10, 15, 9], + "faces": { + "north": {"uv": [8, 13, 9, 14], "texture": "#texture"}, + "east": {"uv": [12, 13, 14, 14], "texture": "#texture"}, + "south": {"uv": [11, 13, 12, 14], "texture": "#texture"}, + "west": {"uv": [12, 13, 14, 14], "texture": "#texture"}, + "up": {"uv": [0, 0, 1, 2], "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 2], "texture": "#missing"} + } + }, + { + "name": "handle", + "from": [6, 14, 7], + "to": [7, 15, 9], + "faces": { + "north": {"uv": [11, 13, 12, 14], "texture": "#texture"}, + "east": {"uv": [12, 13, 14, 14], "texture": "#texture"}, + "south": {"uv": [8, 13, 9, 14], "texture": "#texture"}, + "west": {"uv": [12, 13, 14, 14], "texture": "#texture"}, + "up": {"uv": [0, 0, 1, 2], "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 2], "texture": "#missing"} + } + }, + { + "name": "handle", + "from": [6, 15, 7], + "to": [10, 16, 9], + "faces": { + "north": {"uv": [8, 12, 12, 13], "texture": "#texture"}, + "east": {"uv": [12, 12, 14, 13], "texture": "#texture"}, + "south": {"uv": [8, 12, 12, 13], "texture": "#texture"}, + "west": {"uv": [12, 12, 14, 13], "texture": "#texture"}, + "up": {"uv": [8, 10, 12, 12], "texture": "#texture"}, + "down": {"uv": [8, 11, 12, 13], "texture": "#texture"} + } + }, + { + "name": "frame", + "from": [10, -0.2, 4], + "to": [12, 14.2, 6], + "rotation": {"angle": -45, "axis": "y", "origin": [11, 7, 5]}, + "faces": { + "north": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "east": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "south": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "west": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "up": {"uv": [6, 0, 8, 2], "rotation": 180, "texture": "#texture"}, + "down": {"uv": [6, 0, 8, 2], "rotation": 180, "texture": "#texture"} + } + }, + { + "name": "frame", + "from": [10, -0.2, 10], + "to": [12, 14.2, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [11, 7, 11]}, + "faces": { + "north": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "east": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "south": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "west": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "up": {"uv": [6, 0, 8, 2], "rotation": 270, "texture": "#texture"}, + "down": {"uv": [6, 0, 8, 2], "rotation": 90, "texture": "#texture"} + } + }, + { + "name": "frame", + "from": [4, -0.2, 10], + "to": [6, 14.2, 12], + "rotation": {"angle": -45, "axis": "y", "origin": [5, 7, 11]}, + "faces": { + "north": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "east": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "south": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "west": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "up": {"uv": [6, 0, 8, 2], "rotation": 270, "texture": "#texture"}, + "down": {"uv": [6, 0, 8, 2], "rotation": 90, "texture": "#texture"} + } + }, + { + "name": "frame", + "from": [4, -0.2, 4], + "to": [6, 14.2, 6], + "rotation": {"angle": -45, "axis": "y", "origin": [5, 7, 5]}, + "faces": { + "north": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "east": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "south": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "west": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "up": {"uv": [6, 0, 8, 2], "rotation": 270, "texture": "#texture"}, + "down": {"uv": [6, 0, 8, 2], "rotation": 90, "texture": "#texture"} + } + }, + { + "name": "core", + "from": [7, 6, 7], + "to": [9, 8, 9], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 7, 8]}, + "faces": { + "north": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "east": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "south": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "west": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "up": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "down": {"uv": [8, 0, 10, 2], "texture": "#texture"} + } + }, + { + "name": "core", + "from": [7, 6, 7], + "to": [9, 8, 9], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 7, 8]}, + "faces": { + "north": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "east": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "south": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "west": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "up": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "down": {"uv": [8, 0, 10, 2], "texture": "#texture"} + } + }, + { + "name": "core", + "from": [7, 6, 7], + "to": [9, 8, 9], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 7, 8]}, + "faces": { + "north": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "east": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "south": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "west": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "up": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "down": {"uv": [8, 0, 10, 2], "texture": "#texture"} + } + }, + { + "name": "core", + "from": [7, 6, 7], + "to": [9, 8, 9], + "rotation": {"angle": 0, "axis": "z", "origin": [8, 7, 8]}, + "faces": { + "north": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "east": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "south": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "west": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "up": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "down": {"uv": [8, 0, 10, 2], "texture": "#texture"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [65, 0, 0], + "translation": [0, -4, -4.75], + "scale": [0.7, 0.7, 0.7] + }, + "thirdperson_lefthand": { + "rotation": [65, 0, 0], + "translation": [0, -4, -4.75], + "scale": [0.7, 0.7, 0.7] + }, + "firstperson_righthand": { + "translation": [0, 0, -1] + }, + "firstperson_lefthand": { + "translation": [0, 0, -1] + }, + "ground": { + "translation": [0, 3.5, 0], + "scale": [0.8, 0.8, 0.8] + }, + "gui": { + "rotation": [45, 45, 0], + "translation": [0, 1, 0], + "scale": [0.9, 0.9, 0.9] + }, + "head": { + "translation": [0, 14.25, 0] + } + }, + "groups": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, + { + "name": "Singularity", + "origin": [8, 7, 8], + "color": 0, + "children": [11, 12, 13, 14] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/portable_dense_condensation_drive.json b/src/main/resources/assets/overdrive_that_matters/models/item/portable_dense_condensation_drive.json new file mode 100644 index 000000000..567a22410 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/item/portable_dense_condensation_drive.json @@ -0,0 +1,248 @@ +{ + "textures": { + "texture": "overdrive_that_matters:item/portable_condensation_drive_dense" + }, + "elements": [ + { + "name": "shell", + "from": [5, 0, 5], + "to": [11, 3, 11], + "faces": { + "north": {"uv": [0, 6, 6, 9], "texture": "#texture"}, + "east": {"uv": [0, 6, 6, 9], "texture": "#texture"}, + "south": {"uv": [0, 6, 6, 9], "texture": "#texture"}, + "west": {"uv": [0, 6, 6, 9], "texture": "#texture"}, + "up": {"uv": [0, 0, 6, 6], "texture": "#texture"}, + "down": {"uv": [0, 9, 6, 15], "texture": "#texture"} + } + }, + { + "name": "shell", + "from": [5, 11, 5], + "to": [11, 14, 11], + "faces": { + "north": {"uv": [0, 6, 6, 9], "texture": "#texture"}, + "east": {"uv": [0, 6, 6, 9], "texture": "#texture"}, + "south": {"uv": [0, 6, 6, 9], "texture": "#texture"}, + "west": {"uv": [0, 6, 6, 9], "texture": "#texture"}, + "up": {"uv": [0, 0, 6, 6], "texture": "#texture"}, + "down": {"uv": [0, 9, 6, 15], "texture": "#texture"} + } + }, + { + "name": "coreholder", + "from": [6, 3, 6], + "to": [10, 4, 10], + "faces": { + "north": {"uv": [1, 4, 5, 5], "texture": "#texture"}, + "east": {"uv": [1, 4, 5, 5], "texture": "#texture"}, + "south": {"uv": [1, 4, 5, 5], "texture": "#texture"}, + "west": {"uv": [1, 4, 5, 5], "texture": "#texture"}, + "up": {"uv": [8, 6, 12, 10], "texture": "#texture"}, + "down": {"uv": [0, 0, 4, 4], "texture": "#missing"} + } + }, + { + "name": "coreholder", + "from": [6, 10, 6], + "to": [10, 11, 10], + "faces": { + "north": {"uv": [1, 4, 5, 5], "texture": "#texture"}, + "east": {"uv": [1, 4, 5, 5], "texture": "#texture"}, + "south": {"uv": [1, 4, 5, 5], "texture": "#texture"}, + "west": {"uv": [1, 4, 5, 5], "texture": "#texture"}, + "up": {"uv": [0, 0, 4, 4], "texture": "#missing"}, + "down": {"uv": [8, 6, 12, 10], "texture": "#texture"} + } + }, + { + "name": "handle", + "from": [9, 14, 7], + "to": [10, 15, 9], + "faces": { + "north": {"uv": [8, 13, 9, 14], "texture": "#texture"}, + "east": {"uv": [12, 13, 14, 14], "texture": "#texture"}, + "south": {"uv": [11, 13, 12, 14], "texture": "#texture"}, + "west": {"uv": [12, 13, 14, 14], "texture": "#texture"}, + "up": {"uv": [0, 0, 1, 2], "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 2], "texture": "#missing"} + } + }, + { + "name": "handle", + "from": [6, 14, 7], + "to": [7, 15, 9], + "faces": { + "north": {"uv": [11, 13, 12, 14], "texture": "#texture"}, + "east": {"uv": [12, 13, 14, 14], "texture": "#texture"}, + "south": {"uv": [8, 13, 9, 14], "texture": "#texture"}, + "west": {"uv": [12, 13, 14, 14], "texture": "#texture"}, + "up": {"uv": [0, 0, 1, 2], "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 2], "texture": "#missing"} + } + }, + { + "name": "handle", + "from": [6, 15, 7], + "to": [10, 16, 9], + "faces": { + "north": {"uv": [8, 12, 12, 13], "texture": "#texture"}, + "east": {"uv": [12, 12, 14, 13], "texture": "#texture"}, + "south": {"uv": [8, 12, 12, 13], "texture": "#texture"}, + "west": {"uv": [12, 12, 14, 13], "texture": "#texture"}, + "up": {"uv": [8, 10, 12, 12], "texture": "#texture"}, + "down": {"uv": [8, 11, 12, 13], "texture": "#texture"} + } + }, + { + "name": "frame", + "from": [10, -0.2, 4], + "to": [12, 14.2, 6], + "rotation": {"angle": -45, "axis": "y", "origin": [11, 7, 5]}, + "faces": { + "north": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "east": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "south": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "west": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "up": {"uv": [6, 0, 8, 2], "rotation": 180, "texture": "#texture"}, + "down": {"uv": [6, 0, 8, 2], "rotation": 180, "texture": "#texture"} + } + }, + { + "name": "frame", + "from": [10, -0.2, 10], + "to": [12, 14.2, 12], + "rotation": {"angle": 45, "axis": "y", "origin": [11, 7, 11]}, + "faces": { + "north": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "east": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "south": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "west": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "up": {"uv": [6, 0, 8, 2], "rotation": 270, "texture": "#texture"}, + "down": {"uv": [6, 0, 8, 2], "rotation": 90, "texture": "#texture"} + } + }, + { + "name": "frame", + "from": [4, -0.2, 10], + "to": [6, 14.2, 12], + "rotation": {"angle": -45, "axis": "y", "origin": [5, 7, 11]}, + "faces": { + "north": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "east": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "south": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "west": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "up": {"uv": [6, 0, 8, 2], "rotation": 270, "texture": "#texture"}, + "down": {"uv": [6, 0, 8, 2], "rotation": 90, "texture": "#texture"} + } + }, + { + "name": "frame", + "from": [4, -0.2, 4], + "to": [6, 14.2, 6], + "rotation": {"angle": -45, "axis": "y", "origin": [5, 7, 5]}, + "faces": { + "north": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "east": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "south": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "west": {"uv": [6, 2, 8, 16], "texture": "#texture"}, + "up": {"uv": [6, 0, 8, 2], "rotation": 270, "texture": "#texture"}, + "down": {"uv": [6, 0, 8, 2], "rotation": 90, "texture": "#texture"} + } + }, + { + "name": "core", + "from": [7, 6, 7], + "to": [9, 8, 9], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 7, 8]}, + "faces": { + "north": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "east": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "south": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "west": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "up": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "down": {"uv": [8, 0, 10, 2], "texture": "#texture"} + } + }, + { + "name": "core", + "from": [7, 6, 7], + "to": [9, 8, 9], + "rotation": {"angle": -45, "axis": "x", "origin": [8, 7, 8]}, + "faces": { + "north": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "east": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "south": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "west": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "up": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "down": {"uv": [8, 0, 10, 2], "texture": "#texture"} + } + }, + { + "name": "core", + "from": [7, 6, 7], + "to": [9, 8, 9], + "rotation": {"angle": -45, "axis": "y", "origin": [8, 7, 8]}, + "faces": { + "north": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "east": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "south": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "west": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "up": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "down": {"uv": [8, 0, 10, 2], "texture": "#texture"} + } + }, + { + "name": "core", + "from": [7, 6, 7], + "to": [9, 8, 9], + "rotation": {"angle": 0, "axis": "z", "origin": [8, 7, 8]}, + "faces": { + "north": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "east": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "south": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "west": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "up": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "down": {"uv": [8, 0, 10, 2], "texture": "#texture"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [65, 0, 0], + "translation": [0, -4, -4.75], + "scale": [0.7, 0.7, 0.7] + }, + "thirdperson_lefthand": { + "rotation": [65, 0, 0], + "translation": [0, -4, -4.75], + "scale": [0.7, 0.7, 0.7] + }, + "firstperson_righthand": { + "translation": [0, 0, -1] + }, + "firstperson_lefthand": { + "translation": [0, 0, -1] + }, + "ground": { + "translation": [0, 3.5, 0], + "scale": [0.8, 0.8, 0.8] + }, + "gui": { + "rotation": [45, 45, 0], + "translation": [0, 1, 0], + "scale": [0.9, 0.9, 0.9] + }, + "head": { + "translation": [0, 14.25, 0] + } + }, + "groups": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, + { + "name": "Singularity", + "origin": [8, 7, 8], + "color": 0, + "children": [11, 12, 13, 14] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/tritanium_block.json b/src/main/resources/assets/overdrive_that_matters/models/item/tritanium_block.json new file mode 100644 index 000000000..b17892214 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/item/tritanium_block.json @@ -0,0 +1,3 @@ +{ + "parent": "overdrive_that_matters:block/tritanium_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/tritanium_striped_block.json b/src/main/resources/assets/overdrive_that_matters/models/item/tritanium_striped_block.json new file mode 100644 index 000000000..bbdf740ac --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/item/tritanium_striped_block.json @@ -0,0 +1,3 @@ +{ + "parent": "overdrive_that_matters:block/tritanium_striped_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/carbon_fiber.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/carbon_fibre.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/block/carbon_fiber.png rename to src/main/resources/assets/overdrive_that_matters/textures/block/decorative/carbon_fibre.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/carbon_fiber_borderless.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/carbon_fibre_borderless.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/block/carbon_fiber_borderless.png rename to src/main/resources/assets/overdrive_that_matters/textures/block/decorative/carbon_fibre_borderless.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_black.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_black.png new file mode 100644 index 000000000..0af07297f Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_black.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_blue.png new file mode 100644 index 000000000..23b5c6e09 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_green.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_green.png new file mode 100644 index 000000000..5738ed63a Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_green.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_pink.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_pink.png new file mode 100644 index 000000000..36df523da Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_pink.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_purple.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_purple.png new file mode 100644 index 000000000..67b27384e Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_purple.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/container_block.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_red.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/block/container_block.png rename to src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_red.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/container_block_borderless.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_red_borderless.png similarity index 100% rename from src/main/resources/assets/overdrive_that_matters/textures/block/container_block_borderless.png rename to src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_red_borderless.png diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_yellow.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_yellow.png new file mode 100644 index 000000000..c1b563857 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/crate_yellow.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/tritanium_block.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/tritanium_block.png new file mode 100644 index 000000000..a237cb325 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/tritanium_block.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/tritanium_striped_block.png b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/tritanium_striped_block.png new file mode 100644 index 000000000..44330ca75 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/decorative/tritanium_striped_block.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/drive_viewer.png b/src/main/resources/assets/overdrive_that_matters/textures/block/drive_viewer.png new file mode 100644 index 000000000..93d4873af Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/drive_viewer.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler.png new file mode 100644 index 000000000..cc4ce1636 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler_offline.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler_offline.png new file mode 100644 index 000000000..3cf3c4d26 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler_offline.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_creative.png b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_creative.png index 1ccdbecbf..3633c8223 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_creative.png and b/src/main/resources/assets/overdrive_that_matters/textures/item/matter_capacitor_creative.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/portable_condensation_drive_crude.png b/src/main/resources/assets/overdrive_that_matters/textures/item/portable_condensation_drive_crude.png new file mode 100644 index 000000000..0d332dc5d Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/portable_condensation_drive_crude.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/portable_condensation_drive_dense.png b/src/main/resources/assets/overdrive_that_matters/textures/item/portable_condensation_drive_dense.png new file mode 100644 index 000000000..d57101201 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/portable_condensation_drive_dense.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/portable_condensation_drive_normal.png b/src/main/resources/assets/overdrive_that_matters/textures/item/portable_condensation_drive_normal.png new file mode 100644 index 000000000..a98af1ec1 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/portable_condensation_drive_normal.png differ