From 230c5a8743a1d3b72ac082a0c1c5ad44bfa3cee3 Mon Sep 17 00:00:00 2001 From: BootyToast Date: Sun, 14 Aug 2016 03:44:50 -0400 Subject: [PATCH 1/2] Tweaked empowerer & display stand models. --- .../models/block/blockDisplayStand.json | 121 +++++++++++++ .../models/block/blockEmpowerer.json | 160 +++++++++++++++--- .../textures/blocks/blockDisplayStand.png | Bin 3526 -> 3514 bytes .../textures/blocks/blockEmpowerer.png | Bin 8014 -> 7301 bytes .../textures/blocks/blockEmpowererSide.png | Bin 3118 -> 0 bytes 5 files changed, 261 insertions(+), 20 deletions(-) delete mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockEmpowererSide.png 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 f9ad33917f066531a1b32b5521554423a2cc4833..e8359681b21293c9c1c38b7a03a995d7c2c975b7 100644 GIT binary patch delta 775 zcmV+i1Ni*L8@d~?zzTomNklb3I7=@qr-DjVB?(OXdHBbsFmQq^8k3_5u zg-|8vU%)XV9l*e;iDBf-k%@`_!GR8q5sfh#6d90Ido5}x6hG)queU9|=j^lh%Yc-X ztkD`hPnIk#Et#2-QX;(g6D!{os48jKNInAK)FCPe!tCo0akqcwiShB4#TXeMAIE#o z%6)+?AvFxE6N=(+L?Wml3jO=WD^pX53Z0b>Dk7*V{qV)U!E9M3Z=+@s@GMsbB!n?UW{Kw&co5WH=NmQrS`Qyi&nX?rDov%E{F9iHAM9DcRW#fi7U66Y^oCeL$3ge=SW;?oa_z~}wXxcl=cG1QQQ?0bI9Bq$aW zyE_Bkm^sPSk3ON*Y9S&|T2&SAU%te*_f{zKf_hLBEj@phSPue{3A1ko>R98wXHRZX z6vP-&RmMk#m^oL1fH}jp6b&JeTq0Q_S!ChmY0L}}q0wki*ENks0}q4u4+vkRV|YAcjaP6EQ?O*Oavb%T(7NXn&&H?b7S@$g+$_0|4{JU!!KLk+c8+002ovPDHLk FV1j!Yc18dI delta 788 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 VrIGQo)PUi1bTy4M%G4ge{vT&Q6wLqt delta 5312 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 IM6N<$f-Z{Bd;kCd From 5fed8383fca2b36e82fdf2d937fe35a555e9c9c0 Mon Sep 17 00:00:00 2001 From: BootyToast Date: Sun, 14 Aug 2016 05:40:08 -0400 Subject: [PATCH 2/2] New oil gen texture/model. Top texture not finished. Need canola press,oil and coal generators set up for on/off textures. --- .../mod/blocks/BlockOilGenerator.java | 42 +++++++++ .../blockstates/blockOilGenerator.json | 14 ++- .../models/block/blockOilGenerator.json | 89 ++++++++++++++++++ .../textures/blocks/blockOilGenerator.png | Bin 660 -> 4027 bytes .../blocks/blockOilGenerator.png.mcmeta | 6 ++ 5 files changed, 146 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockOilGenerator.json create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockOilGenerator.png.mcmeta diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java index 7b0c40198..39a8843b8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java @@ -18,7 +18,9 @@ import de.ellpeck.actuallyadditions.mod.proxy.ClientProxy; import de.ellpeck.actuallyadditions.mod.tile.TileEntityOilGenerator; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; +import net.minecraft.block.properties.PropertyInteger; import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; @@ -27,6 +29,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -35,6 +38,8 @@ import java.util.Random; public class BlockOilGenerator extends BlockContainerBase{ + private static final PropertyInteger META = PropertyInteger.create("meta", 0, 7); + public BlockOilGenerator(String name){ super(Material.ROCK, name); this.setHarvestLevel("pickaxe", 0); @@ -45,6 +50,17 @@ public class BlockOilGenerator extends BlockContainerBase{ } + @Override + public boolean isFullCube(IBlockState state){ + return false; + } + + @Override + public boolean isOpaqueCube(IBlockState state){ + return false; + } + + @Override public TileEntity createNewTileEntity(World world, int par2){ return new TileEntityOilGenerator(); @@ -77,6 +93,26 @@ public class BlockOilGenerator extends BlockContainerBase{ return true; } + @Override + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase player, ItemStack stack){ + int rotation = MathHelper.floor_double((double)(player.rotationYaw*4.0F/360.0F)+0.5D) & 3; + + if(rotation == 0){ + world.setBlockState(pos, this.getStateFromMeta(0), 2); + } + if(rotation == 1){ + world.setBlockState(pos, this.getStateFromMeta(3), 2); + } + if(rotation == 2){ + world.setBlockState(pos, this.getStateFromMeta(1), 2); + } + if(rotation == 3){ + world.setBlockState(pos, this.getStateFromMeta(2), 2); + } + + super.onBlockPlacedBy(world, pos, state, player, stack); + } + @Override public EnumRarity getRarity(ItemStack stack){ return EnumRarity.RARE; @@ -87,4 +123,10 @@ public class BlockOilGenerator extends BlockContainerBase{ this.dropInventory(world, pos); super.breakBlock(world, pos, state); } + + @Override + protected PropertyInteger getMetaProperty(){ + return META; + } + } diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockOilGenerator.json b/src/main/resources/assets/actuallyadditions/blockstates/blockOilGenerator.json index 03c8d6e46..d8d0648f6 100644 --- a/src/main/resources/assets/actuallyadditions/blockstates/blockOilGenerator.json +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockOilGenerator.json @@ -1,16 +1,20 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube_bottom_top", + "model": "actuallyadditions:blockOilGenerator", "textures": { - "side": "actuallyadditions:blocks/blockOilGenerator", - "bottom": "actuallyadditions:blocks/blockOilGeneratorBottom", - "top": "actuallyadditions:blocks/blockOilGeneratorTop" + "particle": "actuallyadditions:blocks/blockOilGenerator" }, "transform": "forge:default-block" }, "variants": { "normal": [{}], - "inventory": [{}] + "inventory": [{}], + "meta": { + "0": { "y" : 0 }, + "1": { "y" : 180 }, + "2": { "y" : 270 }, + "3": { "y" : 90 } + } } } \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockOilGenerator.json b/src/main/resources/assets/actuallyadditions/models/block/blockOilGenerator.json new file mode 100644 index 000000000..7e0b9cf7b --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockOilGenerator.json @@ -0,0 +1,89 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + "0": "actuallyadditions:blocks/blockOilGenerator", + "1": "actuallyadditions:blocks/blockCoalGeneratorSide", + "2": "actuallyadditions:blocks/blockCoalGeneratorTop", + "3": "actuallyadditions:blocks/blockCoalGeneratorBottom" + }, + "elements": [ + { + "name": "Cube", + "from": [ 1.0, 0.0, 1.0 ], + "to": [ 15.0, 15.0, 15.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 1.0, 1.0, 15.0, 16.0 ] }, + "east": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 16.0 ] }, + "south": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 16.0 ] }, + "west": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 16.0 ] }, + "up": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 15.0 ], "cullface": "up" }, + "down": { "texture": "#3", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } + } + }, + { + "name": "Outline", + "from": [ 0.0, 0.0, 0.0 ], + "to": [ 1.0, 15.0, 1.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 15.0, 1.0, 16.0, 15.0 ] }, + "east": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] }, + "south": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] }, + "west": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] }, + "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "down": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } + } + }, + { + "name": "Cube", + "from": [ 0.0, 0.0, 15.0 ], + "to": [ 1.0, 15.0, 16.0 ], + "faces": { + "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "east": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] }, + "south": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] }, + "west": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] }, + "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "down": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } + } + }, + { + "name": "Cube", + "from": [ 15.0, 0.0, 15.0 ], + "to": [ 16.0, 15.0, 16.0 ], + "faces": { + "north": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "east": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] }, + "south": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] }, + "west": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] }, + "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "down": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } + } + }, + { + "name": "Cube", + "from": [ 15.0, 0.0, 0.0 ], + "to": [ 16.0, 15.0, 1.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 1.0, 1.0, 15.0 ] }, + "east": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] }, + "south": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] }, + "west": { "texture": "#1", "uv": [ 0.0, 1.0, 1.0, 16.0 ] }, + "up": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "down": { "texture": "#1", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } + } + }, + { + "name": "Cube", + "from": [ 0.0, 15.0, 0.0 ], + "to": [ 16.0, 16.0, 16.0 ], + "faces": { + "north": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "east": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "south": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "west": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "up": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, + "down": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockOilGenerator.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockOilGenerator.png index d1618801bf5bc1930e2e883401327804a1ae0e97..831f0f8d17262d138e6ebd5f7ed4258942aa5d7c 100644 GIT binary patch literal 4027 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