From d74bb1996450d4285b10cf27af2978ffd01b8d00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BB=B6=E7=9A=93?= <1214946206@qq.com> Date: Sat, 25 Jun 2022 02:22:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=97=A5=E5=BF=97=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E3=80=81=E5=AE=8C=E5=96=84=E9=85=8D=E7=BD=AE=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E3=80=81=E5=AE=8C=E5=96=84=E8=AE=A1=E5=88=86=E6=9D=BF?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 15 ++++++++++++ data/fz/advancements/unsneak.json | 8 ++++++- data/fz/functions/entry.mcfunction | 3 +++ data/fz/functions/event/init.mcfunction | 4 ++++ data/fz/functions/event/install.mcfunction | 1 - data/fz/functions/event/on_login.mcfunction | 3 +++ data/fz/functions/event/on_unsneak.mcfunction | 6 ++++- data/fz/functions/event/uninstall.mcfunction | 1 - data/fz/functions/init.mcfunction | 8 +++++++ data/fz/functions/install.mcfunction | 4 +--- data/fz/functions/load.mcfunction | 3 ++- .../fz/functions/logger/clear_data.mcfunction | 6 +++++ .../functions/logger/debug/false.mcfunction | 1 - .../fz/functions/logger/debug/true.mcfunction | 1 - .../{install.mcfunction => init.mcfunction} | 24 ++++++++++++++----- .../functions/logger/level/debug.mcfunction | 6 +++++ .../fz/functions/logger/level/fine.mcfunction | 6 +++++ .../fz/functions/logger/level/info.mcfunction | 6 +++++ data/fz/functions/logger/uninstall.mcfunction | 3 ++- .../module/config/install.mcfunction | 8 ++++++- .../functions/module/config/load.mcfunction | 4 ++++ .../module/config/on_click.mcfunction | 5 +++- .../module/config/reset_trigger.mcfunction | 6 ++++- .../module/config/timeout.mcfunction | 5 +++- .../module/config/trigger.mcfunction | 3 +++ .../module/config/uninstall.mcfunction | 8 ++++++- .../module/scoreboard/clear_data.mcfunction | 2 +- .../config/display/buttons.mcfunction | 2 +- .../scoreboard/config/on_click.mcfunction | 3 +++ .../config/subscribe/activation.mcfunction | 5 +++- .../subscribe/aviating_distance.mcfunction | 5 +++- .../config/subscribe/carousel.mcfunction | 5 +++- .../config/subscribe/damage_taken.mcfunction | 5 +++- .../config/subscribe/death_count.mcfunction | 5 +++- .../config/subscribe/dig_count.mcfunction | 5 +++- .../config/subscribe/fisning_count.mcfunction | 5 +++- .../config/subscribe/general.mcfunction | 5 +++- .../config/subscribe/kill_count.mcfunction | 5 +++- .../config/subscribe/off.mcfunction | 5 +++- .../config/subscribe/trade_count.mcfunction | 5 +++- .../carousel_controller/loop.mcfunction | 2 +- .../set/activation.mcfunction | 3 +++ .../set/aviating_distance.mcfunction | 3 +++ .../set/damage_taken.mcfunction | 3 +++ .../set/death_count.mcfunction | 3 +++ .../set/dig_count.mcfunction | 3 +++ ...nt.mcfunction => fishing_count.mcfunction} | 3 +++ .../set/general.mcfunction | 3 +++ .../set/kill_count.mcfunction | 3 +++ .../set/trade_count.mcfunction | 3 +++ .../set_color/carousel/aqua.mcfunction | 8 ------- .../set_color/carousel/blue.mcfunction | 8 ------- .../set_color/carousel/gold.mcfunction | 8 ------- .../set_color/carousel/gray.mcfunction | 8 ------- .../display/set_color/carousel/red.mcfunction | 8 ------- .../activation/aqua.mcfunction | 5 ++-- .../activation/black.mcfunction | 5 ++-- .../activation/blue.mcfunction | 5 ++-- .../activation/dark_aqua.mcfunction | 5 ++-- .../activation/dark_blue.mcfunction | 5 ++-- .../activation/dark_gray.mcfunction | 5 ++-- .../activation/dark_green.mcfunction | 5 ++-- .../activation/dark_purple.mcfunction | 5 ++-- .../activation/dark_red.mcfunction | 5 ++-- .../activation/gold.mcfunction | 5 ++-- .../activation/gray.mcfunction | 5 ++-- .../activation/green.mcfunction | 5 ++-- .../activation/light_purple.mcfunction | 5 ++-- .../activation/red.mcfunction | 5 ++-- .../activation/white.mcfunction | 5 ++-- .../activation/yellow.mcfunction | 5 ++-- .../aviating_distance/aqua.mcfunction | 5 ++-- .../aviating_distance/black.mcfunction | 5 ++-- .../aviating_distance/blue.mcfunction | 5 ++-- .../aviating_distance/dark_aqua.mcfunction | 5 ++-- .../aviating_distance/dark_blue.mcfunction | 5 ++-- .../aviating_distance/dark_gray.mcfunction | 5 ++-- .../aviating_distance/dark_green.mcfunction | 5 ++-- .../aviating_distance/dark_purple.mcfunction | 5 ++-- .../aviating_distance/dark_red.mcfunction | 5 ++-- .../aviating_distance/gold.mcfunction | 5 ++-- .../aviating_distance/gray.mcfunction | 5 ++-- .../aviating_distance/green.mcfunction | 5 ++-- .../aviating_distance/light_purple.mcfunction | 5 ++-- .../aviating_distance/red.mcfunction | 5 ++-- .../aviating_distance/white.mcfunction | 5 ++-- .../aviating_distance/yellow.mcfunction | 5 ++-- .../display/set_text/carousel/aqua.mcfunction | 6 +++++ .../carousel/black.mcfunction | 6 ++--- .../display/set_text/carousel/blue.mcfunction | 6 +++++ .../carousel/dark_aqua.mcfunction | 6 ++--- .../carousel/dark_blue.mcfunction | 6 ++--- .../carousel/dark_gray.mcfunction | 6 ++--- .../carousel/dark_green.mcfunction | 6 ++--- .../carousel/dark_purple.mcfunction | 6 ++--- .../carousel/dark_red.mcfunction | 6 ++--- .../display/set_text/carousel/gold.mcfunction | 6 +++++ .../display/set_text/carousel/gray.mcfunction | 6 +++++ .../carousel/green.mcfunction | 6 ++--- .../carousel/light_purple.mcfunction | 6 ++--- .../display/set_text/carousel/red.mcfunction | 6 +++++ .../carousel/white.mcfunction | 6 ++--- .../carousel/yellow.mcfunction | 6 ++--- .../damage_taken/aqua.mcfunction | 7 +++--- .../damage_taken/black.mcfunction | 7 +++--- .../damage_taken/blue.mcfunction | 7 +++--- .../damage_taken/dark_aqua.mcfunction | 7 +++--- .../damage_taken/dark_blue.mcfunction | 7 +++--- .../damage_taken/dark_gray.mcfunction | 7 +++--- .../damage_taken/dark_green.mcfunction | 7 +++--- .../damage_taken/dark_purple.mcfunction | 7 +++--- .../damage_taken/dark_red.mcfunction | 7 +++--- .../damage_taken/gold.mcfunction | 7 +++--- .../damage_taken/gray.mcfunction | 7 +++--- .../damage_taken/green.mcfunction | 7 +++--- .../damage_taken/light_purple.mcfunction | 7 +++--- .../damage_taken/red.mcfunction | 7 +++--- .../damage_taken/white.mcfunction | 7 +++--- .../damage_taken/yellow.mcfunction | 7 +++--- .../death_count/aqua.mcfunction | 5 ++-- .../death_count/black.mcfunction | 5 ++-- .../death_count/blue.mcfunction | 5 ++-- .../death_count/dark_aqua.mcfunction | 5 ++-- .../death_count/dark_blue.mcfunction | 5 ++-- .../death_count/dark_gray.mcfunction | 5 ++-- .../death_count/dark_green.mcfunction | 5 ++-- .../death_count/dark_purple.mcfunction | 5 ++-- .../death_count/dark_red.mcfunction | 5 ++-- .../death_count/gold.mcfunction | 5 ++-- .../death_count/gray.mcfunction | 5 ++-- .../death_count/green.mcfunction | 5 ++-- .../death_count/light_purple.mcfunction | 5 ++-- .../death_count/red.mcfunction | 5 ++-- .../death_count/white.mcfunction | 5 ++-- .../death_count/yellow.mcfunction | 5 ++-- .../dig_count/aqua.mcfunction | 5 ++-- .../dig_count/black.mcfunction | 5 ++-- .../dig_count/blue.mcfunction | 5 ++-- .../dig_count/dark_aqua.mcfunction | 5 ++-- .../dig_count/dark_blue.mcfunction | 5 ++-- .../dig_count/dark_gray.mcfunction | 5 ++-- .../dig_count/dark_green.mcfunction | 5 ++-- .../dig_count/dark_purple.mcfunction | 5 ++-- .../dig_count/dark_red.mcfunction | 5 ++-- .../dig_count/gold.mcfunction | 5 ++-- .../dig_count/gray.mcfunction | 5 ++-- .../dig_count/green.mcfunction | 5 ++-- .../dig_count/light_purple.mcfunction | 5 ++-- .../dig_count/red.mcfunction | 5 ++-- .../dig_count/white.mcfunction | 5 ++-- .../dig_count/yellow.mcfunction | 5 ++-- .../fishing_count/aqua.mcfunction | 5 ++-- .../fishing_count/black.mcfunction | 5 ++-- .../fishing_count/blue.mcfunction | 5 ++-- .../fishing_count/dark_aqua.mcfunction | 5 ++-- .../fishing_count/dark_blue.mcfunction | 5 ++-- .../fishing_count/dark_gray.mcfunction | 5 ++-- .../fishing_count/dark_green.mcfunction | 5 ++-- .../fishing_count/dark_purple.mcfunction | 5 ++-- .../fishing_count/dark_red.mcfunction | 5 ++-- .../fishing_count/gold.mcfunction | 5 ++-- .../fishing_count/gray.mcfunction | 5 ++-- .../fishing_count/green.mcfunction | 5 ++-- .../fishing_count/light_purple.mcfunction | 5 ++-- .../fishing_count/red.mcfunction | 5 ++-- .../fishing_count/white.mcfunction | 5 ++-- .../fishing_count/yellow.mcfunction | 5 ++-- .../general/aqua.mcfunction | 5 ++-- .../general/black.mcfunction | 5 ++-- .../general/blue.mcfunction | 5 ++-- .../general/dark_aqua.mcfunction | 5 ++-- .../general/dark_blue.mcfunction | 5 ++-- .../general/dark_gray.mcfunction | 5 ++-- .../general/dark_green.mcfunction | 5 ++-- .../general/dark_purple.mcfunction | 5 ++-- .../general/dark_red.mcfunction | 5 ++-- .../general/gold.mcfunction | 5 ++-- .../general/gray.mcfunction | 5 ++-- .../general/green.mcfunction | 5 ++-- .../general/light_purple.mcfunction | 5 ++-- .../general/red.mcfunction | 5 ++-- .../general/white.mcfunction | 5 ++-- .../general/yellow.mcfunction | 5 ++-- .../kill_count/aqua.mcfunction | 5 ++-- .../kill_count/black.mcfunction | 5 ++-- .../kill_count/blue.mcfunction | 5 ++-- .../kill_count/dark_aqua.mcfunction | 5 ++-- .../kill_count/dark_blue.mcfunction | 5 ++-- .../kill_count/dark_gray.mcfunction | 5 ++-- .../kill_count/dark_green.mcfunction | 5 ++-- .../kill_count/dark_purple.mcfunction | 5 ++-- .../kill_count/dark_red.mcfunction | 5 ++-- .../kill_count/gold.mcfunction | 5 ++-- .../kill_count/gray.mcfunction | 5 ++-- .../kill_count/green.mcfunction | 5 ++-- .../kill_count/light_purple.mcfunction | 5 ++-- .../kill_count/red.mcfunction | 5 ++-- .../kill_count/white.mcfunction | 5 ++-- .../kill_count/yellow.mcfunction | 5 ++-- .../trade_count/aqua.mcfunction | 5 ++-- .../trade_count/black.mcfunction | 5 ++-- .../trade_count/blue.mcfunction | 5 ++-- .../trade_count/dark_aqua.mcfunction | 5 ++-- .../trade_count/dark_blue.mcfunction | 5 ++-- .../trade_count/dark_gray.mcfunction | 5 ++-- .../trade_count/dark_green.mcfunction | 5 ++-- .../trade_count/dark_purple.mcfunction | 5 ++-- .../trade_count/dark_red.mcfunction | 5 ++-- .../trade_count/gold.mcfunction | 5 ++-- .../trade_count/gray.mcfunction | 5 ++-- .../trade_count/green.mcfunction | 5 ++-- .../trade_count/light_purple.mcfunction | 5 ++-- .../trade_count/red.mcfunction | 5 ++-- .../trade_count/white.mcfunction | 5 ++-- .../trade_count/yellow.mcfunction | 5 ++-- .../module/scoreboard/install.mcfunction | 7 ++++-- .../module/scoreboard/load.mcfunction | 23 ++++++++++++++---- .../module/scoreboard/uninstall.mcfunction | 10 ++++---- data/fz/functions/uninstall.mcfunction | 10 ++++---- .../event/{install.json => init.json} | 2 +- .../{logger/install.json => init.json} | 2 +- data/fz/tags/functions/logger/clear_data.json | 6 +++++ .../uninstall.json => logger/init.json} | 2 +- .../display/carousel_controller/loop.json | 9 ------- .../scoreboard/display/set_all_colors.json | 21 ---------------- .../display/set_color/aviating_distance.json | 13 ---------- .../display/set_color/death_count.json | 13 ---------- .../display/set_color/fishing_count.json | 13 ---------- .../scoreboard/display/set_color/general.json | 13 ---------- .../display/set_color/trade_count.json | 13 ---------- .../{set_color => set_text}/activation.json | 6 ++--- .../aviating_distance.json} | 6 ++--- .../{set_color => set_text}/carousel.json | 6 ++--- .../display/set_text/damage_taken.json | 13 ++++++++++ .../display/set_text/death_count.json | 13 ++++++++++ .../{set_color => set_text}/dig_count.json | 6 ++--- .../display/set_text/fishing_count.json | 13 ++++++++++ .../scoreboard/display/set_text/general.json | 13 ++++++++++ .../{set_color => set_text}/kill_count.json | 6 ++--- .../scoreboard/display/set_text/set_all.json | 20 ++++++++++++++++ .../display/set_text/trade_count.json | 13 ++++++++++ 241 files changed, 846 insertions(+), 553 deletions(-) create mode 100644 .vscode/settings.json create mode 100644 data/fz/functions/event/init.mcfunction delete mode 100644 data/fz/functions/event/install.mcfunction delete mode 100644 data/fz/functions/event/uninstall.mcfunction create mode 100644 data/fz/functions/init.mcfunction create mode 100644 data/fz/functions/logger/clear_data.mcfunction delete mode 100644 data/fz/functions/logger/debug/false.mcfunction delete mode 100644 data/fz/functions/logger/debug/true.mcfunction rename data/fz/functions/logger/{install.mcfunction => init.mcfunction} (52%) create mode 100644 data/fz/functions/logger/level/debug.mcfunction create mode 100644 data/fz/functions/logger/level/fine.mcfunction create mode 100644 data/fz/functions/logger/level/info.mcfunction rename data/fz/functions/module/scoreboard/display/carousel_controller/set/{fisning_count.mcfunction => fishing_count.mcfunction} (86%) delete mode 100644 data/fz/functions/module/scoreboard/display/set_color/carousel/aqua.mcfunction delete mode 100644 data/fz/functions/module/scoreboard/display/set_color/carousel/blue.mcfunction delete mode 100644 data/fz/functions/module/scoreboard/display/set_color/carousel/gold.mcfunction delete mode 100644 data/fz/functions/module/scoreboard/display/set_color/carousel/gray.mcfunction delete mode 100644 data/fz/functions/module/scoreboard/display/set_color/carousel/red.mcfunction rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/activation/aqua.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/activation/black.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/activation/blue.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/activation/dark_aqua.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/activation/dark_blue.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/activation/dark_gray.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/activation/dark_green.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/activation/dark_purple.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/activation/dark_red.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/activation/gold.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/activation/gray.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/activation/green.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/activation/light_purple.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/activation/red.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/activation/white.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/activation/yellow.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/aviating_distance/aqua.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/aviating_distance/black.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/aviating_distance/blue.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/aviating_distance/dark_aqua.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/aviating_distance/dark_blue.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/aviating_distance/dark_gray.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/aviating_distance/dark_green.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/aviating_distance/dark_purple.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/aviating_distance/dark_red.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/aviating_distance/gold.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/aviating_distance/gray.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/aviating_distance/green.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/aviating_distance/light_purple.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/aviating_distance/red.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/aviating_distance/white.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/aviating_distance/yellow.mcfunction (67%) create mode 100644 data/fz/functions/module/scoreboard/display/set_text/carousel/aqua.mcfunction rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/carousel/black.mcfunction (50%) create mode 100644 data/fz/functions/module/scoreboard/display/set_text/carousel/blue.mcfunction rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/carousel/dark_aqua.mcfunction (50%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/carousel/dark_blue.mcfunction (50%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/carousel/dark_gray.mcfunction (50%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/carousel/dark_green.mcfunction (51%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/carousel/dark_purple.mcfunction (51%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/carousel/dark_red.mcfunction (50%) create mode 100644 data/fz/functions/module/scoreboard/display/set_text/carousel/gold.mcfunction create mode 100644 data/fz/functions/module/scoreboard/display/set_text/carousel/gray.mcfunction rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/carousel/green.mcfunction (50%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/carousel/light_purple.mcfunction (51%) create mode 100644 data/fz/functions/module/scoreboard/display/set_text/carousel/red.mcfunction rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/carousel/white.mcfunction (50%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/carousel/yellow.mcfunction (50%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/damage_taken/aqua.mcfunction (50%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/damage_taken/black.mcfunction (50%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/damage_taken/blue.mcfunction (50%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/damage_taken/dark_aqua.mcfunction (50%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/damage_taken/dark_blue.mcfunction (50%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/damage_taken/dark_gray.mcfunction (50%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/damage_taken/dark_green.mcfunction (50%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/damage_taken/dark_purple.mcfunction (50%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/damage_taken/dark_red.mcfunction (50%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/damage_taken/gold.mcfunction (50%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/damage_taken/gray.mcfunction (50%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/damage_taken/green.mcfunction (50%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/damage_taken/light_purple.mcfunction (50%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/damage_taken/red.mcfunction (50%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/damage_taken/white.mcfunction (50%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/damage_taken/yellow.mcfunction (50%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/death_count/aqua.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/death_count/black.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/death_count/blue.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/death_count/dark_aqua.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/death_count/dark_blue.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/death_count/dark_gray.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/death_count/dark_green.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/death_count/dark_purple.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/death_count/dark_red.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/death_count/gold.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/death_count/gray.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/death_count/green.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/death_count/light_purple.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/death_count/red.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/death_count/white.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/death_count/yellow.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/dig_count/aqua.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/dig_count/black.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/dig_count/blue.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/dig_count/dark_aqua.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/dig_count/dark_blue.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/dig_count/dark_gray.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/dig_count/dark_green.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/dig_count/dark_purple.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/dig_count/dark_red.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/dig_count/gold.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/dig_count/gray.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/dig_count/green.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/dig_count/light_purple.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/dig_count/red.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/dig_count/white.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/dig_count/yellow.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/fishing_count/aqua.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/fishing_count/black.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/fishing_count/blue.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/fishing_count/dark_aqua.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/fishing_count/dark_blue.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/fishing_count/dark_gray.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/fishing_count/dark_green.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/fishing_count/dark_purple.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/fishing_count/dark_red.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/fishing_count/gold.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/fishing_count/gray.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/fishing_count/green.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/fishing_count/light_purple.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/fishing_count/red.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/fishing_count/white.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/fishing_count/yellow.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/general/aqua.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/general/black.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/general/blue.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/general/dark_aqua.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/general/dark_blue.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/general/dark_gray.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/general/dark_green.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/general/dark_purple.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/general/dark_red.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/general/gold.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/general/gray.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/general/green.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/general/light_purple.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/general/red.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/general/white.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/general/yellow.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/kill_count/aqua.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/kill_count/black.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/kill_count/blue.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/kill_count/dark_aqua.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/kill_count/dark_blue.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/kill_count/dark_gray.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/kill_count/dark_green.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/kill_count/dark_purple.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/kill_count/dark_red.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/kill_count/gold.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/kill_count/gray.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/kill_count/green.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/kill_count/light_purple.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/kill_count/red.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/kill_count/white.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/kill_count/yellow.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/trade_count/aqua.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/trade_count/black.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/trade_count/blue.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/trade_count/dark_aqua.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/trade_count/dark_blue.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/trade_count/dark_gray.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/trade_count/dark_green.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/trade_count/dark_purple.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/trade_count/dark_red.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/trade_count/gold.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/trade_count/gray.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/trade_count/green.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/trade_count/light_purple.mcfunction (68%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/trade_count/red.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/trade_count/white.mcfunction (67%) rename data/fz/functions/module/scoreboard/display/{set_color => set_text}/trade_count/yellow.mcfunction (67%) rename data/fz/tags/functions/event/{install.json => init.json} (63%) rename data/fz/tags/functions/{logger/install.json => init.json} (62%) create mode 100644 data/fz/tags/functions/logger/clear_data.json rename data/fz/tags/functions/{event/uninstall.json => logger/init.json} (61%) delete mode 100644 data/fz/tags/functions/module/scoreboard/display/carousel_controller/loop.json delete mode 100644 data/fz/tags/functions/module/scoreboard/display/set_all_colors.json delete mode 100644 data/fz/tags/functions/module/scoreboard/display/set_color/aviating_distance.json delete mode 100644 data/fz/tags/functions/module/scoreboard/display/set_color/death_count.json delete mode 100644 data/fz/tags/functions/module/scoreboard/display/set_color/fishing_count.json delete mode 100644 data/fz/tags/functions/module/scoreboard/display/set_color/general.json delete mode 100644 data/fz/tags/functions/module/scoreboard/display/set_color/trade_count.json rename data/fz/tags/functions/module/scoreboard/display/{set_color => set_text}/activation.json (53%) rename data/fz/tags/functions/module/scoreboard/display/{set_color/damage_taken.json => set_text/aviating_distance.json} (53%) rename data/fz/tags/functions/module/scoreboard/display/{set_color => set_text}/carousel.json (54%) create mode 100644 data/fz/tags/functions/module/scoreboard/display/set_text/damage_taken.json create mode 100644 data/fz/tags/functions/module/scoreboard/display/set_text/death_count.json rename data/fz/tags/functions/module/scoreboard/display/{set_color => set_text}/dig_count.json (54%) create mode 100644 data/fz/tags/functions/module/scoreboard/display/set_text/fishing_count.json create mode 100644 data/fz/tags/functions/module/scoreboard/display/set_text/general.json rename data/fz/tags/functions/module/scoreboard/display/{set_color => set_text}/kill_count.json (54%) create mode 100644 data/fz/tags/functions/module/scoreboard/display/set_text/set_all.json create mode 100644 data/fz/tags/functions/module/scoreboard/display/set_text/trade_count.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..97c45f7 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,15 @@ +{ + "datapack.snippets": { + "executeIfScoreSet": "execute if score ${1:score_holder} ${2:objective} = ${1:score_holder} ${2:objective} $0", + "scoreboardPlayersOperation": "scoreboard players operation ${1:target_score_holder} ${2:target_objective} ${3|+=,-=,*=,/=,%=,=,>,<,<>|} ${4:source_score_holder} ${5:source_objective}", + "scoreboardPlayersSet": "scoreboard players set ${1:score_holder} ${2:objective} ${3:0}", + "tagAdd": "tag ${1:target} add ${2:tag}", + "tagRemove": "tag ${1:target} remove ${2:tag}", + "dataModifyStorageFromSelf": "data modify storage ${1:id} ${2:path} set from entity @s ${3:path}", + "summonAec": "summon minecraft:area_effect_cloud ~ ~ ~ {Age: -2147483648, Duration: -1, WaitTime: -2147483648, Tags: [\"${1:tag}\"]}", + "logInfo": "tellraw @a [{\"nbt\": \"fz.level.info\", \"interpret\": true, \"storage\": \"fz:logger\"}, {\"text\": \"${1:log_info}\"}]", + "logWarn": "tellraw @a [{\"nbt\": \"fz.level.warn\", \"interpret\": true, \"storage\": \"fz:logger\"}, {\"text\": \"${1:log_warn}\"}]", + "logError": "tellraw @a [{\"nbt\": \"fz.level.error\", \"interpret\": true, \"storage\": \"fz:logger\"}, {\"text\": \"${1:log_error}\"}]", + "logDebug": "execute if data storage fz:logger fz{debug:1b} run tellraw @a [{\"nbt\": \"fz.level.debug\", \"interpret\": true, \"storage\": \"fz:logger\"}, {\"text\": \"${1:log_debug}\"}]", + } +} \ No newline at end of file diff --git a/data/fz/advancements/unsneak.json b/data/fz/advancements/unsneak.json index ca5569b..14ccadc 100644 --- a/data/fz/advancements/unsneak.json +++ b/data/fz/advancements/unsneak.json @@ -2,11 +2,17 @@ "parent": "fz:sneak", "criteria": { "unsneak": { - "trigger": "tick", + "trigger": "minecraft:tick", "conditions": { "player": { "flags": { "is_sneaking": false + }, + "type_specific": { + "type": "player", + "advancements": { + "fz:sneak": true + } } } } diff --git a/data/fz/functions/entry.mcfunction b/data/fz/functions/entry.mcfunction index e69de29..17f717c 100644 --- a/data/fz/functions/entry.mcfunction +++ b/data/fz/functions/entry.mcfunction @@ -0,0 +1,3 @@ +function #fz:init +function #fz:install +function #fz:load \ No newline at end of file diff --git a/data/fz/functions/event/init.mcfunction b/data/fz/functions/event/init.mcfunction new file mode 100644 index 0000000..7c846a8 --- /dev/null +++ b/data/fz/functions/event/init.mcfunction @@ -0,0 +1,4 @@ +scoreboard objectives add fz.event.leave_game minecraft.custom:leave_game + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "已初始化系统组件：事件"}] \ No newline at end of file diff --git a/data/fz/functions/event/install.mcfunction b/data/fz/functions/event/install.mcfunction deleted file mode 100644 index 22c251d..0000000 --- a/data/fz/functions/event/install.mcfunction +++ /dev/null @@ -1 +0,0 @@ -scoreboard objectives add fz.event.leave_game minecraft.custom:leave_game \ No newline at end of file diff --git a/data/fz/functions/event/on_login.mcfunction b/data/fz/functions/event/on_login.mcfunction index 07cc38c..3ad589a 100644 --- a/data/fz/functions/event/on_login.mcfunction +++ b/data/fz/functions/event/on_login.mcfunction @@ -1,3 +1,6 @@ +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "登录游戏"}] + function #fz:event/on_login ## 复位其他触发器 diff --git a/data/fz/functions/event/on_unsneak.mcfunction b/data/fz/functions/event/on_unsneak.mcfunction index 9c70705..789980e 100644 --- a/data/fz/functions/event/on_unsneak.mcfunction +++ b/data/fz/functions/event/on_unsneak.mcfunction @@ -1,8 +1,12 @@ +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "由下蹲状态站起"}] + # 调用者：advancement/fz:unskeak ##### 当玩家蹲起后触发此事件 +## 运行事件 function #fz:event/on_unsneak -execute if entity @s[y_rotation = 90] run function #fz:event/config/on_trigger +execute if entity @s[x_rotation = -90] run function #fz:event/config/on_trigger ## 复位进度触发器 advancement revoke @s until fz:unsneak \ No newline at end of file diff --git a/data/fz/functions/event/uninstall.mcfunction b/data/fz/functions/event/uninstall.mcfunction deleted file mode 100644 index 7694c00..0000000 --- a/data/fz/functions/event/uninstall.mcfunction +++ /dev/null @@ -1 +0,0 @@ -scoreboard objectives remove fz.event.leave_game \ No newline at end of file diff --git a/data/fz/functions/init.mcfunction b/data/fz/functions/init.mcfunction new file mode 100644 index 0000000..fb1e0c2 --- /dev/null +++ b/data/fz/functions/init.mcfunction @@ -0,0 +1,8 @@ + +## 先初始化日志组件 +function #fz:logger/init +## 再初始化事件组件，因为事件组件的初始化函数中使用了日志组件 +function #fz:event/init + +## 日志 +execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "系统组件初始化完成！"}] \ No newline at end of file diff --git a/data/fz/functions/install.mcfunction b/data/fz/functions/install.mcfunction index e1117d1..a67df27 100644 --- a/data/fz/functions/install.mcfunction +++ b/data/fz/functions/install.mcfunction @@ -1,8 +1,5 @@ # 调用者：#fz:install -function #fz:event/install -function #fz:logger/install - ## 整数类型 scoreboard objectives add fz.variable.integer dummy @@ -12,4 +9,5 @@ function #fz:module/install ## 标记为已安装 data modify storage fz:install_manager fz.global set value 1b +## 日志 tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "安装完成！"}] \ No newline at end of file diff --git a/data/fz/functions/load.mcfunction b/data/fz/functions/load.mcfunction index 134f6a5..d7491e7 100644 --- a/data/fz/functions/load.mcfunction +++ b/data/fz/functions/load.mcfunction @@ -2,4 +2,5 @@ function #fz:module/try_load -tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "加载完成！"}] \ No newline at end of file +## 日志 +execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "加载完成！"}] \ No newline at end of file diff --git a/data/fz/functions/logger/clear_data.mcfunction b/data/fz/functions/logger/clear_data.mcfunction new file mode 100644 index 0000000..5b4bbfd --- /dev/null +++ b/data/fz/functions/logger/clear_data.mcfunction @@ -0,0 +1,6 @@ +# 调用者：fz:logger/uninstall + +## 日志 +tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "已删除日志配置!"}] + +data remove storage fz:logger fz \ No newline at end of file diff --git a/data/fz/functions/logger/debug/false.mcfunction b/data/fz/functions/logger/debug/false.mcfunction deleted file mode 100644 index eaf2acc..0000000 --- a/data/fz/functions/logger/debug/false.mcfunction +++ /dev/null @@ -1 +0,0 @@ -data modify storage fz:logger fz.debug set value 0b \ No newline at end of file diff --git a/data/fz/functions/logger/debug/true.mcfunction b/data/fz/functions/logger/debug/true.mcfunction deleted file mode 100644 index 71a6fee..0000000 --- a/data/fz/functions/logger/debug/true.mcfunction +++ /dev/null @@ -1 +0,0 @@ -data modify storage fz:logger fz.debug set value 1b \ No newline at end of file diff --git a/data/fz/functions/logger/install.mcfunction b/data/fz/functions/logger/init.mcfunction similarity index 52% rename from data/fz/functions/logger/install.mcfunction rename to data/fz/functions/logger/init.mcfunction index 2fa83a9..ad2ef53 100644 --- a/data/fz/functions/logger/install.mcfunction +++ b/data/fz/functions/logger/init.mcfunction @@ -1,17 +1,29 @@ -# 调用者：#fz:logger/install +# 调用者：#fz:logger/init ##### 使用方式，形如：tellraw @a [{"nbt": "fz.exception.load_without_install_exception", "interpret": true, "storage": "fz:logger"}, {"text": "计分板"}] ## 前缀 ### 根 data modify storage fz:logger fz.root set value '[{"text": "", "color": "white"}, {"text": "[", "color": "dark_gray"}, {"text": "FZD", "color": "gold"}, {"text": "]", "color": "dark_gray"}]' ### 不同日志等级 -data modify storage fz:logger fz.level.debug set value '[{"text": "", "color": "dark_aqua"}, {"nbt": "fz.root", "interpret": true, "storage": "fz:logger"}, {"text": "[调试]"}]' -data modify storage fz:logger fz.level.info set value '[{"text": "", "color": "green"}, {"nbt": "fz.root", "interpret": true, "storage": "fz:logger"}, {"text": "[信息]"}]' -data modify storage fz:logger fz.level.warn set value '[{"text": "", "color": "yellow"}, {"nbt": "fz.root", "interpret": true, "storage": "fz:logger"}, {"text": "[警告]"}]' +#### error 800 data modify storage fz:logger fz.level.error set value '[{"text": "", "color": "red"}, {"nbt": "root", "interpret": true, "storage": "fz:logger"}, {"text": "[错误]"}]' +#### alert 600 +data modify storage fz:logger fz.level.alert set value '[{"text": "", "color": "yellow"}, {"nbt": "fz.root", "interpret": true, "storage": "fz:logger"}, {"text": "[提醒]"}]' +#### info 500 +data modify storage fz:logger fz.level.info set value '[{"text": "", "color": "green"}, {"nbt": "fz.root", "interpret": true, "storage": "fz:logger"}, {"text": "[信息]"}]' +#### debug 400 +data modify storage fz:logger fz.level.debug set value '[{"text": "", "color": "dark_aqua"}, {"nbt": "fz.root", "interpret": true, "storage": "fz:logger"}, {"text": "[调试]"}]' +#### fine 300 +data modify storage fz:logger fz.level.fine set value '[{"text": "", "color": "gray"}, {"nbt": "fz.root", "interpret": true, "storage": "fz:logger"}, {"text": "[详细]"}]' ## 异常 data modify storage fz:logger fz.exception.load_without_install_exception set value '[{"nbt": "fz.level.error", "interpret": true, "storage": "fz:logger"}, {"text": "模块在未安装时被加载："}]' -## 默认关闭调试 -execute unless data storage fz:logger fz.debug run data modify storage fz:logger fz.debug set value 0b \ No newline at end of file +## 第一次安装时日志等级默认为一般消息 +execute unless data storage fz:logger fz.levels.current run data modify storage fz:logger fz.levels.current set value 500 + +## 读取debug等级存入缓存 +execute store result score fz.logger.level fz.variable.integer run data get storage fz:logger fz.levels.current + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "已初始化系统组件：日志"}] \ No newline at end of file diff --git a/data/fz/functions/logger/level/debug.mcfunction b/data/fz/functions/logger/level/debug.mcfunction new file mode 100644 index 0000000..dce3360 --- /dev/null +++ b/data/fz/functions/logger/level/debug.mcfunction @@ -0,0 +1,6 @@ + +## debug 400 +data modify storage fz:logger fz.levels.current set value 400 + +## 日志 +tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "日志等级设为调试"}] \ No newline at end of file diff --git a/data/fz/functions/logger/level/fine.mcfunction b/data/fz/functions/logger/level/fine.mcfunction new file mode 100644 index 0000000..e3f4ab7 --- /dev/null +++ b/data/fz/functions/logger/level/fine.mcfunction @@ -0,0 +1,6 @@ + +## fine 300 +data modify storage fz:logger fz.levels.current set value 300 + +## 日志 +tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "日志等级设为详细"}] \ No newline at end of file diff --git a/data/fz/functions/logger/level/info.mcfunction b/data/fz/functions/logger/level/info.mcfunction new file mode 100644 index 0000000..b9b651e --- /dev/null +++ b/data/fz/functions/logger/level/info.mcfunction @@ -0,0 +1,6 @@ + +## info 500 +data modify storage fz:logger fz.levels.current set value 500 + +## 日志 +tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "日志等级设为一般信息"}] \ No newline at end of file diff --git a/data/fz/functions/logger/uninstall.mcfunction b/data/fz/functions/logger/uninstall.mcfunction index e7f17b9..50e31c9 100644 --- a/data/fz/functions/logger/uninstall.mcfunction +++ b/data/fz/functions/logger/uninstall.mcfunction @@ -1,3 +1,4 @@ ## 调用者：#fz:logger/uninstall -data remove storage fz:logger fz \ No newline at end of file +## 询问是否清除数据 +execute if score fz.logger.level fz.variable.integer matches ..600 run tellraw @s [{"nbt": "fz.level.alert", "interpret": true, "storage": "fz:logger"}, {"text": "您要删除日志配置吗，它将会永久失去！(真的很久！)"}, {"text": "[确定]", "color": "dark_red", "clickEvent": {"action": "suggest_command", "value": "/function #fz:logger/clear_data"}, "hoverEvent": {"action": "show_text", "contents": {"text": "将命令填入聊天框"}}}] \ No newline at end of file diff --git a/data/fz/functions/module/config/install.mcfunction b/data/fz/functions/module/config/install.mcfunction index 131e83d..5fcd940 100644 --- a/data/fz/functions/module/config/install.mcfunction +++ b/data/fz/functions/module/config/install.mcfunction @@ -1 +1,7 @@ -scoreboard objectives add fz.module.config.trigger dummy \ No newline at end of file +scoreboard objectives add fz.module.config.trigger trigger + +## 标记为已安装 +data modify storage fz:install_manager fz.module.config set value 1b + +## 日志 +execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "已安装组件：配置"}] \ No newline at end of file diff --git a/data/fz/functions/module/config/load.mcfunction b/data/fz/functions/module/config/load.mcfunction index e69de29..a3ad759 100644 --- a/data/fz/functions/module/config/load.mcfunction +++ b/data/fz/functions/module/config/load.mcfunction @@ -0,0 +1,4 @@ +function #fz:module/config/reset_trigger + +## 日志 +execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "已加载组件：配置"}] \ No newline at end of file diff --git a/data/fz/functions/module/config/on_click.mcfunction b/data/fz/functions/module/config/on_click.mcfunction index 806a5b8..70e3390 100644 --- a/data/fz/functions/module/config/on_click.mcfunction +++ b/data/fz/functions/module/config/on_click.mcfunction @@ -1,5 +1,8 @@ # 调用者：#fz:module/config/on_click -##### 处理玩家点击事件，并进行下一步操作 +##### 处理玩家点击，并进行下一步操作 + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "点击了配置按钮，触发器分数为："}, {"score": {"name": "@s", "objective": "fz.module.config.trigger"}}] execute if score @s fz.module.config.trigger matches 1000..1999 run function #fz:module/scoreboard/config/on_click diff --git a/data/fz/functions/module/config/reset_trigger.mcfunction b/data/fz/functions/module/config/reset_trigger.mcfunction index 022b95e..f918b38 100644 --- a/data/fz/functions/module/config/reset_trigger.mcfunction +++ b/data/fz/functions/module/config/reset_trigger.mcfunction @@ -1,3 +1,7 @@ # 调用者：#fz:module/config/reset_trigger -scoreboard players reset @s fz.module.config.trigger \ No newline at end of file +scoreboard players reset @s fz.module.config.trigger +scoreboard players enable @s fz.module.config.trigger + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "已重置玩家"}, {"selector": "@s"}, {"text": "的触发器分数"}] \ No newline at end of file diff --git a/data/fz/functions/module/config/timeout.mcfunction b/data/fz/functions/module/config/timeout.mcfunction index 6782a61..23f8996 100644 --- a/data/fz/functions/module/config/timeout.mcfunction +++ b/data/fz/functions/module/config/timeout.mcfunction @@ -1 +1,4 @@ -schedule clear fz:module/config/loop \ No newline at end of file +schedule clear fz:module/config/loop + +## 日志 +execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "五分钟无人回应，已关闭配置按钮监听，再次使用时需重新唤起"}] \ No newline at end of file diff --git a/data/fz/functions/module/config/trigger.mcfunction b/data/fz/functions/module/config/trigger.mcfunction index 39c73b2..d2e8b3c 100644 --- a/data/fz/functions/module/config/trigger.mcfunction +++ b/data/fz/functions/module/config/trigger.mcfunction @@ -1,6 +1,9 @@ # 调用者：#fz:module/config/trigger ##### 玩家抬头到最高角度并蹲起后，触发此函数 +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "触发了配置功能"}] + ## 监听计分板分数的循环，schedule是为了避免1tick内执行两次，但可有可无 schedule function fz:module/config/loop 0t replace diff --git a/data/fz/functions/module/config/uninstall.mcfunction b/data/fz/functions/module/config/uninstall.mcfunction index 012c45d..7c166e9 100644 --- a/data/fz/functions/module/config/uninstall.mcfunction +++ b/data/fz/functions/module/config/uninstall.mcfunction @@ -1,3 +1,9 @@ schedule clear fz:module/config/loop -scoreboard objectives remove fz.module.config.trigger \ No newline at end of file +scoreboard objectives remove fz.module.config.trigger + +## 标记为已卸载 +data modify storage fz:install_manager fz.module.config set value 0b + +## 日志 +execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "已卸载组件：配置"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/clear_data.mcfunction b/data/fz/functions/module/scoreboard/clear_data.mcfunction index 1f9eb6c..d023f1a 100644 --- a/data/fz/functions/module/scoreboard/clear_data.mcfunction +++ b/data/fz/functions/module/scoreboard/clear_data.mcfunction @@ -21,4 +21,4 @@ scoreboard objectives remove fz.module.scoreboard.display.kill_count scoreboard objectives remove fz.module.scoreboard.display.trade_count ## 日志 -tellraw @a [{"nbt": "level.info", "interpret": true, "storage": "fz:logger"}, {"text": "计分板数据已删除！"}] \ No newline at end of file +execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "level.info", "interpret": true, "storage": "fz:logger"}, {"text": "已删除计分板数据！"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/config/display/buttons.mcfunction b/data/fz/functions/module/scoreboard/config/display/buttons.mcfunction index 1e78957..dacf8df 100644 --- a/data/fz/functions/module/scoreboard/config/display/buttons.mcfunction +++ b/data/fz/functions/module/scoreboard/config/display/buttons.mcfunction @@ -1,3 +1,3 @@ # 调用者：#fz:module/scoreboard/config/display/buttons -tellraw @s [{"text": "- "}, {"text": "[关]", "color": "dark_red", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "dark_red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1000"}}, {"text": "[总榜]", "color": "dark_aqua", "hoverEvent": {"action": "show_text", "contents": {"text": "总榜", "color": "dark_aqua"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1010"}}, {"text": "[活跃度]", "color": "aqua", "hoverEvent": {"action": "show_text", "contents": {"text": "活跃度", "color": "aqua"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1020"}}, {"text": "[飞行距离]", "color": "light_purple", "hoverEvent": {"action": "show_text", "contents": {"text": "飞行距离", "color": "light_purple"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1030"}}] \ No newline at end of file +tellraw @s [[{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "dark_red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1000"}}, {"text": "关", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.general", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1010"}}, {"nbt": "fz.scoreboard.text.general", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.activation", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1020"}}, {"nbt": "fz.scoreboard.text.activation", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.aviating_distance", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1030"}}, {"nbt": "fz.scoreboard.text.aviating_distance", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.damage_taken", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1040"}}, {"nbt": "fz.scoreboard.text.damage_taken", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.death_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1050"}}, {"nbt": "fz.scoreboard.text.death_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.dig_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1060"}}, {"nbt": "fz.scoreboard.text.dig_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.fishing_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1070"}}, {"nbt": "fz.scoreboard.text.fishing_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.kill_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1080"}}, {"nbt": "fz.scoreboard.text.kill_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.trade_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1090"}}, {"nbt": "fz.scoreboard.text.trade_count", "interpret": true, "storage": "fz:module"}, {"text": "]"}]] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/config/on_click.mcfunction b/data/fz/functions/module/scoreboard/config/on_click.mcfunction index e69de29..e0fa7c5 100644 --- a/data/fz/functions/module/scoreboard/config/on_click.mcfunction +++ b/data/fz/functions/module/scoreboard/config/on_click.mcfunction @@ -0,0 +1,3 @@ + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "点击了计分板配置按钮，触发器分数为："}, {"score": {"name": "@s", "objective": "fz.module.config.trigger"}}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/config/subscribe/activation.mcfunction b/data/fz/functions/module/scoreboard/config/subscribe/activation.mcfunction index e57792d..a61dc35 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/activation.mcfunction +++ b/data/fz/functions/module/scoreboard/config/subscribe/activation.mcfunction @@ -1,3 +1,6 @@ # 调用者：fz:module/scoreboard/config/on_click -team join fz.module.scoreboard.display.activation @s \ No newline at end of file +team join fz.module.scoreboard.display.activation @s + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "订阅了"}, {"nbt": "fz.scoreboard.text.activation", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/config/subscribe/aviating_distance.mcfunction b/data/fz/functions/module/scoreboard/config/subscribe/aviating_distance.mcfunction index 04415cc..9f4a6cc 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/aviating_distance.mcfunction +++ b/data/fz/functions/module/scoreboard/config/subscribe/aviating_distance.mcfunction @@ -1,3 +1,6 @@ # 调用者：fz:module/scoreboard/config/on_click -team join fz.module.scoreboard.display.aviating_distance @s \ No newline at end of file +team join fz.module.scoreboard.display.aviating_distance @s + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "订阅了"}, {"nbt": "fz.scoreboard.text.aviating_distance", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/config/subscribe/carousel.mcfunction b/data/fz/functions/module/scoreboard/config/subscribe/carousel.mcfunction index 714faa4..a5d940e 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/carousel.mcfunction +++ b/data/fz/functions/module/scoreboard/config/subscribe/carousel.mcfunction @@ -1,3 +1,6 @@ # 调用者：fz:module/scoreboard/config/on_click -team join fz.module.scoreboard.display.carousel @s \ No newline at end of file +team join fz.module.scoreboard.display.carousel @s + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "订阅了"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/config/subscribe/damage_taken.mcfunction b/data/fz/functions/module/scoreboard/config/subscribe/damage_taken.mcfunction index a680993..77483b4 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/damage_taken.mcfunction +++ b/data/fz/functions/module/scoreboard/config/subscribe/damage_taken.mcfunction @@ -1,3 +1,6 @@ # 调用者：fz:module/scoreboard/config/on_click -team join fz.module.scoreboard.display.damage_taken @s \ No newline at end of file +team join fz.module.scoreboard.display.damage_taken @s + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "订阅了"}, {"nbt": "fz.scoreboard.text.damage_taken", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/config/subscribe/death_count.mcfunction b/data/fz/functions/module/scoreboard/config/subscribe/death_count.mcfunction index 6062546..c5b32b5 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/death_count.mcfunction +++ b/data/fz/functions/module/scoreboard/config/subscribe/death_count.mcfunction @@ -1,3 +1,6 @@ # 调用者：fz:module/scoreboard/config/on_click -team join fz.module.scoreboard.display.death_count @s \ No newline at end of file +team join fz.module.scoreboard.display.death_count @s + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "订阅了"}, {"nbt": "fz.scoreboard.text.death_count", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/config/subscribe/dig_count.mcfunction b/data/fz/functions/module/scoreboard/config/subscribe/dig_count.mcfunction index 7a73796..72a5660 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/dig_count.mcfunction +++ b/data/fz/functions/module/scoreboard/config/subscribe/dig_count.mcfunction @@ -1,3 +1,6 @@ # 调用者：fz:module/scoreboard/config/on_click -team join fz.module.scoreboard.display.dig_count @s \ No newline at end of file +team join fz.module.scoreboard.display.dig_count @s + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "订阅了"}, {"nbt": "fz.scoreboard.text.dig_count", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/config/subscribe/fisning_count.mcfunction b/data/fz/functions/module/scoreboard/config/subscribe/fisning_count.mcfunction index 01b4848..36f034c 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/fisning_count.mcfunction +++ b/data/fz/functions/module/scoreboard/config/subscribe/fisning_count.mcfunction @@ -1,3 +1,6 @@ # 调用者：fz:module/scoreboard/config/on_click -team join fz.module.scoreboard.display.fishing_count @s \ No newline at end of file +team join fz.module.scoreboard.display.fishing_count @s + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "订阅了"}, {"nbt": "fz.scoreboard.text.fishing_count", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/config/subscribe/general.mcfunction b/data/fz/functions/module/scoreboard/config/subscribe/general.mcfunction index bec1aed..acfa32c 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/general.mcfunction +++ b/data/fz/functions/module/scoreboard/config/subscribe/general.mcfunction @@ -1,3 +1,6 @@ # 调用者：fz:module/scoreboard/config/on_click -team join fz.module.scoreboard.display.general @s \ No newline at end of file +team join fz.module.scoreboard.display.general @s + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "订阅了"}, {"nbt": "fz.scoreboard.text.general", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/config/subscribe/kill_count.mcfunction b/data/fz/functions/module/scoreboard/config/subscribe/kill_count.mcfunction index e9d62c2..801bdeb 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/kill_count.mcfunction +++ b/data/fz/functions/module/scoreboard/config/subscribe/kill_count.mcfunction @@ -1,3 +1,6 @@ # 调用者：fz:module/scoreboard/config/on_click -team join fz.module.scoreboard.display.kill_count @s \ No newline at end of file +team join fz.module.scoreboard.display.kill_count @s + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "订阅了"}, {"nbt": "fz.scoreboard.text.kill_count", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/config/subscribe/off.mcfunction b/data/fz/functions/module/scoreboard/config/subscribe/off.mcfunction index e90df64..5af9164 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/off.mcfunction +++ b/data/fz/functions/module/scoreboard/config/subscribe/off.mcfunction @@ -1,3 +1,6 @@ # 调用者：fz:module/scoreboard/config/on_click -team leave @s \ No newline at end of file +team leave @s + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "取消了计分板订阅"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/config/subscribe/trade_count.mcfunction b/data/fz/functions/module/scoreboard/config/subscribe/trade_count.mcfunction index e82feda..ea5c41d 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/trade_count.mcfunction +++ b/data/fz/functions/module/scoreboard/config/subscribe/trade_count.mcfunction @@ -1,3 +1,6 @@ # 调用者：fz:module/scoreboard/config/on_click -team join fz.module.scoreboard.display.trade_count @s \ No newline at end of file +team join fz.module.scoreboard.display.trade_count @s + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "订阅了"}, {"nbt": "fz.scoreboard.text.trade_count", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel_controller/loop.mcfunction b/data/fz/functions/module/scoreboard/display/carousel_controller/loop.mcfunction index 99c5239..a905022 100644 --- a/data/fz/functions/module/scoreboard/display/carousel_controller/loop.mcfunction +++ b/data/fz/functions/module/scoreboard/display/carousel_controller/loop.mcfunction @@ -6,7 +6,7 @@ schedule function fz:module/scoreboard/display/carousel_controller/set/aviating_ schedule function fz:module/scoreboard/display/carousel_controller/set/damage_taken 30s replace schedule function fz:module/scoreboard/display/carousel_controller/set/death_count 40s replace schedule function fz:module/scoreboard/display/carousel_controller/set/dig_count 50s replace -schedule function fz:module/scoreboard/display/carousel_controller/set/fisning_count 60s replace +schedule function fz:module/scoreboard/display/carousel_controller/set/fishing_count 60s replace schedule function fz:module/scoreboard/display/carousel_controller/set/kill_count 70s replace schedule function fz:module/scoreboard/display/carousel_controller/set/trade_count 80s replace diff --git a/data/fz/functions/module/scoreboard/display/carousel_controller/set/activation.mcfunction b/data/fz/functions/module/scoreboard/display/carousel_controller/set/activation.mcfunction index 1ae0541..cb53a3a 100644 --- a/data/fz/functions/module/scoreboard/display/carousel_controller/set/activation.mcfunction +++ b/data/fz/functions/module/scoreboard/display/carousel_controller/set/activation.mcfunction @@ -17,3 +17,6 @@ execute if score carousel_color fz.variable.integer matches 12 run scoreboard ob execute if score carousel_color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.activation execute if score carousel_color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.activation execute if score carousel_color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.activation + +## 详细 +execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.activation", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel_controller/set/aviating_distance.mcfunction b/data/fz/functions/module/scoreboard/display/carousel_controller/set/aviating_distance.mcfunction index f02806e..4fc4918 100644 --- a/data/fz/functions/module/scoreboard/display/carousel_controller/set/aviating_distance.mcfunction +++ b/data/fz/functions/module/scoreboard/display/carousel_controller/set/aviating_distance.mcfunction @@ -17,3 +17,6 @@ execute if score carousel_color fz.variable.integer matches 12 run scoreboard ob execute if score carousel_color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.aviating_distance execute if score carousel_color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.aviating_distance execute if score carousel_color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.aviating_distance + +## 详细 +execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.aviating_distance", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel_controller/set/damage_taken.mcfunction b/data/fz/functions/module/scoreboard/display/carousel_controller/set/damage_taken.mcfunction index a751271..46de946 100644 --- a/data/fz/functions/module/scoreboard/display/carousel_controller/set/damage_taken.mcfunction +++ b/data/fz/functions/module/scoreboard/display/carousel_controller/set/damage_taken.mcfunction @@ -17,3 +17,6 @@ execute if score carousel_color fz.variable.integer matches 12 run scoreboard ob execute if score carousel_color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.damage_taken execute if score carousel_color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.damage_taken execute if score carousel_color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.damage_taken + +## 详细 +execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.damage_taken", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel_controller/set/death_count.mcfunction b/data/fz/functions/module/scoreboard/display/carousel_controller/set/death_count.mcfunction index 3377c7a..2d4d154 100644 --- a/data/fz/functions/module/scoreboard/display/carousel_controller/set/death_count.mcfunction +++ b/data/fz/functions/module/scoreboard/display/carousel_controller/set/death_count.mcfunction @@ -17,3 +17,6 @@ execute if score carousel_color fz.variable.integer matches 12 run scoreboard ob execute if score carousel_color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.death_count execute if score carousel_color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.death_count execute if score carousel_color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.death_count + +## 详细 +execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.death_count", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel_controller/set/dig_count.mcfunction b/data/fz/functions/module/scoreboard/display/carousel_controller/set/dig_count.mcfunction index 1a0f7a5..5d9a94b 100644 --- a/data/fz/functions/module/scoreboard/display/carousel_controller/set/dig_count.mcfunction +++ b/data/fz/functions/module/scoreboard/display/carousel_controller/set/dig_count.mcfunction @@ -17,3 +17,6 @@ execute if score carousel_color fz.variable.integer matches 12 run scoreboard ob execute if score carousel_color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.dig_count execute if score carousel_color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.dig_count execute if score carousel_color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.dig_count + +## 详细 +execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.dig_count", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel_controller/set/fisning_count.mcfunction b/data/fz/functions/module/scoreboard/display/carousel_controller/set/fishing_count.mcfunction similarity index 86% rename from data/fz/functions/module/scoreboard/display/carousel_controller/set/fisning_count.mcfunction rename to data/fz/functions/module/scoreboard/display/carousel_controller/set/fishing_count.mcfunction index 7d2dd24..c5c73cc 100644 --- a/data/fz/functions/module/scoreboard/display/carousel_controller/set/fisning_count.mcfunction +++ b/data/fz/functions/module/scoreboard/display/carousel_controller/set/fishing_count.mcfunction @@ -17,3 +17,6 @@ execute if score carousel_color fz.variable.integer matches 12 run scoreboard ob execute if score carousel_color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.fishing_count execute if score carousel_color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.fishing_count execute if score carousel_color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.fishing_count + +## 详细 +execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.fishing_count", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel_controller/set/general.mcfunction b/data/fz/functions/module/scoreboard/display/carousel_controller/set/general.mcfunction index 0be0ea0..0ddf5ed 100644 --- a/data/fz/functions/module/scoreboard/display/carousel_controller/set/general.mcfunction +++ b/data/fz/functions/module/scoreboard/display/carousel_controller/set/general.mcfunction @@ -17,3 +17,6 @@ execute if score carousel_color fz.variable.integer matches 12 run scoreboard ob execute if score carousel_color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.general execute if score carousel_color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.general execute if score carousel_color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.general + +## 详细 +execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.general", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel_controller/set/kill_count.mcfunction b/data/fz/functions/module/scoreboard/display/carousel_controller/set/kill_count.mcfunction index 7f3cc20..ab6f26d 100644 --- a/data/fz/functions/module/scoreboard/display/carousel_controller/set/kill_count.mcfunction +++ b/data/fz/functions/module/scoreboard/display/carousel_controller/set/kill_count.mcfunction @@ -17,3 +17,6 @@ execute if score carousel_color fz.variable.integer matches 12 run scoreboard ob execute if score carousel_color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.kill_count execute if score carousel_color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.kill_count execute if score carousel_color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.kill_count + +## 详细 +execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.kill_count", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel_controller/set/trade_count.mcfunction b/data/fz/functions/module/scoreboard/display/carousel_controller/set/trade_count.mcfunction index 3948df8..685fb6e 100644 --- a/data/fz/functions/module/scoreboard/display/carousel_controller/set/trade_count.mcfunction +++ b/data/fz/functions/module/scoreboard/display/carousel_controller/set/trade_count.mcfunction @@ -17,3 +17,6 @@ execute if score carousel_color fz.variable.integer matches 12 run scoreboard ob execute if score carousel_color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.trade_count execute if score carousel_color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.trade_count execute if score carousel_color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.trade_count + +## 详细 +execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.trade_count", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/carousel/aqua.mcfunction b/data/fz/functions/module/scoreboard/display/set_color/carousel/aqua.mcfunction deleted file mode 100644 index 39cae45..0000000 --- a/data/fz/functions/module/scoreboard/display/set_color/carousel/aqua.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -# 调用者：#fz:module/scoreboard/display/set_color/carousel - -## 设置轮播颜色 -team modify fz.module.scoreboard.display.carousel color aqua -team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "aqua"} - -## 保存轮播颜色的颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 -scoreboard players set carousel_color fz.variable.integer 11 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/carousel/blue.mcfunction b/data/fz/functions/module/scoreboard/display/set_color/carousel/blue.mcfunction deleted file mode 100644 index 4ecacb2..0000000 --- a/data/fz/functions/module/scoreboard/display/set_color/carousel/blue.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -# 调用者：#fz:module/scoreboard/display/set_color/carousel - -## 设置轮播颜色 -team modify fz.module.scoreboard.display.carousel color blue -team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "blue"} - -## 保存轮播颜色的颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 -scoreboard players set carousel_color fz.variable.integer 9 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/carousel/gold.mcfunction b/data/fz/functions/module/scoreboard/display/set_color/carousel/gold.mcfunction deleted file mode 100644 index c2099e0..0000000 --- a/data/fz/functions/module/scoreboard/display/set_color/carousel/gold.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -# 调用者：#fz:module/scoreboard/display/set_color/carousel - -## 设置轮播颜色 -team modify fz.module.scoreboard.display.carousel color gold -team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "gold"} - -## 保存轮播颜色的颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 -scoreboard players set carousel_color fz.variable.integer 6 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/carousel/gray.mcfunction b/data/fz/functions/module/scoreboard/display/set_color/carousel/gray.mcfunction deleted file mode 100644 index 25f18c8..0000000 --- a/data/fz/functions/module/scoreboard/display/set_color/carousel/gray.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -# 调用者：#fz:module/scoreboard/display/set_color/carousel - -## 设置轮播颜色 -team modify fz.module.scoreboard.display.carousel color gray -team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "gray"} - -## 保存轮播颜色的颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 -scoreboard players set carousel_color fz.variable.integer 7 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/carousel/red.mcfunction b/data/fz/functions/module/scoreboard/display/set_color/carousel/red.mcfunction deleted file mode 100644 index 516d00d..0000000 --- a/data/fz/functions/module/scoreboard/display/set_color/carousel/red.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -# 调用者：#fz:module/scoreboard/display/set_color/carousel - -## 设置轮播颜色 -team modify fz.module.scoreboard.display.carousel color red -team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "red"} - -## 保存轮播颜色的颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 -scoreboard players set carousel_color fz.variable.integer 12 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/activation/aqua.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/activation/aqua.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/activation/aqua.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/activation/aqua.mcfunction index f1ce81e..f5a31f8 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/activation/aqua.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/activation/aqua.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/activation +# 调用者：#fz:module/scoreboard/display/set_text/activation -scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "aqua"} +data modify storage fz:module fz.scoreboard.text.activation set value '{"text": "活跃度", "color": "aqua"}' scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.activation +scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "aqua"} team modify fz.module.scoreboard.display.activation color aqua team modify fz.module.scoreboard.display.activation displayName {"text": "活跃度", "color": "aqua"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/activation/black.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/activation/black.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/activation/black.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/activation/black.mcfunction index 411c370..71bfd0c 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/activation/black.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/activation/black.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/activation +# 调用者：#fz:module/scoreboard/display/set_text/activation -scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "black"} +data modify storage fz:module fz.scoreboard.text.activation set value '{"text": "活跃度", "color": "black"}' scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.activation +scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "black"} team modify fz.module.scoreboard.display.activation color black team modify fz.module.scoreboard.display.activation displayName {"text": "活跃度", "color": "black"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/activation/blue.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/activation/blue.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/activation/blue.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/activation/blue.mcfunction index af4cf68..e3b2ced 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/activation/blue.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/activation/blue.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/activation +# 调用者：#fz:module/scoreboard/display/set_text/activation -scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "blue"} +data modify storage fz:module fz.scoreboard.text.activation set value '{"text": "活跃度", "color": "blue"}' scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.activation +scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "blue"} team modify fz.module.scoreboard.display.activation color blue team modify fz.module.scoreboard.display.activation displayName {"text": "活跃度", "color": "blue"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/activation/dark_aqua.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/activation/dark_aqua.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/activation/dark_aqua.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/activation/dark_aqua.mcfunction index b411879..8e7a7f2 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/activation/dark_aqua.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/activation/dark_aqua.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/activation +# 调用者：#fz:module/scoreboard/display/set_text/activation -scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "dark_aqua"} +data modify storage fz:module fz.scoreboard.text.activation set value '{"text": "活跃度", "color": "dark_aqua"}' scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.activation +scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "dark_aqua"} team modify fz.module.scoreboard.display.activation color dark_aqua team modify fz.module.scoreboard.display.activation displayName {"text": "活跃度", "color": "dark_aqua"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/activation/dark_blue.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/activation/dark_blue.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/activation/dark_blue.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/activation/dark_blue.mcfunction index ebd8fc1..00b28ee 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/activation/dark_blue.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/activation/dark_blue.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/activation +# 调用者：#fz:module/scoreboard/display/set_text/activation -scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "dark_blue"} +data modify storage fz:module fz.scoreboard.text.activation set value '{"text": "活跃度", "color": "dark_blue"}' scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.activation +scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "dark_blue"} team modify fz.module.scoreboard.display.activation color dark_blue team modify fz.module.scoreboard.display.activation displayName {"text": "活跃度", "color": "dark_blue"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/activation/dark_gray.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/activation/dark_gray.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/activation/dark_gray.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/activation/dark_gray.mcfunction index 13c232a..357868b 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/activation/dark_gray.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/activation/dark_gray.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/activation +# 调用者：#fz:module/scoreboard/display/set_text/activation -scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "dark_gray"} +data modify storage fz:module fz.scoreboard.text.activation set value '{"text": "活跃度", "color": "dark_gray"}' scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.activation +scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "dark_gray"} team modify fz.module.scoreboard.display.activation color dark_gray team modify fz.module.scoreboard.display.activation displayName {"text": "活跃度", "color": "dark_gray"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/activation/dark_green.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/activation/dark_green.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/activation/dark_green.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/activation/dark_green.mcfunction index bfc7209..30c156e 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/activation/dark_green.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/activation/dark_green.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/activation +# 调用者：#fz:module/scoreboard/display/set_text/activation -scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "dark_green"} +data modify storage fz:module fz.scoreboard.text.activation set value '{"text": "活跃度", "color": "dark_green"}' scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.activation +scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "dark_green"} team modify fz.module.scoreboard.display.activation color dark_green team modify fz.module.scoreboard.display.activation displayName {"text": "活跃度", "color": "dark_green"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/activation/dark_purple.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/activation/dark_purple.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/activation/dark_purple.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/activation/dark_purple.mcfunction index b823c0d..4b15dde 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/activation/dark_purple.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/activation/dark_purple.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/activation +# 调用者：#fz:module/scoreboard/display/set_text/activation -scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "dark_purple"} +data modify storage fz:module fz.scoreboard.text.activation set value '{"text": "活跃度", "color": "dark_purple"}' scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.activation +scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "dark_purple"} team modify fz.module.scoreboard.display.activation color dark_purple team modify fz.module.scoreboard.display.activation displayName {"text": "活跃度", "color": "dark_purple"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/activation/dark_red.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/activation/dark_red.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/activation/dark_red.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/activation/dark_red.mcfunction index c7f0695..4ef5a58 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/activation/dark_red.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/activation/dark_red.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/activation +# 调用者：#fz:module/scoreboard/display/set_text/activation -scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "dark_red"} +data modify storage fz:module fz.scoreboard.text.activation set value '{"text": "活跃度", "color": "dark_red"}' scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.activation +scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "dark_red"} team modify fz.module.scoreboard.display.activation color dark_red team modify fz.module.scoreboard.display.activation displayName {"text": "活跃度", "color": "dark_red"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/activation/gold.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/activation/gold.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/activation/gold.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/activation/gold.mcfunction index 79b31ab..0e29960 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/activation/gold.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/activation/gold.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/activation +# 调用者：#fz:module/scoreboard/display/set_text/activation -scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "gold"} +data modify storage fz:module fz.scoreboard.text.activation set value '{"text": "活跃度", "color": "gold"}' scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.activation +scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "gold"} team modify fz.module.scoreboard.display.activation color gold team modify fz.module.scoreboard.display.activation displayName {"text": "活跃度", "color": "gold"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/activation/gray.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/activation/gray.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/activation/gray.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/activation/gray.mcfunction index b85ad4e..88cd82c 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/activation/gray.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/activation/gray.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/activation +# 调用者：#fz:module/scoreboard/display/set_text/activation -scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "gray"} +data modify storage fz:module fz.scoreboard.text.activation set value '{"text": "活跃度", "color": "gray"}' scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.activation +scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "gray"} team modify fz.module.scoreboard.display.activation color gray team modify fz.module.scoreboard.display.activation displayName {"text": "活跃度", "color": "gray"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/activation/green.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/activation/green.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/activation/green.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/activation/green.mcfunction index 321930a..cc688e7 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/activation/green.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/activation/green.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/activation +# 调用者：#fz:module/scoreboard/display/set_text/activation -scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "green"} +data modify storage fz:module fz.scoreboard.text.activation set value '{"text": "活跃度", "color": "green"}' scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.activation +scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "green"} team modify fz.module.scoreboard.display.activation color green team modify fz.module.scoreboard.display.activation displayName {"text": "活跃度", "color": "green"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/activation/light_purple.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/activation/light_purple.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/activation/light_purple.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/activation/light_purple.mcfunction index 9d8afa6..a8f9430 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/activation/light_purple.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/activation/light_purple.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/activation +# 调用者：#fz:module/scoreboard/display/set_text/activation -scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "light_purple"} +data modify storage fz:module fz.scoreboard.text.activation set value '{"text": "活跃度", "color": "light_purple"}' scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.activation +scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "light_purple"} team modify fz.module.scoreboard.display.activation color light_purple team modify fz.module.scoreboard.display.activation displayName {"text": "活跃度", "color": "light_purple"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/activation/red.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/activation/red.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/activation/red.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/activation/red.mcfunction index a5ffefa..5b38665 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/activation/red.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/activation/red.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/activation +# 调用者：#fz:module/scoreboard/display/set_text/activation -scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "red"} +data modify storage fz:module fz.scoreboard.text.activation set value '{"text": "活跃度", "color": "red"}' scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.activation +scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "red"} team modify fz.module.scoreboard.display.activation color red team modify fz.module.scoreboard.display.activation displayName {"text": "活跃度", "color": "red"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/activation/white.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/activation/white.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/activation/white.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/activation/white.mcfunction index 98830d3..4615269 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/activation/white.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/activation/white.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/activation +# 调用者：#fz:module/scoreboard/display/set_text/activation -scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "white"} +data modify storage fz:module fz.scoreboard.text.activation set value '{"text": "活跃度", "color": "white"}' scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.activation +scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "white"} team modify fz.module.scoreboard.display.activation color white team modify fz.module.scoreboard.display.activation displayName {"text": "活跃度", "color": "white"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/activation/yellow.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/activation/yellow.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/activation/yellow.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/activation/yellow.mcfunction index 747f088..cc65fce 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/activation/yellow.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/activation/yellow.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/activation +# 调用者：#fz:module/scoreboard/display/set_text/activation -scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "yellow"} +data modify storage fz:module fz.scoreboard.text.activation set value '{"text": "活跃度", "color": "yellow"}' scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.activation +scoreboard objectives modify fz.module.scoreboard.display.activation displayname {"text": "活跃度", "color": "yellow"} team modify fz.module.scoreboard.display.activation color yellow team modify fz.module.scoreboard.display.activation displayName {"text": "活跃度", "color": "yellow"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/aqua.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/aqua.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/aviating_distance/aqua.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/aviating_distance/aqua.mcfunction index d29bc0a..551fe11 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/aqua.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/aqua.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/aviating_distance +# 调用者：#fz:module/scoreboard/display/set_text/aviating_distance -scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "aqua"} +data modify storage fz:module fz.scoreboard.text.aviating_distance set value '{"text": "飞行距离", "color": "aqua"}' scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.aviating_distance +scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "aqua"} team modify fz.module.scoreboard.display.aviating_distance color aqua team modify fz.module.scoreboard.display.aviating_distance displayName {"text": "飞行距离", "color": "aqua"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/black.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/black.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/aviating_distance/black.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/aviating_distance/black.mcfunction index 8f412d2..3be3986 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/black.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/black.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/aviating_distance +# 调用者：#fz:module/scoreboard/display/set_text/aviating_distance -scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "black"} +data modify storage fz:module fz.scoreboard.text.aviating_distance set value '{"text": "飞行距离", "color": "black"}' scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.aviating_distance +scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "black"} team modify fz.module.scoreboard.display.aviating_distance color black team modify fz.module.scoreboard.display.aviating_distance displayName {"text": "飞行距离", "color": "black"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/blue.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/blue.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/aviating_distance/blue.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/aviating_distance/blue.mcfunction index 84317fa..93ddf30 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/blue.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/blue.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/aviating_distance +# 调用者：#fz:module/scoreboard/display/set_text/aviating_distance -scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "blue"} +data modify storage fz:module fz.scoreboard.text.aviating_distance set value '{"text": "飞行距离", "color": "blue"}' scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.aviating_distance +scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "blue"} team modify fz.module.scoreboard.display.aviating_distance color blue team modify fz.module.scoreboard.display.aviating_distance displayName {"text": "飞行距离", "color": "blue"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/dark_aqua.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/dark_aqua.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/aviating_distance/dark_aqua.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/aviating_distance/dark_aqua.mcfunction index 656ee30..3e94620 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/dark_aqua.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/dark_aqua.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/aviating_distance +# 调用者：#fz:module/scoreboard/display/set_text/aviating_distance -scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "dark_aqua"} +data modify storage fz:module fz.scoreboard.text.aviating_distance set value '{"text": "飞行距离", "color": "dark_aqua"}' scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.aviating_distance +scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "dark_aqua"} team modify fz.module.scoreboard.display.aviating_distance color dark_aqua team modify fz.module.scoreboard.display.aviating_distance displayName {"text": "飞行距离", "color": "dark_aqua"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/dark_blue.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/dark_blue.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/aviating_distance/dark_blue.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/aviating_distance/dark_blue.mcfunction index c80141d..91b8f6f 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/dark_blue.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/dark_blue.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/aviating_distance +# 调用者：#fz:module/scoreboard/display/set_text/aviating_distance -scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "dark_blue"} +data modify storage fz:module fz.scoreboard.text.aviating_distance set value '{"text": "飞行距离", "color": "dark_blue"}' scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.aviating_distance +scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "dark_blue"} team modify fz.module.scoreboard.display.aviating_distance color dark_blue team modify fz.module.scoreboard.display.aviating_distance displayName {"text": "飞行距离", "color": "dark_blue"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/dark_gray.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/dark_gray.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/aviating_distance/dark_gray.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/aviating_distance/dark_gray.mcfunction index 27f3605..550d2a0 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/dark_gray.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/dark_gray.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/aviating_distance +# 调用者：#fz:module/scoreboard/display/set_text/aviating_distance -scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "dark_gray"} +data modify storage fz:module fz.scoreboard.text.aviating_distance set value '{"text": "飞行距离", "color": "dark_gray"}' scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.aviating_distance +scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "dark_gray"} team modify fz.module.scoreboard.display.aviating_distance color dark_gray team modify fz.module.scoreboard.display.aviating_distance displayName {"text": "飞行距离", "color": "dark_gray"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/dark_green.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/dark_green.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/aviating_distance/dark_green.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/aviating_distance/dark_green.mcfunction index c7aad3f..e1a9f7e 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/dark_green.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/dark_green.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/aviating_distance +# 调用者：#fz:module/scoreboard/display/set_text/aviating_distance -scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "dark_green"} +data modify storage fz:module fz.scoreboard.text.aviating_distance set value '{"text": "飞行距离", "color": "dark_green"}' scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.aviating_distance +scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "dark_green"} team modify fz.module.scoreboard.display.aviating_distance color dark_green team modify fz.module.scoreboard.display.aviating_distance displayName {"text": "飞行距离", "color": "dark_green"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/dark_purple.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/dark_purple.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/aviating_distance/dark_purple.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/aviating_distance/dark_purple.mcfunction index fb890f8..3f2b570 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/dark_purple.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/dark_purple.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/aviating_distance +# 调用者：#fz:module/scoreboard/display/set_text/aviating_distance -scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "dark_purple"} +data modify storage fz:module fz.scoreboard.text.aviating_distance set value '{"text": "飞行距离", "color": "dark_purple"}' scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.aviating_distance +scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "dark_purple"} team modify fz.module.scoreboard.display.aviating_distance color dark_purple team modify fz.module.scoreboard.display.aviating_distance displayName {"text": "飞行距离", "color": "dark_purple"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/dark_red.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/dark_red.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/aviating_distance/dark_red.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/aviating_distance/dark_red.mcfunction index 5f9c075..773a49f 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/dark_red.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/dark_red.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/aviating_distance +# 调用者：#fz:module/scoreboard/display/set_text/aviating_distance -scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "dark_red"} +data modify storage fz:module fz.scoreboard.text.aviating_distance set value '{"text": "飞行距离", "color": "dark_red"}' scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.aviating_distance +scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "dark_red"} team modify fz.module.scoreboard.display.aviating_distance color dark_red team modify fz.module.scoreboard.display.aviating_distance displayName {"text": "飞行距离", "color": "dark_red"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/gold.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/gold.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/aviating_distance/gold.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/aviating_distance/gold.mcfunction index 5777d6f..d35be01 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/gold.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/gold.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/aviating_distance +# 调用者：#fz:module/scoreboard/display/set_text/aviating_distance -scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "gold"} +data modify storage fz:module fz.scoreboard.text.aviating_distance set value '{"text": "飞行距离", "color": "gold"}' scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.aviating_distance +scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "gold"} team modify fz.module.scoreboard.display.aviating_distance color gold team modify fz.module.scoreboard.display.aviating_distance displayName {"text": "飞行距离", "color": "gold"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/gray.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/gray.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/aviating_distance/gray.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/aviating_distance/gray.mcfunction index b6569a1..2589e74 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/gray.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/gray.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/aviating_distance +# 调用者：#fz:module/scoreboard/display/set_text/aviating_distance -scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "gray"} +data modify storage fz:module fz.scoreboard.text.aviating_distance set value '{"text": "飞行距离", "color": "gray"}' scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.aviating_distance +scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "gray"} team modify fz.module.scoreboard.display.aviating_distance color gray team modify fz.module.scoreboard.display.aviating_distance displayName {"text": "飞行距离", "color": "gray"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/green.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/green.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/aviating_distance/green.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/aviating_distance/green.mcfunction index f362297..2f6791c 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/green.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/green.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/aviating_distance +# 调用者：#fz:module/scoreboard/display/set_text/aviating_distance -scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "green"} +data modify storage fz:module fz.scoreboard.text.aviating_distance set value '{"text": "飞行距离", "color": "green"}' scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.aviating_distance +scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "green"} team modify fz.module.scoreboard.display.aviating_distance color green team modify fz.module.scoreboard.display.aviating_distance displayName {"text": "飞行距离", "color": "green"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/light_purple.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/light_purple.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/aviating_distance/light_purple.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/aviating_distance/light_purple.mcfunction index ff12167..403e44d 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/light_purple.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/light_purple.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/aviating_distance +# 调用者：#fz:module/scoreboard/display/set_text/aviating_distance -scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "light_purple"} +data modify storage fz:module fz.scoreboard.text.aviating_distance set value '{"text": "飞行距离", "color": "light_purple"}' scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.aviating_distance +scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "light_purple"} team modify fz.module.scoreboard.display.aviating_distance color light_purple team modify fz.module.scoreboard.display.aviating_distance displayName {"text": "飞行距离", "color": "light_purple"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/red.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/red.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/aviating_distance/red.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/aviating_distance/red.mcfunction index c637e43..8c1e939 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/red.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/red.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/aviating_distance +# 调用者：#fz:module/scoreboard/display/set_text/aviating_distance -scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "red"} +data modify storage fz:module fz.scoreboard.text.aviating_distance set value '{"text": "飞行距离", "color": "red"}' scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.aviating_distance +scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "red"} team modify fz.module.scoreboard.display.aviating_distance color red team modify fz.module.scoreboard.display.aviating_distance displayName {"text": "飞行距离", "color": "red"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/white.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/white.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/aviating_distance/white.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/aviating_distance/white.mcfunction index 64130a0..3a7d40a 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/white.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/white.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/aviating_distance +# 调用者：#fz:module/scoreboard/display/set_text/aviating_distance -scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "white"} +data modify storage fz:module fz.scoreboard.text.aviating_distance set value '{"text": "飞行距离", "color": "white"}' scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.aviating_distance +scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "white"} team modify fz.module.scoreboard.display.aviating_distance color white team modify fz.module.scoreboard.display.aviating_distance displayName {"text": "飞行距离", "color": "white"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/yellow.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/yellow.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/aviating_distance/yellow.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/aviating_distance/yellow.mcfunction index a04efc8..a70d80c 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/aviating_distance/yellow.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/aviating_distance/yellow.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/aviating_distance +# 调用者：#fz:module/scoreboard/display/set_text/aviating_distance -scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "yellow"} +data modify storage fz:module fz.scoreboard.text.aviating_distance set value '{"text": "飞行距离", "color": "yellow"}' scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.aviating_distance +scoreboard objectives modify fz.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "yellow"} team modify fz.module.scoreboard.display.aviating_distance color yellow team modify fz.module.scoreboard.display.aviating_distance displayName {"text": "飞行距离", "color": "yellow"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_text/carousel/aqua.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/aqua.mcfunction new file mode 100644 index 0000000..2b694a7 --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/aqua.mcfunction @@ -0,0 +1,6 @@ +# 调用者：#fz:module/scoreboard/display/set_text/carousel + +data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "aqua"}' +team modify fz.module.scoreboard.display.carousel color aqua +team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "aqua"} +scoreboard players set carousel_color fz.variable.integer 11 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/carousel/black.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/black.mcfunction similarity index 50% rename from data/fz/functions/module/scoreboard/display/set_color/carousel/black.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/carousel/black.mcfunction index 7b6a9c3..eb0958d 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/carousel/black.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/black.mcfunction @@ -1,8 +1,6 @@ -# 调用者：#fz:module/scoreboard/display/set_color/carousel +# 调用者：#fz:module/scoreboard/display/set_text/carousel -## 设置轮播颜色 +data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "black"}' team modify fz.module.scoreboard.display.carousel color black team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "black"} - -## 保存轮播颜色的颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 scoreboard players set carousel_color fz.variable.integer 0 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_text/carousel/blue.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/blue.mcfunction new file mode 100644 index 0000000..c8afacf --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/blue.mcfunction @@ -0,0 +1,6 @@ +# 调用者：#fz:module/scoreboard/display/set_text/carousel + +data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "blue"}' +team modify fz.module.scoreboard.display.carousel color blue +team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "blue"} +scoreboard players set carousel_color fz.variable.integer 9 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/carousel/dark_aqua.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_aqua.mcfunction similarity index 50% rename from data/fz/functions/module/scoreboard/display/set_color/carousel/dark_aqua.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/carousel/dark_aqua.mcfunction index 2201ef0..32f2875 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/carousel/dark_aqua.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_aqua.mcfunction @@ -1,8 +1,6 @@ -# 调用者：#fz:module/scoreboard/display/set_color/carousel +# 调用者：#fz:module/scoreboard/display/set_text/carousel -## 设置轮播颜色 +data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "dark_aqua"}' team modify fz.module.scoreboard.display.carousel color dark_aqua team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "dark_aqua"} - -## 保存轮播颜色的颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 scoreboard players set carousel_color fz.variable.integer 3 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/carousel/dark_blue.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_blue.mcfunction similarity index 50% rename from data/fz/functions/module/scoreboard/display/set_color/carousel/dark_blue.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/carousel/dark_blue.mcfunction index 8a2a71e..0d12238 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/carousel/dark_blue.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_blue.mcfunction @@ -1,8 +1,6 @@ -# 调用者：#fz:module/scoreboard/display/set_color/carousel +# 调用者：#fz:module/scoreboard/display/set_text/carousel -## 设置轮播颜色 +data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "dark_blue"}' team modify fz.module.scoreboard.display.carousel color dark_blue team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "dark_blue"} - -## 保存轮播颜色的颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 scoreboard players set carousel_color fz.variable.integer 1 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/carousel/dark_gray.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_gray.mcfunction similarity index 50% rename from data/fz/functions/module/scoreboard/display/set_color/carousel/dark_gray.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/carousel/dark_gray.mcfunction index 0486e05..2625e6e 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/carousel/dark_gray.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_gray.mcfunction @@ -1,8 +1,6 @@ -# 调用者：#fz:module/scoreboard/display/set_color/carousel +# 调用者：#fz:module/scoreboard/display/set_text/carousel -## 设置轮播颜色 +data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "dark_gray"}' team modify fz.module.scoreboard.display.carousel color dark_gray team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "dark_gray"} - -## 保存轮播颜色的颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 scoreboard players set carousel_color fz.variable.integer 8 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/carousel/dark_green.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_green.mcfunction similarity index 51% rename from data/fz/functions/module/scoreboard/display/set_color/carousel/dark_green.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/carousel/dark_green.mcfunction index 5251cd8..eeb04ce 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/carousel/dark_green.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_green.mcfunction @@ -1,8 +1,6 @@ -# 调用者：#fz:module/scoreboard/display/set_color/carousel +# 调用者：#fz:module/scoreboard/display/set_text/carousel -## 设置轮播颜色 +data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "dark_green"}' team modify fz.module.scoreboard.display.carousel color dark_green team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "dark_green"} - -## 保存轮播颜色的颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 scoreboard players set carousel_color fz.variable.integer 2 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/carousel/dark_purple.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_purple.mcfunction similarity index 51% rename from data/fz/functions/module/scoreboard/display/set_color/carousel/dark_purple.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/carousel/dark_purple.mcfunction index 28a51a3..937cca2 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/carousel/dark_purple.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_purple.mcfunction @@ -1,8 +1,6 @@ -# 调用者：#fz:module/scoreboard/display/set_color/carousel +# 调用者：#fz:module/scoreboard/display/set_text/carousel -## 设置轮播颜色 +data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "dark_purple"}' team modify fz.module.scoreboard.display.carousel color dark_purple team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "dark_purple"} - -## 保存轮播颜色的颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 scoreboard players set carousel_color fz.variable.integer 5 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/carousel/dark_red.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_red.mcfunction similarity index 50% rename from data/fz/functions/module/scoreboard/display/set_color/carousel/dark_red.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/carousel/dark_red.mcfunction index 438caca..28436e4 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/carousel/dark_red.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_red.mcfunction @@ -1,8 +1,6 @@ -# 调用者：#fz:module/scoreboard/display/set_color/carousel +# 调用者：#fz:module/scoreboard/display/set_text/carousel -## 设置轮播颜色 +data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "dark_red"}' team modify fz.module.scoreboard.display.carousel color dark_red team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "dark_red"} - -## 保存轮播颜色的颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 scoreboard players set carousel_color fz.variable.integer 4 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_text/carousel/gold.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/gold.mcfunction new file mode 100644 index 0000000..86a9b4a --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/gold.mcfunction @@ -0,0 +1,6 @@ +# 调用者：#fz:module/scoreboard/display/set_text/carousel + +data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "gold"}' +team modify fz.module.scoreboard.display.carousel color gold +team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "gold"} +scoreboard players set carousel_color fz.variable.integer 6 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_text/carousel/gray.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/gray.mcfunction new file mode 100644 index 0000000..6b84f74 --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/gray.mcfunction @@ -0,0 +1,6 @@ +# 调用者：#fz:module/scoreboard/display/set_text/carousel + +data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "gray"}' +team modify fz.module.scoreboard.display.carousel color gray +team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "gray"} +scoreboard players set carousel_color fz.variable.integer 7 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/carousel/green.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/green.mcfunction similarity index 50% rename from data/fz/functions/module/scoreboard/display/set_color/carousel/green.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/carousel/green.mcfunction index 7e99cbc..813af89 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/carousel/green.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/green.mcfunction @@ -1,8 +1,6 @@ -# 调用者：#fz:module/scoreboard/display/set_color/carousel +# 调用者：#fz:module/scoreboard/display/set_text/carousel -## 设置轮播颜色 +data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "green"}' team modify fz.module.scoreboard.display.carousel color green team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "green"} - -## 保存轮播颜色的颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 scoreboard players set carousel_color fz.variable.integer 10 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/carousel/light_purple.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/light_purple.mcfunction similarity index 51% rename from data/fz/functions/module/scoreboard/display/set_color/carousel/light_purple.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/carousel/light_purple.mcfunction index d2e208d..46b70c1 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/carousel/light_purple.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/light_purple.mcfunction @@ -1,8 +1,6 @@ -# 调用者：#fz:module/scoreboard/display/set_color/carousel +# 调用者：#fz:module/scoreboard/display/set_text/carousel -## 设置轮播颜色 +data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "light_purple"}' team modify fz.module.scoreboard.display.carousel color light_purple team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "light_purple"} - -## 保存轮播颜色的颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 scoreboard players set carousel_color fz.variable.integer 13 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_text/carousel/red.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/red.mcfunction new file mode 100644 index 0000000..5345a0b --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/red.mcfunction @@ -0,0 +1,6 @@ +# 调用者：#fz:module/scoreboard/display/set_text/carousel + +data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "red"}' +team modify fz.module.scoreboard.display.carousel color red +team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "red"} +scoreboard players set carousel_color fz.variable.integer 12 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/carousel/white.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/white.mcfunction similarity index 50% rename from data/fz/functions/module/scoreboard/display/set_color/carousel/white.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/carousel/white.mcfunction index c315c54..06631ab 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/carousel/white.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/white.mcfunction @@ -1,8 +1,6 @@ -# 调用者：#fz:module/scoreboard/display/set_color/carousel +# 调用者：#fz:module/scoreboard/display/set_text/carousel -## 设置轮播颜色 +data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "white"}' team modify fz.module.scoreboard.display.carousel color white team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "white"} - -## 保存轮播颜色的颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 scoreboard players set carousel_color fz.variable.integer 15 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/carousel/yellow.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/yellow.mcfunction similarity index 50% rename from data/fz/functions/module/scoreboard/display/set_color/carousel/yellow.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/carousel/yellow.mcfunction index 1a9cbeb..b048840 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/carousel/yellow.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/yellow.mcfunction @@ -1,8 +1,6 @@ -# 调用者：#fz:module/scoreboard/display/set_color/carousel +# 调用者：#fz:module/scoreboard/display/set_text/carousel -## 设置轮播颜色 +data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "yellow"}' team modify fz.module.scoreboard.display.carousel color yellow team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "yellow"} - -## 保存轮播颜色的颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 scoreboard players set carousel_color fz.variable.integer 14 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/aqua.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/aqua.mcfunction similarity index 50% rename from data/fz/functions/module/scoreboard/display/set_color/damage_taken/aqua.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/damage_taken/aqua.mcfunction index 9ac40a1..75624bf 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/aqua.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/aqua.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/damage_taken +# 调用者：#fz:module/scoreboard/display/set_text/damage_taken -scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "受伤害榜", "color": "aqua"} +data modify storage fz:module fz.scoreboard.text.damage_taken set value '{"text": "抖M榜", "color": "aqua"}' scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.damage_taken +scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "抖M榜", "color": "aqua"} team modify fz.module.scoreboard.display.damage_taken color aqua -team modify fz.module.scoreboard.display.damage_taken displayName {"text": "受伤害榜", "color": "aqua"} \ No newline at end of file +team modify fz.module.scoreboard.display.damage_taken displayName {"text": "抖M榜", "color": "aqua"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/black.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/black.mcfunction similarity index 50% rename from data/fz/functions/module/scoreboard/display/set_color/damage_taken/black.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/damage_taken/black.mcfunction index 708e1a9..d7e28a8 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/black.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/black.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/damage_taken +# 调用者：#fz:module/scoreboard/display/set_text/damage_taken -scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "受伤害榜", "color": "black"} +data modify storage fz:module fz.scoreboard.text.damage_taken set value '{"text": "抖M榜", "color": "black"}' scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.damage_taken +scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "抖M榜", "color": "black"} team modify fz.module.scoreboard.display.damage_taken color black -team modify fz.module.scoreboard.display.damage_taken displayName {"text": "受伤害榜", "color": "black"} \ No newline at end of file +team modify fz.module.scoreboard.display.damage_taken displayName {"text": "抖M榜", "color": "black"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/blue.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/blue.mcfunction similarity index 50% rename from data/fz/functions/module/scoreboard/display/set_color/damage_taken/blue.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/damage_taken/blue.mcfunction index b066152..9179dab 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/blue.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/blue.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/damage_taken +# 调用者：#fz:module/scoreboard/display/set_text/damage_taken -scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "受伤害榜", "color": "blue"} +data modify storage fz:module fz.scoreboard.text.damage_taken set value '{"text": "抖M榜", "color": "blue"}' scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.damage_taken +scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "抖M榜", "color": "blue"} team modify fz.module.scoreboard.display.damage_taken color blue -team modify fz.module.scoreboard.display.damage_taken displayName {"text": "受伤害榜", "color": "blue"} \ No newline at end of file +team modify fz.module.scoreboard.display.damage_taken displayName {"text": "抖M榜", "color": "blue"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/dark_aqua.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/dark_aqua.mcfunction similarity index 50% rename from data/fz/functions/module/scoreboard/display/set_color/damage_taken/dark_aqua.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/damage_taken/dark_aqua.mcfunction index a891779..de59cb7 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/dark_aqua.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/dark_aqua.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/damage_taken +# 调用者：#fz:module/scoreboard/display/set_text/damage_taken -scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "受伤害榜", "color": "dark_aqua"} +data modify storage fz:module fz.scoreboard.text.damage_taken set value '{"text": "抖M榜", "color": "dark_aqua"}' scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.damage_taken +scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "抖M榜", "color": "dark_aqua"} team modify fz.module.scoreboard.display.damage_taken color dark_aqua -team modify fz.module.scoreboard.display.damage_taken displayName {"text": "受伤害榜", "color": "dark_aqua"} \ No newline at end of file +team modify fz.module.scoreboard.display.damage_taken displayName {"text": "抖M榜", "color": "dark_aqua"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/dark_blue.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/dark_blue.mcfunction similarity index 50% rename from data/fz/functions/module/scoreboard/display/set_color/damage_taken/dark_blue.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/damage_taken/dark_blue.mcfunction index ba79ef8..aa3c483 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/dark_blue.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/dark_blue.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/damage_taken +# 调用者：#fz:module/scoreboard/display/set_text/damage_taken -scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "受伤害榜", "color": "dark_blue"} +data modify storage fz:module fz.scoreboard.text.damage_taken set value '{"text": "抖M榜", "color": "dark_blue"}' scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.damage_taken +scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "抖M榜", "color": "dark_blue"} team modify fz.module.scoreboard.display.damage_taken color dark_blue -team modify fz.module.scoreboard.display.damage_taken displayName {"text": "受伤害榜", "color": "dark_blue"} \ No newline at end of file +team modify fz.module.scoreboard.display.damage_taken displayName {"text": "抖M榜", "color": "dark_blue"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/dark_gray.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/dark_gray.mcfunction similarity index 50% rename from data/fz/functions/module/scoreboard/display/set_color/damage_taken/dark_gray.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/damage_taken/dark_gray.mcfunction index e21074e..e2ccb5f 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/dark_gray.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/dark_gray.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/damage_taken +# 调用者：#fz:module/scoreboard/display/set_text/damage_taken -scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "受伤害榜", "color": "dark_gray"} +data modify storage fz:module fz.scoreboard.text.damage_taken set value '{"text": "抖M榜", "color": "dark_gray"}' scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.damage_taken +scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "抖M榜", "color": "dark_gray"} team modify fz.module.scoreboard.display.damage_taken color dark_gray -team modify fz.module.scoreboard.display.damage_taken displayName {"text": "受伤害榜", "color": "dark_gray"} \ No newline at end of file +team modify fz.module.scoreboard.display.damage_taken displayName {"text": "抖M榜", "color": "dark_gray"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/dark_green.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/dark_green.mcfunction similarity index 50% rename from data/fz/functions/module/scoreboard/display/set_color/damage_taken/dark_green.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/damage_taken/dark_green.mcfunction index 79baab2..0106750 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/dark_green.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/dark_green.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/damage_taken +# 调用者：#fz:module/scoreboard/display/set_text/damage_taken -scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "受伤害榜", "color": "dark_green"} +data modify storage fz:module fz.scoreboard.text.damage_taken set value '{"text": "抖M榜", "color": "dark_green"}' scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.damage_taken +scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "抖M榜", "color": "dark_green"} team modify fz.module.scoreboard.display.damage_taken color dark_green -team modify fz.module.scoreboard.display.damage_taken displayName {"text": "受伤害榜", "color": "dark_green"} \ No newline at end of file +team modify fz.module.scoreboard.display.damage_taken displayName {"text": "抖M榜", "color": "dark_green"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/dark_purple.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/dark_purple.mcfunction similarity index 50% rename from data/fz/functions/module/scoreboard/display/set_color/damage_taken/dark_purple.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/damage_taken/dark_purple.mcfunction index 0e38d4c..0319a54 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/dark_purple.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/dark_purple.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/damage_taken +# 调用者：#fz:module/scoreboard/display/set_text/damage_taken -scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "受伤害榜", "color": "dark_purple"} +data modify storage fz:module fz.scoreboard.text.damage_taken set value '{"text": "抖M榜", "color": "dark_purple"}' scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.damage_taken +scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "抖M榜", "color": "dark_purple"} team modify fz.module.scoreboard.display.damage_taken color dark_purple -team modify fz.module.scoreboard.display.damage_taken displayName {"text": "受伤害榜", "color": "dark_purple"} \ No newline at end of file +team modify fz.module.scoreboard.display.damage_taken displayName {"text": "抖M榜", "color": "dark_purple"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/dark_red.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/dark_red.mcfunction similarity index 50% rename from data/fz/functions/module/scoreboard/display/set_color/damage_taken/dark_red.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/damage_taken/dark_red.mcfunction index a4f2855..910a74c 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/dark_red.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/dark_red.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/damage_taken +# 调用者：#fz:module/scoreboard/display/set_text/damage_taken -scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "受伤害榜", "color": "dark_red"} +data modify storage fz:module fz.scoreboard.text.damage_taken set value '{"text": "抖M榜", "color": "dark_red"}' scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.damage_taken +scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "抖M榜", "color": "dark_red"} team modify fz.module.scoreboard.display.damage_taken color dark_red -team modify fz.module.scoreboard.display.damage_taken displayName {"text": "受伤害榜", "color": "dark_red"} \ No newline at end of file +team modify fz.module.scoreboard.display.damage_taken displayName {"text": "抖M榜", "color": "dark_red"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/gold.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/gold.mcfunction similarity index 50% rename from data/fz/functions/module/scoreboard/display/set_color/damage_taken/gold.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/damage_taken/gold.mcfunction index 4ae180b..8ce4370 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/gold.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/gold.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/damage_taken +# 调用者：#fz:module/scoreboard/display/set_text/damage_taken -scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "受伤害榜", "color": "gold"} +data modify storage fz:module fz.scoreboard.text.damage_taken set value '{"text": "抖M榜", "color": "gold"}' scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.damage_taken +scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "抖M榜", "color": "gold"} team modify fz.module.scoreboard.display.damage_taken color gold -team modify fz.module.scoreboard.display.damage_taken displayName {"text": "受伤害榜", "color": "gold"} \ No newline at end of file +team modify fz.module.scoreboard.display.damage_taken displayName {"text": "抖M榜", "color": "gold"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/gray.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/gray.mcfunction similarity index 50% rename from data/fz/functions/module/scoreboard/display/set_color/damage_taken/gray.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/damage_taken/gray.mcfunction index 5e89765..12bf8f9 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/gray.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/gray.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/damage_taken +# 调用者：#fz:module/scoreboard/display/set_text/damage_taken -scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "受伤害榜", "color": "gray"} +data modify storage fz:module fz.scoreboard.text.damage_taken set value '{"text": "抖M榜", "color": "gray"}' scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.damage_taken +scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "抖M榜", "color": "gray"} team modify fz.module.scoreboard.display.damage_taken color gray -team modify fz.module.scoreboard.display.damage_taken displayName {"text": "受伤害榜", "color": "gray"} \ No newline at end of file +team modify fz.module.scoreboard.display.damage_taken displayName {"text": "抖M榜", "color": "gray"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/green.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/green.mcfunction similarity index 50% rename from data/fz/functions/module/scoreboard/display/set_color/damage_taken/green.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/damage_taken/green.mcfunction index 16b84e5..a832d55 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/green.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/green.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/damage_taken +# 调用者：#fz:module/scoreboard/display/set_text/damage_taken -scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "受伤害榜", "color": "green"} +data modify storage fz:module fz.scoreboard.text.damage_taken set value '{"text": "抖M榜", "color": "green"}' scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.damage_taken +scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "抖M榜", "color": "green"} team modify fz.module.scoreboard.display.damage_taken color green -team modify fz.module.scoreboard.display.damage_taken displayName {"text": "受伤害榜", "color": "green"} \ No newline at end of file +team modify fz.module.scoreboard.display.damage_taken displayName {"text": "抖M榜", "color": "green"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/light_purple.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/light_purple.mcfunction similarity index 50% rename from data/fz/functions/module/scoreboard/display/set_color/damage_taken/light_purple.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/damage_taken/light_purple.mcfunction index af31772..d0135f4 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/light_purple.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/light_purple.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/damage_taken +# 调用者：#fz:module/scoreboard/display/set_text/damage_taken -scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "受伤害榜", "color": "light_purple"} +data modify storage fz:module fz.scoreboard.text.damage_taken set value '{"text": "抖M榜", "color": "light_purple"}' scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.damage_taken +scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "抖M榜", "color": "light_purple"} team modify fz.module.scoreboard.display.damage_taken color light_purple -team modify fz.module.scoreboard.display.damage_taken displayName {"text": "受伤害榜", "color": "light_purple"} \ No newline at end of file +team modify fz.module.scoreboard.display.damage_taken displayName {"text": "抖M榜", "color": "light_purple"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/red.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/red.mcfunction similarity index 50% rename from data/fz/functions/module/scoreboard/display/set_color/damage_taken/red.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/damage_taken/red.mcfunction index 9baa9d7..87ded86 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/red.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/red.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/damage_taken +# 调用者：#fz:module/scoreboard/display/set_text/damage_taken -scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "受伤害榜", "color": "red"} +data modify storage fz:module fz.scoreboard.text.damage_taken set value '{"text": "抖M榜", "color": "red"}' scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.damage_taken +scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "抖M榜", "color": "red"} team modify fz.module.scoreboard.display.damage_taken color red -team modify fz.module.scoreboard.display.damage_taken displayName {"text": "受伤害榜", "color": "red"} \ No newline at end of file +team modify fz.module.scoreboard.display.damage_taken displayName {"text": "抖M榜", "color": "red"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/white.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/white.mcfunction similarity index 50% rename from data/fz/functions/module/scoreboard/display/set_color/damage_taken/white.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/damage_taken/white.mcfunction index 45cbb35..7e2152d 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/white.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/white.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/damage_taken +# 调用者：#fz:module/scoreboard/display/set_text/damage_taken -scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "受伤害榜", "color": "white"} +data modify storage fz:module fz.scoreboard.text.damage_taken set value '{"text": "抖M榜", "color": "white"}' scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.damage_taken +scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "抖M榜", "color": "white"} team modify fz.module.scoreboard.display.damage_taken color white -team modify fz.module.scoreboard.display.damage_taken displayName {"text": "受伤害榜", "color": "white"} \ No newline at end of file +team modify fz.module.scoreboard.display.damage_taken displayName {"text": "抖M榜", "color": "white"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/yellow.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/yellow.mcfunction similarity index 50% rename from data/fz/functions/module/scoreboard/display/set_color/damage_taken/yellow.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/damage_taken/yellow.mcfunction index 4c66d67..8eac128 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/damage_taken/yellow.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/damage_taken/yellow.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/damage_taken +# 调用者：#fz:module/scoreboard/display/set_text/damage_taken -scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "受伤害榜", "color": "yellow"} +data modify storage fz:module fz.scoreboard.text.damage_taken set value '{"text": "抖M榜", "color": "yellow"}' scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.damage_taken +scoreboard objectives modify fz.module.scoreboard.display.damage_taken displayname {"text": "抖M榜", "color": "yellow"} team modify fz.module.scoreboard.display.damage_taken color yellow -team modify fz.module.scoreboard.display.damage_taken displayName {"text": "受伤害榜", "color": "yellow"} \ No newline at end of file +team modify fz.module.scoreboard.display.damage_taken displayName {"text": "抖M榜", "color": "yellow"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/death_count/aqua.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/death_count/aqua.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/death_count/aqua.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/death_count/aqua.mcfunction index c448c78..ed703b1 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/death_count/aqua.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/death_count/aqua.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/death_count +# 调用者：#fz:module/scoreboard/display/set_text/death_count -scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "aqua"} +data modify storage fz:module fz.scoreboard.text.death_count set value '{"text": "死亡榜", "color": "aqua"}' scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.death_count +scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "aqua"} team modify fz.module.scoreboard.display.death_count color aqua team modify fz.module.scoreboard.display.death_count displayName {"text": "死亡榜", "color": "aqua"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/death_count/black.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/death_count/black.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/death_count/black.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/death_count/black.mcfunction index 437615d..8dda847 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/death_count/black.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/death_count/black.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/death_count +# 调用者：#fz:module/scoreboard/display/set_text/death_count -scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "black"} +data modify storage fz:module fz.scoreboard.text.death_count set value '{"text": "死亡榜", "color": "black"}' scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.death_count +scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "black"} team modify fz.module.scoreboard.display.death_count color black team modify fz.module.scoreboard.display.death_count displayName {"text": "死亡榜", "color": "black"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/death_count/blue.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/death_count/blue.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/death_count/blue.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/death_count/blue.mcfunction index 48ba6d3..f746072 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/death_count/blue.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/death_count/blue.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/death_count +# 调用者：#fz:module/scoreboard/display/set_text/death_count -scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "blue"} +data modify storage fz:module fz.scoreboard.text.death_count set value '{"text": "死亡榜", "color": "blue"}' scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.death_count +scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "blue"} team modify fz.module.scoreboard.display.death_count color blue team modify fz.module.scoreboard.display.death_count displayName {"text": "死亡榜", "color": "blue"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/death_count/dark_aqua.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/death_count/dark_aqua.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/death_count/dark_aqua.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/death_count/dark_aqua.mcfunction index b696017..ae8e1c9 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/death_count/dark_aqua.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/death_count/dark_aqua.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/death_count +# 调用者：#fz:module/scoreboard/display/set_text/death_count -scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "dark_aqua"} +data modify storage fz:module fz.scoreboard.text.death_count set value '{"text": "死亡榜", "color": "dark_aqua"}' scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.death_count +scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "dark_aqua"} team modify fz.module.scoreboard.display.death_count color dark_aqua team modify fz.module.scoreboard.display.death_count displayName {"text": "死亡榜", "color": "dark_aqua"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/death_count/dark_blue.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/death_count/dark_blue.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/death_count/dark_blue.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/death_count/dark_blue.mcfunction index 8da83b3..109e179 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/death_count/dark_blue.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/death_count/dark_blue.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/death_count +# 调用者：#fz:module/scoreboard/display/set_text/death_count -scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "dark_blue"} +data modify storage fz:module fz.scoreboard.text.death_count set value '{"text": "死亡榜", "color": "dark_blue"}' scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.death_count +scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "dark_blue"} team modify fz.module.scoreboard.display.death_count color dark_blue team modify fz.module.scoreboard.display.death_count displayName {"text": "死亡榜", "color": "dark_blue"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/death_count/dark_gray.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/death_count/dark_gray.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/death_count/dark_gray.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/death_count/dark_gray.mcfunction index e78f37f..90ebf0b 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/death_count/dark_gray.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/death_count/dark_gray.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/death_count +# 调用者：#fz:module/scoreboard/display/set_text/death_count -scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "dark_gray"} +data modify storage fz:module fz.scoreboard.text.death_count set value '{"text": "死亡榜", "color": "dark_gray"}' scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.death_count +scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "dark_gray"} team modify fz.module.scoreboard.display.death_count color dark_gray team modify fz.module.scoreboard.display.death_count displayName {"text": "死亡榜", "color": "dark_gray"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/death_count/dark_green.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/death_count/dark_green.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/death_count/dark_green.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/death_count/dark_green.mcfunction index e69eb49..a924e19 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/death_count/dark_green.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/death_count/dark_green.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/death_count +# 调用者：#fz:module/scoreboard/display/set_text/death_count -scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "dark_green"} +data modify storage fz:module fz.scoreboard.text.death_count set value '{"text": "死亡榜", "color": "dark_green"}' scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.death_count +scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "dark_green"} team modify fz.module.scoreboard.display.death_count color dark_green team modify fz.module.scoreboard.display.death_count displayName {"text": "死亡榜", "color": "dark_green"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/death_count/dark_purple.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/death_count/dark_purple.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/death_count/dark_purple.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/death_count/dark_purple.mcfunction index 599b85a..b4a6bfb 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/death_count/dark_purple.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/death_count/dark_purple.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/death_count +# 调用者：#fz:module/scoreboard/display/set_text/death_count -scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "dark_purple"} +data modify storage fz:module fz.scoreboard.text.death_count set value '{"text": "死亡榜", "color": "dark_purple"}' scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.death_count +scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "dark_purple"} team modify fz.module.scoreboard.display.death_count color dark_purple team modify fz.module.scoreboard.display.death_count displayName {"text": "死亡榜", "color": "dark_purple"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/death_count/dark_red.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/death_count/dark_red.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/death_count/dark_red.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/death_count/dark_red.mcfunction index a205134..ede1f38 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/death_count/dark_red.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/death_count/dark_red.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/death_count +# 调用者：#fz:module/scoreboard/display/set_text/death_count -scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "dark_red"} +data modify storage fz:module fz.scoreboard.text.death_count set value '{"text": "死亡榜", "color": "dark_red"}' scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.death_count +scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "dark_red"} team modify fz.module.scoreboard.display.death_count color dark_red team modify fz.module.scoreboard.display.death_count displayName {"text": "死亡榜", "color": "dark_red"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/death_count/gold.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/death_count/gold.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/death_count/gold.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/death_count/gold.mcfunction index c958ee6..03a5820 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/death_count/gold.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/death_count/gold.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/death_count +# 调用者：#fz:module/scoreboard/display/set_text/death_count -scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "gold"} +data modify storage fz:module fz.scoreboard.text.death_count set value '{"text": "死亡榜", "color": "gold"}' scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.death_count +scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "gold"} team modify fz.module.scoreboard.display.death_count color gold team modify fz.module.scoreboard.display.death_count displayName {"text": "死亡榜", "color": "gold"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/death_count/gray.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/death_count/gray.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/death_count/gray.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/death_count/gray.mcfunction index eab3d9e..1012be5 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/death_count/gray.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/death_count/gray.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/death_count +# 调用者：#fz:module/scoreboard/display/set_text/death_count -scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "gray"} +data modify storage fz:module fz.scoreboard.text.death_count set value '{"text": "死亡榜", "color": "gray"}' scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.death_count +scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "gray"} team modify fz.module.scoreboard.display.death_count color gray team modify fz.module.scoreboard.display.death_count displayName {"text": "死亡榜", "color": "gray"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/death_count/green.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/death_count/green.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/death_count/green.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/death_count/green.mcfunction index bd236a2..1129dfe 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/death_count/green.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/death_count/green.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/death_count +# 调用者：#fz:module/scoreboard/display/set_text/death_count -scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "green"} +data modify storage fz:module fz.scoreboard.text.death_count set value '{"text": "死亡榜", "color": "green"}' scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.death_count +scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "green"} team modify fz.module.scoreboard.display.death_count color green team modify fz.module.scoreboard.display.death_count displayName {"text": "死亡榜", "color": "green"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/death_count/light_purple.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/death_count/light_purple.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/death_count/light_purple.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/death_count/light_purple.mcfunction index 5adae5c..fb65af3 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/death_count/light_purple.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/death_count/light_purple.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/death_count +# 调用者：#fz:module/scoreboard/display/set_text/death_count -scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "light_purple"} +data modify storage fz:module fz.scoreboard.text.death_count set value '{"text": "死亡榜", "color": "light_purple"}' scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.death_count +scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "light_purple"} team modify fz.module.scoreboard.display.death_count color light_purple team modify fz.module.scoreboard.display.death_count displayName {"text": "死亡榜", "color": "light_purple"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/death_count/red.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/death_count/red.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/death_count/red.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/death_count/red.mcfunction index 9c214ce..25f35da 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/death_count/red.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/death_count/red.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/death_count +# 调用者：#fz:module/scoreboard/display/set_text/death_count -scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "red"} +data modify storage fz:module fz.scoreboard.text.death_count set value '{"text": "死亡榜", "color": "red"}' scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.death_count +scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "red"} team modify fz.module.scoreboard.display.death_count color red team modify fz.module.scoreboard.display.death_count displayName {"text": "死亡榜", "color": "red"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/death_count/white.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/death_count/white.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/death_count/white.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/death_count/white.mcfunction index c3d5190..9512254 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/death_count/white.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/death_count/white.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/death_count +# 调用者：#fz:module/scoreboard/display/set_text/death_count -scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "white"} +data modify storage fz:module fz.scoreboard.text.death_count set value '{"text": "死亡榜", "color": "white"}' scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.death_count +scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "white"} team modify fz.module.scoreboard.display.death_count color white team modify fz.module.scoreboard.display.death_count displayName {"text": "死亡榜", "color": "white"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/death_count/yellow.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/death_count/yellow.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/death_count/yellow.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/death_count/yellow.mcfunction index 3273f7a..83ab7e8 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/death_count/yellow.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/death_count/yellow.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/death_count +# 调用者：#fz:module/scoreboard/display/set_text/death_count -scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "yellow"} +data modify storage fz:module fz.scoreboard.text.death_count set value '{"text": "死亡榜", "color": "yellow"}' scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.death_count +scoreboard objectives modify fz.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "yellow"} team modify fz.module.scoreboard.display.death_count color yellow team modify fz.module.scoreboard.display.death_count displayName {"text": "死亡榜", "color": "yellow"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/dig_count/aqua.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/dig_count/aqua.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/dig_count/aqua.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/dig_count/aqua.mcfunction index fbacc7b..1470b83 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/dig_count/aqua.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/dig_count/aqua.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/dig_count +# 调用者：#fz:module/scoreboard/display/set_text/dig_count -scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "aqua"} +data modify storage fz:module fz.scoreboard.text.dig_count set value '{"text": "挖掘榜", "color": "aqua"}' scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.dig_count +scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "aqua"} team modify fz.module.scoreboard.display.dig_count color aqua team modify fz.module.scoreboard.display.dig_count displayName {"text": "挖掘榜", "color": "aqua"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/dig_count/black.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/dig_count/black.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/dig_count/black.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/dig_count/black.mcfunction index 80a2c5e..e90e523 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/dig_count/black.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/dig_count/black.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/dig_count +# 调用者：#fz:module/scoreboard/display/set_text/dig_count -scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "black"} +data modify storage fz:module fz.scoreboard.text.dig_count set value '{"text": "挖掘榜", "color": "black"}' scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.dig_count +scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "black"} team modify fz.module.scoreboard.display.dig_count color black team modify fz.module.scoreboard.display.dig_count displayName {"text": "挖掘榜", "color": "black"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/dig_count/blue.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/dig_count/blue.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/dig_count/blue.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/dig_count/blue.mcfunction index dfdc405..8831a7c 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/dig_count/blue.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/dig_count/blue.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/dig_count +# 调用者：#fz:module/scoreboard/display/set_text/dig_count -scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "blue"} +data modify storage fz:module fz.scoreboard.text.dig_count set value '{"text": "挖掘榜", "color": "blue"}' scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.dig_count +scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "blue"} team modify fz.module.scoreboard.display.dig_count color blue team modify fz.module.scoreboard.display.dig_count displayName {"text": "挖掘榜", "color": "blue"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/dig_count/dark_aqua.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/dig_count/dark_aqua.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/dig_count/dark_aqua.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/dig_count/dark_aqua.mcfunction index e6a3810..f4582e2 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/dig_count/dark_aqua.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/dig_count/dark_aqua.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/dig_count +# 调用者：#fz:module/scoreboard/display/set_text/dig_count -scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "dark_aqua"} +data modify storage fz:module fz.scoreboard.text.dig_count set value '{"text": "挖掘榜", "color": "dark_aqua"}' scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.dig_count +scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "dark_aqua"} team modify fz.module.scoreboard.display.dig_count color dark_aqua team modify fz.module.scoreboard.display.dig_count displayName {"text": "挖掘榜", "color": "dark_aqua"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/dig_count/dark_blue.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/dig_count/dark_blue.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/dig_count/dark_blue.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/dig_count/dark_blue.mcfunction index 7c2cd59..a94db67 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/dig_count/dark_blue.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/dig_count/dark_blue.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/dig_count +# 调用者：#fz:module/scoreboard/display/set_text/dig_count -scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "dark_blue"} +data modify storage fz:module fz.scoreboard.text.dig_count set value '{"text": "挖掘榜", "color": "dark_blue"}' scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.dig_count +scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "dark_blue"} team modify fz.module.scoreboard.display.dig_count color dark_blue team modify fz.module.scoreboard.display.dig_count displayName {"text": "挖掘榜", "color": "dark_blue"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/dig_count/dark_gray.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/dig_count/dark_gray.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/dig_count/dark_gray.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/dig_count/dark_gray.mcfunction index 3afb86c..e817851 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/dig_count/dark_gray.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/dig_count/dark_gray.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/dig_count +# 调用者：#fz:module/scoreboard/display/set_text/dig_count -scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "dark_gray"} +data modify storage fz:module fz.scoreboard.text.dig_count set value '{"text": "挖掘榜", "color": "dark_gray"}' scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.dig_count +scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "dark_gray"} team modify fz.module.scoreboard.display.dig_count color dark_gray team modify fz.module.scoreboard.display.dig_count displayName {"text": "挖掘榜", "color": "dark_gray"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/dig_count/dark_green.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/dig_count/dark_green.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/dig_count/dark_green.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/dig_count/dark_green.mcfunction index b84847b..88754a6 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/dig_count/dark_green.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/dig_count/dark_green.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/dig_count +# 调用者：#fz:module/scoreboard/display/set_text/dig_count -scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "dark_green"} +data modify storage fz:module fz.scoreboard.text.dig_count set value '{"text": "挖掘榜", "color": "dark_green"}' scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.dig_count +scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "dark_green"} team modify fz.module.scoreboard.display.dig_count color dark_green team modify fz.module.scoreboard.display.dig_count displayName {"text": "挖掘榜", "color": "dark_green"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/dig_count/dark_purple.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/dig_count/dark_purple.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/dig_count/dark_purple.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/dig_count/dark_purple.mcfunction index 2fee5c8..13451b4 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/dig_count/dark_purple.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/dig_count/dark_purple.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/dig_count +# 调用者：#fz:module/scoreboard/display/set_text/dig_count -scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "dark_purple"} +data modify storage fz:module fz.scoreboard.text.dig_count set value '{"text": "挖掘榜", "color": "dark_purple"}' scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.dig_count +scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "dark_purple"} team modify fz.module.scoreboard.display.dig_count color dark_purple team modify fz.module.scoreboard.display.dig_count displayName {"text": "挖掘榜", "color": "dark_purple"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/dig_count/dark_red.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/dig_count/dark_red.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/dig_count/dark_red.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/dig_count/dark_red.mcfunction index 0287344..033bfd0 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/dig_count/dark_red.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/dig_count/dark_red.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/dig_count +# 调用者：#fz:module/scoreboard/display/set_text/dig_count -scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "dark_red"} +data modify storage fz:module fz.scoreboard.text.dig_count set value '{"text": "挖掘榜", "color": "dark_red"}' scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.dig_count +scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "dark_red"} team modify fz.module.scoreboard.display.dig_count color dark_red team modify fz.module.scoreboard.display.dig_count displayName {"text": "挖掘榜", "color": "dark_red"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/dig_count/gold.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/dig_count/gold.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/dig_count/gold.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/dig_count/gold.mcfunction index cd12756..a0109cc 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/dig_count/gold.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/dig_count/gold.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/dig_count +# 调用者：#fz:module/scoreboard/display/set_text/dig_count -scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "gold"} +data modify storage fz:module fz.scoreboard.text.dig_count set value '{"text": "挖掘榜", "color": "gold"}' scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.dig_count +scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "gold"} team modify fz.module.scoreboard.display.dig_count color gold team modify fz.module.scoreboard.display.dig_count displayName {"text": "挖掘榜", "color": "gold"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/dig_count/gray.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/dig_count/gray.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/dig_count/gray.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/dig_count/gray.mcfunction index 57251e8..cd86902 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/dig_count/gray.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/dig_count/gray.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/dig_count +# 调用者：#fz:module/scoreboard/display/set_text/dig_count -scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "gray"} +data modify storage fz:module fz.scoreboard.text.dig_count set value '{"text": "挖掘榜", "color": "gray"}' scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.dig_count +scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "gray"} team modify fz.module.scoreboard.display.dig_count color gray team modify fz.module.scoreboard.display.dig_count displayName {"text": "挖掘榜", "color": "gray"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/dig_count/green.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/dig_count/green.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/dig_count/green.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/dig_count/green.mcfunction index a47ec10..c63e5a2 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/dig_count/green.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/dig_count/green.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/dig_count +# 调用者：#fz:module/scoreboard/display/set_text/dig_count -scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "green"} +data modify storage fz:module fz.scoreboard.text.dig_count set value '{"text": "挖掘榜", "color": "green"}' scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.dig_count +scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "green"} team modify fz.module.scoreboard.display.dig_count color green team modify fz.module.scoreboard.display.dig_count displayName {"text": "挖掘榜", "color": "green"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/dig_count/light_purple.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/dig_count/light_purple.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/dig_count/light_purple.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/dig_count/light_purple.mcfunction index c4dfd2f..5995d83 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/dig_count/light_purple.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/dig_count/light_purple.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/dig_count +# 调用者：#fz:module/scoreboard/display/set_text/dig_count -scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "light_purple"} +data modify storage fz:module fz.scoreboard.text.dig_count set value '{"text": "挖掘榜", "color": "light_purple"}' scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.dig_count +scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "light_purple"} team modify fz.module.scoreboard.display.dig_count color light_purple team modify fz.module.scoreboard.display.dig_count displayName {"text": "挖掘榜", "color": "light_purple"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/dig_count/red.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/dig_count/red.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/dig_count/red.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/dig_count/red.mcfunction index 132e923..5068b45 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/dig_count/red.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/dig_count/red.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/dig_count +# 调用者：#fz:module/scoreboard/display/set_text/dig_count -scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "red"} +data modify storage fz:module fz.scoreboard.text.dig_count set value '{"text": "挖掘榜", "color": "red"}' scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.dig_count +scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "red"} team modify fz.module.scoreboard.display.dig_count color red team modify fz.module.scoreboard.display.dig_count displayName {"text": "挖掘榜", "color": "red"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/dig_count/white.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/dig_count/white.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/dig_count/white.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/dig_count/white.mcfunction index 1e96b56..d1f3f62 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/dig_count/white.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/dig_count/white.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/dig_count +# 调用者：#fz:module/scoreboard/display/set_text/dig_count -scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "white"} +data modify storage fz:module fz.scoreboard.text.dig_count set value '{"text": "挖掘榜", "color": "white"}' scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.dig_count +scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "white"} team modify fz.module.scoreboard.display.dig_count color white team modify fz.module.scoreboard.display.dig_count displayName {"text": "挖掘榜", "color": "white"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/dig_count/yellow.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/dig_count/yellow.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/dig_count/yellow.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/dig_count/yellow.mcfunction index e25e37d..7d1424d 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/dig_count/yellow.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/dig_count/yellow.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/dig_count +# 调用者：#fz:module/scoreboard/display/set_text/dig_count -scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "yellow"} +data modify storage fz:module fz.scoreboard.text.dig_count set value '{"text": "挖掘榜", "color": "yellow"}' scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.dig_count +scoreboard objectives modify fz.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "yellow"} team modify fz.module.scoreboard.display.dig_count color yellow team modify fz.module.scoreboard.display.dig_count displayName {"text": "挖掘榜", "color": "yellow"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/aqua.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/aqua.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/fishing_count/aqua.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/fishing_count/aqua.mcfunction index 761705e..d280d9d 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/aqua.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/aqua.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/fishing_count +# 调用者：#fz:module/scoreboard/display/set_text/fishing_count -scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "aqua"} +data modify storage fz:module fz.scoreboard.text.fishing_count set value '{"text": "钓鱼榜", "color": "aqua"}' scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.fishing_count +scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "aqua"} team modify fz.module.scoreboard.display.fishing_count color aqua team modify fz.module.scoreboard.display.fishing_count displayName {"text": "钓鱼榜", "color": "aqua"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/black.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/black.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/fishing_count/black.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/fishing_count/black.mcfunction index 70e18de..e99d735 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/black.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/black.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/fishing_count +# 调用者：#fz:module/scoreboard/display/set_text/fishing_count -scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "black"} +data modify storage fz:module fz.scoreboard.text.fishing_count set value '{"text": "钓鱼榜", "color": "black"}' scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.fishing_count +scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "black"} team modify fz.module.scoreboard.display.fishing_count color black team modify fz.module.scoreboard.display.fishing_count displayName {"text": "钓鱼榜", "color": "black"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/blue.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/blue.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/fishing_count/blue.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/fishing_count/blue.mcfunction index f4a15f7..10b49bd 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/blue.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/blue.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/fishing_count +# 调用者：#fz:module/scoreboard/display/set_text/fishing_count -scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "blue"} +data modify storage fz:module fz.scoreboard.text.fishing_count set value '{"text": "钓鱼榜", "color": "blue"}' scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.fishing_count +scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "blue"} team modify fz.module.scoreboard.display.fishing_count color blue team modify fz.module.scoreboard.display.fishing_count displayName {"text": "钓鱼榜", "color": "blue"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/dark_aqua.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/dark_aqua.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/fishing_count/dark_aqua.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/fishing_count/dark_aqua.mcfunction index 7c03a10..3bec16f 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/dark_aqua.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/dark_aqua.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/fishing_count +# 调用者：#fz:module/scoreboard/display/set_text/fishing_count -scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "dark_aqua"} +data modify storage fz:module fz.scoreboard.text.fishing_count set value '{"text": "钓鱼榜", "color": "dark_aqua"}' scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.fishing_count +scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "dark_aqua"} team modify fz.module.scoreboard.display.fishing_count color dark_aqua team modify fz.module.scoreboard.display.fishing_count displayName {"text": "钓鱼榜", "color": "dark_aqua"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/dark_blue.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/dark_blue.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/fishing_count/dark_blue.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/fishing_count/dark_blue.mcfunction index 96578a4..2d1bfef 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/dark_blue.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/dark_blue.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/fishing_count +# 调用者：#fz:module/scoreboard/display/set_text/fishing_count -scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "dark_blue"} +data modify storage fz:module fz.scoreboard.text.fishing_count set value '{"text": "钓鱼榜", "color": "dark_blue"}' scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.fishing_count +scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "dark_blue"} team modify fz.module.scoreboard.display.fishing_count color dark_blue team modify fz.module.scoreboard.display.fishing_count displayName {"text": "钓鱼榜", "color": "dark_blue"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/dark_gray.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/dark_gray.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/fishing_count/dark_gray.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/fishing_count/dark_gray.mcfunction index bd53e92..fe979ff 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/dark_gray.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/dark_gray.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/fishing_count +# 调用者：#fz:module/scoreboard/display/set_text/fishing_count -scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "dark_gray"} +data modify storage fz:module fz.scoreboard.text.fishing_count set value '{"text": "钓鱼榜", "color": "dark_gray"}' scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.fishing_count +scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "dark_gray"} team modify fz.module.scoreboard.display.fishing_count color dark_gray team modify fz.module.scoreboard.display.fishing_count displayName {"text": "钓鱼榜", "color": "dark_gray"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/dark_green.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/dark_green.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/fishing_count/dark_green.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/fishing_count/dark_green.mcfunction index ce4ba4e..a3fcc8b 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/dark_green.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/dark_green.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/fishing_count +# 调用者：#fz:module/scoreboard/display/set_text/fishing_count -scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "dark_green"} +data modify storage fz:module fz.scoreboard.text.fishing_count set value '{"text": "钓鱼榜", "color": "dark_green"}' scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.fishing_count +scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "dark_green"} team modify fz.module.scoreboard.display.fishing_count color dark_green team modify fz.module.scoreboard.display.fishing_count displayName {"text": "钓鱼榜", "color": "dark_green"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/dark_purple.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/dark_purple.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/fishing_count/dark_purple.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/fishing_count/dark_purple.mcfunction index 0a7547f..4abc526 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/dark_purple.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/dark_purple.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/fishing_count +# 调用者：#fz:module/scoreboard/display/set_text/fishing_count -scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "dark_purple"} +data modify storage fz:module fz.scoreboard.text.fishing_count set value '{"text": "钓鱼榜", "color": "dark_purple"}' scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.fishing_count +scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "dark_purple"} team modify fz.module.scoreboard.display.fishing_count color dark_purple team modify fz.module.scoreboard.display.fishing_count displayName {"text": "钓鱼榜", "color": "dark_purple"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/dark_red.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/dark_red.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/fishing_count/dark_red.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/fishing_count/dark_red.mcfunction index 6a9ffe9..f649c7a 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/dark_red.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/dark_red.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/fishing_count +# 调用者：#fz:module/scoreboard/display/set_text/fishing_count -scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "dark_red"} +data modify storage fz:module fz.scoreboard.text.fishing_count set value '{"text": "钓鱼榜", "color": "dark_red"}' scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.fishing_count +scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "dark_red"} team modify fz.module.scoreboard.display.fishing_count color dark_red team modify fz.module.scoreboard.display.fishing_count displayName {"text": "钓鱼榜", "color": "dark_red"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/gold.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/gold.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/fishing_count/gold.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/fishing_count/gold.mcfunction index c569356..d021616 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/gold.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/gold.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/fishing_count +# 调用者：#fz:module/scoreboard/display/set_text/fishing_count -scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "gold"} +data modify storage fz:module fz.scoreboard.text.fishing_count set value '{"text": "钓鱼榜", "color": "gold"}' scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.fishing_count +scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "gold"} team modify fz.module.scoreboard.display.fishing_count color gold team modify fz.module.scoreboard.display.fishing_count displayName {"text": "钓鱼榜", "color": "gold"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/gray.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/gray.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/fishing_count/gray.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/fishing_count/gray.mcfunction index 540e172..639f061 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/gray.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/gray.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/fishing_count +# 调用者：#fz:module/scoreboard/display/set_text/fishing_count -scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "gray"} +data modify storage fz:module fz.scoreboard.text.fishing_count set value '{"text": "钓鱼榜", "color": "gray"}' scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.fishing_count +scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "gray"} team modify fz.module.scoreboard.display.fishing_count color gray team modify fz.module.scoreboard.display.fishing_count displayName {"text": "钓鱼榜", "color": "gray"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/green.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/green.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/fishing_count/green.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/fishing_count/green.mcfunction index 07d1e8e..1806c02 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/green.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/green.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/fishing_count +# 调用者：#fz:module/scoreboard/display/set_text/fishing_count -scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "green"} +data modify storage fz:module fz.scoreboard.text.fishing_count set value '{"text": "钓鱼榜", "color": "green"}' scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.fishing_count +scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "green"} team modify fz.module.scoreboard.display.fishing_count color green team modify fz.module.scoreboard.display.fishing_count displayName {"text": "钓鱼榜", "color": "green"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/light_purple.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/light_purple.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/fishing_count/light_purple.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/fishing_count/light_purple.mcfunction index eccccd5..cd3224d 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/light_purple.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/light_purple.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/fishing_count +# 调用者：#fz:module/scoreboard/display/set_text/fishing_count -scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "light_purple"} +data modify storage fz:module fz.scoreboard.text.fishing_count set value '{"text": "钓鱼榜", "color": "light_purple"}' scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.fishing_count +scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "light_purple"} team modify fz.module.scoreboard.display.fishing_count color light_purple team modify fz.module.scoreboard.display.fishing_count displayName {"text": "钓鱼榜", "color": "light_purple"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/red.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/red.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/fishing_count/red.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/fishing_count/red.mcfunction index 16225a9..2e12c95 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/red.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/red.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/fishing_count +# 调用者：#fz:module/scoreboard/display/set_text/fishing_count -scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "red"} +data modify storage fz:module fz.scoreboard.text.fishing_count set value '{"text": "钓鱼榜", "color": "red"}' scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.fishing_count +scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "red"} team modify fz.module.scoreboard.display.fishing_count color red team modify fz.module.scoreboard.display.fishing_count displayName {"text": "钓鱼榜", "color": "red"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/white.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/white.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/fishing_count/white.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/fishing_count/white.mcfunction index fd4aee6..5d370fb 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/white.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/white.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/fishing_count +# 调用者：#fz:module/scoreboard/display/set_text/fishing_count -scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "white"} +data modify storage fz:module fz.scoreboard.text.fishing_count set value '{"text": "钓鱼榜", "color": "white"}' scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.fishing_count +scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "white"} team modify fz.module.scoreboard.display.fishing_count color white team modify fz.module.scoreboard.display.fishing_count displayName {"text": "钓鱼榜", "color": "white"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/yellow.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/yellow.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/fishing_count/yellow.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/fishing_count/yellow.mcfunction index 6e65d8c..c34e778 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/fishing_count/yellow.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/fishing_count/yellow.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/fishing_count +# 调用者：#fz:module/scoreboard/display/set_text/fishing_count -scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "yellow"} +data modify storage fz:module fz.scoreboard.text.fishing_count set value '{"text": "钓鱼榜", "color": "yellow"}' scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.fishing_count +scoreboard objectives modify fz.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "yellow"} team modify fz.module.scoreboard.display.fishing_count color yellow team modify fz.module.scoreboard.display.fishing_count displayName {"text": "钓鱼榜", "color": "yellow"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/general/aqua.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/general/aqua.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/general/aqua.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/general/aqua.mcfunction index 018f2b3..65bce2f 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/general/aqua.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/general/aqua.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/general +# 调用者：#fz:module/scoreboard/display/set_text/general -scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "aqua"} +data modify storage fz:module fz.scoreboard.text.general set value '{"text": "总榜", "color": "aqua"}' scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.general +scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "aqua"} team modify fz.module.scoreboard.display.general color aqua team modify fz.module.scoreboard.display.general displayName {"text": "总榜", "color": "aqua"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/general/black.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/general/black.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/general/black.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/general/black.mcfunction index c6c28d4..591411b 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/general/black.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/general/black.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/general +# 调用者：#fz:module/scoreboard/display/set_text/general -scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "black"} +data modify storage fz:module fz.scoreboard.text.general set value '{"text": "总榜", "color": "black"}' scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.general +scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "black"} team modify fz.module.scoreboard.display.general color black team modify fz.module.scoreboard.display.general displayName {"text": "总榜", "color": "black"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/general/blue.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/general/blue.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/general/blue.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/general/blue.mcfunction index 8c3f521..50e6fd0 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/general/blue.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/general/blue.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/general +# 调用者：#fz:module/scoreboard/display/set_text/general -scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "blue"} +data modify storage fz:module fz.scoreboard.text.general set value '{"text": "总榜", "color": "blue"}' scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.general +scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "blue"} team modify fz.module.scoreboard.display.general color blue team modify fz.module.scoreboard.display.general displayName {"text": "总榜", "color": "blue"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/general/dark_aqua.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/general/dark_aqua.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/general/dark_aqua.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/general/dark_aqua.mcfunction index ddcfb3a..41bb4be 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/general/dark_aqua.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/general/dark_aqua.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/general +# 调用者：#fz:module/scoreboard/display/set_text/general -scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "dark_aqua"} +data modify storage fz:module fz.scoreboard.text.general set value '{"text": "总榜", "color": "dark_aqua"}' scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.general +scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "dark_aqua"} team modify fz.module.scoreboard.display.general color dark_aqua team modify fz.module.scoreboard.display.general displayName {"text": "总榜", "color": "dark_aqua"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/general/dark_blue.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/general/dark_blue.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/general/dark_blue.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/general/dark_blue.mcfunction index edd5038..19f727c 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/general/dark_blue.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/general/dark_blue.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/general +# 调用者：#fz:module/scoreboard/display/set_text/general -scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "dark_blue"} +data modify storage fz:module fz.scoreboard.text.general set value '{"text": "总榜", "color": "dark_blue"}' scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.general +scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "dark_blue"} team modify fz.module.scoreboard.display.general color dark_blue team modify fz.module.scoreboard.display.general displayName {"text": "总榜", "color": "dark_blue"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/general/dark_gray.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/general/dark_gray.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/general/dark_gray.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/general/dark_gray.mcfunction index 64e5e91..5c2303c 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/general/dark_gray.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/general/dark_gray.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/general +# 调用者：#fz:module/scoreboard/display/set_text/general -scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "dark_gray"} +data modify storage fz:module fz.scoreboard.text.general set value '{"text": "总榜", "color": "dark_gray"}' scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.general +scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "dark_gray"} team modify fz.module.scoreboard.display.general color dark_gray team modify fz.module.scoreboard.display.general displayName {"text": "总榜", "color": "dark_gray"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/general/dark_green.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/general/dark_green.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/general/dark_green.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/general/dark_green.mcfunction index 9fb5e9f..7a71cee 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/general/dark_green.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/general/dark_green.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/general +# 调用者：#fz:module/scoreboard/display/set_text/general -scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "dark_green"} +data modify storage fz:module fz.scoreboard.text.general set value '{"text": "总榜", "color": "dark_green"}' scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.general +scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "dark_green"} team modify fz.module.scoreboard.display.general color dark_green team modify fz.module.scoreboard.display.general displayName {"text": "总榜", "color": "dark_green"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/general/dark_purple.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/general/dark_purple.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/general/dark_purple.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/general/dark_purple.mcfunction index 3aff3a0..6c5d672 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/general/dark_purple.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/general/dark_purple.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/general +# 调用者：#fz:module/scoreboard/display/set_text/general -scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "dark_purple"} +data modify storage fz:module fz.scoreboard.text.general set value '{"text": "总榜", "color": "dark_purple"}' scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.general +scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "dark_purple"} team modify fz.module.scoreboard.display.general color dark_purple team modify fz.module.scoreboard.display.general displayName {"text": "总榜", "color": "dark_purple"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/general/dark_red.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/general/dark_red.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/general/dark_red.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/general/dark_red.mcfunction index 6a9da16..10ec5e0 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/general/dark_red.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/general/dark_red.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/general +# 调用者：#fz:module/scoreboard/display/set_text/general -scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "dark_red"} +data modify storage fz:module fz.scoreboard.text.general set value '{"text": "总榜", "color": "dark_red"}' scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.general +scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "dark_red"} team modify fz.module.scoreboard.display.general color dark_red team modify fz.module.scoreboard.display.general displayName {"text": "总榜", "color": "dark_red"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/general/gold.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/general/gold.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/general/gold.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/general/gold.mcfunction index 6b2a136..aebf0a8 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/general/gold.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/general/gold.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/general +# 调用者：#fz:module/scoreboard/display/set_text/general -scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "gold"} +data modify storage fz:module fz.scoreboard.text.general set value '{"text": "总榜", "color": "gold"}' scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.general +scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "gold"} team modify fz.module.scoreboard.display.general color gold team modify fz.module.scoreboard.display.general displayName {"text": "总榜", "color": "gold"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/general/gray.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/general/gray.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/general/gray.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/general/gray.mcfunction index 8991d3b..ad007e6 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/general/gray.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/general/gray.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/general +# 调用者：#fz:module/scoreboard/display/set_text/general -scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "gray"} +data modify storage fz:module fz.scoreboard.text.general set value '{"text": "总榜", "color": "gray"}' scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.general +scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "gray"} team modify fz.module.scoreboard.display.general color gray team modify fz.module.scoreboard.display.general displayName {"text": "总榜", "color": "gray"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/general/green.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/general/green.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/general/green.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/general/green.mcfunction index d9bbe2c..154fbb2 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/general/green.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/general/green.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/general +# 调用者：#fz:module/scoreboard/display/set_text/general -scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "green"} +data modify storage fz:module fz.scoreboard.text.general set value '{"text": "总榜", "color": "green"}' scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.general +scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "green"} team modify fz.module.scoreboard.display.general color green team modify fz.module.scoreboard.display.general displayName {"text": "总榜", "color": "green"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/general/light_purple.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/general/light_purple.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/general/light_purple.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/general/light_purple.mcfunction index e558e4f..bcfe088 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/general/light_purple.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/general/light_purple.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/general +# 调用者：#fz:module/scoreboard/display/set_text/general -scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "light_purple"} +data modify storage fz:module fz.scoreboard.text.general set value '{"text": "总榜", "color": "light_purple"}' scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.general +scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "light_purple"} team modify fz.module.scoreboard.display.general color light_purple team modify fz.module.scoreboard.display.general displayName {"text": "总榜", "color": "light_purple"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/general/red.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/general/red.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/general/red.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/general/red.mcfunction index b2f93ba..9fd00af 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/general/red.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/general/red.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/general +# 调用者：#fz:module/scoreboard/display/set_text/general -scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "red"} +data modify storage fz:module fz.scoreboard.text.general set value '{"text": "总榜", "color": "red"}' scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.general +scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "red"} team modify fz.module.scoreboard.display.general color red team modify fz.module.scoreboard.display.general displayName {"text": "总榜", "color": "red"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/general/white.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/general/white.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/general/white.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/general/white.mcfunction index 75fdd5f..949424c 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/general/white.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/general/white.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/general +# 调用者：#fz:module/scoreboard/display/set_text/general -scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "white"} +data modify storage fz:module fz.scoreboard.text.general set value '{"text": "总榜", "color": "white"}' scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.general +scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "white"} team modify fz.module.scoreboard.display.general color white team modify fz.module.scoreboard.display.general displayName {"text": "总榜", "color": "white"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/general/yellow.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/general/yellow.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/general/yellow.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/general/yellow.mcfunction index fe85e63..4677298 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/general/yellow.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/general/yellow.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/general +# 调用者：#fz:module/scoreboard/display/set_text/general -scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "yellow"} +data modify storage fz:module fz.scoreboard.text.general set value '{"text": "总榜", "color": "yellow"}' scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.general +scoreboard objectives modify fz.module.scoreboard.display.general displayname {"text": "总榜", "color": "yellow"} team modify fz.module.scoreboard.display.general color yellow team modify fz.module.scoreboard.display.general displayName {"text": "总榜", "color": "yellow"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/kill_count/aqua.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/kill_count/aqua.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/kill_count/aqua.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/kill_count/aqua.mcfunction index d92712e..7b39a5e 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/kill_count/aqua.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/kill_count/aqua.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/kill_count +# 调用者：#fz:module/scoreboard/display/set_text/kill_count -scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "aqua"} +data modify storage fz:module fz.scoreboard.text.kill_count set value '{"text": "击杀榜", "color": "aqua"}' scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.kill_count +scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "aqua"} team modify fz.module.scoreboard.display.kill_count color aqua team modify fz.module.scoreboard.display.kill_count displayName {"text": "击杀榜", "color": "aqua"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/kill_count/black.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/kill_count/black.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/kill_count/black.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/kill_count/black.mcfunction index 46579d0..fa360ea 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/kill_count/black.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/kill_count/black.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/kill_count +# 调用者：#fz:module/scoreboard/display/set_text/kill_count -scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "black"} +data modify storage fz:module fz.scoreboard.text.kill_count set value '{"text": "击杀榜", "color": "black"}' scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.kill_count +scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "black"} team modify fz.module.scoreboard.display.kill_count color black team modify fz.module.scoreboard.display.kill_count displayName {"text": "击杀榜", "color": "black"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/kill_count/blue.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/kill_count/blue.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/kill_count/blue.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/kill_count/blue.mcfunction index 6fd8579..06a9654 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/kill_count/blue.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/kill_count/blue.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/kill_count +# 调用者：#fz:module/scoreboard/display/set_text/kill_count -scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "blue"} +data modify storage fz:module fz.scoreboard.text.kill_count set value '{"text": "击杀榜", "color": "blue"}' scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.kill_count +scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "blue"} team modify fz.module.scoreboard.display.kill_count color blue team modify fz.module.scoreboard.display.kill_count displayName {"text": "击杀榜", "color": "blue"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/kill_count/dark_aqua.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/kill_count/dark_aqua.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/kill_count/dark_aqua.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/kill_count/dark_aqua.mcfunction index a9c1ae8..60db40c 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/kill_count/dark_aqua.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/kill_count/dark_aqua.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/kill_count +# 调用者：#fz:module/scoreboard/display/set_text/kill_count -scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "dark_aqua"} +data modify storage fz:module fz.scoreboard.text.kill_count set value '{"text": "击杀榜", "color": "dark_aqua"}' scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.kill_count +scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "dark_aqua"} team modify fz.module.scoreboard.display.kill_count color dark_aqua team modify fz.module.scoreboard.display.kill_count displayName {"text": "击杀榜", "color": "dark_aqua"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/kill_count/dark_blue.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/kill_count/dark_blue.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/kill_count/dark_blue.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/kill_count/dark_blue.mcfunction index fc7e2ec..61d592b 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/kill_count/dark_blue.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/kill_count/dark_blue.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/kill_count +# 调用者：#fz:module/scoreboard/display/set_text/kill_count -scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "dark_blue"} +data modify storage fz:module fz.scoreboard.text.kill_count set value '{"text": "击杀榜", "color": "dark_blue"}' scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.kill_count +scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "dark_blue"} team modify fz.module.scoreboard.display.kill_count color dark_blue team modify fz.module.scoreboard.display.kill_count displayName {"text": "击杀榜", "color": "dark_blue"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/kill_count/dark_gray.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/kill_count/dark_gray.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/kill_count/dark_gray.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/kill_count/dark_gray.mcfunction index b62fa14..9e4d780 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/kill_count/dark_gray.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/kill_count/dark_gray.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/kill_count +# 调用者：#fz:module/scoreboard/display/set_text/kill_count -scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "dark_gray"} +data modify storage fz:module fz.scoreboard.text.kill_count set value '{"text": "击杀榜", "color": "dark_gray"}' scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.kill_count +scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "dark_gray"} team modify fz.module.scoreboard.display.kill_count color dark_gray team modify fz.module.scoreboard.display.kill_count displayName {"text": "击杀榜", "color": "dark_gray"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/kill_count/dark_green.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/kill_count/dark_green.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/kill_count/dark_green.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/kill_count/dark_green.mcfunction index 60568ae..eeee147 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/kill_count/dark_green.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/kill_count/dark_green.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/kill_count +# 调用者：#fz:module/scoreboard/display/set_text/kill_count -scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "dark_green"} +data modify storage fz:module fz.scoreboard.text.kill_count set value '{"text": "击杀榜", "color": "dark_green"}' scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.kill_count +scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "dark_green"} team modify fz.module.scoreboard.display.kill_count color dark_green team modify fz.module.scoreboard.display.kill_count displayName {"text": "击杀榜", "color": "dark_green"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/kill_count/dark_purple.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/kill_count/dark_purple.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/kill_count/dark_purple.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/kill_count/dark_purple.mcfunction index d02c00d..9b60682 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/kill_count/dark_purple.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/kill_count/dark_purple.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/kill_count +# 调用者：#fz:module/scoreboard/display/set_text/kill_count -scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "dark_purple"} +data modify storage fz:module fz.scoreboard.text.kill_count set value '{"text": "击杀榜", "color": "dark_purple"}' scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.kill_count +scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "dark_purple"} team modify fz.module.scoreboard.display.kill_count color dark_purple team modify fz.module.scoreboard.display.kill_count displayName {"text": "击杀榜", "color": "dark_purple"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/kill_count/dark_red.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/kill_count/dark_red.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/kill_count/dark_red.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/kill_count/dark_red.mcfunction index 79a9199..5b1e7cc 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/kill_count/dark_red.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/kill_count/dark_red.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/kill_count +# 调用者：#fz:module/scoreboard/display/set_text/kill_count -scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "dark_red"} +data modify storage fz:module fz.scoreboard.text.kill_count set value '{"text": "击杀榜", "color": "dark_red"}' scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.kill_count +scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "dark_red"} team modify fz.module.scoreboard.display.kill_count color dark_red team modify fz.module.scoreboard.display.kill_count displayName {"text": "击杀榜", "color": "dark_red"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/kill_count/gold.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/kill_count/gold.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/kill_count/gold.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/kill_count/gold.mcfunction index a9c62d4..111bd0f 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/kill_count/gold.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/kill_count/gold.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/kill_count +# 调用者：#fz:module/scoreboard/display/set_text/kill_count -scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "gold"} +data modify storage fz:module fz.scoreboard.text.kill_count set value '{"text": "击杀榜", "color": "gold"}' scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.kill_count +scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "gold"} team modify fz.module.scoreboard.display.kill_count color gold team modify fz.module.scoreboard.display.kill_count displayName {"text": "击杀榜", "color": "gold"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/kill_count/gray.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/kill_count/gray.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/kill_count/gray.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/kill_count/gray.mcfunction index 14dac7c..04c89b4 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/kill_count/gray.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/kill_count/gray.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/kill_count +# 调用者：#fz:module/scoreboard/display/set_text/kill_count -scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "gray"} +data modify storage fz:module fz.scoreboard.text.kill_count set value '{"text": "击杀榜", "color": "gray"}' scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.kill_count +scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "gray"} team modify fz.module.scoreboard.display.kill_count color gray team modify fz.module.scoreboard.display.kill_count displayName {"text": "击杀榜", "color": "gray"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/kill_count/green.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/kill_count/green.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/kill_count/green.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/kill_count/green.mcfunction index ec4c6d4..bebbbaf 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/kill_count/green.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/kill_count/green.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/kill_count +# 调用者：#fz:module/scoreboard/display/set_text/kill_count -scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "green"} +data modify storage fz:module fz.scoreboard.text.kill_count set value '{"text": "击杀榜", "color": "green"}' scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.kill_count +scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "green"} team modify fz.module.scoreboard.display.kill_count color green team modify fz.module.scoreboard.display.kill_count displayName {"text": "击杀榜", "color": "green"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/kill_count/light_purple.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/kill_count/light_purple.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/kill_count/light_purple.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/kill_count/light_purple.mcfunction index 27f4d60..bf1c9ed 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/kill_count/light_purple.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/kill_count/light_purple.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/kill_count +# 调用者：#fz:module/scoreboard/display/set_text/kill_count -scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "light_purple"} +data modify storage fz:module fz.scoreboard.text.kill_count set value '{"text": "击杀榜", "color": "light_purple"}' scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.kill_count +scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "light_purple"} team modify fz.module.scoreboard.display.kill_count color light_purple team modify fz.module.scoreboard.display.kill_count displayName {"text": "击杀榜", "color": "light_purple"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/kill_count/red.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/kill_count/red.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/kill_count/red.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/kill_count/red.mcfunction index aae77c2..c6a07e8 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/kill_count/red.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/kill_count/red.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/kill_count +# 调用者：#fz:module/scoreboard/display/set_text/kill_count -scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "red"} +data modify storage fz:module fz.scoreboard.text.kill_count set value '{"text": "击杀榜", "color": "red"}' scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.kill_count +scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "red"} team modify fz.module.scoreboard.display.kill_count color red team modify fz.module.scoreboard.display.kill_count displayName {"text": "击杀榜", "color": "red"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/kill_count/white.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/kill_count/white.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/kill_count/white.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/kill_count/white.mcfunction index d5cc7f0..668ef59 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/kill_count/white.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/kill_count/white.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/kill_count +# 调用者：#fz:module/scoreboard/display/set_text/kill_count -scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "white"} +data modify storage fz:module fz.scoreboard.text.kill_count set value '{"text": "击杀榜", "color": "white"}' scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.kill_count +scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "white"} team modify fz.module.scoreboard.display.kill_count color white team modify fz.module.scoreboard.display.kill_count displayName {"text": "击杀榜", "color": "white"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/kill_count/yellow.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/kill_count/yellow.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/kill_count/yellow.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/kill_count/yellow.mcfunction index 682762f..ddde8af 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/kill_count/yellow.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/kill_count/yellow.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/kill_count +# 调用者：#fz:module/scoreboard/display/set_text/kill_count -scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "yellow"} +data modify storage fz:module fz.scoreboard.text.kill_count set value '{"text": "击杀榜", "color": "yellow"}' scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.kill_count +scoreboard objectives modify fz.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "yellow"} team modify fz.module.scoreboard.display.kill_count color yellow team modify fz.module.scoreboard.display.kill_count displayName {"text": "击杀榜", "color": "yellow"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/trade_count/aqua.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/trade_count/aqua.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/trade_count/aqua.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/trade_count/aqua.mcfunction index 41ac4bb..40bda32 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/trade_count/aqua.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/trade_count/aqua.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/trade_count +# 调用者：#fz:module/scoreboard/display/set_text/trade_count -scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "aqua"} +data modify storage fz:module fz.scoreboard.text.trade_count set value '{"text": "交易榜", "color": "aqua"}' scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.trade_count +scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "aqua"} team modify fz.module.scoreboard.display.trade_count color aqua team modify fz.module.scoreboard.display.trade_count displayName {"text": "交易榜", "color": "aqua"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/trade_count/black.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/trade_count/black.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/trade_count/black.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/trade_count/black.mcfunction index 3357887..305361d 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/trade_count/black.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/trade_count/black.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/trade_count +# 调用者：#fz:module/scoreboard/display/set_text/trade_count -scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "black"} +data modify storage fz:module fz.scoreboard.text.trade_count set value '{"text": "交易榜", "color": "black"}' scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.trade_count +scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "black"} team modify fz.module.scoreboard.display.trade_count color black team modify fz.module.scoreboard.display.trade_count displayName {"text": "交易榜", "color": "black"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/trade_count/blue.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/trade_count/blue.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/trade_count/blue.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/trade_count/blue.mcfunction index 679a172..2cdcdc5 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/trade_count/blue.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/trade_count/blue.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/trade_count +# 调用者：#fz:module/scoreboard/display/set_text/trade_count -scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "blue"} +data modify storage fz:module fz.scoreboard.text.trade_count set value '{"text": "交易榜", "color": "blue"}' scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.trade_count +scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "blue"} team modify fz.module.scoreboard.display.trade_count color blue team modify fz.module.scoreboard.display.trade_count displayName {"text": "交易榜", "color": "blue"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/trade_count/dark_aqua.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/trade_count/dark_aqua.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/trade_count/dark_aqua.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/trade_count/dark_aqua.mcfunction index fcbf6b5..30cd856 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/trade_count/dark_aqua.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/trade_count/dark_aqua.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/trade_count +# 调用者：#fz:module/scoreboard/display/set_text/trade_count -scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "dark_aqua"} +data modify storage fz:module fz.scoreboard.text.trade_count set value '{"text": "交易榜", "color": "dark_aqua"}' scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.trade_count +scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "dark_aqua"} team modify fz.module.scoreboard.display.trade_count color dark_aqua team modify fz.module.scoreboard.display.trade_count displayName {"text": "交易榜", "color": "dark_aqua"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/trade_count/dark_blue.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/trade_count/dark_blue.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/trade_count/dark_blue.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/trade_count/dark_blue.mcfunction index 52fbd28..08d3f03 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/trade_count/dark_blue.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/trade_count/dark_blue.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/trade_count +# 调用者：#fz:module/scoreboard/display/set_text/trade_count -scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "dark_blue"} +data modify storage fz:module fz.scoreboard.text.trade_count set value '{"text": "交易榜", "color": "dark_blue"}' scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.trade_count +scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "dark_blue"} team modify fz.module.scoreboard.display.trade_count color dark_blue team modify fz.module.scoreboard.display.trade_count displayName {"text": "交易榜", "color": "dark_blue"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/trade_count/dark_gray.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/trade_count/dark_gray.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/trade_count/dark_gray.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/trade_count/dark_gray.mcfunction index 4041ad9..680f678 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/trade_count/dark_gray.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/trade_count/dark_gray.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/trade_count +# 调用者：#fz:module/scoreboard/display/set_text/trade_count -scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "dark_gray"} +data modify storage fz:module fz.scoreboard.text.trade_count set value '{"text": "交易榜", "color": "dark_gray"}' scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.trade_count +scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "dark_gray"} team modify fz.module.scoreboard.display.trade_count color dark_gray team modify fz.module.scoreboard.display.trade_count displayName {"text": "交易榜", "color": "dark_gray"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/trade_count/dark_green.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/trade_count/dark_green.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/trade_count/dark_green.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/trade_count/dark_green.mcfunction index f6849ff..108d3d7 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/trade_count/dark_green.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/trade_count/dark_green.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/trade_count +# 调用者：#fz:module/scoreboard/display/set_text/trade_count -scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "dark_green"} +data modify storage fz:module fz.scoreboard.text.trade_count set value '{"text": "交易榜", "color": "dark_green"}' scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.trade_count +scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "dark_green"} team modify fz.module.scoreboard.display.trade_count color dark_green team modify fz.module.scoreboard.display.trade_count displayName {"text": "交易榜", "color": "dark_green"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/trade_count/dark_purple.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/trade_count/dark_purple.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/trade_count/dark_purple.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/trade_count/dark_purple.mcfunction index 89b21f2..2a0e4aa 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/trade_count/dark_purple.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/trade_count/dark_purple.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/trade_count +# 调用者：#fz:module/scoreboard/display/set_text/trade_count -scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "dark_purple"} +data modify storage fz:module fz.scoreboard.text.trade_count set value '{"text": "交易榜", "color": "dark_purple"}' scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.trade_count +scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "dark_purple"} team modify fz.module.scoreboard.display.trade_count color dark_purple team modify fz.module.scoreboard.display.trade_count displayName {"text": "交易榜", "color": "dark_purple"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/trade_count/dark_red.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/trade_count/dark_red.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/trade_count/dark_red.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/trade_count/dark_red.mcfunction index 9e4931a..2af9cd3 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/trade_count/dark_red.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/trade_count/dark_red.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/trade_count +# 调用者：#fz:module/scoreboard/display/set_text/trade_count -scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "dark_red"} +data modify storage fz:module fz.scoreboard.text.trade_count set value '{"text": "交易榜", "color": "dark_red"}' scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.trade_count +scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "dark_red"} team modify fz.module.scoreboard.display.trade_count color dark_red team modify fz.module.scoreboard.display.trade_count displayName {"text": "交易榜", "color": "dark_red"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/trade_count/gold.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/trade_count/gold.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/trade_count/gold.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/trade_count/gold.mcfunction index 94926dc..0403a5e 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/trade_count/gold.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/trade_count/gold.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/trade_count +# 调用者：#fz:module/scoreboard/display/set_text/trade_count -scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "gold"} +data modify storage fz:module fz.scoreboard.text.trade_count set value '{"text": "交易榜", "color": "gold"}' scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.trade_count +scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "gold"} team modify fz.module.scoreboard.display.trade_count color gold team modify fz.module.scoreboard.display.trade_count displayName {"text": "交易榜", "color": "gold"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/trade_count/gray.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/trade_count/gray.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/trade_count/gray.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/trade_count/gray.mcfunction index 9aa8287..7b3d932 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/trade_count/gray.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/trade_count/gray.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/trade_count +# 调用者：#fz:module/scoreboard/display/set_text/trade_count -scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "gray"} +data modify storage fz:module fz.scoreboard.text.trade_count set value '{"text": "交易榜", "color": "gray"}' scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.trade_count +scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "gray"} team modify fz.module.scoreboard.display.trade_count color gray team modify fz.module.scoreboard.display.trade_count displayName {"text": "交易榜", "color": "gray"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/trade_count/green.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/trade_count/green.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/trade_count/green.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/trade_count/green.mcfunction index 2a5354c..bfab079 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/trade_count/green.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/trade_count/green.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/trade_count +# 调用者：#fz:module/scoreboard/display/set_text/trade_count -scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "green"} +data modify storage fz:module fz.scoreboard.text.trade_count set value '{"text": "交易榜", "color": "green"}' scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.trade_count +scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "green"} team modify fz.module.scoreboard.display.trade_count color green team modify fz.module.scoreboard.display.trade_count displayName {"text": "交易榜", "color": "green"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/trade_count/light_purple.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/trade_count/light_purple.mcfunction similarity index 68% rename from data/fz/functions/module/scoreboard/display/set_color/trade_count/light_purple.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/trade_count/light_purple.mcfunction index c95ee97..2778f2d 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/trade_count/light_purple.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/trade_count/light_purple.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/trade_count +# 调用者：#fz:module/scoreboard/display/set_text/trade_count -scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "light_purple"} +data modify storage fz:module fz.scoreboard.text.trade_count set value '{"text": "交易榜", "color": "light_purple"}' scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.trade_count +scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "light_purple"} team modify fz.module.scoreboard.display.trade_count color light_purple team modify fz.module.scoreboard.display.trade_count displayName {"text": "交易榜", "color": "light_purple"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/trade_count/red.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/trade_count/red.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/trade_count/red.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/trade_count/red.mcfunction index 3b6ef40..2eb72ef 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/trade_count/red.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/trade_count/red.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/trade_count +# 调用者：#fz:module/scoreboard/display/set_text/trade_count -scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "red"} +data modify storage fz:module fz.scoreboard.text.trade_count set value '{"text": "交易榜", "color": "red"}' scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.trade_count +scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "red"} team modify fz.module.scoreboard.display.trade_count color red team modify fz.module.scoreboard.display.trade_count displayName {"text": "交易榜", "color": "red"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/trade_count/white.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/trade_count/white.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/trade_count/white.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/trade_count/white.mcfunction index 8d4a7d1..2d17ff9 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/trade_count/white.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/trade_count/white.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/trade_count +# 调用者：#fz:module/scoreboard/display/set_text/trade_count -scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "white"} +data modify storage fz:module fz.scoreboard.text.trade_count set value '{"text": "交易榜", "color": "white"}' scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.trade_count +scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "white"} team modify fz.module.scoreboard.display.trade_count color white team modify fz.module.scoreboard.display.trade_count displayName {"text": "交易榜", "color": "white"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_color/trade_count/yellow.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/trade_count/yellow.mcfunction similarity index 67% rename from data/fz/functions/module/scoreboard/display/set_color/trade_count/yellow.mcfunction rename to data/fz/functions/module/scoreboard/display/set_text/trade_count/yellow.mcfunction index 59f9e98..52e6a30 100644 --- a/data/fz/functions/module/scoreboard/display/set_color/trade_count/yellow.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/trade_count/yellow.mcfunction @@ -1,6 +1,7 @@ -# 调用者：#fz:module/scoreboard/display/set_color/trade_count +# 调用者：#fz:module/scoreboard/display/set_text/trade_count -scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "yellow"} +data modify storage fz:module fz.scoreboard.text.trade_count set value '{"text": "交易榜", "color": "yellow"}' scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.trade_count +scoreboard objectives modify fz.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "yellow"} team modify fz.module.scoreboard.display.trade_count color yellow team modify fz.module.scoreboard.display.trade_count displayName {"text": "交易榜", "color": "yellow"} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/install.mcfunction b/data/fz/functions/module/scoreboard/install.mcfunction index 9b508d5..356f164 100644 --- a/data/fz/functions/module/scoreboard/install.mcfunction +++ b/data/fz/functions/module/scoreboard/install.mcfunction @@ -18,7 +18,7 @@ team add fz.module.scoreboard.display.activation scoreboard objectives add fz.module.scoreboard.display.aviating_distance dummy team add fz.module.scoreboard.display.aviating_distance -### 受伤害榜 +### 抖M榜 scoreboard objectives add fz.module.scoreboard.display.damage_taken dummy team add fz.module.scoreboard.display.damage_taken @@ -45,5 +45,8 @@ team add fz.module.scoreboard.display.trade_count ### 放置榜 ##### scoreboard objectives add fz.module.scoreboard.placement_count 需要穷举，暂不考虑 -# 标记为已安装 +## 标记为已安装 data modify storage fz:install_manager fz.module.scoreboard set value 1b + +## 日志 +execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "已安装组件：计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/load.mcfunction b/data/fz/functions/module/scoreboard/load.mcfunction index 125fb50..21ba271 100644 --- a/data/fz/functions/module/scoreboard/load.mcfunction +++ b/data/fz/functions/module/scoreboard/load.mcfunction @@ -1,10 +1,25 @@ # 调用者：#fz:module/scoreboard/load ## 异常检测 -execute unless data storage fz:install_manager fz.module{scoreboard: 1b} run tellraw @a [{"nbt": "fz.exception.load_without_install_exception", "interpret": true, "storage": "fz:logger"}, {"text": "计分板"}] +execute unless data storage fz:install_manager fz.module{scoreboard: 1b} if score fz.logger.level fz.variable.integer matches ..800 run tellraw @a [{"nbt": "fz.exception.load_without_install_exception", "interpret": true, "storage": "fz:logger"}, {"text": "计分板"}] -## 设置显示颜色 -function #fz:module/scoreboard/display/set_all_colors +## 设置颜色和名称 +function #fz:module/scoreboard/display/set_text/set_all + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "计分板显示文本已设为："}] +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"text": "", "color": "green"}, {"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "fz.module.scoreboard.display.general - "}, {"nbt": "fz.scoreboard.text.general", "interpret": true, "storage": "fz:module"}] +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"text": "", "color": "green"}, {"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "fz.module.scoreboard.display.activation - "}, {"nbt": "fz.scoreboard.text.activation", "interpret": true, "storage": "fz:module"}] +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"text": "", "color": "green"}, {"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "fz.module.scoreboard.display.aviating_distance - "}, {"nbt": "fz.scoreboard.text.aviating_distance", "interpret": true, "storage": "fz:module"}] +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"text": "", "color": "green"}, {"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "fz.module.scoreboard.display.damage_taken - "}, {"nbt": "fz.scoreboard.text.damage_taken", "interpret": true, "storage": "fz:module"}] +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"text": "", "color": "green"}, {"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "fz.module.scoreboard.display.death_count - "}, {"nbt": "fz.scoreboard.text.death_count", "interpret": true, "storage": "fz:module"}] +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"text": "", "color": "green"}, {"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "fz.module.scoreboard.display.dig_count - "}, {"nbt": "fz.scoreboard.text.dig_count", "interpret": true, "storage": "fz:module"}] +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"text": "", "color": "green"}, {"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "fz.module.scoreboard.display.fishing_count - "}, {"nbt": "fz.scoreboard.text.fishing_count", "interpret": true, "storage": "fz:module"}] +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"text": "", "color": "green"}, {"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "fz.module.scoreboard.display.kill_count - "}, {"nbt": "fz.scoreboard.text.kill_count", "interpret": true, "storage": "fz:module"}] +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"text": "", "color": "green"}, {"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "fz.module.scoreboard.display.trade_count - "}, {"nbt": "fz.scoreboard.text.trade_count", "interpret": true, "storage": "fz:module"}] ## 开启轮播循环 -function #fz:module/scoreboard/display/carousel_controller/loop \ No newline at end of file +function fz:module/scoreboard/display/carousel_controller/loop + +## 日志 +execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "已加载组件：计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/uninstall.mcfunction b/data/fz/functions/module/scoreboard/uninstall.mcfunction index f5ca309..f55db69 100644 --- a/data/fz/functions/module/scoreboard/uninstall.mcfunction +++ b/data/fz/functions/module/scoreboard/uninstall.mcfunction @@ -25,11 +25,11 @@ team remove fz.module.scoreboard.display.kill_count ### 交易榜 team remove fz.module.scoreboard.display.trade_count -## 日志 -tellraw @a [{"nbt": "level.info", "interpret": true, "storage": "fz:logger"}, {"text": "计分板已卸载！"}] - ## 询问是否清除数据 -tellraw @s [{"nbt": "level.warn", "interpret": true, "storage": "fz:logger"}, {"text": "您要删除计分板数据吗，它将会永久失去！(真的很久！)"}, {"text": "[确定]","clickEvent": {"action": "run_command", "value": "/function #fz:module/scoreboard/clear_data"}, "hoverEvent": {"action": "show_text", "contents": {"text": "删除计分板，它将会永久失去！(真的很久！)", "color": "red"}}}] +execute if score fz.logger.level fz.variable.integer matches ..600 run tellraw @s [{"nbt": "fz.level.alert", "interpret": true, "storage": "fz:logger"}, {"text": "您要删除计分板数据吗，它将会永久失去！(真的很久！)"}, {"text": "[确定]", "color": "dark_red", "clickEvent": {"action": "suggest_command", "value": "/function #fz:module/scoreboard/clear_data"}, "hoverEvent": {"action": "show_text", "contents": {"text": "将命令填入聊天框"}}}] -# 标记为已卸载 +## 标记为已卸载 data modify storage fz:install_manager fz.module.scoreboard set value 0b + +## 日志 +execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "已卸载组件：计分板"}] \ No newline at end of file diff --git a/data/fz/functions/uninstall.mcfunction b/data/fz/functions/uninstall.mcfunction index 68b02e4..2a9de20 100644 --- a/data/fz/functions/uninstall.mcfunction +++ b/data/fz/functions/uninstall.mcfunction @@ -5,10 +5,10 @@ function #fz:module/uninstall ## 整数类型 scoreboard objectives remove fz.variable.integer -function #fz:event/uninstall - -## 卸载日志，为避免扩展数据包在卸载时无法使用日志，故延迟1tick卸载 -schedule function #fz:logger/uninstall 1t replace +function #fz:logger/uninstall ## 标记为已卸载 -data modify storage fz:install_manager fz.global set value 0b \ No newline at end of file +data modify storage fz:install_manager fz.global set value 0b + +## 日志 +execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "卸载完成！"}] \ No newline at end of file diff --git a/data/fz/tags/functions/event/install.json b/data/fz/tags/functions/event/init.json similarity index 63% rename from data/fz/tags/functions/event/install.json rename to data/fz/tags/functions/event/init.json index d53b1c2..04496e5 100644 --- a/data/fz/tags/functions/event/install.json +++ b/data/fz/tags/functions/event/init.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "fz:event/install" + "fz:event/init" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/logger/install.json b/data/fz/tags/functions/init.json similarity index 62% rename from data/fz/tags/functions/logger/install.json rename to data/fz/tags/functions/init.json index 16a724b..8db0474 100644 --- a/data/fz/tags/functions/logger/install.json +++ b/data/fz/tags/functions/init.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "fz:logger/install" + "fz:init" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/logger/clear_data.json b/data/fz/tags/functions/logger/clear_data.json new file mode 100644 index 0000000..5c8ef16 --- /dev/null +++ b/data/fz/tags/functions/logger/clear_data.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:logger/clear_data" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/event/uninstall.json b/data/fz/tags/functions/logger/init.json similarity index 61% rename from data/fz/tags/functions/event/uninstall.json rename to data/fz/tags/functions/logger/init.json index 96a9f4b..dd432eb 100644 --- a/data/fz/tags/functions/event/uninstall.json +++ b/data/fz/tags/functions/logger/init.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "fz:event/uninstall" + "fz:logger/init" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/carousel_controller/loop.json b/data/fz/tags/functions/module/scoreboard/display/carousel_controller/loop.json deleted file mode 100644 index 04f67e8..0000000 --- a/data/fz/tags/functions/module/scoreboard/display/carousel_controller/loop.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "__comment": "调用者：fz:module/scoreboard/load", - "__comment_replace": "编写扩展数据包时必须开启覆盖！", - "replace": true, - "__comment_values": "此处只能填入一个函数！", - "values": [ - "fz:module/scoreboard/display/carousel_controller/loop" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_all_colors.json b/data/fz/tags/functions/module/scoreboard/display/set_all_colors.json deleted file mode 100644 index c4e0c10..0000000 --- a/data/fz/tags/functions/module/scoreboard/display/set_all_colors.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "__comments": [ - "调用者：fz:module/scoreboard/load", - "用于在安装或加载时指定计分板颜色，不同计分板不得使用同一颜色！", - "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" - ], - "__comment_replace": "编写扩展数据包时必须为false", - "replace": false, - "values": [ - "#fz:module/scoreboard/display/set_color/carousel", - "#fz:module/scoreboard/display/set_color/activation", - "#fz:module/scoreboard/display/set_color/aviating_distance", - "#fz:module/scoreboard/display/set_color/damage_taken", - "#fz:module/scoreboard/display/set_color/death_count", - "#fz:module/scoreboard/display/set_color/dig_count", - "#fz:module/scoreboard/display/set_color/fishing_count", - "#fz:module/scoreboard/display/set_color/general", - "#fz:module/scoreboard/display/set_color/kill_count", - "#fz:module/scoreboard/display/set_color/trade_count" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_color/aviating_distance.json b/data/fz/tags/functions/module/scoreboard/display/set_color/aviating_distance.json deleted file mode 100644 index 36c36b7..0000000 --- a/data/fz/tags/functions/module/scoreboard/display/set_color/aviating_distance.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "__comments": [ - "调用者：#fz:module/scoreboard/display/set_all_colors", - "用于在安装或加载时指定计分板颜色，不同计分板不得使用同一颜色！", - "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" - ], - "__comment_replace": "编写扩展数据包时必须为true", - "replace": false, - "__comment_values": "此处只能填入一个函数！", - "values": [ - "fz:module/scoreboard/display/set_color/aviating_distance/light_purple" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_color/death_count.json b/data/fz/tags/functions/module/scoreboard/display/set_color/death_count.json deleted file mode 100644 index 7ee74f9..0000000 --- a/data/fz/tags/functions/module/scoreboard/display/set_color/death_count.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "__comments": [ - "调用者：#fz:module/scoreboard/display/set_all_colors", - "用于在安装或加载时指定计分板颜色，不同计分板不得使用同一颜色！", - "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" - ], - "__comment_replace": "编写扩展数据包时必须为true", - "replace": false, - "__comment_values": "此处只能填入一个函数！", - "values": [ - "fz:module/scoreboard/display/set_color/death_count/dark_red" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_color/fishing_count.json b/data/fz/tags/functions/module/scoreboard/display/set_color/fishing_count.json deleted file mode 100644 index ac27a9d..0000000 --- a/data/fz/tags/functions/module/scoreboard/display/set_color/fishing_count.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "__comments": [ - "调用者：#fz:module/scoreboard/display/set_all_colors", - "用于在安装或加载时指定计分板颜色，不同计分板不得使用同一颜色！", - "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" - ], - "__comment_replace": "编写扩展数据包时必须为true", - "replace": false, - "__comment_values": "此处只能填入一个函数！", - "values": [ - "fz:module/scoreboard/display/set_color/fishing_count/blue" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_color/general.json b/data/fz/tags/functions/module/scoreboard/display/set_color/general.json deleted file mode 100644 index 9c136c2..0000000 --- a/data/fz/tags/functions/module/scoreboard/display/set_color/general.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "__comments": [ - "调用者：#fz:module/scoreboard/display/set_all_colors", - "用于在安装或加载时指定计分板颜色，不同计分板不得使用同一颜色！", - "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" - ], - "__comment_replace": "编写扩展数据包时必须为true", - "replace": false, - "__comment_values": "此处只能填入一个函数！", - "values": [ - "fz:module/scoreboard/display/set_color/general/dark_aqua" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_color/trade_count.json b/data/fz/tags/functions/module/scoreboard/display/set_color/trade_count.json deleted file mode 100644 index 28ac004..0000000 --- a/data/fz/tags/functions/module/scoreboard/display/set_color/trade_count.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "__comments": [ - "调用者：#fz:module/scoreboard/display/set_all_colors", - "用于在安装或加载时指定计分板颜色，不同计分板不得使用同一颜色！", - "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" - ], - "__comment_replace": "编写扩展数据包时必须为true", - "replace": false, - "__comment_values": "此处只能填入一个函数！", - "values": [ - "fz:module/scoreboard/display/set_color/trade_count/green" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_color/activation.json b/data/fz/tags/functions/module/scoreboard/display/set_text/activation.json similarity index 53% rename from data/fz/tags/functions/module/scoreboard/display/set_color/activation.json rename to data/fz/tags/functions/module/scoreboard/display/set_text/activation.json index 3e163a9..1979879 100644 --- a/data/fz/tags/functions/module/scoreboard/display/set_color/activation.json +++ b/data/fz/tags/functions/module/scoreboard/display/set_text/activation.json @@ -1,13 +1,13 @@ { "__comments": [ - "调用者：#fz:module/scoreboard/display/set_all_colors", - "用于在安装或加载时指定计分板颜色，不同计分板不得使用同一颜色！", + "调用者：#fz:module/scoreboard/display/set_text/store_all", + "用于在加载时储存计分板颜色，不同计分板不得使用同一颜色！", "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" ], "__comment_replace": "编写扩展数据包时必须为true", "replace": false, "__comment_values": "此处只能填入一个函数！", "values": [ - "fz:module/scoreboard/display/set_color/activation/aqua" + "fz:module/scoreboard/display/set_text/activation/aqua" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_color/damage_taken.json b/data/fz/tags/functions/module/scoreboard/display/set_text/aviating_distance.json similarity index 53% rename from data/fz/tags/functions/module/scoreboard/display/set_color/damage_taken.json rename to data/fz/tags/functions/module/scoreboard/display/set_text/aviating_distance.json index ab38f3f..28d27a1 100644 --- a/data/fz/tags/functions/module/scoreboard/display/set_color/damage_taken.json +++ b/data/fz/tags/functions/module/scoreboard/display/set_text/aviating_distance.json @@ -1,13 +1,13 @@ { "__comments": [ - "调用者：#fz:module/scoreboard/display/set_all_colors", - "用于在安装或加载时指定计分板颜色，不同计分板不得使用同一颜色！", + "调用者：#fz:module/scoreboard/display/set_text/store_all", + "用于在加载时储存计分板颜色，不同计分板不得使用同一颜色！", "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" ], "__comment_replace": "编写扩展数据包时必须为true", "replace": false, "__comment_values": "此处只能填入一个函数！", "values": [ - "fz:module/scoreboard/display/set_color/damage_taken/yellow" + "fz:module/scoreboard/display/set_text/aviating_distance/light_purple" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_color/carousel.json b/data/fz/tags/functions/module/scoreboard/display/set_text/carousel.json similarity index 54% rename from data/fz/tags/functions/module/scoreboard/display/set_color/carousel.json rename to data/fz/tags/functions/module/scoreboard/display/set_text/carousel.json index 53cb700..bc88e8f 100644 --- a/data/fz/tags/functions/module/scoreboard/display/set_color/carousel.json +++ b/data/fz/tags/functions/module/scoreboard/display/set_text/carousel.json @@ -1,13 +1,13 @@ { "__comments": [ - "调用者：#fz:module/scoreboard/display/set_all_colors", - "用于在安装或加载时指定计分板颜色，不同计分板不得使用同一颜色！", + "调用者：#fz:module/scoreboard/display/set_text/store_all", + "用于在加载时储存计分板颜色，不同计分板不得使用同一颜色！", "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" ], "__comment_replace": "编写扩展数据包时必须为true", "replace": false, "__comment_values": "此处只能填入一个函数！", "values": [ - "fz:module/scoreboard/display/set_color/carousel/gold" + "fz:module/scoreboard/display/set_text/carousel/gold" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_text/damage_taken.json b/data/fz/tags/functions/module/scoreboard/display/set_text/damage_taken.json new file mode 100644 index 0000000..3286a36 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/display/set_text/damage_taken.json @@ -0,0 +1,13 @@ +{ + "__comments": [ + "调用者：#fz:module/scoreboard/display/set_text/store_all", + "用于在加载时储存计分板颜色，不同计分板不得使用同一颜色！", + "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" + ], + "__comment_replace": "编写扩展数据包时必须为true", + "replace": false, + "__comment_values": "此处只能填入一个函数！", + "values": [ + "fz:module/scoreboard/display/set_text/damage_taken/yellow" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_text/death_count.json b/data/fz/tags/functions/module/scoreboard/display/set_text/death_count.json new file mode 100644 index 0000000..a1d4f98 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/display/set_text/death_count.json @@ -0,0 +1,13 @@ +{ + "__comments": [ + "调用者：#fz:module/scoreboard/display/set_text/store_all", + "用于在加载时储存计分板颜色，不同计分板不得使用同一颜色！", + "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" + ], + "__comment_replace": "编写扩展数据包时必须为true", + "replace": false, + "__comment_values": "此处只能填入一个函数！", + "values": [ + "fz:module/scoreboard/display/set_text/death_count/dark_red" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_color/dig_count.json b/data/fz/tags/functions/module/scoreboard/display/set_text/dig_count.json similarity index 54% rename from data/fz/tags/functions/module/scoreboard/display/set_color/dig_count.json rename to data/fz/tags/functions/module/scoreboard/display/set_text/dig_count.json index b8504a2..9aedc5b 100644 --- a/data/fz/tags/functions/module/scoreboard/display/set_color/dig_count.json +++ b/data/fz/tags/functions/module/scoreboard/display/set_text/dig_count.json @@ -1,13 +1,13 @@ { "__comments": [ - "调用者：#fz:module/scoreboard/display/set_all_colors", - "用于在安装或加载时指定计分板颜色，不同计分板不得使用同一颜色！", + "调用者：#fz:module/scoreboard/display/set_text/store_all", + "用于在加载时储存计分板颜色，不同计分板不得使用同一颜色！", "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" ], "__comment_replace": "编写扩展数据包时必须为true", "replace": false, "__comment_values": "此处只能填入一个函数！", "values": [ - "fz:module/scoreboard/display/set_color/dig_count/gray" + "fz:module/scoreboard/display/set_text/dig_count/gray" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_text/fishing_count.json b/data/fz/tags/functions/module/scoreboard/display/set_text/fishing_count.json new file mode 100644 index 0000000..9cb383e --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/display/set_text/fishing_count.json @@ -0,0 +1,13 @@ +{ + "__comments": [ + "调用者：#fz:module/scoreboard/display/set_text/store_all", + "用于在加载时储存计分板颜色，不同计分板不得使用同一颜色！", + "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" + ], + "__comment_replace": "编写扩展数据包时必须为true", + "replace": false, + "__comment_values": "此处只能填入一个函数！", + "values": [ + "fz:module/scoreboard/display/set_text/fishing_count/blue" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_text/general.json b/data/fz/tags/functions/module/scoreboard/display/set_text/general.json new file mode 100644 index 0000000..2c5952d --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/display/set_text/general.json @@ -0,0 +1,13 @@ +{ + "__comments": [ + "调用者：#fz:module/scoreboard/display/set_text/store_all", + "用于在加载时储存计分板颜色，不同计分板不得使用同一颜色！", + "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" + ], + "__comment_replace": "编写扩展数据包时必须为true", + "replace": false, + "__comment_values": "此处只能填入一个函数！", + "values": [ + "fz:module/scoreboard/display/set_text/general/dark_aqua" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_color/kill_count.json b/data/fz/tags/functions/module/scoreboard/display/set_text/kill_count.json similarity index 54% rename from data/fz/tags/functions/module/scoreboard/display/set_color/kill_count.json rename to data/fz/tags/functions/module/scoreboard/display/set_text/kill_count.json index e15ef10..63c1222 100644 --- a/data/fz/tags/functions/module/scoreboard/display/set_color/kill_count.json +++ b/data/fz/tags/functions/module/scoreboard/display/set_text/kill_count.json @@ -1,13 +1,13 @@ { "__comments": [ - "调用者：#fz:module/scoreboard/display/set_all_colors", - "用于在安装或加载时指定计分板颜色，不同计分板不得使用同一颜色！", + "调用者：#fz:module/scoreboard/display/set_text/store_all", + "用于在加载时储存计分板颜色，不同计分板不得使用同一颜色！", "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" ], "__comment_replace": "编写扩展数据包时必须为true", "replace": false, "__comment_values": "此处只能填入一个函数！", "values": [ - "fz:module/scoreboard/display/set_color/kill_count/red" + "fz:module/scoreboard/display/set_text/kill_count/red" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_text/set_all.json b/data/fz/tags/functions/module/scoreboard/display/set_text/set_all.json new file mode 100644 index 0000000..b656fff --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/display/set_text/set_all.json @@ -0,0 +1,20 @@ +{ + "__comments": [ + "调用者：fz:module/scoreboard/load", + "用于在加载时储存计分板颜色，不同计分板不得使用同一颜色！", + "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" + ], + "replace": false, + "values": [ + "#fz:module/scoreboard/display/set_text/carousel", + "#fz:module/scoreboard/display/set_text/activation", + "#fz:module/scoreboard/display/set_text/aviating_distance", + "#fz:module/scoreboard/display/set_text/damage_taken", + "#fz:module/scoreboard/display/set_text/death_count", + "#fz:module/scoreboard/display/set_text/dig_count", + "#fz:module/scoreboard/display/set_text/fishing_count", + "#fz:module/scoreboard/display/set_text/general", + "#fz:module/scoreboard/display/set_text/kill_count", + "#fz:module/scoreboard/display/set_text/trade_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_text/trade_count.json b/data/fz/tags/functions/module/scoreboard/display/set_text/trade_count.json new file mode 100644 index 0000000..2c99a51 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/display/set_text/trade_count.json @@ -0,0 +1,13 @@ +{ + "__comments": [ + "调用者：#fz:module/scoreboard/display/set_text/store_all", + "用于在加载时储存计分板颜色，不同计分板不得使用同一颜色！", + "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" + ], + "__comment_replace": "编写扩展数据包时必须为true", + "replace": false, + "__comment_values": "此处只能填入一个函数！", + "values": [ + "fz:module/scoreboard/display/set_text/trade_count/green" + ] +} \ No newline at end of file