Skip to content

Commit 04143dd

Browse files
bangettobangetto
committed
fix some 1.21.4 stuff
1 parent 0f56880 commit 04143dd

File tree

11 files changed

+358
-2
lines changed

11 files changed

+358
-2
lines changed

‎assets/minecraft/models/block/cross.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"ambientocclusion": false,
3+
"textures": {
4+
"particle": "#cross"
5+
},
6+
"elements": [
7+
{ "from": [ 0.8, 0, 8 ],
8+
"to": [ 15.2, 16, 8 ],
9+
"rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
10+
"shade": false,
11+
"faces": {
12+
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" },
13+
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }
14+
}
15+
},
16+
{ "from": [ 8, 0, 0.8 ],
17+
"to": [ 8, 16, 15.2 ],
18+
"rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
19+
"shade": false,
20+
"faces": {
21+
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" },
22+
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }
23+
}
24+
}
25+
]
26+
}

‎assets/minecraft/models/block/cross_emissive.json‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{
2+
"ambientocclusion": false,
3+
"textures": {
4+
"particle": "#cross"
5+
},
6+
"elements": [
7+
{ "from": [ 0.8, 0, 8 ],
8+
"to": [ 15.2, 16, 8 ],
9+
"rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
10+
"shade": false,
11+
"faces": {
12+
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" },
13+
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }
14+
}
15+
},
16+
{ "from": [ 8, 0, 0.8 ],
17+
"to": [ 8, 16, 15.2 ],
18+
"rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
19+
"shade": false,
20+
"faces": {
21+
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" },
22+
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }
23+
}
24+
},
25+
{ "from": [ 0.8, 0, 8 ],
26+
"to": [ 15.2, 16, 8 ],
27+
"rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
28+
"shade": false,
29+
"light_emission": 15,
30+
"faces": {
31+
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross_emissive" },
32+
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross_emissive" }
33+
}
34+
},
35+
{ "from": [ 8, 0, 0.8 ],
36+
"to": [ 8, 16, 15.2 ],
37+
"rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
38+
"shade": false,
39+
"light_emission": 15,
40+
"faces": {
41+
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross_emissive" },
42+
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross_emissive" }
43+
}
44+
}
45+
]
46+
}

‎assets/minecraft/models/block/flower_pot_cross.json‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
{
2+
"ambientocclusion": false,
3+
"textures": {
4+
"particle": "block/flower_pot",
5+
"flowerpot": "block/flower_pot",
6+
"dirt": "block/dirt"
7+
},
8+
"elements": [
9+
{ "from": [ 5, 0, 5 ],
10+
"to": [ 6, 6, 11 ],
11+
"faces": {
12+
"down": { "uv": [ 5, 5, 6, 11 ], "texture": "#flowerpot", "cullface": "down" },
13+
"up": { "uv": [ 5, 5, 6, 11 ], "texture": "#flowerpot" },
14+
"north": { "uv": [ 10, 10, 11, 16 ], "texture": "#flowerpot" },
15+
"south": { "uv": [ 5, 10, 6, 16 ], "texture": "#flowerpot" },
16+
"west": { "uv": [ 5, 10, 11, 16 ], "texture": "#flowerpot" },
17+
"east": { "uv": [ 5, 10, 11, 16 ], "texture": "#flowerpot" }
18+
}
19+
},
20+
{ "from": [ 10, 0, 5 ],
21+
"to": [ 11, 6, 11 ],
22+
"faces": {
23+
"down": { "uv": [ 10, 5, 11, 11 ], "texture": "#flowerpot", "cullface": "down" },
24+
"up": { "uv": [ 10, 5, 11, 11 ], "texture": "#flowerpot" },
25+
"north": { "uv": [ 5, 10, 6, 16 ], "texture": "#flowerpot" },
26+
"south": { "uv": [ 10, 10, 11, 16 ], "texture": "#flowerpot" },
27+
"west": { "uv": [ 5, 10, 11, 16 ], "texture": "#flowerpot" },
28+
"east": { "uv": [ 5, 10, 11, 16 ], "texture": "#flowerpot" }
29+
}
30+
},
31+
{ "from": [ 6, 0, 5 ],
32+
"to": [ 10, 6, 6 ],
33+
"faces": {
34+
"down": { "uv": [ 6, 10, 10, 11 ], "texture": "#flowerpot", "cullface": "down" },
35+
"up": { "uv": [ 6, 5, 10, 6 ], "texture": "#flowerpot" },
36+
"north": { "uv": [ 6, 10, 10, 16 ], "texture": "#flowerpot" },
37+
"south": { "uv": [ 6, 10, 10, 16 ], "texture": "#flowerpot" }
38+
}
39+
},
40+
{ "from": [ 6, 0, 10 ],
41+
"to": [ 10, 6, 11 ],
42+
"faces": {
43+
"down": { "uv": [ 6, 5, 10, 6 ], "texture": "#flowerpot", "cullface": "down" },
44+
"up": { "uv": [ 6, 10, 10, 11 ], "texture": "#flowerpot" },
45+
"north": { "uv": [ 6, 10, 10, 16 ], "texture": "#flowerpot" },
46+
"south": { "uv": [ 6, 10, 10, 16 ], "texture": "#flowerpot" }
47+
}
48+
},
49+
{ "from": [ 6, 0, 6 ],
50+
"to": [ 10, 4, 10 ],
51+
"faces": {
52+
"down": { "uv": [ 6, 12, 10, 16 ], "texture": "#flowerpot", "cullface": "down" },
53+
"up": { "uv": [ 6, 6, 10, 10 ], "texture": "#dirt" }
54+
}
55+
},
56+
{ "from": [ 2.6, 4, 8 ],
57+
"to": [ 13.4, 16, 8 ],
58+
"rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
59+
"shade": false,
60+
"faces": {
61+
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#plant" },
62+
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#plant" }
63+
}
64+
},
65+
{ "from": [ 8, 4, 2.6 ],
66+
"to": [ 8, 16, 13.4 ],
67+
"rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
68+
"shade": false,
69+
"faces": {
70+
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#plant" },
71+
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#plant" }
72+
}
73+
}
74+
]
75+
}

‎assets/minecraft/models/block/flower_pot_cross_emissive.json‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
{
2+
"ambientocclusion": false,
3+
"textures": {
4+
"particle": "block/flower_pot",
5+
"flowerpot": "block/flower_pot",
6+
"dirt": "block/dirt"
7+
},
8+
"elements": [
9+
{ "from": [ 5, 0, 5 ],
10+
"to": [ 6, 6, 11 ],
11+
"faces": {
12+
"down": { "uv": [ 5, 5, 6, 11 ], "texture": "#flowerpot", "cullface": "down" },
13+
"up": { "uv": [ 5, 5, 6, 11 ], "texture": "#flowerpot" },
14+
"north": { "uv": [ 10, 10, 11, 16 ], "texture": "#flowerpot" },
15+
"south": { "uv": [ 5, 10, 6, 16 ], "texture": "#flowerpot" },
16+
"west": { "uv": [ 5, 10, 11, 16 ], "texture": "#flowerpot" },
17+
"east": { "uv": [ 5, 10, 11, 16 ], "texture": "#flowerpot" }
18+
}
19+
},
20+
{ "from": [ 10, 0, 5 ],
21+
"to": [ 11, 6, 11 ],
22+
"faces": {
23+
"down": { "uv": [ 10, 5, 11, 11 ], "texture": "#flowerpot", "cullface": "down" },
24+
"up": { "uv": [ 10, 5, 11, 11 ], "texture": "#flowerpot" },
25+
"north": { "uv": [ 5, 10, 6, 16 ], "texture": "#flowerpot" },
26+
"south": { "uv": [ 10, 10, 11, 16 ], "texture": "#flowerpot" },
27+
"west": { "uv": [ 5, 10, 11, 16 ], "texture": "#flowerpot" },
28+
"east": { "uv": [ 5, 10, 11, 16 ], "texture": "#flowerpot" }
29+
}
30+
},
31+
{ "from": [ 6, 0, 5 ],
32+
"to": [ 10, 6, 6 ],
33+
"faces": {
34+
"down": { "uv": [ 6, 10, 10, 11 ], "texture": "#flowerpot", "cullface": "down" },
35+
"up": { "uv": [ 6, 5, 10, 6 ], "texture": "#flowerpot" },
36+
"north": { "uv": [ 6, 10, 10, 16 ], "texture": "#flowerpot" },
37+
"south": { "uv": [ 6, 10, 10, 16 ], "texture": "#flowerpot" }
38+
}
39+
},
40+
{ "from": [ 6, 0, 10 ],
41+
"to": [ 10, 6, 11 ],
42+
"faces": {
43+
"down": { "uv": [ 6, 5, 10, 6 ], "texture": "#flowerpot", "cullface": "down" },
44+
"up": { "uv": [ 6, 10, 10, 11 ], "texture": "#flowerpot" },
45+
"north": { "uv": [ 6, 10, 10, 16 ], "texture": "#flowerpot" },
46+
"south": { "uv": [ 6, 10, 10, 16 ], "texture": "#flowerpot" }
47+
}
48+
},
49+
{ "from": [ 6, 0, 6 ],
50+
"to": [ 10, 4, 10 ],
51+
"faces": {
52+
"down": { "uv": [ 6, 12, 10, 16 ], "texture": "#flowerpot", "cullface": "down" },
53+
"up": { "uv": [ 6, 6, 10, 10 ], "texture": "#dirt" }
54+
}
55+
},
56+
{ "from": [ 2.6, 4, 8 ],
57+
"to": [ 13.4, 16, 8 ],
58+
"rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
59+
"shade": false,
60+
"faces": {
61+
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#plant" },
62+
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#plant" }
63+
}
64+
},
65+
{ "from": [ 8, 4, 2.6 ],
66+
"to": [ 8, 16, 13.4 ],
67+
"rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
68+
"shade": false,
69+
"faces": {
70+
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#plant" },
71+
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#plant" }
72+
}
73+
},
74+
{ "from": [ 2.6, 4, 8 ],
75+
"to": [ 13.4, 16, 8 ],
76+
"light_emission": 15,
77+
"rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
78+
"shade": false,
79+
"faces": {
80+
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross_emissive" },
81+
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross_emissive" }
82+
}
83+
},
84+
{ "from": [ 8, 4, 2.6 ],
85+
"to": [ 8, 16, 13.4 ],
86+
"light_emission": 15,
87+
"rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
88+
"shade": false,
89+
"faces": {
90+
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross_emissive" },
91+
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross_emissive" }
92+
}
93+
}
94+
]
95+
}

‎assets/minecraft/models/block/tinted_cross.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"ambientocclusion": false,
3+
"textures": {
4+
"particle": "#cross"
5+
},
6+
"elements": [
7+
{ "from": [ 0.8, 0, 8 ],
8+
"to": [ 15.2, 16, 8 ],
9+
"rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
10+
"shade": false,
11+
"faces": {
12+
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross", "tintindex": 0 },
13+
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross", "tintindex": 0 }
14+
}
15+
},
16+
{ "from": [ 8, 0, 0.8 ],
17+
"to": [ 8, 16, 15.2 ],
18+
"rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
19+
"shade": false,
20+
"faces": {
21+
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross", "tintindex": 0 },
22+
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross", "tintindex": 0 }
23+
}
24+
}
25+
]
26+
}

‎assets/minecraft/models/block/tinted_flower_pot_cross.json‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
{
2+
"ambientocclusion": false,
3+
"textures": {
4+
"particle": "block/flower_pot",
5+
"flowerpot": "block/flower_pot",
6+
"dirt": "block/dirt"
7+
},
8+
"elements": [
9+
{ "from": [ 5, 0, 5 ],
10+
"to": [ 6, 6, 11 ],
11+
"faces": {
12+
"down": { "uv": [ 5, 5, 6, 11 ], "texture": "#flowerpot", "cullface": "down" },
13+
"up": { "uv": [ 5, 5, 6, 11 ], "texture": "#flowerpot" },
14+
"north": { "uv": [ 10, 10, 11, 16 ], "texture": "#flowerpot" },
15+
"south": { "uv": [ 5, 10, 6, 16 ], "texture": "#flowerpot" },
16+
"west": { "uv": [ 5, 10, 11, 16 ], "texture": "#flowerpot" },
17+
"east": { "uv": [ 5, 10, 11, 16 ], "texture": "#flowerpot" }
18+
}
19+
},
20+
{ "from": [ 10, 0, 5 ],
21+
"to": [ 11, 6, 11 ],
22+
"faces": {
23+
"down": { "uv": [ 10, 5, 11, 11 ], "texture": "#flowerpot", "cullface": "down" },
24+
"up": { "uv": [ 10, 5, 11, 11 ], "texture": "#flowerpot" },
25+
"north": { "uv": [ 5, 10, 6, 16 ], "texture": "#flowerpot" },
26+
"south": { "uv": [ 10, 10, 11, 16 ], "texture": "#flowerpot" },
27+
"west": { "uv": [ 5, 10, 11, 16 ], "texture": "#flowerpot" },
28+
"east": { "uv": [ 5, 10, 11, 16 ], "texture": "#flowerpot" }
29+
}
30+
},
31+
{ "from": [ 6, 0, 5 ],
32+
"to": [ 10, 6, 6 ],
33+
"faces": {
34+
"down": { "uv": [ 6, 10, 10, 11 ], "texture": "#flowerpot", "cullface": "down" },
35+
"up": { "uv": [ 6, 5, 10, 6 ], "texture": "#flowerpot" },
36+
"north": { "uv": [ 6, 10, 10, 16 ], "texture": "#flowerpot" },
37+
"south": { "uv": [ 6, 10, 10, 16 ], "texture": "#flowerpot" }
38+
}
39+
},
40+
{ "from": [ 6, 0, 10 ],
41+
"to": [ 10, 6, 11 ],
42+
"faces": {
43+
"down": { "uv": [ 6, 5, 10, 6 ], "texture": "#flowerpot", "cullface": "down" },
44+
"up": { "uv": [ 6, 10, 10, 11 ], "texture": "#flowerpot" },
45+
"north": { "uv": [ 6, 10, 10, 16 ], "texture": "#flowerpot" },
46+
"south": { "uv": [ 6, 10, 10, 16 ], "texture": "#flowerpot" }
47+
}
48+
},
49+
{ "from": [ 6, 0, 6 ],
50+
"to": [ 10, 4, 10 ],
51+
"faces": {
52+
"down": { "uv": [ 6, 12, 10, 16 ], "texture": "#flowerpot", "cullface": "down" },
53+
"up": { "uv": [ 6, 6, 10, 10 ], "texture": "#dirt" }
54+
}
55+
},
56+
{ "from": [ 2.6, 4, 8 ],
57+
"to": [ 13.4, 16, 8 ],
58+
"rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
59+
"shade": false,
60+
"faces": {
61+
"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#plant", "tintindex": 0 },
62+
"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#plant", "tintindex": 0 }
63+
}
64+
},
65+
{ "from": [ 8, 4, 2.6 ],
66+
"to": [ 8, 16, 13.4 ],
67+
"rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
68+
"shade": false,
69+
"faces": {
70+
"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#plant", "tintindex": 0 },
71+
"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#plant", "tintindex": 0 }
72+
}
73+
}
74+
]
75+
}

‎assets/minecraft/models/item/closed_eyeblossom.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "minecraft:block/closed_eyeblossom"
5+
}
6+
}

‎assets/minecraft/models/item/open_eyeblossom.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "minecraft:block/open_eyeblossom",
5+
"layer1": "minecraft:block/open_eyeblossom_emissive"
6+
}
7+
}

‎assets/minecraft/overrides/item/red_sandstone_wall.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"VB|Protocol1_21_4To1_21_2|id": 381
77
}
88
},
9-
"model": "block/resin_brick_wall"
9+
"model": "block/resin_brick_wall_inventory"
1010
}
1111
]
1212
}

‎assets/minecraft/overrides/item/torchflower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"VB|Protocol1_21_4To1_21_2|id": 226
77
}
88
},
9-
"model": "block/open_eyeblossom"
9+
"model": "item/open_eyeblossom"
1010
}
1111
]
1212
}

0 commit comments

Comments
 (0)