Skip to content
This repository was archived by the owner on Apr 9, 2026. It is now read-only.

Commit 9d1653e

Browse files
tickwardentickwarden
authored
Merge pull request #12 from ToolkitMC/feat/new-modules-batch2
Feat/new modules batch2
2 parents 2b4615e + 1145788 commit 9d1653e

13 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎1_20_3/data/ame_load/functions/load/internal/validate.mcfunction‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
execute unless data storage macro:engine global run data modify storage macro:engine global set value {version:"v2.2.6"}
2-
data modify storage macro:engine global.version set value "v2.2.6"
1+
execute unless data storage macro:engine global run data modify storage macro:engine global set value {version:"v2.2.8"}
2+
data modify storage macro:engine global.version set value "v2.2.8"
33

44
execute unless data storage macro:engine log_display run data modify storage macro:engine log_display set value []
55
execute unless score #ame.log_count macro.tmp matches 0.. run scoreboard players set #ame.log_count macro.tmp 0

‎1_20_3/data/ame_load/functions/load/internal/version_set.mcfunction‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
scoreboard players set #ame.major ame.pre_version 2
22
scoreboard players set #ame.minor ame.pre_version 2
3-
scoreboard players set #ame.patch ame.pre_version 6
3+
scoreboard players set #ame.patch ame.pre_version 8
44
scoreboard players set #ame.pre ame.pre_version 0
55
scoreboard players set #ame.ver_set ame.pre_version 1

‎1_20_3/data/ame_load/functions/load/internal/version_warn.mcfunction‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
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"}]
1+
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"}]
22
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"}]
33

44
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"}]
55

6-
data modify storage macro:input message set value "✘ Version mismatch — expected v2.2.6. Load aborted."
6+
data modify storage macro:input message set value "✘ Version mismatch — expected v2.2.8. Load aborted."
77
function macro:log/warn with storage macro:input {}
88
data remove storage macro:input message

‎1_20_3/data/macro/functions/tools/utils/input_check.mcfunction‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ data modify storage macro:output data set from storage macro:engine
44
execute unless data storage macro:output data.global{loaded:1b} run return 0
55

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

99
# --- Tehlikeli komutlar: injection engeli (permission-level 3 / singleplayer uyumsuz) ---
1010
execute if data storage macro:output inputs{func:"macro:cmd/op"} run return 0

‎1_21_5/data/ame_load/function/load/internal/version_warn.mcfunction‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

2-
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"}]
2+
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"}]
33
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"}]
44

55
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"}]
66

7-
data modify storage macro:input message set value "❌ Version mismatch — expected v2.2.6. Load aborted."
7+
data modify storage macro:input message set value "❌ Version mismatch — expected v2.2.8. Load aborted."
88
function macro:log/warn with storage macro:input {}
99
data remove storage macro:input message

‎1_21_6/data/ame_load/function/load/internal/version_warn.mcfunction‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

2-
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"}]
2+
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"}]
33
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"}]
44

55
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"}]
66

7-
data modify storage macro:input message set value "❌ Version mismatch — expected v2.2.6. Load aborted."
7+
data modify storage macro:input message set value "❌ Version mismatch — expected v2.2.8. Load aborted."
88
function macro:log/warn with storage macro:input {}
99
data remove storage macro:input message

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ sha256sum datapack.zip
3636
```
3737
macro:engine (persistent data)
3838
├── global
39-
│ ├── version: "v2.2.6"
39+
│ ├── version: "v2.2.8"
4040
│ └── tick: <int>
4141
├── players
4242
│ └── Steve { coins:150, level:5, xp:2300, online:1b, ... }

‎compat_1_21_4/data/ame_load/function/load/internal/version_warn.mcfunction‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
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"}]
1+
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"}]
22
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"}]
33

44
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"}]
55

6-
data modify storage macro:input message set value "❌ Version mismatch — expected v2.2.6. Load aborted."
6+
data modify storage macro:input message set value "❌ Version mismatch — expected v2.2.8. Load aborted."
77
function macro:log/warn with storage macro:input {}
88
data remove storage macro:input message

‎data/ame_load/function/load/internal/validate.mcfunction‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
execute unless data storage macro:engine global run data modify storage macro:engine global set value {version:"v2.2.7"}
2-
data modify storage macro:engine global.version set value "v2.2.7"
1+
execute unless data storage macro:engine global run data modify storage macro:engine global set value {version:"v2.2.8"}
2+
data modify storage macro:engine global.version set value "v2.2.8"
33

44
execute unless data storage macro:engine log_display run data modify storage macro:engine log_display set value []
55
execute unless score #ame.log_count macro.tmp matches 0.. run scoreboard players set #ame.log_count macro.tmp 0

‎data/ame_load/function/load/internal/version_set.mcfunction‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
scoreboard players set #ame.major ame.pre_version 2
22
scoreboard players set #ame.minor ame.pre_version 2
3-
scoreboard players set #ame.patch ame.pre_version 7
3+
scoreboard players set #ame.patch ame.pre_version 8
44
scoreboard players set #ame.pre ame.pre_version 0
55
scoreboard players set #ame.ver_set ame.pre_version 1

0 commit comments

Comments
 (0)