stewbeet 2.2.20__tar.gz → 2.2.21__tar.gz

{stewbeet-2.2.20 → stewbeet-2.2.21}/PKG-INFO

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

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

{stewbeet-2.2.20 → stewbeet-2.2.21}/stewbeet/continuous_delivery/cd_utils.py

@@ -29,7 +29,7 @@ def get_supported_versions(version: str | list[str] | None = None) -> list[str]:
 		except AssertionError:
 			version = LATEST_MC_VERSION
 	if isinstance(version, list):
-		return version
+		return [x for x in version if x != "infinite"]
 	version = str(version)
 
 	# Some versions are considered the same for compatibility purposes

{stewbeet-2.2.20 → stewbeet-2.2.21}/stewbeet/core/constants.py

@@ -21,6 +21,7 @@ MORE_DATA_PACK_FORMATS: dict[tuple[int, ...], FormatSpecifier] = {
 	(1, 21, 8): 81,
 	(1, 21, 9): (88, 0),
 	(1, 21, 10): (88, 0),
+	(2, 0, 0): (1000, 0),
 }
 MORE_ASSETS_PACK_FORMATS: dict[tuple[int, ...], FormatSpecifier] = {
 	(1, 21): 34,
@@ -35,6 +36,7 @@ MORE_ASSETS_PACK_FORMATS: dict[tuple[int, ...], FormatSpecifier] = {
 	(1, 21, 8): 64,
 	(1, 21, 9): (69, 0),
 	(1, 21, 10): (69, 0),
+	(2, 0, 0): (1000, 0),
 }
 MORE_DATA_VERSIONS: dict[tuple[int, ...], int] = {
 	(1, 21): 3953,

{stewbeet-2.2.20 → stewbeet-2.2.21}/stewbeet/core/ingredients.py

@@ -48,7 +48,6 @@ def ingr_repr(id: str, ns: str|None = None, count: int|None = None) -> JsonDict:
 		to_return["count"] = count
 	return to_return
 
-@simple_cache
 def item_to_id_ingr_repr(ingr: JsonDict) -> JsonDict:
 	""" Replace the "item" key by "id" in an item ingredient representation
 	Args:
@@ -138,7 +137,6 @@ def get_vanilla_item_id_from_ingredient(ingredient: JsonDict, add_namespace: boo
 	return ""
 
 # Used for recipes
-@simple_cache
 def get_item_from_ingredient(ingredient: JsonDict) -> JsonDict:
 	""" Get the item dict from an ingredient dict
 	Args:

{stewbeet-2.2.20 → stewbeet-2.2.21}/stewbeet/plugins/custom_recipes/vanilla.py

@@ -84,7 +84,6 @@ advancement revoke @s only {Mem.ctx.project_id}:unlock_recipes
 
             write_function(f"{Mem.ctx.project_id}:advancements/unlock_recipes", content)
 
-    @simple_cache()
     def vanilla_shapeless_recipe(self, recipe: JsonDict, item: str) -> JsonDict:
         """Generate a vanilla shapeless recipe.
 
@@ -112,7 +111,6 @@ advancement revoke @s only {Mem.ctx.project_id}:unlock_recipes
         to_return["result"]["count"] = recipe["result_count"]
         return to_return
 
-    @simple_cache()
     def vanilla_shaped_recipe(self, recipe: JsonDict, item: str) -> JsonDict:
         """Generate a vanilla shaped recipe.
 

{stewbeet-2.2.20 → stewbeet-2.2.21}/stewbeet/plugins/ingame_manual/dialog.py

@@ -89,7 +89,7 @@ def generate_dialogs(book_content: list[list[TextComponent]]) -> None:
 				{
 					"type": "minecraft:plain_message",
 					"contents": new_content,
-					"width": 150
+					"width": 140
 				}
 			],
 		}

{stewbeet-2.2.20 → stewbeet-2.2.21}/stewbeet/plugins/ingame_manual/main.py

@@ -611,7 +611,7 @@ def routine():
 					# Retrieve buttons limit depending on number of lines in the content (more lines = less buttons)
 					buttons_limit: int = 20 if str(content).count("\\n") <= 6 else 15
 					if SharedMemory.use_dialog > 0:
-						buttons_limit = 100	# Higher limit
+						buttons_limit = 42	# Higher limit
 
 					# If too many buttons, remove all the blue ones (blue_craft) except the last one
 					if len(info_buttons) > buttons_limit:
@@ -644,25 +644,26 @@ def routine():
 					content.append("\n")
 
 					last_i = 0
+					buttons_per_line = 5 if not SharedMemory.use_dialog > 0 else 6
 					for i, button in enumerate(info_buttons):
 						last_i = i
 						# Duplicate line and add breakline
-						if i % 5 == 0 and i != 0:
+						if i % buttons_per_line == 0 and i != 0:
 							# Remove VERY_SMALL_NONE_FONT from last button to prevent automatic break line
 							last_content = cast(JsonDict, content[-1])
 							last_content["text"] = last_content["text"].replace(VERY_SMALL_NONE_FONT, "")
 
-							# Re-add last 5 buttons (for good hover_event) but we replace the wiki font by the small font
-							content += ["\n"] + [cast(JsonDict, x).copy() for x in content[-5:]]
-							for j in range(5):
-								selected_content = cast(JsonDict, content[-5 + j])
-								selected_content["text"] = WIKI_NONE_FONT + VERY_SMALL_NONE_FONT * (2 if j != 4 else 0)
+							# Re-add last buttons (for good hover_event) but we replace the wiki font by the small font
+							content += ["\n"] + [cast(JsonDict, x).copy() for x in content[-buttons_per_line:]]
+							for j in range(buttons_per_line):
+								selected_content = cast(JsonDict, content[-buttons_per_line + j])
+								selected_content["text"] = WIKI_NONE_FONT + VERY_SMALL_NONE_FONT * (2 if j != (buttons_per_line - 1) else 0)
 							content.append("\n")
 						content.append(button)
 
 					# Duplicate the last line if not done yet
-					if last_i % 5 != 0 or last_i == 0:
-						last_i = last_i % 5 + 1
+					if last_i % buttons_per_line != 0 or last_i == 0:
+						last_i = last_i % buttons_per_line + 1
 
 						# Remove VERY_SMALL_NONE_FONT from last button to prevent automatic break line
 						last_content = cast(JsonDict, content[-1])
@@ -671,7 +672,7 @@ def routine():
 						content += ["\n"] + [cast(JsonDict, x).copy() for x in content[-last_i:]]
 						for j in range(last_i):
 							selected_content = cast(JsonDict, content[-last_i + j])
-							selected_content["text"] = WIKI_NONE_FONT + VERY_SMALL_NONE_FONT * (2 if j != 4 else 0)
+							selected_content["text"] = WIKI_NONE_FONT + VERY_SMALL_NONE_FONT * (2 if j != (last_i - 1) else 0)
 
 			# Add page to the book
 			book_content.append(content)

{stewbeet-2.2.20 → stewbeet-2.2.21}/stewbeet/plugins/initialize/__init__.py

@@ -4,7 +4,7 @@
 # Imports
 import os
 from pathlib import Path
-from typing import Any
+from typing import Any, cast
 
 from beet import Context, Dialog, DialogTag, FormatSpecifier, Pack
 from beet.core.utils import JsonDict, TextComponent, split_version
@@ -98,7 +98,7 @@ def beet_default(ctx: Context):
 	def setup_pack_mcmeta(pack: Pack[Any], pack_format: FormatSpecifier | None) -> None:
 		# Default to latest if not given
 		if not pack_format:
-			pack_format =  pack.pack_format_registry[(split_version(LATEST_MC_VERSION))]
+			pack_format =  pack.pack_format_registry[(split_version(ctx.minecraft_version or LATEST_MC_VERSION))]
 
 		# Setup pack.mcmeta data
 		existing_mcmeta: JsonDict = pack.mcmeta.data or {}
@@ -117,12 +117,26 @@ def beet_default(ctx: Context):
 			pack_mcmeta["pack"]["min_format"] = pack_format
 			pack_mcmeta["pack"]["max_format"] = 1000 if isinstance(pack_format, int) else (1000, 0)
 
+		# Set min and max data versions (if mc_supports given)
+		mc_supports = ctx.meta.get("mc_supports", [])
+		if isinstance(mc_supports, list):
+			mc_supports = cast(list[str], mc_supports)
+			if len(mc_supports) > 0:
+				min_version: tuple[int, ...] = split_version(mc_supports[0])
+				max_version: tuple[int, ...] = split_version(mc_supports[-1]) if mc_supports[-1] != "infinite" else (2, 0, 0)
+				pack_mcmeta["pack"]["min_format"] = pack.pack_format_registry.get(min_version, int_pack_format)
+				pack_mcmeta["pack"]["max_format"] = pack.pack_format_registry.get(max_version, int_pack_format)
+				if isinstance(pack_mcmeta["pack"]["min_format"], int):
+					max_format: FormatSpecifier = pack_mcmeta["pack"]["max_format"]
+					int_max_format: int = max_format if isinstance(max_format, int) else max_format[0]
+					pack_mcmeta["pack"]["supported_formats"] = [pack_mcmeta["pack"]["min_format"], int_max_format]
+
 		# Set description and id
 		pack_mcmeta["pack"]["description"] = Mem.ctx.project_description
 
-		# Reorder pack keys in ("pack_format","description","min_format","max_format", etc.)
+		# Reorder pack keys
 		ordered_pack: JsonDict = {}
-		for key in ["pack_format", "description", "min_format", "max_format"]:
+		for key in ["pack_format", "description", "supported_formats", "min_format", "max_format"]:
 			if key in pack_mcmeta["pack"]:
 				ordered_pack[key] = pack_mcmeta["pack"][key]
 		ordered_pack.update({k: v for k, v in pack_mcmeta["pack"].items() if k not in ordered_pack})