From 7bdae8271e3c51e60df9a51e34bd7b523033d00c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BB=B6=E7=9A=93?= <1214946206@qq.com> Date: Fri, 2 Sep 2022 05:24:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E7=A0=B4=E5=9F=BA=E5=B2=A9?= =?UTF-8?q?=E6=A6=9C=E5=88=B0=E4=B8=BB=E6=95=B0=E6=8D=AE=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../advancements/broke_bedrock.json | 24 +++++++++++++++ .../functions/assign/bbl.mcfunction | 5 ++++ .../functions/assign/general.mcfunction | 5 ++++ .../functions/clear_data.mcfunction | 3 ++ .../display/carousel/set_display.mcfunction | 21 +++++++++++++ .../display/carousel/try_display.mcfunction | 2 ++ .../functions/display/register_id.mcfunction | 6 ++++ .../display/set_text/aqua.mcfunction | 7 +++++ .../display/set_text/black.mcfunction | 7 +++++ .../display/set_text/blue.mcfunction | 7 +++++ .../display/set_text/dark_aqua.mcfunction | 7 +++++ .../display/set_text/dark_blue.mcfunction | 7 +++++ .../display/set_text/dark_gray.mcfunction | 7 +++++ .../display/set_text/dark_green.mcfunction | 7 +++++ .../display/set_text/dark_purple.mcfunction | 7 +++++ .../display/set_text/dark_red.mcfunction | 7 +++++ .../display/set_text/gold.mcfunction | 7 +++++ .../display/set_text/gray.mcfunction | 7 +++++ .../display/set_text/green.mcfunction | 7 +++++ .../display/set_text/light_purple.mcfunction | 7 +++++ .../functions/display/set_text/red.mcfunction | 7 +++++ .../display/set_text/white.mcfunction | 7 +++++ .../display/set_text/yellow.mcfunction | 7 +++++ .../advancement/broke_bedrock.mcfunction | 7 +++++ .../event/player/broke_bedrock.mcfunction | 6 ++++ .../functions/install.mcfunction | 11 +++++++ .../functions/interactor/display.mcfunction | 3 ++ .../functions/interactor/on_click.mcfunction | 2 ++ .../functions/interactor/subscribe.mcfunction | 6 ++++ .../functions/try_install.mcfunction | 2 ++ .../functions/uninstall.mcfunction | 8 +++++ .../tags/functions/display/set_text.json | 6 ++++ .../tags/functions/event/broke_bedrock.json | 7 +++++ .../scoreboard/display/register_id.mcfunction | 30 +++++++++++++++---- .../set_text/activation/black.mcfunction | 6 ++-- .../aviating_distance/black.mcfunction | 6 ++-- .../set_text/carousel/black.mcfunction | 4 +-- .../set_text/damage_taken/black.mcfunction | 6 ++-- .../set_text/death_count/black.mcfunction | 6 ++-- .../set_text/dig_count/black.mcfunction | 6 ++-- .../set_text/fishing_count/black.mcfunction | 6 ++-- .../display/set_text/general/black.mcfunction | 6 ++-- .../set_text/kill_count/black.mcfunction | 6 ++-- .../set_text/placement_count/black.mcfunction | 6 ++-- .../set_text/trade_count/black.mcfunction | 6 ++-- .../scoreboard/interactor/display.mcfunction | 2 +- .../scoreboard/interactor/on_click.mcfunction | 3 +- data/fzsd/tags/functions/deep_uninstall.json | 2 +- .../general/bedrock_broke_count.json | 7 +++++ .../module/scoreboard/clear_data.json | 3 +- .../display/carousel/try_display.json | 3 +- .../scoreboard/display/register_id.json | 4 ++- .../module/scoreboard/display/set_text.json | 5 ++-- .../display/set_text/placement_count.json | 2 +- .../functions/module/scoreboard/install.json | 3 +- .../module/scoreboard/interactor/display.json | 3 +- .../scoreboard/interactor/on_click.json | 3 +- .../functions/module/scoreboard/load.json | 4 +-- .../module/scoreboard/uninstall.json | 3 +- scripts/fzsd_score.sc | 1 + 60 files changed, 326 insertions(+), 52 deletions(-) create mode 100644 data/fzsd.extra.bbl/advancements/broke_bedrock.json create mode 100644 data/fzsd.extra.bbl/functions/assign/bbl.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/assign/general.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/clear_data.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/display/carousel/set_display.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/display/carousel/try_display.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/display/register_id.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/display/set_text/aqua.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/display/set_text/black.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/display/set_text/blue.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/display/set_text/dark_aqua.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/display/set_text/dark_blue.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/display/set_text/dark_gray.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/display/set_text/dark_green.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/display/set_text/dark_purple.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/display/set_text/dark_red.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/display/set_text/gold.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/display/set_text/gray.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/display/set_text/green.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/display/set_text/light_purple.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/display/set_text/red.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/display/set_text/white.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/display/set_text/yellow.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/event/advancement/broke_bedrock.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/event/player/broke_bedrock.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/install.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/interactor/display.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/interactor/on_click.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/interactor/subscribe.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/try_install.mcfunction create mode 100644 data/fzsd.extra.bbl/functions/uninstall.mcfunction create mode 100644 data/fzsd.extra.bbl/tags/functions/display/set_text.json create mode 100644 data/fzsd.extra.bbl/tags/functions/event/broke_bedrock.json create mode 100644 data/fzsd/tags/functions/module/scoreboard/assign/scoreboard/general/bedrock_broke_count.json diff --git a/data/fzsd.extra.bbl/advancements/broke_bedrock.json b/data/fzsd.extra.bbl/advancements/broke_bedrock.json new file mode 100644 index 0000000..73c2bcd --- /dev/null +++ b/data/fzsd.extra.bbl/advancements/broke_bedrock.json @@ -0,0 +1,24 @@ +{ + "parent": "fzsd:game_event", + "criteria": { + "broke_bedrock": { + "trigger": "minecraft:tick", + "conditions": { + "player": [ + { + "condition": "minecraft:entity_scores", + "entity": "this", + "scores": { + "fzsd.extra.bbl": { + "min": 1 + } + } + } + ] + } + } + }, + "rewards": { + "function": "fzsd.extra.bbl:event/advancement/broke_bedrock" + } +} \ No newline at end of file diff --git a/data/fzsd.extra.bbl/functions/assign/bbl.mcfunction b/data/fzsd.extra.bbl/functions/assign/bbl.mcfunction new file mode 100644 index 0000000..c8b81a6 --- /dev/null +++ b/data/fzsd.extra.bbl/functions/assign/bbl.mcfunction @@ -0,0 +1,5 @@ +# 见#fzsd.extra.bbl:event/broke_bedrock +## 如果运行时id不存在则注册运行时id +execute unless score fzsd.module.scoreboard.display.bedrock_broke_count.id fzsd.variable.integer matches 0.. run function fzsd.extra.bbl:display/register_id +scoreboard players operation @s fzsd.module.scoreboard.display.bedrock_broke_count += fzsd.var.score fzsd.variable.integer +scoreboard players operation fzsd.module.scoreboard.total.bedrock_broke_count fzsd.module.scoreboard.assign.general += fzsd.var.score fzsd.variable.integer diff --git a/data/fzsd.extra.bbl/functions/assign/general.mcfunction b/data/fzsd.extra.bbl/functions/assign/general.mcfunction new file mode 100644 index 0000000..3cc7e13 --- /dev/null +++ b/data/fzsd.extra.bbl/functions/assign/general.mcfunction @@ -0,0 +1,5 @@ +# 见#fzsd.extra.bbl:event/broke_bedrock +team join fzsd.module.scoreboard.display.bedrock_broke_count 总破基岩数 + +scoreboard players operation 总破基岩数 fzsd.module.scoreboard.display.general = fzsd.module.scoreboard.total.bedrock_broke_count fzsd.module.scoreboard.assign.general +scoreboard players operation 总破基岩数 fzsd.module.scoreboard.display.bedrock_broke_count = fzsd.module.scoreboard.total.bedrock_broke_count fzsd.module.scoreboard.assign.general \ No newline at end of file diff --git a/data/fzsd.extra.bbl/functions/clear_data.mcfunction b/data/fzsd.extra.bbl/functions/clear_data.mcfunction new file mode 100644 index 0000000..3016fc4 --- /dev/null +++ b/data/fzsd.extra.bbl/functions/clear_data.mcfunction @@ -0,0 +1,3 @@ +# 见#fzsd:module/scoreboard/clear_data +## 清除数据 +scoreboard objectives remove fzsd.module.scoreboard.display.bedrock_broke_count \ No newline at end of file diff --git a/data/fzsd.extra.bbl/functions/display/carousel/set_display.mcfunction b/data/fzsd.extra.bbl/functions/display/carousel/set_display.mcfunction new file mode 100644 index 0000000..1e9f73e --- /dev/null +++ b/data/fzsd.extra.bbl/functions/display/carousel/set_display.mcfunction @@ -0,0 +1,21 @@ +# 见./try_display +## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.bedrock_broke_count +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fzsd.module.scoreboard.display.bedrock_broke_count +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fzsd.module.scoreboard.display.bedrock_broke_count +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fzsd.module.scoreboard.display.bedrock_broke_count +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fzsd.module.scoreboard.display.bedrock_broke_count +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fzsd.module.scoreboard.display.bedrock_broke_count +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.bedrock_broke_count +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fzsd.module.scoreboard.display.bedrock_broke_count +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fzsd.module.scoreboard.display.bedrock_broke_count +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fzsd.module.scoreboard.display.bedrock_broke_count +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 10 run scoreboard objectives setdisplay sidebar.team.green fzsd.module.scoreboard.display.bedrock_broke_count +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 11 run scoreboard objectives setdisplay sidebar.team.aqua fzsd.module.scoreboard.display.bedrock_broke_count +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 12 run scoreboard objectives setdisplay sidebar.team.red fzsd.module.scoreboard.display.bedrock_broke_count +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fzsd.module.scoreboard.display.bedrock_broke_count +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fzsd.module.scoreboard.display.bedrock_broke_count +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fzsd.module.scoreboard.display.bedrock_broke_count + +## 详细 +execute if score fzsd.logger.level fzsd.variable.integer matches ..300 run tellraw @a [{"nbt": "fzsd.level.fine", "interpret": true, "storage": "fzsd:logger"}, {"text": "已为队伍"}, {"nbt": "fzsd.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}, {"text": "显示"}, {"nbt": "text", "interpret": true, "storage": "fzsd.extra.bbl:text"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fzsd.extra.bbl/functions/display/carousel/try_display.mcfunction b/data/fzsd.extra.bbl/functions/display/carousel/try_display.mcfunction new file mode 100644 index 0000000..b5264b2 --- /dev/null +++ b/data/fzsd.extra.bbl/functions/display/carousel/try_display.mcfunction @@ -0,0 +1,2 @@ +# 见#fzsd:module/scoreboard/display/carousel/try_display +execute if score fzsd.module.scoreboard.display.current_id fzsd.variable.integer = fzsd.module.scoreboard.display.id.bedrock_broke_count fzsd.variable.integer run function fzsd.extra.bbl:display/carousel/set_display \ No newline at end of file diff --git a/data/fzsd.extra.bbl/functions/display/register_id.mcfunction b/data/fzsd.extra.bbl/functions/display/register_id.mcfunction new file mode 100644 index 0000000..ba2fceb --- /dev/null +++ b/data/fzsd.extra.bbl/functions/display/register_id.mcfunction @@ -0,0 +1,6 @@ +# 见#fzsd:module/scoreboard/display/register_id +#### 如果破基岩榜分数不为0，注册破基岩计分板id +execute if score fzsd.module.scoreboard.total.bedrock_broke_count fzsd.module.scoreboard.assign.general matches 1.. run function #fzsd:calculation/highest_id_add_1 +execute if score fzsd.module.scoreboard.total.bedrock_broke_count fzsd.module.scoreboard.assign.general matches 1.. run scoreboard players operation fzsd.module.scoreboard.display.id.bedrock_broke_count fzsd.variable.integer = fzsd.module.scoreboard.display.highest_id fzsd.variable.integer + +execute if score fzsd.module.scoreboard.total.bedrock_broke_count fzsd.module.scoreboard.assign.general matches 1.. if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "注册破基岩计分板id为："}, {"score": {"name": "fzsd.module.scoreboard.display.id.bedrock_broke_count", "objective": "fzsd.variable.integer"}}] \ No newline at end of file diff --git a/data/fzsd.extra.bbl/functions/display/set_text/aqua.mcfunction b/data/fzsd.extra.bbl/functions/display/set_text/aqua.mcfunction new file mode 100644 index 0000000..00b902e --- /dev/null +++ b/data/fzsd.extra.bbl/functions/display/set_text/aqua.mcfunction @@ -0,0 +1,7 @@ +# 见#fzsd.extra.bbl:display/set_text + +data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "aqua"}' +scoreboard objectives setdisplay sidebar.team.aqua fzsd.module.scoreboard.display.bedrock_broke_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "aqua"} +team modify fzsd.module.scoreboard.display.bedrock_broke_count color aqua +team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "aqua"} diff --git a/data/fzsd.extra.bbl/functions/display/set_text/black.mcfunction b/data/fzsd.extra.bbl/functions/display/set_text/black.mcfunction new file mode 100644 index 0000000..12e265b --- /dev/null +++ b/data/fzsd.extra.bbl/functions/display/set_text/black.mcfunction @@ -0,0 +1,7 @@ +# 见#fzsd.extra.bbl:display/set_text + +data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "#202020"}' +scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.bedrock_broke_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "#202020"} +team modify fzsd.module.scoreboard.display.bedrock_broke_count color black +team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "#202020"} diff --git a/data/fzsd.extra.bbl/functions/display/set_text/blue.mcfunction b/data/fzsd.extra.bbl/functions/display/set_text/blue.mcfunction new file mode 100644 index 0000000..26748fb --- /dev/null +++ b/data/fzsd.extra.bbl/functions/display/set_text/blue.mcfunction @@ -0,0 +1,7 @@ +# 见#fzsd.extra.bbl:display/set_text + +data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "blue"}' +scoreboard objectives setdisplay sidebar.team.blue fzsd.module.scoreboard.display.bedrock_broke_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "blue"} +team modify fzsd.module.scoreboard.display.bedrock_broke_count color blue +team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "blue"} diff --git a/data/fzsd.extra.bbl/functions/display/set_text/dark_aqua.mcfunction b/data/fzsd.extra.bbl/functions/display/set_text/dark_aqua.mcfunction new file mode 100644 index 0000000..41ed4f1 --- /dev/null +++ b/data/fzsd.extra.bbl/functions/display/set_text/dark_aqua.mcfunction @@ -0,0 +1,7 @@ +# 见#fzsd.extra.bbl:display/set_text + +data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "dark_aqua"}' +scoreboard objectives setdisplay sidebar.team.dark_aqua fzsd.module.scoreboard.display.bedrock_broke_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "dark_aqua"} +team modify fzsd.module.scoreboard.display.bedrock_broke_count color dark_aqua +team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "dark_aqua"} diff --git a/data/fzsd.extra.bbl/functions/display/set_text/dark_blue.mcfunction b/data/fzsd.extra.bbl/functions/display/set_text/dark_blue.mcfunction new file mode 100644 index 0000000..c612273 --- /dev/null +++ b/data/fzsd.extra.bbl/functions/display/set_text/dark_blue.mcfunction @@ -0,0 +1,7 @@ +# 见#fzsd.extra.bbl:display/set_text + +data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "dark_blue"}' +scoreboard objectives setdisplay sidebar.team.dark_blue fzsd.module.scoreboard.display.bedrock_broke_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "dark_blue"} +team modify fzsd.module.scoreboard.display.bedrock_broke_count color dark_blue +team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "dark_blue"} diff --git a/data/fzsd.extra.bbl/functions/display/set_text/dark_gray.mcfunction b/data/fzsd.extra.bbl/functions/display/set_text/dark_gray.mcfunction new file mode 100644 index 0000000..565b2c6 --- /dev/null +++ b/data/fzsd.extra.bbl/functions/display/set_text/dark_gray.mcfunction @@ -0,0 +1,7 @@ +# 见#fzsd.extra.bbl:display/set_text + +data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "dark_gray"}' +scoreboard objectives setdisplay sidebar.team.dark_gray fzsd.module.scoreboard.display.bedrock_broke_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "dark_gray"} +team modify fzsd.module.scoreboard.display.bedrock_broke_count color dark_gray +team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "dark_gray"} diff --git a/data/fzsd.extra.bbl/functions/display/set_text/dark_green.mcfunction b/data/fzsd.extra.bbl/functions/display/set_text/dark_green.mcfunction new file mode 100644 index 0000000..66ef458 --- /dev/null +++ b/data/fzsd.extra.bbl/functions/display/set_text/dark_green.mcfunction @@ -0,0 +1,7 @@ +# 见#fzsd.extra.bbl:display/set_text + +data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "dark_green"}' +scoreboard objectives setdisplay sidebar.team.dark_green fzsd.module.scoreboard.display.bedrock_broke_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "dark_green"} +team modify fzsd.module.scoreboard.display.bedrock_broke_count color dark_green +team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "dark_green"} diff --git a/data/fzsd.extra.bbl/functions/display/set_text/dark_purple.mcfunction b/data/fzsd.extra.bbl/functions/display/set_text/dark_purple.mcfunction new file mode 100644 index 0000000..28ff5f4 --- /dev/null +++ b/data/fzsd.extra.bbl/functions/display/set_text/dark_purple.mcfunction @@ -0,0 +1,7 @@ +# 见#fzsd.extra.bbl:display/set_text + +data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "dark_purple"}' +scoreboard objectives setdisplay sidebar.team.dark_purple fzsd.module.scoreboard.display.bedrock_broke_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "dark_purple"} +team modify fzsd.module.scoreboard.display.bedrock_broke_count color dark_purple +team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "dark_purple"} diff --git a/data/fzsd.extra.bbl/functions/display/set_text/dark_red.mcfunction b/data/fzsd.extra.bbl/functions/display/set_text/dark_red.mcfunction new file mode 100644 index 0000000..e2c9496 --- /dev/null +++ b/data/fzsd.extra.bbl/functions/display/set_text/dark_red.mcfunction @@ -0,0 +1,7 @@ +# 见#fzsd.extra.bbl:display/set_text + +data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "dark_red"}' +scoreboard objectives setdisplay sidebar.team.dark_red fzsd.module.scoreboard.display.bedrock_broke_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "dark_red"} +team modify fzsd.module.scoreboard.display.bedrock_broke_count color dark_red +team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "dark_red"} diff --git a/data/fzsd.extra.bbl/functions/display/set_text/gold.mcfunction b/data/fzsd.extra.bbl/functions/display/set_text/gold.mcfunction new file mode 100644 index 0000000..ddee6f5 --- /dev/null +++ b/data/fzsd.extra.bbl/functions/display/set_text/gold.mcfunction @@ -0,0 +1,7 @@ +# 见#fzsd.extra.bbl:display/set_text + +data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "gold"}' +scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.bedrock_broke_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "gold"} +team modify fzsd.module.scoreboard.display.bedrock_broke_count color gold +team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "gold"} diff --git a/data/fzsd.extra.bbl/functions/display/set_text/gray.mcfunction b/data/fzsd.extra.bbl/functions/display/set_text/gray.mcfunction new file mode 100644 index 0000000..ac3f8e2 --- /dev/null +++ b/data/fzsd.extra.bbl/functions/display/set_text/gray.mcfunction @@ -0,0 +1,7 @@ +# 见#fzsd.extra.bbl:display/set_text + +data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "gray"}' +scoreboard objectives setdisplay sidebar.team.gray fzsd.module.scoreboard.display.bedrock_broke_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "gray"} +team modify fzsd.module.scoreboard.display.bedrock_broke_count color gray +team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "gray"} diff --git a/data/fzsd.extra.bbl/functions/display/set_text/green.mcfunction b/data/fzsd.extra.bbl/functions/display/set_text/green.mcfunction new file mode 100644 index 0000000..c8bbb96 --- /dev/null +++ b/data/fzsd.extra.bbl/functions/display/set_text/green.mcfunction @@ -0,0 +1,7 @@ +# 见#fzsd.extra.bbl:display/set_text + +data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "green"}' +scoreboard objectives setdisplay sidebar.team.green fzsd.module.scoreboard.display.bedrock_broke_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "green"} +team modify fzsd.module.scoreboard.display.bedrock_broke_count color green +team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "green"} diff --git a/data/fzsd.extra.bbl/functions/display/set_text/light_purple.mcfunction b/data/fzsd.extra.bbl/functions/display/set_text/light_purple.mcfunction new file mode 100644 index 0000000..016829c --- /dev/null +++ b/data/fzsd.extra.bbl/functions/display/set_text/light_purple.mcfunction @@ -0,0 +1,7 @@ +# 见#fzsd.extra.bbl:display/set_text + +data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "purple"}' +scoreboard objectives setdisplay sidebar.team.light_purple fzsd.module.scoreboard.display.bedrock_broke_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "purple"} +team modify fzsd.module.scoreboard.display.bedrock_broke_count color light_purple +team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "purple"} diff --git a/data/fzsd.extra.bbl/functions/display/set_text/red.mcfunction b/data/fzsd.extra.bbl/functions/display/set_text/red.mcfunction new file mode 100644 index 0000000..debed87 --- /dev/null +++ b/data/fzsd.extra.bbl/functions/display/set_text/red.mcfunction @@ -0,0 +1,7 @@ +# 见#fzsd.extra.bbl:display/set_text + +data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "red"}' +scoreboard objectives setdisplay sidebar.team.red fzsd.module.scoreboard.display.bedrock_broke_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "red"} +team modify fzsd.module.scoreboard.display.bedrock_broke_count color red +team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "red"} diff --git a/data/fzsd.extra.bbl/functions/display/set_text/white.mcfunction b/data/fzsd.extra.bbl/functions/display/set_text/white.mcfunction new file mode 100644 index 0000000..b71a120 --- /dev/null +++ b/data/fzsd.extra.bbl/functions/display/set_text/white.mcfunction @@ -0,0 +1,7 @@ +# 见#fzsd.extra.bbl:display/set_text + +data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "white"}' +scoreboard objectives setdisplay sidebar.team.white fzsd.module.scoreboard.display.bedrock_broke_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "white"} +team modify fzsd.module.scoreboard.display.bedrock_broke_count color white +team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "white"} diff --git a/data/fzsd.extra.bbl/functions/display/set_text/yellow.mcfunction b/data/fzsd.extra.bbl/functions/display/set_text/yellow.mcfunction new file mode 100644 index 0000000..10a5648 --- /dev/null +++ b/data/fzsd.extra.bbl/functions/display/set_text/yellow.mcfunction @@ -0,0 +1,7 @@ +# 见#fzsd.extra.bbl:display/set_text + +data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "yellow"}' +scoreboard objectives setdisplay sidebar.team.yellow fzsd.module.scoreboard.display.bedrock_broke_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "yellow"} +team modify fzsd.module.scoreboard.display.bedrock_broke_count color yellow +team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "yellow"} diff --git a/data/fzsd.extra.bbl/functions/event/advancement/broke_bedrock.mcfunction b/data/fzsd.extra.bbl/functions/event/advancement/broke_bedrock.mcfunction new file mode 100644 index 0000000..cb3c1d5 --- /dev/null +++ b/data/fzsd.extra.bbl/functions/event/advancement/broke_bedrock.mcfunction @@ -0,0 +1,7 @@ +# 见advancements/fzsd.extra.bbl:broke_bedrock +## 排除假人并触发事件 +execute if predicate fzsd:is_real_player run function fzsd.extra.bbl:event/player/broke_bedrock + +## 重置事件 +scoreboard players set @s fzsd.extra.bbl 0 +advancement revoke @s only fzsd.extra.bbl:broke_bedrock \ No newline at end of file diff --git a/data/fzsd.extra.bbl/functions/event/player/broke_bedrock.mcfunction b/data/fzsd.extra.bbl/functions/event/player/broke_bedrock.mcfunction new file mode 100644 index 0000000..747f7aa --- /dev/null +++ b/data/fzsd.extra.bbl/functions/event/player/broke_bedrock.mcfunction @@ -0,0 +1,6 @@ +# 见../advancement/broke_bedrock +## 详细 +execute if score fzsd.logger.level fzsd.variable.integer matches ..300 run tellraw @a [{"nbt": "fzsd.level.fine", "interpret": true, "storage": "fzsd:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "破基岩"}] + +scoreboard players operation fzsd.var.score fzsd.variable.integer = @s fzsd.extra.bbl +function #fzsd.extra.bbl:event/broke_bedrock \ No newline at end of file diff --git a/data/fzsd.extra.bbl/functions/install.mcfunction b/data/fzsd.extra.bbl/functions/install.mcfunction new file mode 100644 index 0000000..b62b0bd --- /dev/null +++ b/data/fzsd.extra.bbl/functions/install.mcfunction @@ -0,0 +1,11 @@ +# 应在原模块安装时一并安装模块扩展，见#fzsd:module/scoreboard/install +## 同时应在加载时检测是否需要重新安装，见./try_install +## 添加底层实现计分板 +scoreboard objectives add fzsd.extra.bbl dummy +## 添加显示计分板 +scoreboard objectives add fzsd.module.scoreboard.display.bedrock_broke_count dummy +## 添加计分板订阅队伍 +team add fzsd.module.scoreboard.display.bedrock_broke_count +## 设为已安装 +data modify storage fzsd:install fzsd.extra.bbl set value 1b +execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已安装扩展：破基岩榜"}] \ No newline at end of file diff --git a/data/fzsd.extra.bbl/functions/interactor/display.mcfunction b/data/fzsd.extra.bbl/functions/interactor/display.mcfunction new file mode 100644 index 0000000..573041c --- /dev/null +++ b/data/fzsd.extra.bbl/functions/interactor/display.mcfunction @@ -0,0 +1,3 @@ +# 见#fzsd:module/scoreboard/interactor/display +## 当破基岩榜分数不为0时向玩家显示按钮 +execute if score fzsd.module.scoreboard.total.bedrock_broke_count fzsd.module.scoreboard.assign.general matches 1.. run tellraw @s [{"text": "[", "color": "dark_gray", "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1210"}, "hoverEvent": {"action": "show_text", "contents": {"nbt": "text", "interpret": true, "storage": "fzsd.extra.bbl:text"}}}, {"nbt": "text", "interpret": true, "storage": "fzsd.extra.bbl:text"}, {"text": "]"}] \ No newline at end of file diff --git a/data/fzsd.extra.bbl/functions/interactor/on_click.mcfunction b/data/fzsd.extra.bbl/functions/interactor/on_click.mcfunction new file mode 100644 index 0000000..4edfcba --- /dev/null +++ b/data/fzsd.extra.bbl/functions/interactor/on_click.mcfunction @@ -0,0 +1,2 @@ +# 见#fzsd:module/scoreboard/interactor/on_click +execute if score @s fzsd.module.interactor.trigger matches -1210 run function fzsd.extra.bbl:interactor/subscribe \ No newline at end of file diff --git a/data/fzsd.extra.bbl/functions/interactor/subscribe.mcfunction b/data/fzsd.extra.bbl/functions/interactor/subscribe.mcfunction new file mode 100644 index 0000000..3dcf0cf --- /dev/null +++ b/data/fzsd.extra.bbl/functions/interactor/subscribe.mcfunction @@ -0,0 +1,6 @@ +# 见./on_click + +team join fzsd.module.scoreboard.display.bedrock_broke_count @s + +## 调试 +execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "订阅了"}, {"nbt": "text", "interpret": true, "storage": "fzsd.extra.bbl:text"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fzsd.extra.bbl/functions/try_install.mcfunction b/data/fzsd.extra.bbl/functions/try_install.mcfunction new file mode 100644 index 0000000..0de8870 --- /dev/null +++ b/data/fzsd.extra.bbl/functions/try_install.mcfunction @@ -0,0 +1,2 @@ +# 扩展现有的模块时，应在加载时检测是否需要安装，见#fzsd:module/scoreboard/load +execute unless data storage fzsd:install fzsd.extra{bbl: 1b} run function fzsd.extra.bbl:install \ No newline at end of file diff --git a/data/fzsd.extra.bbl/functions/uninstall.mcfunction b/data/fzsd.extra.bbl/functions/uninstall.mcfunction new file mode 100644 index 0000000..860f125 --- /dev/null +++ b/data/fzsd.extra.bbl/functions/uninstall.mcfunction @@ -0,0 +1,8 @@ +# 见#fzsd:module/scoreboard/uninstall +## 移除底层实现计分板 +scoreboard objectives remove fzsd.extra.bbl +## 移除计分板订阅队伍 +team remove fzsd.module.scoreboard.display.bedrock_broke_count +## 设为已卸载 +data modify storage fzsd:install fzsd.extra.bbl set value 0b +execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已卸载扩展：破基岩榜"}] \ No newline at end of file diff --git a/data/fzsd.extra.bbl/tags/functions/display/set_text.json b/data/fzsd.extra.bbl/tags/functions/display/set_text.json new file mode 100644 index 0000000..af1fc52 --- /dev/null +++ b/data/fzsd.extra.bbl/tags/functions/display/set_text.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fzsd.extra.bbl:display/set_text/black" + ] +} \ No newline at end of file diff --git a/data/fzsd.extra.bbl/tags/functions/event/broke_bedrock.json b/data/fzsd.extra.bbl/tags/functions/event/broke_bedrock.json new file mode 100644 index 0000000..909f494 --- /dev/null +++ b/data/fzsd.extra.bbl/tags/functions/event/broke_bedrock.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "fzsd.extra.bbl:assign/bbl", + "fzsd.extra.bbl:assign/general" + ] +} \ No newline at end of file diff --git a/data/fzsd/functions/module/scoreboard/display/register_id.mcfunction b/data/fzsd/functions/module/scoreboard/display/register_id.mcfunction index 7042b9f..d2d8bc8 100644 --- a/data/fzsd/functions/module/scoreboard/display/register_id.mcfunction +++ b/data/fzsd/functions/module/scoreboard/display/register_id.mcfunction @@ -1,39 +1,59 @@ +#### 注册总榜计分板id +function #fzsd:calculation/highest_id_add_1 +scoreboard players operation fzsd.module.scoreboard.display.id.general fzsd.variable.integer = fzsd.module.scoreboard.display.highest_id fzsd.variable.integer +##### 日志 +execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "注册总榜计分板id为："}, {"score": {"name": "fzsd.module.scoreboard.display.id.general", "objective": "fzsd.variable.integer"}}] + #### 注册活跃度计分板id function #fzsd:calculation/highest_id_add_1 scoreboard players operation fzsd.module.scoreboard.display.id.activation fzsd.variable.integer = fzsd.module.scoreboard.display.highest_id fzsd.variable.integer +##### 日志 +execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "注册活跃度计分板id为："}, {"score": {"name": "fzsd.module.scoreboard.display.id.activation", "objective": "fzsd.variable.integer"}}] #### 注册飞行距离计分板id function #fzsd:calculation/highest_id_add_1 scoreboard players operation fzsd.module.scoreboard.display.id.aviating_distance fzsd.variable.integer = fzsd.module.scoreboard.display.highest_id fzsd.variable.integer +##### 日志 +execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "注册飞行距离计分板id为："}, {"score": {"name": "fzsd.module.scoreboard.display.id.activation", "objective": "fzsd.variable.integer"}}] #### 注册抖M榜计分板id function #fzsd:calculation/highest_id_add_1 scoreboard players operation fzsd.module.scoreboard.display.id.damage_taken fzsd.variable.integer = fzsd.module.scoreboard.display.highest_id fzsd.variable.integer +##### 日志 +execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "注册抖M榜计分板id为："}, {"score": {"name": "fzsd.module.scoreboard.display.id.damage_taken", "objective": "fzsd.variable.integer"}}] #### 注册死亡榜计分板id function #fzsd:calculation/highest_id_add_1 scoreboard players operation fzsd.module.scoreboard.display.id.death_count fzsd.variable.integer = fzsd.module.scoreboard.display.highest_id fzsd.variable.integer +##### 日志 +execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "注册死亡榜计分板id为："}, {"score": {"name": "fzsd.module.scoreboard.display.id.death_count", "objective": "fzsd.variable.integer"}}] #### 注册挖掘榜计分板id function #fzsd:calculation/highest_id_add_1 scoreboard players operation fzsd.module.scoreboard.display.id.dig_count fzsd.variable.integer = fzsd.module.scoreboard.display.highest_id fzsd.variable.integer +##### 日志 +execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "注册挖掘榜计分板id为："}, {"score": {"name": "fzsd.module.scoreboard.display.id.dig_count", "objective": "fzsd.variable.integer"}}] #### 注册钓鱼榜计分板id function #fzsd:calculation/highest_id_add_1 scoreboard players operation fzsd.module.scoreboard.display.id.fishing_count fzsd.variable.integer = fzsd.module.scoreboard.display.highest_id fzsd.variable.integer - -#### 注册总榜计分板id -function #fzsd:calculation/highest_id_add_1 -scoreboard players operation fzsd.module.scoreboard.display.id.general fzsd.variable.integer = fzsd.module.scoreboard.display.highest_id fzsd.variable.integer +##### 日志 +execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "注册钓鱼榜计分板id为："}, {"score": {"name": "fzsd.module.scoreboard.display.id.fishing_count", "objective": "fzsd.variable.integer"}}] #### 注册击杀榜计分板id function #fzsd:calculation/highest_id_add_1 scoreboard players operation fzsd.module.scoreboard.display.id.kill_count fzsd.variable.integer = fzsd.module.scoreboard.display.highest_id fzsd.variable.integer +##### 日志 +execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "注册击杀榜计分板id为："}, {"score": {"name": "fzsd.module.scoreboard.display.id.kill_count", "objective": "fzsd.variable.integer"}}] #### 注册交易榜计分板id function #fzsd:calculation/highest_id_add_1 scoreboard players operation fzsd.module.scoreboard.display.id.trade_count fzsd.variable.integer = fzsd.module.scoreboard.display.highest_id fzsd.variable.integer +##### 日志 +execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "注册交易榜计分板id为："}, {"score": {"name": "fzsd.module.scoreboard.display.id.trade_count", "objective": "fzsd.variable.integer"}}] #### 注册放置榜计分板id function #fzsd:calculation/highest_id_add_1 -scoreboard players operation fzsd.module.scoreboard.display.id.placement_count fzsd.variable.integer = fzsd.module.scoreboard.display.highest_id fzsd.variable.integer \ No newline at end of file +scoreboard players operation fzsd.module.scoreboard.display.id.placement_count fzsd.variable.integer = fzsd.module.scoreboard.display.highest_id fzsd.variable.integer +##### 日志 +execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "注册放置榜计分板id为："}, {"score": {"name": "fzsd.module.scoreboard.display.id.placement_count", "objective": "fzsd.variable.integer"}}] \ No newline at end of file diff --git a/data/fzsd/functions/module/scoreboard/display/set_text/activation/black.mcfunction b/data/fzsd/functions/module/scoreboard/display/set_text/activation/black.mcfunction index 23f2d38..6e815a4 100644 --- a/data/fzsd/functions/module/scoreboard/display/set_text/activation/black.mcfunction +++ b/data/fzsd/functions/module/scoreboard/display/set_text/activation/black.mcfunction @@ -1,7 +1,7 @@ # 调用者：#fzsd:module/scoreboard/display/set_text/activation -data modify storage fzsd:module fzsd.scoreboard.text.activation set value '{"text": "活跃时间（h）", "color": "black"}' +data modify storage fzsd:module fzsd.scoreboard.text.activation set value '{"text": "活跃时间（h）", "color": "#202020"}' scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.activation -scoreboard objectives modify fzsd.module.scoreboard.display.activation displayname {"text": "活跃时间（h）", "color": "black"} +scoreboard objectives modify fzsd.module.scoreboard.display.activation displayname {"text": "活跃时间（h）", "color": "#202020"} team modify fzsd.module.scoreboard.display.activation color black -team modify fzsd.module.scoreboard.display.activation displayName {"text": "活跃时间（h）", "color": "black"} \ No newline at end of file +team modify fzsd.module.scoreboard.display.activation displayName {"text": "活跃时间（h）", "color": "#202020"} \ No newline at end of file diff --git a/data/fzsd/functions/module/scoreboard/display/set_text/aviating_distance/black.mcfunction b/data/fzsd/functions/module/scoreboard/display/set_text/aviating_distance/black.mcfunction index 1dc7fed..31c465e 100644 --- a/data/fzsd/functions/module/scoreboard/display/set_text/aviating_distance/black.mcfunction +++ b/data/fzsd/functions/module/scoreboard/display/set_text/aviating_distance/black.mcfunction @@ -1,7 +1,7 @@ # 调用者：#fzsd:module/scoreboard/display/set_text/aviating_distance -data modify storage fzsd:module fzsd.scoreboard.text.aviating_distance set value '{"text": "飞行距离", "color": "black"}' +data modify storage fzsd:module fzsd.scoreboard.text.aviating_distance set value '{"text": "飞行距离", "color": "#202020"}' scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.aviating_distance -scoreboard objectives modify fzsd.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "black"} +scoreboard objectives modify fzsd.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "#202020"} team modify fzsd.module.scoreboard.display.aviating_distance color black -team modify fzsd.module.scoreboard.display.aviating_distance displayName {"text": "飞行距离", "color": "black"} \ No newline at end of file +team modify fzsd.module.scoreboard.display.aviating_distance displayName {"text": "飞行距离", "color": "#202020"} \ No newline at end of file diff --git a/data/fzsd/functions/module/scoreboard/display/set_text/carousel/black.mcfunction b/data/fzsd/functions/module/scoreboard/display/set_text/carousel/black.mcfunction index c5ce129..1067572 100644 --- a/data/fzsd/functions/module/scoreboard/display/set_text/carousel/black.mcfunction +++ b/data/fzsd/functions/module/scoreboard/display/set_text/carousel/black.mcfunction @@ -1,6 +1,6 @@ # 调用者：#fzsd:module/scoreboard/display/set_text/carousel -data modify storage fzsd:module fzsd.scoreboard.text.carousel set value '{"text": "轮播", "color": "black"}' +data modify storage fzsd:module fzsd.scoreboard.text.carousel set value '{"text": "轮播", "color": "#202020"}' team modify fzsd.module.scoreboard.display.carousel color black -team modify fzsd.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "black"} +team modify fzsd.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "#202020"} scoreboard players set fzsd.module.scoreboard.carousel.color fzsd.variable.integer 0 \ No newline at end of file diff --git a/data/fzsd/functions/module/scoreboard/display/set_text/damage_taken/black.mcfunction b/data/fzsd/functions/module/scoreboard/display/set_text/damage_taken/black.mcfunction index 7611c4e..3c57508 100644 --- a/data/fzsd/functions/module/scoreboard/display/set_text/damage_taken/black.mcfunction +++ b/data/fzsd/functions/module/scoreboard/display/set_text/damage_taken/black.mcfunction @@ -1,7 +1,7 @@ # 调用者：#fzsd:module/scoreboard/display/set_text/damage_taken -data modify storage fzsd:module fzsd.scoreboard.text.damage_taken set value '{"text": "抖M榜", "color": "black"}' +data modify storage fzsd:module fzsd.scoreboard.text.damage_taken set value '{"text": "抖M榜", "color": "#202020"}' scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.damage_taken -scoreboard objectives modify fzsd.module.scoreboard.display.damage_taken displayname {"text": "抖M榜", "color": "black"} +scoreboard objectives modify fzsd.module.scoreboard.display.damage_taken displayname {"text": "抖M榜", "color": "#202020"} team modify fzsd.module.scoreboard.display.damage_taken color black -team modify fzsd.module.scoreboard.display.damage_taken displayName {"text": "抖M榜", "color": "black"} \ No newline at end of file +team modify fzsd.module.scoreboard.display.damage_taken displayName {"text": "抖M榜", "color": "#202020"} \ No newline at end of file diff --git a/data/fzsd/functions/module/scoreboard/display/set_text/death_count/black.mcfunction b/data/fzsd/functions/module/scoreboard/display/set_text/death_count/black.mcfunction index 55ae643..8f73343 100644 --- a/data/fzsd/functions/module/scoreboard/display/set_text/death_count/black.mcfunction +++ b/data/fzsd/functions/module/scoreboard/display/set_text/death_count/black.mcfunction @@ -1,7 +1,7 @@ # 调用者：#fzsd:module/scoreboard/display/set_text/death_count -data modify storage fzsd:module fzsd.scoreboard.text.death_count set value '{"text": "死亡榜", "color": "black"}' +data modify storage fzsd:module fzsd.scoreboard.text.death_count set value '{"text": "死亡榜", "color": "#202020"}' scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.death_count -scoreboard objectives modify fzsd.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "black"} +scoreboard objectives modify fzsd.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "#202020"} team modify fzsd.module.scoreboard.display.death_count color black -team modify fzsd.module.scoreboard.display.death_count displayName {"text": "死亡榜", "color": "black"} \ No newline at end of file +team modify fzsd.module.scoreboard.display.death_count displayName {"text": "死亡榜", "color": "#202020"} \ No newline at end of file diff --git a/data/fzsd/functions/module/scoreboard/display/set_text/dig_count/black.mcfunction b/data/fzsd/functions/module/scoreboard/display/set_text/dig_count/black.mcfunction index 381d8b9..d21eeec 100644 --- a/data/fzsd/functions/module/scoreboard/display/set_text/dig_count/black.mcfunction +++ b/data/fzsd/functions/module/scoreboard/display/set_text/dig_count/black.mcfunction @@ -1,7 +1,7 @@ # 调用者：#fzsd:module/scoreboard/display/set_text/dig_count -data modify storage fzsd:module fzsd.scoreboard.text.dig_count set value '{"text": "挖掘榜", "color": "black"}' +data modify storage fzsd:module fzsd.scoreboard.text.dig_count set value '{"text": "挖掘榜", "color": "#202020"}' scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.dig_count -scoreboard objectives modify fzsd.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "black"} +scoreboard objectives modify fzsd.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "#202020"} team modify fzsd.module.scoreboard.display.dig_count color black -team modify fzsd.module.scoreboard.display.dig_count displayName {"text": "挖掘榜", "color": "black"} \ No newline at end of file +team modify fzsd.module.scoreboard.display.dig_count displayName {"text": "挖掘榜", "color": "#202020"} \ No newline at end of file diff --git a/data/fzsd/functions/module/scoreboard/display/set_text/fishing_count/black.mcfunction b/data/fzsd/functions/module/scoreboard/display/set_text/fishing_count/black.mcfunction index 4dd0b5c..766ac23 100644 --- a/data/fzsd/functions/module/scoreboard/display/set_text/fishing_count/black.mcfunction +++ b/data/fzsd/functions/module/scoreboard/display/set_text/fishing_count/black.mcfunction @@ -1,7 +1,7 @@ # 调用者：#fzsd:module/scoreboard/display/set_text/fishing_count -data modify storage fzsd:module fzsd.scoreboard.text.fishing_count set value '{"text": "钓鱼榜", "color": "black"}' +data modify storage fzsd:module fzsd.scoreboard.text.fishing_count set value '{"text": "钓鱼榜", "color": "#202020"}' scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.fishing_count -scoreboard objectives modify fzsd.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "black"} +scoreboard objectives modify fzsd.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "#202020"} team modify fzsd.module.scoreboard.display.fishing_count color black -team modify fzsd.module.scoreboard.display.fishing_count displayName {"text": "钓鱼榜", "color": "black"} \ No newline at end of file +team modify fzsd.module.scoreboard.display.fishing_count displayName {"text": "钓鱼榜", "color": "#202020"} \ No newline at end of file diff --git a/data/fzsd/functions/module/scoreboard/display/set_text/general/black.mcfunction b/data/fzsd/functions/module/scoreboard/display/set_text/general/black.mcfunction index 07a52a0..efb15d3 100644 --- a/data/fzsd/functions/module/scoreboard/display/set_text/general/black.mcfunction +++ b/data/fzsd/functions/module/scoreboard/display/set_text/general/black.mcfunction @@ -1,7 +1,7 @@ # 调用者：#fzsd:module/scoreboard/display/set_text/general -data modify storage fzsd:module fzsd.scoreboard.text.general set value '{"text": "总榜", "color": "black"}' +data modify storage fzsd:module fzsd.scoreboard.text.general set value '{"text": "总榜", "color": "#202020"}' scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.general -scoreboard objectives modify fzsd.module.scoreboard.display.general displayname {"text": "总榜", "color": "black"} +scoreboard objectives modify fzsd.module.scoreboard.display.general displayname {"text": "总榜", "color": "#202020"} team modify fzsd.module.scoreboard.display.general color black -team modify fzsd.module.scoreboard.display.general displayName {"text": "总榜", "color": "black"} \ No newline at end of file +team modify fzsd.module.scoreboard.display.general displayName {"text": "总榜", "color": "#202020"} \ No newline at end of file diff --git a/data/fzsd/functions/module/scoreboard/display/set_text/kill_count/black.mcfunction b/data/fzsd/functions/module/scoreboard/display/set_text/kill_count/black.mcfunction index 536074a..b865e6d 100644 --- a/data/fzsd/functions/module/scoreboard/display/set_text/kill_count/black.mcfunction +++ b/data/fzsd/functions/module/scoreboard/display/set_text/kill_count/black.mcfunction @@ -1,7 +1,7 @@ # 调用者：#fzsd:module/scoreboard/display/set_text/kill_count -data modify storage fzsd:module fzsd.scoreboard.text.kill_count set value '{"text": "击杀榜", "color": "black"}' +data modify storage fzsd:module fzsd.scoreboard.text.kill_count set value '{"text": "击杀榜", "color": "#202020"}' scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.kill_count -scoreboard objectives modify fzsd.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "black"} +scoreboard objectives modify fzsd.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "#202020"} team modify fzsd.module.scoreboard.display.kill_count color black -team modify fzsd.module.scoreboard.display.kill_count displayName {"text": "击杀榜", "color": "black"} \ No newline at end of file +team modify fzsd.module.scoreboard.display.kill_count displayName {"text": "击杀榜", "color": "#202020"} \ No newline at end of file diff --git a/data/fzsd/functions/module/scoreboard/display/set_text/placement_count/black.mcfunction b/data/fzsd/functions/module/scoreboard/display/set_text/placement_count/black.mcfunction index 56afec8..3099669 100644 --- a/data/fzsd/functions/module/scoreboard/display/set_text/placement_count/black.mcfunction +++ b/data/fzsd/functions/module/scoreboard/display/set_text/placement_count/black.mcfunction @@ -1,7 +1,7 @@ # 调用者：#fzsd:module/scoreboard/display/set_text/placement_count -data modify storage fzsd:module fzsd.scoreboard.text.placement_count set value '{"text": "放置榜", "color": "black"}' +data modify storage fzsd:module fzsd.scoreboard.text.placement_count set value '{"text": "放置榜", "color": "#202020"}' scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.placement_count -scoreboard objectives modify fzsd.module.scoreboard.display.placement_count displayname {"text": "放置榜", "color": "black"} +scoreboard objectives modify fzsd.module.scoreboard.display.placement_count displayname {"text": "放置榜", "color": "#202020"} team modify fzsd.module.scoreboard.display.placement_count color black -team modify fzsd.module.scoreboard.display.placement_count displayName {"text": "放置榜", "color": "black"} \ No newline at end of file +team modify fzsd.module.scoreboard.display.placement_count displayName {"text": "放置榜", "color": "#202020"} \ No newline at end of file diff --git a/data/fzsd/functions/module/scoreboard/display/set_text/trade_count/black.mcfunction b/data/fzsd/functions/module/scoreboard/display/set_text/trade_count/black.mcfunction index e4d8c96..00c404a 100644 --- a/data/fzsd/functions/module/scoreboard/display/set_text/trade_count/black.mcfunction +++ b/data/fzsd/functions/module/scoreboard/display/set_text/trade_count/black.mcfunction @@ -1,7 +1,7 @@ # 调用者：#fzsd:module/scoreboard/display/set_text/trade_count -data modify storage fzsd:module fzsd.scoreboard.text.trade_count set value '{"text": "交易榜", "color": "black"}' +data modify storage fzsd:module fzsd.scoreboard.text.trade_count set value '{"text": "交易榜", "color": "#202020"}' scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.trade_count -scoreboard objectives modify fzsd.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "black"} +scoreboard objectives modify fzsd.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "#202020"} team modify fzsd.module.scoreboard.display.trade_count color black -team modify fzsd.module.scoreboard.display.trade_count displayName {"text": "交易榜", "color": "black"} \ No newline at end of file +team modify fzsd.module.scoreboard.display.trade_count displayName {"text": "交易榜", "color": "#202020"} \ No newline at end of file diff --git a/data/fzsd/functions/module/scoreboard/interactor/display.mcfunction b/data/fzsd/functions/module/scoreboard/interactor/display.mcfunction index 56582ba..e00e4cb 100644 --- a/data/fzsd/functions/module/scoreboard/interactor/display.mcfunction +++ b/data/fzsd/functions/module/scoreboard/interactor/display.mcfunction @@ -2,4 +2,4 @@ execute if data storage fzsd:install fzsd.module{scoreboard:1b} run tellraw @s {"text": "计分板："} -execute if data storage fzsd:install fzsd.module{scoreboard:1b} run tellraw @s [[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "dark_red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1000"}}, {"text": "关", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1010"}}, {"nbt": "fzsd.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1020"}}, {"nbt": "fzsd.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1030"}}, {"nbt": "fzsd.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1040"}}, {"nbt": "fzsd.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1050"}}, {"nbt": "fzsd.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1060"}}, {"nbt": "fzsd.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1070"}}, {"nbt": "fzsd.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1080"}}, {"nbt": "fzsd.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1090"}}, {"nbt": "fzsd.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1100"}}, {"nbt": "fzsd.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}, {"text": "]"}]] \ No newline at end of file +execute if data storage fzsd:install fzsd.module{scoreboard:1b} run tellraw @s [[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "dark_red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1000"}}, {"text": "关", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1010"}}, {"nbt": "fzsd.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1020"}}, {"nbt": "fzsd.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1030"}}, {"nbt": "fzsd.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1040"}}, {"nbt": "fzsd.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1050"}}, {"nbt": "fzsd.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1060"}}, {"nbt": "fzsd.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1070"}}, {"nbt": "fzsd.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1080"}}, {"nbt": "fzsd.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1090"}}, {"nbt": "fzsd.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1100"}}, {"nbt": "fzsd.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1200"}}, {"nbt": "fzsd.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}, {"text": "]"}]] \ No newline at end of file diff --git a/data/fzsd/functions/module/scoreboard/interactor/on_click.mcfunction b/data/fzsd/functions/module/scoreboard/interactor/on_click.mcfunction index fd8fd51..49d6308 100644 --- a/data/fzsd/functions/module/scoreboard/interactor/on_click.mcfunction +++ b/data/fzsd/functions/module/scoreboard/interactor/on_click.mcfunction @@ -8,4 +8,5 @@ execute if score @s fzsd.module.interactor.trigger matches -1060 run function #f execute if score @s fzsd.module.interactor.trigger matches -1070 run function #fzsd:module/scoreboard/interactor/subscribe/dig_count execute if score @s fzsd.module.interactor.trigger matches -1080 run function #fzsd:module/scoreboard/interactor/subscribe/fishing_count execute if score @s fzsd.module.interactor.trigger matches -1090 run function #fzsd:module/scoreboard/interactor/subscribe/kill_count -execute if score @s fzsd.module.interactor.trigger matches -1100 run function #fzsd:module/scoreboard/interactor/subscribe/trade_count \ No newline at end of file +execute if score @s fzsd.module.interactor.trigger matches -1100 run function #fzsd:module/scoreboard/interactor/subscribe/trade_count +execute if score @s fzsd.module.interactor.trigger matches -1200 run function #fzsd:module/scoreboard/interactor/subscribe/placement_count \ No newline at end of file diff --git a/data/fzsd/tags/functions/deep_uninstall.json b/data/fzsd/tags/functions/deep_uninstall.json index 0d2f19a..614597b 100644 --- a/data/fzsd/tags/functions/deep_uninstall.json +++ b/data/fzsd/tags/functions/deep_uninstall.json @@ -1,5 +1,5 @@ { - "__comment": "本标签将强制重装所有模块", + "__comment": "本标签将强制卸载所有模块", "replace": false, "values": [ "#fzsd:system/uninstall/before", diff --git a/data/fzsd/tags/functions/module/scoreboard/assign/scoreboard/general/bedrock_broke_count.json b/data/fzsd/tags/functions/module/scoreboard/assign/scoreboard/general/bedrock_broke_count.json new file mode 100644 index 0000000..e19c3a0 --- /dev/null +++ b/data/fzsd/tags/functions/module/scoreboard/assign/scoreboard/general/bedrock_broke_count.json @@ -0,0 +1,7 @@ +{ + "__comment": "用于兼容fzsd地毯脚本分数恢复功能", + "replace": false, + "values": [ + "fzsd.extra.bbl:assign/general" + ] +} \ No newline at end of file diff --git a/data/fzsd/tags/functions/module/scoreboard/clear_data.json b/data/fzsd/tags/functions/module/scoreboard/clear_data.json index 7f23bf6..0e9ff18 100644 --- a/data/fzsd/tags/functions/module/scoreboard/clear_data.json +++ b/data/fzsd/tags/functions/module/scoreboard/clear_data.json @@ -2,6 +2,7 @@ "__comment": "调用者：fzsd:module:scoreboard/uninstall", "replace": false, "values": [ - "fzsd:module/scoreboard/clear_data" + "fzsd:module/scoreboard/clear_data", + "fzsd.extra.bbl:clear_data" ] } \ No newline at end of file diff --git a/data/fzsd/tags/functions/module/scoreboard/display/carousel/try_display.json b/data/fzsd/tags/functions/module/scoreboard/display/carousel/try_display.json index ce99b38..a62ff32 100644 --- a/data/fzsd/tags/functions/module/scoreboard/display/carousel/try_display.json +++ b/data/fzsd/tags/functions/module/scoreboard/display/carousel/try_display.json @@ -10,6 +10,7 @@ "fzsd:module/scoreboard/display/carousel/try_display/general", "fzsd:module/scoreboard/display/carousel/try_display/kill_count", "fzsd:module/scoreboard/display/carousel/try_display/placement_count", - "fzsd:module/scoreboard/display/carousel/try_display/trade_count" + "fzsd:module/scoreboard/display/carousel/try_display/trade_count", + "fzsd.extra.bbl:display/carousel/try_display" ] } \ No newline at end of file diff --git a/data/fzsd/tags/functions/module/scoreboard/display/register_id.json b/data/fzsd/tags/functions/module/scoreboard/display/register_id.json index 093b87b..084bfed 100644 --- a/data/fzsd/tags/functions/module/scoreboard/display/register_id.json +++ b/data/fzsd/tags/functions/module/scoreboard/display/register_id.json @@ -5,6 +5,8 @@ ], "replace": false, "values": [ - "fzsd:module/scoreboard/display/register_id" + "fzsd:module/scoreboard/display/reset_id", + "fzsd:module/scoreboard/display/register_id", + "fzsd.extra.bbl:display/register_id" ] } \ No newline at end of file diff --git a/data/fzsd/tags/functions/module/scoreboard/display/set_text.json b/data/fzsd/tags/functions/module/scoreboard/display/set_text.json index d27bbc4..97d6d1e 100644 --- a/data/fzsd/tags/functions/module/scoreboard/display/set_text.json +++ b/data/fzsd/tags/functions/module/scoreboard/display/set_text.json @@ -15,6 +15,7 @@ "#fzsd:module/scoreboard/display/set_text/general", "#fzsd:module/scoreboard/display/set_text/kill_count", "#fzsd:module/scoreboard/display/set_text/placement_count", - "#fzsd:module/scoreboard/display/set_text/trade_count" + "#fzsd:module/scoreboard/display/set_text/trade_count", + "#fzsd.extra.bbl:display/set_text" ] -} \ No newline at end of file +} diff --git a/data/fzsd/tags/functions/module/scoreboard/display/set_text/placement_count.json b/data/fzsd/tags/functions/module/scoreboard/display/set_text/placement_count.json index 3f55146..0158e45 100644 --- a/data/fzsd/tags/functions/module/scoreboard/display/set_text/placement_count.json +++ b/data/fzsd/tags/functions/module/scoreboard/display/set_text/placement_count.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "fzsd:module/scoreboard/display/set_text/placement_count/dark_blue" + "fzsd:module/scoreboard/display/set_text/placement_count/dark_green" ] } \ No newline at end of file diff --git a/data/fzsd/tags/functions/module/scoreboard/install.json b/data/fzsd/tags/functions/module/scoreboard/install.json index 9296b8f..4089ac7 100644 --- a/data/fzsd/tags/functions/module/scoreboard/install.json +++ b/data/fzsd/tags/functions/module/scoreboard/install.json @@ -2,6 +2,7 @@ "__comment": "调用者：#fzsd:module/install", "replace": false, "values": [ - "fzsd:module/scoreboard/install" + "fzsd:module/scoreboard/install", + "fzsd.extra.bbl:install" ] } \ No newline at end of file diff --git a/data/fzsd/tags/functions/module/scoreboard/interactor/display.json b/data/fzsd/tags/functions/module/scoreboard/interactor/display.json index 333b080..2f6d63b 100644 --- a/data/fzsd/tags/functions/module/scoreboard/interactor/display.json +++ b/data/fzsd/tags/functions/module/scoreboard/interactor/display.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "fzsd:module/scoreboard/interactor/display" + "fzsd:module/scoreboard/interactor/display", + "fzsd.extra.bbl:interactor/display" ] } \ No newline at end of file diff --git a/data/fzsd/tags/functions/module/scoreboard/interactor/on_click.json b/data/fzsd/tags/functions/module/scoreboard/interactor/on_click.json index 73ed3fd..319383f 100644 --- a/data/fzsd/tags/functions/module/scoreboard/interactor/on_click.json +++ b/data/fzsd/tags/functions/module/scoreboard/interactor/on_click.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "fzsd:module/scoreboard/interactor/on_click" + "fzsd:module/scoreboard/interactor/on_click", + "fzsd.extra.bbl:interactor/on_click" ] } \ No newline at end of file diff --git a/data/fzsd/tags/functions/module/scoreboard/load.json b/data/fzsd/tags/functions/module/scoreboard/load.json index c963f2f..401a0c0 100644 --- a/data/fzsd/tags/functions/module/scoreboard/load.json +++ b/data/fzsd/tags/functions/module/scoreboard/load.json @@ -2,10 +2,10 @@ "__comment": "调用者：fzsd:module/try_load", "replace": false, "values": [ - "fzsd:module/scoreboard/display/reset_id", "#fzsd:module/scoreboard/display/register_id", "#fzsd:module/scoreboard/display/set_text", "fzsd:module/scoreboard/display/carousel/loop", - "fzsd:module/scoreboard/load" + "fzsd:module/scoreboard/load", + "fzsd.extra.bbl:try_install" ] } \ No newline at end of file diff --git a/data/fzsd/tags/functions/module/scoreboard/uninstall.json b/data/fzsd/tags/functions/module/scoreboard/uninstall.json index 98002b9..20e5041 100644 --- a/data/fzsd/tags/functions/module/scoreboard/uninstall.json +++ b/data/fzsd/tags/functions/module/scoreboard/uninstall.json @@ -2,6 +2,7 @@ "__comment": "调用者：#fzsd:module/uninstall", "replace": false, "values": [ - "fzsd:module/scoreboard/uninstall" + "fzsd:module/scoreboard/uninstall", + "fzsd.extra.bbl:uninstall" ] } \ No newline at end of file diff --git a/scripts/fzsd_score.sc b/scripts/fzsd_score.sc index a6855d2..52c3fb8 100644 --- a/scripts/fzsd_score.sc +++ b/scripts/fzsd_score.sc @@ -255,6 +255,7 @@ recalculate_total_scores() -> ( 'fzsd.module.scoreboard.display.kill_count', 'fzsd.module.scoreboard.display.trade_count', 'fzsd.module.scoreboard.display.bedrock_broke_count', + 'fzsd.module.scoreboard.display.placement_count', 'fzsd.module.scoreboard.display.aviating_distance' ]; for(scoreboards,recalculate_total_score(_, get_total_score_name_new(_)));