v2.0.4-pre2

tickwarden · web-flow · commit a2d14be42d89 · 2026-03-18T20:30:43.000+03:00
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
@@ -1,10 +1,10 @@
-setblock -30000000 0 1600 minecraft:test_block[mode=log]{mode:"log",message:"❌ [AME] Version conflict detected. Expected v2.0.4-pre1. Run /reload in-game for details."}
+setblock -30000000 0 1600 minecraft:test_block[mode=log]{mode:"log",message:"❌ [AME] Version conflict detected. Expected v2.0.4-pre2. Run /reload in-game for details."}
 
-tellraw @a ["",{"text":"❌ ","color":"red"},{"text":"[AME] ","color":"aqua","bold":true},{"text":"Version conflict! ","color":"red","bold":true},{"text":"Expected ","color":"gray"},{"text":"v2.0.4-pre1","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.0.4-pre2","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 0 3 pre=0)","color":"red"}]
 
-data modify storage macro:input message set value "❌ Version mismatch — expected v2.0.4-pre1. Load aborted."
+data modify storage macro:input message set value "❌ Version mismatch — expected v2.0.4-pre2. Load aborted."
 function macro:log/warn with storage macro:input {}
 data remove storage macro:input message
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
@@ -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.0.4-pre1","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.0.4-pre2","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 0 3 pre=0)","color":"red"}]
 
-data modify storage macro:input message set value "❌ Version mismatch — expected v2.0.4-pre1. Load aborted."
+data modify storage macro:input message set value "❌ Version mismatch — expected v2.0.4-pre2. Load aborted."
 function macro:log/warn with storage macro:input {}
-data remove storage macro:input message
+data remove storage macro:input message
diff --git a/data/ame_load/function/load/internal/validate.mcfunction b/data/ame_load/function/load/internal/validate.mcfunction
@@ -1,4 +1,4 @@
-execute unless data storage macro:engine global run data modify storage macro:engine global set value {version:"v2.0.4-pre1"}
+execute unless data storage macro:engine global run data modify storage macro:engine global set value {version:"v2.0.4-pre2"}
 
 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
@@ -7,9 +7,9 @@ execute if data storage macro:engine global{loaded:1b} run data modify storage m
 execute if data storage macro:engine global{loaded:1b} run function macro:log/warn with storage macro:input {}
 execute if data storage macro:engine global{loaded:1b} run return 0
 
-execute unless data storage macro:engine global{version:"v2.0.4-pre1"} run data modify storage macro:names temp.vers set value "v2.0.4-pre1"
-execute unless data storage macro:engine global{version:"v2.0.4-pre1"} run tellraw @a [{"text":"[AME] ","color":"aqua","bold":true},{"text":"Version mismatch — expected ","color":"red"},{"storage":"macro:names","nbt":"temp.vers","color":"yellow"},{"text":".","color":"red"}]
-execute unless data storage macro:engine global{version:"v2.0.4-pre1"} run return 0
+execute unless data storage macro:engine global{version:"v2.0.4-pre2"} run data modify storage macro:names temp.vers set value "v2.0.4-pre2"
+execute unless data storage macro:engine global{version:"v2.0.4-pre2"} run tellraw @a [{"text":"[AME] ","color":"aqua","bold":true},{"text":"Version mismatch — expected ","color":"red"},{"storage":"macro:names","nbt":"temp.vers","color":"yellow"},{"text":".","color":"red"}]
+execute unless data storage macro:engine global{version:"v2.0.4-pre2"} run return 0
 
 scoreboard objectives add ame.pre_version dummy
 scoreboard players set #ame.mismatch ame.pre_version 0
diff --git 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 0
 scoreboard players set #ame.patch ame.pre_version 4
-scoreboard players set #ame.pre ame.pre_version 1
-scoreboard players set #ame.ver_set ame.pre_version 1
+scoreboard players set #ame.pre ame.pre_version 2
+scoreboard players set #ame.ver_set ame.pre_version 1
diff --git a/data/ame_load/function/load/internal/version_warn.mcfunction b/data/ame_load/function/load/internal/version_warn.mcfunction
@@ -1,11 +1,11 @@
-setblock -30000000 0 1600 minecraft:test_block[mode=log]{mode:"log",message:"❌ [AME] Version conflict detected. Expected v2.0.4-pre1. Run /reload in-game for details."}
+setblock -30000000 0 1600 minecraft:test_block[mode=log]{mode:"log",message:"❌ [AME] Version conflict detected. Expected v2.0.4-pre2. Run /reload in-game for details."}
 setblock -30000000 1 1600 minecraft:redstone_block
 
-tellraw @a ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"✘ ","color":"red"},{"text":"Version conflict! ","color":"red","bold":true},{"text":"Expected ","color":"#555555"},{"text":"v2.0.4-pre1","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.0.4-pre2","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 0 3 pre=0)","color":"red"}]
 
-data modify storage macro:input message set value "✘ Version mismatch — expected v2.0.4-pre1. Load aborted."
+data modify storage macro:input message set value "✘ Version mismatch — expected v2.0.4-pre2. Load aborted."
 function macro:log/warn with storage macro:input {}
 data remove storage macro:input message
diff --git a/data/macro/function/cmd/data_remove_block.mcfunction b/data/macro/function/cmd/data_remove_block.mcfunction
@@ -4,4 +4,4 @@ execute unless dimension minecraft:overworld run return 0
 execute unless entity @s[gamemode=creative] run return 0
 
 $data remove block $(x) $(y) $(z) $(path)
-tellraw @a[tag=macro.debug] ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"cmd/data_remove_block","color":"aqua"}]
+tellraw @a[tag=macro.debug] ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"cmd/data_remove_block ","color":"aqua"},{"text":"$(x) $(y) $(z) → $(path)","color":"#555555"}]
diff --git a/data/macro/function/cmd/data_remove_entity.mcfunction b/data/macro/function/cmd/data_remove_entity.mcfunction
@@ -4,4 +4,4 @@ execute unless dimension minecraft:overworld run return 0
 execute unless entity @s[gamemode=creative] run return 0
 
 $data remove entity $(target) $(path)
-tellraw @a[tag=macro.debug] ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"cmd/data_remove_entity","color":"aqua"}]
+tellraw @a[tag=macro.debug] ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"cmd/data_remove_entity ","color":"aqua"},{"text":"$(target) → $(path)","color":"#555555"}]
diff --git a/data/macro/function/cmd/data_remove_storage.mcfunction b/data/macro/function/cmd/data_remove_storage.mcfunction
@@ -4,4 +4,4 @@ execute unless dimension minecraft:overworld run return 0
 execute unless entity @s[gamemode=creative] run return 0
 
 $data remove storage $(storage) $(path)
-tellraw @a[tag=macro.debug] ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"cmd/data_remove_storage","color":"aqua"}]
+tellraw @a[tag=macro.debug] ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"cmd/data_remove_storage ","color":"aqua"},{"text":"$(storage) → $(path)","color":"#555555"}]
diff --git a/data/macro/function/engine/call/execute_validated.mcfunction b/data/macro/function/engine/call/execute_validated.mcfunction
@@ -0,0 +1,13 @@
+# ─────────────────────────────────────────────
+#  macro:engine/call/execute_validated
+#  Güvenlik doğrulamasından geçmiş fonksiyonu çalıştırır.
+#  Yalnızca macro:tools/utils/input_check tarafından çağrılır.
+#
+#  Girdi (macro:output.inputs):
+#    func  — çalıştırılacak fonksiyon adı (zaten doğrulanmış)
+#  Veri   (macro:input):
+#    Fonksiyona aktarılacak tüm parametreler
+# ─────────────────────────────────────────────
+
+# Doğrulanmış func adını macro sub-function'a ilet ve çalıştır
+function macro:engine/call/execute_validated/run with storage macro:output inputs
diff --git a/data/macro/function/engine/call/execute_validated/run.mcfunction b/data/macro/function/engine/call/execute_validated/run.mcfunction
@@ -0,0 +1,8 @@
+# ─────────────────────────────────────────────
+#  macro:engine/call/execute_validated/run
+#  Doğrulanmış fonksiyonu macro ile genişletip çalıştırır.
+#  macro:output.inputs storage'ından $(func) değişkenini alır,
+#  macro:input storage'ını parametre kaynağı olarak kullanır.
+# ─────────────────────────────────────────────
+
+$function $(func) with storage macro:input {}
diff --git a/data/macro/function/lib/debounce_cmd.mcfunction b/data/macro/function/lib/debounce_cmd.mcfunction
@@ -0,0 +1,4 @@
+$execute if data storage macro:engine schedules.$(key) run return 0
+
+function macro:lib/schedule_cmd with storage macro:input {}
+$tellraw @a[tag=macro.debug] ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"lib/debounce_cmd ","color":"aqua"},{"text":" → ","color":"#555555"},{"text":"$(key)","color":"aqua"}]
diff --git a/data/macro/function/lib/internal/queue_fire.mcfunction b/data/macro/function/lib/internal/queue_fire.mcfunction
@@ -1,2 +1,3 @@
-function macro:lib/internal/queue_run_func with storage macro:engine queue[0]
+execute if data storage macro:engine queue[0].func run function macro:lib/internal/queue_run_func with storage macro:engine queue[0]
+execute if data storage macro:engine queue[0].cmd run function macro:lib/internal/queue_run_cmd with storage macro:engine queue[0]
 data remove storage macro:engine queue[0]
diff --git a/data/macro/function/lib/internal/queue_run_cmd.mcfunction b/data/macro/function/lib/internal/queue_run_cmd.mcfunction
@@ -0,0 +1 @@
+$$(cmd)
diff --git a/data/macro/function/lib/internal/schedule_requeue_cmd.mcfunction b/data/macro/function/lib/internal/schedule_requeue_cmd.mcfunction
@@ -0,0 +1 @@
+$data modify storage macro:engine queue append value {cmd:"$(cmd)", delay:$(interval)}
diff --git a/data/macro/function/lib/internal/schedule_reset_do_cmd.mcfunction b/data/macro/function/lib/internal/schedule_reset_do_cmd.mcfunction
@@ -0,0 +1,3 @@
+$data modify storage macro:engine schedules.$(key).cmd set value "$(cmd)"
+$data modify storage macro:engine schedules.$(key).interval set value $(interval)
+$data modify storage macro:engine queue append value {cmd:"$(cmd)", delay:$(interval)}
diff --git a/data/macro/function/lib/once_cmd.mcfunction b/data/macro/function/lib/once_cmd.mcfunction
@@ -0,0 +1,7 @@
+$execute if data storage macro:engine once_keys.$(key) run return 0
+
+$data modify storage macro:engine once_keys.$(key) set value 1b
+
+$$(cmd)
+
+$tellraw @a[tag=macro.debug] ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"lib/once_cmd ","color":"aqua"},{"text":"[fired] ","color":"green"},{"text":"$(key)","color":"aqua"},{"text":" → ","color":"#555555"},{"text":"$(cmd)","color":"white"}]
diff --git a/data/macro/function/lib/queue_add_cmd.mcfunction b/data/macro/function/lib/queue_add_cmd.mcfunction
@@ -0,0 +1,2 @@
+$data modify storage macro:engine queue append value {cmd:"$(cmd)", delay:$(delay)}
+$tellraw @a[tag=macro.debug] ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"lib/queue_add_cmd ","color":"aqua"},{"text":" → ","color":"#555555"},{"text":"$(cmd)","color":"aqua"}]
diff --git a/data/macro/function/lib/schedule_cmd.mcfunction b/data/macro/function/lib/schedule_cmd.mcfunction
@@ -0,0 +1,16 @@
+# ─────────────────────────────────────────────
+#  macro:lib/schedule_cmd
+#  Belirli bir süre aralığında tekrar eden komut zamanlayıcısı.
+#
+#  Girdi (macro:input):
+#    key      — zamanlayıcı adı (benzersiz tanımlayıcı)
+#    cmd      — her tetiklendiğinde çalıştırılacak ham komut
+#    interval — tick cinsinden tekrar aralığı
+# ─────────────────────────────────────────────
+
+$execute if data storage macro:engine schedules.$(key) run data remove storage macro:engine schedules.$(key)
+
+$data modify storage macro:engine schedules.$(key).cmd set value "$(cmd)"
+$data modify storage macro:engine schedules.$(key).interval set value $(interval)
+$data modify storage macro:engine queue append value {cmd:"$(cmd)", delay:$(interval)}
+$tellraw @a[tag=macro.debug] ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"lib/schedule_cmd ","color":"aqua"},{"text":" → ","color":"#555555"},{"text":"$(key)","color":"aqua"},{"text":" ($(interval)t)","color":"#555555"}]
diff --git a/data/macro/function/lib/schedule_if_cmd.mcfunction b/data/macro/function/lib/schedule_if_cmd.mcfunction
@@ -0,0 +1 @@
+function macro:lib/queue_add_cmd with storage macro:input {}
diff --git a/data/macro/function/lib/schedule_renew.mcfunction b/data/macro/function/lib/schedule_renew.mcfunction
@@ -1,5 +1,6 @@
 $execute unless data storage macro:engine schedules.$(key) run return 0
 $data modify storage macro:engine _sched_tmp set from storage macro:engine schedules.$(key)
-function macro:lib/internal/schedule_requeue with storage macro:engine _sched_tmp
+execute if data storage macro:engine _sched_tmp.func run function macro:lib/internal/schedule_requeue with storage macro:engine _sched_tmp
+execute if data storage macro:engine _sched_tmp.cmd run function macro:lib/internal/schedule_requeue_cmd with storage macro:engine _sched_tmp
 data remove storage macro:engine _sched_tmp
 $tellraw @a[tag=macro.debug] ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"lib/schedule_renew ","color":"aqua"},{"text":" → ","color":"#555555"},{"text":"$(key)","color":"aqua"}]
diff --git a/data/macro/function/lib/schedule_reset.mcfunction b/data/macro/function/lib/schedule_reset.mcfunction
@@ -5,6 +5,7 @@ $data modify storage macro:engine _sreset.key set value "$(key)"
 
 $data remove storage macro:engine schedules.$(key)
 
-function macro:lib/internal/schedule_reset_do with storage macro:engine _sreset
+execute if data storage macro:engine _sreset.func run function macro:lib/internal/schedule_reset_do with storage macro:engine _sreset
+execute if data storage macro:engine _sreset.cmd run function macro:lib/internal/schedule_reset_do_cmd with storage macro:engine _sreset
 data remove storage macro:engine _sreset
 $tellraw @a[tag=macro.debug] ["",{"text":"[AME] ","color":"#00AAAA","bold":true},{"text":"lib/schedule_reset ","color":"aqua"},{"text":" → ","color":"#555555"},{"text":"$(key)","color":"aqua"}]
diff --git a/data/macro/function/lib/wait_cmd.mcfunction b/data/macro/function/lib/wait_cmd.mcfunction
@@ -0,0 +1 @@
+function macro:lib/queue_add_cmd with storage macro:input {}
diff --git a/data/macro/function/tools/utils/input_check.mcfunction b/data/macro/function/tools/utils/input_check.mcfunction
@@ -3,8 +3,8 @@ data modify storage macro:output data set from storage macro:engine
 
 execute unless data storage macro:output data.global{loaded:1b} run return 0
 
-# BUG FIX: engine v2.0.4-pre1 (küçük v) saklar — V2.0.3 değil
-execute unless data storage macro:output data.global{version:"v2.0.4-pre1"} run return 0
+# engine v2.0.4-pre2 (küçük v) saklar
+execute unless data storage macro:output data.global{version:"v2.0.4-pre2"} 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
@@ -137,7 +137,7 @@ execute if data storage macro:output inputs{func:"with storage macro:input"} run
 execute if data storage macro:output inputs{func:"with storage macro:output"} run return 0
 
 # Doğrulama başarıyla tamamlandıysa, komutu güvenli bir şekilde yürütme aşamasına geç
-#function macro:engine/call/execute_validated
+function macro:engine/call/execute_validated
 
 # Geçici verileri temizle (Bellek yönetimi ve güvenlik için)
 data remove storage macro:output data
diff --git a/data/macro/loot_table/template/tiered_drop.json b/data/macro/loot_table/template/tiered_drop.json
diff --git a/pack.mcmeta b/pack.mcmeta
