3.0.4

Signed-off-by: 延皓 <1214946206@qq.com>

DEVDOC.md

@@ -25,11 +25,6 @@
 - 函数调用尽量不要使用`function`命令，应改在标签中按顺序调用！
 
 
-## 未来计划
-- 细化版本管理，提供不同版本之间的升级函数，由`update_manager`控制。*务必仔细测试再发布，一旦升级无法降级！*
-- playerdata相关功能
-
-
 ## 系统模块
 
 ### 频繁使用的计算单元

README.md

@@ -11,7 +11,7 @@
 ## 安装教程
 
 1. 兼容性
-     - `数据包 v3.0.x` 支持 `Minecraft 1.19.x`（*由于使用了1.18.x不支持的操作，撤销对MC1.18.x的支持*）
+     - `数据包 v3.0.x` 支持 `Minecraft 1.18.2-1.19.x`
      - `数据包 v2.2.x` 支持 `Minecraft 1.19.x`
      - `数据包 v2.1.x` 支持 `Minecraft 1.17.x-1.18.x`
      - `数据包 v2.0.x` 支持 `Minecraft 1.16.3-1.16.5`
@@ -25,9 +25,7 @@
 
 # FZ生存数据包 3.0
 
-## *目前仍在测试阶段，请先备份服务器再使用！*
+[![数据包版本](https://img.shields.io/badge/正式版-3.0.3-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases) [![MC版本](https://img.shields.io/badge/Minecraft-1.19+-blue.svg)](https://minecraft.net/)
-
-[![数据包版本](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://gitee.com/harvey-husky/FZ-sDatapack/releases)
 
@@ -59,7 +57,7 @@
 
   | 默认名称 |                     计分板ID                     |
   | :------: | :----------------------------------------------: |
-  | 破基岩榜 |fzsd.module.scoreboard.display.bedrock_broke_count|
+  | 破基岩榜 |fzsd.module.scoreboard.display.bedrock_broken_count|
 
 
 ### 地毯脚本
@@ -70,10 +68,21 @@
 - 脚本：
   - `fzsd_score.sc`（**开发中！此处列举目前已完成的**）：
     - 可避免Carpet假人污染计分板
-    - 执行 `reload` 指令后自动生效
+    - 可以标记哪些玩家是假人
+    - *注：请不要使用为假人名添加“bot”前缀的carpet扩展，本插件不支持此类假人！*
     - 子命令（ `/fzsd_score <子命令>` ）：
-      - `update_from <version>`：用于从给定的数据包版本恢复计分板数据（需要测试！）
+      - `updateFrom <version>`：用于从给定的数据包版本恢复计分板数据（需要测试！）
-      - `recalculate_total`：重新计算总分
+      - `recalculate`：重新计算所有计分板总分
+      - `recalculate <scoreboardID>`：重新计算该计分板总分
+      - `set <player> <scoreboardID> <score>`：设置该玩家该计分板的分数
+      - `reset <player>`：重置该玩家的所有分数
+      - `reset <player> <scoreboardID>`：重置该玩家该计分板的分数
+      - `restore player <玩家名> <计分板ID>`：恢复该玩家的该计分板分数
+      - `restore player <玩家名>`：恢复该玩家的所有计分板分数
+      - `restore whitelist <玩家名> <计分板ID>`：恢复所有白名单玩家的该计分板分数
+      - `restore whitelist <玩家名>`：恢复所有白名单玩家的所有计分板分数
+        - *副作用：恢复完成后玩家会被放置在出生点，请确保出生点完全安全*
+      - `commandPlayer <permissionType>`：设置player命令权限类型
 
 ### 其他
 - 见游戏内交互器按钮

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
+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

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.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

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
+scoreboard objectives remove fzsd.module.scoreboard.display.bedrock_broken_count

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 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": "计分板"}]

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
+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

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_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"}}]

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"}'
+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"}

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"}'
+data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "black"}'
-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": "black"}
-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": "black"}

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"}'
+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"}

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"}'
+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"}

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"}'
+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"}

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"}'
+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"}

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"}'
+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"}

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"}'
+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"}

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"}'
+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"}

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"}'
+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"}

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"}'
+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"}

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"}'
+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"}

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"}'
+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"}

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"}'
+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"}

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"}'
+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"}

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"}'
+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"}

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": "已安装扩展：破基岩榜"}]

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": "]"}]
+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": "]"}]

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": "计分板"}]

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": "已加载扩展：破基岩榜"}]

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": "已卸载扩展：破基岩榜"}]

data/fzsd/advancements/game_event/on_tool_axes_used_on_block.json

@@ -0,0 +1,28 @@
+{
+    "parent": "fzsd:game_event",
+    "criteria": {
+        "on_tools_exclude_axes_used_on_block": {
+            "trigger": "minecraft:item_used_on_block",
+            "conditions": {
+                "player": [
+                    {
+                        "condition": "minecraft:reference",
+                        "name": "fzsd:is_real_player"
+                    }
+                ],
+                "item": {
+                    "tag": "fzsd:tool/axes"
+                },
+                "location": {
+                    "__comment": "斧子剥树皮会触发两次，所以用目标方块限定只触发一次",
+                    "block": {
+                        "tag": "fzsd:stripped_blocks"
+                    }
+                }
+            }
+        }
+    },
+    "rewards": {
+        "function": "fzsd:game_event/advancement/on_tools_used_on_block"
+    }
+}

data/fzsd/advancements/game_event/on_tools_exclude_axes_used_on_block.json

@@ -1,7 +1,7 @@
 {
     "parent": "fzsd:game_event",
     "criteria": {
-        "on_tools_used_on_block": {
+        "on_tools_exclude_axes_used_on_block": {
             "__comment": "斧子剥树皮会触发两次！",
             "trigger": "minecraft:item_used_on_block",
             "conditions": {
@@ -12,7 +12,7 @@
                     }
                 ],
                 "item": {
-                    "tag": "fzsd:tools"
+                    "tag": "fzsd:tools_exclude_axes"
                 }
             }
         }

data/fzsd/functions/boot.mcfunction

@@ -1,5 +1,5 @@
-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.4'}}
 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
-execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "FZ Survival Data Pack，当前版本：", "color": "gold"}, {"nbt":"fzsd.version", "storage": "fzsd:version", "color": "yellow"}]
+execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "FZ Survival Data Pack，当前版本：", "color": "gold"}, {"nbt":"fzsd.version", "storage": "fzsd:version", "color": "red"}]

data/fzsd/functions/game_event/advancement/on_tools_used_on_block.mcfunction

@@ -1,5 +1,4 @@
 # 调用者：advancements/fzsd:~
-## 斧子剥树皮会触发两次！！
 
 ## 调试
 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": "在方块上使用了工具"}]
@@ -11,4 +10,5 @@ scoreboard players remove @s fzsd.event.used_tool.dig_offset 1
 function #fzsd:game_event/player/on_tools_used_on_block
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_tools_used_on_block
+advancement revoke @s only fzsd:game_event/on_tool_axes_used_on_block
+advancement revoke @s only fzsd:game_event/on_tools_exclude_axes_used_on_block

data/fzsd/functions/game_event/on_tick.mcfunction

@@ -1,3 +1,3 @@
-scoreboard players add @a[predicate=fzsd:is_real_player] fz.event.play_ticks 1
+scoreboard players add @a[predicate=fzsd:is_real_player] fzsd.event.play_ticks 1
 function #fzsd:game_event/on_tick
 schedule function fzsd:game_event/on_tick 1t replace

data/fzsd/functions/game_event/player/on_broke_block_with_tool/on_used_tool.mcfunction

@@ -30,7 +30,7 @@ scoreboard players operation fzsd.var.score fzsd.variable.integer += @s fzsd.eve
 scoreboard players operation fzsd.var.score fzsd.variable.integer += @s fzsd.event.used_tool.wooden_pickaxe
 scoreboard players operation fzsd.var.score fzsd.variable.integer += @s fzsd.event.used_tool.wooden_shovel
 scoreboard players operation fzsd.var.score fzsd.variable.integer += @s fzsd.event.used_tool.wooden_sword
-scoreboard players operation fzsd.var.score fzsd.variable.integer += @s fzsd.event.used_tool.offset
+scoreboard players operation fzsd.var.score fzsd.variable.integer += @s fzsd.event.used_tool.dig_offset
 
 ## 判断分数
 execute unless score fzsd.var.score fzsd.variable.integer matches ..0 run function fzsd:game_event/player/on_broke_block_with_tool

data/fzsd/functions/game_event/player/on_used_tool/reset_used_tool.mcfunction

@@ -1,4 +1,4 @@
-scoreboard players set @s fzsd.event.used_tool.offset 0
+scoreboard players set @s fzsd.event.used_tool.dig_offset 0
 scoreboard players set @s fzsd.event.used_tool.diamond_axe 0
 scoreboard players set @s fzsd.event.used_tool.diamond_hoe 0
 scoreboard players set @s fzsd.event.used_tool.diamond_pickaxe 0

data/fzsd/functions/module/here/get_dimension_message/if_overworld.mcfunction

@@ -3,4 +3,4 @@ execute store result storage fzsd:here fzsd.nether.x int 0.125 run data get enti
 execute store result storage fzsd:here fzsd.nether.z int 0.125 run data get entity @s Pos[2]
 data modify storage fzsd:global fzsd.api.dimension.id set value "minecraft:the_nether"
 function #fzsd:api/get_dimension_name
-data modify storage fzsd:here fzsd.message[2] set value '[{"text": "，对应", "color": "white"}, {"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": "[", "color": "green"}, {"nbt": "fzsd.nether.x", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.nether.z", "storage": "fzsd:here"}, {"text": "]"}]]'
+data modify storage fzsd:here fzsd.message.append set value '[{"text": "，对应", "color": "white"}, {"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": "[", "color": "green"}, {"nbt": "fzsd.nether.x", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.nether.z", "storage": "fzsd:here"}, {"text": "]"}]]'

data/fzsd/functions/module/here/get_dimension_message/if_the_nether.mcfunction

@@ -3,4 +3,4 @@ execute store result storage fzsd:here fzsd.overworld.x int 8 run data get entit
 execute store result storage fzsd:here fzsd.overworld.z int 8 run data get entity @s Pos[2]
 data modify storage fzsd:global fzsd.api.dimension.id set value "minecraft:overworld"
 function #fzsd:api/get_dimension_name
-data modify storage fzsd:here fzsd.message[2] set value '[{"text": "，对应", "color": "white"}, {"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": "[", "color": "green"}, {"nbt": "fzsd.overworld.x", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.overworld.z", "storage": "fzsd:here"}, {"text": "]"}]]'
+data modify storage fzsd:here fzsd.message.append set value '[{"text": "，对应", "color": "white"}, {"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": "[", "color": "green"}, {"nbt": "fzsd.overworld.x", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.overworld.z", "storage": "fzsd:here"}, {"text": "]"}]]'

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": "#202020"}'
+data modify storage fzsd:module fzsd.scoreboard.text.activation set value '{"text": "活跃时间（h）", "color": "black"}'
 scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.activation
-scoreboard objectives modify fzsd.module.scoreboard.display.activation displayname {"text": "活跃时间（h）", "color": "#202020"}
+scoreboard objectives modify fzsd.module.scoreboard.display.activation displayname {"text": "活跃时间（h）", "color": "black"}
 team modify fzsd.module.scoreboard.display.activation color black
-team modify fzsd.module.scoreboard.display.activation displayName {"text": "活跃时间（h）", "color": "#202020"}
+team modify fzsd.module.scoreboard.display.activation displayName {"text": "活跃时间（h）", "color": "black"}

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": "#202020"}'
+data modify storage fzsd:module fzsd.scoreboard.text.aviating_distance set value '{"text": "飞行距离", "color": "black"}'
 scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.aviating_distance
-scoreboard objectives modify fzsd.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "#202020"}
+scoreboard objectives modify fzsd.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "black"}
 team modify fzsd.module.scoreboard.display.aviating_distance color black
-team modify fzsd.module.scoreboard.display.aviating_distance displayName {"text": "飞行距离", "color": "#202020"}
+team modify fzsd.module.scoreboard.display.aviating_distance displayName {"text": "飞行距离", "color": "black"}

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": "#202020"}'
+data modify storage fzsd:module fzsd.scoreboard.text.carousel set value '{"text": "轮播", "color": "black"}'
 team modify fzsd.module.scoreboard.display.carousel color black
-team modify fzsd.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "#202020"}
+team modify fzsd.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "black"}
 scoreboard players set fzsd.module.scoreboard.carousel.color fzsd.variable.integer 0

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": "#202020"}'
+data modify storage fzsd:module fzsd.scoreboard.text.damage_taken set value '{"text": "抖M榜", "color": "black"}'
 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": "#202020"}
+scoreboard objectives modify fzsd.module.scoreboard.display.damage_taken displayname {"text": "抖M榜", "color": "black"}
 team modify fzsd.module.scoreboard.display.damage_taken color black
-team modify fzsd.module.scoreboard.display.damage_taken displayName {"text": "抖M榜", "color": "#202020"}
+team modify fzsd.module.scoreboard.display.damage_taken displayName {"text": "抖M榜", "color": "black"}

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": "#202020"}'
+data modify storage fzsd:module fzsd.scoreboard.text.death_count set value '{"text": "死亡榜", "color": "black"}'
 scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.death_count
-scoreboard objectives modify fzsd.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "#202020"}
+scoreboard objectives modify fzsd.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "black"}
 team modify fzsd.module.scoreboard.display.death_count color black
-team modify fzsd.module.scoreboard.display.death_count displayName {"text": "死亡榜", "color": "#202020"}
+team modify fzsd.module.scoreboard.display.death_count displayName {"text": "死亡榜", "color": "black"}

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": "#202020"}'
+data modify storage fzsd:module fzsd.scoreboard.text.dig_count set value '{"text": "挖掘榜", "color": "black"}'
 scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.dig_count
-scoreboard objectives modify fzsd.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "#202020"}
+scoreboard objectives modify fzsd.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "black"}
 team modify fzsd.module.scoreboard.display.dig_count color black
-team modify fzsd.module.scoreboard.display.dig_count displayName {"text": "挖掘榜", "color": "#202020"}
+team modify fzsd.module.scoreboard.display.dig_count displayName {"text": "挖掘榜", "color": "black"}

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": "#202020"}'
+data modify storage fzsd:module fzsd.scoreboard.text.fishing_count set value '{"text": "钓鱼榜", "color": "black"}'
 scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.fishing_count
-scoreboard objectives modify fzsd.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "#202020"}
+scoreboard objectives modify fzsd.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "black"}
 team modify fzsd.module.scoreboard.display.fishing_count color black
-team modify fzsd.module.scoreboard.display.fishing_count displayName {"text": "钓鱼榜", "color": "#202020"}
+team modify fzsd.module.scoreboard.display.fishing_count displayName {"text": "钓鱼榜", "color": "black"}

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": "#202020"}'
+data modify storage fzsd:module fzsd.scoreboard.text.general set value '{"text": "总榜", "color": "black"}'
 scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.general
-scoreboard objectives modify fzsd.module.scoreboard.display.general displayname {"text": "总榜", "color": "#202020"}
+scoreboard objectives modify fzsd.module.scoreboard.display.general displayname {"text": "总榜", "color": "black"}
 team modify fzsd.module.scoreboard.display.general color black
-team modify fzsd.module.scoreboard.display.general displayName {"text": "总榜", "color": "#202020"}
+team modify fzsd.module.scoreboard.display.general displayName {"text": "总榜", "color": "black"}

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": "#202020"}'
+data modify storage fzsd:module fzsd.scoreboard.text.kill_count set value '{"text": "击杀榜", "color": "black"}'
 scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.kill_count
-scoreboard objectives modify fzsd.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "#202020"}
+scoreboard objectives modify fzsd.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "black"}
 team modify fzsd.module.scoreboard.display.kill_count color black
-team modify fzsd.module.scoreboard.display.kill_count displayName {"text": "击杀榜", "color": "#202020"}
+team modify fzsd.module.scoreboard.display.kill_count displayName {"text": "击杀榜", "color": "black"}

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": "#202020"}'
+data modify storage fzsd:module fzsd.scoreboard.text.placement_count set value '{"text": "方块放置榜", "color": "black"}'
 scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.placement_count
-scoreboard objectives modify fzsd.module.scoreboard.display.placement_count displayname {"text": "方块放置榜", "color": "#202020"}
+scoreboard objectives modify fzsd.module.scoreboard.display.placement_count displayname {"text": "方块放置榜", "color": "black"}
 team modify fzsd.module.scoreboard.display.placement_count color black
-team modify fzsd.module.scoreboard.display.placement_count displayName {"text": "方块放置榜", "color": "#202020"}
+team modify fzsd.module.scoreboard.display.placement_count displayName {"text": "方块放置榜", "color": "black"}

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": "#202020"}'
+data modify storage fzsd:module fzsd.scoreboard.text.trade_count set value '{"text": "交易榜", "color": "black"}'
 scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.trade_count
-scoreboard objectives modify fzsd.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "#202020"}
+scoreboard objectives modify fzsd.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "black"}
 team modify fzsd.module.scoreboard.display.trade_count color black
-team modify fzsd.module.scoreboard.display.trade_count displayName {"text": "交易榜", "color": "#202020"}
+team modify fzsd.module.scoreboard.display.trade_count displayName {"text": "交易榜", "color": "black"}

data/fzsd/tags/functions/game_event/player/on_tools_used_on_block.json

@@ -1,6 +1,5 @@
 {
     "replace": false,
     "values": [
-        
     ]
 }

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"
     ]
 }

data/fzsd/tags/items/tools_exclude_axes.json

@@ -0,0 +1,10 @@
+{
+    "replace": false,
+    "values": [
+        "#fzsd:tool/hoes",
+        "#fzsd:tool/pickaxes",
+        "#fzsd:tool/shears",
+        "#fzsd:tool/shovels",
+        "#fzsd:tool/swords"
+    ]
+}

scripts/fzsd_score.sc

@@ -1,7 +1,20 @@
 // 计分板模块扩展插件
 // 忽略假人分数
 // **请勿修改文件名！！**
-global_app_version = '1.0-beta.8';
+global_app_version = '1.0-beta.13';
+global_current_scoreboard_list =  [
+    'fzsd.module.scoreboard.display.activation',
+    'fzsd.module.scoreboard.display.damage_taken',
+    'fzsd.module.scoreboard.display.death_count',
+    'fzsd.module.scoreboard.display.dig_count',
+    'fzsd.module.scoreboard.display.fishing_count',
+    'fzsd.module.scoreboard.display.kill_count',
+    'fzsd.module.scoreboard.display.trade_count',
+    'fzsd.module.scoreboard.display.bedrock_broken_count',
+    'fzsd.module.scoreboard.display.aviating_distance',
+    'fzsd.module.scoreboard.display.placement_count'
+];
+global_app_name = system_info('app_name');
 
 __config() -> {
     'scope' -> 'global',
@@ -9,21 +22,51 @@ __config() -> {
         'carpet' -> '>=1.4.45',
         'minecraft' -> '>=1.17'
     },
-    'command_permission' -> 4,
+    'command_permission' -> 2,
     'commands' -> {
         '' -> 'help',
         'help' -> 'help',
-        'delete_old <delete_old>' -> 'delete_old',
+        'delete <version>' -> 'command_delete',
-        'update_from <update_from>' -> 'update_from',
+        'update <version>' -> 'command_update',
-        'restore_from_stats' -> 'restore_from_stats',
+        'restore whitelist' -> ['command_restore', null, null],
-        'recalculate_total' -> 'recalculate_total_scores',
+        'restore whitelist <scoreboardID>' -> _(scoreboardID) -> command_restore(null, scoreboardID),
-        'commandPlayer <boolean>' -> 'command_player'
+        'restore player <playerName>' -> ['command_restore', null],
+        'restore player <playerName> <scoreboardID>' -> 'command_restore',
+        'restore <custom> whitelist <trade_count>' -> _(custom, trade_count) -> command_restore_trade_count_confirm(custom, null, trade_count),
+        'restore <custom> player <playerName> <trade_count>' -> 'command_restore_trade_count_confirm',
+        'recalculate <scoreboardID>' -> 'recalculate_total_score',
+        'recalculate' -> ['recalculate_total_score', null],
+        'commandPlayer <permissionType>' -> 'carpet_command_player',
+        'reset <scoreboardPlayer> <scoreboardID>' -> 'command_reset',
+        'reset <scoreboardPlayer>' -> ['command_reset', null],
+        'set <playerName> <scoreboardID> <score>' -> 'command_set'
     },
     'arguments' -> {
-        'boolean' -> {
+        'trade_count' -> {
-            'type' -> 'bool'
+            'type' -> 'term',
+            'suggest' -> ['fzsd.module.scoreboard.display.trade_count']
         },
-        'update_from' -> {
+        'playerName' -> {
+            'type' -> 'term',
+            'suggester' -> _(args) -> player('all')
+        },
+        'scoreboardID' -> {
+            'type' -> 'term',
+            'suggest' -> global_current_scoreboard_list
+        },
+        'scoreboardPlayer' -> {
+            'type' -> 'term',
+            'suggester' -> _(args) -> get_scoreboard_player_list()
+        },
+        'permissionType' -> {
+            'type' -> 'term',
+            'suggest' -> [
+                'true',
+                'false',
+                'ops'
+            ]
+        },
+        'version' -> {
             'type' -> 'term',
             'suggest' -> [
                 '2.x',
@@ -32,13 +75,13 @@ __config() -> {
                 '3.0-beta.10'
             ]
         },
-        'delete_old' -> {
+        'score' -> {
+            'type' -> 'int',
+            'suggest' -> []
+        },
+        'custom' -> {
             'type' -> 'term',
-            'suggest' -> [
+            'suggest' -> []
-                '2.x',
-                '3.0-beta.4',
-                '3.0-beta.9'
-            ]
         }
     }
 };
@@ -60,24 +103,70 @@ __on_player_connects(player) -> (
     player_type = player ~ 'player_type';
     player_team = player ~ 'team';
     player_name = player ~ 'name';
-    if(player_type == 'fake' && player_team != 'fzsd.module.scoreboard.fake',
+    if(player_type == 'fake',
         (
+            if(player_team != 'fzsd.module.scoreboard.fake',
                 global_team_cache:player_name = player_team;
+            );
             team_add('fzsd.module.scoreboard.fake', player);
+            print(player('all'), '↑假的');
         ),
-        player_type == 'shadow' && player_team != 'fzsd.module.scoreboard.shadow',
+        player_type == 'shadow',
         (
+            if(player_team != 'fzsd.module.scoreboard.shadow',
                 global_team_cache:player_name = player_team;
+            );
             team_add('fzsd.module.scoreboard.shadow', player);
+            print(player('all'), '↑挂机');
         ),
         try_restore_team_from_cache(player);
     );
 );
 
 __on_player_disconnects(player, reason) -> (
+    player_type = player ~ 'player_type';
+    if(player_type == 'fake' && player_team != 'fzsd.module.scoreboard.fake',
+        (
+            print(player('all'), '↓假的');
+        ),
+        player_type == 'shadow' && player_team != 'fzsd.module.scoreboard.shadow',
+        (
+            print(player('all'), '↓挂机');
+        )
+    );
     try_restore_team_from_cache(player);
 );
 
+// 获取所有计分板下的所有玩家列表
+get_scoreboard_player_list() -> (
+    set = m();
+    for(global_current_scoreboard_list, 
+        for(scoreboard(_),
+            if(_ ~ '\\w',
+                put(set:_, null);
+            );
+        );
+    );
+    return(keys(set));
+);
+
+// 重置玩家计分板分数
+command_reset(player, scoreboard) -> (
+    if(scoreboard == null,
+        for(scoreboard(),
+            scoreboard_remove(_, player);
+        );
+        recalculate_total_score(null);
+        print('已重置' + player + '的所有分数');
+        return();
+    );
+    scoreboard_remove(scoreboard, player);
+    recalculate_total_score(scoreboard);
+    print('已重置' + player + '的' + scoreboard + '分数');        
+    return();
+);
+
+// 尝试从缓存恢复玩家队伍，玩家/假人上下线时执行
 try_restore_team_from_cache(player) -> (
     player_team = player ~ 'team';
     player_name = player ~ 'name';
@@ -99,11 +188,15 @@ help() -> (
     return();
 );
 
-delete_old(fzsd_version) -> (
+// 删除旧版的计分板
-    if(fzsd_version == '3.0-beta.9',
+command_delete(fzsd_version) -> (
+    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',
         (
@@ -126,19 +219,19 @@ delete_old(fzsd_version) -> (
     return();
 );
 
-update_from(fzsd_version) -> (
+// 从某一旧版升级
+command_update(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);
+            command_delete(fzsd_version);
             scoreboard_remove('fzsd.module.scoreboard.display.placement_count', '总放置方块数');
+            scoreboard_remove('fzsd.module.scoreboard.display.general', '总放置方块数');
         ),
         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']
+            command_delete(fzsd_version);
-            ];
-            for(params, merge_score(..._, fzsd_version));
-            // 清除旧计分板
-            delete_old(fzsd_version);
         ),
         fzsd_version == '2.x',
         (
@@ -150,12 +243,11 @@ 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));
-            // 清除旧计分板
+            command_delete(fzsd_version);
-            delete_old(fzsd_version);
         ),
         fzsd_version == '3.0-beta.4',
         (
@@ -167,22 +259,22 @@ 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));
-            // 清除旧计分板
+            command_delete(fzsd_version);
-            delete_old(fzsd_version);
         ),
         print('参数错误！');
         return();
     );
-    recalculate_total_scores();
+    recalculate_total_score(null);
     print('已从' + fzsd_version + '升级！');
     return();
 );
 
+// 将两计分板分数合并到后者
 merge_score(from, to, fzsd_version) -> (
     // 如果目标计分板不存在则创建
     if(scoreboard() ~ to == null, scoreboard_add(to));
@@ -215,7 +307,8 @@ merge_score(from, to, fzsd_version) -> (
     return();
 );
 
-// 因为新计分板允许玩家自定义显示的总榜名称，故续做复杂判断才能使脚本确定之
+// 获取承载总榜数据的玩家名
+// 因为新计分板允许玩家自定义显示的总榜名称，故做复杂判断才能使脚本确定用来承载总榜数据的玩家名
 get_total_score_name_new(scoreboard) -> (
     INT_MIN = -2147483648;
     // 获取系统总榜id
@@ -235,7 +328,7 @@ get_total_score_name_new(scoreboard) -> (
     // 将总分赋值到显示计分板上
     display_total_score(scoreboard);
 
-    // 查找榜内最低分
+    // 查找显示计分板内的最低分玩家名
     last_min_player = null;
     for(scoreboard(scoreboard),
         if(last_min_player == null,
@@ -259,29 +352,17 @@ get_total_score_name_new(scoreboard) -> (
     );
     display_total_score(scoreboard);
     
-    // 返回榜内最低分的名称
+    // 返回榜内最低分的玩家名（承载总榜数据的玩家名）
     return(last_min_player);
 );
 
-recalculate_total_scores() -> (
+// 重算总分，scoreboard == null 时重算所有总分
-    scoreboards = [
+recalculate_total_score(scoreboard) -> (
-        'fzsd.module.scoreboard.display.activation', 
+    if(scoreboard == null,
-        'fzsd.module.scoreboard.display.damage_taken', 
+        for(global_current_scoreboard_list, recalculate_total_score(_));
-        'fzsd.module.scoreboard.display.death_count', 
-        'fzsd.module.scoreboard.display.dig_count', 
-        '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.placement_count', 
-        'fzsd.module.scoreboard.display.aviating_distance'
-    ];
-    for(scoreboards,recalculate_total_score(_, get_total_score_name_new(_)));
-    print('已重新计算总分！');
         return();
-);
+    );
-
+    total_score_name_new = get_total_score_name_new(scoreboard);
-recalculate_total_score(scoreboard, total_score_name_new) -> (
     // 计算总分
     total_score = 0;
     for(scoreboard(scoreboard), 
@@ -299,6 +380,7 @@ recalculate_total_score(scoreboard, total_score_name_new) -> (
     return();
 );
 
+// 使用数据包函数标签将总分赋值到显示计分板上
 display_total_score(scoreboard) -> (
     // 获取计算总榜的函数标签名
     str_1 = split('\\.', scoreboard);
@@ -308,18 +390,166 @@ display_total_score(scoreboard) -> (
     return();
 );
 
-restore_from_stats() -> (
+// 恢复计分板分数，player == null 时恢复所有玩家分数，scoreboard == null 时恢复所有计分板分数
-    print('暂未开发');
+command_restore(player, scoreboard) -> (
+    if(player == null,
+        i = 0;
+        for(keys(system_info('server_whitelist')),
+            i += 1;
+            if(i > 10,
+                game_tick(50);
+                i = 0;
+            );
+            restore_score(_, scoreboard);
+        );
+        if(scoreboard == null,
+            (
+                print('重置交易榜会丢失猪灵交易分数，请输入\n“/' + global_app_name + ' restore confirm whitelist fzsd.module.scoreboard.display.trade_count”继续执行');
+                print('无法还原破基岩榜，已忽略');
+                print('已恢复所有玩家的所有分数');
+            ),
+            if(scoreboard == 'fzsd.module.scoreboard.display.trade_count',
+                print('重置交易榜会丢失猪灵交易分数，请输入\n“/' + global_app_name + ' restore confirm whitelist fzsd.module.scoreboard.display.trade_count”继续执行');
+                ,
+                scoreboard == 'fzsd.module.scoreboard.display.bedrock_broken_count',
+                print('无法还原破基岩榜，已忽略');
+                ,
+                print('已恢复所有玩家的' + scoreboard + '分数');
+            );
+        );
+        return();
+    );
+    if(scoreboard == null,
+        for(global_current_scoreboard_list, restore_score(player, _));
+        print('重置交易榜会丢失猪灵交易分数，请输入\n“/' + global_app_name + ' restore confirm player <playerName> fzsd.module.scoreboard.display.trade_count”继续执行');
+        print('无法还原破基岩榜，已忽略');
+        print('已恢复' + player + '的所有分数');
+        return();
+    );
+    if(restore_score(player, scoreboard),
+        print('已恢复' + player + '的' + scoreboard + '分数');
+        ,
+        if(scoreboard == 'fzsd.module.scoreboard.display.trade_count',
+            print('重置交易榜会丢失猪灵交易分数，请输入\n“/' + global_app_name + ' restore confirm whitelist fzsd.module.scoreboard.display.trade_count”继续执行');
+            ,
+            scoreboard == 'fzsd.module.scoreboard.display.bedrock_broken_count',
+            print('无法还原破基岩榜，已忽略');
+        );
+    );
     return();
 );
 
-merge_stat(scoreboard, ...stats) -> (
+// 恢复玩家的计分板分数
-    print('暂未开发');
+restore_score(player_name, scoreboard) -> (
+    require_not_null(player_name);
+    if(scoreboard == null,
+        for(global_current_scoreboard_list, restore_score(player_name, _));
+        return();
+    );
+    player = player(player_name);
+    player_is_offline = false;
+    if(player == null,
+        (
+            run('player ' + player_name + ' spawn at ~ ~ ~ facing 0 0 in minecraft:overworld in survival');
+            player_is_offline = true;
+            player = player(player_name);
+        )
+    );
+    if(scoreboard == 'fzsd.module.scoreboard.display.activation',
+        (
+            play_ticks = statistic(player, 'custom', 'play_time');
+            scoreboard('fzsd.event.play_ticks', player, play_ticks%72000);
+            scoreboard(scoreboard, player, play_ticks/72000);
+        ),
+        scoreboard == 'fzsd.module.scoreboard.display.damage_taken',
+        scoreboard(scoreboard, player, statistic(player, 'custom', 'damage_taken')/10);
+        ,
+        scoreboard == 'fzsd.module.scoreboard.display.death_count',
+        restore_from_stat(scoreboard, player, 'custom', 'deaths');
+        ,
+        scoreboard == 'fzsd.module.scoreboard.display.dig_count',
+        (
+            scoreboard(scoreboard, player, 0);
+            for(block_list(),
+                append_from_stat(scoreboard, player, 'mined', _);
+            );
+        ),
+        scoreboard == 'fzsd.module.scoreboard.display.fishing_count',
+        scoreboard(scoreboard, player, statistic(player, 'custom', 'fish_caught'));
+        ,
+        scoreboard == 'fzsd.module.scoreboard.display.kill_count',
+        (
+            scoreboard(scoreboard, player, 0);
+            for(entity_types('living'),
+                append_from_stat(scoreboard, player, 'killed', _);
+            );
+        ),
+        scoreboard == 'fzsd.module.scoreboard.display.trade_count',
+        return(false);
+        ,
+        scoreboard == 'fzsd.module.scoreboard.display.bedrock_broken_count',
+        return(false);
+        ,
+        scoreboard == 'fzsd.module.scoreboard.display.aviating_distance',
+        scoreboard(scoreboard, player, statistic(player, 'custom', 'aviate_one_cm')/200);
+        ,
+        scoreboard == 'fzsd.module.scoreboard.display.placement_count',
+        (
+            scoreboard(scoreboard, player, 0);
+            for(block_list(),
+                append_from_stat(scoreboard, player, 'used', _);
+            );
+        ),
+        print('未识别的计分板ID！' + scoreboard);
+        return(false);
+    );
+    recalculate_total_score(scoreboard);
+    if(player_is_offline,
+        world_spawn = system_info('world_spawn_point');
+        run('spreadplayers ' + world_spawn:0 + ' ' + world_spawn:2 + ' 0 10 false ' + player);
+        run('player ' + player + ' kill');
+    );
+    return(true);
+);
+
+// 确定恢复交易榜
+command_restore_trade_count_confirm(confirm, player, trade_count) -> (
+    if(confirm != 'confirm' || trade_count != 'fzsd.module.scoreboard.display.trade_count',
+        print('命令格式错误！');
+        return();
+    );
+    if(player == null,
+        for(keys(system_info('server_whitelist')),
+            restore_from_stat(scoreboard, _, 'custom', 'traded_with_villager');
+        );
+        return();
+    );
+    restore_from_stat(scoreboard, player, 'custom', 'traded_with_villager');
     return();
 );
 
-command_player(boolean) -> (
+restore_from_stat(scoreboard, player, category, entry) -> (
-    print(run('carpet setDefault commandPlayer ' + str(boolean)):1:0);
+    scoreboard(scoreboard, player, statistic(player, category, entry));
+);
+
+append_from_stat(scoreboard, player, category, entry) -> (
+    scoreboard(scoreboard, player,
+        statistic(player, category, entry) + scoreboard(scoreboard, player)
+    );
+);
+
+// 修改地毯假人规则
+carpet_command_player(level) -> (
+    print(run('carpet setDefault commandPlayer ' + level):1:0);
+    return();
+);
+
+// 设置玩家的计分板分数
+command_set(player, scoreboard, score) -> (
+    i = scoreboard(scoreboard, player, score);
+    print('玩家' + player + '修改前的分数为：' + i);
+    recalculate_total_score(scoreboard);
+    return(i);
 );
 
 // 工具函数
@@ -332,3 +562,8 @@ debug(msg) -> (
     logger('debug', msg);
     return();
 );
+
+require_not_null(value) -> (
+    if(value == null, throw('空指针异常！'));
+    return(value);
+);