修复自动升级相关bug

.vscode/settings.json

@@ -16,5 +16,8 @@
         "TEXT": "{\"text\": \"${1:TEXT}\", \"color\": \"${2:COLOR}\"}",
         "storageText": "{\"nbt\": \"${1:NBT}\", \"interpret\": true, \"storage\": \"${2:A namespaced ID}\"}",
         "ifInstalled": "execute if data storage fz:installed fz.module{${1:module_name}:1b} run ${tellraw}"
-    }
+    },
+    "datapack.env.cmdVersion": "1.19",
+    "datapack.env.jsonVersion": "1.19",
+    "datapack.env.dataVersion": "1.19"
 }

LICENSE

@@ -1,7 +1,7 @@
 
 FZSD许可证
 
-2022/7/20 https://gitee.com/harvey-husky/fz-survival-datapack/LICENSE
+2022/8/1 https://gitee.com/harvey-husky/fz-survival-datapack/blob/dev/3.0/LICENSE
 
 版权所有 © 2019-2022 延皓<https://gitee.com/harvey-husky><https://space.bilibili.com/677233356>
 

README.md

@@ -11,8 +11,8 @@
 ## 安装教程
 
 1. 兼容性
-     - `数据包 v3.0.x` 暂时只支持 `Minecraft 1.19+`
+     - `数据包 v3.0.x` 支持 `Minecraft 1.18~1.19.1`
-     - `数据包 v2.2.x` 支持 `Minecraft 1.19+`
+     - `数据包 v2.2.x` 支持 `Minecraft 1.19.x`
      - `数据包 v2.1.x` 支持 `Minecraft 1.17.x-1.18.x`
      - `数据包 v2.0.x` 支持 `Minecraft 1.16.3-1.16.5`
 2. 前往[发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases)下载对应MC版本的数据包
@@ -25,7 +25,9 @@
 
 # FZ生存数据包 3.0
 
-[![release版本](https://img.shields.io/badge/发行版-3.0.0-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases/v3.0.0) [![mc版本](https://img.shields.io/badge/Minecraft-1.19+-blue.svg)](https://minecraft.net/)
+## *目前仍在测试阶段，请先备份服务器再使用！*
+
+[![数据包版本](https://img.shields.io/badge/测试版-3.0+beta.8-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases/v3.0-beta.8) [![MC版本](https://img.shields.io/badge/Minecraft-1.19+-blue.svg)](https://minecraft.net/)
 
 > 其他版本见[发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases)
 
@@ -62,9 +64,11 @@
     - 可避免Carpet假人污染计分板
     - 执行 `reload` 指令后自动生效
     - 子命令（ `/fzsd_score <子命令>` ）：
-      - `merge_old`：用于从 `数据包2.x` 升级后恢复计分板数据
+      - `update_from <version>`：用于从给定的数据包版本恢复计分板数据（需要测试！）
       - `recalculate_total`：重新计算总分
 
 ### 其他
 - 见游戏内交互器按钮
 
+## 开发者相关
+- 参见[开发文档](/DEVDOC.md)

data/fzsd/advancements/game_event/on_unsneak.json

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

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

@@ -37,6 +37,6 @@
         }
     },
     "rewards": {
-        "function": "fzsd:module/interactor/event/on_click"
+        "function": "fzsd:module/interactor/event/advamcement/on_click"
     }
 }

data/fzsd/functions/boot.mcfunction

@@ -1,4 +1,4 @@
-execute store success storage fzsd:version fzsd.need_update int 1 run data merge storage fzsd:version {fzsd:{version: '3.0.0-beta.5'}}
+execute store success storage fzsd:version fzsd.need_update int 1 run data merge storage fzsd:version {fzsd: {version: '3.0.0-beta.8'}}
 execute if data storage fzsd:version fzsd{need_update: 1} run function fzsd:system/update
 function fzsd:system/carpet/try_load_fzsd_score
 function #fzsd:load

data/fzsd/functions/entry.mcfunction

@@ -1 +1 @@
-execute unless data storage fzsd:installed fzsd{global: 0b} run function fzsd:boot
+execute unless data storage fzsd:install fzsd{global: 0b} run function fzsd:boot

data/fzsd/functions/game_event/install.mcfunction

@@ -41,8 +41,5 @@ scoreboard objectives add fzsd.event.used_tool.wooden_sword minecraft.used:woode
 scoreboard objectives add fzsd.event.used_tool.diamond_sword minecraft.used:diamond_sword
 scoreboard objectives add fzsd.event.used_tool.netherite_sword minecraft.used:netherite_sword
 
-## 标记为已安装
-data modify storage fzsd:installed fzsd.event set value 1b
-
 ## 调试
 execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "已安装系统组件：游戏事件"}]

data/fzsd/functions/game_event/uninstall.mcfunction

@@ -42,8 +42,5 @@ scoreboard objectives remove fzsd.event.used_tool.netherite_sword
 
 schedule clear fzsd:game_event/on_tick
 
-## 删除安装标记
-data remove storage fzsd:installed fzsd.event
-
 ## 调试
 execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "已卸载系统组件：游戏事件"}]

data/fzsd/functions/logger/install.mcfunction

@@ -24,8 +24,5 @@ execute unless data storage fzsd:logger fzsd.levels.current run data modify stor
 ## 读取日志等级存入缓存
 execute store result score fzsd.logger.level fzsd.variable.integer run data get storage fzsd:logger fzsd.levels.current
 
-## 标记为已安装
-data modify storage fzsd:installed fzsd.logger set value 1b
-
 ## 调试
 execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "已安装系统组件：日志"}]

data/fzsd/functions/logger/uninstall.mcfunction

@@ -1,8 +1,5 @@
 ## 调用者：#fzsd:logger/uninstall
 
-## 删除安装标记
-data remove storage fzsd:installed fzsd.logger
-
 ## 调试
 execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "已卸载系统组件：日志"}]
 

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

@@ -2,7 +2,7 @@ scoreboard objectives add fzsd.module.health health
 scoreboard objectives modify fzsd.module.health rendertype hearts
 
 ## 标记为已安装
-data modify storage fzsd:installed fzsd.module.health set value 1b
+data modify storage fzsd:install fzsd.module.health set value 1b
 
 ## 日志
 execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已安装组件：血量显示"}]

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

@@ -2,7 +2,7 @@ scoreboard objectives remove fzsd.module.health
 data remove storage fzsd:config fzsd.module.health
 
 ## 标记为已卸载
-data modify storage fzsd:installed fzsd.module.health set value 0b
+data modify storage fzsd:install fzsd.module.health set value 0b
 
 
 ## 日志

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

@@ -2,8 +2,6 @@
 execute store result storage fzsd:here fzsd.x int 1 run data get entity @s Pos[0]
 execute store result storage fzsd:here fzsd.y int 1 run data get entity @s Pos[1]
 execute store result storage fzsd:here fzsd.z int 1 run data get entity @s Pos[2]
-data modify storage fzsd:here fzsd.message.dimension set from storage fzsd:global fzsd.api.dimension.name
-data modify storage fzsd:here fzsd.message.position set value '[{"text": "[", "color": "green"}, {"nbt": "fzsd.x", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.y", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.z", "storage": "fzsd:here"}, {"text": "]"}]'
 data modify storage fzsd:here fzsd.message.append set value ''
 
 ## 调试

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

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

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

@@ -1,5 +1,5 @@
 ## 标记为已安装
-data modify storage fzsd:installed fzsd.module.here set value 1b
+data modify storage fzsd:install fzsd.module.here set value 1b
 
 ## 日志
 execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已安装组件：玩家位置"}]

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

@@ -1 +1 @@
-execute if data storage fzsd:installed 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} 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": "]"}]]

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

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

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

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

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

@@ -0,0 +1,5 @@
+execute if data storage fzsd:install fzsd.module{interactor: 1b} run function fzsd:module/interactor/event/on_click
+
+function #fzsd:module/interactor/reset_trigger
+## 重置进度
+advancement revoke @s only fzsd:module/interactor/on_click

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

@@ -2,6 +2,3 @@
 function #fzsd:module/interactor/event/on_click
 ## 触发器分数为正数时重新显示交互器按钮，为负数时不显示
 execute if score @s fzsd.module.interactor.trigger matches 1.. run function #fzsd:module/interactor/display
-function #fzsd:module/interactor/reset_trigger
-## 重置进度
-advancement revoke @s only fzsd:module/interactor/on_click

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

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

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

@@ -2,7 +2,7 @@ scoreboard objectives add fzsd.module.interactor.trigger trigger
 scoreboard objectives add fzsd.module.interactor.player.config dummy
 
 ## 标记为已安装
-data modify storage fzsd:installed fzsd.module.interactor set value 1b
+data modify storage fzsd:install fzsd.module.interactor set value 1b
 
 ## 日志
 execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已安装组件：配置"}]

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

@@ -3,7 +3,7 @@ schedule clear fzsd:module/interactor/loop
 scoreboard objectives remove fzsd.module.interactor.trigger
 
 ## 标记为已卸载
-data modify storage fzsd:installed fzsd.module.interactor set value 0b
+data modify storage fzsd:install fzsd.module.interactor set value 0b
 
 ## 日志
 execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已卸载组件：配置"}]

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

@@ -1,5 +1,5 @@
 ## 标记为已安装
-data modify storage fzsd:installed fzsd.module.join_message set value 1b
+data modify storage fzsd:install fzsd.module.join_message set value 1b
 
 ## 日志
 execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已安装组件：进服消息"}]

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

@@ -1,5 +1,5 @@
 ## 标记为已卸载
-data modify storage fzsd:installed fzsd.module.join_message set value 0b
+data modify storage fzsd:install fzsd.module.join_message set value 0b
 
 ## 日志
 execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已卸载组件：进服消息"}]

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

@@ -1,5 +1,5 @@
 ## 标记为已安装
-data modify storage fzsd:installed fzsd.module.last_death set value 1b
+data modify storage fzsd:install fzsd.module.last_death set value 1b
 
 ## 日志
 execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已安装组件：上一死亡点"}]

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

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

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

@@ -1,7 +1,7 @@
 data remove storage fzsd:last_death fzsd
 
 ## 标记为已卸载
-data modify storage fzsd:installed fzsd.module.last_death set value 0b
+data modify storage fzsd:install fzsd.module.last_death set value 0b
 
 ## 日志
 execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已卸载组件：上一死亡点"}]

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

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

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

@@ -2,10 +2,9 @@ scoreboard objectives add fzsd.module.last_nether_portal.dimension dummy
 scoreboard objectives add fzsd.module.last_nether_portal.x dummy
 scoreboard objectives add fzsd.module.last_nether_portal.y dummy
 scoreboard objectives add fzsd.module.last_nether_portal.z dummy
-data modify storage fzsd:last_nether_portal fzsd.message set value '[{"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": "[", "color": "green"}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.x"}}, {"text": ", "}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.z"}}, {"text": ", "}, {"score": {"name": "@s", "objective": "fzsd.module.last_nether_portal.z"}}, {"text": "]"}]]'
 
 ## 标记为已安装
-data modify storage fzsd:installed fzsd.module.last_nether_portal set value 1b
+data modify storage fzsd:install fzsd.module.last_nether_portal set value 1b
 
 ## 日志
 execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已安装组件：上次穿出的下界传送门"}]

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

@@ -1 +1 @@
-execute if data storage fzsd:installed 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} 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": "]"}]]

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

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

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

@@ -5,7 +5,7 @@ scoreboard objectives remove fzsd.module.last_nether_portal.z
 data remove storage fzsd:last_nether_portal fzsd
 
 ## 标记为已安装
-data modify storage fzsd:installed fzsd.module.last_nether_portal set value 0b
+data modify storage fzsd:install fzsd.module.last_nether_portal set value 0b
 
 ## 日志
 execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已卸载组件：上次穿出的下界传送门"}]

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

@@ -1,5 +1,5 @@
 ## 标记为已安装
-data modify storage fzsd:installed fzsd.module.last_spawn_point set value 1b
+data modify storage fzsd:install fzsd.module.last_spawn_point set value 1b
 
 ## 日志
 execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已安装组件：上一出生点"}]

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

@@ -1 +1 @@
-execute if data storage fzsd:installed 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} 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": "]"}]]

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

@@ -1,2 +1,2 @@
-execute if data entity @s SpawnDimension run tellraw @s [{"text": "你的上个出生点位于"}, {"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": "[x: ", "color": "green"}, {"nbt": "fzsd.x", "storage": "fzsd:last_spawn_point"}, {"text": ", y: "}, {"nbt": "fzsd.y", "storage": "fzsd:last_spawn_point"}, {"text": ", z: "}, {"nbt": "fzsd.z", "storage": "fzsd:last_spawn_point"}, {"text": "]"}]]
+execute if data entity @s SpawnDimension run tellraw @s [{"text": "你的上个出生点位于"}, {"nbt": "fzsd.api.dimension.name", "interpret": true, "storage": "fzsd:global"}, [{"text": " [", "color": "green"}, {"nbt": "fzsd.x", "storage": "fzsd:last_spawn_point"}, {"text": ", "}, {"nbt": "fzsd.y", "storage": "fzsd:last_spawn_point"}, {"text": ", "}, {"nbt": "fzsd.z", "storage": "fzsd:last_spawn_point"}, {"text": "]"}]]
 execute unless data entity @s SpawnDimension run tellraw @s {"text": "你从未设置过出生点！"}

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

@@ -1,5 +1,5 @@
 ## 标记为已安装
-data modify storage fzsd:installed fzsd.module.last_spawn_point set value 0b
+data modify storage fzsd:install fzsd.module.last_spawn_point set value 0b
 
 ## 日志
 execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已卸载组件：上一出生点"}]

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

@@ -57,7 +57,7 @@ team modify fzsd.module.scoreboard.fake prefix {"text": "假的"}
 team modify fzsd.module.scoreboard.shadow prefix {"text": "挂机"}
 
 ## 标记为已安装
-data modify storage fzsd:installed fzsd.module.scoreboard set value 1b
+data modify storage fzsd:install fzsd.module.scoreboard set value 1b
 
 ## 日志
 execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已安装组件：计分板"}]

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

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

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

@@ -28,7 +28,7 @@ team remove fzsd.module.scoreboard.shadow
 execute if score fzsd.logger.level fzsd.variable.integer matches ..600 run tellraw @s [{"nbt": "fzsd.level.alert", "interpret": true, "storage": "fzsd:logger"}, {"text": "您要删除计分板数据吗，它将会永久失去！(真的很久！)"}, {"text": "[确定]", "color": "dark_red", "clickEvent": {"action": "suggest_command", "value": "/function #fzsd:module/scoreboard/clear_data"}, "hoverEvent": {"action": "show_text", "contents": {"text": "将命令填入聊天框"}}}]
 
 ## 标记为已卸载
-data modify storage fzsd:installed fzsd.module.scoreboard set value 0b
+data modify storage fzsd:install fzsd.module.scoreboard set value 0b
 
 ## 日志
 execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已卸载组件：计分板"}]

data/fzsd/functions/module/try_install.mcfunction

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

data/fzsd/functions/module/try_load.mcfunction

@@ -1,6 +1,6 @@
 # 调用者：#fzsd:module/try_load
 
 ## 判断是否安装，如果安装则加载
-execute if data storage fzsd:installed fzsd.module{health:1b} run function #fzsd:module/health/load
+execute if data storage fzsd:install fzsd.module{health:1b} run function #fzsd:module/health/load
-execute if data storage fzsd:installed fzsd.module{interactor:1b} run function #fzsd:module/interactor/load
+execute if data storage fzsd:install fzsd.module{interactor:1b} run function #fzsd:module/interactor/load
-execute if data storage fzsd:installed fzsd.module{scoreboard:1b} run function #fzsd:module/scoreboard/load
+execute if data storage fzsd:install fzsd.module{scoreboard:1b} run function #fzsd:module/scoreboard/load

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

@@ -1,5 +1,5 @@
 ## 标记为已安装
-data modify storage fzsd:installed fzsd.global set value 1b
+data modify storage fzsd:install fzsd.global set value 1b
 
 ## 日志
 tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "安装完成！"}]

data/fzsd/functions/system/uninstall/after.mcfunction

@@ -1,5 +1,5 @@
 ## 标记为已卸载
-data modify storage fzsd:installed fzsd.global set value 0b
+data modify storage fzsd:install fzsd.global set value 0b
 
 ## 日志
 execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "卸载完成！"}]

data/fzsd/functions/system/uninstall/cache_module_install_data.mcfunction

@@ -1,2 +1,2 @@
 ## 将模块安装记录缓存，因为模块的卸载函数会覆盖该记录
-data modify storage fzsd:installed fzsd.cache set from storage fzsd:installed fzsd.module
+data modify storage fzsd:install fzsd.cache set from storage fzsd:install fzsd.module

data/fzsd/functions/system/uninstall/restore_module_install_data.mcfunction

@@ -1,3 +1,3 @@
 ## 恢复模块安装记录
-data modify storage fzsd:installed fzsd.module set from storage fzsd:installed fzsd.cache
+data modify storage fzsd:install fzsd.module set from storage fzsd:install fzsd.cache
-data remove storage fzsd:installed fzsd.cache
+data remove storage fzsd:install fzsd.cache

data/fzsd/functions/system/update.mcfunction

@@ -1,2 +1,2 @@
-execute if data storage fzsd:installed fzsd{global: 1b} run function #fzsd:uninstall
+execute if data storage fzsd:install fzsd{global: 1b} run function #fzsd:uninstall
 function #fzsd:install

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

@@ -2,6 +2,6 @@
     "replace": false,
     "__comment": "将在卸载后恢复安装记录",
     "values": [
-        "fzsd:system/uninstall/uninstalled"
+        "fzsd:system/uninstall/after"
     ]
 }

data/fzsd/tags/functions/uninstall.json

@@ -5,8 +5,8 @@
         "#fzsd:system/uninstall/before",
         "fzsd:system/uninstall/cache_module_install_data",
         "#fzsd:system/uninstall/module",
-        "fzsd:system/uninstall/restore_module_install_data",
         "#fzsd:system/uninstall/system",
+        "fzsd:system/uninstall/restore_module_install_data",
         "#fzsd:system/uninstall/after"
     ]
 }

scripts/fzsd_score.sc

@@ -1,7 +1,7 @@
 // 计分板模块扩展插件
 // 忽略假人分数
 // **请勿修改文件名！！**
-global_app_version = '1.0-beta.4';
+global_app_version = '1.0-beta.6';
 
 __config() -> {
     'scope' -> 'global',
@@ -13,148 +13,176 @@ __config() -> {
     'commands' -> {
         '' -> 'help',
         'help' -> 'help',
-        'delete_old' -> 'delete_old',
+        'delete_old <fzsd_version>' -> 'delete_old',
-        'merge_old' -> 'restore_merge_old',
+        'update_from <fzsd_version>' -> 'update_from',
         'restore_from_stats' -> 'restore_from_stats',
-        'recalculate_total' -> 'recalculate_total_scores'
+        'recalculate_total' -> 'recalculate_total_scores',
+        'commandPlayer <boolean>' -> 'command_player'
+    },
+    'arguments' -> {
+        'boolean' -> {
+            'type' -> 'bool'
+        },
+        'fzsd_version' -> {
+            'type' -> 'term',
+            'suggest' -> [
+                '2.x',
+                '3.0-beta.4'
+            ]
+        }
     }
 };
 
 __on_start() -> (
     global_team_cache = read_file('team_cache', 'json');
-    debug(global_team_cache);
+    if(global_team_cache == null, // carpet 1.4.69 兼容
+        global_team_cache = {};
+    );
     print(player('all'), 'fzsd_score.sc已加载！');
 );
 
 __on_close() -> (
-    debug(global_team_cache);
     delete_file('team_cache', 'json');
     write_file('team_cache', 'json', global_team_cache);
 );
 
 __on_player_connects(player) -> (
-    debug(player ~ 'name');
+    player_type = player ~ 'player_type';
-    debug(player ~ 'player_type');
+    player_team = player ~ 'team';
-    debug(player ~ 'team');
+    player_name = player ~ 'name';
-    debug(global_team_cache);
+    if(player_type == 'fake' && player_team != 'fzsd.module.scoreboard.fake',
-    if(player ~ 'player_type' == 'fake' && player ~ 'team' != 'fz.module.scoreboard.fake',
         (
-            debug('1~');
+            global_team_cache:player_name = player_team;
-            global_team_cache:(player ~ 'name') = player ~ 'team';
+            team_add('fzsd.module.scoreboard.fake', player);
-            debug(global_team_cache);
-            team_add('fz.module.scoreboard.fake', player);
         ),
-        player ~ 'player_type' == 'shadow' && player ~ 'team' != 'fz.module.scoreboard.shadow',
+        player_type == 'shadow' && player_team != 'fzsd.module.scoreboard.shadow',
         (
-            debug('2~');
+            global_team_cache:player_name = player_team;
-            global_team_cache:(player ~ 'name') = player ~ 'team';
+            team_add('fzsd.module.scoreboard.shadow', player);
-            team_add('fz.module.scoreboard.shadow', player);
         ),
         try_restore_team_from_cache(player);
     );
-    debug(global_team_cache);
 );
 
 __on_player_disconnects(player, reason) -> (
-    debug(player ~ 'name');
-    debug(player ~ 'player_type');
-    debug(player ~ 'team');
-    debug(global_team_cache);
     try_restore_team_from_cache(player);
 );
 
 try_restore_team_from_cache(player) -> (
+    player_team = player ~ 'team';
+    player_name = player ~ 'name';
     debug('restore_team_from_cache');
-    if(player ~ 'team' == 'fz.module.scoreboard.fake' 
+    if(player_team == 'fzsd.module.scoreboard.fake' 
-            || player ~ 'team' == 'fz.module.scoreboard.shadow',
+            || player_team == 'fzsd.module.scoreboard.shadow',
-        debug(global_team_cache);
+        if(global_team_cache:player_name == null,
-        if(global_team_cache:(player ~ 'name') == null,
             (
-                debug('global_team_cache:(player ~ \'name\') == null');
                 team_leave(player);
             ),
-                debug('global_team_cache:(player ~ \'name\') != null');
+            team_add(global_team_cache:player_name , player);
-            team_add(global_team_cache:(player ~ 'name') , player);
+            delete(global_team_cache:player_name);
-            delete(global_team_cache:(player ~ 'name'));
         );
     );
 );
 
 help() -> (
-    print('这是一条帮助');
+    print('暂未开发');
     return(0);
 );
 
-delete_old() -> (
+delete_old(fzsd_version) -> (
-    old_scoreboards = [
+    old_scoreboards = [];
-        'usedDiaAxe', 'usedDiaPickaxe', 'usedDiaShovel', 'usedDiaHoe', 'usedIroAxe', 'usedIroPickaxe', 
+    if(fzsd_version == '2.x',
-        'usedIroShovel', 'usedIroHoe', 'usedStoAxe', 'usedStoPickaxe', 'usedStoShovel', 'usedStoHoe', 
+        (
-        'usedWooAxe', 'usedWooPickaxe', 'usedWooShovel', 'usedWooHoe', 'usedGolAxe', 'usedGolPickaxe', 
+            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'];
-        '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'
-    ];
-    for(old_scoreboards, scoreboard_remove(_));
             team_remove('carpetBot');
             team_remove('shadowedPlayer');
+        ),
+        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('已清除旧版计分板！');
     return(0);
 );
 
-restore_merge_old() -> (
+update_from(fzsd_version) -> (
-
+    params = [];
-    merge_score('activation', 'fz.module.scoreboard.display.activation');
+    if(fzsd_version == '2.x',
-    merge_score('damageTaken', 'fz.module.scoreboard.display.damage_taken');
+        (
-    merge_score('deathCounter', 'fz.module.scoreboard.display.death_count');
+            params = [
-    merge_score('digCounter', 'fz.module.scoreboard.display.dig_count');
+                ['activation', 'fzsd.module.scoreboard.display.activation'],
-    merge_score('fishingCounter', 'fz.module.scoreboard.display.fishing_count');
+                ['damageTaken', 'fzsd.module.scoreboard.display.damage_taken'],
-    merge_score('killCounter', 'fz.module.scoreboard.display.kill_count');
+                ['deathCounter', 'fzsd.module.scoreboard.display.death_count'],
-    merge_score('tradingCounter', 'fz.module.scoreboard.display.trade_count');
+                ['digCounter', 'fzsd.module.scoreboard.display.dig_count'],
-    merge_score('bedrockBreaked', 'fz.module.scoreboard.display.bedrock_broke_count');
+                ['fishingCounter', 'fzsd.module.scoreboard.display.fishing_count'],
-    merge_score('fz.aviate1m', 'fz.module.scoreboard.display.aviating_distance');
+                ['killCounter', 'fzsd.module.scoreboard.display.kill_count'],
-    // restore_score('fz.module.scoreboard.display.placement_count', );
+                ['tradingCounter', 'fzsd.module.scoreboard.display.trade_count'],
+                ['bedrockBreaked', 'fzsd.module.scoreboard.display.bedrock_broke_count'],
+                ['fz.aviate1m', 'fzsd.module.scoreboard.display.aviating_distance']
+            ]
+        ),
+        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_broke_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));
 
     // 清除旧计分板
-    delete_old();
+    delete_old(fzsd_version);
 
     print('完成！');
     return(0);
 );
 
-merge_score(from, to) -> (
+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');
-    debug('2' + new_players);
+        )
+    );
+
     for(scoreboard(from),
-        debug('3' + _);
+        if(!(_ ~ '\\W'),
-        debug('3.1' + contains(fake_players, _));
-        debug('3.2' + contains(new_players, _));
-        debug('3.3' + str(_ != total_name_old));
-        debug('3.4' + str((!contains(fake_players, _)
-                || contains(new_players, _)
-            ) && !(_ ~ '\\W')));
-        if((!contains(fake_players, _)
-                || contains(new_players, _)
-            ) && !(_ ~ '\\W'),
-            debug('4' + _);
-            debug('from' + scoreboard(from, _));
-            debug('to' + scoreboard(to, _));
             scoreboard(to, _, scoreboard(to, _) + scoreboard(from, _));
         );
     );
 
+    print('已合并：' + to);
+
     // 重新计算总分
     recalculate_total_score(to, get_total_score_name_new(to));
 
-    print('已合并：' + to);
     return(0);
 );
 
@@ -167,10 +195,10 @@ get_total_score_name_new(scoreboard) -> (
 
     // 将系统总榜分数加上最小int值，使其成为最低分
     scoreboard(
-        'fz.module.scoreboard.assign.general',
+        'fzsd.module.scoreboard.assign.general',
         system_total_name, 
         scoreboard(
-            'fz.module.scoreboard.assign.general', 
+            'fzsd.module.scoreboard.assign.general', 
             system_total_name
         ) + INT_MIN
     );
@@ -189,15 +217,14 @@ get_total_score_name_new(scoreboard) -> (
                 last_min_player = _;
             )
         );
-        debug(_);
     );
 
     // 恢复总榜分数
     scoreboard(
-        'fz.module.scoreboard.assign.general', 
+        'fzsd.module.scoreboard.assign.general', 
         system_total_name, 
         scoreboard(
-            'fz.module.scoreboard.assign.general', 
+            'fzsd.module.scoreboard.assign.general', 
             system_total_name
         ) - INT_MIN
     );
@@ -209,15 +236,15 @@ get_total_score_name_new(scoreboard) -> (
 
 recalculate_total_scores() -> (
     scoreboards = [
-        '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_broke_count', 
-        'fz.module.scoreboard.display.aviating_distance'
+        'fzsd.module.scoreboard.display.aviating_distance'
     ];
     for(scoreboards,recalculate_total_score(_, get_total_score_name_new(_)));
     print('完成！');
@@ -234,7 +261,7 @@ recalculate_total_score(scoreboard, total_score_name_new) -> (
     );
     // 赋值总分到系统总分计分板
     scoreboard(
-        'fz.module.scoreboard.assign.general',
+        'fzsd.module.scoreboard.assign.general',
         replace(scoreboard, 'display', 'total'),
         total_score
     );
@@ -248,12 +275,11 @@ display_total_score(scoreboard) -> (
     str_1 = split('\\.', scoreboard);
     function_name = str_1:(length(str_1) - 1);
     // 运行函数，将分数赋值到显示计分板上
-    run('function #fz:module/scoreboard/assign/scoreboard/general/' + function_name);
+    run('function #fzsd:module/scoreboard/assign/scoreboard/general/' + function_name);
     return(0);
 );
 
 restore_from_stats() -> (
-    
     print('暂未开发');
     return(0);
 );
@@ -263,6 +289,12 @@ merge_stat(scoreboard, ...stats) -> (
     return(0);
 );
 
+command_player(boolean) -> (
+    print(run('carpet setDefault commandPlayer ' + str(boolean)):1:0);
+);
+
+// 工具函数
+
 contains(list, value) -> (
     return(list ~ value != null);
 );