3.2

Signed-off-by: 延皓 <harvey_husky@foxmail.com>

.vscode/settings.json

@@ -17,7 +17,28 @@
         "storageText": "{\"nbt\": \"${1:NBT}\", \"interpret\": true, \"storage\": \"${2:A namespaced ID}\"}",
         "ifInstalled": "execute if data storage fzsd:installed fzsd.module{${1:module_name}:1b} run ${tellraw}"
     },
-    "datapack.env.cmdVersion": "1.19",
+    "datapack.env.exclude": [
-    "datapack.env.jsonVersion": "1.19",
+        "data/fzsd/functions/system/carpet/*"
-    "datapack.env.dataVersion": "1.19"
+    ],
-}
+    "datapack.lint.blockStateCommaSpacing": {
+        "before": 0,
+        "after": 1
+    },
+    "datapack.lint.blockStateEqualSpacing": {
+        "before": 1,
+        "after": 1
+    },
+    "datapack.lint.selectorCommaSpacing": {
+        "before": 0,
+        "after": 1
+    },
+    "datapack.lint.selectorEqualSpacing": {
+        "before": 1,
+        "after": 1
+    },
+    "datapack.env.cmdVersion": "1.20.3",
+    "datapack.env.dataVersion": "1.21",
+    "[javascript]": {
+        "editor.maxTokenizationLineLength": 25000
+    }
+}

DEVDOC.md

@@ -1,94 +1,111 @@
 # 开发文档
 
-
 ## 指引
+
 - `函数`，指数据包`<命名空间>/functions`目录下的`.mcfunction`文件
 - `标签`，指数据包`<命名空间>/tags`目录下的`.json`文件
-    - `覆盖标签并填入函数`时，`replace`为`true`
+  - `覆盖标签并填入函数`时，`replace`为`true`
-        ``` json
-        {
-            "replace": true,
-            "values": ...
-        }
-        ```
-    - `向标签中注册函数`时，`replace`为`false`
-        ``` json
-        {
-            "replace": false,
-            "values": ...
-        }
-        ```
 
+    ``` json
+    {
+        "replace": true,
+        "values": ...
+    }
+    ```
+
+  - `向标签中注册函数`时，`replace`为`false`
+
+    ``` json
+    {
+        "replace": false,
+        "values": ...
+    }
+    ```
+
+- ***函数和标签是否能被扩展数据包成功覆盖，取决于数据包加载顺序***，请使用`/datapack enable <xxx> after <xxx>`指令，使您的扩展数据包在FZ's Survival Datapack之后加载
 
 ## 基本要求
+
 - 函数由两个以上的函数调用，或由不同包下的函数调用，或需要作为接口开放给下游数据包时，应改用标签调用！
 - 函数调用尽量不要使用`function`命令，应改在标签中按顺序调用！
 
-
 ## 系统模块
 
 ### 频繁使用的计算单元
+
 - [`#fzsd:calculation/*`](data/fzsd/tags/functions/calculation/)标签通常被用来进行简单重复的计算任务
 
 ### 事件模块
+
 - 通常由**进度**触发，触发后调用同名的事件标签
 - 在[`#fzsd:game_event/(<...>/)on_<事件>`](data/fzsd/tags/functions/game_event/)标签中注册触发时需要调用的函数即可
 
 ### 日志模块
+
 - 仓库中提供了日志相关的代码片段，位于[`.vscode/settings.json`](.vscode/settings.json)
 - 暂时没有找到方法在服务端控制台打印日志，但会被记录在客户端
 
 #### 详细 Fine
+
 - 等级：300
 - 使用方法：`execute if score fzsd.logger.level fzsd.variable.integer matches ..300 run tellraw @a [{"nbt": "fzsd.level.fine", "interpret": true, "storage": "fzsd:logger"}, {"text": "你的日志"}`
 
 #### 调试 Debug
+
 - 等级：400
 - 使用方法：`execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "你的日志"}`
 
 #### 信息 Info
+
 - 等级：500
 - 使用方法：`execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "你的日志"}`
 
 #### 提醒 Alert
+
 - 等级：600
 - 使用方法：`execute if score fzsd.logger.level fzsd.variable.integer matches ..600 run tellraw @a [{"nbt": "fzsd.level.alert", "interpret": true, "storage": "fzsd:logger"}, {"text": "你的日志"}`
 
 #### 意外 Exception
+
 - 暂不提供
 
 #### 错误 Error
+
 - 等级：800
 - 使用方法：`execute if score fzsd.logger.level fzsd.variable.integer matches ..800 run tellraw @a [{"nbt": "fzsd.level.error", "interpret": true, "storage": "fzsd:logger"}, {"text": "你的日志"}`
 
-
 ## 功能模块
 
 ### 交互器模块
 
 #### 按钮操作
+
 1. 定义一个显示按钮时执行的函数，使用形如`tellraw @s {"text": "[按钮]", "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set <触发器分数>"}}`的指令定义按钮。
     - *触发器分数为正数会重新向玩家发送交互按钮，如不想重新发送，请使用负数*
     - 大多数情况下这里的触发器分数必须是独一无二的
     - 建议使用`>10000`的随机数作为自定义按钮的触发器分数
-2. 在[`#fzsd:module/interactor/display`](data/fzsd/tags/functions/module/interactor/display.json)标签中注册上述函数
+2. 在[`#fzsd:module/interactor/event/on_display`](data/fzsd/tags/functions/module/interactor/display.json)标签中注册上述函数
 3. 定义一个点击按钮时执行的函数，使用形如`execute if score @s fzsd.module.interactor.trigger matches <min>..<max> run ...`的指令判断玩家的触发器分数，并执行你的操作
 4. 在[`#fzsd:module/interactor/event/on_click`](data/fzsd/tags/functions/module/interactor/event/on_click.json)标签中注册上述函数
 
 #### 其他标签
+
 - 标签[`#fzsd:module/interactor/reset_trigger`](data/fzsd/tags/functions/module/interactor/reset_trigger.json)：重置玩家`@s`的触发器计分板
 
 ### 计分板模块
 
 #### 自定义计分板颜色
+
 - 数据包提供了所有计分板的全部16色命名函数
 - 使用方法：**覆盖**[`#fzsd:module/scoreboard/display/set_text/<计分板名称>`](data/fzsd/tags/functions/module/scoreboard/display/set_text/)标签，填入[`fzsd:module/scoreboard/display/set_text/<计分板名称>/<颜色名称>`](data/fzsd/functions/module/scoreboard/display/set_text/)函数
 
 #### 自定义计分板名称
+
 1. 定义一个设置计分板颜色、文本的函数，格式可以参考[`fzsd:module/scoreboard/display/set_text/general/*`](data/fzsd/functions/module/scoreboard/display/set_text/general/)函数
 2. **覆盖**[`#fzsd:module/scoreboard/display/set_text/<计分板名称>`](data/fzsd/tags/functions/module/scoreboard/display/set_text/)标签，填入上述函数
 
 #### 扩展自己的计分板
+
 1. 定义一个安装函数，参考[`fzsd:module/scoreboard/install`](data/fzsd/functions/module/scoreboard/install.mcfunction)函数
 2. 在[`#fzsd:module/scoreboard/install`](data/fzsd/tags/functions/module/scoreboard/install.json)标签中注册该函数
 3. 按照“自定义计分板颜色”和“自定义计分板名称”中的操作，定义你的计分板颜色和名称
@@ -98,18 +115,20 @@
 7. 定义一个用来判断在轮播时是否轮到你的计分板的函数，在判断后调用上一条中的函数，参考[`fzsd:module/scoreboard/display/carousel/try_display/*`](data/fzsd/functions/module/scoreboard/display/carousel/try_display/activation.mcfunction)函数
 8. 将该函数注册到[`#fzsd:module/scoreboard/display/try_display`](data/fzsd/tags/functions/module/scoreboard/display/carousel/try_display.json)标签中
 
-
 ## 自定义模块
 
 ### 排除假人
+
 - 如果您不想对假人执行您的命令，请将以下语句添加在您要执行的命令之前：
     <pre><code><font color=ee82ee>execute </font><font color=1e90ff>if predicate </font><font color=f0e68c>fzsd:is_real_player</font></code></pre>
 
 #### 注册安装、卸载、加载函数
+
 - 在下列标签中注册你的安装、卸载、加载函数：
-    - [`#fzsd:system/install/module`](data/fzsd/tags/functions/system/install/module.json)
+  - [`#fzsd:system/install/module`](data/fzsd/tags/functions/system/install/module.json)
-    - [`#fzsd:system/uninstall/module`](data/fzsd/tags/functions/system/uninstall/module.json)
+  - [`#fzsd:system/uninstall/module`](data/fzsd/tags/functions/system/uninstall/module.json)
-    - [`#fzsd:system/load/module`](data/fzsd/tags/functions/system/load/module.json)
+  - [`#fzsd:system/load/module`](data/fzsd/tags/functions/system/load/module.json)
 
 #### 注册交互器按钮
+
 - 见[交互器按钮](#按钮操作)

LICENSE

@@ -1,20 +1,20 @@
 
-FZSD许可证
+FZSD许可协议
 
-2022/8/1 https://gitee.com/harvey-husky/fz-survival-datapack/blob/dev/3.0/LICENSE
+2023/6/6 https://gitee.com/harvey-husky/fz-survival-datapack/blob/dev/3.0/LICENSE
 
-版权所有 © 2019-2022 延皓<https://gitee.com/harvey-husky><https://space.bilibili.com/677233356>
+版权所有 © 2019-2023 延皓<https://gitee.com/harvey-husky><https://space.bilibili.com/677233356>
 
 定义：
-“该许可证”指FZSD许可证。
+“该许可协议”指FZSD许可协议。
-“该软件”指许可在该许可证下的程序和相关文档的集合。
+“该软件”指许可在该许可协议下的程序和相关文档的集合。
 “官方网址”指由版权所有者提供的该软件的发布网址。
 
 您对该软件的复制、使用、修改及分发受如下条款的约束：
-1. 禁止添加、修改或删除该许可证的内容。
+1. 禁止添加、修改或删除该许可协议的内容。
 2. 禁止未经授权的转载、销售或二次发布该软件。
 3. 禁止添加、修改或抹除该软件中的原作者署名。
-4. 如果您从部署了该软件的Minecraft服务器中以任何方式获取了收益，则您必须在游戏中的明显位置明确告知用户您的Minecraft服务器使用了该软件，并附上官方网址。
+4. 如果您从部署了该软件的Minecraft服务器中以任何方式获取了收益，则您必须在游戏中的明显位置明确告知用户您的Minecraft服务器使用了该软件，并附上该软件的官方网址。
 5. 如果您修改了该软件中的任何内容，您必须将修改部分开源在主流开源平台（如gitee<https://gitee.com/>或github<https://github.com/>等）。
-6. 如果您修改了该软件中的任何内容，您必须保留该许可证，但您可以追加其他许可证（不包括不支持附加条款的许可证）。当您添加的许可证中的条款与该许可证冲突时，必须以该许可证为准。
+6. 如果您修改了该软件中的任何内容，您必须保留该许可协议，但您可以追加其他许可协议（不包括不支持附加条款的许可协议）。当您添加的许可协议中的条款与该许可协议冲突时，必须以该许可协议为准。
 7. 该软件在提供时不带任何明示或默示的担保。在任何情况下，版权所有者不对任何人因使用该软件而引发的任何直接或间接损失承担任何责任。

README.md

@@ -1,33 +1,23 @@
-# FZ生存数据包
+# FZ生存数据包 v3.1
 
 为FZ服务器写的Minecraft生存辅助数据包
 
-#### @Author: Harvey_Husky
+[![数据包版本](https://img.shields.io/badge/正式版-3.2-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases) [![MC版本](https://img.shields.io/badge/Minecraft-1.21+-blue.svg)](https://minecraft.net/)
 
-#### Copyright (C) 2019-2022 Harvey_Husky
+> 其他版本见[发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases)
-
-[Bilibili专栏](https://www.bilibili.com/read/cv4267319)（年久失修）
 
 ## 安装教程
 
 1. 兼容性
-     - `数据包 v3.0.x` 支持 `Minecraft 1.19.x`（*由于使用了1.18.x不支持的操作，撤销对MC1.18.x的支持*）
+    - `数据包 v3.2.x` 支持 `Minecraft 1.21+`
-     - `数据包 v2.2.x` 支持 `Minecraft 1.19.x`
+    - `数据包 v3.1.x` 支持 `Minecraft 1.20-1.20.6`
-     - `数据包 v2.1.x` 支持 `Minecraft 1.17.x-1.18.x`
+    - `数据包 v3.0.x` 支持 `Minecraft 1.18.2-1.19.x` (不再维护)
-     - `数据包 v2.0.x` 支持 `Minecraft 1.16.3-1.16.5`
 2. 前往[发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases)下载对应MC版本的数据包
-3. 从zip文件的 `scripts` 目录中挑选你需要的 `.sc` 文件
+3. 将数据包 `zip` 文件放入 `world/datapacks` 中（在客户端位于 `.minecraft/saves/<存档名>/datapacks`）
-4. 将数据包 `zip` 文件放入 `world/datapacks` 中（在客户端位于 `.minecraft/saves/<存档名>/datapacks`）
+4. （可选）下载并安装 [Carpet Mod](https://github.com/gnembon/fabric-carpet/releases)  
-5. （可选）下载并安装 [Carpet Mod **1.4.24**](https://github.com/gnembon/fabric-carpet/releases) 或以上版本
+5. （可选）从数据包 `zip` 文件的 `scripts` 目录中解压 `.sc` 文件，将其放入 `world/scripts` 中（在客户端位于 `.minecraft/saves/<存档名>/scripts` ）
-6. （可选）从数据包 `zip` 文件的 `scripts` 目录中解压 `.sc` 文件，将其放入 `world/scripts` 中（在客户端位于 `.minecraft/saves/<存档名>/scripts` ）
+    - **注意：如果未正确安装该脚本，数据包会强制禁用 carpet mod 的 `player` 命令以避免假人污染记分板，需要在安装好脚本后手动启用 `player` 命令**
-7. 执行 `reload` 指令（或重新打开存档）
+6. 执行 `reload` 指令（或重新打开存档；在一些第三方服务端中可能需要改为`/minecraft:reload`）
-
-
-# FZ生存数据包 3.0
-
-[![数据包版本](https://img.shields.io/badge/正式版-3.0.1-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)
 
 ## 功能
 
@@ -39,46 +29,69 @@
 
 - 提供下列计分板：
 
-| 默认名称 |                     计分板ID                     |
+  | 默认名称 |                     计分板 ID                     |
-| :------: | :----------------------------------------------: |
+  | :------: | :----------------------------------------------: |
-|   总榜   |      fzsd.module.scoreboard.display.general      |
+  |   总览   |      fzsd.module.scoreboard.display.general      |
-|  活跃度  |    fzsd.module.scoreboard.display.activation     |
+  |  活跃度  |    fzsd.module.scoreboard.display.activation     |
-| 飞行距离 | fzsd.module.scoreboard.display.aviating_distance |
+  | 飞行距离 | fzsd.module.scoreboard.display.aviating_distance |
-|  抖M榜   |   fzsd.module.scoreboard.display.damage_taken    |
+  |  抖M榜   |   fzsd.module.scoreboard.display.damage_taken    |
-|  死亡榜  |    fzsd.module.scoreboard.display.death_count    |
+  |  死亡榜  |    fzsd.module.scoreboard.display.death_count    |
-|  挖掘榜  |     fzsd.module.scoreboard.display.dig_count     |
+  |  挖掘榜  |     fzsd.module.scoreboard.display.dig_count     |
-|  钓鱼榜  |   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.placement_count  |
+  |  放置榜  |  fzsd.module.scoreboard.display.placement_count  |
-|  交易榜  |    fzsd.module.scoreboard.display.trade_count    |
+  |  交易榜  |    fzsd.module.scoreboard.display.trade_count    |
 
 - 兼容[破基岩榜Mod](https://gitee.com/harvey-husky/yh-bbl)
   - 安装该Mod后，使用连点器破基岩，破基岩榜将自动显示在交互器页面
 
-  | 默认名称 |                     计分板ID                     |
+  | 默认名称 |                     计分板 ID                     |
   | :------: | :----------------------------------------------: |
   | 破基岩榜 |fzsd.module.scoreboard.display.bedrock_broken_count|
 
+- 系统总览计分板：`fzsd.module.scoreboard.assign.general`
+  - 可以在在此记分板修改总分数据，下次加分时会刷新显示分数
+  - 总计分项名称对照表：
+
+  |   默认名称   |                    player ID                    |
+  |  :------:  | :----------------------------------------------: |
+  |  总活跃时间  |    fzsd.module.scoreboard.total.activation     |
+  |  总飞行距离  | fzsd.module.scoreboard.total.aviating_distance |
+  |  总受伤害数  |   fzsd.module.scoreboard.total.damage_taken    |
+  |   总死亡数   |    fzsd.module.scoreboard.total.death_count    |
+  |   总挖掘数   |     fzsd.module.scoreboard.total.dig_count     |
+  |   总钓鱼数   |   fzsd.module.scoreboard.total.fishing_count   |
+  |   总击杀数   |    fzsd.module.scoreboard.total.kill_count     |
+  |   总建造数   |  fzsd.module.scoreboard.total.placement_count  |
+  |   总交易数   |    fzsd.module.scoreboard.total.trade_count    |
+  |  总破基岩数  |fzsd.module.scoreboard.total.bedrock_broken_count|
 
 ### 地毯脚本
 
 - 如果你不知道 Carpet Mod 或 Carpet 脚本，请忽略本节
 - 需要安装 [Carpet Mod](https://github.com/gnembon/fabric-carpet/releases)
 - 从数据包 `zip` 文件的 `scripts` 目录中解压 `.sc` 文件，将其放入 `world/scripts` 中（在客户端位于 `.minecraft/saves/<存档名>/scripts` ）
+- **注意：如果未正确安装该脚本，数据包会强制禁用 carpet mod 的 `player` 命令以避免假人污染记分板，需要在安装好脚本后手动启用 `player` 命令**
 - 脚本：
-  - `fzsd_score.sc`（**开发中！此处列举目前已完成的**）：
+  - `fzsd_score.sc`：
     - 可避免Carpet假人污染计分板
-    - 执行 `reload` 指令后自动生效
+    - 可以标记哪些玩家是假人
     - 子命令（ `/fzsd_score <子命令>` ）：
-      - `updateFrom <version>`：用于从给定的数据包版本恢复计分板数据（需要测试！）
+      - 重写
-      - `recalculate`：重新计算所有计分板总分
+
-      - `recalculate <scoreboardID>`：重新计算该计分板总分
+### 管理员
-      - `reset <player>`：重置该玩家的所有分数
+
-      - `reset <player> <scoreboardID>`：重置该玩家该计分板的分数
+- 使用`/function admin.fzsd:admin`命令管理（安装、卸载等）各模块
-      - `commandPlayer <permissionType>`：设置player命令权限类型
 
 ### 其他
-- 见游戏内交互器按钮
+
+- 扫地机
+- 获取当前维度和坐标（以及对应的主世界、下界坐标）（私信/广播）
+- 获取上次死亡维度和坐标（私信）
+- 获取上次穿出的下界传送门坐标（私信/广播）
+- 获取上个重生点维度和坐标（私信）
+- 幻翼预警
 
 ## 开发者相关
-- 参见[开发文档](/DEVDOC.md)
+
+- 见[开发文档](/DEVDOC.md)

data/admin.fzsd/function/admin.mcfunction

@@ -32,4 +32,9 @@ tellraw @s [{"text": "上次穿出的下界传送门："}, [{"text": "", "color"
 tellraw @s [{"text": "上一出生点："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_spawn_point/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_spawn_point/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
 
 
-tellraw @s [{"text": "计分板："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/scoreboard/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/scoreboard/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+tellraw @s [{"text": "计分板："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/scoreboard/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/scoreboard/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+# TODO: fzsd:module fzsd.module.scoreboard.config{trade_count_includes_piglin:1b} ?
+
+tellraw @s [{"text": "扫地机："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/sweeper/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/sweeper/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+
+tellraw @s [{"text": "幻翼预警："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/phantom_warning/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/phantom_warning/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]

data/admin.fzsd/function/module/health/below_name/off.mcfunction

@@ -1,2 +1,2 @@
 data modify storage fzsd:config fzsd.module.health.display.below_name set value 0b
-function #fzsd:module/health/try_load
+function fzsd:module/health/try_load

data/admin.fzsd/function/module/health/below_name/on.mcfunction

@@ -1,2 +1,2 @@
 data modify storage fzsd:config fzsd.module.health.display.below_name set value 1b
-function #fzsd:module/health/try_load
+function fzsd:module/health/try_load

data/admin.fzsd/function/module/health/list/off.mcfunction

@@ -1,2 +1,2 @@
 data modify storage fzsd:config fzsd.module.health.display.list set value 0b
-function #fzsd:module/health/try_load
+function fzsd:module/health/try_load

data/admin.fzsd/function/module/health/list/on.mcfunction

@@ -1,2 +1,2 @@
 data modify storage fzsd:config fzsd.module.health.display.list set value 1b
-function #fzsd:module/health/try_load
+function fzsd:module/health/try_load

data/fzsd.extra.bbl/function/display/carousel/set_display.mcfunction

@@ -18,4 +18,4 @@ execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer mat
 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.module.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}, {"text": "显示"}, {"nbt": "text", "interpret": true, "storage": "fzsd.extra.bbl:text"}, {"text": "计分板"}]

data/fzsd.extra.bbl/function/display/register_id.mcfunction

@@ -3,4 +3,4 @@
 execute if score fzsd.module.scoreboard.total.bedrock_broken_count fzsd.module.scoreboard.assign.general matches 1.. run function #fzsd:calculation/highest_id_add_1
 execute if score fzsd.module.scoreboard.total.bedrock_broken_count fzsd.module.scoreboard.assign.general matches 1.. run scoreboard players operation fzsd.module.scoreboard.display.id.bedrock_broken_count fzsd.variable.integer = fzsd.module.scoreboard.display.highest_id fzsd.variable.integer
 
-execute if score fzsd.module.scoreboard.total.bedrock_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"}}]
+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.module.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/function/display/set_text/aqua.mcfunction

@@ -1,6 +1,6 @@
 # 见#fzsd.extra.bbl:display/set_text
 
-data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "aqua"}'
+data modify storage fzsd:module fzsd.module.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "aqua"}'
 scoreboard objectives setdisplay sidebar.team.aqua fzsd.module.scoreboard.display.bedrock_broken_count
 scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "aqua"}
 team modify fzsd.module.scoreboard.display.bedrock_broken_count color aqua

data/fzsd.extra.bbl/function/display/set_text/black.mcfunction

@@ -1,6 +1,6 @@
 # 见#fzsd.extra.bbl:display/set_text
 
-data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "black"}'
+data modify storage fzsd:module fzsd.module.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "black"}'
 scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.bedrock_broken_count
 scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "black"}
 team modify fzsd.module.scoreboard.display.bedrock_broken_count color black

data/fzsd.extra.bbl/function/display/set_text/blue.mcfunction

@@ -1,6 +1,6 @@
 # 见#fzsd.extra.bbl:display/set_text
 
-data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "blue"}'
+data modify storage fzsd:module fzsd.module.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "blue"}'
 scoreboard objectives setdisplay sidebar.team.blue fzsd.module.scoreboard.display.bedrock_broken_count
 scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "blue"}
 team modify fzsd.module.scoreboard.display.bedrock_broken_count color blue

data/fzsd.extra.bbl/function/display/set_text/dark_aqua.mcfunction

@@ -1,6 +1,6 @@
 # 见#fzsd.extra.bbl:display/set_text
 
-data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "dark_aqua"}'
+data modify storage fzsd:module fzsd.module.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "dark_aqua"}'
 scoreboard objectives setdisplay sidebar.team.dark_aqua fzsd.module.scoreboard.display.bedrock_broken_count
 scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "dark_aqua"}
 team modify fzsd.module.scoreboard.display.bedrock_broken_count color dark_aqua

data/fzsd.extra.bbl/function/display/set_text/dark_blue.mcfunction

@@ -1,6 +1,6 @@
 # 见#fzsd.extra.bbl:display/set_text
 
-data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "dark_blue"}'
+data modify storage fzsd:module fzsd.module.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "dark_blue"}'
 scoreboard objectives setdisplay sidebar.team.dark_blue fzsd.module.scoreboard.display.bedrock_broken_count
 scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "dark_blue"}
 team modify fzsd.module.scoreboard.display.bedrock_broken_count color dark_blue

data/fzsd.extra.bbl/function/display/set_text/dark_gray.mcfunction

@@ -1,6 +1,6 @@
 # 见#fzsd.extra.bbl:display/set_text
 
-data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "dark_gray"}'
+data modify storage fzsd:module fzsd.module.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "dark_gray"}'
 scoreboard objectives setdisplay sidebar.team.dark_gray fzsd.module.scoreboard.display.bedrock_broken_count
 scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "dark_gray"}
 team modify fzsd.module.scoreboard.display.bedrock_broken_count color dark_gray

data/fzsd.extra.bbl/function/display/set_text/dark_green.mcfunction

@@ -1,6 +1,6 @@
 # 见#fzsd.extra.bbl:display/set_text
 
-data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "dark_green"}'
+data modify storage fzsd:module fzsd.module.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "dark_green"}'
 scoreboard objectives setdisplay sidebar.team.dark_green fzsd.module.scoreboard.display.bedrock_broken_count
 scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "dark_green"}
 team modify fzsd.module.scoreboard.display.bedrock_broken_count color dark_green

data/fzsd.extra.bbl/function/display/set_text/dark_purple.mcfunction

@@ -1,6 +1,6 @@
 # 见#fzsd.extra.bbl:display/set_text
 
-data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "dark_purple"}'
+data modify storage fzsd:module fzsd.module.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "dark_purple"}'
 scoreboard objectives setdisplay sidebar.team.dark_purple fzsd.module.scoreboard.display.bedrock_broken_count
 scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "dark_purple"}
 team modify fzsd.module.scoreboard.display.bedrock_broken_count color dark_purple

data/fzsd.extra.bbl/function/display/set_text/dark_red.mcfunction

@@ -1,6 +1,6 @@
 # 见#fzsd.extra.bbl:display/set_text
 
-data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "dark_red"}'
+data modify storage fzsd:module fzsd.module.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "dark_red"}'
 scoreboard objectives setdisplay sidebar.team.dark_red fzsd.module.scoreboard.display.bedrock_broken_count
 scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "dark_red"}
 team modify fzsd.module.scoreboard.display.bedrock_broken_count color dark_red

data/fzsd.extra.bbl/function/display/set_text/gold.mcfunction

@@ -1,6 +1,6 @@
 # 见#fzsd.extra.bbl:display/set_text
 
-data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "gold"}'
+data modify storage fzsd:module fzsd.module.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "gold"}'
 scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.bedrock_broken_count
 scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "gold"}
 team modify fzsd.module.scoreboard.display.bedrock_broken_count color gold

data/fzsd.extra.bbl/function/display/set_text/gray.mcfunction

@@ -1,6 +1,6 @@
 # 见#fzsd.extra.bbl:display/set_text
 
-data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "gray"}'
+data modify storage fzsd:module fzsd.module.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "gray"}'
 scoreboard objectives setdisplay sidebar.team.gray fzsd.module.scoreboard.display.bedrock_broken_count
 scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "gray"}
 team modify fzsd.module.scoreboard.display.bedrock_broken_count color gray

data/fzsd.extra.bbl/function/display/set_text/green.mcfunction

@@ -1,6 +1,6 @@
 # 见#fzsd.extra.bbl:display/set_text
 
-data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "green"}'
+data modify storage fzsd:module fzsd.module.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "green"}'
 scoreboard objectives setdisplay sidebar.team.green fzsd.module.scoreboard.display.bedrock_broken_count
 scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "green"}
 team modify fzsd.module.scoreboard.display.bedrock_broken_count color green

data/fzsd.extra.bbl/function/display/set_text/light_purple.mcfunction

@@ -1,7 +1,7 @@
 # 见#fzsd.extra.bbl:display/set_text
 
-data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "purple"}'
+data modify storage fzsd:module fzsd.module.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "light_purple"}'
 scoreboard objectives setdisplay sidebar.team.light_purple fzsd.module.scoreboard.display.bedrock_broken_count
-scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "purple"}
+scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "light_purple"}
 team modify fzsd.module.scoreboard.display.bedrock_broken_count color light_purple
-team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "purple"}
+team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "light_purple"}

data/fzsd.extra.bbl/function/display/set_text/red.mcfunction

@@ -1,6 +1,6 @@
 # 见#fzsd.extra.bbl:display/set_text
 
-data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "red"}'
+data modify storage fzsd:module fzsd.module.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "red"}'
 scoreboard objectives setdisplay sidebar.team.red fzsd.module.scoreboard.display.bedrock_broken_count
 scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "red"}
 team modify fzsd.module.scoreboard.display.bedrock_broken_count color red

data/fzsd.extra.bbl/function/display/set_text/white.mcfunction

@@ -1,6 +1,6 @@
 # 见#fzsd.extra.bbl:display/set_text
 
-data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "white"}'
+data modify storage fzsd:module fzsd.module.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "white"}'
 scoreboard objectives setdisplay sidebar.team.white fzsd.module.scoreboard.display.bedrock_broken_count
 scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "white"}
 team modify fzsd.module.scoreboard.display.bedrock_broken_count color white

data/fzsd.extra.bbl/function/display/set_text/yellow.mcfunction

@@ -1,6 +1,6 @@
 # 见#fzsd.extra.bbl:display/set_text
 
-data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "yellow"}'
+data modify storage fzsd:module fzsd.module.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "yellow"}'
 scoreboard objectives setdisplay sidebar.team.yellow fzsd.module.scoreboard.display.bedrock_broken_count
 scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "yellow"}
 team modify fzsd.module.scoreboard.display.bedrock_broken_count color yellow

data/fzsd.extra.bbl/function/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_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": "]"}]
+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.module.scoreboard.text.bedrock_broken_count", "interpret": true, "storage": "fzsd:module"}, {"text": "]"}]

data/fzsd.extra.bbl/function/load.mcfunction

@@ -1,3 +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 ..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.module.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/tags/function/display/set_text.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "fzsd.extra.bbl:display/set_text/dark_gray"
+    ]
+}

data/fzsd.extra.bbl/tags/functions/display/set_text.json

@@ -1,6 +0,0 @@
-{
-    "replace": false,
-    "values": [
-        "fzsd.extra.bbl:display/set_text/black"
-    ]
-}

data/fzsd/advancement/game_event/on_fished.json

@@ -11,7 +11,7 @@
                     }
                 ],
                 "item": {
-                    "tag": "fzsd:raw_fishes"
+                    "items": "#fzsd:raw_fishes"
                 }
             }
         }
@@ -19,4 +19,4 @@
     "rewards": {
         "function": "fzsd:game_event/advancement/on_fished"
     }
-}
+}

data/fzsd/advancement/game_event/on_hurt_entity_with_tools.json

@@ -15,7 +15,7 @@
                         "predicate": {
                             "equipment": {
                                 "mainhand": {
-                                    "tag": "fzsd:tools"
+                                    "items": "#fzsd:tools"
                                 }
                             }
                         }

data/fzsd/advancement/game_event/on_placed_block.json

@@ -4,7 +4,7 @@
         "on_placed_block": {
             "trigger": "minecraft:placed_block",
             "conditions": {
-                "player": [
+                "location": [
                     {
                         "condition": "minecraft:reference",
                         "name": "fzsd:is_real_player"

data/fzsd/advancement/game_event/on_placed_block/on_placed_liquid.json

@@ -0,0 +1,27 @@
+{
+    "parent": "fzsd:game_event/on_placed_block",
+    "criteria": {
+        "on_placed_liquid": {
+            "trigger": "minecraft:placed_block",
+            "conditions": {
+                "location": [
+                    {
+                        "condition": "minecraft:reference",
+                        "name": "fzsd:is_real_player"
+                    },
+                    {
+                        "condition": "minecraft:location_check",
+                        "predicate": {
+                            "block": {
+                                "blocks": "#fzsd:liquid"
+                            }
+                        }
+                    }
+                ]
+            }
+        }
+    },
+    "rewards": {
+        "function": "fzsd:game_event/advancement/on_placed_block/on_placed_liquid"
+    }
+}

data/fzsd/advancement/game_event/on_placed_block/on_placed_solid.json

@@ -0,0 +1,31 @@
+{
+    "parent": "fzsd:game_event/on_placed_block",
+    "criteria": {
+        "on_placed_solid": {
+            "trigger": "minecraft:placed_block",
+            "conditions": {
+                "location": [
+                    {
+                        "condition": "minecraft:reference",
+                        "name": "fzsd:is_real_player"
+                    },
+                    {
+                        "condition": "minecraft:inverted",
+                        "term": 
+                        {
+                            "condition": "minecraft:location_check",
+                            "predicate": {
+                                "block": {
+                                    "blocks": "#fzsd:liquid"
+                                }
+                            }
+                        }
+                    }
+                ]
+            }
+        }
+    },
+    "rewards": {
+        "function": "fzsd:game_event/advancement/on_placed_block/on_placed_solid"
+    }
+}

data/fzsd/advancement/game_event/on_shears_used_on_entity.json

@@ -14,7 +14,7 @@
                     "type": "#fzsd:shearable"
                 },
                 "item": {
-                    "tag": "fzsd:tool/shears"
+                    "items": "#fzsd:tool/shears"
                 }
             }
         }

data/fzsd/advancement/game_event/on_sleeping.json

@@ -0,0 +1,19 @@
+{
+    "parent": "fzsd:game_event",
+    "criteria": {
+        "on_sleeping": {
+            "trigger": "minecraft:slept_in_bed",
+            "conditions": {
+                "player": [
+                    {
+                        "condition": "minecraft:reference",
+                        "name": "fzsd:is_real_player"
+                    }
+                ]
+            }
+        }
+    },
+    "rewards": {
+        "function": "fzsd:game_event/advancement/on_sleeping"
+    }
+}

data/fzsd/advancement/game_event/on_tools_used_on_block.json

@@ -0,0 +1,50 @@
+{
+    "parent": "fzsd:game_event",
+    "criteria": {
+        "on_tools_exclude_axes_used_on_block": {
+            "trigger": "minecraft:item_used_on_block",
+            "conditions": {
+                "location": [
+                    {
+                        "condition": "minecraft:reference",
+                        "name": "fzsd:is_real_player"
+                    },
+                    {
+                        "condition": "minecraft:any_of",
+                        "terms": [
+                            {
+                                "condition": "minecraft:match_tool",
+                                "predicate": {
+                                    "items": "#fzsd:tools_exclude_axes"
+                                }
+                            },
+                            {
+                                "condition": "minecraft:all_of",
+                                "terms": [
+                                    {
+                                        "condition": "minecraft:match_tool",
+                                        "predicate": {
+                                            "items": "#fzsd:tool/axes"
+                                        }
+                                    },
+                                    {
+                                        "condition": "minecraft:location_check",
+                                        "predicate": {
+                                            "__comment": "斧子剥树皮会触发两次，所以用目标方块限定只触发一次",
+                                            "block": {
+                                                "blocks": "#fzsd:stripped_blocks"
+                                            }
+                                        }
+                                    }
+                                ]
+                            }
+                        ]
+                    }
+                ]
+            }
+        }
+    },
+    "rewards": {
+        "function": "fzsd:game_event/advancement/on_tools_used_on_block"
+    }
+}

data/fzsd/advancement/game_event/on_unsneak.json

@@ -16,18 +16,11 @@
                             "flags": {
                                 "is_sneaking": false
                             },
-                            "__comment_type_specific": "1.19+",
                             "type_specific": {
                                 "type": "player",
                                 "advancements": {
                                     "fzsd:game_event/on_sneak": true
                                 }
-                            },
-                            "__comment_player": "1.18 compat",
-                            "player": {
-                                "advancements": {
-                                    "fzsd:game_event/on_sneak": true
-                                }
                             }
                         }
                     }

data/fzsd/advancement/game_event/on_used_tool.json

@@ -7,7 +7,6 @@
                 "player": [
                     {
                         "condition": "minecraft:reference",
-                        "entity": "this",
                         "name": "fzsd:used_tool"
                     }
                 ]

data/fzsd/advancement/module/interactor/on_click.json

@@ -10,7 +10,7 @@
                         "name": "fzsd:is_real_player"
                     },
                     {
-                        "condition": "minecraft:alternative",
+                        "condition": "minecraft:any_of",
                         "terms": [
                             {
                                 "condition": "minecraft:entity_scores",

data/fzsd/advancements/game_event/on_tool_axes_used_on_block.json

@@ -1,28 +0,0 @@
-{
-    "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,23 +0,0 @@
-{
-    "parent": "fzsd:game_event",
-    "criteria": {
-        "on_tools_exclude_axes_used_on_block": {
-            "__comment": "斧子剥树皮会触发两次！",
-            "trigger": "minecraft:item_used_on_block",
-            "conditions": {
-                "player": [
-                    {
-                        "condition": "minecraft:reference",
-                        "name": "fzsd:is_real_player"
-                    }
-                ],
-                "item": {
-                    "tag": "fzsd:tools_exclude_axes"
-                }
-            }
-        }
-    },
-    "rewards": {
-        "function": "fzsd:game_event/advancement/on_tools_used_on_block"
-    }
-}

data/fzsd/function/api/get_current_daytime.mcfunction

@@ -0,0 +1,2 @@
+# 游戏时间范围：0-2147483647
+execute store result score fzsd.var.cache fzsd.variable.integer run time query daytime

data/fzsd/function/api/get_current_gametime.mcfunction

@@ -0,0 +1,2 @@
+# 游戏时间范围：0-2147483647
+execute store result score fzsd.var.cache fzsd.variable.integer run time query gametime

data/fzsd/function/api/get_dimension_name/default.mcfunction

@@ -1 +1 @@
-data modify storage fzsd:global fzsd.api.dimension.name set value '{"nbt": "fzsd.cache.dimension.id", "storage": "fzsd:global"}'
+data modify storage fzsd:global fzsd.api.dimension.name set value '{"nbt": "fzsd.api.dimension.id", "storage": "fzsd:global"}'

data/fzsd/function/api/get_time_since_rest.mcfunction

@@ -0,0 +1 @@
+scoreboard players operation fzsd.var.cache fzsd.variable.integer = @s fzsd.api.time_since_rest

data/fzsd/function/api/install.mcfunction

@@ -0,0 +1,5 @@
+## 距上次睡觉时间
+scoreboard objectives add fzsd.api.time_since_rest minecraft.custom:time_since_rest
+
+## 调试
+execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "已安装系统组件：API"}]

data/fzsd/function/api/uninstall.mcfunction

@@ -0,0 +1,5 @@
+## 距上次睡觉时间
+scoreboard objectives remove fzsd.api.time_since_rest
+
+## 调试
+execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "已卸载系统组件：API"}]

data/fzsd/function/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'}}
+execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.2'}}
-execute if data storage fzsd:version fzsd{need_update: 1} run function fzsd:system/update
+execute if data storage fzsd:version fzsd{need_update: 1b} run function fzsd:system/update
-function fzsd:system/carpet/try_load_fzsd_score
 function #fzsd:load
+function fzsd:system/carpet/try_load_fzsd_score
 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/function/game_event/advancement/on_aviate_one_meter.mcfunction

@@ -4,4 +4,4 @@ execute if predicate fzsd:is_real_player run function fzsd:game_event/player/on_
 
 ## 重置事件
 scoreboard players operation @s fzsd.event.aviating_distance %= 200 fzsd.variable.integer
-advancement revoke @s only fzsd:game_event/on_aviate_one_meter
+advancement revoke @s from fzsd:game_event/on_aviate_one_meter

data/fzsd/function/game_event/advancement/on_dead.mcfunction

@@ -4,4 +4,4 @@ execute if predicate fzsd:is_real_player run function fzsd:game_event/player/on_
 
 ## 重置事件
 scoreboard players set @s fzsd.event.death_count 0
-advancement revoke @s only fzsd:game_event/on_dead
+advancement revoke @s from fzsd:game_event/on_dead

data/fzsd/function/game_event/advancement/on_entered_nether_portal.mcfunction

@@ -4,4 +4,4 @@ execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellr
 function #fzsd:game_event/player/on_entered_nether_portal
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_entered_nether_portal
+advancement revoke @s from fzsd:game_event/on_entered_nether_portal

data/fzsd/function/game_event/advancement/on_fished.mcfunction

@@ -7,4 +7,4 @@ execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellr
 function #fzsd:game_event/player/on_fished
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_fished
+advancement revoke @s from fzsd:game_event/on_fished

data/fzsd/function/game_event/advancement/on_hurt_entity_with_tools.mcfunction

@@ -10,4 +10,4 @@ scoreboard players remove @s fzsd.event.used_tool.dig_offset 1
 function #fzsd:game_event/player/on_hurt_entity_with_tools
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_hurt_entity_with_tools
+advancement revoke @s from fzsd:game_event/on_hurt_entity_with_tools

data/fzsd/function/game_event/advancement/on_killed_mob_or_player.mcfunction

@@ -7,4 +7,4 @@ execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellr
 function #fzsd:game_event/player/on_killed_mob_or_player
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_killed_mob_or_player
+advancement revoke @s from fzsd:game_event/on_killed_mob_or_player

data/fzsd/function/game_event/advancement/on_login.mcfunction

@@ -1,7 +1,7 @@
 # 调用者：advancements/fzsd:~
 
-execute if predicate fzsd:is_real_player run function fzsd:game_event/player/on_login
+scoreboard players set @s fzsd.event.leave_game 0
+execute if predicate fzsd:is_real_player if score @s fzsd.event.leave_game matches 0 run function fzsd:game_event/player/on_login
 
 ## 重制所有触发器、事件进度
-scoreboard players set @s fzsd.event.leave_game 0
 function #fzsd:game_event/reset_all

data/fzsd/function/game_event/advancement/on_piglin_trade.mcfunction

@@ -7,4 +7,4 @@ execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellr
 function #fzsd:game_event/player/on_piglin_trade
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_piglin_trade
+advancement revoke @s from fzsd:game_event/on_piglin_trade

data/fzsd/function/game_event/advancement/on_placed_block.mcfunction

@@ -0,0 +1,9 @@
+# 调用者：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": "放置了方块/流体"}]
+
+function #fzsd:game_event/player/on_placed_block
+
+## 重置事件进度
+advancement revoke @s from fzsd:game_event/on_placed_block

data/fzsd/function/game_event/advancement/on_placed_block/on_placed_liquid.mcfunction

@@ -0,0 +1,9 @@
+# 调用者：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": "放置了流体"}]
+
+function #fzsd:game_event/player/on_placed_liquid
+
+## 重置事件进度
+advancement revoke @s from fzsd:game_event/on_placed_block/on_placed_liquid

data/fzsd/function/game_event/advancement/on_placed_block/on_placed_solid.mcfunction

@@ -3,8 +3,7 @@
 ## 调试
 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": "放置了方块"}]
 
-## 运行事件
+function #fzsd:game_event/player/on_placed_solid
-function #fzsd:game_event/player/on_placed_block
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_placed_block
+advancement revoke @s from fzsd:game_event/on_placed_block/on_placed_solid

data/fzsd/function/game_event/advancement/on_play_one_hour.mcfunction

@@ -4,4 +4,4 @@ execute if predicate fzsd:is_real_player run function fzsd:game_event/player/on_
 
 ## 重置事件
 scoreboard players operation @s fzsd.event.play_ticks %= 72000 fzsd.variable.integer
-advancement revoke @s only fzsd:game_event/on_play_one_hour
+advancement revoke @s from fzsd:game_event/on_play_one_hour

data/fzsd/function/game_event/advancement/on_shears_used_on_entity.mcfunction

@@ -10,4 +10,4 @@ scoreboard players remove @s fzsd.event.used_tool.dig_offset 1
 function #fzsd:game_event/player/on_shears_used_on_entity
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_shears_used_on_entity
+advancement revoke @s from fzsd:game_event/on_shears_used_on_entity

data/fzsd/function/game_event/advancement/on_sleeping.mcfunction

@@ -0,0 +1,10 @@
+# 调用者：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": "正在睡觉"}]
+
+## 运行事件
+function #fzsd:game_event/player/on_sleeping
+
+## 重置事件进度
+advancement revoke @s from fzsd:game_event/on_sleeping

data/fzsd/function/game_event/advancement/on_took_damage.mcfunction

@@ -4,4 +4,4 @@ execute if predicate fzsd:is_real_player run function fzsd:game_event/player/on_
 
 ## 重置事件
 scoreboard players operation @s fzsd.event.damage_taken %= 10 fzsd.variable.integer
-advancement revoke @s only fzsd:game_event/on_took_damage
+advancement revoke @s from fzsd:game_event/on_took_damage

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

@@ -10,5 +10,4 @@ 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_tool_axes_used_on_block
+advancement revoke @s from fzsd:game_event/on_tools_used_on_block
-advancement revoke @s only fzsd:game_event/on_tools_exclude_axes_used_on_block

data/fzsd/function/game_event/advancement/on_unsneak.mcfunction

@@ -10,4 +10,4 @@ execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellr
 function #fzsd:game_event/player/on_unsneak
 
 ## 重置事件进度
-advancement revoke @s until fzsd:game_event/on_unsneak
+advancement revoke @s through fzsd:game_event/on_unsneak