stewbeet 2.2.3__tar.gz → 2.2.5__tar.gz

{stewbeet-2.2.3 → stewbeet-2.2.5}/PKG-INFO

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

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

{stewbeet-2.2.3 → stewbeet-2.2.5}/stewbeet/plugins/initialize/__init__.py

@@ -14,7 +14,7 @@ from stouputils.print import warning
 
 from ...core import Mem
 from ...core.constants import MORE_ASSETS_PACK_FORMATS, MORE_DATA_PACK_FORMATS, MORE_DATA_VERSIONS
-from .source_lore_font import prepare_source_lore_font
+from .source_lore_font import find_pack_png, prepare_source_lore_font
 
 
 # Main entry point
@@ -41,7 +41,10 @@ def beet_default(ctx: Context):
 	# Preprocess source lore
 	source_lore: TextComponent = Mem.ctx.meta.get("stewbeet", {}).get("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"}]
+		if not find_pack_png():
+			Mem.ctx.meta["stewbeet"]["source_lore"] = [{"text": ctx.project_name,"italic":True,"color":"blue"}]
+		else:
+			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.get("stewbeet", {}).get("source_lore", []))
 
 	# Preprocess manual name

{stewbeet-2.2.3 → stewbeet-2.2.5}/stewbeet/plugins/verify_definitions/__init__.py

@@ -8,7 +8,7 @@ from beet import Context
 from beet.core.utils import JsonDict
 from stouputils.decorators import measure_time
 from stouputils.io import relative_path, super_json_dump, super_open
-from stouputils.print import debug, error, info, progress
+from stouputils.print import debug, error, info, progress, warning
 
 from ...core.__memory__ import Mem
 from ...core.constants import (
@@ -63,8 +63,18 @@ def beet_default(ctx: Context) -> None:
 
 	# Check every single thing in the definitions
 	errors: list[str] = []
+	warnings: list[str] = []
 	for item, data in Mem.definitions.items():
 
+		# Check if components doesn't start with "minecraft:", if so rename them
+		to_replace: bool = False
+		for k in data.keys():
+			if k.startswith("minecraft:"):
+				warnings.append(f"Remove the 'minecraft:' prefix from key '{k}' in item '{item}', as it's automatically added by stewbeet.")
+				to_replace = True
+		if to_replace:
+			Mem.definitions[item] = data = {k[10:] if k.startswith("minecraft:") else k: v for k, v in data.items()}
+
 		# Check if the item uses a reserved name
 		if item == "heavy_workbench":
 			errors.append(f"'{item}' is reserved for the heavy workbench used for NBT recipes, please use another name")
@@ -266,6 +276,8 @@ def beet_default(ctx: Context) -> None:
 	# Log errors if any
 	if errors:
 		error("Errors found in the definitions during verification:\n- " + "\n- ".join(errors))
+	elif warnings:
+		warning("Warnings found in the definitions during verification:\n- " + "\n- ".join(warnings))
 	else:
 		info("No errors found in the definitions during verification")