diff --git a/1_20_3/data/ame_load/functions/load/internal/validate.mcfunction b/1_20_3/data/ame_load/functions/load/internal/validate.mcfunction index 2a51699..1db2dfc 100644 --- a/1_20_3/data/ame_load/functions/load/internal/validate.mcfunction +++ b/1_20_3/data/ame_load/functions/load/internal/validate.mcfunction @@ -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 diff --git a/1_20_3/data/ame_load/functions/load/internal/version_set.mcfunction b/1_20_3/data/ame_load/functions/load/internal/version_set.mcfunction index 6f7dda8..9484a1b 100644 --- a/1_20_3/data/ame_load/functions/load/internal/version_set.mcfunction +++ b/1_20_3/data/ame_load/functions/load/internal/version_set.mcfunction @@ -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 \ No newline at end of file diff --git a/1_20_3/data/ame_load/functions/load/internal/version_warn.mcfunction b/1_20_3/data/ame_load/functions/load/internal/version_warn.mcfunction index 76b0b2f..a79874e 100644 --- a/1_20_3/data/ame_load/functions/load/internal/version_warn.mcfunction +++ b/1_20_3/data/ame_load/functions/load/internal/version_warn.mcfunction @@ -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 \ No newline at end of file diff --git a/1_20_3/data/macro/functions/tools/utils/input_check.mcfunction b/1_20_3/data/macro/functions/tools/utils/input_check.mcfunction index 332e606..db76c8f 100644 --- a/1_20_3/data/macro/functions/tools/utils/input_check.mcfunction +++ b/1_20_3/data/macro/functions/tools/utils/input_check.mcfunction @@ -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 diff --git a/1_21_5/data/ame_load/function/load/internal/version_warn.mcfunction b/1_21_5/data/ame_load/function/load/internal/version_warn.mcfunction index 8c8e951..6436efa 100644 --- a/1_21_5/data/ame_load/function/load/internal/version_warn.mcfunction +++ b/1_21_5/data/ame_load/function/load/internal/version_warn.mcfunction @@ -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 \ No newline at end of file diff --git a/1_21_6/data/ame_load/function/load/internal/version_warn.mcfunction b/1_21_6/data/ame_load/function/load/internal/version_warn.mcfunction index 8c8e951..6436efa 100644 --- a/1_21_6/data/ame_load/function/load/internal/version_warn.mcfunction +++ b/1_21_6/data/ame_load/function/load/internal/version_warn.mcfunction @@ -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 \ No newline at end of file diff --git a/README.md b/README.md index 5eecfa5..09a4123 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ sha256sum datapack.zip ``` macro:engine (persistent data) ├── global -│ ├── version: "v2.2.6" +│ ├── version: "v2.2.8" │ └── tick: ├── players │ └── Steve { coins:150, level:5, xp:2300, online:1b, ... } diff --git a/compat_1_21_4/data/ame_load/function/load/internal/version_warn.mcfunction b/compat_1_21_4/data/ame_load/function/load/internal/version_warn.mcfunction index 09279fb..9710d85 100644 --- a/compat_1_21_4/data/ame_load/function/load/internal/version_warn.mcfunction +++ b/compat_1_21_4/data/ame_load/function/load/internal/version_warn.mcfunction @@ -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 \ No newline at end of file diff --git a/data/ame_load/function/load/internal/validate.mcfunction b/data/ame_load/function/load/internal/validate.mcfunction index 3a2f187..e28cad4 100644 --- a/data/ame_load/function/load/internal/validate.mcfunction +++ b/data/ame_load/function/load/internal/validate.mcfunction @@ -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 diff --git a/data/ame_load/function/load/internal/version_set.mcfunction b/data/ame_load/function/load/internal/version_set.mcfunction index 3c96009..9484a1b 100644 --- a/data/ame_load/function/load/internal/version_set.mcfunction +++ b/data/ame_load/function/load/internal/version_set.mcfunction @@ -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 \ No newline at end of file diff --git a/data/ame_load/function/load/internal/version_warn.mcfunction b/data/ame_load/function/load/internal/version_warn.mcfunction index 63e0a6b..4123e51 100644 --- a/data/ame_load/function/load/internal/version_warn.mcfunction +++ b/data/ame_load/function/load/internal/version_warn.mcfunction @@ -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 \ No newline at end of file diff --git a/data/macro/function/tools/utils/input_check.mcfunction b/data/macro/function/tools/utils/input_check.mcfunction index 332e606..db76c8f 100644 --- a/data/macro/function/tools/utils/input_check.mcfunction +++ b/data/macro/function/tools/utils/input_check.mcfunction @@ -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 diff --git a/pack.mcmeta b/pack.mcmeta index 6c7ae13..92ad98d 100644 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -45,7 +45,7 @@ "italic": false }, { - "text": " | v2.2.6", + "text": " | v2.2.8", "color": "#ffaa00", "bold": false, "italic": false