stewbeet 2.2.17__tar.gz → 2.2.18__tar.gz

{stewbeet-2.2.17 → stewbeet-2.2.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stewbeet
-Version: 2.2.17
+Version: 2.2.18
 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
@@ -11,14 +11,14 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.12
-Requires-Dist: beet>=0.111.0
+Requires-Dist: beet>=0.112.0
 Requires-Dist: bolt>=0.49.2
 Requires-Dist: mecha>=0.99.0
-Requires-Dist: model-resolver>=1.11.0
+Requires-Dist: model-resolver>=1.11.1
 Requires-Dist: mutagen>=1.47.0
 Requires-Dist: pyperclip>=1.8.0
 Requires-Dist: smithed>=0.19.0
-Requires-Dist: stouputils>=1.3.20
+Requires-Dist: stouputils>=1.4.1
 Description-Content-Type: text/markdown
 
 

{stewbeet-2.2.17 → stewbeet-2.2.18}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "stewbeet"
-version = "2.2.17"
+version = "2.2.18"
 description = "Beet Framework made to help generating advanced Minecraft datapack contents"
 readme = "README.md"
 license = "MIT"
@@ -16,9 +16,9 @@ classifiers = [
 	"Operating System :: OS Independent",
 ]
 dependencies = [
-	"stouputils>=1.3.20",
-	"model_resolver>=1.11.0",
-	"beet>=0.111.0",
+	"stouputils>=1.4.1",
+	"model_resolver>=1.11.1",
+	"beet>=0.112.0",
 	"bolt>=0.49.2",
 	"mecha>=0.99.0",
 	"smithed>=0.19.0",

{stewbeet-2.2.17 → stewbeet-2.2.18}/stewbeet/cli.py

@@ -5,27 +5,23 @@ import os
 import shutil
 import subprocess
 import sys
-from importlib.metadata import version
 
 from beet import ProjectConfig
 from stouputils.decorators import LogLevels, handle_error
-from stouputils.print import GREEN, RED, RESET, info
+from stouputils.print import GREEN, RED, info, show_version
 
 from .utils import get_project_config
 
 
 @handle_error(message="Error while running 'stewbeet'")
 def main():
-    second_arg: str = sys.argv[1] if len(sys.argv) == 2 else ""
+    second_arg: str = sys.argv[1].lower() if len(sys.argv) == 2 else ""
     if second_arg == "" and len(sys.argv) == 1:
         sys.argv.append("build")
 
     # Print the version of stewbeet, beet, bolt, mecha, and stouputils
-    if second_arg == "--version":
-        for pkg in ["stewbeet", "beet", "bolt", "mecha", "smithed", "model_resolver", "stouputils"]:
-            v: str = version(pkg).split("version: ")[-1]
-            print(f"{RED}{pkg} {GREEN}v{v}{RESET}")
-        return
+    if second_arg in ("--version", "-v", "version"):
+        return show_version("stewbeet", primary_color=RED, secondary_color=GREEN)
 
     # Try to find and load the beet configuration file
     cfg: ProjectConfig = get_project_config()

{stewbeet-2.2.17 → stewbeet-2.2.18}/stewbeet/core/constants.py

@@ -3,11 +3,12 @@
 # Imports
 from beet.core.utils import JsonDict
 from beet.library import base
+from beet.toolchain.config import FormatSpecifier
 
 from ..dependencies.bookshelf import BOOKSHELF_MODULES
 
 # Minecraft version specific constants
-MORE_DATA_PACK_FORMATS: dict[tuple[int, ...], int] = {
+MORE_DATA_PACK_FORMATS: dict[tuple[int, ...], FormatSpecifier] = {
 	(1, 21): 48,
 	(1, 21, 0): 48,
 	(1, 21, 1): 48,
@@ -18,10 +19,10 @@ MORE_DATA_PACK_FORMATS: dict[tuple[int, ...], int] = {
 	(1, 21, 6): 80,
 	(1, 21, 7): 81,
 	(1, 21, 8): 81,
-	(1, 21, 9): 88,
-	(1, 21, 10): 88,
+	(1, 21, 9): (88, 0),
+	(1, 21, 10): (88, 0),
 }
-MORE_ASSETS_PACK_FORMATS: dict[tuple[int, ...], int] = {
+MORE_ASSETS_PACK_FORMATS: dict[tuple[int, ...], FormatSpecifier] = {
 	(1, 21): 34,
 	(1, 21, 0): 34,
 	(1, 21, 1): 34,
@@ -32,8 +33,8 @@ MORE_ASSETS_PACK_FORMATS: dict[tuple[int, ...], int] = {
 	(1, 21, 6): 63,
 	(1, 21, 7): 64,
 	(1, 21, 8): 64,
-	(1, 21, 9): 69,
-	(1, 21, 10): 69,
+	(1, 21, 9): (69, 0),
+	(1, 21, 10): (69, 0),
 }
 MORE_DATA_VERSIONS: dict[tuple[int, ...], int] = {
 	(1, 21): 3953,

{stewbeet-2.2.17 → stewbeet-2.2.18}/stewbeet/core/definitions_helper/completion.py

@@ -78,13 +78,18 @@ def add_item_name_and_lore_if_missing(is_external: bool = False, black_list: lis
 	return
 
 # Add private custom data for namespace
-def add_private_custom_data_for_namespace(is_external: bool = False) -> None:
+def add_private_custom_data_for_namespace(is_external: bool = False, black_list: list[str] | None = None) -> None:
 	""" Add private custom data for namespace to all items in the definitions if they are missing.
 
 	Args:
 		is_external	(bool):				Whether the definitions is the external one or not (meaning the namespace is in the item name).
+		black_list	(list[str]):		The list of items to ignore.
 	"""
+	if black_list is None:
+		black_list = []
 	for item, data in Mem.definitions.items():
+		if item in black_list:
+			continue
 		if not data.get("custom_data"):
 			data["custom_data"] = cast(JsonDict, {})
 		if is_external and ":" in item:

{stewbeet-2.2.17 → stewbeet-2.2.18}/stewbeet/plugins/ingame_manual/__init__.py

@@ -36,7 +36,7 @@ def beet_default(ctx: Context):
 	stewbeet: JsonDict = ctx.meta.get("stewbeet", {})
 	assert stewbeet, "stewbeet configuration is not set. Please set it in the project configuration."
 	assert stewbeet.get("textures_folder"), "Textures folder is not set. Please set it in the project configuration."
-	manual_config = stewbeet.get("manual", {})
+	manual_config: JsonDict = stewbeet.get("manual", {})
 	assert manual_config, "Manual configuration is not set. Please set it in the project configuration."
 
 	# Set up manual path
@@ -46,6 +46,9 @@ def beet_default(ctx: Context):
 	# Set up high resolution in the shared_import module
 	SharedMemory.high_resolution = manual_config.get("high_resolution", True)
 
+	# Set up use_dialog in the shared_import module
+	SharedMemory.use_dialog = manual_config.get("use_dialog", 0)
+
 	# Call the main manual generation function
 	manual_main()
 

{stewbeet-2.2.17 → stewbeet-2.2.18}/stewbeet/plugins/ingame_manual/craft_content.py

@@ -8,11 +8,11 @@ from ...core.ingredients import FURNACES_RECIPES_TYPES, ingr_to_id
 from .book_components import get_item_component
 from .other_utils import convert_shapeless_to_shaped, high_res_font_from_craft
 from .page_font import generate_page_font
-from .shared_import import FONT_FILE, INVISIBLE_ITEM_WIDTH, MICRO_NONE_FONT, SMALL_NONE_FONT, VERY_SMALL_NONE_FONT, SharedMemory
+from .shared_import import FONT_FILE, INVISIBLE_ITEM_WIDTH, MICRO_NONE_FONT, NONE_FONT, SMALL_NONE_FONT, VERY_SMALL_NONE_FONT, SharedMemory
 
 
 # Generate all craft types content
-def generate_craft_content(craft: JsonDict, name: str, page_font: str) -> list[TextComponent]:
+def generate_craft_content(craft: JsonDict, name: str, page_font: str, in_lore: bool = False) -> list[TextComponent]:
 	""" Generate the content for the craft type
 	Args:
 		craft		(JsonDict):	The craft dictionary, ex: {"type": "crafting_shaped","result_count": 1,"category": "equipment","shape": ["XXX","X X"],"ingredients": {"X": {"components": {"custom_data": {"iyc": {"adamantium": true}}}}}}
@@ -32,11 +32,13 @@ def generate_craft_content(craft: JsonDict, name: str, page_font: str) -> list[T
 	# If high resolution, get proper page font
 	if SharedMemory.high_resolution:
 		page_font = high_res_font_from_craft(craft)
+	use_dialog: bool = SharedMemory.use_dialog > 0 and not in_lore	# In lore, we don't need to re-align the content
 
 	# Show up item title and page font
 	titled = name.replace("_", " ").title() + "\n"
 	content.append({"text": titled, "font": "minecraft:default", "color": "black", "underlined": True})
-	content.append(SMALL_NONE_FONT + page_font + "\n")
+	padding: str = MICRO_NONE_FONT if use_dialog else ""
+	content.append(SMALL_NONE_FONT + padding + page_font + "\n")
 
 	# Generate the image for the page
 	generate_page_font(name, page_font, craft)
@@ -55,6 +57,7 @@ def generate_craft_content(craft: JsonDict, name: str, page_font: str) -> list[T
 	# If the craft is shaped
 	if craft_type == "crafting_shaped":
 		shape: list[str] = craft["shape"]
+		is_small_craft: bool = len(shape) <= 2 and all(len(x) <= 2 for x in shape)
 
 		# Convert each ingredients to its text component
 		formatted_ingredients: dict[str, JsonDict] = {}
@@ -72,7 +75,7 @@ def generate_craft_content(craft: JsonDict, name: str, page_font: str) -> list[T
 			shape = [" " + line + " " for line in shape]
 
 		# Add each ingredient to the craft
-		for line in shape:
+		for index, line in enumerate(shape):
 			for i in range(2):	# We need two lines to make a square, otherwise it will be a rectangle
 				content.append(SMALL_NONE_FONT)
 				for k in line:
@@ -85,13 +88,16 @@ def generate_craft_content(craft: JsonDict, name: str, page_font: str) -> list[T
 							copy = formatted_ingredients[k].copy()
 							copy["text"] = INVISIBLE_ITEM_WIDTH
 							content.append(copy)
+				if use_dialog and index != 1 and (not is_small_craft or i != 1):
+					content.append(INVISIBLE_ITEM_WIDTH * max(0, (2 if is_small_craft else 3) - len(line)))
+					content.append(NONE_FONT * 2)
 				content.append("\n")
 		if len(shape) == 1 and len(shape[0]) < 3:
 			content.append("\n")
 			pass
 
 		# Add the result to the craft
-		if len(shape) <= 2 and len(shape[0]) <= 2:
+		if is_small_craft:
 
 			# First layer of the square
 			len_1 = len(shape[0])
@@ -99,6 +105,9 @@ def generate_craft_content(craft: JsonDict, name: str, page_font: str) -> list[T
 			break_line_pos = content.index("\n", content.index("\n") + 1)	# Find the second line break
 			content.insert(break_line_pos, (INVISIBLE_ITEM_WIDTH * offset_1))
 			content.insert(break_line_pos + 1, result_component)
+			if use_dialog:
+				content.insert(break_line_pos + 2, VERY_SMALL_NONE_FONT + MICRO_NONE_FONT)
+				break_line_pos += 1
 
 			# Second layer of the square
 			len_2 = len(shape[1]) if len(shape) > 1 else 0
@@ -110,6 +119,8 @@ def generate_craft_content(craft: JsonDict, name: str, page_font: str) -> list[T
 			copy = result_component.copy()
 			copy["text"] = INVISIBLE_ITEM_WIDTH
 			content.insert(break_line_pos + 1, copy)
+			if use_dialog:
+				content.insert(break_line_pos + 2, VERY_SMALL_NONE_FONT + MICRO_NONE_FONT)
 		else:
 			# First layer of the square
 			len_line = len(shape[1]) if len(shape) > 1 else 0
@@ -122,6 +133,9 @@ def generate_craft_content(craft: JsonDict, name: str, page_font: str) -> list[T
 				break_line_pos = len(content)
 			content.insert(break_line_pos, (INVISIBLE_ITEM_WIDTH * (offset - 1) + SMALL_NONE_FONT * 2))
 			content.insert(break_line_pos + 1, result_component)
+			if use_dialog:
+				content.insert(break_line_pos + 2, VERY_SMALL_NONE_FONT + MICRO_NONE_FONT)
+				break_line_pos += 1
 
 			# Second layer of the square
 			try:
@@ -133,6 +147,8 @@ def generate_craft_content(craft: JsonDict, name: str, page_font: str) -> list[T
 			copy = result_component.copy()
 			copy["text"] = INVISIBLE_ITEM_WIDTH
 			content.insert(break_line_pos + 1, copy)
+			if use_dialog:
+				content.insert(break_line_pos + 2, VERY_SMALL_NONE_FONT + MICRO_NONE_FONT)
 
 			# Add break lines for the third layer of a 3x3 craft
 			if len(shape) < 3 and len(shape[0]) == 3:
@@ -167,6 +183,8 @@ def generate_craft_content(craft: JsonDict, name: str, page_font: str) -> list[T
 				copy = result_component.copy()
 				copy["text"] = INVISIBLE_ITEM_WIDTH
 				content.append(copy)
+			if use_dialog:
+				content.append(VERY_SMALL_NONE_FONT + MICRO_NONE_FONT)
 			content.append("\n")
 		content.append("\n\n")
 
@@ -291,6 +309,8 @@ def generate_craft_content(craft: JsonDict, name: str, page_font: str) -> list[T
 				copy = result_component.copy()
 				copy["text"] = INVISIBLE_ITEM_WIDTH
 				content.append(copy)
+			if use_dialog:
+				content.append(VERY_SMALL_NONE_FONT + MICRO_NONE_FONT)
 			content.append("\n")
 		content.append("\n")
 		pass

stewbeet-2.2.18/stewbeet/plugins/ingame_manual/dialog.py

@@ -0,0 +1,140 @@
+"""
+Handles generation of dialogs based of book content
+"""
+from beet import Advancement, Dialog, DialogTag
+from beet.core.utils import JsonDict, TextComponent
+
+from ...core import Mem, set_json_encoder, write_function, write_load_file
+from .shared_import import BOOK_FONT, NONE_FONT, SharedMemory
+
+
+# Utility Function
+def change_page_to_show_dialog(element: TextComponent, ns: str) -> None:
+	if isinstance(element, dict) and "click_event" in element and element["click_event"]["action"] == "change_page":
+		change_page: int = element["click_event"]["page"]
+		element["click_event"] = {"action": "show_dialog", "dialog": f"{ns}:manual/page_{change_page}"}
+	elif isinstance(element, list):
+		for sub_element in element:
+			change_page_to_show_dialog(sub_element, ns)
+
+# Function
+def generate_dialogs(book_content: list[list[TextComponent]]) -> None:
+	ns: str = Mem.ctx.project_id
+
+	# Generate dialogs for each page
+	dialog_ids: list[str] = []
+	for page_index, page in enumerate(book_content):
+		dialog_id: str = f"manual/page_{page_index + 1}"
+		dialog_ids.append(f"{ns}:{dialog_id}")
+
+		# Previous and next page indexes
+		prev_index: int = page_index - 1 if page_index > 0 else 0
+		next_index: int = page_index + 1 if page_index + 1 < len(book_content) else page_index
+		prev_dialog_id: str = f"{ns}:manual/page_{prev_index + 1}"
+		next_dialog_id: str = f"{ns}:manual/page_{next_index + 1}"
+
+		# Get title
+		title: TextComponent = page[1]
+		if isinstance(title, dict):
+			title = str(title.get("text", "")).replace("\n", "")
+		else:
+			title = str(title).replace("\n", "")
+		if len(title.strip()) < 2:
+			title = page[2]
+			if isinstance(title, dict):
+				title = str(title.get("text", "")).replace("\n", "")
+			page = page[:1] + page[2:]  # Remove title from body if taken from body
+
+		# Generate the new body content
+		new_content: list[TextComponent] = [{"text":"","font": f"{ns}:manual", "color": "white", "shadow_color": [0]*4}]	# Initial font and color
+		if len(page) > 2:
+			page = page[2:]	# Remove first two elements
+
+			# Modify click events to show dialog instead of changing page
+			change_page_to_show_dialog(page, ns)
+
+			# Add to new content
+			new_content.extend(page)
+
+		# Add padding to avoid texture cutoff
+		def count_breaklines(element: TextComponent) -> int:
+			if isinstance(element, dict):
+				return count_breaklines(element.get("text", ""))
+			elif isinstance(element, list):
+				return sum(count_breaklines(sub_element) for sub_element in element)
+			return str(element).count("\n")
+		nb_breaklines_to_add: int = max(0, 20 - count_breaklines(new_content))
+		if nb_breaklines_to_add > 0:
+			new_content.append("\n"*nb_breaklines_to_add)
+
+		# Create dialog
+		dialog: JsonDict = {
+			"type": "minecraft:notice",
+			"title": {"text": title, "underlined": True},
+			"body": [
+				{
+					"type": "minecraft:plain_message",
+					"contents": [
+						{"text": BOOK_FONT + NONE_FONT*3, "font": f"{ns}:manual", "color": "white"},
+						*(2 * [
+							{"text": "\n" + NONE_FONT*3, "click_event": {"action": "show_dialog", "dialog": prev_dialog_id},
+								"hover_event": {"action": "show_text", "value": [{"text": "Go to previous page"}, {"text": f" ({prev_index + 1})"}]}},
+							NONE_FONT,
+							{"text": NONE_FONT*3, "click_event": {"action": "show_dialog", "dialog": next_dialog_id},
+								"hover_event": {"action": "show_text", "value": [{"text": "Go to next page"}, {"text": f" ({next_index + 1})"}]}}
+						])
+					],
+					"width": 400
+				},
+				{
+					"type": "minecraft:plain_message",
+					"contents": new_content,
+					"width": 150
+				}
+			],
+		}
+		Mem.ctx.data[ns].dialogs[dialog_id] = set_json_encoder(Dialog(dialog), max_level=4)
+	pass
+
+	# Generate an advancement detecting when the manual is opened
+	if SharedMemory.use_dialog != 2:
+		write_load_file(f"# Opening manual detection\nscoreboard objectives add {ns}.open_manual minecraft.used:minecraft.written_book")
+		Mem.ctx.data[ns].advancements["open_manual"] = set_json_encoder(Advancement({
+			"criteria": {
+				"requirement": {
+					"trigger": "minecraft:tick",
+					"conditions": {
+						"player": [
+							{
+								"condition": "minecraft:entity_scores",
+								"entity": "this",
+								"scores": {f"{ns}.open_manual": {"min": 1}}
+							}
+						]
+					}
+				}
+			},
+			"rewards": {
+				"function": f"{ns}:advancements/open_manual"
+			}
+		}), max_level=-1)
+		write_function(f"{ns}:advancements/open_manual", f"""
+# Revoke advancement and reset score
+advancement revoke @s only {ns}:open_manual
+scoreboard players set @s {ns}.open_manual 0
+
+# Show manual dialog if holding the manual
+execute if items entity @s weapon.* *[custom_data~{{{ns}:{{manual:true}}}}] run dialog show @s {ns}:manual/page_1
+""")
+
+	# Generate main dialog to open the manual
+	Mem.ctx.data["minecraft"].dialogs_tags["quick_actions"] = set_json_encoder(
+		DialogTag({"replace": False, "values": [f"{ns}:all_manual"]})
+	)
+	Mem.ctx.data[ns].dialogs["all_manual"] = set_json_encoder(Dialog({
+		"type": "minecraft:dialog_list",
+		"title": {"text": f"{Mem.ctx.project_name} Manual"},
+		"dialogs": dialog_ids,
+		"exit_action": {"label": {"translate": "gui.back"}, "width": 200}
+	}))
+