Compare commits

..

1 Commits

Author SHA1 Message Date
延皓 cccc793446 修复拼写错误 2022-09-02 07:30:25 +08:00
31 changed files with 134 additions and 130 deletions
+2 -2
View File
@@ -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) > 其他版本见[发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases)
@@ -59,7 +59,7 @@
| 默认名称 | 计分板ID | | 默认名称 | 计分板ID |
| :------: | :----------------------------------------------: | | :------: | :----------------------------------------------: |
| 破基岩榜 |fzsd.module.scoreboard.display.bedrock_broke_count| | 破基岩榜 |fzsd.module.scoreboard.display.bedrock_broken_count|
### 地毯脚本 ### 地毯脚本
@@ -1,5 +1,5 @@
# 见#fzsd.extra.bbl:event/broke_bedrock # 见#fzsd.extra.bbl:event/broke_bedrock
## id不存在则注册运行时id ## 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 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_broke_count += fzsd.var.score fzsd.variable.integer 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_broke_count fzsd.module.scoreboard.assign.general += 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
@@ -1,5 +1,5 @@
# 见#fzsd.extra.bbl:event/broke_bedrock # 见#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.general = fzsd.module.scoreboard.total.bedrock_broken_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 scoreboard players operation fzsd.module.scoreboard.display.bedrock_broken_count = fzsd.module.scoreboard.total.bedrock_broken_count fzsd.module.scoreboard.assign.general
@@ -1,3 +1,3 @@
# 见#fzsd:module/scoreboard/clear_data # 见#fzsd:module/scoreboard/clear_data
## ##
scoreboard objectives remove fzsd.module.scoreboard.display.bedrock_broke_count scoreboard objectives remove fzsd.module.scoreboard.display.bedrock_broken_count
@@ -1,21 +1,21 @@
# 见./try_display # 见./try_display
## https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 ## 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 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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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": "计分板"}] 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": "计分板"}]
@@ -1,2 +1,2 @@
# 见#fzsd:module/scoreboard/display/carousel/try_display # 见#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 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
@@ -1,6 +1,6 @@
# 见#fzsd:module/scoreboard/display/register_id # 见#fzsd:module/scoreboard/display/register_id
#### 0id #### 0id
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_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_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 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"}}] 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"}}]
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text # 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"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_broke_count scoreboard objectives setdisplay sidebar.team.aqua fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "aqua"} scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "aqua"}
team modify fzsd.module.scoreboard.display.bedrock_broke_count color aqua team modify fzsd.module.scoreboard.display.bedrock_broken_count color aqua
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "aqua"} team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "aqua"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text # 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"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_broke_count scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "#202020"} scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "#202020"}
team modify fzsd.module.scoreboard.display.bedrock_broke_count color black team modify fzsd.module.scoreboard.display.bedrock_broken_count color black
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "#202020"} team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "#202020"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text # 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"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_broke_count scoreboard objectives setdisplay sidebar.team.blue fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "blue"} scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "blue"}
team modify fzsd.module.scoreboard.display.bedrock_broke_count color blue team modify fzsd.module.scoreboard.display.bedrock_broken_count color blue
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "blue"} team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "blue"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text # 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"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_broke_count scoreboard objectives setdisplay sidebar.team.dark_aqua fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "dark_aqua"} scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_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_broken_count color dark_aqua
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "dark_aqua"} team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "dark_aqua"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text # 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"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_broke_count scoreboard objectives setdisplay sidebar.team.dark_blue fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "dark_blue"} scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_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_broken_count color dark_blue
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "dark_blue"} team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "dark_blue"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text # 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"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_broke_count scoreboard objectives setdisplay sidebar.team.dark_gray fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "dark_gray"} scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_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_broken_count color dark_gray
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "dark_gray"} team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "dark_gray"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text # 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"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_broke_count scoreboard objectives setdisplay sidebar.team.dark_green fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "dark_green"} scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_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_broken_count color dark_green
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "dark_green"} team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "dark_green"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text # 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"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_broke_count scoreboard objectives setdisplay sidebar.team.dark_purple fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "dark_purple"} scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_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_broken_count color dark_purple
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "dark_purple"} team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "dark_purple"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text # 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"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_broke_count scoreboard objectives setdisplay sidebar.team.dark_red fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "dark_red"} scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_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_broken_count color dark_red
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "dark_red"} team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "dark_red"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text # 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"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_broke_count scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "gold"} scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "gold"}
team modify fzsd.module.scoreboard.display.bedrock_broke_count color gold team modify fzsd.module.scoreboard.display.bedrock_broken_count color gold
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "gold"} team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "gold"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text # 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"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_broke_count scoreboard objectives setdisplay sidebar.team.gray fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "gray"} scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "gray"}
team modify fzsd.module.scoreboard.display.bedrock_broke_count color gray team modify fzsd.module.scoreboard.display.bedrock_broken_count color gray
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "gray"} team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "gray"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text # 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"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_broke_count scoreboard objectives setdisplay sidebar.team.green fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "green"} scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "green"}
team modify fzsd.module.scoreboard.display.bedrock_broke_count color green team modify fzsd.module.scoreboard.display.bedrock_broken_count color green
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "green"} team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "green"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text # 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"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_broke_count scoreboard objectives setdisplay sidebar.team.light_purple fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "purple"} scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "purple"}
team modify fzsd.module.scoreboard.display.bedrock_broke_count color light_purple team modify fzsd.module.scoreboard.display.bedrock_broken_count color light_purple
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "purple"} team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "purple"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text # 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"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_broke_count scoreboard objectives setdisplay sidebar.team.red fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "red"} scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "red"}
team modify fzsd.module.scoreboard.display.bedrock_broke_count color red team modify fzsd.module.scoreboard.display.bedrock_broken_count color red
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "red"} team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "red"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text # 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"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_broke_count scoreboard objectives setdisplay sidebar.team.white fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "white"} scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "white"}
team modify fzsd.module.scoreboard.display.bedrock_broke_count color white team modify fzsd.module.scoreboard.display.bedrock_broken_count color white
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "white"} team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "white"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text # 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"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_broke_count scoreboard objectives setdisplay sidebar.team.yellow fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "yellow"} scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "yellow"}
team modify fzsd.module.scoreboard.display.bedrock_broke_count color yellow team modify fzsd.module.scoreboard.display.bedrock_broken_count color yellow
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "yellow"} team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "yellow"}
@@ -3,9 +3,9 @@
## ##
scoreboard objectives add fzsd.extra.bbl dummy 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 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": "已安装扩展:破基岩榜"}] execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已安装扩展:破基岩榜"}]
@@ -1,3 +1,3 @@
# 见#fzsd:module/scoreboard/interactor/display # 见#fzsd:module/scoreboard/interactor/display
## 0 ## 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": "]"}] 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": "]"}]
@@ -1,6 +1,6 @@
# 见./on_click # 见./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": "计分板"}] 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": "计分板"}]
@@ -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": "已加载扩展:破基岩榜"}]
@@ -2,7 +2,7 @@
## ##
scoreboard objectives remove fzsd.extra.bbl 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 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": "已卸载扩展:破基岩榜"}] execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已卸载扩展:破基岩榜"}]
+1 -1
View File
@@ -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 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:system/carpet/try_load_fzsd_score
function #fzsd:load function #fzsd:load
@@ -6,6 +6,7 @@
"#fzsd:module/scoreboard/display/set_text", "#fzsd:module/scoreboard/display/set_text",
"fzsd:module/scoreboard/display/carousel/loop", "fzsd:module/scoreboard/display/carousel/loop",
"fzsd:module/scoreboard/load", "fzsd:module/scoreboard/load",
"fzsd.extra.bbl:try_install" "fzsd.extra.bbl:try_install",
"fzsd.extra.bbl:load"
] ]
} }
+14 -14
View File
@@ -37,7 +37,8 @@ __config() -> {
'suggest' -> [ 'suggest' -> [
'2.x', '2.x',
'3.0-beta.4', '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) -> ( delete_old(fzsd_version) -> (
if(fzsd_version == '3.0-beta.9', if(fzsd_version == '3.0-beta.10',
( (
old_scoreboards = ['fzsd.extra.bbl.display']; scoreboard_remove('fzsd.module.scoreboard.display.bedrock_broke_count');
for(old_scoreboards, scoreboard_remove(_)); ),
fzsd_version == '3.0-beta.9',
(
scoreboard_remove('fzsd.extra.bbl.display');
), ),
fzsd_version == '2.x', fzsd_version == '2.x',
( (
@@ -129,15 +133,13 @@ delete_old(fzsd_version) -> (
update_from(fzsd_version) -> ( update_from(fzsd_version) -> (
if(fzsd_version == '3.0-beta.10', 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', '总放置方块数'); scoreboard_remove('fzsd.module.scoreboard.display.placement_count', '总放置方块数');
), ),
fzsd_version == '3.0-beta.9', fzsd_version == '3.0-beta.9',
( (
params = [ merge_score('fzsd.extra.bbl.display', 'fzsd.module.scoreboard.display.bedrock_broken_count', fzsd_version);
['fzsd.extra.bbl.display', 'fzsd.module.scoreboard.display.bedrock_broke_count']
];
for(params, merge_score(..._, fzsd_version));
// 清除旧计分板
delete_old(fzsd_version); delete_old(fzsd_version);
), ),
fzsd_version == '2.x', fzsd_version == '2.x',
@@ -150,11 +152,10 @@ update_from(fzsd_version) -> (
['fishingCounter', 'fzsd.module.scoreboard.display.fishing_count'], ['fishingCounter', 'fzsd.module.scoreboard.display.fishing_count'],
['killCounter', 'fzsd.module.scoreboard.display.kill_count'], ['killCounter', 'fzsd.module.scoreboard.display.kill_count'],
['tradingCounter', 'fzsd.module.scoreboard.display.trade_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'] ['fz.aviate1m', 'fzsd.module.scoreboard.display.aviating_distance']
]; ];
for(params, merge_score(..._, fzsd_version)); for(params, merge_score(..._, fzsd_version));
// 清除旧计分板
delete_old(fzsd_version); delete_old(fzsd_version);
), ),
fzsd_version == '3.0-beta.4', 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.fishing_count', 'fzsd.module.scoreboard.display.fishing_count'],
['fz.module.scoreboard.display.kill_count', 'fzsd.module.scoreboard.display.kill_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.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.aviating_distance', 'fzsd.module.scoreboard.display.aviating_distance'],
['fz.module.scoreboard.display.placement_count', 'fzsd.module.scoreboard.display.placement_count'] ['fz.module.scoreboard.display.placement_count', 'fzsd.module.scoreboard.display.placement_count']
]; ];
for(params, merge_score(..._, fzsd_version)); for(params, merge_score(..._, fzsd_version));
// 清除旧计分板
delete_old(fzsd_version); delete_old(fzsd_version);
), ),
print('参数错误!'); print('参数错误!');
@@ -272,7 +272,7 @@ recalculate_total_scores() -> (
'fzsd.module.scoreboard.display.fishing_count', 'fzsd.module.scoreboard.display.fishing_count',
'fzsd.module.scoreboard.display.kill_count', 'fzsd.module.scoreboard.display.kill_count',
'fzsd.module.scoreboard.display.trade_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.placement_count',
'fzsd.module.scoreboard.display.aviating_distance' 'fzsd.module.scoreboard.display.aviating_distance'
]; ];