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

Commit a050559

Browse files
tickwardentickwarden
authored
v2.1.2
1 parent 2012cde commit a050559

39 files changed

Lines changed: 276 additions & 40 deletions

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
setblock -30000000 0 1600 minecraft:test_block[mode=log]{mode:"log",message:"❌ [AME] Version conflict detected. Expected v2.1.1. Run /reload in-game for details."}
1+
setblock -30000000 0 1600 minecraft:test_block[mode=log]{mode:"log",message:"❌ [AME] Version conflict detected. Expected v2.1.2. Run /reload in-game for details."}
22

3-
tellraw @a ["",{"text":"❌ ","color":"red"},{"text":"[AME] ","color":"aqua","bold":true},{"text":"Version conflict! ","color":"red","bold":true},{"text":"Expected ","color":"gray"},{"text":"v2.1.1","color":"yellow","bold":true},{"text":" — stored scores do not match.","color":"gray"}]
3+
tellraw @a ["",{"text":"❌ ","color":"red"},{"text":"[AME] ","color":"aqua","bold":true},{"text":"Version conflict! ","color":"red","bold":true},{"text":"Expected ","color":"gray"},{"text":"v2.1.2","color":"yellow","bold":true},{"text":" — stored scores do not match.","color":"gray"}]
44
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"}]
55

6-
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 0 3 pre=0)","color":"red"}]
6+
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 1 2 pre=0)","color":"red"}]
77

8-
data modify storage macro:input message set value "❌ Version mismatch — expected v2.1.1. Load aborted."
8+
data modify storage macro:input message set value "❌ Version mismatch — expected v2.1.2. Load aborted."
99
function macro:log/warn with storage macro:input {}
1010
data remove storage macro:input message

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
setblock -30000000 0 1600 minecraft:test_block[mode=log]{mode:"log",message:"❌ [AME] Version conflict detected. Expected v2.1.1-pre1. Run /reload in-game for details."}
1+
setblock -30000000 0 1600 minecraft:test_block[mode=log]{mode:"log",message:"❌ [AME] Version conflict detected. Expected v2.1.2-pre1. Run /reload in-game for details."}
22

3-
tellraw @a ["",{"text":"❌ ","color":"red"},{"text":"[AME] ","color":"aqua","bold":true},{"text":"Version conflict! ","color":"red","bold":true},{"text":"Expected ","color":"gray"},{"text":"v2.1.1","color":"yellow","bold":true},{"text":" — stored scores do not match.","color":"gray"}]
3+
tellraw @a ["",{"text":"❌ ","color":"red"},{"text":"[AME] ","color":"aqua","bold":true},{"text":"Version conflict! ","color":"red","bold":true},{"text":"Expected ","color":"gray"},{"text":"v2.1.2","color":"yellow","bold":true},{"text":" — stored scores do not match.","color":"gray"}]
44
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"}]
55

6-
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 0 3 pre=0)","color":"red"}]
6+
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 1 2 pre=0)","color":"red"}]
77

8-
data modify storage macro:input message set value "❌ Version mismatch — expected v2.1.1. Load aborted."
8+
data modify storage macro:input message set value "❌ Version mismatch — expected v2.1.2. Load aborted."
99
function macro:log/warn with storage macro:input {}
1010
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.0.4-pre1"
39+
│ ├── version: "v2.1.2"
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: 3 additions & 3 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.1.1","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.1.2","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

4-
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 0 3 pre=0)","color":"red"}]
4+
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 1 2 pre=0)","color":"red"}]
55

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

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,20 @@ scoreboard objectives remove macro.hook_online
7373
scoreboard objectives remove macro.hook_deaths
7474
scoreboard objectives remove macro.hook_placed
7575
scoreboard objectives remove macro.hook_lvl
76+
scoreboard objectives remove macro.hook_lvl_new
77+
scoreboard objectives remove macro.hook_sneak
78+
scoreboard objectives remove macro.hook_sprint
79+
scoreboard objectives remove macro.hook_elytra
7680
tag @a remove macro.hook_dead
81+
tag @a remove macro.hook_sneaking
82+
tag @a remove macro.hook_sprinting
83+
tag @a remove macro.hook_gliding
84+
scoreboard objectives remove macro.hook_tool_used
85+
scoreboard objectives remove macro.hook_item_used
86+
scoreboard objectives remove macro.hook_entity_killed
87+
scoreboard objectives remove macro.hook_using_item
88+
scoreboard objectives remove macro.hook_killed_by_arrow
89+
scoreboard objectives remove macro.hook_hero_of_the_village
7790
data remove storage macro:engine hook_binds
7891
data remove storage macro:engine _hook_iter
7992
data remove storage macro:engine _hook_ctx

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

Lines changed: 4 additions & 4 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.1.1"}
2-
data modify storage macro:engine global.version set value "v2.1.1"
1+
execute unless data storage macro:engine global run data modify storage macro:engine global set value {version:"v2.1.2"}
2+
data modify storage macro:engine global.version set value "v2.1.2"
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
@@ -12,8 +12,8 @@ scoreboard objectives add ame.pre_version dummy
1212
scoreboard players set #ame.mismatch ame.pre_version 0
1313
execute if score #ame.ver_set ame.pre_version matches 1 run execute unless score #ame.major ame.pre_version matches 2 run scoreboard players set #ame.mismatch ame.pre_version 1
1414
execute if score #ame.ver_set ame.pre_version matches 1 run execute unless score #ame.minor ame.pre_version matches 1 run scoreboard players set #ame.mismatch ame.pre_version 1
15-
execute if score #ame.ver_set ame.pre_version matches 1 run execute unless score #ame.patch ame.pre_version matches 0 run scoreboard players set #ame.mismatch ame.pre_version 1
16-
execute if score #ame.ver_set ame.pre_version matches 1 run execute unless score #ame.pre ame.pre_version matches 3 run scoreboard players set #ame.mismatch ame.pre_version 1
15+
execute if score #ame.ver_set ame.pre_version matches 1 run execute unless score #ame.patch ame.pre_version matches 2 run scoreboard players set #ame.mismatch ame.pre_version 1
16+
execute if score #ame.ver_set ame.pre_version matches 1 run execute unless score #ame.pre ame.pre_version matches 0 run scoreboard players set #ame.mismatch ame.pre_version 1
1717
execute if score #ame.mismatch ame.pre_version matches 1 run function ame_load:load/internal/version_warn
1818
execute if score #ame.mismatch ame.pre_version matches 1 run return 0
1919

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

Lines changed: 2 additions & 2 deletions
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 1
3-
scoreboard players set #ame.patch ame.pre_version 0
4-
scoreboard players set #ame.pre ame.pre_version 3
3+
scoreboard players set #ame.patch ame.pre_version 2
4+
scoreboard players set #ame.pre ame.pre_version 0
55
scoreboard players set #ame.ver_set ame.pre_version 1

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
setblock -30000000 0 1600 minecraft:test_block[mode=log]{mode:"log",message:"❌ [AME] Version conflict detected. Expected v2.1.1. Run /reload in-game for details."}
1+
setblock -30000000 0 1600 minecraft:test_block[mode=log]{mode:"log",message:"❌ [AME] Version conflict detected. Expected v2.1.2. Run /reload in-game for details."}
22
setblock -30000000 1 1600 minecraft:redstone_block
33

4-
tellraw @a ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"✘ ","color":"red"},{"text":"Version conflict! ","color":"red","bold":true},{"text":"Expected ","color":"#555555"},{"text":"v2.1.1","color":"aqua","bold":true},{"text":" — stored scores do not match.","color":"#555555"}]
4+
tellraw @a ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"✘ ","color":"red"},{"text":"Version conflict! ","color":"red","bold":true},{"text":"Expected ","color":"#555555"},{"text":"v2.1.2","color":"aqua","bold":true},{"text":" — stored scores do not match.","color":"#555555"}]
55
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"}]
66

7-
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 0 3 pre=0)","color":"red"}]
7+
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 1 2 pre=0)","color":"red"}]
88

9-
data modify storage macro:input message set value "✘ Version mismatch — expected v2.1.1. Load aborted."
9+
data modify storage macro:input message set value "✘ Version mismatch — expected v2.1.2. Load aborted."
1010
function macro:log/warn with storage macro:input {}
1111
data remove storage macro:input message

‎data/ame_load/function/load/scoreboards.mcfunction‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,23 @@ scoreboard objectives add macro.rightClick minecraft.used:minecraft.carrot_on_a_
2222

2323
# Hook modülü scoreboardları
2424
scoreboard objectives add macro.hook_online dummy
25-
scoreboard objectives add macro.hook_deaths minecraft.custom:minecraft.deaths
25+
# BUGFIX: reload sonrası online oyuncular yeni join gibi tetiklenmesin
26+
scoreboard players set @a macro.hook_online 1
27+
scoreboard objectives add macro.hook_deaths deathCount
2628
# NOT: placed_blocks genel bir statistic değil — dummy olarak kullanılmalı
2729
scoreboard objectives add macro.hook_placed dummy
2830
scoreboard objectives add macro.hook_lvl dummy
31+
scoreboard objectives add macro.hook_lvl_new dummy
32+
# Yeni hook scoreboardları
33+
scoreboard objectives add macro.hook_sneak dummy
34+
scoreboard objectives add macro.hook_sprint dummy
35+
scoreboard objectives add macro.hook_elytra dummy
36+
# block_break — item_durability_changed advancement tabanlı
37+
scoreboard objectives add macro.hook_tool_used dummy
38+
# item_use, entity_kill advancement tabanlı
39+
scoreboard objectives add macro.hook_item_used dummy
40+
scoreboard objectives add macro.hook_entity_killed dummy
41+
# using_item, killed_by_arrow, hero_of_the_village
42+
scoreboard objectives add macro.hook_using_item dummy
43+
scoreboard objectives add macro.hook_killed_by_arrow dummy
44+
scoreboard objectives add macro.hook_hero_of_the_village dummy

‎data/macro/advancement/hook/break_block.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"criteria": {
3+
"tool_durability_lost": {
4+
"trigger": "minecraft:item_durability_changed",
5+
"conditions": {
6+
"delta": {
7+
"max": -1
8+
}
9+
}
10+
}
11+
},
12+
"rewards": {
13+
"function": "macro:hook/on_break_block"
14+
},
15+
"parent": "macro:hidden/root"
16+
}

0 commit comments

Comments
 (0)