stewbeet 2.0.4__tar.gz → 2.0.5__tar.gz

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

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

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

{stewbeet-2.0.4 → stewbeet-2.0.5}/stewbeet/plugins/custom_recipes/pulverizer.py

@@ -3,11 +3,10 @@
 import json
 from typing import Any
 
-from beet import Recipe
 from stouputils.decorators import simple_cache
-from stouputils.io import super_json_dump
 
 from ...core.__memory__ import Mem
+from ...core.constants import PULVERIZING
 from ...core.ingredients import (
     get_item_from_ingredient,
     ingr_repr,
@@ -44,22 +43,24 @@ class PulverizerRecipeHandler:
             str: The generated recipe command.
         """
         ingredient: dict[str, Any] = item_to_id_ingr_repr(recipe["ingredient"])
-        result: dict[str, Any] = item_to_id_ingr_repr(get_item_from_ingredient(Mem.ctx.meta, recipe["result"])) if recipe.get("result") else ingr_repr(item, Mem.ctx.project_id)
+        result: dict[str, Any] = item_to_id_ingr_repr(get_item_from_ingredient(recipe["result"])) if recipe.get("result") else ingr_repr(item, Mem.ctx.project_id)
 
         line: str = "execute if score #found simplenergy.data matches 0 store result score #found simplenergy.data if data storage simplenergy:main pulverizer.input"
         line += json.dumps(ingredient)
-        line += f" run loot replace entity @s contents loot {loot_table_from_ingredient(Mem.ctx.meta, result, recipe['result_count'])}"
-        return line + "\n"
+        line += f" run loot replace entity @s contents loot {loot_table_from_ingredient(result, recipe['result_count'])}"
+        return line
 
     def generate_recipes(self) -> None:
-        """Generate all pulverizer recipes."""
+        """ Generate all pulverizer recipes. """
         for item, data in Mem.definitions.items():
             crafts: list[dict[str, Any]] = list(data.get("result_of_crafting", []))
             crafts += list(data.get("used_for_crafting", []))
 
             for recipe in crafts:
-                if recipe["type"] == "pulverizing":
-                    write_function(self.SIMPLENERGY_PULVERIZER_PATH,
-                             self.simplenergy_pulverizer_recipe(recipe, item))
-                    Mem.ctx.data["simplenergy:tags/function/calls/pulverizer_recipes"] = Recipe(super_json_dump({"values": [f"{Mem.ctx.project_id}:calls/simplenergy/pulverizer_recipes"]}))
+                if recipe["type"] == PULVERIZING:
+                    write_function(
+                        self.SIMPLENERGY_PULVERIZER_PATH,
+                        self.simplenergy_pulverizer_recipe(recipe, item),
+                        tags=["simplenergy:calls/pulverizer_recipes"],
+                    )
 

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

@@ -46,8 +46,10 @@ def beet_default(ctx: Context):
 	# Predicates
 	FACING = ["north", "east", "south", "west"]
 	for face in FACING:
-		adv = {"condition":"minecraft:location_check","predicate":{"block":{"state":{"facing":face}}}}
-		ctx.data[ns].predicates[f"facing/{face}"] = Predicate(super_json_dump(adv))
+		pred = {"condition":"minecraft:location_check","predicate":{"block":{"state":{"facing":face}}}}
+		pred_obj = Predicate(pred)
+		pred_obj.encoder = super_json_dump
+		ctx.data[ns].predicates[f"facing/{face}"] = pred_obj
 
 	# Get rotation function
 	write_function(f"{ns}:custom_blocks/get_rotation",
@@ -80,19 +82,6 @@ execute if score #rotation {ns}.data matches 0 if predicate {ns}:facing/west run
 		# Custom block
 		if data.get(VANILLA_BLOCK):
 
-			# Add additional data to the custom blocks
-			if data.get("id") == CUSTOM_BLOCK_VANILLA:
-				data["container"] = [
-					{"slot":0,"item":{"id":"minecraft:stone","count":1,"components":{"minecraft:custom_data":{"smithed":{"block":{"id":f"{ctx.project_id}:{item}","from":ctx.project_id}}}}}}
-				]
-
-				# Hide the container tooltip
-				if not data.get("tooltip_display"):
-					data["tooltip_display"] = {"hidden_components": []}
-				elif not data["tooltip_display"].get("hidden_components"):
-					data["tooltip_display"]["hidden_components"] = []
-				data["tooltip_display"]["hidden_components"].append("minecraft:container")
-
 			# Get the vanilla block data
 			block = data[VANILLA_BLOCK]
 			block_id = block["id"]
@@ -329,7 +318,9 @@ execute store result entity @s Item.count byte 1 run scoreboard players get #ite
 
 	# Create 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))
+	pred_obj = Predicate(pred)
+	pred_obj.encoder = super_json_dump
+	ctx.data[ns].predicates["check_vanilla_blocks"] = pred_obj
 
 	# Create advanced predicate
 	advanced_predicate = {"condition": "minecraft:any_of", "terms": []}
@@ -342,7 +333,9 @@ execute store result entity @s Item.count byte 1 run scoreboard players get #ite
 			"predicate": { "nbt": f"{{Tags:[\"{ns}.vanilla.{block_underscore}\"]}}", "location": { "block": { "blocks": block }}}
 		}
 		advanced_predicate["terms"].append(pred)
-	ctx.data[ns].predicates["advanced_check_vanilla_blocks"] = Predicate(super_json_dump(advanced_predicate))
+	pred_obj = Predicate(advanced_predicate)
+	pred_obj.encoder = super_json_dump
+	ctx.data[ns].predicates["advanced_check_vanilla_blocks"] = pred_obj
 
 	# Write a destroy check every 2 ticks, every second, and every 5 seconds
 	ore_block = VANILLA_BLOCK_FOR_ORES["id"].replace(':', '_')
@@ -407,7 +400,9 @@ execute as @e[tag={ns}.custom_block,dx=0,dy=0,dz=0] at @s run function {ns}:cust
 				max_level = 0
 			)
 			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))
+			adv_obj = Advancement(adv)
+			adv_obj.encoder = super_json_dump
+			ctx.data[ns].advancements[f"custom_block_head/{item}"] = adv_obj
 
 			# Make search function
 			content = "# Search where the head has been placed\n"

{stewbeet-2.0.4 → stewbeet-2.0.5}/stewbeet/plugins/datapack/loading/__init__.py

@@ -2,7 +2,6 @@
 # ruff: noqa: E501
 # Imports
 from beet import Context
-from beet.core.utils import JsonDict
 from stouputils.decorators import measure_time
 from stouputils.io import super_json_dump
 from stouputils.print import progress
@@ -31,9 +30,6 @@ def beet_default(ctx: Context):
 	assert ctx.project_id, "Project ID is not set. Please set it in the project configuration."
 	assert ctx.project_version.count(".") == 2, "Project version must be in the format 'major.minor.patch'."
 
-	# Get configuration from context meta
-	stewbeet: JsonDict = ctx.meta.get("stewbeet", {})
-
 	# Get basic project information
 	major, minor, patch = ctx.project_version.split(".")
 
@@ -98,7 +94,7 @@ execute unless score #{ctx.project_id}.loaded load.status matches 1 run function
 			items_storage += f"data modify storage {ctx.project_id}:items all.{item} set value " + super_json_dump(mc_data, max_level = 0)
 
 	# Write the loading tellraw and score, along with the final dataset
-	project_name = stewbeet.get('project_name', ctx.project_id)
+	project_name = ctx.project_name or ctx.project_id
 	write_load_file(
 f"""
 # Confirm load

{stewbeet-2.0.4 → stewbeet-2.0.5}/stewbeet/plugins/initialize/__init__.py

@@ -1,96 +1,96 @@
-
-# Imports
-import os
-from pathlib import Path
-
-from beet import Context, Pack
-from beet.core.utils import JsonDict, TextComponent
-from box import Box
-from stouputils import relative_path
-from stouputils.decorators import measure_time
-from stouputils.io import super_json_dump
-from stouputils.print import progress, warning
-
-from ...core import Mem
-from .source_lore_font import make_source_lore_font
-
-
-# Main entry point
-@measure_time(progress, message="Execution time of 'stewbeet.plugins.initialize'")
-def beet_default(ctx: Context):
-
-	# Assertions
-	assert ctx.project_id, "Project ID must be set in the project configuration."
-
-	# Store the Box object in ctx for access throughout the codebase
-	meta_box: Box = Box(ctx.meta, default_box=True, default_box_attr={})
-	object.__setattr__(ctx, "meta", meta_box) # Bypass FrozenInstanceError
-	Mem.ctx = ctx
-
-	# Preprocess project description
-	project_description: TextComponent = Mem.ctx.meta.stewbeet.project_description
-	if not project_description or project_description == "auto":
-		# Use project name, version, and author to create a default description
-		Mem.ctx.meta.stewbeet.project_description = f"{ctx.project_name} [{ctx.project_version}] by {ctx.project_author}"
-
-	# Preprocess source lore
-	source_lore: TextComponent = Mem.ctx.meta.stewbeet.source_lore
-	if not source_lore or source_lore == "auto":
-		Mem.ctx.meta.stewbeet.source_lore = [{"text":"ICON"},{"text":f" {ctx.project_name}","italic":True,"color":"blue"}]
-	make_source_lore_font(Mem.ctx.meta.stewbeet.source_lore)
-
-	# Preprocess manual name
-	manual_name: TextComponent = Mem.ctx.meta.stewbeet.manual.name
-	if not manual_name:
-		Mem.ctx.meta.stewbeet.manual.name = f"{ctx.project_name} Manual"
-
-	# Convert paths to relative ones
-	object.__setattr__(ctx, "output_directory", relative_path(Mem.ctx.output_directory))
-
-	# Helper function to setup pack.mcmeta
-	def setup_pack_mcmeta(pack: Pack, pack_format: int):
-		existing_mcmeta = pack.mcmeta.data or {}
-		pack_mcmeta: JsonDict = {"pack": {}}
-		pack_mcmeta.update(existing_mcmeta)
-		pack_mcmeta["pack"].update(existing_mcmeta.get("pack", {}))
-		pack_mcmeta["pack"]["pack_format"] = pack_format
-		pack_mcmeta["pack"]["description"] = Mem.ctx.meta.stewbeet.project_description
-		pack_mcmeta["id"] = Mem.ctx.project_id
-		pack.mcmeta.data = pack_mcmeta
-		pack.mcmeta.encoder = super_json_dump
-
-	# Setup pack.mcmeta for both packs
-	setup_pack_mcmeta(ctx.data, ctx.data.pack_format)
-	setup_pack_mcmeta(ctx.assets, ctx.assets.pack_format)
-
-	# Convert texture names if needed (from old legacy system)
-	textures_folder = Mem.ctx.meta.stewbeet.get("textures_folder")
-	if textures_folder and Path(textures_folder).exists():
-		REPLACEMENTS = {
-			"_off": "",
-			"_down": "_bottom",
-			"_up": "_top",
-			"_north": "_front",
-			"_south": "_back",
-			"_west": "_left",
-			"_east": "_right",
-		}
-
-		# Get all texture files
-		texture_files = [f for f in os.listdir(textures_folder) if f.endswith(('.png', '.jpg', '.jpeg', ".mcmeta"))]
-
-		for file in texture_files:
-			new_name = file.lower()
-			for k, v in REPLACEMENTS.items():
-				if k in file:
-					new_name = new_name.replace(k, v)
-
-			if new_name != file:
-				old_path = Path(textures_folder) / file
-				new_path = Path(textures_folder) / new_name
-				if old_path.exists() and not new_path.exists():
-					os.rename(old_path, new_path)
-					warning(f"Renamed texture {file} to {new_name}")
-
-	pass
-
+
+# Imports
+import os
+from pathlib import Path
+
+from beet import Context, Pack
+from beet.core.utils import JsonDict, TextComponent
+from box import Box
+from stouputils import relative_path
+from stouputils.decorators import measure_time
+from stouputils.io import super_json_dump
+from stouputils.print import progress, warning
+
+from ...core import Mem
+from .source_lore_font import make_source_lore_font
+
+
+# Main entry point
+@measure_time(progress, message="Execution time of 'stewbeet.plugins.initialize'")
+def beet_default(ctx: Context):
+
+	# Assertions
+	assert ctx.project_id, "Project ID must be set in the project configuration."
+
+	# Store the Box object in ctx for access throughout the codebase
+	meta_box: Box = Box(ctx.meta, default_box=True, default_box_attr={})
+	object.__setattr__(ctx, "meta", meta_box) # Bypass FrozenInstanceError
+	Mem.ctx = ctx
+
+	# Preprocess project description
+	project_description: TextComponent = Mem.ctx.meta.stewbeet.project_description
+	if not project_description or project_description == "auto":
+		# Use project name, version, and author to create a default description
+		Mem.ctx.meta.stewbeet.project_description = f"{ctx.project_name} [{ctx.project_version}] by {ctx.project_author}"
+
+	# Preprocess source lore
+	source_lore: TextComponent = Mem.ctx.meta.stewbeet.source_lore
+	if not source_lore or source_lore == "auto":
+		Mem.ctx.meta.stewbeet.source_lore = [{"text":"ICON"},{"text":f" {ctx.project_name}","italic":True,"color":"blue"}]
+	make_source_lore_font(Mem.ctx.meta.stewbeet.source_lore)
+
+	# Preprocess manual name
+	manual_name: TextComponent = Mem.ctx.meta.stewbeet.manual.name
+	if not manual_name:
+		Mem.ctx.meta.stewbeet.manual.name = f"{ctx.project_name} Manual"
+
+	# Convert paths to relative ones
+	object.__setattr__(ctx, "output_directory", relative_path(Mem.ctx.output_directory))
+
+	# Helper function to setup pack.mcmeta
+	def setup_pack_mcmeta(pack: Pack, pack_format: int):
+		existing_mcmeta = pack.mcmeta.data or {}
+		pack_mcmeta: JsonDict = {"pack": {}}
+		pack_mcmeta.update(existing_mcmeta)
+		pack_mcmeta["pack"].update(existing_mcmeta.get("pack", {}))
+		pack_mcmeta["pack"]["pack_format"] = pack_format
+		pack_mcmeta["pack"]["description"] = Mem.ctx.meta.stewbeet.project_description
+		pack_mcmeta["id"] = Mem.ctx.project_id
+		pack.mcmeta.data = pack_mcmeta
+		pack.mcmeta.encoder = super_json_dump
+
+	# Setup pack.mcmeta for both packs
+	setup_pack_mcmeta(ctx.data, ctx.data.pack_format)
+	setup_pack_mcmeta(ctx.assets, ctx.assets.pack_format)
+
+	# Convert texture names if needed (from old legacy system)
+	textures_folder = Mem.ctx.meta.stewbeet.get("textures_folder")
+	if textures_folder and Path(textures_folder).exists():
+		REPLACEMENTS = {
+			"_off": "",
+			"_down": "_bottom",
+			"_up": "_top",
+			"_north": "_front",
+			"_south": "_back",
+			"_west": "_left",
+			"_east": "_right",
+		}
+
+		# Get all texture files
+		texture_files = [f for f in os.listdir(textures_folder) if f.endswith(('.png', '.jpg', '.jpeg', ".mcmeta"))]
+
+		for file in texture_files:
+			new_name = file.lower()
+			for k, v in REPLACEMENTS.items():
+				if k in file:
+					new_name = new_name.replace(k, v)
+
+			if new_name != file:
+				old_path = Path(textures_folder) / file
+				new_path = Path(textures_folder) / new_name
+				if old_path.exists() and not new_path.exists():
+					os.rename(old_path, new_path)
+					warning(f"Renamed texture {file} to {new_name}")
+
+	pass
+

{stewbeet-2.0.4 → stewbeet-2.0.5}/stewbeet/plugins/verify_definitions/__init__.py

@@ -214,3 +214,18 @@ def beet_default(ctx: Context) -> None:
 	else:
 		info("No errors found in the definitions during verification")
 
+
+	for item, data in Mem.definitions.items():
+		# Add additional data to the custom blocks
+		if data.get("id") == CUSTOM_BLOCK_VANILLA:
+			data["container"] = [
+				{"slot":0,"item":{"id":"minecraft:stone","count":1,"components":{"minecraft:custom_data":{"smithed":{"block":{"id":f"{ctx.project_id}:{item}","from":ctx.project_id}}}}}}
+			]
+
+			# Hide the container tooltip
+			if not data.get("tooltip_display"):
+				data["tooltip_display"] = {"hidden_components": []}
+			elif not data["tooltip_display"].get("hidden_components"):
+				data["tooltip_display"]["hidden_components"] = []
+			data["tooltip_display"]["hidden_components"].append("minecraft:container")
+