diff --git a/README.md b/README.md index 3777cd8..85061f0 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ ## *目前仍在测试阶段,请先备份服务器再使用!* -[![数据包版本](https://img.shields.io/badge/测试版-3.0+beta.11-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases/v3.0-beta.11) [![MC版本](https://img.shields.io/badge/Minecraft-1.19+-blue.svg)](https://minecraft.net/) +[![数据包版本](https://img.shields.io/badge/测试版-3.0+beta.12-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases/v3.0-beta.12) [![MC版本](https://img.shields.io/badge/Minecraft-1.19+-blue.svg)](https://minecraft.net/) > 其他版本见[发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases) @@ -59,7 +59,7 @@ | 默认名称 | 计分板ID | | :------: | :----------------------------------------------: | - | 破基岩榜 |fzsd.module.scoreboard.display.bedrock_broke_count| + | 破基岩榜 |fzsd.module.scoreboard.display.bedrock_broken_count| ### 地毯脚本 diff --git a/data/fzsd.extra.bbl/functions/assign/bbl.mcfunction b/data/fzsd.extra.bbl/functions/assign/bbl.mcfunction index c8b81a6..e78bc38 100644 --- a/data/fzsd.extra.bbl/functions/assign/bbl.mcfunction +++ b/data/fzsd.extra.bbl/functions/assign/bbl.mcfunction @@ -1,5 +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 +execute unless score fzsd.module.scoreboard.display.bedrock_broken_count.id fzsd.variable.integer matches 0.. run function fzsd.extra.bbl:display/register_id +scoreboard players operation @s fzsd.module.scoreboard.display.bedrock_broken_count += fzsd.var.score fzsd.variable.integer +scoreboard players operation fzsd.module.scoreboard.total.bedrock_broken_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 index 3cc7e13..28dcb9a 100644 --- a/data/fzsd.extra.bbl/functions/assign/general.mcfunction +++ b/data/fzsd.extra.bbl/functions/assign/general.mcfunction @@ -1,5 +1,5 @@ # 见#fzsd.extra.bbl:event/broke_bedrock -team join fzsd.module.scoreboard.display.bedrock_broke_count 总破基岩数 +team join fzsd.module.scoreboard.display.bedrock_broken_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 +scoreboard players operation 总破基岩数 fzsd.module.scoreboard.display.general = fzsd.module.scoreboard.total.bedrock_broken_count fzsd.module.scoreboard.assign.general +scoreboard players operation 总破基岩数 fzsd.module.scoreboard.display.bedrock_broken_count = fzsd.module.scoreboard.total.bedrock_broken_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 index 3016fc4..0179cc4 100644 --- a/data/fzsd.extra.bbl/functions/clear_data.mcfunction +++ b/data/fzsd.extra.bbl/functions/clear_data.mcfunction @@ -1,3 +1,3 @@ # 见#fzsd:module/scoreboard/clear_data ## 清除数据 -scoreboard objectives remove fzsd.module.scoreboard.display.bedrock_broke_count \ No newline at end of file +scoreboard objectives remove fzsd.module.scoreboard.display.bedrock_broken_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 index 1e9f73e..9dd1b6c 100644 --- a/data/fzsd.extra.bbl/functions/display/carousel/set_display.mcfunction +++ b/data/fzsd.extra.bbl/functions/display/carousel/set_display.mcfunction @@ -1,21 +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.module.scoreboard.carousel.color fzsd.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.bedrock_broken_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_broken_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_broken_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_broken_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_broken_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_broken_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_broken_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_broken_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_broken_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_broken_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_broken_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_broken_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_broken_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_broken_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_broken_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_broken_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 index b5264b2..4d94bbb 100644 --- a/data/fzsd.extra.bbl/functions/display/carousel/try_display.mcfunction +++ b/data/fzsd.extra.bbl/functions/display/carousel/try_display.mcfunction @@ -1,2 +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 +execute if score fzsd.module.scoreboard.display.current_id fzsd.variable.integer = fzsd.module.scoreboard.display.id.bedrock_broken_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 index 489cb08..241637b 100644 --- a/data/fzsd.extra.bbl/functions/display/register_id.mcfunction +++ b/data/fzsd.extra.bbl/functions/display/register_id.mcfunction @@ -1,6 +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_broken_count fzsd.module.scoreboard.assign.general matches 1.. run function #fzsd:calculation/highest_id_add_1 +execute if score fzsd.module.scoreboard.total.bedrock_broken_count fzsd.module.scoreboard.assign.general matches 1.. run scoreboard players operation fzsd.module.scoreboard.display.id.bedrock_broken_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": "注册"}, {"nbt": "fzsd.scoreboard.text.bedrock_broke_count", "interpret": true, "storage": "fzsd:module"}, {"text": "id为:"}, {"score": {"name": "fzsd.module.scoreboard.display.id.bedrock_broke_count", "objective": "fzsd.variable.integer"}}] \ No newline at end of file +execute if score fzsd.module.scoreboard.total.bedrock_broken_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": "注册"}, {"nbt": "fzsd.scoreboard.text.bedrock_broken_count", "interpret": true, "storage": "fzsd:module"}, {"text": "id为:"}, {"score": {"name": "fzsd.module.scoreboard.display.id.bedrock_broken_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 index 00b902e..cbde44c 100644 --- a/data/fzsd.extra.bbl/functions/display/set_text/aqua.mcfunction +++ b/data/fzsd.extra.bbl/functions/display/set_text/aqua.mcfunction @@ -1,7 +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"} +data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "aqua"}' +scoreboard objectives setdisplay sidebar.team.aqua fzsd.module.scoreboard.display.bedrock_broken_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "aqua"} +team modify fzsd.module.scoreboard.display.bedrock_broken_count color aqua +team modify fzsd.module.scoreboard.display.bedrock_broken_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 index 12e265b..7490946 100644 --- a/data/fzsd.extra.bbl/functions/display/set_text/black.mcfunction +++ b/data/fzsd.extra.bbl/functions/display/set_text/black.mcfunction @@ -1,7 +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"} +data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "#202020"}' +scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.bedrock_broken_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "#202020"} +team modify fzsd.module.scoreboard.display.bedrock_broken_count color black +team modify fzsd.module.scoreboard.display.bedrock_broken_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 index 26748fb..fe2c966 100644 --- a/data/fzsd.extra.bbl/functions/display/set_text/blue.mcfunction +++ b/data/fzsd.extra.bbl/functions/display/set_text/blue.mcfunction @@ -1,7 +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"} +data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "blue"}' +scoreboard objectives setdisplay sidebar.team.blue fzsd.module.scoreboard.display.bedrock_broken_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "blue"} +team modify fzsd.module.scoreboard.display.bedrock_broken_count color blue +team modify fzsd.module.scoreboard.display.bedrock_broken_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 index 41ed4f1..ecda711 100644 --- a/data/fzsd.extra.bbl/functions/display/set_text/dark_aqua.mcfunction +++ b/data/fzsd.extra.bbl/functions/display/set_text/dark_aqua.mcfunction @@ -1,7 +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"} +data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "dark_aqua"}' +scoreboard objectives setdisplay sidebar.team.dark_aqua fzsd.module.scoreboard.display.bedrock_broken_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "dark_aqua"} +team modify fzsd.module.scoreboard.display.bedrock_broken_count color dark_aqua +team modify fzsd.module.scoreboard.display.bedrock_broken_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 index c612273..0fdfc31 100644 --- a/data/fzsd.extra.bbl/functions/display/set_text/dark_blue.mcfunction +++ b/data/fzsd.extra.bbl/functions/display/set_text/dark_blue.mcfunction @@ -1,7 +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"} +data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "dark_blue"}' +scoreboard objectives setdisplay sidebar.team.dark_blue fzsd.module.scoreboard.display.bedrock_broken_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "dark_blue"} +team modify fzsd.module.scoreboard.display.bedrock_broken_count color dark_blue +team modify fzsd.module.scoreboard.display.bedrock_broken_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 index 565b2c6..2accdaa 100644 --- a/data/fzsd.extra.bbl/functions/display/set_text/dark_gray.mcfunction +++ b/data/fzsd.extra.bbl/functions/display/set_text/dark_gray.mcfunction @@ -1,7 +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"} +data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "dark_gray"}' +scoreboard objectives setdisplay sidebar.team.dark_gray fzsd.module.scoreboard.display.bedrock_broken_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "dark_gray"} +team modify fzsd.module.scoreboard.display.bedrock_broken_count color dark_gray +team modify fzsd.module.scoreboard.display.bedrock_broken_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 index 66ef458..c688cbd 100644 --- a/data/fzsd.extra.bbl/functions/display/set_text/dark_green.mcfunction +++ b/data/fzsd.extra.bbl/functions/display/set_text/dark_green.mcfunction @@ -1,7 +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"} +data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "dark_green"}' +scoreboard objectives setdisplay sidebar.team.dark_green fzsd.module.scoreboard.display.bedrock_broken_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "dark_green"} +team modify fzsd.module.scoreboard.display.bedrock_broken_count color dark_green +team modify fzsd.module.scoreboard.display.bedrock_broken_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 index 28ff5f4..03e4d07 100644 --- a/data/fzsd.extra.bbl/functions/display/set_text/dark_purple.mcfunction +++ b/data/fzsd.extra.bbl/functions/display/set_text/dark_purple.mcfunction @@ -1,7 +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"} +data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "dark_purple"}' +scoreboard objectives setdisplay sidebar.team.dark_purple fzsd.module.scoreboard.display.bedrock_broken_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "dark_purple"} +team modify fzsd.module.scoreboard.display.bedrock_broken_count color dark_purple +team modify fzsd.module.scoreboard.display.bedrock_broken_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 index e2c9496..354f5f4 100644 --- a/data/fzsd.extra.bbl/functions/display/set_text/dark_red.mcfunction +++ b/data/fzsd.extra.bbl/functions/display/set_text/dark_red.mcfunction @@ -1,7 +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"} +data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "dark_red"}' +scoreboard objectives setdisplay sidebar.team.dark_red fzsd.module.scoreboard.display.bedrock_broken_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "dark_red"} +team modify fzsd.module.scoreboard.display.bedrock_broken_count color dark_red +team modify fzsd.module.scoreboard.display.bedrock_broken_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 index ddee6f5..82a81c4 100644 --- a/data/fzsd.extra.bbl/functions/display/set_text/gold.mcfunction +++ b/data/fzsd.extra.bbl/functions/display/set_text/gold.mcfunction @@ -1,7 +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"} +data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "gold"}' +scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.bedrock_broken_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "gold"} +team modify fzsd.module.scoreboard.display.bedrock_broken_count color gold +team modify fzsd.module.scoreboard.display.bedrock_broken_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 index ac3f8e2..ff0fb5a 100644 --- a/data/fzsd.extra.bbl/functions/display/set_text/gray.mcfunction +++ b/data/fzsd.extra.bbl/functions/display/set_text/gray.mcfunction @@ -1,7 +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"} +data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "gray"}' +scoreboard objectives setdisplay sidebar.team.gray fzsd.module.scoreboard.display.bedrock_broken_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "gray"} +team modify fzsd.module.scoreboard.display.bedrock_broken_count color gray +team modify fzsd.module.scoreboard.display.bedrock_broken_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 index c8bbb96..b2edbd8 100644 --- a/data/fzsd.extra.bbl/functions/display/set_text/green.mcfunction +++ b/data/fzsd.extra.bbl/functions/display/set_text/green.mcfunction @@ -1,7 +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"} +data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "green"}' +scoreboard objectives setdisplay sidebar.team.green fzsd.module.scoreboard.display.bedrock_broken_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "green"} +team modify fzsd.module.scoreboard.display.bedrock_broken_count color green +team modify fzsd.module.scoreboard.display.bedrock_broken_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 index 016829c..2a96a54 100644 --- a/data/fzsd.extra.bbl/functions/display/set_text/light_purple.mcfunction +++ b/data/fzsd.extra.bbl/functions/display/set_text/light_purple.mcfunction @@ -1,7 +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"} +data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "purple"}' +scoreboard objectives setdisplay sidebar.team.light_purple fzsd.module.scoreboard.display.bedrock_broken_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "purple"} +team modify fzsd.module.scoreboard.display.bedrock_broken_count color light_purple +team modify fzsd.module.scoreboard.display.bedrock_broken_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 index debed87..5e875bc 100644 --- a/data/fzsd.extra.bbl/functions/display/set_text/red.mcfunction +++ b/data/fzsd.extra.bbl/functions/display/set_text/red.mcfunction @@ -1,7 +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"} +data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "red"}' +scoreboard objectives setdisplay sidebar.team.red fzsd.module.scoreboard.display.bedrock_broken_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "red"} +team modify fzsd.module.scoreboard.display.bedrock_broken_count color red +team modify fzsd.module.scoreboard.display.bedrock_broken_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 index b71a120..f669219 100644 --- a/data/fzsd.extra.bbl/functions/display/set_text/white.mcfunction +++ b/data/fzsd.extra.bbl/functions/display/set_text/white.mcfunction @@ -1,7 +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"} +data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "white"}' +scoreboard objectives setdisplay sidebar.team.white fzsd.module.scoreboard.display.bedrock_broken_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "white"} +team modify fzsd.module.scoreboard.display.bedrock_broken_count color white +team modify fzsd.module.scoreboard.display.bedrock_broken_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 index 10a5648..b93b7e5 100644 --- a/data/fzsd.extra.bbl/functions/display/set_text/yellow.mcfunction +++ b/data/fzsd.extra.bbl/functions/display/set_text/yellow.mcfunction @@ -1,7 +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"} +data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "yellow"}' +scoreboard objectives setdisplay sidebar.team.yellow fzsd.module.scoreboard.display.bedrock_broken_count +scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "yellow"} +team modify fzsd.module.scoreboard.display.bedrock_broken_count color yellow +team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "yellow"} diff --git a/data/fzsd.extra.bbl/functions/install.mcfunction b/data/fzsd.extra.bbl/functions/install.mcfunction index b62b0bd..e9ca10c 100644 --- a/data/fzsd.extra.bbl/functions/install.mcfunction +++ b/data/fzsd.extra.bbl/functions/install.mcfunction @@ -3,9 +3,9 @@ ## 添加底层实现计分板 scoreboard objectives add fzsd.extra.bbl dummy ## 添加显示计分板 -scoreboard objectives add fzsd.module.scoreboard.display.bedrock_broke_count dummy +scoreboard objectives add fzsd.module.scoreboard.display.bedrock_broken_count dummy ## 添加计分板订阅队伍 -team add fzsd.module.scoreboard.display.bedrock_broke_count +team add fzsd.module.scoreboard.display.bedrock_broken_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 index a9e418d..2adc4e0 100644 --- a/data/fzsd.extra.bbl/functions/interactor/display.mcfunction +++ b/data/fzsd.extra.bbl/functions/interactor/display.mcfunction @@ -1,3 +1,3 @@ # 见#fzsd:module/scoreboard/interactor/display ## 当破基岩榜分数不为0时向玩家显示按钮 -execute if data storage fzsd:install fzsd.extra{bbl:1b} 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 +execute if data storage fzsd:install fzsd.extra{bbl:1b} if score fzsd.module.scoreboard.total.bedrock_broken_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": "fzsd.scoreboard.text.bedrock_broken_count", "interpret": true, "storage": "fzsd:module"}, {"text": "]"}] \ 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 index 3dcf0cf..e23d74f 100644 --- a/data/fzsd.extra.bbl/functions/interactor/subscribe.mcfunction +++ b/data/fzsd.extra.bbl/functions/interactor/subscribe.mcfunction @@ -1,6 +1,6 @@ # 见./on_click -team join fzsd.module.scoreboard.display.bedrock_broke_count @s +team join fzsd.module.scoreboard.display.bedrock_broken_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/load.mcfunction b/data/fzsd.extra.bbl/functions/load.mcfunction new file mode 100644 index 0000000..342ae6e --- /dev/null +++ b/data/fzsd.extra.bbl/functions/load.mcfunction @@ -0,0 +1,3 @@ +execute if data storage fzsd:install fzsd.extra{bbl:1b} if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"text": "", "color": "green"}, {"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "fzsd.module.scoreboard.display.bedrock_broken_count - "}, {"nbt": "fzsd.scoreboard.text.bedrock_broken_count", "interpret": true, "storage": "fzsd:module"}] + +execute if data storage fzsd:install fzsd.extra{bbl:1b} 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/uninstall.mcfunction b/data/fzsd.extra.bbl/functions/uninstall.mcfunction index 860f125..1734f86 100644 --- a/data/fzsd.extra.bbl/functions/uninstall.mcfunction +++ b/data/fzsd.extra.bbl/functions/uninstall.mcfunction @@ -2,7 +2,7 @@ ## 移除底层实现计分板 scoreboard objectives remove fzsd.extra.bbl ## 移除计分板订阅队伍 -team remove fzsd.module.scoreboard.display.bedrock_broke_count +team remove fzsd.module.scoreboard.display.bedrock_broken_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/functions/boot.mcfunction b/data/fzsd/functions/boot.mcfunction index 5da4dfe..4d23114 100644 --- a/data/fzsd/functions/boot.mcfunction +++ b/data/fzsd/functions/boot.mcfunction @@ -1,4 +1,4 @@ -execute store success storage fzsd:version fzsd.need_update int 1 run data merge storage fzsd:version {fzsd: {version: '3.0.0-beta.11'}} +execute store success storage fzsd:version fzsd.need_update int 1 run data merge storage fzsd:version {fzsd: {version: '3.0.0-beta.12'}} execute if data storage fzsd:version fzsd{need_update: 1} run function fzsd:system/update function fzsd:system/carpet/try_load_fzsd_score function #fzsd:load diff --git a/data/fzsd/tags/functions/module/scoreboard/load.json b/data/fzsd/tags/functions/module/scoreboard/load.json index 401a0c0..f2661cb 100644 --- a/data/fzsd/tags/functions/module/scoreboard/load.json +++ b/data/fzsd/tags/functions/module/scoreboard/load.json @@ -6,6 +6,7 @@ "#fzsd:module/scoreboard/display/set_text", "fzsd:module/scoreboard/display/carousel/loop", "fzsd:module/scoreboard/load", - "fzsd.extra.bbl:try_install" + "fzsd.extra.bbl:try_install", + "fzsd.extra.bbl:load" ] } \ No newline at end of file diff --git a/scripts/fzsd_score.sc b/scripts/fzsd_score.sc index d0e6a1c..67255de 100644 --- a/scripts/fzsd_score.sc +++ b/scripts/fzsd_score.sc @@ -37,7 +37,8 @@ __config() -> { 'suggest' -> [ '2.x', '3.0-beta.4', - '3.0-beta.9' + '3.0-beta.9', + '3.0-beta.10' ] } } @@ -100,10 +101,13 @@ help() -> ( ); delete_old(fzsd_version) -> ( - if(fzsd_version == '3.0-beta.9', + if(fzsd_version == '3.0-beta.10', ( - old_scoreboards = ['fzsd.extra.bbl.display']; - for(old_scoreboards, scoreboard_remove(_)); + scoreboard_remove('fzsd.module.scoreboard.display.bedrock_broke_count'); + ), + fzsd_version == '3.0-beta.9', + ( + scoreboard_remove('fzsd.extra.bbl.display'); ), fzsd_version == '2.x', ( @@ -129,15 +133,13 @@ delete_old(fzsd_version) -> ( update_from(fzsd_version) -> ( if(fzsd_version == '3.0-beta.10', ( + merge_score('fzsd.module.scoreboard.display.bedrock_broke_count', 'fzsd.module.scoreboard.display.bedrock_broken_count', fzsd_version); + delete_old(fzsd_version); scoreboard_remove('fzsd.module.scoreboard.display.placement_count', '总放置方块数'); ), fzsd_version == '3.0-beta.9', ( - params = [ - ['fzsd.extra.bbl.display', 'fzsd.module.scoreboard.display.bedrock_broke_count'] - ]; - for(params, merge_score(..._, fzsd_version)); - // 清除旧计分板 + merge_score('fzsd.extra.bbl.display', 'fzsd.module.scoreboard.display.bedrock_broken_count', fzsd_version); delete_old(fzsd_version); ), fzsd_version == '2.x', @@ -150,11 +152,10 @@ update_from(fzsd_version) -> ( ['fishingCounter', 'fzsd.module.scoreboard.display.fishing_count'], ['killCounter', 'fzsd.module.scoreboard.display.kill_count'], ['tradingCounter', 'fzsd.module.scoreboard.display.trade_count'], - ['bedrockBreaked', 'fzsd.module.scoreboard.display.bedrock_broke_count'], + ['bedrockBreaked', 'fzsd.module.scoreboard.display.bedrock_broken_count'], ['fz.aviate1m', 'fzsd.module.scoreboard.display.aviating_distance'] ]; for(params, merge_score(..._, fzsd_version)); - // 清除旧计分板 delete_old(fzsd_version); ), fzsd_version == '3.0-beta.4', @@ -167,12 +168,11 @@ update_from(fzsd_version) -> ( ['fz.module.scoreboard.display.fishing_count', 'fzsd.module.scoreboard.display.fishing_count'], ['fz.module.scoreboard.display.kill_count', 'fzsd.module.scoreboard.display.kill_count'], ['fz.module.scoreboard.display.trade_count', 'fzsd.module.scoreboard.display.trade_count'], - ['fz.module.scoreboard.display.bedrock_broke_count', 'fzsd.module.scoreboard.display.bedrock_broke_count'], + ['fz.module.scoreboard.display.bedrock_broke_count', 'fzsd.module.scoreboard.display.bedrock_broken_count'], ['fz.module.scoreboard.display.aviating_distance', 'fzsd.module.scoreboard.display.aviating_distance'], ['fz.module.scoreboard.display.placement_count', 'fzsd.module.scoreboard.display.placement_count'] ]; for(params, merge_score(..._, fzsd_version)); - // 清除旧计分板 delete_old(fzsd_version); ), print('参数错误!'); @@ -272,7 +272,7 @@ recalculate_total_scores() -> ( 'fzsd.module.scoreboard.display.fishing_count', 'fzsd.module.scoreboard.display.kill_count', 'fzsd.module.scoreboard.display.trade_count', - 'fzsd.module.scoreboard.display.bedrock_broke_count', + 'fzsd.module.scoreboard.display.bedrock_broken_count', 'fzsd.module.scoreboard.display.placement_count', 'fzsd.module.scoreboard.display.aviating_distance' ];