bug fix+1.21.6 support

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

.vscode/settings.json

@@ -37,5 +37,5 @@
         "after": 1
     },
     "datapack.env.cmdVersion": "1.20.3",
-    "datapack.env.dataVersion": "1.20.6"
+    "datapack.env.dataVersion": "1.21"
 }

DEVDOC.md

@@ -80,7 +80,7 @@
 
 #### 按钮操作
 
-1. 定义一个显示按钮时执行的函数，使用形如`tellraw @s {"text": "[按钮]", "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set <触发器分数>"}}`的指令定义按钮。
+1. 定义一个显示按钮时执行的函数，使用形如`tellraw @s {"text": "[按钮]", "click_event": {"action": "run_command", "command": "/trigger fzsd.module.interactor.trigger set <触发器分数>"}}`的指令定义按钮。
     - *触发器分数为正数会重新向玩家发送交互按钮，如不想重新发送，请使用负数*
     - 大多数情况下这里的触发器分数必须是独一无二的
     - 建议使用`>10000`的随机数作为自定义按钮的触发器分数

README.md

@@ -2,18 +2,16 @@
 
 为FZ服务器写的Minecraft生存辅助数据包
 
-[![数据包版本](https://img.shields.io/badge/正式版-3.1.7-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases) [![MC版本](https://img.shields.io/badge/Minecraft-1.20+-blue.svg)](https://minecraft.net/)
-
-> 其他版本见[发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases)
+> [下载](https://gitee.com/harvey-husky/FZ-sDatapack/releases)
 
 ## 安装教程
 
 1. 兼容性
-     - `数据包 v3.1.x` 支持 `Minecraft 1.20.x`
+     - `数据包 v3.1.x` 支持 `Minecraft 1.20-1.21`
      - `数据包 v3.0.x` 支持 `Minecraft 1.18.2-1.19.x` (不再维护)
 2. 前往[发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases)下载对应MC版本的数据包
 3. 将数据包 `zip` 文件放入 `world/datapacks` 中（在客户端位于 `.minecraft/saves/<存档名>/datapacks`）
-4. （可选）下载并安装 [Carpet Mod](https://github.com/gnembon/fabric-carpet/releases)  
+4. （可选）下载并安装 Carpet Mod  
 5. （可选）从数据包 `zip` 文件的 `scripts` 目录中解压 `.sc` 文件，将其放入 `world/scripts` 中（在客户端位于 `.minecraft/saves/<存档名>/scripts` ）
     - **注意：如果未正确安装该脚本，数据包会强制禁用 carpet mod 的 `player` 命令以避免假人污染记分板，需要在安装好脚本后手动启用 `player` 命令**
 6. 执行 `reload` 指令（或重新打开存档；在一些第三方服务端中可能需要改为`/minecraft:reload`）
@@ -28,9 +26,9 @@
 
 - 提供下列计分板：
 
-  | 默认名称 |                     计分板ID                     |
+  | 默认名称 |                     计分板 ID                     |
   | :------: | :----------------------------------------------: |
-  |   总榜   |      fzsd.module.scoreboard.display.general      |
+  |   总览   |      fzsd.module.scoreboard.display.general      |
   |  活跃度  |    fzsd.module.scoreboard.display.activation     |
   | 飞行距离 | fzsd.module.scoreboard.display.aviating_distance |
   |  抖M榜   |   fzsd.module.scoreboard.display.damage_taken    |
@@ -44,30 +42,30 @@
 - 兼容[破基岩榜Mod](https://gitee.com/harvey-husky/yh-bbl)
   - 安装该Mod后，使用连点器破基岩，破基岩榜将自动显示在交互器页面
 
-  | 默认名称 |                     计分板ID                     |
+  | 默认名称 |                     计分板 ID                     |
   | :------: | :----------------------------------------------: |
   | 破基岩榜 |fzsd.module.scoreboard.display.bedrock_broken_count|
 
-- 系统总榜计分板：`fzsd.module.scoreboard.assign.general`
+- 系统总览计分板：`fzsd.module.scoreboard.assign.general`
   - 可以在在此记分板修改总分数据，下次加分时会刷新显示分数
   - 总计分项名称对照表：
 
-  |   默认名称   |                    计分板ID                    |
+  |   默认名称   |                    player ID                    |
   |  :------:  | :----------------------------------------------: |
   |  总活跃时间  |    fzsd.module.scoreboard.total.activation     |
   |  总飞行距离  | fzsd.module.scoreboard.total.aviating_distance |
-  |  总受伤害量  |   fzsd.module.scoreboard.total.damage_taken    |
+  |  总受伤害数  |   fzsd.module.scoreboard.total.damage_taken    |
   |   总死亡数   |    fzsd.module.scoreboard.total.death_count    |
-  |   总挖掘量   |     fzsd.module.scoreboard.total.dig_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.placement_count  |
+  |   总交易数   |    fzsd.module.scoreboard.total.trade_count    |
 
 ### 地毯脚本
 
 - 如果你不知道 Carpet Mod 或 Carpet 脚本，请忽略本节
-- 需要安装 [Carpet Mod](https://github.com/gnembon/fabric-carpet/releases)
+- 需要安装 Carpet Mod
 - 从数据包 `zip` 文件的 `scripts` 目录中解压 `.sc` 文件，将其放入 `world/scripts` 中（在客户端位于 `.minecraft/saves/<存档名>/scripts` ）
 - **注意：如果未正确安装该脚本，数据包会强制禁用 carpet mod 的 `player` 命令以避免假人污染记分板，需要在安装好脚本后手动启用 `player` 命令**
 - 脚本：
@@ -78,7 +76,6 @@
       - ***使用前请务必备份存档！请报告不符预期的结果***
       - ***使用前请务必备份存档！请报告不符预期的结果***
       - ***使用前请务必备份存档！请报告不符预期的结果***
-      - `updateFrom <version>`：用于从给定的数据包版本恢复计分板数据（需要测试！）
       - `recalculate`：重新计算所有计分板总分
       - `recalculate <scoreboardID>`：重新计算该计分板总分
       - `set <player> <scoreboardID> <score>`：设置该玩家该计分板的分数
@@ -98,6 +95,7 @@
 ### 管理员
 
 - 使用`/function admin.fzsd:admin`命令管理（安装、卸载等）各模块
+- 开启权限限制后，权限tag为``
 
 ### 其他
 

compat_27/data/fzsd/advancements/game_event/on_placed_block/on_placed_solid.json

@@ -1,31 +0,0 @@
-{
-    "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/admin.fzsd/function/admin.mcfunction

@@ -0,0 +1,61 @@
+tag @s add fzsd.admin
+
+tellraw @s {"text": "管理员页面：", "color": "red"}
+
+
+tellraw @s [{"text": "数据包："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/reload"}, "hover_event": {"action": "show_text", "value": {"text": "重载", "color": "yellow"}}}, {"text": "重载", "color": "yellow"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:install"}, "hover_event": {"action": "show_text", "value": [{"text": "安装：", "color": "dark_green"}, {"text": "仅安装上次卸载前已安装的模块", "color": "red"}]}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:uninstall"}, "hover_event": {"action": "show_text", "value": [{"text": "卸载：", "color": "dark_red"}, {"text": "将保留模块安装记录", "color": "red"}]}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:reinstall"}, "hover_event": {"action": "show_text", "value": [{"text": "重装：", "color": "gold"}, {"text": "可能可以修复一些奇怪问题，", "color": "white"}, {"text": "将保留模块安装记录", "color": "red"}]}}, {"text": "重装", "color": "gold"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:deep_install"}, "hover_event": {"action": "show_text", "value": [{"text": "深度安装：", "color": "dark_green"}, {"text": "将安装所有模块", "color": "red"}]}}, {"text": "深度安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:deep_uninstall"}, "hover_event": {"action": "show_text", "value": [{"text": "深度卸载：", "color": "dark_red"}, {"text": "将清除模块安装记录", "color": "red"}]}}, {"text": "深度卸载", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:deep_reinstall"}, "hover_event": {"action": "show_text", "value": [{"text": "深度重装：", "color": "gold"}, {"text": "可能可以修复一些奇怪问题，", "color": "white"}, {"text": "将清除模块安装记录", "color": "red"}]}}, {"text": "深度重装", "color": "gold"}, {"text": "]"}]]]
+
+tellraw @s [{"text": "假人前缀："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/function admin.fzsd:module/fake_player_prefix/on"}, "hover_event": {"action": "show_text", "value": {"text": "启用假人前缀", "color": "green"}}}, {"text": "启用", "color": "green"}, {"text": "]"}],[{"text": "[", "click_event": {"action": "run_command", "command": "/function admin.fzsd:module/fake_player_prefix/off"}, "hover_event": {"action": "show_text", "value": {"text": "禁用假人前缀", "color": "dark_red"}}}, {"text": "禁用", "color": "dark_red"}, {"text": "]"}]]]
+
+tellraw @s [{"text": "日志等级："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/function fzsd:logger/level/fine"}, "hover_event": {"action": "show_text", "value": {"text": "详细", "color": "gray"}}}, {"text": "详细", "color": "gray"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function fzsd:logger/level/debug"}, "hover_event": {"action": "show_text", "value": {"text": "调试", "color": "dark_aqua"}}}, {"text": "调试", "color": "dark_aqua"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function fzsd:logger/level/info"}, "hover_event": {"action": "show_text", "value": {"text": "信息", "color": "green"}}}, {"text": "信息", "color": "green"}, {"text": "]"}]]]
+
+
+tellraw @s [{"text": "血量显示："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/health/install"}, "hover_event": {"action": "show_text", "value": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/health/uninstall"}, "hover_event": {"action": "show_text", "value": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+
+tellraw @s [{"text": "- 名牌下方：", "color": "gray"}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/function admin.fzsd:module/health/below_name/on"}, "hover_event": {"action": "show_text", "value": {"text": "显示", "color": "dark_green"}}}, {"text": "显示", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function admin.fzsd:module/health/below_name/off"}, "hover_event": {"action": "show_text", "value": {"text": "隐藏", "color": "dark_red"}}}, {"text": "隐藏", "color": "dark_red"}, {"text": "]"}]]]
+
+tellraw @s [{"text": "- 玩家列表内：", "color": "gray"}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/function admin.fzsd:module/health/list/on"}, "hover_event": {"action": "show_text", "value": {"text": "显示", "color": "dark_green"}}}, {"text": "显示", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function admin.fzsd:module/health/list/off"}, "hover_event": {"action": "show_text", "value": {"text": "隐藏", "color": "dark_red"}}}, {"text": "隐藏", "color": "dark_red"}, {"text": "]"}]]]
+
+
+tellraw @s [{"text": "交互器："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/interactor/install"}, "hover_event": {"action": "show_text", "value": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/interactor/uninstall"}, "hover_event": {"action": "show_text", "value": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+
+
+tellraw @s [{"text": "登录消息："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/join_message/install"}, "hover_event": {"action": "show_text", "value": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/join_message/uninstall"}, "hover_event": {"action": "show_text", "value": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+
+
+tellraw @s [{"text": "玩家位置："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/here/install"}, "hover_event": {"action": "show_text", "value": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/here/uninstall"}, "hover_event": {"action": "show_text", "value": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/data modify storage fzsd:perm here set value 1"}, "hover_event": {"action": "show_text", "value": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/data remove storage fzsd:perm here"}, "hover_event": {"action": "show_text", "value": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]]
+
+
+tellraw @s [{"text": "上一死亡点："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/last_death/install"}, "hover_event": {"action": "show_text", "value": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/last_death/uninstall"}, "hover_event": {"action": "show_text", "value": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/data modify storage fzsd:perm last_death set value 1"}, "hover_event": {"action": "show_text", "value": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/data remove storage fzsd:perm last_death"}, "hover_event": {"action": "show_text", "value": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]]
+
+
+tellraw @s [{"text": "上次穿出的下界传送门："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/last_nether_portal/install"}, "hover_event": {"action": "show_text", "value": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/last_nether_portal/uninstall"}, "hover_event": {"action": "show_text", "value": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/data modify storage fzsd:perm last_nether_portal set value 1"}, "hover_event": {"action": "show_text", "value": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/data remove storage fzsd:perm last_nether_portal"}, "hover_event": {"action": "show_text", "value": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]]
+
+
+tellraw @s [{"text": "上一出生点："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/last_spawn_point/install"}, "hover_event": {"action": "show_text", "value": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/last_spawn_point/uninstall"}, "hover_event": {"action": "show_text", "value": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/data modify storage fzsd:perm last_spawn_point set value 1"}, "hover_event": {"action": "show_text", "value": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/data remove storage fzsd:perm last_spawn_point"}, "hover_event": {"action": "show_text", "value": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]]
+
+
+tellraw @s [{"text": "计分板："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/scoreboard/install"}, "hover_event": {"action": "show_text", "value": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/scoreboard/uninstall"}, "hover_event": {"action": "show_text", "value": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/data modify storage fzsd:perm scoreboard set value 1"}, "hover_event": {"action": "show_text", "value": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/data remove storage fzsd:perm scoreboard"}, "hover_event": {"action": "show_text", "value": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]]
+
+
+tellraw @s [{"text": "扫地机："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/sweeper/install"}, "hover_event": {"action": "show_text", "value": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/sweeper/uninstall"}, "hover_event": {"action": "show_text", "value": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/data modify storage fzsd:perm sweeper set value 1"}, "hover_event": {"action": "show_text", "value": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/data remove storage fzsd:perm sweeper"}, "hover_event": {"action": "show_text", "value": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]]
+
+
+tellraw @s [{"text": "幻翼预警："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/phantom_warning/install"}, "hover_event": {"action": "show_text", "value": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/phantom_warning/uninstall"}, "hover_event": {"action": "show_text", "value": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/data modify storage fzsd:perm phantom_warning set value 1"}, "hover_event": {"action": "show_text", "value": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/data remove storage fzsd:perm phantom_warning"}, "hover_event": {"action": "show_text", "value": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]]
+
+
+tellraw @s {"text": "已为您添加管理员标签“fzsd.admin”，使用“/tag <player> add fzsd.admin”为其他人添加“仅管理员”功能的使用权限", "color": "white"}

data/admin.fzsd/function/carpet_settings_preset.mcfunction

@@ -0,0 +1 @@
+function fzsd:system/carpet/settings_preset

data/admin.fzsd/function/module/fake_player_prefix/off.mcfunction

@@ -0,0 +1,3 @@
+team modify fzsd.module.scoreboard.fake prefix ""
+team modify fzsd.module.scoreboard.shadow prefix ""
+data modify storage fzsd:config fzsd.module.scoreboard.fake_player_prefix set value false

data/admin.fzsd/function/module/fake_player_prefix/on.mcfunction

@@ -0,0 +1,3 @@
+team modify fzsd.module.scoreboard.fake prefix "假的"
+team modify fzsd.module.scoreboard.shadow prefix "挂机"
+data modify storage fzsd:config fzsd.module.scoreboard.fake_player_prefix set value true

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

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

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

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

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

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

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

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

data/admin.fzsd/functions/admin.mcfunction

@@ -1,40 +1,61 @@
+tag @s add fzsd.admin
+
 tellraw @s {"text": "管理员页面：", "color": "red"}
 
 
-tellraw @s [{"text": "全局："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/reload"}, "hoverEvent": {"action": "show_text", "contents": {"text": "重载", "color": "yellow"}}}, {"text": "重载", "color": "yellow"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:install"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "安装：", "color": "dark_green"}, {"text": "仅安装上次卸载前已安装的模块", "color": "red"}]}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:uninstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "卸载：", "color": "dark_red"}, {"text": "将保留模块安装记录", "color": "red"}]}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:reinstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "重装：", "color": "gold"}, {"text": "可能可以修复一些奇怪问题，", "color": "white"}, {"text": "将保留模块安装记录", "color": "red"}]}}, {"text": "重装", "color": "gold"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_install"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度安装：", "color": "dark_green"}, {"text": "将安装所有模块", "color": "red"}]}}, {"text": "深度安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_uninstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度卸载：", "color": "dark_red"}, {"text": "将清除模块安装记录", "color": "red"}]}}, {"text": "深度卸载", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_reinstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度重装：", "color": "gold"}, {"text": "可能可以修复一些奇怪问题，", "color": "white"}, {"text": "将清除模块安装记录", "color": "red"}]}}, {"text": "深度重装", "color": "gold"}, {"text": "]"}]]]
+tellraw @s [{"text": "数据包："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/reload"}, "hover_event": {"action": "show_text", "value": {"text": "重载", "color": "yellow"}}}, {"text": "重载", "color": "yellow"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:install"}, "hover_event": {"action": "show_text", "value": [{"text": "安装：", "color": "dark_green"}, {"text": "仅安装上次卸载前已安装的模块", "color": "red"}]}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:uninstall"}, "hover_event": {"action": "show_text", "value": [{"text": "卸载：", "color": "dark_red"}, {"text": "将保留模块安装记录", "color": "red"}]}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:reinstall"}, "hover_event": {"action": "show_text", "value": [{"text": "重装：", "color": "gold"}, {"text": "可能可以修复一些奇怪问题，", "color": "white"}, {"text": "将保留模块安装记录", "color": "red"}]}}, {"text": "重装", "color": "gold"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:deep_install"}, "hover_event": {"action": "show_text", "value": [{"text": "深度安装：", "color": "dark_green"}, {"text": "将安装所有模块", "color": "red"}]}}, {"text": "深度安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:deep_uninstall"}, "hover_event": {"action": "show_text", "value": [{"text": "深度卸载：", "color": "dark_red"}, {"text": "将清除模块安装记录", "color": "red"}]}}, {"text": "深度卸载", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:deep_reinstall"}, "hover_event": {"action": "show_text", "value": [{"text": "深度重装：", "color": "gold"}, {"text": "可能可以修复一些奇怪问题，", "color": "white"}, {"text": "将清除模块安装记录", "color": "red"}]}}, {"text": "深度重装", "color": "gold"}, {"text": "]"}]]]
+
+tellraw @s [{"text": "假人前缀："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/function admin.fzsd:module/fake_player_prefix/on"}, "hover_event": {"action": "show_text", "value": {"text": "启用假人前缀", "color": "green"}}}, {"text": "启用", "color": "green"}, {"text": "]"}],[{"text": "[", "click_event": {"action": "run_command", "command": "/function admin.fzsd:module/fake_player_prefix/off"}, "hover_event": {"action": "show_text", "value": {"text": "禁用假人前缀", "color": "dark_red"}}}, {"text": "禁用", "color": "dark_red"}, {"text": "]"}]]]
+
+tellraw @s [{"text": "日志等级："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/function fzsd:logger/level/fine"}, "hover_event": {"action": "show_text", "value": {"text": "详细", "color": "gray"}}}, {"text": "详细", "color": "gray"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function fzsd:logger/level/debug"}, "hover_event": {"action": "show_text", "value": {"text": "调试", "color": "dark_aqua"}}}, {"text": "调试", "color": "dark_aqua"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function fzsd:logger/level/info"}, "hover_event": {"action": "show_text", "value": {"text": "信息", "color": "green"}}}, {"text": "信息", "color": "green"}, {"text": "]"}]]]
 
 
-tellraw @s [{"text": "日志等级："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function fzsd:logger/level/fine"}, "hoverEvent": {"action": "show_text", "contents": {"text": "详细", "color": "gray"}}}, {"text": "详细", "color": "gray"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function fzsd:logger/level/debug"}, "hoverEvent": {"action": "show_text", "contents": {"text": "调试", "color": "dark_aqua"}}}, {"text": "调试", "color": "dark_aqua"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function fzsd:logger/level/info"}, "hoverEvent": {"action": "show_text", "contents": {"text": "信息", "color": "green"}}}, {"text": "信息", "color": "green"}, {"text": "]"}]]]
+tellraw @s [{"text": "血量显示："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/health/install"}, "hover_event": {"action": "show_text", "value": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/health/uninstall"}, "hover_event": {"action": "show_text", "value": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+
+tellraw @s [{"text": "- 名牌下方：", "color": "gray"}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/function admin.fzsd:module/health/below_name/on"}, "hover_event": {"action": "show_text", "value": {"text": "显示", "color": "dark_green"}}}, {"text": "显示", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function admin.fzsd:module/health/below_name/off"}, "hover_event": {"action": "show_text", "value": {"text": "隐藏", "color": "dark_red"}}}, {"text": "隐藏", "color": "dark_red"}, {"text": "]"}]]]
+
+tellraw @s [{"text": "- 玩家列表内：", "color": "gray"}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/function admin.fzsd:module/health/list/on"}, "hover_event": {"action": "show_text", "value": {"text": "显示", "color": "dark_green"}}}, {"text": "显示", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function admin.fzsd:module/health/list/off"}, "hover_event": {"action": "show_text", "value": {"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/health/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/health/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
-
-tellraw @s [{"text": "- 名牌下方：", "color": "gray"}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function admin.fzsd:module/health/below_name/on"}, "hoverEvent": {"action": "show_text", "contents": {"text": "显示", "color": "dark_green"}}}, {"text": "显示", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function admin.fzsd:module/health/below_name/off"}, "hoverEvent": {"action": "show_text", "contents": {"text": "隐藏", "color": "dark_red"}}}, {"text": "隐藏", "color": "dark_red"}, {"text": "]"}]]]
-
-tellraw @s [{"text": "- 玩家列表内：", "color": "gray"}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function admin.fzsd:module/health/list/on"}, "hoverEvent": {"action": "show_text", "contents": {"text": "显示", "color": "dark_green"}}}, {"text": "显示", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function admin.fzsd:module/health/list/off"}, "hoverEvent": {"action": "show_text", "contents": {"text": "隐藏", "color": "dark_red"}}}, {"text": "隐藏", "color": "dark_red"}, {"text": "]"}]]]
+tellraw @s [{"text": "交互器："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/interactor/install"}, "hover_event": {"action": "show_text", "value": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/interactor/uninstall"}, "hover_event": {"action": "show_text", "value": {"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/here/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/here/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+tellraw @s [{"text": "登录消息："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/join_message/install"}, "hover_event": {"action": "show_text", "value": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/join_message/uninstall"}, "hover_event": {"action": "show_text", "value": {"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/interactor/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/interactor/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+tellraw @s [{"text": "玩家位置："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/here/install"}, "hover_event": {"action": "show_text", "value": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/here/uninstall"}, "hover_event": {"action": "show_text", "value": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/data modify storage fzsd:perm here set value 1"}, "hover_event": {"action": "show_text", "value": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/data remove storage fzsd:perm here"}, "hover_event": {"action": "show_text", "value": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]]
 
 
-tellraw @s [{"text": "登录消息："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/join_message/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/join_message/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+tellraw @s [{"text": "上一死亡点："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/last_death/install"}, "hover_event": {"action": "show_text", "value": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/last_death/uninstall"}, "hover_event": {"action": "show_text", "value": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/data modify storage fzsd:perm last_death set value 1"}, "hover_event": {"action": "show_text", "value": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/data remove storage fzsd:perm last_death"}, "hover_event": {"action": "show_text", "value": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]]
 
 
-tellraw @s [{"text": "上一死亡点："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_death/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_death/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+tellraw @s [{"text": "上次穿出的下界传送门："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/last_nether_portal/install"}, "hover_event": {"action": "show_text", "value": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/last_nether_portal/uninstall"}, "hover_event": {"action": "show_text", "value": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/data modify storage fzsd:perm last_nether_portal set value 1"}, "hover_event": {"action": "show_text", "value": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/data remove storage fzsd:perm last_nether_portal"}, "hover_event": {"action": "show_text", "value": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]]
 
 
-tellraw @s [{"text": "上次穿出的下界传送门："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_nether_portal/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_nether_portal/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+tellraw @s [{"text": "上一出生点："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/last_spawn_point/install"}, "hover_event": {"action": "show_text", "value": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/last_spawn_point/uninstall"}, "hover_event": {"action": "show_text", "value": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/data modify storage fzsd:perm last_spawn_point set value 1"}, "hover_event": {"action": "show_text", "value": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/data remove storage fzsd:perm last_spawn_point"}, "hover_event": {"action": "show_text", "value": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]]
 
 
-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": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/scoreboard/install"}, "hover_event": {"action": "show_text", "value": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/scoreboard/uninstall"}, "hover_event": {"action": "show_text", "value": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/data modify storage fzsd:perm scoreboard set value 1"}, "hover_event": {"action": "show_text", "value": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/data remove storage fzsd:perm scoreboard"}, "hover_event": {"action": "show_text", "value": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"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": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/sweeper/install"}, "hover_event": {"action": "show_text", "value": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/sweeper/uninstall"}, "hover_event": {"action": "show_text", "value": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/data modify storage fzsd:perm sweeper set value 1"}, "hover_event": {"action": "show_text", "value": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/data remove storage fzsd:perm sweeper"}, "hover_event": {"action": "show_text", "value": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]]
 
 
-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": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/phantom_warning/install"}, "hover_event": {"action": "show_text", "value": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/function #fzsd:module/phantom_warning/uninstall"}, "hover_event": {"action": "show_text", "value": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "click_event": {"action": "run_command", "command": "/data modify storage fzsd:perm phantom_warning set value 1"}, "hover_event": {"action": "show_text", "value": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "click_event": {"action": "run_command", "command": "/data remove storage fzsd:perm phantom_warning"}, "hover_event": {"action": "show_text", "value": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"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": "]"}]]]
+
+tellraw @s {"text": "已为您添加管理员标签“fzsd.admin”，使用“/tag <player> add fzsd.admin”为其他人添加“仅管理员”功能的使用权限", "color": "white"}

data/admin.fzsd/functions/module/fake_player_prefix/off.mcfunction

@@ -0,0 +1,3 @@
+team modify fzsd.module.scoreboard.fake prefix ""
+team modify fzsd.module.scoreboard.shadow prefix ""
+data modify storage fzsd:config fzsd.module.scoreboard.fake_player_prefix set value true

data/admin.fzsd/functions/module/fake_player_prefix/on.mcfunction

@@ -0,0 +1,3 @@
+team modify fzsd.module.scoreboard.fake prefix ""
+team modify fzsd.module.scoreboard.shadow prefix ""
+data modify storage fzsd:config fzsd.module.scoreboard.fake_player_prefix set value false

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,6 +1,6 @@
 # 见#fzsd.extra.bbl:display/set_text
 
-data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "light_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": "light_purple"}
 team modify fzsd.module.scoreboard.display.bedrock_broken_count 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

@@ -0,0 +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", "click_event": {"action": "run_command", "command": "/trigger fzsd.module.interactor.trigger set -1210"}, "hover_event": {"action": "show_text", "value": {"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/functions/interactor/display.mcfunction

@@ -1,3 +0,0 @@
-# 见#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": "]"}]

data/fzsd/advancement/game_event/on_fished.json

@@ -19,4 +19,4 @@
     "rewards": {
         "function": "fzsd:game_event/advancement/on_fished"
     }
-}
+}

data/fzsd/advancement/game_event/on_killed_mob_or_player.json

@@ -21,10 +21,7 @@
                             }
                         }
                     }
-                ],
-                "killing_blow": {
-                    "bypasses_invulnerability": false
-                }
+                ]
             }
         }
     },

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

@@ -13,7 +13,7 @@
                         "condition": "minecraft:location_check",
                         "predicate": {
                             "block": {
-                                "blocks": "#fzsd:liquid"
+                                "blocks": "#fzsd:placed_liquid_ignore"
                             }
                         }
                     }

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

@@ -16,7 +16,7 @@
                             "condition": "minecraft:location_check",
                             "predicate": {
                                 "block": {
-                                    "tag": "fzsd:liquid"
+                                    "blocks": "#fzsd:placed_liquid_ignore"
                                 }
                             }
                         }

data/fzsd/advancements/game_event/on_fished.json

@@ -1,22 +0,0 @@
-{
-    "parent": "fzsd:game_event",
-    "criteria": {
-        "on_fished": {
-            "trigger": "minecraft:fishing_rod_hooked",
-            "conditions": {
-                "player": [
-                    {
-                        "condition": "minecraft:reference",
-                        "name": "fzsd:is_real_player"
-                    }
-                ],
-                "item": {
-                    "tag": "fzsd:raw_fishes"
-                }
-            }
-        }
-    },
-    "rewards": {
-        "function": "fzsd:game_event/advancement/on_fished"
-    }
-}

data/fzsd/advancements/game_event/on_hurt_entity_with_tools.json

@@ -1,30 +0,0 @@
-{
-    "parent": "fzsd:game_event",
-    "criteria": {
-        "on_hurt_entity_with_tools": {
-            "trigger": "minecraft:player_hurt_entity",
-            "conditions": {
-                "player": [
-                    {
-                        "condition": "minecraft:reference",
-                        "name": "fzsd:is_real_player"
-                    },
-                    {
-                        "condition": "minecraft:entity_properties",
-                        "entity": "this",
-                        "predicate": {
-                            "equipment": {
-                                "mainhand": {
-                                    "tag": "fzsd:tools"
-                                }
-                            }
-                        }
-                    }
-                ]
-            }
-        }
-    },
-    "rewards": {
-        "function": "fzsd:game_event/advancement/on_hurt_entity_with_tools"
-    }
-}

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

@@ -1,27 +0,0 @@
-{
-    "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": {
-                                "tag": "fzsd:liquid"
-                            }
-                        }
-                    }
-                ]
-            }
-        }
-    },
-    "rewards": {
-        "function": "fzsd:game_event/advancement/on_placed_block/on_placed_liquid"
-    }
-}

data/fzsd/advancements/game_event/on_shears_used_on_entity.json

@@ -1,25 +0,0 @@
-{
-    "parent": "fzsd:game_event",
-    "criteria": {
-        "on_shears_used_on_entity": {
-            "trigger": "minecraft:player_interacted_with_entity",
-            "conditions": {
-                "player": [
-                    {
-                        "condition": "minecraft:reference",
-                        "name": "fzsd:is_real_player"
-                    }
-                ],
-                "entity": {
-                    "type": "#fzsd:shearable"
-                },
-                "item": {
-                    "tag": "fzsd:tool/shears"
-                }
-            }
-        }
-    },
-    "rewards": {
-        "function": "fzsd:game_event/advancement/on_shears_used_on_entity"
-    }
-}

data/fzsd/advancements/game_event/on_tools_used_on_block.json

@@ -1,50 +0,0 @@
-{
-    "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": {
-                                    "tag": "fzsd:tools_exclude_axes"
-                                }
-                            },
-                            {
-                                "condition": "minecraft:all_of",
-                                "terms": [
-                                    {
-                                        "condition": "minecraft:match_tool",
-                                        "predicate": {
-                                            "tag": "fzsd:tool/axes"
-                                        }
-                                    },
-                                    {
-                                        "condition": "minecraft:location_check",
-                                        "predicate": {
-                                            "__comment": "斧子剥树皮会触发两次，所以用目标方块限定只触发一次",
-                                            "block": {
-                                                "tag": "fzsd:stripped_blocks"
-                                            }
-                                        }
-                                    }
-                                ]
-                            }
-                        ]
-                    }
-                ]
-            }
-        }
-    },
-    "rewards": {
-        "function": "fzsd:game_event/advancement/on_tools_used_on_block"
-    }
-}

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

@@ -1 +1 @@
-data modify storage fzsd:global fzsd.api.dimension.name set value '{"nbt": "fzsd.api.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_dimension_name/minecraft/overworld.mcfunction

@@ -1 +1 @@
-execute if data storage fzsd:global fzsd.api.dimension{id:'minecraft:overworld'} run data modify storage fzsd:global fzsd.api.dimension.name set value '{"text": "主世界", "color": "dark_green"}'
+execute if data storage fzsd:global fzsd.api.dimension{id:'minecraft:overworld'} run data modify storage fzsd:global fzsd.api.dimension.name set value {"text": "主世界", "color": "dark_green"}

data/fzsd/function/api/get_dimension_name/minecraft/the_end.mcfunction

@@ -1 +1 @@
-execute if data storage fzsd:global fzsd.api.dimension{id:'minecraft:the_end'} run data modify storage fzsd:global fzsd.api.dimension.name set value '{"text": "末地", "color": "dark_gray"}'
+execute if data storage fzsd:global fzsd.api.dimension{id:'minecraft:the_end'} run data modify storage fzsd:global fzsd.api.dimension.name set value {"text": "末地", "color": "dark_gray"}

data/fzsd/function/api/get_dimension_name/minecraft/the_nether.mcfunction

@@ -1 +1 @@
-execute if data storage fzsd:global fzsd.api.dimension{id:'minecraft:the_nether'} run data modify storage fzsd:global fzsd.api.dimension.name set value '{"text": "下界", "color": "dark_red"}'
+execute if data storage fzsd:global fzsd.api.dimension{id:'minecraft:the_nether'} run data modify storage fzsd:global fzsd.api.dimension.name set value {"text": "下界", "color": "dark_red"}

data/fzsd/function/boot.mcfunction

@@ -1,4 +1,4 @@
-execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.1.8'}}
+execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.3.0'}}
 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

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

@@ -1,5 +1,5 @@
 ## 调试
-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": "进入了下届传送门"}]
+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_entered_nether_portal