stewbeet 2.1.7__tar.gz → 2.1.8__tar.gz

{stewbeet-2.1.7 → stewbeet-2.1.8}/PKG-INFO

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

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

{stewbeet-2.1.7 → stewbeet-2.1.8}/stewbeet/contrib/simplenergy/gui.py

@@ -25,7 +25,7 @@ class GuiTranslation(Enum):
 	""" Assume you are placing GUI item model in the __27th__ slot of a barrel. """
 
 # Setup GUI in resource packs
-def setup_gui_in_resource_packs(gui_translations: dict[str, GuiTranslation]) -> dict[str, str]:
+def setup_gui_in_resource_packs(gui_translations: dict[str, list[int]]) -> dict[str, str]:
 	""" Setup GUI item models in resource packs by creating item models and textures for each GUI.
 
 	Args:

{stewbeet-2.1.7 → stewbeet-2.1.8}/stewbeet/plugins/ingame_manual/iso_renders.py

@@ -7,16 +7,14 @@ import requests
 from beet import Model
 from beet.core.utils import JsonDict
 from model_resolver import Render  # pyright: ignore[reportMissingTypeStubs]
-from stouputils.io import super_copy, super_open
+from stouputils.io import super_open
 from stouputils.parallel import multithreading
 from stouputils.print import debug, warning
 
 from ...core.__memory__ import Mem
 from ...core.constants import (
-	CUSTOM_BLOCK_VANILLA,
 	DOWNLOAD_VANILLA_ASSETS_RAW,
 	DOWNLOAD_VANILLA_ASSETS_SOURCE,
-	OVERRIDE_MODEL,
 	RESULT_OF_CRAFTING,
 	USED_FOR_CRAFTING,
 )
@@ -33,7 +31,6 @@ def generate_all_iso_renders():
 
 	# For every item, get the model path and the destination path
 	cache_assets: bool = Mem.ctx.meta.get("stewbeet",{}).get("manual", {}).get("cache_assets", True)
-	textures_folder: str = Mem.ctx.meta.get("stewbeet",{}).get("textures_folder", "assets/textures")
 	for_model_resolver: dict[str, str] = {}
 	for item, data in Mem.definitions.items():
 
@@ -41,30 +38,16 @@ def generate_all_iso_renders():
 		if not data.get("item_model"):
 			continue
 
-		# If it's not a block, simply copy the texture
-		try:
-			if data["id"] == CUSTOM_BLOCK_VANILLA:
-				raise ValueError()
-			if not os.path.exists(f"{path}/{ns}/{item}.png") or not cache_assets:
-				if data.get(OVERRIDE_MODEL, None) != {}:
-					source: str = f"{textures_folder}/{item}.png"
-					if os.path.exists(source):
-						super_copy(source, f"{path}/{ns}/{item}.png")
-					else:
-						warning(f"Missing texture for item '{item}', please add it manually to '{path}/{ns}/{item}.png'")
-
-		# Else, add the block to the model resolver list
-		except ValueError:
-			# Skip if item is already generated (to prevent OpenGL launching for nothing)
-			if os.path.exists(f"{path}/{ns}/{item}.png") and cache_assets:
-				continue
-
-			# Add to the model resolver queue (only if present in resource pack)
-			model: Model | None = Mem.ctx.assets[ns].models.get(f"item/{item}")
-			rp_path = f"{ns}:item/{item}"
-			dst_path = f"{path}/{ns}/{item}.png"
-			if model is not None and model.get_content().get("textures", None) is not None: # type: ignore
-				for_model_resolver[rp_path] = dst_path
+		# Skip if item is already generated (to prevent OpenGL launching for nothing)
+		if os.path.exists(f"{path}/{ns}/{item}.png") and cache_assets:
+			continue
+
+		# Add to the model resolver queue (only if present in resource pack)
+		model: Model | None = Mem.ctx.assets[ns].models.get(f"item/{item}")
+		rp_path = f"{ns}:item/{item}"
+		dst_path = f"{path}/{ns}/{item}.png"
+		if model is not None and model.get_content().get("textures", None) is not None: # type: ignore
+			for_model_resolver[rp_path] = dst_path
 
 	# Launch model resolvers for remaining blocks
 	if len(for_model_resolver) > 0:

{stewbeet-2.1.7 → stewbeet-2.1.8}/stewbeet/plugins/ingame_manual/main.py

@@ -245,7 +245,7 @@ def routine():
 			if page["type"] == CATEGORY:
 				file_name = name.replace(" ", "_").replace("#", "").lower()
 				page_font = get_page_font(number)
-				SharedMemory.font_providers.append({"type":"bitmap","file":f"{Mem.ctx.project_id}:font/category/{file_name}.png", "ascent": 0, "height": 130, "chars": [page_font]})
+				SharedMemory.font_providers.append({"type":"bitmap","file":f"{Mem.ctx.project_id}:font/category/{file_name}.png", "ascent": 1, "height": 131, "chars": [page_font]})
 				content.append({"text": "", "font": FONT, "color": "white"})	# Make default font for every next component
 				content.append({"text": "➤ ", "font": "minecraft:default", "color": "black"})
 				content.append({"text": titled, "font": "minecraft:default", "color": "black", "underlined": True})
@@ -516,7 +516,7 @@ def routine():
 			if page["type"] == CATEGORY:
 				item = page["raw_data"][0]
 
-				# Get item texture TODO
+				# Get item texture
 				texture_path = f"{SharedMemory.cache_path}/items/{Mem.ctx.project_id}/{item}.png"
 				if os.path.exists(texture_path):
 					item_image = Image.open(texture_path)

{stewbeet-2.1.7 → stewbeet-2.1.8}/stewbeet/plugins/ingame_manual/page_font.py

@@ -151,12 +151,13 @@ def generate_page_font(name: str, page_font: str, craft: JsonDict|None = None, o
 	else:
 		# Get the image template and append the provider
 		template = Image.open(f"{TEMPLATES_PATH}/simple_case_no_border.png")
-		factor = 1
+		factor: int = 1
 		if SharedMemory.high_resolution:
-			factor = 256 // template.size[0]
-			result_texture = careful_resize(result_texture, SQUARE_SIZE * factor)
+			factor_float: float = 256 / template.size[0]
+			result_texture = careful_resize(result_texture, round(SQUARE_SIZE * factor_float))
 			template = careful_resize(template, 256)
 			result_mask = result_texture.convert("RGBA").split()[3]
+			factor = int(factor_float)
 		else:
 			# Resize the texture and get the mask
 			result_texture = careful_resize(result_texture, SQUARE_SIZE)

{stewbeet-2.1.7 → stewbeet-2.1.8}/stewbeet/plugins/resource_pack/item_models/object.py

@@ -100,7 +100,22 @@ class AutoModel:
 		Returns:
 			bool: True if all models are in variants.
 		"""
-		return all(any(model in x for x in variants) for model in models)
+		def model_matches(model: str, variant: str) -> bool:
+			""" Check if model matches in variant with proper word boundary. """
+			pattern: str = f"_{model}"
+			idx: int = variant.find(pattern)
+			if idx == -1:
+				return False
+			# Check if there's a character after the pattern
+			after_idx: int = idx + len(pattern)
+			if after_idx < len(variant):
+				# Character after pattern should not be alphanumeric
+				return not variant[after_idx].isalnum()
+			else:
+				# Pattern is at the end of the string, which is valid
+				return True
+
+		return all(any(model_matches(model, x) for x in variants) for model in models)
 
 	@simple_cache
 	def get_same_folder_variants(self, variants: Iterable[str]) -> list[str]: