stewbeet 2.0.9__tar.gz → 2.0.10__tar.gz

{stewbeet-2.0.9 → stewbeet-2.0.10}/PKG-INFO

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

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

{stewbeet-2.0.9 → stewbeet-2.0.10}/stewbeet/__init__.py

@@ -3,6 +3,7 @@
 # Imports
 from beet import *
 
+from .__main__ import main
 from .core import *
 from .plugins.initialize.source_lore_font import find_pack_png
 from .plugins.resource_pack.item_models.object import AutoModel

{stewbeet-2.0.9 → stewbeet-2.0.10}/stewbeet/plugins/auto/lang_file/__init__.py

@@ -32,6 +32,6 @@ def beet_default(ctx: Context):
 
 	# Update the lang file
 	lang.update(ctx.assets.languages.get("minecraft:en_us", Language()).data)
-	ctx.assets.languages["minecraft:en_us"] = Language(super_json_dump(lang))
+	ctx.assets.languages["minecraft:en_us"] = Language(super_json_dump(dict(sorted(lang.items()))))
 	pass
 

{stewbeet-2.0.9 → stewbeet-2.0.10}/stewbeet/plugins/custom_recipes/vanilla.py

@@ -52,7 +52,9 @@ class VanillaRecipeHandler:
                 "criteria": {"requirement": {"trigger": "minecraft:inventory_changed"}},
                 "rewards": {"function": f"{Mem.ctx.project_id}:advancements/unlock_recipes"}
             }
-            Mem.ctx.data[adv_path] = Advancement(super_json_dump(adv_json, max_level=-1))
+            adv = Advancement(adv_json)
+            adv.encoder = lambda x: super_json_dump(x, max_level=-1)
+            Mem.ctx.data[adv_path] = adv
 
             # Write the function that will unlock the recipes
             content = f"""

{stewbeet-2.0.9 → stewbeet-2.0.10}/stewbeet/plugins/initialize/__init__.py

@@ -97,6 +97,16 @@ def beet_default(ctx: Context):
 	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,
+		(1, 21, 6): 80,
+	})
+	ctx.assets.pack_format_registry.update({
+		(1, 21, 5): 55,
+		(1, 21, 6): 63,
+	})
+
 	# Yield message to indicate successful build
 	yield
 

{stewbeet-2.0.9 → stewbeet-2.0.10}/stewbeet/plugins/resource_pack/item_models/object.py

@@ -3,11 +3,12 @@
 from __future__ import annotations
 
 import os
+from collections.abc import Iterable
 
 from beet import ItemModel, Model, Texture
 from beet.core.utils import JsonDict
+from stouputils.decorators import LogLevels, handle_error, simple_cache
 from stouputils.io import super_json_dump, super_json_load
-from stouputils.print import error
 
 from ....core.__memory__ import Mem
 from ....core.constants import CUSTOM_BLOCK_VANILLA, CUSTOM_ITEM_VANILLA, OVERRIDE_MODEL
@@ -65,6 +66,7 @@ class AutoModel:
 		"""
 		return cls(item_name, data, source_textures, ignore_textures)
 
+	@handle_error(exceptions=ValueError, error_log=LogLevels.ERROR_TRACEBACK)
 	def get_powered_texture(self, variants: list[str], side: str, on_off: str) -> str:
 		""" Get the powered texture for a given side.
 
@@ -84,7 +86,7 @@ class AutoModel:
 			if texture.endswith(side):
 				return texture
 		if not self.ignore_textures:
-			error(f"Couldn't find texture for side '{side}' in '{variants}', consider adding missing texture or override the model")
+			raise ValueError(f"Couldn't find texture for side '{side}' in '{variants}', consider adding missing texture or override the model")
 		return ""
 
 	def model_in_variants(self, models: list[str], variants: list[str]) -> bool:
@@ -99,12 +101,42 @@ class AutoModel:
 		"""
 		return all(any(model in x for x in variants) for model in models)
 
+	@simple_cache
+	def get_same_folder_variants(self, variants: Iterable[str]) -> list[str]:
+		""" Get variants that are in the same folder as the item.
+
+		Args:
+			variants  (Iterable[str]): Iterable of variant names.
+
+		Returns:
+			list[str]: List of variants in the same folder.
+		"""
+		target_folder_depth: int = self.item_name.count('/')
+		same_folder_variants: list[str] = []
+		for variant in variants:
+			variant_folder_depth: int = variant.count('/')
+			if variant_folder_depth == target_folder_depth:
+				# Check if all folder parts before the filename are the same
+				if target_folder_depth == 0:
+					same_folder_variants.append(variant)
+				else:
+					target_folder: str = '/'.join(self.item_name.split('/')[:-1])
+					variant_folder: str = '/'.join(variant.split('/')[:-1])
+					if target_folder == variant_folder:
+						same_folder_variants.append(variant)
+		return same_folder_variants
+
+	@handle_error(exceptions=ValueError, error_log=LogLevels.ERROR_TRACEBACK)
 	def process(self) -> None:
 		""" Process the item model. """
 		# If no item model, return
 		if not self.data.get("item_model"):
 			return
 
+		# If item_model is already processed, return
+		if self.data["item_model"] in Mem.ctx.meta["stewbeet"]["rendered_item_models"]:
+			return
+
 		# Initialize variables
 		if (self.data.get("id") == CUSTOM_BLOCK_VANILLA or
 			any((isinstance(x, str) and "block" in x) for x in self.data.get(OVERRIDE_MODEL, {}).values())):
@@ -128,13 +160,13 @@ class AutoModel:
 
 		# Generate its model file(s)
 		for on_off in powered:
-			content: dict = {}
-
-			# Get all variants
-			variants: list[str] = [
+			content: dict = {}			# Get all variants
+			all_variants: list[str] = [
 				x.replace(".png", "") for x in self.source_textures
-				if "gui/" not in x and x.startswith(self.item_name)
+				if os.path.basename(x).startswith(self.item_name)
 			]
+			# Filter to only include variants in the same folder
+			variants: list[str] = self.get_same_folder_variants(all_variants)
 
 			if self.data.get(OVERRIDE_MODEL, None) != {}:
 				# If it's a block
@@ -188,7 +220,7 @@ class AutoModel:
 									"orientable": orientable,
 									"cube_column": cube_column
 								}, max_level=1)
-								error(
+								raise ValueError(
 									f"Block '{self.item_name}' has invalid variants: {variants},\n"
 									"consider overriding the model or adding missing textures to match up one of the following patterns:"
 									f"\n{patterns}"
@@ -297,7 +329,7 @@ class AutoModel:
 						Mem.ctx.assets[texture] = Texture(source_path=self.source_textures[texture_name], mcmeta=mcmeta)
 					else:
 						if not self.ignore_textures:
-							error(f"Texture '{texture_name}' not found in source textures")
+							raise ValueError(f"Texture '{texture_name}' not found in source textures")
 
 			# Add model to assets
 			if self.data.get(OVERRIDE_MODEL, None) != {}: