update version

.vscode/settings.json

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

LICENSE

@@ -1,9 +1,9 @@
 
 FZSD许可协议
 
-2023/6/6 https://gitee.com/harvey-husky/fz-survival-datapack/blob/dev/3.0/LICENSE
+2022/11/19 https://gitee.com/harvey-husky/fz-survival-datapack/blob/dev/3.0/LICENSE
 
-版权所有 © 2019-2023 延皓<https://gitee.com/harvey-husky><https://space.bilibili.com/677233356>
+版权所有 © 2019-2022 延皓<https://gitee.com/harvey-husky><https://space.bilibili.com/677233356>
 
 定义：
 “该许可协议”指FZSD许可协议。

README.md

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

compat_16/data/fzsd/functions/module/health/load.mcfunction

@@ -1,7 +0,0 @@
-execute unless data storage fzsd:config fzsd.module.health.display{below_name: 0b} run scoreboard objectives setdisplay below_name fzsd.module.health
-execute if data storage fzsd:config fzsd.module.health.display{below_name: 0b} run scoreboard objectives setdisplay below_name
-execute unless data storage fzsd:config fzsd.module.health.display{list: 0b} run scoreboard objectives setdisplay list fzsd.module.health
-execute if data storage fzsd:config fzsd.module.health.display{list: 0b} run scoreboard objectives setdisplay list
-
-## 日志
-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/admin.fzsd/functions/admin.mcfunction

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

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

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

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

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

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

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

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

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

data/fzsd/advancements/game_event/on_placed_block.json

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

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

@@ -4,24 +4,10 @@
         "on_placed_liquid": {
             "trigger": "minecraft:placed_block",
             "conditions": {
-                "location": [
+                "item": {
-                    {
+                    "tag": "fzsd:bucket_of_liquid"
-                        "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

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

data/fzsd/advancements/game_event/on_sleeping.json

@@ -1,19 +0,0 @@
-{
-    "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,27 +4,21 @@
         "on_tools_exclude_axes_used_on_block": {
             "trigger": "minecraft:item_used_on_block",
             "conditions": {
-                "location": [
+                "player": [
                     {
                         "condition": "minecraft:reference",
                         "name": "fzsd:is_real_player"
-                    },
-                    {
-                        "condition": "minecraft:match_tool",
-                        "predicate": {
-                            "tag": "fzsd:tool/axes"
-                        }
-                    },
-                    {
-                        "condition": "minecraft:location_check",
-                        "predicate": {
-                            "__comment": "斧子剥树皮会触发两次，所以用目标方块限定只触发一次",
-                            "block": {
-                                "tag": "fzsd:stripped_blocks"
-                            }
-                        }
                     }
-                ]
+                ],
+                "item": {
+                    "tag": "fzsd:tool/axes"
+                },
+                "location": {
+                    "__comment": "斧子剥树皮会触发两次，所以用目标方块限定只触发一次",
+                    "block": {
+                        "tag": "fzsd:stripped_blocks"
+                    }
+                }
             }
         }
     },

data/fzsd/advancements/game_event/on_tools_exclude_axes_used_on_block.json

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

data/fzsd/advancements/game_event/on_unsneak.json

@@ -16,11 +16,18 @@
                             "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:any_of",
+                        "condition": "minecraft:alternative",
                         "terms": [
                             {
                                 "condition": "minecraft:entity_scores",

data/fzsd/functions/api/get_current_daytime.mcfunction

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

data/fzsd/functions/api/get_current_gametime.mcfunction

@@ -1,2 +0,0 @@
-# 游戏时间范围：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

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

data/fzsd/functions/api/install.mcfunction

@@ -1,5 +0,0 @@
-## 距上次睡觉时间
-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

@@ -1,5 +0,0 @@
-## 距上次睡觉时间
-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 byte 1 run data merge storage fzsd:version {fzsd: {version: '3.1.7'}}
+execute store success storage fzsd:version fzsd.need_update int 1 run data merge storage fzsd:version {fzsd: {version: '3.0.9'}}
-execute if data storage fzsd:version fzsd{need_update: 1b} run function fzsd:system/update
+execute if data storage fzsd:version fzsd{need_update: 1} run function fzsd:system/update
 function fzsd:system/carpet/try_load_fzsd_score
 function #fzsd:load
 execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "FZ Survival Data Pack，当前版本：", "color": "gold"}, {"nbt":"fzsd.version", "storage": "fzsd:version", "color": "red"}]

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

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

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

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

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

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

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

@@ -0,0 +1,2 @@
+## 调试
+execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "放置了流体"}]

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

@@ -0,0 +1,2 @@
+## 调试
+execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "放置了实体方块"}]

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

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

@@ -1,3 +0,0 @@
-# 由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_broke_block_with_tool/try_trigger
+# 调用者：fzsd:game_event/player/on_used_tool
 
 ## 调试
 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,4 +1,2 @@
-# 调用者：#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 ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "使用了工具"}]
+execute if score fzsd.logger.level fzsd.variable.integer matches ..300 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 ..300 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 ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "重置了玩家"}, {"selector": "@s"}, {"text": "的used_tool计分板"}]

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

@@ -1,4 +1,3 @@
-## @see compat_16
 execute unless data storage fzsd:config fzsd.module.health.display{below_name: 0b} run scoreboard objectives setdisplay belowName fzsd.module.health
 execute if data storage fzsd:config fzsd.module.health.display{below_name: 0b} run scoreboard objectives setdisplay belowName
 execute unless data storage fzsd:config fzsd.module.health.display{list: 0b} run scoreboard objectives setdisplay list fzsd.module.health

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

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

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

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

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

@@ -1,3 +1,3 @@
 # 本目录用于存放向事件中注册的函数，并不用来新建事件
 
-execute if data storage fzsd:install fzsd.module{interactor: 1b} if entity @s[tag=!fzsd.ignore_interactor_headup_sneak, x_rotation = -90] run function #fzsd:module/interactor/event/on_start_interact
+execute if data storage fzsd:install fzsd.module{interactor: 1b} unless score @s fzsd.module.interactor.player.config matches -1 if entity @s[x_rotation = -90] run function #fzsd:module/interactor/event/on_start_interact

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

@@ -1,7 +1,7 @@
 ## 调试
 execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "向玩家"}, {"selector": "@s"}, {"text": "显示交互器"}]
 
-execute if data storage fzsd:install fzsd.module{interactor:1b} run tellraw @s {"text": "交互器："}
+execute if data storage fzsd:installed fzsd.module{last_death:1b} run tellraw @s {"text": "交互器打开方式："}
 
-execute if data storage fzsd:install fzsd.module{interactor:1b} if entity @s[tag=!fzsd.ignore_interactor_headup_sneak] run tellraw @s [{"text": "- 打开方式“抬头+蹲起”："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "点击关闭"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set 900"}},{"text": "已启用", "color": "green"},{"text": "]"}]]
+execute if data storage fzsd:installed fzsd.module{last_death:1b} unless score @s fzsd.module.interactor.player.config matches -1 run tellraw @s [{"text": "- 抬头+蹲起："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "点击关闭"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set 900"}},{"text": "已开启", "color": "green"},{"text": "]"}]]
-execute if data storage fzsd:install fzsd.module{interactor:1b} if entity @s[tag=fzsd.ignore_interactor_headup_sneak] run tellraw @s [{"text": "- 打开方式“抬头+蹲起”："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "点击启用"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set 910"}},{"text": "已关闭", "color": "red"},{"text": "]"}]]
+execute if data storage fzsd:installed fzsd.module{last_death:1b} if score @s fzsd.module.interactor.player.config matches -1 run tellraw @s [{"text": "- 抬头+蹲起："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "点击开启"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set 910"}},{"text": "已关闭", "color": "red"},{"text": "]"}]]

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

@@ -3,5 +3,6 @@
 ## 调试
 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": "的交互器分数为："}, {"score": {"name": "@s", "objective": "fzsd.module.interactor.trigger"}}]
 
-execute if score @s fzsd.module.interactor.trigger matches 900 run tag @s add fzsd.ignore_interactor_headup_sneak
+execute if score @s fzsd.module.interactor.trigger matches 900 run scoreboard players set @s fzsd.module.interactor.player.config -1
-execute if score @s fzsd.module.interactor.trigger matches 910 run tag @s remove fzsd.ignore_interactor_headup_sneak
+
+execute if score @s fzsd.module.interactor.trigger matches 910 run scoreboard players set @s fzsd.module.interactor.player.config 0

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

@@ -1,5 +1,5 @@
 tellraw @s [{"nbt": "fzsd.root", "interpret": true, "storage": "fzsd:logger"}, [{"text": "本服务器启用了"}, {"text": "FZ生存数据包", "color": "gold", "underlined": true, "hoverEvent": {"action": "show_text", "contents": {"text": "点击前往数据包gitee主页"}}, "clickEvent": {"action": "open_url", "value": "https://gitee.com/harvey-husky/fz-survival-datapack"}}]]
 ## 如果玩家未关闭抬头蹲起功能
-execute if entity @s[tag=!fzsd.ignore_interactor_headup_sneak] run tellraw @s [{"nbt": "fzsd.root", "interpret": true, "storage": "fzsd:logger"}, [{"text": "抬头90°并蹲起，或使用", "color": "white"}, {"text": "/trigger fzsd.module.interactor.trigger", "color": "aqua", "underlined": true, "hoverEvent": {"action": "show_text", "contents": {"text": "点击填入聊天栏"}}, "clickEvent": {"action": "suggest_command", "value": "/trigger fzsd.module.interactor.trigger"}}, {"text": "打开交互器"}]]
+execute unless score @s fzsd.module.interactor.player.config matches -1 run tellraw @s [{"nbt": "fzsd.root", "interpret": true, "storage": "fzsd:logger"}, [{"text": "抬头90°并蹲起，或使用", "color": "white"}, {"text": "/trigger fzsd.module.interactor.trigger", "color": "aqua", "underlined": true, "hoverEvent": {"action": "show_text", "contents": {"text": "点击填入聊天栏"}}, "clickEvent": {"action": "suggest_command", "value": "/trigger fzsd.module.interactor.trigger"}}, {"text": "打开交互器"}]]
 ## 如果玩家关闭了抬头蹲起功能
-execute if entity @s[tag=fzsd.ignore_interactor_headup_sneak] run tellraw @s [{"nbt": "fzsd.root", "interpret": true, "storage": "fzsd:logger"}, [{"text": "使用", "color": "white"}, {"text": "/trigger fzsd.module.interactor.trigger", "color": "aqua", "underlined": true, "hoverEvent": {"action": "show_text", "contents": {"text": "点击填入聊天栏"}}, "clickEvent": {"action": "suggest_command", "value": "/trigger fzsd.module.interactor.trigger"}}, {"text": "打开交互器"}]]
+execute if score @s fzsd.module.interactor.player.config matches -1 run tellraw @s [{"nbt": "fzsd.root", "interpret": true, "storage": "fzsd:logger"}, [{"text": "使用", "color": "white"}, {"text": "/trigger fzsd.module.interactor.trigger", "color": "aqua", "underlined": true, "hoverEvent": {"action": "show_text", "contents": {"text": "点击填入聊天栏"}}, "clickEvent": {"action": "suggest_command", "value": "/trigger fzsd.module.interactor.trigger"}}, {"text": "打开交互器"}]]

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

@@ -1,4 +0,0 @@
-# TODO: 数字有待商榷
-## @s this player
-function #fzsd:api/get_time_since_rest
-execute if score fzsd.var.cache fzsd.variable.integer matches 61766.. if entity @s[tag=!fzsd.ignore_phantom_warning] run function #fzsd:module/phantom_warning/send_phantom_warning

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

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

@@ -1,5 +0,0 @@
-## 标记为已安装
-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/interactor/display.mcfunction

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

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

@@ -1,2 +0,0 @@
-tellraw @s[tag=!fzsd.ignore_phantom_warning] [{"text": "幻翼预警："}, [{"text": "[", "color": "gray", "hoverEvent": {"action": "show_text", "value": "点击关闭"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set 4000"}}, {"text": "已启用", "color": "green"}, {"text": "]", "color": "gray"}]]
-tellraw @s[tag=fzsd.ignore_phantom_warning] [{"text": "幻翼预警："}, [{"text": "[", "color": "gray", "hoverEvent": {"action": "show_text", "value": "点击启用"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set 4001"}}, {"text": "已关闭", "color": "red"}, {"text": "]", "color": "gray"}]]

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

@@ -1,2 +0,0 @@
-execute if score @s fzsd.module.interactor.trigger matches 4000 run tag @s add fzsd.ignore_phantom_warning
-execute if score @s fzsd.module.interactor.trigger matches 4001 run tag @s remove fzsd.ignore_phantom_warning

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

@@ -1,6 +0,0 @@
-# 调用者：tags\functions\module\phantom_warning\send_phantom_warning.json
-## 对当前玩家发送提醒
-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

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

@@ -1,5 +0,0 @@
-## 标记为已卸载
-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,18 +1,13 @@
 # 调用者：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,17 +1,13 @@
 # 调用者：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,17 +1,13 @@
 # 调用者：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,17 +1,13 @@
 # 调用者：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,17 +1,13 @@
 # 调用者：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,17 +1,13 @@
 # 调用者：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,17 +1,13 @@
 # 调用者：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,17 +1,13 @@
 # 调用者：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,17 +1,13 @@
 # 调用者：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,17 +1,13 @@
 # 调用者：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/interactor/display_0.mcfunction

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

data/fzsd/functions/system/carpet/settings_preset.mcfunction

@@ -1,4 +1,3 @@
-# 这个文件并不会自动执行，有需要可以手动执行
 carpet setDefault language zh_cn
 carpet setDefault stackableShulkerBoxes 16
 carpet setDefault leadFix true

data/fzsd/functions/system/install/install.mcfunction

@@ -1,7 +1,2 @@
 ## 整数类型
-scoreboard objectives add fzsd.variable.integer dummy
+scoreboard objectives add fzsd.variable.integer dummy
-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/functions/system/load/load.mcfunction

@@ -2,5 +2,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 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:any_of",
+    "condition": "minecraft:alternative",
     "terms": [
         {
             "__comment": "主手==斧子",
@@ -15,11 +15,11 @@
         },
         {
             "__comment": "主手!=工具&&副手==斧子",
-            "condition": "minecraft:all_of",
+            "condition": "minecraft:inverted",
-            "terms": [
+            "term": {
-                {
+                "condition": "minecraft:alternative",
-                    "condition": "minecraft:inverted",
+                "terms": [
-                    "term": {
+                    {
                         "condition": "minecraft:entity_properties",
                         "entity": "this",
                         "predicate": {
@@ -29,20 +29,23 @@
                                 }
                             }
                         }
-                    }
+                    },
-                },
+                    {
-                {
+                        "condition": "minecraft:inverted",
-                    "condition": "minecraft:entity_properties",
+                        "term": {
-                    "entity": "this",
+                            "condition": "minecraft:entity_properties",
-                    "predicate": {
+                            "entity": "this",
-                        "equipment": {
+                            "predicate": {
-                            "offhand": {
+                                "equipment": {
-                                "tag": "fzsd:tool/axes"
+                                    "offhand": {
+                                        "tag": "fzsd:tool/axes"
+                                    }
+                                }
                             }
                         }
                     }
-                }
+                ]
-            ]
+            }
         }
     ]
 }

data/fzsd/predicates/not_real_player.json

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

data/fzsd/predicates/sweeper/whitelist.json

@@ -1,96 +1,7 @@
 {
-    "condition": "minecraft:any_of",
+    "condition": "minecraft:entity_properties",
-    "terms": [
+    "entity": "this",
-        {
+    "predicate": {
-            "condition": "minecraft:entity_properties",
+        "nbt": "{Item:{id:\"minecraft:minecart\"}}"
-            "entity": "this",
+    }
-            "predicate": {
+}
-                "nbt": "{Item:{id:\"minecraft:minecart\"}}"
-            }
-        },
-        {
-            "condition": "minecraft:entity_properties",
-            "entity": "this",
-            "predicate": {
-                "nbt": "{Item:{id:\"minecraft:hopper_minecart\"}}"
-            }
-        },
-        {
-            "condition": "minecraft:entity_properties",
-            "entity": "this",
-            "predicate": {
-                "nbt": "{Item:{id:\"minecraft:chest_minecart\"}}"
-            }
-        },
-        {
-            "condition": "minecraft:entity_properties",
-            "entity": "this",
-            "predicate": {
-                "nbt": "{Item:{id:\"minecraft:furnace_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:cherry_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\"}}"
-            }
-        },
-        {
-            "condition": "minecraft:entity_properties",
-            "entity": "this",
-            "predicate": {
-                "nbt": "{Item:{id:\"minecraft:mangrove_boat\"}}"
-            }
-        },
-        {
-            "condition": "minecraft:entity_properties",
-            "entity": "this",
-            "predicate": {
-                "nbt": "{Item:{id:\"minecraft:bamboo_raft\"}}"
-            }
-        }
-    ]
-}

data/fzsd/predicates/used_tool.json

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

data/fzsd/tags/blocks/liquid.json

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

data/fzsd/tags/blocks/stripped_blocks.json

@@ -16,10 +16,6 @@
         "minecraft:stripped_spruce_log",
         "minecraft:stripped_spruce_wood",
         "minecraft:stripped_warped_hyphae",
-        "minecraft:stripped_warped_stem",
+        "minecraft:stripped_warped_stem"
-        "minecraft:stripped_cherry_log",
-        "minecraft:stripped_cherry_wood",
-        "minecraft:stripped_mangrove_log",
-        "minecraft:stripped_mangrove_wood"
     ]
 }

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

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

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

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

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

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

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

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

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

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

data/fzsd/tags/functions/deep_reinstall.json

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

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

@@ -1,6 +0,0 @@
-{
-    "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,5 +1,6 @@
 {
     "replace": false,
     "values": [
+        "fzsd:game_event/callback/on_placed_liquid"
     ]
 }

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

@@ -1,6 +1,7 @@
 {
     "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

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

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

@@ -7,7 +7,6 @@
         "#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",
+        "#fzsd:module/sweeper/interactor/on_click"
-        "#fzsd:module/phantom_warning/interactor/on_click"
     ]
 }

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

@@ -8,7 +8,6 @@
         "#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",
+        "#fzsd:module/sweeper/interactor/display"
-        "#fzsd:module/phantom_warning/interactor/display"
     ]
 }

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

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

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

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

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

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

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

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

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

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

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

@@ -1,7 +0,0 @@
-{
-    "replace": false,
-    "__comment": "调用者：data/fzsd/functions/module/phantom_warning/check_time_since_rest.mcfunction",
-    "values": [
-        "fzsd:module/phantom_warning/send_phantom_warning"
-    ]
-}

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

@@ -1,6 +0,0 @@
-{
-    "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,7 +2,6 @@
     "replace": false,
     "values": [
         "#fzsd:uninstall",
-        "#fzsd:install",
+        "#fzsd:install"
-        "#fzsd:load"
     ]
 }

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

@@ -4,12 +4,10 @@
         "#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"
     ]
-}
+}

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

@@ -8,7 +8,6 @@
         "fzsd:module/last_death/try_install",
         "fzsd:module/last_nether_portal/try_install",
         "fzsd:module/last_spawn_point/try_install",
-        "fzsd:module/phantom_warning/try_install",
         "fzsd:module/scoreboard/try_install",
         "fzsd:module/sweeper/try_install"
     ]

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

@@ -3,7 +3,6 @@
     "values": [
         "fzsd:system/install/install",
         "#fzsd:logger/install",
-        "#fzsd:api/install",
         "#fzsd:game_event/install"
     ]
 }

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

@@ -1,7 +1,6 @@
 {
     "replace": false,
     "values": [
-        "#fzsd:api/uninstall",
         "#fzsd:game_event/uninstall",
         "#fzsd:logger/uninstall",
         "fzsd:system/uninstall/uninstall"

pack.mcmeta

@@ -1,21 +1,6 @@
 {
     "pack": {
-        "description": "FZ Survival Datapack 3.1 | Author: Harvey_Husky",
+        "description": "FZ Survival Datapack 3.0 | Author: Harvey_Husky",
-        "pack_format": 15,
+        "pack_format": 10
-        "supported_formats": {
-            "min_inclusive": 15,
-            "max_inclusive": 26
-        }
-    },
-    "overlays": {
-        "entries": [
-            {
-                "formats": {
-                    "min_inclusive": 16,
-                    "max_inclusive": 26
-                },
-                "directory": "compat_16"
-            }
-        ]
     }
 }