bug修复

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.6'}}
 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/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/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/install.mcfunction

@@ -5,7 +5,7 @@ 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/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/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/tags/functions/system/uninstall/after.json

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