Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 1 addition & 40 deletions base/assets/minecraft/atlases/blocks.json
Original file line number Diff line number Diff line change
@@ -1,42 +1,3 @@
{
"sources": [
{
"type": "directory",
"source": "gui",
"prefix": "gui/"
},
{
"type": "directory",
"source": "entity",
"prefix": "entity/"
},
{
"type": "filter",
"pattern":{
"namespace": "^((?!gm4).)*$",
"path": "gui"
}
},
{
"type": "filter",
"pattern": {
"namespace": "gm4_*",
"path": "gui/container"
}
},
{
"type": "filter",
"pattern": {
"namespace": "minecraft",
"path": "entity/fishing_hook"
}
},
{
"type": "filter",
"pattern": {
"namespace": "gm4_guidebook",
"path": "gui/"
}
}
]
"sources": []
}
30 changes: 30 additions & 0 deletions base/assets/minecraft/atlases/items.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"sources": [
{
"type": "directory",
"source": "gui",
"prefix": "gui/"
},
{
"type": "filter",
"pattern":{
"namespace": "^((?!gm4).)*$",
"path": "gui"
}
},
{
"type": "filter",
"pattern": {
"namespace": "gm4_*",
"path": "gui/container"
}
},
{
"type": "filter",
"pattern": {
"namespace": "gm4_guidebook",
"path": "gui/"
}
}
]
}
30 changes: 30 additions & 0 deletions base/backport_72/assets/minecraft/atlases/blocks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"sources": [
{
"type": "directory",
"source": "gui",
"prefix": "gui/"
},
{
"type": "filter",
"pattern":{
"namespace": "^((?!gm4).)*$",
"path": "gui"
}
},
{
"type": "filter",
"pattern": {
"namespace": "gm4_*",
"path": "gui/container"
}
},
{
"type": "filter",
"pattern": {
"namespace": "gm4_guidebook",
"path": "gui/"
}
}
]
}
1 change: 1 addition & 0 deletions base/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ data_pack:
resource_pack:
load:
assets: assets
backport_72: backport_72

require:
- gm4.plugins.resource_pack
Expand Down
29 changes: 28 additions & 1 deletion gm4/plugins/backwards.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@
def beet_default(ctx: Context):
yield

# edited item model definition - replaced head with player_head
# edited item model definitions
# - replaced head with player_head
backport(ctx.assets, 63, playerhead_models_1_21_5)
# - added on_shelf
backport(ctx.assets, 64, on_shelf_models_1_21_9)

# renamed gamerules
backport(ctx.data, 92, rename_gamerules)
Expand Down Expand Up @@ -48,6 +51,30 @@ def recursive_replace(compound: dict[str,Any]):
recursive_replace(overlay.data)
return overlay

def on_shelf_models_1_21_9(id: str, resource: NamespaceFile):
if not isinstance(resource, ItemModel):
return None

def recursive_replace(compound: dict[str,Any]):
for key, val in compound.items():
# recurse down the tree
if key == "when":
if isinstance(compound[key], list) and "on_shelf" in val:
compound[key].remove("on_shelf")
elif isinstance(compound[key], str) and val == "on_shelf":
compound.pop(key)
continue
if isinstance(val, list):
for subval in val: # type: ignore
if isinstance(subval, dict):
recursive_replace(subval) # type: ignore
elif isinstance(val, dict):
recursive_replace(val) # type: ignore

overlay = resource.copy()
recursive_replace(overlay.data)
return overlay if overlay != resource else None


# Only gamerules that are actually used are replaced
GAMERULES_RENAMES = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"bottom": "minecraft:block/furnace_top",
"top": "gm4_block_compressors:block/block_compressor_top",
"front": "gm4_block_compressors:block/block_compressor_side",
"plate": "gm4_block_compressors:block/block_compressor_plate"
"plate": "gm4_block_compressors:block/block_compressor_plate",
"particle": "gm4_block_compressors:block/block_compressor_side"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"parent": "gm4:block/plate",
"textures": {
"top": "gm4_block_compressors:block/block_compressor_plate"
"top": "gm4_block_compressors:block/block_compressor_plate",
"particle": "gm4_block_compressors:block/block_compressor_plate"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"textures": {
"side": "gm4_ender_hoppers:block/ender_hopper_eye_side",
"top": "gm4_ender_hoppers:block/ender_hopper_eye_top",
"bottom": "gm4_ender_hoppers:block/ender_hopper_eye_bottom"
"bottom": "gm4_ender_hoppers:block/ender_hopper_eye_bottom",
"particle": "gm4_ender_hoppers:block/ender_hopper_eye_side"
},
"elements": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"textures": {
"side": "gm4_ender_hoppers:block/ender_hopper_eye_side",
"top": "gm4_ender_hoppers:block/ender_hopper_eye_top",
"bottom": "gm4_ender_hoppers:block/ender_hopper_eye_bottom"
"bottom": "gm4_ender_hoppers:block/ender_hopper_eye_bottom",
"particle": "gm4_ender_hoppers:block/ender_hopper_eye_side"
},
"elements": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"textures": {
"side": "gm4_ender_hoppers:block/ender_hopper_eye_side",
"top": "gm4_ender_hoppers:block/ender_hopper_eye_top",
"bottom": "gm4_ender_hoppers:block/ender_hopper_eye_bottom"
"bottom": "gm4_ender_hoppers:block/ender_hopper_eye_bottom",
"particle": "gm4_ender_hoppers:block/ender_hopper_eye_side"
},
"elements": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"textures": {
"top": "gm4_liquid_tanks:block/liquid_tank_top",
"bottom": "gm4_liquid_tanks:block/liquid_tank_top",
"side": "gm4_liquid_tanks:block/liquid_tank_side"
"side": "gm4_liquid_tanks:block/liquid_tank_side",
"particle": "gm4_liquid_tanks:block/liquid_tank_side"
},
"elements": [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"textures": {
"1": "gm4_monsters_unbound:item/spore/cherry"
"1": "gm4_monsters_unbound:item/spore/cherry",
"particle": "gm4_monsters_unbound:item/spore/cherry"
},
"elements": [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"textures": {
"1": "gm4_monsters_unbound:item/spore/default"
"1": "gm4_monsters_unbound:item/spore/default",
"particle": "gm4_monsters_unbound:item/spore/default"
},
"elements": [
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"textures": {
"1": "gm4_monsters_unbound:item/spore/flowering"
"1": "gm4_monsters_unbound:item/spore/flowering",
"particle": "gm4_monsters_unbound:item/spore/flowering"
},
"elements": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"parent": "gm4_relocators:item/relocator_base",
"textures": {
"outer": "gm4_relocators:item/relocator_outer",
"core": "gm4_relocators:item/relocator_core"
"core": "gm4_relocators:item/relocator_core",
"particle": "gm4_relocators:item/relocator_outer"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"parent": "gm4_relocators:item/relocator_base",
"textures": {
"outer": "gm4_relocators:item/relocator_outer",
"core": "gm4_relocators:item/relocator_core_full"
"core": "gm4_relocators:item/relocator_core_full",
"particle": "gm4_relocators:item/relocator_outer"
}
}
1 change: 1 addition & 0 deletions gm4_smelteries/ore_display.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ def create_models(self, config: ModelData, models_container: NamespaceProxy[Mode
"textures":{
"top": f"gm4_smelteries:block/ore_display/{reference}_top",
"side": f"gm4_smelteries:block/ore_display/{reference}_side",
"particle": f"gm4_smelteries:block/ore_display/{reference}_side",
}
})
return [m]
Expand Down
12 changes: 12 additions & 0 deletions resource_pack/beet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,18 @@ resource_pack:
min_format: 1
max_format: 63
directory: backport_63
- formats:
min_inclusive: 1
max_inclusive: 64
min_format: 1
max_format: 64
directory: backport_64
- formats:
min_inclusive: 1
max_inclusive: 72
min_format: 1
max_format: 72
directory: backport_72

pipeline:
- dev_warning
Expand Down
Loading