Skip to content

Commit d0919e1

Browse files
Lance5057Lance5057
committed
Merge branch '1.21' of https://github.com/Lance5057/Compendium into 1.21
2 parents 2d6c7e0 + 88e3ce8 commit d0919e1

18 files changed

Lines changed: 1018 additions & 11 deletions

‎src/main/resources/assets/compendium/models/block/furniture/chair/back/basic_medium.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@
4141
"to": [15, 23, 15],
4242
"rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]},
4343
"faces": {
44-
"north": {"uv": [0, 1, 14, 8], "texture": "#0"},
45-
"east": {"uv": [0, 1, 4, 8], "texture": "#0"},
46-
"south": {"uv": [0, 9, 14, 16], "texture": "#0"},
47-
"west": {"uv": [4, 1, 8, 8], "texture": "#0"},
44+
"north": {"uv": [0, 0, 14, 7], "texture": "#0"},
45+
"east": {"uv": [0, 0, 4, 7], "texture": "#0"},
46+
"south": {"uv": [1, 0, 15, 7], "texture": "#0"},
47+
"west": {"uv": [8, 0, 12, 7], "texture": "#0"},
4848
"up": {"uv": [0, 0, 14, 4], "texture": "#0"},
4949
"down": {"uv": [0, 3, 14, 7], "texture": "#0"}
5050
}

‎src/main/resources/assets/compendium/models/block/furniture/chair/back/cross_heavy.json‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
{
2+
"format_version": "1.21.6",
3+
"credit": "Made with Blockbench",
4+
"parent": "block/block",
5+
"textures": {
6+
"0": "block/acacia_planks",
7+
"particle": "block/acacia_planks"
8+
},
9+
"elements": [
10+
{
11+
"name": "left upright",
12+
"from": [2, 11, 11],
13+
"to": [5, 20, 14],
14+
"rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]},
15+
"faces": {
16+
"north": {"uv": [1, 4, 10, 7], "rotation": 90, "texture": "#0"},
17+
"east": {"uv": [1, 0, 10, 3], "rotation": 90, "texture": "#0"},
18+
"south": {"uv": [1, 12, 10, 15], "rotation": 90, "texture": "#0"},
19+
"west": {"uv": [1, 8, 10, 11], "rotation": 90, "texture": "#0"},
20+
"up": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"},
21+
"down": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#0"}
22+
}
23+
},
24+
{
25+
"name": "right upright",
26+
"from": [11, 11, 11],
27+
"to": [14, 20, 14],
28+
"rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]},
29+
"faces": {
30+
"north": {"uv": [0, 4, 9, 7], "rotation": 90, "texture": "#0"},
31+
"east": {"uv": [0, 0, 9, 3], "rotation": 90, "texture": "#0"},
32+
"south": {"uv": [0, 12, 9, 15], "rotation": 90, "texture": "#0"},
33+
"west": {"uv": [0, 8, 9, 11], "rotation": 90, "texture": "#0"},
34+
"up": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"},
35+
"down": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#0"}
36+
}
37+
},
38+
{
39+
"name": "top rail",
40+
"from": [1, 20, 11],
41+
"to": [15, 23, 14],
42+
"rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]},
43+
"faces": {
44+
"north": {"uv": [0, 1, 14, 4], "texture": "#0"},
45+
"east": {"uv": [0, 1, 3, 4], "texture": "#0"},
46+
"south": {"uv": [0, 9, 14, 12], "texture": "#0"},
47+
"west": {"uv": [3, 1, 6, 4], "texture": "#0"},
48+
"up": {"uv": [0, 13, 14, 16], "texture": "#0"},
49+
"down": {"uv": [0, 5, 14, 8], "texture": "#0"}
50+
}
51+
},
52+
{
53+
"name": "bottom rail",
54+
"from": [5, 12, 11],
55+
"to": [11, 15, 14],
56+
"rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]},
57+
"faces": {
58+
"north": {"uv": [10, 1, 16, 4], "texture": "#0"},
59+
"east": {"uv": [0, 1, 3, 4], "texture": "#0"},
60+
"south": {"uv": [10, 9, 16, 12], "texture": "#0"},
61+
"west": {"uv": [3, 1, 6, 4], "texture": "#0"},
62+
"up": {"uv": [10, 13, 16, 16], "texture": "#0"},
63+
"down": {"uv": [10, 5, 16, 8], "texture": "#0"}
64+
}
65+
},
66+
{
67+
"name": "diagonal",
68+
"from": [3.5, 16, 11.1],
69+
"to": [12.5, 19, 13.9],
70+
"rotation": {"angle": 40, "axis": "z", "origin": [8, 17.5, 12]},
71+
"faces": {
72+
"north": {"uv": [7, 4, 16, 7], "texture": "#0"},
73+
"east": {"uv": [0, 0, 2.8, 3], "rotation": 180, "texture": "#0"},
74+
"south": {"uv": [7, 12, 16, 15], "rotation": 180, "texture": "#0"},
75+
"west": {"uv": [0, 0, 2.8, 3], "rotation": 180, "texture": "#0"},
76+
"up": {"uv": [7, 8, 16, 10.8], "rotation": 180, "texture": "#0"},
77+
"down": {"uv": [7, 0, 16, 2.8], "rotation": 180, "texture": "#0"}
78+
}
79+
},
80+
{
81+
"name": "diagonal",
82+
"from": [3.5, 16, 11.05],
83+
"to": [12.5, 19, 13.85],
84+
"rotation": {"angle": -40, "axis": "z", "origin": [8, 17.5, 12]},
85+
"faces": {
86+
"north": {"uv": [7, 4, 16, 7], "texture": "#0"},
87+
"east": {"uv": [0, 0, 2.8, 3], "rotation": 180, "texture": "#0"},
88+
"south": {"uv": [7, 12, 16, 15], "rotation": 180, "texture": "#0"},
89+
"west": {"uv": [0, 0, 2.8, 3], "rotation": 180, "texture": "#0"},
90+
"up": {"uv": [7, 8, 16, 10.8], "rotation": 180, "texture": "#0"},
91+
"down": {"uv": [7, 0, 16, 2.8], "rotation": 180, "texture": "#0"}
92+
}
93+
}
94+
]
95+
}

‎src/main/resources/assets/compendium/models/block/furniture/chair/back/cross_light.json‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
{
2+
"format_version": "1.21.6",
3+
"credit": "Made with Blockbench",
4+
"parent": "block/block",
5+
"textures": {
6+
"0": "block/acacia_planks",
7+
"particle": "block/acacia_planks"
8+
},
9+
"elements": [
10+
{
11+
"name": "left upright",
12+
"from": [2, 11, 13],
13+
"to": [3, 22, 14],
14+
"rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]},
15+
"faces": {
16+
"north": {"uv": [0, 1, 11, 2], "rotation": 90, "texture": "#0"},
17+
"east": {"uv": [0, 13, 11, 14], "rotation": 90, "texture": "#0"},
18+
"south": {"uv": [0, 9, 11, 10], "rotation": 90, "texture": "#0"},
19+
"west": {"uv": [0, 5, 11, 6], "rotation": 90, "texture": "#0"},
20+
"up": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0", "cullface": "up"},
21+
"down": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"}
22+
}
23+
},
24+
{
25+
"name": "right upright",
26+
"from": [13, 11, 13],
27+
"to": [14, 22, 14],
28+
"rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]},
29+
"faces": {
30+
"north": {"uv": [0, 5, 11, 6], "rotation": 90, "texture": "#0"},
31+
"east": {"uv": [0, 1, 11, 2], "rotation": 90, "texture": "#0"},
32+
"south": {"uv": [0, 13, 11, 14], "rotation": 90, "texture": "#0"},
33+
"west": {"uv": [0, 9, 11, 10], "rotation": 90, "texture": "#0"},
34+
"up": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0", "cullface": "up"},
35+
"down": {"uv": [0, 1, 1, 2], "rotation": 90, "texture": "#0"}
36+
}
37+
},
38+
{
39+
"name": "top rail",
40+
"from": [1, 22, 13],
41+
"to": [15, 23, 14],
42+
"rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]},
43+
"faces": {
44+
"north": {"uv": [0, 1, 14, 2], "texture": "#0"},
45+
"east": {"uv": [0, 1, 1, 2], "texture": "#0"},
46+
"south": {"uv": [0, 4, 14, 5], "texture": "#0"},
47+
"west": {"uv": [3, 1, 4, 2], "texture": "#0"},
48+
"up": {"uv": [0, 0, 14, 1], "texture": "#0", "cullface": "up"},
49+
"down": {"uv": [0, 2, 14, 3], "texture": "#0"}
50+
}
51+
},
52+
{
53+
"name": "bottom rail",
54+
"from": [3, 12, 13],
55+
"to": [13, 13, 14],
56+
"rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]},
57+
"faces": {
58+
"north": {"uv": [0, 8, 10, 9], "texture": "#0"},
59+
"east": {"uv": [0, 1, 1, 2], "texture": "#0"},
60+
"south": {"uv": [0, 6, 10, 7], "texture": "#0"},
61+
"west": {"uv": [3, 1, 4, 2], "texture": "#0"},
62+
"up": {"uv": [0, 9, 10, 10], "texture": "#0", "cullface": "up"},
63+
"down": {"uv": [0, 5, 10, 6], "texture": "#0"}
64+
}
65+
},
66+
{
67+
"name": "diagonal",
68+
"from": [1, 17, 13.1],
69+
"to": [15, 18, 13.9],
70+
"rotation": {"angle": 42.5, "axis": "z", "origin": [8, 17.5, 11]},
71+
"faces": {
72+
"north": {"uv": [0, 2, 14, 3], "texture": "#0"},
73+
"east": {"uv": [0, 1, 1, 2], "rotation": 180, "texture": "#0", "cullface": "up"},
74+
"south": {"uv": [0, 10, 14, 11], "rotation": 180, "texture": "#0"},
75+
"west": {"uv": [0, 1, 1, 2], "rotation": 180, "texture": "#0"},
76+
"up": {"uv": [0, 6, 14, 7], "rotation": 180, "texture": "#0"},
77+
"down": {"uv": [0, 14, 14, 15], "rotation": 180, "texture": "#0"}
78+
}
79+
},
80+
{
81+
"name": "diagonal",
82+
"from": [1, 17, 13.05],
83+
"to": [15, 18, 13.85],
84+
"rotation": {"angle": -42.5, "axis": "z", "origin": [8, 17.5, 11]},
85+
"faces": {
86+
"north": {"uv": [2, 1, 16, 2], "rotation": 180, "texture": "#0"},
87+
"east": {"uv": [0, 1, 1, 2], "texture": "#0"},
88+
"south": {"uv": [2, 9, 16, 10], "texture": "#0"},
89+
"west": {"uv": [0, 1, 1, 2], "texture": "#0", "cullface": "up"},
90+
"up": {"uv": [2, 13, 16, 14], "texture": "#0"},
91+
"down": {"uv": [2, 5, 16, 6], "texture": "#0"}
92+
}
93+
}
94+
]
95+
}

‎src/main/resources/assets/compendium/models/block/furniture/chair/back/cross_medium.json‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
{
2+
"format_version": "1.21.6",
3+
"credit": "Made with Blockbench",
4+
"parent": "block/block",
5+
"textures": {
6+
"0": "block/acacia_planks",
7+
"particle": "block/acacia_planks"
8+
},
9+
"elements": [
10+
{
11+
"name": "left upright",
12+
"from": [2, 11, 12],
13+
"to": [4, 21, 14],
14+
"rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]},
15+
"faces": {
16+
"north": {"uv": [0, 1, 10, 3], "rotation": 90, "texture": "#0"},
17+
"east": {"uv": [0, 13, 10, 15], "rotation": 90, "texture": "#0"},
18+
"south": {"uv": [0, 9, 10, 11], "rotation": 90, "texture": "#0"},
19+
"west": {"uv": [0, 5, 10, 7], "rotation": 90, "texture": "#0"},
20+
"up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"},
21+
"down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"}
22+
}
23+
},
24+
{
25+
"name": "right upright",
26+
"from": [12, 11, 12],
27+
"to": [14, 21, 14],
28+
"rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]},
29+
"faces": {
30+
"north": {"uv": [0, 5, 10, 7], "rotation": 90, "texture": "#0"},
31+
"east": {"uv": [0, 1, 10, 3], "rotation": 90, "texture": "#0"},
32+
"south": {"uv": [0, 13, 10, 15], "rotation": 90, "texture": "#0"},
33+
"west": {"uv": [0, 9, 10, 11], "rotation": 90, "texture": "#0"},
34+
"up": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"},
35+
"down": {"uv": [0, 1, 2, 3], "rotation": 90, "texture": "#0"}
36+
}
37+
},
38+
{
39+
"name": "top rail",
40+
"from": [1, 21, 12],
41+
"to": [15, 23, 14],
42+
"rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]},
43+
"faces": {
44+
"north": {"uv": [0, 4, 14, 6], "texture": "#0"},
45+
"east": {"uv": [0, 1, 2, 3], "texture": "#0"},
46+
"south": {"uv": [0, 12, 14, 14], "texture": "#0"},
47+
"west": {"uv": [4, 1, 6, 3], "texture": "#0"},
48+
"up": {"uv": [0, 0, 14, 2], "texture": "#0"},
49+
"down": {"uv": [0, 8, 14, 10], "texture": "#0"}
50+
}
51+
},
52+
{
53+
"name": "bottom rail",
54+
"from": [4, 12, 12],
55+
"to": [12, 14, 14],
56+
"rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]},
57+
"faces": {
58+
"north": {"uv": [8, 12, 16, 14], "texture": "#0"},
59+
"east": {"uv": [0, 1, 2, 3], "texture": "#0"},
60+
"south": {"uv": [8, 4, 16, 6], "texture": "#0"},
61+
"west": {"uv": [4, 1, 6, 3], "texture": "#0"},
62+
"up": {"uv": [8, 0, 16, 2], "texture": "#0"},
63+
"down": {"uv": [8, 8, 16, 10], "texture": "#0"}
64+
}
65+
},
66+
{
67+
"name": "diagonal",
68+
"from": [7, 12, 12.05],
69+
"to": [9, 23, 13.85],
70+
"rotation": {"angle": 45, "axis": "z", "origin": [8, 17.5, 11]},
71+
"faces": {
72+
"north": {"uv": [5, 5, 16, 7], "rotation": 90, "texture": "#0"},
73+
"east": {"uv": [5, 1, 16, 2.8], "rotation": 90, "texture": "#0"},
74+
"south": {"uv": [5, 12, 16, 14], "rotation": 90, "texture": "#0"},
75+
"west": {"uv": [5, 9, 16, 10.8], "rotation": 90, "texture": "#0"},
76+
"up": {"uv": [0, 1, 1.8, 3], "rotation": 90, "texture": "#0"},
77+
"down": {"uv": [0, 1, 1.8, 3], "rotation": 90, "texture": "#0"}
78+
}
79+
},
80+
{
81+
"name": "diagonal",
82+
"from": [7, 12, 12.1],
83+
"to": [9, 23, 13.9],
84+
"rotation": {"angle": -45, "axis": "z", "origin": [8, 17.5, 11]},
85+
"faces": {
86+
"north": {"uv": [0, 8, 11, 10], "rotation": 90, "texture": "#0"},
87+
"east": {"uv": [0, 4, 11, 5.8], "rotation": 90, "texture": "#0"},
88+
"south": {"uv": [0, 0, 11, 2], "rotation": 90, "texture": "#0"},
89+
"west": {"uv": [0, 12, 11, 13.8], "rotation": 90, "texture": "#0"},
90+
"up": {"uv": [0, 1, 1.8, 3], "rotation": 90, "texture": "#0"},
91+
"down": {"uv": [0, 1, 1.8, 3], "rotation": 90, "texture": "#0"}
92+
}
93+
}
94+
]
95+
}

‎src/main/resources/assets/compendium/models/block/furniture/chair/back/panel_heavy.json‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
{
2+
"format_version": "1.21.6",
3+
"credit": "Made with Blockbench",
4+
"parent": "block/block",
5+
"textures": {
6+
"1": "block/acacia_planks",
7+
"particle": "block/acacia_planks"
8+
},
9+
"elements": [
10+
{
11+
"name": "left upright",
12+
"from": [2, 11, 11],
13+
"to": [5, 23, 14],
14+
"rotation": {"angle": 0, "axis": "y", "origin": [2, 11, 11]},
15+
"faces": {
16+
"north": {"uv": [1, 4, 13, 7], "rotation": 90, "texture": "#1"},
17+
"east": {"uv": [1, 0, 13, 3], "rotation": 90, "texture": "#1"},
18+
"south": {"uv": [1, 12, 13, 15], "rotation": 90, "texture": "#1"},
19+
"west": {"uv": [1, 8, 13, 11], "rotation": 90, "texture": "#1"},
20+
"up": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#1"},
21+
"down": {"uv": [0, 0, 3, 3], "rotation": 90, "texture": "#1"}
22+
}
23+
},
24+
{
25+
"name": "right upright",
26+
"from": [11, 11, 11],
27+
"to": [14, 23, 14],
28+
"rotation": {"angle": 0, "axis": "y", "origin": [11, 11, 11]},
29+
"faces": {
30+
"north": {"uv": [0, 4, 12, 7], "rotation": 90, "texture": "#1"},
31+
"east": {"uv": [0, 0, 12, 3], "rotation": 90, "texture": "#1"},
32+
"south": {"uv": [0, 12, 12, 15], "rotation": 90, "texture": "#1"},
33+
"west": {"uv": [0, 8, 12, 11], "rotation": 90, "texture": "#1"},
34+
"up": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#1"},
35+
"down": {"uv": [0, 1, 3, 4], "rotation": 90, "texture": "#1"}
36+
}
37+
},
38+
{
39+
"name": "back panel",
40+
"from": [1, 16, 9],
41+
"to": [15, 22, 11],
42+
"rotation": {"angle": 0, "axis": "y", "origin": [11, 16, 11]},
43+
"faces": {
44+
"north": {"uv": [0, 2, 14, 8], "texture": "#1"},
45+
"east": {"uv": [3, 2, 5, 8], "texture": "#1"},
46+
"south": {"uv": [0, 10, 14, 16], "texture": "#1"},
47+
"west": {"uv": [5, 2, 7, 8], "texture": "#1"},
48+
"up": {"uv": [0, 0, 14, 2], "texture": "#1"},
49+
"down": {"uv": [0, 0, 14, 2], "texture": "#1"}
50+
}
51+
}
52+
]
53+
}

0 commit comments

Comments
 (0)