stewbeet 2.1.2__tar.gz → 2.1.4__tar.gz

{stewbeet-2.1.2 → stewbeet-2.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stewbeet
-Version: 2.1.2
+Version: 2.1.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
@@ -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.110.1
-Requires-Dist: bolt>=0.49.1
-Requires-Dist: mecha>=0.98.1
-Requires-Dist: model-resolver>=1.8.0
+Requires-Dist: beet>=0.111.0
+Requires-Dist: bolt>=0.49.2
+Requires-Dist: mecha>=0.99.0
+Requires-Dist: model-resolver>=1.10.0
 Requires-Dist: mutagen>=1.47.0
 Requires-Dist: pyperclip>=1.8.0
 Requires-Dist: smithed>=0.19.0
-Requires-Dist: stouputils>=1.3.19
+Requires-Dist: stouputils>=1.3.20
 Description-Content-Type: text/markdown
 
 

{stewbeet-2.1.2 → stewbeet-2.1.4}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "stewbeet"
-version = "2.1.2"
+version = "2.1.4"
 description = "Beet Framework made to help generating advanced Minecraft datapack contents"
 readme = "README.md"
 license = "MIT"
@@ -16,11 +16,11 @@ classifiers = [
 	"Operating System :: OS Independent",
 ]
 dependencies = [
-	"stouputils>=1.3.19",
-	"model_resolver>=1.8.0",
-	"beet>=0.110.1",
-	"bolt>=0.49.1",
-	"mecha>=0.98.1",
+	"stouputils>=1.3.20",
+	"model_resolver>=1.10.0",
+	"beet>=0.111.0",
+	"bolt>=0.49.2",
+	"mecha>=0.99.0",
 	"smithed>=0.19.0",
 	"mutagen>=1.47.0",
 	"pyperclip>=1.8.0",

{stewbeet-2.1.2 → stewbeet-2.1.4}/stewbeet/all.py

@@ -13,6 +13,7 @@ GENERATION_PLUGINS = (
     "stewbeet.plugins.datapack.loading",
     "stewbeet.plugins.datapack.custom_blocks",
     "stewbeet.plugins.datapack.loot_tables",
+    "stewbeet.plugins.datapack.sorters",
     "stewbeet.plugins.compatibilities.simpledrawer",
     "stewbeet.plugins.compatibilities.neo_enchant"
 )

{stewbeet-2.1.2 → stewbeet-2.1.4}/stewbeet/contrib/simplenergy/cables.py

@@ -10,7 +10,7 @@ from ...core import CUSTOM_ITEM_VANILLA, JsonDict, Mem, set_json_encoder, write_
 # Constants
 ENERGY_CABLE_MODELS_FOLDER: str = get_root_path(__file__) + "/energy_cable_models"
 
-# Setup machines work and visuals
+# Setup energy cables work and visuals
 def energy_cables_models(cables: list[str]) -> None:
 	""" Setup energy cables models and functions for SimplEnergy.
 
@@ -100,7 +100,7 @@ item modify entity @s contents {{"function": "minecraft:set_custom_model_data","
 
 
 
-# Setup machines work and visuals
+# Setup item cables work and visuals
 def item_cables_models(cables: dict[str, dict[str, str] | None]) -> None:
 	""" Setup item cables models and functions for SimplEnergy.
 
@@ -202,7 +202,7 @@ function #itemio:calls/cables/init
 function #itemio:calls/cables/destroy
 """)
 
-	# Update_cable_model function
+	# Update cable_model function
 	cables_str: str = "\n".join([
 		f"execute if entity @s[tag={ns}.{cable}] run item replace entity @s contents with {CUSTOM_ITEM_VANILLA}[item_model=\"{ns}:{cable}\"]"
 		for cable in cables
@@ -220,3 +220,110 @@ item modify entity @s contents {{"function": "minecraft:set_custom_model_data","
 	write_function(f"{ns}:calls/itemio/cable_update", cable_update_content, tags=["itemio:event/cable_update"])
 	return
 
+
+# Setup servo-mechanisms work and visuals
+def servo_mechanisms_models(servos: dict[str, dict[str, str] | None]) -> None:
+	""" Setup servo mechanisms models and functions for SimplEnergy.
+
+	Args:
+		servos (dict[str, dict[str, str]]): Dictionary of servo mechanisms to setup.
+			Each key is the servo name, and the value is a dictionary mapping model textures to their paths (excluding the 'type' key)
+			The mapping dictionnary is optional, if not provided, it will use the default model paths.
+			(e.g. {"servo_extractor": {"type": "extract", "default": "servo/extract_default", "connected": "servo/extract_connected"}})
+	"""
+	ns: str = Mem.ctx.project_id
+	textures_folder: str = Mem.ctx.meta.stewbeet.textures_folder
+
+	# Path to the base servo models
+	models_path: str = get_root_path(__file__) + "/servo_mechanism_models"
+
+	# Register the base block models
+	for base in ("block", "item"):
+		model_data: dict = super_json_load(f"{models_path}/base_{base}.json")
+		if base == "item":
+			model_data["parent"] = f"{ns}:block/servo/base_block"
+		Mem.ctx.assets[ns].models[f"block/servo/base_{base}"] = set_json_encoder(Model(model_data), max_level=3)
+
+	# Handle parameters
+	for servo, textures in servos.items():
+		if textures is None:
+			textures = {}
+		typ: str = textures.get("type", "extract")  # Default to 'extract' if not specified
+		default_texture: str = textures.get("default", f"servo/{typ}_default")
+		connected_texture: str = textures.get("connected", f"servo/{typ}_connected")
+
+		# Register the block model
+		base_model: dict = super_json_load(f"{models_path}/{typ}_block.json")
+		base_model["parent"] = f"{ns}:block/servo/base_block"
+		base_model["textures"] = {"0": f"{ns}:block/{default_texture}", "particle": f"{ns}:block/{default_texture}"}
+		Mem.ctx.assets[ns].models[f"block/servo/{typ}_block"] = set_json_encoder(Model(base_model), max_level=3)
+
+		# Register the connected model
+		connected_model: dict = super_json_load(f"{models_path}/{typ}_connected.json")
+		connected_model["parent"] = f"{ns}:block/servo/base_block"
+		connected_model["textures"] = {"0": f"{ns}:block/{connected_texture}", "particle": f"{ns}:block/{connected_texture}"}
+		Mem.ctx.assets[ns].models[f"block/servo/{typ}_connected"] = set_json_encoder(Model(connected_model), max_level=3)
+
+		# Register the item model
+		item_model: dict = super_json_load(f"{models_path}/{typ}_item.json")
+		item_model["parent"] = f"{ns}:block/servo/base_item"
+		item_model["textures"] = {"0": f"{ns}:block/{default_texture}", "particle": f"{ns}:block/{default_texture}"}
+		Mem.ctx.assets[ns].models[f"block/servo/{typ}_item"] = set_json_encoder(Model(item_model), max_level=3)
+
+		# Register two items file (for default and connected)
+		for texture in ("block", "connected"):
+			model_data: dict = {
+				"model": {
+					"type": "minecraft:model",
+					"model": f"{ns}:block/servo/{typ}_{texture}"
+				}
+			}
+			Mem.ctx.assets[ns].item_models[f"servo/{typ}_{texture}"] = set_json_encoder(ItemModel(model_data), max_level=3)
+
+		# Copy textures to resource pack
+		for texture_key in ("default", "connected"):
+			texture_path: str = textures.get(texture_key, f"{typ}_{texture_key}")
+			src: str = f"{textures_folder}/{texture_path}.png"
+			dst: str = f"block/{texture_path}"
+
+			# Check if the source file exists and if the texture is not already registered
+			if os.path.exists(src) and (not Mem.ctx.assets[ns].textures.get(dst)):
+				mcmeta: JsonDict | None = None if not os.path.exists(src + ".mcmeta") else super_json_load(f"{src}.mcmeta")
+				Mem.ctx.assets[ns].textures[dst] = Texture(source_path=src, mcmeta=mcmeta)
+
+		## Working functions
+		# On placement, add necessary tag and call init function
+		ns_data: dict[str, int] = Mem.definitions[servo].get("custom_data", {}).get(ns, {})
+		stack_limit: int = ns_data.get("stack_limit", 1)
+		retry_limit: int = ns_data.get("retry_limit", 1)
+		write_function(f"{ns}:custom_blocks/{servo}/place_secondary", f"""
+# Servo mechanism setup (1 item by 1 item: stack_limit)
+tag @s add itemio.servo.{typ}
+tag @s add {ns}.servo
+scoreboard players set @s itemio.servo.stack_limit {stack_limit}
+scoreboard players set @s itemio.servo.retry_limit {retry_limit}
+function #itemio:calls/servos/init
+""")
+		# On destruction, call destroy function of itemio
+		write_function(f"{ns}:custom_blocks/{servo}/destroy", """
+# Servo mechanism destruction cleanup
+function #itemio:calls/servos/destroy
+""")
+
+	# Update servo_model function
+	servo_update_content: str = f"""
+# Stop if not {ns} servo
+execute unless entity @s[tag={ns}.custom_block,tag={ns}.servo] run return fail
+
+# Apply the model dynamically based on servo tags and itemio.math score
+"""
+	for servo, textures in servos.items():
+		typ: str = textures.get("type", "extract")
+		for number, texture in ((0, "block"), (1, "connected")):
+			servo_update_content += (
+				f'execute if score @s itemio.math matches {number} if entity @s[tag={ns}.{servo}] run '
+				f'data modify entity @s Item.components."minecraft:item_model" set value "{ns}:servo/{typ}_{texture}"\n'
+			)
+	write_function(f"{ns}:calls/itemio/network_update", servo_update_content, tags=["itemio:event/network_update"])
+	return
+

stewbeet-2.1.4/stewbeet/contrib/simplenergy/servo_mechanism_models/base_block.json

@@ -0,0 +1,17 @@
+{
+	"elements": [
+		{
+			"from": [4, 0, 4],
+			"to": [12, 2, 12],
+			"rotation": {"angle": 0, "axis": "y", "origin": [2, 0, 2]},
+			"faces": {
+				"north": {"uv": [8, 0, 16, 2], "texture": "#0"},
+				"east": {"uv": [8, 2, 16, 4], "texture": "#0"},
+				"south": {"uv": [8, 4, 16, 6], "texture": "#0"},
+				"west": {"uv": [8, 6, 16, 8], "texture": "#0"},
+				"up": {"uv": [8, 8, 0, 0], "texture": "#0"},
+				"down": {"uv": [8, 8, 0, 16], "texture": "#0"}
+			}
+		}
+	]
+}

stewbeet-2.1.4/stewbeet/contrib/simplenergy/servo_mechanism_models/base_item.json

@@ -0,0 +1,28 @@
+{
+	"parent": "technicalutils:item/servo/base_block",
+	"display": {
+		"thirdperson_righthand": {
+			"translation": [0, 4, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"thirdperson_lefthand": {
+			"translation": [0, 4, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"firstperson_righthand": {
+			"translation": [3, 7.5, 0]
+		},
+		"firstperson_lefthand": {
+			"translation": [1, 7.5, 0]
+		},
+		"ground": {
+			"translation": [0, 3, 0],
+			"scale": [0.5, 0.5, 0.5]
+		},
+		"gui": {
+			"rotation": [20, 45, 0],
+			"translation": [0, 3.5, 0],
+			"scale": [0.75, 0.75, 0.75]
+		}
+	}
+}

stewbeet-2.1.4/stewbeet/contrib/simplenergy/servo_mechanism_models/extract_block.json

@@ -0,0 +1,13 @@
+{
+	"parent": "technicalutils:item/servo/base_block",
+	"textures": {
+		"0": "technicalutils:block/servo/extract_default"
+	},
+	"display": {
+		"fixed": {
+			"rotation": [-90, 0, 0],
+			"translation": [0, 0, -15],
+			"scale": [2.001, 2.001, 2.001]
+		}
+	}
+}

stewbeet-2.1.4/stewbeet/contrib/simplenergy/servo_mechanism_models/extract_connected.json

@@ -0,0 +1,13 @@
+{
+	"parent": "technicalutils:item/servo/base_block",
+	"textures": {
+		"0": "technicalutils:block/servo/extract_connected"
+	},
+	"display": {
+		"fixed": {
+			"rotation": [-90, 0, 0],
+			"translation": [0, 0, -15],
+			"scale": [2.001, 2.001, 2.001]
+		}
+	}
+}

stewbeet-2.1.4/stewbeet/contrib/simplenergy/servo_mechanism_models/extract_item.json

@@ -0,0 +1,6 @@
+{
+	"parent": "technicalutils:item/servo/base_item",
+	"textures": {
+		"0": "technicalutils:block/servo/extract_default"
+	}
+}

stewbeet-2.1.4/stewbeet/contrib/simplenergy/servo_mechanism_models/insert_block.json

@@ -0,0 +1,13 @@
+{
+	"parent": "technicalutils:item/servo/base_block",
+	"textures": {
+		"0": "technicalutils:block/servo/insert_default"
+	},
+	"display": {
+		"fixed": {
+			"rotation": [-90, 0, 0],
+			"translation": [0, 0, -15],
+			"scale": [2.001, 2.001, 2.001]
+		}
+	}
+}

stewbeet-2.1.4/stewbeet/contrib/simplenergy/servo_mechanism_models/insert_connected.json

@@ -0,0 +1,13 @@
+{
+	"parent": "technicalutils:item/servo/base_block",
+	"textures": {
+		"0": "technicalutils:block/servo/insert_connected"
+	},
+	"display": {
+		"fixed": {
+			"rotation": [-90, 0, 0],
+			"translation": [0, 0, -15],
+			"scale": [2.001, 2.001, 2.001]
+		}
+	}
+}

stewbeet-2.1.4/stewbeet/contrib/simplenergy/servo_mechanism_models/insert_item.json

@@ -0,0 +1,6 @@
+{
+	"parent": "technicalutils:item/servo/base_item",
+	"textures": {
+		"0": "technicalutils:block/servo/insert_default"
+	}
+}