stewbeet 2.0.5__tar.gz → 2.0.7__tar.gz

{stewbeet-2.0.5 → stewbeet-2.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stewbeet
-Version: 2.0.5
+Version: 2.0.7
 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
@@ -18,7 +18,7 @@ Requires-Dist: model-resolver>=1.8.0
 Requires-Dist: mutagen>=1.47.0
 Requires-Dist: pyperclip>=1.8.0
 Requires-Dist: smithed>=0.19.0
-Requires-Dist: stouputils>=1.3.13
+Requires-Dist: stouputils>=1.3.16
 Description-Content-Type: text/markdown
 
 

{stewbeet-2.0.5 → stewbeet-2.0.7}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "stewbeet"
-version = "2.0.5"
+version = "2.0.7"
 description = "Beet Framework made to help generating advanced Minecraft datapack contents"
 readme = "README.md"
 license = "MIT"
@@ -16,7 +16,7 @@ classifiers = [
 	"Operating System :: OS Independent",
 ]
 dependencies = [
-	"stouputils>=1.3.13",
+	"stouputils>=1.3.16",
 	"model_resolver>=1.8.0",
 	"beet>=0.110.1",
 	"bolt>=0.49.1",

{stewbeet-2.0.5 → stewbeet-2.0.7}/stewbeet/cli.py

@@ -6,11 +6,12 @@ import shutil
 import subprocess
 import sys
 
-from beet import ProjectConfig, load_config, locate_config
+from beet import ProjectConfig
 from box import Box
 from stouputils.decorators import LogLevels, handle_error
-from stouputils.io import clean_path
-from stouputils.print import error, info
+from stouputils.print import info
+
+from .utils import get_project_config
 
 
 @handle_error(message="Error while running 'stewbeet'")
@@ -18,13 +19,7 @@ def main():
     second_arg: str = sys.argv[1] if len(sys.argv) == 2 else ""
 
     # Try to find and load the beet configuration file
-    cfg: ProjectConfig | None = None
-    if config_path := locate_config(os.getcwd(), parents=True):
-        cfg = load_config(filename=config_path)
-        if cfg:
-            os.chdir(config_path.parent)
-    if not cfg:
-        error(f"No beet config file found in the current directory '{clean_path(os.getcwd())}'")
+    cfg: ProjectConfig | None = get_project_config()
 
     # Check if the command is "clean" or "rebuild"
     if second_arg in ["clean", "rebuild"]:

{stewbeet-2.0.5 → stewbeet-2.0.7}/stewbeet/core/constants.py

@@ -94,7 +94,7 @@ OFFICIAL_LIBS: dict[str, dict] = {
 	"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, 3, 3], "name":"ItemIO",							"url":"https://github.com/edayot/ItemIO",					"is_used": False},
+	"itemio":				{"version":[1, 4, 0], "name":"ItemIO",							"url":"https://github.com/edayot/ItemIO",					"is_used": False},
 	**BOOKSHELF_MODULES,
 }
 

{stewbeet-2.0.5 → stewbeet-2.0.7}/stewbeet/core/utils/sounds.py

@@ -33,8 +33,12 @@ def add_sound(ctx: Context, sounds: Sound | dict[str, Sound], name: str, ns: str
 		ctx.assets[ns].sounds[path] = sound
 
 	# Create a new sound config
+	# Use subtitle from the first sound if available, otherwise use the sound name
+	first_sound = next(iter(sounds.values()))
+	subtitle = first_sound.subtitle if first_sound.subtitle else name.split("/")[-1]
+
 	new_config: JsonDict = {name: {
-		"subtitle": name.split("/")[-1],
+		"subtitle": subtitle,
 		"sounds": [
 			{
 				"name": f"{ns}:{path}",

{stewbeet-2.0.5 → stewbeet-2.0.7}/stewbeet/plugins/datapack/custom_blocks/__init__.py

@@ -407,10 +407,12 @@ execute as @e[tag={ns}.custom_block,dx=0,dy=0,dz=0] at @s run function {ns}:cust
 			# Make search function
 			content = "# Search where the head has been placed\n"
 			mid_x, mid_y, mid_z = [x // 2 for x in CUSTOM_BLOCK_HEAD_CUBE_RADIUS]
-			for x in range(-mid_x, mid_x + 1):
-				for y in range(-mid_y, mid_y + 1):
-					for z in range(-mid_z, mid_z + 1):
-						content += f"execute positioned ~{x} ~{y} ~{z} if data block ~ ~ ~ components.\"minecraft:custom_data\".{ns}.{item} run function {ns}:custom_blocks/{item}/place_main\n"
+			content += f"""
+for x in range({-mid_x}, {mid_x + 1}):
+	for y in range({-mid_y}, {mid_y + 1}):
+		for z in range({-mid_z}, {mid_z + 1}):
+			execute positioned ~x ~y ~z if data block ~ ~ ~ components.\"minecraft:custom_data\".{ns}.{item} run function {ns}:custom_blocks/{item}/place_main
+"""
 			content += f"\n# Advancement\nadvancement revoke @s only {ns}:custom_block_head/{item}\n\n"
 			write_function(f"{ns}:custom_blocks/_player_head/search_{item}", content)
 

{stewbeet-2.0.5 → stewbeet-2.0.7}/stewbeet/plugins/ingame_manual/__init__.py

@@ -6,7 +6,7 @@ from stouputils.decorators import measure_time
 from stouputils.print import progress, warning
 
 from ...core.__memory__ import Mem
-from .main import main as manual_main
+from .main import manual_main
 from .shared_import import SharedMemory
 
 

{stewbeet-2.0.5 → stewbeet-2.0.7}/stewbeet/plugins/ingame_manual/main.py

@@ -84,8 +84,7 @@ from .shared_import import (
 def deepcopy(x):
 	return json.loads(json.dumps(x))
 
-@measure_time(info, "Added manual to the definitions")
-def main():
+def manual_main():
 	# Copy everything in the manual assets folder to the templates folder
 	os.makedirs(TEMPLATES_PATH, exist_ok = True)
 	shutil.copytree(MANUAL_ASSETS_PATH + "assets", TEMPLATES_PATH, dirs_exist_ok = True)
@@ -102,7 +101,7 @@ def main():
 
 def routine():
 	manual_config: JsonDict = Mem.ctx.meta.get("stewbeet",{}).get("manual", {})
-	manual_debug: str = manual_config.get("manual_debug", "")
+	json_dump_path: str = manual_config.get("json_dump_path", "")
 	manual_name: str = manual_config.get("name", "")
 	if not manual_name:
 		manual_name = f"{Mem.ctx.project_name} Manual"
@@ -162,8 +161,8 @@ def routine():
 
 	# If the manual cache is enabled and we have a cache file, load it
 	cache_pages: bool = manual_config.get("cache_pages", False)
-	if cache_pages and manual_debug and os.path.exists(manual_debug) and os.path.exists(f"{SharedMemory.cache_path}/font/manual.json"):
-		with super_open(manual_debug, "r") as f:
+	if cache_pages and json_dump_path and os.path.exists(json_dump_path) and os.path.exists(f"{SharedMemory.cache_path}/font/manual.json"):
+		with super_open(json_dump_path, "r") as f:
 			book_content = json.load(f)
 
 	# Else, generate all
@@ -630,11 +629,11 @@ def routine():
 			f.write(super_json_dump(fonts))
 
 		# Debug book_content
-		manual_debug: str = manual_config.get("json_dump_path", "")
-		if manual_debug:
-			with super_open(manual_debug, "w") as f:
+		json_dump_path: str = manual_config.get("json_dump_path", "")
+		if json_dump_path:
+			with super_open(json_dump_path, "w") as f:
 				f.write(super_json_dump(book_content))
-			debug(f"Debug book_content at '{relative_path(manual_debug)}'")
+			debug(f"Debug book_content at '{relative_path(json_dump_path)}'")
 
 
 	# Copy the font provider and the generated textures to the resource pack

{stewbeet-2.0.5 → stewbeet-2.0.7}/stewbeet/plugins/initialize/__init__.py

@@ -9,14 +9,14 @@ 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 progress, warning
+from stouputils.print import warning
 
 from ...core import Mem
 from .source_lore_font import make_source_lore_font
 
 
 # Main entry point
-@measure_time(progress, message="Execution time of 'stewbeet.plugins.initialize'")
+@measure_time(message="Total execution time", is_generator=True)
 def beet_default(ctx: Context):
 
 	# Assertions
@@ -92,5 +92,6 @@ def beet_default(ctx: Context):
 					os.rename(old_path, new_path)
 					warning(f"Renamed texture {file} to {new_name}")
 
-	pass
+	# Yield message to indicate successful build
+	yield
 

{stewbeet-2.0.5 → stewbeet-2.0.7}/stewbeet/plugins/resource_pack/item_models/object.py

@@ -114,11 +114,9 @@ class AutoModel:
 
 		# Get powered states (if any)
 		powered = [""]
-		on_textures = []
 		for texture_name in self.source_textures:
 			if texture_name.startswith(self.item_name) and texture_name.endswith("_on.png"):
 				powered = ["", "_on"]
-				on_textures.append(texture_name)
 
 		# Debug
 		if False:
@@ -127,7 +125,6 @@ class AutoModel:
 			print(f"Block or item: {self.block_or_item}")
 			print(f"Overrides: {overrides}")
 			print(f"Powered states: {powered}")
-			print(f"On textures: {on_textures}")
 
 		# Generate its model file(s)
 		for on_off in powered:
@@ -144,7 +141,6 @@ class AutoModel:
 				if self.block_or_item == "block":
 					# Get parent
 					content = {"parent": "block/cube_all", "textures": {}}
-
 					# Check in which variants state we are
 					variants_without_on = [x for x in variants if "_on" not in x]
 					if len(variants_without_on) == 1:
@@ -269,7 +265,7 @@ class AutoModel:
 
 			# Add overrides
 			for key, value in overrides.items():
-				content[key] = value
+				content[key] = value.copy() if isinstance(value, dict) else value
 
 			# If powered, check if the on state is in the variants and add it
 			if on_off == "_on":

{stewbeet-2.0.5 → stewbeet-2.0.7}/stewbeet/plugins/resource_pack/sounds/__init__.py

@@ -45,9 +45,8 @@ def beet_default(ctx: Context):
 	sounds_names: list[str] = [sound for sound in all_files if sound.endswith(".ogg")]
 	if not sounds_names:
 		return
-
 	# Dictionary to group sound variants
-	sound_groups: dict[str, list[str]] = defaultdict(list)
+	sound_groups: dict[str, list[tuple[str, str]]] = defaultdict(list)
 
 	def handle_sound(sound: str) -> None:
 		""" Process a single sound file.
@@ -78,14 +77,14 @@ def beet_default(ctx: Context):
 		sounds: dict[str, Sound] = {}
 
 		# Process each variant
-		for variant in sorted(variants):
+		for variant_rel_sound in sorted(variants):
 			# Get variant name without extension
-			variant_name: str = os.path.splitext(variant)[0]
+			variant_name: str = os.path.splitext(variant_rel_sound)[0]
 
 			# Create Sound object for this variant
-			sounds[variant_name] = Sound(
-				source_path=clean_path(f"{sounds_folder}/{variant}"),
-				subtitle=base_name.split("/")[-1]
+			sounds[variant_name.lower().replace(" ","_")] = Sound(
+				source_path=clean_path(f"{sounds_folder}/{variant_rel_sound}"),
+				subtitle=variant_name
 			)
 
 		# Add all variants to the sound system

stewbeet-2.0.7/stewbeet/utils.py

@@ -0,0 +1,28 @@
+
+
+# Imports
+import os
+
+from beet import ProjectConfig, load_config, locate_config
+from stouputils.io import clean_path
+from stouputils.print import error
+
+
+# Try to find and load the beet configuration file
+def get_project_config(directory: str = os.getcwd()) -> ProjectConfig | None:
+    """ Get the project configuration from the current directory.
+
+    If no configuration file is found, it returns None and prints an error message.
+
+    Args:
+        directory (str): The directory to search for the configuration file. Defaults to the current working directory.
+    """
+    cfg: ProjectConfig | None = None
+    if config_path := locate_config(directory, parents=True):
+        cfg = load_config(filename=config_path)
+        if cfg:
+            os.chdir(config_path.parent)
+    if not cfg:
+        error(f"No beet config file found in the current directory '{clean_path(directory)}'")
+    return cfg
+