Skip to content

Commit 1ad802a

Browse files
authored
Assorted Resource Pack Fixes (#1248)
* RP add backwards compat for on_shelf * Add particle textures * Move blocks atlas to items and remove entity import * adjust my backwards plugin changes to be neater
1 parent b0c6eb0 commit 1ad802a

File tree

18 files changed

+125
-52
lines changed

18 files changed

+125
-52
lines changed
Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,3 @@
11
{
2-
"sources": [
3-
{
4-
"type": "directory",
5-
"source": "gui",
6-
"prefix": "gui/"
7-
},
8-
{
9-
"type": "directory",
10-
"source": "entity",
11-
"prefix": "entity/"
12-
},
13-
{
14-
"type": "filter",
15-
"pattern":{
16-
"namespace": "^((?!gm4).)*$",
17-
"path": "gui"
18-
}
19-
},
20-
{
21-
"type": "filter",
22-
"pattern": {
23-
"namespace": "gm4_*",
24-
"path": "gui/container"
25-
}
26-
},
27-
{
28-
"type": "filter",
29-
"pattern": {
30-
"namespace": "minecraft",
31-
"path": "entity/fishing_hook"
32-
}
33-
},
34-
{
35-
"type": "filter",
36-
"pattern": {
37-
"namespace": "gm4_guidebook",
38-
"path": "gui/"
39-
}
40-
}
41-
]
2+
"sources": []
423
}
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"sources": [
3+
{
4+
"type": "directory",
5+
"source": "gui",
6+
"prefix": "gui/"
7+
},
8+
{
9+
"type": "filter",
10+
"pattern":{
11+
"namespace": "^((?!gm4).)*$",
12+
"path": "gui"
13+
}
14+
},
15+
{
16+
"type": "filter",
17+
"pattern": {
18+
"namespace": "gm4_*",
19+
"path": "gui/container"
20+
}
21+
},
22+
{
23+
"type": "filter",
24+
"pattern": {
25+
"namespace": "gm4_guidebook",
26+
"path": "gui/"
27+
}
28+
}
29+
]
30+
}
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"sources": [
3+
{
4+
"type": "directory",
5+
"source": "gui",
6+
"prefix": "gui/"
7+
},
8+
{
9+
"type": "filter",
10+
"pattern":{
11+
"namespace": "^((?!gm4).)*$",
12+
"path": "gui"
13+
}
14+
},
15+
{
16+
"type": "filter",
17+
"pattern": {
18+
"namespace": "gm4_*",
19+
"path": "gui/container"
20+
}
21+
},
22+
{
23+
"type": "filter",
24+
"pattern": {
25+
"namespace": "gm4_guidebook",
26+
"path": "gui/"
27+
}
28+
}
29+
]
30+
}

base/beet.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ data_pack:
88
resource_pack:
99
load:
1010
assets: assets
11+
backport_72: backport_72
1112

1213
require:
1314
- gm4.plugins.resource_pack

gm4/plugins/backwards.py

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@
99
def beet_default(ctx: Context):
1010
yield
1111

12-
# edited item model definition - replaced head with player_head
12+
# edited item model definitions
13+
# - replaced head with player_head
1314
backport(ctx.assets, 63, playerhead_models_1_21_5)
15+
# - added on_shelf
16+
backport(ctx.assets, 64, on_shelf_models_1_21_9)
1417

1518
# renamed gamerules
1619
backport(ctx.data, 92, rename_gamerules)
@@ -48,6 +51,30 @@ def recursive_replace(compound: dict[str,Any]):
4851
recursive_replace(overlay.data)
4952
return overlay
5053

54+
def on_shelf_models_1_21_9(id: str, resource: NamespaceFile):
55+
if not isinstance(resource, ItemModel):
56+
return None
57+
58+
def recursive_replace(compound: dict[str,Any]):
59+
for key, val in compound.items():
60+
# recurse down the tree
61+
if key == "when":
62+
if isinstance(compound[key], list) and "on_shelf" in val:
63+
compound[key].remove("on_shelf")
64+
elif isinstance(compound[key], str) and val == "on_shelf":
65+
compound.pop(key)
66+
continue
67+
if isinstance(val, list):
68+
for subval in val: # type: ignore
69+
if isinstance(subval, dict):
70+
recursive_replace(subval) # type: ignore
71+
elif isinstance(val, dict):
72+
recursive_replace(val) # type: ignore
73+
74+
overlay = resource.copy()
75+
recursive_replace(overlay.data)
76+
return overlay if overlay != resource else None
77+
5178

5279
# Only gamerules that are actually used are replaced
5380
GAMERULES_RENAMES = {

gm4_block_compressors/assets/gm4_block_compressors/models/block/block_compressor_full.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"bottom": "minecraft:block/furnace_top",
66
"top": "gm4_block_compressors:block/block_compressor_top",
77
"front": "gm4_block_compressors:block/block_compressor_side",
8-
"plate": "gm4_block_compressors:block/block_compressor_plate"
8+
"plate": "gm4_block_compressors:block/block_compressor_plate",
9+
"particle": "gm4_block_compressors:block/block_compressor_side"
910
}
1011
}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"parent": "gm4:block/plate",
33
"textures": {
4-
"top": "gm4_block_compressors:block/block_compressor_plate"
4+
"top": "gm4_block_compressors:block/block_compressor_plate",
5+
"particle": "gm4_block_compressors:block/block_compressor_plate"
56
}
67
}

gm4_ender_hoppers/assets/gm4_ender_hoppers/models/block/ender_hopper.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"textures": {
33
"side": "gm4_ender_hoppers:block/ender_hopper_eye_side",
44
"top": "gm4_ender_hoppers:block/ender_hopper_eye_top",
5-
"bottom": "gm4_ender_hoppers:block/ender_hopper_eye_bottom"
5+
"bottom": "gm4_ender_hoppers:block/ender_hopper_eye_bottom",
6+
"particle": "gm4_ender_hoppers:block/ender_hopper_eye_side"
67
},
78
"elements": [
89
{

gm4_ender_hoppers/assets/gm4_ender_hoppers/models/block/ender_hopper_minecart.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"textures": {
33
"side": "gm4_ender_hoppers:block/ender_hopper_eye_side",
44
"top": "gm4_ender_hoppers:block/ender_hopper_eye_top",
5-
"bottom": "gm4_ender_hoppers:block/ender_hopper_eye_bottom"
5+
"bottom": "gm4_ender_hoppers:block/ender_hopper_eye_bottom",
6+
"particle": "gm4_ender_hoppers:block/ender_hopper_eye_side"
67
},
78
"elements": [
89
{

gm4_ender_hoppers/assets/gm4_ender_hoppers/models/block/ender_hopper_side.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"textures": {
33
"side": "gm4_ender_hoppers:block/ender_hopper_eye_side",
44
"top": "gm4_ender_hoppers:block/ender_hopper_eye_top",
5-
"bottom": "gm4_ender_hoppers:block/ender_hopper_eye_bottom"
5+
"bottom": "gm4_ender_hoppers:block/ender_hopper_eye_bottom",
6+
"particle": "gm4_ender_hoppers:block/ender_hopper_eye_side"
67
},
78
"elements": [
89
{

0 commit comments

Comments
 (0)