stewbeet 2.0.3__tar.gz → 2.0.4__tar.gz

{stewbeet-2.0.3 → stewbeet-2.0.4}/PKG-INFO

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

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

{stewbeet-2.0.3 → stewbeet-2.0.4}/stewbeet/plugins/auto/lang_file/__init__.py

@@ -1,6 +1,6 @@
 
 # Imports
-from beet import Context, Function, Language, LootTable
+from beet import Advancement, Context, Function, ItemModifier, Language, LootTable
 from stouputils.decorators import measure_time
 from stouputils.io import super_json_dump
 from stouputils.parallel import multithreading
@@ -22,9 +22,11 @@ def beet_default(ctx: Context):
 	files_to_process: dict[str, Function | LootTable] = {}
 	files_to_process.update(ctx.data.functions)
 	files_to_process.update(ctx.data.loot_tables)
+	files_to_process.update(ctx.data.item_modifiers)
+	files_to_process.update(ctx.data.advancements)
 
 	# Process all files
-	args: list[tuple[Context, str, Function | LootTable]] = [
+	args: list[tuple[Context, str, Function | LootTable | ItemModifier, Advancement]] = [
 		(ctx, file, content) for (file, content) in files_to_process.items()
 		if True
 	]

{stewbeet-2.0.3 → stewbeet-2.0.4}/stewbeet/plugins/auto/lang_file/utils.py

@@ -2,9 +2,8 @@
 # Imports
 import re
 
-from beet import Context, Function, LootTable
+from beet import Advancement, Context, Function, ItemModifier, LootTable
 from stouputils.decorators import simple_cache
-from stouputils.print import breakpoint
 
 # Prepare lang dictionary and lang_format function
 lang: dict[str, str] = {}
@@ -56,7 +55,7 @@ def lang_format(ctx: Context, text: str) -> tuple[str, str]:
 	return key, re.sub(r"[._]", "", alpha_num)
 
 
-def handle_file(ctx: Context, file: str, content: Function | LootTable) -> None:
+def handle_file(ctx: Context, file: str, content: Function | LootTable | ItemModifier | Advancement) -> None:
 	""" Process a file to extract and replace text with lang keys.
 
 	Args:
@@ -67,10 +66,10 @@ def handle_file(ctx: Context, file: str, content: Function | LootTable) -> None:
 	Returns:
 		None: The function modifies the content in place.
 	"""
-	# Read content
-	if isinstance(content, Function):
-		string: str = content.text
-	elif isinstance(content, LootTable):
+	# Read content from supported beet types
+	#	Function, LootTable, ItemModifier or Advancement
+	if isinstance(content, Function) or isinstance(content, LootTable) \
+		or isinstance(content, ItemModifier) or isinstance(content, Advancement):
 		string: str = content.text
 	else:
 		raise ValueError(f"Unsupported content type: {type(content)}")
@@ -98,9 +97,13 @@ def handle_file(ctx: Context, file: str, content: Function | LootTable) -> None:
 		new_fragment: str = f'{quote}translate{quote}: {quote}{key_for_lang}{quote}'
 		string = string[:start] + new_fragment + string[end:]
 
-	# Write the new content to the file
+	# Write the new content back to the appropriate context data
 	if isinstance(content, Function):
 		ctx.data.functions[file] = Function(string)
-	else:
+	elif isinstance(content, LootTable):
 		ctx.data.loot_tables[file] = LootTable(string)
+	elif isinstance(content, ItemModifier):
+		ctx.data.item_modifiers[file] = ItemModifier(string)
+	elif isinstance(content, Advancement):
+		ctx.data.advancements[file] = Advancement(string)
 

{stewbeet-2.0.3 → stewbeet-2.0.4}/stewbeet/plugins/datapack/custom_blocks/__init__.py

@@ -2,7 +2,7 @@
 # Imports
 from typing import Any
 
-from beet import BlockTag, Context, Predicate
+from beet import Advancement, BlockTag, Context, Predicate
 from stouputils.decorators import measure_time
 from stouputils.io import super_json_dump
 from stouputils.print import debug, progress
@@ -46,8 +46,8 @@ def beet_default(ctx: Context):
 	# Predicates
 	FACING = ["north", "east", "south", "west"]
 	for face in FACING:
-		predicate = {"condition":"minecraft:location_check","predicate":{"block":{"state":{"facing":face}}}}
-		ctx.data[ns].predicates[f"facing/{face}"] = Predicate(super_json_dump(predicate))
+		adv = {"condition":"minecraft:location_check","predicate":{"block":{"state":{"facing":face}}}}
+		ctx.data[ns].predicates[f"facing/{face}"] = Predicate(super_json_dump(adv))
 
 	# Get rotation function
 	write_function(f"{ns}:custom_blocks/get_rotation",
@@ -328,8 +328,8 @@ execute store result entity @s Item.count byte 1 run scoreboard players get #ite
 	ctx.data[ns].block_tags[VANILLA_BLOCKS_TAG] = BlockTag(super_json_dump({"values": listed_blocks}))
 
 	# Create predicate
-	predicate = {"condition": "minecraft:location_check", "predicate": {"block": {"blocks": f"#{ns}:{VANILLA_BLOCKS_TAG}"}}}
-	ctx.data[ns].predicates["check_vanilla_blocks"] = Predicate(super_json_dump(predicate))
+	pred = {"condition": "minecraft:location_check", "predicate": {"block": {"blocks": f"#{ns}:{VANILLA_BLOCKS_TAG}"}}}
+	ctx.data[ns].predicates["check_vanilla_blocks"] = Predicate(super_json_dump(pred))
 
 	# Create advanced predicate
 	advanced_predicate = {"condition": "minecraft:any_of", "terms": []}
@@ -337,11 +337,11 @@ execute store result entity @s Item.count byte 1 run scoreboard players get #ite
 		block_underscore = block.replace(":","_")
 		if block == "minecraft:cauldron":
 			block = "#minecraft:cauldrons"
-		predicate = {
+		pred = {
 			"condition": "minecraft:entity_properties", "entity": "this",
 			"predicate": { "nbt": f"{{Tags:[\"{ns}.vanilla.{block_underscore}\"]}}", "location": { "block": { "blocks": block }}}
 		}
-		advanced_predicate["terms"].append(predicate)
+		advanced_predicate["terms"].append(pred)
 	ctx.data[ns].predicates["advanced_check_vanilla_blocks"] = Predicate(super_json_dump(advanced_predicate))
 
 	# Write a destroy check every 2 ticks, every second, and every 5 seconds
@@ -397,17 +397,17 @@ execute as @e[tag={ns}.custom_block,dx=0,dy=0,dz=0] at @s run function {ns}:cust
 		if data["id"] == CUSTOM_BLOCK_HEAD and data.get(VANILLA_BLOCK):
 
 			# Make advancement
-			predicate = {
+			adv = {
 				"criteria":{"requirement":{"trigger":"minecraft:placed_block","conditions":{"location": [{"condition": "minecraft:location_check","predicate": {"block": {}}}]}}},
 				"requirements":[["requirement"]],
 				"rewards":{}
 			}
-			predicate["criteria"]["requirement"]["conditions"]["location"][0]["predicate"]["block"]["nbt"] = super_json_dump(
+			adv["criteria"]["requirement"]["conditions"]["location"][0]["predicate"]["block"]["nbt"] = super_json_dump(
 				{"components":{"minecraft:custom_data":data.get("custom_data", {})}},
 				max_level = 0
 			)
-			predicate["rewards"]["function"] = f"{ns}:custom_blocks/_player_head/search_{item}"
-			ctx.data.advancements[f"{ns}:custom_block_head/{item}"].data = predicate
+			adv["rewards"]["function"] = f"{ns}:custom_blocks/_player_head/search_{item}"
+			ctx.data[ns].advancements[f"custom_block_head/{item}"] = Advancement(super_json_dump(adv))
 
 			# Make search function
 			content = "# Search where the head has been placed\n"

{stewbeet-2.0.3 → stewbeet-2.0.4}/stewbeet/plugins/ingame_manual/iso_renders.py

@@ -78,7 +78,7 @@ def generate_all_iso_renders():
 		debug(f"Generating iso renders for {len(for_model_resolver)} items, this may take a while...")
 		render = Render(Mem.ctx)
 		for rp_path, dst_path in for_model_resolver.items():
-			render.add_model_task(rp_path, path_save=dst_path)
+			render.add_model_task(rp_path, path_save=dst_path, animation_mode="one_file")
 		render.run()
 		debug("Generated iso renders for all items")
 

{stewbeet-2.0.3 → stewbeet-2.0.4}/stewbeet/plugins/resource_pack/item_models/object.py

@@ -5,7 +5,8 @@ from __future__ import annotations
 import os
 
 from beet import ItemModel, Model, Texture
-from stouputils.io import super_json_dump
+from beet.core.utils import JsonDict
+from stouputils.io import super_json_dump, super_json_load
 from stouputils.print import error
 
 from ....core.__memory__ import Mem
@@ -292,9 +293,10 @@ class AutoModel:
 					texture_name = texture.split(":")[-1].split("/")[-1]  # Get just the filename
 					texture_name += ".png"
 					if texture_name in self.source_textures:
-						Mem.ctx.assets[texture] = Texture(source_path=self.source_textures[texture_name])
+						mcmeta: JsonDict | None = None
 						if os.path.exists(self.source_textures[texture_name] + ".mcmeta"):
-							Mem.ctx.assets[f"{texture}.mcmeta"] = Texture(source_path=self.source_textures[texture_name] + ".mcmeta")
+							mcmeta = super_json_load(self.source_textures[texture_name] + ".mcmeta")
+						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")