stewbeet 2.0.16__tar.gz → 2.0.18__tar.gz

{stewbeet-2.0.16 → stewbeet-2.0.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stewbeet
-Version: 2.0.16
+Version: 2.0.18
 Summary: Beet Framework made to help generating advanced Minecraft datapack contents
 Project-URL: Homepage, https://github.com/Stoupy51/stewbeet
 Project-URL: Issues, https://github.com/Stoupy51/stewbeet/issues

{stewbeet-2.0.16 → stewbeet-2.0.18}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "stewbeet"
-version = "2.0.16"
+version = "2.0.18"
 description = "Beet Framework made to help generating advanced Minecraft datapack contents"
 readme = "README.md"
 license = "MIT"

{stewbeet-2.0.16 → stewbeet-2.0.18}/stewbeet/__init__.py

@@ -9,3 +9,8 @@ from .plugins.initialize.source_lore_font import find_pack_png
 from .plugins.resource_pack.item_models.object import AutoModel
 from .plugins.resource_pack.sounds import add_sound
 
+
+def beet_default(ctx: Context):
+    """ Initializes the StewBeet package. """
+    ctx.require("stewbeet.plugins.initialize")
+

stewbeet-2.0.18/stewbeet/all.py

@@ -0,0 +1,50 @@
+
+# Imports
+from beet import Context
+
+# Constants
+GENERATION_PLUGINS = (
+    "stewbeet.plugins.verify_definitions",
+    "stewbeet.plugins.resource_pack.sounds",
+    "stewbeet.plugins.resource_pack.item_models",
+    "stewbeet.plugins.resource_pack.check_power_of_2",
+    "stewbeet.plugins.custom_recipes",
+    "stewbeet.plugins.ingame_manual",
+    "stewbeet.plugins.datapack.loading",
+    "stewbeet.plugins.datapack.custom_blocks",
+    "stewbeet.plugins.datapack.loot_tables",
+    "stewbeet.plugins.compatibilities.simpledrawer",
+    "stewbeet.plugins.compatibilities.neo_enchant"
+)
+FINALYZE_PLUGINS = (
+    "stewbeet.plugins.finalyze.custom_blocks_ticking",
+    "stewbeet.plugins.finalyze.basic_datapack_structure",
+    "stewbeet.plugins.finalyze.dependencies",
+    "stewbeet.plugins.finalyze.check_unused_textures",
+    "stewbeet.plugins.finalyze.last_final",
+    "stewbeet.plugins.auto.headers",
+    "stewbeet.plugins.archive",
+    "stewbeet.plugins.merge_smithed_weld",
+    "stewbeet.plugins.copy_to_destination",
+    "stewbeet.plugins.compute_sha1"
+)
+
+def beet_default(ctx: Context):
+    """ Run all plugins that should run after definitions are loaded.
+    This function will yield before finalizing the project (so users can run their own plugins in the middle of the pipeline).
+
+    Requires:
+        - StewBeet to be initialized (e.g. from stewbeet.plugins.initialize).
+        - Definitions to be loaded
+    """
+    # Assertions
+    for x in GENERATION_PLUGINS:
+        ctx.require(x)
+
+    # Yield to allow user code to run
+    yield
+
+    # After user code, run the final plugins
+    for x in FINALYZE_PLUGINS:
+        ctx.require(x)
+

{stewbeet-2.0.16 → stewbeet-2.0.18}/stewbeet/plugins/archive/__init__.py

@@ -81,6 +81,16 @@ def beet_default(ctx: Context) -> None:
 			for item in temp_zip.filelist:
 				temp_contents[item.filename] = temp_zip.read(item.filename)
 
+		# Check if pack.png exists and prepare it
+		pack_png_path = find_pack_png()
+		if pack_png_path:
+			# Remove pack.png from temp_contents if it exists to avoid duplicates
+			temp_contents.pop("pack.png", None)
+
+			# Read pack.png content
+			with open(pack_png_path, "rb") as f:
+				temp_contents["pack.png"] = f.read()
+
 		# Recreate the zip file with proper timestamps and compression
 		with zipfile.ZipFile(archive_path, "w", compression=zipfile.ZIP_DEFLATED, compresslevel=6) as final_zip:
 			for filename, content in temp_contents.items():
@@ -89,15 +99,6 @@ def beet_default(ctx: Context) -> None:
 				info.compress_type = zipfile.ZIP_DEFLATED
 				final_zip.writestr(info, content)
 
-			# Check if pack.png exists and add it to the final zip if it does
-			pack_png_path = find_pack_png()
-			if pack_png_path:
-				info = ZipInfo("pack.png")
-				info.compress_type = zipfile.ZIP_DEFLATED
-				info.date_time = consistent_time
-				with open(pack_png_path, "rb") as f:
-					final_zip.writestr(info, f.read())
-
 	# Process each pack in parallel
 	multithreading(handle_pack, ctx.packs, max_workers=len(ctx.packs))
 

stewbeet-2.0.18/stewbeet/plugins/finalyze/last_final/__init__.py

@@ -0,0 +1,30 @@
+
+# Imports
+from beet import Context, PngFile
+from stouputils.decorators import measure_time
+from stouputils.print import progress
+
+from ....core import Mem
+from ...initialize.source_lore_font import create_source_lore_font, find_pack_png
+
+
+# Main entry point
+@measure_time(progress, message="Execution time of 'stewbeet.plugins.finalyze.last_final'")
+def beet_default(ctx: Context):
+
+	# If source lore is present and there are item definitions using it, create the source lore font
+	src_lore: str = Mem.ctx.meta.stewbeet.get("pack_icon_path", "")
+	if src_lore and Mem.ctx.meta.stewbeet.source_lore and any(
+		Mem.ctx.meta.stewbeet.source_lore in data.get("lore", [])
+		for data in Mem.definitions.values()
+	):
+		create_source_lore_font(src_lore)
+
+	# Add the pack icon to the output directory for datapack and resource pack
+	pack_icon = find_pack_png()
+	if pack_icon:
+		Mem.ctx.data.extra["pack.png"] = PngFile(source_path=pack_icon)
+		all_assets = set(Mem.ctx.assets.all())
+		if len(all_assets) > 0:
+			Mem.ctx.assets.extra["pack.png"] = PngFile(source_path=pack_icon)
+

{stewbeet-2.0.16 → stewbeet-2.0.18}/stewbeet/plugins/ingame_manual/main.py

@@ -3,13 +3,14 @@
 import json
 import os
 import shutil
+from pathlib import Path
 from typing import Any
 
 from beet import Font, Texture
 from beet.core.utils import JsonDict, TextComponent
 from PIL import Image
 from stouputils.collections import unique_list
-from stouputils.io import relative_path, super_json_dump, super_open
+from stouputils.io import clean_path, relative_path, super_json_dump, super_open
 from stouputils.parallel import colored_for_loop
 from stouputils.print import debug, error, suggestion, warning
 
@@ -678,7 +679,12 @@ def routine():
 
 	# Add the model to the resource pack if it doesn't already exist
 	if not manual_already_exists:
-		AutoModel.from_definitions("manual", Mem.definitions["manual"], {})
+		textures_folder: str = relative_path(Mem.ctx.meta.get("stewbeet", {}).get("textures_folder", ""))
+		textures: dict[str, str] = {
+			clean_path(str(p)).split("/")[-1]: relative_path(p)
+			for p in Path(textures_folder).rglob("*.png")
+		}
+		AutoModel.from_definitions("manual", Mem.definitions["manual"], textures).process()
 
 	# Remove the heavy workbench from the definitions
 	if OFFICIAL_LIBS["smithed.crafter"]["is_used"]:

{stewbeet-2.0.16 → stewbeet-2.0.18}/stewbeet/plugins/initialize/__init__.py

@@ -1,124 +1,109 @@
-
-# Imports
-import os
-from pathlib import Path
-
-from beet import Context, Pack, PngFile
-from beet.core.utils import JsonDict, TextComponent
-from box import Box
-from stouputils import relative_path
-from stouputils.decorators import measure_time
-from stouputils.io import super_json_dump
-from stouputils.print import warning
-
-from ...core import Mem
-from .source_lore_font import create_source_lore_font, find_pack_png, prepare_source_lore_font
-
-
-# Main entry point
-@measure_time(message="Total execution time", is_generator=True)
-def beet_default(ctx: Context):
-
-	# Assertions
-	assert ctx.project_id, "Project ID must be set in the project configuration."
-
-	# Store the Box object in ctx for access throughout the codebase
-	meta_box: Box = Box(ctx.meta, default_box=True, default_box_attr={})
-	object.__setattr__(ctx, "meta", meta_box) # Bypass FrozenInstanceError
-	Mem.ctx = ctx
-
-	# Preprocess project description
-	project_description: TextComponent = Mem.ctx.meta.stewbeet.project_description
-	if not project_description or project_description == "auto":
-		# Use project name, version, and author to create a default description
-		Mem.ctx.meta.stewbeet.project_description = f"{ctx.project_name} [{ctx.project_version}] by {ctx.project_author}"
-
-	# Preprocess source lore
-	source_lore: TextComponent = Mem.ctx.meta.stewbeet.source_lore
-	if not source_lore or source_lore == "auto":
-		Mem.ctx.meta.stewbeet.source_lore = [{"text":"ICON"},{"text":f" {ctx.project_name}","italic":True,"color":"blue"}]
-	src_lore: str = prepare_source_lore_font(Mem.ctx.meta.stewbeet.source_lore)
-
-	# Preprocess manual name
-	manual_name: TextComponent = Mem.ctx.meta.stewbeet.manual.name
-	if not manual_name:
-		Mem.ctx.meta.stewbeet.manual.name = f"{ctx.project_name} Manual"
-
-	# Convert paths to relative ones
-	object.__setattr__(ctx, "output_directory", relative_path(Mem.ctx.output_directory))
-
-	# Helper function to setup pack.mcmeta
-	def setup_pack_mcmeta(pack: Pack, pack_format: int):
-		existing_mcmeta = pack.mcmeta.data or {}
-		pack_mcmeta: JsonDict = {"pack": {}}
-		pack_mcmeta.update(existing_mcmeta)
-		pack_mcmeta["pack"].update(existing_mcmeta.get("pack", {}))
-		pack_mcmeta["pack"]["pack_format"] = pack_format
-		pack_mcmeta["pack"]["description"] = Mem.ctx.meta.stewbeet.project_description
-		pack_mcmeta["id"] = Mem.ctx.project_id
-		pack.mcmeta.data = pack_mcmeta
-		pack.mcmeta.encoder = super_json_dump
-
-	# Setup pack.mcmeta for both packs
-	setup_pack_mcmeta(ctx.data, ctx.data.pack_format)
-	setup_pack_mcmeta(ctx.assets, ctx.assets.pack_format)
-
-	# Convert texture names if needed (from old legacy system)
-	textures_folder = Mem.ctx.meta.stewbeet.get("textures_folder")
-	if textures_folder and Path(textures_folder).exists():
-		REPLACEMENTS = {
-			"_off": "",
-			"_down": "_bottom",
-			"_up": "_top",
-			"_north": "_front",
-			"_south": "_back",
-			"_west": "_left",
-			"_east": "_right",
-		}
-
-		# Get all texture files
-		texture_files = [f for f in os.listdir(textures_folder) if f.endswith(('.png', '.jpg', '.jpeg', ".mcmeta"))]
-
-		for file in texture_files:
-			new_name = file.lower()
-			for k, v in REPLACEMENTS.items():
-				if k in file:
-					new_name = new_name.replace(k, v)
-
-			if new_name != file:
-				old_path = Path(textures_folder) / file
-				new_path = Path(textures_folder) / new_name
-				if old_path.exists() and not new_path.exists():
-					os.rename(old_path, new_path)
-					warning(f"Renamed texture '{file}' to '{new_name}'")
-
-	# Add missing pack format registries if not present
-	ctx.data.pack_format_registry.update({
-		(1, 21, 5): 71,
-		(1, 21, 6): 80,
-		(1, 21, 7): 81,
-	})
-	ctx.assets.pack_format_registry.update({
-		(1, 21, 5): 55,
-		(1, 21, 6): 63,
-		(1, 21, 7): 64,
-	})
-
-	# Yield message to indicate successful build
-	yield
-
-	# If source lore is present and there are item definitions using it, create the source lore font
-	if src_lore and Mem.ctx.meta.stewbeet.source_lore and any(
-		Mem.ctx.meta.stewbeet.source_lore in data.get("lore", [])
-		for data in Mem.definitions.values()
-	):
-		create_source_lore_font(src_lore)
-
-	# Add the pack icon to the output directory for datapack and resource pack
-	pack_icon = find_pack_png()
-	if pack_icon:
-		Mem.ctx.data.extra["pack.png"] = PngFile(source_path=pack_icon)
-		all_assets = set(Mem.ctx.assets.all())
-		if len(all_assets) > 0:
-			Mem.ctx.assets.extra["pack.png"] = PngFile(source_path=pack_icon)
-
+
+# Imports
+import os
+from pathlib import Path
+
+from beet import Context, Pack
+from beet.core.utils import JsonDict, TextComponent
+from box import Box
+from stouputils import relative_path
+from stouputils.decorators import measure_time
+from stouputils.io import super_json_dump
+from stouputils.print import warning
+
+from ...core import Mem
+from .source_lore_font import prepare_source_lore_font
+
+
+# Main entry point
+@measure_time(message="Total execution time", is_generator=True)
+def beet_default(ctx: Context):
+
+	# Assertions
+	assert ctx.project_id, "Project ID must be set in the project configuration."
+
+	# Store the Box object in ctx for access throughout the codebase
+	meta_box: Box = Box(ctx.meta, default_box=True, default_box_attr={})
+	object.__setattr__(ctx, "meta", meta_box) # Bypass FrozenInstanceError
+	Mem.ctx = ctx
+
+	# Preprocess project description
+	project_description: TextComponent = Mem.ctx.meta.stewbeet.project_description
+	if not project_description or project_description == "auto":
+		# Use project name, version, and author to create a default description
+		Mem.ctx.meta.stewbeet.project_description = f"{ctx.project_name} [{ctx.project_version}] by {ctx.project_author}"
+
+	# Preprocess source lore
+	source_lore: TextComponent = Mem.ctx.meta.stewbeet.source_lore
+	if not source_lore or source_lore == "auto":
+		Mem.ctx.meta.stewbeet.source_lore = [{"text":"ICON"},{"text":f" {ctx.project_name}","italic":True,"color":"blue"}]
+	Mem.ctx.meta.stewbeet["pack_icon_path"] = prepare_source_lore_font(Mem.ctx.meta.stewbeet.source_lore)
+
+	# Preprocess manual name
+	manual_name: TextComponent = Mem.ctx.meta.stewbeet.manual.name
+	if not manual_name:
+		Mem.ctx.meta.stewbeet.manual.name = f"{ctx.project_name} Manual"
+
+	# Convert paths to relative ones
+	object.__setattr__(ctx, "output_directory", relative_path(Mem.ctx.output_directory))
+
+	# Helper function to setup pack.mcmeta
+	def setup_pack_mcmeta(pack: Pack, pack_format: int):
+		existing_mcmeta = pack.mcmeta.data or {}
+		pack_mcmeta: JsonDict = {"pack": {}}
+		pack_mcmeta.update(existing_mcmeta)
+		pack_mcmeta["pack"].update(existing_mcmeta.get("pack", {}))
+		pack_mcmeta["pack"]["pack_format"] = pack_format
+		pack_mcmeta["pack"]["description"] = Mem.ctx.meta.stewbeet.project_description
+		pack_mcmeta["id"] = Mem.ctx.project_id
+		pack.mcmeta.data = pack_mcmeta
+		pack.mcmeta.encoder = super_json_dump
+
+	# Setup pack.mcmeta for both packs
+	setup_pack_mcmeta(ctx.data, ctx.data.pack_format)
+	setup_pack_mcmeta(ctx.assets, ctx.assets.pack_format)
+
+	# Convert texture names if needed (from old legacy system)
+	textures_folder = Mem.ctx.meta.stewbeet.get("textures_folder")
+	if textures_folder and Path(textures_folder).exists():
+		REPLACEMENTS = {
+			"_off": "",
+			"_down": "_bottom",
+			"_up": "_top",
+			"_north": "_front",
+			"_south": "_back",
+			"_west": "_left",
+			"_east": "_right",
+		}
+
+		# Get all texture files
+		texture_files = [f for f in os.listdir(textures_folder) if f.endswith(('.png', '.jpg', '.jpeg', ".mcmeta"))]
+
+		for file in texture_files:
+			new_name = file.lower()
+			for k, v in REPLACEMENTS.items():
+				if k in file:
+					new_name = new_name.replace(k, v)
+
+			if new_name != file:
+				old_path = Path(textures_folder) / file
+				new_path = Path(textures_folder) / new_name
+				if old_path.exists() and not new_path.exists():
+					os.rename(old_path, new_path)
+					warning(f"Renamed texture '{file}' to '{new_name}'")
+
+	# Add missing pack format registries if not present
+	ctx.data.pack_format_registry.update({
+		(1, 21, 5): 71,
+		(1, 21, 6): 80,
+		(1, 21, 7): 81,
+	})
+	ctx.assets.pack_format_registry.update({
+		(1, 21, 5): 55,
+		(1, 21, 6): 63,
+		(1, 21, 7): 64,
+	})
+
+	# Yield message to indicate successful build
+	yield
+

{stewbeet-2.0.16 → stewbeet-2.0.18}/stewbeet/plugins/initialize/source_lore_font.py

@@ -63,3 +63,10 @@ def create_source_lore_font(pack_icon: str) -> None:
 		image = image.resize((256, 256))
 	Mem.ctx.assets[Mem.ctx.project_id].textures["font/original_icon"] = Texture(image)
 
+def delete_source_lore_font() -> None:
+	""" Delete the source lore font if it exists. """
+	if Mem.ctx.assets[Mem.ctx.project_id].fonts.get("icons"):
+		del Mem.ctx.assets[Mem.ctx.project_id].fonts["icons"]
+	if Mem.ctx.assets[Mem.ctx.project_id].textures.get("font/original_icon"):
+		del Mem.ctx.assets[Mem.ctx.project_id].textures["font/original_icon"]
+