Skip to content

Even more! #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Lance5057 merged 4 commits into from
Jun 22, 2025
Merged

Even more! #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd22b56
Even more!
Robynstar Jun 21, 2025
5ecf620
Move all the light/heavy ones to dump folder, rename medium ones.
Robynstar Jun 21, 2025
49d3ab4
Rename a few, update bits lists.
Robynstar Jun 21, 2025
7201f3a
Merge branch '1.21' into even-more-chairs
Lance5057 Jun 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...ock/furniture/chair/back/basic_heavy.json → ...pfiles/chair models/back_basic_heavy.json
View file
Open in desktop
File renamed without changes.
0 ...ock/furniture/chair/back/basic_light.json → ...pfiles/chair models/back_basic_light.json
View file
Open in desktop
File renamed without changes.
0 ...ock/furniture/chair/back/cross_heavy.json → ...s_gimpfiles/chair models/cross_heavy.json
View file
Open in desktop
File renamed without changes.
0 ...ock/furniture/chair/back/cross_light.json → ...s_gimpfiles/chair models/cross_light.json
View file
Open in desktop
File renamed without changes.
0 ...ck/furniture/chair/back/ladder_heavy.json → ..._gimpfiles/chair models/ladder_heavy.json
View file
Open in desktop
File renamed without changes.
0 ...ck/furniture/chair/back/ladder_light.json → ..._gimpfiles/chair models/ladder_light.json
View file
Open in desktop
File renamed without changes.
0 ...ock/furniture/chair/legs/basic_heavy.json → ...pfiles/chair models/legs_basic_heavy.json
View file
Open in desktop
File renamed without changes.
0 ...ock/furniture/chair/legs/basic_light.json → ...pfiles/chair models/legs_basic_light.json
View file
Open in desktop
File renamed without changes.
0 ...ock/furniture/chair/back/panel_heavy.json → ...s_gimpfiles/chair models/panel_heavy.json
View file
Open in desktop
File renamed without changes.
0 ...ock/furniture/chair/back/panel_light.json → ...s_gimpfiles/chair models/panel_light.json
View file
Open in desktop
File renamed without changes.
0 ...ock/furniture/chair/legs/rails_heavy.json → ...s_gimpfiles/chair models/rails_heavy.json
View file
Open in desktop
File renamed without changes.
0 ...ock/furniture/chair/legs/rails_light.json → ...s_gimpfiles/chair models/rails_light.json
View file
Open in desktop
File renamed without changes.
0 ...ock/furniture/chair/seat/basic_heavy.json → ...pfiles/chair models/seat_basic_heavy.json
View file
Open in desktop
File renamed without changes.
0 ...ock/furniture/chair/seat/basic_light.json → ...pfiles/chair models/seat_basic_light.json
View file
Open in desktop
File renamed without changes.
0 ...lock/furniture/chair/back/slat_heavy.json → ...ls_gimpfiles/chair models/slat_heavy.json
View file
Open in desktop
File renamed without changes.
0 ...lock/furniture/chair/back/slat_light.json → ...ls_gimpfiles/chair models/slat_light.json
View file
Open in desktop
File renamed without changes.
0 ...ock/furniture/chair/back/solid_heavy.json → ...s_gimpfiles/chair models/solid_heavy.json
View file
Open in desktop
File renamed without changes.
0 ...ock/furniture/chair/back/solid_light.json → ...s_gimpfiles/chair models/solid_light.json
View file
Open in desktop
File renamed without changes.
16 changes: 8 additions & 8 deletions src/main/java/com/lance5057/compendium/blocks/chair/StyleChairBlockEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
import net.neoforged.neoforge.client.model.data.ModelData;

public class StyleChairBlockEntity extends MultiMaterialBlockEntity implements IStyleable {
public static List<String> 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<String> seat = List.of("basic_heavy", "basic_medium", "basic_light");
public static List<String> legs = List.of("basic_heavy", "basic_medium", "basic_light", "rails_heavy",
"rails_medium", "rails_light");

public static List<String> 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<String> seat = List.of("seat", "basic", "tilted", "tilted_weave", "weave");
public static List<String> 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<List<String>> styles = List.of(back, seat, legs); // Immutable!

Expand Down
0 ...ck/furniture/chair/back/basic_medium.json → ...els/block/furniture/chair/back/basic.json
View file
Open in desktop
File renamed without changes.
0 ...ck/furniture/chair/back/panel_medium.json → ...ock/furniture/chair/back/basic_panel.json
View file
Open in desktop
File renamed without changes.
26 changes: 13 additions & 13 deletions src/main/resources/assets/compendium/models/block/furniture/chair/back/cross.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"format_version": "1.21.6",
"credit": "Made with Blockbench",
"parent": "block/block",
"textures": {
Expand All @@ -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"}
}
Expand All @@ -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]},
Expand All @@ -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]},
Expand All @@ -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]},
Expand All @@ -76,6 +77,5 @@
"down": {"uv": [0, 3, 14, 6], "texture": "#0"}
}
}
],
"format_version": "1.21.6"
]
}
0 ...ck/furniture/chair/back/cross_medium.json → ...ck/furniture/chair/back/cross_framed.json
View file
Open in desktop
File renamed without changes.
81 changes: 81 additions & 0 deletions src/main/resources/assets/compendium/models/block/furniture/chair/back/fan.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"}
}
}
]
}
34 changes: 17 additions & 17 deletions src/main/resources/assets/compendium/models/block/furniture/chair/back/full.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"format_version": "1.21.6",
"credit": "Made with Blockbench",
"parent": "block/block",
"textures": {
Expand All @@ -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"}
}
Expand All @@ -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]},
Expand All @@ -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"
]
}
0 ...k/furniture/chair/back/ladder_medium.json → ...ls/block/furniture/chair/back/ladder.json
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions src/main/resources/assets/compendium/models/block/furniture/chair/back/live_edge.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"format_version": "1.21.6",
"credit": "Made with Blockbench",
"parent": "block/block",
"textures": {
Expand All @@ -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]},
Expand All @@ -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]},
Expand All @@ -34,6 +35,5 @@
"down": {"uv": [0, 1, 2, 13], "rotation": 90, "texture": "#0"}
}
}
],
"format_version": "1.21.6"
]
}
34 changes: 17 additions & 17 deletions src/main/resources/assets/compendium/models/block/furniture/chair/back/open.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"format_version": "1.21.6",
"credit": "Made with Blockbench",
"parent": "block/block",
"textures": {
Expand All @@ -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"}
}
Expand All @@ -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"
]
}
Loading
Loading