From b1c5c55b2903015968d15a2407894730169ba133 Mon Sep 17 00:00:00 2001 From: BootyToast Date: Wed, 10 Aug 2016 00:50:48 -0400 Subject: [PATCH] New reconstructor, coal gen, & display stand textures/models. --- .../blockstates/blockAtomicReconstructor.json | 48 ++--- .../blockstates/blockCoalGenerator.json | 3 +- .../blockstates/blockDisplayStand.json | 3 +- .../block/blockAtomicReconstructor.json | 179 ++++++++++++++++++ .../models/block/blockCoalGenerator.json | 141 ++++++++++++++ .../models/block/blockDisplayStand.json | 154 +++++++++++++++ .../blocks/blockAtomicReconstructorFront.png | Bin 3369 -> 3386 bytes .../textures/blocks/blockCoalGenerator.png | Bin 3431 -> 3489 bytes .../blocks/blockCoalGeneratorBottom.png | Bin 3141 -> 3222 bytes .../blocks/blockCoalGeneratorSide.png | Bin 3133 -> 3212 bytes .../textures/blocks/blockCoalGeneratorTop.png | Bin 3327 -> 3368 bytes .../textures/blocks/blockDisplayStand.png | Bin 486 -> 3526 bytes 12 files changed, 502 insertions(+), 26 deletions(-) create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockAtomicReconstructor.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockCoalGenerator.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/blockDisplayStand.json diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockAtomicReconstructor.json b/src/main/resources/assets/actuallyadditions/blockstates/blockAtomicReconstructor.json index 323f41ede..0f9979aa1 100644 --- a/src/main/resources/assets/actuallyadditions/blockstates/blockAtomicReconstructor.json +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockAtomicReconstructor.json @@ -1,28 +1,28 @@ { - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube", - "textures": { - "particle": "actuallyadditions:blocks/blockAtomicReconstructor", - "down": "#particle", - "up": "actuallyadditions:blocks/blockAtomicReconstructorTop", - "south": "#particle", - "north": "actuallyadditions:blocks/blockAtomicReconstructorFront", - "east": "#particle", - "west": "#particle" + "forge_marker": 1, + "defaults": { + "model": "actuallyadditions:blockAtomicReconstructor", + "textures": { + "particle": "actuallyadditions:blocks/blockAtomicReconstructor", + "down": "#particle", + "up": "actuallyadditions:blocks/blockAtomicReconstructorTop", + "south": "#particle", + "north": "actuallyadditions:blocks/blockAtomicReconstructorFront", + "east": "#particle", + "west": "#particle" + }, + "transform": "forge:default-block" }, - "transform": "forge:default-block" - }, - "variants": { - "normal": [{}], - "inventory": [{}], - "meta": { - "0": { "x" : 90 }, - "1": { "x" : 270 }, - "2": { "y" : 0 }, - "3": { "y" : 180 }, - "4": { "y" : 270 }, - "5": { "y" : 90 } + "variants": { + "normal": [{}], + "inventory": [{}], + "meta": { + "0": { "x" : 90 }, + "1": { "x" : 270 }, + "2": { "y" : 0 }, + "3": { "y" : 180 }, + "4": { "y" : 270 }, + "5": { "y" : 90 } + } } - } } \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockCoalGenerator.json b/src/main/resources/assets/actuallyadditions/blockstates/blockCoalGenerator.json index 506064340..f542c8f97 100644 --- a/src/main/resources/assets/actuallyadditions/blockstates/blockCoalGenerator.json +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockCoalGenerator.json @@ -1,8 +1,9 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:cube_bottom_top", + "model": "actuallyadditions:blockCoalGenerator", "textures": { + "particle": "actuallyadditions:blocks/blockCoalGenerator", "side": "actuallyadditions:blocks/blockCoalGeneratorSide", "bottom": "actuallyadditions:blocks/blockCoalGeneratorBottom", "top": "actuallyadditions:blocks/blockCoalGeneratorTop", diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockDisplayStand.json b/src/main/resources/assets/actuallyadditions/blockstates/blockDisplayStand.json index 3540b7e6b..223f7aece 100644 --- a/src/main/resources/assets/actuallyadditions/blockstates/blockDisplayStand.json +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockDisplayStand.json @@ -1,8 +1,9 @@ { "forge_marker": 1, "defaults": { - "model": "minecraft:half_slab", + "model": "actuallyadditions:blockDisplayStand", "textures": { + "particle": "actuallyadditions:blocks/blockGiantChestTop", "bottom": "actuallyadditions:blocks/blockDisplayStand", "top": "#bottom", "side": "actuallyadditions:blocks/blockDisplayStandSide" diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockAtomicReconstructor.json b/src/main/resources/assets/actuallyadditions/models/block/blockAtomicReconstructor.json new file mode 100644 index 000000000..7249f2fd3 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockAtomicReconstructor.json @@ -0,0 +1,179 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + "0": "actuallyadditions:blocks/blockAtomicReconstructorFront", + "1": "actuallyadditions:blocks/blockAtomicReconstructor", + "2": "actuallyadditions:blocks/blockAtomicReconstructorTop" + }, + "elements": [ + { + "name": "Base", + "from": [ 1.0, 1.0, 0.0 ], + "to": [ 15.0, 15.0, 15.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, + "east": { "texture": "#1", "uv": [ 1.0, 1.0, 16.0, 15.0 ] }, + "south": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, + "west": { "texture": "#1", "uv": [ 0.0, 1.0, 15.0, 15.0 ] }, + "up": { "texture": "#2", "uv": [ 1.0, 0.0, 15.0, 15.0 ] }, + "down": { "texture": "#2", "uv": [ 1.0, 1.0, 15.0, 16.0 ] } + } + }, + { + "name": "OutlineBottom", + "from": [ 0.0, 0.0, 15.0 ], + "to": [ 16.0, 1.0, 16.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] } + } + }, + { + "name": "OutlineBottom2", + "from": [ 0.0, 0.0, 0.0 ], + "to": [ 16.0, 1.0, 1.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] } + } + }, + { + "name": "OutlineBottom3", + "from": [ 15.0, 0.0, 1.0 ], + "to": [ 16.0, 1.0, 15.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "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": "OutlineBottom4", + "from": [ 0.0, 0.0, 1.0 ], + "to": [ 1.0, 1.0, 15.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "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": "OutlineTop", + "from": [ 0.0, 15.0, 15.0 ], + "to": [ 16.0, 16.0, 16.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] } + } + }, + { + "name": "OutlineTop2", + "from": [ 0.0, 15.0, 0.0 ], + "to": [ 16.0, 16.0, 1.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] } + } + }, + { + "name": "OutlineTop3", + "from": [ 15.0, 15.0, 1.0 ], + "to": [ 16.0, 16.0, 15.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "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": "OutlineTop4", + "from": [ 0.0, 15.0, 1.0 ], + "to": [ 1.0, 16.0, 15.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "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": "OutlineCorner", + "from": [ 0.0, 1.0, 0.0 ], + "to": [ 1.0, 15.0, 1.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 1.0, 1.0, 15.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 2.0, 1.0, 16.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 1.0, 1.0, 15.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 14.0 ] }, + "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } + } + }, + { + "name": "OutlineCorner2", + "from": [ 15.0, 1.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": "#0", "uv": [ 15.0, 1.0, 16.0, 15.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 1.0, 1.0, 15.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 14.0 ] }, + "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } + } + }, + { + "name": "OutlineCorner3", + "from": [ 15.0, 1.0, 15.0 ], + "to": [ 16.0, 15.0, 16.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 1.0, 1.0, 15.0 ] }, + "east": { "texture": "#0", "uv": [ 15.0, 1.0, 16.0, 15.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 1.0, 1.0, 15.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 14.0 ] }, + "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "down": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] } + } + }, + { + "name": "OutlineCorner4", + "from": [ 0.0, 1.0, 15.0 ], + "to": [ 1.0, 15.0, 16.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 15.0, 1.0, 16.0, 15.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 2.0, 1.0, 16.0 ] }, + "south": { "texture": "#0", "uv": [ 15.0, 1.0, 16.0, 15.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 14.0 ] }, + "up": { "texture": "#0", "uv": [ 0.0, 0.0, 1.0, 1.0 ] }, + "down": { "texture": "#0", "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/blockCoalGenerator.json b/src/main/resources/assets/actuallyadditions/models/block/blockCoalGenerator.json new file mode 100644 index 000000000..d79ad3485 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockCoalGenerator.json @@ -0,0 +1,141 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + "0": "actuallyadditions:blocks/blockCoalGenerator", + "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 ] } + } + }, + { + "name": "Cube", + "from": [ 1.0, 0.0, 0.0 ], + "to": [ 15.0, 1.0, 1.0 ], + "faces": { + "north": { "texture": "#2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "east": { "texture": "#2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "south": { "texture": "#2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "west": { "texture": "#2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "up": { "texture": "#2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "down": { "texture": "#2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] } + } + }, + { + "name": "Cube", + "from": [ 1.0, 0.0, 15.0 ], + "to": [ 15.0, 1.0, 16.0 ], + "faces": { + "north": { "texture": "#2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "east": { "texture": "#2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "south": { "texture": "#2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "west": { "texture": "#2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "up": { "texture": "#2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "down": { "texture": "#2", "uv": [ 1.0, 0.0, 15.0, 1.0 ] } + } + }, + { + "name": "Cube", + "from": [ 15.0, 1.0, 15.0 ], + "to": [ 16.0, 0.0, 1.0 ], + "faces": { + "north": { "texture": "#2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "east": { "texture": "#2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "south": { "texture": "#2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "west": { "texture": "#2", "uv": [ 0.0, 0.0, 14.0, 1.0 ] }, + "up": { "texture": "#2", "uv": [ 15.0, 1.0, 16.0, 15.0 ] }, + "down": { "texture": "#2", "uv": [ 0.0, 15.0, 1.0, 1.0 ] } + } + }, + { + "name": "Cube", + "from": [ 0.0, 1.0, 15.0 ], + "to": [ 1.0, 0.0, 1.0 ], + "faces": { + "north": { "texture": "#2", "uv": [ 0.0, 0.0, 11.0, 5.0 ] }, + "east": { "texture": "#2", "uv": [ 0.0, 0.0, 16.0, 5.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, 14.0, 1.0, 0.0 ] }, + "down": { "texture": "#2", "uv": [ 0.0, 16.0, 1.0, 0.0 ] } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/blockDisplayStand.json b/src/main/resources/assets/actuallyadditions/models/block/blockDisplayStand.json new file mode 100644 index 000000000..1893acda2 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/blockDisplayStand.json @@ -0,0 +1,154 @@ +{ + "__comment": "Model generated using MrCrayfish's Model Creator (http://mrcrayfish.com/modelcreator/)", + "textures": { + "0": "actuallyadditions:blocks/blockDisplayStand", + "1": "actuallyadditions:blocks/blockGiantChestTop", + "2": "actuallyadditions:blocks/blockDisplayStandSide", + "3": "actuallyadditions:blocks/blockDisplayStand" + }, + "elements": [ + { + "name": "Cube", + "from": [ 0.0, 0.0, 0.0 ], + "to": [ 16.0, 1.0, 16.0 ], + "faces": { + "north": { "texture": "#0", "uv": [ 0.0, 16.0, 16.0, 15.0 ] }, + "east": { "texture": "#0", "uv": [ 0.0, 1.0, 16.0, 0.0 ] }, + "south": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "west": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "up": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "down": { "texture": "#0", "uv": [ 0.0, 0.0, 16.0, 16.0 ] } + } + }, + { + "name": "Cube", + "from": [ 1.0, 1.0, 1.0 ], + "to": [ 15.0, 7.0, 15.0 ], + "faces": { + "north": { "texture": "#1", "uv": [ 1.0, 5.0, 15.0, 11.0 ] }, + "east": { "texture": "#1", "uv": [ 1.0, 5.0, 15.0, 11.0 ] }, + "south": { "texture": "#1", "uv": [ 1.0, 5.0, 15.0, 11.0 ] }, + "west": { "texture": "#1", "uv": [ 1.0, 5.0, 15.0, 11.0 ] }, + "up": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 15.0 ] }, + "down": { "texture": "#1", "uv": [ 1.0, 1.0, 15.0, 15.0 ] } + } + }, + { + "name": "Cube", + "from": [ 0.0, 1.0, 3.0 ], + "to": [ 16.0, 2.0, 13.0 ], + "faces": { + "north": { "texture": "#2", "uv": [ 0.0, 10.0, 16.0, 11.0 ] }, + "east": { "texture": "#2", "uv": [ 3.0, 10.0, 13.0, 11.0 ] }, + "south": { "texture": "#2", "uv": [ 0.0, 10.0, 16.0, 11.0 ] }, + "west": { "texture": "#2", "uv": [ 3.0, 10.0, 13.0, 11.0 ] }, + "up": { "texture": "#2", "uv": [ 0.0, 8.0, 4.0, 16.0 ] }, + "down": { "texture": "#2", "uv": [ 0.0, 8.0, 4.0, 16.0 ] } + } + }, + { + "name": "Cube", + "from": [ 3.0, 1.0, 0.0 ], + "to": [ 13.0, 2.0, 16.0 ], + "faces": { + "north": { "texture": "#2", "uv": [ 3.0, 10.0, 13.0, 11.0 ] }, + "east": { "texture": "#2", "uv": [ 0.0, 9.0, 16.0, 10.0 ] }, + "south": { "texture": "#2", "uv": [ 3.0, 9.0, 13.0, 10.0 ] }, + "west": { "texture": "#2", "uv": [ 0.0, 9.0, 16.0, 10.0 ] }, + "up": { "texture": "#2", "uv": [ 0.0, 8.0, 4.0, 16.0 ] }, + "down": { "texture": "#2", "uv": [ 0.0, 8.0, 4.0, 16.0 ] } + } + }, + { + "name": "Cube", + "from": [ 0.0, 2.0, 5.0 ], + "to": [ 16.0, 3.0, 11.0 ], + "faces": { + "north": { "texture": "#2", "uv": [ 0.0, 11.0, 16.0, 12.0 ] }, + "east": { "texture": "#2", "uv": [ 5.0, 11.0, 11.0, 12.0 ] }, + "south": { "texture": "#2", "uv": [ 0.0, 11.0, 16.0, 12.0 ] }, + "west": { "texture": "#2", "uv": [ 5.0, 11.0, 11.0, 12.0 ] }, + "up": { "texture": "#2", "uv": [ 0.0, 8.0, 4.0, 16.0 ] }, + "down": { "texture": "#2", "uv": [ 0.0, 10.0, 4.0, 16.0 ] } + } + }, + { + "name": "Cube", + "from": [ 5.0, 2.0, 0.0 ], + "to": [ 11.0, 3.0, 16.0 ], + "faces": { + "north": { "texture": "#2", "uv": [ 5.0, 11.0, 11.0, 12.0 ] }, + "east": { "texture": "#2", "uv": [ 0.0, 11.0, 16.0, 12.0 ] }, + "south": { "texture": "#2", "uv": [ 5.0, 11.0, 11.0, 13.0 ] }, + "west": { "texture": "#2", "uv": [ 0.0, 11.0, 16.0, 12.0 ] }, + "up": { "texture": "#2", "uv": [ 12.0, 8.0, 16.0, 16.0 ] }, + "down": { "texture": "#2", "uv": [ 0.0, 8.0, 4.0, 16.0 ] } + } + }, + { + "name": "Cube", + "from": [ 5.0, 5.0, 0.0 ], + "to": [ 11.0, 6.0, 16.0 ], + "faces": { + "north": { "texture": "#2", "uv": [ 5.0, 11.0, 11.0, 12.0 ] }, + "east": { "texture": "#2", "uv": [ 0.0, 11.0, 16.0, 12.0 ] }, + "south": { "texture": "#2", "uv": [ 5.0, 11.0, 11.0, 12.0 ] }, + "west": { "texture": "#2", "uv": [ 0.0, 11.0, 16.0, 12.0 ] }, + "up": { "texture": "#2", "uv": [ 0.0, 8.0, 16.0, 16.0 ] }, + "down": { "texture": "#2", "uv": [ 12.0, 8.0, 16.0, 16.0 ] } + } + }, + { + "name": "Cube", + "from": [ 0.0, 5.0, 5.0 ], + "to": [ 16.0, 6.0, 11.0 ], + "faces": { + "north": { "texture": "#2", "uv": [ 0.0, 9.0, 16.0, 10.0 ] }, + "east": { "texture": "#2", "uv": [ 5.0, 11.0, 11.0, 12.0 ] }, + "south": { "texture": "#2", "uv": [ 0.0, 8.0, 16.0, 9.0 ] }, + "west": { "texture": "#2", "uv": [ 5.0, 11.0, 11.0, 12.0 ] }, + "up": { "texture": "#2", "uv": [ 0.0, 9.0, 16.0, 15.0 ] }, + "down": { "texture": "#2", "uv": [ 0.0, 8.0, 16.0, 16.0 ] } + } + }, + { + "name": "Cube", + "from": [ 3.0, 6.0, 0.0 ], + "to": [ 13.0, 7.0, 16.0 ], + "faces": { + "north": { "texture": "#2", "uv": [ 3.0, 9.0, 13.0, 10.0 ] }, + "east": { "texture": "#2", "uv": [ 0.0, 9.0, 16.0, 10.0 ] }, + "south": { "texture": "#2", "uv": [ 3.0, 9.0, 13.0, 10.0 ] }, + "west": { "texture": "#2", "uv": [ 0.0, 9.0, 16.0, 10.0 ] }, + "up": { "texture": "#2", "uv": [ 0.0, 9.0, 16.0, 10.0 ] }, + "down": { "texture": "#2", "uv": [ 2.0, 10.0, 15.0, 11.0 ] } + } + }, + { + "name": "Cube", + "from": [ 0.0, 6.0, 3.0 ], + "to": [ 16.0, 7.0, 13.0 ], + "faces": { + "north": { "texture": "#2", "uv": [ 0.0, 9.0, 16.0, 10.0 ] }, + "east": { "texture": "#2", "uv": [ 3.0, 9.0, 13.0, 10.0 ] }, + "south": { "texture": "#2", "uv": [ 0.0, 9.0, 16.0, 10.0 ] }, + "west": { "texture": "#2", "uv": [ 3.0, 9.0, 13.0, 10.0 ] }, + "up": { "texture": "#2", "uv": [ 0.0, 9.0, 16.0, 10.0 ] }, + "down": { "texture": "#2", "uv": [ 0.0, 9.0, 16.0, 10.0 ] } + } + }, + { + "name": "Cube", + "from": [ 0.0, 7.0, 0.0 ], + "to": [ 16.0, 8.0, 16.0 ], + "faces": { + "north": { "texture": "#3", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "east": { "texture": "#3", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "south": { "texture": "#3", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "west": { "texture": "#3", "uv": [ 0.0, 0.0, 16.0, 1.0 ] }, + "up": { "texture": "#3", "uv": [ 0.0, 0.0, 16.0, 16.0 ] }, + "down": { "texture": "#3", "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/blockAtomicReconstructorFront.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockAtomicReconstructorFront.png index 079d59c43a3a87690de80702677f61fd9279b297..df767e34d48a741f859cd4903ee9297af7684e31 100644 GIT binary patch delta 646 zcmV;10(t$Z8oC;=zzTn5NklD4iRFyo>0q`LNo}QjiRjSo0o6QC@qtR%vTCMQjQ>}ki$+8R)Dc`+bk6y2b z=ePBGJ$Abt{eB-aW4GHe91bxvw%aX(!2l6qv)OQQal!rlJvf!S z`2BtlK$@nA2mr_9v6$OAVvK|k$n%`T;Xslk zelJh)-lM7v1_R8DEX#^+MT9KNI6FH-Rq1xSc<Hk+6k{eGYK_jeYH z1+7+#{eF*+F=A%?X*V}FOs7*sq(u0w{|yyIM9A~Jq~=euRn>B~N~OZ>?Je8w7J&2f zbJpuMF&ciYRs%ER^YgPv?!7PdKO7FJ)oR2LN~|J+h)}6iP%S$8`ud{XZWpRGGe)Bk zlgWhTa>;l+Mpc>5=Zr=p@;qm~UUPMIg@~|NEV#bDCdOFE|KZ`mPTWk delta 629 zcmV-*0*d{*8mStvzzTm9H-3Kk*2#gl+9|p`(jW?0+HV zH(q+uW&|rOA_XB37;J1~Gt*TU%zCujQFoVAZ@nKSS65eVW|$deS)!`AJ87Eo`T2>N zkt7Len&R%n7*SQqvIHQ+7`eW_MpbFI+iW%)+?{T>%WAbEgg}40-DbUBBO>)Z&vWuT zC-Cd!dCqRP-8v#0ujO8 z2_X<;#LNJQF(M-Mdp@7@{QQi&qh`i(xun%G%5pxH}>Oz{|@^ z-8ja`a5%)w`117&F-BIaRpm&UrYsfFPaq=182R__ zzkZ3Q^%Udr7+5R; z5JIT)KbdVz$g&KJ@ef-?gl4mes-UWTe0(q%464++JJacu`FzfDxnwq*p{gtv3#QX4 zWm)q6{?767F(Sg-+Z$(RXP8+Pu*=I!KlrYyHS%Glf8UA2UL5oh5&jHOZzm329siE(B3b z6tYxs=U#9TQ4kbeD1HDxhPrm?UXU)7Zo83?nzl5it;HnHOp>|x{p%tnAK)C$IXp-0 z?(UXS3OQ#|N{9$bDXPjbpLdi}aLxikN{N&bT5DpA0GOOJp3^Q{I36Y7w{oEh%q8_>ubOA4rdf+`0UK@pyy?gb*ubxZYeL2rJ78@z_Ko7kIQ z^|-Kl>69VQ+7bFW&o=vl)E%r)PC_g&40u zQad|4rLJp+!-l%9dHVDj>+838`0z1XTN^K!f5c|(+v^-0JYZvEjSwOyC#Q5>cV*z5 zV_~7aeqqxzgb=XS()S)~EiuMxghL3-=N*&D1d~$Y{QR7*>ktu2DFBpGu7#x(lu`iK gmya=Gt>ym#0P>h@cw7|!2><{907*qoM6N<$f`6rB4FCWD delta 692 zcmV;l0!#g&8|NCZzzTnoNklzlE121^53swtq-i4a`J8{IiA=_crU|6B1;D(L zi($ptbUm+LZ75cF_WLs;R8#}w@tC#=OeQVUt;EAe2Lu&F1$X#lb)Sn(kGoOFEoWyL zs6-G_YG~Vrtx3z1pPn!tHGKWfuT1aXKxc2T`T2;i9zJ5-8TUTCi+g1>N`r+f|1k;& z2aoyY#&f2-N2GrT3&NXUAiBro{qOkp)(`Z*&G_s`XMcYm097Tb4p9YFf(FvGqp3#n zKZ&FF5S>u}`kwxA!MYYz8LV9j=#VhD8MQiFcN)f@Lc8}lZMsED@6x{YC20@ZaDvnd zQZX~!9aYuK^BCsN`ZS?C_Xy!5VobwpAE0l)&iaof*^Ga#%M>$21X-;Mr@QO21Jx%M$U!4@5#Mg&KWZ& zx;r9D&INz>ikb8LCa?gb)xBUc5L0 zpp=5Ub9i`&yR%pAnHk%D01Zu5=g`6z&wTPk}RCU3Q2tXDh5y9gszP^E( z{cUh{H{6}x`w}i9mYBpP?EH5=FAdCWH7TW_I=J07%#55fs=Ac-aDrb))`Z`ywMHq0 zF_hl>LR4#|){1|-6CU*5F9f}J#u%&6%-HvRY2ogSF~~X7d#AOw-n;un!QI*Sol*+7 z+YJ$6-*PloDeMdhZl>U&>BFC%@x3 zNGUBRYOMeq$FUqLGY9h?5wzAYGg@o7JMZ_KNp+qv1|nHZ23-bQ&#FbH3P79nx2lOxJ(1_rCJ|iMT1nyo8%nT8sX+u?uK}2x5TmVq^lLdeB-`y5^M4_7be=!k( zCSrcQ_dQ66JrKa$P+c<2tk`K9lIA4Z4qvheb{4i|c%Z8E3^p_7oaMf1<8WAPdhcx8 zR_+JEw7D3oYPD}A>hAVHRf=lrP9QT|u}QJD<+Quk<0||G*tV^@QJ$rCGppXKDr1bL zvG>yL?u;=iSyg|(67sk^bIzij29GfoNUXs!v&A4Q{T30Cy36;xM_`Wm9p#*?Jn_@I zoQcopQwhna3S{qdvRZ3w+gAHvX0+DI+~2vWWqLlJoKB}=@b~vuniDM(#u&^wdA(k1 u@p4e!?|02XCj74SuS`{?wT6iBZvZMJi;ZdI=s5rY000O{MNUMnLSTXjw8Yi` diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCoalGeneratorSide.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCoalGeneratorSide.png index 3d3b64c7b23c298d323c9f8e748043ff8208ef13..2fda7ed50792b03b79d64882d820d7c9562a0105 100644 GIT binary patch delta 471 zcmV;|0Vw{x7>pUPzzTo2NklzLrPkE7-Q4UOh7gx5h3y_zV5)?{{md- zPDIdq-@;|)7L&Y$UH`7{t%1955Hn+p$^CxA-6^Fo#@Nb72FcTr-QoGP)-W^X9Q58d zqgpGqRw9Cor1yV*G3dQ>90xBiFGK`CKR@v+NpUT&E9Il{qK9cPt{dvP;l4-{bK>RX4+0 zD*%tjV>@Ik2kV`gwAOHUT5CiE$8lU)h}dV&iHKmO6o5}1+uQBNd7h{$=XnC`lr9!) ztjxR^xclyMp63QxxnK4zmlo(4=zzTn8NklPydPe$cRi!= z2m!huNZ#*vW+ng;frt>DCUZ{A3^QZS2?!C6nX%StEBF43peXFU+rBDR zRmK>d?Cwpa5fp!gyVs@ged5+yxce!d>4l(tt;8xkeRqKNT|_|m$Enda-4L82I>&Jk z5zIL|r`}69uT42I#^}T1J;p#)&&m6ba*y&_>zp`u9*+m#@3*J2imTz?yJI6W`FuXz l@je&#Cw-sJdUR&S?*PM1YKi&lBUAtY002ovPDHLkV1k6jyiEWA diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockCoalGeneratorTop.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockCoalGeneratorTop.png index 2877a96d8a4f78a98b1ca29641c6a5bef22218eb..23f533588ac49f0a49f566258f5793bee7ae42d9 100644 GIT binary patch delta 628 zcmV-)0*n3s8K@etzzTm;Nkl(17)LMVR!I%HO;BOPR+buB$ z%($M{m>FiU-|rcQ0p}bsMp8<2U5Bb7r4+pPh{${sW3yRdR>8n~VH__s&Afthpei`$ zFf%+rt(BZJBEn+Pa6BG~Q2{}9-uLAt^XAR3^!){ZQp%hUaDA;J;`sjke^edEW6SBK z<#hT%+a6dfBJF?SKnQ`HC$Kr_dj_={V8p2WI3DCEq$B&=bY#*4W z2{4Q+ksB@%N3DkU0reig9bmfPr>`uRzp+>}ESC#nRBElHl;$6#lo*DA)oKo|Klhyb zj?IS!&7X?C`B z7$e?$+~eb;t=DT_zy1XgN8g{>ZP&EN1KvksP{x#5uebF5z-qa{iSYdVOxw2jS}V>u zQkpStw>wVViOpt*s!~d2w_DTq1H0WG=Nw&k#?0mnZXSrtD917J@bHS93r!O+Gjh(X zR%>$3TrO;hS}W5u;he*(Dgfh{@Lp+}hGDoM;^?}3r=zO${e=+1-NL(xrIfqt!*HQ# z8pd(Fdmloe)=I6FzV87L5pvFR8&gWxHRcv_O*({duk=m0Tb*we|2Y6joL>C^c=rwf O0000QeWpc@An>y?w9wKEFC>VB4Nw4i z1>QnO&>?gJFMS#r6nqN9009%k3`O-!eKNIZc2kSmRAog(W<<)>)s?$D0A_}WU}l66 zmOFqD0`88xFEs#hemp%rWf%rTgcu_LDJ1|LM-Wt%)*9~4?d^Xp_xJaxyK{VejEFEP znbhQ*5rLEIE7FJFKD=C9ZPad`SK`Qr)p%V(~y|K$Aq3{?Sv)*EI=+<$EgY(Sl1Ee>fsP-EI)KU>q=09dO*(f5^ zS}CQ_TF1=U{GVxue^AQr^bW0eYHRHGJ9_WaXI13#^3s3T>ovo$Vi*S2>w#A<5BU1^ zA5siczs)#1d(US3$T${Ct&HQ2ySux|#(564R>n~f5#GLgONtS2%;4Mi9sAPgX0+Cx zqde!^eR85a^;v5t=Y+dcN}-hYMAGQpo&hGG+mb9*m6N!?F`|tbbnVnQ^WOAs{0B Z7yyo6bppQlof-fD002ovPDHLkV1fX`9yR~~ diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockDisplayStand.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockDisplayStand.png index c3d2fbe555c6e3bea4057ce76fd361c41622b72b..f9ad33917f066531a1b32b5521554423a2cc4833 100644 GIT binary patch delta 3524 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