Skip to content

Commit a4f44f1

Browse files
committed
tweaks to finalize compatibility
brought back missing files tested against viaBackwards-5.9.0 snapshot in 1.21.4
1 parent 1674a9a commit a4f44f1

10 files changed

Lines changed: 256 additions & 4 deletions

File tree

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
name: ${{ steps.download-files.outputs.release_name }}
2828
files: '*.zip'
2929
loaders: minecraft
30-
game-versions: "[1.21.5,1.21.10]"
30+
game-versions: "[1.21.4,1.21.11]"
3131

3232
modrinth-id: v7n1ZsFg
3333
modrinth-token: ${{ secrets.MODRINTH_TOKEN }}

backport_to_1_21_5/assets/minecraft/items/skeleton_skull.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,13 @@
3030
}
3131
],
3232
"fallback": {
33-
"type": "minecraft:model",
34-
"model": "minecraft:item/skeleton_skull"
33+
"type": "minecraft:special",
34+
"base": "minecraft:item/template_skull",
35+
"model": {
36+
"type": "minecraft:head",
37+
"kind": "skeleton"
38+
}
3539
}
3640
}
3741
}
38-
}
42+
}
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"model": {
3+
"type": "minecraft:select",
4+
"property": "minecraft:custom_model_data",
5+
"index": 0,
6+
"cases": [
7+
{
8+
"when": "minecraft:acacia_shelf",
9+
"model": {
10+
"type": "minecraft:model",
11+
"model": "minecraft:block/acacia_shelf_inventory"
12+
}
13+
}
14+
],
15+
"fallback": {
16+
"type": "minecraft:select",
17+
"property": "minecraft:component",
18+
"component": "minecraft:custom_name",
19+
"cases": [
20+
{
21+
"when": {
22+
"text": "1.21.9 Acacia Shelf",
23+
"italic": false,
24+
"color": "white"
25+
},
26+
"model": {
27+
"type": "minecraft:model",
28+
"model": "minecraft:block/acacia_shelf_inventory"
29+
}
30+
}
31+
],
32+
"fallback": {
33+
"type": "minecraft:model",
34+
"model": "minecraft:block/acacia_planks"
35+
}
36+
}
37+
}
38+
}
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"model": {
3+
"type": "minecraft:select",
4+
"property": "minecraft:custom_model_data",
5+
"index": 0,
6+
"cases": [
7+
{
8+
"when": "minecraft:bamboo_shelf",
9+
"model": {
10+
"type": "minecraft:model",
11+
"model": "minecraft:block/bamboo_shelf_inventory"
12+
}
13+
}
14+
],
15+
"fallback": {
16+
"type": "minecraft:select",
17+
"property": "minecraft:component",
18+
"component": "minecraft:custom_name",
19+
"cases": [
20+
{
21+
"when": {
22+
"text": "1.21.9 Bamboo Shelf",
23+
"italic": false,
24+
"color": "white"
25+
},
26+
"model": {
27+
"type": "minecraft:model",
28+
"model": "minecraft:block/bamboo_shelf_inventory"
29+
}
30+
}
31+
],
32+
"fallback": {
33+
"type": "minecraft:model",
34+
"model": "minecraft:block/bamboo_planks"
35+
}
36+
}
37+
}
38+
}
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"model": {
3+
"type": "minecraft:select",
4+
"property": "minecraft:custom_model_data",
5+
"index": 0,
6+
"cases": [
7+
{
8+
"when": "minecraft:birch_shelf",
9+
"model": {
10+
"type": "minecraft:model",
11+
"model": "minecraft:block/birch_shelf_inventory"
12+
}
13+
}
14+
],
15+
"fallback": {
16+
"type": "minecraft:select",
17+
"property": "minecraft:component",
18+
"component": "minecraft:custom_name",
19+
"cases": [
20+
{
21+
"when": {
22+
"text": "1.21.9 Birch Shelf",
23+
"italic": false,
24+
"color": "white"
25+
},
26+
"model": {
27+
"type": "minecraft:model",
28+
"model": "minecraft:block/birch_shelf_inventory"
29+
}
30+
}
31+
],
32+
"fallback": {
33+
"type": "minecraft:model",
34+
"model": "minecraft:block/birch_planks"
35+
}
36+
}
37+
}
38+
}
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
"model": {
3+
"type": "minecraft:select",
4+
"property": "minecraft:custom_model_data",
5+
"index": 0,
6+
"cases": [
7+
{
8+
"when": "minecraft:cherry_shelf",
9+
"model": {
10+
"type": "minecraft:model",
11+
"model": "minecraft:block/cherry_shelf_inventory"
12+
}
13+
}
14+
],
15+
"fallback": {
16+
"type": "minecraft:select",
17+
"property": "minecraft:component",
18+
"component": "minecraft:custom_name",
19+
"cases": [
20+
{
21+
"when": {
22+
"text": "1.21.9 Cherry Shelf",
23+
"italic": false,
24+
"color": "white"
25+
},
26+
"model": {
27+
"type": "minecraft:model",
28+
"model": "minecraft:block/cherry_shelf_inventory"
29+
}
30+
}
31+
],
32+
"fallback": {
33+
"type": "minecraft:model",
34+
"model": "minecraft:block/cherry_planks"
35+
}
36+
}
37+
}
38+
}
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
{
2+
"model": {
3+
"type": "minecraft:select",
4+
"property": "minecraft:custom_model_data",
5+
"index": 0,
6+
"cases": [
7+
{
8+
"when": "minecraft:diamond_spear",
9+
"model": {
10+
"type": "minecraft:select",
11+
"cases": [
12+
{
13+
"model": {
14+
"type": "minecraft:model",
15+
"model": "minecraft:item/diamond_spear"
16+
},
17+
"when": [
18+
"gui",
19+
"ground",
20+
"fixed"
21+
]
22+
}
23+
],
24+
"fallback": {
25+
"type": "minecraft:model",
26+
"model": "minecraft:item/diamond_spear_in_hand"
27+
},
28+
"property": "minecraft:display_context"
29+
}
30+
}
31+
],
32+
"fallback": {
33+
"type": "minecraft:select",
34+
"property": "minecraft:component",
35+
"component": "minecraft:custom_name",
36+
"cases": [
37+
{
38+
"when": {
39+
"text": "1.21.11 Diamond Spear",
40+
"italic": false,
41+
"color": "white"
42+
},
43+
"model": {
44+
"type": "minecraft:select",
45+
"cases": [
46+
{
47+
"model": {
48+
"type": "minecraft:model",
49+
"model": "minecraft:item/diamond_spear"
50+
},
51+
"when": [
52+
"gui",
53+
"ground",
54+
"fixed"
55+
]
56+
}
57+
],
58+
"fallback": {
59+
"type": "minecraft:model",
60+
"model": "minecraft:item/diamond_spear_in_hand"
61+
},
62+
"property": "minecraft:display_context"
63+
}
64+
}
65+
],
66+
"fallback": {
67+
"type": "minecraft:model",
68+
"model": "minecraft:item/diamond_sword"
69+
}
70+
}
71+
}
72+
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"model": {
3+
"type": "minecraft:select",
4+
"property": "minecraft:component",
5+
"component": "minecraft:custom_name",
6+
"cases": [
7+
{
8+
"when": {
9+
"text": "1.21.7 Music Disc Lava Chicken",
10+
"italic": false,
11+
"color": "white"
12+
},
13+
"model": {
14+
"type": "minecraft:model",
15+
"model": "minecraft:item/music_disc_lava_chicken"
16+
}
17+
}
18+
],
19+
"fallback": {
20+
"type": "minecraft:model",
21+
"model": "minecraft:item/music_disc_pigstep"
22+
}
23+
}
24+
}
Binary file not shown.

backport_to_1_21_6/assets/minecraft/textures/color_palettes/copper_darker.png renamed to backport_to_1_21_6/assets/minecraft/textures/trims/color_palettes/copper_darker.png

File renamed without changes.

0 commit comments

Comments
 (0)