Skip to content
This repository was archived by the owner on Apr 9, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
execute unless data storage macro:engine global run data modify storage macro:engine global set value {version:"v2.2.6"}
data modify storage macro:engine global.version set value "v2.2.6"
execute unless data storage macro:engine global run data modify storage macro:engine global set value {version:"v2.2.8"}
data modify storage macro:engine global.version set value "v2.2.8"

execute unless data storage macro:engine log_display run data modify storage macro:engine log_display set value []
execute unless score #ame.log_count macro.tmp matches 0.. run scoreboard players set #ame.log_count macro.tmp 0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
scoreboard players set #ame.major ame.pre_version 2
scoreboard players set #ame.minor ame.pre_version 2
scoreboard players set #ame.patch ame.pre_version 6
scoreboard players set #ame.patch ame.pre_version 8
scoreboard players set #ame.pre ame.pre_version 0
scoreboard players set #ame.ver_set ame.pre_version 1
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
tellraw @a ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"✘ ","color":"red"},{"text":"Version conflict! ","color":"red","bold":true},{"text":"Expected ","color":"#555555"},{"text":"v2.2.6","color":"aqua","bold":true},{"text":" — stored scores do not match.","color":"#555555"}]
tellraw @a ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"✘ ","color":"red"},{"text":"Version conflict! ","color":"red","bold":true},{"text":"Expected ","color":"#555555"},{"text":"v2.2.8","color":"aqua","bold":true},{"text":" — stored scores do not match.","color":"#555555"}]
tellraw @a ["",{"text":" ","color":"#555555"},{"text":"→ Run ","color":"gray"},{"text":"/reload","color":"aqua","underlined":true,"clickEvent":{"action":"run_command","value":"/reload"},"hoverEvent":{"action":"show_text","contents":"Click to reload"}},{"text":" to reinitialize AME.","color":"gray"}]

tellraw @a[tag=macro.debug] ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"DEBUG ","color":"aqua"},{"text":"ame.pre_version scores → ","color":"#555555"},{"text":"major=","color":"gray"},{"score":{"name":"#ame.major","objective":"ame.pre_version"},"color":"yellow"},{"text":" minor=","color":"gray"},{"score":{"name":"#ame.minor","objective":"ame.pre_version"},"color":"yellow"},{"text":" patch=","color":"gray"},{"score":{"name":"#ame.patch","objective":"ame.pre_version"},"color":"yellow"},{"text":" (expected: 2 2 0 pre=0)","color":"red"}]

data modify storage macro:input message set value "✘ Version mismatch — expected v2.2.6. Load aborted."
data modify storage macro:input message set value "✘ Version mismatch — expected v2.2.8. Load aborted."
function macro:log/warn with storage macro:input {}
data remove storage macro:input message
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ data modify storage macro:output data set from storage macro:engine
execute unless data storage macro:output data.global{loaded:1b} run return 0

# engine stores v2.2.2-pre1 (lowercase v)
execute unless data storage macro:output data.global{version:"v2.2.6"} run return 0
execute unless data storage macro:output data.global{version:"v2.2.8"} run return 0

# --- Tehlikeli komutlar: injection engeli (permission-level 3 / singleplayer uyumsuz) ---
execute if data storage macro:output inputs{func:"macro:cmd/op"} run return 0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

tellraw @a ["",{"text":"❌ ","color":"red"},{"text":"[AME] ","color":"aqua","bold":true},{"text":"Version conflict! ","color":"red","bold":true},{"text":"Expected ","color":"gray"},{"text":"v2.2.6","color":"yellow","bold":true},{"text":" — stored scores do not match.","color":"gray"}]
tellraw @a ["",{"text":"❌ ","color":"red"},{"text":"[AME] ","color":"aqua","bold":true},{"text":"Version conflict! ","color":"red","bold":true},{"text":"Expected ","color":"gray"},{"text":"v2.2.8","color":"yellow","bold":true},{"text":" — stored scores do not match.","color":"gray"}]
tellraw @a ["",{"text":" ↳ ","color":"#555555"},{"text":"Run ","color":"gray"},{"text":"/reload","color":"white","underlined":true,"click_event":{"action":"run_command","command":"/reload"}},{"text":" to reinitialize AME.","color":"gray"}]

tellraw @a[tag=macro.debug] ["",{"text":"[AME/DEBUG] ","color":"aqua"},{"text":"ame.pre_version → ","color":"#555555"},{"text":"$v_major=","color":"gray"},{"score":{"name":"$v_major","objective":"ame.pre_version"},"color":"yellow"},{"text":" $v_minor=","color":"gray"},{"score":{"name":"$v_minor","objective":"ame.pre_version"},"color":"yellow"},{"text":" $v_patch=","color":"gray"},{"score":{"name":"$v_patch","objective":"ame.pre_version"},"color":"yellow"},{"text":" (expected: 2 2 5 pre=0)","color":"red"}]

data modify storage macro:input message set value "❌ Version mismatch — expected v2.2.6. Load aborted."
data modify storage macro:input message set value "❌ Version mismatch — expected v2.2.8. Load aborted."
function macro:log/warn with storage macro:input {}
data remove storage macro:input message
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

tellraw @a ["",{"text":"❌ ","color":"red"},{"text":"[AME] ","color":"aqua","bold":true},{"text":"Version conflict! ","color":"red","bold":true},{"text":"Expected ","color":"gray"},{"text":"v2.2.6","color":"yellow","bold":true},{"text":" — stored scores do not match.","color":"gray"}]
tellraw @a ["",{"text":"❌ ","color":"red"},{"text":"[AME] ","color":"aqua","bold":true},{"text":"Version conflict! ","color":"red","bold":true},{"text":"Expected ","color":"gray"},{"text":"v2.2.8","color":"yellow","bold":true},{"text":" — stored scores do not match.","color":"gray"}]
tellraw @a ["",{"text":" ↳ ","color":"#555555"},{"text":"Run ","color":"gray"},{"text":"/reload","color":"white","underlined":true,"click_event":{"action":"run_command","command":"/reload"}},{"text":" to reinitialize AME.","color":"gray"}]

tellraw @a[tag=macro.debug] ["",{"text":"[AME/DEBUG] ","color":"aqua"},{"text":"ame.pre_version → ","color":"#555555"},{"text":"$v_major=","color":"gray"},{"score":{"name":"$v_major","objective":"ame.pre_version"},"color":"yellow"},{"text":" $v_minor=","color":"gray"},{"score":{"name":"$v_minor","objective":"ame.pre_version"},"color":"yellow"},{"text":" $v_patch=","color":"gray"},{"score":{"name":"$v_patch","objective":"ame.pre_version"},"color":"yellow"},{"text":" (expected: 2 2 5 pre=0)","color":"red"}]

data modify storage macro:input message set value "❌ Version mismatch — expected v2.2.6. Load aborted."
data modify storage macro:input message set value "❌ Version mismatch — expected v2.2.8. Load aborted."
function macro:log/warn with storage macro:input {}
data remove storage macro:input message
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ sha256sum datapack.zip
```
macro:engine (persistent data)
├── global
│ ├── version: "v2.2.6"
│ ├── version: "v2.2.8"
│ └── tick: <int>
├── players
│ └── Steve { coins:150, level:5, xp:2300, online:1b, ... }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
tellraw @a ["",{"text":"❌ ","color":"red"},{"text":"[AME] ","color":"aqua","bold":true},{"text":"Version conflict! ","color":"red","bold":true},{"text":"Expected ","color":"gray"},{"text":"v2.2.6","color":"yellow","bold":true},{"text":" — stored scores do not match.","color":"gray"}]
tellraw @a ["",{"text":"❌ ","color":"red"},{"text":"[AME] ","color":"aqua","bold":true},{"text":"Version conflict! ","color":"red","bold":true},{"text":"Expected ","color":"gray"},{"text":"v2.2.8","color":"yellow","bold":true},{"text":" — stored scores do not match.","color":"gray"}]
tellraw @a ["",{"text":" ↳ ","color":"#555555"},{"text":"Run ","color":"gray"},{"text":"/reload","color":"white","underlined":true,"clickEvent":{"action":"run_command","value":"/reload"}},{"text":" to reinitialize AME.","color":"gray"}]

tellraw @a[tag=macro.debug] ["",{"text":"[AME/DEBUG] ","color":"aqua"},{"text":"ame.pre_version → ","color":"#555555"},{"text":"$v_major=","color":"gray"},{"score":{"name":"#ame.major","objective":"ame.pre_version"},"color":"yellow"},{"text":" $v_minor=","color":"gray"},{"score":{"name":"#ame.minor","objective":"ame.pre_version"},"color":"yellow"},{"text":" $v_patch=","color":"gray"},{"score":{"name":"#ame.patch","objective":"ame.pre_version"},"color":"yellow"},{"text":" (expected: 2 2 5 pre=0)","color":"red"}]

data modify storage macro:input message set value "❌ Version mismatch — expected v2.2.6. Load aborted."
data modify storage macro:input message set value "❌ Version mismatch — expected v2.2.8. Load aborted."
function macro:log/warn with storage macro:input {}
data remove storage macro:input message
4 changes: 2 additions & 2 deletions data/ame_load/function/load/internal/validate.mcfunction
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
execute unless data storage macro:engine global run data modify storage macro:engine global set value {version:"v2.2.7"}
data modify storage macro:engine global.version set value "v2.2.7"
execute unless data storage macro:engine global run data modify storage macro:engine global set value {version:"v2.2.8"}
data modify storage macro:engine global.version set value "v2.2.8"

execute unless data storage macro:engine log_display run data modify storage macro:engine log_display set value []
execute unless score #ame.log_count macro.tmp matches 0.. run scoreboard players set #ame.log_count macro.tmp 0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
scoreboard players set #ame.major ame.pre_version 2
scoreboard players set #ame.minor ame.pre_version 2
scoreboard players set #ame.patch ame.pre_version 7
scoreboard players set #ame.patch ame.pre_version 8
scoreboard players set #ame.pre ame.pre_version 0
scoreboard players set #ame.ver_set ame.pre_version 1
4 changes: 2 additions & 2 deletions data/ame_load/function/load/internal/version_warn.mcfunction
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
tellraw @a ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"✘ ","color":"red"},{"text":"Version conflict! ","color":"red","bold":true},{"text":"Expected ","color":"#555555"},{"text":"v2.2.7","color":"aqua","bold":true},{"text":" — stored scores do not match.","color":"#555555"}]
tellraw @a ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"✘ ","color":"red"},{"text":"Version conflict! ","color":"red","bold":true},{"text":"Expected ","color":"#555555"},{"text":"v2.2.8","color":"aqua","bold":true},{"text":" — stored scores do not match.","color":"#555555"}]
tellraw @a ["",{"text":" ","color":"#555555"},{"text":"→ Run ","color":"gray"},{"text":"/reload","color":"aqua","underlined":true,"click_event":{"action":"run_command","command":"/reload"},"hover_event":{"action":"show_text","value":"Click to reload"}},{"text":" to reinitialize AME.","color":"gray"}]

tellraw @a[tag=macro.debug] ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"DEBUG ","color":"aqua"},{"text":"ame.pre_version scores → ","color":"#555555"},{"text":"major=","color":"gray"},{"score":{"name":"#ame.major","objective":"ame.pre_version"},"color":"yellow"},{"text":" minor=","color":"gray"},{"score":{"name":"#ame.minor","objective":"ame.pre_version"},"color":"yellow"},{"text":" patch=","color":"gray"},{"score":{"name":"#ame.patch","objective":"ame.pre_version"},"color":"yellow"},{"text":" (expected: 2 2 5 pre=0)","color":"red"}]

data modify storage macro:input message set value "✘ Version mismatch — expected v2.2.7. Load aborted."
data modify storage macro:input message set value "✘ Version mismatch — expected v2.2.8. Load aborted."
function macro:log/warn with storage macro:input {}
data remove storage macro:input message
2 changes: 1 addition & 1 deletion data/macro/function/tools/utils/input_check.mcfunction
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ data modify storage macro:output data set from storage macro:engine
execute unless data storage macro:output data.global{loaded:1b} run return 0

# engine stores v2.2.2-pre1 (lowercase v)
execute unless data storage macro:output data.global{version:"v2.2.6"} run return 0
execute unless data storage macro:output data.global{version:"v2.2.8"} run return 0

# --- Tehlikeli komutlar: injection engeli (permission-level 3 / singleplayer uyumsuz) ---
execute if data storage macro:output inputs{func:"macro:cmd/op"} run return 0
Expand Down
2 changes: 1 addition & 1 deletion pack.mcmeta
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"italic": false
},
{
"text": " | v2.2.6",
"text": " | v2.2.8",
"color": "#ffaa00",
"bold": false,
"italic": false
Expand Down
Loading