diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/basic_heavy.json b/bbmodels_gimpfiles/chair models/back_basic_heavy.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/back/basic_heavy.json rename to bbmodels_gimpfiles/chair models/back_basic_heavy.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/basic_light.json b/bbmodels_gimpfiles/chair models/back_basic_light.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/back/basic_light.json rename to bbmodels_gimpfiles/chair models/back_basic_light.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/cross_heavy.json b/bbmodels_gimpfiles/chair models/cross_heavy.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/back/cross_heavy.json rename to bbmodels_gimpfiles/chair models/cross_heavy.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/cross_light.json b/bbmodels_gimpfiles/chair models/cross_light.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/back/cross_light.json rename to bbmodels_gimpfiles/chair models/cross_light.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/ladder_heavy.json b/bbmodels_gimpfiles/chair models/ladder_heavy.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/back/ladder_heavy.json rename to bbmodels_gimpfiles/chair models/ladder_heavy.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/ladder_light.json b/bbmodels_gimpfiles/chair models/ladder_light.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/back/ladder_light.json rename to bbmodels_gimpfiles/chair models/ladder_light.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic_heavy.json b/bbmodels_gimpfiles/chair models/legs_basic_heavy.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic_heavy.json rename to bbmodels_gimpfiles/chair models/legs_basic_heavy.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic_light.json b/bbmodels_gimpfiles/chair models/legs_basic_light.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic_light.json rename to bbmodels_gimpfiles/chair models/legs_basic_light.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/panel_heavy.json b/bbmodels_gimpfiles/chair models/panel_heavy.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/back/panel_heavy.json rename to bbmodels_gimpfiles/chair models/panel_heavy.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/panel_light.json b/bbmodels_gimpfiles/chair models/panel_light.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/back/panel_light.json rename to bbmodels_gimpfiles/chair models/panel_light.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_heavy.json b/bbmodels_gimpfiles/chair models/rails_heavy.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_heavy.json rename to bbmodels_gimpfiles/chair models/rails_heavy.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_light.json b/bbmodels_gimpfiles/chair models/rails_light.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_light.json rename to bbmodels_gimpfiles/chair models/rails_light.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/seat/basic_heavy.json b/bbmodels_gimpfiles/chair models/seat_basic_heavy.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/seat/basic_heavy.json rename to bbmodels_gimpfiles/chair models/seat_basic_heavy.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/seat/basic_light.json b/bbmodels_gimpfiles/chair models/seat_basic_light.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/seat/basic_light.json rename to bbmodels_gimpfiles/chair models/seat_basic_light.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/slat_heavy.json b/bbmodels_gimpfiles/chair models/slat_heavy.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/back/slat_heavy.json rename to bbmodels_gimpfiles/chair models/slat_heavy.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/slat_light.json b/bbmodels_gimpfiles/chair models/slat_light.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/back/slat_light.json rename to bbmodels_gimpfiles/chair models/slat_light.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/solid_heavy.json b/bbmodels_gimpfiles/chair models/solid_heavy.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/back/solid_heavy.json rename to bbmodels_gimpfiles/chair models/solid_heavy.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/solid_light.json b/bbmodels_gimpfiles/chair models/solid_light.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/back/solid_light.json rename to bbmodels_gimpfiles/chair models/solid_light.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 3810dd3a08..20ccd8d516 100644 --- a/src/main/java/com/lance5057/compendium/blocks/chair/StyleChairBlockEntity.java +++ b/src/main/java/com/lance5057/compendium/blocks/chair/StyleChairBlockEntity.java @@ -22,14 +22,14 @@ import net.neoforged.neoforge.client.model.data.ModelData; public class StyleChairBlockEntity extends MultiMaterialBlockEntity implements IStyleable { - public static List back = List.of("basic_heavy", "basic_medium", "basic_light", "ladder_heavy", - "ladder_medium", "ladder_light", "cross", "full", "live_edge", "open", "panel", "panel_weave", "slats", - "turned_panel", "turned_panel_weave", "weave", "windsor", "cross_heavy", "cross_light", "cross_medium", - "panel_heavy", "panel_medium", "panel_light", "slat_heavy", "slat_light", "slat_medium", "solid_heavy", - "solid_light", "solid_medium"); - public static List seat = List.of("basic_heavy", "basic_medium", "basic_light"); - public static List legs = List.of("basic_heavy", "basic_medium", "basic_light", "rails_heavy", - "rails_medium", "rails_light"); + + public static List back = List.of("back", "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("seat", "basic", "tilted", "tilted_weave", "weave"); + public static List legs = List.of("legs", "basic", "angled", "pedestal", "pedestal_cross", + "pedestal_X", "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/basic_medium.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/basic.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/back/basic_medium.json rename to src/main/resources/assets/compendium/models/block/furniture/chair/back/basic.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/panel_medium.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/basic_panel.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/back/panel_medium.json rename to src/main/resources/assets/compendium/models/block/furniture/chair/back/basic_panel.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/cross.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/cross.json index f36adf80c0..dd8599c388 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/back/cross.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/cross.json @@ -1,4 +1,5 @@ { + "format_version": "1.21.6", "credit": "Made with Blockbench", "parent": "block/block", "textures": { @@ -12,10 +13,10 @@ "to": [4, 20, 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"}, + "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"} } @@ -26,16 +27,16 @@ "to": [14, 20, 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, 13, 5, 15], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 9, 5, 11], "rotation": 90, "texture": "#0"}, + "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": "right upright", + "name": "diagonal", "from": [7.01, 9.01, 12.01], "to": [8.99, 21.99, 13.99], "rotation": {"angle": 45, "axis": "z", "origin": [8, 15.5, 13]}, @@ -49,7 +50,7 @@ } }, { - "name": "right upright", + "name": "diagonal", "from": [1.52, 14.52, 12.02], "to": [14.48, 16.48, 13.98], "rotation": {"angle": 45, "axis": "z", "origin": [8, 15.5, 13]}, @@ -63,7 +64,7 @@ } }, { - "name": "back panel", + "name": "top bar", "from": [1, 20, 12], "to": [15, 23, 15], "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, @@ -76,6 +77,5 @@ "down": {"uv": [0, 3, 14, 6], "texture": "#0"} } } - ], - "format_version": "1.21.6" + ] } \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/cross_medium.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/cross_framed.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/back/cross_medium.json rename to src/main/resources/assets/compendium/models/block/furniture/chair/back/cross_framed.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/fan.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/fan.json new file mode 100644 index 0000000000..a1a65019db --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/fan.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": [6.85, 11, 12.001], + "to": [7.85, 21, 13.001], + "rotation": {"angle": 0, "axis": "z", "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": "left diagonal", + "from": [5.5, 10, 12.001], + "to": [6.5, 22, 13.001], + "rotation": {"angle": 22.5, "axis": "z", "origin": [5, 11, 13]}, + "faces": { + "north": {"uv": [0, 2, 12, 3], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 14, 12, 15], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 10, 12, 11], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 6, 12, 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": "right upright", + "from": [8.15, 11, 12.001], + "to": [9.15, 21, 13.001], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 11, 13]}, + "faces": { + "north": {"uv": [0, 5, 10, 6], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 1, 10, 2], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 13, 10, 14], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 9, 10, 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 diagonal", + "from": [9.5, 10, 12.001], + "to": [10.5, 22, 13.001], + "rotation": {"angle": -22.5, "axis": "z", "origin": [11, 11, 13]}, + "faces": { + "north": {"uv": [0, 6, 12, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 2, 12, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 14, 12, 15], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 10, 12, 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": "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"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/full.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/full.json index 8516b661e2..e413294acd 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/back/full.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/full.json @@ -1,4 +1,5 @@ { + "format_version": "1.21.6", "credit": "Made with Blockbench", "parent": "block/block", "textures": { @@ -12,10 +13,10 @@ "to": [4, 20, 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"}, + "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"} } @@ -26,16 +27,16 @@ "to": [14, 20, 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, 13, 5, 15], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 9, 5, 11], "rotation": 90, "texture": "#0"}, + "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": "right upright", + "name": "back panel", "from": [4, 11, 13], "to": [12, 20, 13], "rotation": {"angle": 0, "axis": "y", "origin": [9, 11, 11]}, @@ -45,19 +46,18 @@ } }, { - "name": "back panel", + "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"}, + "north": {"uv": [0, 0, 14, 3], "texture": "#0"}, + "east": {"uv": [0, 12, 3, 15], "texture": "#0"}, + "south": {"uv": [0, 8, 14, 11], "texture": "#0"}, + "west": {"uv": [3, 12, 6, 15], "texture": "#0"}, "up": {"uv": [0, 0, 14, 3], "texture": "#0"}, - "down": {"uv": [0, 3, 14, 6], "texture": "#0"} + "down": {"uv": [0, 4, 14, 7], "texture": "#0"} } } - ], - "format_version": "1.21.6" + ] } \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/ladder_medium.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/ladder.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/back/ladder_medium.json rename to src/main/resources/assets/compendium/models/block/furniture/chair/back/ladder.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/live_edge.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/live_edge.json index ab2489959a..613e546946 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/back/live_edge.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/live_edge.json @@ -1,4 +1,5 @@ { + "format_version": "1.21.6", "credit": "Made with Blockbench", "parent": "block/block", "textures": { @@ -7,7 +8,7 @@ }, "elements": [ { - "name": "left upright", + "name": "back panel", "from": [2, 4, 12], "to": [14, 20, 14], "rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]}, @@ -21,7 +22,7 @@ } }, { - "name": "left upright", + "name": "bottom bit", "from": [2, 0, 12], "to": [14, 4, 14], "rotation": {"angle": 0, "axis": "y", "origin": [2, 7, 11]}, @@ -34,6 +35,5 @@ "down": {"uv": [0, 1, 2, 13], "rotation": 90, "texture": "#0"} } } - ], - "format_version": "1.21.6" + ] } \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/open.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/open.json index 9a7f0b0671..b52523e87b 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/back/open.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/open.json @@ -1,4 +1,5 @@ { + "format_version": "1.21.6", "credit": "Made with Blockbench", "parent": "block/block", "textures": { @@ -12,10 +13,10 @@ "to": [4, 20, 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"}, + "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"} } @@ -26,28 +27,27 @@ "to": [14, 20, 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, 13, 5, 15], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 9, 5, 11], "rotation": 90, "texture": "#0"}, + "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": "back panel", + "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, 4, 4], "texture": "#0"}, - "south": {"uv": [0, 9, 14, 12], "texture": "#0"}, - "west": {"uv": [4, 1, 8, 4], "texture": "#0"}, - "up": {"uv": [0, 0, 14, 4], "texture": "#0"}, - "down": {"uv": [0, 3, 14, 7], "texture": "#0"} + "north": {"uv": [0, 0, 14, 3], "texture": "#0"}, + "east": {"uv": [0, 12, 3, 15], "texture": "#0"}, + "south": {"uv": [0, 8, 14, 11], "texture": "#0"}, + "west": {"uv": [3, 12, 6, 15], "texture": "#0"}, + "up": {"uv": [0, 0, 14, 3], "texture": "#0"}, + "down": {"uv": [0, 4, 14, 7], "texture": "#0"} } } - ], - "format_version": "1.21.6" + ] } \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/panel.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/panel.json index 5c555c2398..fd2de8de55 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/back/panel.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/panel.json @@ -1,4 +1,5 @@ { + "format_version": "1.21.6", "credit": "Made with Blockbench", "parent": "block/block", "textures": { @@ -7,7 +8,7 @@ }, "elements": [ { - "name": "left upright", + "name": "frame left", "from": [3, 15, 12], "to": [5, 21, 14], "rotation": {"angle": 0, "axis": "y", "origin": [9, 18, 13]}, @@ -21,7 +22,7 @@ } }, { - "name": "right upright", + "name": "frame right", "from": [11, 15, 12], "to": [13, 21, 14], "rotation": {"angle": 0, "axis": "y", "origin": [7, 18, 13]}, @@ -35,7 +36,7 @@ } }, { - "name": "back panel", + "name": "frame top", "from": [3, 21, 12], "to": [13, 23, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 17, 13]}, @@ -49,7 +50,7 @@ } }, { - "name": "back panel", + "name": "centre panel", "from": [5, 15, 13], "to": [11, 21, 13], "rotation": {"angle": 0, "axis": "y", "origin": [8, 16, 13]}, @@ -63,7 +64,7 @@ } }, { - "name": "back panel", + "name": "frame bottom", "from": [3, 13, 12], "to": [13, 15, 14], "rotation": {"angle": 0, "axis": "y", "origin": [8, 19, 13]}, @@ -77,7 +78,7 @@ } }, { - "name": "back panel", + "name": "left upright", "from": [10, 11, 12], "to": [12, 13, 14], "rotation": {"angle": 0, "axis": "y", "origin": [11, 17, 13]}, @@ -91,7 +92,7 @@ } }, { - "name": "back panel", + "name": "right upright", "from": [4, 11, 12], "to": [6, 13, 14], "rotation": {"angle": 0, "axis": "y", "origin": [5, 17, 13]}, @@ -104,6 +105,5 @@ "down": {"uv": [0, 3, 2, 5], "texture": "#0"} } } - ], - "format_version": "1.21.6" + ] } \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/panel_weave.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/panel_weave.json index 5d78a20a99..3246e8148b 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/back/panel_weave.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/panel_weave.json @@ -1,6 +1,8 @@ { + "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/weave", @@ -8,7 +10,7 @@ }, "elements": [ { - "name": "left upright", + "name": "frame left", "from": [3, 15, 12], "to": [5, 21, 14], "rotation": {"angle": 0, "axis": "z", "origin": [8, 18, 13]}, @@ -22,7 +24,7 @@ } }, { - "name": "right upright", + "name": "frame right", "from": [11, 15, 12], "to": [13, 21, 14], "rotation": {"angle": 0, "axis": "z", "origin": [8, 18, 13]}, @@ -36,7 +38,7 @@ } }, { - "name": "back panel", + "name": "frame top", "from": [3, 21, 12], "to": [13, 23, 14], "rotation": {"angle": 0, "axis": "z", "origin": [8, 18, 13]}, @@ -50,7 +52,7 @@ } }, { - "name": "back panel", + "name": "centre panel", "from": [5, 15, 13], "to": [11, 21, 13], "rotation": {"angle": 0, "axis": "z", "origin": [8, 18, 13]}, @@ -60,7 +62,7 @@ } }, { - "name": "back panel", + "name": "frame bottom", "from": [3, 13, 12], "to": [13, 15, 14], "rotation": {"angle": 0, "axis": "z", "origin": [8, 18, 13]}, @@ -74,7 +76,7 @@ } }, { - "name": "back panel", + "name": "right upright", "from": [10.001, 11.001, 12.001], "to": [11.999, 14.999, 13.999], "rotation": {"angle": 0, "axis": "y", "origin": [11, 17, 13]}, @@ -88,7 +90,7 @@ } }, { - "name": "back panel", + "name": "left upright", "from": [4.001, 11.001, 12.001], "to": [5.999, 14.999, 13.999], "rotation": {"angle": 0, "axis": "y", "origin": [5, 17, 13]}, @@ -101,6 +103,5 @@ "down": {"uv": [0, 3, 2, 5], "texture": "#0"} } } - ], - "format_version": "1.21.6" + ] } \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/slats.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/slats.json index eb9da27b32..bdd48002d8 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/back/slats.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/slats.json @@ -1,6 +1,8 @@ { + "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", @@ -13,10 +15,10 @@ "to": [4, 20, 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"}, + "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"} } @@ -27,10 +29,10 @@ "to": [14, 20, 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, 13, 5, 15], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 9, 5, 11], "rotation": 90, "texture": "#0"}, + "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"} } @@ -46,7 +48,7 @@ } }, { - "name": "back panel", + "name": "top bar", "from": [1, 20, 12], "to": [15, 23, 15], "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, @@ -60,7 +62,7 @@ } }, { - "name": "back panel", + "name": "bottom bar", "from": [4, 12, 12], "to": [12, 14, 14], "rotation": {"angle": 0, "axis": "y", "origin": [11, 8, 11]}, @@ -73,6 +75,5 @@ "down": {"uv": [0, 4, 8, 6], "texture": "#0"} } } - ], - "format_version": "1.21.6" + ] } \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/slat_medium.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/slats_chunky.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/back/slat_medium.json rename to src/main/resources/assets/compendium/models/block/furniture/chair/back/slats_chunky.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/solid.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/solid.json new file mode 100644 index 0000000000..533fbda11d --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/solid.json @@ -0,0 +1,25 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "block/acacia_planks", + "particle": "block/acacia_planks" + }, + "elements": [ + { + "name": "back panel", + "from": [2, 11, 11], + "to": [14, 23, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, + "faces": { + "north": {"uv": [1, 0, 13, 12], "texture": "#0"}, + "east": {"uv": [0, 0, 3, 12], "texture": "#0"}, + "south": {"uv": [0, 0, 12, 12], "texture": "#0"}, + "west": {"uv": [8, 0, 11, 12], "texture": "#0"}, + "up": {"uv": [0, 0, 12, 3], "texture": "#0"}, + "down": {"uv": [0, 3, 12, 6], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/solid_medium.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/solid_medium.json deleted file mode 100644 index e82a03c80a..0000000000 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/back/solid_medium.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "format_version": "1.21.6", - "credit": "Made with Blockbench", - "parent": "block/block", - "textures": { - "0": "block/acacia_planks", - "particle": "block/acacia_planks" - }, - "elements": [ - { - "name": "back panel", - "from": [1, 11, 11], - "to": [15, 23, 15], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, - "faces": { - "north": {"uv": [1, 0, 15, 12], "texture": "#0"}, - "east": {"uv": [0, 0, 4, 12], "texture": "#0"}, - "south": {"uv": [0, 0, 14, 12], "texture": "#0"}, - "west": {"uv": [8, 0, 12, 12], "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/turned_panel.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/turned_panel.json index a206fb7da9..eaa5af3979 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/back/turned_panel.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/turned_panel.json @@ -1,4 +1,5 @@ { + "format_version": "1.21.6", "credit": "Made with Blockbench", "parent": "block/block", "textures": { @@ -7,7 +8,7 @@ }, "elements": [ { - "name": "left upright", + "name": "frame bottom left", "from": [3, 15, 12], "to": [5, 21, 14], "rotation": {"angle": 45, "axis": "z", "origin": [8, 18, 13]}, @@ -21,7 +22,7 @@ } }, { - "name": "right upright", + "name": "frame top right", "from": [11, 15, 12], "to": [13, 21, 14], "rotation": {"angle": 45, "axis": "z", "origin": [8, 18, 13]}, @@ -35,7 +36,7 @@ } }, { - "name": "back panel", + "name": "frame top left", "from": [3, 21, 12], "to": [13, 23, 14], "rotation": {"angle": 45, "axis": "z", "origin": [8, 18, 13]}, @@ -49,7 +50,7 @@ } }, { - "name": "back panel", + "name": "centre panel", "from": [5, 15, 13], "to": [11, 21, 13], "rotation": {"angle": 45, "axis": "z", "origin": [8, 18, 13]}, @@ -63,7 +64,7 @@ } }, { - "name": "back panel", + "name": "frame bottom right", "from": [3, 13, 12], "to": [13, 15, 14], "rotation": {"angle": 45, "axis": "z", "origin": [8, 18, 13]}, @@ -77,33 +78,32 @@ } }, { - "name": "back panel", + "name": "right upright", "from": [10.001, 11.001, 12.001], "to": [11.999, 14.999, 13.999], "rotation": {"angle": 0, "axis": "y", "origin": [11, 17, 13]}, "faces": { - "north": {"uv": [0, 1, 2, 3], "texture": "#0"}, - "east": {"uv": [0, 1, 2, 3], "texture": "#0"}, - "south": {"uv": [0, 9, 2, 11], "texture": "#0"}, - "west": {"uv": [4, 1, 6, 3], "texture": "#0"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#0"}, - "down": {"uv": [0, 3, 2, 5], "texture": "#0"} + "north": {"uv": [0, 1, 3.998, 3], "texture": "#0"}, + "east": {"uv": [0, 4, 3.998, 6], "texture": "#0"}, + "south": {"uv": [0, 9, 3.998, 11], "texture": "#0"}, + "west": {"uv": [4, 1, 7.998, 3], "texture": "#0"}, + "up": {"uv": [0, 1, 2, 3], "texture": "#0"}, + "down": {"uv": [0, 4, 2, 6], "texture": "#0"} } }, { - "name": "back panel", + "name": "left upright", "from": [4.001, 11.001, 12.001], "to": [5.999, 14.999, 13.999], "rotation": {"angle": 0, "axis": "y", "origin": [5, 17, 13]}, "faces": { - "north": {"uv": [0, 1, 2, 3], "texture": "#0"}, - "east": {"uv": [0, 1, 2, 3], "texture": "#0"}, - "south": {"uv": [0, 9, 2, 11], "texture": "#0"}, - "west": {"uv": [4, 1, 6, 3], "texture": "#0"}, + "north": {"uv": [8, 1, 11.998, 3], "texture": "#0"}, + "east": {"uv": [0, 12, 3.998, 14], "texture": "#0"}, + "south": {"uv": [0, 5, 3.998, 7], "texture": "#0"}, + "west": {"uv": [0, 8, 3.998, 10], "texture": "#0"}, "up": {"uv": [0, 0, 2, 2], "texture": "#0"}, - "down": {"uv": [0, 3, 2, 5], "texture": "#0"} + "down": {"uv": [2, 0, 4, 2], "texture": "#0"} } } - ], - "format_version": "1.21.6" + ] } \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/turned_panel_weave.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/turned_panel_weave.json index cda6d8b599..2768e452eb 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/back/turned_panel_weave.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/turned_panel_weave.json @@ -1,6 +1,8 @@ { + "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/weave", @@ -8,7 +10,7 @@ }, "elements": [ { - "name": "left upright", + "name": "frame bottom left", "from": [3, 15, 12], "to": [5, 21, 14], "rotation": {"angle": 45, "axis": "z", "origin": [8, 18, 13]}, @@ -22,7 +24,7 @@ } }, { - "name": "right upright", + "name": "frame top right", "from": [11, 15, 12], "to": [13, 21, 14], "rotation": {"angle": 45, "axis": "z", "origin": [8, 18, 13]}, @@ -36,7 +38,7 @@ } }, { - "name": "back panel", + "name": "frame top left", "from": [3, 21, 12], "to": [13, 23, 14], "rotation": {"angle": 45, "axis": "z", "origin": [8, 18, 13]}, @@ -50,7 +52,7 @@ } }, { - "name": "back panel", + "name": "centre panel", "from": [5, 15, 13], "to": [11, 21, 13], "rotation": {"angle": 45, "axis": "z", "origin": [8, 18, 13]}, @@ -60,7 +62,7 @@ } }, { - "name": "back panel", + "name": "frame bottom right", "from": [3, 13, 12], "to": [13, 15, 14], "rotation": {"angle": 45, "axis": "z", "origin": [8, 18, 13]}, @@ -74,33 +76,32 @@ } }, { - "name": "back panel", + "name": "right upright", "from": [10.001, 11.001, 12.001], "to": [11.999, 14.999, 13.999], "rotation": {"angle": 0, "axis": "y", "origin": [11, 17, 13]}, "faces": { - "north": {"uv": [0, 1, 2, 3], "texture": "#0"}, - "east": {"uv": [0, 1, 2, 3], "texture": "#0"}, - "south": {"uv": [0, 9, 2, 11], "texture": "#0"}, - "west": {"uv": [4, 1, 6, 3], "texture": "#0"}, - "up": {"uv": [0, 0, 2, 2], "texture": "#0"}, - "down": {"uv": [0, 3, 2, 5], "texture": "#0"} + "north": {"uv": [0, 1, 3.998, 3], "texture": "#0"}, + "east": {"uv": [0, 4, 3.998, 6], "texture": "#0"}, + "south": {"uv": [0, 9, 3.998, 11], "texture": "#0"}, + "west": {"uv": [4, 1, 7.998, 3], "texture": "#0"}, + "up": {"uv": [0, 1, 2, 3], "texture": "#0"}, + "down": {"uv": [0, 4, 2, 6], "texture": "#0"} } }, { - "name": "back panel", + "name": "left upright", "from": [4.001, 11.001, 12.001], "to": [5.999, 14.999, 13.999], "rotation": {"angle": 0, "axis": "y", "origin": [5, 17, 13]}, "faces": { - "north": {"uv": [0, 1, 2, 3], "texture": "#0"}, - "east": {"uv": [0, 1, 2, 3], "texture": "#0"}, - "south": {"uv": [0, 9, 2, 11], "texture": "#0"}, - "west": {"uv": [4, 1, 6, 3], "texture": "#0"}, + "north": {"uv": [8, 1, 11.998, 3], "texture": "#0"}, + "east": {"uv": [0, 12, 3.998, 14], "texture": "#0"}, + "south": {"uv": [0, 5, 3.998, 7], "texture": "#0"}, + "west": {"uv": [0, 8, 3.998, 10], "texture": "#0"}, "up": {"uv": [0, 0, 2, 2], "texture": "#0"}, - "down": {"uv": [0, 3, 2, 5], "texture": "#0"} + "down": {"uv": [2, 0, 4, 2], "texture": "#0"} } } - ], - "format_version": "1.21.6" + ] } \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/weave.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/weave.json index 75d4048c97..6827304617 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/back/weave.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/weave.json @@ -1,6 +1,8 @@ { + "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/weave", @@ -13,10 +15,10 @@ "to": [4, 20, 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"}, + "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"} } @@ -27,10 +29,10 @@ "to": [14, 20, 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, 13, 5, 15], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 9, 5, 11], "rotation": 90, "texture": "#0"}, + "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"} } @@ -46,7 +48,7 @@ } }, { - "name": "back panel", + "name": "top bar", "from": [1, 20, 12], "to": [15, 23, 15], "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, @@ -59,6 +61,5 @@ "down": {"uv": [0, 3, 14, 6], "texture": "#0"} } } - ], - "format_version": "1.21.6" + ] } \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/back/windsor.json b/src/main/resources/assets/compendium/models/block/furniture/chair/back/windsor.json index 6be5e201d1..a509afec7f 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/back/windsor.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/back/windsor.json @@ -1,6 +1,8 @@ { + "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", @@ -13,10 +15,10 @@ "to": [4, 20, 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"}, + "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"} } @@ -27,16 +29,16 @@ "to": [14, 20, 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, 13, 5, 15], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 9, 5, 11], "rotation": 90, "texture": "#0"}, + "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": "right upright", + "name": "panel", "from": [4, 11, 13], "to": [12, 20, 13], "rotation": {"angle": 0, "axis": "y", "origin": [9, 11, 11]}, @@ -46,7 +48,7 @@ } }, { - "name": "back panel", + "name": "top bar", "from": [1, 20, 12], "to": [15, 23, 15], "rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]}, @@ -59,6 +61,5 @@ "down": {"uv": [0, 3, 14, 6], "texture": "#0"} } } - ], - "format_version": "1.21.6" + ] } \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/angled.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/angled.json new file mode 100644 index 0000000000..0f75144c9b --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/angled.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, 11, 4], + "rotation": {"angle": 22.5, "axis": "x", "origin": [3, 0, 2]}, + "faces": { + "north": {"uv": [0, 1, 11, 3], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 13, 11, 15], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 9, 11, 11], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 5, 11, 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, 11, 4], + "rotation": {"angle": 22.5, "axis": "x", "origin": [13, 0, 2]}, + "faces": { + "north": {"uv": [0, 5, 11, 7], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 1, 11, 3], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 13, 11, 15], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 9, 11, 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.999, 0, 12], + "to": [13.999, 11, 14], + "rotation": {"angle": -22.5, "axis": "x", "origin": [13, 0, 14]}, + "faces": { + "north": {"uv": [0, 9, 11, 11], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 5, 11, 7], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 1, 11, 3], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 13, 11, 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.001, 0, 12], + "to": [4.001, 11, 14], + "rotation": {"angle": -22.5, "axis": "x", "origin": [3, 0, 14]}, + "faces": { + "north": {"uv": [0, 13, 11, 15], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 9, 11, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 5, 11, 7], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 1, 11, 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/basic_medium.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic_medium.json rename to src/main/resources/assets/compendium/models/block/furniture/chair/legs/basic.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/corner_heavy.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/corner_heavy.json deleted file mode 100644 index ed51e87058..0000000000 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/corner_heavy.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "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": [0.9, 0, 0.9], - "to": [3.9, 11.1, 3.9], - "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 2]}, - "faces": { - "north": {"uv": [0, 13, 11.1, 16], "rotation": 90, "texture": "#0"}, - "east": {"uv": [0, 9, 11.1, 12], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 5, 11.1, 8], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 1, 11.1, 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": [12.1, 0, 0.9], - "to": [15.1, 11.1, 3.9], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 2]}, - "faces": { - "north": {"uv": [0, 5, 11.1, 8], "rotation": 90, "texture": "#0"}, - "east": {"uv": [0, 1, 11.1, 4], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 13, 11.1, 16], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 9, 11.1, 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": [12.1, 0, 12.1], - "to": [15.1, 11.1, 15.1], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 11]}, - "faces": { - "north": {"uv": [0, 9, 11.1, 12], "rotation": 90, "texture": "#0"}, - "east": {"uv": [0, 1, 11.1, 4], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 5, 11.1, 8], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 13, 11.1, 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": [0.9, 0, 12.1], - "to": [3.9, 11.1, 15.1], - "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 11]}, - "faces": { - "north": {"uv": [0, 1, 11.1, 4], "rotation": 90, "texture": "#0"}, - "east": {"uv": [0, 13, 11.1, 16], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 9, 11.1, 12], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 5, 11.1, 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"} - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/corner_light.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/corner_light.json deleted file mode 100644 index 98b0bad311..0000000000 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/corner_light.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "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": [0.9, 0, 0.9], - "to": [1.9, 11.1, 1.9], - "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 2]}, - "faces": { - "north": {"uv": [0, 8, 11.1, 9], "rotation": 90, "texture": "#0"}, - "east": {"uv": [0, 4, 11.1, 5], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 0, 11.1, 1], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 12, 11.1, 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": [14.1, 0, 0.9], - "to": [15.1, 11.1, 1.9], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 2]}, - "faces": { - "north": {"uv": [0, 4, 11.1, 5], "rotation": 90, "texture": "#0"}, - "east": {"uv": [0, 0, 11.1, 1], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 12, 11.1, 13], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 8, 11.1, 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": [14.1, 0, 14.1], - "to": [15.1, 11.1, 15.1], - "rotation": {"angle": 0, "axis": "z", "origin": [11, 0, 11]}, - "faces": { - "north": {"uv": [0, 12, 11.1, 13], "rotation": 90, "texture": "#0"}, - "east": {"uv": [0, 8, 11.1, 9], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 4, 11.1, 5], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 0, 11.1, 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": [0.9, 0, 14.1], - "to": [1.9, 11.1, 15.1], - "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 11]}, - "faces": { - "north": {"uv": [0, 0, 11.1, 1], "rotation": 90, "texture": "#0"}, - "east": {"uv": [0, 12, 11.1, 13], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 8, 11.1, 9], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 4, 11.1, 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/corner_medium.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/corner_medium.json deleted file mode 100644 index b2205684af..0000000000 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/corner_medium.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "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": [0.9, 0, 0.9], - "to": [2.9, 11.1, 2.9], - "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 2]}, - "faces": { - "north": {"uv": [0, 1, 11.1, 3], "rotation": 90, "texture": "#0"}, - "east": {"uv": [0, 13, 11.1, 15], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 9, 11.1, 11], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 5, 11.1, 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": [13.1, 0, 0.9], - "to": [15.1, 11.1, 2.9], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 2]}, - "faces": { - "north": {"uv": [0, 5, 11.1, 7], "rotation": 90, "texture": "#0"}, - "east": {"uv": [0, 1, 11.1, 3], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 13, 11.1, 15], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 9, 11.1, 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": [13.1, 0, 13.1], - "to": [15.1, 11.1, 15.1], - "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 11]}, - "faces": { - "north": {"uv": [0, 9, 11.1, 11], "rotation": 90, "texture": "#0"}, - "east": {"uv": [0, 5, 11.1, 7], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 1, 11.1, 3], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 13, 11.1, 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": [0.9, 0, 13.1], - "to": [2.9, 11.1, 15.1], - "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 11]}, - "faces": { - "north": {"uv": [0, 13, 11.1, 15], "rotation": 90, "texture": "#0"}, - "east": {"uv": [0, 9, 11.1, 11], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 5, 11.1, 7], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 1, 11.1, 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 new file mode 100644 index 0000000000..50741fd432 --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/pedestal.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": "pedestal", + "from": [7, 2, 7], + "to": [9, 9, 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"}, + "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "base", + "from": [2, 0, 2], + "to": [14, 2, 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"}, + "up": {"uv": [0, 0, 12, 12], "texture": "#0"}, + "down": {"uv": [0, 0, 12, 12], "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_X.json new file mode 100644 index 0000000000..69fa88a21f --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/pedestal_X.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": "pedestal", + "from": [7, 0, 7], + "to": [9, 9, 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"}, + "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "left foot", + "from": [2, 0, 7], + "to": [7, 2, 9], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 1, 5, 3], "texture": "#0"}, + "east": {"uv": [0, 13, 2, 15], "texture": "#0"}, + "south": {"uv": [0, 9, 5, 11], "texture": "#0"}, + "west": {"uv": [0, 5, 2, 7], "texture": "#0"}, + "up": {"uv": [0, 1, 2, 6], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 2, 6], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "right foot", + "from": [9, 0, 7], + "to": [14, 2, 9], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 9, 5, 11], "texture": "#0"}, + "east": {"uv": [0, 5, 2, 7], "texture": "#0"}, + "south": {"uv": [0, 1, 5, 3], "texture": "#0"}, + "west": {"uv": [0, 13, 2, 15], "texture": "#0"}, + "up": {"uv": [0, 1, 2, 6], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 2, 6], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "front foot", + "from": [7, 0, 2], + "to": [9, 2, 7], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 9, 2, 11], "texture": "#0"}, + "east": {"uv": [7, 5, 12, 7], "texture": "#0"}, + "south": {"uv": [0, 1, 2, 3], "texture": "#0"}, + "west": {"uv": [7, 12, 12, 14], "texture": "#0"}, + "up": {"uv": [7, 1, 12, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [7, 1, 12, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "back foot", + "from": [7, 0, 9], + "to": [9, 2, 14], + "rotation": {"angle": 45, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 9, 2, 11], "texture": "#0"}, + "east": {"uv": [6, 4, 11, 6], "texture": "#0"}, + "south": {"uv": [0, 1, 2, 3], "texture": "#0"}, + "west": {"uv": [6, 8, 11, 10], "texture": "#0"}, + "up": {"uv": [6, 0, 11, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6, 0, 11, 2], "rotation": 90, "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 new file mode 100644 index 0000000000..ceb321bef0 --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/pedestal_cross.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": "pedestal", + "from": [7, 0, 7], + "to": [9, 9, 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"}, + "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "left foot", + "from": [2, 0, 7], + "to": [7, 2, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 2]}, + "faces": { + "north": {"uv": [0, 1, 5, 3], "texture": "#0"}, + "east": {"uv": [0, 13, 2, 15], "texture": "#0"}, + "south": {"uv": [0, 9, 5, 11], "texture": "#0"}, + "west": {"uv": [0, 5, 2, 7], "texture": "#0"}, + "up": {"uv": [0, 1, 2, 6], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 2, 6], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "right foot", + "from": [9, 0, 7], + "to": [14, 2, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 11]}, + "faces": { + "north": {"uv": [0, 9, 5, 11], "texture": "#0"}, + "east": {"uv": [0, 5, 2, 7], "texture": "#0"}, + "south": {"uv": [0, 1, 5, 3], "texture": "#0"}, + "west": {"uv": [0, 13, 2, 15], "texture": "#0"}, + "up": {"uv": [0, 1, 2, 6], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 2, 6], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "front foot", + "from": [7, 0, 2], + "to": [9, 2, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 11]}, + "faces": { + "north": {"uv": [0, 9, 2, 11], "texture": "#0"}, + "east": {"uv": [7, 5, 12, 7], "texture": "#0"}, + "south": {"uv": [0, 1, 2, 3], "texture": "#0"}, + "west": {"uv": [7, 12, 12, 14], "texture": "#0"}, + "up": {"uv": [7, 1, 12, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [7, 1, 12, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "back foot", + "from": [7, 0, 9], + "to": [9, 2, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 11]}, + "faces": { + "north": {"uv": [0, 9, 2, 11], "texture": "#0"}, + "east": {"uv": [6, 4, 11, 6], "texture": "#0"}, + "south": {"uv": [0, 1, 2, 3], "texture": "#0"}, + "west": {"uv": [6, 8, 11, 10], "texture": "#0"}, + "up": {"uv": [6, 0, 11, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [6, 0, 11, 2], "rotation": 90, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_connected.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_connected.json new file mode 100644 index 0000000000..06d8c70434 --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_connected.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": "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, 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": "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, 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": "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, 9, 11], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 5, 9, 7], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 1, 9, 3], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 13, 9, 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, 0, 12], + "to": [4, 9, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 11]}, + "faces": { + "north": {"uv": [0, 13, 9, 15], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 9, 9, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 5, 9, 7], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 1, 9, 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"} + } + }, + { + "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, 8, 3], "texture": "#0"}, + "east": {"uv": [0, 13, 8, 15], "texture": "#0"}, + "south": {"uv": [0, 9, 8, 11], "texture": "#0"}, + "west": {"uv": [0, 5, 8, 7], "texture": "#0"}, + "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "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, 8, 11], "texture": "#0"}, + "east": {"uv": [0, 5, 8, 7], "texture": "#0"}, + "south": {"uv": [0, 1, 8, 3], "texture": "#0"}, + "west": {"uv": [0, 13, 8, 15], "texture": "#0"}, + "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "centre rail", + "from": [7, 2, 4], + "to": [9, 4, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 11]}, + "faces": { + "north": {"uv": [0, 9, 2, 11], "texture": "#0"}, + "east": {"uv": [0, 5, 8, 7], "texture": "#0"}, + "south": {"uv": [0, 1, 2, 3], "texture": "#0"}, + "west": {"uv": [0, 13, 8, 15], "texture": "#0"}, + "up": {"uv": [0, 9, 8, 11], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 8, 3], "rotation": 90, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_medium.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_end.json similarity index 58% rename from src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_medium.json rename to src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_end.json index 087f6ccf40..e864a7abd9 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_medium.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_end.json @@ -13,10 +13,10 @@ "to": [4, 9, 4], "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, 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"} } @@ -27,10 +27,10 @@ "to": [14, 9, 4], "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 2]}, "faces": { - "north": {"uv": [0, 5, 7, 7], "rotation": 90, "texture": "#0"}, - "east": {"uv": [0, 1, 7, 3], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 13, 7, 15], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 9, 7, 11], "rotation": 90, "texture": "#0"}, + "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"} } @@ -41,10 +41,10 @@ "to": [14, 9, 14], "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 11]}, "faces": { - "north": {"uv": [0, 9, 7, 11], "rotation": 90, "texture": "#0"}, - "east": {"uv": [0, 5, 7, 7], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 1, 7, 3], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 13, 7, 15], "rotation": 90, "texture": "#0"}, + "north": {"uv": [0, 9, 9, 11], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 5, 9, 7], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 1, 9, 3], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 13, 9, 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"} } @@ -55,10 +55,10 @@ "to": [4, 9, 14], "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 11]}, "faces": { - "north": {"uv": [0, 13, 7, 15], "rotation": 90, "texture": "#0"}, - "east": {"uv": [0, 9, 7, 11], "rotation": 90, "texture": "#0"}, - "south": {"uv": [0, 5, 7, 7], "rotation": 90, "texture": "#0"}, - "west": {"uv": [0, 1, 7, 3], "rotation": 90, "texture": "#0"}, + "north": {"uv": [0, 13, 9, 15], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 9, 9, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 5, 9, 7], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 1, 9, 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"} } @@ -69,10 +69,10 @@ "to": [12, 4, 4], "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 2]}, "faces": { - "north": {"uv": [0, 1, 7, 3], "texture": "#0"}, - "east": {"uv": [0, 13, 7, 15], "texture": "#0"}, - "south": {"uv": [0, 9, 7, 11], "texture": "#0"}, - "west": {"uv": [0, 5, 7, 7], "texture": "#0"}, + "north": {"uv": [0, 1, 8, 3], "texture": "#0"}, + "east": {"uv": [0, 13, 8, 15], "texture": "#0"}, + "south": {"uv": [0, 9, 8, 11], "texture": "#0"}, + "west": {"uv": [0, 5, 8, 7], "texture": "#0"}, "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"}, "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"} } @@ -83,10 +83,10 @@ "to": [12, 4, 14], "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 11]}, "faces": { - "north": {"uv": [0, 9, 7, 11], "texture": "#0"}, - "east": {"uv": [0, 5, 7, 7], "texture": "#0"}, - "south": {"uv": [0, 1, 7, 3], "texture": "#0"}, - "west": {"uv": [0, 13, 7, 15], "texture": "#0"}, + "north": {"uv": [0, 9, 8, 11], "texture": "#0"}, + "east": {"uv": [0, 5, 8, 7], "texture": "#0"}, + "south": {"uv": [0, 1, 8, 3], "texture": "#0"}, + "west": {"uv": [0, 13, 8, 15], "texture": "#0"}, "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"}, "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"} } diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_full.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_full.json new file mode 100644 index 0000000000..9c4002225d --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_full.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": "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, 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": "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, 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": "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, 9, 11], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 5, 9, 7], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 1, 9, 3], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 13, 9, 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, 0, 12], + "to": [4, 9, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 11]}, + "faces": { + "north": {"uv": [0, 13, 9, 15], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 9, 9, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 5, 9, 7], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 1, 9, 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"} + } + }, + { + "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, 8, 3], "texture": "#0"}, + "east": {"uv": [0, 13, 8, 15], "texture": "#0"}, + "south": {"uv": [0, 9, 8, 11], "texture": "#0"}, + "west": {"uv": [0, 5, 8, 7], "texture": "#0"}, + "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "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, 8, 11], "texture": "#0"}, + "east": {"uv": [0, 5, 8, 7], "texture": "#0"}, + "south": {"uv": [0, 1, 8, 3], "texture": "#0"}, + "west": {"uv": [0, 13, 8, 15], "texture": "#0"}, + "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "left rail", + "from": [2, 2, 4], + "to": [4, 4, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 11]}, + "faces": { + "north": {"uv": [0, 9, 2, 11], "texture": "#0"}, + "east": {"uv": [8, 5, 16, 7], "texture": "#0"}, + "south": {"uv": [0, 1, 2, 3], "texture": "#0"}, + "west": {"uv": [8, 12, 16, 14], "texture": "#0"}, + "up": {"uv": [8, 1, 16, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8, 1, 16, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "right rail", + "from": [12, 2, 4], + "to": [14, 4, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 11]}, + "faces": { + "north": {"uv": [0, 9, 2, 11], "texture": "#0"}, + "east": {"uv": [8, 4, 16, 6], "texture": "#0"}, + "south": {"uv": [0, 1, 2, 3], "texture": "#0"}, + "west": {"uv": [8, 8, 16, 10], "texture": "#0"}, + "up": {"uv": [8, 0, 16, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8, 0, 16, 2], "rotation": 90, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_full_offset.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_full_offset.json new file mode 100644 index 0000000000..24d75bb22c --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_full_offset.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": "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, 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": "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, 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": "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, 9, 11], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 5, 9, 7], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 1, 9, 3], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 13, 9, 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, 0, 12], + "to": [4, 9, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 11]}, + "faces": { + "north": {"uv": [0, 13, 9, 15], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 9, 9, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 5, 9, 7], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 1, 9, 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"} + } + }, + { + "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, 8, 3], "texture": "#0"}, + "east": {"uv": [0, 13, 8, 15], "texture": "#0"}, + "south": {"uv": [0, 9, 8, 11], "texture": "#0"}, + "west": {"uv": [0, 5, 8, 7], "texture": "#0"}, + "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "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, 8, 11], "texture": "#0"}, + "east": {"uv": [0, 5, 8, 7], "texture": "#0"}, + "south": {"uv": [0, 1, 8, 3], "texture": "#0"}, + "west": {"uv": [0, 13, 8, 15], "texture": "#0"}, + "up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "left rail", + "from": [2, 5, 4], + "to": [4, 7, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 11]}, + "faces": { + "north": {"uv": [0, 9, 2, 11], "texture": "#0"}, + "east": {"uv": [8, 5, 16, 7], "texture": "#0"}, + "south": {"uv": [0, 1, 2, 3], "texture": "#0"}, + "west": {"uv": [8, 12, 16, 14], "texture": "#0"}, + "up": {"uv": [8, 1, 16, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8, 1, 16, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "right rail", + "from": [12, 5, 4], + "to": [14, 7, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 11]}, + "faces": { + "north": {"uv": [0, 9, 2, 11], "texture": "#0"}, + "east": {"uv": [8, 4, 16, 6], "texture": "#0"}, + "south": {"uv": [0, 1, 2, 3], "texture": "#0"}, + "west": {"uv": [8, 8, 16, 10], "texture": "#0"}, + "up": {"uv": [8, 0, 16, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8, 0, 16, 2], "rotation": 90, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_side.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_side.json new file mode 100644 index 0000000000..d7094a8261 --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/rails_side.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": [4, 9, 4], + "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"}, + "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": [12, 0, 2], + "to": [14, 9, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 2]}, + "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": "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, 9, 11], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 5, 9, 7], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 1, 9, 3], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 13, 9, 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, 0, 12], + "to": [4, 9, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 11]}, + "faces": { + "north": {"uv": [0, 13, 9, 15], "rotation": 90, "texture": "#0"}, + "east": {"uv": [0, 9, 9, 11], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 5, 9, 7], "rotation": 90, "texture": "#0"}, + "west": {"uv": [0, 1, 9, 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"} + } + }, + { + "name": "left rail", + "from": [2, 2, 4], + "to": [4, 4, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 11]}, + "faces": { + "north": {"uv": [0, 9, 2, 11], "texture": "#0"}, + "east": {"uv": [8, 5, 16, 7], "texture": "#0"}, + "south": {"uv": [0, 1, 2, 3], "texture": "#0"}, + "west": {"uv": [8, 12, 16, 14], "texture": "#0"}, + "up": {"uv": [8, 1, 16, 3], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8, 1, 16, 3], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "right rail", + "from": [12, 2, 4], + "to": [14, 4, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 11]}, + "faces": { + "north": {"uv": [0, 9, 2, 11], "texture": "#0"}, + "east": {"uv": [8, 4, 16, 6], "texture": "#0"}, + "south": {"uv": [0, 1, 2, 3], "texture": "#0"}, + "west": {"uv": [8, 8, 16, 10], "texture": "#0"}, + "up": {"uv": [8, 0, 16, 2], "rotation": 90, "texture": "#0"}, + "down": {"uv": [8, 0, 16, 2], "rotation": 90, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/solid.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/solid.json new file mode 100644 index 0000000000..6633319ee4 --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/solid.json @@ -0,0 +1,25 @@ +{ + "format_version": "1.21.6", + "credit": "Made with Blockbench", + "parent": "block/block", + "textures": { + "0": "block/acacia_planks", + "particle": "block/acacia_planks" + }, + "elements": [ + { + "name": "pedestal", + "from": [2, 0, 2], + "to": [14, 9, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 12, 9], "texture": "#0"}, + "east": {"uv": [0, 0, 12, 9], "texture": "#0"}, + "south": {"uv": [0, 0, 12, 9], "texture": "#0"}, + "west": {"uv": [0, 0, 12, 9], "texture": "#0"}, + "up": {"uv": [0, 1, 12, 13], "texture": "#0"}, + "down": {"uv": [0, 1, 12, 13], "rotation": 180, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/solid_ends.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/solid_ends.json new file mode 100644 index 0000000000..3c8b9546a7 --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/solid_ends.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": "front leg", + "from": [2, 0, 2], + "to": [14, 9, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 2]}, + "faces": { + "north": {"uv": [0, 6, 12, 15], "texture": "#0"}, + "east": {"uv": [14, 6, 16, 15], "texture": "#0"}, + "south": {"uv": [0, 6, 12, 15], "texture": "#0"}, + "west": {"uv": [12, 6, 14, 15], "texture": "#0"}, + "up": {"uv": [0, 1, 12, 3], "texture": "#0"}, + "down": {"uv": [0, 1, 12, 3], "texture": "#0"} + } + }, + { + "name": "back leg", + "from": [2, 0, 12], + "to": [14, 9, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 11]}, + "faces": { + "north": {"uv": [0, 2, 12, 11], "texture": "#0"}, + "east": {"uv": [12, 2, 14, 11], "texture": "#0"}, + "south": {"uv": [0, 2, 12, 11], "texture": "#0"}, + "west": {"uv": [14, 2, 16, 11], "texture": "#0"}, + "up": {"uv": [0, 1, 12, 3], "texture": "#0"}, + "down": {"uv": [0, 1, 12, 3], "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/legs/solid_sides.json b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/solid_sides.json new file mode 100644 index 0000000000..871f1815da --- /dev/null +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/legs/solid_sides.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": "left leg", + "from": [2, 0, 2], + "to": [4, 9, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 2]}, + "faces": { + "north": {"uv": [2, 6, 4, 15], "texture": "#0"}, + "east": {"uv": [0, 2, 12, 11], "texture": "#0"}, + "south": {"uv": [0, 6, 2, 15], "texture": "#0"}, + "west": {"uv": [0, 2, 12, 11], "texture": "#0"}, + "up": {"uv": [0, 4, 12, 6], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 8, 12, 10], "rotation": 90, "texture": "#0"} + } + }, + { + "name": "right leg", + "from": [12, 0, 2], + "to": [14, 9, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [11, 0, 2]}, + "faces": { + "north": {"uv": [0, 6, 2, 15], "texture": "#0"}, + "east": {"uv": [0, 2, 12, 11], "texture": "#0"}, + "south": {"uv": [2, 6, 4, 15], "texture": "#0"}, + "west": {"uv": [0, 2, 12, 11], "texture": "#0"}, + "up": {"uv": [0, 4, 12, 6], "rotation": 90, "texture": "#0"}, + "down": {"uv": [0, 8, 12, 10], "rotation": 90, "texture": "#0"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/seat/basic_medium.json b/src/main/resources/assets/compendium/models/block/furniture/chair/seat/basic.json similarity index 62% rename from src/main/resources/assets/compendium/models/block/furniture/chair/seat/basic_medium.json rename to src/main/resources/assets/compendium/models/block/furniture/chair/seat/basic.json index 60ccd21b16..ead36c5c48 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/seat/basic_medium.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/seat/basic.json @@ -1,4 +1,5 @@ { + "format_version": "1.21.6", "credit": "Made with Blockbench", "parent": "block/block", "textures": { @@ -11,10 +12,10 @@ "to": [14, 11, 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, 4, 12, 6], "texture": "#0"}, + "east": {"uv": [0, 8, 12, 10], "texture": "#0"}, + "south": {"uv": [0, 12, 12, 14], "texture": "#0"}, + "west": {"uv": [0, 0, 12, 2], "texture": "#0"}, "up": {"uv": [0, 0, 12, 12], "texture": "#0"}, "down": {"uv": [0, 0, 12, 12], "texture": "#0"} } diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/seat/tilted_medium.json b/src/main/resources/assets/compendium/models/block/furniture/chair/seat/tilted.json similarity index 100% rename from src/main/resources/assets/compendium/models/block/furniture/chair/seat/tilted_medium.json rename to src/main/resources/assets/compendium/models/block/furniture/chair/seat/tilted.json diff --git a/src/main/resources/assets/compendium/models/block/furniture/chair/seat/weave.json b/src/main/resources/assets/compendium/models/block/furniture/chair/seat/weave.json index dbfadc7d0e..eae9f99d65 100644 --- a/src/main/resources/assets/compendium/models/block/furniture/chair/seat/weave.json +++ b/src/main/resources/assets/compendium/models/block/furniture/chair/seat/weave.json @@ -1,6 +1,8 @@ { + "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/weave", @@ -8,6 +10,7 @@ }, "elements": [ { + "name": "frame front", "from": [4, 9, 2], "to": [12, 11, 4], "rotation": {"angle": 0, "axis": "y", "origin": [0, 7, 0]}, @@ -21,6 +24,7 @@ } }, { + "name": "frame back", "from": [4, 9, 12], "to": [12, 11, 14], "rotation": {"angle": 0, "axis": "y", "origin": [0, 7, 10]}, @@ -34,6 +38,7 @@ } }, { + "name": "frame right", "from": [12, 9, 2], "to": [14, 11, 14], "rotation": {"angle": 0, "axis": "y", "origin": [0, 7, 0]}, @@ -47,6 +52,7 @@ } }, { + "name": "frame left", "from": [2, 9, 2], "to": [4, 11, 14], "rotation": {"angle": 0, "axis": "y", "origin": [-10, 7, 0]}, @@ -60,6 +66,7 @@ } }, { + "name": "weave", "from": [4, 10.5, 4], "to": [12, 10.5, 12], "rotation": {"angle": 0, "axis": "y", "origin": [-10, 6.5, 0]},