diff --git a/1_20_5/data/dl_load/functions/core/internal/load/finalize.mcfunction b/1_20_5/data/dl_load/functions/core/internal/load/finalize.mcfunction index 662cb22..13e75d8 100644 --- a/1_20_5/data/dl_load/functions/core/internal/load/finalize.mcfunction +++ b/1_20_5/data/dl_load/functions/core/internal/load/finalize.mcfunction @@ -7,7 +7,7 @@ execute if score #dl.pre dl.pre_version matches ..0 run tellraw @a ["",{"text":" data modify storage datalib:engine _log_add_tmp.message set value "✔ All modules initialized. Engine ready." data modify storage datalib:input level set value "DL" data modify storage datalib:input color set value "green" -function datalib:systems/log/add with storage datalib:engine {} +function datalib:systems/log/add with storage datalib:engine _log_add_tmp data remove storage datalib:engine _log_add_tmp.message data remove storage datalib:input level data remove storage datalib:input color diff --git a/1_20_5/data/dl_load/functions/core/internal/load/validate.mcfunction b/1_20_5/data/dl_load/functions/core/internal/load/validate.mcfunction index fe583db..7b124e6 100644 --- a/1_20_5/data/dl_load/functions/core/internal/load/validate.mcfunction +++ b/1_20_5/data/dl_load/functions/core/internal/load/validate.mcfunction @@ -5,7 +5,7 @@ execute unless data storage datalib:engine log_display run data modify storage d execute unless score #dl.log_count dl.tmp matches 0.. run scoreboard players set #dl.log_count dl.tmp 0 execute if data storage datalib:engine global{loaded:1b} run data modify storage datalib:engine _log_add_tmp.message set value "Already loaded — skipping reload." -execute if data storage datalib:engine global{loaded:1b} run function datalib:systems/log/warn with storage datalib:engine {} +execute if data storage datalib:engine global{loaded:1b} run function datalib:systems/log/warn with storage datalib:engine _log_add_tmp execute if data storage datalib:engine global{loaded:1b} run return 0 scoreboard objectives add dl.pre_version dummy diff --git a/1_20_5/data/dl_load/functions/core/internal/load/version_warn.mcfunction b/1_20_5/data/dl_load/functions/core/internal/load/version_warn.mcfunction index b55fcd1..62803bf 100644 --- a/1_20_5/data/dl_load/functions/core/internal/load/version_warn.mcfunction +++ b/1_20_5/data/dl_load/functions/core/internal/load/version_warn.mcfunction @@ -4,5 +4,5 @@ tellraw @a ["",{"text":" ","color":"#555555"},{"text":"→ Run ","color":"gray"} tellraw @a[tag=datalib.debug] ["",{"text":"[DL] ","color":"#00AAAA","bold":true},{"text":"DEBUG ","color":"aqua"},{"text":"dl.pre_version scores → ","color":"#555555"},{"text":"major=","color":"gray"},{"score":{"name":"#dl.major","objective":"dl.pre_version"},"color":"yellow"},{"text":" minor=","color":"gray"},{"score":{"name":"#dl.minor","objective":"dl.pre_version"},"color":"yellow"},{"text":" patch=","color":"gray"},{"score":{"name":"#dl.patch","objective":"dl.pre_version"},"color":"yellow"},{"text":" pre=","color":"gray"},{"score":{"name":"#dl.pre","objective":"dl.pre_version"},"color":"yellow"},{"text":" (expected: 4 0 4 pre=0)","color":"red"}] data modify storage datalib:engine _log_add_tmp.message set value "✘ Version mismatch — expected v5.1.2. Load aborted." -function datalib:systems/log/warn with storage datalib:engine {} +function datalib:systems/log/warn with storage datalib:engine _log_add_tmp data remove storage datalib:engine _log_add_tmp.message \ No newline at end of file diff --git a/1_20_5/data/dl_load/functions/load/all.mcfunction b/1_20_5/data/dl_load/functions/load/all.mcfunction index 45bd104..4515f33 100644 --- a/1_20_5/data/dl_load/functions/load/all.mcfunction +++ b/1_20_5/data/dl_load/functions/load/all.mcfunction @@ -11,7 +11,7 @@ execute unless function dl_load:core/internal/load/validate run return 0 data modify storage datalib:engine _log_add_tmp.level set value "D.L." data modify storage datalib:engine _log_add_tmp.message set value "Starting..." data modify storage datalib:engine _log_add_tmp.color set value "aqua" -function datalib:systems/log/add with storage datalib:engine {} +function datalib:systems/log/add with storage datalib:engine _log_add_tmp # Stage 2 debug summon minecraft:marker ~ ~ ~ {Tags:["datalib.stage2"],CustomName:'{"text":"DL"}'} @@ -48,6 +48,6 @@ execute if score #dl.pre dl.pre_version matches ..0 run tellraw @a[tag=datalib.d data modify storage datalib:engine _log_add_tmp.level set value "dataLib" data modify storage datalib:engine _log_add_tmp.message set value "Loaded." data modify storage datalib:engine _log_add_tmp.color set value "green" -function datalib:systems/log/add with storage datalib:engine {} +function datalib:systems/log/add with storage datalib:engine _log_add_tmp function dl_load:core/internal/load/finalize \ No newline at end of file