diff --git a/.vscode/settings.json b/.vscode/settings.json index 97c45f7..2182aa2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,9 +7,10 @@ "tagRemove": "tag ${1:target} remove ${2:tag}", "dataModifyStorageFromSelf": "data modify storage ${1:id} ${2:path} set from entity @s ${3:path}", "summonAec": "summon minecraft:area_effect_cloud ~ ~ ~ {Age: -2147483648, Duration: -1, WaitTime: -2147483648, Tags: [\"${1:tag}\"]}", - "logInfo": "tellraw @a [{\"nbt\": \"fz.level.info\", \"interpret\": true, \"storage\": \"fz:logger\"}, {\"text\": \"${1:log_info}\"}]", - "logWarn": "tellraw @a [{\"nbt\": \"fz.level.warn\", \"interpret\": true, \"storage\": \"fz:logger\"}, {\"text\": \"${1:log_warn}\"}]", - "logError": "tellraw @a [{\"nbt\": \"fz.level.error\", \"interpret\": true, \"storage\": \"fz:logger\"}, {\"text\": \"${1:log_error}\"}]", - "logDebug": "execute if data storage fz:logger fz{debug:1b} run tellraw @a [{\"nbt\": \"fz.level.debug\", \"interpret\": true, \"storage\": \"fz:logger\"}, {\"text\": \"${1:log_debug}\"}]", + "logFine": "execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{\"nbt\": \"fz.level.fine\", \"interpret\": true, \"storage\": \"fz:logger\"}, {\"text\": \"${log_fine}\"}", + "logDebug": "execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{\"nbt\": \"fz.level.debug\", \"interpret\": true, \"storage\": \"fz:logger\"}, {\"text\": \"${1:log_debug}\"}]", + "logInfo": "execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{\"nbt\": \"fz.level.info\", \"interpret\": true, \"storage\": \"fz:logger\"}, {\"text\": \"${1:log_info}\"}]", + "logAlert": "execute if score fz.logger.level fz.variable.integer matches ..600 run tellraw @a [{\"nbt\": \"fz.level.warn\", \"interpret\": true, \"storage\": \"fz:logger\"}, {\"text\": \"${1:log_alert}\"}]", + "logError": "execute if score fz.logger.level fz.variable.integer matches ..800 run tellraw @a [{\"nbt\": \"fz.level.error\", \"interpret\": true, \"storage\": \"fz:logger\"}, {\"text\": \"${1:log_error}\"}]", } } \ No newline at end of file diff --git a/DEVDOC.md b/DEVDOC.md index 0a3d6ce..6e6bc9c 100644 --- a/DEVDOC.md +++ b/DEVDOC.md @@ -1,7 +1,6 @@ 1. 主要逻辑和模块逻辑分离 -0. 提供各种工具，位于fz.admin命名空间下，包括 0. 细化版本管理，提供不同版本之间的升级函数，由`update_manager`控制。*务必仔细测试再发布，一旦升级无法降级！* -0. 反馈、警告、报错和调试由`logger`控制。分别对应四个类：`info`、`warn`、`error`、`debug` +0. 反馈、警告、报错、调试等由`logger`控制。 0. 函数由两个以上的函数调用，或由不同包下的函数调用，或需要作为接口开放给下游数据包时，应改用标签调用！ ### 如果需要修改计分板颜色 \ No newline at end of file diff --git a/data/fz/functions/entry.mcfunction b/data/fz/functions/entry.mcfunction index 17f717c..acc98da 100644 --- a/data/fz/functions/entry.mcfunction +++ b/data/fz/functions/entry.mcfunction @@ -1,3 +1,3 @@ -function #fz:init +function #fz:system_load function #fz:install function #fz:load \ No newline at end of file diff --git a/data/fz/functions/load.mcfunction b/data/fz/functions/load.mcfunction index d7491e7..078012b 100644 --- a/data/fz/functions/load.mcfunction +++ b/data/fz/functions/load.mcfunction @@ -1,5 +1,8 @@ # 调用者：#fz:load +## 常量 +scoreboard players set 10 fz.variable.integer 10 + function #fz:module/try_load ## 日志 diff --git a/data/fz/functions/logger/init.mcfunction b/data/fz/functions/logger/init.mcfunction index ad2ef53..075480d 100644 --- a/data/fz/functions/logger/init.mcfunction +++ b/data/fz/functions/logger/init.mcfunction @@ -1,25 +1,25 @@ # 调用者：#fz:logger/init ##### 使用方式，形如：tellraw @a [{"nbt": "fz.exception.load_without_install_exception", "interpret": true, "storage": "fz:logger"}, {"text": "计分板"}] -## 前缀 -### 根 +## 根 data modify storage fz:logger fz.root set value '[{"text": "", "color": "white"}, {"text": "[", "color": "dark_gray"}, {"text": "FZD", "color": "gold"}, {"text": "]", "color": "dark_gray"}]' -### 不同日志等级 -#### error 800 + +## 不同日志等级 +### error 800 data modify storage fz:logger fz.level.error set value '[{"text": "", "color": "red"}, {"nbt": "root", "interpret": true, "storage": "fz:logger"}, {"text": "[错误]"}]' -#### alert 600 +### alert 600 data modify storage fz:logger fz.level.alert set value '[{"text": "", "color": "yellow"}, {"nbt": "fz.root", "interpret": true, "storage": "fz:logger"}, {"text": "[提醒]"}]' -#### info 500 +### info 500 data modify storage fz:logger fz.level.info set value '[{"text": "", "color": "green"}, {"nbt": "fz.root", "interpret": true, "storage": "fz:logger"}, {"text": "[信息]"}]' -#### debug 400 +### debug 400 data modify storage fz:logger fz.level.debug set value '[{"text": "", "color": "dark_aqua"}, {"nbt": "fz.root", "interpret": true, "storage": "fz:logger"}, {"text": "[调试]"}]' -#### fine 300 +### fine 300 data modify storage fz:logger fz.level.fine set value '[{"text": "", "color": "gray"}, {"nbt": "fz.root", "interpret": true, "storage": "fz:logger"}, {"text": "[详细]"}]' ## 异常 data modify storage fz:logger fz.exception.load_without_install_exception set value '[{"nbt": "fz.level.error", "interpret": true, "storage": "fz:logger"}, {"text": "模块在未安装时被加载："}]' -## 第一次安装时日志等级默认为一般消息 +## 首次安装时日志等级默认为一般消息 execute unless data storage fz:logger fz.levels.current run data modify storage fz:logger fz.levels.current set value 500 ## 读取debug等级存入缓存 diff --git a/data/fz/functions/module/scoreboard/display/carousel/loop.mcfunction b/data/fz/functions/module/scoreboard/display/carousel/loop.mcfunction new file mode 100644 index 0000000..997f756 --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/carousel/loop.mcfunction @@ -0,0 +1,10 @@ +# 调用者：#fz:module/scoreboard/display/carousel_controller/loop + +function #fz:module/scoreboard/display/carousel/try_display + +schedule function fz:module/scoreboard/display/carousel/loop 10s replace + +## 自增 +scoreboard players add fz.module.scoreboard.display.current_id fz.variable.integer 1 +## 循环 +execute if score fz.module.scoreboard.display.current_id fz.variable.integer > fz.module.scoreboard.display.highest_id fz.variable.integer run scoreboard players set fz.module.scoreboard.display.current_id fz.variable.integer 0 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel/set_display/activation.mcfunction b/data/fz/functions/module/scoreboard/display/carousel/set_display/activation.mcfunction new file mode 100644 index 0000000..c6d180b --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/carousel/set_display/activation.mcfunction @@ -0,0 +1,22 @@ +# 调用者：fz:module/scoreboard/carousel/try_display/~ + +## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.activation +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.activation +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.activation +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.activation +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.activation +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.activation +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.activation +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.activation +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.activation +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.activation +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 10 run scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.activation +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 11 run scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.activation +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 12 run scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.activation +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.activation +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.activation +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.activation + +## 详细 +execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.activation", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel/set_display/aviating_distance.mcfunction b/data/fz/functions/module/scoreboard/display/carousel/set_display/aviating_distance.mcfunction new file mode 100644 index 0000000..ba0e513 --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/carousel/set_display/aviating_distance.mcfunction @@ -0,0 +1,22 @@ +# 调用者：fz:module/scoreboard/carousel/try_display/~ + +## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.aviating_distance +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.aviating_distance +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.aviating_distance +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.aviating_distance +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.aviating_distance +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.aviating_distance +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.aviating_distance +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.aviating_distance +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.aviating_distance +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.aviating_distance +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 10 run scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.aviating_distance +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 11 run scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.aviating_distance +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 12 run scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.aviating_distance +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.aviating_distance +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.aviating_distance +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.aviating_distance + +## 详细 +execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.aviating_distance", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel/set_display/damage_taken.mcfunction b/data/fz/functions/module/scoreboard/display/carousel/set_display/damage_taken.mcfunction new file mode 100644 index 0000000..15af4e8 --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/carousel/set_display/damage_taken.mcfunction @@ -0,0 +1,22 @@ +# 调用者：fz:module/scoreboard/carousel/try_display/~ + +## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.damage_taken +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.damage_taken +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.damage_taken +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.damage_taken +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.damage_taken +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.damage_taken +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.damage_taken +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.damage_taken +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.damage_taken +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.damage_taken +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 10 run scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.damage_taken +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 11 run scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.damage_taken +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 12 run scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.damage_taken +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.damage_taken +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.damage_taken +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.damage_taken + +## 详细 +execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.damage_taken", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel/set_display/death_count.mcfunction b/data/fz/functions/module/scoreboard/display/carousel/set_display/death_count.mcfunction new file mode 100644 index 0000000..c09b5ca --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/carousel/set_display/death_count.mcfunction @@ -0,0 +1,22 @@ +# 调用者：fz:module/scoreboard/carousel/try_display/~ + +## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.death_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.death_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.death_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.death_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.death_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.death_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.death_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.death_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.death_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.death_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 10 run scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.death_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 11 run scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.death_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 12 run scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.death_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.death_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.death_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.death_count + +## 详细 +execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.death_count", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel/set_display/dig_count.mcfunction b/data/fz/functions/module/scoreboard/display/carousel/set_display/dig_count.mcfunction new file mode 100644 index 0000000..47bf207 --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/carousel/set_display/dig_count.mcfunction @@ -0,0 +1,22 @@ +# 调用者：fz:module/scoreboard/carousel/try_display/~ + +## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.dig_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.dig_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.dig_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.dig_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.dig_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.dig_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.dig_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.dig_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.dig_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.dig_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 10 run scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.dig_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 11 run scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.dig_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 12 run scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.dig_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.dig_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.dig_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.dig_count + +## 详细 +execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.dig_count", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel/set_display/fishing_count.mcfunction b/data/fz/functions/module/scoreboard/display/carousel/set_display/fishing_count.mcfunction new file mode 100644 index 0000000..e41cca4 --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/carousel/set_display/fishing_count.mcfunction @@ -0,0 +1,22 @@ +# 调用者：fz:module/scoreboard/carousel/try_display/~ + +## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.fishing_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.fishing_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.fishing_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.fishing_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.fishing_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.fishing_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.fishing_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.fishing_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.fishing_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.fishing_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 10 run scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.fishing_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 11 run scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.fishing_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 12 run scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.fishing_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.fishing_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.fishing_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.fishing_count + +## 详细 +execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.fishing_count", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel/set_display/general.mcfunction b/data/fz/functions/module/scoreboard/display/carousel/set_display/general.mcfunction new file mode 100644 index 0000000..ffaa439 --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/carousel/set_display/general.mcfunction @@ -0,0 +1,22 @@ +# 调用者：fz:module/scoreboard/carousel/try_display/~ + +## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.general +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.general +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.general +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.general +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.general +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.general +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.general +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.general +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.general +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.general +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 10 run scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.general +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 11 run scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.general +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 12 run scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.general +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.general +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.general +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.general + +## 详细 +execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.general", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel/set_display/kill_count.mcfunction b/data/fz/functions/module/scoreboard/display/carousel/set_display/kill_count.mcfunction new file mode 100644 index 0000000..fe2d058 --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/carousel/set_display/kill_count.mcfunction @@ -0,0 +1,22 @@ +# 调用者：fz:module/scoreboard/carousel/try_display/~ + +## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.kill_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.kill_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.kill_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.kill_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.kill_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.kill_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.kill_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.kill_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.kill_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.kill_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 10 run scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.kill_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 11 run scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.kill_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 12 run scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.kill_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.kill_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.kill_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.kill_count + +## 详细 +execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.kill_count", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel/set_display/trade_count.mcfunction b/data/fz/functions/module/scoreboard/display/carousel/set_display/trade_count.mcfunction new file mode 100644 index 0000000..6386a6b --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/carousel/set_display/trade_count.mcfunction @@ -0,0 +1,22 @@ +# 调用者：fz:module/scoreboard/carousel/try_display/~ + +## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.trade_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.trade_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.trade_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.trade_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.trade_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.trade_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.trade_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.trade_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.trade_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.trade_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 10 run scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.trade_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 11 run scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.trade_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 12 run scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.trade_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.trade_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.trade_count +execute if score fz.module.scoreboard.carousel.color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.trade_count + +## 详细 +execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.trade_count", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel/try_display/activation.mcfunction b/data/fz/functions/module/scoreboard/display/carousel/try_display/activation.mcfunction new file mode 100644 index 0000000..4eb94dd --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/carousel/try_display/activation.mcfunction @@ -0,0 +1 @@ +execute if score fz.module.scoreboard.display.current_id fz.variable.integer = fz.module.scoreboard.display.id.activation fz.variable.integer run function fz:module/scoreboard/display/carousel/set_display/activation \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel/try_display/aviating_distance.mcfunction b/data/fz/functions/module/scoreboard/display/carousel/try_display/aviating_distance.mcfunction new file mode 100644 index 0000000..5bb2d31 --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/carousel/try_display/aviating_distance.mcfunction @@ -0,0 +1 @@ +execute if score fz.module.scoreboard.display.current_id fz.variable.integer = fz.module.scoreboard.display.id.aviating_distance fz.variable.integer run function fz:module/scoreboard/display/carousel/set_display/aviating_distance \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel/try_display/damage_taken.mcfunction b/data/fz/functions/module/scoreboard/display/carousel/try_display/damage_taken.mcfunction new file mode 100644 index 0000000..c72d90f --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/carousel/try_display/damage_taken.mcfunction @@ -0,0 +1 @@ +execute if score fz.module.scoreboard.display.current_id fz.variable.integer = fz.module.scoreboard.display.id.damage_taken fz.variable.integer run function fz:module/scoreboard/display/carousel/set_display/damage_taken \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel/try_display/death_count.mcfunction b/data/fz/functions/module/scoreboard/display/carousel/try_display/death_count.mcfunction new file mode 100644 index 0000000..32b810d --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/carousel/try_display/death_count.mcfunction @@ -0,0 +1 @@ +execute if score fz.module.scoreboard.display.current_id fz.variable.integer = fz.module.scoreboard.display.id.death_count fz.variable.integer run function fz:module/scoreboard/display/carousel/set_display/death_count \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel/try_display/dig_count.mcfunction b/data/fz/functions/module/scoreboard/display/carousel/try_display/dig_count.mcfunction new file mode 100644 index 0000000..025d1d8 --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/carousel/try_display/dig_count.mcfunction @@ -0,0 +1 @@ +execute if score fz.module.scoreboard.display.current_id fz.variable.integer = fz.module.scoreboard.display.id.dig_count fz.variable.integer run function fz:module/scoreboard/display/carousel/set_display/dig_count \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel/try_display/fishing_count.mcfunction b/data/fz/functions/module/scoreboard/display/carousel/try_display/fishing_count.mcfunction new file mode 100644 index 0000000..221fc1e --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/carousel/try_display/fishing_count.mcfunction @@ -0,0 +1 @@ +execute if score fz.module.scoreboard.display.current_id fz.variable.integer = fz.module.scoreboard.display.id.fishing_count fz.variable.integer run function fz:module/scoreboard/display/carousel/set_display/fishing_count \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel/try_display/general.mcfunction b/data/fz/functions/module/scoreboard/display/carousel/try_display/general.mcfunction new file mode 100644 index 0000000..979c511 --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/carousel/try_display/general.mcfunction @@ -0,0 +1 @@ +execute if score fz.module.scoreboard.display.current_id fz.variable.integer = fz.module.scoreboard.display.id.general fz.variable.integer run function fz:module/scoreboard/display/carousel/set_display/general \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel/try_display/kill_count.mcfunction b/data/fz/functions/module/scoreboard/display/carousel/try_display/kill_count.mcfunction new file mode 100644 index 0000000..c16769c --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/carousel/try_display/kill_count.mcfunction @@ -0,0 +1 @@ +execute if score fz.module.scoreboard.display.current_id fz.variable.integer = fz.module.scoreboard.display.id.kill_count fz.variable.integer run function fz:module/scoreboard/display/carousel/set_display/kill_count \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel/try_display/trade_count.mcfunction b/data/fz/functions/module/scoreboard/display/carousel/try_display/trade_count.mcfunction new file mode 100644 index 0000000..ad4e86b --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/carousel/try_display/trade_count.mcfunction @@ -0,0 +1 @@ +execute if score fz.module.scoreboard.display.current_id fz.variable.integer = fz.module.scoreboard.display.id.trade_count fz.variable.integer run function fz:module/scoreboard/display/carousel/set_display/trade_count \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel_controller/loop.mcfunction b/data/fz/functions/module/scoreboard/display/carousel_controller/loop.mcfunction deleted file mode 100644 index a905022..0000000 --- a/data/fz/functions/module/scoreboard/display/carousel_controller/loop.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -# 调用者：#fz:module/scoreboard/display/carousel_controller/loop - -function fz:module/scoreboard/display/carousel_controller/set/general -schedule function fz:module/scoreboard/display/carousel_controller/set/activation 10s replace -schedule function fz:module/scoreboard/display/carousel_controller/set/aviating_distance 20s replace -schedule function fz:module/scoreboard/display/carousel_controller/set/damage_taken 30s replace -schedule function fz:module/scoreboard/display/carousel_controller/set/death_count 40s replace -schedule function fz:module/scoreboard/display/carousel_controller/set/dig_count 50s replace -schedule function fz:module/scoreboard/display/carousel_controller/set/fishing_count 60s replace -schedule function fz:module/scoreboard/display/carousel_controller/set/kill_count 70s replace -schedule function fz:module/scoreboard/display/carousel_controller/set/trade_count 80s replace - -schedule function fz:module/scoreboard/display/carousel_controller/loop 90s replace \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel_controller/set/activation.mcfunction b/data/fz/functions/module/scoreboard/display/carousel_controller/set/activation.mcfunction deleted file mode 100644 index cb53a3a..0000000 --- a/data/fz/functions/module/scoreboard/display/carousel_controller/set/activation.mcfunction +++ /dev/null @@ -1,22 +0,0 @@ -# 调用者：fz:module/scoreboard/carousel_controller/loop - -## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 -execute if score carousel_color fz.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.activation -execute if score carousel_color fz.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.activation -execute if score carousel_color fz.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.activation -execute if score carousel_color fz.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.activation -execute if score carousel_color fz.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.activation -execute if score carousel_color fz.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.activation -execute if score carousel_color fz.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.activation -execute if score carousel_color fz.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.activation -execute if score carousel_color fz.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.activation -execute if score carousel_color fz.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.activation -execute if score carousel_color fz.variable.integer matches 10 run scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.activation -execute if score carousel_color fz.variable.integer matches 11 run scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.activation -execute if score carousel_color fz.variable.integer matches 12 run scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.activation -execute if score carousel_color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.activation -execute if score carousel_color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.activation -execute if score carousel_color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.activation - -## 详细 -execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.activation", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel_controller/set/aviating_distance.mcfunction b/data/fz/functions/module/scoreboard/display/carousel_controller/set/aviating_distance.mcfunction deleted file mode 100644 index 4fc4918..0000000 --- a/data/fz/functions/module/scoreboard/display/carousel_controller/set/aviating_distance.mcfunction +++ /dev/null @@ -1,22 +0,0 @@ -# 调用者：fz:module/scoreboard/carousel_controller/loop - -## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 -execute if score carousel_color fz.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.aviating_distance -execute if score carousel_color fz.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.aviating_distance -execute if score carousel_color fz.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.aviating_distance -execute if score carousel_color fz.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.aviating_distance -execute if score carousel_color fz.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.aviating_distance -execute if score carousel_color fz.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.aviating_distance -execute if score carousel_color fz.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.aviating_distance -execute if score carousel_color fz.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.aviating_distance -execute if score carousel_color fz.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.aviating_distance -execute if score carousel_color fz.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.aviating_distance -execute if score carousel_color fz.variable.integer matches 10 run scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.aviating_distance -execute if score carousel_color fz.variable.integer matches 11 run scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.aviating_distance -execute if score carousel_color fz.variable.integer matches 12 run scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.aviating_distance -execute if score carousel_color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.aviating_distance -execute if score carousel_color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.aviating_distance -execute if score carousel_color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.aviating_distance - -## 详细 -execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.aviating_distance", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel_controller/set/damage_taken.mcfunction b/data/fz/functions/module/scoreboard/display/carousel_controller/set/damage_taken.mcfunction deleted file mode 100644 index 46de946..0000000 --- a/data/fz/functions/module/scoreboard/display/carousel_controller/set/damage_taken.mcfunction +++ /dev/null @@ -1,22 +0,0 @@ -# 调用者：fz:module/scoreboard/carousel_controller/loop - -## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 -execute if score carousel_color fz.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.damage_taken -execute if score carousel_color fz.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.damage_taken -execute if score carousel_color fz.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.damage_taken -execute if score carousel_color fz.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.damage_taken -execute if score carousel_color fz.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.damage_taken -execute if score carousel_color fz.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.damage_taken -execute if score carousel_color fz.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.damage_taken -execute if score carousel_color fz.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.damage_taken -execute if score carousel_color fz.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.damage_taken -execute if score carousel_color fz.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.damage_taken -execute if score carousel_color fz.variable.integer matches 10 run scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.damage_taken -execute if score carousel_color fz.variable.integer matches 11 run scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.damage_taken -execute if score carousel_color fz.variable.integer matches 12 run scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.damage_taken -execute if score carousel_color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.damage_taken -execute if score carousel_color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.damage_taken -execute if score carousel_color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.damage_taken - -## 详细 -execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.damage_taken", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel_controller/set/death_count.mcfunction b/data/fz/functions/module/scoreboard/display/carousel_controller/set/death_count.mcfunction deleted file mode 100644 index 2d4d154..0000000 --- a/data/fz/functions/module/scoreboard/display/carousel_controller/set/death_count.mcfunction +++ /dev/null @@ -1,22 +0,0 @@ -# 调用者：fz:module/scoreboard/carousel_controller/loop - -## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 -execute if score carousel_color fz.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.death_count -execute if score carousel_color fz.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.death_count -execute if score carousel_color fz.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.death_count -execute if score carousel_color fz.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.death_count -execute if score carousel_color fz.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.death_count -execute if score carousel_color fz.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.death_count -execute if score carousel_color fz.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.death_count -execute if score carousel_color fz.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.death_count -execute if score carousel_color fz.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.death_count -execute if score carousel_color fz.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.death_count -execute if score carousel_color fz.variable.integer matches 10 run scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.death_count -execute if score carousel_color fz.variable.integer matches 11 run scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.death_count -execute if score carousel_color fz.variable.integer matches 12 run scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.death_count -execute if score carousel_color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.death_count -execute if score carousel_color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.death_count -execute if score carousel_color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.death_count - -## 详细 -execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.death_count", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel_controller/set/dig_count.mcfunction b/data/fz/functions/module/scoreboard/display/carousel_controller/set/dig_count.mcfunction deleted file mode 100644 index 5d9a94b..0000000 --- a/data/fz/functions/module/scoreboard/display/carousel_controller/set/dig_count.mcfunction +++ /dev/null @@ -1,22 +0,0 @@ -# 调用者：fz:module/scoreboard/carousel_controller/loop - -## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 -execute if score carousel_color fz.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.dig_count -execute if score carousel_color fz.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.dig_count -execute if score carousel_color fz.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.dig_count -execute if score carousel_color fz.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.dig_count -execute if score carousel_color fz.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.dig_count -execute if score carousel_color fz.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.dig_count -execute if score carousel_color fz.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.dig_count -execute if score carousel_color fz.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.dig_count -execute if score carousel_color fz.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.dig_count -execute if score carousel_color fz.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.dig_count -execute if score carousel_color fz.variable.integer matches 10 run scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.dig_count -execute if score carousel_color fz.variable.integer matches 11 run scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.dig_count -execute if score carousel_color fz.variable.integer matches 12 run scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.dig_count -execute if score carousel_color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.dig_count -execute if score carousel_color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.dig_count -execute if score carousel_color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.dig_count - -## 详细 -execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.dig_count", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel_controller/set/fishing_count.mcfunction b/data/fz/functions/module/scoreboard/display/carousel_controller/set/fishing_count.mcfunction deleted file mode 100644 index c5c73cc..0000000 --- a/data/fz/functions/module/scoreboard/display/carousel_controller/set/fishing_count.mcfunction +++ /dev/null @@ -1,22 +0,0 @@ -# 调用者：fz:module/scoreboard/carousel_controller/loop - -## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 -execute if score carousel_color fz.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.fishing_count -execute if score carousel_color fz.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.fishing_count -execute if score carousel_color fz.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.fishing_count -execute if score carousel_color fz.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.fishing_count -execute if score carousel_color fz.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.fishing_count -execute if score carousel_color fz.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.fishing_count -execute if score carousel_color fz.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.fishing_count -execute if score carousel_color fz.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.fishing_count -execute if score carousel_color fz.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.fishing_count -execute if score carousel_color fz.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.fishing_count -execute if score carousel_color fz.variable.integer matches 10 run scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.fishing_count -execute if score carousel_color fz.variable.integer matches 11 run scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.fishing_count -execute if score carousel_color fz.variable.integer matches 12 run scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.fishing_count -execute if score carousel_color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.fishing_count -execute if score carousel_color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.fishing_count -execute if score carousel_color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.fishing_count - -## 详细 -execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.fishing_count", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel_controller/set/general.mcfunction b/data/fz/functions/module/scoreboard/display/carousel_controller/set/general.mcfunction deleted file mode 100644 index 0ddf5ed..0000000 --- a/data/fz/functions/module/scoreboard/display/carousel_controller/set/general.mcfunction +++ /dev/null @@ -1,22 +0,0 @@ -# 调用者：fz:module/scoreboard/carousel_controller/loop - -## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 -execute if score carousel_color fz.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.general -execute if score carousel_color fz.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.general -execute if score carousel_color fz.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.general -execute if score carousel_color fz.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.general -execute if score carousel_color fz.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.general -execute if score carousel_color fz.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.general -execute if score carousel_color fz.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.general -execute if score carousel_color fz.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.general -execute if score carousel_color fz.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.general -execute if score carousel_color fz.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.general -execute if score carousel_color fz.variable.integer matches 10 run scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.general -execute if score carousel_color fz.variable.integer matches 11 run scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.general -execute if score carousel_color fz.variable.integer matches 12 run scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.general -execute if score carousel_color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.general -execute if score carousel_color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.general -execute if score carousel_color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.general - -## 详细 -execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.general", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel_controller/set/kill_count.mcfunction b/data/fz/functions/module/scoreboard/display/carousel_controller/set/kill_count.mcfunction deleted file mode 100644 index ab6f26d..0000000 --- a/data/fz/functions/module/scoreboard/display/carousel_controller/set/kill_count.mcfunction +++ /dev/null @@ -1,22 +0,0 @@ -# 调用者：fz:module/scoreboard/carousel_controller/loop - -## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 -execute if score carousel_color fz.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.kill_count -execute if score carousel_color fz.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.kill_count -execute if score carousel_color fz.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.kill_count -execute if score carousel_color fz.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.kill_count -execute if score carousel_color fz.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.kill_count -execute if score carousel_color fz.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.kill_count -execute if score carousel_color fz.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.kill_count -execute if score carousel_color fz.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.kill_count -execute if score carousel_color fz.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.kill_count -execute if score carousel_color fz.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.kill_count -execute if score carousel_color fz.variable.integer matches 10 run scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.kill_count -execute if score carousel_color fz.variable.integer matches 11 run scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.kill_count -execute if score carousel_color fz.variable.integer matches 12 run scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.kill_count -execute if score carousel_color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.kill_count -execute if score carousel_color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.kill_count -execute if score carousel_color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.kill_count - -## 详细 -execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.kill_count", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/carousel_controller/set/trade_count.mcfunction b/data/fz/functions/module/scoreboard/display/carousel_controller/set/trade_count.mcfunction deleted file mode 100644 index 685fb6e..0000000 --- a/data/fz/functions/module/scoreboard/display/carousel_controller/set/trade_count.mcfunction +++ /dev/null @@ -1,22 +0,0 @@ -# 调用者：fz:module/scoreboard/carousel_controller/loop - -## 判断颜色代码，见：https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81 -execute if score carousel_color fz.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fz.module.scoreboard.display.trade_count -execute if score carousel_color fz.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fz.module.scoreboard.display.trade_count -execute if score carousel_color fz.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fz.module.scoreboard.display.trade_count -execute if score carousel_color fz.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fz.module.scoreboard.display.trade_count -execute if score carousel_color fz.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fz.module.scoreboard.display.trade_count -execute if score carousel_color fz.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fz.module.scoreboard.display.trade_count -execute if score carousel_color fz.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fz.module.scoreboard.display.trade_count -execute if score carousel_color fz.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fz.module.scoreboard.display.trade_count -execute if score carousel_color fz.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fz.module.scoreboard.display.trade_count -execute if score carousel_color fz.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fz.module.scoreboard.display.trade_count -execute if score carousel_color fz.variable.integer matches 10 run scoreboard objectives setdisplay sidebar.team.green fz.module.scoreboard.display.trade_count -execute if score carousel_color fz.variable.integer matches 11 run scoreboard objectives setdisplay sidebar.team.aqua fz.module.scoreboard.display.trade_count -execute if score carousel_color fz.variable.integer matches 12 run scoreboard objectives setdisplay sidebar.team.red fz.module.scoreboard.display.trade_count -execute if score carousel_color fz.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fz.module.scoreboard.display.trade_count -execute if score carousel_color fz.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fz.module.scoreboard.display.trade_count -execute if score carousel_color fz.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fz.module.scoreboard.display.trade_count - -## 详细 -execute if score fz.logger.level fz.variable.integer matches ..300 run tellraw @a [{"nbt": "fz.level.fine", "interpret": true, "storage": "fz:logger"}, {"text": "已为队伍"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "显示"}, {"nbt": "fz.scoreboard.text.trade_count", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/highest_id_add_1.mcfunction b/data/fz/functions/module/scoreboard/display/highest_id_add_1.mcfunction new file mode 100644 index 0000000..4b63708 --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/highest_id_add_1.mcfunction @@ -0,0 +1 @@ +scoreboard players add fz.module.scoreboard.display.highest_id fz.variable.integer 1 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/register_id/activation.mcfunction b/data/fz/functions/module/scoreboard/display/register_id/activation.mcfunction new file mode 100644 index 0000000..6145569 --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/register_id/activation.mcfunction @@ -0,0 +1,3 @@ +#### 注册计分板id +function #fz:calculation/highest_id_add_1 +scoreboard players operation fz.module.scoreboard.display.id.activation fz.variable.integer = fz.module.scoreboard.display.highest_id fz.variable.integer \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/register_id/aviating_distance.mcfunction b/data/fz/functions/module/scoreboard/display/register_id/aviating_distance.mcfunction new file mode 100644 index 0000000..6d56785 --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/register_id/aviating_distance.mcfunction @@ -0,0 +1,3 @@ +#### 注册计分板id +function #fz:calculation/highest_id_add_1 +scoreboard players operation fz.module.scoreboard.display.id.aviating_distance fz.variable.integer = fz.module.scoreboard.display.highest_id fz.variable.integer \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/register_id/damage_taken.mcfunction b/data/fz/functions/module/scoreboard/display/register_id/damage_taken.mcfunction new file mode 100644 index 0000000..c9dc5cf --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/register_id/damage_taken.mcfunction @@ -0,0 +1,3 @@ +#### 注册计分板id +function #fz:calculation/highest_id_add_1 +scoreboard players operation fz.module.scoreboard.display.id.damage_taken fz.variable.integer = fz.module.scoreboard.display.highest_id fz.variable.integer \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/register_id/death_count.mcfunction b/data/fz/functions/module/scoreboard/display/register_id/death_count.mcfunction new file mode 100644 index 0000000..c1645a8 --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/register_id/death_count.mcfunction @@ -0,0 +1,3 @@ +#### 注册计分板id +function #fz:calculation/highest_id_add_1 +scoreboard players operation fz.module.scoreboard.display.id.death_count fz.variable.integer = fz.module.scoreboard.display.highest_id fz.variable.integer \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/register_id/dig_count.mcfunction b/data/fz/functions/module/scoreboard/display/register_id/dig_count.mcfunction new file mode 100644 index 0000000..cd5a6e3 --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/register_id/dig_count.mcfunction @@ -0,0 +1,3 @@ +#### 注册计分板id +function #fz:calculation/highest_id_add_1 +scoreboard players operation fz.module.scoreboard.display.id.dig_count fz.variable.integer = fz.module.scoreboard.display.highest_id fz.variable.integer \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/register_id/fishing_count.mcfunction b/data/fz/functions/module/scoreboard/display/register_id/fishing_count.mcfunction new file mode 100644 index 0000000..86b42b1 --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/register_id/fishing_count.mcfunction @@ -0,0 +1,3 @@ +#### 注册计分板id +function #fz:calculation/highest_id_add_1 +scoreboard players operation fz.module.scoreboard.display.id.fishing_count fz.variable.integer = fz.module.scoreboard.display.highest_id fz.variable.integer \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/register_id/general.mcfunction b/data/fz/functions/module/scoreboard/display/register_id/general.mcfunction new file mode 100644 index 0000000..7238295 --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/register_id/general.mcfunction @@ -0,0 +1,3 @@ +#### 注册计分板id +function #fz:calculation/highest_id_add_1 +scoreboard players operation fz.module.scoreboard.display.id.general fz.variable.integer = fz.module.scoreboard.display.highest_id fz.variable.integer \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/register_id/kill_count.mcfunction b/data/fz/functions/module/scoreboard/display/register_id/kill_count.mcfunction new file mode 100644 index 0000000..1584399 --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/register_id/kill_count.mcfunction @@ -0,0 +1,3 @@ +#### 注册计分板id +function #fz:calculation/highest_id_add_1 +scoreboard players operation fz.module.scoreboard.display.id.kill_count fz.variable.integer = fz.module.scoreboard.display.highest_id fz.variable.integer \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/register_id/trade_count.mcfunction b/data/fz/functions/module/scoreboard/display/register_id/trade_count.mcfunction new file mode 100644 index 0000000..015217c --- /dev/null +++ b/data/fz/functions/module/scoreboard/display/register_id/trade_count.mcfunction @@ -0,0 +1,3 @@ +#### 注册计分板id +function #fz:calculation/highest_id_add_1 +scoreboard players operation fz.module.scoreboard.display.id.trade_count fz.variable.integer = fz.module.scoreboard.display.highest_id fz.variable.integer \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_text/carousel/aqua.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/aqua.mcfunction index 2b694a7..c35fc0a 100644 --- a/data/fz/functions/module/scoreboard/display/set_text/carousel/aqua.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/aqua.mcfunction @@ -3,4 +3,4 @@ data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "aqua"}' team modify fz.module.scoreboard.display.carousel color aqua team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "aqua"} -scoreboard players set carousel_color fz.variable.integer 11 \ No newline at end of file +scoreboard players set fz.module.scoreboard.carousel.color fz.variable.integer 11 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_text/carousel/black.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/black.mcfunction index eb0958d..b26f43d 100644 --- a/data/fz/functions/module/scoreboard/display/set_text/carousel/black.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/black.mcfunction @@ -3,4 +3,4 @@ data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "black"}' team modify fz.module.scoreboard.display.carousel color black team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "black"} -scoreboard players set carousel_color fz.variable.integer 0 \ No newline at end of file +scoreboard players set fz.module.scoreboard.carousel.color fz.variable.integer 0 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_text/carousel/blue.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/blue.mcfunction index c8afacf..e589909 100644 --- a/data/fz/functions/module/scoreboard/display/set_text/carousel/blue.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/blue.mcfunction @@ -3,4 +3,4 @@ data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "blue"}' team modify fz.module.scoreboard.display.carousel color blue team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "blue"} -scoreboard players set carousel_color fz.variable.integer 9 \ No newline at end of file +scoreboard players set fz.module.scoreboard.carousel.color fz.variable.integer 9 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_aqua.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_aqua.mcfunction index 32f2875..87bc8ca 100644 --- a/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_aqua.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_aqua.mcfunction @@ -3,4 +3,4 @@ data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "dark_aqua"}' team modify fz.module.scoreboard.display.carousel color dark_aqua team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "dark_aqua"} -scoreboard players set carousel_color fz.variable.integer 3 \ No newline at end of file +scoreboard players set fz.module.scoreboard.carousel.color fz.variable.integer 3 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_blue.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_blue.mcfunction index 0d12238..8a960d9 100644 --- a/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_blue.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_blue.mcfunction @@ -3,4 +3,4 @@ data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "dark_blue"}' team modify fz.module.scoreboard.display.carousel color dark_blue team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "dark_blue"} -scoreboard players set carousel_color fz.variable.integer 1 \ No newline at end of file +scoreboard players set fz.module.scoreboard.carousel.color fz.variable.integer 1 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_gray.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_gray.mcfunction index 2625e6e..74769ef 100644 --- a/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_gray.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_gray.mcfunction @@ -3,4 +3,4 @@ data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "dark_gray"}' team modify fz.module.scoreboard.display.carousel color dark_gray team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "dark_gray"} -scoreboard players set carousel_color fz.variable.integer 8 \ No newline at end of file +scoreboard players set fz.module.scoreboard.carousel.color fz.variable.integer 8 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_green.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_green.mcfunction index eeb04ce..ccb032b 100644 --- a/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_green.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_green.mcfunction @@ -3,4 +3,4 @@ data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "dark_green"}' team modify fz.module.scoreboard.display.carousel color dark_green team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "dark_green"} -scoreboard players set carousel_color fz.variable.integer 2 \ No newline at end of file +scoreboard players set fz.module.scoreboard.carousel.color fz.variable.integer 2 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_purple.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_purple.mcfunction index 937cca2..0ff229e 100644 --- a/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_purple.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_purple.mcfunction @@ -3,4 +3,4 @@ data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "dark_purple"}' team modify fz.module.scoreboard.display.carousel color dark_purple team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "dark_purple"} -scoreboard players set carousel_color fz.variable.integer 5 \ No newline at end of file +scoreboard players set fz.module.scoreboard.carousel.color fz.variable.integer 5 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_red.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_red.mcfunction index 28436e4..b8beed6 100644 --- a/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_red.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/dark_red.mcfunction @@ -3,4 +3,4 @@ data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "dark_red"}' team modify fz.module.scoreboard.display.carousel color dark_red team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "dark_red"} -scoreboard players set carousel_color fz.variable.integer 4 \ No newline at end of file +scoreboard players set fz.module.scoreboard.carousel.color fz.variable.integer 4 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_text/carousel/gold.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/gold.mcfunction index 86a9b4a..4ebd468 100644 --- a/data/fz/functions/module/scoreboard/display/set_text/carousel/gold.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/gold.mcfunction @@ -3,4 +3,4 @@ data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "gold"}' team modify fz.module.scoreboard.display.carousel color gold team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "gold"} -scoreboard players set carousel_color fz.variable.integer 6 \ No newline at end of file +scoreboard players set fz.module.scoreboard.carousel.color fz.variable.integer 6 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_text/carousel/gray.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/gray.mcfunction index 6b84f74..ac4e3b2 100644 --- a/data/fz/functions/module/scoreboard/display/set_text/carousel/gray.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/gray.mcfunction @@ -3,4 +3,4 @@ data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "gray"}' team modify fz.module.scoreboard.display.carousel color gray team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "gray"} -scoreboard players set carousel_color fz.variable.integer 7 \ No newline at end of file +scoreboard players set fz.module.scoreboard.carousel.color fz.variable.integer 7 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_text/carousel/green.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/green.mcfunction index 813af89..66796b1 100644 --- a/data/fz/functions/module/scoreboard/display/set_text/carousel/green.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/green.mcfunction @@ -3,4 +3,4 @@ data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "green"}' team modify fz.module.scoreboard.display.carousel color green team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "green"} -scoreboard players set carousel_color fz.variable.integer 10 \ No newline at end of file +scoreboard players set fz.module.scoreboard.carousel.color fz.variable.integer 10 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_text/carousel/light_purple.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/light_purple.mcfunction index 46b70c1..11a45a6 100644 --- a/data/fz/functions/module/scoreboard/display/set_text/carousel/light_purple.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/light_purple.mcfunction @@ -3,4 +3,4 @@ data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "light_purple"}' team modify fz.module.scoreboard.display.carousel color light_purple team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "light_purple"} -scoreboard players set carousel_color fz.variable.integer 13 \ No newline at end of file +scoreboard players set fz.module.scoreboard.carousel.color fz.variable.integer 13 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_text/carousel/red.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/red.mcfunction index 5345a0b..c0d64a0 100644 --- a/data/fz/functions/module/scoreboard/display/set_text/carousel/red.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/red.mcfunction @@ -3,4 +3,4 @@ data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "red"}' team modify fz.module.scoreboard.display.carousel color red team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "red"} -scoreboard players set carousel_color fz.variable.integer 12 \ No newline at end of file +scoreboard players set fz.module.scoreboard.carousel.color fz.variable.integer 12 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_text/carousel/white.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/white.mcfunction index 06631ab..2300b13 100644 --- a/data/fz/functions/module/scoreboard/display/set_text/carousel/white.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/white.mcfunction @@ -3,4 +3,4 @@ data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "white"}' team modify fz.module.scoreboard.display.carousel color white team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "white"} -scoreboard players set carousel_color fz.variable.integer 15 \ No newline at end of file +scoreboard players set fz.module.scoreboard.carousel.color fz.variable.integer 15 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/display/set_text/carousel/yellow.mcfunction b/data/fz/functions/module/scoreboard/display/set_text/carousel/yellow.mcfunction index b048840..1138261 100644 --- a/data/fz/functions/module/scoreboard/display/set_text/carousel/yellow.mcfunction +++ b/data/fz/functions/module/scoreboard/display/set_text/carousel/yellow.mcfunction @@ -3,4 +3,4 @@ data modify storage fz:module fz.scoreboard.text.carousel set value '{"text": "轮播", "color": "yellow"}' team modify fz.module.scoreboard.display.carousel color yellow team modify fz.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "yellow"} -scoreboard players set carousel_color fz.variable.integer 14 \ No newline at end of file +scoreboard players set fz.module.scoreboard.carousel.color fz.variable.integer 14 \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/install.mcfunction b/data/fz/functions/module/scoreboard/install.mcfunction index 356f164..ba3b769 100644 --- a/data/fz/functions/module/scoreboard/install.mcfunction +++ b/data/fz/functions/module/scoreboard/install.mcfunction @@ -1,5 +1,6 @@ # 调用者：#fz:module/scoreboard/install + ## 主计分板 ###### 判据均为dummy，便于升级维护！ diff --git a/data/fz/functions/module/scoreboard/load.mcfunction b/data/fz/functions/module/scoreboard/load.mcfunction index 21ba271..002c9f2 100644 --- a/data/fz/functions/module/scoreboard/load.mcfunction +++ b/data/fz/functions/module/scoreboard/load.mcfunction @@ -1,10 +1,7 @@ # 调用者：#fz:module/scoreboard/load ## 异常检测 -execute unless data storage fz:install_manager fz.module{scoreboard: 1b} if score fz.logger.level fz.variable.integer matches ..800 run tellraw @a [{"nbt": "fz.exception.load_without_install_exception", "interpret": true, "storage": "fz:logger"}, {"text": "计分板"}] - -## 设置颜色和名称 -function #fz:module/scoreboard/display/set_text/set_all +execute unless data storage fz:install_manager fz.module{scoreboard: 1b} run tellraw @a [{"nbt": "fz.exception.load_without_install_exception", "interpret": true, "storage": "fz:logger"}, {"text": "计分板"}] ## 调试 execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "计分板显示文本已设为："}] @@ -18,8 +15,16 @@ execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @ execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"text": "", "color": "green"}, {"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "fz.module.scoreboard.display.kill_count - "}, {"nbt": "fz.scoreboard.text.kill_count", "interpret": true, "storage": "fz:module"}] execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"text": "", "color": "green"}, {"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "fz.module.scoreboard.display.trade_count - "}, {"nbt": "fz.scoreboard.text.trade_count", "interpret": true, "storage": "fz:module"}] +## 初始化计分板 +### 重置计分板最大id计数 +scoreboard players set fz.module.scoreboard.display.highest_id fz.variable.integer -1 +### 设置颜色、名称、运行时数字id，同时会计算最大id数 +function #fz:module/scoreboard/display/init + +## 重置轮播计分板ID +scoreboard players set fz.module.scoreboard.display.current_id fz.variable.integer 0 ## 开启轮播循环 -function fz:module/scoreboard/display/carousel_controller/loop +function fz:module/scoreboard/display/carousel/loop ## 日志 execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "已加载组件：计分板"}] \ No newline at end of file diff --git a/data/fz/functions/init.mcfunction b/data/fz/functions/system_load.mcfunction similarity index 100% rename from data/fz/functions/init.mcfunction rename to data/fz/functions/system_load.mcfunction diff --git a/data/fz/tags/functions/calculation/highest_id_add_1.json b/data/fz/tags/functions/calculation/highest_id_add_1.json new file mode 100644 index 0000000..71b793a --- /dev/null +++ b/data/fz/tags/functions/calculation/highest_id_add_1.json @@ -0,0 +1,6 @@ +{ + "replace": true, + "values": [ + "fz:module/scoreboard/display/highest_id_add_1" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/carousel/try_display.json b/data/fz/tags/functions/module/scoreboard/display/carousel/try_display.json new file mode 100644 index 0000000..c1f168b --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/display/carousel/try_display.json @@ -0,0 +1,14 @@ +{ + "replace": false, + "values": [ + "#fz:module/scoreboard/display/carousel/try_display/activation", + "#fz:module/scoreboard/display/carousel/try_display/aviating_distance", + "#fz:module/scoreboard/display/carousel/try_display/damage_taken", + "#fz:module/scoreboard/display/carousel/try_display/death_count", + "#fz:module/scoreboard/display/carousel/try_display/dig_count", + "#fz:module/scoreboard/display/carousel/try_display/fishing_count", + "#fz:module/scoreboard/display/carousel/try_display/general", + "#fz:module/scoreboard/display/carousel/try_display/kill_count", + "#fz:module/scoreboard/display/carousel/try_display/trade_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/activation.json b/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/activation.json new file mode 100644 index 0000000..26a6596 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/activation.json @@ -0,0 +1,8 @@ +{ + "__comment_replace": "编写扩展数据包时必须为true", + "replace": false, + "__comment_values": "此处只能填入一个函数！", + "values": [ + "fz:module/scoreboard/display/carousel/try_display/activation" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/aviating_distance.json b/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/aviating_distance.json new file mode 100644 index 0000000..f8cf85d --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/aviating_distance.json @@ -0,0 +1,8 @@ +{ + "__comment_replace": "编写扩展数据包时必须为true", + "replace": false, + "__comment_values": "此处只能填入一个函数！", + "values": [ + "fz:module/scoreboard/display/carousel/try_display/aviating_distance" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/damage_taken.json b/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/damage_taken.json new file mode 100644 index 0000000..69849cf --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/damage_taken.json @@ -0,0 +1,8 @@ +{ + "__comment_replace": "编写扩展数据包时必须为true", + "replace": false, + "__comment_values": "此处只能填入一个函数！", + "values": [ + "fz:module/scoreboard/display/carousel/try_display/damage_taken" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/death_count.json b/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/death_count.json new file mode 100644 index 0000000..bb61d87 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/death_count.json @@ -0,0 +1,8 @@ +{ + "__comment_replace": "编写扩展数据包时必须为true", + "replace": false, + "__comment_values": "此处只能填入一个函数！", + "values": [ + "fz:module/scoreboard/display/carousel/try_display/death_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/dig_count.json b/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/dig_count.json new file mode 100644 index 0000000..5c9bdbd --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/dig_count.json @@ -0,0 +1,8 @@ +{ + "__comment_replace": "编写扩展数据包时必须为true", + "replace": false, + "__comment_values": "此处只能填入一个函数！", + "values": [ + "fz:module/scoreboard/display/carousel/try_display/dig_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/fishing_count.json b/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/fishing_count.json new file mode 100644 index 0000000..4e3435c --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/fishing_count.json @@ -0,0 +1,8 @@ +{ + "__comment_replace": "编写扩展数据包时必须为true", + "replace": false, + "__comment_values": "此处只能填入一个函数！", + "values": [ + "fz:module/scoreboard/display/carousel/try_display/fishing_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/general.json b/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/general.json new file mode 100644 index 0000000..3aa495d --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/general.json @@ -0,0 +1,8 @@ +{ + "__comment_replace": "编写扩展数据包时必须为true", + "replace": false, + "__comment_values": "此处只能填入一个函数！", + "values": [ + "fz:module/scoreboard/display/carousel/try_display/general" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/kill_count.json b/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/kill_count.json new file mode 100644 index 0000000..b07fdb0 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/kill_count.json @@ -0,0 +1,8 @@ +{ + "__comment_replace": "编写扩展数据包时必须为true", + "replace": false, + "__comment_values": "此处只能填入一个函数！", + "values": [ + "fz:module/scoreboard/display/carousel/try_display/kill_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/trade_count.json b/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/trade_count.json new file mode 100644 index 0000000..75907b5 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/display/carousel/try_display/trade_count.json @@ -0,0 +1,8 @@ +{ + "__comment_replace": "编写扩展数据包时必须为true", + "replace": false, + "__comment_values": "此处只能填入一个函数！", + "values": [ + "fz:module/scoreboard/display/carousel/try_display/trade_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/init.json b/data/fz/tags/functions/module/scoreboard/display/init.json new file mode 100644 index 0000000..b5a51e7 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/display/init.json @@ -0,0 +1,20 @@ +{ + "__comments": [ + "调用者：fz:module/scoreboard/load", + "用于在加载时储存计分板颜色，不同计分板不得使用同一颜色！", + "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" + ], + "replace": false, + "values": [ + "#fz:module/scoreboard/display/init/carousel", + "#fz:module/scoreboard/display/init/activation", + "#fz:module/scoreboard/display/init/aviating_distance", + "#fz:module/scoreboard/display/init/damage_taken", + "#fz:module/scoreboard/display/init/death_count", + "#fz:module/scoreboard/display/init/dig_count", + "#fz:module/scoreboard/display/init/fishing_count", + "#fz:module/scoreboard/display/init/general", + "#fz:module/scoreboard/display/init/kill_count", + "#fz:module/scoreboard/display/init/trade_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_text/activation.json b/data/fz/tags/functions/module/scoreboard/display/init/activation.json similarity index 61% rename from data/fz/tags/functions/module/scoreboard/display/set_text/activation.json rename to data/fz/tags/functions/module/scoreboard/display/init/activation.json index 1979879..6bee3f7 100644 --- a/data/fz/tags/functions/module/scoreboard/display/set_text/activation.json +++ b/data/fz/tags/functions/module/scoreboard/display/init/activation.json @@ -1,13 +1,13 @@ { "__comments": [ - "调用者：#fz:module/scoreboard/display/set_text/store_all", + "调用者：#fz:module/scoreboard/display/init", "用于在加载时储存计分板颜色，不同计分板不得使用同一颜色！", "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" ], "__comment_replace": "编写扩展数据包时必须为true", "replace": false, - "__comment_values": "此处只能填入一个函数！", "values": [ - "fz:module/scoreboard/display/set_text/activation/aqua" + "fz:module/scoreboard/display/set_text/activation/aqua", + "fz:module/scoreboard/display/register_id/activation" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_text/aviating_distance.json b/data/fz/tags/functions/module/scoreboard/display/init/aviating_distance.json similarity index 71% rename from data/fz/tags/functions/module/scoreboard/display/set_text/aviating_distance.json rename to data/fz/tags/functions/module/scoreboard/display/init/aviating_distance.json index 28d27a1..e7f3fa1 100644 --- a/data/fz/tags/functions/module/scoreboard/display/set_text/aviating_distance.json +++ b/data/fz/tags/functions/module/scoreboard/display/init/aviating_distance.json @@ -1,13 +1,13 @@ { "__comments": [ - "调用者：#fz:module/scoreboard/display/set_text/store_all", + "调用者：#fz:module/scoreboard/display/init", "用于在加载时储存计分板颜色，不同计分板不得使用同一颜色！", "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" ], "__comment_replace": "编写扩展数据包时必须为true", "replace": false, - "__comment_values": "此处只能填入一个函数！", "values": [ - "fz:module/scoreboard/display/set_text/aviating_distance/light_purple" + "fz:module/scoreboard/display/set_text/aviating_distance/light_purple", + "fz:module/scoreboard/display/register_id/aviating_distance" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_text/carousel.json b/data/fz/tags/functions/module/scoreboard/display/init/carousel.json similarity index 72% rename from data/fz/tags/functions/module/scoreboard/display/set_text/carousel.json rename to data/fz/tags/functions/module/scoreboard/display/init/carousel.json index bc88e8f..66e7306 100644 --- a/data/fz/tags/functions/module/scoreboard/display/set_text/carousel.json +++ b/data/fz/tags/functions/module/scoreboard/display/init/carousel.json @@ -1,12 +1,11 @@ { "__comments": [ - "调用者：#fz:module/scoreboard/display/set_text/store_all", + "调用者：#fz:module/scoreboard/display/init", "用于在加载时储存计分板颜色，不同计分板不得使用同一颜色！", "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" ], "__comment_replace": "编写扩展数据包时必须为true", "replace": false, - "__comment_values": "此处只能填入一个函数！", "values": [ "fz:module/scoreboard/display/set_text/carousel/gold" ] diff --git a/data/fz/tags/functions/module/scoreboard/display/set_text/damage_taken.json b/data/fz/tags/functions/module/scoreboard/display/init/damage_taken.json similarity index 72% rename from data/fz/tags/functions/module/scoreboard/display/set_text/damage_taken.json rename to data/fz/tags/functions/module/scoreboard/display/init/damage_taken.json index 3286a36..b915bc0 100644 --- a/data/fz/tags/functions/module/scoreboard/display/set_text/damage_taken.json +++ b/data/fz/tags/functions/module/scoreboard/display/init/damage_taken.json @@ -1,13 +1,13 @@ { "__comments": [ - "调用者：#fz:module/scoreboard/display/set_text/store_all", + "调用者：#fz:module/scoreboard/display/init", "用于在加载时储存计分板颜色，不同计分板不得使用同一颜色！", "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" ], "__comment_replace": "编写扩展数据包时必须为true", "replace": false, - "__comment_values": "此处只能填入一个函数！", "values": [ - "fz:module/scoreboard/display/set_text/damage_taken/yellow" + "fz:module/scoreboard/display/set_text/damage_taken/yellow", + "fz:module/scoreboard/display/register_id/damage_taken" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_text/death_count.json b/data/fz/tags/functions/module/scoreboard/display/init/death_count.json similarity index 72% rename from data/fz/tags/functions/module/scoreboard/display/set_text/death_count.json rename to data/fz/tags/functions/module/scoreboard/display/init/death_count.json index a1d4f98..f22f472 100644 --- a/data/fz/tags/functions/module/scoreboard/display/set_text/death_count.json +++ b/data/fz/tags/functions/module/scoreboard/display/init/death_count.json @@ -1,13 +1,13 @@ { "__comments": [ - "调用者：#fz:module/scoreboard/display/set_text/store_all", + "调用者：#fz:module/scoreboard/display/init", "用于在加载时储存计分板颜色，不同计分板不得使用同一颜色！", "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" ], "__comment_replace": "编写扩展数据包时必须为true", "replace": false, - "__comment_values": "此处只能填入一个函数！", "values": [ - "fz:module/scoreboard/display/set_text/death_count/dark_red" + "fz:module/scoreboard/display/set_text/death_count/dark_red", + "fz:module/scoreboard/display/register_id/death_count" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_text/dig_count.json b/data/fz/tags/functions/module/scoreboard/display/init/dig_count.json similarity index 61% rename from data/fz/tags/functions/module/scoreboard/display/set_text/dig_count.json rename to data/fz/tags/functions/module/scoreboard/display/init/dig_count.json index 9aedc5b..728838b 100644 --- a/data/fz/tags/functions/module/scoreboard/display/set_text/dig_count.json +++ b/data/fz/tags/functions/module/scoreboard/display/init/dig_count.json @@ -1,13 +1,13 @@ { "__comments": [ - "调用者：#fz:module/scoreboard/display/set_text/store_all", + "调用者：#fz:module/scoreboard/display/init", "用于在加载时储存计分板颜色，不同计分板不得使用同一颜色！", "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" ], "__comment_replace": "编写扩展数据包时必须为true", "replace": false, - "__comment_values": "此处只能填入一个函数！", "values": [ - "fz:module/scoreboard/display/set_text/dig_count/gray" + "fz:module/scoreboard/display/set_text/dig_count/gray", + "fz:module/scoreboard/display/register_id/dig_count" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_text/fishing_count.json b/data/fz/tags/functions/module/scoreboard/display/init/fishing_count.json similarity index 72% rename from data/fz/tags/functions/module/scoreboard/display/set_text/fishing_count.json rename to data/fz/tags/functions/module/scoreboard/display/init/fishing_count.json index 9cb383e..c5f2e2e 100644 --- a/data/fz/tags/functions/module/scoreboard/display/set_text/fishing_count.json +++ b/data/fz/tags/functions/module/scoreboard/display/init/fishing_count.json @@ -1,13 +1,13 @@ { "__comments": [ - "调用者：#fz:module/scoreboard/display/set_text/store_all", + "调用者：#fz:module/scoreboard/display/init", "用于在加载时储存计分板颜色，不同计分板不得使用同一颜色！", "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" ], "__comment_replace": "编写扩展数据包时必须为true", "replace": false, - "__comment_values": "此处只能填入一个函数！", "values": [ - "fz:module/scoreboard/display/set_text/fishing_count/blue" + "fz:module/scoreboard/display/set_text/fishing_count/blue", + "fz:module/scoreboard/display/register_id/fishing_count" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_text/general.json b/data/fz/tags/functions/module/scoreboard/display/init/general.json similarity index 72% rename from data/fz/tags/functions/module/scoreboard/display/set_text/general.json rename to data/fz/tags/functions/module/scoreboard/display/init/general.json index 2c5952d..53272fe 100644 --- a/data/fz/tags/functions/module/scoreboard/display/set_text/general.json +++ b/data/fz/tags/functions/module/scoreboard/display/init/general.json @@ -1,13 +1,13 @@ { "__comments": [ - "调用者：#fz:module/scoreboard/display/set_text/store_all", + "调用者：#fz:module/scoreboard/display/init", "用于在加载时储存计分板颜色，不同计分板不得使用同一颜色！", "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" ], "__comment_replace": "编写扩展数据包时必须为true", "replace": false, - "__comment_values": "此处只能填入一个函数！", "values": [ - "fz:module/scoreboard/display/set_text/general/dark_aqua" + "fz:module/scoreboard/display/set_text/general/dark_aqua", + "fz:module/scoreboard/display/register_id/general" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_text/kill_count.json b/data/fz/tags/functions/module/scoreboard/display/init/kill_count.json similarity index 61% rename from data/fz/tags/functions/module/scoreboard/display/set_text/kill_count.json rename to data/fz/tags/functions/module/scoreboard/display/init/kill_count.json index 63c1222..028d3af 100644 --- a/data/fz/tags/functions/module/scoreboard/display/set_text/kill_count.json +++ b/data/fz/tags/functions/module/scoreboard/display/init/kill_count.json @@ -1,13 +1,13 @@ { "__comments": [ - "调用者：#fz:module/scoreboard/display/set_text/store_all", + "调用者：#fz:module/scoreboard/display/init", "用于在加载时储存计分板颜色，不同计分板不得使用同一颜色！", "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" ], "__comment_replace": "编写扩展数据包时必须为true", "replace": false, - "__comment_values": "此处只能填入一个函数！", "values": [ - "fz:module/scoreboard/display/set_text/kill_count/red" + "fz:module/scoreboard/display/set_text/kill_count/red", + "fz:module/scoreboard/display/register_id/kill_count" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_text/trade_count.json b/data/fz/tags/functions/module/scoreboard/display/init/trade_count.json similarity index 72% rename from data/fz/tags/functions/module/scoreboard/display/set_text/trade_count.json rename to data/fz/tags/functions/module/scoreboard/display/init/trade_count.json index 2c99a51..92ebbb6 100644 --- a/data/fz/tags/functions/module/scoreboard/display/set_text/trade_count.json +++ b/data/fz/tags/functions/module/scoreboard/display/init/trade_count.json @@ -1,13 +1,13 @@ { "__comments": [ - "调用者：#fz:module/scoreboard/display/set_text/store_all", + "调用者：#fz:module/scoreboard/display/init", "用于在加载时储存计分板颜色，不同计分板不得使用同一颜色！", "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" ], "__comment_replace": "编写扩展数据包时必须为true", "replace": false, - "__comment_values": "此处只能填入一个函数！", "values": [ - "fz:module/scoreboard/display/set_text/trade_count/green" + "fz:module/scoreboard/display/set_text/trade_count/green", + "fz:module/scoreboard/display/register_id/trade_count" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/display/set_text/set_all.json b/data/fz/tags/functions/module/scoreboard/display/set_text/set_all.json deleted file mode 100644 index b656fff..0000000 --- a/data/fz/tags/functions/module/scoreboard/display/set_text/set_all.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "__comments": [ - "调用者：fz:module/scoreboard/load", - "用于在加载时储存计分板颜色，不同计分板不得使用同一颜色！", - "建议不要直接修改本文件，可编写扩展数据包并覆写本标签！" - ], - "replace": false, - "values": [ - "#fz:module/scoreboard/display/set_text/carousel", - "#fz:module/scoreboard/display/set_text/activation", - "#fz:module/scoreboard/display/set_text/aviating_distance", - "#fz:module/scoreboard/display/set_text/damage_taken", - "#fz:module/scoreboard/display/set_text/death_count", - "#fz:module/scoreboard/display/set_text/dig_count", - "#fz:module/scoreboard/display/set_text/fishing_count", - "#fz:module/scoreboard/display/set_text/general", - "#fz:module/scoreboard/display/set_text/kill_count", - "#fz:module/scoreboard/display/set_text/trade_count" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/init.json b/data/fz/tags/functions/system_load.json similarity index 65% rename from data/fz/tags/functions/init.json rename to data/fz/tags/functions/system_load.json index 8db0474..886dbc0 100644 --- a/data/fz/tags/functions/init.json +++ b/data/fz/tags/functions/system_load.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "fz:init" + "fz:system_load" ] } \ No newline at end of file