stewbeet 2.0.14__tar.gz → 2.0.16__tar.gz

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

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

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

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

@@ -90,12 +90,12 @@ def official_lib_used(lib: str) -> bool:
 	return is_used
 
 OFFICIAL_LIBS: dict[str, dict] = {
-	"common_signals":		{"version":[0, 1, 0], "name":"Common Signals",					"url":"https://github.com/Stoupy51/CommonSignals",			"is_used": False},
-	"smithed.custom_block":	{"version":[0, 7, 0], "name":"Smithed Custom Block",			"url":"https://wiki.smithed.dev/libraries/custom-block/",	"is_used": False},
-	"smithed.crafter":		{"version":[0, 7, 0], "name":"Smithed Crafter",					"url":"https://wiki.smithed.dev/libraries/crafter/",		"is_used": False},
-	"furnace_nbt_recipes":	{"version":[1, 9, 0], "name":"Furnace NBT Recipes",				"url":"https://github.com/Stoupy51/FurnaceNbtRecipes",		"is_used": False},
-	"smart_ore_generation":	{"version":[1, 7, 1], "name":"SmartOreGeneration",				"url":"https://github.com/Stoupy51/SmartOreGeneration",		"is_used": False},
-	"itemio":				{"version":[1, 4, 0], "name":"ItemIO",							"url":"https://github.com/edayot/ItemIO",					"is_used": False},
+	"common_signals":		{"version":[0, 1, 1], "name":"Common Signals",					"url":"https://github.com/Stoupy51/CommonSignals",			"is_used": False},
+	"smithed.custom_block":	{"version":[0, 7, 1], "name":"Smithed Custom Block",			"url":"https://wiki.smithed.dev/libraries/custom-block/",	"is_used": False},
+	"smithed.crafter":		{"version":[0, 7, 1], "name":"Smithed Crafter",					"url":"https://wiki.smithed.dev/libraries/crafter/",		"is_used": False},
+	"furnace_nbt_recipes":	{"version":[1, 9, 1], "name":"Furnace NBT Recipes",				"url":"https://github.com/Stoupy51/FurnaceNbtRecipes",		"is_used": False},
+	"smart_ore_generation":	{"version":[1, 7, 2], "name":"SmartOreGeneration",				"url":"https://github.com/Stoupy51/SmartOreGeneration",		"is_used": False},
+	"itemio":				{"version":[1, 4, 1], "name":"ItemIO",							"url":"https://github.com/edayot/ItemIO",					"is_used": False},
 	**BOOKSHELF_MODULES,
 }
 

stewbeet-2.0.16/stewbeet/core/utils/io.py

@@ -0,0 +1,161 @@
+
+# Imports
+from typing import Any
+
+from beet import Function, FunctionTag, JsonFile
+from beet.core.utils import JsonDict
+from stouputils.collections import unique_list
+from stouputils.io import super_json_dump
+
+from ..__memory__ import Mem
+
+
+# Functions
+def write_function_tag(path: str, functions: list[Any] | None = None, prepend: bool = False) -> None:
+	""" Write a function tag at the given path.
+
+	Args:
+		path        (str):  The path to the function tag (ex: "namespace:something" for 'data/namespace/tags/function/something.json')
+		functions   (list[Any] | None): The functions to add to the tag
+		prepend     (bool): If the functions should be prepended instead of appended
+	"""
+	if path.endswith(".json"):
+		path = path[:-len(".json")]
+	tag: FunctionTag = Mem.ctx.data.function_tags.setdefault(path)
+	data: JsonDict = tag.data
+	if not data.get("values"):
+		data["values"] = functions or []
+
+	if prepend:
+		data["values"] = functions + data["values"]
+	else:
+		data["values"].extend(functions or [])
+	data["values"] = unique_list(data["values"])
+	tag.encoder = super_json_dump
+
+
+def read_function(path: str) -> str:
+	""" Read the content of a function at the given path.
+
+	Args:
+		path (str): The path to the function (ex: "namespace:folder/function_name")
+
+	Returns:
+		str: The content of the function
+	"""
+	if path.endswith(".mcfunction"):
+		path = path[:-len(".mcfunction")]
+	return Mem.ctx.data.functions[path].text
+
+
+def write_function(path: str, content: str, overwrite: bool = False, prepend: bool = False, tags: list[str] | None = None) -> None:
+	""" Write the content to the function at the given path.
+
+	Args:
+		path            (str):  The path to the function (ex: "namespace:folder/function_name")
+		content         (str):  The content to write
+		overwrite       (bool): If the file should be overwritten (default: Append the content)
+		prepend         (bool): If the content should be prepended instead of appended (not used if overwrite is True)
+		tags            (list[str] | None): The function tags to add to the function (ex: ["namespace:something"] for 'data/namespace/tags/function/something.json')
+	"""
+	if path.endswith(".mcfunction"):
+		path = path[:-len(".mcfunction")]
+	if overwrite:
+		Mem.ctx.data.functions[path] = Function(content)
+	else:
+		if prepend:
+			Mem.ctx.data.functions.setdefault(path).prepend(content)
+		else:
+			Mem.ctx.data.functions.setdefault(path).append(content)
+	if tags:
+		for tag in tags:
+			write_function_tag(tag, [path], prepend)
+
+
+def write_load_file(content: str, overwrite: bool = False, prepend: bool = False, tags: list[str] | None = None) -> None:
+	""" Write the content to the load file
+
+	Args:
+		content     (str):  The content to write
+		overwrite   (bool): If the file should be overwritten (default: Append the content)
+		prepend     (bool): If the content should be prepended instead of appended (not used if overwrite is True)
+		tags        (list[str] | None): The function tags to add to the function (ex: ["namespace:something"] for 'data/namespace/tags/function/something.json')
+	"""
+	write_function(f"{Mem.ctx.project_id}:v{Mem.ctx.project_version}/load/confirm_load", content, overwrite, prepend, tags)
+
+
+def write_tick_file(content: str, overwrite: bool = False, prepend: bool = False, tags: list[str] | None = None) -> None:
+	""" Write the content to the tick file
+
+	Args:
+		content     (str):  The content to write
+		overwrite   (bool): If the file should be overwritten (default: Append the content)
+		prepend     (bool): If the content should be prepended instead of appended (not used if overwrite is True)
+		tags        (list[str] | None): The function tags to add to the function (ex: ["namespace:something"] for 'data/namespace/tags/function/something.json')
+	"""
+	write_function(f"{Mem.ctx.project_id}:v{Mem.ctx.project_version}/tick", content, overwrite, prepend, tags)
+
+
+def write_versioned_function(path: str, content: str, overwrite: bool = False, prepend: bool = False, tags: list[str] | None = None) -> None:
+	""" Write the content to a versioned function at the given path.
+
+	Args:
+		path            (str):  The path to the function (ex: "folder/function_name")
+		content         (str):  The content to write
+		overwrite       (bool): If the file should be overwritten (default: Append the content)
+		prepend         (bool): If the content should be prepended instead of appended (not used if overwrite is True)
+		tags            (list[str] | None): The function tags to add to the function (ex: ["namespace:something"] for 'data/namespace/tags/function/something.json')
+	"""
+	write_function(f"{Mem.ctx.project_id}:v{Mem.ctx.project_version}/{path}", content, overwrite, prepend, tags)
+
+
+# Merge two dict recuirsively
+def super_merge_dict(dict1: dict, dict2: dict) -> dict:
+	""" Merge the two dictionnaries recursively without modifying originals
+	Args:
+		dict1 (dict): The first dictionnary
+		dict2 (dict): The second dictionnary
+	Returns:
+		dict: The merged dictionnary
+	"""
+	# Copy first dictionnary
+	new_dict = {}
+	for key, value in dict1.items():
+		new_dict[key] = value
+
+	# For each key of the second dictionnary,
+	for key, value in dict2.items():
+
+		# If key exists in dict1, and both values are also dict, merge recursively
+		if key in dict1 and isinstance(dict1[key], dict) and isinstance(value, dict):
+			new_dict[key] = super_merge_dict(dict1[key], value)
+
+		# Else if it's a list, merge it
+		elif key in dict1 and isinstance(dict1[key], list) and isinstance(value, list):
+			new_dict[key] = dict1[key] + value
+			if not any(isinstance(x, dict) for x in new_dict[key]):
+				new_dict[key] = unique_list(new_dict[key])
+
+		# Else, just overwrite or add value
+		else:
+			new_dict[key] = value
+
+	# Return the new dict
+	return new_dict
+
+def set_json_encoder(obj: JsonFile, max_level: int | None = None, indent: str | int = '\t') -> JsonFile:
+	""" Set the encoder of the given object to super_json_dump
+
+	Args:
+		obj			(JsonFile):		The object to set the encoder for
+		max_level	(int | None):	The maximum level of the JSON dump, or None for default behavior
+		indent		(str | int):	The indentation character (default: '\t')
+	Returns:
+		JsonFile: The object with the encoder set
+	"""
+	if max_level is None:
+		obj.encoder = lambda x: super_json_dump(x, indent=indent)
+	else:
+		obj.encoder = lambda x: super_json_dump(x, max_level=max_level, indent=indent)
+	return obj
+

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

@@ -10,6 +10,8 @@ from stouputils.decorators import handle_error, measure_time
 from stouputils.parallel import multithreading
 from stouputils.print import progress
 
+from ..initialize.source_lore_font import find_pack_png
+
 
 def get_consistent_timestamp(ctx: Context) -> tuple[int, ...]:
 	""" Get a consistent timestamp for archive files based on beet cache .gitignore file modification time. """
@@ -87,6 +89,15 @@ 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.14 → stewbeet-2.0.16}/stewbeet/plugins/initialize/__init__.py

@@ -109,8 +109,8 @@ def beet_default(ctx: Context):
 
 	# 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()
+		Mem.ctx.meta.stewbeet.source_lore in data.get("lore", [])
+		for data in Mem.definitions.values()
 	):
 		create_source_lore_font(src_lore)
 

stewbeet-2.0.14/stewbeet/core/utils/io.py

@@ -1,136 +0,0 @@
-
-# Imports
-from typing import Any
-
-from beet import Function, FunctionTag
-from beet.core.utils import JsonDict
-from stouputils.collections import unique_list
-from stouputils.io import super_json_dump
-
-from ..__memory__ import Mem
-
-
-# Functions
-def write_function_tag(path: str, functions: list[Any] | None = None, prepend: bool = False) -> None:
-    """ Write a function tag at the given path.
-
-    Args:
-        path        (str):  The path to the function tag (ex: "namespace:something" for 'data/namespace/tags/function/something.json')
-        functions   (list[Any] | None): The functions to add to the tag
-        prepend     (bool): If the functions should be prepended instead of appended
-    """
-    tag: FunctionTag = Mem.ctx.data.function_tags.setdefault(path)
-    data: JsonDict = tag.data
-    if not data.get("values"):
-        data["values"] = functions or []
-
-    if prepend:
-        data["values"] = functions + data["values"]
-    else:
-        data["values"].extend(functions or [])
-    data["values"] = unique_list(data["values"])
-    tag.encoder = super_json_dump
-
-
-def read_function(path: str) -> str:
-    """ Read the content of a function at the given path.
-
-    Args:
-        path (str): The path to the function (ex: "namespace:folder/function_name")
-
-    Returns:
-        str: The content of the function
-    """
-    return Mem.ctx.data.functions[path].text
-
-
-def write_function(path: str, content: str, overwrite: bool = False, prepend: bool = False, tags: list[str] | None = None) -> None:
-    """ Write the content to the function at the given path.
-
-    Args:
-        path            (str):  The path to the function (ex: "namespace:folder/function_name")
-        content         (str):  The content to write
-        overwrite       (bool): If the file should be overwritten (default: Append the content)
-        prepend         (bool): If the content should be prepended instead of appended (not used if overwrite is True)
-        tags            (list[str] | None): The function tags to add to the function (ex: ["namespace:something"] for 'data/namespace/tags/function/something.json')
-    """
-    if overwrite:
-        Mem.ctx.data.functions[path] = Function(content)
-    else:
-        if prepend:
-            Mem.ctx.data.functions.setdefault(path).prepend(content)
-        else:
-            Mem.ctx.data.functions.setdefault(path).append(content)
-    if tags:
-        for tag in tags:
-            write_function_tag(tag, [path], prepend)
-
-
-def write_load_file(content: str, overwrite: bool = False, prepend: bool = False) -> None:
-    """ Write the content to the load file
-
-    Args:
-        content     (str):  The content to write
-        overwrite   (bool): If the file should be overwritten (default: Append the content)
-        prepend     (bool): If the content should be prepended instead of appended (not used if overwrite is True)
-    """
-    write_function(f"{Mem.ctx.project_id}:v{Mem.ctx.project_version}/load/confirm_load", content, overwrite, prepend)
-
-
-def write_tick_file(content: str, overwrite: bool = False, prepend: bool = False) -> None:
-    """ Write the content to the tick file
-
-    Args:
-        content     (str):  The content to write
-        overwrite   (bool): If the file should be overwritten (default: Append the content)
-        prepend     (bool): If the content should be prepended instead of appended (not used if overwrite is True)
-    """
-    write_function(f"{Mem.ctx.project_id}:v{Mem.ctx.project_version}/tick", content, overwrite, prepend)
-
-
-def write_versioned_function(path: str, content: str, overwrite: bool = False, prepend: bool = False) -> None:
-    """ Write the content to a versioned function at the given path.
-
-    Args:
-        path            (str):  The path to the function (ex: "folder/function_name")
-        content         (str):  The content to write
-        overwrite       (bool): If the file should be overwritten (default: Append the content)
-        prepend         (bool): If the content should be prepended instead of appended (not used if overwrite is True)
-    """
-    write_function(f"{Mem.ctx.project_id}:v{Mem.ctx.project_version}/{path}", content, overwrite, prepend)
-
-
-# Merge two dict recuirsively
-def super_merge_dict(dict1: dict, dict2: dict) -> dict:
-	""" Merge the two dictionnaries recursively without modifying originals
-	Args:
-		dict1 (dict): The first dictionnary
-		dict2 (dict): The second dictionnary
-	Returns:
-		dict: The merged dictionnary
-	"""
-	# Copy first dictionnary
-	new_dict = {}
-	for key, value in dict1.items():
-		new_dict[key] = value
-
-	# For each key of the second dictionnary,
-	for key, value in dict2.items():
-
-		# If key exists in dict1, and both values are also dict, merge recursively
-		if key in dict1 and isinstance(dict1[key], dict) and isinstance(value, dict):
-			new_dict[key] = super_merge_dict(dict1[key], value)
-
-		# Else if it's a list, merge it
-		elif key in dict1 and isinstance(dict1[key], list) and isinstance(value, list):
-			new_dict[key] = dict1[key] + value
-			if not any(isinstance(x, dict) for x in new_dict[key]):
-				new_dict[key] = unique_list(new_dict[key])
-
-		# Else, just overwrite or add value
-		else:
-			new_dict[key] = value
-
-	# Return the new dict
-	return new_dict
-