Skip to content

Commit bebdbf6

Browse files
jpeterik12jpeterik12
authored
Update for 1.18 (#55)
* update a few models * a bit more seperation, to aid in future additions * add support for cmd ranges * guidebook cmds * 1.18 version, machine blocks come later * Remove temp guidebook texture
1 parent 1d73480 commit bebdbf6

File tree

203 files changed

+3694
-851
lines changed

Some content is hidden

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

203 files changed

+3694
-851
lines changed

‎gm4_resources/assets/gm4/font/guidebook.json‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -289,33 +289,6 @@
289289
"\uf820"
290290
]
291291
},
292-
{
293-
"type": "bitmap",
294-
"file": "gm4:shulker_tooltip.png",
295-
"ascent": 23,
296-
"height": 78,
297-
"chars": [
298-
"\u0900"
299-
]
300-
},
301-
{
302-
"type": "bitmap",
303-
"file": "gm4:shulker_tooltip_header.png",
304-
"ascent": 23,
305-
"height": 78,
306-
"chars": [
307-
"\u0901"
308-
]
309-
},
310-
{
311-
"type": "bitmap",
312-
"file": "gm4:ender_tooltip.png",
313-
"ascent": 23,
314-
"height": 78,
315-
"chars": [
316-
"\u0902"
317-
]
318-
},
319292
{
320293
"type": "bitmap",
321294
"file": "minecraft:item/acacia_boat.png",

‎gm4_resources/assets/gm4/models/block/block_compressors/block_compressor.json‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
{
2-
"parent": "gm4:block/cube_w_input",
3-
"textures": {
4-
"particle": "gm4:block/block_compressor_side",
5-
"side": "gm4:block/block_compressor_side",
6-
"bottom": "gm4:block/master_crafter_bottom",
7-
"top": "gm4:block/compressor_top",
8-
"small_side": "gm4:block/input_side",
9-
"small_top": "gm4:block/input_top"
10-
},
2+
"parent": "gm4:block/block_compressors/block_compressor_full",
113
"display": {
124
"thirdperson_righthand": {
13-
"rotation": [90, 0, 0],
14-
"translation": [-6, -2, 0.775],
15-
"scale": [2.002, 2.003, 2.003]
16-
},
17-
"gui": {
18-
"rotation": [ 30, 225, 0 ],
19-
"translation": [ 0, 0, 0],
20-
"scale":[ 0.625, 0.625, 0.625 ]
21-
}
5+
"rotation": [
6+
90,
7+
0,
8+
0
9+
],
10+
"translation": [
11+
-6,
12+
-2,
13+
0.775
14+
],
15+
"scale": [
16+
2.002,
17+
2.003,
18+
2.003
19+
]
20+
}
2221
}
2322
}

‎gm4_resources/assets/gm4/models/block/block_compressors/block_compressor_full.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"parent": "gm4:block/cube_w_input",
3+
"textures": {
4+
"particle": "gm4:block/block_compressor_side",
5+
"side": "gm4:block/block_compressor_side",
6+
"bottom": "gm4:block/master_crafter_bottom",
7+
"top": "gm4:block/compressor_top",
8+
"small_side": "gm4:block/input_side",
9+
"small_top": "gm4:block/input_top"
10+
}
11+
}

‎gm4_resources/assets/gm4/models/block/cube_w_input.json‎

Lines changed: 131 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,142 @@
11
{
2+
"parent": "gm4:block/cube",
23
"elements": [
34
{
4-
"from": [0, 0, 0],
5-
"to": [16, 16, 16],
5+
"from": [
6+
0,
7+
0,
8+
0
9+
],
10+
"to": [
11+
16,
12+
16,
13+
16
14+
],
615
"faces": {
7-
"north": {"uv": [0, 0, 16, 16], "texture": "#side"},
8-
"east": {"uv": [0, 0, 16, 16], "texture": "#side"},
9-
"south": {"uv": [0, 0, 16, 16], "texture": "#side"},
10-
"west": {"uv": [0, 0, 16, 16], "texture": "#side"},
11-
"up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#top"},
12-
"down": {"uv": [0, 0, 16, 16], "texture": "#bottom"}
16+
"north": {
17+
"uv": [
18+
0,
19+
0,
20+
16,
21+
16
22+
],
23+
"texture": "#side"
24+
},
25+
"east": {
26+
"uv": [
27+
0,
28+
0,
29+
16,
30+
16
31+
],
32+
"texture": "#side"
33+
},
34+
"south": {
35+
"uv": [
36+
0,
37+
0,
38+
16,
39+
16
40+
],
41+
"texture": "#side"
42+
},
43+
"west": {
44+
"uv": [
45+
0,
46+
0,
47+
16,
48+
16
49+
],
50+
"texture": "#side"
51+
},
52+
"up": {
53+
"uv": [
54+
0,
55+
0,
56+
16,
57+
16
58+
],
59+
"rotation": 180,
60+
"texture": "#top"
61+
},
62+
"down": {
63+
"uv": [
64+
0,
65+
0,
66+
16,
67+
16
68+
],
69+
"texture": "#bottom"
70+
}
1371
}
1472
},
1573
{
16-
"from": [4, 16, 4],
17-
"to": [12, 21, 12],
18-
"rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 19]},
74+
"from": [
75+
4,
76+
16,
77+
4
78+
],
79+
"to": [
80+
12,
81+
21,
82+
12
83+
],
84+
"rotation": {
85+
"angle": 0,
86+
"axis": "x",
87+
"origin": [
88+
8,
89+
8,
90+
19
91+
]
92+
},
1993
"faces": {
20-
"north": {"uv": [0, 0, 16, 10], "texture": "#small_side"},
21-
"east": {"uv": [0, 0, 16, 10], "texture": "#small_side"},
22-
"south": {"uv": [0, 0, 16, 10], "texture": "#small_side"},
23-
"west": {"uv": [0, 0, 16, 10], "texture": "#small_side"},
24-
"up": {"uv": [0, 0, 16, 16], "texture": "#small_top"}
94+
"north": {
95+
"uv": [
96+
0,
97+
0,
98+
16,
99+
10
100+
],
101+
"texture": "#small_side"
102+
},
103+
"east": {
104+
"uv": [
105+
0,
106+
0,
107+
16,
108+
10
109+
],
110+
"texture": "#small_side"
111+
},
112+
"south": {
113+
"uv": [
114+
0,
115+
0,
116+
16,
117+
10
118+
],
119+
"texture": "#small_side"
120+
},
121+
"west": {
122+
"uv": [
123+
0,
124+
0,
125+
16,
126+
10
127+
],
128+
"texture": "#small_side"
129+
},
130+
"up": {
131+
"uv": [
132+
0,
133+
0,
134+
16,
135+
16
136+
],
137+
"texture": "#small_top"
138+
}
25139
}
26140
}
27141
]
28-
}
142+
}

0 commit comments

Comments
 (0)