update version

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

.vscode/settings.json

@@ -17,7 +17,6 @@
         "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.jsonVersion": "1.18.2",
-    "datapack.env.dataVersion": "1.18.2"
+    "datapack.env.cmdVersion": "1.20",
+    "datapack.env.dataVersion": "1.20"
 }

DEVDOC.md

@@ -18,6 +18,7 @@
             "values": ...
         }
         ```
+- ***函数和标签是否能被扩展数据包成功覆盖，取决于数据包加载顺序***，请使用`/datapack enable <xxx> after <xxx>`指令，使您的扩展数据包在FZ's Survival Datapack之后加载
 
 
 ## 基本要求
@@ -71,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,9 +1,9 @@
 
 FZSD许可协议
 
-2022/11/19 https://gitee.com/harvey-husky/fz-survival-datapack/blob/dev/3.0/LICENSE
+2023/6/6 https://gitee.com/harvey-husky/fz-survival-datapack/blob/dev/3.0/LICENSE
 
-版权所有 © 2019-2022 延皓<https://gitee.com/harvey-husky><https://space.bilibili.com/677233356>
+版权所有 © 2019-2023 延皓<https://gitee.com/harvey-husky><https://space.bilibili.com/677233356>
 
 定义：
 “该许可协议”指FZSD许可协议。

README.md

@@ -4,24 +4,28 @@
 
 #### @Author: Harvey_Husky
 
-#### Copyright (C) 2019-2022 Harvey_Husky
+#### Copyright (C) 2019-2023 Harvey_Husky
+
+[Bilibili专栏](https://www.bilibili.com/read/cv4267319)（年久失修）
 
 ## 安装教程
 
 1. 兼容性
-     - `数据包 v3.0.x` 支持 `Minecraft 1.18.2/1.19.4`
+     - `数据包 v3.1.x` 支持 `Minecraft 1.20.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`
 2. 前往[发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases)下载对应MC版本的数据包
-3. 将数据包 `zip` 文件放入 `world/datapacks` 中（在客户端位于 `.minecraft/saves/<存档名>/datapacks`）
-4. （可选）下载并安装 [Carpet Mod **1.4.24**](https://github.com/gnembon/fabric-carpet/releases) 或以上版本
-5. （可选）从数据包 `zip` 文件的 `scripts` 目录中解压 `.sc` 文件，将其放入 `world/scripts` 中（在客户端位于 `.minecraft/saves/<存档名>/scripts` ）
-6. 执行 `reload` 指令（或重新打开存档）
+3. 从zip文件的 `scripts` 目录中挑选你需要的 `.sc` 文件
+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` 指令（或重新打开存档；在一些第三方服务端中可能需要改为`/minecraft:reload`）
 
-# FZ生存数据包 3.0
+# FZ生存数据包 3.1
 
-[![数据包版本](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.1.2-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases) [![MC版本](https://img.shields.io/badge/Minecraft-1.20+-blue.svg)](https://minecraft.net/)
 
 > 其他版本见[发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases)
 
@@ -77,17 +81,31 @@
 - 需要安装 [Carpet Mod](https://github.com/gnembon/fabric-carpet/releases)
 - 从数据包 `zip` 文件的 `scripts` 目录中解压 `.sc` 文件，将其放入 `world/scripts` 中（在客户端位于 `.minecraft/saves/<存档名>/scripts` ）
 - 脚本：
-  - `fzsd_score.sc`（**开发中！此处列举目前已完成的**）：
+  - `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`命令管理（安装、卸载等）各模块
+
 ### 其他
 
 - 见游戏内交互器按钮

data/admin.fzsd/functions/admin.mcfunction

@@ -35,4 +35,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": "]"}],[{"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": "]"}]]]
+tellraw @s [{"text": "扫地机："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/sweeper/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/sweeper/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+
+tellraw @s [{"text": "幻翼预警："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/phantom_warning/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/phantom_warning/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]

data/fzsd/advancements/game_event/on_placed_block.json

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

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

@@ -4,10 +4,24 @@
         "on_placed_liquid": {
             "trigger": "minecraft:placed_block",
             "conditions": {
-                "item": {
-                    "tag": "fzsd:bucket_of_liquid"
+                "location": [
+                    {
+                        "condition": "minecraft:reference",
+                        "name": "fzsd:is_real_player"
+                    },
+                    {
+                        "condition": "minecraft:location_check",
+                        "predicate": {
+                            "block": {
+                                "tag": "fzsd:liquid"
                             }
                         }
                     }
+                ]
+            }
+        }
+    },
+    "rewards": {
+        "function": "fzsd:game_event/advancement/on_placed_block/on_placed_liquid"
     }
 }

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

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

data/fzsd/advancements/game_event/on_sleeping.json

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

data/fzsd/advancements/game_event/on_tool_axes_used_on_block.json

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

data/fzsd/advancements/game_event/on_tools_exclude_axes_used_on_block.json

@@ -5,16 +5,19 @@
             "__comment": "斧子剥树皮会触发两次！",
             "trigger": "minecraft:item_used_on_block",
             "conditions": {
-                "player": [
+                "location": [
                     {
                         "condition": "minecraft:reference",
                         "name": "fzsd:is_real_player"
-                    }
-                ],
-                "item": {
+                    },
+                    {
+                        "condition": "minecraft:match_tool",
+                        "predicate": {
                             "tag": "fzsd:tools_exclude_axes"
                         }
                     }
+                ]
+            }
         }
     },
     "rewards": {

data/fzsd/advancements/game_event/on_unsneak.json

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

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

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

data/fzsd/functions/api/get_current_daytime.mcfunction

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

data/fzsd/functions/api/get_current_gametime.mcfunction

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

data/fzsd/functions/api/get_time_since_rest.mcfunction

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

data/fzsd/functions/api/install.mcfunction

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

data/fzsd/functions/api/uninstall.mcfunction

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

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

@@ -1,10 +1,6 @@
 # 调用者：advancements/fzsd:~
 
-## 运行事件
-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/advancement/on_placed_block/on_placed_liquid.mcfunction

@@ -0,0 +1,9 @@
+# 调用者：advancements/fzsd:~
+
+## 调试
+execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "放置了流体"}]
+
+function #fzsd:game_event/player/on_placed_liquid
+
+## 重置事件进度
+advancement revoke @s from fzsd:game_event/on_placed_block/on_placed_liquid

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

@@ -0,0 +1,9 @@
+# 调用者：advancements/fzsd:~
+
+## 调试
+execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "放置了方块"}]
+
+function #fzsd:game_event/player/on_placed_solid
+
+## 重置事件进度
+advancement revoke @s from fzsd:game_event/on_placed_block/on_placed_solid

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

@@ -0,0 +1,10 @@
+# 调用者：advancements/fzsd:~
+
+## 调试
+execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "正在睡觉"}]
+
+## 运行事件
+function #fzsd:game_event/player/on_sleeping
+
+## 重置事件进度
+advancement revoke @s from fzsd:game_event/on_sleeping

data/fzsd/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/game_event/game/on_night.mcfunction

@@ -0,0 +1,7 @@
+# 调用者：fzsd:game_event/game/on_night/on_tick
+
+## 调试
+execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "事件已触发：夜幕降临"}]
+
+## 运行事件
+function #fzsd:game_event/game/on_night

data/fzsd/functions/game_event/game/on_night/on_tick.mcfunction

@@ -0,0 +1,3 @@
+# 由fzsd:game_event/on_tick事件调用
+function #fzsd:api/get_current_daytime
+execute if score fzsd.var.cache fzsd.variable.integer matches 12516 run function fzsd:game_event/game/on_night

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

@@ -1,4 +1,4 @@
-# 调用者：fzsd:game_event/player/on_used_tool
+# 调用者：fzsd:game_event/player/on_broke_block_with_tool/try_trigger
 
 ## 调试
 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/player/on_broke_block_with_tool/try_trigger.mcfunction

@@ -1,2 +1,4 @@
+# 调用者：#fzsd:game_event/player/on_used_tool
+
 ## 判断分数
 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.mcfunction

@@ -1,5 +1,5 @@
-## 详细
-execute if score fzsd.logger.level fzsd.variable.integer matches ..300 run tellraw @a [{"nbt": "fzsd.level.fine", "interpret": true, "storage": "fzsd:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "使用了工具"}]
+## 调试
+execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.fine", "interpret": true, "storage": "fzsd:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "使用了工具"}]
 
 ## 运行事件
 function #fzsd:game_event/player/on_used_tool

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

@@ -31,5 +31,5 @@ scoreboard players set @s fzsd.event.used_tool.wooden_pickaxe 0
 scoreboard players set @s fzsd.event.used_tool.wooden_shovel 0
 scoreboard players set @s fzsd.event.used_tool.wooden_sword 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": "的used_tool计分板"}]
+## 详细
+execute if score fzsd.logger.level fzsd.variable.integer matches ..300 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "重置了玩家"}, {"selector": "@s"}, {"text": "的used_tool计分板"}]

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/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_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/phantom_warning/check_time_since_rest.mcfunction

@@ -0,0 +1,3 @@
+# TODO: 数字有待商榷
+function #fzsd:api/get_time_since_rest
+execute if score fzsd.var.cache fzsd.variable.integer matches 61766.. run function #fzsd:module/phantom_warning/send_phantom_warning

data/fzsd/functions/module/phantom_warning/event/on_night.mcfunction

@@ -0,0 +1 @@
+execute if data storage fzsd:install fzsd.module{phantom_warning:1b} as @a[predicate=fzsd:is_real_player] run function #fzsd:module/phantom_warning/check_time_since_rest

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

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

@@ -0,0 +1,5 @@
+## 对当前玩家发送提醒
+execute if score fzsd.logger.level fzsd.variable.integer matches ..600 run tellraw @s [{"nbt": "fzsd.level.alert", "interpret": true, "storage": "fzsd:logger"}, {"text": "今晚可能会生成幻翼，建议睡觉！"}]
+
+## 调试
+execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "事件已触发：已向玩家"}, {"selector": "@s"}, {"text": "发送幻翼预警"}]

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

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

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

@@ -0,0 +1,5 @@
+## 标记为已卸载
+data modify storage fzsd:install fzsd.module.phantom_warning 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/scoreboard/display/carousel/set_display/activation.mcfunction

@@ -1,13 +1,18 @@
 # 调用者：fzsd:module/scoreboard/carousel/try_display/~
 
 ## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81
+
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.activation
+### 默认值金色放到第一位
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 if score fzsd.logger.level fzsd.variable.integer matches ..300 run tellraw @a [{"nbt": "fzsd.level.fine", "interpret": true, "storage": "fzsd:logger"}, {"text": "已为队伍"}, {"nbt": "fzsd.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}, {"text": "显示"}, {"nbt": "fzsd.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"}, {"text": "计分板"}]
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run return 6
+
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.activation
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fzsd.module.scoreboard.display.activation
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fzsd.module.scoreboard.display.activation
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fzsd.module.scoreboard.display.activation
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fzsd.module.scoreboard.display.activation
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fzsd.module.scoreboard.display.activation
-execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.activation
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fzsd.module.scoreboard.display.activation
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fzsd.module.scoreboard.display.activation
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fzsd.module.scoreboard.display.activation

data/fzsd/functions/module/scoreboard/display/carousel/set_display/aviating_distance.mcfunction

@@ -1,13 +1,17 @@
 # 调用者：fzsd:module/scoreboard/carousel/try_display/~
 
 ## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.aviating_distance
+### 默认值金色放到第一位
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 if score fzsd.logger.level fzsd.variable.integer matches ..300 run tellraw @a [{"nbt": "fzsd.level.fine", "interpret": true, "storage": "fzsd:logger"}, {"text": "已为队伍"}, {"nbt": "fzsd.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}, {"text": "显示"}, {"nbt": "fzsd.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"}, {"text": "计分板"}]
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run return 6
+
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.aviating_distance
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fzsd.module.scoreboard.display.aviating_distance
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fzsd.module.scoreboard.display.aviating_distance
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fzsd.module.scoreboard.display.aviating_distance
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fzsd.module.scoreboard.display.aviating_distance
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fzsd.module.scoreboard.display.aviating_distance
-execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.aviating_distance
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fzsd.module.scoreboard.display.aviating_distance
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fzsd.module.scoreboard.display.aviating_distance
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fzsd.module.scoreboard.display.aviating_distance

data/fzsd/functions/module/scoreboard/display/carousel/set_display/damage_taken.mcfunction

@@ -1,13 +1,17 @@
 # 调用者：fzsd:module/scoreboard/carousel/try_display/~
 
 ## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.damage_taken
+### 默认值金色放到第一位
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 if score fzsd.logger.level fzsd.variable.integer matches ..300 run tellraw @a [{"nbt": "fzsd.level.fine", "interpret": true, "storage": "fzsd:logger"}, {"text": "已为队伍"}, {"nbt": "fzsd.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}, {"text": "显示"}, {"nbt": "fzsd.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"}, {"text": "计分板"}]
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run return 6
+
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.damage_taken
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fzsd.module.scoreboard.display.damage_taken
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fzsd.module.scoreboard.display.damage_taken
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fzsd.module.scoreboard.display.damage_taken
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fzsd.module.scoreboard.display.damage_taken
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fzsd.module.scoreboard.display.damage_taken
-execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.damage_taken
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fzsd.module.scoreboard.display.damage_taken
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fzsd.module.scoreboard.display.damage_taken
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fzsd.module.scoreboard.display.damage_taken

data/fzsd/functions/module/scoreboard/display/carousel/set_display/death_count.mcfunction

@@ -1,13 +1,17 @@
 # 调用者：fzsd:module/scoreboard/carousel/try_display/~
 
 ## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.death_count
+### 默认值金色放到第一位
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 if score fzsd.logger.level fzsd.variable.integer matches ..300 run tellraw @a [{"nbt": "fzsd.level.fine", "interpret": true, "storage": "fzsd:logger"}, {"text": "已为队伍"}, {"nbt": "fzsd.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}, {"text": "显示"}, {"nbt": "fzsd.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"}, {"text": "计分板"}]
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run return 6
+
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.death_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fzsd.module.scoreboard.display.death_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fzsd.module.scoreboard.display.death_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fzsd.module.scoreboard.display.death_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fzsd.module.scoreboard.display.death_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fzsd.module.scoreboard.display.death_count
-execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.death_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fzsd.module.scoreboard.display.death_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fzsd.module.scoreboard.display.death_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fzsd.module.scoreboard.display.death_count

data/fzsd/functions/module/scoreboard/display/carousel/set_display/dig_count.mcfunction

@@ -1,13 +1,17 @@
 # 调用者：fzsd:module/scoreboard/carousel/try_display/~
 
 ## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.dig_count
+### 默认值金色放到第一位
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 if score fzsd.logger.level fzsd.variable.integer matches ..300 run tellraw @a [{"nbt": "fzsd.level.fine", "interpret": true, "storage": "fzsd:logger"}, {"text": "已为队伍"}, {"nbt": "fzsd.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}, {"text": "显示"}, {"nbt": "fzsd.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"}, {"text": "计分板"}]
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run return 6
+
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.dig_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fzsd.module.scoreboard.display.dig_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fzsd.module.scoreboard.display.dig_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fzsd.module.scoreboard.display.dig_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fzsd.module.scoreboard.display.dig_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fzsd.module.scoreboard.display.dig_count
-execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.dig_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fzsd.module.scoreboard.display.dig_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fzsd.module.scoreboard.display.dig_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fzsd.module.scoreboard.display.dig_count

data/fzsd/functions/module/scoreboard/display/carousel/set_display/fishing_count.mcfunction

@@ -1,13 +1,17 @@
 # 调用者：fzsd:module/scoreboard/carousel/try_display/~
 
 ## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.fishing_count
+### 默认值金色放到第一位
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 if score fzsd.logger.level fzsd.variable.integer matches ..300 run tellraw @a [{"nbt": "fzsd.level.fine", "interpret": true, "storage": "fzsd:logger"}, {"text": "已为队伍"}, {"nbt": "fzsd.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}, {"text": "显示"}, {"nbt": "fzsd.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"}, {"text": "计分板"}]
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run return 6
+
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.fishing_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fzsd.module.scoreboard.display.fishing_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fzsd.module.scoreboard.display.fishing_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fzsd.module.scoreboard.display.fishing_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fzsd.module.scoreboard.display.fishing_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fzsd.module.scoreboard.display.fishing_count
-execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.fishing_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fzsd.module.scoreboard.display.fishing_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fzsd.module.scoreboard.display.fishing_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fzsd.module.scoreboard.display.fishing_count

data/fzsd/functions/module/scoreboard/display/carousel/set_display/general.mcfunction

@@ -1,13 +1,17 @@
 # 调用者：fzsd:module/scoreboard/carousel/try_display/~
 
 ## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.general
+### 默认值金色放到第一位
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 if score fzsd.logger.level fzsd.variable.integer matches ..300 run tellraw @a [{"nbt": "fzsd.level.fine", "interpret": true, "storage": "fzsd:logger"}, {"text": "已为队伍"}, {"nbt": "fzsd.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}, {"text": "显示"}, {"nbt": "fzsd.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"}, {"text": "计分板"}]
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run return 6
+
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.general
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fzsd.module.scoreboard.display.general
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fzsd.module.scoreboard.display.general
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fzsd.module.scoreboard.display.general
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fzsd.module.scoreboard.display.general
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fzsd.module.scoreboard.display.general
-execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.general
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fzsd.module.scoreboard.display.general
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fzsd.module.scoreboard.display.general
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fzsd.module.scoreboard.display.general

data/fzsd/functions/module/scoreboard/display/carousel/set_display/kill_count.mcfunction

@@ -1,13 +1,17 @@
 # 调用者：fzsd:module/scoreboard/carousel/try_display/~
 
 ## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.kill_count
+### 默认值金色放到第一位
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 if score fzsd.logger.level fzsd.variable.integer matches ..300 run tellraw @a [{"nbt": "fzsd.level.fine", "interpret": true, "storage": "fzsd:logger"}, {"text": "已为队伍"}, {"nbt": "fzsd.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}, {"text": "显示"}, {"nbt": "fzsd.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"}, {"text": "计分板"}]
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run return 6
+
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.kill_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fzsd.module.scoreboard.display.kill_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fzsd.module.scoreboard.display.kill_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fzsd.module.scoreboard.display.kill_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fzsd.module.scoreboard.display.kill_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fzsd.module.scoreboard.display.kill_count
-execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.kill_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fzsd.module.scoreboard.display.kill_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fzsd.module.scoreboard.display.kill_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fzsd.module.scoreboard.display.kill_count

data/fzsd/functions/module/scoreboard/display/carousel/set_display/placement_count.mcfunction

@@ -1,13 +1,17 @@
 # 调用者：fzsd:module/scoreboard/carousel/try_display/~
 
 ## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.placement_count
+### 默认值金色放到第一位
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 if score fzsd.logger.level fzsd.variable.integer matches ..300 run tellraw @a [{"nbt": "fzsd.level.fine", "interpret": true, "storage": "fzsd:logger"}, {"text": "已为队伍"}, {"nbt": "fzsd.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}, {"text": "显示"}, {"nbt": "fzsd.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}, {"text": "计分板"}]
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run return 6
+
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.placement_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fzsd.module.scoreboard.display.placement_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fzsd.module.scoreboard.display.placement_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fzsd.module.scoreboard.display.placement_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fzsd.module.scoreboard.display.placement_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fzsd.module.scoreboard.display.placement_count
-execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.placement_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fzsd.module.scoreboard.display.placement_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fzsd.module.scoreboard.display.placement_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fzsd.module.scoreboard.display.placement_count

data/fzsd/functions/module/scoreboard/display/carousel/set_display/trade_count.mcfunction

@@ -1,13 +1,17 @@
 # 调用者：fzsd:module/scoreboard/carousel/try_display/~
 
 ## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.trade_count
+### 默认值金色放到第一位
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 if score fzsd.logger.level fzsd.variable.integer matches ..300 run tellraw @a [{"nbt": "fzsd.level.fine", "interpret": true, "storage": "fzsd:logger"}, {"text": "已为队伍"}, {"nbt": "fzsd.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}, {"text": "显示"}, {"nbt": "fzsd.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}, {"text": "计分板"}]
+execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run return 6
+
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.trade_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fzsd.module.scoreboard.display.trade_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fzsd.module.scoreboard.display.trade_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fzsd.module.scoreboard.display.trade_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fzsd.module.scoreboard.display.trade_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fzsd.module.scoreboard.display.trade_count
-execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.trade_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fzsd.module.scoreboard.display.trade_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fzsd.module.scoreboard.display.trade_count
 execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fzsd.module.scoreboard.display.trade_count

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

@@ -11,13 +11,5 @@ 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/interactor/display_0.mcfunction

@@ -9,5 +9,4 @@ tellraw @s[tag=fzsd.ignore_sweeper_sound] [{"text": "- 音效："}, [{"text": "[
 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": "]"}]]
+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

@@ -6,4 +6,4 @@ execute if score @s fzsd.module.interactor.trigger matches 3600 run tag @s add f
 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
+execute if score @s fzsd.module.interactor.trigger matches -3240..-3010 run function #fzsd:module/sweeper/start_loop

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

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

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

@@ -4,12 +4,4 @@ execute if score fzsd.sweeper.interval_time fzsd.variable.integer matches 60 run
 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/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/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/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/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/system/load/load.mcfunction

@@ -2,4 +2,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 24000 fzsd.variable.integer 24000
 scoreboard players set 72000 fzsd.variable.integer 72000

data/fzsd/predicates/axe_in_hand_effective.json

@@ -1,5 +1,5 @@
 {
-    "condition": "minecraft:alternative",
+    "condition": "minecraft:any_of",
     "terms": [
         {
             "__comment": "主手==斧子",
@@ -15,11 +15,11 @@
         },
         {
             "__comment": "主手!=工具&&副手==斧子",
-            "condition": "minecraft:inverted",
-            "term": {
-                "condition": "minecraft:alternative",
+            "condition": "minecraft:all_of",
             "terms": [
                 {
+                    "condition": "minecraft:inverted",
+                    "term": {
                         "condition": "minecraft:entity_properties",
                         "entity": "this",
                         "predicate": {
@@ -29,10 +29,9 @@
                                 }
                             }
                         }
+                    }
                 },
                 {
-                        "condition": "minecraft:inverted",
-                        "term": {
                     "condition": "minecraft:entity_properties",
                     "entity": "this",
                     "predicate": {
@@ -43,9 +42,7 @@
                         }
                     }
                 }
-                    }
-                ]
-            }
+            ]
         }
     ]
 }

data/fzsd/predicates/not_real_player.json

@@ -1,5 +1,5 @@
 {
-    "condition": "minecraft:alternative",
+    "condition": "minecraft:any_of",
     "terms": [
         {
             "condition": "minecraft:reference",

data/fzsd/predicates/sweeper/whitelist.json

@@ -1,54 +1,7 @@
-{
-    "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/predicates/used_tool.json

@@ -1,5 +1,5 @@
 {
-    "condition": "minecraft:alternative",
+    "condition": "minecraft:any_of",
     "terms": [
         {
             "condition": "minecraft:entity_scores",

data/fzsd/tags/blocks/liquid.json

@@ -0,0 +1,7 @@
+{
+    "replace": false,
+    "values": [
+        "minecraft:water",
+        "minecraft:lava"
+    ]
+}

data/fzsd/tags/functions/api/get_current_daytime.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "fzsd:api/get_current_daytime"
+    ]
+}

data/fzsd/tags/functions/api/get_current_gametime.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "fzsd:api/get_current_gametime"
+    ]
+}

data/fzsd/tags/functions/api/get_time_since_rest.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "fzsd:api/get_time_since_rest"
+    ]
+}

data/fzsd/tags/functions/api/install.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "fzsd:api/install"
+    ]
+}

data/fzsd/tags/functions/api/uninstall.json

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

data/fzsd/tags/functions/deep_reinstall.json

@@ -2,7 +2,8 @@
     "__comment": "本标签将强制重装所有模块",
     "replace": false,
     "values": [
-        "#fzsd:uninstall",
-        "#fzsd:deep_install"
+        "#fzsd:deep_uninstall",
+        "#fzsd:deep_install",
+        "#fzsd:load"
     ]
 }

data/fzsd/tags/functions/game_event/game/on_night.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "#fzsd:module/phantom_warning/event/on_night"
+    ]
+}

data/fzsd/tags/functions/game_event/on_tick.json

@@ -1,6 +1,6 @@
 {
     "replace": false,
     "values": [
-        
+        "fzsd:game_event/game/on_night/on_tick"
     ]
 }

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

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

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

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

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

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

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

@@ -4,6 +4,7 @@
         "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/sweeper/interactor/on_click"

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

@@ -5,6 +5,7 @@
         "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/sweeper/interactor/display"

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

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "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/phantom_warning/check_time_since_rest.json

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

data/fzsd/tags/functions/module/phantom_warning/event/on_night.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "fzsd:module/phantom_warning/event/on_night"
+    ]
+}

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

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

data/fzsd/tags/functions/module/phantom_warning/send_phantom_warning.json

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

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

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

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

@@ -2,7 +2,7 @@
     "replace": false,
     "values": [
         "fzsd:module/sweeper/clear",
-        "fzsd:module/sweeper/pre_loop",
+        "fzsd:module/sweeper/post_loop",
         "fzsd:module/sweeper/start_timer",
         "fzsd:module/sweeper/bossbar"
     ]

data/fzsd/tags/functions/reinstall.json

@@ -2,6 +2,7 @@
     "replace": false,
     "values": [
         "#fzsd:uninstall",
-        "#fzsd:install"
+        "#fzsd:install",
+        "#fzsd:load"
     ]
 }

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

@@ -4,8 +4,11 @@
         "#fzsd:module/health/install",
         "#fzsd:module/here/install",
         "#fzsd:module/interactor/install",
+        "#fzsd:module/join_message/install",
+        "#fzsd:module/last_death/install",
         "#fzsd:module/last_nether_portal/install",
         "#fzsd:module/last_spawn_point/install",
+        "#fzsd:module/phantom_warning/install",
         "#fzsd:module/scoreboard/install",
         "#fzsd:module/sweeper/install"
     ]