From eae71d0d96e142a78bebb2011e93bcf3fe950857 Mon Sep 17 00:00:00 2001 From: Robynstar Date: Mon, 23 Jun 2025 23:08:07 +1200 Subject: [PATCH] Planks and pedestals are tricky. --- .../blocks/chair/StyleChairBlockEntity.java | 17 ++- .../block/furniture/chair/back/braced.json | 81 ++++++++++++ .../furniture/chair/back/contemporary.json | 39 ++++++ .../chair/back/contemporary_slats.json | 67 ++++++++++ .../block/furniture/chair/back/flat.json | 53 ++++++++ .../furniture/chair/back/flat_extra.json | 67 ++++++++++ .../block/furniture/chair/back/laced.json | 123 ++++++++++++++++++ .../furniture/chair/back/ladder_tall.json | 109 ++++++++++++++++ .../block/furniture/chair/back/lath.json | 123 ++++++++++++++++++ .../block/furniture/chair/back/lattice.json | 123 ++++++++++++++++++ .../chair/back/planks_horizontal.json | 95 ++++++++++++++ .../chair/back/planks_horizontal_angled.json | 95 ++++++++++++++ .../block/furniture/chair/back/splat.json | 81 ++++++++++++ .../furniture/chair/back/splat_double.json | 95 ++++++++++++++ .../furniture/chair/back/splat_slat.json | 65 +++++++++ .../block/furniture/chair/back/vienna.json | 81 ++++++++++++ .../block/furniture/chair/legs/crosstie.json | 67 ++++++++++ .../block/furniture/chair/legs/pedestal.json | 36 +++-- .../furniture/chair/legs/pedestal_cross.json | 24 +++- ...stal_X.json => pedestal_cross_tilted.json} | 25 +++- .../chair/seat/planks_horizontal.json | 95 ++++++++++++++ .../chair/seat/planks_horizontal_angled.json | 95 ++++++++++++++ 22 files changed, 1628 insertions(+), 28 deletions(-) create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/back/braced.json create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/back/contemporary.json create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/back/contemporary_slats.json create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/back/flat.json create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/back/flat_extra.json create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/back/laced.json create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/back/ladder_tall.json create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/back/lath.json create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/back/lattice.json create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/back/planks_horizontal.json create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/back/planks_horizontal_angled.json create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/back/splat.json create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/back/splat_double.json create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/back/splat_slat.json create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/back/vienna.json create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/legs/crosstie.json rename src/main/resources/assets/compendium/models/block/furniture/chair/legs/{pedestal_X.json => pedestal_cross_tilted.json} (75%) create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/seat/planks_horizontal.json create mode 100644 src/main/resources/assets/compendium/models/block/furniture/chair/seat/planks_horizontal_angled.json diff --git a/src/main/java/com/lance5057/compendium/blocks/chair/StyleChairBlockEntity.java b/src/main/java/com/lance5057/compendium/blocks/chair/StyleChairBlockEntity.java index 2f50b6759d..16f90d0523 100644 --- a/src/main/java/com/lance5057/compendium/blocks/chair/StyleChairBlockEntity.java +++ b/src/main/java/com/lance5057/compendium/blocks/chair/StyleChairBlockEntity.java @@ -20,13 +20,16 @@ public class StyleChairBlockEntity extends MultiMaterialBlockEntity implements IStyleable { - public static List back = List.of("basic", "basic_panel", "cross", "cross_framed", "fan", "full", "ladder", - "live_edge", "open", "panel", "panel_weave", "slats", "slats_chunky", "solid", "turned_panel", - "turned_panel_weave", "weave", "windsor"); - public static List seat = List.of("basic", "tilted", "tilted_weave", "weave"); - public static List legs = List.of("basic", "angled", "pedestal", "pedestal_cross", "pedestal_x", - "rails_connected", "rails_end", "rails_full", "rails_full_offset", "rails_side", "solid", "solid_ends", - "solid_sides"); + public static List back = List.of("basic", "basic_panel", "braced", "contemporary", + "contemporary_slats", "cross", "cross_framed", "fan", "flat", "flat_extra", "full", "laced", "ladder", + "ladder_tall", "lath", "lattice", "live_edge", "open", "panel", "panel_weave", "planks_horizontal", + "planks_horizontal_angled", "slats", "slats_chunky", "solid", "splat", "splat_double", "splat_slat", + "turned_panel", "turned_panel_weave", "vienna", "weave", "windsor"); + public static List seat = List.of("basic", "planks_horizontal", "planks_horizontal_angled", "tilted", + "tilted_weave", "weave"); + public static List legs = List.of("basic", "angled", "crosstie", "pedestal", "pedestal_cross", + "pedestal_cross_tilted", "rails_connected", "rails_end", "rails_full", "rails_full_offset", "rails_side", + "solid", "solid_ends", "solid_sides"); List> styles = List.of(back, seat, legs); // Immutable! diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/braced.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/braced.json new file mode 100644 index 0000000000..14c25aad6a --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/braced.json @@ -0,0 +1,81 @@ +{ + "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, 12], + "to": [4, 20, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, + "faces": { + "north": {"uv": [0, 1, 9, 3], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 13, 9, 15], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 9, 9, 11], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 5, 9, 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"} + } + }, + { + "name": "right upright", + "from": [12, 11, 12], + "to": [14, 20, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 5, 9, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 1, 9, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 13, 9, 15], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 9, 9, 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": "diagonal", + "from": [11.01, 12.01, 12.01], + "to": [12.99, 20.99, 13.99], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 15.5, 13]}, + "faces": { + "north": {"uv": [0, 5, 8.98, 6.98], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 1, 8.98, 2.98], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 13, 8.98, 14.98], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 9, 8.98, 10.98], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 1.98, 2.98], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 1.98, 2.98], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "diagonal", + "from": [4.52, 18.52, 12.02], + "to": [12.48, 20.48, 13.98], + "rotation": {"angle": 45, "axis": "z", "origin": [8, 15.5, 13]}, + "faces": { + "north": {"uv": [0, 5, 7.96, 6.96], "rotation": 180, "texture": "#0"}, + "east": {"uv": [0, 1, 1.96, 2.96], "texture": "#0"}, + "south": {"uv": [0, 13, 7.96, 14.96], "texture": "#0"}, + "west": {"uv": [0, 1, 1.96, 2.96], "texture": "#0"}, + "up": {"uv": [0, 1, 7.96, 2.96], "texture": "#0"}, + "down": {"uv": [0, 9, 7.96, 10.96], "texture": "#0"} + } + }, + { + "name": "top bar", + "from": [1, 20, 12], + "to": [15, 23, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [0, 1, 14, 4], "texture": "#0"}, + "east": {"uv": [0, 1, 3, 4], "texture": "#0"}, + "south": {"uv": [0, 9, 14, 12], "texture": "#0"}, + "west": {"uv": [4, 1, 7, 4], "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/contemporary.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/contemporary.json new file mode 100644 index 0000000000..af24606f2b --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/contemporary.json @@ -0,0 +1,39 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "block/acacia_planks", + "particle": "block/acacia_planks" + }, + "elements": [ + { + "name": "upright", + "from": [6.5, 11, 13], + "to": [9.5, 23, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, + "faces": { + "north": {"uv": [0, 1, 12, 4], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 13, 12, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 9, 12, 12], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 5, 12, 6], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 1, 4], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 1, 4], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "back panel", + "from": [1, 17, 12], + "to": [15, 23, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [0, 2, 14, 8], "texture": "#0"}, + "east": {"uv": [0, 2, 1, 8], "texture": "#0"}, + "south": {"uv": [0, 10, 14, 16], "texture": "#0"}, + "west": {"uv": [1, 2, 2, 8], "texture": "#0"}, + "up": {"uv": [0, 0, 14, 1], "texture": "#0"}, + "down": {"uv": [0, 1, 14, 2], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/contemporary_slats.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/contemporary_slats.json new file mode 100644 index 0000000000..59d945a955 --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/contemporary_slats.json @@ -0,0 +1,67 @@ +{ + "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": [4.5, 11, 13], + "to": [6, 23, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, + "faces": { + "north": {"uv": [0, 1, 12, 2.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 13, 12, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 9, 12, 10.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 5, 12, 6], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 1, 2.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 1, 2.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "centre upright", + "from": [7.25, 11, 13], + "to": [8.75, 23, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, + "faces": { + "north": {"uv": [0, 1, 12, 2.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 13, 12, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 9, 12, 10.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 5, 12, 6], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 1, 2.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 1, 2.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "right upright", + "from": [10, 11, 13], + "to": [11.5, 23, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, + "faces": { + "north": {"uv": [0, 1, 12, 2.5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 13, 12, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 9, 12, 10.5], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 5, 12, 6], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 1, 2.5], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 1, 2.5], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "back panel", + "from": [1, 17, 12], + "to": [15, 23, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [0, 2, 14, 8], "texture": "#0"}, + "east": {"uv": [0, 2, 1, 8], "texture": "#0"}, + "south": {"uv": [0, 10, 14, 16], "texture": "#0"}, + "west": {"uv": [1, 2, 2, 8], "texture": "#0"}, + "up": {"uv": [0, 0, 14, 1], "texture": "#0"}, + "down": {"uv": [0, 1, 14, 2], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/flat.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/flat.json new file mode 100644 index 0000000000..a828c08b0f --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/flat.json @@ -0,0 +1,53 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "1": "block/acacia_planks", + "particle": "block/acacia_planks" + }, + "elements": [ + { + "name": "left upright", + "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"} + } + }, + { + "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, 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"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"} + } + }, + { + "name": "back panel", + "from": [4, 16, 12.25], + "to": [12, 22, 13.75], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [0, 2, 8, 8], "texture": "#1"}, + "east": {"uv": [0, 2, 1.5, 8], "texture": "#1"}, + "south": {"uv": [0, 10, 8, 16], "texture": "#1"}, + "west": {"uv": [1, 2, 2.5, 8], "texture": "#1"}, + "up": {"uv": [0, 0, 8, 1.5], "texture": "#1"}, + "down": {"uv": [0, 1, 8, 2.5], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/flat_extra.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/flat_extra.json new file mode 100644 index 0000000000..049aa87d80 --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/flat_extra.json @@ -0,0 +1,67 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "1": "block/acacia_planks", + "particle": "block/acacia_planks" + }, + "elements": [ + { + "name": "left upright", + "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"} + } + }, + { + "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, 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"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#1"} + } + }, + { + "name": "back panel", + "from": [4, 16, 12.25], + "to": [12, 22, 13.75], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [0, 2, 8, 8], "texture": "#1"}, + "east": {"uv": [0, 2, 1.5, 8], "texture": "#1"}, + "south": {"uv": [0, 10, 8, 16], "texture": "#1"}, + "west": {"uv": [1, 2, 2.5, 8], "texture": "#1"}, + "up": {"uv": [0, 0, 8, 1.5], "texture": "#1"}, + "down": {"uv": [0, 1, 8, 2.5], "texture": "#1"} + } + }, + { + "name": "back panel", + "from": [4, 13, 12.25], + "to": [12, 15, 13.75], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [8, 9, 16, 11], "texture": "#1"}, + "east": {"uv": [12.5, 0, 14, 2], "texture": "#1"}, + "south": {"uv": [8, 13, 16, 15], "texture": "#1"}, + "west": {"uv": [14.5, 0, 16, 2], "texture": "#1"}, + "up": {"uv": [8, 2, 16, 3.5], "texture": "#1"}, + "down": {"uv": [8, 6, 16, 7.5], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/laced.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/laced.json new file mode 100644 index 0000000000..16d294cfc7 --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/laced.json @@ -0,0 +1,123 @@ +{ + "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, 12], + "to": [4, 27, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, + "faces": { + "north": {"uv": [0, 1, 16, 3], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 13, 16, 15], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 9, 16, 11], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 5, 16, 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"} + } + }, + { + "name": "right upright", + "from": [12, 11, 12], + "to": [14, 27, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 5, 16, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 1, 16, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 13, 16, 15], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 9, 16, 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": "top rail", + "from": [1, 27, 12], + "to": [15, 29, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [0, 4, 14, 6], "texture": "#0"}, + "east": {"uv": [0, 1, 2, 3], "texture": "#0"}, + "south": {"uv": [0, 12, 14, 14], "texture": "#0"}, + "west": {"uv": [4, 1, 6, 3], "texture": "#0"}, + "up": {"uv": [0, 0, 14, 2], "texture": "#0"}, + "down": {"uv": [0, 8, 14, 10], "texture": "#0"} + } + }, + { + "name": "bottom rail", + "from": [4, 12, 12], + "to": [12, 14, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [8, 12, 16, 14], "texture": "#0"}, + "east": {"uv": [0, 1, 2, 3], "texture": "#0"}, + "south": {"uv": [8, 4, 16, 6], "texture": "#0"}, + "west": {"uv": [4, 1, 6, 3], "texture": "#0"}, + "up": {"uv": [8, 0, 16, 2], "texture": "#0"}, + "down": {"uv": [8, 8, 16, 10], "texture": "#0"} + } + }, + { + "name": "diagonal", + "from": [2.5, 16.5, 12.05], + "to": [13.5, 18.5, 13.85], + "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 17.5, 11]}, + "faces": { + "north": {"uv": [5, 5, 16, 7], "rotation": 180, "texture": "#0"}, + "east": {"uv": [0, 1, 1.8, 3], "texture": "#0"}, + "south": {"uv": [5, 12, 16, 14], "texture": "#0"}, + "west": {"uv": [0, 1, 1.8, 3], "texture": "#0"}, + "up": {"uv": [5, 1, 16, 2.8], "texture": "#0"}, + "down": {"uv": [5, 9, 16, 10.8], "texture": "#0"} + } + }, + { + "name": "diagonal", + "from": [2.5, 16.5, 12.1], + "to": [13.5, 18.5, 13.9], + "rotation": {"angle": 22.5, "axis": "z", "origin": [8, 17.5, 11]}, + "faces": { + "north": {"uv": [0, 8, 11, 10], "texture": "#0"}, + "east": {"uv": [0, 1, 1.8, 3], "rotation": 180, "texture": "#0"}, + "south": {"uv": [0, 0, 11, 2], "rotation": 180, "texture": "#0"}, + "west": {"uv": [0, 1, 1.8, 3], "rotation": 180, "texture": "#0"}, + "up": {"uv": [0, 12, 11, 13.8], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 4, 11, 5.8], "rotation": 180, "texture": "#0"} + } + }, + { + "name": "diagonal", + "from": [0.5, 22, 12.05], + "to": [11.5, 24, 13.85], + "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 17.5, 11]}, + "faces": { + "north": {"uv": [5, 8, 16, 10], "rotation": 180, "texture": "#0"}, + "east": {"uv": [0, 1, 1.8, 3], "texture": "#0"}, + "south": {"uv": [5, 0, 16, 2], "texture": "#0"}, + "west": {"uv": [0, 1, 1.8, 3], "texture": "#0"}, + "up": {"uv": [5, 4, 16, 5.8], "texture": "#0"}, + "down": {"uv": [5, 12, 16, 13.8], "texture": "#0"} + } + }, + { + "name": "diagonal", + "from": [4.5, 22, 12.1], + "to": [15.5, 24, 13.9], + "rotation": {"angle": 22.5, "axis": "z", "origin": [8, 17.5, 11]}, + "faces": { + "north": {"uv": [0, 12, 11, 14], "texture": "#0"}, + "east": {"uv": [0, 1, 1.8, 3], "rotation": 180, "texture": "#0"}, + "south": {"uv": [0, 4, 11, 6], "rotation": 180, "texture": "#0"}, + "west": {"uv": [0, 1, 1.8, 3], "rotation": 180, "texture": "#0"}, + "up": {"uv": [0, 0, 11, 1.8], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 8, 11, 9.8], "rotation": 180, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/ladder_tall.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/ladder_tall.json new file mode 100644 index 0000000000..8a30cd4f67 --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/ladder_tall.json @@ -0,0 +1,109 @@ +{ + "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, 12], + "to": [4, 27, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, + "faces": { + "north": {"uv": [0, 1, 16, 3], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 13, 16, 15], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 9, 16, 11], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 5, 16, 7], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 5, 2, 7], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "right upright", + "from": [12, 11, 12], + "to": [14, 27, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 5, 16, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 1, 16, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 13, 16, 15], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 9, 16, 11], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 5, 2, 7], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "bottom rail", + "from": [4, 12, 12], + "to": [12, 14, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 4, 8, 6], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 12, 8, 14], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 8, 8, 10], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 2], "texture": "#0"} + } + }, + { + "name": "middle rail", + "from": [4, 15, 12], + "to": [12, 17, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 8, 8, 10], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 0, 8, 2], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 12, 8, 14], "texture": "#0"}, + "down": {"uv": [0, 4, 8, 6], "texture": "#0"} + } + }, + { + "name": "middle rail", + "from": [4, 18, 12], + "to": [12, 20, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 0, 8, 2], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 8, 8, 10], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 4, 8, 6], "texture": "#0"}, + "down": {"uv": [0, 12, 8, 14], "texture": "#0"} + } + }, + { + "name": "middle rail", + "from": [4, 21, 12], + "to": [12, 23, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [8, 0, 16, 2], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#0"}, + "south": {"uv": [8, 8, 16, 10], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#0"}, + "up": {"uv": [8, 4, 16, 6], "texture": "#0"}, + "down": {"uv": [8, 12, 16, 14], "texture": "#0"} + } + }, + { + "name": "top rail", + "from": [4, 24, 12], + "to": [12, 26, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [8, 1, 16, 3], "texture": "#0"}, + "east": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#0"}, + "south": {"uv": [8, 9, 16, 11], "texture": "#0"}, + "west": {"uv": [0, 0, 2, 2], "rotation": 90, "texture": "#0"}, + "up": {"uv": [8, 5, 16, 7], "texture": "#0"}, + "down": {"uv": [8, 13, 16, 15], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/lath.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/lath.json new file mode 100644 index 0000000000..434d84d428 --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/lath.json @@ -0,0 +1,123 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "block/acacia_planks", + "particle": "block/acacia_planks" + }, + "elements": [ + { + "name": "top rail", + "from": [2, 21, 12], + "to": [14, 23, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 12]}, + "faces": { + "north": {"uv": [0, 4, 12, 6], "texture": "#0"}, + "east": {"uv": [0, 1, 2, 3], "texture": "#0"}, + "south": {"uv": [0, 12, 12, 14], "texture": "#0"}, + "west": {"uv": [4, 1, 6, 3], "texture": "#0"}, + "up": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "down": {"uv": [0, 8, 12, 10], "texture": "#0"} + } + }, + { + "name": "left upright", + "from": [2, 11, 12], + "to": [4, 21, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 11, 13]}, + "faces": { + "north": {"uv": [6, 0, 16, 2], "rotation": 90, "texture": "#0"}, + "east": {"uv": [6, 12, 16, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [6, 8, 16, 10], "rotation": 90, "texture": "#0"}, + "west": {"uv": [6, 4, 16, 6], "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": "slat", + "from": [4.5, 11, 12], + "to": [5.5, 21, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 11, 13]}, + "faces": { + "north": {"uv": [0, 1, 10, 2], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 13, 10, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 9, 10, 10], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 5, 10, 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"} + } + }, + { + "name": "slat", + "from": [6, 11, 12], + "to": [7, 21, 13], + "rotation": {"angle": 0, "axis": "z", "origin": [5, 11, 13]}, + "faces": { + "north": {"uv": [0, 2, 10, 3], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 14, 10, 15], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 10, 10, 11], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 6, 10, 7], "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": "slat", + "from": [7.5, 11, 12], + "to": [8.5, 21, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 11, 13]}, + "faces": { + "north": {"uv": [0, 4, 10, 5], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 0, 10, 1], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 12, 10, 13], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 8, 10, 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": "slat", + "from": [9, 11, 12], + "to": [10, 21, 13], + "rotation": {"angle": 0, "axis": "z", "origin": [11, 11, 13]}, + "faces": { + "north": {"uv": [6, 6, 16, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [6, 2, 16, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [6, 14, 16, 15], "rotation": 90, "texture": "#0"}, + "west": {"uv": [6, 10, 16, 11], "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": "salt", + "from": [10.5, 11, 12], + "to": [11.5, 21, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 13]}, + "faces": { + "north": {"uv": [6, 5, 16, 6], "rotation": 90, "texture": "#0"}, + "east": {"uv": [6, 1, 16, 2], "rotation": 90, "texture": "#0"}, + "south": {"uv": [6, 13, 16, 14], "rotation": 90, "texture": "#0"}, + "west": {"uv": [6, 9, 16, 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": "right upright", + "from": [12, 11, 12], + "to": [14, 21, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 13]}, + "faces": { + "north": {"uv": [6, 5, 16, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [6, 1, 16, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [6, 13, 16, 15], "rotation": 90, "texture": "#0"}, + "west": {"uv": [6, 9, 16, 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"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/lattice.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/lattice.json new file mode 100644 index 0000000000..8f0cf62064 --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/lattice.json @@ -0,0 +1,123 @@ +{ + "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, 12], + "to": [4, 21, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, + "faces": { + "north": {"uv": [0, 1, 10, 3], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 13, 10, 15], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 9, 10, 11], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 5, 10, 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"} + } + }, + { + "name": "right upright", + "from": [12, 11, 12], + "to": [14, 21, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 5, 10, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 1, 10, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 13, 10, 15], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 9, 10, 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": "top rail", + "from": [1, 21, 12], + "to": [15, 23, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [0, 4, 14, 6], "texture": "#0"}, + "east": {"uv": [0, 1, 2, 3], "texture": "#0"}, + "south": {"uv": [0, 12, 14, 14], "texture": "#0"}, + "west": {"uv": [4, 1, 6, 3], "texture": "#0"}, + "up": {"uv": [0, 0, 14, 2], "texture": "#0"}, + "down": {"uv": [0, 8, 14, 10], "texture": "#0"} + } + }, + { + "name": "bottom rail", + "from": [4, 12, 12], + "to": [12, 13, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [8, 12, 16, 13], "texture": "#0"}, + "east": {"uv": [0, 1, 2, 2], "texture": "#0"}, + "south": {"uv": [8, 4, 16, 5], "texture": "#0"}, + "west": {"uv": [4, 1, 6, 2], "texture": "#0"}, + "up": {"uv": [8, 0, 16, 2], "texture": "#0"}, + "down": {"uv": [8, 8, 16, 10], "texture": "#0"} + } + }, + { + "name": "top slat", + "from": [4, 18, 11.999], + "to": [12, 19, 12.999], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [8, 14, 16, 15], "texture": "#0"}, + "east": {"uv": [0, 1, 1, 2], "texture": "#0"}, + "south": {"uv": [8, 6, 16, 7], "texture": "#0"}, + "west": {"uv": [4, 1, 5, 2], "texture": "#0"}, + "up": {"uv": [8, 2, 16, 3], "texture": "#0"}, + "down": {"uv": [8, 10, 16, 11], "texture": "#0"} + } + }, + { + "name": "bottom slat", + "from": [4, 15, 11.999], + "to": [12, 16, 12.999], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [0, 12, 8, 13], "texture": "#0"}, + "east": {"uv": [0, 1, 1, 2], "texture": "#0"}, + "south": {"uv": [0, 4, 8, 5], "texture": "#0"}, + "west": {"uv": [4, 1, 5, 2], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 1], "texture": "#0"}, + "down": {"uv": [0, 8, 8, 9], "texture": "#0"} + } + }, + { + "name": "left slat", + "from": [6, 13, 12], + "to": [7, 21, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [8, 5, 16, 6], "rotation": 90, "texture": "#0"}, + "east": {"uv": [8, 1, 16, 2], "rotation": 90, "texture": "#0"}, + "south": {"uv": [8, 12, 16, 13], "rotation": 90, "texture": "#0"}, + "west": {"uv": [8, 9, 16, 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": "right slat", + "from": [9, 13, 12], + "to": [10, 21, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "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"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/planks_horizontal.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/planks_horizontal.json new file mode 100644 index 0000000000..d27be2db3a --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/planks_horizontal.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": "upright", + "from": [6.5, 11, 13], + "to": [9.5, 26, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, + "faces": { + "north": {"uv": [0, 0, 15, 3], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 13, 15, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 8, 15, 11], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 5, 15, 6], "rotation": 90, "texture": "#0"}, + "up": {"uv": [15, 8, 16, 11], "rotation": 90, "texture": "#0"}, + "down": {"uv": [15, 0, 16, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "bottom plank", + "from": [2, 12, 12], + "to": [14, 14, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "east": {"uv": [14, 0, 15, 2], "texture": "#0"}, + "south": {"uv": [0, 4, 12, 6], "texture": "#0"}, + "west": {"uv": [15, 0, 16, 2], "texture": "#0"}, + "up": {"uv": [0, 2, 12, 3], "texture": "#0"}, + "down": {"uv": [0, 6, 12, 7], "texture": "#0"} + } + }, + { + "name": "plank", + "from": [2, 15, 12], + "to": [14, 17, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [0, 4, 12, 6], "texture": "#0"}, + "east": {"uv": [14, 4, 15, 6], "texture": "#0"}, + "south": {"uv": [0, 8, 12, 10], "texture": "#0"}, + "west": {"uv": [15, 4, 16, 6], "texture": "#0"}, + "up": {"uv": [0, 6, 12, 7], "texture": "#0"}, + "down": {"uv": [0, 10, 12, 11], "texture": "#0"} + } + }, + { + "name": "plank", + "from": [2, 18, 12], + "to": [14, 20, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [0, 8, 12, 10], "texture": "#0"}, + "east": {"uv": [14, 8, 15, 10], "texture": "#0"}, + "south": {"uv": [0, 12, 12, 14], "texture": "#0"}, + "west": {"uv": [15, 8, 16, 10], "texture": "#0"}, + "up": {"uv": [0, 10, 12, 11], "texture": "#0"}, + "down": {"uv": [0, 14, 12, 15], "texture": "#0"} + } + }, + { + "name": "plank", + "from": [2, 21, 12], + "to": [14, 23, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [0, 12, 12, 14], "texture": "#0"}, + "east": {"uv": [14, 12, 15, 14], "texture": "#0"}, + "south": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "west": {"uv": [15, 12, 16, 14], "texture": "#0"}, + "up": {"uv": [0, 14, 12, 15], "texture": "#0"}, + "down": {"uv": [0, 2, 12, 3], "texture": "#0"} + } + }, + { + "name": "top plank", + "from": [2, 24, 12], + "to": [14, 26, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [2, 0, 14, 2], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#0"}, + "south": {"uv": [2, 4, 14, 6], "texture": "#0"}, + "west": {"uv": [1, 0, 2, 2], "texture": "#0"}, + "up": {"uv": [2, 2, 14, 3], "texture": "#0"}, + "down": {"uv": [2, 6, 14, 7], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/planks_horizontal_angled.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/planks_horizontal_angled.json new file mode 100644 index 0000000000..65e537289c --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/planks_horizontal_angled.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": "upright", + "from": [6.5, 11, 13], + "to": [9.5, 26, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, + "faces": { + "north": {"uv": [0, 0, 15, 3], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 13, 15, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 8, 15, 11], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 5, 15, 6], "rotation": 90, "texture": "#0"}, + "up": {"uv": [15, 8, 16, 11], "rotation": 90, "texture": "#0"}, + "down": {"uv": [15, 0, 16, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "bottom plank", + "from": [2, 12, 12], + "to": [14, 14, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "east": {"uv": [14, 0, 15, 2], "texture": "#0"}, + "south": {"uv": [0, 4, 12, 6], "texture": "#0"}, + "west": {"uv": [15, 0, 16, 2], "texture": "#0"}, + "up": {"uv": [0, 2, 12, 3], "texture": "#0"}, + "down": {"uv": [0, 6, 12, 7], "texture": "#0"} + } + }, + { + "name": "plank", + "from": [2.5, 15, 12], + "to": [13.5, 17, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [1, 4, 12, 6], "texture": "#0"}, + "east": {"uv": [14, 4, 15, 6], "texture": "#0"}, + "south": {"uv": [1, 8, 12, 10], "texture": "#0"}, + "west": {"uv": [15, 4, 16, 6], "texture": "#0"}, + "up": {"uv": [1, 6, 12, 7], "texture": "#0"}, + "down": {"uv": [1, 10, 12, 11], "texture": "#0"} + } + }, + { + "name": "plank", + "from": [3, 18, 12], + "to": [13, 20, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [2, 8, 12, 10], "texture": "#0"}, + "east": {"uv": [14, 8, 15, 10], "texture": "#0"}, + "south": {"uv": [2, 12, 12, 14], "texture": "#0"}, + "west": {"uv": [15, 8, 16, 10], "texture": "#0"}, + "up": {"uv": [2, 10, 12, 11], "texture": "#0"}, + "down": {"uv": [2, 14, 12, 15], "texture": "#0"} + } + }, + { + "name": "plank", + "from": [3.5, 21, 12], + "to": [12.5, 23, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [3, 12, 12, 14], "texture": "#0"}, + "east": {"uv": [14, 12, 15, 14], "texture": "#0"}, + "south": {"uv": [3, 0, 12, 2], "texture": "#0"}, + "west": {"uv": [15, 12, 16, 14], "texture": "#0"}, + "up": {"uv": [3, 14, 12, 15], "texture": "#0"}, + "down": {"uv": [3, 2, 12, 3], "texture": "#0"} + } + }, + { + "name": "top plank", + "from": [4, 24, 12], + "to": [12, 26, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [8, 0, 16, 2], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 2], "texture": "#0"}, + "south": {"uv": [8, 5, 16, 7], "texture": "#0"}, + "west": {"uv": [1, 0, 2, 2], "texture": "#0"}, + "up": {"uv": [8, 2, 16, 3], "texture": "#0"}, + "down": {"uv": [8, 4, 16, 5], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/splat.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/splat.json new file mode 100644 index 0000000000..a1c14a9aa7 --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/splat.json @@ -0,0 +1,81 @@ +{ + "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, 12], + "to": [4, 21, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, + "faces": { + "north": {"uv": [0, 1, 10, 3], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 13, 10, 15], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 9, 10, 11], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 5, 10, 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"} + } + }, + { + "name": "right upright", + "from": [12, 11, 12], + "to": [14, 21, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 5, 10, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 1, 10, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 13, 10, 15], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 9, 10, 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": "top rail", + "from": [1, 21, 12], + "to": [15, 23, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [0, 4, 14, 6], "texture": "#0"}, + "east": {"uv": [0, 1, 2, 3], "texture": "#0"}, + "south": {"uv": [0, 12, 14, 14], "texture": "#0"}, + "west": {"uv": [4, 1, 6, 3], "texture": "#0"}, + "up": {"uv": [0, 0, 14, 2], "texture": "#0"}, + "down": {"uv": [0, 8, 14, 10], "texture": "#0"} + } + }, + { + "name": "bottom rail", + "from": [4, 12, 12], + "to": [12, 14, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [8, 12, 16, 14], "texture": "#0"}, + "east": {"uv": [0, 1, 2, 3], "texture": "#0"}, + "south": {"uv": [8, 4, 16, 6], "texture": "#0"}, + "west": {"uv": [4, 1, 6, 3], "texture": "#0"}, + "up": {"uv": [8, 0, 16, 2], "texture": "#0"}, + "down": {"uv": [8, 8, 16, 10], "texture": "#0"} + } + }, + { + "name": "splat", + "from": [6.5, 14, 13], + "to": [9.5, 21, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [9, 5, 16, 8], "rotation": 90, "texture": "#0"}, + "east": {"uv": [9, 1, 16, 2], "rotation": 90, "texture": "#0"}, + "south": {"uv": [9, 12, 16, 15], "rotation": 90, "texture": "#0"}, + "west": {"uv": [9, 9, 16, 10], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 1, 4], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 1, 4], "rotation": 90, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/splat_double.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/splat_double.json new file mode 100644 index 0000000000..dff50aaf5f --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/splat_double.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": "left upright", + "from": [2, 11, 12], + "to": [4, 21, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, + "faces": { + "north": {"uv": [0, 1, 10, 3], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 13, 10, 15], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 9, 10, 11], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 5, 10, 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"} + } + }, + { + "name": "right upright", + "from": [12, 11, 12], + "to": [14, 21, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 5, 10, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 1, 10, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 13, 10, 15], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 9, 10, 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": "top rail", + "from": [1, 21, 12], + "to": [15, 23, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [0, 4, 14, 6], "texture": "#0"}, + "east": {"uv": [0, 1, 2, 3], "texture": "#0"}, + "south": {"uv": [0, 12, 14, 14], "texture": "#0"}, + "west": {"uv": [4, 1, 6, 3], "texture": "#0"}, + "up": {"uv": [0, 0, 14, 2], "texture": "#0"}, + "down": {"uv": [0, 8, 14, 10], "texture": "#0"} + } + }, + { + "name": "bottom rail", + "from": [4, 12, 12], + "to": [12, 14, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [8, 12, 16, 14], "texture": "#0"}, + "east": {"uv": [0, 1, 2, 3], "texture": "#0"}, + "south": {"uv": [8, 4, 16, 6], "texture": "#0"}, + "west": {"uv": [4, 1, 6, 3], "texture": "#0"}, + "up": {"uv": [8, 0, 16, 2], "texture": "#0"}, + "down": {"uv": [8, 8, 16, 10], "texture": "#0"} + } + }, + { + "name": "left splat", + "from": [5.75, 14, 13], + "to": [7.75, 21, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [8, 5, 15, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [8, 1, 15, 2], "rotation": 90, "texture": "#0"}, + "south": {"uv": [8, 12, 15, 14], "rotation": 90, "texture": "#0"}, + "west": {"uv": [8, 9, 15, 10], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 1, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 1, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "right splat", + "from": [8.25, 14, 13], + "to": [10.25, 21, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [9, 5, 16, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [9, 1, 16, 2], "rotation": 90, "texture": "#0"}, + "south": {"uv": [9, 12, 16, 14], "rotation": 90, "texture": "#0"}, + "west": {"uv": [9, 9, 16, 10], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 1, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 1, 3], "rotation": 90, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/splat_slat.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/splat_slat.json new file mode 100644 index 0000000000..85f1e072a0 --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/splat_slat.json @@ -0,0 +1,65 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "parent": "block/block", + "render_type": "cutout", + "textures": { + "0": "block/acacia_planks", + "1": "compendium:block/material/wood/acacia/slats", + "particle": "block/acacia_planks" + }, + "elements": [ + { + "name": "top rail", + "from": [2, 21, 12], + "to": [14, 23, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 12]}, + "faces": { + "north": {"uv": [0, 4, 12, 6], "texture": "#0"}, + "east": {"uv": [0, 1, 2, 3], "texture": "#0"}, + "south": {"uv": [0, 12, 12, 14], "texture": "#0"}, + "west": {"uv": [4, 1, 6, 3], "texture": "#0"}, + "up": {"uv": [0, 0, 12, 2], "texture": "#0"}, + "down": {"uv": [0, 8, 12, 10], "texture": "#0"} + } + }, + { + "name": "left upright", + "from": [2, 11, 12], + "to": [4, 21, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [7, 11, 13]}, + "faces": { + "north": {"uv": [6, 0, 16, 2], "rotation": 90, "texture": "#0"}, + "east": {"uv": [6, 12, 16, 14], "rotation": 90, "texture": "#0"}, + "south": {"uv": [6, 8, 16, 10], "rotation": 90, "texture": "#0"}, + "west": {"uv": [6, 4, 16, 6], "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": "right upright", + "from": [12, 11, 12], + "to": [14, 21, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 13]}, + "faces": { + "north": {"uv": [6, 5, 16, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [6, 1, 16, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [6, 13, 16, 15], "rotation": 90, "texture": "#0"}, + "west": {"uv": [6, 9, 16, 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": "panel", + "from": [5.25, 11, 13], + "to": [10.75, 21, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 11, 11]}, + "faces": { + "north": {"uv": [0, 0, 11, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 11, 16], "texture": "#1"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/vienna.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/vienna.json new file mode 100644 index 0000000000..e5cfa436ff --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/vienna.json @@ -0,0 +1,81 @@ +{ + "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, 12], + "to": [4, 20, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, + "faces": { + "north": {"uv": [0, 1, 9, 3], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 13, 9, 15], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 9, 9, 11], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 5, 9, 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"} + } + }, + { + "name": "right upright", + "from": [12, 11, 12], + "to": [14, 20, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]}, + "faces": { + "north": {"uv": [0, 5, 9, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 1, 9, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 13, 9, 15], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 9, 9, 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": "diagonal", + "from": [9.01, 9.01, 12.01], + "to": [10.99, 21.99, 13.99], + "rotation": {"angle": 22.5, "axis": "z", "origin": [8, 15.5, 13]}, + "faces": { + "north": {"uv": [0, 5, 12.98, 6.98], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 1, 12.98, 2.98], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 13, 12.98, 14.98], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 9, 12.98, 10.98], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 1.98, 2.98], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 1.98, 2.98], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "diagonal", + "from": [5.02, 9.02, 12.02], + "to": [6.98, 21.98, 13.98], + "rotation": {"angle": -22.5, "axis": "z", "origin": [8, 15.5, 13]}, + "faces": { + "north": {"uv": [0, 5, 12.96, 6.96], "rotation": 270, "texture": "#0"}, + "east": {"uv": [0, 9, 12.96, 10.96], "rotation": 270, "texture": "#0"}, + "south": {"uv": [0, 13, 12.96, 14.96], "rotation": 270, "texture": "#0"}, + "west": {"uv": [0, 1, 12.96, 2.96], "rotation": 270, "texture": "#0"}, + "up": {"uv": [0, 1, 1.96, 2.96], "rotation": 270, "texture": "#0"}, + "down": {"uv": [0, 1, 1.96, 2.96], "rotation": 270, "texture": "#0"} + } + }, + { + "name": "top bar", + "from": [1, 20, 12], + "to": [15, 23, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [0, 1, 14, 4], "texture": "#0"}, + "east": {"uv": [0, 1, 2, 4], "texture": "#0"}, + "south": {"uv": [0, 9, 14, 12], "texture": "#0"}, + "west": {"uv": [4, 1, 6, 4], "texture": "#0"}, + "up": {"uv": [0, 0, 14, 2], "texture": "#0"}, + "down": {"uv": [0, 3, 14, 5], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/crosstie.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/crosstie.json new file mode 100644 index 0000000000..b9af990521 --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/crosstie.json @@ -0,0 +1,67 @@ +{ + "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.001, 0, 2], + "to": [4.001, 14.85, 4], + "rotation": {"angle": 45, "axis": "x", "origin": [3, 0, 2]}, + "faces": { + "north": {"uv": [0, 1, 14.85, 3], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 13, 14.85, 15], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 9, 14.85, 11], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 5, 14.85, 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"} + } + }, + { + "name": "front right leg", + "from": [11.999, 0, 2], + "to": [13.999, 14.85, 4], + "rotation": {"angle": 45, "axis": "x", "origin": [13, 0, 2]}, + "faces": { + "north": {"uv": [0, 5, 14.85, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 1, 14.85, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 13, 14.85, 15], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 9, 14.85, 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 right leg", + "from": [11.998, 0, 12], + "to": [13.998, 14.85, 14], + "rotation": {"angle": -45, "axis": "x", "origin": [13, 0, 14]}, + "faces": { + "north": {"uv": [0, 9, 14.85, 11], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 5, 14.85, 7], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 1, 14.85, 3], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 13, 14.85, 15], "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 left leg", + "from": [2.002, 0, 12], + "to": [4.002, 14.85, 14], + "rotation": {"angle": -45, "axis": "x", "origin": [3, 0, 14]}, + "faces": { + "north": {"uv": [0, 13, 14.85, 15], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 9, 14.85, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 5, 14.85, 7], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 1, 14.85, 3], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/pedestal.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/pedestal.json index 50741fd432..49f81120ad 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/pedestal.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/pedestal.json @@ -9,14 +9,14 @@ "elements": [ { "name": "pedestal", - "from": [7, 2, 7], - "to": [9, 9, 9], + "from": [7, 1.5, 7], + "to": [9, 9.1, 9], "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 2]}, "faces": { - "north": {"uv": [0, 1, 7, 3], "rotation": 90, "texture": "#0"}, - "east": {"uv": [0, 13, 7, 15], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 9, 7, 11], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 5, 7, 7], "rotation": 90, "texture": "#0"}, + "north": {"uv": [0, 1, 8.5, 3], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 13, 8.5, 15], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 9, 8.5, 11], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 5, 8.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"} } @@ -24,16 +24,30 @@ { "name": "base", "from": [2, 0, 2], - "to": [14, 2, 14], + "to": [14, 1.5, 14], "rotation": {"angle": 0, "axis": "y", "origin": [0, 7, 0]}, "faces": { - "north": {"uv": [0, 1, 12, 3], "texture": "#0"}, - "east": {"uv": [0, 5, 12, 7], "texture": "#0"}, - "south": {"uv": [0, 5, 12, 7], "texture": "#0"}, - "west": {"uv": [0, 5, 12, 7], "texture": "#0"}, + "north": {"uv": [0, 1, 12, 2.5], "texture": "#0"}, + "east": {"uv": [0, 5, 12, 6.5], "texture": "#0"}, + "south": {"uv": [0, 5, 12, 6.5], "texture": "#0"}, + "west": {"uv": [0, 5, 12, 6.5], "texture": "#0"}, "up": {"uv": [0, 0, 12, 12], "texture": "#0"}, "down": {"uv": [0, 0, 12, 12], "texture": "#0"} } + }, + { + "name": "top connector", + "from": [4, 9.1, 6.5], + "to": [12, 9.999, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 7, 0]}, + "faces": { + "north": {"uv": [0, 1, 8, 1.899], "texture": "#0"}, + "east": {"uv": [0, 5, 3, 5.899], "texture": "#0"}, + "south": {"uv": [0, 5, 8, 5.899], "texture": "#0"}, + "west": {"uv": [0, 5, 3, 5.899], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 3], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 3], "texture": "#0"} + } } ] } \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/pedestal_cross.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/pedestal_cross.json index ceb321bef0..47ef2510a9 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/pedestal_cross.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/pedestal_cross.json @@ -10,13 +10,13 @@ { "name": "pedestal", "from": [7, 0, 7], - "to": [9, 9, 9], + "to": [9, 9.1, 9], "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 2]}, "faces": { - "north": {"uv": [0, 1, 9, 3], "rotation": 90, "texture": "#0"}, - "east": {"uv": [0, 13, 9, 15], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 9, 9, 11], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 5, 9, 7], "rotation": 90, "texture": "#0"}, + "north": {"uv": [0, 1, 10, 3], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 13, 10, 15], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 9, 10, 11], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 5, 10, 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"} } @@ -76,6 +76,20 @@ "up": {"uv": [6, 0, 11, 2], "rotation": 90, "texture": "#0"}, "down": {"uv": [6, 0, 11, 2], "rotation": 90, "texture": "#0"} } + }, + { + "name": "top connector", + "from": [4, 9.1, 6.5], + "to": [12, 9.999, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 7, 0]}, + "faces": { + "north": {"uv": [0, 1, 8, 1.899], "texture": "#0"}, + "east": {"uv": [0, 5, 3, 5.899], "texture": "#0"}, + "south": {"uv": [0, 5, 8, 5.899], "texture": "#0"}, + "west": {"uv": [0, 5, 3, 5.899], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 3], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 3], "texture": "#0"} + } } ] } \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/pedestal_X.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/pedestal_cross_tilted.json similarity index 75% rename from src/main/resources/assets/compendium/models/block/furniture/chair/legs/pedestal_X.json rename to src/main/resources/assets/compendium/models/block/furniture/chair/legs/pedestal_cross_tilted.json index 69fa88a21f..03c0e2134c 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/pedestal_X.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/pedestal_cross_tilted.json @@ -2,6 +2,7 @@ "format_version": "1.21.6", "credit": "Made with Blockbench", "parent": "block/block", + "render_type": "cutout", "textures": { "0": "block/acacia_planks", "particle": "block/acacia_planks" @@ -10,13 +11,13 @@ { "name": "pedestal", "from": [7, 0, 7], - "to": [9, 9, 9], + "to": [9, 9.1, 9], "rotation": {"angle": 45, "axis": "y", "origin": [8, 0, 8]}, "faces": { - "north": {"uv": [0, 1, 9, 3], "rotation": 90, "texture": "#0"}, - "east": {"uv": [0, 13, 9, 15], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 9, 9, 11], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 5, 9, 7], "rotation": 90, "texture": "#0"}, + "north": {"uv": [0, 1, 10, 3], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 13, 10, 15], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 9, 10, 11], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 5, 10, 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"} } @@ -76,6 +77,20 @@ "up": {"uv": [6, 0, 11, 2], "rotation": 90, "texture": "#0"}, "down": {"uv": [6, 0, 11, 2], "rotation": 90, "texture": "#0"} } + }, + { + "name": "top connector", + "from": [4, 9.1, 6.5], + "to": [12, 9.999, 9.5], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 7, 0]}, + "faces": { + "north": {"uv": [0, 1, 8, 1.899], "texture": "#0"}, + "east": {"uv": [0, 5, 3, 5.899], "texture": "#0"}, + "south": {"uv": [0, 5, 8, 5.899], "texture": "#0"}, + "west": {"uv": [0, 5, 3, 5.899], "texture": "#0"}, + "up": {"uv": [0, 0, 8, 3], "texture": "#0"}, + "down": {"uv": [0, 0, 8, 3], "texture": "#0"} + } } ] } \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/seat/planks_horizontal.json b/src/main/resources/assets/compendium/models/block/furniture/chair/seat/planks_horizontal.json new file mode 100644 index 0000000000..eeb0498184 --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/seat/planks_horizontal.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": "left bottom support", + "from": [2, 9, 2], + "to": [5, 10, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 7, 0]}, + "faces": { + "north": {"uv": [0, 4, 3, 5], "texture": "#0"}, + "east": {"uv": [4, 12, 16, 13], "texture": "#0"}, + "south": {"uv": [0, 12, 3, 13], "texture": "#0"}, + "west": {"uv": [4, 0, 16, 1], "texture": "#0"}, + "up": {"uv": [4, 4, 16, 7], "rotation": 90, "texture": "#0"}, + "down": {"uv": [4, 8, 16, 11], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "right bottom support", + "from": [11, 9, 2], + "to": [14, 10, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 7, 0]}, + "faces": { + "north": {"uv": [0, 4, 3, 5], "texture": "#0"}, + "east": {"uv": [4, 12, 16, 13], "texture": "#0"}, + "south": {"uv": [0, 12, 3, 13], "texture": "#0"}, + "west": {"uv": [4, 0, 16, 1], "texture": "#0"}, + "up": {"uv": [4, 4, 16, 7], "rotation": 90, "texture": "#0"}, + "down": {"uv": [4, 8, 16, 11], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "back plank", + "from": [2, 10, 11], + "to": [14, 11, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [4, 5, 16, 6], "texture": "#0"}, + "east": {"uv": [2, 6, 5, 7], "texture": "#0"}, + "south": {"uv": [4, 9, 16, 10], "texture": "#0"}, + "west": {"uv": [2, 5, 5, 6], "texture": "#0"}, + "up": {"uv": [4, 4, 16, 7], "texture": "#0"}, + "down": {"uv": [4, 8, 16, 11], "texture": "#0"} + } + }, + { + "name": "plank", + "from": [2, 10, 8], + "to": [14, 11, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [4, 8, 16, 9], "texture": "#0"}, + "east": {"uv": [2, 10, 4, 11], "texture": "#0"}, + "south": {"uv": [4, 12, 16, 13], "texture": "#0"}, + "west": {"uv": [2, 9, 4, 10], "texture": "#0"}, + "up": {"uv": [4, 9, 16, 11], "texture": "#0"}, + "down": {"uv": [4, 13, 16, 15], "texture": "#0"} + } + }, + { + "name": "plank", + "from": [2, 10, 5], + "to": [14, 11, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [4, 12, 16, 13], "texture": "#0"}, + "east": {"uv": [2, 13, 4, 14], "texture": "#0"}, + "south": {"uv": [4, 0, 16, 1], "texture": "#0"}, + "west": {"uv": [2, 14, 4, 15], "texture": "#0"}, + "up": {"uv": [4, 13, 16, 15], "texture": "#0"}, + "down": {"uv": [4, 1, 16, 3], "texture": "#0"} + } + }, + { + "name": "front plank", + "from": [2, 10, 2], + "to": [14, 11, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [4, 0, 16, 1], "texture": "#0"}, + "east": {"uv": [2, 0, 4, 1], "texture": "#0"}, + "south": {"uv": [4, 4, 16, 5], "texture": "#0"}, + "west": {"uv": [2, 1, 4, 2], "texture": "#0"}, + "up": {"uv": [4, 1, 16, 3], "texture": "#0"}, + "down": {"uv": [4, 5, 16, 7], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/seat/planks_horizontal_angled.json b/src/main/resources/assets/compendium/models/block/furniture/chair/seat/planks_horizontal_angled.json new file mode 100644 index 0000000000..8494c18ffa --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/seat/planks_horizontal_angled.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": "left bottom support", + "from": [3.5, 9, 2], + "to": [6.5, 10, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 7, 0]}, + "faces": { + "north": {"uv": [0, 2, 3, 3], "texture": "#0"}, + "east": {"uv": [4, 10, 16, 11], "texture": "#0"}, + "south": {"uv": [0, 8, 3, 9], "texture": "#0"}, + "west": {"uv": [4, 4, 16, 5], "texture": "#0"}, + "up": {"uv": [4, 0, 16, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [4, 12, 16, 15], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "right bottom support", + "from": [9.5, 9, 2], + "to": [12.5, 10, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 7, 0]}, + "faces": { + "north": {"uv": [0, 4, 3, 5], "texture": "#0"}, + "east": {"uv": [4, 12, 16, 13], "texture": "#0"}, + "south": {"uv": [0, 12, 3, 13], "texture": "#0"}, + "west": {"uv": [4, 0, 16, 1], "texture": "#0"}, + "up": {"uv": [4, 4, 16, 7], "rotation": 90, "texture": "#0"}, + "down": {"uv": [4, 8, 16, 11], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "back plank", + "from": [2, 10, 11], + "to": [14, 11, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [4, 5, 16, 6], "texture": "#0"}, + "east": {"uv": [2, 6, 5, 7], "texture": "#0"}, + "south": {"uv": [4, 9, 16, 10], "texture": "#0"}, + "west": {"uv": [2, 5, 5, 6], "texture": "#0"}, + "up": {"uv": [4, 4, 16, 7], "texture": "#0"}, + "down": {"uv": [4, 8, 16, 11], "texture": "#0"} + } + }, + { + "name": "plank", + "from": [2.5, 10, 8], + "to": [13.5, 11, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [4, 8, 15, 9], "texture": "#0"}, + "east": {"uv": [2, 10, 4, 11], "texture": "#0"}, + "south": {"uv": [4, 12, 15, 13], "texture": "#0"}, + "west": {"uv": [2, 9, 4, 10], "texture": "#0"}, + "up": {"uv": [4, 9, 15, 11], "texture": "#0"}, + "down": {"uv": [4, 13, 15, 15], "texture": "#0"} + } + }, + { + "name": "plank", + "from": [3, 10, 5], + "to": [13, 11, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [4, 12, 14, 13], "texture": "#0"}, + "east": {"uv": [2, 13, 4, 14], "texture": "#0"}, + "south": {"uv": [4, 0, 14, 1], "texture": "#0"}, + "west": {"uv": [2, 14, 4, 15], "texture": "#0"}, + "up": {"uv": [4, 13, 14, 15], "texture": "#0"}, + "down": {"uv": [4, 1, 14, 3], "texture": "#0"} + } + }, + { + "name": "front plank", + "from": [3.5, 10, 2], + "to": [12.5, 11, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [4, 0, 13, 1], "texture": "#0"}, + "east": {"uv": [2, 0, 4, 1], "texture": "#0"}, + "south": {"uv": [4, 4, 13, 5], "texture": "#0"}, + "west": {"uv": [2, 1, 4, 2], "texture": "#0"}, + "up": {"uv": [4, 1, 13, 3], "texture": "#0"}, + "down": {"uv": [4, 5, 13, 7], "texture": "#0"} + } + } + ] +} \ No newline at end of file