Player head management plugin

beet-release.yaml

@@ -6,14 +6,21 @@ pipeline:
   - gm4.plugins.manifest.write_meta
   - broadcast: 'gm4_*'
     extend: 'beet.yaml'
+    require:
+      - gm4.plugins.output.release
+      - gm4.plugins.player_heads
     pipeline:
       - gm4.plugins.manifest.write_updates
       - gm4.plugins.manifest.write_credits
       - require: [beet.contrib.copy_files]
         meta: {copy_files: {data_pack: {LICENSE.md: "../LICENSE.md"}}}
       - gm4.plugins.readme_generator
       - gm4.plugins.write_mcmeta
-      - gm4.plugins.output.release
+    meta:
+      mecha:
+        formatting:
+          layout: preserve
+          nbt_compact: True
 
 meta:
   autosave:

beet.yaml

@@ -3,6 +3,13 @@ pipeline:
   - gm4.plugins.manifest.create
   - broadcast: 'gm4_*'
     extend: 'beet.yaml'
+    require:
+      - gm4.plugins.output
+      - gm4.plugins.player_heads
     pipeline:
       - gm4.plugins.write_mcmeta
-      - gm4.plugins.output
+    meta:
+      mecha:
+        layout: preserve
+        nbt_compact: True
+        cmd_compact: True

gm4/commands.py

@@ -39,11 +39,24 @@ def dev(ctx: click.Context, project: Project, modules: tuple[str], watch: bool,
 	config = {
 		"broadcast": modules,
 		"extend": "beet.yaml",
-		"require": ["beet.contrib.livereload"] if reload else [],
+		"require": [
+			"gm4.plugins.output",
+			"beet.contrib.livereload",
+			"gm4.plugins.player_heads"
+		] if reload else [
+			"gm4.plugins.output",
+			"gm4.plugins.player_heads"
+		],
 		"pipeline": [
-			"gm4.plugins.write_mcmeta",
-			"gm4.plugins.output"
-		]
+			"gm4.plugins.write_mcmeta"
+		],
+		"meta": {
+			"mecha" : {
+				"formatting":{
+					"layout": "preserve",
+					"nbt_compact": True,
+					"cmd_compact": True
+		}	}	}
 	}
 	project.config_overrides = [
 		f"pipeline[] = {json.dumps(config)}",

gm4/plugins/manifest.py

@@ -1,4 +1,4 @@
-from beet import Context, TextFile
+from beet import Context, TextFile, JsonFile
 from pathlib import Path
 from typing import Any
 from functools import cache
@@ -97,6 +97,7 @@ def update_patch(ctx: Context):
 	release_dir = Path('release') / version
 	manifest_file = release_dir / "meta.json"
 	logger = parent_logger.getChild("update_patch")
+	skin_cache = JsonFile(source_path="gm4/skin_cache.json").data
 
 	modules = ctx.cache["gm4_manifest"].json["modules"]
 
@@ -119,7 +120,16 @@ def update_patch(ctx: Context):
 		deps = _traverse_includes(id) | {"base"}
 		deps_dirs = [element for sublist in [[f"{d}/data", f"{d}/*py"] for d in deps] for element in sublist]
 
-		diff = run(["git", "diff", last_commit, "--shortstat", "--", f"{id}/data", f"{id}/*.py"] + deps_dirs) if last_commit else True
+		 # add watches to skins this module uses from other modules. NOTE this could be done in a more extendable way in the future, rather than "hardcoded"
+		skin_dep_dirs: list[str] = []
+		for skin_ref in skin_cache["nonnative_references"].get(id, []):
+			d = skin_cache["skins"][skin_ref]["parent_module"]
+			ns, path = skin_ref.split(":")	
+			skin_dep_dirs.append(f"{d}/data/{ns}/skins/{path}.png")
+
+		watch_dirs = deps_dirs+skin_dep_dirs
+
+		diff = run(["git", "diff", last_commit, "--shortstat", "--", f"{id}/data", f"{id}/*.py"] + watch_dirs) if last_commit else True
 
 		if not diff and released:
 			# No changes were made, keep the same patch version

gm4/plugins/output.py

@@ -1,6 +1,5 @@
 from beet import Context
 from pathlib import Path
-from bolt import Module
 import os
 import json
 import requests
@@ -18,12 +17,13 @@
 USER_AGENT = "Gamemode4Dev/GM4_Datapacks/release-pipeline ([email protected])"
 
 def beet_default(ctx: Context):
-	"""Saves the datapack to the ./out folder."""
+	"""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")
 	out_dir = Path("out")
 
-	ctx.data[Module].clear() # manually cleanup bolt modules
-
+	yield # wait for exit phase, after other plugins cleanup
+	
 	ctx.data.save(
 		path=out_dir / f"{ctx.project_id}_{version.replace('.', '_')}",
 		overwrite=True,
@@ -33,6 +33,7 @@ def beet_default(ctx: Context):
 def release(ctx: Context):
 	"""
 	Saves the zipped datapack and metadata to the ./release/{version} folder.
+		Should be first in pipeline to properly wrap all other plugins cleanup phases
 
 	If the module has the `version` and `meta.modrinth.project_id` fields, and
 	`BEET_MODRINTH_TOKEN` environment variable is set, will try to publish a
@@ -46,7 +47,7 @@ def release(ctx: Context):
 	release_dir = Path("release") / version_dir
 	file_name = f"{ctx.project_id}_{version_dir.replace('.', '_')}.zip"
 
-	ctx.data[Module].clear() # manually cleanup bolt modules
+	yield # wait for exit phase, after other plugins cleanup
 
 	ctx.data.save(
 		path=release_dir / file_name,