Merge branch 'dev/3.1' of https://gitee.com/harvey-husky/fz-survival-datapack into dev/3.1

fix #IBJ6VX
update README.md.
2025-01-22 12:14:46 +08:00 · 2025-01-22 12:14:42 +08:00 · 2025-01-08 18:14:53 +00:00 · 2024-12-30 15:30:18 +08:00 · 2024-12-30 15:25:45 +08:00 · 2024-12-09 20:26:38 +08:00
63 changed files with 618 additions and 478 deletions
@@ -2,7 +2,9 @@

 为FZ服务器写的Minecraft生存辅助数据包

-[![数据包版本](https://img.shields.io/badge/正式版-3.1.7-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases) [![MC版本](https://img.shields.io/badge/Minecraft-1.20+-blue.svg)](https://minecraft.net/)
+
+[![数据包版本](https://img.shields.io/badge/正式版-3.1.12-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)

@@ -78,7 +80,6 @@
      - ***使用前请务必备份存档！请报告不符预期的结果***
      - ***使用前请务必备份存档！请报告不符预期的结果***
      - ***使用前请务必备份存档！请报告不符预期的结果***
-      - `updateFrom <version>`：用于从给定的数据包版本恢复计分板数据（需要测试！）
      - `recalculate`：重新计算所有计分板总分
      - `recalculate <scoreboardID>`：重新计算该计分板总分
      - `set <player> <scoreboardID> <score>`：设置该玩家该计分板的分数
@@ -13,7 +13,7 @@
                        "condition": "minecraft:location_check",
                        "predicate": {
                            "block": {
-                                "blocks": "#fzsd:liquid"
+                                "blocks": "#fzsd:placed_liquid_ignore"
                            }
                        }
                    }
@@ -16,7 +16,7 @@
                            "condition": "minecraft:location_check",
                            "predicate": {
                                "block": {
-                                    "blocks": "#fzsd:liquid"
+                                    "blocks": "#fzsd:placed_liquid_ignore"
                                }
                            }
                        }
@@ -0,0 +1,101 @@
+{
+    "condition": "minecraft:any_of",
+    "terms": [
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "type": "item",
+                "nbt": "{Item:{id:\"minecraft:minecart\"}}"
+            }
+        },
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "type": "item",
+                "nbt": "{Item:{id:\"minecraft:hopper_minecart\"}}"
+            }
+        },
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "type": "item",
+                "nbt": "{Item:{id:\"minecraft:chest_minecart\"}}"
+            }
+        },
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "type": "item",
+                "nbt": "{Item:{id:\"minecraft:furnace_minecart\"}}"
+            }
+        },
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "type": "item",
+                "nbt": "{Item:{id:\"minecraft:oak_boat\"}}"
+            }
+        },
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "type": "item",
+                "nbt": "{Item:{id:\"minecraft:birch_boat\"}}"
+            }
+        },
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "type": "item",
+                "nbt": "{Item:{id:\"minecraft:acacia_boat\"}}"
+            }
+        },
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "type": "item",
+                "nbt": "{Item:{id:\"minecraft:cherry_boat\"}}"
+            }
+        },
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "type": "item",
+                "nbt": "{Item:{id:\"minecraft:jungle_boat\"}}"
+            }
+        },
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "type": "item",
+                "nbt": "{Item:{id:\"minecraft:spruce_boat\"}}"
+            }
+        },
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "type": "item",
+                "nbt": "{Item:{id:\"minecraft:mangrove_boat\"}}"
+            }
+        },
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "type": "item",
+                "nbt": "{Item:{id:\"minecraft:bamboo_raft\"}}"
+            }
+        }
+    ]
+}
@@ -0,0 +1,25 @@
+{
+    "replace": false,
+    "values": [
+        "minecraft:stripped_acacia_log",
+        "minecraft:stripped_acacia_wood",
+        "minecraft:stripped_birch_log",
+        "minecraft:stripped_birch_wood",
+        "minecraft:stripped_crimson_hyphae",
+        "minecraft:stripped_crimson_stem",
+        "minecraft:stripped_dark_oak_log",
+        "minecraft:stripped_dark_oak_wood",
+        "minecraft:stripped_jungle_log",
+        "minecraft:stripped_jungle_wood",
+        "minecraft:stripped_oak_log",
+        "minecraft:stripped_oak_wood",
+        "minecraft:stripped_spruce_log",
+        "minecraft:stripped_spruce_wood",
+        "minecraft:stripped_warped_hyphae",
+        "minecraft:stripped_warped_stem",
+        "minecraft:stripped_cherry_log",
+        "minecraft:stripped_cherry_wood",
+        "minecraft:stripped_mangrove_log",
+        "minecraft:stripped_mangrove_wood"
+    ]
+}
@@ -0,0 +1,12 @@
+{
+    "replace": false,
+    "values": [
+        "minecraft:armor_stand",
+        "minecraft:boat",
+        "minecraft:shulker_bullet",
+        "minecraft:item_frame",
+        "minecraft:glow_item_frame",
+        "minecraft:painting",
+        "minecraft:end_crystal"
+    ]
+}
@@ -1,8 +1,11 @@
+tag @s add fzsd.admin
+
 tellraw @s {"text": "管理员页面：", "color": "red"}


-tellraw @s [{"text": "全局："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/reload"}, "hoverEvent": {"action": "show_text", "contents": {"text": "重载", "color": "yellow"}}}, {"text": "重载", "color": "yellow"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:install"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "安装：", "color": "dark_green"}, {"text": "仅安装上次卸载前已安装的模块", "color": "red"}]}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:uninstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "卸载：", "color": "dark_red"}, {"text": "将保留模块安装记录", "color": "red"}]}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:reinstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "重装：", "color": "gold"}, {"text": "可能可以修复一些奇怪问题，", "color": "white"}, {"text": "将保留模块安装记录", "color": "red"}]}}, {"text": "重装", "color": "gold"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_install"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度安装：", "color": "dark_green"}, {"text": "将安装所有模块", "color": "red"}]}}, {"text": "深度安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_uninstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度卸载：", "color": "dark_red"}, {"text": "将清除模块安装记录", "color": "red"}]}}, {"text": "深度卸载", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_reinstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度重装：", "color": "gold"}, {"text": "可能可以修复一些奇怪问题，", "color": "white"}, {"text": "将清除模块安装记录", "color": "red"}]}}, {"text": "深度重装", "color": "gold"}, {"text": "]"}]]]
+tellraw @s [{"text": "数据包："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/reload"}, "hoverEvent": {"action": "show_text", "contents": {"text": "重载", "color": "yellow"}}}, {"text": "重载", "color": "yellow"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:install"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "安装：", "color": "dark_green"}, {"text": "仅安装上次卸载前已安装的模块", "color": "red"}]}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:uninstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "卸载：", "color": "dark_red"}, {"text": "将保留模块安装记录", "color": "red"}]}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:reinstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "重装：", "color": "gold"}, {"text": "可能可以修复一些奇怪问题，", "color": "white"}, {"text": "将保留模块安装记录", "color": "red"}]}}, {"text": "重装", "color": "gold"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_install"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度安装：", "color": "dark_green"}, {"text": "将安装所有模块", "color": "red"}]}}, {"text": "深度安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_uninstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度卸载：", "color": "dark_red"}, {"text": "将清除模块安装记录", "color": "red"}]}}, {"text": "深度卸载", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_reinstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度重装：", "color": "gold"}, {"text": "可能可以修复一些奇怪问题，", "color": "white"}, {"text": "将清除模块安装记录", "color": "red"}]}}, {"text": "深度重装", "color": "gold"}, {"text": "]"}]]]

+tellraw @s [{"text": "假人前缀："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function admin.fzsd:module/fake_player_prefix/on"}, "hoverEvent": {"action": "show_text", "contents": {"text": "启用假人前缀", "color": "green"}}}, {"text": "启用", "color": "green"}, {"text": "]"}],[{"text": "[", "clickEvent": {"action": "run_command", "value": "/function admin.fzsd:module/fake_player_prefix/off"}, "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:logger/level/fine"}, "hoverEvent": {"action": "show_text", "contents": {"text": "详细", "color": "gray"}}}, {"text": "详细", "color": "gray"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function fzsd:logger/level/debug"}, "hoverEvent": {"action": "show_text", "contents": {"text": "调试", "color": "dark_aqua"}}}, {"text": "调试", "color": "dark_aqua"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function fzsd:logger/level/info"}, "hoverEvent": {"action": "show_text", "contents": {"text": "信息", "color": "green"}}}, {"text": "信息", "color": "green"}, {"text": "]"}]]]

@@ -14,27 +17,45 @@ tellraw @s [{"text": "- 名牌下方：", "color": "gray"}, [{"text": "", "color
 tellraw @s [{"text": "- 玩家列表内：", "color": "gray"}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function admin.fzsd:module/health/list/on"}, "hoverEvent": {"action": "show_text", "contents": {"text": "显示", "color": "dark_green"}}}, {"text": "显示", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function admin.fzsd:module/health/list/off"}, "hoverEvent": {"action": "show_text", "contents": {"text": "隐藏", "color": "dark_red"}}}, {"text": "隐藏", "color": "dark_red"}, {"text": "]"}]]]


-tellraw @s [{"text": "玩家位置："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/here/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/here/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
-
-
 tellraw @s [{"text": "交互器："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/interactor/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/interactor/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]


 tellraw @s [{"text": "登录消息："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/join_message/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/join_message/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]


+tellraw @s [{"text": "玩家位置："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/here/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/here/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm here set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm here"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]]
+
+
 tellraw @s [{"text": "上一死亡点："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_death/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_death/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm last_death set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm last_death"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]]


 tellraw @s [{"text": "上次穿出的下界传送门："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_nether_portal/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_nether_portal/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm last_nether_portal set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm last_nether_portal"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]]


 tellraw @s [{"text": "上一出生点："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_spawn_point/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_spawn_point/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm last_spawn_point set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm last_spawn_point"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]]


 tellraw @s [{"text": "计分板："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/scoreboard/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/scoreboard/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm scoreboard set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm scoreboard"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]]


 tellraw @s [{"text": "扫地机："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/sweeper/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/sweeper/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm sweeper set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm sweeper"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]]
+

 tellraw @s [{"text": "幻翼预警："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/phantom_warning/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/phantom_warning/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm phantom_warning set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm phantom_warning"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]]
+
+
+tellraw @s {"text": "已为您添加管理员标签“fzsd.admin”，使用“/tag <player> add fzsd.admin”为其他人添加“仅管理员”功能的使用权限", "color": "white"}
@@ -0,0 +1,3 @@
+team modify fzsd.module.scoreboard.fake prefix ""
+team modify fzsd.module.scoreboard.shadow prefix ""
+data modify storage fzsd:config fzsd.module.scoreboard.fake_player_prefix set value false
@@ -0,0 +1,3 @@
+team modify fzsd.module.scoreboard.fake prefix "假的"
+team modify fzsd.module.scoreboard.shadow prefix "挂机"
+data modify storage fzsd:config fzsd.module.scoreboard.fake_player_prefix set value true
@@ -1,8 +1,11 @@
+tag @s add fzsd.admin
+
 tellraw @s {"text": "管理员页面：", "color": "red"}


-tellraw @s [{"text": "全局："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/reload"}, "hoverEvent": {"action": "show_text", "contents": {"text": "重载", "color": "yellow"}}}, {"text": "重载", "color": "yellow"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:install"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "安装：", "color": "dark_green"}, {"text": "仅安装上次卸载前已安装的模块", "color": "red"}]}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:uninstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "卸载：", "color": "dark_red"}, {"text": "将保留模块安装记录", "color": "red"}]}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:reinstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "重装：", "color": "gold"}, {"text": "可能可以修复一些奇怪问题，", "color": "white"}, {"text": "将保留模块安装记录", "color": "red"}]}}, {"text": "重装", "color": "gold"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_install"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度安装：", "color": "dark_green"}, {"text": "将安装所有模块", "color": "red"}]}}, {"text": "深度安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_uninstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度卸载：", "color": "dark_red"}, {"text": "将清除模块安装记录", "color": "red"}]}}, {"text": "深度卸载", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_reinstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度重装：", "color": "gold"}, {"text": "可能可以修复一些奇怪问题，", "color": "white"}, {"text": "将清除模块安装记录", "color": "red"}]}}, {"text": "深度重装", "color": "gold"}, {"text": "]"}]]]
+tellraw @s [{"text": "数据包："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/reload"}, "hoverEvent": {"action": "show_text", "contents": {"text": "重载", "color": "yellow"}}}, {"text": "重载", "color": "yellow"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:install"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "安装：", "color": "dark_green"}, {"text": "仅安装上次卸载前已安装的模块", "color": "red"}]}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:uninstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "卸载：", "color": "dark_red"}, {"text": "将保留模块安装记录", "color": "red"}]}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:reinstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "重装：", "color": "gold"}, {"text": "可能可以修复一些奇怪问题，", "color": "white"}, {"text": "将保留模块安装记录", "color": "red"}]}}, {"text": "重装", "color": "gold"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_install"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度安装：", "color": "dark_green"}, {"text": "将安装所有模块", "color": "red"}]}}, {"text": "深度安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_uninstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度卸载：", "color": "dark_red"}, {"text": "将清除模块安装记录", "color": "red"}]}}, {"text": "深度卸载", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:deep_reinstall"}, "hoverEvent": {"action": "show_text", "contents": [{"text": "深度重装：", "color": "gold"}, {"text": "可能可以修复一些奇怪问题，", "color": "white"}, {"text": "将清除模块安装记录", "color": "red"}]}}, {"text": "深度重装", "color": "gold"}, {"text": "]"}]]]

+tellraw @s [{"text": "假人前缀："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function admin.fzsd:module/fake_player_prefix/on"}, "hoverEvent": {"action": "show_text", "contents": {"text": "启用假人前缀", "color": "green"}}}, {"text": "启用", "color": "green"}, {"text": "]"}],[{"text": "[", "clickEvent": {"action": "run_command", "value": "/function admin.fzsd:module/fake_player_prefix/off"}, "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:logger/level/fine"}, "hoverEvent": {"action": "show_text", "contents": {"text": "详细", "color": "gray"}}}, {"text": "详细", "color": "gray"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function fzsd:logger/level/debug"}, "hoverEvent": {"action": "show_text", "contents": {"text": "调试", "color": "dark_aqua"}}}, {"text": "调试", "color": "dark_aqua"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function fzsd:logger/level/info"}, "hoverEvent": {"action": "show_text", "contents": {"text": "信息", "color": "green"}}}, {"text": "信息", "color": "green"}, {"text": "]"}]]]

@@ -14,27 +17,45 @@ tellraw @s [{"text": "- 名牌下方：", "color": "gray"}, [{"text": "", "color
 tellraw @s [{"text": "- 玩家列表内：", "color": "gray"}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function admin.fzsd:module/health/list/on"}, "hoverEvent": {"action": "show_text", "contents": {"text": "显示", "color": "dark_green"}}}, {"text": "显示", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function admin.fzsd:module/health/list/off"}, "hoverEvent": {"action": "show_text", "contents": {"text": "隐藏", "color": "dark_red"}}}, {"text": "隐藏", "color": "dark_red"}, {"text": "]"}]]]


-tellraw @s [{"text": "玩家位置："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/here/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/here/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
-
-
 tellraw @s [{"text": "交互器："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/interactor/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/interactor/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]


 tellraw @s [{"text": "登录消息："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/join_message/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/join_message/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]


+tellraw @s [{"text": "玩家位置："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/here/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/here/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm here set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm here"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]]
+
+
 tellraw @s [{"text": "上一死亡点："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_death/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_death/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm last_death set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm last_death"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]]


 tellraw @s [{"text": "上次穿出的下界传送门："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_nether_portal/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_nether_portal/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm last_nether_portal set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm last_nether_portal"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]]


 tellraw @s [{"text": "上一出生点："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_spawn_point/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_spawn_point/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm last_spawn_point set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm last_spawn_point"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]]


 tellraw @s [{"text": "计分板："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/scoreboard/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/scoreboard/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm scoreboard set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm scoreboard"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]]


 tellraw @s [{"text": "扫地机："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/sweeper/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/sweeper/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm sweeper set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm sweeper"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]]
+

 tellraw @s [{"text": "幻翼预警："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/phantom_warning/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/phantom_warning/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
+## [权限管理] 
+tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm phantom_warning set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm phantom_warning"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]]
+
+
+tellraw @s {"text": "已为您添加管理员标签“fzsd.admin”，使用“/tag <player> add fzsd.admin”为其他人添加“仅管理员”功能的使用权限", "color": "white"}
@@ -0,0 +1,3 @@
+team modify fzsd.module.scoreboard.fake prefix ""
+team modify fzsd.module.scoreboard.shadow prefix ""
+data modify storage fzsd:config fzsd.module.scoreboard.fake_player_prefix set value true
@@ -0,0 +1,3 @@
+team modify fzsd.module.scoreboard.fake prefix ""
+team modify fzsd.module.scoreboard.shadow prefix ""
+data modify storage fzsd:config fzsd.module.scoreboard.fake_player_prefix set value false
@@ -21,10 +21,7 @@
                            }
                        }
                    }
-                ],
-                "killing_blow": {
-                    "bypasses_invulnerability": false
-                }
+                ]
            }
        }
    },
@@ -13,7 +13,7 @@
                        "condition": "minecraft:location_check",
                        "predicate": {
                            "block": {
-                                "blocks": "#fzsd:liquid"
+                                "blocks": "#fzsd:placed_liquid_ignore"
                            }
                        }
                    }
@@ -16,7 +16,7 @@
                            "condition": "minecraft:location_check",
                            "predicate": {
                                "block": {
-                                    "blocks": "#fzsd:liquid"
+                                    "blocks": "#fzsd:placed_liquid_ignore"
                                }
                            }
                        }
@@ -13,7 +13,7 @@
                        "condition": "minecraft:location_check",
                        "predicate": {
                            "block": {
-                                "tag": "fzsd:liquid"
+                                "tag": "fzsd:placed_liquid_ignore"
                            }
                        }
                    }
@@ -16,7 +16,7 @@
                            "condition": "minecraft:location_check",
                            "predicate": {
                                "block": {
-                                    "tag": "fzsd:liquid"
+                                    "tag": "fzsd:placed_liquid_ignore"
                                }
                            }
                        }
@@ -1,4 +1,4 @@
-execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.1.9-beta.2'}}
+execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.1.14'}}
 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
@@ -1 +1,4 @@
-execute if data storage fzsd:install fzsd.module{last_nether_portal: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 -2000"}},{"text": "私信", "color": "aqua"},{"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：所有人"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2010"}},{"text": "广播", "color": "aqua"},{"text": "]"}]]
+execute if data storage fzsd:install fzsd.module{last_nether_portal:1b} unless data storage fzsd:perm {here: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 -2000"}},{"text": "私信", "color": "aqua"},{"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：所有人"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2010"}},{"text": "广播", "color": "aqua"},{"text": "]"}]]
+
+# 仅管理员
+execute if data storage fzsd:install fzsd.module{last_nether_portal:1b} if data storage fzsd:perm {here:1} if entity @s[tag=fzsd.admin] run tellraw @s [{"text": "获取位置："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2000"}},{"text": "私信", "color": "aqua"},{"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：所有人"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2010"}},{"text": "广播", "color": "aqua"},{"text": "]"}]]
@@ -1,2 +1,4 @@
-execute if score @s fzsd.module.interactor.trigger matches -2000 run function #fzsd:module/here/private_message
-execute if score @s fzsd.module.interactor.trigger matches -2010 run function #fzsd:module/here/global_message
+execute if score @s fzsd.module.interactor.trigger matches -2000 if data storage fzsd:perm {here:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/here/private_message
+execute if score @s fzsd.module.interactor.trigger matches -2000 unless data storage fzsd:perm {here:1} run function #fzsd:module/here/private_message
+execute if score @s fzsd.module.interactor.trigger matches -2010 if data storage fzsd:perm {here:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/here/global_message
+execute if score @s fzsd.module.interactor.trigger matches -2010 unless data storage fzsd:perm {here:1} run function #fzsd:module/here/global_message
@@ -1 +1,2 @@
-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": "]"}]]
+execute if data storage fzsd:install fzsd.module{last_death:1b} if data storage fzsd:perm {last_death:1} if entity @s[tag=fzsd.admin] 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": "]"}]]
+execute if data storage fzsd:install fzsd.module{last_death:1b} unless data storage fzsd:perm {last_death: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 -2100"}},{"text": "私信", "color": "aqua"},{"text": "]"}]]
@@ -1 +1,2 @@
-execute if score @s fzsd.module.interactor.trigger matches -2100 run function #fzsd:module/last_death/private_message
+execute if score @s fzsd.module.interactor.trigger matches -2100 if data storage fzsd:perm {last_death:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/last_death/private_message
+execute if score @s fzsd.module.interactor.trigger matches -2100 unless data storage fzsd:perm {last_death:1} run function #fzsd:module/last_death/private_message
@@ -1 +1,2 @@
-execute if data storage fzsd:install fzsd.module{last_nether_portal: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 -2200"}},{"text": "私信", "color": "aqua"},{"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：所有人"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2210"}},{"text": "广播", "color": "aqua"},{"text": "]"}]]
+execute if data storage fzsd:install fzsd.module{last_nether_portal:1b} if data storage fzsd:perm {last_nether_portal:1} if entity @s[tag=fzsd.admin] run tellraw @s [{"text": "获取上次穿出的下界传送门："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2200"}},{"text": "私信", "color": "aqua"},{"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：所有人"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2210"}},{"text": "广播", "color": "aqua"},{"text": "]"}]]
+execute if data storage fzsd:install fzsd.module{last_nether_portal:1b} unless data storage fzsd:perm {last_nether_portal: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 -2200"}},{"text": "私信", "color": "aqua"},{"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：所有人"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2210"}},{"text": "广播", "color": "aqua"},{"text": "]"}]]
@@ -1,2 +1,4 @@
-execute if score @s fzsd.module.interactor.trigger matches -2200 run function #fzsd:module/last_nether_portal/private_message
-execute if score @s fzsd.module.interactor.trigger matches -2210 run function #fzsd:module/last_nether_portal/global_message
+execute if score @s fzsd.module.interactor.trigger matches -2200 if data storage fzsd:perm {last_nether_portal:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/last_nether_portal/private_message
+execute if score @s fzsd.module.interactor.trigger matches -2200 unless data storage fzsd:perm {last_nether_portal:1} run function #fzsd:module/last_nether_portal/private_message
+execute if score @s fzsd.module.interactor.trigger matches -2210 if data storage fzsd:perm {last_nether_portal:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/last_nether_portal/global_message
+execute if score @s fzsd.module.interactor.trigger matches -2210 unless data storage fzsd:perm {last_nether_portal:1} run function #fzsd:module/last_nether_portal/global_message
@@ -1 +1,2 @@
-execute if data storage fzsd:install fzsd.module{last_spawn_point: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 -2300"}},{"text": "私信", "color": "aqua"},{"text": "]"}]]
+execute if data storage fzsd:install fzsd.module{last_spawn_point:1b} if data storage fzsd:perm {last_spawn_point:1} if entity @s[tag=fzsd.admin] run tellraw @s [{"text": "获取上一出生点："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2300"}},{"text": "私信", "color": "aqua"},{"text": "]"}]]
+execute if data storage fzsd:install fzsd.module{last_spawn_point:1b} unless data storage fzsd:perm {last_spawn_point: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 -2300"}},{"text": "私信", "color": "aqua"},{"text": "]"}]]
@@ -1 +1,2 @@
-execute if score @s fzsd.module.interactor.trigger matches -2300 run function #fzsd:module/last_spawn_point/private_message
+execute if score @s fzsd.module.interactor.trigger matches -2300 if data storage fzsd:perm {last_spawn_point:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/last_spawn_point/private_message
+execute if score @s fzsd.module.interactor.trigger matches -2300 unless data storage fzsd:perm {last_spawn_point:1} run function #fzsd:module/last_spawn_point/private_message
@@ -1 +1,2 @@
-execute if data storage fzsd:install fzsd.module{phantom_warning:1b} run function fzsd:module/phantom_warning/interactor/display_0
+execute if data storage fzsd:install fzsd.module{phantom_warning:1b} if data storage fzsd:perm {phantom_warning:1} if entity @s[tag=fzsd.admin] run function fzsd:module/phantom_warning/interactor/display_0
+execute if data storage fzsd:install fzsd.module{phantom_warning:1b} unless data storage fzsd:perm {phantom_warning:1} run function fzsd:module/phantom_warning/interactor/display_0
@@ -1,2 +1,4 @@
-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
+execute if score @s fzsd.module.interactor.trigger matches 4000 if data storage fzsd:perm {phantom_warning:1} if entity @s[tag=fzsd.admin] run tag @s add fzsd.ignore_phantom_warning
+execute if score @s fzsd.module.interactor.trigger matches 4000 unless data storage fzsd:perm {phantom_warning:1} run tag @s add fzsd.ignore_phantom_warning
+execute if score @s fzsd.module.interactor.trigger matches 4001 if data storage fzsd:perm {phantom_warning:1} if entity @s[tag=fzsd.admin] run tag @s remove fzsd.ignore_phantom_warning
+execute if score @s fzsd.module.interactor.trigger matches 4001 unless data storage fzsd:perm {phantom_warning:1} run tag @s remove fzsd.ignore_phantom_warning
@@ -1,6 +1,7 @@
 # 调用者：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 ..600 if data storage fzsd:perm {phantom_warning:1} if entity @s[tag=fzsd.admin] run tellraw @s [{"nbt": "fzsd.level.alert", "interpret": true, "storage": "fzsd:logger"}, {"text": "今晚可能会生成幻翼，建议睡觉！"}]
+execute if score fzsd.logger.level fzsd.variable.integer matches ..600 unless data storage fzsd:perm {phantom_warning:1} 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": "发送幻翼预警"}]
+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": "发送幻翼预警"}]
@@ -0,0 +1 @@
+execute if data storage fzsd:module fzsd.module.scoreboard.config{trade_count_includes_piglin:1b} run function fzsd:module/scoreboard/assign/scoreboard/trade_count
@@ -53,8 +53,8 @@ team add fzsd.module.scoreboard.display.trade_count

 team add fzsd.module.scoreboard.fake
 team add fzsd.module.scoreboard.shadow
-team modify fzsd.module.scoreboard.fake prefix {"text": "假的"}
-team modify fzsd.module.scoreboard.shadow prefix {"text": "挂机"}
+execute unless data storage fzsd:config fzsd.module.scoreboard{fake_player_prefix:false} run team modify fzsd.module.scoreboard.fake prefix {"text": "假的"}
+execute unless data storage fzsd:config fzsd.module.scoreboard{fake_player_prefix:false} run team modify fzsd.module.scoreboard.shadow prefix {"text": "挂机"}

 ## 标记为已安装
 data modify storage fzsd:install fzsd.module.scoreboard set value 1b
@@ -1,7 +1,10 @@
 # 调用者：#fzsd:module/scoreboard/interactor/display

-execute if data storage fzsd:install fzsd.module{scoreboard:1b} run tellraw @s {"text": "计分板："}
+execute if data storage fzsd:install fzsd.module{scoreboard:1b} if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run tellraw @s {"text": "计分板："}
+execute if data storage fzsd:install fzsd.module{scoreboard:1b} unless data storage fzsd:perm {scoreboard:1} run tellraw @s {"text": "计分板："}

-execute if data storage fzsd:install fzsd.module{scoreboard:1b} run tellraw @s [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "查询我的分数", "color": "#F4A460"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1120"}}, {"text": "查询我的分数", "color": "#F4A460"}, {"text": "] "}]
+execute if data storage fzsd:install fzsd.module{scoreboard:1b} if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run tellraw @s [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "查询我的分数", "color": "#F4A460"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1120"}}, {"text": "查询我的分数", "color": "#F4A460"}, {"text": "] "}]
+execute if data storage fzsd:install fzsd.module{scoreboard:1b} unless data storage fzsd:perm {scoreboard:1} run tellraw @s [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "查询我的分数", "color": "#F4A460"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1120"}}, {"text": "查询我的分数", "color": "#F4A460"}, {"text": "] "}]

-execute if data storage fzsd:install fzsd.module{scoreboard:1b} run tellraw @s [[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1000"}}, {"text": "关", "color": "red"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1010"}}, {"nbt": "fzsd.module.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1020"}}, {"nbt": "fzsd.module.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1030"}}, {"nbt": "fzsd.module.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1040"}}, {"nbt": "fzsd.module.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1050"}}, {"nbt": "fzsd.module.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1060"}}, {"nbt": "fzsd.module.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1070"}}, {"nbt": "fzsd.module.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1080"}}, {"nbt": "fzsd.module.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1090"}}, {"nbt": "fzsd.module.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1100"}}, {"nbt": "fzsd.module.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1110"}}, {"nbt": "fzsd.module.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}]]
+execute if data storage fzsd:install fzsd.module{scoreboard:1b} if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run tellraw @s [[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1000"}}, {"text": "关", "color": "red"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1010"}}, {"nbt": "fzsd.module.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1020"}}, {"nbt": "fzsd.module.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1030"}}, {"nbt": "fzsd.module.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1040"}}, {"nbt": "fzsd.module.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1050"}}, {"nbt": "fzsd.module.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1060"}}, {"nbt": "fzsd.module.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1070"}}, {"nbt": "fzsd.module.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1080"}}, {"nbt": "fzsd.module.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1090"}}, {"nbt": "fzsd.module.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1100"}}, {"nbt": "fzsd.module.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1110"}}, {"nbt": "fzsd.module.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}]]
+execute if data storage fzsd:install fzsd.module{scoreboard:1b} unless data storage fzsd:perm {scoreboard:1} run tellraw @s [[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1000"}}, {"text": "关", "color": "red"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1010"}}, {"nbt": "fzsd.module.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1020"}}, {"nbt": "fzsd.module.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1030"}}, {"nbt": "fzsd.module.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1040"}}, {"nbt": "fzsd.module.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1050"}}, {"nbt": "fzsd.module.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1060"}}, {"nbt": "fzsd.module.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1070"}}, {"nbt": "fzsd.module.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1080"}}, {"nbt": "fzsd.module.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1090"}}, {"nbt": "fzsd.module.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1100"}}, {"nbt": "fzsd.module.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1110"}}, {"nbt": "fzsd.module.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}]]
@@ -1,13 +1,26 @@
-execute if score @s fzsd.module.interactor.trigger matches -1000 run function #fzsd:module/scoreboard/interactor/subscribe/off
-execute if score @s fzsd.module.interactor.trigger matches -1010 run function #fzsd:module/scoreboard/interactor/subscribe/carousel
-execute if score @s fzsd.module.interactor.trigger matches -1020 run function #fzsd:module/scoreboard/interactor/subscribe/general
-execute if score @s fzsd.module.interactor.trigger matches -1030 run function #fzsd:module/scoreboard/interactor/subscribe/activation
-execute if score @s fzsd.module.interactor.trigger matches -1040 run function #fzsd:module/scoreboard/interactor/subscribe/aviating_distance
-execute if score @s fzsd.module.interactor.trigger matches -1050 run function #fzsd:module/scoreboard/interactor/subscribe/damage_taken
-execute if score @s fzsd.module.interactor.trigger matches -1060 run function #fzsd:module/scoreboard/interactor/subscribe/death_count
-execute if score @s fzsd.module.interactor.trigger matches -1070 run function #fzsd:module/scoreboard/interactor/subscribe/dig_count
-execute if score @s fzsd.module.interactor.trigger matches -1080 run function #fzsd:module/scoreboard/interactor/subscribe/fishing_count
-execute if score @s fzsd.module.interactor.trigger matches -1090 run function #fzsd:module/scoreboard/interactor/subscribe/kill_count
-execute if score @s fzsd.module.interactor.trigger matches -1100 run function #fzsd:module/scoreboard/interactor/subscribe/trade_count
-execute if score @s fzsd.module.interactor.trigger matches -1110 run function #fzsd:module/scoreboard/interactor/subscribe/placement_count
-execute if score @s fzsd.module.interactor.trigger matches -1120 run function #fzsd:module/scoreboard/interactor/show_my_scores
+execute if score @s fzsd.module.interactor.trigger matches -1000 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/off
+execute if score @s fzsd.module.interactor.trigger matches -1000 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/off
+execute if score @s fzsd.module.interactor.trigger matches -1010 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/carousel
+execute if score @s fzsd.module.interactor.trigger matches -1010 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/carousel
+execute if score @s fzsd.module.interactor.trigger matches -1020 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/general
+execute if score @s fzsd.module.interactor.trigger matches -1020 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/general
+execute if score @s fzsd.module.interactor.trigger matches -1030 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/activation
+execute if score @s fzsd.module.interactor.trigger matches -1030 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/activation
+execute if score @s fzsd.module.interactor.trigger matches -1040 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/aviating_distance
+execute if score @s fzsd.module.interactor.trigger matches -1040 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/aviating_distance
+execute if score @s fzsd.module.interactor.trigger matches -1050 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/damage_taken
+execute if score @s fzsd.module.interactor.trigger matches -1050 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/damage_taken
+execute if score @s fzsd.module.interactor.trigger matches -1060 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/death_count
+execute if score @s fzsd.module.interactor.trigger matches -1060 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/death_count
+execute if score @s fzsd.module.interactor.trigger matches -1070 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/dig_count
+execute if score @s fzsd.module.interactor.trigger matches -1070 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/dig_count
+execute if score @s fzsd.module.interactor.trigger matches -1080 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/fishing_count
+execute if score @s fzsd.module.interactor.trigger matches -1080 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/fishing_count
+execute if score @s fzsd.module.interactor.trigger matches -1090 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/kill_count
+execute if score @s fzsd.module.interactor.trigger matches -1090 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/kill_count
+execute if score @s fzsd.module.interactor.trigger matches -1100 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/trade_count
+execute if score @s fzsd.module.interactor.trigger matches -1100 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/trade_count
+execute if score @s fzsd.module.interactor.trigger matches -1110 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/placement_count
+execute if score @s fzsd.module.interactor.trigger matches -1110 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/placement_count
+execute if score @s fzsd.module.interactor.trigger matches -1120 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/show_my_scores
+execute if score @s fzsd.module.interactor.trigger matches -1120 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/show_my_scores
@@ -1,9 +1 @@
-execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.activation", "name": "@s"}}]]
-execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.aviating_distance", "name": "@s"}}]]
-execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.damage_taken", "name": "@s"}}]]
-execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.death_count", "name": "@s"}}]]
-execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.dig_count", "name": "@s"}}]]
-execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.fishing_count", "name": "@s"}}]]
-execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.kill_count", "name": "@s"}}]]
-execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.trade_count", "name": "@s"}}]]
-execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.placement_count", "name": "@s"}}]]
+execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"selector": "@s"}," 的分数：",{"text": "[","color": "dark_gray"},{"nbt": "fzsd.module.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.activation", "name": "@s"}}],{"text": "] [","color": "dark_gray"}, {"nbt": "fzsd.module.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.aviating_distance", "name": "@s"}}],{"text": "] [","color": "dark_gray"}, {"nbt": "fzsd.module.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.damage_taken", "name": "@s"}}],{"text": "] [","color": "dark_gray"}, {"nbt": "fzsd.module.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.death_count", "name": "@s"}}],{"text": "] [","color": "dark_gray"}, {"nbt": "fzsd.module.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.dig_count", "name": "@s"}}],{"text": "] [","color": "dark_gray"}, {"nbt": "fzsd.module.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.fishing_count", "name": "@s"}}],{"text": "] [","color": "dark_gray"}, {"nbt": "fzsd.module.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.kill_count", "name": "@s"}}],{"text": "] [","color": "dark_gray"}, {"nbt": "fzsd.module.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.trade_count", "name": "@s"}}],{"text": "] [","color": "dark_gray"}, {"nbt": "fzsd.module.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.placement_count", "name": "@s"}}],{"text": "]","color": "dark_gray"}]
@@ -9,4 +9,5 @@ tellraw @s[tag=fzsd.ignore_sweeper_sound] [{"text": "- 音效："}, [{"text": "[
 tellraw @s[tag=!fzsd.ignore_sweeper_message] [{"text": "- 聊天栏："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "点击关闭"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set 3600"}}, {"text": "已启用", "color": "green"}, {"text": "]"}]]
 tellraw @s[tag=fzsd.ignore_sweeper_message] [{"text": "- 聊天栏："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "点击启用"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set 3601"}}, {"text": "已关闭", "color": "red"}, {"text": "]"}]]

-tellraw @s [{"text": "- 开关："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3000"}}, {"text": "关", "color": "red"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "清理一次", "color": "aqua"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3300"}}, {"text": "清理一次", "color": "aqua"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "]"}]]
+execute if data storage fzsd:perm {sweeper:1} if entity @s[tag=fzsd.admin] run tellraw @s [{"text": "- 开关："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3000"}}, {"text": "关", "color": "red"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "清理一次", "color": "aqua"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3300"}}, {"text": "清理一次", "color": "aqua"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "]"}]]
+execute unless data storage fzsd:perm {sweeper:1} run tellraw @s [{"text": "- 开关："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3000"}}, {"text": "关", "color": "red"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "清理一次", "color": "aqua"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3300"}}, {"text": "清理一次", "color": "aqua"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "]"}]]
@@ -1,9 +1,18 @@
 execute if score @s fzsd.module.interactor.trigger matches 3400 run tag @s add fzsd.ignore_sweeper_bossbar
+execute if score @s fzsd.module.interactor.trigger matches 3400 run tag @s add fzsd.ignore_sweeper_bossbar
 execute if score @s fzsd.module.interactor.trigger matches 3401 run tag @s remove fzsd.ignore_sweeper_bossbar
+execute if score @s fzsd.module.interactor.trigger matches 3401 run tag @s remove fzsd.ignore_sweeper_bossbar
+execute if score @s fzsd.module.interactor.trigger matches 3500 run tag @s add fzsd.ignore_sweeper_sound
 execute if score @s fzsd.module.interactor.trigger matches 3500 run tag @s add fzsd.ignore_sweeper_sound
 execute if score @s fzsd.module.interactor.trigger matches 3501 run tag @s remove fzsd.ignore_sweeper_sound
+execute if score @s fzsd.module.interactor.trigger matches 3501 run tag @s remove fzsd.ignore_sweeper_sound
+execute if score @s fzsd.module.interactor.trigger matches 3600 run tag @s add fzsd.ignore_sweeper_message
 execute if score @s fzsd.module.interactor.trigger matches 3600 run tag @s add fzsd.ignore_sweeper_message
 execute if score @s fzsd.module.interactor.trigger matches 3601 run tag @s remove fzsd.ignore_sweeper_message
-execute if score @s fzsd.module.interactor.trigger matches -3300 run function #fzsd:module/sweeper/sweep
-execute if score @s fzsd.module.interactor.trigger matches -3000 run function #fzsd:module/sweeper/stop_loop
-execute if score @s fzsd.module.interactor.trigger matches -3240..-3010 run function #fzsd:module/sweeper/start_loop
+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 if data storage fzsd:perm {sweeper:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/sweeper/sweep
+execute if score @s fzsd.module.interactor.trigger matches -3300 unless data storage fzsd:perm {sweeper:1} run function #fzsd:module/sweeper/sweep
+execute if score @s fzsd.module.interactor.trigger matches -3000 if data storage fzsd:perm {sweeper:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/sweeper/stop_loop
+execute if score @s fzsd.module.interactor.trigger matches -3000 unless data storage fzsd:perm {sweeper:1} run function #fzsd:module/sweeper/stop_loop
+execute if score @s fzsd.module.interactor.trigger matches -3240..-3010 if data storage fzsd:perm {sweeper:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/sweeper/start_loop
+execute if score @s fzsd.module.interactor.trigger matches -3240..-3010 unless data storage fzsd:perm {sweeper:1} run function #fzsd:module/sweeper/start_loop
@@ -1,4 +1,4 @@
-execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.1.9-alpha.1'}}
+execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.1.14'}}
 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
@@ -1 +1,4 @@
-execute if data storage fzsd:install fzsd.module{last_nether_portal: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 -2000"}},{"text": "私信", "color": "aqua"},{"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：所有人"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2010"}},{"text": "广播", "color": "aqua"},{"text": "]"}]]
+execute if data storage fzsd:install fzsd.module{last_nether_portal:1b} unless data storage fzsd:perm {here: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 -2000"}},{"text": "私信", "color": "aqua"},{"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：所有人"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2010"}},{"text": "广播", "color": "aqua"},{"text": "]"}]]
+
+# 仅管理员
+execute if data storage fzsd:install fzsd.module{last_nether_portal:1b} if data storage fzsd:perm {here:1} if entity @s[tag=fzsd.admin] run tellraw @s [{"text": "获取位置："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2000"}},{"text": "私信", "color": "aqua"},{"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：所有人"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2010"}},{"text": "广播", "color": "aqua"},{"text": "]"}]]
@@ -1,2 +1,4 @@
-execute if score @s fzsd.module.interactor.trigger matches -2000 run function #fzsd:module/here/private_message
-execute if score @s fzsd.module.interactor.trigger matches -2010 run function #fzsd:module/here/global_message
+execute if score @s fzsd.module.interactor.trigger matches -2000 if data storage fzsd:perm {here:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/here/private_message
+execute if score @s fzsd.module.interactor.trigger matches -2000 unless data storage fzsd:perm {here:1} run function #fzsd:module/here/private_message
+execute if score @s fzsd.module.interactor.trigger matches -2010 if data storage fzsd:perm {here:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/here/global_message
+execute if score @s fzsd.module.interactor.trigger matches -2010 unless data storage fzsd:perm {here:1} run function #fzsd:module/here/global_message
@@ -1 +1,2 @@
-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": "]"}]]
+execute if data storage fzsd:install fzsd.module{last_death:1b} if data storage fzsd:perm {last_death:1} if entity @s[tag=fzsd.admin] 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": "]"}]]
+execute if data storage fzsd:install fzsd.module{last_death:1b} unless data storage fzsd:perm {last_death: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 -2100"}},{"text": "私信", "color": "aqua"},{"text": "]"}]]
@@ -1 +1,2 @@
-execute if score @s fzsd.module.interactor.trigger matches -2100 run function #fzsd:module/last_death/private_message
+execute if score @s fzsd.module.interactor.trigger matches -2100 if data storage fzsd:perm {last_death:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/last_death/private_message
+execute if score @s fzsd.module.interactor.trigger matches -2100 unless data storage fzsd:perm {last_death:1} run function #fzsd:module/last_death/private_message
@@ -1 +1,2 @@
-execute if data storage fzsd:install fzsd.module{last_nether_portal: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 -2200"}},{"text": "私信", "color": "aqua"},{"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：所有人"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2210"}},{"text": "广播", "color": "aqua"},{"text": "]"}]]
+execute if data storage fzsd:install fzsd.module{last_nether_portal:1b} if data storage fzsd:perm {last_nether_portal:1} if entity @s[tag=fzsd.admin] run tellraw @s [{"text": "获取上次穿出的下界传送门："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2200"}},{"text": "私信", "color": "aqua"},{"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：所有人"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2210"}},{"text": "广播", "color": "aqua"},{"text": "]"}]]
+execute if data storage fzsd:install fzsd.module{last_nether_portal:1b} unless data storage fzsd:perm {last_nether_portal: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 -2200"}},{"text": "私信", "color": "aqua"},{"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：所有人"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2210"}},{"text": "广播", "color": "aqua"},{"text": "]"}]]
@@ -1,2 +1,4 @@
-execute if score @s fzsd.module.interactor.trigger matches -2200 run function #fzsd:module/last_nether_portal/private_message
-execute if score @s fzsd.module.interactor.trigger matches -2210 run function #fzsd:module/last_nether_portal/global_message
+execute if score @s fzsd.module.interactor.trigger matches -2200 if data storage fzsd:perm {last_nether_portal:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/last_nether_portal/private_message
+execute if score @s fzsd.module.interactor.trigger matches -2200 unless data storage fzsd:perm {last_nether_portal:1} run function #fzsd:module/last_nether_portal/private_message
+execute if score @s fzsd.module.interactor.trigger matches -2210 if data storage fzsd:perm {last_nether_portal:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/last_nether_portal/global_message
+execute if score @s fzsd.module.interactor.trigger matches -2210 unless data storage fzsd:perm {last_nether_portal:1} run function #fzsd:module/last_nether_portal/global_message
@@ -1 +1,2 @@
-execute if data storage fzsd:install fzsd.module{last_spawn_point: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 -2300"}},{"text": "私信", "color": "aqua"},{"text": "]"}]]
+execute if data storage fzsd:install fzsd.module{last_spawn_point:1b} if data storage fzsd:perm {last_spawn_point:1} if entity @s[tag=fzsd.admin] run tellraw @s [{"text": "获取上一出生点："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2300"}},{"text": "私信", "color": "aqua"},{"text": "]"}]]
+execute if data storage fzsd:install fzsd.module{last_spawn_point:1b} unless data storage fzsd:perm {last_spawn_point: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 -2300"}},{"text": "私信", "color": "aqua"},{"text": "]"}]]
@@ -1 +1,2 @@
-execute if score @s fzsd.module.interactor.trigger matches -2300 run function #fzsd:module/last_spawn_point/private_message
+execute if score @s fzsd.module.interactor.trigger matches -2300 if data storage fzsd:perm {last_spawn_point:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/last_spawn_point/private_message
+execute if score @s fzsd.module.interactor.trigger matches -2300 unless data storage fzsd:perm {last_spawn_point:1} run function #fzsd:module/last_spawn_point/private_message
@@ -1 +1,2 @@
-execute if data storage fzsd:install fzsd.module{phantom_warning:1b} run function fzsd:module/phantom_warning/interactor/display_0
+execute if data storage fzsd:install fzsd.module{phantom_warning:1b} if data storage fzsd:perm {phantom_warning:1} if entity @s[tag=fzsd.admin] run function fzsd:module/phantom_warning/interactor/display_0
+execute if data storage fzsd:install fzsd.module{phantom_warning:1b} unless data storage fzsd:perm {phantom_warning:1} run function fzsd:module/phantom_warning/interactor/display_0
@@ -1,2 +1,4 @@
-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
+execute if score @s fzsd.module.interactor.trigger matches 4000 if data storage fzsd:perm {phantom_warning:1} if entity @s[tag=fzsd.admin] run tag @s add fzsd.ignore_phantom_warning
+execute if score @s fzsd.module.interactor.trigger matches 4000 unless data storage fzsd:perm {phantom_warning:1} run tag @s add fzsd.ignore_phantom_warning
+execute if score @s fzsd.module.interactor.trigger matches 4001 if data storage fzsd:perm {phantom_warning:1} if entity @s[tag=fzsd.admin] run tag @s remove fzsd.ignore_phantom_warning
+execute if score @s fzsd.module.interactor.trigger matches 4001 unless data storage fzsd:perm {phantom_warning:1} run tag @s remove fzsd.ignore_phantom_warning
@@ -1,6 +1,7 @@
 # 调用者：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 ..600 if data storage fzsd:perm {phantom_warning:1} if entity @s[tag=fzsd.admin] run tellraw @s [{"nbt": "fzsd.level.alert", "interpret": true, "storage": "fzsd:logger"}, {"text": "今晚可能会生成幻翼，建议睡觉！"}]
+execute if score fzsd.logger.level fzsd.variable.integer matches ..600 unless data storage fzsd:perm {phantom_warning:1} 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": "发送幻翼预警"}]
+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": "发送幻翼预警"}]
@@ -53,8 +53,8 @@ team add fzsd.module.scoreboard.display.trade_count

 team add fzsd.module.scoreboard.fake
 team add fzsd.module.scoreboard.shadow
-team modify fzsd.module.scoreboard.fake prefix {"text": "假的"}
-team modify fzsd.module.scoreboard.shadow prefix {"text": "挂机"}
+execute unless data storage fzsd:config fzsd.module.scoreboard{fake_player_prefix:false} run team modify fzsd.module.scoreboard.fake prefix {"text": "假的"}
+execute unless data storage fzsd:config fzsd.module.scoreboard{fake_player_prefix:false} run team modify fzsd.module.scoreboard.shadow prefix {"text": "挂机"}

 ## 标记为已安装
 data modify storage fzsd:install fzsd.module.scoreboard set value 1b
@@ -1,7 +1,10 @@
 # 调用者：#fzsd:module/scoreboard/interactor/display

-execute if data storage fzsd:install fzsd.module{scoreboard:1b} run tellraw @s {"text": "计分板："}
+execute if data storage fzsd:install fzsd.module{scoreboard:1b} if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run tellraw @s {"text": "计分板："}
+execute if data storage fzsd:install fzsd.module{scoreboard:1b} unless data storage fzsd:perm {scoreboard:1} run tellraw @s {"text": "计分板："}

-execute if data storage fzsd:install fzsd.module{scoreboard:1b} run tellraw @s [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "查询我的分数", "color": "#F4A460"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1120"}}, {"text": "查询我的分数", "color": "#F4A460"}, {"text": "] "}]
+execute if data storage fzsd:install fzsd.module{scoreboard:1b} if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run tellraw @s [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "查询我的分数", "color": "#F4A460"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1120"}}, {"text": "查询我的分数", "color": "#F4A460"}, {"text": "] "}]
+execute if data storage fzsd:install fzsd.module{scoreboard:1b} unless data storage fzsd:perm {scoreboard:1} run tellraw @s [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "查询我的分数", "color": "#F4A460"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1120"}}, {"text": "查询我的分数", "color": "#F4A460"}, {"text": "] "}]

-execute if data storage fzsd:install fzsd.module{scoreboard:1b} run tellraw @s [[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1000"}}, {"text": "关", "color": "red"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1010"}}, {"nbt": "fzsd.module.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1020"}}, {"nbt": "fzsd.module.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1030"}}, {"nbt": "fzsd.module.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1040"}}, {"nbt": "fzsd.module.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1050"}}, {"nbt": "fzsd.module.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1060"}}, {"nbt": "fzsd.module.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1070"}}, {"nbt": "fzsd.module.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1080"}}, {"nbt": "fzsd.module.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1090"}}, {"nbt": "fzsd.module.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1100"}}, {"nbt": "fzsd.module.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1110"}}, {"nbt": "fzsd.module.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}]]
+execute if data storage fzsd:install fzsd.module{scoreboard:1b} if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run tellraw @s [[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1000"}}, {"text": "关", "color": "red"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1010"}}, {"nbt": "fzsd.module.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1020"}}, {"nbt": "fzsd.module.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1030"}}, {"nbt": "fzsd.module.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1040"}}, {"nbt": "fzsd.module.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1050"}}, {"nbt": "fzsd.module.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1060"}}, {"nbt": "fzsd.module.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1070"}}, {"nbt": "fzsd.module.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1080"}}, {"nbt": "fzsd.module.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1090"}}, {"nbt": "fzsd.module.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1100"}}, {"nbt": "fzsd.module.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1110"}}, {"nbt": "fzsd.module.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}]]
+execute if data storage fzsd:install fzsd.module{scoreboard:1b} unless data storage fzsd:perm {scoreboard:1} run tellraw @s [[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1000"}}, {"text": "关", "color": "red"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1010"}}, {"nbt": "fzsd.module.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1020"}}, {"nbt": "fzsd.module.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1030"}}, {"nbt": "fzsd.module.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1040"}}, {"nbt": "fzsd.module.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1050"}}, {"nbt": "fzsd.module.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1060"}}, {"nbt": "fzsd.module.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1070"}}, {"nbt": "fzsd.module.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1080"}}, {"nbt": "fzsd.module.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1090"}}, {"nbt": "fzsd.module.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1100"}}, {"nbt": "fzsd.module.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1110"}}, {"nbt": "fzsd.module.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}]]
@@ -1,13 +1,26 @@
-execute if score @s fzsd.module.interactor.trigger matches -1000 run function #fzsd:module/scoreboard/interactor/subscribe/off
-execute if score @s fzsd.module.interactor.trigger matches -1010 run function #fzsd:module/scoreboard/interactor/subscribe/carousel
-execute if score @s fzsd.module.interactor.trigger matches -1020 run function #fzsd:module/scoreboard/interactor/subscribe/general
-execute if score @s fzsd.module.interactor.trigger matches -1030 run function #fzsd:module/scoreboard/interactor/subscribe/activation
-execute if score @s fzsd.module.interactor.trigger matches -1040 run function #fzsd:module/scoreboard/interactor/subscribe/aviating_distance
-execute if score @s fzsd.module.interactor.trigger matches -1050 run function #fzsd:module/scoreboard/interactor/subscribe/damage_taken
-execute if score @s fzsd.module.interactor.trigger matches -1060 run function #fzsd:module/scoreboard/interactor/subscribe/death_count
-execute if score @s fzsd.module.interactor.trigger matches -1070 run function #fzsd:module/scoreboard/interactor/subscribe/dig_count
-execute if score @s fzsd.module.interactor.trigger matches -1080 run function #fzsd:module/scoreboard/interactor/subscribe/fishing_count
-execute if score @s fzsd.module.interactor.trigger matches -1090 run function #fzsd:module/scoreboard/interactor/subscribe/kill_count
-execute if score @s fzsd.module.interactor.trigger matches -1100 run function #fzsd:module/scoreboard/interactor/subscribe/trade_count
-execute if score @s fzsd.module.interactor.trigger matches -1110 run function #fzsd:module/scoreboard/interactor/subscribe/placement_count
-execute if score @s fzsd.module.interactor.trigger matches -1120 run function #fzsd:module/scoreboard/interactor/show_my_scores
+execute if score @s fzsd.module.interactor.trigger matches -1000 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/off
+execute if score @s fzsd.module.interactor.trigger matches -1000 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/off
+execute if score @s fzsd.module.interactor.trigger matches -1010 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/carousel
+execute if score @s fzsd.module.interactor.trigger matches -1010 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/carousel
+execute if score @s fzsd.module.interactor.trigger matches -1020 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/general
+execute if score @s fzsd.module.interactor.trigger matches -1020 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/general
+execute if score @s fzsd.module.interactor.trigger matches -1030 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/activation
+execute if score @s fzsd.module.interactor.trigger matches -1030 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/activation
+execute if score @s fzsd.module.interactor.trigger matches -1040 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/aviating_distance
+execute if score @s fzsd.module.interactor.trigger matches -1040 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/aviating_distance
+execute if score @s fzsd.module.interactor.trigger matches -1050 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/damage_taken
+execute if score @s fzsd.module.interactor.trigger matches -1050 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/damage_taken
+execute if score @s fzsd.module.interactor.trigger matches -1060 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/death_count
+execute if score @s fzsd.module.interactor.trigger matches -1060 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/death_count
+execute if score @s fzsd.module.interactor.trigger matches -1070 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/dig_count
+execute if score @s fzsd.module.interactor.trigger matches -1070 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/dig_count
+execute if score @s fzsd.module.interactor.trigger matches -1080 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/fishing_count
+execute if score @s fzsd.module.interactor.trigger matches -1080 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/fishing_count
+execute if score @s fzsd.module.interactor.trigger matches -1090 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/kill_count
+execute if score @s fzsd.module.interactor.trigger matches -1090 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/kill_count
+execute if score @s fzsd.module.interactor.trigger matches -1100 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/trade_count
+execute if score @s fzsd.module.interactor.trigger matches -1100 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/trade_count
+execute if score @s fzsd.module.interactor.trigger matches -1110 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/placement_count
+execute if score @s fzsd.module.interactor.trigger matches -1110 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/placement_count
+execute if score @s fzsd.module.interactor.trigger matches -1120 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/show_my_scores
+execute if score @s fzsd.module.interactor.trigger matches -1120 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/show_my_scores
@@ -1,9 +1 @@
-execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.activation", "name": "@s"}}]]
-execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.aviating_distance", "name": "@s"}}]]
-execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.damage_taken", "name": "@s"}}]]
-execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.death_count", "name": "@s"}}]]
-execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.dig_count", "name": "@s"}}]]
-execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.fishing_count", "name": "@s"}}]]
-execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.kill_count", "name": "@s"}}]]
-execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.trade_count", "name": "@s"}}]]
-execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.placement_count", "name": "@s"}}]]
+execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"selector": "@s"}," 的分数：",{"text": "[","color": "dark_gray"},{"nbt": "fzsd.module.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.activation", "name": "@s"}}],{"text": "] [","color": "dark_gray"}, {"nbt": "fzsd.module.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.aviating_distance", "name": "@s"}}],{"text": "] [","color": "dark_gray"}, {"nbt": "fzsd.module.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.damage_taken", "name": "@s"}}],{"text": "] [","color": "dark_gray"}, {"nbt": "fzsd.module.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.death_count", "name": "@s"}}],{"text": "] [","color": "dark_gray"}, {"nbt": "fzsd.module.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.dig_count", "name": "@s"}}],{"text": "] [","color": "dark_gray"}, {"nbt": "fzsd.module.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.fishing_count", "name": "@s"}}],{"text": "] [","color": "dark_gray"}, {"nbt": "fzsd.module.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.kill_count", "name": "@s"}}],{"text": "] [","color": "dark_gray"}, {"nbt": "fzsd.module.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.trade_count", "name": "@s"}}],{"text": "] [","color": "dark_gray"}, {"nbt": "fzsd.module.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.placement_count", "name": "@s"}}],{"text": "]","color": "dark_gray"}]
@@ -9,4 +9,5 @@ tellraw @s[tag=fzsd.ignore_sweeper_sound] [{"text": "- 音效："}, [{"text": "[
 tellraw @s[tag=!fzsd.ignore_sweeper_message] [{"text": "- 聊天栏："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "点击关闭"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set 3600"}}, {"text": "已启用", "color": "green"}, {"text": "]"}]]
 tellraw @s[tag=fzsd.ignore_sweeper_message] [{"text": "- 聊天栏："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "点击启用"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set 3601"}}, {"text": "已关闭", "color": "red"}, {"text": "]"}]]

-tellraw @s [{"text": "- 开关："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3000"}}, {"text": "关", "color": "red"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "清理一次", "color": "aqua"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3300"}}, {"text": "清理一次", "color": "aqua"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "]"}]]
+execute if data storage fzsd:perm {sweeper:1} if entity @s[tag=fzsd.admin] run tellraw @s [{"text": "- 开关："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3000"}}, {"text": "关", "color": "red"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "清理一次", "color": "aqua"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3300"}}, {"text": "清理一次", "color": "aqua"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "]"}]]
+execute unless data storage fzsd:perm {sweeper:1} run tellraw @s [{"text": "- 开关："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3000"}}, {"text": "关", "color": "red"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "清理一次", "color": "aqua"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3300"}}, {"text": "清理一次", "color": "aqua"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "[", "color": "dark_gray", "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": "]"}]]
@@ -1,9 +1,18 @@
 execute if score @s fzsd.module.interactor.trigger matches 3400 run tag @s add fzsd.ignore_sweeper_bossbar
+execute if score @s fzsd.module.interactor.trigger matches 3400 run tag @s add fzsd.ignore_sweeper_bossbar
 execute if score @s fzsd.module.interactor.trigger matches 3401 run tag @s remove fzsd.ignore_sweeper_bossbar
+execute if score @s fzsd.module.interactor.trigger matches 3401 run tag @s remove fzsd.ignore_sweeper_bossbar
+execute if score @s fzsd.module.interactor.trigger matches 3500 run tag @s add fzsd.ignore_sweeper_sound
 execute if score @s fzsd.module.interactor.trigger matches 3500 run tag @s add fzsd.ignore_sweeper_sound
 execute if score @s fzsd.module.interactor.trigger matches 3501 run tag @s remove fzsd.ignore_sweeper_sound
+execute if score @s fzsd.module.interactor.trigger matches 3501 run tag @s remove fzsd.ignore_sweeper_sound
+execute if score @s fzsd.module.interactor.trigger matches 3600 run tag @s add fzsd.ignore_sweeper_message
 execute if score @s fzsd.module.interactor.trigger matches 3600 run tag @s add fzsd.ignore_sweeper_message
 execute if score @s fzsd.module.interactor.trigger matches 3601 run tag @s remove fzsd.ignore_sweeper_message
-execute if score @s fzsd.module.interactor.trigger matches -3300 run function #fzsd:module/sweeper/sweep
-execute if score @s fzsd.module.interactor.trigger matches -3000 run function #fzsd:module/sweeper/stop_loop
-execute if score @s fzsd.module.interactor.trigger matches -3240..-3010 run function #fzsd:module/sweeper/start_loop
+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 if data storage fzsd:perm {sweeper:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/sweeper/sweep
+execute if score @s fzsd.module.interactor.trigger matches -3300 unless data storage fzsd:perm {sweeper:1} run function #fzsd:module/sweeper/sweep
+execute if score @s fzsd.module.interactor.trigger matches -3000 if data storage fzsd:perm {sweeper:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/sweeper/stop_loop
+execute if score @s fzsd.module.interactor.trigger matches -3000 unless data storage fzsd:perm {sweeper:1} run function #fzsd:module/sweeper/stop_loop
+execute if score @s fzsd.module.interactor.trigger matches -3240..-3010 if data storage fzsd:perm {sweeper:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/sweeper/start_loop
+execute if score @s fzsd.module.interactor.trigger matches -3240..-3010 unless data storage fzsd:perm {sweeper:1} run function #fzsd:module/sweeper/start_loop
@@ -85,6 +85,13 @@
                "nbt": "{Item:{id:\"minecraft:mangrove_boat\"}}"
            }
        },
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "nbt": "{Item:{id:\"minecraft:pale_oak_boat\"}}"
+            }
+        },
        {
            "condition": "minecraft:entity_properties",
            "entity": "this",
@@ -0,0 +1,7 @@
+{
+    "replace": false,
+    "values": [
+        "#fzsd:liquid",
+        "minecraft:powder_snow"
+    ]
+}
@@ -20,6 +20,8 @@
        "minecraft:stripped_cherry_log",
        "minecraft:stripped_cherry_wood",
        "minecraft:stripped_mangrove_log",
-        "minecraft:stripped_mangrove_wood"
+        "minecraft:stripped_mangrove_wood",
+        "minecraft:stripped_pale_oak_log",
+        "minecraft:stripped_pale_oak_wood"
    ]
 }
@@ -0,0 +1,7 @@
+{
+    "replace": false,
+    "values": [
+        "#fzsd:liquid",
+        "minecraft:powder_snow"
+    ]
+}
@@ -2,7 +2,7 @@
    "replace": false,
    "values": [
        "minecraft:armor_stand",
-        "minecraft:boat",
+        "#minecraft:boat",
        "minecraft:minecart",
        "minecraft:shulker_bullet",
        "minecraft:item_frame",
@@ -0,0 +1,15 @@
+{
+    "replace": false,
+    "values": [
+        "#fzsd:module/scoreboard/assign/scoreboard/general/activation",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/aviating_distance",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/bedrock_broke_count",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/damage_taken",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/death_count",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/dig_count",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/fishing_count",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/kill_count",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/placement_count",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/trade_count"
+    ]
+}
@@ -0,0 +1,15 @@
+{
+    "replace": false,
+    "values": [
+        "#fzsd:module/scoreboard/assign/scoreboard/general/activation",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/aviating_distance",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/bedrock_broke_count",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/damage_taken",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/death_count",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/dig_count",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/fishing_count",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/kill_count",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/placement_count",
+        "#fzsd:module/scoreboard/assign/scoreboard/general/trade_count"
+    ]
+}
@@ -1,10 +1,10 @@
 {
    "pack": {
        "description": "FZ Survival Datapack 3.1 | Author: Harvey_Husky",
-        "pack_format": 15,
+        "pack_format": 61,
        "supported_formats": {
            "min_inclusive": 15,
-            "max_inclusive": 48
+            "max_inclusive": 61
        }
    },
    "overlays": {
@@ -29,6 +29,13 @@
                    "min_inclusive": 42,
                    "max_inclusive": 48
                }
+            },
+            {
+                "directory": "compat_49",
+                "formats": {
+                    "min_inclusive": 49,
+                    "max_inclusive": 61
+                }
            }
        ]
    }
@@ -43,6 +43,25 @@ global_current_scoreboard_list =  [
    'fzsd.module.scoreboard.display.aviating_distance',
    'fzsd.module.scoreboard.display.placement_count'
 ];
+global_generals_old = {
+    'fzsd.module.scoreboard.display.damage_taken' -> '总受伤害量',
+    'fzsd.module.scoreboard.display.dig_count' -> '总挖掘量',
+    'fzsd.module.scoreboard.display.placement_count' -> '总方块放置数',
+    'fzsd.module.scoreboard.display.death_count' -> '总死亡次数',
+    'fzsd.module.scoreboard.display.trade_count' -> '总交易量'
+};
+global_current_generals = {
+    'fzsd.module.scoreboard.display.activation' -> '总活跃时间',
+    'fzsd.module.scoreboard.display.damage_taken' -> '总受伤害数',
+    'fzsd.module.scoreboard.display.death_count' -> '总死亡数',
+    'fzsd.module.scoreboard.display.dig_count' -> '总挖掘数',
+    'fzsd.module.scoreboard.display.fishing_count' -> '总钓鱼数',
+    'fzsd.module.scoreboard.display.kill_count' -> '总击杀数',
+    'fzsd.module.scoreboard.display.trade_count' -> '总交易数',
+    'fzsd.module.scoreboard.display.bedrock_broken_count' -> '总破基岩数',
+    'fzsd.module.scoreboard.display.aviating_distance' -> '总飞行距离',
+    'fzsd.module.scoreboard.display.placement_count' -> '总建造数'
+};

 __config() -> {
    'scope' -> 'global',
@@ -54,26 +73,18 @@ __config() -> {
    'commands' -> {
        // '' -> 'help',
        // 'help' -> 'help',
-        'delete <version>' -> 'command_delete',
-        'update <version>' -> 'command_update',
-        'restore whitelist' -> ['command_restore', null, null],
-        'restore whitelist <scoreboardID>' -> _(scoreboardID) -> command_restore(null, scoreboardID),
-        'restore player <playerName>' -> ['command_restore', null],
-        'restore player <playerName> <scoreboardID>' -> 'command_restore',
-        'restore <custom> whitelist <trade_count>' -> _(custom, trade_count) -> command_restore_trade_count_confirm(custom, null, trade_count),
-        'restore <custom> player <playerName> <trade_count>' -> 'command_restore_trade_count_confirm',
-        'recalculate <scoreboardID>' -> 'command_recalculate_total_score',
-        'recalculate' -> ['command_recalculate_total_score', null],
-        'commandPlayer <permissionType>' -> 'carpet_command_player',
+        'restore whitelist' -> ['command_restore_whitelist', null],
+        'restore whitelist <scoreboardID>' -> 'command_restore_whitelist',
+        'restore player <playerName>' -> ['command_restore_player', null],
+        'restore player <playerName> <scoreboardID>' -> 'command_restore_player',
+        'recalculate <scoreboardID>' -> 'command_recalculate',
+        'recalculate' -> ['command_recalculate', null],
+        'commandPlayer <permissionType>' -> 'command_carpet_command_player',
        'reset <scoreboardPlayer> <scoreboardID>' -> 'command_reset',
        'reset <scoreboardPlayer>' -> ['command_reset', null],
        'set <playerName> <scoreboardID> <score>' -> 'command_set'
    },
    'arguments' -> {
-        'trade_count' -> {
-            'type' -> 'term',
-            'suggest' -> ['fzsd.module.scoreboard.display.trade_count']
-        },
        'playerName' -> {
            'type' -> 'term',
            'suggester' -> _(args) -> player('all')
@@ -94,22 +105,9 @@ __config() -> {
                'ops'
            ]
        },
-        'version' -> {
-            'type' -> 'term',
-            'suggest' -> [
-                '2.x',
-                '3.0-beta.4',
-                '3.0-beta.9',
-                '3.0-beta.10'
-            ]
-        },
        'score' -> {
            'type' -> 'int',
            'suggest' -> []
-        },
-        'custom' -> {
-            'type' -> 'term',
-            'suggest' -> []
        }
    }
 };
@@ -128,7 +126,7 @@ __on_close() -> (
    write_file('team_cache', 'json', global_team_cache);
 );

-if(require_version('1.4.999'), // 待支持
+if(require_version('1.4.999'), // 暂时无效
    __on_player_command(player, command) -> (
        l = length(command);
        if(l > 13
@@ -151,7 +149,10 @@ __on_player_connects(player) -> (
                global_team_cache:player_name = player_team;
            );
            team_add('fzsd.module.scoreboard.fake', player);
+            if(nbt_storage('fzsd:config'):'fzsd':'module':'scoreboard':'fake_player_prefix'
+                || nbt_storage('fzsd:config'):'fzsd':'module':'scoreboard':'fake_player_prefix' == null,
                print(player('all'), '↑假的');
+            );
        ),
        player_type == 'shadow',
        (
@@ -161,7 +162,10 @@ __on_player_connects(player) -> (
                global_team_cache:player_name = player_team;
            );
            team_add('fzsd.module.scoreboard.shadow', player);
+            if(nbt_storage('fzsd:config'):'fzsd':'module':'scoreboard':'fake_player_prefix'
+                || nbt_storage('fzsd:config'):'fzsd':'module':'scoreboard':'fake_player_prefix' == null,
                print(player('all'), '↑挂机');
+            );
        ),
        try_restore_team_from_cache(player);
    );
@@ -169,11 +173,16 @@ __on_player_connects(player) -> (

 __on_player_disconnects(player, reason) -> (
    player_type = player ~ 'player_type';
-    if(player_type == 'fake' && player_team != 'fzsd.module.scoreboard.fake',
+    if(player_type == 'fake'
+        && player_team != 'fzsd.module.scoreboard.fake'
+        && (nbt_storage('fzsd:config'):'fzsd':'module':'scoreboard':'fake_player_prefix'
+        || nbt_storage('fzsd:config'):'fzsd':'module':'scoreboard':'fake_player_prefix' == null),
        (
            print(player('all'), '↓假的');
        ),
-        player_type == 'shadow' && player_team != 'fzsd.module.scoreboard.shadow',
+        player_type == 'shadow' && player_team != 'fzsd.module.scoreboard.shadow'
+        && (nbt_storage('fzsd:config'):'fzsd':'module':'scoreboard':'fake_player_prefix'
+        || nbt_storage('fzsd:config'):'fzsd':'module':'scoreboard':'fake_player_prefix' == null),
        (
            print(player('all'), '↓挂机');
        )
@@ -199,7 +208,7 @@ reload_configs() -> (
        global_config:'config_version' = '1.0.0'; // 占位用，无实际作用
        config_changed = true;
    );
-    // 待支持
+    // 暂时无效
    if(require_version('1.4.999') && !contains(global_config, 'allow_spawn_whitelist_player'),
        global_config:'allow_spawn_whitelist_player' = false;
        config_changed = true;
@@ -223,297 +232,148 @@ get_scoreboard_player_list() -> (
    return(keys(set));
 );

-// 重置玩家计分板分数
-command_reset(player, scoreboard) -> (
-    if(scoreboard == null,
-        for(scoreboard(),
-            scoreboard_remove(_, player);
-        );
-        command_recalculate_total_score(null);
-        print('已重置' + player + '的所有分数');
-        return();
-    );
-    scoreboard_remove(scoreboard, player);
-    command_recalculate_total_score(scoreboard);
-    print('已重置' + player + '的' + scoreboard + '分数');        
-    return();
-);
-
 // 尝试从缓存恢复玩家队伍，玩家/假人上下线时执行
 try_restore_team_from_cache(player) -> (
    player_team = player ~ 'team';
    player_name = player ~ 'name';
    debug('restore_team_from_cache');
-    if(player_team == 'fzsd.module.scoreboard.fake' 
-            || player_team == 'fzsd.module.scoreboard.shadow',
+    if(player_team != 'fzsd.module.scoreboard.fake' 
+        && player_team != 'fzsd.module.scoreboard.shadow',
+        return();
+    );
    if(global_team_cache:player_name == null,
-            (
        team_leave(player);
-            ),
+        ,
        team_add(global_team_cache:player_name , player);
        delete(global_team_cache:player_name);
    );
 );
-);

 help() -> (
-    print('暂未开发');
    return();
 );

-// 删除旧版的计分板
-command_delete(fzsd_version) -> (
-    if(fzsd_version == '3.0-beta.10',
-        (
-            scoreboard_remove('fzsd.module.scoreboard.display.bedrock_broke_count');
-        ),
-        fzsd_version == '3.0-beta.9',
-        (
-            scoreboard_remove('fzsd.extra.bbl.display');
-        ),
-        fzsd_version == '2.x',
-        (
-            old_scoreboards = ['usedDiaAxe', 'usedDiaPickaxe', 'usedDiaShovel', 'usedDiaHoe', 'usedIroAxe','usedIroPickaxe', 'usedIroShovel', 'usedIroHoe', 'usedStoAxe', 'usedStoPickaxe', 'usedStoShovel', 'usedStoHoe', 'usedWooAxe', 'usedWooPickaxe', 'usedWooShovel', 'usedWooHoe', 'usedGolAxe', 'usedGolPickaxe', 'usedGolShovel', 'usedGolHoe', 'usedNetAxe', 'usedNetPickaxe', 'usedNetShovel', 'usedNetHoe', 'usedShears', 'damageTaken', '10xDamageTaken', 'deathCounter', 'deathTester', 'digCounter', 'fishingCounter', 'fishingTester', 'killCounter', 'tradingCounter', 'totalList', 'bedrockBreaked', 'fz.bbl', 'fz.aviate1m', 'fz.aviateCounter', 'fz.aviateOneTime', 'Health', 'carpetBot', 'parameter'];
-            team_remove('carpetBot');
-            team_remove('shadowedPlayer');
-            for(old_scoreboards, scoreboard_remove(_));
-        ),
-        fzsd_version == '3.0-beta.4',
-        (
-            old_scoreboards = ['fz.module.scoreboard.display.activation', 'fz.module.scoreboard.display.damage_taken', 'fz.module.scoreboard.display.death_count', 'fz.module.scoreboard.display.dig_count', 'fz.module.scoreboard.display.fishing_count', 'fz.module.scoreboard.display.kill_count', 'fz.module.scoreboard.display.trade_count', 'fz.module.scoreboard.display.bedrock_broke_count', 'fz.module.scoreboard.display.aviating_distance', 'fz.module.scoreboard.display.placement_count', 'fz.module.scoreboard.assign.general', 'fz.module.scoreboard.display.general', 'fz.module.scoreboard.interactor'];
-            team_remove('fz.module.scoreboard.fake');
-            team_remove('fz.module.scoreboard.shadow');
-            for(old_scoreboards, scoreboard_remove(_));
-        ),
-        print('参数错误！');
+// 重置玩家计分板分数
+command_reset(player, scoreboard_id) -> (
+    if(scoreboard_id == null,
+        run('scoreboard players reset ' + player);
+        recalculate_general(null);
+        print('已重置' + player + '的所有分数');
        return();
    );
-    print('已清除旧版计分板！');
-    return();
-);
-
-// 从某一旧版升级
-command_update(fzsd_version) -> (
-    if(fzsd_version == '3.0-beta.10',
-        (
-            merge_score('fzsd.module.scoreboard.display.bedrock_broke_count', 'fzsd.module.scoreboard.display.bedrock_broken_count', fzsd_version);
-            command_delete(fzsd_version);
-            scoreboard_remove('fzsd.module.scoreboard.display.placement_count', '总放置方块数');
-            scoreboard_remove('fzsd.module.scoreboard.display.general', '总放置方块数');
-        ),
-        fzsd_version == '3.0-beta.9',
-        (
-            merge_score('fzsd.extra.bbl.display', 'fzsd.module.scoreboard.display.bedrock_broken_count', fzsd_version);
-            command_delete(fzsd_version);
-        ),
-        fzsd_version == '2.x',
-        (
-            params = [
-                ['activation', 'fzsd.module.scoreboard.display.activation'],
-                ['damageTaken', 'fzsd.module.scoreboard.display.damage_taken'],
-                ['deathCounter', 'fzsd.module.scoreboard.display.death_count'],
-                ['digCounter', 'fzsd.module.scoreboard.display.dig_count'],
-                ['fishingCounter', 'fzsd.module.scoreboard.display.fishing_count'],
-                ['killCounter', 'fzsd.module.scoreboard.display.kill_count'],
-                ['tradingCounter', 'fzsd.module.scoreboard.display.trade_count'],
-                ['bedrockBreaked', 'fzsd.module.scoreboard.display.bedrock_broken_count'],
-                ['fz.aviate1m', 'fzsd.module.scoreboard.display.aviating_distance']
-            ];
-            for(params, merge_score(..._, fzsd_version));
-            command_delete(fzsd_version);
-        ),
-        fzsd_version == '3.0-beta.4',
-        (
-            params = [
-                ['fz.module.scoreboard.display.activation', 'fzsd.module.scoreboard.display.activation'],
-                ['fz.module.scoreboard.display.damage_taken', 'fzsd.module.scoreboard.display.damage_taken'],
-                ['fz.module.scoreboard.display.death_count', 'fzsd.module.scoreboard.display.death_count'],
-                ['fz.module.scoreboard.display.dig_count', 'fzsd.module.scoreboard.display.dig_count'],
-                ['fz.module.scoreboard.display.fishing_count', 'fzsd.module.scoreboard.display.fishing_count'],
-                ['fz.module.scoreboard.display.kill_count', 'fzsd.module.scoreboard.display.kill_count'],
-                ['fz.module.scoreboard.display.trade_count', 'fzsd.module.scoreboard.display.trade_count'],
-                ['fz.module.scoreboard.display.bedrock_broke_count', 'fzsd.module.scoreboard.display.bedrock_broken_count'],
-                ['fz.module.scoreboard.display.aviating_distance', 'fzsd.module.scoreboard.display.aviating_distance'],
-                ['fz.module.scoreboard.display.placement_count', 'fzsd.module.scoreboard.display.placement_count']
-            ];
-            for(params, merge_score(..._, fzsd_version));
-            command_delete(fzsd_version);
-        ),
-        print('参数错误！');
-        return();
-    );
-    command_recalculate_total_score(null);
-    print('已从' + fzsd_version + '升级！');
-    return();
-);
-
-// 将两计分板分数合并到后者
-merge_score(from, to, fzsd_version) -> (
-    // 如果目标计分板不存在则创建
-    if(scoreboard() ~ to == null, scoreboard_add(to));
-
-    // new_players = [];
-
-    if(fzsd_version == '2.x',
-        (
-            // 2.x数据包的假人列表
-            fake_players = team_list('carpetBot');
-
-            // 新数据包的计分板中存储的玩家列表
-            new_players = scoreboard('fzsd.module.interactor.trigger');
-
-            for(fake_players, delete(new_players, _));
-        ),
-        fzsd_version == '3.0-beta.4',
-        (
-            new_players = scoreboard('fz.module.interactor.trigger');
-        )
-    );
-
-    for(scoreboard(from),
-        if(!(_ ~ '\\W'),
-            scoreboard(to, _, scoreboard(to, _) + scoreboard(from, _));
-        );
-    );
-
-    print('已合并：' + to);
-    return();
-);
-
-// 获取承载总览数据的玩家名
-// 因为新计分板允许玩家自定义显示的总览名称，故做复杂判断才能使脚本确定用来承载总览数据的玩家名
-get_total_score_name_new(scoreboard) -> (
-    // 系统总览id
-    sys_total_name = replace(scoreboard, 'display', 'total');
-
-    // 当前总分
-    current_score = scoreboard('fzsd.module.scoreboard.assign.general', sys_total_name);
-
-    // 将系统总览分数设为INT_MIN，使其成为最低分
-    scoreboard('fzsd.module.scoreboard.assign.general', sys_total_name, -2147483648);
-
-    // 将总分赋值到显示计分板上
-    display_total_score(scoreboard);
-
-    // 查找显示计分板内的最低分玩家名
-    last_min_player = null;
-    for(scoreboard(scoreboard),
-        if(last_min_player == null,
-            (
-                last_min_player = _;
-            ),
-            if(scoreboard(scoreboard, _) < scoreboard(scoreboard, last_min_player),
-                last_min_player = _;
-            )
-        );
-    );
-
-    // 恢复总览分数
-    scoreboard('fzsd.module.scoreboard.assign.general', sys_total_name, current_score);
-    display_total_score(scoreboard);
-    
-    // 返回榜内最低分的玩家名（承载总览数据的玩家名）
-    return(last_min_player);
+    scoreboard_remove(scoreboard_id, player);
+    recalculate_general(scoreboard_id);
+    print('已重置' + player + '的' + scoreboard_id + '分数');
 );

 // 重算总分，scoreboard == null 时重算所有总分
-command_recalculate_total_score(scoreboard) -> (
-    if(scoreboard == null,
-        for(global_current_scoreboard_list, command_recalculate_total_score(_));
-        return();
+command_recalculate(scoreboard_id) -> (
+    recalculate_general(scoreboard_id);
 );
-    total_score_name_new = get_total_score_name_new(scoreboard);
-    // 计算总分
+
+// 设置玩家的计分板分数
+command_set(player, scoreboard_id, score) -> (
+    i = scoreboard(scoreboard_id, player, score);
+    print('玩家' + player + '修改前的分数为：' + i);
+    recalculate_general(scoreboard_id);
+    return(i);
+);
+
+command_carpet_command_player(level) -> (
+    print(run('carpet setDefault commandPlayer ' + level):1:0);
+);
+
+command_restore_whitelist(scoreboard_id) -> (
+    restore_scores_of_whitelist_players(scoreboard_id);
+);
+
+command_restore_player(player_name, scoreboard_id) -> (
+    restore_score(player_name, scoreboard_id);
+);
+
+// impls...
+
+recalculate_general(scoreboard_id) -> (
+    if(scoreboard_id == null,
+    (
+        for(global_current_scoreboard_list, _recalculate_general(_));
+    ),( // else
+        _recalculate_general(scoreboard_id);
+    ));
+    display_generals();
+);
+
+_recalculate_general(scoreboard_id) -> (
+    require_not_null(scoreboard_id);
+    scoreboard_remove(scoreboard_id, global_generals_old:scoreboard_id); // shit compat...
+    scoreboard_remove(scoreboard_id, global_current_generals:scoreboard_id); // shit compat...
    total_score = 0;
-    for(scoreboard(scoreboard), 
-        if(_ != total_score_name_new,
-            current_player_score = scoreboard(scoreboard, _);
-            if(current_player_score < -1000000000, // 避免溢出
-                current_player_score = 2147483647;
-                scoreboard(scoreboard, _, 2147483647);
-            );
-            total_score += current_player_score;
-        );
-        if(total_score < 0, // 避免溢出
-            total_score = 2147483647;
-        );
-    );
-    // 赋值总分到系统总分计分板
-    scoreboard(
-        'fzsd.module.scoreboard.assign.general',
-        replace(scoreboard, 'display', 'total'),
-        total_score
-    );
-    display_total_score(scoreboard);
-    return();
+    for(scoreboard(scoreboard_id),
+    ( // _ = player_name
+        score = scoreboard(scoreboard_id, _);
+        if(score <= 0,(
+            scoreboard_remove(scoreboard_id, _);
+            continue();
+        ));
+        total_score += scoreboard(scoreboard_id, _);
+        if(total_score < 0,(
+            total_score = 2147483647; // INT_MAX
+            break();
+        ));
+    ));
+    scoreboard('fzsd.module.scoreboard.assign.general', replace(scoreboard_id, 'display', 'total'), total_score); // shit... must call display_generals() later.
+    return(total_score);
 );

 // 使用数据包函数标签将总分赋值到显示计分板上
-display_total_score(scoreboard) -> (
-    // 获取计算总览的函数标签名
-    str_1 = split('\\.', scoreboard);
-    function_name = str_1:(length(str_1) - 1);
+display_generals() -> (
    // 运行函数，将分数赋值到显示计分板上
-    run('function #fzsd:module/scoreboard/assign/scoreboard/general/' + function_name);
-    return();
+    run('function #fzsd:module/scoreboard/assign/scoreboard/general');
 );

-// 恢复计分板分数，player == null 时恢复所有玩家分数，scoreboard == null 时恢复所有计分板分数
-command_restore(player, scoreboard) -> (
-    if(player == null,
-        i = 0;
-        for(keys(system_info('server_whitelist')),
-            i += 1;
-            if(i > 10,
-                game_tick(50);
-                i = 0;
-            );
-            restore_score(_, scoreboard);
-        );
-        if(scoreboard == null,
+restore_scores_of_whitelist_players(scoreboard_id) -> ( // whitelist players only!
+    whitelist = get_server_whitelist();
+
+    if(scoreboard_id != null,
    (
-                print('重置交易榜会丢失猪灵交易分数，请输入\n“/' + global_app_name + ' restore confirm whitelist fzsd.module.scoreboard.display.trade_count”继续执行');
-                print('无法还原破基岩榜，已忽略');
-                print('已恢复所有玩家的所有分数');
-            ),
-            if(scoreboard == 'fzsd.module.scoreboard.display.trade_count',
-                print('重置交易榜会丢失猪灵交易分数，请输入\n“/' + global_app_name + ' restore confirm whitelist fzsd.module.scoreboard.display.trade_count”继续执行');
-                ,
-                scoreboard == 'fzsd.module.scoreboard.display.bedrock_broken_count',
-                print('无法还原破基岩榜，已忽略');
-                ,
-                print('已恢复所有玩家的' + scoreboard + '分数');
-            );
-        );
-        return();
-    );
-    if(scoreboard == null,
-        for(global_current_scoreboard_list, restore_score(player, _));
-        print('重置交易榜会丢失猪灵交易分数，请输入\n“/' + global_app_name + ' restore confirm player <playerName> fzsd.module.scoreboard.display.trade_count”继续执行');
-        print('无法还原破基岩榜，已忽略');
-        print('已恢复' + player + '的所有分数');
-        return();
-    );
-    if(restore_score(player, scoreboard),
-        print('已恢复' + player + '的' + scoreboard + '分数');
-        ,
-        if(scoreboard == 'fzsd.module.scoreboard.display.trade_count',
-            print('重置交易榜会丢失猪灵交易分数，请输入\n“/' + global_app_name + ' restore confirm whitelist fzsd.module.scoreboard.display.trade_count”继续执行');
-            ,
-            scoreboard == 'fzsd.module.scoreboard.display.bedrock_broken_count',
-            print('无法还原破基岩榜，已忽略');
-        );
-    );
+        for(whitelist,
+        ( // _ = player_name
+            _restore_score(_, scoreboard_id);
+        ));
+        recalculate_general(scoreboard_id);
        return();
+    ));
+
+    for(global_current_scoreboard_list,
+    ( 
+        scoreboard_id = _;
+        for(whitelist,
+        ( // _ = player_name
+            _restore_score(_, scoreboard_id);
+        ));
+    ));
+    recalculate_general(null);
 );

 // 恢复玩家的计分板分数
-restore_score(player_name, scoreboard) -> (
+restore_score(player_name, scoreboard_id) -> (
    require_not_null(player_name);
-    if(scoreboard == null,
-        for(global_current_scoreboard_list, restore_score(player_name, _));
+    if(scoreboard_id == null || scoreboard_id == '',
+    (
+        for(global_current_scoreboard_list, _restore_score(player_name, _));
+        recalculate_general(null);
        return(true);
+    ));
+    if(_restore_score(player_name, scoreboard_id),
+    (
+        recalculate_general(scoreboard_id);
+        return(true);
+    ));
+    return(false);
 );
+
+_restore_score(player_name, scoreboard_id) -> (
+    require_not_null(scoreboard_id);
    player = player(player_name);
    player_is_offline = false;
    if(player == null,
@@ -523,55 +383,49 @@ restore_score(player_name, scoreboard) -> (
            player = player(player_name);
        )
    );
-    if(scoreboard == 'fzsd.module.scoreboard.display.activation',
+    if(scoreboard_id == 'fzsd.module.scoreboard.display.activation',
        (
            play_ticks = statistic(player, 'custom', 'play_time');
            scoreboard('fzsd.event.play_ticks', player, play_ticks%72000);
-            scoreboard(scoreboard, player, play_ticks/72000);
+            scoreboard(scoreboard_id, player, play_ticks/72000);
        ),
-        scoreboard == 'fzsd.module.scoreboard.display.damage_taken',
-        scoreboard(scoreboard, player, statistic(player, 'custom', 'damage_taken')/10);
+        scoreboard_id == 'fzsd.module.scoreboard.display.damage_taken',
+        scoreboard(scoreboard_id, player, statistic(player, 'custom', 'damage_taken')/10);
        ,
-        scoreboard == 'fzsd.module.scoreboard.display.death_count',
-        restore_from_stat(scoreboard, player, 'custom', 'deaths');
+        scoreboard_id == 'fzsd.module.scoreboard.display.death_count',
+        scoreboard(scoreboard_id, player, statistic(player, 'custom', 'deaths'));
        ,
-        scoreboard == 'fzsd.module.scoreboard.display.dig_count',
+        scoreboard_id == 'fzsd.module.scoreboard.display.dig_count',
        (
-            scoreboard(scoreboard, player, 0);
-            for(block_list(),
-                append_from_stat(scoreboard, player, 'mined', _);
-            );
+            scoreboard(scoreboard_id, player, 0);
+            for(block_list(), append_from_stat(scoreboard_id, player, 'mined', _));
        ),
-        scoreboard == 'fzsd.module.scoreboard.display.fishing_count',
-        scoreboard(scoreboard, player, statistic(player, 'custom', 'fish_caught'));
+        scoreboard_id == 'fzsd.module.scoreboard.display.fishing_count',
+        scoreboard(scoreboard_id, player, statistic(player, 'custom', 'fish_caught'));
        ,
-        scoreboard == 'fzsd.module.scoreboard.display.kill_count',
+        scoreboard_id == 'fzsd.module.scoreboard.display.kill_count',
        (
-            scoreboard(scoreboard, player, 0);
-            for(entity_types('living'),
-                append_from_stat(scoreboard, player, 'killed', _);
-            );
+            scoreboard(scoreboard_id, player, 0);
+            for(entity_types('living'), append_from_stat(scoreboard_id, player, 'killed', _));
        ),
-        scoreboard == 'fzsd.module.scoreboard.display.trade_count',
+        scoreboard_id == 'fzsd.module.scoreboard.display.trade_count',
+        scoreboard(scoreboard_id, player, statistic(player, 'custom', 'traded_with_villager'));
        return(false);
        ,
-        scoreboard == 'fzsd.module.scoreboard.display.bedrock_broken_count',
+        scoreboard_id == 'fzsd.module.scoreboard.display.bedrock_broken_count',
        return(false);
        ,
-        scoreboard == 'fzsd.module.scoreboard.display.aviating_distance',
-        scoreboard(scoreboard, player, statistic(player, 'custom', 'aviate_one_cm')/200);
+        scoreboard_id == 'fzsd.module.scoreboard.display.aviating_distance',
+        scoreboard(scoreboard_id, player, statistic(player, 'custom', 'aviate_one_cm')/200);
        ,
-        scoreboard == 'fzsd.module.scoreboard.display.placement_count',
+        scoreboard_id == 'fzsd.module.scoreboard.display.placement_count',
        (
-            scoreboard(scoreboard, player, 0);
-            for(block_list(),
-                append_from_stat(scoreboard, player, 'used', _);
-            );
+            scoreboard(scoreboard_id, player, 0);
+            for(block_list(), append_from_stat(scoreboard_id, player, 'used', _));
        ),
-        print('未识别的计分板ID！' + scoreboard);
+        print('未识别的计分板ID！' + scoreboard_id);
        return(false);
    );
-    command_recalculate_total_score(scoreboard);
    if(player_is_offline,
        world_spawn = system_info('world_spawn_point');
        run('spreadplayers ' + world_spawn:0 + ' ' + world_spawn:2 + ' 0 10 false ' + player);
@@ -580,42 +434,9 @@ restore_score(player_name, scoreboard) -> (
    return(true);
 );

-// 确定恢复交易榜
-command_restore_trade_count_confirm(confirm, player, trade_count) -> (
-    if(confirm != 'confirm' || trade_count != 'fzsd.module.scoreboard.display.trade_count',
-        print('命令格式错误！');
-        return();
-    );
-    if(player == null,
-        for(keys(system_info('server_whitelist')),
-            restore_from_stat(scoreboard, _, 'custom', 'traded_with_villager');
-        );
-        return();
-    );
-    restore_from_stat(scoreboard, player, 'custom', 'traded_with_villager');
-    return();
-);
-
-restore_from_stat(scoreboard, player, category, entry) -> (
-    scoreboard(scoreboard, player, statistic(player, category, entry));
-);
-
 append_from_stat(scoreboard, player, category, entry) -> (
    scoreboard(scoreboard, player,
        statistic(player, category, entry) + scoreboard(scoreboard, player)
    );
 );

-// 修改地毯假人规则
-carpet_command_player(level) -> (
-    print(run('carpet setDefault commandPlayer ' + level):1:0);
-    return();
-);
-
-// 设置玩家的计分板分数
-command_set(player, scoreboard, score) -> (
-    i = scoreboard(scoreboard, player, score);
-    print('玩家' + player + '修改前的分数为：' + i);
-    command_recalculate_total_score(scoreboard);
-    return(i);
-);
Author	SHA1	Message	Date
延皓	52075ad98b	Merge branch 'dev/3.1' of https://gitee.com/harvey-husky/fz-survival-datapack into dev/3.1	2025-01-22 12:14:46 +08:00
延皓	2233b3b95d	fix #IBJ6VX	2025-01-22 12:14:42 +08:00
延皓	0241f6e5f0	update README.md. Signed-off-by: 延皓 <harvey_husky@foxmail.com>	2025-01-08 18:14:53 +00:00
Harvey_Husky	12f5b34329	fix 缺失苍白橡木	2024-12-30 15:30:18 +08:00
Harvey_Husky	a765aa75b9	fix 缺失苍白橡木	2024-12-30 15:25:45 +08:00
Harvey_Husky	eb9931ea06	Merge branch 'dev/3.1' of https://gitee.com/harvey-husky/fz-survival-datapack into dev/3.1	2024-12-09 20:26:38 +08:00
Harvey_Husky	1971888161	fix 1.21.2以上击杀榜失效	2024-12-09 20:17:09 +08:00
延皓	82b1f0dcdd	update README.md. Signed-off-by: 延皓 <harvey_husky@foxmail.com>	2024-11-03 09:08:40 +00:00
Harvey_Husky	79ee77b42d	update README.md	2024-10-05 19:48:06 +08:00
Harvey_Husky	e9ad855fd9	fix 在1.20.1使用脚本修改/计算分数时不会刷新显示计分板；fix 重置分数时不会重新计算总分	2024-10-05 19:40:49 +08:00
Harvey_Husky	a40d2000fb	3.1.11	2024-09-17 10:53:50 +08:00
Harvey_Husky	eba2df0d0d	3.1.11	2024-09-16 20:35:15 +08:00
Harvey_Husky	b62c744321	添加权限控制、修改查询分数的格式减少刷屏	2024-09-16 20:34:18 +08:00
Harvey_Husky	b2f455cbb6	3.1.10	2024-08-24 22:18:55 +08:00
Harvey_Husky	bdb5c0a8da	添加假人前缀开关	2024-08-24 22:12:24 +08:00
Harvey_Husky	1bf367ce12	忘了改..	2024-08-24 21:31:56 +08:00
Harvey_Husky	9b99a8e836	版本号..	2024-08-24 21:26:36 +08:00
Harvey_Husky	c9270ef8bb	Merge branch 'dev/3.1' of https://gitee.com/harvey-husky/fz-survival-datapack into dev/3.1	2024-08-24 21:24:15 +08:00
Harvey_Husky	bca530269a	修复建造榜未忽略细雪桶	2024-08-24 21:20:56 +08:00
延皓	96f2320257	fix scripts/fzsd_score.sc. (重写) Signed-off-by: 延皓 <harvey_husky@foxmail.com>	2024-06-23 13:12:20 +00:00
				`@@ -0,0 +1 @@`
				`execute if data storage fzsd:module fzsd.module.scoreboard.config{trade_count_includes_piglin:1b} run function fzsd:module/scoreboard/assign/scoreboard/trade_count`