Skip to content

Commit 0ca44e5

Browse files
Dinoguin-JessDinoguin-Jess
authored
Cherry bench, stool and chair (#4)
* New module: Reeling Rods (Gamemode4Dev#1104) * Shrink Blossoming Pots pack.png * Shrink Reeling Rods pack.png (Gamemode4Dev#1153) * Update raw wood set file. Add cherry models and textures for bench, stool and chair. Remove version from spruce model files. * Add Reeling Rods Smithed ID (Gamemode4Dev#1156)
1 parent bcd2fd8 commit 0ca44e5

115 files changed

Lines changed: 2897 additions & 164 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎gm4/modeldata_registry.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,7 @@
534534
"fishing_rod": {
535535
"gm4_end_fishing:gui/advancement/end_fishing": 1,
536536
"gm4_end_fishing:guidebook_icon/end_fishing": 2,
537+
"gm4_reeling_rods:guidebook_icon/reeling_rods": 3,
537538
"gm4_metallurgy:shamir/hypexperia": 110,
538539
"gm4_animi_shamir:shamir/animi": 124
539540
},

‎gm4/utils.py‎

Lines changed: 183 additions & 157 deletions
Large diffs are not rendered by default.

‎gm4_blossoming_pots/pack.png‎

-50.5 KB
Loading

‎gm4_furniture/assets/gm4_furniture/items/wood_set/cherry/bench_1.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"model": {
3+
"type": "minecraft:model",
4+
"model": "gm4_furniture:block/furniture/wood_set/cherry/bench_1",
5+
"tints": [
6+
{
7+
"type": "minecraft:dye",
8+
"default": -393217
9+
}
10+
]
11+
}
12+
}

‎gm4_furniture/assets/gm4_furniture/items/wood_set/cherry/chair_1.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"model": {
3+
"type": "minecraft:model",
4+
"model": "gm4_furniture:block/furniture/wood_set/cherry/chair_1",
5+
"tints": [
6+
{
7+
"type": "minecraft:dye",
8+
"default": -393217
9+
}
10+
]
11+
}
12+
}

‎gm4_furniture/assets/gm4_furniture/items/wood_set/cherry/stool_1.json‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"model": {
3+
"type": "minecraft:model",
4+
"model": "gm4_furniture:block/furniture/wood_set/cherry/stool_1",
5+
"tints": [
6+
{
7+
"type": "minecraft:dye",
8+
"default": -393217
9+
}
10+
]
11+
}
12+
}

‎gm4_furniture/assets/gm4_furniture/models/block/furniture/wood_set/cherry/bench_1.json‎

Lines changed: 259 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,259 @@
1+
{
2+
"credit": "Made with Blockbench",
3+
"texture_size": [64, 64],
4+
"textures": {
5+
"0": "gm4_furniture:block/furniture/wood_set/cherry/bench_1",
6+
"particle": "gm4_furniture:block/furniture/wood_set/cherry/bench_1"
7+
},
8+
"elements": [
9+
{
10+
"name": "Leg_Front_Left",
11+
"from": [29, 0, 1],
12+
"to": [31, 12, 3],
13+
"rotation": {"angle": 0, "axis": "y", "origin": [29, 0, 1]},
14+
"faces": {
15+
"north": {"uv": [5.5, 2.125, 5.75, 3.625], "texture": "#0"},
16+
"east": {"uv": [5.875, 2.125, 6.125, 3.625], "texture": "#0"},
17+
"south": {"uv": [5.5, 2.125, 5.75, 3.625], "texture": "#0"},
18+
"west": {"uv": [5.875, 2.125, 6.125, 3.625], "texture": "#0"},
19+
"up": {"uv": [6.5, 1.375, 6.25, 1.125], "texture": "#0"},
20+
"down": {"uv": [6.5, 1.125, 6.25, 1.375], "texture": "#0"}
21+
}
22+
},
23+
{
24+
"name": "Leg_Back_Left",
25+
"from": [29, 0, 13],
26+
"to": [31, 20, 15],
27+
"rotation": {"angle": 0, "axis": "y", "origin": [29, 0, 13]},
28+
"faces": {
29+
"north": {"uv": [5.5, 1.125, 5.75, 3.625], "texture": "#0"},
30+
"east": {"uv": [5.875, 1.125, 6.125, 3.625], "texture": "#0"},
31+
"south": {"uv": [5.5, 1.125, 5.75, 3.625], "texture": "#0"},
32+
"west": {"uv": [6.125, 1.125, 5.875, 3.625], "texture": "#0"},
33+
"up": {"uv": [6.5, 1.375, 6.25, 1.125], "texture": "#0"},
34+
"down": {"uv": [6.5, 1.125, 6.25, 1.375], "texture": "#0"}
35+
}
36+
},
37+
{
38+
"name": "Leg_Back_Right",
39+
"from": [-15, 0, 13],
40+
"to": [-13, 20, 15],
41+
"rotation": {"angle": 0, "axis": "y", "origin": [-15, 0, 13]},
42+
"faces": {
43+
"north": {"uv": [5.5, 1.125, 5.75, 3.625], "texture": "#0"},
44+
"east": {"uv": [5.875, 1.125, 6.125, 3.625], "texture": "#0"},
45+
"south": {"uv": [5.5, 1.125, 5.75, 3.625], "texture": "#0"},
46+
"west": {"uv": [5.875, 1.125, 6.125, 3.625], "texture": "#0"},
47+
"up": {"uv": [6.5, 1.375, 6.25, 1.125], "texture": "#0"},
48+
"down": {"uv": [6.5, 1.125, 6.25, 1.375], "texture": "#0"}
49+
}
50+
},
51+
{
52+
"name": "Leg_Front_Right",
53+
"from": [-15, 0, 1],
54+
"to": [-13, 12, 3],
55+
"rotation": {"angle": 0, "axis": "y", "origin": [-15, 0, 1]},
56+
"faces": {
57+
"north": {"uv": [5.5, 2.125, 5.75, 3.625], "texture": "#0"},
58+
"east": {"uv": [5.875, 2.125, 6.125, 3.625], "texture": "#0"},
59+
"south": {"uv": [5.5, 2.125, 5.75, 3.625], "texture": "#0"},
60+
"west": {"uv": [5.875, 2.125, 6.125, 3.625], "texture": "#0"},
61+
"up": {"uv": [6.5, 1.375, 6.25, 1.125], "texture": "#0"},
62+
"down": {"uv": [6.5, 1.125, 6.25, 1.375], "texture": "#0"}
63+
}
64+
},
65+
{
66+
"name": "under_seat_panel",
67+
"from": [-13, 4, 1],
68+
"to": [29, 6, 15],
69+
"rotation": {"angle": 0, "axis": "y", "origin": [22, 4, 2]},
70+
"faces": {
71+
"north": {"uv": [0, 7.625, 5.25, 7.875], "texture": "#0"},
72+
"east": {"uv": [7, 4.25, 8.75, 4.5], "texture": "#0"},
73+
"south": {"uv": [0, 6.875, 5.25, 7.125], "texture": "#0"},
74+
"west": {"uv": [5.25, 4.25, 7, 4.5], "texture": "#0"},
75+
"up": {"uv": [10.625, 7.125, 5.375, 5.375], "texture": "#0"},
76+
"down": {"uv": [5.25, 0, 0, 1.75], "texture": "#0"}
77+
}
78+
},
79+
{
80+
"name": "Left_Panel",
81+
"from": [29, 4, 3],
82+
"to": [31, 12, 13],
83+
"rotation": {"angle": 0, "axis": "y", "origin": [28, 3, 5]},
84+
"faces": {
85+
"north": {"uv": [7.375, 4.5, 7.625, 5.5], "texture": "#0"},
86+
"east": {"uv": [5.5, 0, 6.75, 1], "texture": "#0"},
87+
"south": {"uv": [7.125, 4.5, 7.375, 5.5], "texture": "#0"},
88+
"west": {"uv": [5.5, 0, 6.75, 1], "texture": "#0"},
89+
"up": {"uv": [7.125, 3.625, 6.875, 2.375], "texture": "#0"},
90+
"down": {"uv": [7.125, 2.375, 6.875, 3.625], "texture": "#0"}
91+
}
92+
},
93+
{
94+
"name": "Right_Panel",
95+
"from": [-15, 4, 3],
96+
"to": [-13, 12, 13],
97+
"rotation": {"angle": 0, "axis": "y", "origin": [-16, 3, 5]},
98+
"faces": {
99+
"north": {"uv": [6.875, 4.5, 7.125, 5.5], "texture": "#0"},
100+
"east": {"uv": [5.5, 0, 6.75, 1], "texture": "#0"},
101+
"south": {"uv": [6.625, 4.5, 6.875, 5.5], "texture": "#0"},
102+
"west": {"uv": [5.5, 0, 6.75, 1], "texture": "#0"},
103+
"up": {"uv": [7.125, 3.625, 6.875, 2.375], "texture": "#0"},
104+
"down": {"uv": [7.125, 2.375, 6.875, 3.625], "texture": "#0"}
105+
}
106+
},
107+
{
108+
"name": "back_seat_panel",
109+
"from": [-13, 6, 12],
110+
"to": [29, 19, 15],
111+
"rotation": {"angle": 0, "axis": "y", "origin": [0, 18, 13]},
112+
"faces": {
113+
"north": {"uv": [0, 1.875, 5.25, 3.5], "texture": "#0", "tintindex": 0},
114+
"east": {"uv": [6.25, 2, 6.625, 3.625], "texture": "#0", "tintindex": 0},
115+
"south": {"uv": [0, 0, 5.25, 1.625], "texture": "#0"},
116+
"west": {"uv": [6.25, 2, 6.625, 3.625], "texture": "#0", "tintindex": 0},
117+
"up": {"uv": [5.25, 4, 0, 3.625], "texture": "#0", "tintindex": 0},
118+
"down": {"uv": [10.5, 3.625, 5.25, 4], "texture": "#0"}
119+
}
120+
},
121+
{
122+
"name": "flat_seat",
123+
"from": [-13, 6, 2],
124+
"to": [29, 8, 12],
125+
"rotation": {"angle": 0, "axis": "y", "origin": [0, 6, 0]},
126+
"faces": {
127+
"north": {"uv": [0, 8.375, 5.25, 8.625], "texture": "#0", "tintindex": 0},
128+
"east": {"uv": [5.25, 4.5, 6.5, 4.75], "texture": "#0"},
129+
"south": {"uv": [5.25, 3.625, 10.5, 3.875], "texture": "#0"},
130+
"west": {"uv": [8.75, 4.25, 10, 4.5], "texture": "#0"},
131+
"up": {"uv": [5.25, 5.375, 0, 4.125], "texture": "#0", "tintindex": 0},
132+
"down": {"uv": [10.5, 3.625, 5.25, 4.875], "texture": "#0"}
133+
}
134+
},
135+
{
136+
"name": "top_across",
137+
"from": [-14, 19, 13],
138+
"to": [30, 21, 15],
139+
"rotation": {"angle": 0, "axis": "y", "origin": [-9, 20, 13]},
140+
"faces": {
141+
"north": {"uv": [0, 7.25, 5.5, 7.5], "texture": "#0"},
142+
"east": {"uv": [5.625, 7.625, 5.875, 7.875], "texture": "#0"},
143+
"south": {"uv": [0, 8, 5.5, 8.25], "texture": "#0"},
144+
"west": {"uv": [5.625, 7.625, 5.875, 7.875], "texture": "#0"},
145+
"up": {"uv": [5.5, 7.875, 0, 7.625], "texture": "#0"},
146+
"down": {"uv": [10.75, 4, 5.25, 4.25], "texture": "#0"}
147+
}
148+
},
149+
{
150+
"name": "top_right",
151+
"from": [-11, 19, 12],
152+
"to": [5, 20, 13],
153+
"rotation": {"angle": 0, "axis": "y", "origin": [0, 19, 11]},
154+
"faces": {
155+
"north": {"uv": [0, 5.75, 2, 5.875], "texture": "#0", "tintindex": 0},
156+
"east": {"uv": [2.125, 5.5, 2.25, 5.625], "texture": "#0", "tintindex": 0},
157+
"south": {"uv": [0, 6, 2, 6.125], "texture": "#0"},
158+
"west": {"uv": [2.125, 5.5, 2.25, 5.625], "texture": "#0", "tintindex": 0},
159+
"up": {"uv": [0, 5.5, 2, 5.625], "texture": "#0", "tintindex": 0},
160+
"down": {"uv": [0, 6, 2, 6.125], "texture": "#0"}
161+
}
162+
},
163+
{
164+
"name": "top_left",
165+
"from": [11, 19, 12],
166+
"to": [27, 20, 13],
167+
"rotation": {"angle": 0, "axis": "y", "origin": [11, 19, 11]},
168+
"faces": {
169+
"north": {"uv": [0, 5.875, 2, 5.75], "texture": "#0", "tintindex": 0},
170+
"east": {"uv": [2.125, 5.5, 2.25, 5.625], "texture": "#0", "tintindex": 0},
171+
"south": {"uv": [0, 6, 2, 6.125], "texture": "#0"},
172+
"west": {"uv": [2.125, 5.5, 2.25, 5.625], "texture": "#0", "tintindex": 0},
173+
"up": {"uv": [0, 5.5, 2, 5.625], "texture": "#0", "tintindex": 0},
174+
"down": {"uv": [0, 6, 2, 6.125], "texture": "#0"}
175+
}
176+
},
177+
{
178+
"name": "ear_left",
179+
"from": [20.5, 18.96447, 13.1],
180+
"to": [24.5, 22.96447, 14.9],
181+
"rotation": {"angle": -45, "axis": "z", "origin": [22.5, 20.96447, 13.95]},
182+
"faces": {
183+
"north": {"uv": [7, 0, 7.5, 0.5], "texture": "#0"},
184+
"east": {"uv": [8.25, 0, 8.5, 0.5], "texture": "#0"},
185+
"south": {"uv": [7.625, 0, 8.125, 0.5], "texture": "#0"},
186+
"west": {"uv": [8.25, 0, 8.5, 0.5], "texture": "#0"},
187+
"up": {"uv": [7, 0.625, 7.5, 0.8625], "texture": "#0"},
188+
"down": {"uv": [7, 0.625, 7.5, 0.8625], "texture": "#0"}
189+
}
190+
},
191+
{
192+
"name": "ear_right",
193+
"from": [-8.5, 18.96447, 13.1],
194+
"to": [-4.5, 22.96447, 14.9],
195+
"rotation": {"angle": -45, "axis": "z", "origin": [-6.5, 20.96447, 13.95]},
196+
"faces": {
197+
"north": {"uv": [7, 0, 7.5, 0.5], "texture": "#0"},
198+
"east": {"uv": [8.25, 0, 8.5, 0.5], "texture": "#0"},
199+
"south": {"uv": [7.625, 0, 8.125, 0.5], "texture": "#0"},
200+
"west": {"uv": [8.25, 0, 8.5, 0.5], "texture": "#0"},
201+
"up": {"uv": [7, 0.625, 7.5, 0.8625], "texture": "#0"},
202+
"down": {"uv": [7, 0.625, 7.5, 0.8625], "texture": "#0"}
203+
}
204+
}
205+
],
206+
"groups": [
207+
{
208+
"name": "Legs",
209+
"origin": [8, 8, 8],
210+
"color": 0,
211+
"children": [0, 1, 2, 3]
212+
},
213+
{
214+
"name": "Panels",
215+
"origin": [8, 8, 8],
216+
"color": 0,
217+
"children": [4, 5, 6, 7, 8]
218+
},
219+
{
220+
"name": "Top_Shaping",
221+
"origin": [8, 8, 8],
222+
"color": 0,
223+
"children": [9, 10, 11, 12, 13]
224+
}
225+
],
226+
"display": {
227+
"thirdperson_righthand": {
228+
"rotation": [75, 45, 0],
229+
"translation": [0, 1.75, 0],
230+
"scale": [0.1875, 0.1875, 0.1875]
231+
},
232+
"thirdperson_lefthand": {
233+
"rotation": [75, 45, 0],
234+
"translation": [0, 1.75, 0],
235+
"scale": [0.1875, 0.1875, 0.1875]
236+
},
237+
"firstperson_righthand": {
238+
"rotation": [0, 45, 0],
239+
"scale": [0.4, 0.4, 0.4]
240+
},
241+
"firstperson_lefthand": {
242+
"rotation": [0, 225, 0],
243+
"scale": [0.4, 0.4, 0.4]
244+
},
245+
"ground": {
246+
"translation": [0, 3, 0],
247+
"scale": [0.25, 0.25, 0.25]
248+
},
249+
"gui": {
250+
"rotation": [30, 225, 0],
251+
"scale": [0.3125, 0.3125, 0.3125]
252+
},
253+
"fixed": {
254+
"rotation": [-90, 0, 0],
255+
"translation": [0, 0.5, -3.25],
256+
"scale": [0.5, 0.5, 0.5]
257+
}
258+
}
259+
}

0 commit comments

Comments
 (0)