diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/android_station_working.json b/src/main/resources/assets/overdrive_that_matters/models/block/android_station_working.json index fb047e55b..97b5b2064 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/android_station_working.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/android_station_working.json @@ -3,6 +3,7 @@ "render_type": "translucent", "textures": { "0": "overdrive_that_matters:block/android_station", + "1": "overdrive_that_matters:block/android_station_em", "particle": "overdrive_that_matters:block/android_station" }, "elements": [ @@ -19,6 +20,19 @@ "down": {"uv": [8, 4.5, 16, 8.5], "texture": "#0"} } }, + { + "name": "platform_em", + "from": [0, 7, 0], + "to": [16, 9, 16], + "faces": { + "north": {"uv": [8, 4, 16, 4.5], "texture": "#1", "emissivity": 15}, + "east": {"uv": [0, 4, 8, 4.5], "texture": "#1", "emissivity": 15}, + "south": {"uv": [8, 4, 16, 4.5], "texture": "#1", "emissivity": 15}, + "west": {"uv": [0, 4, 8, 4.5], "texture": "#1", "emissivity": 15}, + "up": {"uv": [8, 0, 16, 4], "texture": "#1", "emissivity": 15}, + "down": {"uv": [8, 4.5, 16, 8.5], "texture": "#1", "emissivity": 15} + } + }, { "name": "base", "from": [0, 0, 0], @@ -45,6 +59,19 @@ "down": {"uv": [9, 5, 15, 8], "texture": "#0"} } }, + { + "name": "body_em", + "from": [2, 4, 2], + "to": [14, 7, 14], + "faces": { + "north": {"uv": [1, 0, 7, 0.75], "texture": "#1", "emissivity": 15}, + "east": {"uv": [1, 0, 7, 0.75], "texture": "#1", "emissivity": 15}, + "south": {"uv": [1, 0, 7, 0.75], "texture": "#1", "emissivity": 15}, + "west": {"uv": [1, 0, 7, 0.75], "texture": "#1", "emissivity": 15}, + "up": {"uv": [9, 5, 15, 8], "texture": "#1", "emissivity": 15}, + "down": {"uv": [9, 5, 15, 8], "texture": "#1", "emissivity": 15} + } + }, { "name": "frame", "from": [1, 4, 13], @@ -105,8 +132,8 @@ "east": {"uv": [0, 0, 8, 0], "texture": "#missing"}, "south": {"uv": [0, 0, 8, 0], "texture": "#missing"}, "west": {"uv": [0, 0, 8, 0], "texture": "#missing"}, - "up": {"uv": [0, 9.5, 8, 13.5], "texture": "#0"}, - "down": {"uv": [0, 9.5, 8, 13.5], "texture": "#0"} + "up": {"uv": [0, 9.5, 8, 13.5], "texture": "#0", "emissivity": 15}, + "down": {"uv": [0, 9.5, 8, 13.5], "texture": "#0", "emissivity": 15} } } ], diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/energy_servo_body.json b/src/main/resources/assets/overdrive_that_matters/models/block/energy_servo_body.json new file mode 100644 index 000000000..ed73eec4e --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/energy_servo_body.json @@ -0,0 +1,332 @@ +{ + "parent": "block/cube_all", + "render_type": "solid", + "textures": { + "0": "overdrive_that_matters:block/energy_servo", + "particle": "overdrive_that_matters:block/energy_servo" + }, + "elements": [ + { + "name": "body", + "from": [0, 0, 0], + "to": [16, 10, 11], + "faces": { + "north": {"uv": [0, 0, 8, 2.5], "texture": "#0"}, + "east": {"uv": [13.5, 0, 8, 2.5], "texture": "#0"}, + "south": {"uv": [0, 9.25, 8, 11.75], "texture": "#0"}, + "west": {"uv": [8, 0, 13.5, 2.5], "texture": "#0"}, + "up": {"uv": [0, 6.5, 8, 9.25], "texture": "#0"}, + "down": {"uv": [0, 2.5, 8, 5.25], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "body", + "from": [4, 10, 0], + "to": [12, 16, 7], + "faces": { + "north": {"uv": [8, 2.5, 12, 4], "texture": "#0"}, + "east": {"uv": [15.5, 2.5, 12, 4], "texture": "#0"}, + "south": {"uv": [0, 0, 3, 1.5], "texture": "#missing"}, + "west": {"uv": [12, 2.5, 15.5, 4], "texture": "#0"}, + "up": {"uv": [8, 4, 12, 5.75], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 0, 3, 1.75], "texture": "#missing"} + } + }, + { + "name": "body", + "from": [0, 10, 7], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 14, 8, 15.5], "texture": "#0"}, + "east": {"uv": [12.5, 14, 8, 15.5], "texture": "#0"}, + "south": {"uv": [8, 12.5, 16, 14], "texture": "#0"}, + "west": {"uv": [8, 14, 12.5, 15.5], "texture": "#0"}, + "up": {"uv": [0, 11.75, 8, 14], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 9, 8, 11.25], "texture": "#0"} + } + }, + { + "name": "body", + "from": [5, 2, 11], + "to": [11, 10, 16], + "faces": { + "north": {"uv": [0, 0, 3, 2], "texture": "#missing"}, + "east": {"uv": [0, 9.25, 2.5, 11.25], "texture": "#0"}, + "south": {"uv": [8, 10.5, 11, 12.5], "texture": "#0"}, + "west": {"uv": [5.5, 9.25, 8, 11.25], "texture": "#0"}, + "up": {"uv": [0, 0, 3, 1.25], "texture": "#missing"}, + "down": {"uv": [0, 0, 3, 1.25], "texture": "#missing"} + } + }, + { + "name": "body", + "from": [0, 0, 11], + "to": [16, 2, 16], + "faces": { + "north": {"uv": [0, 0, 8, 0.5], "texture": "#missing"}, + "east": {"uv": [16, 2, 13.5, 2.5], "texture": "#0"}, + "south": {"uv": [0, 2, 8, 2.5], "texture": "#0"}, + "west": {"uv": [13.5, 2, 16, 2.5], "texture": "#0"}, + "up": {"uv": [0, 8, 8, 9.25], "texture": "#0"}, + "down": {"uv": [0, 5.25, 8, 6.5], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "coil", + "from": [1, 2, 11], + "to": [5, 3, 15], + "faces": { + "north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"}, + "east": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "south": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "west": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "up": {"uv": [8, 6, 10, 7], "texture": "#0"}, + "down": {"uv": [8, 6, 10, 7], "texture": "#0"} + } + }, + { + "name": "coil", + "from": [1, 4, 11], + "to": [5, 5, 15], + "faces": { + "north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"}, + "east": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "south": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "west": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "up": {"uv": [8, 6, 10, 7], "texture": "#0"}, + "down": {"uv": [8, 6, 10, 7], "texture": "#0"} + } + }, + { + "name": "coil", + "from": [1, 6, 11], + "to": [5, 7, 15], + "faces": { + "north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"}, + "east": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "south": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "west": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "up": {"uv": [8, 6, 10, 7], "texture": "#0"}, + "down": {"uv": [8, 6, 10, 7], "texture": "#0"} + } + }, + { + "name": "coil", + "from": [1, 8, 11], + "to": [5, 9, 15], + "faces": { + "north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"}, + "east": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "south": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "west": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "up": {"uv": [8, 6, 10, 7], "texture": "#0"}, + "down": {"uv": [8, 6, 10, 7], "texture": "#0"} + } + }, + { + "name": "coil", + "from": [11, 2, 11], + "to": [15, 3, 15], + "faces": { + "north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"}, + "east": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "south": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "west": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "up": {"uv": [8, 6, 10, 7], "texture": "#0"}, + "down": {"uv": [8, 6, 10, 7], "texture": "#0"} + } + }, + { + "name": "coil", + "from": [11, 4, 11], + "to": [15, 5, 15], + "faces": { + "north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"}, + "east": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "south": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "west": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "up": {"uv": [8, 6, 10, 7], "texture": "#0"}, + "down": {"uv": [8, 6, 10, 7], "texture": "#0"} + } + }, + { + "name": "coil", + "from": [11, 6, 11], + "to": [15, 7, 15], + "faces": { + "north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"}, + "east": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "south": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "west": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "up": {"uv": [8, 6, 10, 7], "texture": "#0"}, + "down": {"uv": [8, 6, 10, 7], "texture": "#0"} + } + }, + { + "name": "coil", + "from": [11, 8, 11], + "to": [15, 9, 15], + "faces": { + "north": {"uv": [0, 0, 2, 0.25], "texture": "#missing"}, + "east": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "south": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "west": {"uv": [8, 5.75, 10, 6], "texture": "#0"}, + "up": {"uv": [8, 6, 10, 7], "texture": "#0"}, + "down": {"uv": [8, 6, 10, 7], "texture": "#0"} + } + }, + { + "name": "coil", + "from": [2, 2, 12], + "to": [4, 10, 14], + "faces": { + "north": {"uv": [9, 8.5, 8, 10.5], "texture": "#0"}, + "east": {"uv": [8, 8.5, 9, 10.5], "texture": "#0"}, + "south": {"uv": [8, 8.5, 9, 10.5], "texture": "#0"}, + "west": {"uv": [8, 8.5, 9, 10.5], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 0.5], "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 0.5], "texture": "#missing"} + } + }, + { + "name": "coil", + "from": [12, 2, 12], + "to": [14, 10, 14], + "faces": { + "north": {"uv": [9, 8.5, 8, 10.5], "texture": "#0"}, + "east": {"uv": [8, 8.5, 9, 10.5], "texture": "#0"}, + "south": {"uv": [8, 8.5, 9, 10.5], "texture": "#0"}, + "west": {"uv": [8, 8.5, 9, 10.5], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 0.5], "texture": "#missing"}, + "down": {"uv": [0, 0, 1, 0.5], "texture": "#missing"} + } + }, + { + "from": [0, 10, 0], + "to": [1, 16, 1], + "faces": { + "north": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"}, + "east": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"}, + "south": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"}, + "west": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"}, + "up": {"uv": [13.5, 0, 14, 0.25], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"} + } + }, + { + "from": [15, 10, 0], + "to": [16, 16, 1], + "faces": { + "north": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"}, + "east": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"}, + "south": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"}, + "west": {"uv": [13.5, 0.25, 14, 1.75], "texture": "#0"}, + "up": {"uv": [13.5, 0, 14, 0.25], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"} + } + }, + { + "from": [15.2, 11, 1], + "to": [15.7, 12, 7], + "faces": { + "north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "east": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "west": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"}, + "down": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"} + } + }, + { + "from": [15.2, 14, 1], + "to": [15.7, 15, 7], + "faces": { + "north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "east": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "west": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"}, + "down": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"} + } + }, + { + "from": [0.3, 14, 1], + "to": [0.8, 15, 7], + "faces": { + "north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "east": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "west": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"}, + "down": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"} + } + }, + { + "from": [0.3, 11, 1], + "to": [0.8, 12, 7], + "faces": { + "north": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "east": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 0.25, 0.25], "texture": "#missing"}, + "west": {"uv": [14, 0, 14.5, 1.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"}, + "down": {"uv": [14, 0, 14.25, 1.5], "texture": "#0"} + } + }, + { + "from": [1.5, 10, 1], + "to": [4.5, 14, 7], + "faces": { + "north": {"uv": [10, 8.5, 11.5, 9.5], "texture": "#0"}, + "east": {"uv": [10, 7, 8, 8.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 1.5, 1], "texture": "#missing"}, + "west": {"uv": [10, 7, 8, 8.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [10, 7, 11.5, 8.5], "texture": "#0"}, + "down": {"uv": [0, 0, 1.5, 1.5], "texture": "#missing"} + } + }, + { + "from": [11.5, 10, 1], + "to": [14.5, 14, 7], + "faces": { + "north": {"uv": [10, 8.5, 11.5, 9.5], "texture": "#0"}, + "east": {"uv": [10, 7, 8, 8.5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 1.5, 1], "texture": "#missing"}, + "west": {"uv": [10, 7, 8, 8.5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [10, 7, 11.5, 8.5], "texture": "#0"}, + "down": {"uv": [0, 0, 1.5, 1.5], "texture": "#missing"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/energy_servo_effect.json b/src/main/resources/assets/overdrive_that_matters/models/block/energy_servo_effect.json new file mode 100644 index 000000000..9bd6745d0 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/energy_servo_effect.json @@ -0,0 +1,66 @@ +{ + "parent": "block/cube_all", + "render_type": "translucent", + "textures": { + "1": "overdrive_that_matters:item/energy_sword_charge" + }, + "elements": [ + { + "name": "effect", + "from": [0.5, 2, 10.5], + "to": [5.5, 10, 15.5], + "faces": { + "north": {"uv": [0, 0, 2.5, 2], "texture": "#missing"}, + "east": {"uv": [0, 0, 2.5, 2], "texture": "#missing"}, + "south": {"uv": [2.5, 8, 5, 12], "texture": "#1"}, + "west": {"uv": [0, 8, 2.5, 12], "texture": "#1"}, + "up": {"uv": [0, 0, 2.5, 1.25], "texture": "#missing"}, + "down": {"uv": [0, 0, 2.5, 1.25], "texture": "#missing"} + } + }, + { + "name": "effect", + "from": [10.5, 2, 10.5], + "to": [15.5, 10, 15.5], + "faces": { + "north": {"uv": [0, 0, 2.5, 2], "texture": "#missing"}, + "east": {"uv": [2.5, 4, 5, 8], "texture": "#1"}, + "south": {"uv": [0, 4, 2.5, 8], "texture": "#1"}, + "west": {"uv": [2.5, 4, 5, 6], "texture": "#1"}, + "up": {"uv": [0, 0, 2.5, 1.25], "texture": "#missing"}, + "down": {"uv": [0, 0, 2.5, 1.25], "texture": "#missing"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/energy_servo_multiparttest_whatthefuck.json b/src/main/resources/assets/overdrive_that_matters/models/block/energy_servo_multiparttest_whatthefuck.json new file mode 100644 index 000000000..f09d10e58 --- /dev/null +++ b/src/main/resources/assets/overdrive_that_matters/models/block/energy_servo_multiparttest_whatthefuck.json @@ -0,0 +1,19 @@ +{ + "loader": "forge:composite", + "parts": { + "body": { + "parent": "overdrive_that_matters:block/energy_servo_body", + "transform": { + "translation": [0, 0, 0], + "origin": [0, 0, 0] + } + }, + "effect": { + "parent": "overdrive_that_matters:block/energy_servo_effect", + "transform": { + "translation": [0, 0, 0], + "origin": [0, 0, 0] + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_powered.json b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_powered.json index ae03d34a5..2e897f089 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_powered.json +++ b/src/main/resources/assets/overdrive_that_matters/models/item/energy_sword_powered.json @@ -260,11 +260,11 @@ "from": [7.1, 7, 6.9], "to": [8.8, 29.3, 12], "faces": { - "north": {"uv": [2.45, 1, 3.45, 12], "texture": "#1"}, - "east": {"uv": [0, 1, 2.5, 12], "texture": "#1"}, - "south": {"uv": [6, 1, 7, 12], "texture": "#1"}, - "west": {"uv": [3.5, 1, 6, 12], "texture": "#1"}, - "up": {"uv": [3.5, 0, 6, 1], "rotation": 90, "texture": "#1"}, + "north": {"uv": [2.45, 1, 3.45, 12], "texture": "#1", "emissivity": 15}, + "east": {"uv": [0, 1, 2.5, 12], "texture": "#1", "emissivity": 15}, + "south": {"uv": [6, 1, 7, 12], "texture": "#1", "emissivity": 15}, + "west": {"uv": [3.5, 1, 6, 12], "texture": "#1", "emissivity": 15}, + "up": {"uv": [3.5, 0, 6, 1], "rotation": 90, "texture": "#1", "emissivity": 15}, "down": {"uv": [0, 0, 1, 2.5], "texture": "#missing"} } }, diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_upgrades.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_upgrades.png index f06b97c4e..ce32f5677 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_upgrades.png and b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_upgrades.png differ