Update to 1.21 (Gamemode4Dev#1004)

* Update version numbers and pack format

* Rename legacy folders

* Update beet and mecha

* Update attribute commands

* Update packtest to v1.8-beta3

* Fix attribute modifiers in JSON

* Update to gm4_combat_expanded:dynamic

* Update attribute NBT in commands

* Move tests to singular name folder

* Fix template directives pointing to singular folder name

* Gamemode predicate is a list now

* Update looting_enchant -> enchanted_count_increase

* Fix enchant_randomly enchantments -> options

* Fix random_chance_with_looting

* Update enchant_with_levels

* Fix enchantment predicates

* campfire damage type was split from in_fire

* Use new #air block tag
Keeping the #gm4:air tag for now, because some in-world nbt may still refer to it

* Remove some trailing spaces

* fix attribute names (Gamemode4Dev#1005)

* Fix some issues found by spyglass

* Configure for spyglass v4

* Fix double doors: use singular template folders

* Disable combat expanded

---------

Co-authored-by: Thanathor <[email protected]>

Author: misode

.github/workflows/main.yml

@@ -7,11 +7,11 @@ on:
   workflow_dispatch:
 
 env:
-  VERSION: '1.20.5'
+  VERSION: '1.21'
   COMMIT_MSG: ${{ github.event.head_commit.message }}
-  TEST_FABRIC_SERVER: https://meta.fabricmc.net/v2/versions/loader/1.20.6/0.15.10/1.0.1/server/jar
-  TEST_FABRIC_API: https://cdn.modrinth.com/data/P7dR8mSH/versions/kAQqRNrK/fabric-api-0.97.8%2B1.20.6.jar
-  TEST_PACKTEST: https://cdn.modrinth.com/data/XsKUhp45/versions/UnZw9eUD/packtest-1.7-mc1.20.5.jar
+  TEST_FABRIC_SERVER: https://meta.fabricmc.net/v2/versions/loader/1.21/0.15.11/1.0.1/server/jar
+  TEST_FABRIC_API: https://cdn.modrinth.com/data/P7dR8mSH/versions/HXzEJYgV/fabric-api-0.100.1%2B1.21.jar
+  TEST_PACKTEST: https://cdn.modrinth.com/data/XsKUhp45/versions/sQSunYHv/packtest-1.8-beta3-mc1.21.jar
 
 jobs:
   build:

.gitignore

@@ -14,3 +14,4 @@ __pycache__/
 ### Beet ###
 out/
 release/
+.beet_cache/

.vscode/settings.json

@@ -1,8 +1,4 @@
 {
-	"datapack.env.cmdVersion": "1.20.3",
-	"datapack.env.dataVersion": "1.20.3",
-	"datapack.lint.stringQuote": ["hint", true],
-	"datapack.lint.nbtStringQuoteType": ["hint", "prefer double"],
 	"files.insertFinalNewline": true,
 	"files.trimFinalNewlines": true
 }

base/data/gm4/advancements/intro_song/invisible_root.json renamed to base/data/gm4/advancement/intro_song/invisible_root.json

@@ -1,6 +1,6 @@
 {
   "values": [
-    "#gm4:air",
+    "#minecraft:air",
     "#gm4:water",
     "#minecraft:banners",
     "#minecraft:buttons",

base/data/gm4/advancements/intro_song/play_song.json renamed to base/data/gm4/advancement/intro_song/play_song.json

@@ -1,6 +1,6 @@
 {
   "values": [
-    "#gm4:air",
+    "#minecraft:air",
     "#minecraft:fire",
     "minecraft:bubble_column",
     "minecraft:crimson_roots",

base/data/gm4/advancements/intro_song/welcome_toast.json renamed to base/data/gm4/advancement/intro_song/welcome_toast.json

@@ -20,7 +20,7 @@
 
 parent_logger = logging.getLogger("gm4.manifest")
 
-SUPPORTED_GAME_VERSIONS = ["1.20.5", "1.20.6"]
+SUPPORTED_GAME_VERSIONS = ["1.21"]
 
 # config models for beet.yaml metas
 CreditsModel = dict[str, list[str]]
@@ -144,7 +144,7 @@ def create(ctx: Context):
 	ctx.cache["gm4_manifest"].json = manifest.dict()
 
 	# Read in the previous manifest, if found
-	version = os.getenv("VERSION", "1.20.5")
+	version = os.getenv("VERSION", "1.21")
 	release_dir = Path('release') / version
 	manifest_file = release_dir / "meta.json"
 
@@ -214,7 +214,7 @@ def update_patch(ctx: Context):
 
 def write_meta(ctx: Context):
 	"""Write the updated meta.json file."""
-	version = os.getenv("VERSION", "1.20.5")
+	version = os.getenv("VERSION", "1.21")
 	release_dir = Path('release') / version
 	os.makedirs(release_dir, exist_ok=True)
 
@@ -263,7 +263,7 @@ def write_credits(ctx: Context):
 
 def write_updates(ctx: Context):
 	"""Writes the module update commands to this module's init function."""
-	init = ctx.data.functions.get(f"{ctx.project_id}:init", None)
+	init = ctx.data.function.get(f"{ctx.project_id}:init", None)
 	if init is None:
 		return
 

base/data/gm4/advancements/upgrade_paths/changed_dimension.json renamed to base/data/gm4/advancement/upgrade_paths/changed_dimension.json

@@ -8,8 +8,8 @@ def default_pack_icon(ctx: Context):
 
 def gm4_root_advancement(ctx: Context):
     """Adds the root display advancement gm4:root, if the module has any display advancements"""
-    if len(ctx.data["gm4"].advancements.keys()) > 0:
-        ctx.data.advancements["gm4:root"] = Advancement(
+    if len(ctx.data["gm4"].advancement.keys()) > 0:
+        ctx.data.advancement["gm4:root"] = Advancement(
             {
                 "display": {
                     "icon": {

base/data/gm4/advancements/upgrade_paths/join_game.json renamed to base/data/gm4/advancement/upgrade_paths/join_game.json

@@ -20,7 +20,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", "1.20.5")
+	version = os.getenv("VERSION", "1.21")
 	out_dir = Path("out")
 
 	yield # wait for exit phase, after other plugins cleanup
@@ -32,7 +32,7 @@ def beet_default(ctx: Context):
 
 def resource_pack(ctx: Context):
 	"""Saves the resourcepack to the ./out folder."""
-	version = os.getenv("VERSION", "1.20.5")
+	version = os.getenv("VERSION", "1.21")
 	out_dir = Path("out")
 
 	ctx.assets.save(
@@ -42,7 +42,7 @@ def resource_pack(ctx: Context):
 
 def release_resource_pack(ctx: Context):
 	"""Saves the resourcepack to the ./out folder."""
-	version = os.getenv("VERSION", "1.20.5")
+	version = os.getenv("VERSION", "1.21")
 	release_dir = Path("release") / version
 
 	yield
@@ -81,7 +81,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", "1.20.5")
+	version_dir = os.getenv("VERSION", "1.21")
 	release_dir = Path("release") / version_dir
 
 	corrected_project_id = stem if (stem:=ctx.directory.stem).startswith("lib") else ctx.project_id
@@ -197,7 +197,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", "1.20.5")
+	mc_version_dir = os.getenv("VERSION", "1.21")
 	manifest = ManifestCacheModel.parse_obj(ctx.cache["gm4_manifest"].json)
 	project_id = stem if (stem:=ctx.directory.stem).startswith("lib") else ctx.project_id
 
@@ -297,7 +297,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", "1.20.5")
+	version = os.getenv("VERSION", "1.21")
 	release_dir = Path("release") / version
 	shutil.rmtree(release_dir, ignore_errors=True)
 	os.makedirs(release_dir, exist_ok=True)

base/data/gm4/functions/conflict_logs/traverse.mcfunction renamed to base/data/gm4/function/conflict_logs/traverse.mcfunction

@@ -39,8 +39,8 @@ def structure_deep_rename(ctx: Context, find_namespace: str, repl_namespace: str
     }))
 
     # rename structure-file references
-    for s in ctx.data.structures:
-        blocks = ctx.data.structures[s].data["blocks"].snbt() # type: ignore ; nbtlib typing missing
+    for s in ctx.data.structure:
+        blocks = ctx.data.structure[s].data["blocks"].snbt() # type: ignore ; nbtlib typing missing
         updated_blocks_data = re.sub(f"{find_namespace}:([a-z0-9_/]+)", f"{repl_namespace}:\\1", blocks) # type: ignore ; nbtlib typing missing
-        ctx.data.structures[s].serializer = repro_structure_to_bytes
-        ctx.data.structures[s].data["blocks"] = nbtlib.parse_nbt(updated_blocks_data) # type: ignore ; nbtlib typing missing
+        ctx.data.structure[s].serializer = repro_structure_to_bytes
+        ctx.data.structure[s].data["blocks"] = nbtlib.parse_nbt(updated_blocks_data) # type: ignore ; nbtlib typing missing

base/data/gm4/functions/conflict_logs/version_conflict_start.mcfunction renamed to base/data/gm4/function/conflict_logs/version_conflict_start.mcfunction

@@ -10,15 +10,15 @@ def load_tests(ctx: Context):
 class TestFile(TextFile):
     """Class representing an test function."""
 
-    scope: ClassVar[Tuple[str, ...]] = ("tests",)
+    scope: ClassVar[Tuple[str, ...]] = ("test",)
     extension: ClassVar[str] = ".mcfunction"
 
 
 def strip_tests(ctx: Context):
-    for structure in ctx.data.structures.match("*:test_*", "*:tests/*"):
-        del ctx.data.structures[structure]
-    for predicate in ctx.data.predicates.match("*:test_*", "*:tests/*"):
-        del ctx.data.predicates[predicate]
+    for structure in ctx.data.structure.match("*:test_*", "*:test/*"):
+        del ctx.data.structure[structure]
+    for predicate in ctx.data.predicate.match("*:test_*", "*:test/*"):
+        del ctx.data.predicate[predicate]
 
 
 def skip_mecha_lint(ctx: Context):

base/data/gm4/functions/intro_song/init.mcfunction renamed to base/data/gm4/function/intro_song/init.mcfunction

@@ -22,7 +22,7 @@ def beet_default(ctx: Context, opts: UpgradePathsConfig):
     score_holder = ctx.project_id.removeprefix('gm4_')
     newest_version_with_upgrades = 0.0
     for ns, direc in map(lambda a: a.split(':'), upgrade_paths_dirs):
-        upgrade_paths_tree = ctx.data[ns].functions.generate_tree(direc)
+        upgrade_paths_tree = ctx.data[ns].function.generate_tree(direc)
         if upgrade_paths_tree:
             newest_version_with_upgrades = max(newest_version_with_upgrades, max(map(float, upgrade_paths_tree.keys())))
         for path in upgrade_paths_tree.keys():
@@ -42,6 +42,6 @@ def lib(ctx: Context):
     if ver.patch is None:
         ver.patch = 0 #  when beet-dev is run, pipeline has no patch number record, but dev builds should still allow int conversion
     ver_int = ver.int_rep()
-    ctx.data.functions[f'{ctx.project_id}:load'].append(f'execute unless score {score_holder} gm4_earliest_version matches ..{ver_int} run scoreboard players set {score_holder} gm4_earliest_version {ver_int}')
+    ctx.data.function[f'{ctx.project_id}:load'].append(f'execute unless score {score_holder} gm4_earliest_version matches ..{ver_int} run scoreboard players set {score_holder} gm4_earliest_version {ver_int}')
 
     beet_default(ctx)

base/data/gm4/functions/intro_song/init_song.mcfunction renamed to base/data/gm4/function/intro_song/init_song.mcfunction

@@ -73,7 +73,7 @@ def modules(ctx: Context, opts: VersioningConfig):
         namespaced_function = f"{ctx.project_id}:{function}" if ":" not in function else function
         lines.append(f"execute unless score {ctx.project_id} load.status matches {module_ver.major} run schedule clear {namespaced_function}")
 
-    ctx.data.functions[f"{ctx.project_id}:load"] = Function(lines)
+    ctx.data.function[f"{ctx.project_id}:load"] = Function(lines)
 
     # load.json tag
     ctx.data.function_tags["load:load"] = FunctionTag({
@@ -84,7 +84,7 @@ def modules(ctx: Context, opts: VersioningConfig):
 
     # inject module load success checks (load.status 1..) into technical and display advancements
         # advancements get score checks injected into every criteria
-    versioned_advancements(ctx, Version("X.X.X"), [a for a in ctx.data.advancements.keys() if not a=="gm4:root"], False)
+    versioned_advancements(ctx, Version("X.X.X"), [a for a in ctx.data.advancement.keys() if not a=="gm4:root"], False)
 
 @configurable("gm4.versioning", validator=VersioningConfig)
 def libraries(ctx: Context, opts: VersioningConfig):
@@ -120,7 +120,7 @@ def libraries(ctx: Context, opts: VersioningConfig):
     lines.append(dep_check_line + f"{ctx.project_id}_minor load.status {lib_ver.minor}")
     lines.append(dep_check_line + f"{ctx.project_id} load.status {lib_ver.major}")
 
-    ctx.data.functions[f"{ctx.project_id}:enumerate"] = Function(lines)
+    ctx.data.function[f"{ctx.project_id}:enumerate"] = Function(lines)
 
     # resolve_load.mcfunction
     lines = [f"execute if score {ctx.project_id} load.status matches {lib_ver.major} if score {ctx.project_id}_minor load.status matches {lib_ver.minor} run function {ctx.project_id}:load"]
@@ -129,7 +129,7 @@ def libraries(ctx: Context, opts: VersioningConfig):
         lines.append(f"execute unless score {ctx.project_id} load.status matches {lib_ver.major} run schedule clear {ctx.project_id}:{func}")
         lines.append(f"execute unless score {ctx.project_id}_minor load.status matches {lib_ver.minor} run schedule clear {ctx.project_id}:{func}")
 
-    ctx.data.functions[f"{ctx.project_id}:resolve_load"] = Function(lines)
+    ctx.data.function[f"{ctx.project_id}:resolve_load"] = Function(lines)
 
     # load/tags {{ lib name }}.json
     ctx.data.function_tags[f"load:{ctx.project_id}"] = FunctionTag({
@@ -175,7 +175,7 @@ def libraries(ctx: Context, opts: VersioningConfig):
     ))
 
         # stamp version number and module bring packaged into into load.mcfunction
-    handle = ctx.data.functions[f"{ctx.project_id}:load"]
+    handle = ctx.data.function[f"{ctx.project_id}:load"]
     handle.append([
         "\n",
         f"data modify storage gm4:log versions append value {{id:\"{ctx.project_id}\",module:\"{ctx.project_id.replace('gm4', 'lib')}\",version:\"{ctx.project_version}\",from:\"{ctx.cache['currently_building'].json.get('name', 'standalone')}\"}}"
@@ -199,15 +199,15 @@ def base(ctx: Context, opts: VersioningConfig):
         f"execute unless score gm4 load.status matches {ver.major}.. run scoreboard players set gm4_minor load.status {ver.minor}",
         f"execute unless score gm4 load.status matches {ver.major}.. run scoreboard players set gm4 load.status {ver.major}"
     ]
-    ctx.data.functions[f"gm4:enumerate"] = Function(lines)
+    ctx.data.function[f"gm4:enumerate"] = Function(lines)
 
     # resolve_load.mcfunction
     lines = f"execute if score gm4 load.status matches {ver.major} if score gm4_minor load.status matches {ver.minor} run function gm4:load"
-    ctx.data.functions[f"gm4:resolve_load"] = Function(lines)
+    ctx.data.function[f"gm4:resolve_load"] = Function(lines)
 
     # resolve_post_load.mcfunction
     lines = f"execute if score gm4 load.status matches {ver.major} if score gm4_minor load.status matches {ver.minor} run function gm4:post_load"
-    ctx.data.functions[f"gm4:resolve_post_load"] = Function(lines)
+    ctx.data.function[f"gm4:resolve_post_load"] = Function(lines)
 
     versioned_advancements(ctx, ver, opts.extra_version_injections.advancements, strict=True) #type:ignore
 
@@ -266,9 +266,9 @@ def versioned_advancements(ctx: Context, ver: Version, targets: list[str], stric
 
     for entry in targets:
         if ":" in entry:
-            handle = ctx.data.advancements[entry]
+            handle = ctx.data.advancement[entry]
         else:
-            handle = ctx.data.advancements[f"{ctx.project_id}:{entry}"]
+            handle = ctx.data.advancement[f"{ctx.project_id}:{entry}"]
         for criteria in handle.data["criteria"].values():
             player_conditions = criteria.setdefault("conditions", {}).setdefault("player", [])
             if type(player_conditions) is dict:

base/data/gm4/functions/intro_song/main.mcfunction renamed to base/data/gm4/function/intro_song/main.mcfunction

@@ -7,13 +7,12 @@ def beet_default(ctx: Context):
 	"""Writes the pack.mcmeta based on the module name and version."""
 	yield # wait for exit phase
 
-	version = os.getenv("VERSION", "1.20.5")
+	version = os.getenv("VERSION", "1.21")
 	manifest = ManifestCacheModel.parse_obj(ctx.cache["gm4_manifest"].json)
 	manifest_entry = {v.id:v for v in (manifest.modules|manifest.libraries).values()}.get(ctx.project_id, NoneAttribute())
 
-	# manually set as beet's `latest` is not available for 1.20.5 at this time.
-	ctx.data.pack_format = 41
-	ctx.assets.pack_format = 32
+	ctx.data.pack_format = 48
+	ctx.assets.pack_format = 34
 
 	for pack in ctx.packs:
 		pack.description = [