Devlop

.dependencies.json

@@ -5,18 +5,22 @@
       "version": "v1.7",
       "source": "https://github.com/ICY105/PlayerAction",
       "license": "MIT",
-      "namespace": "player_action",
-      "load_tag": "#player_action:load",
-      "renamed_as": "macroengine_player",
-      "note": "Embedded as-is. Provides player event hooks (click, movement, block interaction)."
+      "previously_renamed_as": "macroengine_player",
+      "note": "Ported into macroengine:core/internal/player/* (v6.1.0 refactor). The intermediate macroengine_player namespace no longer exists. player_action.* scoreboard objectives and entity tags remain as data-level identifiers, left unchanged from upstream."
+    },
+    {
+      "id": "stringlib",
+      "source": "https://modrinth.com/datapack/stringlib",
+      "note": "Ported into macroengine:core/internal/string/* (v6.1.0 refactor). Upstream/embedded copy was itself missing zprivate/split, zprivate/to_lowercase/main_*, zprivate/to_uppercase/main_* — see in-file warning comments in the ported files."
     }
   ],
-  "required": [
+  "required": [],
+  "removed": [
     {
       "id": "lanternload",
-      "renamed_as": "macroengine_load",
+      "previously_renamed_as": "macroengine_load",
       "source": "https://github.com/LanternMC/load",
-      "note": "Already bundled via data/load namespace."
+      "note": "Removed in v6.1.0. Replaced by manual /function macroengine:setup entry point."
     }
   ]
 }

README.md

@@ -6,7 +6,7 @@
 [![License: MIT](https://img.shields.io/badge/License-MIT-green?style=for-the-badge)](LICENSE)
 
 ---
-> Current version: **v6.0.2**
+> Current version: **v6.1.0**
 ---
 
 > **This datapack was considered safe to use as of its last release, but it no longer receives security improvements, bug fixes, or new features. There is no "up to date" version to move to.**
@@ -44,11 +44,17 @@ execute unless data storage macroengine:engine {global:{loaded:1b}} run function
 # Guard checks the SAME storage/path the trigger condition checks (macroengine:engine global.loaded).
 execute if data storage macroengine:engine {global:{loaded:1b}} run return 0
 
-function macroengine_load:main
+function macroengine:setup
 
 data modify storage macroengine:engine global.loaded set value 1b
 ```
 
+> **v6.1.0 change:** macroEngine no longer auto-starts via `minecraft:load`. The
+> old `function macroengine_load:main` entry point (and the LanternMC `load:`
+> tag chain it depended on) is gone. Consuming packs must call
+> `function macroengine:setup` explicitly — either from their own manual
+> `<namespace>:load_macroengine` guard (as above) or once by an admin.
+
 <details>
 <summary>Fixed bug: duplicate load trigger (click to expand)</summary>
 
@@ -65,7 +71,7 @@ Both the check and the set must target `macroengine:engine global.loaded`. If yo
 ```
 macroengine:engine  (persistent data)
 ├── global
-│   ├── version: "v6.0.2"
+│   ├── version: "v6.1.0"
 │   ├── loaded: 1b
 │   └── tick: <int>
 ├── players
@@ -87,17 +93,17 @@ macroengine:output  (receiving results from a function)
 
 ## 📦 Dependencies
 
-### Lantern Load
+### Lantern Load — **removed in v6.1.0**
 **Repository:** https://github.com/LanternMC/load
 **License:** BSD 0-Clause (public domain)
 
-Provides deterministic load order, version tracking, and pre/load/post-load hooks.
+Previously provided deterministic load order, version tracking, and pre/load/post-load hooks via the `load:` namespace tag chain. As of v6.1.0 this dependency is gone entirely — macroEngine starts via a manual `function macroengine:setup` call instead (see the Load Guard section above). `data/load/` no longer exists in this pack.
 
 ```mcfunction
 # Check if MacroEngine is loaded
 execute if score #MacroEngine load.status matches 1.. run say MacroEngine is loaded
 
-# Get version (major*10000 + minor*100 + patch → v6.0.2 = 601)
+# Get version (major*100 + minor*10 + patch → v6.1.0 = 610)
 scoreboard players get #MacroEngine load.status
 ```
 
@@ -138,4 +144,4 @@ function macroengine:core/lib/string/replace
 
 ---
 
-*MacroEngine v6.0.2 | MC Java 26.2 | Pure Datapack*
+*MacroEngine v6.1.0 | MC Java 26.2 | Pure Datapack*

datapacks/macroEngine/1_20_5/data/macroengine/advancements/core/internal/player/attack_click_entity.json

@@ -0,0 +1,21 @@
+{
+  "criteria": {
+    "attack_click_entity": {
+      "trigger": "minecraft:player_hurt_entity",
+      "conditions": {
+        "entity": [
+          {
+            "entity": "this",
+            "predicate": {
+              "nbt": "{Tags:[\"player_action.click_entity\"]}"
+            },
+            "condition": "minecraft:entity_properties"
+          }
+        ]
+      }
+    }
+  },
+  "rewards": {
+    "function": "macroengine:core/internal/player/internal/attack_click_entity"
+  }
+}

datapacks/macroEngine/1_20_5/data/macroengine/advancements/core/internal/player/interact_anvil.json

@@ -0,0 +1,24 @@
+{
+  "criteria": {
+    "interact_anvil": {
+      "trigger": "minecraft:default_block_use",
+      "conditions": {
+        "location": [
+          {
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:anvil"
+                ]
+              }
+            },
+            "condition": "minecraft:location_check"
+          }
+        ]
+      }
+    }
+  },
+  "rewards": {
+    "function": "macroengine:core/internal/player/internal/interact_anvil"
+  }
+}

datapacks/macroEngine/1_20_5/data/macroengine/advancements/core/internal/player/interact_barrel.json

@@ -0,0 +1,24 @@
+{
+  "criteria": {
+    "interact_barrel": {
+      "trigger": "minecraft:default_block_use",
+      "conditions": {
+        "location": [
+          {
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:barrel"
+                ]
+              }
+            },
+            "condition": "minecraft:location_check"
+          }
+        ]
+      }
+    }
+  },
+  "rewards": {
+    "function": "macroengine:core/internal/player/internal/interact_barrel"
+  }
+}

datapacks/macroEngine/1_20_5/data/macroengine/advancements/core/internal/player/interact_beacon.json

@@ -0,0 +1,24 @@
+{
+  "criteria": {
+    "interact_beacon": {
+      "trigger": "minecraft:default_block_use",
+      "conditions": {
+        "location": [
+          {
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:beacon"
+                ]
+              }
+            },
+            "condition": "minecraft:location_check"
+          }
+        ]
+      }
+    }
+  },
+  "rewards": {
+    "function": "macroengine:core/internal/player/internal/interact_beacon"
+  }
+}

datapacks/macroEngine/1_20_5/data/macroengine/advancements/core/internal/player/interact_blast_furnace.json

@@ -0,0 +1,24 @@
+{
+  "criteria": {
+    "interact_blast_furnace": {
+      "trigger": "minecraft:default_block_use",
+      "conditions": {
+        "location": [
+          {
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:blast_furnace"
+                ]
+              }
+            },
+            "condition": "minecraft:location_check"
+          }
+        ]
+      }
+    }
+  },
+  "rewards": {
+    "function": "macroengine:core/internal/player/internal/interact_blast_furnace"
+  }
+}

datapacks/macroEngine/1_20_5/data/macroengine/advancements/core/internal/player/interact_brewingstand.json

@@ -0,0 +1,24 @@
+{
+  "criteria": {
+    "interact_brewingstand": {
+      "trigger": "minecraft:default_block_use",
+      "conditions": {
+        "location": [
+          {
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:brewing_stand"
+                ]
+              }
+            },
+            "condition": "minecraft:location_check"
+          }
+        ]
+      }
+    }
+  },
+  "rewards": {
+    "function": "macroengine:core/internal/player/internal/interact_brewingstand"
+  }
+}

datapacks/macroEngine/1_20_5/data/macroengine/advancements/core/internal/player/interact_cake.json

@@ -0,0 +1,24 @@
+{
+  "criteria": {
+    "interact_cake": {
+      "trigger": "minecraft:default_block_use",
+      "conditions": {
+        "location": [
+          {
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:cake"
+                ]
+              }
+            },
+            "condition": "minecraft:location_check"
+          }
+        ]
+      }
+    }
+  },
+  "rewards": {
+    "function": "macroengine:core/internal/player/internal/interact_cake"
+  }
+}

datapacks/macroEngine/1_20_5/data/macroengine/advancements/core/internal/player/interact_campfire.json

@@ -0,0 +1,25 @@
+{
+  "criteria": {
+    "interact_campfire": {
+      "trigger": "minecraft:item_used_on_block",
+      "conditions": {
+        "location": [
+          {
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:campfire",
+                  "minecraft:soul_campfire"
+                ]
+              }
+            },
+            "condition": "minecraft:location_check"
+          }
+        ]
+      }
+    }
+  },
+  "rewards": {
+    "function": "macroengine:core/internal/player/internal/interact_campfire"
+  }
+}

datapacks/macroEngine/1_20_5/data/macroengine/advancements/core/internal/player/interact_cartopgraphy_table.json

@@ -0,0 +1,24 @@
+{
+  "criteria": {
+    "interact_cartopgraphy_table": {
+      "trigger": "minecraft:default_block_use",
+      "conditions": {
+        "location": [
+          {
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:cartography_table"
+                ]
+              }
+            },
+            "condition": "minecraft:location_check"
+          }
+        ]
+      }
+    }
+  },
+  "rewards": {
+    "function": "macroengine:core/internal/player/internal/interact_cartopgraphy_table"
+  }
+}

datapacks/macroEngine/1_20_5/data/macroengine/advancements/core/internal/player/interact_cauldron.json

@@ -0,0 +1,22 @@
+{
+  "criteria": {
+    "interact_cauldron": {
+      "trigger": "minecraft:item_used_on_block",
+      "conditions": {
+        "location": [
+          {
+            "predicate": {
+              "block": {
+                "blocks": "#minecraft:cauldrons"
+              }
+            },
+            "condition": "minecraft:location_check"
+          }
+        ]
+      }
+    }
+  },
+  "rewards": {
+    "function": "macroengine:core/internal/player/internal/interact_cauldron"
+  }
+}