diff --git a/1_20_3/data/datalib/functions/core/tick/admin_systems.mcfunction b/1_20_3/data/datalib/functions/core/tick/admin_systems.mcfunction index 9002a87..b8c8b74 100644 --- a/1_20_3/data/datalib/functions/core/tick/admin_systems.mcfunction +++ b/1_20_3/data/datalib/functions/core/tick/admin_systems.mcfunction @@ -1,4 +1,4 @@ tag @a[tag=datalib.admin] add datalib.debug -scoreboard players enable @a[tag=datalib.admin] datalib_menu +scoreboard players enable @a[tag=datalib.admin] dl_menu scoreboard players enable @a[tag=datalib.admin] dl_action scoreboard players enable @a[tag=datalib.admin] dl_run diff --git a/1_20_3/data/datalib/functions/core/tick/player_systems.mcfunction b/1_20_3/data/datalib/functions/core/tick/player_systems.mcfunction index 618e8e9..f0323c6 100644 --- a/1_20_3/data/datalib/functions/core/tick/player_systems.mcfunction +++ b/1_20_3/data/datalib/functions/core/tick/player_systems.mcfunction @@ -1,8 +1,8 @@ execute as @a run function datalib:core/lib/tick_guard_clear -execute as @a[scores={datalib_menu=1..}] run function datalib:menu -scoreboard players set @a[scores={datalib_menu=1..}] datalib_menu 0 -scoreboard players enable @a[scores={datalib_menu=-1..}] datalib_menu +execute as @a[scores={dl_menu=1..}] run function datalib:menu +scoreboard players set @a[scores={dl_menu=1..}] dl_menu 0 +scoreboard players enable @a[scores={dl_menu=-1..}] dl_menu execute as @a[scores={dl_run=1..}] run function #datalib:admin/run scoreboard players set @a[scores={dl_run=1..}] dl_run 0 diff --git a/1_20_3/data/dl_load/functions/load/internal/cleanup.mcfunction b/1_20_3/data/dl_load/functions/load/internal/cleanup.mcfunction index 92b6c77..074167f 100644 --- a/1_20_3/data/dl_load/functions/load/internal/cleanup.mcfunction +++ b/1_20_3/data/dl_load/functions/load/internal/cleanup.mcfunction @@ -3,7 +3,7 @@ schedule clear datalib:core/lib/sync_tick forceload remove -30000000 1600 forceload remove 0 0 -scoreboard players reset @a datalib_menu +scoreboard players reset @a dl_menu scoreboard players reset @a dl_run scoreboard players reset $tick dl.tmp @@ -49,7 +49,7 @@ data remove storage datalib:engine rate_limit scoreboard objectives remove dl.tmp scoreboard objectives remove datalib.time -scoreboard objectives remove datalib_menu +scoreboard objectives remove dl_menu scoreboard objectives remove dl_run scoreboard objectives remove dl_action scoreboard objectives remove datalib.tick_guard diff --git a/1_20_3/data/dl_load/functions/load/other.mcfunction b/1_20_3/data/dl_load/functions/load/other.mcfunction index 97482ca..92eb93d 100644 --- a/1_20_3/data/dl_load/functions/load/other.mcfunction +++ b/1_20_3/data/dl_load/functions/load/other.mcfunction @@ -8,7 +8,7 @@ data remove storage datalib:input func data remove storage datalib:input interval data remove storage datalib:input key -scoreboard players enable @a[tag=datalib.admin] datalib_menu +scoreboard players enable @a[tag=datalib.admin] dl_menu scoreboard players enable @a[tag=datalib.admin] dl_run scoreboard players enable @a[tag=datalib.admin] dl_action diff --git a/1_20_3/data/dl_load/functions/load/scoreboards.mcfunction b/1_20_3/data/dl_load/functions/load/scoreboards.mcfunction index ab7b11f..f6ad4da 100644 --- a/1_20_3/data/dl_load/functions/load/scoreboards.mcfunction +++ b/1_20_3/data/dl_load/functions/load/scoreboards.mcfunction @@ -1,6 +1,6 @@ scoreboard objectives add dl.tmp dummy scoreboard objectives add datalib.time dummy -scoreboard objectives add datalib_menu trigger +scoreboard objectives add dl_menu trigger scoreboard objectives add dl_run trigger scoreboard objectives add dl_action trigger scoreboard objectives add datalib.dialog_load dummy diff --git a/1_20_5/data/datalib/functions/core/tick/admin_systems.mcfunction b/1_20_5/data/datalib/functions/core/tick/admin_systems.mcfunction index a6665d4..353522b 100644 --- a/1_20_5/data/datalib/functions/core/tick/admin_systems.mcfunction +++ b/1_20_5/data/datalib/functions/core/tick/admin_systems.mcfunction @@ -1,4 +1,4 @@ tag @a[tag=datalib.admin] add datalib.debug -scoreboard players enable @a[tag=datalib.admin] datalib_menu +scoreboard players enable @a[tag=datalib.admin] dl_menu scoreboard players enable @a[tag=datalib.admin] datalib_action scoreboard players enable @a[tag=datalib.admin] datalib_run diff --git a/1_20_5/data/datalib/functions/core/tick/player_systems.mcfunction b/1_20_5/data/datalib/functions/core/tick/player_systems.mcfunction index 4a17596..080f2a3 100644 --- a/1_20_5/data/datalib/functions/core/tick/player_systems.mcfunction +++ b/1_20_5/data/datalib/functions/core/tick/player_systems.mcfunction @@ -1,8 +1,8 @@ execute as @a run function datalib:core/lib/tick_guard_clear -execute as @a[scores={datalib_menu=1..}] run function datalib:menu -scoreboard players set @a[scores={datalib_menu=1..}] datalib_menu 0 -scoreboard players enable @a[scores={datalib_menu=-1..}] datalib_menu +execute as @a[scores={dl_menu=1..}] run function datalib:menu +scoreboard players set @a[scores={dl_menu=1..}] dl_menu 0 +scoreboard players enable @a[scores={dl_menu=-1..}] dl_menu execute as @a[scores={macro_run=1..}] run function #datalib:admin/run scoreboard players set @a[scores={macro_run=1..}] datalib_run 0 diff --git a/1_20_5/data/dl_load/functions/load/internal/cleanup.mcfunction b/1_20_5/data/dl_load/functions/load/internal/cleanup.mcfunction index b888f00..15f5443 100644 --- a/1_20_5/data/dl_load/functions/load/internal/cleanup.mcfunction +++ b/1_20_5/data/dl_load/functions/load/internal/cleanup.mcfunction @@ -3,7 +3,7 @@ schedule clear datalib:core/lib/sync_tick forceload remove -30000000 1600 forceload remove 0 0 -scoreboard players reset @a datalib_menu +scoreboard players reset @a dl_menu scoreboard players reset @a datalib_run scoreboard players reset $tick dl.tmp @@ -49,7 +49,7 @@ data remove storage datalib:engine rate_limit scoreboard objectives remove dl.tmp scoreboard objectives remove datalib.time -scoreboard objectives remove datalib_menu +scoreboard objectives remove dl_menu scoreboard objectives remove datalib_run scoreboard objectives remove datalib_action scoreboard objectives remove datalib.tick_guard diff --git a/1_20_5/data/dl_load/functions/load/other.mcfunction b/1_20_5/data/dl_load/functions/load/other.mcfunction index d0bdb42..cc7e579 100644 --- a/1_20_5/data/dl_load/functions/load/other.mcfunction +++ b/1_20_5/data/dl_load/functions/load/other.mcfunction @@ -8,7 +8,7 @@ data remove storage datalib:input func data remove storage datalib:input interval data remove storage datalib:input key -scoreboard players enable @a[tag=datalib.admin] datalib_menu +scoreboard players enable @a[tag=datalib.admin] dl_menu scoreboard players enable @a[tag=datalib.admin] datalib_run scoreboard players enable @a[tag=datalib.admin] datalib_action diff --git a/1_20_5/data/dl_load/functions/load/scoreboards.mcfunction b/1_20_5/data/dl_load/functions/load/scoreboards.mcfunction index defecef..4d6ab0a 100644 --- a/1_20_5/data/dl_load/functions/load/scoreboards.mcfunction +++ b/1_20_5/data/dl_load/functions/load/scoreboards.mcfunction @@ -1,6 +1,6 @@ scoreboard objectives add dl.tmp dummy scoreboard objectives add datalib.time dummy -scoreboard objectives add datalib_menu trigger +scoreboard objectives add dl_menu trigger scoreboard objectives add datalib_run trigger scoreboard objectives add datalib_action trigger scoreboard objectives add datalib.dialog_load dummy diff --git a/1_21_5/data/datalib/function/core/tick/player_systems.mcfunction b/1_21_5/data/datalib/function/core/tick/player_systems.mcfunction index ab657f1..311c9b0 100644 --- a/1_21_5/data/datalib/function/core/tick/player_systems.mcfunction +++ b/1_21_5/data/datalib/function/core/tick/player_systems.mcfunction @@ -1,6 +1,6 @@ -execute as @a[scores={datalib_menu=1..}] run function datalib:menu -scoreboard players set @a[scores={datalib_menu=1..}] datalib_menu 0 -scoreboard players enable @a[scores={datalib_menu=-1..}] datalib_menu +execute as @a[scores={dl_menu=1..}] run function datalib:menu +scoreboard players set @a[scores={dl_menu=1..}] dl_menu 0 +scoreboard players enable @a[scores={dl_menu=-1..}] dl_menu execute as @a[scores={dl_run=1..}] run function #datalib:run scoreboard players set @a[scores={dl_run=1..}] dl_run 0 diff --git a/1_21_6/data/datalib/function/core/tick/player_systems.mcfunction b/1_21_6/data/datalib/function/core/tick/player_systems.mcfunction index d02b6fd..3adf13d 100644 --- a/1_21_6/data/datalib/function/core/tick/player_systems.mcfunction +++ b/1_21_6/data/datalib/function/core/tick/player_systems.mcfunction @@ -1,6 +1,6 @@ -execute as @a[scores={datalib_menu=1..}] run function datalib:menu -scoreboard players set @a[scores={datalib_menu=1..}] datalib_menu 0 -scoreboard players enable @a[scores={datalib_menu=-1..}] datalib_menu +execute as @a[scores={dl_menu=1..}] run function datalib:menu +scoreboard players set @a[scores={dl_menu=1..}] dl_menu 0 +scoreboard players enable @a[scores={dl_menu=-1..}] dl_menu execute as @a[scores={dl_run=1..}] run function #datalib:run scoreboard players set @a[scores={dl_run=1..}] dl_run 0 diff --git a/data/datalib/function/core/tick/admin_systems.mcfunction b/data/datalib/function/core/tick/admin_systems.mcfunction index 555aae2..603f68e 100644 --- a/data/datalib/function/core/tick/admin_systems.mcfunction +++ b/data/datalib/function/core/tick/admin_systems.mcfunction @@ -1,5 +1,5 @@ tag @a[tag=datalib.admin] add datalib.debug -scoreboard players enable @a[tag=datalib.admin] datalib_menu +scoreboard players enable @a[tag=datalib.admin] dl_menu scoreboard players enable @a[tag=datalib.admin] dl_action scoreboard players enable @a[tag=datalib.admin] dl_run function datalib:systems/geo/region_watch/internal/tick_scan diff --git a/data/datalib/function/core/tick/player_systems.mcfunction b/data/datalib/function/core/tick/player_systems.mcfunction index c08af52..fd0c230 100644 --- a/data/datalib/function/core/tick/player_systems.mcfunction +++ b/data/datalib/function/core/tick/player_systems.mcfunction @@ -1,8 +1,8 @@ execute as @a run function datalib:core/lib/tick_guard_clear -execute as @a[scores={datalib_menu=1..}] run function datalib:menu -scoreboard players set @a[scores={datalib_menu=1..}] datalib_menu 0 -scoreboard players enable @a[scores={datalib_menu=-1..}] datalib_menu +execute as @a[scores={dl_menu=1..}] run function datalib:menu +scoreboard players set @a[scores={dl_menu=1..}] dl_menu 0 +scoreboard players enable @a[scores={dl_menu=-1..}] dl_menu execute as @a[scores={dl_run=1..}] run function #datalib:admin/run scoreboard players set @a[scores={dl_run=1..}] dl_run 0 diff --git a/data/dl_load/function/load/internal/cleanup.mcfunction b/data/dl_load/function/load/internal/cleanup.mcfunction index bdf3bb5..2c7f715 100644 --- a/data/dl_load/function/load/internal/cleanup.mcfunction +++ b/data/dl_load/function/load/internal/cleanup.mcfunction @@ -3,7 +3,7 @@ schedule clear datalib:core/lib/sync_tick forceload remove -30000000 1600 forceload remove 0 0 -scoreboard players reset @a datalib_menu +scoreboard players reset @a dl_menu scoreboard players reset @a dl_run scoreboard players reset $tick dl.tmp @@ -49,7 +49,7 @@ data remove storage datalib:engine rate_limit scoreboard objectives remove dl.tmp scoreboard objectives remove datalib.time -scoreboard objectives remove datalib_menu +scoreboard objectives remove dl_menu scoreboard objectives remove dl_run scoreboard objectives remove dl_action scoreboard objectives remove datalib.tick_guard diff --git a/data/dl_load/function/load/other.mcfunction b/data/dl_load/function/load/other.mcfunction index 51f0089..429fff5 100644 --- a/data/dl_load/function/load/other.mcfunction +++ b/data/dl_load/function/load/other.mcfunction @@ -8,7 +8,7 @@ data remove storage datalib:input func data remove storage datalib:input interval data remove storage datalib:input key -scoreboard players enable @a[tag=datalib.admin] datalib_menu +scoreboard players enable @a[tag=datalib.admin] dl_menu scoreboard players enable @a[tag=datalib.admin] dl_run scoreboard players enable @a[tag=datalib.admin] dl_action diff --git a/data/dl_load/function/load/scoreboards.mcfunction b/data/dl_load/function/load/scoreboards.mcfunction index 85363cf..24fa2e5 100644 --- a/data/dl_load/function/load/scoreboards.mcfunction +++ b/data/dl_load/function/load/scoreboards.mcfunction @@ -1,6 +1,6 @@ scoreboard objectives add dl.tmp dummy scoreboard objectives add datalib.time dummy -scoreboard objectives add datalib_menu trigger +scoreboard objectives add dl_menu trigger scoreboard objectives add dl_run trigger scoreboard objectives add dl_action trigger scoreboard objectives add datalib.dialog_load dummy @@ -10,6 +10,7 @@ scoreboard objectives add dl.pre_version dummy scoreboard objectives add datalib.pid dummy scoreboard objectives add dl.freeze_id dummy scoreboard objectives add datalib.onlinePlayers dummy +scoreboard objectives add datalib_settingsBook trigger # Lantern Load integration — pack version tracking scoreboard objectives add load.status dummy