Skip to content

Commit 95a2a8a

Browse files
committed
changed excalibur to 1.21.4
1 parent 114e40d commit 95a2a8a

File tree

1,718 files changed

+18405
-10057
lines changed

Some content is hidden

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

1,718 files changed

+18405
-10057
lines changed

illyriarp/assets/minecraft/blockstates/acacia_leaves.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
"model": "minecraft:block/leaves/acacia_leaves"
55
}
66
}
7-
}
7+
}
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
2-
"variants": {
3-
"": [
4-
{ "model": "block/acacia_planks" , "weight": 1 },
5-
{ "model": "block/planks/acacia/acacia1" , "weight": 1 },
6-
{ "model": "block/planks/acacia/acacia2" , "weight": 10 }
7-
]
8-
}
2+
"variants": {
3+
"": [
4+
{ "model": "block/acacia_planks", "weight": 1 },
5+
{ "model": "block/planks/acacia/acacia1", "weight": 1 },
6+
{ "model": "block/planks/acacia/acacia2", "weight": 10 }
7+
]
8+
}
99
}
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"variants": {
3-
"type=bottom": { "model": "block/acacia_slab" },
4-
"type=top": { "model": "block/acacia_slab_top" },
5-
"type=double": { "model": "block/planks/acacia/doubleslab" }
6-
}
7-
}
2+
"variants": {
3+
"type=bottom": { "model": "block/acacia_slab" },
4+
"type=top": { "model": "block/acacia_slab_top" },
5+
"type=double": { "model": "block/planks/acacia/doubleslab" }
6+
}
7+
}
Lines changed: 61 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,64 @@
11
{
2-
"variants": {
3-
"facing=north,half=bottom,open=false": { "model": "block/acacia_trapdoor_bottom" },
4-
"facing=south,half=bottom,open=false": { "model": "block/acacia_trapdoor_bottom", "y": 180 },
5-
"facing=east,half=bottom,open=false": { "model": "block/acacia_trapdoor_bottom", "y": 90 },
6-
"facing=west,half=bottom,open=false": { "model": "block/acacia_trapdoor_bottom", "y": 270 },
7-
"facing=north,half=top,open=false": { "model": "block/acacia_trapdoor_top" },
8-
"facing=south,half=top,open=false": { "model": "block/acacia_trapdoor_top", "y": 180 },
9-
"facing=east,half=top,open=false": { "model": "block/acacia_trapdoor_top", "y": 90 },
10-
"facing=west,half=top,open=false": { "model": "block/acacia_trapdoor_top", "y": 270 },
11-
"facing=north,half=bottom,open=true": { "model": "block/acacia_trapdoor_open" },
12-
"facing=south,half=bottom,open=true": { "model": "block/acacia_trapdoor_open", "y": 180 },
13-
"facing=east,half=bottom,open=true": { "model": "block/acacia_trapdoor_open", "y": 90 },
14-
"facing=west,half=bottom,open=true": { "model": "block/acacia_trapdoor_open", "y": 270 },
15-
"facing=north,half=top,open=true": { "model": "block/acacia_trapdoor_open" },
16-
"facing=south,half=top,open=true": { "model": "block/acacia_trapdoor_open", "y": 180 },
17-
"facing=east,half=top,open=true": { "model": "block/acacia_trapdoor_open", "y": 90 },
18-
"facing=west,half=top,open=true": { "model": "block/acacia_trapdoor_open", "y": 270 }
2+
"variants": {
3+
"facing=north,half=bottom,open=false": {
4+
"model": "block/acacia_trapdoor_bottom"
5+
},
6+
"facing=south,half=bottom,open=false": {
7+
"model": "block/acacia_trapdoor_bottom",
8+
"y": 180
9+
},
10+
"facing=east,half=bottom,open=false": {
11+
"model": "block/acacia_trapdoor_bottom",
12+
"y": 90
13+
},
14+
"facing=west,half=bottom,open=false": {
15+
"model": "block/acacia_trapdoor_bottom",
16+
"y": 270
17+
},
18+
"facing=north,half=top,open=false": {
19+
"model": "block/acacia_trapdoor_top"
20+
},
21+
"facing=south,half=top,open=false": {
22+
"model": "block/acacia_trapdoor_top",
23+
"y": 180
24+
},
25+
"facing=east,half=top,open=false": {
26+
"model": "block/acacia_trapdoor_top",
27+
"y": 90
28+
},
29+
"facing=west,half=top,open=false": {
30+
"model": "block/acacia_trapdoor_top",
31+
"y": 270
32+
},
33+
"facing=north,half=bottom,open=true": {
34+
"model": "block/acacia_trapdoor_open"
35+
},
36+
"facing=south,half=bottom,open=true": {
37+
"model": "block/acacia_trapdoor_open",
38+
"y": 180
39+
},
40+
"facing=east,half=bottom,open=true": {
41+
"model": "block/acacia_trapdoor_open",
42+
"y": 90
43+
},
44+
"facing=west,half=bottom,open=true": {
45+
"model": "block/acacia_trapdoor_open",
46+
"y": 270
47+
},
48+
"facing=north,half=top,open=true": {
49+
"model": "block/acacia_trapdoor_open"
50+
},
51+
"facing=south,half=top,open=true": {
52+
"model": "block/acacia_trapdoor_open",
53+
"y": 180
54+
},
55+
"facing=east,half=top,open=true": {
56+
"model": "block/acacia_trapdoor_open",
57+
"y": 90
58+
},
59+
"facing=west,half=top,open=true": {
60+
"model": "block/acacia_trapdoor_open",
61+
"y": 270
1962
}
63+
}
2064
}
Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,38 @@
11
{
22
"multipart": [
3+
{
4+
"apply": [
5+
{ "model": "minecraft:block/foliage/flowers/allium", "weight": 100 },
6+
{ "model": "minecraft:block/foliage/flowers/allium1", "weight": 100 },
7+
{ "model": "minecraft:block/foliage/flowers/allium2", "weight": 100 }
8+
]
9+
},
310

4-
{"apply": [
5-
{"model": "minecraft:block/foliage/flowers/allium", "weight": 100},
6-
{"model": "minecraft:block/foliage/flowers/allium1", "weight": 100},
7-
{"model": "minecraft:block/foliage/flowers/allium2", "weight": 100}
8-
]
9-
},
11+
{
12+
"apply": [
13+
{
14+
"model": "minecraft:block/foliage/flowers/butterfly_white1",
15+
"y": 0,
16+
"weight": 1
17+
},
18+
{
19+
"model": "minecraft:block/foliage/flowers/butterfly_white1",
20+
"y": 90,
21+
"weight": 1
22+
},
23+
{
24+
"model": "minecraft:block/foliage/flowers/butterfly_white1",
25+
"y": 180,
26+
"weight": 1
27+
},
28+
{
29+
"model": "minecraft:block/foliage/flowers/butterfly_white1",
30+
"y": 270,
31+
"weight": 1
32+
},
1033

11-
{"apply": [
12-
{"model": "minecraft:block/foliage/flowers/butterfly_white1", "y": 0, "weight": 1},
13-
{"model": "minecraft:block/foliage/flowers/butterfly_white1", "y": 90, "weight": 1},
14-
{"model": "minecraft:block/foliage/flowers/butterfly_white1", "y": 180, "weight": 1},
15-
{"model": "minecraft:block/foliage/flowers/butterfly_white1", "y": 270, "weight": 1},
16-
17-
{"model": "minecraft:block/air","weight": 96}
18-
]
19-
}
20-
]
21-
}
34+
{ "model": "minecraft:block/air", "weight": 96 }
35+
]
36+
}
37+
]
38+
}

illyriarp/assets/minecraft/blockstates/azalea_leaves.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
"model": "minecraft:block/leaves/azalea_leaves"
55
}
66
}
7-
}
7+
}
Lines changed: 53 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,58 @@
11
{
22
"multipart": [
3+
{
4+
"apply": [
5+
{ "model": "minecraft:block/foliage/flowers/azure", "weight": 200 },
6+
{ "model": "minecraft:block/foliage/flowers/azure1", "weight": 400 }
7+
]
8+
},
39

4-
{"apply": [
5-
{"model": "minecraft:block/foliage/flowers/azure", "weight": 200},
6-
{"model": "minecraft:block/foliage/flowers/azure1", "weight": 400}
7-
]
8-
},
10+
{
11+
"apply": [
12+
{
13+
"model": "minecraft:block/foliage/flowers/butterfly_white",
14+
"y": 0,
15+
"weight": 1
16+
},
17+
{
18+
"model": "minecraft:block/foliage/flowers/butterfly_white",
19+
"y": 90,
20+
"weight": 1
21+
},
22+
{
23+
"model": "minecraft:block/foliage/flowers/butterfly_white",
24+
"y": 180,
25+
"weight": 1
26+
},
27+
{
28+
"model": "minecraft:block/foliage/flowers/butterfly_white",
29+
"y": 270,
30+
"weight": 1
31+
},
932

10-
{"apply": [
11-
{"model": "minecraft:block/foliage/flowers/butterfly_white", "y": 0, "weight": 1},
12-
{"model": "minecraft:block/foliage/flowers/butterfly_white", "y": 90, "weight": 1},
13-
{"model": "minecraft:block/foliage/flowers/butterfly_white", "y": 180, "weight": 1},
14-
{"model": "minecraft:block/foliage/flowers/butterfly_white", "y": 270, "weight": 1},
33+
{
34+
"model": "minecraft:block/foliage/flowers/butterfly_white1",
35+
"y": 0,
36+
"weight": 1
37+
},
38+
{
39+
"model": "minecraft:block/foliage/flowers/butterfly_white1",
40+
"y": 90,
41+
"weight": 1
42+
},
43+
{
44+
"model": "minecraft:block/foliage/flowers/butterfly_white1",
45+
"y": 180,
46+
"weight": 1
47+
},
48+
{
49+
"model": "minecraft:block/foliage/flowers/butterfly_white1",
50+
"y": 270,
51+
"weight": 1
52+
},
1553

16-
{"model": "minecraft:block/foliage/flowers/butterfly_white1", "y": 0, "weight": 1},
17-
{"model": "minecraft:block/foliage/flowers/butterfly_white1", "y": 90, "weight": 1},
18-
{"model": "minecraft:block/foliage/flowers/butterfly_white1", "y": 180, "weight": 1},
19-
{"model": "minecraft:block/foliage/flowers/butterfly_white1", "y": 270, "weight": 1},
20-
21-
{"model": "minecraft:block/air","weight": 192}
22-
]
23-
}
24-
]
25-
}
54+
{ "model": "minecraft:block/air", "weight": 192 }
55+
]
56+
}
57+
]
58+
}
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"variants": {
3-
"type=bottom": { "model": "block/bamboo_mosaic_slab" },
4-
"type=top": { "model": "block/bamboo_mosaic_slab_top" },
5-
"type=double": { "model": "block/wood/bamboo/mosaic_doubleslab" }
6-
}
7-
}
2+
"variants": {
3+
"type=bottom": { "model": "block/bamboo_mosaic_slab" },
4+
"type=top": { "model": "block/bamboo_mosaic_slab_top" },
5+
"type=double": { "model": "block/wood/bamboo/mosaic_doubleslab" }
6+
}
7+
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"variants": {
3-
"": { "model": "block/bedrock" }
4-
}
2+
"variants": {
3+
"": { "model": "block/bedrock" }
4+
}
55
}

illyriarp/assets/minecraft/blockstates/birch_leaves.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
"model": "minecraft:block/leaves/birch_leaves"
55
}
66
}
7-
}
7+
}

0 commit comments

Comments
 (0)