diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockDisplayStand.json b/src/main/resources/assets/actuallyadditions/models/block/blockDisplayStand.json index 1893acda2..0e24231ab 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/blockDisplayStand.json +++ b/src/main/resources/assets/actuallyadditions/models/block/blockDisplayStand.json @@ -149,6 +149,127 @@ "up": { "texture": "#3", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, "down": { "texture": "#3", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } } + }, + { + "name": "Cube", + "from": [ 6.0, 8.0, 6.0 ], + "to": [ 10.0, 9.0, 10.0 ], + "faces": { + "north": { "texture": "#3", "uv": [ 6.0, 6.0, 10.0, 7.0 ], "rotation": 180 }, + "east": { "texture": "#3", "uv": [ 6.0, 9.0, 10.0, 10.0 ] }, + "south": { "texture": "#3", "uv": [ 6.0, 9.0, 10.0, 10.0 ] }, + "west": { "texture": "#3", "uv": [ 6.0, 6.0, 7.0, 10.0 ], "rotation": 270 }, + "up": { "texture": "#3", "uv": [ 6.0, 6.0, 10.0, 10.0 ] }, + "down": { "texture": "#3", "uv": [ 6.0, 6.0, 10.0, 10.0 ] } + } + }, + { + "name": "Cube", + "from": [ 4.0, 8.0, 6.0 ], + "to": [ 6.0, 9.0, 10.0 ], + "rotation": { "origin": [ 6.0, 9.0, 8.0 ], "axis": "z", "angle": 45.0 }, + "faces": { + "north": { "texture": "#3", "uv": [ 6.0, 6.0, 7.0, 7.0 ] }, + "east": { "texture": "#3", "uv": [ 6.0, 6.0, 8.0, 10.0 ], "rotation": 270 }, + "south": { "texture": "#3", "uv": [ 6.0, 9.0, 7.0, 10.0 ] }, + "west": { "texture": "#3", "uv": [ 6.0, 6.0, 8.0, 10.0 ], "rotation": 270 }, + "up": { "texture": "#3", "uv": [ 6.0, 6.0, 8.0, 10.0 ] }, + "down": { "texture": "#3", "uv": [ 6.0, 6.0, 8.0, 10.0 ] } + } + }, + { + "name": "Cube", + "from": [ 10.0, 8.0, 6.0 ], + "to": [ 12.0, 9.0, 10.0 ], + "rotation": { "origin": [ 10.0, 9.0, 8.0 ], "axis": "z", "angle": -45.0 }, + "faces": { + "north": { "texture": "#3", "uv": [ 9.0, 6.0, 10.0, 7.0 ] }, + "east": { "texture": "#3", "uv": [ 9.0, 6.0, 11.0, 10.0 ], "rotation": 90 }, + "south": { "texture": "#3", "uv": [ 9.0, 9.0, 10.0, 10.0 ] }, + "west": { "texture": "#3", "uv": [ 9.0, 6.0, 11.0, 10.0 ], "rotation": 90 }, + "up": { "texture": "#3", "uv": [ 9.0, 6.0, 11.0, 10.0 ] }, + "down": { "texture": "#3", "uv": [ 9.0, 6.0, 11.0, 10.0 ] } + } + }, + { + "name": "Cube", + "from": [ 6.0, 8.0, 10.0 ], + "to": [ 10.0, 9.0, 12.0 ], + "rotation": { "origin": [ 8.0, 9.0, 10.0 ], "axis": "x", "angle": 45.0 }, + "faces": { + "north": { "texture": "#3", "uv": [ 6.0, 9.0, 10.0, 11.0 ] }, + "east": { "texture": "#3", "uv": [ 6.0, 9.0, 7.0, 10.0 ] }, + "south": { "texture": "#3", "uv": [ 6.0, 9.0, 10.0, 11.0 ] }, + "west": { "texture": "#3", "uv": [ 9.0, 9.0, 10.0, 10.0 ] }, + "up": { "texture": "#3", "uv": [ 6.0, 9.0, 10.0, 11.0 ] }, + "down": { "texture": "#3", "uv": [ 6.0, 9.0, 10.0, 11.0 ] } + } + }, + { + "name": "Cube", + "from": [ 6.0, 8.0, 4.0 ], + "to": [ 10.0, 9.0, 6.0 ], + "rotation": { "origin": [ 8.0, 9.0, 6.0 ], "axis": "x", "angle": -45.0 }, + "faces": { + "north": { "texture": "#3", "uv": [ 6.0, 6.0, 10.0, 8.0 ] }, + "east": { "texture": "#3", "uv": [ 6.0, 6.0, 7.0, 7.0 ] }, + "south": { "texture": "#3", "uv": [ 6.0, 6.0, 10.0, 8.0 ] }, + "west": { "texture": "#3", "uv": [ 9.0, 6.0, 10.0, 7.0 ] }, + "up": { "texture": "#3", "uv": [ 6.0, 6.0, 10.0, 8.0 ] }, + "down": { "texture": "#3", "uv": [ 6.0, 6.0, 10.0, 8.0 ] } + } + }, + { + "name": "Cube", + "from": [ 0.0, 6.0, 0.0 ], + "to": [ 1.0, 9.0, 1.0 ], + "faces": { + "north": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, + "east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, + "south": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, + "west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, + "up": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "down": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } + } + }, + { + "name": "Cube", + "from": [ 15.0, 6.0, 0.0 ], + "to": [ 16.0, 9.0, 1.0 ], + "faces": { + "north": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, + "east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, + "south": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, + "west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, + "up": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "down": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } + } + }, + { + "name": "Cube", + "from": [ 15.0, 6.0, 15.0 ], + "to": [ 16.0, 9.0, 16.0 ], + "faces": { + "north": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, + "east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, + "south": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, + "west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, + "up": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "down": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } + } + }, + { + "name": "Cube", + "from": [ 0.0, 6.0, 15.0 ], + "to": [ 1.0, 9.0, 16.0 ], + "faces": { + "north": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, + "east": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, + "south": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, + "west": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 3.0 ] }, + "up": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "down": { "texture": "#3", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } + } } ] } \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockEmpowerer.json b/src/main/resources/assets/actuallyadditions/models/block/blockEmpowerer.json index a01aa2bfd..03b58132a 100644 --- a/src/main/resources/assets/actuallyadditions/models/block/blockEmpowerer.json +++ b/src/main/resources/assets/actuallyadditions/models/block/blockEmpowerer.json @@ -3,8 +3,7 @@ "textures": { "0": "actuallyadditions:blocks/blockCoalGeneratorSide", "1": "actuallyadditions:blocks/blockMiscIronCasing", - "2": "actuallyadditions:blocks/blockAtomicReconstructorTop", - "3": "actuallyadditions:blocks/blockEmpowerer" + "2": "actuallyadditions:blocks/blockEmpowerer" }, "elements": [ { @@ -90,12 +89,12 @@ "from": [ 2.0, 6.0, 0.0 ], "to": [ 14.0, 7.0, 16.0 ], "faces": { - "north": { "texture": "#2", "uv": [ 2.0, 0.0, 14.0, 1.0 ] }, - "east": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, - "south": { "texture": "#2", "uv": [ 2.0, 0.0, 14.0, 1.0 ] }, - "west": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, - "up": { "texture": "#2", "uv": [ 2.0, 0.0, 14.0, 16.0 ] }, - "down": { "texture": "#2", "uv": [ 2.0, 0.0, 14.0, 16.0 ] } + "north": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 1.0 ] }, + "east": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "south": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 1.0 ] }, + "west": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "up": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 16.0 ] }, + "down": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 16.0 ] } } }, { @@ -103,12 +102,12 @@ "from": [ 0.0, 6.0, 2.0 ], "to": [ 16.0, 7.0, 14.0 ], "faces": { - "north": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, - "east": { "texture": "#2", "uv": [ 2.0, 0.0, 14.0, 1.0 ] }, - "south": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, - "west": { "texture": "#2", "uv": [ 2.0, 0.0, 14.0, 1.0 ] }, - "up": { "texture": "#2", "uv": [ 0.0, 2.0, 16.0, 14.0 ] }, - "down": { "texture": "#2", "uv": [ 0.0, 2.0, 16.0, 14.0 ] } + "north": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "east": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 1.0 ] }, + "south": { "texture": "#1", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "west": { "texture": "#1", "uv": [ 2.0, 0.0, 14.0, 1.0 ] }, + "up": { "texture": "#1", "uv": [ 0.0, 2.0, 16.0, 14.0 ] }, + "down": { "texture": "#1", "uv": [ 0.0, 2.0, 16.0, 14.0 ] } } }, { @@ -116,12 +115,12 @@ "from": [ 1.0, 7.0, 1.0 ], "to": [ 15.0, 8.0, 15.0 ], "faces": { - "north": { "texture": "#3", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, - "east": { "texture": "#3", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }, - "south": { "texture": "#3", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }, - "west": { "texture": "#3", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }, - "up": { "texture": "#3", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, - "down": { "texture": "#3", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } + "north": { "texture": "#2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "east": { "texture": "#2", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }, + "south": { "texture": "#2", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }, + "west": { "texture": "#2", "uv": [ 1.0, 0.0, 15.0, 1.0 ] }, + "up": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, + "down": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } } }, { @@ -175,6 +174,127 @@ "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 14.0 ] }, "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 14.0 ] } } + }, + { + "name": "Cube", + "from": [ 3.0, 8.0, 5.0 ], + "to": [ 5.0, 9.0, 11.0 ], + "rotation": { "origin": [ 5.0, 9.0, 8.0 ], "axis": "z", "angle": 45.0 }, + "faces": { + "north": { "texture": "#1", "uv": [ 5.0, 0.0, 6.0, 1.0 ] }, + "east": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] }, + "south": { "texture": "#1", "uv": [ 10.0, 7.0, 11.0, 8.0 ] }, + "west": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] }, + "up": { "texture": "#1", "uv": [ 5.0, 7.0, 6.0, 13.0 ], "rotation": 180 }, + "down": { "texture": "#1", "uv": [ 5.0, 3.0, 11.0, 4.0 ] } + } + }, + { + "name": "Cube", + "from": [ 11.0, 8.0, 5.0 ], + "to": [ 13.0, 9.0, 11.0 ], + "rotation": { "origin": [ 11.0, 9.0, 8.0 ], "axis": "z", "angle": -45.0 }, + "faces": { + "north": { "texture": "#1", "uv": [ 4.0, 8.0, 5.0, 9.0 ] }, + "east": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] }, + "south": { "texture": "#1", "uv": [ 11.0, 7.0, 12.0, 8.0 ] }, + "west": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] }, + "up": { "texture": "#1", "uv": [ 4.0, 5.0, 5.0, 11.0 ], "rotation": 180 }, + "down": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ], "rotation": 90 } + } + }, + { + "name": "Cube", + "from": [ 5.0, 8.0, 3.0 ], + "to": [ 11.0, 9.0, 5.0 ], + "rotation": { "origin": [ 8.0, 9.0, 5.0 ], "axis": "x", "angle": -45.0 }, + "faces": { + "north": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] }, + "east": { "texture": "#1", "uv": [ 10.0, 0.0, 11.0, 1.0 ] }, + "south": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] }, + "west": { "texture": "#1", "uv": [ 5.0, 0.0, 6.0, 1.0 ] }, + "up": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] }, + "down": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] } + } + }, + { + "name": "Cube", + "from": [ 5.0, 8.0, 11.0 ], + "to": [ 11.0, 9.0, 13.0 ], + "rotation": { "origin": [ 8.0, 9.0, 11.0 ], "axis": "x", "angle": 45.0 }, + "faces": { + "north": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] }, + "east": { "texture": "#1", "uv": [ 5.0, 0.0, 6.0, 1.0 ] }, + "south": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] }, + "west": { "texture": "#1", "uv": [ 10.0, 0.0, 11.0, 1.0 ] }, + "up": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] }, + "down": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] } + } + }, + { + "name": "Cube", + "from": [ 5.0, 8.0, 5.0 ], + "to": [ 11.0, 9.0, 11.0 ], + "faces": { + "north": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ] }, + "east": { "texture": "#1", "uv": [ 4.0, 6.0, 5.0, 12.0 ], "rotation": 90 }, + "south": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 1.0 ], "rotation": 180 }, + "west": { "texture": "#1", "uv": [ 5.0, 3.0, 6.0, 9.0 ], "rotation": 90 }, + "up": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 6.0 ] }, + "down": { "texture": "#1", "uv": [ 5.0, 0.0, 11.0, 6.0 ] } + } + }, + { + "name": "Cube", + "from": [ 0.0, 6.0, 0.0 ], + "to": [ 1.0, 9.0, 1.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }, + "east": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }, + "south": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }, + "west": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }, + "up": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }, + "down": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] } + } + }, + { + "name": "Cube", + "from": [ 15.0, 6.0, 0.0 ], + "to": [ 16.0, 9.0, 1.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }, + "east": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }, + "south": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }, + "west": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }, + "up": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }, + "down": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] } + } + }, + { + "name": "Cube", + "from": [ 15.0, 6.0, 15.0 ], + "to": [ 16.0, 9.0, 16.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }, + "east": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }, + "south": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }, + "west": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }, + "up": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }, + "down": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] } + } + }, + { + "name": "Cube", + "from": [ 0.0, 6.0, 15.0 ], + "to": [ 1.0, 9.0, 16.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }, + "east": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }, + "south": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }, + "west": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }, + "up": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] }, + "down": { "texture": "#0", "uv": [ 7.0, 0.0, 8.0, 1.0 ] } + } } ] } \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockDisplayStand.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockDisplayStand.png index f9ad33917..e8359681b 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/blockDisplayStand.png and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockDisplayStand.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockEmpowerer.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockEmpowerer.png index 23de613c9..b98c8c80a 100644 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/blockEmpowerer.png and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockEmpowerer.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockEmpowererSide.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockEmpowererSide.png deleted file mode 100644 index 7a09d61c2..000000000 Binary files a/src/main/resources/assets/actuallyadditions/textures/blocks/blockEmpowererSide.png and /dev/null differ