Skip to content

Commit 8819d40

Browse files
The-Code-MonkeyThe-Code-Monkey
authored
Merge branch '1.21' into feat/add-workbench
2 parents 6971c34 + 6307098 commit 8819d40

6 files changed

Lines changed: 376 additions & 0 deletions

File tree

‎src/main/resources/assets/minetale/blockstates/construction_sign.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"variants": {
3+
"facing=east,half=lower": {
4+
"model": "minetale:block/furniture/construction_sign_bottom"
5+
},
6+
"facing=north,half=lower": {
7+
"model": "minetale:block/furniture/construction_sign_bottom"
8+
},
9+
"facing=south,half=lower": {
10+
"model": "minetale:block/furniture/construction_sign_bottom"
11+
},
12+
"facing=west,half=lower": {
13+
"model": "minetale:block/furniture/construction_sign_bottom"
14+
},
15+
"facing=east,half=upper": {
16+
"model": "minetale:block/furniture/construction_sign_top"
17+
},
18+
"facing=north,half=upper": {
19+
"model": "minetale:block/furniture/construction_sign_top"
20+
},
21+
"facing=south,half=upper": {
22+
"model": "minetale:block/furniture/construction_sign_top"
23+
},
24+
"facing=west,half=upper": {
25+
"model": "minetale:block/furniture/construction_sign_top"
26+
}
27+
}
28+
}

‎src/main/resources/assets/minetale/models/block/furniture/construction_sign_bottom.json‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
{
2+
"textures": {
3+
"0": "minetale:block/furniture/construction_sign",
4+
"1": "minetale:block/furniture/construction_sign_edge",
5+
"particle": "minetale:block/furniture/construction_sign_edge"
6+
},
7+
"elements": [
8+
{
9+
"from": [0.125, 1.25, 5],
10+
"to": [16.125, 17.25, 7],
11+
"rotation": {"angle": 16.875, "axis": "x", "origin": [1.125, 29, 9]},
12+
"faces": {
13+
"north": {"uv": [0, 8, 8, 16], "texture": "#0"},
14+
"east": {"uv": [4, 0, 6, 16], "texture": "#1"},
15+
"south": {"uv": [8, 8, 16, 16], "texture": "#0"},
16+
"west": {"uv": [4, 0, 6, 16], "texture": "#1"},
17+
"down": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#1"}
18+
}
19+
},
20+
{
21+
"from": [2.5, -1.25, 7],
22+
"to": [4.5, 13.75, 9],
23+
"rotation": {"angle": 16.875, "axis": "x", "origin": [2.5, 29, 9]},
24+
"faces": {
25+
"north": {"uv": [8, 1, 10, 16], "texture": "#1"},
26+
"east": {"uv": [8, 1, 10, 16], "texture": "#1"},
27+
"south": {"uv": [8, 1, 10, 16], "texture": "#1"},
28+
"west": {"uv": [8, 1, 10, 16], "texture": "#1"},
29+
"down": {"uv": [8, 0, 10, 2], "texture": "#1"}
30+
}
31+
},
32+
{
33+
"from": [2.25, -1.25, 7],
34+
"to": [4.25, 13.75, 9],
35+
"rotation": {"angle": -16.875, "axis": "x", "origin": [2.25, 29, 7]},
36+
"faces": {
37+
"north": {"uv": [10, 1, 12, 16], "texture": "#1"},
38+
"east": {"uv": [10, 1, 12, 16], "texture": "#1"},
39+
"south": {"uv": [12, 1, 10, 16], "texture": "#1"},
40+
"west": {"uv": [10, 1, 12, 16], "texture": "#1"},
41+
"down": {"uv": [10, 0, 12, 2], "texture": "#1"}
42+
}
43+
},
44+
{
45+
"from": [11.25, -1.25, 7],
46+
"to": [13.25, 13.75, 9],
47+
"rotation": {"angle": -16.875, "axis": "x", "origin": [11.25, 29, 7]},
48+
"faces": {
49+
"north": {"uv": [12, 1, 14, 16], "texture": "#1"},
50+
"east": {"uv": [12, 1, 14, 16], "texture": "#1"},
51+
"south": {"uv": [14, 1, 12, 16], "texture": "#1"},
52+
"west": {"uv": [12, 1, 14, 16], "texture": "#1"},
53+
"down": {"uv": [12, 0, 14, 2], "texture": "#1"}
54+
}
55+
},
56+
{
57+
"from": [11.5, -1.25, 7],
58+
"to": [13.5, 13.75, 9],
59+
"rotation": {"angle": 16.875, "axis": "x", "origin": [11.5, 29, 9]},
60+
"faces": {
61+
"north": {"uv": [14, 1, 16, 16], "texture": "#1"},
62+
"east": {"uv": [14, 1, 16, 16], "texture": "#1"},
63+
"south": {"uv": [14, 1, 16, 16], "texture": "#1"},
64+
"west": {"uv": [14, 1, 16, 16], "texture": "#1"},
65+
"down": {"uv": [14, 0, 16, 2], "texture": "#1"}
66+
}
67+
},
68+
{
69+
"from": [-0.125, 1.25, 9],
70+
"to": [15.875, 17.25, 11],
71+
"rotation": {"angle": -16.875, "axis": "x", "origin": [0.875, 29, 7]},
72+
"faces": {
73+
"north": {"uv": [8, 8, 16, 16], "texture": "#0"},
74+
"east": {"uv": [4, 0, 6, 16], "texture": "#1"},
75+
"south": {"uv": [0, 8, 8, 16], "texture": "#0"},
76+
"west": {"uv": [4, 0, 6, 16], "texture": "#1"},
77+
"down": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#1"}
78+
}
79+
}
80+
]
81+
}

‎src/main/resources/assets/minetale/models/block/furniture/construction_sign_top.json‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
{
2+
"textures": {
3+
"0": "minetale:block/furniture/construction_sign",
4+
"1": "minetale:block/furniture/construction_sign_edge",
5+
"particle": "minetale:block/furniture/construction_sign_edge"
6+
},
7+
"elements": [
8+
{
9+
"from": [2.25, -2.25, 7],
10+
"to": [4.25, 12.75, 9],
11+
"rotation": {"angle": -16.875, "axis": "x", "origin": [2.25, 13, 7]},
12+
"faces": {
13+
"north": {"uv": [10, 0, 12, 15], "texture": "#1"},
14+
"east": {"uv": [10, 0, 12, 15], "texture": "#1"},
15+
"west": {"uv": [10, 0, 12, 15], "texture": "#1"},
16+
"up": {"uv": [10, 0, 12, 2], "texture": "#1"}
17+
}
18+
},
19+
{
20+
"from": [0.125, 1.25, 5],
21+
"to": [16.125, 17.25, 7],
22+
"rotation": {"angle": 16.875, "axis": "x", "origin": [1.125, 13, 9]},
23+
"faces": {
24+
"north": {"uv": [0, 0, 8, 8], "texture": "#0"},
25+
"east": {"uv": [2, 0, 4, 16], "texture": "#1"},
26+
"south": {"uv": [8, 0, 16, 8], "texture": "#0"},
27+
"west": {"uv": [2, 0, 4, 16], "texture": "#1"},
28+
"up": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#1"}
29+
}
30+
},
31+
{
32+
"from": [-0.125, 1.25, 9],
33+
"to": [15.875, 17.25, 11],
34+
"rotation": {"angle": -16.875, "axis": "x", "origin": [0.875, 13, 7]},
35+
"faces": {
36+
"north": {"uv": [8, 0, 16, 8], "texture": "#0"},
37+
"east": {"uv": [2, 0, 4, 16], "texture": "#1"},
38+
"south": {"uv": [0, 0, 8, 8], "texture": "#0"},
39+
"west": {"uv": [2, 0, 4, 16], "texture": "#1"},
40+
"up": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#1"}
41+
}
42+
},
43+
{
44+
"from": [11.25, -2.25, 7],
45+
"to": [13.25, 12.75, 9],
46+
"rotation": {"angle": -16.875, "axis": "x", "origin": [11.25, 13, 7]},
47+
"faces": {
48+
"north": {"uv": [12, 0, 14, 15], "texture": "#1"},
49+
"east": {"uv": [12, 0, 14, 15], "texture": "#1"},
50+
"west": {"uv": [12, 0, 14, 15], "texture": "#1"},
51+
"up": {"uv": [12, 0, 14, 2], "texture": "#1"}
52+
}
53+
},
54+
{
55+
"from": [11.5, -2.25, 7],
56+
"to": [13.5, 12.75, 9],
57+
"rotation": {"angle": 16.875, "axis": "x", "origin": [11.5, 13, 9]},
58+
"faces": {
59+
"east": {"uv": [14, 0, 16, 15], "texture": "#1"},
60+
"south": {"uv": [14, 0, 16, 15], "texture": "#1"},
61+
"west": {"uv": [14, 0, 16, 15], "texture": "#1"},
62+
"up": {"uv": [14, 0, 16, 2], "texture": "#1"}
63+
}
64+
},
65+
{
66+
"from": [2.5, -2.25, 7],
67+
"to": [4.5, 12.75, 9],
68+
"rotation": {"angle": 16.875, "axis": "x", "origin": [2.5, 13, 9]},
69+
"faces": {
70+
"east": {"uv": [8, 0, 10, 15], "texture": "#1"},
71+
"south": {"uv": [8, 0, 10, 15], "texture": "#1"},
72+
"west": {"uv": [8, 0, 10, 15], "texture": "#1"},
73+
"up": {"uv": [8, 0, 10, 2], "texture": "#1"}
74+
}
75+
}
76+
]
77+
}

‎src/main/resources/assets/minetale/models/item/furniture/construction_sign.json‎

Lines changed: 190 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,190 @@
1+
{
2+
"textures": {
3+
"0": "minetale:block/furniture/construction_sign",
4+
"1": "minetale:block/furniture/construction_sign_edge"
5+
},
6+
"elements": [
7+
{
8+
"from": [0.125, -6.75, 5],
9+
"to": [16.125, 9.25, 7],
10+
"rotation": {"angle": 4.21875, "axis": "x", "origin": [1.125, 21, 9]},
11+
"faces": {
12+
"north": {"uv": [0, 8, 8, 16], "texture": "#0"},
13+
"east": {"uv": [4, 0, 6, 16], "texture": "#1"},
14+
"south": {"uv": [8, 8, 16, 16], "texture": "#0"},
15+
"west": {"uv": [4, 0, 6, 16], "texture": "#1"},
16+
"down": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#1"}
17+
}
18+
},
19+
{
20+
"from": [2.5, -9.25, 7],
21+
"to": [4.5, 5.75, 9],
22+
"rotation": {"angle": 4.21875, "axis": "x", "origin": [2.5, 21, 9]},
23+
"faces": {
24+
"north": {"uv": [8, 1, 10, 16], "texture": "#1"},
25+
"east": {"uv": [8, 1, 10, 16], "texture": "#1"},
26+
"south": {"uv": [8, 1, 10, 16], "texture": "#1"},
27+
"west": {"uv": [8, 1, 10, 16], "texture": "#1"},
28+
"down": {"uv": [8, 0, 10, 2], "texture": "#1"}
29+
}
30+
},
31+
{
32+
"from": [2.25, -9.25, 7],
33+
"to": [4.25, 5.75, 9],
34+
"rotation": {"angle": -4.21875, "axis": "x", "origin": [2.25, 21, 7]},
35+
"faces": {
36+
"north": {"uv": [10, 1, 12, 16], "texture": "#1"},
37+
"east": {"uv": [10, 1, 12, 16], "texture": "#1"},
38+
"south": {"uv": [12, 1, 10, 16], "texture": "#1"},
39+
"west": {"uv": [10, 1, 12, 16], "texture": "#1"},
40+
"down": {"uv": [10, 0, 12, 2], "texture": "#1"}
41+
}
42+
},
43+
{
44+
"from": [11.25, -9.25, 7],
45+
"to": [13.25, 5.75, 9],
46+
"rotation": {"angle": -4.21875, "axis": "x", "origin": [11.25, 21, 7]},
47+
"faces": {
48+
"north": {"uv": [12, 1, 14, 16], "texture": "#1"},
49+
"east": {"uv": [12, 1, 14, 16], "texture": "#1"},
50+
"south": {"uv": [14, 1, 12, 16], "texture": "#1"},
51+
"west": {"uv": [12, 1, 14, 16], "texture": "#1"},
52+
"down": {"uv": [12, 0, 14, 2], "texture": "#1"}
53+
}
54+
},
55+
{
56+
"from": [11.5, -9.25, 7],
57+
"to": [13.5, 5.75, 9],
58+
"rotation": {"angle": 4.21875, "axis": "x", "origin": [11.5, 21, 9]},
59+
"faces": {
60+
"north": {"uv": [14, 1, 16, 16], "texture": "#1"},
61+
"east": {"uv": [14, 1, 16, 16], "texture": "#1"},
62+
"south": {"uv": [14, 1, 16, 16], "texture": "#1"},
63+
"west": {"uv": [14, 1, 16, 16], "texture": "#1"},
64+
"down": {"uv": [14, 0, 16, 2], "texture": "#1"}
65+
}
66+
},
67+
{
68+
"from": [-0.125, -6.75, 9],
69+
"to": [15.875, 9.25, 11],
70+
"rotation": {"angle": -4.21875, "axis": "x", "origin": [0.875, 21, 7]},
71+
"faces": {
72+
"north": {"uv": [8, 8, 16, 16], "texture": "#0"},
73+
"east": {"uv": [4, 0, 6, 16], "texture": "#1"},
74+
"south": {"uv": [0, 8, 8, 16], "texture": "#0"},
75+
"west": {"uv": [4, 0, 6, 16], "texture": "#1"},
76+
"down": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#1"}
77+
}
78+
},
79+
{
80+
"from": [2.25, 5.75, 7],
81+
"to": [4.25, 20.75, 9],
82+
"rotation": {"angle": -4.21875, "axis": "x", "origin": [2.25, 21, 7]},
83+
"faces": {
84+
"north": {"uv": [10, 0, 12, 15], "texture": "#1"},
85+
"east": {"uv": [10, 0, 12, 15], "texture": "#1"},
86+
"west": {"uv": [10, 0, 12, 15], "texture": "#1"},
87+
"up": {"uv": [10, 0, 12, 2], "texture": "#1"}
88+
}
89+
},
90+
{
91+
"from": [0.125, 9.25, 5],
92+
"to": [16.125, 25.25, 7],
93+
"rotation": {"angle": 4.21875, "axis": "x", "origin": [1.125, 21, 9]},
94+
"faces": {
95+
"north": {"uv": [0, 0, 8, 8], "texture": "#0"},
96+
"east": {"uv": [2, 0, 4, 16], "texture": "#1"},
97+
"south": {"uv": [8, 0, 16, 8], "texture": "#0"},
98+
"west": {"uv": [2, 0, 4, 16], "texture": "#1"},
99+
"up": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#1"}
100+
}
101+
},
102+
{
103+
"from": [-0.125, 9.25, 9],
104+
"to": [15.875, 25.25, 11],
105+
"rotation": {"angle": -4.21875, "axis": "x", "origin": [0.875, 21, 7]},
106+
"faces": {
107+
"north": {"uv": [8, 0, 16, 8], "texture": "#0"},
108+
"east": {"uv": [2, 0, 4, 16], "texture": "#1"},
109+
"south": {"uv": [0, 0, 8, 8], "texture": "#0"},
110+
"west": {"uv": [2, 0, 4, 16], "texture": "#1"},
111+
"up": {"uv": [0, 0, 2, 16], "rotation": 90, "texture": "#1"}
112+
}
113+
},
114+
{
115+
"from": [11.25, 5.75, 7],
116+
"to": [13.25, 20.75, 9],
117+
"rotation": {"angle": -4.21875, "axis": "x", "origin": [11.25, 21, 7]},
118+
"faces": {
119+
"north": {"uv": [12, 0, 14, 15], "texture": "#1"},
120+
"east": {"uv": [12, 0, 14, 15], "texture": "#1"},
121+
"west": {"uv": [12, 0, 14, 15], "texture": "#1"},
122+
"up": {"uv": [12, 0, 14, 2], "texture": "#1"}
123+
}
124+
},
125+
{
126+
"from": [11.5, 5.75, 7],
127+
"to": [13.5, 20.75, 9],
128+
"rotation": {"angle": 4.21875, "axis": "x", "origin": [11.5, 21, 9]},
129+
"faces": {
130+
"east": {"uv": [14, 0, 16, 15], "texture": "#1"},
131+
"south": {"uv": [14, 0, 16, 15], "texture": "#1"},
132+
"west": {"uv": [14, 0, 16, 15], "texture": "#1"},
133+
"up": {"uv": [14, 0, 16, 2], "texture": "#1"}
134+
}
135+
},
136+
{
137+
"from": [2.5, 5.75, 7],
138+
"to": [4.5, 20.75, 9],
139+
"rotation": {"angle": 4.21875, "axis": "x", "origin": [2.5, 21, 9]},
140+
"faces": {
141+
"east": {"uv": [8, 0, 10, 15], "texture": "#1"},
142+
"south": {"uv": [8, 0, 10, 15], "texture": "#1"},
143+
"west": {"uv": [8, 0, 10, 15], "texture": "#1"},
144+
"up": {"uv": [8, 0, 10, 2], "texture": "#1"}
145+
}
146+
}
147+
],
148+
"display": {
149+
"thirdperson_righthand": {
150+
"rotation": [75, 45, 0],
151+
"translation": [0, 1.5, 0],
152+
"scale": [0.375, 0.375, 0.375]
153+
},
154+
"thirdperson_lefthand": {
155+
"rotation": [75, 45, 0],
156+
"translation": [0, 1.5, 0],
157+
"scale": [0.375, 0.375, 0.375]
158+
},
159+
"firstperson_righthand": {
160+
"rotation": [0, -45, 0],
161+
"translation": [0, 0, 1],
162+
"scale": [0.4, 0.4, 0.4]
163+
},
164+
"firstperson_lefthand": {
165+
"rotation": [0, -45, 0],
166+
"translation": [0, 0, 1],
167+
"scale": [0.4, 0.4, 0.4]
168+
},
169+
"ground": {
170+
"translation": [0, 4, 0],
171+
"scale": [0.25, 0.25, 0.25]
172+
},
173+
"gui": {
174+
"rotation": [30, -135, 0],
175+
"translation": [0, -0.25, 0],
176+
"scale": [0.4, 0.4, 0.4]
177+
},
178+
"head": {
179+
"translation": [0, -23, 0],
180+
"scale": [1, 1, 1.25]
181+
},
182+
"fixed": {
183+
"translation": [0, 0, 1.5],
184+
"scale": [0.5, 0.5, 0.5]
185+
},
186+
"on_shelf": {
187+
"translation": [0, 0, -4.75]
188+
}
189+
}
190+
}

‎src/main/resources/assets/minetale/textures/block/furniture/construction_sign.png‎

1.91 KB
Loading

‎src/main/resources/assets/minetale/textures/block/furniture/construction_sign_edge.png‎

495 Bytes
Loading

0 commit comments

Comments
 (0)