diff --git a/README.md b/README.md index 3d462f3..f721762 100644 --- a/README.md +++ b/README.md @@ -44,8 +44,7 @@ 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 dl_load:load/yes -function dl_load:load/fork_no +function macroengine_load:main data modify storage macroengine:engine global.loaded set value 1b ``` @@ -99,7 +98,7 @@ Provides deterministic load order, version tracking, and pre/load/post-load hook execute if score #MacroEngine load.status matches 1.. run say MacroEngine is loaded # Get version (major*10000 + minor*100 + patch → v6.0.2 = 601) -scoreboard players get MacroEngine load.status +scoreboard players get #MacroEngine load.status ``` ### StringLib diff --git a/datapacks/macroEngine/1_20_5/data/macroengine/functions/version.mcfunction b/datapacks/macroEngine/1_20_5/data/macroengine/functions/version.mcfunction index 7a2628d..9ee8631 100644 --- a/datapacks/macroEngine/1_20_5/data/macroengine/functions/version.mcfunction +++ b/datapacks/macroEngine/1_20_5/data/macroengine/functions/version.mcfunction @@ -13,9 +13,9 @@ execute if score #macroengine.pre macroengine.pre_version matches 1.. run tellra execute if score #macroengine.pre macroengine.pre_version matches ..0 run tellraw @s ["",{"text":" ┃ ","color":"#555555"},{"text":"Version ","color":"gray"},{"text":"v","color":"#ffaa00"},{"score":{"name":"#macroengine.major","objective":"macroengine.pre_version"},"color":"#ffaa00","bold":true},{"text":".","color":"#ffaa00"},{"score":{"name":"#macroengine.minor","objective":"macroengine.pre_version"},"color":"#ffaa00","bold":true},{"text":".","color":"#ffaa00"},{"score":{"name":"#macroengine.patch","objective":"macroengine.pre_version"},"color":"#ffaa00","bold":true}] tellraw @s ["",{"text":" ┃ ","color":"#555555"},{"text":"MC ","color":"gray"},{"text":"26.2","color":"#e3ff57"},{"text":" (pack_format 107)","color":"#555555"}] -tellraw @s ["",{"text":" ┃ ","color":"#555555"},{"text":"Author ","color":"gray"},{"text":"Legends11","color":"#00ff33"},{"text":" / ","color":"#555555"},{"text":"runtoolkit","color":"aqua"}] +tellraw @s ["",{"text":" ┃ ","color":"#555555"},{"text":"Author ","color":"gray"},{"text":"Legends11","color":"#00ff33","clickEvent":{"action":"open_url","value":"https://github.com/tickwarden"}},{"text":" / ","color":"#555555"},{"text":"runtoolkit","color":"aqua","underlined":true,"clickEvent":{"action":"open_url","value":"https://github.com/runtoolkit"}}] -tellraw @s ["",{"text":" ┃ ","color":"#555555"},{"text":"Source ","color":"gray"},{"text":"github.com/runtoolkit/macroengine-dp","color":"#5555ff"}] +tellraw @s ["",{"text":" ┃ ","color":"#555555"},{"text":"Source ","color":"gray"},{"text":"github.com/runtoolkit/macroEngine","color":"#5555ff","underlined":true,"click_event":{"action":"open_url","url":"https://github.com/runtoolkit/macroengine-dp"}}] # Check if loaded execute if score #macroengine.ver_set macroengine.pre_version matches 1 run tellraw @s ["",{"text":" ┃ ","color":"#555555"},{"text":"Status ","color":"gray"},{"text":"● loaded","color":"green"}] execute unless score #macroengine.ver_set macroengine.pre_version matches 1 run tellraw @s ["",{"text":" ┃ ","color":"#555555"},{"text":"Status ","color":"gray"},{"text":"✖ not initialized","color":"red"}] diff --git a/datapacks/macroEngine/1_20_5/data/macroengine_load/functions/load/all.mcfunction b/datapacks/macroEngine/1_20_5/data/macroengine_load/functions/load/all.mcfunction index 10a0b82..fd49225 100644 --- a/datapacks/macroEngine/1_20_5/data/macroengine_load/functions/load/all.mcfunction +++ b/datapacks/macroEngine/1_20_5/data/macroengine_load/functions/load/all.mcfunction @@ -1,6 +1,6 @@ # macroengine_load:load/all — full init pipeline (no fork / rt_origin / confirm gates) -tellraw @a ["",{"text":"[MACROENGINE] ","color":"#00AAAA","bold":true},{"text":"Starting macroengine...","color":"gray"}] +tellraw @a ["",{"text":"[MACROENGINE] ","color":"#00AAAA","bold":true},{"text":"Starting macroEngine...","color":"gray"}] # forceload classic marker chunk (legacy features) forceload add -30000000 1600 @@ -14,4 +14,4 @@ function macroengine:config data modify storage macroengine:engine global.loaded set value 1b -schedule function macroengine_load:load/final 1s +schedule function macroengine_load:load/final 2s diff --git a/datapacks/macroEngine/1_20_5/data/macroengine_load/functions/load/final.mcfunction b/datapacks/macroEngine/1_20_5/data/macroengine_load/functions/load/final.mcfunction index 85aee90..e996718 100644 --- a/datapacks/macroEngine/1_20_5/data/macroengine_load/functions/load/final.mcfunction +++ b/datapacks/macroEngine/1_20_5/data/macroengine_load/functions/load/final.mcfunction @@ -2,4 +2,4 @@ data modify storage macroengine:engine global.version set value "v6.0.2" scoreboard players set #runtoolkit.packs.macroengine.version macroengine.meta 602 -tellraw @a ["",{"text":"[MACROENGINE] ","color":"#00AAAA","bold":true},{"text":"macroengine v6.0.2 loaded.","color":"green"}] +tellraw @a ["",{"text":"[MACROENGINE] ","color":"#00AAAA","bold":true},{"text":"macroEngine v6.0.2 loaded.","color":"green"}] diff --git a/datapacks/macroEngine/data/macroengine/function/disable.mcfunction b/datapacks/macroEngine/data/macroengine/function/disable.mcfunction index 06c71e0..a0d0d16 100644 --- a/datapacks/macroEngine/data/macroengine/function/disable.mcfunction +++ b/datapacks/macroEngine/data/macroengine/function/disable.mcfunction @@ -1,5 +1,3 @@ -playsound minecraft:block.note_block.pling master @s ~ ~ ~ 4 2 - function macroengine:core/disable/main -tellraw @s [{"text":"To restart:"}," ",{"text":"/datapack enable 'file/macroengine.zip'","color":"aqua","bold":true,"italic":false,"click_event": {"action": "run_command", "command": "/datapack enable 'file/macroengine.zip'"}},", ",{"text":"/datapack enable 'file/macroengine'","color":"aqua","bold":true,"italic":false,"click_event": {"action": "run_command", "command": "/datapack enable 'file/macroengine'"}}," or",{"text":"/datapack enable 'file/macroengine-full.zip'","color":"aqua","bold":true,"italic":false,"click_event": {"action": "run_command", "command": "/datapack enable 'file/macroengine-full.zip'"}}] +tellraw @s [{"text":"To restart:"}," ",{"text":"/datapack enable 'file/macroEngine.zip'","color":"aqua","bold":true,"italic":false,"click_event": {"action": "run_command", "command": "/datapack enable 'file/macroEngine.zip'"}},", ",{"text":"/datapack enable 'file/macroEngine'","color":"aqua","bold":true,"italic":false,"click_event": {"action": "run_command", "command": "/datapack enable 'file/macroEngine'"}}," or",{"text":"/datapack enable 'file/macroEngine-full.zip'","color":"aqua","bold":true,"italic":false,"click_event": {"action": "run_command", "command": "/datapack enable 'file/macroEngine-full.zip'"}}] diff --git a/datapacks/macroEngine/data/macroengine/function/version.mcfunction b/datapacks/macroEngine/data/macroengine/function/version.mcfunction index 10aea5b..e162fea 100644 --- a/datapacks/macroEngine/data/macroengine/function/version.mcfunction +++ b/datapacks/macroEngine/data/macroengine/function/version.mcfunction @@ -15,7 +15,7 @@ execute if score #macroengine.pre macroengine.pre_version matches ..0 run tellra tellraw @s ["",{"text":" ┃ ","color":"#555555"},{"text":"MC ","color":"gray"},{"text":"26.2","color":"#e3ff57"},{"text":" (pack_format 107)","color":"#555555"}] tellraw @s ["",{"text":" ┃ ","color":"#555555"},{"text":"Author ","color":"gray"},{"text":"Legends11","color":"#00ff33","click_event":{"action":"open_url","url":"https://github.com/tickwarden"}},{"text":" / ","color":"#555555"},{"text":"runtoolkit","color":"aqua","underlined":true,"click_event":{"action":"open_url","url":"https://github.com/runtoolkit"}}] -tellraw @s ["",{"text":" ┃ ","color":"#555555"},{"text":"Source ","color":"gray"},{"text":"github.com/runtoolkit/macroengine-dp","color":"#5555ff","underlined":true,"click_event":{"action":"open_url","url":"https://github.com/runtoolkit/macroengine-dp"}}] +tellraw @s ["",{"text":" ┃ ","color":"#555555"},{"text":"Source ","color":"gray"},{"text":"github.com/runtoolkit/macroEngine","color":"#5555ff","underlined":true,"click_event":{"action":"open_url","url":"https://github.com/runtoolkit/macroengine-dp"}}] # Check if loaded execute if score #macroengine.ver_set macroengine.pre_version matches 1 run tellraw @s ["",{"text":" ┃ ","color":"#555555"},{"text":"Status ","color":"gray"},{"text":"● loaded","color":"green"}] execute unless score #macroengine.ver_set macroengine.pre_version matches 1 run tellraw @s ["",{"text":" ┃ ","color":"#555555"},{"text":"Status ","color":"gray"},{"text":"✖ not initialized","color":"red"}] diff --git a/datapacks/macroEngine/data/macroengine_load/function/load/all.mcfunction b/datapacks/macroEngine/data/macroengine_load/function/load/all.mcfunction index 8499d5e..8de623b 100644 --- a/datapacks/macroEngine/data/macroengine_load/function/load/all.mcfunction +++ b/datapacks/macroEngine/data/macroengine_load/function/load/all.mcfunction @@ -1,6 +1,6 @@ # macroengine_load:load/all — full init pipeline (no fork / rt_origin / confirm gates) -tellraw @a ["",{"text":"[MACROENGINE] ","color":"#00AAAA","bold":true},{"text":"Starting macroengine...","color":"gray"}] +tellraw @a ["",{"text":"[MACROENGINE] ","color":"#00AAAA","bold":true},{"text":"Starting macroEngine...","color":"gray"}] # forceload classic marker chunk (legacy features) forceload add -30000000 1600 @@ -18,4 +18,4 @@ function macroengine:backport/load data modify storage macroengine:engine global.loaded set value 1b -schedule function macroengine_load:load/final 1s +schedule function macroengine_load:load/final 2s diff --git a/datapacks/macroEngine/data/macroengine_load/function/load/final.mcfunction b/datapacks/macroEngine/data/macroengine_load/function/load/final.mcfunction index 85aee90..e996718 100644 --- a/datapacks/macroEngine/data/macroengine_load/function/load/final.mcfunction +++ b/datapacks/macroEngine/data/macroengine_load/function/load/final.mcfunction @@ -2,4 +2,4 @@ data modify storage macroengine:engine global.version set value "v6.0.2" scoreboard players set #runtoolkit.packs.macroengine.version macroengine.meta 602 -tellraw @a ["",{"text":"[MACROENGINE] ","color":"#00AAAA","bold":true},{"text":"macroengine v6.0.2 loaded.","color":"green"}] +tellraw @a ["",{"text":"[MACROENGINE] ","color":"#00AAAA","bold":true},{"text":"macroEngine v6.0.2 loaded.","color":"green"}]