From 90a4a618557e9b828234ec37983213f3b16accaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BB=B6=E7=9A=93?= <1214946206@qq.com> Date: Tue, 19 Jul 2022 20:53:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E4=BA=A4=E4=BA=92=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 3 ++- DEVDOC.md | 2 +- data/fz/functions/entry.mcfunction | 1 + .../module/config/event/on_unsneak.mcfunction | 3 --- data/fz/functions/module/config/loop.mcfunction | 6 ------ .../module/config/reset_timeout.mcfunction | 2 -- .../get_dimension_message/if_overworld.mcfunction | 6 +++--- .../get_dimension_message/if_the_nether.mcfunction | 6 +++--- .../functions/module/here/get_message.mcfunction | 12 ++++++------ .../module/here/global_message.mcfunction | 2 +- data/fz/functions/module/here/install.mcfunction | 5 +---- .../module/here/interactor/display.mcfunction | 1 + .../module/here/interactor/on_click.mcfunction | 2 ++ .../module/here/private_message.mcfunction | 2 +- data/fz/functions/module/here/uninstall.mcfunction | 2 +- .../module/interactor/event/on_unsneak.mcfunction | 3 +++ .../{config => interactor}/install.mcfunction | 4 ++-- .../module/{config => interactor}/load.mcfunction | 4 ++-- .../fz/functions/module/interactor/loop.mcfunction | 6 ++++++ .../{config => interactor}/on_click.mcfunction | 4 ++-- .../on_interact.mcfunction} | 0 .../module/interactor/reset_timeout.mcfunction | 2 ++ .../reset_trigger.mcfunction | 6 +++--- .../{config => interactor}/timeout.mcfunction | 2 +- .../{config => interactor}/uninstall.mcfunction | 6 +++--- .../module/last_death/get_death_point.mcfunction | 7 +++---- .../functions/module/last_death/install.mcfunction | 4 +--- .../last_death/interactor/display.mcfunction | 1 + .../last_death/interactor/on_click.mcfunction | 1 + .../module/last_death/private_message.mcfunction | 3 ++- .../module/last_death/uninstall.mcfunction | 2 +- .../last_nether_portal/get_message.mcfunction | 5 ++++- .../last_nether_portal/global_message.mcfunction | 3 ++- .../module/last_nether_portal/install.mcfunction | 8 +++++++- .../interactor/display.mcfunction | 1 + .../interactor/on_click.mcfunction | 2 ++ .../last_nether_portal/private_message.mcfunction | 3 ++- .../module/last_nether_portal/uninstall.mcfunction | 9 ++++++++- .../last_spawn_point/get_spawn_point.mcfunction | 7 +++++++ .../module/last_spawn_point/install.mcfunction | 5 +++++ .../last_spawn_point/interactor/display.mcfunction | 1 + .../interactor/on_click.mcfunction | 1 + .../last_spawn_point/private_message.mcfunction | 2 ++ .../module/last_spawn_point/uninstall.mcfunction | 5 +++++ .../scoreboard/config/display/buttons.mcfunction | 3 --- .../module/scoreboard/config/on_click.mcfunction | 14 -------------- .../display/1.mcfunction} | 2 +- .../scoreboard/interactor/display/2.mcfunction | 3 +++ .../scoreboard/interactor/on_click.mcfunction | 11 +++++++++++ .../subscribe/activation.mcfunction | 10 +++++----- .../subscribe/aviating_distance.mcfunction | 10 +++++----- .../subscribe/carousel.mcfunction | 10 +++++----- .../subscribe/damage_taken.mcfunction | 10 +++++----- .../subscribe/death_count.mcfunction | 10 +++++----- .../subscribe/dig_count.mcfunction | 10 +++++----- .../subscribe/fisning_count.mcfunction | 10 +++++----- .../subscribe/general.mcfunction | 10 +++++----- .../subscribe/kill_count.mcfunction | 10 +++++----- .../subscribe/off.mcfunction | 10 +++++----- .../subscribe/placement_count.mcfunction | 2 +- .../subscribe/trade_count.mcfunction | 10 +++++----- data/fz/functions/module/try_load.mcfunction | 2 +- .../tags/functions/game_event/player/on_login.json | 2 +- .../functions/game_event/player/on_unsneak.json | 2 +- data/fz/tags/functions/module/config/display.json | 7 ------- data/fz/tags/functions/module/config/on_click.json | 7 ------- .../functions/module/config/on_click/on_click.json | 7 ------- .../interactor/display.json} | 2 +- .../functions/module/here/interactor/on_click.json | 6 ++++++ .../tags/functions/module/interactor/display.json | 11 +++++++++++ .../module/{config => interactor}/install.json | 2 +- .../module/{config => interactor}/load.json | 2 +- .../tags/functions/module/interactor/on_click.json | 11 +++++++++++ .../module/interactor/on_click/on_click.json | 8 ++++++++ .../on_config.json => interactor/on_interact.json} | 5 +++-- .../functions/module/interactor/reset_trigger.json | 6 ++++++ .../module/{config => interactor}/timeout.json | 2 +- .../module/{config => interactor}/uninstall.json | 2 +- .../module/last_death/interactor/display.json | 6 ++++++ .../module/last_death/interactor/on_click.json | 6 ++++++ .../last_nether_portal/interactor/display.json | 6 ++++++ .../last_nether_portal/interactor/on_click.json | 6 ++++++ .../module/last_spawn_point/get_spawn_point.json | 7 +++++++ .../functions/module/last_spawn_point/install.json | 6 ++++++ .../last_spawn_point/interactor/display.json | 6 ++++++ .../last_spawn_point/interactor/on_click.json | 6 ++++++ .../module/last_spawn_point/private_message.json | 7 +++++++ .../module/last_spawn_point/uninstall.json | 6 ++++++ .../module/scoreboard/config/display.json | 7 ------- .../module/scoreboard/config/on_click.json | 7 ------- .../scoreboard/config/subscribe/activation.json | 6 ------ .../config/subscribe/aviating_distance.json | 6 ------ .../scoreboard/config/subscribe/carousel.json | 6 ------ .../scoreboard/config/subscribe/damage_taken.json | 6 ------ .../scoreboard/config/subscribe/death_count.json | 6 ------ .../scoreboard/config/subscribe/dig_count.json | 6 ------ .../scoreboard/config/subscribe/fishing_count.json | 6 ------ .../scoreboard/config/subscribe/general.json | 6 ------ .../scoreboard/config/subscribe/kill_count.json | 6 ------ .../module/scoreboard/config/subscribe/off.json | 6 ------ .../config/subscribe/placement_count.json | 6 ------ .../scoreboard/config/subscribe/trade_count.json | 6 ------ .../module/scoreboard/interactor/display.json | 7 +++++++ .../module/scoreboard/interactor/on_click.json | 6 ++++++ .../interactor/subscribe/activation.json | 6 ++++++ .../interactor/subscribe/aviating_distance.json | 6 ++++++ .../scoreboard/interactor/subscribe/carousel.json | 6 ++++++ .../interactor/subscribe/damage_taken.json | 6 ++++++ .../interactor/subscribe/death_count.json | 6 ++++++ .../scoreboard/interactor/subscribe/dig_count.json | 6 ++++++ .../interactor/subscribe/fishing_count.json | 6 ++++++ .../scoreboard/interactor/subscribe/general.json | 6 ++++++ .../interactor/subscribe/kill_count.json | 6 ++++++ .../scoreboard/interactor/subscribe/off.json | 6 ++++++ .../interactor/subscribe/placement_count.json | 6 ++++++ .../interactor/subscribe/trade_count.json | 6 ++++++ data/fz/tags/functions/system/install/module.json | 3 ++- .../fz/tags/functions/system/uninstall/module.json | 3 ++- 118 files changed, 378 insertions(+), 252 deletions(-) delete mode 100644 data/fz/functions/module/config/event/on_unsneak.mcfunction delete mode 100644 data/fz/functions/module/config/loop.mcfunction delete mode 100644 data/fz/functions/module/config/reset_timeout.mcfunction create mode 100644 data/fz/functions/module/here/interactor/display.mcfunction create mode 100644 data/fz/functions/module/here/interactor/on_click.mcfunction create mode 100644 data/fz/functions/module/interactor/event/on_unsneak.mcfunction rename data/fz/functions/module/{config => interactor}/install.mcfunction (63%) rename data/fz/functions/module/{config => interactor}/load.mcfunction (65%) create mode 100644 data/fz/functions/module/interactor/loop.mcfunction rename data/fz/functions/module/{config => interactor}/on_click.mcfunction (70%) rename data/fz/functions/module/{config/on_config.mcfunction => interactor/on_interact.mcfunction} (100%) create mode 100644 data/fz/functions/module/interactor/reset_timeout.mcfunction rename data/fz/functions/module/{config => interactor}/reset_trigger.mcfunction (59%) rename data/fz/functions/module/{config => interactor}/timeout.mcfunction (86%) rename data/fz/functions/module/{config => interactor}/uninstall.mcfunction (57%) create mode 100644 data/fz/functions/module/last_death/interactor/display.mcfunction create mode 100644 data/fz/functions/module/last_death/interactor/on_click.mcfunction create mode 100644 data/fz/functions/module/last_nether_portal/interactor/display.mcfunction create mode 100644 data/fz/functions/module/last_nether_portal/interactor/on_click.mcfunction create mode 100644 data/fz/functions/module/last_spawn_point/get_spawn_point.mcfunction create mode 100644 data/fz/functions/module/last_spawn_point/install.mcfunction create mode 100644 data/fz/functions/module/last_spawn_point/interactor/display.mcfunction create mode 100644 data/fz/functions/module/last_spawn_point/interactor/on_click.mcfunction create mode 100644 data/fz/functions/module/last_spawn_point/private_message.mcfunction create mode 100644 data/fz/functions/module/last_spawn_point/uninstall.mcfunction delete mode 100644 data/fz/functions/module/scoreboard/config/display/buttons.mcfunction delete mode 100644 data/fz/functions/module/scoreboard/config/on_click.mcfunction rename data/fz/functions/module/scoreboard/{config/display/head.mcfunction => interactor/display/1.mcfunction} (64%) create mode 100644 data/fz/functions/module/scoreboard/interactor/display/2.mcfunction create mode 100644 data/fz/functions/module/scoreboard/interactor/on_click.mcfunction rename data/fz/functions/module/scoreboard/{config => interactor}/subscribe/activation.mcfunction (86%) rename data/fz/functions/module/scoreboard/{config => interactor}/subscribe/aviating_distance.mcfunction (87%) rename data/fz/functions/module/scoreboard/{config => interactor}/subscribe/carousel.mcfunction (86%) rename data/fz/functions/module/scoreboard/{config => interactor}/subscribe/damage_taken.mcfunction (86%) rename data/fz/functions/module/scoreboard/{config => interactor}/subscribe/death_count.mcfunction (86%) rename data/fz/functions/module/scoreboard/{config => interactor}/subscribe/dig_count.mcfunction (86%) rename data/fz/functions/module/scoreboard/{config => interactor}/subscribe/fisning_count.mcfunction (86%) rename data/fz/functions/module/scoreboard/{config => interactor}/subscribe/general.mcfunction (86%) rename data/fz/functions/module/scoreboard/{config => interactor}/subscribe/kill_count.mcfunction (86%) rename data/fz/functions/module/scoreboard/{config => interactor}/subscribe/off.mcfunction (81%) rename data/fz/functions/module/scoreboard/{config => interactor}/subscribe/placement_count.mcfunction (87%) rename data/fz/functions/module/scoreboard/{config => interactor}/subscribe/trade_count.mcfunction (86%) delete mode 100644 data/fz/tags/functions/module/config/display.json delete mode 100644 data/fz/tags/functions/module/config/on_click.json delete mode 100644 data/fz/tags/functions/module/config/on_click/on_click.json rename data/fz/tags/functions/module/{config/reset_trigger.json => here/interactor/display.json} (51%) create mode 100644 data/fz/tags/functions/module/here/interactor/on_click.json create mode 100644 data/fz/tags/functions/module/interactor/display.json rename data/fz/tags/functions/module/{config => interactor}/install.json (71%) rename data/fz/tags/functions/module/{config => interactor}/load.json (73%) create mode 100644 data/fz/tags/functions/module/interactor/on_click.json create mode 100644 data/fz/tags/functions/module/interactor/on_click/on_click.json rename data/fz/tags/functions/module/{config/on_config.json => interactor/on_interact.json} (57%) create mode 100644 data/fz/tags/functions/module/interactor/reset_trigger.json rename data/fz/tags/functions/module/{config => interactor}/timeout.json (54%) rename data/fz/tags/functions/module/{config => interactor}/uninstall.json (70%) create mode 100644 data/fz/tags/functions/module/last_death/interactor/display.json create mode 100644 data/fz/tags/functions/module/last_death/interactor/on_click.json create mode 100644 data/fz/tags/functions/module/last_nether_portal/interactor/display.json create mode 100644 data/fz/tags/functions/module/last_nether_portal/interactor/on_click.json create mode 100644 data/fz/tags/functions/module/last_spawn_point/get_spawn_point.json create mode 100644 data/fz/tags/functions/module/last_spawn_point/install.json create mode 100644 data/fz/tags/functions/module/last_spawn_point/interactor/display.json create mode 100644 data/fz/tags/functions/module/last_spawn_point/interactor/on_click.json create mode 100644 data/fz/tags/functions/module/last_spawn_point/private_message.json create mode 100644 data/fz/tags/functions/module/last_spawn_point/uninstall.json delete mode 100644 data/fz/tags/functions/module/scoreboard/config/display.json delete mode 100644 data/fz/tags/functions/module/scoreboard/config/on_click.json delete mode 100644 data/fz/tags/functions/module/scoreboard/config/subscribe/activation.json delete mode 100644 data/fz/tags/functions/module/scoreboard/config/subscribe/aviating_distance.json delete mode 100644 data/fz/tags/functions/module/scoreboard/config/subscribe/carousel.json delete mode 100644 data/fz/tags/functions/module/scoreboard/config/subscribe/damage_taken.json delete mode 100644 data/fz/tags/functions/module/scoreboard/config/subscribe/death_count.json delete mode 100644 data/fz/tags/functions/module/scoreboard/config/subscribe/dig_count.json delete mode 100644 data/fz/tags/functions/module/scoreboard/config/subscribe/fishing_count.json delete mode 100644 data/fz/tags/functions/module/scoreboard/config/subscribe/general.json delete mode 100644 data/fz/tags/functions/module/scoreboard/config/subscribe/kill_count.json delete mode 100644 data/fz/tags/functions/module/scoreboard/config/subscribe/off.json delete mode 100644 data/fz/tags/functions/module/scoreboard/config/subscribe/placement_count.json delete mode 100644 data/fz/tags/functions/module/scoreboard/config/subscribe/trade_count.json create mode 100644 data/fz/tags/functions/module/scoreboard/interactor/display.json create mode 100644 data/fz/tags/functions/module/scoreboard/interactor/on_click.json create mode 100644 data/fz/tags/functions/module/scoreboard/interactor/subscribe/activation.json create mode 100644 data/fz/tags/functions/module/scoreboard/interactor/subscribe/aviating_distance.json create mode 100644 data/fz/tags/functions/module/scoreboard/interactor/subscribe/carousel.json create mode 100644 data/fz/tags/functions/module/scoreboard/interactor/subscribe/damage_taken.json create mode 100644 data/fz/tags/functions/module/scoreboard/interactor/subscribe/death_count.json create mode 100644 data/fz/tags/functions/module/scoreboard/interactor/subscribe/dig_count.json create mode 100644 data/fz/tags/functions/module/scoreboard/interactor/subscribe/fishing_count.json create mode 100644 data/fz/tags/functions/module/scoreboard/interactor/subscribe/general.json create mode 100644 data/fz/tags/functions/module/scoreboard/interactor/subscribe/kill_count.json create mode 100644 data/fz/tags/functions/module/scoreboard/interactor/subscribe/off.json create mode 100644 data/fz/tags/functions/module/scoreboard/interactor/subscribe/placement_count.json create mode 100644 data/fz/tags/functions/module/scoreboard/interactor/subscribe/trade_count.json diff --git a/.vscode/settings.json b/.vscode/settings.json index cad41ce..61f84de 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -14,6 +14,7 @@ "logAlert": "execute if score fz.logger.level fz.variable.integer matches ..600 run tellraw @a [{\"nbt\": \"fz.level.alert\", \"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}\"}]", "TEXT": "{\"text\": \"${1:TEXT}\", \"color\": \"${2:COLOR}\"}", - "storageText": "{\"nbt\": \"${1:NBT}\", \"interpret\": true, \"storage\": \"${2:A namespaced ID}\"}" + "storageText": "{\"nbt\": \"${1:NBT}\", \"interpret\": true, \"storage\": \"${2:A namespaced ID}\"}", + "ifInstalled": "execute if data storage fz:installed fz.module{${1:module_name}:1b} run ${tellraw}" } } \ No newline at end of file diff --git a/DEVDOC.md b/DEVDOC.md index 5793773..d0e6b08 100644 --- a/DEVDOC.md +++ b/DEVDOC.md @@ -41,7 +41,7 @@ - 在[`#fz:game_event/(<...>/)on_<事件>`](data/fz/tags/functions/game_event/)标签中注册触发时需要调用的函数即可 ### 日志模块 -- 仓库中提供了日志相关的代码片段，位于`.vscode/settings.json` +- 仓库中提供了日志相关的代码片段，位于[`.vscode/settings.json`](.vscode/settings.json) - 暂时没有找到方法在服务端控制台打印日志，但会被记录在客户端 #### 详细 Fine diff --git a/data/fz/functions/entry.mcfunction b/data/fz/functions/entry.mcfunction index f46e475..71a6ceb 100644 --- a/data/fz/functions/entry.mcfunction +++ b/data/fz/functions/entry.mcfunction @@ -1,5 +1,6 @@ +function #fz:uninstall function #fz:install function #fz:load diff --git a/data/fz/functions/module/config/event/on_unsneak.mcfunction b/data/fz/functions/module/config/event/on_unsneak.mcfunction deleted file mode 100644 index 0fc534c..0000000 --- a/data/fz/functions/module/config/event/on_unsneak.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -# 本目录用于存放向事件中注册的函数，并不用来新建事件 - -execute if entity @s[x_rotation = -90] run function #fz:module/config/on_config \ No newline at end of file diff --git a/data/fz/functions/module/config/loop.mcfunction b/data/fz/functions/module/config/loop.mcfunction deleted file mode 100644 index b51a37d..0000000 --- a/data/fz/functions/module/config/loop.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# 调用者：fz:module/config/trigger - -## 如果分数大于0说明玩家点击了按钮 -execute as @a if score @s fz.module.config.trigger matches 1.. run function #fz:module/config/on_click/on_click - -schedule function fz:module/config/loop 1t replace diff --git a/data/fz/functions/module/config/reset_timeout.mcfunction b/data/fz/functions/module/config/reset_timeout.mcfunction deleted file mode 100644 index 2a4c033..0000000 --- a/data/fz/functions/module/config/reset_timeout.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -## 设置或重制超时时间 -schedule function #fz:module/config/timeout 300s replace \ No newline at end of file diff --git a/data/fz/functions/module/here/get_dimension_message/if_overworld.mcfunction b/data/fz/functions/module/here/get_dimension_message/if_overworld.mcfunction index a8bab56..bd29d7d 100644 --- a/data/fz/functions/module/here/get_dimension_message/if_overworld.mcfunction +++ b/data/fz/functions/module/here/get_dimension_message/if_overworld.mcfunction @@ -1,6 +1,6 @@ data modify storage fz:here fz.nether_pos set value [0, 0] -execute store result storage fz:here fz.nether_pos[0] int 0.125 run data get entity @s Pos[0] -execute store result storage fz:here fz.nether_pos[1] int 0.125 run data get entity @s Pos[2] +execute store result storage fz:here fz.nether.x int 0.125 run data get entity @s Pos[0] +execute store result storage fz:here fz.nether.z int 0.125 run data get entity @s Pos[2] data modify storage fz:global fz.api.dimension.id set value "minecraft:the_nether" function #fz:api/get_dimension_name -data modify storage fz:here fz.message[2] set value '[{"text": "，对应", "color": "white"}, {"nbt": "fz.api.dimension.name", "interpret": true, "storage": "fz:global"}, [{"text": "[", "color": "green"}, {"nbt": "fz.nether_pos[0]", "storage": "fz:here"}, {"text": ", "}, {"nbt": "fz.nether_pos[1]", "storage": "fz:here"}, {"text": "]"}]]' \ No newline at end of file +data modify storage fz:here fz.message[2] set value '[{"text": "，对应", "color": "white"}, {"nbt": "fz.api.dimension.name", "interpret": true, "storage": "fz:global"}, [{"text": "[", "color": "green"}, {"nbt": "fz.nether.x", "storage": "fz:here"}, {"text": ", "}, {"nbt": "fz.nether.z", "storage": "fz:here"}, {"text": "]"}]]' \ No newline at end of file diff --git a/data/fz/functions/module/here/get_dimension_message/if_the_nether.mcfunction b/data/fz/functions/module/here/get_dimension_message/if_the_nether.mcfunction index 8499358..18c9531 100644 --- a/data/fz/functions/module/here/get_dimension_message/if_the_nether.mcfunction +++ b/data/fz/functions/module/here/get_dimension_message/if_the_nether.mcfunction @@ -1,6 +1,6 @@ data modify storage fz:here fz.overworld_pos set value [0, 0] -execute store result storage fz:here fz.overworld_pos[0] int 8 run data get entity @s Pos[0] -execute store result storage fz:here fz.overworld_pos[1] int 8 run data get entity @s Pos[2] +execute store result storage fz:here fz.overworld.x int 8 run data get entity @s Pos[0] +execute store result storage fz:here fz.overworld.z int 8 run data get entity @s Pos[2] data modify storage fz:global fz.api.dimension.id set value "minecraft:overworld" function #fz:api/get_dimension_name -data modify storage fz:here fz.message[2] set value '[{"text": "，对应", "color": "white"}, {"nbt": "fz.api.dimension.name", "interpret": true, "storage": "fz:global"}, [{"text": "[", "color": "green"}, {"nbt": "fz.overworld_pos[0]", "storage": "fz:here"}, {"text": ", "}, {"nbt": "fz.overworld_pos[1]", "storage": "fz:here"}, {"text": "]"}]]' \ No newline at end of file +data modify storage fz:here fz.message[2] set value '[{"text": "，对应", "color": "white"}, {"nbt": "fz.api.dimension.name", "interpret": true, "storage": "fz:global"}, [{"text": "[", "color": "green"}, {"nbt": "fz.overworld.x", "storage": "fz:here"}, {"text": ", "}, {"nbt": "fz.overworld.z", "storage": "fz:here"}, {"text": "]"}]]' \ No newline at end of file diff --git a/data/fz/functions/module/here/get_message.mcfunction b/data/fz/functions/module/here/get_message.mcfunction index 65e528a..0b8d771 100644 --- a/data/fz/functions/module/here/get_message.mcfunction +++ b/data/fz/functions/module/here/get_message.mcfunction @@ -1,10 +1,10 @@ ## fz.cache.pos已在install中初始化 -execute store result storage fz:here fz.pos[0] int 1 run data get entity @s Pos[0] -execute store result storage fz:here fz.pos[1] int 1 run data get entity @s Pos[1] -execute store result storage fz:here fz.pos[2] int 1 run data get entity @s Pos[2] -data modify storage fz:here fz.message[0] set from storage fz:global fz.api.dimension.name -data modify storage fz:here fz.message[1] set value '[{"text": "[", "color": "green"}, {"nbt": "fz.pos[0]", "storage": "fz:here"}, {"text": ", "}, {"nbt": "fz.pos[1]", "storage": "fz:here"}, {"text": ", "}, {"nbt": "fz.pos[2]", "storage": "fz:here"}, {"text": "]"}]' -data modify storage fz:here fz.message[2] set value '' +execute store result storage fz:here fz.x int 1 run data get entity @s Pos[0] +execute store result storage fz:here fz.y int 1 run data get entity @s Pos[1] +execute store result storage fz:here fz.z int 1 run data get entity @s Pos[2] +data modify storage fz:here fz.message.dimension set from storage fz:global fz.api.dimension.name +data modify storage fz:here fz.message.position set value '[{"text": "[", "color": "green"}, {"nbt": "fz.x", "storage": "fz:here"}, {"text": ", "}, {"nbt": "fz.y", "storage": "fz:here"}, {"text": ", "}, {"nbt": "fz.z", "storage": "fz:here"}, {"text": "]"}]' +data modify storage fz:here fz.message.append set value '' ## 调试 execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "获取了位置信息"}] \ No newline at end of file diff --git a/data/fz/functions/module/here/global_message.mcfunction b/data/fz/functions/module/here/global_message.mcfunction index 5013a41..cd82c77 100644 --- a/data/fz/functions/module/here/global_message.mcfunction +++ b/data/fz/functions/module/here/global_message.mcfunction @@ -1 +1 @@ -tellraw @a [{"text": "", "color": "white"}, {"selector": "@s"}, {"text": "说："}, {"text": "我在"}, {"nbt": "fz.message[0]", "interpret": true, "storage": "fz:here"}, {"nbt": "fz.message[1]", "interpret": true, "storage": "fz:here"}, {"nbt": "fz.message[2]", "interpret": true, "storage": "fz:here"}] \ No newline at end of file +tellraw @a [{"text": "", "color": "white"}, {"selector": "@s"}, {"text": "说："}, {"text": "我在"}, {"nbt": "fz.message.dimension", "interpret": true, "storage": "fz:here"}, {"nbt": "fz.message.position", "interpret": true, "storage": "fz:here"}, {"nbt": "fz.message.append", "interpret": true, "storage": "fz:here"}] \ No newline at end of file diff --git a/data/fz/functions/module/here/install.mcfunction b/data/fz/functions/module/here/install.mcfunction index 2337fdb..91ecaff 100644 --- a/data/fz/functions/module/here/install.mcfunction +++ b/data/fz/functions/module/here/install.mcfunction @@ -1,8 +1,5 @@ -data modify storage fz:here fz.pos set value [0, 0, 0] -data modify storage fz:here fz.message set value ['', '', ''] - ## 标记为已安装 data modify storage fz:installed fz.module.here set value 1b ## 日志 -execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "已安装组件：here"}] \ No newline at end of file +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/module/here/interactor/display.mcfunction b/data/fz/functions/module/here/interactor/display.mcfunction new file mode 100644 index 0000000..45d20d7 --- /dev/null +++ b/data/fz/functions/module/here/interactor/display.mcfunction @@ -0,0 +1 @@ +execute if data storage fz:installed fz.module{last_nether_portal:1b} run tellraw @s [{"text": "获取位置："},[{"text": "[", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.interactor.trigger set 2000"}},{"text": "私信", "color": "aqua"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "value": "发送给：所有人"}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.interactor.trigger set 2010"}},{"text": "广播", "color": "aqua"},{"text": "]"}]] \ No newline at end of file diff --git a/data/fz/functions/module/here/interactor/on_click.mcfunction b/data/fz/functions/module/here/interactor/on_click.mcfunction new file mode 100644 index 0000000..61464ee --- /dev/null +++ b/data/fz/functions/module/here/interactor/on_click.mcfunction @@ -0,0 +1,2 @@ +execute if score @s fz.module.interactor.trigger matches 2000 run function #fz:module/here/private_message +execute if score @s fz.module.interactor.trigger matches 2010 run function #fz:module/here/global_message diff --git a/data/fz/functions/module/here/private_message.mcfunction b/data/fz/functions/module/here/private_message.mcfunction index 0a62b25..bbad748 100644 --- a/data/fz/functions/module/here/private_message.mcfunction +++ b/data/fz/functions/module/here/private_message.mcfunction @@ -1 +1 @@ -tellraw @s [{"text": "你在", "color": "white"}, {"nbt": "fz.message[0]", "interpret": true, "storage": "fz:here"}, {"nbt": "fz.message[1]", "interpret": true, "storage": "fz:here"}, {"nbt": "fz.message[2]", "interpret": true, "storage": "fz:here"}] \ No newline at end of file +tellraw @s [{"text": "你在", "color": "white"}, {"nbt": "fz.message.dimension", "interpret": true, "storage": "fz:here"}, {"nbt": "fz.message.position", "interpret": true, "storage": "fz:here"}, {"nbt": "fz.message.append", "interpret": true, "storage": "fz:here"}] \ No newline at end of file diff --git a/data/fz/functions/module/here/uninstall.mcfunction b/data/fz/functions/module/here/uninstall.mcfunction index e34d0a4..91b4a13 100644 --- a/data/fz/functions/module/here/uninstall.mcfunction +++ b/data/fz/functions/module/here/uninstall.mcfunction @@ -4,4 +4,4 @@ data remove storage fz:here fz data modify storage fz:installed fz.module.here set value 0b ## 日志 -execute if score fz.logger.level fz.variable.integer matches ..500 run tellraw @a [{"nbt": "fz.level.info", "interpret": true, "storage": "fz:logger"}, {"text": "已卸载组件：here"}] \ No newline at end of file +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/module/interactor/event/on_unsneak.mcfunction b/data/fz/functions/module/interactor/event/on_unsneak.mcfunction new file mode 100644 index 0000000..71604e8 --- /dev/null +++ b/data/fz/functions/module/interactor/event/on_unsneak.mcfunction @@ -0,0 +1,3 @@ +# 本目录用于存放向事件中注册的函数，并不用来新建事件 + +execute if entity @s[x_rotation = -90] run function #fz:module/interactor/on_interact \ No newline at end of file diff --git a/data/fz/functions/module/config/install.mcfunction b/data/fz/functions/module/interactor/install.mcfunction similarity index 63% rename from data/fz/functions/module/config/install.mcfunction rename to data/fz/functions/module/interactor/install.mcfunction index 11db54e..7532369 100644 --- a/data/fz/functions/module/config/install.mcfunction +++ b/data/fz/functions/module/interactor/install.mcfunction @@ -1,7 +1,7 @@ -scoreboard objectives add fz.module.config.trigger trigger +scoreboard objectives add fz.module.interactor.trigger trigger ## 标记为已安装 -data modify storage fz:installed fz.module.config set value 1b +data modify storage fz:installed fz.module.interactor set value 1b ## 日志 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/module/config/load.mcfunction b/data/fz/functions/module/interactor/load.mcfunction similarity index 65% rename from data/fz/functions/module/config/load.mcfunction rename to data/fz/functions/module/interactor/load.mcfunction index 61c664b..6cc9c3d 100644 --- a/data/fz/functions/module/config/load.mcfunction +++ b/data/fz/functions/module/interactor/load.mcfunction @@ -1,5 +1,5 @@ -schedule clear fz:module/config/loop -execute as @a run function #fz:module/config/reset_trigger +schedule clear fz:module/interactor/loop +execute as @a run function #fz:module/interactor/reset_trigger ## 日志 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/module/interactor/loop.mcfunction b/data/fz/functions/module/interactor/loop.mcfunction new file mode 100644 index 0000000..3aa31c1 --- /dev/null +++ b/data/fz/functions/module/interactor/loop.mcfunction @@ -0,0 +1,6 @@ +# 调用者：fz:module/interactor/trigger + +## 如果分数大于0说明玩家点击了按钮 +execute as @a if score @s fz.module.interactor.trigger matches 1.. run function #fz:module/interactor/on_click/on_click + +schedule function fz:module/interactor/loop 1t replace diff --git a/data/fz/functions/module/config/on_click.mcfunction b/data/fz/functions/module/interactor/on_click.mcfunction similarity index 70% rename from data/fz/functions/module/config/on_click.mcfunction rename to data/fz/functions/module/interactor/on_click.mcfunction index 1d45b3c..adf595e 100644 --- a/data/fz/functions/module/config/on_click.mcfunction +++ b/data/fz/functions/module/interactor/on_click.mcfunction @@ -1,4 +1,4 @@ -# 调用者：#fz:module/config/on_click +# 调用者：#fz:module/interactor/on_click ## 调试 -execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "点击了配置按钮，触发器分数为："}, {"score": {"name": "@s", "objective": "fz.module.config.trigger"}}] \ No newline at end of file +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "点击了配置按钮，触发器分数为："}, {"score": {"name": "@s", "objective": "fz.module.interactor.trigger"}}] \ No newline at end of file diff --git a/data/fz/functions/module/config/on_config.mcfunction b/data/fz/functions/module/interactor/on_interact.mcfunction similarity index 100% rename from data/fz/functions/module/config/on_config.mcfunction rename to data/fz/functions/module/interactor/on_interact.mcfunction diff --git a/data/fz/functions/module/interactor/reset_timeout.mcfunction b/data/fz/functions/module/interactor/reset_timeout.mcfunction new file mode 100644 index 0000000..92f0055 --- /dev/null +++ b/data/fz/functions/module/interactor/reset_timeout.mcfunction @@ -0,0 +1,2 @@ +## 设置或重制超时时间 +schedule function #fz:module/interactor/timeout 300s replace \ No newline at end of file diff --git a/data/fz/functions/module/config/reset_trigger.mcfunction b/data/fz/functions/module/interactor/reset_trigger.mcfunction similarity index 59% rename from data/fz/functions/module/config/reset_trigger.mcfunction rename to data/fz/functions/module/interactor/reset_trigger.mcfunction index f918b38..4cdf237 100644 --- a/data/fz/functions/module/config/reset_trigger.mcfunction +++ b/data/fz/functions/module/interactor/reset_trigger.mcfunction @@ -1,7 +1,7 @@ -# 调用者：#fz:module/config/reset_trigger +# 调用者：#fz:module/interactor/reset_trigger -scoreboard players reset @s fz.module.config.trigger -scoreboard players enable @s fz.module.config.trigger +scoreboard players reset @s fz.module.interactor.trigger +scoreboard players enable @s fz.module.interactor.trigger ## 调试 execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "已重置玩家"}, {"selector": "@s"}, {"text": "的触发器分数"}] \ No newline at end of file diff --git a/data/fz/functions/module/config/timeout.mcfunction b/data/fz/functions/module/interactor/timeout.mcfunction similarity index 86% rename from data/fz/functions/module/config/timeout.mcfunction rename to data/fz/functions/module/interactor/timeout.mcfunction index 23f8996..1804b9f 100644 --- a/data/fz/functions/module/config/timeout.mcfunction +++ b/data/fz/functions/module/interactor/timeout.mcfunction @@ -1,4 +1,4 @@ -schedule clear fz:module/config/loop +schedule clear fz:module/interactor/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/module/config/uninstall.mcfunction b/data/fz/functions/module/interactor/uninstall.mcfunction similarity index 57% rename from data/fz/functions/module/config/uninstall.mcfunction rename to data/fz/functions/module/interactor/uninstall.mcfunction index 2e862f6..ad88273 100644 --- a/data/fz/functions/module/config/uninstall.mcfunction +++ b/data/fz/functions/module/interactor/uninstall.mcfunction @@ -1,9 +1,9 @@ -schedule clear fz:module/config/loop +schedule clear fz:module/interactor/loop -scoreboard objectives remove fz.module.config.trigger +scoreboard objectives remove fz.module.interactor.trigger ## 标记为已卸载 -data modify storage fz:installed fz.module.config set value 0b +data modify storage fz:installed fz.module.interactor set value 0b ## 日志 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/module/last_death/get_death_point.mcfunction b/data/fz/functions/module/last_death/get_death_point.mcfunction index 6f5e94c..458baf8 100644 --- a/data/fz/functions/module/last_death/get_death_point.mcfunction +++ b/data/fz/functions/module/last_death/get_death_point.mcfunction @@ -1,8 +1,7 @@ data modify storage fz:global fz.api.dimension.id set from entity @s LastDeathLocation.dimension -## fz.cache.pos已在install中初始化 -execute store result storage fz:last_death fz.cache.pos[0] int 1 run data get entity @s LastDeathLocation.pos[0] -execute store result storage fz:last_death fz.cache.pos[1] int 1 run data get entity @s LastDeathLocation.pos[1] -execute store result storage fz:last_death fz.cache.pos[2] int 1 run data get entity @s LastDeathLocation.pos[2] +execute store result storage fz:last_death fz.x int 1 run data get entity @s LastDeathLocation.pos[0] +execute store result storage fz:last_death fz.y int 1 run data get entity @s LastDeathLocation.pos[1] +execute store result storage fz:last_death fz.z int 1 run data get entity @s LastDeathLocation.pos[2] ## 调试 execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "获取了死亡点"}] \ No newline at end of file diff --git a/data/fz/functions/module/last_death/install.mcfunction b/data/fz/functions/module/last_death/install.mcfunction index 0dbf229..a4e251d 100644 --- a/data/fz/functions/module/last_death/install.mcfunction +++ b/data/fz/functions/module/last_death/install.mcfunction @@ -1,7 +1,5 @@ -data modify storage fz:last_death fz.cache.pos set value [0, 0, 0] - ## 标记为已安装 data modify storage fz:installed fz.module.last_death set value 1b ## 日志 -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 +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/module/last_death/interactor/display.mcfunction b/data/fz/functions/module/last_death/interactor/display.mcfunction new file mode 100644 index 0000000..74e2174 --- /dev/null +++ b/data/fz/functions/module/last_death/interactor/display.mcfunction @@ -0,0 +1 @@ +execute if data storage fz:installed fz.module{last_death:1b} run tellraw @s [{"text": "获取上一死亡点："},[{"text": "[", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.interactor.trigger set 2100"}},{"text": "私信", "color": "aqua"},{"text": "]"}]] \ No newline at end of file diff --git a/data/fz/functions/module/last_death/interactor/on_click.mcfunction b/data/fz/functions/module/last_death/interactor/on_click.mcfunction new file mode 100644 index 0000000..688b99d --- /dev/null +++ b/data/fz/functions/module/last_death/interactor/on_click.mcfunction @@ -0,0 +1 @@ +execute if score @s fz.module.interactor.trigger matches 2100 run function #fz:module/last_death/private_message \ No newline at end of file diff --git a/data/fz/functions/module/last_death/private_message.mcfunction b/data/fz/functions/module/last_death/private_message.mcfunction index 296f3eb..0ff87a6 100644 --- a/data/fz/functions/module/last_death/private_message.mcfunction +++ b/data/fz/functions/module/last_death/private_message.mcfunction @@ -1 +1,2 @@ -tellraw @s [{"text": "你上次死亡于"}, {"nbt": "fz.api.dimension.name", "interpret": true, "storage": "fz:global"}, [{"text": "[", "color": "green"}, {"nbt": "fz.cache.pos[0]", "storage": "fz:last_death"}, {"text": ", "}, {"nbt": "fz.cache.pos[1]", "storage": "fz:last_death"}, {"text": ", "}, {"nbt": "fz.cache.pos[2]", "storage": "fz:last_death"}, {"text": "]"}]] \ No newline at end of file +execute if data entity @s LastDeathLocation run tellraw @s [{"text": "你上次死亡于"}, {"nbt": "fz.api.dimension.name", "interpret": true, "storage": "fz:global"}, [{"text": "[", "color": "green"}, {"nbt": "fz.x", "storage": "fz:last_death"}, {"text": ", "}, {"nbt": "fz.y", "storage": "fz:last_death"}, {"text": ", "}, {"nbt": "fz.z", "storage": "fz:last_death"}, {"text": "]"}]] +execute unless data entity @s LastDeathLocation run tellraw @s {"text": "你从未死亡！"} \ No newline at end of file diff --git a/data/fz/functions/module/last_death/uninstall.mcfunction b/data/fz/functions/module/last_death/uninstall.mcfunction index e837e73..2df5e1b 100644 --- a/data/fz/functions/module/last_death/uninstall.mcfunction +++ b/data/fz/functions/module/last_death/uninstall.mcfunction @@ -4,4 +4,4 @@ data remove storage fz:last_death fz data modify storage fz:installed fz.module.last_death set value 0b ## 日志 -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 +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/module/last_nether_portal/get_message.mcfunction b/data/fz/functions/module/last_nether_portal/get_message.mcfunction index 74e7981..62169fb 100644 --- a/data/fz/functions/module/last_nether_portal/get_message.mcfunction +++ b/data/fz/functions/module/last_nether_portal/get_message.mcfunction @@ -1,2 +1,5 @@ execute if score @s fz.module.last_nether_portal.dimension matches 0 run data modify storage fz:global fz.api.dimension.id set value "minecraft:overworld" -execute if score @s fz.module.last_nether_portal.dimension matches -1 run data modify storage fz:global fz.api.dimension.id set value "minecraft:the_nether" \ No newline at end of file +execute if score @s fz.module.last_nether_portal.dimension matches -1 run data modify storage fz:global fz.api.dimension.id set value "minecraft:the_nether" + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "获取了上次穿出的地狱门"}] \ No newline at end of file diff --git a/data/fz/functions/module/last_nether_portal/global_message.mcfunction b/data/fz/functions/module/last_nether_portal/global_message.mcfunction index 6fbf22c..4c30da2 100644 --- a/data/fz/functions/module/last_nether_portal/global_message.mcfunction +++ b/data/fz/functions/module/last_nether_portal/global_message.mcfunction @@ -1 +1,2 @@ -tellraw @a [{"selector": "@s"}, [{"text": "说：我上次穿出的下界传送门位于", "color": "white"}, {"nbt": "fz.message", "interpret": true, "storage": "fz:last_nether_portal"}]] \ No newline at end of file +execute if score @s fz.module.last_nether_portal.dimension matches -2147483648..2147483647 run tellraw @a [{"selector": "@s"}, [{"text": "说：我上次穿出的下界传送门位于", "color": "white"}, {"nbt": "fz.message", "interpret": true, "storage": "fz:last_nether_portal"}]] +execute unless score @s fz.module.last_nether_portal.dimension matches -2147483648..2147483647 run tellraw @s {"text": "你从未穿出过下界传送门！"} \ No newline at end of file diff --git a/data/fz/functions/module/last_nether_portal/install.mcfunction b/data/fz/functions/module/last_nether_portal/install.mcfunction index b560366..f20030b 100644 --- a/data/fz/functions/module/last_nether_portal/install.mcfunction +++ b/data/fz/functions/module/last_nether_portal/install.mcfunction @@ -2,4 +2,10 @@ scoreboard objectives add fz.module.last_nether_portal.dimension dummy scoreboard objectives add fz.module.last_nether_portal.x dummy scoreboard objectives add fz.module.last_nether_portal.y dummy scoreboard objectives add fz.module.last_nether_portal.z dummy -data modify storage fz:last_nether_portal fz.message set value '[{"nbt": "fz.api.dimension.name", "interpret": true, "storage": "fz:global"}, [{"text": "[", "color": "green"}, {"score": {"name": "@s", "objective": "fz.module.last_nether_portal.x"}}, {"text": ", "}, {"score": {"name": "@s", "objective": "fz.module.last_nether_portal.z"}}, {"text": ", "}, {"score": {"name": "@s", "objective": "fz.module.last_nether_portal.z"}}, {"text": "]"}]]' \ No newline at end of file +data modify storage fz:last_nether_portal fz.message set value '[{"nbt": "fz.api.dimension.name", "interpret": true, "storage": "fz:global"}, [{"text": "[", "color": "green"}, {"score": {"name": "@s", "objective": "fz.module.last_nether_portal.x"}}, {"text": ", "}, {"score": {"name": "@s", "objective": "fz.module.last_nether_portal.z"}}, {"text": ", "}, {"score": {"name": "@s", "objective": "fz.module.last_nether_portal.z"}}, {"text": "]"}]]' + +## 标记为已安装 +data modify storage fz:installed fz.module.last_nether_portal set value 1b + +## 日志 +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/module/last_nether_portal/interactor/display.mcfunction b/data/fz/functions/module/last_nether_portal/interactor/display.mcfunction new file mode 100644 index 0000000..b475b29 --- /dev/null +++ b/data/fz/functions/module/last_nether_portal/interactor/display.mcfunction @@ -0,0 +1 @@ +execute if data storage fz:installed fz.module{last_nether_portal:1b} run tellraw @s [{"text": "获取上次穿出的下界传送门："},[{"text": "[", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.interactor.trigger set 2200"}},{"text": "私信", "color": "aqua"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "value": "发送给：所有人"}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.interactor.trigger set 2210"}},{"text": "广播", "color": "aqua"},{"text": "]"}]] \ No newline at end of file diff --git a/data/fz/functions/module/last_nether_portal/interactor/on_click.mcfunction b/data/fz/functions/module/last_nether_portal/interactor/on_click.mcfunction new file mode 100644 index 0000000..60015ea --- /dev/null +++ b/data/fz/functions/module/last_nether_portal/interactor/on_click.mcfunction @@ -0,0 +1,2 @@ +execute if score @s fz.module.interactor.trigger matches 2200 run function #fz:module/last_nether_portal/private_message +execute if score @s fz.module.interactor.trigger matches 2210 run function #fz:module/last_nether_portal/global_message \ No newline at end of file diff --git a/data/fz/functions/module/last_nether_portal/private_message.mcfunction b/data/fz/functions/module/last_nether_portal/private_message.mcfunction index d94d17d..4bc988b 100644 --- a/data/fz/functions/module/last_nether_portal/private_message.mcfunction +++ b/data/fz/functions/module/last_nether_portal/private_message.mcfunction @@ -1 +1,2 @@ -tellraw @a [{"text": "你上次穿出的下界传送门位于"}, {"nbt": "fz.message", "interpret": true, "storage": "fz:last_nether_portal"}] \ No newline at end of file +execute if score @s fz.module.last_nether_portal.dimension matches -2147483648..2147483647 run tellraw @s [{"text": "你上次穿出的下界传送门位于"}, {"nbt": "fz.message", "interpret": true, "storage": "fz:last_nether_portal"}] +execute unless score @s fz.module.last_nether_portal.dimension matches -2147483648..2147483647 run tellraw @s {"text": "你从未穿出过下界传送门！"} \ No newline at end of file diff --git a/data/fz/functions/module/last_nether_portal/uninstall.mcfunction b/data/fz/functions/module/last_nether_portal/uninstall.mcfunction index d971f23..ed698f8 100644 --- a/data/fz/functions/module/last_nether_portal/uninstall.mcfunction +++ b/data/fz/functions/module/last_nether_portal/uninstall.mcfunction @@ -1,4 +1,11 @@ +scoreboard objectives remove fz.module.last_nether_portal.dimension scoreboard objectives remove fz.module.last_nether_portal.x scoreboard objectives remove fz.module.last_nether_portal.y scoreboard objectives remove fz.module.last_nether_portal.z -data remove storage fz:last_nether_portal fz \ No newline at end of file +data remove storage fz:last_nether_portal fz + +## 标记为已安装 +data modify storage fz:installed fz.module.last_nether_portal set value 0b + +## 日志 +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/module/last_spawn_point/get_spawn_point.mcfunction b/data/fz/functions/module/last_spawn_point/get_spawn_point.mcfunction new file mode 100644 index 0000000..920596e --- /dev/null +++ b/data/fz/functions/module/last_spawn_point/get_spawn_point.mcfunction @@ -0,0 +1,7 @@ +data modify storage fz:global fz.api.dimension.id set from entity @s SpawnDimension +data modify storage fz:last_spawn_point fz.x set from entity @s SpawnX +data modify storage fz:last_spawn_point fz.y set from entity @s SpawnY +data modify storage fz:last_spawn_point fz.z set from entity @s SpawnZ + +## 调试 +execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "获取了出生点"}] \ No newline at end of file diff --git a/data/fz/functions/module/last_spawn_point/install.mcfunction b/data/fz/functions/module/last_spawn_point/install.mcfunction new file mode 100644 index 0000000..e723239 --- /dev/null +++ b/data/fz/functions/module/last_spawn_point/install.mcfunction @@ -0,0 +1,5 @@ +## 标记为已安装 +data modify storage fz:installed fz.module.last_spawn_point set value 1b + +## 日志 +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/module/last_spawn_point/interactor/display.mcfunction b/data/fz/functions/module/last_spawn_point/interactor/display.mcfunction new file mode 100644 index 0000000..6656368 --- /dev/null +++ b/data/fz/functions/module/last_spawn_point/interactor/display.mcfunction @@ -0,0 +1 @@ +execute if data storage fz:installed fz.module{last_spawn_point:1b} run tellraw @s [{"text": "获取上一出生点："},[{"text": "[", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.interactor.trigger set 2300"}},{"text": "私信", "color": "aqua"},{"text": "]"}]] \ No newline at end of file diff --git a/data/fz/functions/module/last_spawn_point/interactor/on_click.mcfunction b/data/fz/functions/module/last_spawn_point/interactor/on_click.mcfunction new file mode 100644 index 0000000..614c37c --- /dev/null +++ b/data/fz/functions/module/last_spawn_point/interactor/on_click.mcfunction @@ -0,0 +1 @@ +execute if score @s fz.module.interactor.trigger matches 2300 run function #fz:module/last_spawn_point/private_message \ No newline at end of file diff --git a/data/fz/functions/module/last_spawn_point/private_message.mcfunction b/data/fz/functions/module/last_spawn_point/private_message.mcfunction new file mode 100644 index 0000000..d77e1f0 --- /dev/null +++ b/data/fz/functions/module/last_spawn_point/private_message.mcfunction @@ -0,0 +1,2 @@ +execute if data entity @s SpawnDimension run tellraw @s [{"text": "你的上个出生点位于"}, {"nbt": "fz.api.dimension.name", "interpret": true, "storage": "fz:global"}, [{"text": "[x: ", "color": "green"}, {"nbt": "fz.x", "storage": "fz:last_spawn_point"}, {"text": ", y: "}, {"nbt": "fz.y", "storage": "fz:last_spawn_point"}, {"text": ", z: "}, {"nbt": "fz.z", "storage": "fz:last_spawn_point"}, {"text": "]"}]] +execute unless data entity @s SpawnDimension run tellraw @s {"text": "你从未设置过出生点！"} \ No newline at end of file diff --git a/data/fz/functions/module/last_spawn_point/uninstall.mcfunction b/data/fz/functions/module/last_spawn_point/uninstall.mcfunction new file mode 100644 index 0000000..523dfc7 --- /dev/null +++ b/data/fz/functions/module/last_spawn_point/uninstall.mcfunction @@ -0,0 +1,5 @@ +## 标记为已安装 +data modify storage fz:installed fz.module.last_spawn_point set value 0b + +## 日志 +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/module/scoreboard/config/display/buttons.mcfunction b/data/fz/functions/module/scoreboard/config/display/buttons.mcfunction deleted file mode 100644 index 00a338d..0000000 --- a/data/fz/functions/module/scoreboard/config/display/buttons.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -# 调用者：#fz:module/scoreboard/config/display/buttons - -execute if data storage fz:installed fz.module{scoreboard:1b} run tellraw @s [[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "dark_red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1000"}}, {"text": "关", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1010"}}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.general", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1020"}}, {"nbt": "fz.scoreboard.text.general", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.activation", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1030"}}, {"nbt": "fz.scoreboard.text.activation", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.aviating_distance", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1040"}}, {"nbt": "fz.scoreboard.text.aviating_distance", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.damage_taken", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1050"}}, {"nbt": "fz.scoreboard.text.damage_taken", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.death_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1060"}}, {"nbt": "fz.scoreboard.text.death_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.dig_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1070"}}, {"nbt": "fz.scoreboard.text.dig_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.fishing_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1080"}}, {"nbt": "fz.scoreboard.text.fishing_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.kill_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1090"}}, {"nbt": "fz.scoreboard.text.kill_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.trade_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.config.trigger set 1100"}}, {"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/config/on_click.mcfunction b/data/fz/functions/module/scoreboard/config/on_click.mcfunction deleted file mode 100644 index 242ceb4..0000000 --- a/data/fz/functions/module/scoreboard/config/on_click.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -execute if score @s fz.module.config.trigger matches 1000 run function #fz:module/scoreboard/config/subscribe/off -execute if score @s fz.module.config.trigger matches 1010 run function #fz:module/scoreboard/config/subscribe/carousel -execute if score @s fz.module.config.trigger matches 1020 run function #fz:module/scoreboard/config/subscribe/general -execute if score @s fz.module.config.trigger matches 1030 run function #fz:module/scoreboard/config/subscribe/activation -execute if score @s fz.module.config.trigger matches 1040 run function #fz:module/scoreboard/config/subscribe/aviating_distance -execute if score @s fz.module.config.trigger matches 1050 run function #fz:module/scoreboard/config/subscribe/damage_taken -execute if score @s fz.module.config.trigger matches 1060 run function #fz:module/scoreboard/config/subscribe/death_count -execute if score @s fz.module.config.trigger matches 1070 run function #fz:module/scoreboard/config/subscribe/dig_count -execute if score @s fz.module.config.trigger matches 1080 run function #fz:module/scoreboard/config/subscribe/fishing_count -execute if score @s fz.module.config.trigger matches 1090 run function #fz:module/scoreboard/config/subscribe/kill_count -execute if score @s fz.module.config.trigger matches 1100 run function #fz:module/scoreboard/config/subscribe/trade_count - -## 调试 -execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "点击了计分板配置按钮，触发器分数为："}, {"score": {"name": "@s", "objective": "fz.module.config.trigger"}}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/config/display/head.mcfunction b/data/fz/functions/module/scoreboard/interactor/display/1.mcfunction similarity index 64% rename from data/fz/functions/module/scoreboard/config/display/head.mcfunction rename to data/fz/functions/module/scoreboard/interactor/display/1.mcfunction index 98c8a9d..234e4e6 100644 --- a/data/fz/functions/module/scoreboard/config/display/head.mcfunction +++ b/data/fz/functions/module/scoreboard/interactor/display/1.mcfunction @@ -1,3 +1,3 @@ -# 调用者：#fz:module/scoreboard/config/display/head +# 调用者：#fz:module/scoreboard/interactor/display execute if data storage fz:installed fz.module{scoreboard:1b} run tellraw @s {"text": "计分板："} \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/interactor/display/2.mcfunction b/data/fz/functions/module/scoreboard/interactor/display/2.mcfunction new file mode 100644 index 0000000..07b988a --- /dev/null +++ b/data/fz/functions/module/scoreboard/interactor/display/2.mcfunction @@ -0,0 +1,3 @@ +# 调用者：#fz:module/scoreboard/interactor/display + +execute if data storage fz:installed fz.module{scoreboard:1b} run tellraw @s [[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "dark_red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.interactor.trigger set 1000"}}, {"text": "关", "color": "dark_red"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.interactor.trigger set 1010"}}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.general", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.interactor.trigger set 1020"}}, {"nbt": "fz.scoreboard.text.general", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.activation", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.interactor.trigger set 1030"}}, {"nbt": "fz.scoreboard.text.activation", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.aviating_distance", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.interactor.trigger set 1040"}}, {"nbt": "fz.scoreboard.text.aviating_distance", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.damage_taken", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.interactor.trigger set 1050"}}, {"nbt": "fz.scoreboard.text.damage_taken", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.death_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.interactor.trigger set 1060"}}, {"nbt": "fz.scoreboard.text.death_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.dig_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.interactor.trigger set 1070"}}, {"nbt": "fz.scoreboard.text.dig_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.fishing_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.interactor.trigger set 1080"}}, {"nbt": "fz.scoreboard.text.fishing_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.kill_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.interactor.trigger set 1090"}}, {"nbt": "fz.scoreboard.text.kill_count", "interpret": true, "storage": "fz:module"},{"text": "]"}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fz.scoreboard.text.trade_count", "interpret": true, "storage": "fz:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fz.module.interactor.trigger set 1100"}}, {"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/interactor/on_click.mcfunction b/data/fz/functions/module/scoreboard/interactor/on_click.mcfunction new file mode 100644 index 0000000..4fe8ec6 --- /dev/null +++ b/data/fz/functions/module/scoreboard/interactor/on_click.mcfunction @@ -0,0 +1,11 @@ +execute if score @s fz.module.interactor.trigger matches 1000 run function #fz:module/scoreboard/interactor/subscribe/off +execute if score @s fz.module.interactor.trigger matches 1010 run function #fz:module/scoreboard/interactor/subscribe/carousel +execute if score @s fz.module.interactor.trigger matches 1020 run function #fz:module/scoreboard/interactor/subscribe/general +execute if score @s fz.module.interactor.trigger matches 1030 run function #fz:module/scoreboard/interactor/subscribe/activation +execute if score @s fz.module.interactor.trigger matches 1040 run function #fz:module/scoreboard/interactor/subscribe/aviating_distance +execute if score @s fz.module.interactor.trigger matches 1050 run function #fz:module/scoreboard/interactor/subscribe/damage_taken +execute if score @s fz.module.interactor.trigger matches 1060 run function #fz:module/scoreboard/interactor/subscribe/death_count +execute if score @s fz.module.interactor.trigger matches 1070 run function #fz:module/scoreboard/interactor/subscribe/dig_count +execute if score @s fz.module.interactor.trigger matches 1080 run function #fz:module/scoreboard/interactor/subscribe/fishing_count +execute if score @s fz.module.interactor.trigger matches 1090 run function #fz:module/scoreboard/interactor/subscribe/kill_count +execute if score @s fz.module.interactor.trigger matches 1100 run function #fz:module/scoreboard/interactor/subscribe/trade_count \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/config/subscribe/activation.mcfunction b/data/fz/functions/module/scoreboard/interactor/subscribe/activation.mcfunction similarity index 86% rename from data/fz/functions/module/scoreboard/config/subscribe/activation.mcfunction rename to data/fz/functions/module/scoreboard/interactor/subscribe/activation.mcfunction index 3c0df14..a5e8bac 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/activation.mcfunction +++ b/data/fz/functions/module/scoreboard/interactor/subscribe/activation.mcfunction @@ -1,6 +1,6 @@ -# 调用者：fz:module/scoreboard/config/subscribe/~ - -team join fz.module.scoreboard.display.activation @s - -## 调试 +# 调用者：fz:module/scoreboard/interactor/subscribe/~ + +team join fz.module.scoreboard.display.activation @s + +## 调试 execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"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/config/subscribe/aviating_distance.mcfunction b/data/fz/functions/module/scoreboard/interactor/subscribe/aviating_distance.mcfunction similarity index 87% rename from data/fz/functions/module/scoreboard/config/subscribe/aviating_distance.mcfunction rename to data/fz/functions/module/scoreboard/interactor/subscribe/aviating_distance.mcfunction index 3ecde40..bd37906 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/aviating_distance.mcfunction +++ b/data/fz/functions/module/scoreboard/interactor/subscribe/aviating_distance.mcfunction @@ -1,6 +1,6 @@ -# 调用者：fz:module/scoreboard/config/subscribe/~ - -team join fz.module.scoreboard.display.aviating_distance @s - -## 调试 +# 调用者：fz:module/scoreboard/interactor/subscribe/~ + +team join fz.module.scoreboard.display.aviating_distance @s + +## 调试 execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"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/config/subscribe/carousel.mcfunction b/data/fz/functions/module/scoreboard/interactor/subscribe/carousel.mcfunction similarity index 86% rename from data/fz/functions/module/scoreboard/config/subscribe/carousel.mcfunction rename to data/fz/functions/module/scoreboard/interactor/subscribe/carousel.mcfunction index 8840592..157ca13 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/carousel.mcfunction +++ b/data/fz/functions/module/scoreboard/interactor/subscribe/carousel.mcfunction @@ -1,6 +1,6 @@ -# 调用者：fz:module/scoreboard/config/subscribe/~ - -team join fz.module.scoreboard.display.carousel @s - -## 调试 +# 调用者：fz:module/scoreboard/interactor/subscribe/~ + +team join fz.module.scoreboard.display.carousel @s + +## 调试 execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "订阅了"}, {"nbt": "fz.scoreboard.text.carousel", "interpret": true, "storage": "fz:module"}, {"text": "计分板"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/config/subscribe/damage_taken.mcfunction b/data/fz/functions/module/scoreboard/interactor/subscribe/damage_taken.mcfunction similarity index 86% rename from data/fz/functions/module/scoreboard/config/subscribe/damage_taken.mcfunction rename to data/fz/functions/module/scoreboard/interactor/subscribe/damage_taken.mcfunction index 5355695..de3f091 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/damage_taken.mcfunction +++ b/data/fz/functions/module/scoreboard/interactor/subscribe/damage_taken.mcfunction @@ -1,6 +1,6 @@ -# 调用者：fz:module/scoreboard/config/subscribe/~ - -team join fz.module.scoreboard.display.damage_taken @s - -## 调试 +# 调用者：fz:module/scoreboard/interactor/subscribe/~ + +team join fz.module.scoreboard.display.damage_taken @s + +## 调试 execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"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/config/subscribe/death_count.mcfunction b/data/fz/functions/module/scoreboard/interactor/subscribe/death_count.mcfunction similarity index 86% rename from data/fz/functions/module/scoreboard/config/subscribe/death_count.mcfunction rename to data/fz/functions/module/scoreboard/interactor/subscribe/death_count.mcfunction index 343352a..8a7acf0 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/death_count.mcfunction +++ b/data/fz/functions/module/scoreboard/interactor/subscribe/death_count.mcfunction @@ -1,6 +1,6 @@ -# 调用者：fz:module/scoreboard/config/subscribe/~ - -team join fz.module.scoreboard.display.death_count @s - -## 调试 +# 调用者：fz:module/scoreboard/interactor/subscribe/~ + +team join fz.module.scoreboard.display.death_count @s + +## 调试 execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"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/config/subscribe/dig_count.mcfunction b/data/fz/functions/module/scoreboard/interactor/subscribe/dig_count.mcfunction similarity index 86% rename from data/fz/functions/module/scoreboard/config/subscribe/dig_count.mcfunction rename to data/fz/functions/module/scoreboard/interactor/subscribe/dig_count.mcfunction index b7b0c27..3a61139 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/dig_count.mcfunction +++ b/data/fz/functions/module/scoreboard/interactor/subscribe/dig_count.mcfunction @@ -1,6 +1,6 @@ -# 调用者：fz:module/scoreboard/config/subscribe/~ - -team join fz.module.scoreboard.display.dig_count @s - -## 调试 +# 调用者：fz:module/scoreboard/interactor/subscribe/~ + +team join fz.module.scoreboard.display.dig_count @s + +## 调试 execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"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/config/subscribe/fisning_count.mcfunction b/data/fz/functions/module/scoreboard/interactor/subscribe/fisning_count.mcfunction similarity index 86% rename from data/fz/functions/module/scoreboard/config/subscribe/fisning_count.mcfunction rename to data/fz/functions/module/scoreboard/interactor/subscribe/fisning_count.mcfunction index 47e96cf..e2bc887 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/fisning_count.mcfunction +++ b/data/fz/functions/module/scoreboard/interactor/subscribe/fisning_count.mcfunction @@ -1,6 +1,6 @@ -# 调用者：fz:module/scoreboard/config/subscribe/~ - -team join fz.module.scoreboard.display.fishing_count @s - -## 调试 +# 调用者：fz:module/scoreboard/interactor/subscribe/~ + +team join fz.module.scoreboard.display.fishing_count @s + +## 调试 execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"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/config/subscribe/general.mcfunction b/data/fz/functions/module/scoreboard/interactor/subscribe/general.mcfunction similarity index 86% rename from data/fz/functions/module/scoreboard/config/subscribe/general.mcfunction rename to data/fz/functions/module/scoreboard/interactor/subscribe/general.mcfunction index 6c059e0..dfd0a8f 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/general.mcfunction +++ b/data/fz/functions/module/scoreboard/interactor/subscribe/general.mcfunction @@ -1,6 +1,6 @@ -# 调用者：fz:module/scoreboard/config/subscribe/~ - -team join fz.module.scoreboard.display.general @s - -## 调试 +# 调用者：fz:module/scoreboard/interactor/subscribe/~ + +team join fz.module.scoreboard.display.general @s + +## 调试 execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"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/config/subscribe/kill_count.mcfunction b/data/fz/functions/module/scoreboard/interactor/subscribe/kill_count.mcfunction similarity index 86% rename from data/fz/functions/module/scoreboard/config/subscribe/kill_count.mcfunction rename to data/fz/functions/module/scoreboard/interactor/subscribe/kill_count.mcfunction index cb58444..9102548 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/kill_count.mcfunction +++ b/data/fz/functions/module/scoreboard/interactor/subscribe/kill_count.mcfunction @@ -1,6 +1,6 @@ -# 调用者：fz:module/scoreboard/config/subscribe/~ - -team join fz.module.scoreboard.display.kill_count @s - -## 调试 +# 调用者：fz:module/scoreboard/interactor/subscribe/~ + +team join fz.module.scoreboard.display.kill_count @s + +## 调试 execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"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/config/subscribe/off.mcfunction b/data/fz/functions/module/scoreboard/interactor/subscribe/off.mcfunction similarity index 81% rename from data/fz/functions/module/scoreboard/config/subscribe/off.mcfunction rename to data/fz/functions/module/scoreboard/interactor/subscribe/off.mcfunction index 02f0fca..1df5096 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/off.mcfunction +++ b/data/fz/functions/module/scoreboard/interactor/subscribe/off.mcfunction @@ -1,6 +1,6 @@ -# 调用者：#fz:module/scoreboard/config/subscribe/~ - -team leave @s - -## 调试 +# 调用者：#fz:module/scoreboard/interactor/subscribe/~ + +team leave @s + +## 调试 execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "取消了计分板订阅"}] \ No newline at end of file diff --git a/data/fz/functions/module/scoreboard/config/subscribe/placement_count.mcfunction b/data/fz/functions/module/scoreboard/interactor/subscribe/placement_count.mcfunction similarity index 87% rename from data/fz/functions/module/scoreboard/config/subscribe/placement_count.mcfunction rename to data/fz/functions/module/scoreboard/interactor/subscribe/placement_count.mcfunction index 488d5a1..79fb703 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/placement_count.mcfunction +++ b/data/fz/functions/module/scoreboard/interactor/subscribe/placement_count.mcfunction @@ -1,4 +1,4 @@ -# 调用者：fz:module/scoreboard/config/subscribe/~ +# 调用者：fz:module/scoreboard/interactor/subscribe/~ team join fz.module.scoreboard.display.placement_count @s diff --git a/data/fz/functions/module/scoreboard/config/subscribe/trade_count.mcfunction b/data/fz/functions/module/scoreboard/interactor/subscribe/trade_count.mcfunction similarity index 86% rename from data/fz/functions/module/scoreboard/config/subscribe/trade_count.mcfunction rename to data/fz/functions/module/scoreboard/interactor/subscribe/trade_count.mcfunction index 019db3d..35288c5 100644 --- a/data/fz/functions/module/scoreboard/config/subscribe/trade_count.mcfunction +++ b/data/fz/functions/module/scoreboard/interactor/subscribe/trade_count.mcfunction @@ -1,6 +1,6 @@ -# 调用者：fz:module/scoreboard/config/subscribe/~ - -team join fz.module.scoreboard.display.trade_count @s - -## 调试 +# 调用者：fz:module/scoreboard/interactor/subscribe/~ + +team join fz.module.scoreboard.display.trade_count @s + +## 调试 execute if score fz.logger.level fz.variable.integer matches ..400 run tellraw @a [{"nbt": "fz.level.debug", "interpret": true, "storage": "fz:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"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/try_load.mcfunction b/data/fz/functions/module/try_load.mcfunction index 2cb59f0..7c0e6fa 100644 --- a/data/fz/functions/module/try_load.mcfunction +++ b/data/fz/functions/module/try_load.mcfunction @@ -1,6 +1,6 @@ # 调用者：#fz:module/try_load ## 判断是否安装，如果安装则加载 -execute if data storage fz:installed fz.module{config:1b} run function #fz:module/config/load +execute if data storage fz:installed fz.module{interactor:1b} run function #fz:module/interactor/load execute if data storage fz:installed fz.module{health:1b} run function #fz:module/health/load execute if data storage fz:installed fz.module{scoreboard:1b} run function #fz:module/scoreboard/load diff --git a/data/fz/tags/functions/game_event/player/on_login.json b/data/fz/tags/functions/game_event/player/on_login.json index 4df8db9..8285185 100644 --- a/data/fz/tags/functions/game_event/player/on_login.json +++ b/data/fz/tags/functions/game_event/player/on_login.json @@ -2,6 +2,6 @@ "replace": false, "values": [ "#fz:game_event/reset_all", - "#fz:module/config/reset_trigger" + "#fz:module/interactor/reset_trigger" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/game_event/player/on_unsneak.json b/data/fz/tags/functions/game_event/player/on_unsneak.json index 578af4d..1c2a033 100644 --- a/data/fz/tags/functions/game_event/player/on_unsneak.json +++ b/data/fz/tags/functions/game_event/player/on_unsneak.json @@ -2,6 +2,6 @@ "__comment": "调用者：fz:game_event/on_unsneaked，当玩家蹲起后触发此事件", "replace": false, "values": [ - "fz:module/config/event/on_unsneak" + "fz:module/interactor/event/on_unsneak" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/config/display.json b/data/fz/tags/functions/module/config/display.json deleted file mode 100644 index c0e1bea..0000000 --- a/data/fz/tags/functions/module/config/display.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "__comment": "调用者：fz:module/config/on_click、fz:module/config/trigger", - "replace": false, - "values": [ - "#fz:module/scoreboard/config/display" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/config/on_click.json b/data/fz/tags/functions/module/config/on_click.json deleted file mode 100644 index b431f65..0000000 --- a/data/fz/tags/functions/module/config/on_click.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "fz:module/config/on_click", - "#fz:module/scoreboard/config/on_click" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/config/on_click/on_click.json b/data/fz/tags/functions/module/config/on_click/on_click.json deleted file mode 100644 index a6d16f7..0000000 --- a/data/fz/tags/functions/module/config/on_click/on_click.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "#fz:module/config/on_click", - "#fz:module/config/reset_trigger" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/config/reset_trigger.json b/data/fz/tags/functions/module/here/interactor/display.json similarity index 51% rename from data/fz/tags/functions/module/config/reset_trigger.json rename to data/fz/tags/functions/module/here/interactor/display.json index e87d3c3..dbe19f8 100644 --- a/data/fz/tags/functions/module/config/reset_trigger.json +++ b/data/fz/tags/functions/module/here/interactor/display.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "fz:module/config/reset_trigger" + "fz:module/here/interactor/display" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/here/interactor/on_click.json b/data/fz/tags/functions/module/here/interactor/on_click.json new file mode 100644 index 0000000..fe78d2e --- /dev/null +++ b/data/fz/tags/functions/module/here/interactor/on_click.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/here/interactor/on_click" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/interactor/display.json b/data/fz/tags/functions/module/interactor/display.json new file mode 100644 index 0000000..0f41970 --- /dev/null +++ b/data/fz/tags/functions/module/interactor/display.json @@ -0,0 +1,11 @@ +{ + "__comment": "调用者：fz:module/interactor/on_click、fz:module/interactor/trigger", + "replace": false, + "values": [ + "#fz:module/scoreboard/interactor/display", + "#fz:module/here/interactor/display", + "#fz:module/last_death/interactor/display", + "#fz:module/last_nether_portal/interactor/display", + "#fz:module/last_spawn_point/interactor/display" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/config/install.json b/data/fz/tags/functions/module/interactor/install.json similarity index 71% rename from data/fz/tags/functions/module/config/install.json rename to data/fz/tags/functions/module/interactor/install.json index 9ede793..5c364a0 100644 --- a/data/fz/tags/functions/module/config/install.json +++ b/data/fz/tags/functions/module/interactor/install.json @@ -2,6 +2,6 @@ "__comment": "调用者：#fz:module/install", "replace": false, "values": [ - "fz:module/config/install" + "fz:module/interactor/install" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/config/load.json b/data/fz/tags/functions/module/interactor/load.json similarity index 73% rename from data/fz/tags/functions/module/config/load.json rename to data/fz/tags/functions/module/interactor/load.json index 4d5f8c6..c372b1d 100644 --- a/data/fz/tags/functions/module/config/load.json +++ b/data/fz/tags/functions/module/interactor/load.json @@ -2,6 +2,6 @@ "__comment": "调用者：fz:module/try_load", "replace": false, "values": [ - "fz:module/config/load" + "fz:module/interactor/load" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/interactor/on_click.json b/data/fz/tags/functions/module/interactor/on_click.json new file mode 100644 index 0000000..ace1310 --- /dev/null +++ b/data/fz/tags/functions/module/interactor/on_click.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "fz:module/interactor/on_click", + "#fz:module/scoreboard/interactor/on_click", + "#fz:module/here/interactor/on_click", + "#fz:module/last_death/interactor/on_click", + "#fz:module/last_nether_portal/interactor/on_click", + "#fz:module/last_spawn_point/interactor/on_click" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/interactor/on_click/on_click.json b/data/fz/tags/functions/module/interactor/on_click/on_click.json new file mode 100644 index 0000000..d566dc2 --- /dev/null +++ b/data/fz/tags/functions/module/interactor/on_click/on_click.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "#fz:module/interactor/display", + "#fz:module/interactor/on_click", + "#fz:module/interactor/reset_trigger" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/config/on_config.json b/data/fz/tags/functions/module/interactor/on_interact.json similarity index 57% rename from data/fz/tags/functions/module/config/on_config.json rename to data/fz/tags/functions/module/interactor/on_interact.json index 62b9cf7..0c1536c 100644 --- a/data/fz/tags/functions/module/config/on_config.json +++ b/data/fz/tags/functions/module/interactor/on_interact.json @@ -2,7 +2,8 @@ "__comment": "调用者：fz:event/on_unsneak，当玩家抬头到最高角度并蹲起后，触发此事件", "replace": false, "values": [ - "fz:module/config/loop", - "#fz:module/config/display" + "fz:module/interactor/on_interact", + "fz:module/interactor/loop", + "#fz:module/interactor/display" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/interactor/reset_trigger.json b/data/fz/tags/functions/module/interactor/reset_trigger.json new file mode 100644 index 0000000..8ba5445 --- /dev/null +++ b/data/fz/tags/functions/module/interactor/reset_trigger.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/interactor/reset_trigger" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/config/timeout.json b/data/fz/tags/functions/module/interactor/timeout.json similarity index 54% rename from data/fz/tags/functions/module/config/timeout.json rename to data/fz/tags/functions/module/interactor/timeout.json index c663051..0c5af48 100644 --- a/data/fz/tags/functions/module/config/timeout.json +++ b/data/fz/tags/functions/module/interactor/timeout.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "fz:module/config/timeout" + "fz:module/interactor/timeout" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/config/uninstall.json b/data/fz/tags/functions/module/interactor/uninstall.json similarity index 70% rename from data/fz/tags/functions/module/config/uninstall.json rename to data/fz/tags/functions/module/interactor/uninstall.json index c3ac6ad..0619ef8 100644 --- a/data/fz/tags/functions/module/config/uninstall.json +++ b/data/fz/tags/functions/module/interactor/uninstall.json @@ -2,6 +2,6 @@ "__comment": "调用者：#fz:module/uninstall", "replace": false, "values": [ - "fz:module/config/uninstall" + "fz:module/interactor/uninstall" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/module/last_death/interactor/display.json b/data/fz/tags/functions/module/last_death/interactor/display.json new file mode 100644 index 0000000..12dd6b4 --- /dev/null +++ b/data/fz/tags/functions/module/last_death/interactor/display.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/last_death/interactor/display" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/last_death/interactor/on_click.json b/data/fz/tags/functions/module/last_death/interactor/on_click.json new file mode 100644 index 0000000..8c8d4ce --- /dev/null +++ b/data/fz/tags/functions/module/last_death/interactor/on_click.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/last_death/interactor/on_click" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/last_nether_portal/interactor/display.json b/data/fz/tags/functions/module/last_nether_portal/interactor/display.json new file mode 100644 index 0000000..57de05e --- /dev/null +++ b/data/fz/tags/functions/module/last_nether_portal/interactor/display.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/last_nether_portal/interactor/display" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/last_nether_portal/interactor/on_click.json b/data/fz/tags/functions/module/last_nether_portal/interactor/on_click.json new file mode 100644 index 0000000..567ff57 --- /dev/null +++ b/data/fz/tags/functions/module/last_nether_portal/interactor/on_click.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/last_nether_portal/interactor/on_click" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/last_spawn_point/get_spawn_point.json b/data/fz/tags/functions/module/last_spawn_point/get_spawn_point.json new file mode 100644 index 0000000..1237384 --- /dev/null +++ b/data/fz/tags/functions/module/last_spawn_point/get_spawn_point.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "fz:module/last_spawn_point/get_spawn_point", + "#fz:api/get_dimension_name" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/last_spawn_point/install.json b/data/fz/tags/functions/module/last_spawn_point/install.json new file mode 100644 index 0000000..70d5136 --- /dev/null +++ b/data/fz/tags/functions/module/last_spawn_point/install.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/last_spawn_point/install" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/last_spawn_point/interactor/display.json b/data/fz/tags/functions/module/last_spawn_point/interactor/display.json new file mode 100644 index 0000000..90bd182 --- /dev/null +++ b/data/fz/tags/functions/module/last_spawn_point/interactor/display.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/last_spawn_point/interactor/display" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/last_spawn_point/interactor/on_click.json b/data/fz/tags/functions/module/last_spawn_point/interactor/on_click.json new file mode 100644 index 0000000..52ce2e2 --- /dev/null +++ b/data/fz/tags/functions/module/last_spawn_point/interactor/on_click.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/last_spawn_point/interactor/on_click" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/last_spawn_point/private_message.json b/data/fz/tags/functions/module/last_spawn_point/private_message.json new file mode 100644 index 0000000..4b076a0 --- /dev/null +++ b/data/fz/tags/functions/module/last_spawn_point/private_message.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "#fz:module/last_spawn_point/get_spawn_point", + "fz:module/last_spawn_point/private_message" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/last_spawn_point/uninstall.json b/data/fz/tags/functions/module/last_spawn_point/uninstall.json new file mode 100644 index 0000000..3e66409 --- /dev/null +++ b/data/fz/tags/functions/module/last_spawn_point/uninstall.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/last_spawn_point/uninstall" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/config/display.json b/data/fz/tags/functions/module/scoreboard/config/display.json deleted file mode 100644 index 60469f9..0000000 --- a/data/fz/tags/functions/module/scoreboard/config/display.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "fz:module/scoreboard/config/display/head", - "fz:module/scoreboard/config/display/buttons" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/config/on_click.json b/data/fz/tags/functions/module/scoreboard/config/on_click.json deleted file mode 100644 index 5f8f8ab..0000000 --- a/data/fz/tags/functions/module/scoreboard/config/on_click.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "fz:module/scoreboard/config/on_click", - "#fz:module/config/display" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/config/subscribe/activation.json b/data/fz/tags/functions/module/scoreboard/config/subscribe/activation.json deleted file mode 100644 index bfe2d31..0000000 --- a/data/fz/tags/functions/module/scoreboard/config/subscribe/activation.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "fz:module/scoreboard/config/subscribe/activation" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/config/subscribe/aviating_distance.json b/data/fz/tags/functions/module/scoreboard/config/subscribe/aviating_distance.json deleted file mode 100644 index 9f4b399..0000000 --- a/data/fz/tags/functions/module/scoreboard/config/subscribe/aviating_distance.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "fz:module/scoreboard/config/subscribe/aviating_distance" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/config/subscribe/carousel.json b/data/fz/tags/functions/module/scoreboard/config/subscribe/carousel.json deleted file mode 100644 index 1a5937d..0000000 --- a/data/fz/tags/functions/module/scoreboard/config/subscribe/carousel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "fz:module/scoreboard/config/subscribe/carousel" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/config/subscribe/damage_taken.json b/data/fz/tags/functions/module/scoreboard/config/subscribe/damage_taken.json deleted file mode 100644 index 761ea98..0000000 --- a/data/fz/tags/functions/module/scoreboard/config/subscribe/damage_taken.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "fz:module/scoreboard/config/subscribe/damage_taken" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/config/subscribe/death_count.json b/data/fz/tags/functions/module/scoreboard/config/subscribe/death_count.json deleted file mode 100644 index 5dc3c0c..0000000 --- a/data/fz/tags/functions/module/scoreboard/config/subscribe/death_count.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "fz:module/scoreboard/config/subscribe/death_count" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/config/subscribe/dig_count.json b/data/fz/tags/functions/module/scoreboard/config/subscribe/dig_count.json deleted file mode 100644 index edc4440..0000000 --- a/data/fz/tags/functions/module/scoreboard/config/subscribe/dig_count.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "fz:module/scoreboard/config/subscribe/dig_count" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/config/subscribe/fishing_count.json b/data/fz/tags/functions/module/scoreboard/config/subscribe/fishing_count.json deleted file mode 100644 index 963e48e..0000000 --- a/data/fz/tags/functions/module/scoreboard/config/subscribe/fishing_count.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "fz:module/scoreboard/config/subscribe/fishing_count" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/config/subscribe/general.json b/data/fz/tags/functions/module/scoreboard/config/subscribe/general.json deleted file mode 100644 index 98807dc..0000000 --- a/data/fz/tags/functions/module/scoreboard/config/subscribe/general.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "fz:module/scoreboard/config/subscribe/general" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/config/subscribe/kill_count.json b/data/fz/tags/functions/module/scoreboard/config/subscribe/kill_count.json deleted file mode 100644 index c7103a7..0000000 --- a/data/fz/tags/functions/module/scoreboard/config/subscribe/kill_count.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "fz:module/scoreboard/config/subscribe/kill_count" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/config/subscribe/off.json b/data/fz/tags/functions/module/scoreboard/config/subscribe/off.json deleted file mode 100644 index 7446a17..0000000 --- a/data/fz/tags/functions/module/scoreboard/config/subscribe/off.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "fz:module/scoreboard/config/subscribe/off" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/config/subscribe/placement_count.json b/data/fz/tags/functions/module/scoreboard/config/subscribe/placement_count.json deleted file mode 100644 index 3bd4c36..0000000 --- a/data/fz/tags/functions/module/scoreboard/config/subscribe/placement_count.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "fz:module/scoreboard/config/subscribe/placement_count" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/config/subscribe/trade_count.json b/data/fz/tags/functions/module/scoreboard/config/subscribe/trade_count.json deleted file mode 100644 index b79835d..0000000 --- a/data/fz/tags/functions/module/scoreboard/config/subscribe/trade_count.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "fz:module/scoreboard/config/subscribe/trade_count" - ] -} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/interactor/display.json b/data/fz/tags/functions/module/scoreboard/interactor/display.json new file mode 100644 index 0000000..bff40db --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/interactor/display.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/interactor/display/1", + "fz:module/scoreboard/interactor/display/2" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/interactor/on_click.json b/data/fz/tags/functions/module/scoreboard/interactor/on_click.json new file mode 100644 index 0000000..3b1148c --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/interactor/on_click.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/interactor/on_click" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/interactor/subscribe/activation.json b/data/fz/tags/functions/module/scoreboard/interactor/subscribe/activation.json new file mode 100644 index 0000000..21b2869 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/interactor/subscribe/activation.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/interactor/subscribe/activation" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/interactor/subscribe/aviating_distance.json b/data/fz/tags/functions/module/scoreboard/interactor/subscribe/aviating_distance.json new file mode 100644 index 0000000..ace3d50 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/interactor/subscribe/aviating_distance.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/interactor/subscribe/aviating_distance" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/interactor/subscribe/carousel.json b/data/fz/tags/functions/module/scoreboard/interactor/subscribe/carousel.json new file mode 100644 index 0000000..cdc5e36 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/interactor/subscribe/carousel.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/interactor/subscribe/carousel" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/interactor/subscribe/damage_taken.json b/data/fz/tags/functions/module/scoreboard/interactor/subscribe/damage_taken.json new file mode 100644 index 0000000..543d201 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/interactor/subscribe/damage_taken.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/interactor/subscribe/damage_taken" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/interactor/subscribe/death_count.json b/data/fz/tags/functions/module/scoreboard/interactor/subscribe/death_count.json new file mode 100644 index 0000000..b593c9e --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/interactor/subscribe/death_count.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/interactor/subscribe/death_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/interactor/subscribe/dig_count.json b/data/fz/tags/functions/module/scoreboard/interactor/subscribe/dig_count.json new file mode 100644 index 0000000..61472eb --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/interactor/subscribe/dig_count.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/interactor/subscribe/dig_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/interactor/subscribe/fishing_count.json b/data/fz/tags/functions/module/scoreboard/interactor/subscribe/fishing_count.json new file mode 100644 index 0000000..280135b --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/interactor/subscribe/fishing_count.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/interactor/subscribe/fishing_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/interactor/subscribe/general.json b/data/fz/tags/functions/module/scoreboard/interactor/subscribe/general.json new file mode 100644 index 0000000..50daa78 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/interactor/subscribe/general.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/interactor/subscribe/general" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/interactor/subscribe/kill_count.json b/data/fz/tags/functions/module/scoreboard/interactor/subscribe/kill_count.json new file mode 100644 index 0000000..e203b71 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/interactor/subscribe/kill_count.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/interactor/subscribe/kill_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/interactor/subscribe/off.json b/data/fz/tags/functions/module/scoreboard/interactor/subscribe/off.json new file mode 100644 index 0000000..1e12b73 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/interactor/subscribe/off.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/interactor/subscribe/off" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/interactor/subscribe/placement_count.json b/data/fz/tags/functions/module/scoreboard/interactor/subscribe/placement_count.json new file mode 100644 index 0000000..0f81557 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/interactor/subscribe/placement_count.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/interactor/subscribe/placement_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/module/scoreboard/interactor/subscribe/trade_count.json b/data/fz/tags/functions/module/scoreboard/interactor/subscribe/trade_count.json new file mode 100644 index 0000000..1495157 --- /dev/null +++ b/data/fz/tags/functions/module/scoreboard/interactor/subscribe/trade_count.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "fz:module/scoreboard/interactor/subscribe/trade_count" + ] +} \ No newline at end of file diff --git a/data/fz/tags/functions/system/install/module.json b/data/fz/tags/functions/system/install/module.json index a920fc3..5137537 100644 --- a/data/fz/tags/functions/system/install/module.json +++ b/data/fz/tags/functions/system/install/module.json @@ -1,11 +1,12 @@ { "replace": false, "values": [ - "#fz:module/config/install", + "#fz:module/interactor/install", "#fz:module/health/install", "#fz:module/here/install", "#fz:module/last_death/install", "#fz:module/last_nether_portal/install", + "#fz:module/last_spawn_point/install", "#fz:module/scoreboard/install" ] } \ No newline at end of file diff --git a/data/fz/tags/functions/system/uninstall/module.json b/data/fz/tags/functions/system/uninstall/module.json index 47df1b2..e94c7c3 100644 --- a/data/fz/tags/functions/system/uninstall/module.json +++ b/data/fz/tags/functions/system/uninstall/module.json @@ -1,11 +1,12 @@ { "replace": false, "values": [ - "#fz:module/config/uninstall", + "#fz:module/interactor/uninstall", "#fz:module/health/uninstall", "#fz:module/here/uninstall", "#fz:module/last_death/uninstall", "#fz:module/last_nether_portal/uninstall", + "#fz:module/last_spawn_point/uninstall", "#fz:module/scoreboard/uninstall" ] } \ No newline at end of file