Merge branch 'dev/3.0' of https://gitee.com/harvey-husky/yh-ssd into dev/3.0

Signed-off-by: 延皓 <8511461+harvey-husky@user.noreply.gitee.com>

.vscode/settings.json

@@ -17,7 +17,7 @@
         "storageText": "{\"nbt\": \"${1:NBT}\", \"interpret\": true, \"storage\": \"${2:A namespaced ID}\"}",
         "ifInstalled": "execute if data storage fzsd:installed fzsd.module{${1:module_name}:1b} run ${tellraw}"
     },
-    "datapack.env.cmdVersion": "1.18.2",
+    "datapack.env.cmdVersion": "1.19",
-    "datapack.env.jsonVersion": "1.18.2",
+    "datapack.env.jsonVersion": "1.19",
-    "datapack.env.dataVersion": "1.18.2"
+    "datapack.env.dataVersion": "1.19"
 }

DEVDOC.md

@@ -18,6 +18,7 @@
             "values": ...
         }
         ```
+- ***函数和标签是否能被扩展数据包成功覆盖，取决于数据包加载顺序***，请使用`/datapack enable <xxx> after <xxx>`指令，使您的扩展数据包在FZ's Survival Datapack之后加载
 
 
 ## 基本要求

README.md

@@ -6,22 +6,26 @@
 
 #### Copyright (C) 2019-2022 Harvey_Husky
 
+[Bilibili专栏](https://www.bilibili.com/read/cv4267319)（年久失修）
+
 ## 安装教程
 
 1. 兼容性
-     - `数据包 v3.0.x` 支持 `Minecraft 1.18.2/1.19.4`
+     - `数据包 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`
 2. 前往[发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases)下载对应MC版本的数据包
-3. 将数据包 `zip` 文件放入 `world/datapacks` 中（在客户端位于 `.minecraft/saves/<存档名>/datapacks`）
+3. 从zip文件的 `scripts` 目录中挑选你需要的 `.sc` 文件
-4. （可选）下载并安装 [Carpet Mod **1.4.24**](https://github.com/gnembon/fabric-carpet/releases) 或以上版本
+4. 将数据包 `zip` 文件放入 `world/datapacks` 中（在客户端位于 `.minecraft/saves/<存档名>/datapacks`）
-5. （可选）从数据包 `zip` 文件的 `scripts` 目录中解压 `.sc` 文件，将其放入 `world/scripts` 中（在客户端位于 `.minecraft/saves/<存档名>/scripts` ）
+5. （可选）下载并安装 [Carpet Mod **1.4.24**](https://github.com/gnembon/fabric-carpet/releases) 或以上版本
-6. 执行 `reload` 指令（或重新打开存档）
+6. （可选）从数据包 `zip` 文件的 `scripts` 目录中解压 `.sc` 文件，将其放入 `world/scripts` 中（在客户端位于 `.minecraft/saves/<存档名>/scripts` ）
+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.18+-blue.svg)](https://minecraft.net/)
+[![数据包版本](https://img.shields.io/badge/正式版-3.0.5-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://gitee.com/harvey-husky/FZ-sDatapack/releases)
 
@@ -55,21 +59,6 @@
   | :------: | :----------------------------------------------: |
   | 破基岩榜 |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    |
 
 ### 地毯脚本
 
@@ -79,19 +68,29 @@
 - 脚本：
   - `fzsd_score.sc`（**开发中！此处列举目前已完成的**）：
     - 可避免Carpet假人污染计分板
-    - 执行 `reload` 指令后自动生效
+    - 可以标记哪些玩家是假人
+    - *注：请不要使用为假人名添加“bot”前缀的carpet扩展，本插件不支持此类假人！*
     - 子命令（ `/fzsd_score <子命令>` ）：
       - `updateFrom <version>`：用于从给定的数据包版本恢复计分板数据（需要测试！）
       - `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,6 +33,3 @@ 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": "]"}],[{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:module fzsd.sweeper.extra_interval set value 1b"}},{"text": "显示额外时间","color": "green"},{"text": "]"}],[{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:module fzsd.sweeper.extra_interval set value 0b"}},{"text": "隐藏额外时间","color": "red"},{"text": "]"}]]]

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

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

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

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

data/fzsd/functions/boot.mcfunction

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

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 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/callback/on_placed_liquid.mcfunction

@@ -1,2 +0,0 @@
-## 调试
-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

@@ -1,2 +0,0 @@
-## 调试
-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/health/try_install.mcfunction

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

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

@@ -1 +0,0 @@
-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/event/on_display
+execute if score @s fzsd.module.interactor.trigger matches 1.. run function #fzsd:module/interactor/display

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

@@ -1 +0,0 @@
-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:install fzsd.module{join_message:1b} run function #fzsd:module/join_message/send_message
+execute if data storage fzsd:installed fzsd.module{join_message:1b} run function #fzsd:module/join_message/send_message

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

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

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

@@ -0,0 +1,7 @@
+data modify storage fzsd:global fzsd.api.dimension.id set from entity @s LastDeathLocation.dimension
+execute store result storage fzsd:last_death fzsd.x int 1 run data get entity @s LastDeathLocation.pos[0]
+execute store result storage fzsd:last_death fzsd.y int 1 run data get entity @s LastDeathLocation.pos[1]
+execute store result storage fzsd:last_death fzsd.z int 1 run data get entity @s LastDeathLocation.pos[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/module/last_death/install.mcfunction

@@ -0,0 +1,5 @@
+## 标记为已安装
+data modify storage fzsd:install fzsd.module.last_death 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/last_death/interactor/display.mcfunction

@@ -0,0 +1 @@
+execute if data storage fzsd:install fzsd.module{last_death:1b} run tellraw @s [{"text": "获取上一死亡点："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2100"}},{"text": "私信", "color": "aqua"},{"text": "]"}]]

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

@@ -0,0 +1 @@
+execute if score @s fzsd.module.interactor.trigger matches -2100 run function #fzsd:module/last_death/private_message

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

@@ -0,0 +1,2 @@
+execute if data entity @s LastDeathLocation run tellraw @s [{"text": "你上次死亡于"}, {"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": " [", "color": "green"}, {"nbt": "fzsd.x", "storage": "fzsd:last_death"}, {"text": ", "}, {"nbt": "fzsd.y", "storage": "fzsd:last_death"}, {"text": ", "}, {"nbt": "fzsd.z", "storage": "fzsd:last_death"}, {"text": "]"}]]
+execute unless data entity @s LastDeathLocation run tellraw @s {"text": "你从未死亡！"}

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

@@ -0,0 +1,7 @@
+data remove storage fzsd:last_death fzsd
+
+## 标记为已卸载
+data modify storage fzsd:install fzsd.module.last_death 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/last_nether_portal/try_install.mcfunction

@@ -1 +0,0 @@
-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

@@ -1 +0,0 @@
-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,4 +1,2 @@
 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,4 +1,2 @@
 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,4 +1,2 @@
 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,4 +1,2 @@
 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,4 +1,2 @@
 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,4 +1,2 @@
 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,4 +1,2 @@
 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,4 +1,2 @@
 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,4 +1,2 @@
 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/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": "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": "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": "]"}]]

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

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

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

@@ -1,4 +0,0 @@
-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

@@ -1,23 +0,0 @@
-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
-schedule clear fzsd:module/sweeper/timer/5min
-schedule clear fzsd:module/sweeper/timer/6min
-schedule clear fzsd:module/sweeper/timer/7min
-schedule clear fzsd:module/sweeper/timer/8min
-schedule clear fzsd:module/sweeper/timer/9min
-schedule clear fzsd:module/sweeper/timer/10min
-schedule clear fzsd:module/sweeper/timer/12min
-schedule clear fzsd:module/sweeper/timer/15min
-bossbar set fzsd:sweeper visible false
-bossbar set fzsd:sweeper value 0

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

@@ -1,8 +0,0 @@
-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

@@ -1,2 +0,0 @@
-# 调用者：#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

@@ -1,13 +0,0 @@
-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 -4010"}}, {"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 -4030"}}, {"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 -4060"}}, {"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 -4120"}}, {"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 -4180"}}, {"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 -4240"}}, {"text": "4min", "color": "#00aa00"}, {"text": "]"}]]
-execute if data storage fzsd:module fzsd.sweeper{extra_interval:1b} run tellraw @s [{"text": "- 额外："}, [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"text": "5min", "color": "#aa0000"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -4300"}}, {"text": "5min", "color": "#aa0000"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"text": "6min", "color": "#da7924"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -4360"}}, {"text": "6min", "color": "#da7924"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"text": "7min", "color": "#ffe34c"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -4420"}}, {"text": "7min", "color": "#ffe34c"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"text": "8min", "color": "#e3ff50"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -4480"}}, {"text": "8min", "color": "#e3ff50"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"text": "9min", "color": "#81d42c"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -4540"}}, {"text": "9min", "color": "#81d42c"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"text": "10min", "color": "#00aa00"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -4600"}}, {"text": "10min", "color": "#00aa00"}, {"text": "]"}],[{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"text": "12min", "color": "light_purple"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -4720"}}, {"text": "12min", "color": "light_purple"}, {"text": "]"}],[{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"text": "15min", "color": "dark_purple"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -4900"}}, {"text": "15min", "color": "dark_purple"}, {"text": "]"}]]

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

@@ -1,9 +0,0 @@
-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 -4900..-4010 run function #fzsd:module/sweeper/start_loop

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

@@ -1,4 +0,0 @@
-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

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

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

@@ -1,6 +0,0 @@
-# 获取间隔时间
-scoreboard players set fzsd.sweeper.interval_time fzsd.variable.integer 4000
-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

@@ -1,15 +0,0 @@
-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
-execute if score fzsd.sweeper.interval_time fzsd.variable.integer matches 300 run function fzsd:module/sweeper/timer/5min
-execute if score fzsd.sweeper.interval_time fzsd.variable.integer matches 360 run function fzsd:module/sweeper/timer/6min
-execute if score fzsd.sweeper.interval_time fzsd.variable.integer matches 420 run function fzsd:module/sweeper/timer/7min
-execute if score fzsd.sweeper.interval_time fzsd.variable.integer matches 480 run function fzsd:module/sweeper/timer/8min
-execute if score fzsd.sweeper.interval_time fzsd.variable.integer matches 540 run function fzsd:module/sweeper/timer/9min
-execute if score fzsd.sweeper.interval_time fzsd.variable.integer matches 600 run function fzsd:module/sweeper/timer/10min
-execute if score fzsd.sweeper.interval_time fzsd.variable.integer matches 720 run function fzsd:module/sweeper/timer/12min
-execute if score fzsd.sweeper.interval_time fzsd.variable.integer matches 900 run function fzsd:module/sweeper/timer/15min
-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

@@ -1,3 +0,0 @@
-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/10min.mcfunction

@@ -1,5 +0,0 @@
-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 green
-bossbar set fzsd:sweeper value 60
-schedule function fzsd:module/sweeper/timer/5min 300s

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

@@ -1,5 +0,0 @@
-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/12min.mcfunction

@@ -1,5 +0,0 @@
-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": "12分钟后清理掉落物"}]
-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 60
-schedule function fzsd:module/sweeper/timer/10min 120s

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

@@ -1,5 +0,0 @@
-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": "15分钟后清理掉落物"}]
-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 60
-schedule function fzsd:module/sweeper/timer/10min 300s

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

@@ -1,5 +0,0 @@
-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

@@ -1,4 +0,0 @@
-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

@@ -1,5 +0,0 @@
-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

@@ -1,4 +0,0 @@
-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

@@ -1,5 +0,0 @@
-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

@@ -1,5 +0,0 @@
-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

@@ -1,4 +0,0 @@
-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

@@ -1,5 +0,0 @@
-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

@@ -1,4 +0,0 @@
-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/5min.mcfunction

@@ -1,5 +0,0 @@
-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 green
-bossbar set fzsd:sweeper value 60
-schedule function fzsd:module/sweeper/timer/4min 60s

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

@@ -1,5 +0,0 @@
-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/timer/6min.mcfunction

@@ -1,5 +0,0 @@
-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": "6分钟后清理掉落物"}]
-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 60
-schedule function fzsd:module/sweeper/timer/4min 120s

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

@@ -1,5 +0,0 @@
-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": "7分钟后清理掉落物"}]
-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 60
-schedule function fzsd:module/sweeper/timer/5min 120s

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

@@ -1,5 +0,0 @@
-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": "8分钟后清理掉落物"}]
-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 60
-schedule function fzsd:module/sweeper/timer/5min 180s

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

@@ -1,5 +0,0 @@
-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": "9分钟后清理掉落物"}]
-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 60
-schedule function fzsd:module/sweeper/timer/5min 240s

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

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

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

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

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

@@ -1,7 +0,0 @@
-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

@@ -0,0 +1,11 @@
+# 调用者：#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,5 +1,4 @@
 ## 常量
-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

data/fzsd/predicates/sweeper/whitelist.json

@@ -1,54 +0,0 @@
-{
-    "condition": "minecraft:alternative",
-    "terms": [
-        {
-            "condition": "minecraft:entity_properties",
-            "entity": "this",
-            "predicate": {
-                "nbt": "{Item:{id:\"minecraft:minecart\"}}"
-            }
-        },
-        {
-            "condition": "minecraft:entity_properties",
-            "entity": "this",
-            "predicate": {
-                "nbt": "{Item:{id:\"minecraft:oak_boat\"}}"
-            }
-        },
-        {
-            "condition": "minecraft:entity_properties",
-            "entity": "this",
-            "predicate": {
-                "nbt": "{Item:{id:\"minecraft:birch_boat\"}}"
-            }
-        },
-        {
-            "condition": "minecraft:entity_properties",
-            "entity": "this",
-            "predicate": {
-                "nbt": "{Item:{id:\"minecraft:acacia_boat\"}}"
-            }
-        },
-        {
-            "condition": "minecraft:entity_properties",
-            "entity": "this",
-            "predicate": {
-                "nbt": "{Item:{id:\"minecraft:jungle_boat\"}}"
-            }
-        },
-        {
-            "condition": "minecraft:entity_properties",
-            "entity": "this",
-            "predicate": {
-                "nbt": "{Item:{id:\"minecraft:spruce_boat\"}}"
-            }
-        },
-        {
-            "condition": "minecraft:entity_properties",
-            "entity": "this",
-            "predicate": {
-                "nbt": "{Item:{id:\"minecraft:dark_oak_boat\"}}"
-            }
-        }
-    ]
-}

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

@@ -1,5 +1,6 @@
 {
     "replace": false,
     "values": [
+        "#fzsd:module/scoreboard/assign/scoreboard/placement_count"
     ]
 }

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

@@ -1,6 +0,0 @@
-{
-    "replace": false,
-    "values": [
-        "fzsd:game_event/callback/on_placed_liquid"
-    ]
-}

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

@@ -1,7 +0,0 @@
-{
-    "replace": false,
-    "values": [
-        "fzsd:game_event/callback/on_placed_solid",
-        "#fzsd:module/scoreboard/assign/scoreboard/placement_count"
-    ]
-}

data/fzsd/tags/functions/module/health/try_load.json

@@ -1,6 +1,6 @@
 {
     "replace": false,
     "values": [
-        "fzsd:module/sweeper/clear"
+        "fzsd:module/health/try_load"
     ]
 }

data/fzsd/tags/functions/module/interactor/display.json

@@ -5,8 +5,8 @@
         "fzsd:module/interactor/interactor/display",
         "#fzsd:module/scoreboard/interactor/display",
         "#fzsd:module/here/interactor/display",
+        "#fzsd:module/last_death/interactor/display",
         "#fzsd:module/last_nether_portal/interactor/display",
-        "#fzsd:module/last_spawn_point/interactor/display",
+        "#fzsd:module/last_spawn_point/interactor/display"
-        "#fzsd:module/sweeper/interactor/display"
     ]
 }

data/fzsd/tags/functions/module/interactor/event/on_click.json

@@ -4,8 +4,8 @@
         "fzsd:module/interactor/interactor/on_click",
         "#fzsd:module/scoreboard/interactor/on_click",
         "#fzsd:module/here/interactor/on_click",
+        "#fzsd:module/last_death/interactor/on_click",
         "#fzsd:module/last_nether_portal/interactor/on_click",
-        "#fzsd:module/last_spawn_point/interactor/on_click",
+        "#fzsd:module/last_spawn_point/interactor/on_click"
-        "#fzsd:module/sweeper/interactor/on_click"
     ]
 }

data/fzsd/tags/functions/module/interactor/event/on_start_interact.json

@@ -1,7 +1,7 @@
 {
     "replace": false,
     "values": [
-        "#fzsd:module/interactor/event/on_display",
+        "#fzsd:module/interactor/display",
         "#fzsd:module/interactor/reset_trigger"
     ]
 }

data/fzsd/tags/functions/module/interactor/try_load.json

@@ -1,6 +1,6 @@
 {
     "replace": false,
     "values": [
-        "fzsd:module/sweeper/load"
+        "fzsd:module/interactor/try_load"
     ]
 }

data/fzsd/tags/functions/module/join_message/default_message.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "fzsd:module/join_message/default_message"
+    ]
+}

data/fzsd/tags/functions/module/join_message/send_message.json

@@ -1,6 +1,6 @@
 {
     "replace": false,
     "values": [
-        "fzsd:module/join_message/default_message"
+        "#fzsd:module/join_message/default_message"
     ]
 }

data/fzsd/tags/functions/module/last_death/get_death_point.json

@@ -0,0 +1,7 @@
+{
+    "replace": false,
+    "values": [
+        "fzsd:module/last_death/get_death_point",
+        "#fzsd:api/get_dimension_name"
+    ]
+}

data/fzsd/tags/functions/module/last_death/install.json

@@ -1,6 +1,6 @@
 {
     "replace": false,
     "values": [
-        "fzsd:module/sweeper/sweep"
+        "fzsd:module/last_death/install"
     ]
 }

data/fzsd/tags/functions/module/last_death/interactor/display.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "fzsd:module/last_death/interactor/display"
+    ]
+}

data/fzsd/tags/functions/module/last_death/interactor/on_click.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "fzsd:module/last_death/interactor/on_click"
+    ]
+}

data/fzsd/tags/functions/module/last_death/private_message.json

@@ -0,0 +1,7 @@
+{
+    "replace": false,
+    "values": [
+        "#fzsd:module/last_death/get_death_point",
+        "fzsd:module/last_death/private_message"
+    ]
+}

data/fzsd/tags/functions/module/last_death/uninstall.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "fzsd:module/last_death/uninstall"
+    ]
+}

data/fzsd/tags/functions/module/scoreboard/try_load.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "fzsd:module/scoreboard/try_load"
+    ]
+}

data/fzsd/tags/functions/module/sweeper/install.json

@@ -1,7 +0,0 @@
-{
-    "__comment": "调用者：#fzsd:module/install",
-    "replace": false,
-    "values": [
-        "fzsd:module/sweeper/install"
-    ]
-}

data/fzsd/tags/functions/module/sweeper/interactor/display.json

@@ -1,6 +0,0 @@
-{
-    "replace": false,
-    "values": [
-        "fzsd:module/sweeper/interactor/display"
-    ]
-}

data/fzsd/tags/functions/module/sweeper/interactor/on_click.json

@@ -1,6 +0,0 @@
-{
-    "replace": false,
-    "values": [
-        "fzsd:module/sweeper/interactor/on_click"
-    ]
-}

data/fzsd/tags/functions/module/sweeper/start_loop.json

@@ -1,9 +0,0 @@
-{
-    "replace": false,
-    "values": [
-        "fzsd:module/sweeper/clear",
-        "fzsd:module/sweeper/pre_loop",
-        "fzsd:module/sweeper/start_timer",
-        "fzsd:module/sweeper/bossbar"
-    ]
-}

data/fzsd/tags/functions/module/sweeper/uninstall.json

@@ -1,7 +0,0 @@
-{
-    "__comment": "调用者：#fzsd:module/uninstall",
-    "replace": false,
-    "values": [
-        "fzsd:module/sweeper/uninstall"
-    ]
-}

data/fzsd/tags/functions/module/try_install.json

@@ -0,0 +1,7 @@
+{
+    "__comment": "调用者：fzsd:load",
+    "replace": false,
+    "values": [
+        "fzsd:module/try_install"
+    ]
+}

data/fzsd/tags/functions/module/try_load.json

@@ -0,0 +1,9 @@
+{
+    "__comment": "调用者：fzsd:load",
+    "replace": false,
+    "values": [
+        "#fzsd:module/health/try_load",
+        "#fzsd:module/interactor/try_load",
+        "#fzsd:module/scoreboard/try_load"
+    ]
+}

data/fzsd/tags/functions/system/install/module/force.json

@@ -4,9 +4,9 @@
         "#fzsd:module/health/install",
         "#fzsd:module/here/install",
         "#fzsd:module/interactor/install",
+        "#fzsd:module/last_death/install",
         "#fzsd:module/last_nether_portal/install",
         "#fzsd:module/last_spawn_point/install",
-        "#fzsd:module/scoreboard/install",
+        "#fzsd:module/scoreboard/install"
-        "#fzsd:module/sweeper/install"
     ]
 }

data/fzsd/tags/functions/system/install/module/try.json

@@ -1,13 +1,6 @@
 {
     "replace": false,
     "values": [
-        "fzsd:module/health/try_install",
+        "#fzsd:module/try_install"
-        "fzsd:module/here/try_install",
-        "fzsd:module/interactor/try_install",
-        "fzsd:module/join_message/try_install",
-        "fzsd:module/last_nether_portal/try_install",
-        "fzsd:module/last_spawn_point/try_install",
-        "fzsd:module/scoreboard/try_install",
-        "fzsd:module/sweeper/try_install"
     ]
 }

data/fzsd/tags/functions/system/load/module/try.json

@@ -1,9 +1,6 @@
 {
     "replace": false,
     "values": [
-        "fzsd:module/health/try_load",
+        "#fzsd:module/try_load"
-        "fzsd:module/interactor/try_load",
-        "fzsd:module/scoreboard/try_load",
-        "fzsd:module/sweeper/try_load"
     ]
 }

data/fzsd/tags/functions/system/uninstall/module.json

@@ -5,9 +5,9 @@
         "#fzsd:module/health/uninstall",
         "#fzsd:module/here/uninstall",
         "#fzsd:module/interactor/uninstall",
+        "#fzsd:module/last_death/uninstall",
         "#fzsd:module/last_nether_portal/uninstall",
         "#fzsd:module/last_spawn_point/uninstall",
-        "#fzsd:module/scoreboard/uninstall",
+        "#fzsd:module/scoreboard/uninstall"
-        "#fzsd:module/sweeper/uninstall"
     ]
 }

data/fzsd/tags/items/bucket_of_liquid.json

@@ -1,9 +0,0 @@
-{
-    "replace": false,
-    "values": [
-        "minecraft:lava_bucket",
-        "minecraft:water_bucket",
-        "minecraft:powder_snow_bucket",
-        "#fzsd:bucket_of_mob"
-    ]
-}