Update to 26.2

.github/workflows/main.yml

@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  VERSION: '26.1'
+  VERSION: '26.2'
   COMMIT_MSG: ${{ github.event.head_commit.message }}
 
 jobs:
@@ -86,11 +86,11 @@ jobs:
           # https://fabricmc.net/use/server/
           # https://modrinth.com/mod/fabric-api/versions
           # https://modrinth.com/mod/packtest/versions
-          - version: '26.1'
-            fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/26.1-snapshot-6/0.18.4/1.1.1/server/jar
-            fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/WAZ95Yd8/fabric-api-0.143.2%2B26.1.jar
-            packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/eupLiv70/packtest-2.5.0-beta1.jar
-            command_limit_tracer_url: https://cdn.modrinth.com/data/Ao12dSbt/versions/DxBN5h3K/commandlimittracer-0.2.0.jar
+          - version: '26.2'
+            fabric_server_url: https://meta.fabricmc.net/v2/versions/loader/26.2-rc-2/0.19.3/1.1.1/server/jar
+            fabric_api_url: https://cdn.modrinth.com/data/P7dR8mSH/versions/Fsy077WD/fabric-api-0.152.0%2B26.2.jar
+            packtest_url: https://cdn.modrinth.com/data/XsKUhp45/versions/qT2wdJhc/packtest-2.6.0-beta1.jar
+            command_limit_tracer_url: https://cdn.modrinth.com/data/Ao12dSbt/versions/zKvlVzlN/commandlimittracer-0.3.0.jar
     name: 'test-${{ matrix.version }}'
     runs-on: ubuntu-24.04
     steps:

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

@@ -1,7 +1,7 @@
 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","plain":true,"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","interpret":true,"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","plain":true,"color":"red"},{"text":" is disabled. It requires ","color":"red"},{"nbt":"log.require","storage":"gm4:log","plain":true,"color":"red"},{"text":" v","color":"red"},{"nbt":"log.require_ver","storage":"gm4:log","plain":true},{"text":" but ","color":"red"},{"nbt":"traverse_versions[0].module","storage":"gm4:log","plain":true},{"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}]
+execute if score #not_match gm4_data matches 0 run tellraw @a[tag=gm4_show_log] [{"nbt":"log.module","storage":"gm4:log","interpret":true,"color":"red"},{"text":" is disabled. It requires ","color":"red"},{"nbt":"log.require","storage":"gm4:log","interpret":true,"color":"red"},{"text":" v","color":"red"},{"nbt":"log.require_ver","storage":"gm4:log","interpret":true},{"text":" but ","color":"red"},{"nbt":"traverse_versions[0].module","storage":"gm4:log","interpret":true},{"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}]
 
 data remove storage gm4:log temp
 execute if score #not_match gm4_data matches 1 run data remove storage gm4:log traverse_versions[0]

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

@@ -1,6 +1,6 @@
 data modify storage gm4:log traverse_versions set from storage gm4:log versions
 function gm4:conflict_logs/traverse
 
-execute if score #not_match gm4_data matches 1 run tellraw @a[tag=gm4_show_log] [{"nbt":"log.module","storage":"gm4:log","plain":true,"color":"red"},{"text":" is disabled. It requires ","color":"red"},{"nbt":"log.require","storage":"gm4:log","plain":true,"color":"red"},{"text":" v","color":"red"},{"nbt":"log.require_ver","storage":"gm4:log","plain":true},{"text":" but ?Unknown Version? is installed instead","color":"red"}]
+execute if score #not_match gm4_data matches 1 run tellraw @a[tag=gm4_show_log] [{"nbt":"log.module","storage":"gm4:log","interpret":true,"color":"red"},{"text":" is disabled. It requires ","color":"red"},{"nbt":"log.require","storage":"gm4:log","interpret":true,"color":"red"},{"text":" v","color":"red"},{"nbt":"log.require_ver","storage":"gm4:log","interpret":true},{"text":" but ?Unknown Version? is installed instead","color":"red"}]
 
 data remove storage gm4:log traverse_versions

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

@@ -48,6 +48,7 @@
         "minecraft:carved_pumpkin",
         "minecraft:chain_command_block",
         "minecraft:chiseled_bookshelf",
+        "minecraft:chiseled_cinnabar",
         "minecraft:chiseled_copper",
         "minecraft:chiseled_deepslate",
         "minecraft:chiseled_nether_bricks",
@@ -57,7 +58,10 @@
         "minecraft:chiseled_resin_bricks",
         "minecraft:chiseled_sandstone",
         "minecraft:chiseled_stone_bricks",
+        "minecraft:chiseled_sulfur",
         "minecraft:chiseled_tuff",
+        "minecraft:cinnabar",
+        "minecraft:cinnabar_bricks",
         "minecraft:clay",
         "minecraft:coal_block",
         "minecraft:coal_ore",
@@ -223,10 +227,13 @@
         "minecraft:polished_basalt",
         "minecraft:polished_blackstone_bricks",
         "minecraft:polished_blackstone",
+        "minecraft:polished_cinnabar",
         "minecraft:polished_deepslate",
         "minecraft:polished_diorite",
         "minecraft:polished_granite",
+        "minecraft:polished_sulfur",
         "minecraft:polished_tuff",
+        "minecraft:potent_sulfur",
         "minecraft:prismarine_bricks",
         "minecraft:prismarine",
         "minecraft:pumpkin",
@@ -281,6 +288,8 @@
         "minecraft:stone_bricks",
         "minecraft:stone",
         "minecraft:structure_block",
+        "minecraft:sulfur",
+        "minecraft:sulfur_bricks",
         "minecraft:suspicious_gravel",
         "minecraft:suspicious_sand",
         "minecraft:target",

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

@@ -73,6 +73,7 @@
     "minecraft:sea_pickle",
     "minecraft:small_dripleaf",
     "minecraft:soul_lantern",
+    "minecraft:sulfur_spike",
     "minecraft:trapped_chest",
     "minecraft:white_stained_glass_pane",
     "minecraft:yellow_stained_glass_pane"

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

@@ -30,6 +30,7 @@
         "minecraft:snow_golem",
         "minecraft:squid",
         "minecraft:strider",
+        "minecraft:sulfur_cube",
         "minecraft:tadpole",
         "minecraft:tropical_fish",
         "minecraft:turtle",

gm4/plugins/manifest.py

@@ -21,7 +21,7 @@
 
 parent_logger = logging.getLogger("gm4.manifest")
 
-SUPPORTED_GAME_VERSIONS = ["26.1"]
+SUPPORTED_GAME_VERSIONS = ["26.2"]
 
 # config models for beet.yaml metas
 CreditsModel = dict[str, list[str]]
@@ -145,7 +145,7 @@ def create(ctx: Context):
 	ctx.cache["gm4_manifest"].json = manifest.model_dump()
 
 	# Read in the previous manifest, if found
-	version = os.getenv("VERSION", "26.1")
+	version = os.getenv("VERSION", "26.2")
 	release_dir = Path('release') / version
 	manifest_file = release_dir / "meta.json"
 
@@ -219,7 +219,7 @@ def update_patch(ctx: Context):
 
 def write_meta(ctx: Context):
 	"""Write the updated meta.json file."""
-	version = os.getenv("VERSION", "26.1")
+	version = os.getenv("VERSION", "26.2")
 	release_dir = Path('release') / version
 	os.makedirs(release_dir, exist_ok=True)
 

gm4/plugins/output.py

@@ -21,7 +21,7 @@
 def beet_default(ctx: Context):
 	"""Saves the datapack to the ./out folder in it's exit phase.
 	 	Should be first in pipeline to properly wrap all other plugins cleanup phases"""
-	version = os.getenv("VERSION", "26.1")
+	version = os.getenv("VERSION", "26.2")
 	out_dir = Path("out")
 
 	yield # wait for exit phase, after other plugins cleanup
@@ -33,7 +33,7 @@ def beet_default(ctx: Context):
 
 def resource_pack(ctx: Context):
 	"""Saves the resourcepack to the ./out folder."""
-	version = os.getenv("VERSION", "26.1")
+	version = os.getenv("VERSION", "26.2")
 	out_dir = Path("out")
 
 	ctx.assets.save(
@@ -43,7 +43,7 @@ def resource_pack(ctx: Context):
 
 def release_resource_pack(ctx: Context):
 	"""Saves the resourcepack to the ./out folder."""
-	version = os.getenv("VERSION", "26.1")
+	version = os.getenv("VERSION", "26.2")
 	release_dir = Path("release") / version
 
 	yield
@@ -82,7 +82,7 @@ def release(ctx: Context):
 	`BEET_SMITHED_TOKEN` environment variable is set, will try to publish a
 	new version to Smithed if it doesn't already exist.
 	"""
-	version_dir = os.getenv("VERSION", "26.1")
+	version_dir = os.getenv("VERSION", "26.2")
 	release_dir = Path("release") / version_dir
 
 	corrected_project_id = stem if (stem:=ctx.directory.stem).startswith("lib") else ctx.project_id
@@ -199,7 +199,7 @@ def publish_smithed(ctx: Context, config: ManifestConfig, file_name: str):
 	"""Attempts to publish pack to smithed"""
 	auth_token = os.getenv(SMITHED_AUTH_KEY, None)
 	logger = parent_logger.getChild(f"smithed.{ctx.project_id}")
-	mc_version_dir = os.getenv("VERSION", "26.1")
+	mc_version_dir = os.getenv("VERSION", "26.2")
 	manifest = ManifestCacheModel.model_validate(ctx.cache["gm4_manifest"].json)
 	project_id = stem if (stem:=ctx.directory.stem).startswith("lib") else ctx.project_id
 
@@ -299,7 +299,7 @@ def clear_release(ctx: Context):
 	1. Deleted modules no longer stick around in the current version
 	2. Changes to the build system (such as renamed files/folders) are properly reflected
 	"""
-	version = os.getenv("VERSION", "26.1")
+	version = os.getenv("VERSION", "26.2")
 	release_dir = Path("release") / version
 	shutil.rmtree(release_dir, ignore_errors=True)
 	os.makedirs(release_dir, exist_ok=True)

gm4/plugins/resource_pack.py

@@ -43,7 +43,7 @@
 
 JsonType = dict[str,Any]
 
-MINECRAFT_REFERENCE_VERSION = "26.1"
+MINECRAFT_REFERENCE_VERSION = "26.2"
 
 parent_logger = logging.getLogger("gm4.resource_pack")
 

gm4/plugins/write_mcmeta.py

@@ -9,18 +9,18 @@ def beet_default(ctx: Context):
 	manifest = ManifestCacheModel.model_validate(ctx.cache["gm4_manifest"].json)
 	manifest_entry = {v.id:v for v in (manifest.modules|manifest.libraries).values()}.get(ctx.project_id, NoneAttribute())
 
-	ctx.data.min_format = 101
-	ctx.data.max_format = 101
+	ctx.data.min_format = 107
+	ctx.data.max_format = 107
 
-	ctx.assets.min_format = 84
-	ctx.assets.max_format = 84
+	ctx.assets.min_format = 88
+	ctx.assets.max_format = 88
 
 	for pack in ctx.packs:
 		pack.description = [
 			ctx.project_name,
 			"\n",
 			{
-				"text": f"Gamemode 4 for 26.1",
+				"text": f"Gamemode 4 for 26.2",
 				"color": "#4AA0C7"
 			}
 		]

gm4_apple_trees/data/gm4_apple_trees/advancement/apple_hand_empty.json

@@ -27,8 +27,13 @@
             "condition": "minecraft:entity_properties",
             "entity": "this",
             "predicate": {
-              "type": "minecraft:armor_stand",
-              "nbt": "{Tags:[\"gm4_apple\",\"gm4_ripe_apple\"]}"
+              "minecraft:entity_type": "minecraft:armor_stand",
+              "minecraft:entity_tags": {
+                "all_of": [
+                  "gm4_apple",
+                  "gm4_ripe_apple"
+                ]
+              }
             }
           }
         ]

gm4_apple_trees/data/gm4_apple_trees/advancement/apple_hand_item.json

@@ -30,8 +30,13 @@
             "condition": "minecraft:entity_properties",
             "entity": "this",
             "predicate": {
-              "type": "minecraft:armor_stand",
-              "nbt": "{Tags:[\"gm4_apple\",\"gm4_ripe_apple\"]}"
+              "minecraft:entity_type": "minecraft:armor_stand",
+              "minecraft:entity_tags": {
+                "all_of": [
+                  "gm4_apple",
+                  "gm4_ripe_apple"
+                ]
+              }
             }
           }
         ]

gm4_apple_trees/data/gm4_apple_trees/guidebook/apple_trees.json

@@ -29,8 +29,12 @@
             "condition": "minecraft:entity_properties",
             "entity": "this",
             "predicate": {
-              "type": "minecraft:armor_stand",
-              "nbt": "{Tags:[\"gm4_apple\"]}"
+              "minecraft:entity_type": "minecraft:armor_stand",
+              "minecraft:entity_tags": {
+                "all_of": [
+                  "gm4_apple"
+                ]
+              }
             }
           }
         ]

gm4_apple_trees/data/gm4_golden_apple_trees/advancement/apple_hand_empty.json

@@ -27,8 +27,13 @@
             "condition": "minecraft:entity_properties",
             "entity": "this",
             "predicate": {
-              "type": "minecraft:armor_stand",
-              "nbt": "{Tags:[\"gm4_golden_apple\",\"gm4_ripe_apple\"]}"
+              "minecraft:entity_type": "minecraft:armor_stand",
+              "minecraft:entity_tags": {
+                "all_of": [
+                  "gm4_golden_apple",
+                  "gm4_ripe_apple"
+                ]
+              }
             }
           }
         ]

gm4_apple_trees/data/gm4_golden_apple_trees/advancement/apple_hand_item.json

@@ -30,8 +30,13 @@
             "condition": "minecraft:entity_properties",
             "entity": "this",
             "predicate": {
-              "type": "minecraft:armor_stand",
-              "nbt": "{Tags:[\"gm4_golden_apple\",\"gm4_ripe_apple\"]}"
+              "minecraft:entity_type": "minecraft:armor_stand",
+              "minecraft:entity_tags": {
+                "all_of": [
+                  "gm4_golden_apple",
+                  "gm4_ripe_apple"
+                ]
+              }
             }
           }
         ]

gm4_balloon_animals/data/gm4_balloon_animals/guidebook/balloon_animals.json

@@ -14,7 +14,11 @@
             "condition": "minecraft:entity_properties",
             "entity": "this",
             "predicate": {
-              "nbt": "{Tags:[\"gm4_balloon_animal_trader\"]}"
+              "minecraft:entity_tags": {
+                "all_of": [
+                  "gm4_balloon_animal_trader"
+                ]
+              }
             }
           }
         ]

gm4_bat_grenades/data/gm4/advancement/bat_grenades.json

@@ -22,8 +22,12 @@
       "trigger": "minecraft:entity_killed_player",
       "conditions": {
         "entity": {
-          "type": "creeper",
-          "nbt": "{Tags:[\"gm4_bat_grenade\"]}"
+          "minecraft:entity_type": "creeper",
+          "minecraft:entity_tags": {
+            "all_of": [
+              "gm4_bat_grenade"
+            ]
+          }
         }
       }
     }

gm4_bat_grenades/data/gm4_bat_grenades/guidebook/bat_grenades.json

@@ -11,8 +11,12 @@
       "conditions": {
         "damage": {
           "source_entity": {
-            "type": "minecraft:creeper",
-            "nbt": "{Tags:[\"gm4_bat_grenade\"]}"
+            "minecraft:entity_type": "minecraft:creeper",
+            "minecraft:entity_tags": {
+              "all_of": [
+                "gm4_bat_grenade"
+              ]
+            }
           }
         }
       }

gm4_better_armour_stands/data/gm4_better_armour_stands/advancement/book/tracking.json

@@ -8,7 +8,11 @@
             "condition": "minecraft:entity_properties",
             "entity": "this",
             "predicate": {
-              "nbt": "{Tags:[\"gm4_bas_track\"]}"
+              "minecraft:entity_tags": {
+                "all_of": [
+                  "gm4_bas_track"
+                ]
+              }
             }
           }
         ],
@@ -22,7 +26,7 @@
             "condition": "minecraft:entity_properties",
             "entity": "this",
             "predicate": {
-              "type": "minecraft:armor_stand"
+              "minecraft:entity_type": "minecraft:armor_stand"
             }
           },
           {
@@ -39,4 +43,4 @@
   "rewards": {
     "function": "gm4_better_armour_stands:pose/set"
   }
-}
+}

gm4_better_armour_stands/data/gm4_better_armour_stands/advancement/book/use.json

@@ -13,7 +13,7 @@
             "condition": "minecraft:entity_properties",
             "entity": "this",
             "predicate": {
-              "type": "minecraft:armor_stand"
+              "minecraft:entity_type": "minecraft:armor_stand"
             }
           },
           {

gm4_better_armour_stands/data/gm4_better_armour_stands/advancement/book/use_arms.json

@@ -13,8 +13,12 @@
             "condition": "minecraft:entity_properties",
             "entity": "this",
             "predicate": {
-              "type": "minecraft:interaction",
-              "nbt": "{Tags:[\"gm4_bas_arms_detect\"]}"
+              "minecraft:entity_type": "minecraft:interaction",
+              "minecraft:entity_tags": {
+                "all_of": [
+                  "gm4_bas_arms_detect"
+                ]
+              }
             }
           }
         ]