From a0e83e259c46d84eb64296f867d7c027667a202e Mon Sep 17 00:00:00 2001 From: Robynstar Date: Thu, 19 Jun 2025 23:15:24 +1200 Subject: [PATCH 1/2] Some chair models --- .../block/furniture/chair/back/basic.json | 49 ++++++++++ .../furniture/chair/back/basic_ladder.json | 75 +++++++++++++++ .../block/furniture/chair/back/chunky.json | 76 +++++++++++++++ .../furniture/chair/back/chunky_ladder.json | 75 +++++++++++++++ .../block/furniture/chair/back/thin.json | 49 ++++++++++ .../furniture/chair/back/thin_ladder.json | 75 +++++++++++++++ .../furniture/chair/basic_chair_back.json | 49 ---------- .../block/furniture/chair/legs/basic.json | 62 ++++++++++++ .../furniture/chair/legs/basic_rails.json | 94 +++++++++++++++++++ .../chunky.json} | 32 +++---- .../block/furniture/chair/legs/thin.json | 66 +++++++++++++ .../furniture/chair/legs/thin_rails.json | 94 +++++++++++++++++++ .../block/furniture/chair/seat/basic.json | 23 +++++ .../chunky.json} | 0 .../block/furniture/chair/seat/thin.json | 23 +++++ 15 files changed, 777 insertions(+), 65 deletions(-) create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/back/basic.json create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/back/basic_ladder.json create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/back/chunky.json create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/back/chunky_ladder.json create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/back/thin.json create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/back/thin_ladder.json delete mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/basic_chair_back.json create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic.json create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic_rails.json rename src/main/resources/assets/compendium/models/block/furniture/chair/{basic_chair_legs.json => legs/chunky.json} (61%) create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/legs/thin.json create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/legs/thin_rails.json create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/seat/basic.json rename src/main/resources/assets/compendium/models/block/furniture/chair/{basic_chair_seat.json => seat/chunky.json} (100%) create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/seat/thin.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/basic.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/basic.json new file mode 100644 index 0000000000..1c33b9dff8 --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/basic.json @@ -0,0 +1,49 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "block/acacia_planks", + "particle": "block/acacia_planks" + }, + "elements": [ + { + "from": [2, 11, 12], + "to": [4, 16, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, + "faces": { + "north": {"uv": [0, 1, 5, 3], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 13, 5, 15], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 9, 5, 11], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 5, 5, 7], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [12, 11, 12], + "to": [14, 16, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 5, 5, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 1, 5, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 12, 5, 14], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 9, 5, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [1, 16, 11], + "to": [15, 23, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [0, 1, 14, 8], "texture": "#0"}, + "east": {"uv": [0, 1, 4, 8], "texture": "#0"}, + "south": {"uv": [0, 9, 14, 16], "texture": "#0"}, + "west": {"uv": [0, 1, 4, 8], "texture": "#0"}, + "up": {"uv": [0, 0, 14, 4], "texture": "#0"}, + "down": {"uv": [0, 3, 14, 7], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/basic_ladder.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/basic_ladder.json new file mode 100644 index 0000000000..807a65266d --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/basic_ladder.json @@ -0,0 +1,75 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "1": "block/acacia_planks", + "particle": "block/acacia_planks" + }, + "elements": [ + { + "from": [2, 11, 12], + "to": [4, 23, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, + "faces": { + "north": {"uv": [0, 1, 12, 3], "rotation": 90, "texture": "#1"}, + "east": {"uv": [0, 13, 12, 15], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 9, 12, 11], "rotation": 90, "texture": "#1"}, + "west": {"uv": [0, 5, 12, 7], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [12, 11, 12], + "to": [14, 23, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 5, 12, 7], "rotation": 90, "texture": "#1"}, + "east": {"uv": [0, 1, 12, 3], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 12, 12, 14], "rotation": 90, "texture": "#1"}, + "west": {"uv": [0, 9, 12, 11], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [4, 13, 12], + "to": [12, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 4, 8, 6], "texture": "#1"}, + "east": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 12, 8, 14], "texture": "#1"}, + "west": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 8, 8, 10], "texture": "#1"}, + "down": {"uv": [0, 0, 8, 2], "texture": "#1"} + } + }, + { + "from": [4, 16, 12], + "to": [12, 18, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 8, 8, 10], "texture": "#1"}, + "east": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 0, 8, 2], "texture": "#1"}, + "west": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 12, 8, 14], "texture": "#1"}, + "down": {"uv": [0, 4, 8, 6], "texture": "#1"} + } + }, + { + "from": [4, 19, 12], + "to": [12, 21, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 0, 8, 2], "texture": "#1"}, + "east": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 8, 8, 10], "texture": "#1"}, + "west": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 4, 8, 6], "texture": "#1"}, + "down": {"uv": [0, 12, 8, 14], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/chunky.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/chunky.json new file mode 100644 index 0000000000..55f4b8aa40 --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/chunky.json @@ -0,0 +1,76 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "Minecraft Modding:block/acacia_planks", + "particle": "Minecraft Modding:block/acacia_planks" + }, + "elements": [ + { + "from": [2, 11, 11], + "to": [5, 23, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, + "faces": { + "north": {"uv": [1, 4, 13, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [1, 0, 13, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [1, 12, 13, 15], "rotation": 90, "texture": "#0"}, + "west": {"uv": [1, 8, 13, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [11, 11, 11], + "to": [14, 23, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 4, 12, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 0, 12, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 12, 12, 15], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 8, 12, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [5, 12, 11], + "to": [11, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 8, 6, 11], "texture": "#0"}, + "east": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 12, 6, 15], "texture": "#0"}, + "west": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 4, 6, 7], "texture": "#0"}, + "down": {"uv": [0, 0, 6, 3], "texture": "#0"} + } + }, + { + "from": [5, 15.5, 11], + "to": [11, 18.5, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 12, 6, 15], "texture": "#0"}, + "east": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 6, 3], "texture": "#0"}, + "west": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 8, 6, 11], "texture": "#0"}, + "down": {"uv": [0, 4, 6, 7], "texture": "#0"} + } + }, + { + "from": [5, 19, 11], + "to": [11, 22, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 0, 6, 3], "texture": "#0"}, + "east": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 4, 6, 7], "texture": "#0"}, + "west": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 12, 6, 15], "texture": "#0"}, + "down": {"uv": [0, 8, 6, 11], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/chunky_ladder.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/chunky_ladder.json new file mode 100644 index 0000000000..4062c71d10 --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/chunky_ladder.json @@ -0,0 +1,75 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "block/acacia_planks", + "particle": "block/acacia_planks" + }, + "elements": [ + { + "from": [2, 11, 11], + "to": [5, 23, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, + "faces": { + "north": {"uv": [1, 4, 13, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [1, 0, 13, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [1, 12, 13, 15], "rotation": 90, "texture": "#0"}, + "west": {"uv": [1, 8, 13, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [11, 11, 11], + "to": [14, 23, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 4, 12, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 0, 12, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 12, 12, 15], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 8, 12, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [5, 12, 11], + "to": [11, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 8, 6, 11], "texture": "#0"}, + "east": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 12, 6, 15], "texture": "#0"}, + "west": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 4, 6, 7], "texture": "#0"}, + "down": {"uv": [0, 0, 6, 3], "texture": "#0"} + } + }, + { + "from": [5, 15.5, 11], + "to": [11, 18.5, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 12, 6, 15], "texture": "#0"}, + "east": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 6, 3], "texture": "#0"}, + "west": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 8, 6, 11], "texture": "#0"}, + "down": {"uv": [0, 4, 6, 7], "texture": "#0"} + } + }, + { + "from": [5, 19, 11], + "to": [11, 22, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 0, 6, 3], "texture": "#0"}, + "east": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 4, 6, 7], "texture": "#0"}, + "west": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 12, 6, 15], "texture": "#0"}, + "down": {"uv": [0, 8, 6, 11], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/thin.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/thin.json new file mode 100644 index 0000000000..4264fcfaaf --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/thin.json @@ -0,0 +1,49 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "block/acacia_planks", + "particle": "block/acacia_planks" + }, + "elements": [ + { + "from": [2, 11, 13], + "to": [3, 16, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, + "faces": { + "north": {"uv": [0, 1, 5, 2], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 13, 5, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 9, 5, 10], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 5, 5, 6], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [13, 11, 13], + "to": [14, 16, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 5, 5, 6], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 1, 5, 2], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 12, 5, 13], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 9, 5, 10], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [1, 16, 12], + "to": [15, 23, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [0, 1, 14, 8], "texture": "#0"}, + "east": {"uv": [0, 1, 3, 8], "texture": "#0"}, + "south": {"uv": [0, 9, 14, 16], "texture": "#0"}, + "west": {"uv": [0, 1, 3, 8], "texture": "#0"}, + "up": {"uv": [0, 0, 14, 3], "texture": "#0"}, + "down": {"uv": [0, 3, 14, 6], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/thin_ladder.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/thin_ladder.json new file mode 100644 index 0000000000..60bd569fe0 --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/thin_ladder.json @@ -0,0 +1,75 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "block/acacia_planks", + "particle": "block/acacia_planks" + }, + "elements": [ + { + "from": [2, 11, 13], + "to": [3, 23, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, + "faces": { + "north": {"uv": [0, 1, 12, 2], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 13, 12, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 9, 12, 10], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 5, 12, 6], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [13, 11, 13], + "to": [14, 23, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 5, 12, 6], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 1, 12, 2], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 12, 12, 13], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 9, 12, 10], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"} + } + }, + { + "from": [3, 14, 13], + "to": [13, 15, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 5, 10, 6], "rotation": 180, "texture": "#0"}, + "east": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 1, 10, 2], "rotation": 180, "texture": "#0"}, + "west": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 0, 10, 1], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 2, 10, 3], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [3, 17, 13], + "to": [13, 18, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 8, 10, 9], "rotation": 180, "texture": "#0"}, + "east": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 10, 10, 11], "rotation": 180, "texture": "#0"}, + "west": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 12, 10, 13], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 9, 10, 10], "rotation": 180, "texture": "#0"} + } + }, + { + "from": [3, 20, 13], + "to": [13, 21, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 13, 10, 14], "rotation": 180, "texture": "#0"}, + "east": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 8, 10, 9], "rotation": 180, "texture": "#0"}, + "west": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 10, 10, 11], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 14, 10, 15], "rotation": 180, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/basic_chair_back.json b/src/main/resources/assets/compendium/models/block/furniture/chair/basic_chair_back.json deleted file mode 100644 index 6e57211cc0..0000000000 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/basic_chair_back.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "block/acacia_planks", - "particle": "block/acacia_planks" - }, - "elements": [ - { - "from": [2, 11, 11], - "to": [5, 16, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, - "faces": { - "north": {"uv": [0, 1, 5, 4], "rotation": 90, "texture": "#0"}, - "east": {"uv": [0, 1, 5, 4], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 1, 5, 4], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 1, 5, 4], "rotation": 90, "texture": "#0"}, - "up": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [11, 11, 11], - "to": [14, 16, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, - "faces": { - "north": {"uv": [0, 1, 5, 4], "rotation": 90, "texture": "#0"}, - "east": {"uv": [0, 1, 5, 4], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 1, 5, 4], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 1, 5, 4], "rotation": 90, "texture": "#0"}, - "up": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [1, 16, 10], - "to": [15, 23, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, - "faces": { - "north": {"uv": [0, 1, 14, 8], "texture": "#0"}, - "east": {"uv": [0, 1, 5, 8], "texture": "#0"}, - "south": {"uv": [0, 1, 14, 8], "texture": "#0"}, - "west": {"uv": [0, 1, 5, 8], "texture": "#0"}, - "up": {"uv": [0, 1, 14, 6], "texture": "#0"}, - "down": {"uv": [0, 1, 14, 6], "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic.json new file mode 100644 index 0000000000..514f68476e --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic.json @@ -0,0 +1,62 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "1": "block/acacia_planks", + "particle": "block/acacia_planks" + }, + "elements": [ + { + "from": [2, 0, 2], + "to": [4, 9, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 2]}, + "faces": { + "north": {"uv": [0, 1, 7, 3], "rotation": 90, "texture": "#1"}, + "east": {"uv": [0, 13, 7, 15], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 9, 7, 11], "rotation": 90, "texture": "#1"}, + "west": {"uv": [0, 5, 7, 7], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [12, 0, 2], + "to": [14, 9, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 2]}, + "faces": { + "north": {"uv": [0, 5, 7, 7], "rotation": 90, "texture": "#1"}, + "east": {"uv": [0, 1, 7, 3], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 13, 7, 15], "rotation": 90, "texture": "#1"}, + "west": {"uv": [0, 9, 7, 11], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [12, 0, 12], + "to": [14, 9, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 11]}, + "faces": { + "north": {"uv": [0, 9, 7, 11], "rotation": 90, "texture": "#1"}, + "east": {"uv": [0, 5, 7, 7], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 1, 7, 3], "rotation": 90, "texture": "#1"}, + "west": {"uv": [0, 13, 7, 15], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"} + } + }, + { + "from": [2, 0, 12], + "to": [4, 9, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 11]}, + "faces": { + "north": {"uv": [0, 13, 7, 15], "rotation": 90, "texture": "#1"}, + "east": {"uv": [0, 9, 7, 11], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 5, 7, 7], "rotation": 90, "texture": "#1"}, + "west": {"uv": [0, 1, 7, 3], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic_rails.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic_rails.json new file mode 100644 index 0000000000..d34ba96559 --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic_rails.json @@ -0,0 +1,94 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "1": "block/acacia_planks", + "particle": "block/acacia_planks" + }, + "elements": [ + { + "name": "front left leg", + "from": [2, 0, 2], + "to": [4, 9, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 2]}, + "faces": { + "north": {"uv": [0, 1, 7, 3], "rotation": 90, "texture": "#1"}, + "east": {"uv": [0, 13, 7, 15], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 9, 7, 11], "rotation": 90, "texture": "#1"}, + "west": {"uv": [0, 5, 7, 7], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"} + } + }, + { + "name": "front right leg", + "from": [12, 0, 2], + "to": [14, 9, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 2]}, + "faces": { + "north": {"uv": [0, 5, 7, 7], "rotation": 90, "texture": "#1"}, + "east": {"uv": [0, 1, 7, 3], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 13, 7, 15], "rotation": 90, "texture": "#1"}, + "west": {"uv": [0, 9, 7, 11], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"} + } + }, + { + "name": "back right leg", + "from": [12, 0, 12], + "to": [14, 9, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 11]}, + "faces": { + "north": {"uv": [0, 9, 7, 11], "rotation": 90, "texture": "#1"}, + "east": {"uv": [0, 5, 7, 7], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 1, 7, 3], "rotation": 90, "texture": "#1"}, + "west": {"uv": [0, 13, 7, 15], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"} + } + }, + { + "name": "back left leg", + "from": [2, 0, 12], + "to": [4, 9, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 11]}, + "faces": { + "north": {"uv": [0, 13, 7, 15], "rotation": 90, "texture": "#1"}, + "east": {"uv": [0, 9, 7, 11], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 5, 7, 7], "rotation": 90, "texture": "#1"}, + "west": {"uv": [0, 1, 7, 3], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"} + } + }, + { + "name": "front rail", + "from": [4, 2, 2], + "to": [12, 4, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 2]}, + "faces": { + "north": {"uv": [0, 1, 7, 3], "texture": "#1"}, + "east": {"uv": [0, 13, 7, 15], "texture": "#1"}, + "south": {"uv": [0, 9, 7, 11], "texture": "#1"}, + "west": {"uv": [0, 5, 7, 7], "texture": "#1"}, + "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"} + } + }, + { + "name": "back rail", + "from": [4, 2, 12], + "to": [12, 4, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 11]}, + "faces": { + "north": {"uv": [0, 9, 7, 11], "texture": "#1"}, + "east": {"uv": [0, 5, 7, 7], "texture": "#1"}, + "south": {"uv": [0, 1, 7, 3], "texture": "#1"}, + "west": {"uv": [0, 13, 7, 15], "texture": "#1"}, + "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/basic_chair_legs.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/chunky.json similarity index 61% rename from src/main/resources/assets/compendium/models/block/furniture/chair/basic_chair_legs.json rename to src/main/resources/assets/compendium/models/block/furniture/chair/legs/chunky.json index b718fcaae9..3f2b9680c4 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/basic_chair_legs.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/chunky.json @@ -8,12 +8,12 @@ "elements": [ { "from": [2, 0, 2], - "to": [5, 7, 5], + "to": [5, 9, 5], "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 2]}, "faces": { - "north": {"uv": [0, 1, 7, 4], "rotation": 90, "texture": "#0"}, - "east": {"uv": [0, 1, 7, 4], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 1, 7, 4], "rotation": 90, "texture": "#0"}, + "north": {"uv": [0, 13, 7, 16], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 9, 7, 12], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 5, 7, 8], "rotation": 90, "texture": "#0"}, "west": {"uv": [0, 1, 7, 4], "rotation": 90, "texture": "#0"}, "up": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"}, "down": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"} @@ -21,39 +21,39 @@ }, { "from": [11, 0, 2], - "to": [14, 7, 5], + "to": [14, 9, 5], "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 2]}, "faces": { - "north": {"uv": [0, 1, 7, 4], "rotation": 90, "texture": "#0"}, + "north": {"uv": [0, 5, 7, 8], "rotation": 90, "texture": "#0"}, "east": {"uv": [0, 1, 7, 4], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 1, 7, 4], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 1, 7, 4], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 13, 7, 16], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 9, 7, 12], "rotation": 90, "texture": "#0"}, "up": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"}, "down": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"} } }, { "from": [11, 0, 11], - "to": [14, 7, 14], + "to": [14, 9, 14], "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 11]}, "faces": { - "north": {"uv": [0, 1, 7, 4], "rotation": 90, "texture": "#0"}, + "north": {"uv": [0, 9, 7, 12], "rotation": 90, "texture": "#0"}, "east": {"uv": [0, 1, 7, 4], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 1, 7, 4], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 1, 7, 4], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 5, 7, 8], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 13, 7, 16], "rotation": 90, "texture": "#0"}, "up": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"}, "down": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"} } }, { "from": [2, 0, 11], - "to": [5, 7, 14], + "to": [5, 9, 14], "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 11]}, "faces": { "north": {"uv": [0, 1, 7, 4], "rotation": 90, "texture": "#0"}, - "east": {"uv": [0, 1, 7, 4], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 1, 7, 4], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 1, 7, 4], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 13, 7, 16], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 9, 7, 12], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 5, 7, 8], "rotation": 90, "texture": "#0"}, "up": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"}, "down": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"} } diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/thin.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/thin.json new file mode 100644 index 0000000000..e58ccc4b9f --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/thin.json @@ -0,0 +1,66 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "block/acacia_planks", + "particle": "block/acacia_planks" + }, + "elements": [ + { + "name": "front left leg", + "from": [2, 0, 2], + "to": [3, 9, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 2]}, + "faces": { + "north": {"uv": [0, 8, 8, 9], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 4, 8, 5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 12, 8, 13], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "front right leg", + "from": [13, 0, 2], + "to": [14, 9, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 2]}, + "faces": { + "north": {"uv": [0, 4, 8, 5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 12, 8, 13], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 8, 8, 9], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "back right leg", + "from": [13, 0, 13], + "to": [14, 9, 14], + "rotation": {"angle": 0, "axis": "z", "origin": [11, 0, 11]}, + "faces": { + "north": {"uv": [0, 12, 8, 13], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 8, 8, 9], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 4, 8, 5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "back left leg", + "from": [2, 0, 13], + "to": [3, 9, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 11]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 12, 8, 13], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 8, 8, 9], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 4, 8, 5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/thin_rails.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/thin_rails.json new file mode 100644 index 0000000000..53cfe5a726 --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/thin_rails.json @@ -0,0 +1,94 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "block/acacia_planks", + "particle": "block/acacia_planks" + }, + "elements": [ + { + "name": "front left leg", + "from": [2, 0, 2], + "to": [3, 9, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 2]}, + "faces": { + "north": {"uv": [0, 8, 8, 9], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 4, 8, 5], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 12, 8, 13], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "front right leg", + "from": [13, 0, 2], + "to": [14, 9, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 2]}, + "faces": { + "north": {"uv": [0, 4, 8, 5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 12, 8, 13], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 8, 8, 9], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "back right leg", + "from": [13, 0, 13], + "to": [14, 9, 14], + "rotation": {"angle": 0, "axis": "z", "origin": [11, 0, 11]}, + "faces": { + "north": {"uv": [0, 12, 8, 13], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 8, 8, 9], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 4, 8, 5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "back left leg", + "from": [2, 0, 13], + "to": [3, 9, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 11]}, + "faces": { + "north": {"uv": [0, 0, 8, 1], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 12, 8, 13], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 8, 8, 9], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 4, 8, 5], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "front rail", + "from": [3, 3, 2], + "to": [13, 4, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 2]}, + "faces": { + "north": {"uv": [0, 8, 8, 9], "texture": "#0"}, + "east": {"uv": [0, 4, 8, 5], "texture": "#0"}, + "south": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "west": {"uv": [0, 12, 8, 13], "texture": "#0"}, + "up": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "back rail", + "from": [3, 3, 13], + "to": [13, 4, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 11]}, + "faces": { + "north": {"uv": [0, 12, 8, 13], "texture": "#0"}, + "east": {"uv": [0, 8, 8, 9], "texture": "#0"}, + "south": {"uv": [0, 4, 8, 5], "texture": "#0"}, + "west": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "up": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/seat/basic.json b/src/main/resources/assets/compendium/models/block/furniture/chair/seat/basic.json new file mode 100644 index 0000000000..0dc168a900 --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/seat/basic.json @@ -0,0 +1,23 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "block/acacia_planks", + "particle": "block/acacia_planks" + }, + "elements": [ + { + "from": [1, 8, 1], + "to": [15, 11, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 7, 0]}, + "faces": { + "north": {"uv": [0, 1, 14, 4], "texture": "#0"}, + "east": {"uv": [0, 9, 14, 12], "texture": "#0"}, + "south": {"uv": [0, 5, 14, 8], "texture": "#0"}, + "west": {"uv": [0, 13, 14, 16], "texture": "#0"}, + "up": {"uv": [0, 0, 14, 14], "texture": "#0"}, + "down": {"uv": [0, 0, 14, 14], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/basic_chair_seat.json b/src/main/resources/assets/compendium/models/block/furniture/chair/seat/chunky.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/basic_chair_seat.json rename to src/main/resources/assets/compendium/models/block/furniture/chair/seat/chunky.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/seat/thin.json b/src/main/resources/assets/compendium/models/block/furniture/chair/seat/thin.json new file mode 100644 index 0000000000..44e541b829 --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/seat/thin.json @@ -0,0 +1,23 @@ +{ + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "block/acacia_planks", + "particle": "block/acacia_planks" + }, + "elements": [ + { + "from": [1, 9, 1], + "to": [15, 11, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 7, 0]}, + "faces": { + "north": {"uv": [0, 6, 14, 8], "texture": "#0"}, + "east": {"uv": [0, 14, 14, 16], "texture": "#0"}, + "south": {"uv": [0, 10, 14, 12], "texture": "#0"}, + "west": {"uv": [0, 2, 14, 4], "texture": "#0"}, + "up": {"uv": [0, 0, 14, 14], "texture": "#0"}, + "down": {"uv": [0, 0, 14, 14], "texture": "#0"} + } + } + ] +} \ No newline at end of file From 32dbe6394656a9719d7dc9d935bb8764d5587727 Mon Sep 17 00:00:00 2001 From: Robynstar Date: Fri, 20 Jun 2025 08:09:52 +1200 Subject: [PATCH 2/2] Re-name all the models, again. --- .../furniture/chair/back/basic_heavy.json | 53 +++++++++++ .../back/{thin.json => basic_light.json} | 8 +- .../back/{basic.json => basic_medium.json} | 8 +- .../block/furniture/chair/back/chunky.json | 76 --------------- .../{chunky_ladder.json => ladder_heavy.json} | 14 ++- .../{thin_ladder.json => ladder_light.json} | 10 +- .../{basic_ladder.json => ladder_medium.json} | 12 ++- .../legs/{chunky.json => basic_heavy.json} | 5 + .../legs/{thin.json => basic_light.json} | 1 + .../legs/{basic.json => basic_medium.json} | 5 + .../furniture/chair/legs/rails_heavy.json | 95 +++++++++++++++++++ .../{thin_rails.json => rails_light.json} | 1 + .../{basic_rails.json => rails_medium.json} | 1 + .../seat/{chunky.json => basic_heavy.json} | 0 .../seat/{thin.json => basic_light.json} | 0 .../seat/{basic.json => basic_medium.json} | 0 16 files changed, 200 insertions(+), 89 deletions(-) create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/back/basic_heavy.json rename src/main/resources/assets/compendium/models/block/furniture/chair/back/{thin.json => basic_light.json} (87%) rename src/main/resources/assets/compendium/models/block/furniture/chair/back/{basic.json => basic_medium.json} (87%) delete mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/back/chunky.json rename src/main/resources/assets/compendium/models/block/furniture/chair/back/{chunky_ladder.json => ladder_heavy.json} (89%) rename src/main/resources/assets/compendium/models/block/furniture/chair/back/{thin_ladder.json => ladder_light.json} (90%) rename src/main/resources/assets/compendium/models/block/furniture/chair/back/{basic_ladder.json => ladder_medium.json} (87%) rename src/main/resources/assets/compendium/models/block/furniture/chair/legs/{chunky.json => basic_heavy.json} (94%) rename src/main/resources/assets/compendium/models/block/furniture/chair/legs/{thin.json => basic_light.json} (98%) rename src/main/resources/assets/compendium/models/block/furniture/chair/legs/{basic.json => basic_medium.json} (94%) create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_heavy.json rename src/main/resources/assets/compendium/models/block/furniture/chair/legs/{thin_rails.json => rails_light.json} (99%) rename src/main/resources/assets/compendium/models/block/furniture/chair/legs/{basic_rails.json => rails_medium.json} (99%) rename src/main/resources/assets/compendium/models/block/furniture/chair/seat/{chunky.json => basic_heavy.json} (100%) rename src/main/resources/assets/compendium/models/block/furniture/chair/seat/{thin.json => basic_light.json} (100%) rename src/main/resources/assets/compendium/models/block/furniture/chair/seat/{basic.json => basic_medium.json} (100%) diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/basic_heavy.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/basic_heavy.json new file mode 100644 index 0000000000..39fb2123f2 --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/basic_heavy.json @@ -0,0 +1,53 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "block/acacia_planks", + "particle": "block/acacia_planks" + }, + "elements": [ + { + "name": "left upright", + "from": [2, 11, 11], + "to": [5, 16, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, + "faces": { + "north": {"uv": [1, 4, 6, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [1, 0, 6, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [1, 12, 6, 15], "rotation": 90, "texture": "#0"}, + "west": {"uv": [1, 8, 6, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "right upright", + "from": [11, 11, 11], + "to": [14, 16, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 4, 5, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 0, 5, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 12, 5, 15], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 8, 5, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "back panel", + "from": [1, 16, 10], + "to": [15, 23, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [0, 1, 14, 8], "texture": "#0"}, + "east": {"uv": [0, 1, 5, 8], "texture": "#0"}, + "south": {"uv": [0, 9, 14, 16], "texture": "#0"}, + "west": {"uv": [5, 1, 10, 8], "texture": "#0"}, + "up": {"uv": [0, 1, 14, 6], "texture": "#0"}, + "down": {"uv": [0, 1, 14, 6], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/thin.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/basic_light.json similarity index 87% rename from src/main/resources/assets/compendium/models/block/furniture/chair/back/thin.json rename to src/main/resources/assets/compendium/models/block/furniture/chair/back/basic_light.json index 4264fcfaaf..33a7b6f8c2 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/back/thin.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/basic_light.json @@ -1,4 +1,5 @@ { + "format_version": "1.21.6", "credit": "Made with Blockbench", "parent": "block/block", "textures": { @@ -7,6 +8,7 @@ }, "elements": [ { + "name": "left upright", "from": [2, 11, 13], "to": [3, 16, 14], "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, @@ -20,19 +22,21 @@ } }, { + "name": "right upright", "from": [13, 11, 13], "to": [14, 16, 14], "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, "faces": { "north": {"uv": [0, 5, 5, 6], "rotation": 90, "texture": "#0"}, "east": {"uv": [0, 1, 5, 2], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 12, 5, 13], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 13, 5, 14], "rotation": 90, "texture": "#0"}, "west": {"uv": [0, 9, 5, 10], "rotation": 90, "texture": "#0"}, "up": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"}, "down": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"} } }, { + "name": "back panel", "from": [1, 16, 12], "to": [15, 23, 15], "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, @@ -40,7 +44,7 @@ "north": {"uv": [0, 1, 14, 8], "texture": "#0"}, "east": {"uv": [0, 1, 3, 8], "texture": "#0"}, "south": {"uv": [0, 9, 14, 16], "texture": "#0"}, - "west": {"uv": [0, 1, 3, 8], "texture": "#0"}, + "west": {"uv": [3, 1, 6, 8], "texture": "#0"}, "up": {"uv": [0, 0, 14, 3], "texture": "#0"}, "down": {"uv": [0, 3, 14, 6], "texture": "#0"} } diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/basic.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/basic_medium.json similarity index 87% rename from src/main/resources/assets/compendium/models/block/furniture/chair/back/basic.json rename to src/main/resources/assets/compendium/models/block/furniture/chair/back/basic_medium.json index 1c33b9dff8..c60fbe5532 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/back/basic.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/basic_medium.json @@ -1,4 +1,5 @@ { + "format_version": "1.21.6", "credit": "Made with Blockbench", "parent": "block/block", "textures": { @@ -7,6 +8,7 @@ }, "elements": [ { + "name": "left upright", "from": [2, 11, 12], "to": [4, 16, 14], "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, @@ -20,19 +22,21 @@ } }, { + "name": "right upright", "from": [12, 11, 12], "to": [14, 16, 14], "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, "faces": { "north": {"uv": [0, 5, 5, 7], "rotation": 90, "texture": "#0"}, "east": {"uv": [0, 1, 5, 3], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 12, 5, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 13, 5, 15], "rotation": 90, "texture": "#0"}, "west": {"uv": [0, 9, 5, 11], "rotation": 90, "texture": "#0"}, "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"}, "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"} } }, { + "name": "back panel", "from": [1, 16, 11], "to": [15, 23, 15], "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, @@ -40,7 +44,7 @@ "north": {"uv": [0, 1, 14, 8], "texture": "#0"}, "east": {"uv": [0, 1, 4, 8], "texture": "#0"}, "south": {"uv": [0, 9, 14, 16], "texture": "#0"}, - "west": {"uv": [0, 1, 4, 8], "texture": "#0"}, + "west": {"uv": [4, 1, 8, 8], "texture": "#0"}, "up": {"uv": [0, 0, 14, 4], "texture": "#0"}, "down": {"uv": [0, 3, 14, 7], "texture": "#0"} } diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/chunky.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/chunky.json deleted file mode 100644 index 55f4b8aa40..0000000000 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/back/chunky.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "format_version": "1.21.6", - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "Minecraft Modding:block/acacia_planks", - "particle": "Minecraft Modding:block/acacia_planks" - }, - "elements": [ - { - "from": [2, 11, 11], - "to": [5, 23, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, - "faces": { - "north": {"uv": [1, 4, 13, 7], "rotation": 90, "texture": "#0"}, - "east": {"uv": [1, 0, 13, 3], "rotation": 90, "texture": "#0"}, - "south": {"uv": [1, 12, 13, 15], "rotation": 90, "texture": "#0"}, - "west": {"uv": [1, 8, 13, 11], "rotation": 90, "texture": "#0"}, - "up": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [11, 11, 11], - "to": [14, 23, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, - "faces": { - "north": {"uv": [0, 4, 12, 7], "rotation": 90, "texture": "#0"}, - "east": {"uv": [0, 0, 12, 3], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 12, 12, 15], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 8, 12, 11], "rotation": 90, "texture": "#0"}, - "up": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"} - } - }, - { - "from": [5, 12, 11], - "to": [11, 15, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, - "faces": { - "north": {"uv": [0, 8, 6, 11], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 12, 6, 15], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"}, - "up": {"uv": [0, 4, 6, 7], "texture": "#0"}, - "down": {"uv": [0, 0, 6, 3], "texture": "#0"} - } - }, - { - "from": [5, 15.5, 11], - "to": [11, 18.5, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, - "faces": { - "north": {"uv": [0, 12, 6, 15], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 0, 6, 3], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"}, - "up": {"uv": [0, 8, 6, 11], "texture": "#0"}, - "down": {"uv": [0, 4, 6, 7], "texture": "#0"} - } - }, - { - "from": [5, 19, 11], - "to": [11, 22, 14], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, - "faces": { - "north": {"uv": [0, 0, 6, 3], "texture": "#0"}, - "east": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 4, 6, 7], "texture": "#0"}, - "west": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"}, - "up": {"uv": [0, 12, 6, 15], "texture": "#0"}, - "down": {"uv": [0, 8, 6, 11], "texture": "#0"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/chunky_ladder.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/ladder_heavy.json similarity index 89% rename from src/main/resources/assets/compendium/models/block/furniture/chair/back/chunky_ladder.json rename to src/main/resources/assets/compendium/models/block/furniture/chair/back/ladder_heavy.json index 4062c71d10..cb4c176427 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/back/chunky_ladder.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/ladder_heavy.json @@ -1,4 +1,5 @@ { + "format_version": "1.21.6", "credit": "Made with Blockbench", "parent": "block/block", "textures": { @@ -7,6 +8,7 @@ }, "elements": [ { + "name": "left upright", "from": [2, 11, 11], "to": [5, 23, 14], "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, @@ -15,11 +17,12 @@ "east": {"uv": [1, 0, 13, 3], "rotation": 90, "texture": "#0"}, "south": {"uv": [1, 12, 13, 15], "rotation": 90, "texture": "#0"}, "west": {"uv": [1, 8, 13, 11], "rotation": 90, "texture": "#0"}, - "up": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"} + "up": {"uv": [0, 4, 3, 7], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 4, 3, 7], "rotation": 90, "texture": "#0"} } }, { + "name": "right upright", "from": [11, 11, 11], "to": [14, 23, 14], "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, @@ -28,11 +31,12 @@ "east": {"uv": [0, 0, 12, 3], "rotation": 90, "texture": "#0"}, "south": {"uv": [0, 12, 12, 15], "rotation": 90, "texture": "#0"}, "west": {"uv": [0, 8, 12, 11], "rotation": 90, "texture": "#0"}, - "up": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"} + "up": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"} } }, { + "name": "bottom rail", "from": [5, 12, 11], "to": [11, 15, 14], "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, @@ -46,6 +50,7 @@ } }, { + "name": "middle rail", "from": [5, 15.5, 11], "to": [11, 18.5, 14], "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, @@ -59,6 +64,7 @@ } }, { + "name": "top rail", "from": [5, 19, 11], "to": [11, 22, 14], "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/thin_ladder.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/ladder_light.json similarity index 90% rename from src/main/resources/assets/compendium/models/block/furniture/chair/back/thin_ladder.json rename to src/main/resources/assets/compendium/models/block/furniture/chair/back/ladder_light.json index 60bd569fe0..d7f1128ccb 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/back/thin_ladder.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/ladder_light.json @@ -1,4 +1,5 @@ { + "format_version": "1.21.6", "credit": "Made with Blockbench", "parent": "block/block", "textures": { @@ -7,6 +8,7 @@ }, "elements": [ { + "name": "left upright", "from": [2, 11, 13], "to": [3, 23, 14], "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, @@ -15,11 +17,12 @@ "east": {"uv": [0, 13, 12, 14], "rotation": 90, "texture": "#0"}, "south": {"uv": [0, 9, 12, 10], "rotation": 90, "texture": "#0"}, "west": {"uv": [0, 5, 12, 6], "rotation": 90, "texture": "#0"}, - "up": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 2, 1, 3], "rotation": 90, "texture": "#0"}, "down": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"} } }, { + "name": "right upright", "from": [13, 11, 13], "to": [14, 23, 14], "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, @@ -29,10 +32,11 @@ "south": {"uv": [0, 12, 12, 13], "rotation": 90, "texture": "#0"}, "west": {"uv": [0, 9, 12, 10], "rotation": 90, "texture": "#0"}, "up": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"}, - "down": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"} + "down": {"uv": [0, 2, 1, 3], "rotation": 90, "texture": "#0"} } }, { + "name": "bottom rail", "from": [3, 14, 13], "to": [13, 15, 14], "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, @@ -46,6 +50,7 @@ } }, { + "name": "middle rail", "from": [3, 17, 13], "to": [13, 18, 14], "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, @@ -59,6 +64,7 @@ } }, { + "name": "top rail", "from": [3, 20, 13], "to": [13, 21, 14], "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/basic_ladder.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/ladder_medium.json similarity index 87% rename from src/main/resources/assets/compendium/models/block/furniture/chair/back/basic_ladder.json rename to src/main/resources/assets/compendium/models/block/furniture/chair/back/ladder_medium.json index 807a65266d..8eedf3d043 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/back/basic_ladder.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/ladder_medium.json @@ -1,4 +1,5 @@ { + "format_version": "1.21.6", "credit": "Made with Blockbench", "parent": "block/block", "textures": { @@ -7,6 +8,7 @@ }, "elements": [ { + "name": "left upright", "from": [2, 11, 12], "to": [4, 23, 14], "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, @@ -16,23 +18,25 @@ "south": {"uv": [0, 9, 12, 11], "rotation": 90, "texture": "#1"}, "west": {"uv": [0, 5, 12, 7], "rotation": 90, "texture": "#1"}, "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"}, - "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"} + "down": {"uv": [0, 5, 2, 7], "rotation": 90, "texture": "#1"} } }, { + "name": "right upright", "from": [12, 11, 12], "to": [14, 23, 14], "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, "faces": { "north": {"uv": [0, 5, 12, 7], "rotation": 90, "texture": "#1"}, "east": {"uv": [0, 1, 12, 3], "rotation": 90, "texture": "#1"}, - "south": {"uv": [0, 12, 12, 14], "rotation": 90, "texture": "#1"}, + "south": {"uv": [0, 13, 12, 15], "rotation": 90, "texture": "#1"}, "west": {"uv": [0, 9, 12, 11], "rotation": 90, "texture": "#1"}, - "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"}, + "up": {"uv": [0, 5, 2, 7], "rotation": 90, "texture": "#1"}, "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"} } }, { + "name": "bottom rail", "from": [4, 13, 12], "to": [12, 15, 14], "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, @@ -46,6 +50,7 @@ } }, { + "name": "middle rail", "from": [4, 16, 12], "to": [12, 18, 14], "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, @@ -59,6 +64,7 @@ } }, { + "name": "top rail", "from": [4, 19, 12], "to": [12, 21, 14], "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/chunky.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic_heavy.json similarity index 94% rename from src/main/resources/assets/compendium/models/block/furniture/chair/legs/chunky.json rename to src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic_heavy.json index 3f2b9680c4..0a2fd7ca8e 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/chunky.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic_heavy.json @@ -1,4 +1,5 @@ { + "format_version": "1.21.6", "credit": "Made with Blockbench", "parent": "block/block", "textures": { @@ -7,6 +8,7 @@ }, "elements": [ { + "name": "front left leg", "from": [2, 0, 2], "to": [5, 9, 5], "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 2]}, @@ -20,6 +22,7 @@ } }, { + "name": "front right leg", "from": [11, 0, 2], "to": [14, 9, 5], "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 2]}, @@ -33,6 +36,7 @@ } }, { + "name": "back right leg", "from": [11, 0, 11], "to": [14, 9, 14], "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 11]}, @@ -46,6 +50,7 @@ } }, { + "name": "back left leg", "from": [2, 0, 11], "to": [5, 9, 14], "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 11]}, diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/thin.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic_light.json similarity index 98% rename from src/main/resources/assets/compendium/models/block/furniture/chair/legs/thin.json rename to src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic_light.json index e58ccc4b9f..378209bde9 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/thin.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic_light.json @@ -1,4 +1,5 @@ { + "format_version": "1.21.6", "credit": "Made with Blockbench", "parent": "block/block", "textures": { diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic_medium.json similarity index 94% rename from src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic.json rename to src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic_medium.json index 514f68476e..f1a2b0950f 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic_medium.json @@ -1,4 +1,5 @@ { + "format_version": "1.21.6", "credit": "Made with Blockbench", "parent": "block/block", "textures": { @@ -7,6 +8,7 @@ }, "elements": [ { + "name": "front left leg", "from": [2, 0, 2], "to": [4, 9, 4], "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 2]}, @@ -20,6 +22,7 @@ } }, { + "name": "front right leg", "from": [12, 0, 2], "to": [14, 9, 4], "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 2]}, @@ -33,6 +36,7 @@ } }, { + "name": "back right leg", "from": [12, 0, 12], "to": [14, 9, 14], "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 11]}, @@ -46,6 +50,7 @@ } }, { + "name": "back left leg", "from": [2, 0, 12], "to": [4, 9, 14], "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 11]}, diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_heavy.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_heavy.json new file mode 100644 index 0000000000..1474710c66 --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_heavy.json @@ -0,0 +1,95 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "block/acacia_planks", + "particle": "block/acacia_planks" + }, + "elements": [ + { + "name": "front left leg", + "from": [2, 0, 2], + "to": [5, 9, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 2]}, + "faces": { + "north": {"uv": [0, 13, 7, 16], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 9, 7, 12], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 5, 7, 8], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 1, 7, 4], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "front right leg", + "from": [11, 0, 2], + "to": [14, 9, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 2]}, + "faces": { + "north": {"uv": [0, 5, 7, 8], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 1, 7, 4], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 13, 7, 16], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 9, 7, 12], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "back right leg", + "from": [11, 0, 11], + "to": [14, 9, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 11]}, + "faces": { + "north": {"uv": [0, 9, 7, 12], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 1, 7, 4], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 5, 7, 8], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 13, 7, 16], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "back left leg", + "from": [2, 0, 11], + "to": [5, 9, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 11]}, + "faces": { + "north": {"uv": [0, 1, 7, 4], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 13, 7, 16], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 9, 7, 12], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 5, 7, 8], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "front rail", + "from": [5, 2, 2], + "to": [11, 5, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 2]}, + "faces": { + "north": {"uv": [0, 5, 7, 8], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 1, 7, 4], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 13, 7, 16], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 9, 7, 12], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "back rail", + "from": [5, 2, 11], + "to": [11, 5, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 2]}, + "faces": { + "north": {"uv": [0, 9, 7, 12], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 5, 7, 8], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 1, 7, 4], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 13, 7, 16], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/thin_rails.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_light.json similarity index 99% rename from src/main/resources/assets/compendium/models/block/furniture/chair/legs/thin_rails.json rename to src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_light.json index 53cfe5a726..b320cccf4b 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/thin_rails.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_light.json @@ -1,4 +1,5 @@ { + "format_version": "1.21.6", "credit": "Made with Blockbench", "parent": "block/block", "textures": { diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic_rails.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_medium.json similarity index 99% rename from src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic_rails.json rename to src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_medium.json index d34ba96559..d57f42c4e7 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic_rails.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_medium.json @@ -1,4 +1,5 @@ { + "format_version": "1.21.6", "credit": "Made with Blockbench", "parent": "block/block", "textures": { diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/seat/chunky.json b/src/main/resources/assets/compendium/models/block/furniture/chair/seat/basic_heavy.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/seat/chunky.json rename to src/main/resources/assets/compendium/models/block/furniture/chair/seat/basic_heavy.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/seat/thin.json b/src/main/resources/assets/compendium/models/block/furniture/chair/seat/basic_light.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/seat/thin.json rename to src/main/resources/assets/compendium/models/block/furniture/chair/seat/basic_light.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/seat/basic.json b/src/main/resources/assets/compendium/models/block/furniture/chair/seat/basic_medium.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/seat/basic.json rename to src/main/resources/assets/compendium/models/block/furniture/chair/seat/basic_medium.json