diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/battery_bank.json b/src/main/resources/assets/overdrive_that_matters/models/block/battery_bank.json index fa97e8bbd..c8e2cc246 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/battery_bank.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/battery_bank.json @@ -1,7 +1,7 @@ { - "parent": "block/block", + "texture_size": [32, 32], "textures": { - "1": "overdrive_that_matters:block/batterybank_frame", + "0": "overdrive_that_matters:block/batterybank_frame", "particle": "overdrive_that_matters:block/batterybank_frame" }, "elements": [ @@ -10,12 +10,12 @@ "from": [14, 0, 0], "to": [16, 2, 16], "faces": { - "north": {"uv": [8, 1, 9, 2], "texture": "#1"}, - "east": {"uv": [8, 1, 16, 2], "texture": "#1"}, - "south": {"uv": [15, 1, 16, 2], "texture": "#1"}, - "west": {"uv": [8, 1, 16, 2], "texture": "#1"}, - "up": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#1"}, - "down": {"uv": [8, 2, 16, 3], "rotation": 90, "texture": "#1"} + "north": {"uv": [8, 1, 9, 2], "texture": "#0"}, + "east": {"uv": [8, 1, 16, 2], "texture": "#0"}, + "south": {"uv": [15, 1, 16, 2], "texture": "#0"}, + "west": {"uv": [8, 1, 16, 2], "texture": "#0"}, + "up": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8, 2, 16, 3], "rotation": 90, "texture": "#0"} } }, { @@ -23,12 +23,12 @@ "from": [0, 0, 0], "to": [2, 2, 16], "faces": { - "north": {"uv": [8, 1, 9, 2], "texture": "#1"}, - "east": {"uv": [8, 1, 16, 2], "texture": "#1"}, - "south": {"uv": [15, 1, 16, 2], "texture": "#1"}, - "west": {"uv": [8, 1, 16, 2], "texture": "#1"}, - "up": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#1"}, - "down": {"uv": [8, 2, 16, 3], "rotation": 90, "texture": "#1"} + "north": {"uv": [8, 1, 9, 2], "texture": "#0"}, + "east": {"uv": [8, 1, 16, 2], "texture": "#0"}, + "south": {"uv": [15, 1, 16, 2], "texture": "#0"}, + "west": {"uv": [8, 1, 16, 2], "texture": "#0"}, + "up": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8, 2, 16, 3], "rotation": 90, "texture": "#0"} } }, { @@ -36,12 +36,12 @@ "from": [2, 0, 0], "to": [14, 2, 2], "faces": { - "north": {"uv": [9, 1, 15, 2], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 2], "texture": "#1"}, - "south": {"uv": [9, 1, 15, 2], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 2], "texture": "#1"}, - "up": {"uv": [9, 0, 15, 1], "texture": "#1"}, - "down": {"uv": [9, 2, 15, 3], "texture": "#1"} + "north": {"uv": [9, 1, 15, 2], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "south": {"uv": [9, 1, 15, 2], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "up": {"uv": [9, 0, 15, 1], "texture": "#0"}, + "down": {"uv": [9, 2, 15, 3], "texture": "#0"} } }, { @@ -49,12 +49,12 @@ "from": [2, 0, 14], "to": [14, 2, 16], "faces": { - "north": {"uv": [9, 1, 15, 2], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 2], "texture": "#1"}, - "south": {"uv": [9, 1, 15, 2], "texture": "#1"}, - "west": {"uv": [0, 0, 2, 2], "texture": "#1"}, - "up": {"uv": [9, 0, 15, 1], "texture": "#1"}, - "down": {"uv": [9, 2, 15, 3], "texture": "#1"} + "north": {"uv": [9, 1, 15, 2], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "south": {"uv": [9, 1, 15, 2], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "up": {"uv": [9, 0, 15, 1], "texture": "#0"}, + "down": {"uv": [9, 2, 15, 3], "texture": "#0"} } }, { @@ -62,12 +62,12 @@ "from": [2, 14, 0], "to": [14, 16, 2], "faces": { - "north": {"uv": [9, 1, 15, 2], "rotation": 180, "texture": "#1"}, - "east": {"uv": [0, 0, 2, 2], "texture": "#1"}, - "south": {"uv": [9, 1, 15, 2], "rotation": 180, "texture": "#1"}, - "west": {"uv": [0, 0, 2, 2], "texture": "#1"}, - "up": {"uv": [9, 2, 15, 3], "texture": "#1"}, - "down": {"uv": [9, 0, 15, 1], "texture": "#1"} + "north": {"uv": [9, 1, 15, 2], "rotation": 180, "texture": "#0"}, + "east": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "south": {"uv": [9, 1, 15, 2], "rotation": 180, "texture": "#0"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "up": {"uv": [9, 2, 15, 3], "texture": "#0"}, + "down": {"uv": [9, 0, 15, 1], "texture": "#0"} } }, { @@ -75,12 +75,12 @@ "from": [0, 14, 0], "to": [2, 16, 16], "faces": { - "north": {"uv": [15, 0, 16, 1], "texture": "#1"}, - "east": {"uv": [8, 0, 16, 2], "texture": "#1"}, - "south": {"uv": [8, 0, 9, 1], "texture": "#1"}, - "west": {"uv": [8, 1, 16, 2], "rotation": 180, "texture": "#1"}, - "up": {"uv": [8, 2, 16, 3], "rotation": 90, "texture": "#1"}, - "down": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#1"} + "north": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "east": {"uv": [8, 0, 16, 2], "texture": "#0"}, + "south": {"uv": [8, 0, 9, 1], "texture": "#0"}, + "west": {"uv": [8, 1, 16, 2], "rotation": 180, "texture": "#0"}, + "up": {"uv": [8, 2, 16, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#0"} } }, { @@ -88,12 +88,12 @@ "from": [2, 14, 14], "to": [14, 16, 16], "faces": { - "north": {"uv": [9, 0, 15, 2], "texture": "#1"}, - "east": {"uv": [0, 0, 2, 2], "texture": "#1"}, - "south": {"uv": [9, 1, 15, 2], "rotation": 180, "texture": "#1"}, - "west": {"uv": [0, 0, 2, 2], "texture": "#1"}, - "up": {"uv": [9, 2, 15, 3], "texture": "#1"}, - "down": {"uv": [9, 0, 15, 1], "texture": "#1"} + "north": {"uv": [9, 0, 15, 2], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "south": {"uv": [9, 1, 15, 2], "rotation": 180, "texture": "#0"}, + "west": {"uv": [0, 0, 2, 2], "texture": "#0"}, + "up": {"uv": [9, 2, 15, 3], "texture": "#0"}, + "down": {"uv": [9, 0, 15, 1], "texture": "#0"} } }, { @@ -101,12 +101,12 @@ "from": [14, 14, 0], "to": [16, 16, 16], "faces": { - "north": {"uv": [8, 0, 9, 1], "texture": "#1"}, - "east": {"uv": [8, 1, 16, 2], "rotation": 180, "texture": "#1"}, - "south": {"uv": [15, 0, 16, 1], "texture": "#1"}, - "west": {"uv": [8, 0, 16, 2], "texture": "#1"}, - "up": {"uv": [8, 2, 16, 3], "rotation": 90, "texture": "#1"}, - "down": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#1"} + "north": {"uv": [8, 0, 9, 1], "texture": "#0"}, + "east": {"uv": [8, 1, 16, 2], "rotation": 180, "texture": "#0"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#0"}, + "west": {"uv": [8, 0, 16, 2], "texture": "#0"}, + "up": {"uv": [8, 2, 16, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8, 0, 16, 1], "rotation": 90, "texture": "#0"} } }, { @@ -114,121 +114,176 @@ "from": [1, 1, 7], "to": [15, 15, 9], "faces": { - "north": {"uv": [0.5, 0.5, 7.5, 7.5], "texture": "#1"}, - "east": {"uv": [0.5, 0, 1.5, 7.5], "texture": "#1"}, - "south": {"uv": [0.5, 0.5, 7.5, 7.5], "texture": "#1"}, - "west": {"uv": [0.5, 0, 1.5, 7.5], "texture": "#1"}, - "up": {"uv": [0.5, 0, 7.5, 1], "rotation": 180, "texture": "#1"}, - "down": {"uv": [0.5, 6.5, 7.5, 7.5], "texture": "#1"} + "north": {"uv": [0.5, 0.5, 7.5, 7.5], "texture": "#0"}, + "east": {"uv": [0.5, 0, 1.5, 7.5], "texture": "#0"}, + "south": {"uv": [0.5, 0.5, 7.5, 7.5], "texture": "#0"}, + "west": {"uv": [0.5, 0, 1.5, 7.5], "texture": "#0"}, + "up": {"uv": [0.5, 0, 7.5, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0.5, 6.5, 7.5, 7.5], "texture": "#0"} } }, { "from": [2, 0.5, 2], "to": [14, 1.5, 14], "faces": { - "north": {"uv": [0, 0, 6, 0.5], "texture": "#missing"}, - "east": {"uv": [0, 0, 6, 0.5], "texture": "#missing"}, - "south": {"uv": [0, 0, 6, 0.5], "texture": "#missing"}, - "west": {"uv": [0, 0, 6, 0.5], "texture": "#missing"}, - "up": {"uv": [10, 3, 16, 9], "texture": "#1"}, - "down": {"uv": [10, 3, 16, 9], "texture": "#1"} + "north": {"uv": [0, 0, 6, 0.5], "texture": "#0"}, + "east": {"uv": [0, 0, 6, 0.5], "texture": "#0"}, + "south": {"uv": [0, 0, 6, 0.5], "texture": "#0"}, + "west": {"uv": [0, 0, 6, 0.5], "texture": "#0"}, + "up": {"uv": [10, 3, 16, 9], "texture": "#0"}, + "down": {"uv": [10, 3, 16, 9], "texture": "#0"} } }, { "from": [2, 14.5, 2], "to": [14, 15.5, 14], "faces": { - "north": {"uv": [0, 0, 6, 0.5], "texture": "#missing"}, - "east": {"uv": [0, 0, 6, 0.5], "texture": "#missing"}, - "south": {"uv": [0, 0, 6, 0.5], "texture": "#missing"}, - "west": {"uv": [0, 0, 6, 0.5], "texture": "#missing"}, - "up": {"uv": [10, 3, 16, 9], "texture": "#1"}, - "down": {"uv": [10, 3, 16, 9], "texture": "#1"} + "north": {"uv": [0, 0, 6, 0.5], "texture": "#0"}, + "east": {"uv": [0, 0, 6, 0.5], "texture": "#0"}, + "south": {"uv": [0, 0, 6, 0.5], "texture": "#0"}, + "west": {"uv": [0, 0, 6, 0.5], "texture": "#0"}, + "up": {"uv": [10, 3, 16, 9], "texture": "#0"}, + "down": {"uv": [10, 3, 16, 9], "texture": "#0"} } }, { - "from": [3, 3, 0], - "to": [13, 13, 3], + "from": [5, 5, 0], + "to": [11, 11, 3], "faces": { - "north": {"uv": [0.5, 11.5, 4.5, 15.5], "texture": "#1"}, - "east": {"uv": [6.5, 11.5, 5, 15.5], "texture": "#1"}, - "south": {"uv": [7, 11.5, 11, 15.5], "texture": "#1"}, - "west": {"uv": [5, 11.5, 6.5, 15.5], "texture": "#1"}, - "up": {"uv": [5, 11.5, 6.5, 15.5], "rotation": 90, "texture": "#1"}, - "down": {"uv": [5, 11.5, 6.5, 15.5], "rotation": 270, "texture": "#1"} + "north": {"uv": [0, 8, 3, 11], "texture": "#0"}, + "east": {"uv": [4, 8, 3, 11], "texture": "#0"}, + "south": {"uv": [4, 8, 7, 11], "texture": "#0"}, + "west": {"uv": [3, 8, 4, 11], "texture": "#0"}, + "up": {"uv": [3, 8, 4, 11], "rotation": 90, "texture": "#0"}, + "down": {"uv": [3, 8, 4, 11], "rotation": 270, "texture": "#0"} } }, { "from": [1, 2, 2], "to": [2, 14, 4], "faces": { - "north": {"uv": [11.5, 10, 12, 16], "texture": "#1"}, - "east": {"uv": [11.5, 10, 12.5, 16], "texture": "#1"}, - "south": {"uv": [12, 10, 12.5, 16], "texture": "#1"}, - "west": {"uv": [11.5, 10, 12.5, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "texture": "#missing"}, - "down": {"uv": [0, 0, 0.5, 1], "texture": "#missing"} + "north": {"uv": [11.5, 10, 12, 16], "texture": "#0"}, + "east": {"uv": [11.5, 10, 12.5, 16], "texture": "#0"}, + "south": {"uv": [12, 10, 12.5, 16], "texture": "#0"}, + "west": {"uv": [11.5, 10, 12.5, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 0.5, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 1], "texture": "#0"} } }, { "from": [1, 2, 12], "to": [2, 14, 14], "faces": { - "north": {"uv": [11.5, 10, 12, 16], "texture": "#1"}, - "east": {"uv": [11.5, 10, 12.5, 16], "texture": "#1"}, - "south": {"uv": [12, 10, 12.5, 16], "texture": "#1"}, - "west": {"uv": [11.5, 10, 12.5, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "texture": "#missing"}, - "down": {"uv": [0, 0, 0.5, 1], "texture": "#missing"} + "north": {"uv": [11.5, 10, 12, 16], "texture": "#0"}, + "east": {"uv": [11.5, 10, 12.5, 16], "texture": "#0"}, + "south": {"uv": [12, 10, 12.5, 16], "texture": "#0"}, + "west": {"uv": [11.5, 10, 12.5, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 0.5, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 1], "texture": "#0"} } }, { "from": [14, 2, 12], "to": [15, 14, 14], "faces": { - "north": {"uv": [11.5, 10, 12, 16], "texture": "#1"}, - "east": {"uv": [11.5, 10, 12.5, 16], "texture": "#1"}, - "south": {"uv": [12, 10, 12.5, 16], "texture": "#1"}, - "west": {"uv": [11.5, 10, 12.5, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "texture": "#missing"}, - "down": {"uv": [0, 0, 0.5, 1], "texture": "#missing"} + "north": {"uv": [11.5, 10, 12, 16], "texture": "#0"}, + "east": {"uv": [11.5, 10, 12.5, 16], "texture": "#0"}, + "south": {"uv": [12, 10, 12.5, 16], "texture": "#0"}, + "west": {"uv": [11.5, 10, 12.5, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 0.5, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 1], "texture": "#0"} } }, { "from": [14, 2, 2], "to": [15, 14, 4], "faces": { - "north": {"uv": [11.5, 10, 12, 16], "texture": "#1"}, - "east": {"uv": [11.5, 10, 12.5, 16], "texture": "#1"}, - "south": {"uv": [12, 10, 12.5, 16], "texture": "#1"}, - "west": {"uv": [11.5, 10, 12.5, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 0.5, 1], "texture": "#missing"}, - "down": {"uv": [0, 0, 0.5, 1], "texture": "#missing"} + "north": {"uv": [11.5, 10, 12, 16], "texture": "#0"}, + "east": {"uv": [11.5, 10, 12.5, 16], "texture": "#0"}, + "south": {"uv": [12, 10, 12.5, 16], "texture": "#0"}, + "west": {"uv": [11.5, 10, 12.5, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 0.5, 1], "texture": "#0"}, + "down": {"uv": [0, 0, 0.5, 1], "texture": "#0"} + } + }, + { + "from": [2, 10, 2.5], + "to": [14, 12, 3.5], + "faces": { + "north": {"uv": [11.5, 10, 12.5, 16], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [11.5, 10, 12.5, 16], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [11.5, 10, 12, 16], "rotation": 90, "texture": "#0"}, + "down": {"uv": [11.5, 10, 12, 16], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [2, 4, 2.5], + "to": [14, 6, 3.5], + "faces": { + "north": {"uv": [11.5, 10, 12.5, 16], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "south": {"uv": [11.5, 10, 12.5, 16], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#0"}, + "up": {"uv": [11.5, 10, 12, 16], "rotation": 90, "texture": "#0"}, + "down": {"uv": [11.5, 10, 12, 16], "rotation": 90, "texture": "#0"} } }, { "from": [0, 2, 6], "to": [2, 14, 10], "faces": { - "north": {"uv": [14.5, 10, 15.5, 16], "texture": "#1"}, - "east": {"uv": [12.5, 10, 14.5, 16], "texture": "#1"}, - "south": {"uv": [14.5, 10, 15.5, 16], "texture": "#1"}, - "west": {"uv": [12.5, 10, 14.5, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 1, 2], "texture": "#missing"}, - "down": {"uv": [0, 0, 1, 2], "texture": "#missing"} + "north": {"uv": [14.5, 10, 15.5, 16], "texture": "#0"}, + "east": {"uv": [12.5, 10, 14.5, 16], "texture": "#0"}, + "south": {"uv": [14.5, 10, 15.5, 16], "texture": "#0"}, + "west": {"uv": [12.5, 10, 14.5, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 2], "texture": "#0"} } }, { "from": [14, 2, 6], "to": [16, 14, 10], "faces": { - "north": {"uv": [14.5, 10, 15.5, 16], "texture": "#1"}, - "east": {"uv": [12.5, 10, 14.5, 16], "texture": "#1"}, - "south": {"uv": [14.5, 10, 15.5, 16], "texture": "#1"}, - "west": {"uv": [12.5, 10, 14.5, 16], "texture": "#1"}, - "up": {"uv": [0, 0, 1, 2], "texture": "#missing"}, - "down": {"uv": [0, 0, 1, 2], "texture": "#missing"} + "north": {"uv": [14.5, 10, 15.5, 16], "texture": "#0"}, + "east": {"uv": [12.5, 10, 14.5, 16], "texture": "#0"}, + "south": {"uv": [14.5, 10, 15.5, 16], "texture": "#0"}, + "west": {"uv": [12.5, 10, 14.5, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 1, 2], "texture": "#0"}, + "down": {"uv": [0, 0, 1, 2], "texture": "#0"} } } - ] + ], + "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/textures/block/android_station.png b/src/main/resources/assets/overdrive_that_matters/textures/block/android_station.png index e198859cf..e63176da7 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/android_station.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/android_station.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_offline.png b/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_offline.png index 5d2bef604..faee6d94e 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_offline.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_offline.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame.png b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame.png index 7d03dbf1c..223803a70 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame.png b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame.png index 97841ad70..223803a70 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame.png and b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame.png differ