向扫地机白名单添加了所有矿车和船（不包括箱船！）

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

DEVDOC.md

@@ -18,6 +18,7 @@
             "values": ...
         }
         ```
+- ***函数和标签是否能被扩展数据包成功覆盖，取决于数据包加载顺序***，请使用`/datapack enable <xxx> after <xxx>`指令，使您的扩展数据包在FZ's Survival Datapack之后加载
 
 
 ## 基本要求
@@ -25,11 +26,6 @@
 - 函数调用尽量不要使用`function`命令，应改在标签中按顺序调用！
 
 
-## 未来计划
-- 细化版本管理，提供不同版本之间的升级函数，由`update_manager`控制。*务必仔细测试再发布，一旦升级无法降级！*
-- playerdata相关功能
-
-
 ## 系统模块
 
 ### 频繁使用的计算单元
@@ -76,7 +72,7 @@
     - *触发器分数为正数会重新向玩家发送交互按钮，如不想重新发送，请使用负数*
     - 大多数情况下这里的触发器分数必须是独一无二的
     - 建议使用`>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)标签中注册上述函数
 

LICENSE

@@ -1,20 +1,20 @@
 
-FZSD许可证
+FZSD许可协议
 
-2022/8/1 https://gitee.com/harvey-husky/fz-survival-datapack/blob/dev/3.0/LICENSE
+2022/11/19 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>
 
 定义：
-“该许可证”指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

@@ -6,12 +6,10 @@
 
 #### Copyright (C) 2019-2022 Harvey_Husky
 
-[Bilibili专栏](https://www.bilibili.com/read/cv4267319)（年久失修）
-
 ## 安装教程
 
 1. 兼容性
-     - `数据包 v3.0.x` 支持 `Minecraft 1.19.x`（*由于使用了1.18.x不支持的操作，撤销对MC1.18.x的支持*）
+     - `数据包 v3.0.x` 支持 `Minecraft 1.18.2-1.19.x`
      - `数据包 v2.2.x` 支持 `Minecraft 1.19.x`
      - `数据包 v2.1.x` 支持 `Minecraft 1.17.x-1.18.x`
      - `数据包 v2.0.x` 支持 `Minecraft 1.16.3-1.16.5`
@@ -20,14 +18,11 @@
 4. 将数据包 `zip` 文件放入 `world/datapacks` 中（在客户端位于 `.minecraft/saves/<存档名>/datapacks`）
 5. （可选）下载并安装 [Carpet Mod **1.4.24**](https://github.com/gnembon/fabric-carpet/releases) 或以上版本
 6. （可选）从数据包 `zip` 文件的 `scripts` 目录中解压 `.sc` 文件，将其放入 `world/scripts` 中（在客户端位于 `.minecraft/saves/<存档名>/scripts` ）
-7. 执行 `reload` 指令（或重新打开存档）
+7. 执行 `reload` 指令（或重新打开存档；在一些第三方服务端中可能需要改为`/minecraft:reload`）
-
 
 # FZ生存数据包 3.0
 
-## *目前仍在测试阶段，请先备份服务器再使用！*
+[![数据包版本](https://img.shields.io/badge/正式版-3.0.10-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases) [![MC版本](https://img.shields.io/badge/Minecraft-1.19+-blue.svg)](https://minecraft.net/)
-
-[![数据包版本](https://img.shields.io/badge/测试版-3.0+beta.12-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases/v3.0-beta.12) [![MC版本](https://img.shields.io/badge/Minecraft-1.19+-blue.svg)](https://minecraft.net/)
 
 > 其他版本见[发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases)
 
@@ -61,6 +56,21 @@
   | :------: | :----------------------------------------------: |
   | 破基岩榜 |fzsd.module.scoreboard.display.bedrock_broken_count|
 
+- 系统总榜计分板：`fzsd.module.scoreboard.assign.general`
+  - 可以在在此记分板修改总分数据，下次加分时会刷新显示分数
+  - 总计分项名称对照表：
+
+  |   默认名称   |                    计分板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    |
 
 ### 地毯脚本
 
@@ -70,13 +80,30 @@
 - 脚本：
   - `fzsd_score.sc`（**开发中！此处列举目前已完成的**）：
     - 可避免Carpet假人污染计分板
-    - 执行 `reload` 指令后自动生效
+    - 可以标记哪些玩家是假人
+    - *注：请不要使用为假人名添加“bot”前缀的carpet扩展，本插件不支持此类假人！*
     - 子命令（ `/fzsd_score <子命令>` ）：
-      - `update_from <version>`：用于从给定的数据包版本恢复计分板数据（需要测试！）
+      - `updateFrom <version>`：用于从给定的数据包版本恢复计分板数据（需要测试！）
-      - `recalculate_total`：重新计算总分
+      - `recalculate`：重新计算所有计分板总分
+      - `recalculate <scoreboardID>`：重新计算该计分板总分
+      - `set <player> <scoreboardID> <score>`：设置该玩家该计分板的分数
+      - `reset <player>`：重置该玩家的所有分数
+      - `reset <player> <scoreboardID>`：重置该玩家该计分板的分数
+      - `restore player <玩家名> <计分板ID>`：恢复该玩家的该计分板分数
+      - `restore player <玩家名>`：恢复该玩家的所有计分板分数
+      - `restore whitelist <计分板ID>`：恢复所有白名单玩家的该计分板分数
+      - `restore whitelist`：恢复所有白名单玩家的所有计分板分数
+        - *副作用：恢复完成后玩家会被放置在出生点，请确保出生点完全安全*
+      - `commandPlayer <permissionType>`：设置player命令权限类型
+
+### 管理员
+
+- 使用`/function admin.fzsd:admin`命令管理（安装、卸载等）各模块
 
 ### 其他
+
 - 见游戏内交互器按钮
 
 ## 开发者相关
+
 - 参见[开发文档](/DEVDOC.md)

data/admin.fzsd/functions/admin.mcfunction

@@ -33,3 +33,6 @@ tellraw @s [{"text": "上一出生点："}, [{"text": "", "color": "dark_gray"},
 
 
 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/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": "]"}]]]

data/fzsd.extra.bbl/functions/display/set_text/black.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": "#202020"}'
+data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "black"}'
 scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.bedrock_broken_count
-scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "#202020"}
+scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "black"}
 team modify fzsd.module.scoreboard.display.bedrock_broken_count color black
-team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "#202020"}
+team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "black"}

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

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

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

@@ -0,0 +1,13 @@
+{
+    "parent": "fzsd:game_event/on_placed_block",
+    "criteria": {
+        "on_placed_liquid": {
+            "trigger": "minecraft:placed_block",
+            "conditions": {
+                "item": {
+                    "tag": "fzsd:bucket_of_liquid"
+                }
+            }
+        }
+    }
+}

data/fzsd/advancements/game_event/on_tool_axes_used_on_block.json

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

data/fzsd/advancements/game_event/on_tools_exclude_axes_used_on_block.json

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

data/fzsd/advancements/game_event/on_used_tool.json

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

data/fzsd/functions/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/functions/boot.mcfunction

@@ -1,5 +1,5 @@
-execute store success storage fzsd:version fzsd.need_update int 1 run data merge storage fzsd:version {fzsd: {version: '3.0.0-beta.12'}}
+execute store success storage fzsd:version fzsd.need_update int 1 run data merge storage fzsd:version {fzsd: {version: '3.0.10'}}
 execute if data storage fzsd:version fzsd{need_update: 1} run function fzsd:system/update
 function fzsd:system/carpet/try_load_fzsd_score
 function #fzsd:load
-execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "FZ Survival Data Pack，当前版本：", "color": "gold"}, {"nbt":"fzsd.version", "storage": "fzsd:version", "color": "yellow"}]
+execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "FZ Survival Data Pack，当前版本：", "color": "gold"}, {"nbt":"fzsd.version", "storage": "fzsd:version", "color": "red"}]

data/fzsd/functions/game_event/advancement/on_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/functions/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/functions/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/functions/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/functions/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/functions/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/functions/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/functions/game_event/advancement/on_placed_block.mcfunction

@@ -1,10 +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": "放置了方块"}]
-
 ## 运行事件
+execute if entity @s[advancements={fzsd:game_event/on_placed_block/on_placed_liquid=true}] run function #fzsd:game_event/player/on_placed_liquid
+execute if entity @s[advancements={fzsd:game_event/on_placed_block/on_placed_liquid=false}] run 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
+advancement revoke @s from fzsd:game_event/on_placed_block/on_placed_liquid

data/fzsd/functions/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/functions/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/functions/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/functions/game_event/advancement/on_tools_used_on_block.mcfunction

@@ -1,5 +1,4 @@
 # 调用者：advancements/fzsd:~
-## 斧子剥树皮会触发两次！！
 
 ## 调试
 execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "在方块上使用了工具"}]
@@ -11,4 +10,5 @@ scoreboard players remove @s fzsd.event.used_tool.dig_offset 1
 function #fzsd:game_event/player/on_tools_used_on_block
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_tools_used_on_block
+advancement revoke @s from fzsd:game_event/on_tool_axes_used_on_block
+advancement revoke @s from fzsd:game_event/on_tools_exclude_axes_used_on_block

data/fzsd/functions/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

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

@@ -6,4 +6,4 @@ execute if predicate fzsd:is_real_player run function fzsd:game_event/player/on_
 function #fzsd:game_event/player/on_used_tool/reset_used_tool
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_used_tool
+advancement revoke @s from fzsd:game_event/on_used_tool

data/fzsd/functions/game_event/advancement/on_villager_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_villager_trade
 
 ## 重置事件进度
-advancement revoke @s only fzsd:game_event/on_villager_trade
+advancement revoke @s from fzsd:game_event/on_villager_trade

data/fzsd/functions/game_event/callback/on_placed_liquid.mcfunction

@@ -0,0 +1,2 @@
+## 调试
+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": "放置了流体"}]

data/fzsd/functions/game_event/callback/on_placed_solid.mcfunction

@@ -0,0 +1,2 @@
+## 调试
+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": "放置了实体方块"}]

data/fzsd/functions/game_event/on_tick.mcfunction

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

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

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

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

@@ -0,0 +1,2 @@
+## 判断分数
+execute unless score fzsd.var.score fzsd.variable.integer matches ..0 run function fzsd:game_event/player/on_broke_block_with_tool

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

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

data/fzsd/functions/module/health/try_install.mcfunction

@@ -0,0 +1 @@
+execute unless data storage fzsd:install fzsd.module{health:0b} run function #fzsd:module/health/install

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

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

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

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

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

@@ -1 +1 @@
-execute if data storage fzsd:global fzsd.api.dimension{id:"minecraft:overworld"} run function fzsd:module/here/get_dimension_message/if_overworld
+execute if data entity @s {Dimension:"minecraft:overworld"} run function fzsd:module/here/get_dimension_message/if_overworld

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

@@ -1 +1 @@
-execute if data storage fzsd:global fzsd.api.dimension{id:"minecraft:the_nether"} run function fzsd:module/here/get_dimension_message/if_the_nether
+execute if data entity @s {Dimension:"minecraft:the_nether"} run function fzsd:module/here/get_dimension_message/if_the_nether

data/fzsd/functions/module/here/get_message.mcfunction

@@ -1,8 +1,8 @@
-## fzsd.cache.pos已在install中初始化
+
 execute store result storage fzsd:here fzsd.x int 1 run data get entity @s Pos[0]
 execute store result storage fzsd:here fzsd.y int 1 run data get entity @s Pos[1]
 execute store result storage fzsd:here fzsd.z int 1 run data get entity @s Pos[2]
 data modify storage fzsd:here fzsd.message.append set value ''
-
+data modify storage fzsd:here fzsd.dimension.name set from storage fzsd:global fzsd.api.dimension.name
 ## 调试
 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": "获取了位置信息"}]

data/fzsd/functions/module/here/global_message.mcfunction

@@ -1 +1 @@
-tellraw @a [{"selector": "@s"}, [{"text": "说：我在", "color": "white"}, {"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": " [", "color": "green"}, {"nbt": "fzsd.x", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.y", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.z", "storage": "fzsd:here"}, {"text": "]"}], {"nbt": "fzsd.message.append", "interpret": true, "storage": "fzsd:here"}]]
+tellraw @a [{"text": ""}, [{"selector": "@s"}, {"text": "说：我在", "color": "white"}, {"nbt": "fzsd.dimension.name", "interpret": true, "storage": "fzsd:here"}, [{"text": "[", "color": "green"}, {"nbt": "fzsd.x", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.y", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.z", "storage": "fzsd:here"}, {"text": "]"}], {"nbt": "fzsd.message.append", "interpret": true, "storage": "fzsd:here"}]]

data/fzsd/functions/module/here/private_message.mcfunction

@@ -1 +1 @@
-tellraw @s [{"text": "你在", "color": "white"}, {"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": " [", "color": "green"}, {"nbt": "fzsd.x", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.y", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.z", "storage": "fzsd:here"}, {"text": "]"}], {"nbt": "fzsd.message.append", "interpret": true, "storage": "fzsd:here"}]
+tellraw @s [{"text": "你在", "color": "white"}, {"nbt": "fzsd.dimension.name", "interpret": true, "storage": "fzsd:here"}, [{"text": "[", "color": "green"}, {"nbt": "fzsd.x", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.y", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.z", "storage": "fzsd:here"}, {"text": "]"}], {"nbt": "fzsd.message.append", "interpret": true, "storage": "fzsd:here"}]

data/fzsd/functions/module/here/try_install.mcfunction

@@ -0,0 +1 @@
+execute unless data storage fzsd:install fzsd.module{here:0b} run function #fzsd:module/here/install

data/fzsd/functions/module/interactor/event/on_click.mcfunction

@@ -1,4 +1,4 @@
 ## 运行事件
 function #fzsd:module/interactor/event/on_click
 ## 触发器分数为正数时重新显示交互器按钮，为负数时不显示
-execute if score @s fzsd.module.interactor.trigger matches 1.. run function #fzsd:module/interactor/display
+execute if score @s fzsd.module.interactor.trigger matches 1.. run function #fzsd:module/interactor/event/on_display

data/fzsd/functions/module/interactor/try_install.mcfunction

@@ -0,0 +1 @@
+execute unless data storage fzsd:install fzsd.module{interactor:0b} run function #fzsd:module/interactor/install

data/fzsd/functions/module/join_message/event/on_login/on_login.mcfunction

@@ -1 +1 @@
-execute if data storage fzsd:installed fzsd.module{join_message:1b} run function #fzsd:module/join_message/send_message
+execute if data storage fzsd:install fzsd.module{join_message:1b} run function #fzsd:module/join_message/send_message

data/fzsd/functions/module/join_message/try_install.mcfunction

@@ -0,0 +1 @@
+execute unless data storage fzsd:install fzsd.module{join_message:0b} run function #fzsd:module/join_message/install

data/fzsd/functions/module/last_death/try_install.mcfunction

@@ -0,0 +1 @@
+execute unless data storage fzsd:install fzsd.module{last_death:0b} run function #fzsd:module/last_death/install

data/fzsd/functions/module/last_nether_portal/global_message.mcfunction

@@ -1,2 +1,2 @@
-execute if score @s fzsd.module.last_nether_portal.dimension matches -2147483648..2147483647 run tellraw @a [{"selector": "@s"}, [{"text": "说：我上次穿出的下界传送门位于", "color": "white"}, {"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": " [", "color": "green"}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.x"}}, {"text": ", "}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.z"}}, {"text": ", "}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.z"}}, {"text": "]"}]]]
+execute if score @s fzsd.module.last_nether_portal.dimension matches -2147483648..2147483647 run tellraw @a [{"text": ""}, [{"selector": "@s"}, {"text": "说：我上次穿出的下界传送门位于", "color": "white"}, {"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": " [", "color": "green"}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.x"}}, {"text": ", "}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.y"}}, {"text": ", "}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.z"}}, {"text": "]"}]]]
 execute unless score @s fzsd.module.last_nether_portal.dimension matches -2147483648..2147483647 run tellraw @s {"text": "你从未穿出过下界传送门！"}

data/fzsd/functions/module/last_nether_portal/private_message.mcfunction

@@ -1,2 +1,2 @@
-execute if score @s fzsd.module.last_nether_portal.dimension matches -2147483648..2147483647 run tellraw @s [{"text": "你上次穿出的下界传送门位于"}, {"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": " [", "color": "green"}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.x"}}, {"text": ", "}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.z"}}, {"text": ", "}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.z"}}, {"text": "]"}]]
+execute if score @s fzsd.module.last_nether_portal.dimension matches -2147483648..2147483647 run tellraw @s [{"text": "你上次穿出的下界传送门位于"}, {"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": " [", "color": "green"}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.x"}}, {"text": ", "}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.y"}}, {"text": ", "}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.z"}}, {"text": "]"}]]
 execute unless score @s fzsd.module.last_nether_portal.dimension matches -2147483648..2147483647 run tellraw @s {"text": "你从未穿出过下界传送门！"}

data/fzsd/functions/module/last_nether_portal/try_install.mcfunction

@@ -0,0 +1 @@
+execute unless data storage fzsd:install fzsd.module{last_nether_portal:0b} run function #fzsd:module/last_nether_portal/install

data/fzsd/functions/module/last_spawn_point/try_install.mcfunction

@@ -0,0 +1 @@
+execute unless data storage fzsd:install fzsd.module{last_spawn_point:0b} run function #fzsd:module/last_spawn_point/install

data/fzsd/functions/module/scoreboard/assign/scoreboard/activation.mcfunction

@@ -1,2 +1,4 @@
 scoreboard players add @s fzsd.module.scoreboard.display.activation 1
+execute if score @s fzsd.module.scoreboard.display.activation matches ..-1 run scoreboard players set @s fzsd.module.scoreboard.display.activation 2147483647
 scoreboard players add fzsd.module.scoreboard.total.activation fzsd.module.scoreboard.assign.general 1
+execute if score fzsd.module.scoreboard.total.activation fzsd.module.scoreboard.assign.general matches ..-1 run scoreboard players set fzsd.module.scoreboard.total.activation fzsd.module.scoreboard.assign.general 2147483647

data/fzsd/functions/module/scoreboard/assign/scoreboard/aviating_distance.mcfunction

@@ -1,2 +1,4 @@
 scoreboard players operation @s fzsd.module.scoreboard.display.aviating_distance += fzsd.var.score fzsd.variable.integer
+execute if score @s fzsd.module.scoreboard.display.aviating_distance matches ..-1 run scoreboard players set @s fzsd.module.scoreboard.display.aviating_distance 2147483647
 scoreboard players operation fzsd.module.scoreboard.total.aviating_distance fzsd.module.scoreboard.assign.general += fzsd.var.score fzsd.variable.integer
+execute if score fzsd.module.scoreboard.total.aviating_distance fzsd.module.scoreboard.assign.general matches ..-1 run scoreboard players set fzsd.module.scoreboard.total.aviating_distance fzsd.module.scoreboard.assign.general 2147483647

data/fzsd/functions/module/scoreboard/assign/scoreboard/damage_taken.mcfunction

@@ -1,2 +1,4 @@
 scoreboard players operation @s fzsd.module.scoreboard.display.damage_taken += fzsd.var.score fzsd.variable.integer
+execute if score @s fzsd.module.scoreboard.display.damage_taken matches ..-1 run scoreboard players set @s fzsd.module.scoreboard.display.damage_taken 2147483647
 scoreboard players operation fzsd.module.scoreboard.total.damage_taken fzsd.module.scoreboard.assign.general += fzsd.var.score fzsd.variable.integer
+execute if score fzsd.module.scoreboard.total.damage_taken fzsd.module.scoreboard.assign.general matches ..-1 run scoreboard players set fzsd.module.scoreboard.total.damage_taken fzsd.module.scoreboard.assign.general 2147483647

data/fzsd/functions/module/scoreboard/assign/scoreboard/death_count.mcfunction

@@ -1,2 +1,4 @@
 scoreboard players add @s fzsd.module.scoreboard.display.death_count 1
+execute if score @s fzsd.module.scoreboard.display.death_count matches ..-1 run scoreboard players set @s fzsd.module.scoreboard.display.death_count 2147483647
 scoreboard players add fzsd.module.scoreboard.total.death_count fzsd.module.scoreboard.assign.general 1
+execute if score fzsd.module.scoreboard.total.death_count fzsd.module.scoreboard.assign.general matches ..-1 run scoreboard players set fzsd.module.scoreboard.total.death_count fzsd.module.scoreboard.assign.general 2147483647

data/fzsd/functions/module/scoreboard/assign/scoreboard/dig_count.mcfunction

@@ -1,2 +1,4 @@
 scoreboard players operation @s fzsd.module.scoreboard.display.dig_count += fzsd.var.score fzsd.variable.integer
+execute if score @s fzsd.module.scoreboard.display.dig_count matches ..-1 run scoreboard players set @s fzsd.module.scoreboard.display.dig_count 2147483647
 scoreboard players operation fzsd.module.scoreboard.total.dig_count fzsd.module.scoreboard.assign.general += fzsd.var.score fzsd.variable.integer
+execute if score fzsd.module.scoreboard.total.dig_count fzsd.module.scoreboard.assign.general matches ..-1 run scoreboard players set fzsd.module.scoreboard.total.dig_count fzsd.module.scoreboard.assign.general 2147483647

data/fzsd/functions/module/scoreboard/assign/scoreboard/fishing_count.mcfunction

@@ -1,2 +1,4 @@
 scoreboard players add @s fzsd.module.scoreboard.display.fishing_count 1
+execute if score @s fzsd.module.scoreboard.display.fishing_count matches ..-1 run scoreboard players set @s fzsd.module.scoreboard.display.fishing_count 2147483647
 scoreboard players add fzsd.module.scoreboard.total.fishing_count fzsd.module.scoreboard.assign.general 1
+execute if score fzsd.module.scoreboard.total.fishing_count fzsd.module.scoreboard.assign.general matches ..-1 run scoreboard players set fzsd.module.scoreboard.total.fishing_count fzsd.module.scoreboard.assign.general 2147483647

data/fzsd/functions/module/scoreboard/assign/scoreboard/kill_count.mcfunction

@@ -1,2 +1,4 @@
 scoreboard players add @s fzsd.module.scoreboard.display.kill_count 1
+execute if score @s fzsd.module.scoreboard.display.kill_count matches ..-1 run scoreboard players set @s fzsd.module.scoreboard.display.kill_count 2147483647
 scoreboard players add fzsd.module.scoreboard.total.kill_count fzsd.module.scoreboard.assign.general 1
+execute if score fzsd.module.scoreboard.total.kill_count fzsd.module.scoreboard.assign.general matches ..-1 run scoreboard players set fzsd.module.scoreboard.total.kill_count fzsd.module.scoreboard.assign.general 2147483647

data/fzsd/functions/module/scoreboard/assign/scoreboard/placement_count.mcfunction

@@ -1,2 +1,4 @@
 scoreboard players add @s fzsd.module.scoreboard.display.placement_count 1
+execute if score @s fzsd.module.scoreboard.display.placement_count matches ..-1 run scoreboard players set @s fzsd.module.scoreboard.display.placement_count 2147483647
 scoreboard players add fzsd.module.scoreboard.total.placement_count fzsd.module.scoreboard.assign.general 1
+execute if score fzsd.module.scoreboard.total.placement_count fzsd.module.scoreboard.assign.general matches ..-1 run scoreboard players set fzsd.module.scoreboard.total.placement_count fzsd.module.scoreboard.assign.general 2147483647

data/fzsd/functions/module/scoreboard/assign/scoreboard/trade_count.mcfunction

@@ -1,2 +1,4 @@
 scoreboard players add @s fzsd.module.scoreboard.display.trade_count 1
+execute if score @s fzsd.module.scoreboard.display.trade_count matches ..-1 run scoreboard players set @s fzsd.module.scoreboard.display.trade_count 2147483647
 scoreboard players add fzsd.module.scoreboard.total.trade_count fzsd.module.scoreboard.assign.general 1
+execute if score fzsd.module.scoreboard.total.trade_count fzsd.module.scoreboard.assign.general matches ..-1 run scoreboard players set fzsd.module.scoreboard.total.trade_count fzsd.module.scoreboard.assign.general 2147483647

data/fzsd/functions/module/scoreboard/display/set_text/activation/black.mcfunction

@@ -1,7 +1,7 @@
 # 调用者：#fzsd:module/scoreboard/display/set_text/activation
 
-data modify storage fzsd:module fzsd.scoreboard.text.activation set value '{"text": "活跃时间（h）", "color": "#202020"}'
+data modify storage fzsd:module fzsd.scoreboard.text.activation set value '{"text": "活跃时间（h）", "color": "black"}'
 scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.activation
-scoreboard objectives modify fzsd.module.scoreboard.display.activation displayname {"text": "活跃时间（h）", "color": "#202020"}
+scoreboard objectives modify fzsd.module.scoreboard.display.activation displayname {"text": "活跃时间（h）", "color": "black"}
 team modify fzsd.module.scoreboard.display.activation color black
-team modify fzsd.module.scoreboard.display.activation displayName {"text": "活跃时间（h）", "color": "#202020"}
+team modify fzsd.module.scoreboard.display.activation displayName {"text": "活跃时间（h）", "color": "black"}

data/fzsd/functions/module/scoreboard/display/set_text/aviating_distance/black.mcfunction

@@ -1,7 +1,7 @@
 # 调用者：#fzsd:module/scoreboard/display/set_text/aviating_distance
 
-data modify storage fzsd:module fzsd.scoreboard.text.aviating_distance set value '{"text": "飞行距离", "color": "#202020"}'
+data modify storage fzsd:module fzsd.scoreboard.text.aviating_distance set value '{"text": "飞行距离", "color": "black"}'
 scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.aviating_distance
-scoreboard objectives modify fzsd.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "#202020"}
+scoreboard objectives modify fzsd.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "black"}
 team modify fzsd.module.scoreboard.display.aviating_distance color black
-team modify fzsd.module.scoreboard.display.aviating_distance displayName {"text": "飞行距离", "color": "#202020"}
+team modify fzsd.module.scoreboard.display.aviating_distance displayName {"text": "飞行距离", "color": "black"}

data/fzsd/functions/module/scoreboard/display/set_text/carousel/black.mcfunction

@@ -1,6 +1,6 @@
 # 调用者：#fzsd:module/scoreboard/display/set_text/carousel
 
-data modify storage fzsd:module fzsd.scoreboard.text.carousel set value '{"text": "轮播", "color": "#202020"}'
+data modify storage fzsd:module fzsd.scoreboard.text.carousel set value '{"text": "轮播", "color": "black"}'
 team modify fzsd.module.scoreboard.display.carousel color black
-team modify fzsd.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "#202020"}
+team modify fzsd.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "black"}
 scoreboard players set fzsd.module.scoreboard.carousel.color fzsd.variable.integer 0

data/fzsd/functions/module/scoreboard/display/set_text/damage_taken/black.mcfunction

@@ -1,7 +1,7 @@
 # 调用者：#fzsd:module/scoreboard/display/set_text/damage_taken
 
-data modify storage fzsd:module fzsd.scoreboard.text.damage_taken set value '{"text": "抖M榜", "color": "#202020"}'
+data modify storage fzsd:module fzsd.scoreboard.text.damage_taken set value '{"text": "抖M榜", "color": "black"}'
 scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.damage_taken
-scoreboard objectives modify fzsd.module.scoreboard.display.damage_taken displayname {"text": "抖M榜", "color": "#202020"}
+scoreboard objectives modify fzsd.module.scoreboard.display.damage_taken displayname {"text": "抖M榜", "color": "black"}
 team modify fzsd.module.scoreboard.display.damage_taken color black
-team modify fzsd.module.scoreboard.display.damage_taken displayName {"text": "抖M榜", "color": "#202020"}
+team modify fzsd.module.scoreboard.display.damage_taken displayName {"text": "抖M榜", "color": "black"}

data/fzsd/functions/module/scoreboard/display/set_text/death_count/black.mcfunction

@@ -1,7 +1,7 @@
 # 调用者：#fzsd:module/scoreboard/display/set_text/death_count
 
-data modify storage fzsd:module fzsd.scoreboard.text.death_count set value '{"text": "死亡榜", "color": "#202020"}'
+data modify storage fzsd:module fzsd.scoreboard.text.death_count set value '{"text": "死亡榜", "color": "black"}'
 scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.death_count
-scoreboard objectives modify fzsd.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "#202020"}
+scoreboard objectives modify fzsd.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "black"}
 team modify fzsd.module.scoreboard.display.death_count color black
-team modify fzsd.module.scoreboard.display.death_count displayName {"text": "死亡榜", "color": "#202020"}
+team modify fzsd.module.scoreboard.display.death_count displayName {"text": "死亡榜", "color": "black"}

data/fzsd/functions/module/scoreboard/display/set_text/dig_count/black.mcfunction

@@ -1,7 +1,7 @@
 # 调用者：#fzsd:module/scoreboard/display/set_text/dig_count
 
-data modify storage fzsd:module fzsd.scoreboard.text.dig_count set value '{"text": "挖掘榜", "color": "#202020"}'
+data modify storage fzsd:module fzsd.scoreboard.text.dig_count set value '{"text": "挖掘榜", "color": "black"}'
 scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.dig_count
-scoreboard objectives modify fzsd.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "#202020"}
+scoreboard objectives modify fzsd.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "black"}
 team modify fzsd.module.scoreboard.display.dig_count color black
-team modify fzsd.module.scoreboard.display.dig_count displayName {"text": "挖掘榜", "color": "#202020"}
+team modify fzsd.module.scoreboard.display.dig_count displayName {"text": "挖掘榜", "color": "black"}

data/fzsd/functions/module/scoreboard/display/set_text/fishing_count/black.mcfunction

@@ -1,7 +1,7 @@
 # 调用者：#fzsd:module/scoreboard/display/set_text/fishing_count
 
-data modify storage fzsd:module fzsd.scoreboard.text.fishing_count set value '{"text": "钓鱼榜", "color": "#202020"}'
+data modify storage fzsd:module fzsd.scoreboard.text.fishing_count set value '{"text": "钓鱼榜", "color": "black"}'
 scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.fishing_count
-scoreboard objectives modify fzsd.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "#202020"}
+scoreboard objectives modify fzsd.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "black"}
 team modify fzsd.module.scoreboard.display.fishing_count color black
-team modify fzsd.module.scoreboard.display.fishing_count displayName {"text": "钓鱼榜", "color": "#202020"}
+team modify fzsd.module.scoreboard.display.fishing_count displayName {"text": "钓鱼榜", "color": "black"}

data/fzsd/functions/module/scoreboard/display/set_text/general/black.mcfunction

@@ -1,7 +1,7 @@
 # 调用者：#fzsd:module/scoreboard/display/set_text/general
 
-data modify storage fzsd:module fzsd.scoreboard.text.general set value '{"text": "总榜", "color": "#202020"}'
+data modify storage fzsd:module fzsd.scoreboard.text.general set value '{"text": "总榜", "color": "black"}'
 scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.general
-scoreboard objectives modify fzsd.module.scoreboard.display.general displayname {"text": "总榜", "color": "#202020"}
+scoreboard objectives modify fzsd.module.scoreboard.display.general displayname {"text": "总榜", "color": "black"}
 team modify fzsd.module.scoreboard.display.general color black
-team modify fzsd.module.scoreboard.display.general displayName {"text": "总榜", "color": "#202020"}
+team modify fzsd.module.scoreboard.display.general displayName {"text": "总榜", "color": "black"}

data/fzsd/functions/module/scoreboard/display/set_text/kill_count/black.mcfunction

@@ -1,7 +1,7 @@
 # 调用者：#fzsd:module/scoreboard/display/set_text/kill_count
 
-data modify storage fzsd:module fzsd.scoreboard.text.kill_count set value '{"text": "击杀榜", "color": "#202020"}'
+data modify storage fzsd:module fzsd.scoreboard.text.kill_count set value '{"text": "击杀榜", "color": "black"}'
 scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.kill_count
-scoreboard objectives modify fzsd.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "#202020"}
+scoreboard objectives modify fzsd.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "black"}
 team modify fzsd.module.scoreboard.display.kill_count color black
-team modify fzsd.module.scoreboard.display.kill_count displayName {"text": "击杀榜", "color": "#202020"}
+team modify fzsd.module.scoreboard.display.kill_count displayName {"text": "击杀榜", "color": "black"}

data/fzsd/functions/module/scoreboard/display/set_text/placement_count/black.mcfunction

@@ -1,7 +1,7 @@
 # 调用者：#fzsd:module/scoreboard/display/set_text/placement_count
 
-data modify storage fzsd:module fzsd.scoreboard.text.placement_count set value '{"text": "方块放置榜", "color": "#202020"}'
+data modify storage fzsd:module fzsd.scoreboard.text.placement_count set value '{"text": "方块放置榜", "color": "black"}'
 scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.placement_count
-scoreboard objectives modify fzsd.module.scoreboard.display.placement_count displayname {"text": "方块放置榜", "color": "#202020"}
+scoreboard objectives modify fzsd.module.scoreboard.display.placement_count displayname {"text": "方块放置榜", "color": "black"}
 team modify fzsd.module.scoreboard.display.placement_count color black
-team modify fzsd.module.scoreboard.display.placement_count displayName {"text": "方块放置榜", "color": "#202020"}
+team modify fzsd.module.scoreboard.display.placement_count displayName {"text": "方块放置榜", "color": "black"}

data/fzsd/functions/module/scoreboard/display/set_text/trade_count/black.mcfunction

@@ -1,7 +1,7 @@
 # 调用者：#fzsd:module/scoreboard/display/set_text/trade_count
 
-data modify storage fzsd:module fzsd.scoreboard.text.trade_count set value '{"text": "交易榜", "color": "#202020"}'
+data modify storage fzsd:module fzsd.scoreboard.text.trade_count set value '{"text": "交易榜", "color": "black"}'
 scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.trade_count
-scoreboard objectives modify fzsd.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "#202020"}
+scoreboard objectives modify fzsd.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "black"}
 team modify fzsd.module.scoreboard.display.trade_count color black
-team modify fzsd.module.scoreboard.display.trade_count displayName {"text": "交易榜", "color": "#202020"}
+team modify fzsd.module.scoreboard.display.trade_count displayName {"text": "交易榜", "color": "black"}

data/fzsd/functions/module/scoreboard/interactor/display.mcfunction

@@ -2,4 +2,4 @@
 
 execute if data storage fzsd:install fzsd.module{scoreboard:1b} run tellraw @s {"text": "计分板："}
 
-execute if data storage fzsd:install fzsd.module{scoreboard:1b} run tellraw @s [[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "dark_red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1000"}}, {"text": "关", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1010"}}, {"nbt": "fzsd.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1020"}}, {"nbt": "fzsd.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1030"}}, {"nbt": "fzsd.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1040"}}, {"nbt": "fzsd.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1050"}}, {"nbt": "fzsd.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1060"}}, {"nbt": "fzsd.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1070"}}, {"nbt": "fzsd.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1080"}}, {"nbt": "fzsd.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1090"}}, {"nbt": "fzsd.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1100"}}, {"nbt": "fzsd.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1200"}}, {"nbt": "fzsd.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}, {"text": "]"}]]
+execute if data storage fzsd:install fzsd.module{scoreboard:1b} run tellraw @s [[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "dark_red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1000"}}, {"text": "关", "color": "red"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1010"}}, {"nbt": "fzsd.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1020"}}, {"nbt": "fzsd.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1030"}}, {"nbt": "fzsd.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1040"}}, {"nbt": "fzsd.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1050"}}, {"nbt": "fzsd.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1060"}}, {"nbt": "fzsd.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1070"}}, {"nbt": "fzsd.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1080"}}, {"nbt": "fzsd.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1090"}}, {"nbt": "fzsd.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1100"}}, {"nbt": "fzsd.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1200"}}, {"nbt": "fzsd.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}, {"text": "]"}]]

data/fzsd/functions/module/scoreboard/try_install.mcfunction

@@ -0,0 +1,2 @@
+
+execute unless data storage fzsd:install fzsd.module{scoreboard:0b} run function #fzsd:module/scoreboard/install

data/fzsd/functions/module/sweeper/bossbar.mcfunction

@@ -0,0 +1,4 @@
+bossbar set fzsd:sweeper name [{"score": {"objective": "fzsd.variable.integer", "name": "fzsd.sweeper.bossbar.current_time"},"color": "#ff6100","underlined": true,"bold": true},{"text": "秒后清理掉落物","color": "#ffd900","bold": false}]
+bossbar set fzsd:sweeper players @a[tag=!fzsd.ignore_sweeper_bossbar]
+scoreboard players remove fzsd.sweeper.bossbar.current_time fzsd.variable.integer 1
+schedule function fzsd:module/sweeper/bossbar 1s

data/fzsd/functions/module/sweeper/clear.mcfunction

@@ -0,0 +1,15 @@
+schedule clear fzsd:module/sweeper/bossbar
+schedule clear fzsd:module/sweeper/main
+schedule clear fzsd:module/sweeper/timer/1s
+schedule clear fzsd:module/sweeper/timer/2s
+schedule clear fzsd:module/sweeper/timer/3s
+schedule clear fzsd:module/sweeper/timer/4s
+schedule clear fzsd:module/sweeper/timer/5s
+schedule clear fzsd:module/sweeper/timer/10s
+schedule clear fzsd:module/sweeper/timer/30s
+schedule clear fzsd:module/sweeper/timer/1min
+schedule clear fzsd:module/sweeper/timer/2min
+schedule clear fzsd:module/sweeper/timer/3min
+schedule clear fzsd:module/sweeper/timer/4min
+bossbar set fzsd:sweeper visible false
+bossbar set fzsd:sweeper value 0

data/fzsd/functions/module/sweeper/install.mcfunction

@@ -0,0 +1,8 @@
+bossbar add fzsd:sweeper ""
+bossbar set fzsd:sweeper max 60
+
+## 标记为已安装
+data modify storage fzsd:install fzsd.module.sweeper set value 1b
+
+## 日志
+execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已安装组件：扫地机"}]

data/fzsd/functions/module/sweeper/interactor/display.mcfunction

@@ -0,0 +1,2 @@
+# 调用者：#fzsd:module/sweeper/interactor/display
+execute if data storage fzsd:install fzsd.module{sweeper:1b} run function fzsd:module/sweeper/interactor/display_0

data/fzsd/functions/module/sweeper/interactor/display_0.mcfunction

@@ -0,0 +1,12 @@
+tellraw @s [{"text": "扫地机："}]
+
+tellraw @s[tag=!fzsd.ignore_sweeper_bossbar] [{"text": "- 血条栏："}, [{"text": "[", "color": "gray", "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set 3400"}}, {"text": "已开启", "color": "green"}, {"text": "]", "color": "gray"}]]
+tellraw @s[tag=fzsd.ignore_sweeper_bossbar] [{"text": "- 血条栏："}, [{"text": "[", "color": "gray", "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set 3401"}}, {"text": "已关闭", "color": "red"}, {"text": "]", "color": "gray"}]]
+
+tellraw @s[tag=!fzsd.ignore_sweeper_sound] [{"text": "- 音效："}, [{"text": "[", "color": "gray", "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set 3500"}}, {"text": "已开启", "color": "green"}, {"text": "]", "color": "gray"}]]
+tellraw @s[tag=fzsd.ignore_sweeper_sound] [{"text": "- 音效："}, [{"text": "[", "color": "gray", "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set 3501"}}, {"text": "已关闭", "color": "red"}, {"text": "]", "color": "gray"}]]
+
+tellraw @s[tag=!fzsd.ignore_sweeper_message] [{"text": "- 消息："}, [{"text": "[", "color": "gray", "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set 3600"}}, {"text": "已开启", "color": "green"}, {"text": "]", "color": "gray"}]]
+tellraw @s[tag=fzsd.ignore_sweeper_message] [{"text": "- 消息："}, [{"text": "[", "color": "gray", "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set 3601"}}, {"text": "已关闭", "color": "red"}, {"text": "]", "color": "gray"}]]
+
+tellraw @s [{"text": "- 开关："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "dark_red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3000"}}, {"text": "关", "color": "red"}, {"text": "]"}], [{"text": "[", "color": "gray", "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3300"}}, {"text": "清理一次", "color": "aqua"}, {"text": "]", "color": "gray"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"text": "10s", "color": "#aa0000"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3010"}}, {"text": "10s", "color": "#aa0000"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"text": "30s", "color": "#da7924"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3030"}}, {"text": "30s", "color": "#da7924"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"text": "1min", "color": "#ffe34c"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3060"}}, {"text": "1min", "color": "#ffe34c"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"text": "2min", "color": "#e3ff50"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3120"}}, {"text": "2min", "color": "#e3ff50"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"text": "3min", "color": "#81d42c"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3180"}}, {"text": "3min", "color": "#81d42c"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"text": "4min", "color": "#00aa00"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3240"}}, {"text": "4min", "color": "#00aa00"}, {"text": "]"}]]

data/fzsd/functions/module/sweeper/interactor/on_click.mcfunction

@@ -0,0 +1,9 @@
+execute if score @s fzsd.module.interactor.trigger matches 3400 run tag @s add fzsd.ignore_sweeper_bossbar
+execute if score @s fzsd.module.interactor.trigger matches 3401 run tag @s remove fzsd.ignore_sweeper_bossbar
+execute if score @s fzsd.module.interactor.trigger matches 3500 run tag @s add fzsd.ignore_sweeper_sound
+execute if score @s fzsd.module.interactor.trigger matches 3501 run tag @s remove fzsd.ignore_sweeper_sound
+execute if score @s fzsd.module.interactor.trigger matches 3600 run tag @s add fzsd.ignore_sweeper_message
+execute if score @s fzsd.module.interactor.trigger matches 3601 run tag @s remove fzsd.ignore_sweeper_message
+execute if score @s fzsd.module.interactor.trigger matches -3300 run function #fzsd:module/sweeper/sweep
+execute if score @s fzsd.module.interactor.trigger matches -3000 run function #fzsd:module/sweeper/stop_loop
+execute if score @s fzsd.module.interactor.trigger matches -3240..-3010 run function #fzsd:module/sweeper/start_loop

data/fzsd/functions/module/sweeper/load.mcfunction

@@ -0,0 +1,4 @@
+function fzsd:module/sweeper/clear
+
+## 日志
+execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已加载组件：扫地机"}]

data/fzsd/functions/module/sweeper/main.mcfunction

@@ -0,0 +1,3 @@
+bossbar set fzsd:sweeper value 0
+function #fzsd:module/sweeper/sweep
+function fzsd:module/sweeper/start_timer

data/fzsd/functions/module/sweeper/post_loop.mcfunction

@@ -0,0 +1,6 @@
+# 获取间隔时间
+scoreboard players set fzsd.sweeper.interval_time fzsd.variable.integer 3000
+scoreboard players operation fzsd.sweeper.interval_time fzsd.variable.integer += @s fzsd.module.interactor.trigger
+scoreboard players operation fzsd.sweeper.interval_time fzsd.variable.integer *= -1 fzsd.variable.integer
+# 设为显示
+bossbar set fzsd:sweeper visible true

data/fzsd/functions/module/sweeper/start_timer.mcfunction

@@ -0,0 +1,7 @@
+execute if score fzsd.sweeper.interval_time fzsd.variable.integer matches 10 run function fzsd:module/sweeper/timer/10s
+execute if score fzsd.sweeper.interval_time fzsd.variable.integer matches 30 run function fzsd:module/sweeper/timer/30s
+execute if score fzsd.sweeper.interval_time fzsd.variable.integer matches 60 run function fzsd:module/sweeper/timer/1min
+execute if score fzsd.sweeper.interval_time fzsd.variable.integer matches 120 run function fzsd:module/sweeper/timer/2min
+execute if score fzsd.sweeper.interval_time fzsd.variable.integer matches 180 run function fzsd:module/sweeper/timer/3min
+execute if score fzsd.sweeper.interval_time fzsd.variable.integer matches 240 run function fzsd:module/sweeper/timer/4min
+scoreboard players operation fzsd.sweeper.bossbar.current_time fzsd.variable.integer = fzsd.sweeper.interval_time fzsd.variable.integer

data/fzsd/functions/module/sweeper/sweep.mcfunction

@@ -0,0 +1,3 @@
+execute store result score fzsd.sweeper.killed fzsd.variable.integer run kill @e[type=minecraft:item,predicate=!fzsd:sweeper/whitelist]
+execute if score fzsd.logger.level fzsd.variable.integer matches ..600 run tellraw @a [{"nbt": "fzsd.level.alert", "interpret": true, "storage": "fzsd:logger"}, {"text": "本次共清理了"}, {"score": {"objective": "fzsd.variable.integer", "name": "fzsd.sweeper.killed"}}, {"text": "堆掉落物"}]
+execute as @a[tag=!fzsd.ignore_sweeper_sound] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 2

data/fzsd/functions/module/sweeper/timer/10s.mcfunction

@@ -0,0 +1,5 @@
+execute if score fzsd.logger.level fzsd.variable.integer matches ..600 run tellraw @a[tag=!fzsd.ignore_sweeper_message] [{"nbt": "fzsd.level.alert", "interpret": true, "storage": "fzsd:logger"}, {"text": "10秒后清理掉落物"}]
+execute as @a[tag=!fzsd.ignore_sweeper_sound] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1
+bossbar set fzsd:sweeper color yellow
+bossbar set fzsd:sweeper value 10
+schedule function fzsd:module/sweeper/timer/5s 5s

data/fzsd/functions/module/sweeper/timer/1min.mcfunction

@@ -0,0 +1,5 @@
+execute if score fzsd.logger.level fzsd.variable.integer matches ..600 run execute if score fzsd.logger.level fzsd.variable.integer matches ..600 run tellraw @a[tag=!fzsd.ignore_sweeper_message] [{"nbt": "fzsd.level.alert", "interpret": true, "storage": "fzsd:logger"}, {"text": "1分钟后清理掉落物"}]
+execute as @a[tag=!fzsd.ignore_sweeper_sound] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1
+bossbar set fzsd:sweeper color yellow
+bossbar set fzsd:sweeper value 60
+schedule function fzsd:module/sweeper/timer/30s 30s

data/fzsd/functions/module/sweeper/timer/1s.mcfunction

@@ -0,0 +1,4 @@
+execute if score fzsd.logger.level fzsd.variable.integer matches ..600 run tellraw @a[tag=!fzsd.ignore_sweeper_message] [{"nbt": "fzsd.level.alert", "interpret": true, "storage": "fzsd:logger"}, {"text": "1秒后清理掉落物"}]
+execute as @a[tag=!fzsd.ignore_sweeper_sound] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1
+bossbar set fzsd:sweeper value 12
+schedule function fzsd:module/sweeper/main 1s

data/fzsd/functions/module/sweeper/timer/2min.mcfunction

@@ -0,0 +1,5 @@
+execute if score fzsd.logger.level fzsd.variable.integer matches ..600 run tellraw @a[tag=!fzsd.ignore_sweeper_message] [{"nbt": "fzsd.level.alert", "interpret": true, "storage": "fzsd:logger"}, {"text": "2分钟后清理掉落物"}]
+execute as @a[tag=!fzsd.ignore_sweeper_sound] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1
+bossbar set fzsd:sweeper color green
+bossbar set fzsd:sweeper value 30
+schedule function fzsd:module/sweeper/timer/1min 60s

data/fzsd/functions/module/sweeper/timer/2s.mcfunction

@@ -0,0 +1,4 @@
+execute if score fzsd.logger.level fzsd.variable.integer matches ..600 run tellraw @a[tag=!fzsd.ignore_sweeper_message] [{"nbt": "fzsd.level.alert", "interpret": true, "storage": "fzsd:logger"}, {"text": "2秒后清理掉落物"}]
+execute as @a[tag=!fzsd.ignore_sweeper_sound] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1
+bossbar set fzsd:sweeper value 24
+schedule function fzsd:module/sweeper/timer/1s 1s

data/fzsd/functions/module/sweeper/timer/30s.mcfunction

@@ -0,0 +1,5 @@
+execute if score fzsd.logger.level fzsd.variable.integer matches ..600 run tellraw @a[tag=!fzsd.ignore_sweeper_message] [{"nbt": "fzsd.level.alert", "interpret": true, "storage": "fzsd:logger"}, {"text": "30秒后清理掉落物"}]
+execute as @a[tag=!fzsd.ignore_sweeper_sound] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1
+bossbar set fzsd:sweeper color yellow
+bossbar set fzsd:sweeper value 30
+schedule function fzsd:module/sweeper/timer/10s 20s

data/fzsd/functions/module/sweeper/timer/3min.mcfunction

@@ -0,0 +1,5 @@
+execute if score fzsd.logger.level fzsd.variable.integer matches ..600 run tellraw @a[tag=!fzsd.ignore_sweeper_message] [{"nbt": "fzsd.level.alert", "interpret": true, "storage": "fzsd:logger"}, {"text": "3分钟后清理掉落物"}]
+execute as @a[tag=!fzsd.ignore_sweeper_sound] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1
+bossbar set fzsd:sweeper color green
+bossbar set fzsd:sweeper value 45
+schedule function fzsd:module/sweeper/timer/2min 60s

data/fzsd/functions/module/sweeper/timer/3s.mcfunction

@@ -0,0 +1,4 @@
+execute if score fzsd.logger.level fzsd.variable.integer matches ..600 run tellraw @a[tag=!fzsd.ignore_sweeper_message] [{"nbt": "fzsd.level.alert", "interpret": true, "storage": "fzsd:logger"}, {"text": "3秒后清理掉落物"}]
+execute as @a[tag=!fzsd.ignore_sweeper_sound] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1
+bossbar set fzsd:sweeper value 36
+schedule function fzsd:module/sweeper/timer/2s 1s

data/fzsd/functions/module/sweeper/timer/4min.mcfunction

@@ -0,0 +1,5 @@
+execute if score fzsd.logger.level fzsd.variable.integer matches ..600 run tellraw @a[tag=!fzsd.ignore_sweeper_message] [{"nbt": "fzsd.level.alert", "interpret": true, "storage": "fzsd:logger"}, {"text": "4分钟后清理掉落物"}]
+execute as @a[tag=!fzsd.ignore_sweeper_sound] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1
+bossbar set fzsd:sweeper color green
+bossbar set fzsd:sweeper value 50
+schedule function fzsd:module/sweeper/timer/3min 60s

data/fzsd/functions/module/sweeper/timer/4s.mcfunction

@@ -0,0 +1,4 @@
+execute if score fzsd.logger.level fzsd.variable.integer matches ..600 run tellraw @a[tag=!fzsd.ignore_sweeper_message] [{"nbt": "fzsd.level.alert", "interpret": true, "storage": "fzsd:logger"}, {"text": "4秒后清理掉落物"}]
+execute as @a[tag=!fzsd.ignore_sweeper_sound] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1
+bossbar set fzsd:sweeper value 48
+schedule function fzsd:module/sweeper/timer/3s 1s

data/fzsd/functions/module/sweeper/timer/5s.mcfunction

@@ -0,0 +1,5 @@
+execute if score fzsd.logger.level fzsd.variable.integer matches ..600 run tellraw @a[tag=!fzsd.ignore_sweeper_message] [{"nbt": "fzsd.level.alert", "interpret": true, "storage": "fzsd:logger"}, {"text": "5秒后清理掉落物"}]
+execute as @a[tag=!fzsd.ignore_sweeper_sound] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1
+bossbar set fzsd:sweeper color red
+bossbar set fzsd:sweeper value 60
+schedule function fzsd:module/sweeper/timer/4s 1s

data/fzsd/functions/module/sweeper/try_install.mcfunction

@@ -0,0 +1 @@
+execute unless data storage fzsd:install fzsd.module{sweeper:0b} run function #fzsd:module/sweeper/install

data/fzsd/functions/module/sweeper/try_load.mcfunction

@@ -0,0 +1,2 @@
+## 判断是否安装，如果安装则加载
+execute if data storage fzsd:install fzsd.module{sweeper:1b} run function #fzsd:module/sweeper/load

data/fzsd/functions/module/sweeper/uninstall.mcfunction

@@ -0,0 +1,7 @@
+bossbar remove fzsd:sweeper
+
+## 标记为已安装
+data modify storage fzsd:install fzsd.module.sweeper set value 0b
+
+## 日志
+execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已卸载组件：扫地机"}]

data/fzsd/functions/module/try_install.mcfunction

@@ -1,11 +0,0 @@
-# 调用者：#fzsd:module/try_install
-
-## 判断是否需要安装
-execute unless data storage fzsd:install fzsd.module{health:0b} run function #fzsd:module/health/install
-execute unless data storage fzsd:install fzsd.module{here:0b} run function #fzsd:module/here/install
-execute unless data storage fzsd:install fzsd.module{interactor:0b} run function #fzsd:module/interactor/install
-execute unless data storage fzsd:install fzsd.module{join_message:0b} run function #fzsd:module/join_message/install
-execute unless data storage fzsd:install fzsd.module{last_death:0b} run function #fzsd:module/last_death/install
-execute unless data storage fzsd:install fzsd.module{last_nether_portal:0b} run function #fzsd:module/last_nether_portal/install
-execute unless data storage fzsd:install fzsd.module{last_spawn_point:0b} run function #fzsd:module/last_spawn_point/install
-execute unless data storage fzsd:install fzsd.module{scoreboard:0b} run function #fzsd:module/scoreboard/install

data/fzsd/functions/system/load/load.mcfunction

@@ -1,4 +1,5 @@
 ## 常量
+scoreboard players set -1 fzsd.variable.integer -1
 scoreboard players set 10 fzsd.variable.integer 10
 scoreboard players set 200 fzsd.variable.integer 200
 scoreboard players set 72000 fzsd.variable.integer 72000