Update to 1.21.5

.github/workflows/main.yml

@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  VERSION: '1.21'
+  VERSION: '1.21.5'
   COMMIT_MSG: ${{ github.event.head_commit.message }}
 
 jobs:
@@ -89,18 +89,10 @@ jobs:
           # https://fabricmc.net/use/server/
           # https://modrinth.com/mod/fabric-api/versions
           # https://modrinth.com/mod/packtest/versions
-          - version: '1.21.1'
-            fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.1/0.16.5/1.0.1/server/jar
-            fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/WTaAx4ah/fabric-api-0.105.0%2B1.21.1.jar
-            packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/x9txtivi/packtest-1.8-mc1.21.1.jar
-          - version: '1.21.3'
-            fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.3/0.16.7/1.0.1/server/jar
-            fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/dhD4I4lJ/fabric-api-0.106.1%2B1.21.3.jar
-            packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/wjOUK14F/packtest-1.9-mc1.21.2.jar
-          - version: '1.21.4'
-            fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.4-rc1/0.16.9/1.0.1/server/jar
-            fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/X7o8njVT/fabric-api-0.110.2%2B1.21.4.jar
-            packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/owHaqexZ/packtest-1.10-beta1-mc1.21.4.jar
+          - version: '1.21.5'
+            fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/1.21.5/0.16.13/1.0.3/server/jar
+            fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/FZ4q3wQK/fabric-api-0.119.9%2B1.21.5.jar
+            packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/Swh7th09/packtest-2.1-mc1.21.5.jar
     name: 'test-${{ matrix.version }}'
     runs-on: ubuntu-24.04
     steps:

base/beet.yaml

@@ -1,4 +1,4 @@
-version: 1.7.0
+version: 1.8.0
 id: gm4
 
 data_pack:

base/data/gm4/function/conflict_logs/traverse.mcfunction

@@ -1,5 +1,5 @@
 execute store success score #not_match gm4_data run data modify storage gm4:log traverse_versions[0].id set from storage gm4:log log.require_id
-execute if data storage gm4:log traverse_versions[0].from run data modify storage gm4:log temp set value '[{"text":" (packaged in ","color":"red"},{"nbt":"traverse_versions[0].from","storage":"gm4:log","color":"red"},{"text":")","color":"red"}]'
+execute if data storage gm4:log traverse_versions[0].from run data modify storage gm4:log temp set value [{"text":" (packaged in ","color":"red"},{"nbt":"traverse_versions[0].from","storage":"gm4:log","color":"red"},{"text":")","color":"red"}]
 
 execute if score #not_match gm4_data matches 0 run tellraw @a[tag=gm4_show_log] [{"nbt":"log.module","storage":"gm4:log","color":"red"},{"text":" is disabled. It requires ","color":"red"},{"nbt":"log.require","storage":"gm4:log","color":"red"},{"text":" v","color":"red"},{"nbt":"log.require_ver","storage":"gm4:log"},{"text":" but ","color":"red"},{"nbt":"traverse_versions[0].module","storage":"gm4:log"},{"text":" v"},{"nbt":"traverse_versions[0].version","storage":"gm4:log","color":"red"},{"text":" is installed instead","color":"red"},{"nbt":"temp","storage":"gm4:log","interpret":true}]
 

base/data/gm4/function/load.mcfunction

@@ -1,5 +1,5 @@
 data merge storage gm4:log {queue:[],versions:[]}
-data modify storage gm4:log queue append value {type:"text",message:'{"text":"[GM4]: Checking for updates...","color":"#4AA0C7"}'}
+data modify storage gm4:log queue append value {type:"text",message:{"text":"[GM4]: Checking for updates...","color":"#4AA0C7"}}
 
 scoreboard objectives add gm4_modules dummy
 scoreboard objectives add gm4_data dummy
@@ -15,6 +15,6 @@ execute unless score $cooldown gm4_creative matches 0.. run scoreboard players s
 # Setting this to 0 will always show logs to all players
 execute unless score $global_cooldown gm4_creative matches 0.. run scoreboard players set $global_cooldown gm4_creative 10
 
-execute unless score gm4 gm4_modules matches 1.. run data modify storage gm4:log queue append value {type:"text",message:'{"text":"[GM4]: Welcome to Gamemode 4. Initialising...","color":"green"}'}
+execute unless score gm4 gm4_modules matches 1.. run data modify storage gm4:log queue append value {type:"text",message:{"text":"[GM4]: Welcome to Gamemode 4. Initialising...","color":"green"}}
 execute unless score gm4 gm4_modules matches 1.. run schedule function gm4:intro_song/init 2s
 execute unless score gm4 gm4_modules matches 1.. run scoreboard players set gm4 gm4_modules 1

base/data/gm4/function/outdated_logs/outdated_start.mcfunction

@@ -1,4 +1,4 @@
-tellraw @a[tag=gm4_show_log] [{"text":"The following modules are outdated! Click here to download the latest versions.","color":"gold","clickEvent":{"action":"open_url","value":"https://www.gm4.co/modules"},"hoverEvent":{"action":"show_text","value":{"text":"Click to visit gm4.co/modules","color":"#4AA0C7"}}}]
+tellraw @a[tag=gm4_show_log] [{"text":"The following modules are outdated! Click here to download the latest versions.","color":"gold","click_event":{"action":"open_url","url":"https://www.gm4.co/modules"},"hover_event":{"action":"show_text","value":{"text":"Click to visit gm4.co/modules","color":"#4AA0C7"}}}]
 
 data modify storage gm4:log outdated_list set from storage gm4:log queue
 data remove storage gm4:log outdated_list[{type:"text"}]

base/data/gm4/function/post_load.mcfunction

@@ -1,4 +1,4 @@
-execute unless data storage gm4:log queue[{type:"install"}] run data modify storage gm4:log queue append value {type:"text",message:'{"text":"[GM4]: No updates found.","color":"#4AA0C7"}'}
-execute if data storage gm4:log queue[{type:"install"}] run data modify storage gm4:log queue append value {type:"text",message:'{"text":"[GM4]: Updates completed.","color":"#4AA0C7"}'}
+execute unless data storage gm4:log queue[{type:"install"}] run data modify storage gm4:log queue append value {type:"text",message:{"text":"[GM4]: No updates found.","color":"#4AA0C7"}}
+execute if data storage gm4:log queue[{type:"install"}] run data modify storage gm4:log queue append value {type:"text",message:{"text":"[GM4]: Updates completed.","color":"#4AA0C7"}}
 
 function gm4:log_wait

base/data/gm4/tags/block/foliage.json

@@ -11,33 +11,40 @@
     "minecraft:big_dripleaf",
     "minecraft:big_dripleaf_stem",
     "minecraft:brown_mushroom",
+    "minecraft:bush",
+    "minecraft:cactus_flower",
     "minecraft:cave_vines",
     "minecraft:cave_vines_plant",
     "minecraft:crimson_fungus",
     "minecraft:crimson_roots",
     "minecraft:dead_bush",
     "minecraft:fern",
+    "minecraft:firefly_bush",
     "minecraft:glow_lichen",
+    "minecraft:short_dry_grass",
     "minecraft:short_grass",
     "minecraft:hanging_roots",
     "minecraft:large_fern",
+    "minecraft:leaf_litter",
     "minecraft:mangrove_propagule",
     "minecraft:moss_carpet",
     "minecraft:nether_sprouts",
-    { "id": "minecraft:pale_hanging_moss", "required": false },
-    { "id": "minecraft:pale_moss_carpet", "required": false },
+    "minecraft:pale_hanging_moss",
+    "minecraft:pale_moss_carpet",
     "minecraft:pink_petals",
     "minecraft:red_mushroom",
     "minecraft:small_dripleaf",
     "minecraft:spore_blossom",
     "minecraft:sweet_berry_bush",
+    "minecraft:tall_dry_grass",
     "minecraft:tall_grass",
     "minecraft:twisting_vines",
     "minecraft:twisting_vines_plant",
     "minecraft:vine",
     "minecraft:warped_fungus",
     "minecraft:warped_roots",
     "minecraft:weeping_vines",
-    "minecraft:weeping_vines_plant"
+    "minecraft:weeping_vines_plant",
+    "minecraft:wildflowers"
   ]
 }

base/data/gm4/tags/block/full_collision.json

@@ -54,7 +54,7 @@
         "minecraft:chiseled_polished_blackstone",
         "minecraft:chiseled_quartz_block",
         "minecraft:chiseled_red_sandstone",
-        { "id": "minecraft:chiseled_resin_bricks", "required": false },
+        "minecraft:chiseled_resin_bricks",
         "minecraft:chiseled_sandstone",
         "minecraft:chiseled_stone_bricks",
         "minecraft:chiseled_tuff",
@@ -75,7 +75,7 @@
         "minecraft:cracked_stone_bricks",
         "minecraft:crafter",
         "minecraft:crafting_table",
-        { "id": "minecraft:creaking_heart", "required": false },
+        "minecraft:creaking_heart",
         "minecraft:crimson_nylium",
         "minecraft:crying_obsidian",
         "minecraft:cut_copper",
@@ -257,8 +257,8 @@
         "minecraft:redstone_ore",
         "minecraft:reinforced_deepslate",
         "minecraft:repeating_command_block",
-        { "id": "minecraft:resin_block", "required": false },
-        { "id": "minecraft:resin_bricks", "required": false },
+        "minecraft:resin_block",
+        "minecraft:resin_bricks",
         "minecraft:respawn_anchor",
         "minecraft:sand",
         "minecraft:sandstone",
@@ -285,6 +285,8 @@
         "minecraft:suspicious_sand",
         "minecraft:target",
         "minecraft:terracotta",
+        "minecraft:test_block",
+        "minecraft:test_instance_block",
         "minecraft:tinted_glass",
         "minecraft:tnt",
         "minecraft:trial_spawner",

base/data/gm4/tags/block/no_collision.json

@@ -1,7 +1,7 @@
 {
   "values": [
-    "#minecraft:air",
     "#gm4:water",
+    "#minecraft:air",
     "#minecraft:banners",
     "#minecraft:buttons",
     "#minecraft:ceiling_hanging_signs",
@@ -13,11 +13,6 @@
     "#minecraft:rails",
     "#minecraft:signs",
     "#minecraft:small_flowers",
-    "minecraft:sunflower",
-    "minecraft:lilac",
-    "minecraft:peony",
-    "minecraft:rose_bush",
-    "minecraft:pitcher_plant",
     "#minecraft:wall_corals",
     "minecraft:acacia_sapling",
     "minecraft:attached_melon_stem",
@@ -26,6 +21,8 @@
     "minecraft:big_dripleaf_stem",
     "minecraft:birch_sapling",
     "minecraft:brown_mushroom",
+    "minecraft:bush",
+    "minecraft:cactus_flower",
     "minecraft:cave_vines",
     "minecraft:cave_vines_plant",
     "minecraft:cherry_sapling",
@@ -50,28 +47,36 @@
     "minecraft:dead_tube_coral_wall_fan",
     "minecraft:dead_tube_coral",
     "minecraft:fern",
+    "minecraft:firefly_bush",
     "minecraft:frogspawn",
     "minecraft:glow_lichen",
+    "minecraft:short_dry_grass",
     "minecraft:short_grass",
+    "minecraft:sunflower",
     "minecraft:hanging_roots",
     "minecraft:jungle_sapling",
     "minecraft:ladder",
     "minecraft:large_fern",
     "minecraft:lava",
+    "minecraft:leaf_litter",
     "minecraft:lever",
     "minecraft:light",
+    "minecraft:lilac",
     "minecraft:mangrove_propagule",
     "minecraft:nether_sprouts",
     "minecraft:nether_wart",
     "minecraft:oak_sapling",
-    { "id": "minecraft:pale_hanging_moss", "required": false },
-    { "id": "minecraft:pale_oak_sapling", "required": false },
+    "minecraft:pale_hanging_moss",
+    "minecraft:pale_oak_sapling",
+    "minecraft:peony",
     "minecraft:pink_petals",
+    "minecraft:pitcher_plant",
     "minecraft:powder_snow",
     "minecraft:red_mushroom",
     "minecraft:redstone_torch",
     "minecraft:redstone_wall_torch",
     "minecraft:redstone_wire",
+    "minecraft:rose_bush",
     "minecraft:scaffolding",
     "minecraft:sculk_vein",
     "minecraft:small_dripleaf",
@@ -82,6 +87,7 @@
     "minecraft:structure_void",
     "minecraft:sugar_cane",
     "minecraft:sweet_berry_bush",
+    "minecraft:tall_dry_grass",
     "minecraft:tall_grass",
     "minecraft:torch",
     "minecraft:tripwire_hook",
@@ -93,6 +99,7 @@
     "minecraft:warped_fungus",
     "minecraft:warped_roots",
     "minecraft:weeping_vines",
-    "minecraft:weeping_vines_plant"
+    "minecraft:weeping_vines_plant",
+    "minecraft:wildflowers"
   ]
 }

base/data/gm4/tags/block/replaceable.json

@@ -3,21 +3,25 @@
     "#minecraft:air",
     "#minecraft:fire",
     "minecraft:bubble_column",
+    "minecraft:bush",
     "minecraft:crimson_roots",
     "minecraft:dead_bush",
     "minecraft:fern",
     "minecraft:glow_lichen",
+    "minecraft:short_dry_grass",
     "minecraft:short_grass",
     "minecraft:hanging_roots",
     "minecraft:large_fern",
     "minecraft:lava",
+    "minecraft:leaf_litter",
     "minecraft:light",
     "minecraft:nether_sprouts",
-    { "id": "minecraft:resin_clump", "required": false },
+    "minecraft:resin_clump",
     "minecraft:sculk_vein",
     "minecraft:seagrass",
     "minecraft:snow",
     "minecraft:structure_void",
+    "minecraft:tall_dry_grass",
     "minecraft:tall_grass",
     "minecraft:tall_seagrass",
     "minecraft:vine",

base/data/gm4/tags/block/waterloggable.json

@@ -59,7 +59,7 @@
     "minecraft:pointed_dripstone",
     "minecraft:purple_stained_glass_pane",
     "minecraft:red_stained_glass_pane",
-    { "id": "minecraft:resin_clump", "required": false },
+    "minecraft:resin_clump",
     "minecraft:scaffolding",
     "minecraft:sculk_sensor",
     "minecraft:sculk_vein",

base/data/gm4/tags/entity_type/boats.json

@@ -1,6 +1,5 @@
 {
   "values": [
-    { "id": "minecraft:boat", "required": false },
-    { "id": "#minecraft:boat", "required": false }
+    "#minecraft:boat"
   ]
 }

base/data/gm4/tags/entity_type/chest_boats.json

@@ -1,15 +1,14 @@
 {
   "values": [
-    { "id": "minecraft:chest_boat", "required": false },
-    { "id": "minecraft:oak_chest_boat", "required": false },
-    { "id": "minecraft:spruce_chest_boat", "required": false },
-    { "id": "minecraft:birch_chest_boat", "required": false },
-    { "id": "minecraft:jungle_chest_boat", "required": false },
-    { "id": "minecraft:acacia_chest_boat", "required": false },
-    { "id": "minecraft:cherry_chest_boat", "required": false },
-    { "id": "minecraft:dark_oak_chest_boat", "required": false },
-    { "id": "minecraft:mangrove_chest_boat", "required": false },
-    { "id": "minecraft:bamboo_chest_raft", "required": false },
-    { "id": "minecraft:pale_oak_chest_boat", "required": false }
+    "minecraft:oak_chest_boat",
+    "minecraft:spruce_chest_boat",
+    "minecraft:birch_chest_boat",
+    "minecraft:jungle_chest_boat",
+    "minecraft:acacia_chest_boat",
+    "minecraft:cherry_chest_boat",
+    "minecraft:dark_oak_chest_boat",
+    "minecraft:mangrove_chest_boat",
+    "minecraft:bamboo_chest_raft",
+    "minecraft:pale_oak_chest_boat"
   ]
 }

base/data/gm4/tags/entity_type/neutral_hostile.json

@@ -1,7 +1,7 @@
 {
     "values": [
         "minecraft:cave_spider",
-        { "id": "minecraft:creaking", "required": false },
+        "minecraft:creaking",
         "minecraft:drowned",
         "minecraft:enderman",
         "minecraft:piglin",

base/data/gm4/tags/entity_type/non_living.json

@@ -29,17 +29,18 @@
         "minecraft:item_frame",
         "minecraft:leash_knot",
         "minecraft:lightning_bolt",
+        "minecraft:lingering_potion",
         "minecraft:llama_spit",
         "minecraft:marker",
         "minecraft:minecart",
         "minecraft:ominous_item_spawner",
         "minecraft:painting",
-        "minecraft:potion",
         "minecraft:shulker_bullet",
         "minecraft:small_fireball",
         "minecraft:snowball",
         "minecraft:spawner_minecart",
         "minecraft:spectral_arrow",
+        "minecraft:splash_potion",
         "minecraft:text_display",
         "minecraft:tnt",
         "minecraft:tnt_minecart",

base/mod.mcdoc

@@ -1,3 +1,5 @@
+use ::java::util::text::Text
+
 dispatch minecraft:storage[gm4:log] to struct Gm4Log {
   versions?: [LogVersion],
   traverse_versions?: [LogVersion],
@@ -6,7 +8,7 @@ dispatch minecraft:storage[gm4:log] to struct Gm4Log {
   },
   outdated_list?: [LogEntry],
   queue?: [LogEntry],
-  temp?: #[text_component] string,
+  temp?: Text,
 }
 
 struct LogVersion {
@@ -23,7 +25,7 @@ struct LogEntry {
 
 dispatch gm4:log_entry[text] to struct {
   /// The text component message to display.
-  message: #[text_component] string,
+  message: Text,
 }
 
 dispatch gm4:log_entry[install] to struct {
@@ -34,7 +36,7 @@ dispatch gm4:log_entry[install] to struct {
 dispatch gm4:log_entry[outdated] to struct {
   module: string,
   download: #[url] string,
-  render: #[text_component] string,
+  render: Text,
 }
 
 dispatch gm4:log_entry[missing] to struct MissingLog {

beet-dev.yaml

@@ -36,7 +36,7 @@ pipeline:
     directory: resource_pack
     pipeline:
       - resource_pack.dev_description
-  - gm4.plugins.resource_pack.pad_model_overrides
+  - gm4.plugins.resource_pack.pad_item_def_range_dispatch
   - gm4.plugins.resource_pack.link_resource_pack
   - gm4.plugins.output.resource_pack
   - gm4.plugins.resource_pack.dump_registry

beet-release.yaml

@@ -82,7 +82,7 @@ pipeline:
       - gm4.plugins.output.release_resource_pack
       - gm4.plugins.write_mcmeta
       - gm4.plugins.manifest.update_patch
-      - gm4.plugins.resource_pack.pad_model_overrides
+      - gm4.plugins.resource_pack.pad_item_def_range_dispatch
     meta:
       pack_scan: resource_pack
 

docs/making-a-module.md

@@ -109,7 +109,7 @@ If all required dependencies are present, Lantern Load will call `init.mcfunctio
 #### Logging
 Messages can be logged during the load process. This can be done by appending to the `queue` field in the `gm4:log` storage. Here are a few examples:
 ```mcfunction
-data modify storage gm4:log queue append value {type:"text",message:'{"text":"We've been attempting to contact you about your car's extended warranty"}'}
+data modify storage gm4:log queue append value {type:"text",message:{text:"We've been attempting to contact you about your car's extended warranty"}}
 data modify storage gm4:log queue append value {type:"install",module:"Bat Grenades"}
 ```