stewbeet 2.0.12__tar.gz → 2.0.14__tar.gz

{stewbeet-2.0.12 → stewbeet-2.0.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stewbeet
-Version: 2.0.12
+Version: 2.0.14
 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.12 → stewbeet-2.0.14}/pyproject.toml

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

{stewbeet-2.0.12 → stewbeet-2.0.14}/stewbeet/core/constants.py

@@ -4,7 +4,7 @@
 from ..dependencies.bookshelf import BOOKSHELF_MODULES
 
 # Minecraft version constants
-MINECRAFT_VERSION: str = "1.21.6"	# Text used when loading the datapack to warn the user when the data version is not right
+MINECRAFT_VERSION: str = "1.21.7"	# Text used when loading the datapack to warn the user when the data version is not right
 DATA_VERSION: int = 4435			# Depending on MC version, given by /data get entity @p DataVersion to check if the datapack is not running in an older version of MC
 
 

{stewbeet-2.0.12 → stewbeet-2.0.14}/stewbeet/plugins/archive/__init__.py

@@ -50,6 +50,10 @@ def beet_default(ctx: Context) -> None:
 	# Create archives for each pack
 	@handle_error
 	def handle_pack(pack: DataPack | ResourcePack) -> None:
+		all_items = set(pack.all())
+		if not len(all_items) > 0:
+			return  # Skip empty packs
+
 		# Get pack name and type
 		pack_name: str = ctx.project_name.replace(" ", "") or pack.name or "pack"
 

{stewbeet-2.0.12 → stewbeet-2.0.14}/stewbeet/plugins/copy_to_destination/__init__.py

@@ -66,13 +66,14 @@ def _copy_datapacks(output_path: str, project_name_simple: str, libs_folder: str
 		libs_folder (str): The folder containing library files.
 		destinations (list[str]): List of destination paths for datapacks.
 	"""
+	any_copied: bool = False
 	main_datapack = relative_path(f"{output_path}/{project_name_simple}_datapack.zip")
 
 	if os.path.exists(main_datapack):
 		for dest in destinations:
 			dest_file = relative_path(f"{dest}/{os.path.basename(main_datapack)}")
 			if _copy_with_retry(main_datapack, dest_file):
-				info(f"Copied normal datapack to: '{dest_file}'")
+				any_copied = True
 
 	# Copy all library datapacks
 	if libs_folder:
@@ -84,7 +85,10 @@ def _copy_datapacks(output_path: str, project_name_simple: str, libs_folder: str
 					for dest in destinations:
 						dest_file = relative_path(f"{dest}/{lib_zip}")
 						if _copy_with_retry(lib_zip_path, dest_file):
-							info(f"Copied library datapack to: '{dest_file}'")
+							any_copied = True
+
+	if any_copied:
+		info(f"Copied datapacks to destinations: {', '.join(destinations)}")
 
 
 def _copy_resource_packs(output_path: str, project_name_simple: str, destinations: list[str]) -> None:
@@ -95,6 +99,7 @@ def _copy_resource_packs(output_path: str, project_name_simple: str, destination
 		project_name_simple (str): The simplified project name.
 		destinations (list[str]): List of destination paths for resource packs.
 	"""
+	any_copied: bool = False
 	merged_resource_pack: str = relative_path(f"{output_path}/{project_name_simple}_resource_pack_with_libs.zip")
 	normal_resource_pack: str = relative_path(f"{output_path}/{project_name_simple}_resource_pack.zip")
 
@@ -102,14 +107,18 @@ def _copy_resource_packs(output_path: str, project_name_simple: str, destination
 	resource_pack_to_copy: str = merged_resource_pack if os.path.exists(merged_resource_pack) else normal_resource_pack
 
 	if os.path.exists(resource_pack_to_copy):
+		pack_type = "merged" if resource_pack_to_copy == merged_resource_pack else "normal"
 		for dest in destinations:
 			# Use original name (without _with_libs suffix) for the destination
 			with_libs = "_with_libs" if resource_pack_to_copy == merged_resource_pack else ""
 			dest_name = f"{project_name_simple}_resource_pack{with_libs}.zip"
 			dest_file = relative_path(f"{dest}/{dest_name}")
 			if _copy_with_retry(resource_pack_to_copy, dest_file):
-				pack_type = "merged" if resource_pack_to_copy == merged_resource_pack else "normal"
-				info(f"Copied {pack_type} resource pack to: '{dest_file}'")
+				any_copied = True
+
+	if any_copied:
+		pack_type = "merged" if resource_pack_to_copy == merged_resource_pack else "normal"
+		info(f"Copied {pack_type} resource pack to destinations: {', '.join(destinations)}")
 
 
 def _copy_official_libs(datapack_destinations: list[str]) -> None:
@@ -125,6 +134,7 @@ def _copy_official_libs(datapack_destinations: list[str]) -> None:
 	if datapack_destinations:
 		official_datapack_path = relative_path(f"{OFFICIAL_LIBS_PATH}/datapack")
 		if os.path.exists(official_datapack_path):
+			any_copied: bool = False
 			for lib in OFFICIAL_LIBS.values():
 				if not lib.get("is_used", False):
 					continue
@@ -135,7 +145,9 @@ def _copy_official_libs(datapack_destinations: list[str]) -> None:
 					for dest in datapack_destinations:
 						dest_file = relative_path(f"{dest}/{lib_zip}")
 						if _copy_with_retry(lib_zip_path, dest_file):
-							info(f"Copied official library to: '{dest_file}'")
+							any_copied = True
+			if any_copied:
+				info(f"Copied official libraries to datapack destinations: {', '.join(datapack_destinations)}")
 
 
 def _copy_with_retry(src: str, dst: str, max_retries: int = 10, delay: float = 1.0) -> bool:

{stewbeet-2.0.12 → stewbeet-2.0.14}/stewbeet/plugins/finalyze/dependencies/__init__.py

@@ -67,12 +67,15 @@ def beet_default(ctx: Context) -> None:
 	project_name: str = ctx.project_name
 	author: str = ctx.project_author
 
+	# Track newly found official libraries
+	newly_found_libs: list[str] = []
+
 	# Find if furnace_nbt_recipes is used
 	if ns != "furnace_nbt_recipes":
 		for function in ctx.data.functions.values():
 			if "furnace_nbt_recipes" in function.text:
 				if not official_lib_used("furnace_nbt_recipes"):
-					debug("Found the use of official supported library 'furnace_nbt_recipes', adding it to the datapack")
+					newly_found_libs.append("furnace_nbt_recipes")
 				break
 
 	# Find if common_signals is used
@@ -80,7 +83,7 @@ def beet_default(ctx: Context) -> None:
 		for function in ctx.data.functions.values():
 			if "common_signals" in function.text:
 				if not official_lib_used("common_signals"):
-					debug("Found the use of official supported library 'common_signals', adding it to the datapack")
+					newly_found_libs.append("common_signals")
 				break
 
 	# Find if itemio is used
@@ -88,7 +91,7 @@ def beet_default(ctx: Context) -> None:
 		for function in ctx.data.functions.values():
 			if "itemio" in function.text:
 				if not official_lib_used("itemio"):
-					debug("Found the use of official supported library 'itemio', adding it to the datapack")
+					newly_found_libs.append("itemio")
 				break
 
 	# Find for each bookshelf module if it is used
@@ -97,9 +100,13 @@ def beet_default(ctx: Context) -> None:
 			for function in ctx.data.functions.values():
 				if f"#{module_ns}:" in function.text:
 					if not official_lib_used(module_ns):
-						debug(f"Found the use of official supported library '{module_ns}', adding it to the datapack")
+						newly_found_libs.append(module_ns)
 					break
 
+	# Debug message for newly found libraries
+	if newly_found_libs:
+		debug(f"Found the use of official supported libraries: {', '.join(newly_found_libs)}, adding them to the datapack")
+
 	# Get all dependencies (official and custom)
 	dependencies: list[tuple[str, dict]] = [(lib_ns, data) for lib_ns, data in OFFICIAL_LIBS.items() if data["is_used"]]
 	load_dependencies: JsonDict = ctx.meta.get("stewbeet", {}).get("load_dependencies", {})

{stewbeet-2.0.12 → stewbeet-2.0.14}/stewbeet/plugins/initialize/__init__.py

@@ -12,7 +12,7 @@ from stouputils.io import super_json_dump
 from stouputils.print import warning
 
 from ...core import Mem
-from .source_lore_font import find_pack_png, make_source_lore_font
+from .source_lore_font import create_source_lore_font, find_pack_png, prepare_source_lore_font
 
 
 # Main entry point
@@ -37,7 +37,7 @@ def beet_default(ctx: Context):
 	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"}]
-	make_source_lore_font(Mem.ctx.meta.stewbeet.source_lore)
+	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
@@ -92,11 +92,6 @@ def beet_default(ctx: Context):
 					os.rename(old_path, new_path)
 					warning(f"Renamed texture '{file}' to '{new_name}'")
 
-	# 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"] = Mem.ctx.assets.extra["pack.png"] = PngFile(source_path=pack_icon)
-
 	# Add missing pack format registries if not present
 	ctx.data.pack_format_registry.update({
 		(1, 21, 5): 71,
@@ -112,3 +107,18 @@ def beet_default(ctx: Context):
 	# 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(
+		isinstance(item, dict) and item.get("lore") == Mem.ctx.meta.stewbeet.source_lore
+		for item 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.12 → stewbeet-2.0.14}/stewbeet/plugins/initialize/source_lore_font.py

@@ -27,25 +27,14 @@ def find_pack_png() -> str | None:
 
 
 # Main function to create the source lore font
-def make_source_lore_font(source_lore: TextComponent) -> None:
+def prepare_source_lore_font(source_lore: TextComponent) -> str:
 
 	# If the source_lore has an ICON text component and pack_icon is present,
 	if source_lore and any(isinstance(component, dict) and "ICON" == component.get("text") for component in source_lore):
 
 		pack_icon = find_pack_png()
 		if not pack_icon:
-			return None
-
-		# Create the font file
-		Mem.ctx.assets[Mem.ctx.project_id].fonts["icons"] = Font(
-			super_json_dump({"providers": [{"type": "bitmap","file": f"{Mem.ctx.project_id}:font/original_icon.png","ascent": 8,"height": 9,"chars": ["I"]}]})
-		)
-
-		# Copy the pack.png to the resource pack
-		image: Image.Image = Image.open(pack_icon).convert("RGBA")
-		if image.width > 256:
-			image = image.resize((256, 256))
-		Mem.ctx.assets[Mem.ctx.project_id].textures["font/original_icon"] = Texture(image)
+			return ""
 
 		# Replace every ICON text component with the original icon
 		for component in source_lore:
@@ -56,6 +45,21 @@ def make_source_lore_font(source_lore: TextComponent) -> None:
 				component["font"] = f"{Mem.ctx.project_id}:icons"
 		source_lore.insert(0, "")
 		Mem.ctx.meta.stewbeet.source_lore = source_lore
+		return pack_icon
+
+	return ""
+
+def create_source_lore_font(pack_icon: str) -> None:
+	""" Create the source lore font using the provided pack icon. """
+
+	# Create the font file
+	Mem.ctx.assets[Mem.ctx.project_id].fonts["icons"] = Font(
+		super_json_dump({"providers": [{"type": "bitmap","file": f"{Mem.ctx.project_id}:font/original_icon.png","ascent": 8,"height": 9,"chars": ["I"]}]})
+	)
 
-	return None
+	# Copy the pack.png to the resource pack
+	image: Image.Image = Image.open(pack_icon).convert("RGBA")
+	if image.width > 256:
+		image = image.resize((256, 256))
+	Mem.ctx.assets[Mem.ctx.project_id].textures["font/original_icon"] = Texture(image)