diff --git a/data/admin.fzsd/function/admin.mcfunction b/data/admin.fzsd/function/admin.mcfunction index e486313..1474e41 100644 --- a/data/admin.fzsd/function/admin.mcfunction +++ b/data/admin.fzsd/function/admin.mcfunction @@ -1,3 +1,5 @@ +tag @s add fzsd.admin + tellraw @s {"text": "管理员页面：", "color": "red"} @@ -15,27 +17,45 @@ tellraw @s [{"text": "- 名牌下方：", "color": "gray"}, [{"text": "", "color tellraw @s [{"text": "- 玩家列表内：", "color": "gray"}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function admin.fzsd:module/health/list/on"}, "hoverEvent": {"action": "show_text", "contents": {"text": "显示", "color": "dark_green"}}}, {"text": "显示", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function admin.fzsd:module/health/list/off"}, "hoverEvent": {"action": "show_text", "contents": {"text": "隐藏", "color": "dark_red"}}}, {"text": "隐藏", "color": "dark_red"}, {"text": "]"}]]] -tellraw @s [{"text": "玩家位置："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/here/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/here/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]] - - tellraw @s [{"text": "交互器："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/interactor/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/interactor/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]] tellraw @s [{"text": "登录消息："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/join_message/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/join_message/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]] +tellraw @s [{"text": "玩家位置："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/here/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/here/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]] +## [权限管理] +tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm here set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm here"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]] + + tellraw @s [{"text": "上一死亡点："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_death/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_death/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]] +## [权限管理] +tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm last_death set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm last_death"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]] tellraw @s [{"text": "上次穿出的下界传送门："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_nether_portal/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_nether_portal/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]] +## [权限管理] +tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm last_nether_portal set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm last_nether_portal"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]] tellraw @s [{"text": "上一出生点："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_spawn_point/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_spawn_point/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]] +## [权限管理] +tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm last_spawn_point set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm last_spawn_point"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]] tellraw @s [{"text": "计分板："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/scoreboard/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/scoreboard/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]] +## [权限管理] +tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm scoreboard set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm scoreboard"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]] tellraw @s [{"text": "扫地机："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/sweeper/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/sweeper/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]] +## [权限管理] +tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm sweeper set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm sweeper"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]] -tellraw @s [{"text": "幻翼预警："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/phantom_warning/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/phantom_warning/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]] \ No newline at end of file + +tellraw @s [{"text": "幻翼预警："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/phantom_warning/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/phantom_warning/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]] +## [权限管理] +tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm phantom_warning set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm phantom_warning"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]] + + +tellraw @s {"text": "已为您添加管理员标签“fzsd.admin”，使用“/tag add fzsd.admin”为其他人添加“仅管理员”功能的使用权限", "color": "white"} \ No newline at end of file diff --git a/data/admin.fzsd/functions/admin.mcfunction b/data/admin.fzsd/functions/admin.mcfunction index e486313..1474e41 100644 --- a/data/admin.fzsd/functions/admin.mcfunction +++ b/data/admin.fzsd/functions/admin.mcfunction @@ -1,3 +1,5 @@ +tag @s add fzsd.admin + tellraw @s {"text": "管理员页面：", "color": "red"} @@ -15,27 +17,45 @@ tellraw @s [{"text": "- 名牌下方：", "color": "gray"}, [{"text": "", "color tellraw @s [{"text": "- 玩家列表内：", "color": "gray"}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function admin.fzsd:module/health/list/on"}, "hoverEvent": {"action": "show_text", "contents": {"text": "显示", "color": "dark_green"}}}, {"text": "显示", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function admin.fzsd:module/health/list/off"}, "hoverEvent": {"action": "show_text", "contents": {"text": "隐藏", "color": "dark_red"}}}, {"text": "隐藏", "color": "dark_red"}, {"text": "]"}]]] -tellraw @s [{"text": "玩家位置："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/here/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/here/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]] - - tellraw @s [{"text": "交互器："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/interactor/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/interactor/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]] tellraw @s [{"text": "登录消息："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/join_message/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/join_message/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]] +tellraw @s [{"text": "玩家位置："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/here/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/here/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]] +## [权限管理] +tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm here set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm here"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]] + + tellraw @s [{"text": "上一死亡点："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_death/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_death/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]] +## [权限管理] +tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm last_death set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm last_death"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]] tellraw @s [{"text": "上次穿出的下界传送门："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_nether_portal/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_nether_portal/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]] +## [权限管理] +tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm last_nether_portal set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm last_nether_portal"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]] tellraw @s [{"text": "上一出生点："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_spawn_point/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/last_spawn_point/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]] +## [权限管理] +tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm last_spawn_point set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm last_spawn_point"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]] tellraw @s [{"text": "计分板："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/scoreboard/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/scoreboard/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]] +## [权限管理] +tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm scoreboard set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm scoreboard"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]] tellraw @s [{"text": "扫地机："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/sweeper/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/sweeper/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]] +## [权限管理] +tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm sweeper set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm sweeper"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]] -tellraw @s [{"text": "幻翼预警："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/phantom_warning/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/phantom_warning/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]] \ No newline at end of file + +tellraw @s [{"text": "幻翼预警："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/phantom_warning/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/phantom_warning/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]] +## [权限管理] +tellraw @s ["- 权限：",[{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data modify storage fzsd:perm phantom_warning set value 1"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为仅管理员", "color": "white"}}}, {"text": "仅管理员", "color": "white"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/data remove storage fzsd:perm phantom_warning"}, "hoverEvent": {"action": "show_text", "contents": {"text": "设为全体玩家", "color": "white"}}}, {"text": "全体玩家", "color": "white"}, {"text": "]"}]]] + + +tellraw @s {"text": "已为您添加管理员标签“fzsd.admin”，使用“/tag add fzsd.admin”为其他人添加“仅管理员”功能的使用权限", "color": "white"} \ No newline at end of file diff --git a/data/fzsd/function/module/here/interactor/display.mcfunction b/data/fzsd/function/module/here/interactor/display.mcfunction index bc39fc1..04722c3 100644 --- a/data/fzsd/function/module/here/interactor/display.mcfunction +++ b/data/fzsd/function/module/here/interactor/display.mcfunction @@ -1 +1,4 @@ -execute if data storage fzsd:install fzsd.module{last_nether_portal:1b} run tellraw @s [{"text": "获取位置："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2000"}},{"text": "私信", "color": "aqua"},{"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：所有人"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2010"}},{"text": "广播", "color": "aqua"},{"text": "]"}]] \ No newline at end of file +execute if data storage fzsd:install fzsd.module{last_nether_portal:1b} unless data storage fzsd:perm {here:1} run tellraw @s [{"text": "获取位置："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2000"}},{"text": "私信", "color": "aqua"},{"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：所有人"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2010"}},{"text": "广播", "color": "aqua"},{"text": "]"}]] + +# 仅管理员 +execute if data storage fzsd:install fzsd.module{last_nether_portal:1b} if data storage fzsd:perm {here:1} if entity @s[tag=fzsd.admin] run tellraw @s [{"text": "获取位置："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2000"}},{"text": "私信", "color": "aqua"},{"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：所有人"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2010"}},{"text": "广播", "color": "aqua"},{"text": "]"}]] \ No newline at end of file diff --git a/data/fzsd/function/module/here/interactor/on_click.mcfunction b/data/fzsd/function/module/here/interactor/on_click.mcfunction index 18b4498..c169743 100644 --- a/data/fzsd/function/module/here/interactor/on_click.mcfunction +++ b/data/fzsd/function/module/here/interactor/on_click.mcfunction @@ -1,2 +1,4 @@ -execute if score @s fzsd.module.interactor.trigger matches -2000 run function #fzsd:module/here/private_message -execute if score @s fzsd.module.interactor.trigger matches -2010 run function #fzsd:module/here/global_message +execute if score @s fzsd.module.interactor.trigger matches -2000 if data storage fzsd:perm {here:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/here/private_message +execute if score @s fzsd.module.interactor.trigger matches -2000 unless data storage fzsd:perm {here:1} run function #fzsd:module/here/private_message +execute if score @s fzsd.module.interactor.trigger matches -2010 if data storage fzsd:perm {here:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/here/global_message +execute if score @s fzsd.module.interactor.trigger matches -2010 unless data storage fzsd:perm {here:1} run function #fzsd:module/here/global_message diff --git a/data/fzsd/function/module/last_death/interactor/display.mcfunction b/data/fzsd/function/module/last_death/interactor/display.mcfunction index 8f3a1ad..9449648 100644 --- a/data/fzsd/function/module/last_death/interactor/display.mcfunction +++ b/data/fzsd/function/module/last_death/interactor/display.mcfunction @@ -1 +1,2 @@ -execute if data storage fzsd:install fzsd.module{last_death:1b} run tellraw @s [{"text": "获取上一死亡点："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2100"}},{"text": "私信", "color": "aqua"},{"text": "]"}]] \ No newline at end of file +execute if data storage fzsd:install fzsd.module{last_death:1b} if data storage fzsd:perm {last_death:1} if entity @s[tag=fzsd.admin] run tellraw @s [{"text": "获取上一死亡点："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2100"}},{"text": "私信", "color": "aqua"},{"text": "]"}]] +execute if data storage fzsd:install fzsd.module{last_death:1b} unless data storage fzsd:perm {last_death:1} run tellraw @s [{"text": "获取上一死亡点："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2100"}},{"text": "私信", "color": "aqua"},{"text": "]"}]] diff --git a/data/fzsd/function/module/last_death/interactor/on_click.mcfunction b/data/fzsd/function/module/last_death/interactor/on_click.mcfunction index 5ce5872..072fd2a 100644 --- a/data/fzsd/function/module/last_death/interactor/on_click.mcfunction +++ b/data/fzsd/function/module/last_death/interactor/on_click.mcfunction @@ -1 +1,2 @@ -execute if score @s fzsd.module.interactor.trigger matches -2100 run function #fzsd:module/last_death/private_message \ No newline at end of file +execute if score @s fzsd.module.interactor.trigger matches -2100 if data storage fzsd:perm {last_death:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/last_death/private_message +execute if score @s fzsd.module.interactor.trigger matches -2100 unless data storage fzsd:perm {last_death:1} run function #fzsd:module/last_death/private_message \ No newline at end of file diff --git a/data/fzsd/function/module/last_nether_portal/interactor/display.mcfunction b/data/fzsd/function/module/last_nether_portal/interactor/display.mcfunction index 53d5e58..9f3fc75 100644 --- a/data/fzsd/function/module/last_nether_portal/interactor/display.mcfunction +++ b/data/fzsd/function/module/last_nether_portal/interactor/display.mcfunction @@ -1 +1,2 @@ -execute if data storage fzsd:install fzsd.module{last_nether_portal:1b} run tellraw @s [{"text": "获取上次穿出的下界传送门："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2200"}},{"text": "私信", "color": "aqua"},{"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：所有人"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2210"}},{"text": "广播", "color": "aqua"},{"text": "]"}]] \ No newline at end of file +execute if data storage fzsd:install fzsd.module{last_nether_portal:1b} if data storage fzsd:perm {last_nether_portal:1} if entity @s[tag=fzsd.admin] run tellraw @s [{"text": "获取上次穿出的下界传送门："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2200"}},{"text": "私信", "color": "aqua"},{"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：所有人"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2210"}},{"text": "广播", "color": "aqua"},{"text": "]"}]] +execute if data storage fzsd:install fzsd.module{last_nether_portal:1b} unless data storage fzsd:perm {last_nether_portal:1} run tellraw @s [{"text": "获取上次穿出的下界传送门："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2200"}},{"text": "私信", "color": "aqua"},{"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：所有人"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2210"}},{"text": "广播", "color": "aqua"},{"text": "]"}]] \ No newline at end of file diff --git a/data/fzsd/function/module/last_nether_portal/interactor/on_click.mcfunction b/data/fzsd/function/module/last_nether_portal/interactor/on_click.mcfunction index 40d1eea..59c082a 100644 --- a/data/fzsd/function/module/last_nether_portal/interactor/on_click.mcfunction +++ b/data/fzsd/function/module/last_nether_portal/interactor/on_click.mcfunction @@ -1,2 +1,4 @@ -execute if score @s fzsd.module.interactor.trigger matches -2200 run function #fzsd:module/last_nether_portal/private_message -execute if score @s fzsd.module.interactor.trigger matches -2210 run function #fzsd:module/last_nether_portal/global_message \ No newline at end of file +execute if score @s fzsd.module.interactor.trigger matches -2200 if data storage fzsd:perm {last_nether_portal:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/last_nether_portal/private_message +execute if score @s fzsd.module.interactor.trigger matches -2200 unless data storage fzsd:perm {last_nether_portal:1} run function #fzsd:module/last_nether_portal/private_message +execute if score @s fzsd.module.interactor.trigger matches -2210 if data storage fzsd:perm {last_nether_portal:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/last_nether_portal/global_message +execute if score @s fzsd.module.interactor.trigger matches -2210 unless data storage fzsd:perm {last_nether_portal:1} run function #fzsd:module/last_nether_portal/global_message \ No newline at end of file diff --git a/data/fzsd/function/module/last_spawn_point/interactor/display.mcfunction b/data/fzsd/function/module/last_spawn_point/interactor/display.mcfunction index 834c54f..596cab7 100644 --- a/data/fzsd/function/module/last_spawn_point/interactor/display.mcfunction +++ b/data/fzsd/function/module/last_spawn_point/interactor/display.mcfunction @@ -1 +1,2 @@ -execute if data storage fzsd:install fzsd.module{last_spawn_point:1b} run tellraw @s [{"text": "获取上一出生点："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2300"}},{"text": "私信", "color": "aqua"},{"text": "]"}]] \ No newline at end of file +execute if data storage fzsd:install fzsd.module{last_spawn_point:1b} if data storage fzsd:perm {last_spawn_point:1} if entity @s[tag=fzsd.admin] run tellraw @s [{"text": "获取上一出生点："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2300"}},{"text": "私信", "color": "aqua"},{"text": "]"}]] +execute if data storage fzsd:install fzsd.module{last_spawn_point:1b} unless data storage fzsd:perm {last_spawn_point:1} run tellraw @s [{"text": "获取上一出生点："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2300"}},{"text": "私信", "color": "aqua"},{"text": "]"}]] \ No newline at end of file diff --git a/data/fzsd/function/module/last_spawn_point/interactor/on_click.mcfunction b/data/fzsd/function/module/last_spawn_point/interactor/on_click.mcfunction index d49c977..0e7d3fb 100644 --- a/data/fzsd/function/module/last_spawn_point/interactor/on_click.mcfunction +++ b/data/fzsd/function/module/last_spawn_point/interactor/on_click.mcfunction @@ -1 +1,2 @@ -execute if score @s fzsd.module.interactor.trigger matches -2300 run function #fzsd:module/last_spawn_point/private_message \ No newline at end of file +execute if score @s fzsd.module.interactor.trigger matches -2300 if data storage fzsd:perm {last_spawn_point:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/last_spawn_point/private_message +execute if score @s fzsd.module.interactor.trigger matches -2300 unless data storage fzsd:perm {last_spawn_point:1} run function #fzsd:module/last_spawn_point/private_message \ No newline at end of file diff --git a/data/fzsd/function/module/phantom_warning/interactor/display.mcfunction b/data/fzsd/function/module/phantom_warning/interactor/display.mcfunction index 2253ce4..868aaa5 100644 --- a/data/fzsd/function/module/phantom_warning/interactor/display.mcfunction +++ b/data/fzsd/function/module/phantom_warning/interactor/display.mcfunction @@ -1 +1,2 @@ -execute if data storage fzsd:install fzsd.module{phantom_warning:1b} run function fzsd:module/phantom_warning/interactor/display_0 \ No newline at end of file +execute if data storage fzsd:install fzsd.module{phantom_warning:1b} if data storage fzsd:perm {phantom_warning:1} if entity @s[tag=fzsd.admin] run function fzsd:module/phantom_warning/interactor/display_0 +execute if data storage fzsd:install fzsd.module{phantom_warning:1b} unless data storage fzsd:perm {phantom_warning:1} run function fzsd:module/phantom_warning/interactor/display_0 \ No newline at end of file diff --git a/data/fzsd/function/module/phantom_warning/interactor/on_click.mcfunction b/data/fzsd/function/module/phantom_warning/interactor/on_click.mcfunction index 5d3b3d8..2aab1b2 100644 --- a/data/fzsd/function/module/phantom_warning/interactor/on_click.mcfunction +++ b/data/fzsd/function/module/phantom_warning/interactor/on_click.mcfunction @@ -1,2 +1,4 @@ -execute if score @s fzsd.module.interactor.trigger matches 4000 run tag @s add fzsd.ignore_phantom_warning -execute if score @s fzsd.module.interactor.trigger matches 4001 run tag @s remove fzsd.ignore_phantom_warning \ No newline at end of file +execute if score @s fzsd.module.interactor.trigger matches 4000 if data storage fzsd:perm {phantom_warning:1} if entity @s[tag=fzsd.admin] run tag @s add fzsd.ignore_phantom_warning +execute if score @s fzsd.module.interactor.trigger matches 4000 unless data storage fzsd:perm {phantom_warning:1} run tag @s add fzsd.ignore_phantom_warning +execute if score @s fzsd.module.interactor.trigger matches 4001 if data storage fzsd:perm {phantom_warning:1} if entity @s[tag=fzsd.admin] run tag @s remove fzsd.ignore_phantom_warning +execute if score @s fzsd.module.interactor.trigger matches 4001 unless data storage fzsd:perm {phantom_warning:1} run tag @s remove fzsd.ignore_phantom_warning diff --git a/data/fzsd/function/module/phantom_warning/send_phantom_warning.mcfunction b/data/fzsd/function/module/phantom_warning/send_phantom_warning.mcfunction index 9edcc41..bde154d 100644 --- a/data/fzsd/function/module/phantom_warning/send_phantom_warning.mcfunction +++ b/data/fzsd/function/module/phantom_warning/send_phantom_warning.mcfunction @@ -1,6 +1,7 @@ # 调用者：tags\functions\module\phantom_warning\send_phantom_warning.json ## 对当前玩家发送提醒 -execute if score fzsd.logger.level fzsd.variable.integer matches ..600 run tellraw @s [{"nbt": "fzsd.level.alert", "interpret": true, "storage": "fzsd:logger"}, {"text": "今晚可能会生成幻翼，建议睡觉！"}] +execute if score fzsd.logger.level fzsd.variable.integer matches ..600 if data storage fzsd:perm {phantom_warning:1} if entity @s[tag=fzsd.admin] run tellraw @s [{"nbt": "fzsd.level.alert", "interpret": true, "storage": "fzsd:logger"}, {"text": "今晚可能会生成幻翼，建议睡觉！"}] +execute if score fzsd.logger.level fzsd.variable.integer matches ..600 unless data storage fzsd:perm {phantom_warning:1} run tellraw @s [{"nbt": "fzsd.level.alert", "interpret": true, "storage": "fzsd:logger"}, {"text": "今晚可能会生成幻翼，建议睡觉！"}] ## 调试 -execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "事件已触发：已向玩家"}, {"selector": "@s"}, {"text": "发送幻翼预警"}] \ No newline at end of file +execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "事件已触发：向玩家"}, {"selector": "@s"}, {"text": "发送幻翼预警"}] diff --git a/data/fzsd/function/module/scoreboard/interactor/display.mcfunction b/data/fzsd/function/module/scoreboard/interactor/display.mcfunction index 33db53c..1a6289f 100644 --- a/data/fzsd/function/module/scoreboard/interactor/display.mcfunction +++ b/data/fzsd/function/module/scoreboard/interactor/display.mcfunction @@ -1,7 +1,10 @@ # 调用者：#fzsd:module/scoreboard/interactor/display -execute if data storage fzsd:install fzsd.module{scoreboard:1b} run tellraw @s {"text": "计分板："} +execute if data storage fzsd:install fzsd.module{scoreboard:1b} if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run tellraw @s {"text": "计分板："} +execute if data storage fzsd:install fzsd.module{scoreboard:1b} unless data storage fzsd:perm {scoreboard:1} run tellraw @s {"text": "计分板："} -execute if data storage fzsd:install fzsd.module{scoreboard:1b} run tellraw @s [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "查询我的分数", "color": "#F4A460"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1120"}}, {"text": "查询我的分数", "color": "#F4A460"}, {"text": "] "}] +execute if data storage fzsd:install fzsd.module{scoreboard:1b} if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run tellraw @s [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "查询我的分数", "color": "#F4A460"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1120"}}, {"text": "查询我的分数", "color": "#F4A460"}, {"text": "] "}] +execute if data storage fzsd:install fzsd.module{scoreboard:1b} unless data storage fzsd:perm {scoreboard:1} run tellraw @s [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "查询我的分数", "color": "#F4A460"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1120"}}, {"text": "查询我的分数", "color": "#F4A460"}, {"text": "] "}] -execute if data storage fzsd:install fzsd.module{scoreboard:1b} run tellraw @s [[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1000"}}, {"text": "关", "color": "red"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1010"}}, {"nbt": "fzsd.module.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1020"}}, {"nbt": "fzsd.module.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1030"}}, {"nbt": "fzsd.module.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1040"}}, {"nbt": "fzsd.module.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1050"}}, {"nbt": "fzsd.module.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1060"}}, {"nbt": "fzsd.module.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1070"}}, {"nbt": "fzsd.module.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1080"}}, {"nbt": "fzsd.module.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1090"}}, {"nbt": "fzsd.module.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1100"}}, {"nbt": "fzsd.module.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1110"}}, {"nbt": "fzsd.module.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}]] \ No newline at end of file +execute if data storage fzsd:install fzsd.module{scoreboard:1b} if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run tellraw @s [[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1000"}}, {"text": "关", "color": "red"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1010"}}, {"nbt": "fzsd.module.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1020"}}, {"nbt": "fzsd.module.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1030"}}, {"nbt": "fzsd.module.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1040"}}, {"nbt": "fzsd.module.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1050"}}, {"nbt": "fzsd.module.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1060"}}, {"nbt": "fzsd.module.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1070"}}, {"nbt": "fzsd.module.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1080"}}, {"nbt": "fzsd.module.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1090"}}, {"nbt": "fzsd.module.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1100"}}, {"nbt": "fzsd.module.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1110"}}, {"nbt": "fzsd.module.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}]] +execute if data storage fzsd:install fzsd.module{scoreboard:1b} unless data storage fzsd:perm {scoreboard:1} run tellraw @s [[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1000"}}, {"text": "关", "color": "red"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1010"}}, {"nbt": "fzsd.module.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1020"}}, {"nbt": "fzsd.module.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1030"}}, {"nbt": "fzsd.module.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1040"}}, {"nbt": "fzsd.module.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1050"}}, {"nbt": "fzsd.module.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1060"}}, {"nbt": "fzsd.module.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1070"}}, {"nbt": "fzsd.module.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1080"}}, {"nbt": "fzsd.module.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1090"}}, {"nbt": "fzsd.module.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"},{"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1100"}}, {"nbt": "fzsd.module.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}], [{"text": "[", "hoverEvent": {"action": "show_text", "contents": {"nbt": "fzsd.module.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1110"}}, {"nbt": "fzsd.module.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}, {"text": "] "}]] diff --git a/data/fzsd/function/module/scoreboard/interactor/on_click.mcfunction b/data/fzsd/function/module/scoreboard/interactor/on_click.mcfunction index 851668f..64054ee 100644 --- a/data/fzsd/function/module/scoreboard/interactor/on_click.mcfunction +++ b/data/fzsd/function/module/scoreboard/interactor/on_click.mcfunction @@ -1,13 +1,26 @@ -execute if score @s fzsd.module.interactor.trigger matches -1000 run function #fzsd:module/scoreboard/interactor/subscribe/off -execute if score @s fzsd.module.interactor.trigger matches -1010 run function #fzsd:module/scoreboard/interactor/subscribe/carousel -execute if score @s fzsd.module.interactor.trigger matches -1020 run function #fzsd:module/scoreboard/interactor/subscribe/general -execute if score @s fzsd.module.interactor.trigger matches -1030 run function #fzsd:module/scoreboard/interactor/subscribe/activation -execute if score @s fzsd.module.interactor.trigger matches -1040 run function #fzsd:module/scoreboard/interactor/subscribe/aviating_distance -execute if score @s fzsd.module.interactor.trigger matches -1050 run function #fzsd:module/scoreboard/interactor/subscribe/damage_taken -execute if score @s fzsd.module.interactor.trigger matches -1060 run function #fzsd:module/scoreboard/interactor/subscribe/death_count -execute if score @s fzsd.module.interactor.trigger matches -1070 run function #fzsd:module/scoreboard/interactor/subscribe/dig_count -execute if score @s fzsd.module.interactor.trigger matches -1080 run function #fzsd:module/scoreboard/interactor/subscribe/fishing_count -execute if score @s fzsd.module.interactor.trigger matches -1090 run function #fzsd:module/scoreboard/interactor/subscribe/kill_count -execute if score @s fzsd.module.interactor.trigger matches -1100 run function #fzsd:module/scoreboard/interactor/subscribe/trade_count -execute if score @s fzsd.module.interactor.trigger matches -1110 run function #fzsd:module/scoreboard/interactor/subscribe/placement_count -execute if score @s fzsd.module.interactor.trigger matches -1120 run function #fzsd:module/scoreboard/interactor/show_my_scores \ No newline at end of file +execute if score @s fzsd.module.interactor.trigger matches -1000 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/off +execute if score @s fzsd.module.interactor.trigger matches -1000 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/off +execute if score @s fzsd.module.interactor.trigger matches -1010 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/carousel +execute if score @s fzsd.module.interactor.trigger matches -1010 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/carousel +execute if score @s fzsd.module.interactor.trigger matches -1020 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/general +execute if score @s fzsd.module.interactor.trigger matches -1020 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/general +execute if score @s fzsd.module.interactor.trigger matches -1030 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/activation +execute if score @s fzsd.module.interactor.trigger matches -1030 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/activation +execute if score @s fzsd.module.interactor.trigger matches -1040 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/aviating_distance +execute if score @s fzsd.module.interactor.trigger matches -1040 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/aviating_distance +execute if score @s fzsd.module.interactor.trigger matches -1050 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/damage_taken +execute if score @s fzsd.module.interactor.trigger matches -1050 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/damage_taken +execute if score @s fzsd.module.interactor.trigger matches -1060 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/death_count +execute if score @s fzsd.module.interactor.trigger matches -1060 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/death_count +execute if score @s fzsd.module.interactor.trigger matches -1070 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/dig_count +execute if score @s fzsd.module.interactor.trigger matches -1070 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/dig_count +execute if score @s fzsd.module.interactor.trigger matches -1080 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/fishing_count +execute if score @s fzsd.module.interactor.trigger matches -1080 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/fishing_count +execute if score @s fzsd.module.interactor.trigger matches -1090 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/kill_count +execute if score @s fzsd.module.interactor.trigger matches -1090 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/kill_count +execute if score @s fzsd.module.interactor.trigger matches -1100 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/trade_count +execute if score @s fzsd.module.interactor.trigger matches -1100 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/trade_count +execute if score @s fzsd.module.interactor.trigger matches -1110 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/subscribe/placement_count +execute if score @s fzsd.module.interactor.trigger matches -1110 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/subscribe/placement_count +execute if score @s fzsd.module.interactor.trigger matches -1120 if data storage fzsd:perm {scoreboard:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/scoreboard/interactor/show_my_scores +execute if score @s fzsd.module.interactor.trigger matches -1120 unless data storage fzsd:perm {scoreboard:1} run function #fzsd:module/scoreboard/interactor/show_my_scores diff --git a/data/fzsd/function/module/scoreboard/interactor/show_my_scores.mcfunction b/data/fzsd/function/module/scoreboard/interactor/show_my_scores.mcfunction index 8e204eb..8827096 100644 --- a/data/fzsd/function/module/scoreboard/interactor/show_my_scores.mcfunction +++ b/data/fzsd/function/module/scoreboard/interactor/show_my_scores.mcfunction @@ -1,9 +1 @@ -execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.activation", "name": "@s"}}]] -execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.aviating_distance", "name": "@s"}}]] -execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.damage_taken", "name": "@s"}}]] -execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.death_count", "name": "@s"}}]] -execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.dig_count", "name": "@s"}}]] -execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.fishing_count", "name": "@s"}}]] -execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.kill_count", "name": "@s"}}]] -execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.trade_count", "name": "@s"}}]] -execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"nbt": "fzsd.module.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.placement_count", "name": "@s"}}]] +execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"text": ""}, {"selector": "@s"}," 的分数：",{"text": "[","color": "dark_gray"},{"nbt": "fzsd.module.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.activation", "name": "@s"}}],{"text": "] [","color": "dark_gray"}, {"nbt": "fzsd.module.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.aviating_distance", "name": "@s"}}],{"text": "] [","color": "dark_gray"}, {"nbt": "fzsd.module.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.damage_taken", "name": "@s"}}],{"text": "] [","color": "dark_gray"}, {"nbt": "fzsd.module.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.death_count", "name": "@s"}}],{"text": "] [","color": "dark_gray"}, {"nbt": "fzsd.module.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.dig_count", "name": "@s"}}],{"text": "] [","color": "dark_gray"}, {"nbt": "fzsd.module.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.fishing_count", "name": "@s"}}],{"text": "] [","color": "dark_gray"}, {"nbt": "fzsd.module.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.kill_count", "name": "@s"}}],{"text": "] [","color": "dark_gray"}, {"nbt": "fzsd.module.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.trade_count", "name": "@s"}}],{"text": "] [","color": "dark_gray"}, {"nbt": "fzsd.module.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}, [{"text": "："}, {"score": {"objective": "fzsd.module.scoreboard.display.placement_count", "name": "@s"}}],{"text": "]","color": "dark_gray"}] diff --git a/data/fzsd/function/module/sweeper/interactor/display_0.mcfunction b/data/fzsd/function/module/sweeper/interactor/display_0.mcfunction index d3a307b..1ab4983 100644 --- a/data/fzsd/function/module/sweeper/interactor/display_0.mcfunction +++ b/data/fzsd/function/module/sweeper/interactor/display_0.mcfunction @@ -9,4 +9,5 @@ tellraw @s[tag=fzsd.ignore_sweeper_sound] [{"text": "- 音效："}, [{"text": "[ tellraw @s[tag=!fzsd.ignore_sweeper_message] [{"text": "- 聊天栏："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "点击关闭"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set 3600"}}, {"text": "已启用", "color": "green"}, {"text": "]"}]] tellraw @s[tag=fzsd.ignore_sweeper_message] [{"text": "- 聊天栏："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "点击启用"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set 3601"}}, {"text": "已关闭", "color": "red"}, {"text": "]"}]] -tellraw @s [{"text": "- 开关："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3000"}}, {"text": "关", "color": "red"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "清理一次", "color": "aqua"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3300"}}, {"text": "清理一次", "color": "aqua"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "10s", "color": "#aa0000"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3010"}}, {"text": "10s", "color": "#aa0000"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "30s", "color": "#da7924"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3030"}}, {"text": "30s", "color": "#da7924"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "1min", "color": "#ffe34c"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3060"}}, {"text": "1min", "color": "#ffe34c"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "2min", "color": "#e3ff50"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3120"}}, {"text": "2min", "color": "#e3ff50"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "3min", "color": "#81d42c"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3180"}}, {"text": "3min", "color": "#81d42c"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "4min", "color": "#00aa00"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3240"}}, {"text": "4min", "color": "#00aa00"}, {"text": "]"}]] +execute if data storage fzsd:perm {sweeper:1} if entity @s[tag=fzsd.admin] run tellraw @s [{"text": "- 开关："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3000"}}, {"text": "关", "color": "red"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "清理一次", "color": "aqua"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3300"}}, {"text": "清理一次", "color": "aqua"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "10s", "color": "#aa0000"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3010"}}, {"text": "10s", "color": "#aa0000"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "30s", "color": "#da7924"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3030"}}, {"text": "30s", "color": "#da7924"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "1min", "color": "#ffe34c"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3060"}}, {"text": "1min", "color": "#ffe34c"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "2min", "color": "#e3ff50"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3120"}}, {"text": "2min", "color": "#e3ff50"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "3min", "color": "#81d42c"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3180"}}, {"text": "3min", "color": "#81d42c"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "4min", "color": "#00aa00"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3240"}}, {"text": "4min", "color": "#00aa00"}, {"text": "]"}]] +execute unless data storage fzsd:perm {sweeper:1} run tellraw @s [{"text": "- 开关："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3000"}}, {"text": "关", "color": "red"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "清理一次", "color": "aqua"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3300"}}, {"text": "清理一次", "color": "aqua"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "10s", "color": "#aa0000"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3010"}}, {"text": "10s", "color": "#aa0000"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "30s", "color": "#da7924"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3030"}}, {"text": "30s", "color": "#da7924"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "1min", "color": "#ffe34c"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3060"}}, {"text": "1min", "color": "#ffe34c"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "2min", "color": "#e3ff50"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3120"}}, {"text": "2min", "color": "#e3ff50"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "3min", "color": "#81d42c"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3180"}}, {"text": "3min", "color": "#81d42c"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "4min", "color": "#00aa00"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3240"}}, {"text": "4min", "color": "#00aa00"}, {"text": "]"}]] diff --git a/data/fzsd/function/module/sweeper/interactor/on_click.mcfunction b/data/fzsd/function/module/sweeper/interactor/on_click.mcfunction index 4f9b385..dacace0 100644 --- a/data/fzsd/function/module/sweeper/interactor/on_click.mcfunction +++ b/data/fzsd/function/module/sweeper/interactor/on_click.mcfunction @@ -1,9 +1,18 @@ execute if score @s fzsd.module.interactor.trigger matches 3400 run tag @s add fzsd.ignore_sweeper_bossbar +execute if score @s fzsd.module.interactor.trigger matches 3400 run tag @s add fzsd.ignore_sweeper_bossbar execute if score @s fzsd.module.interactor.trigger matches 3401 run tag @s remove fzsd.ignore_sweeper_bossbar +execute if score @s fzsd.module.interactor.trigger matches 3401 run tag @s remove fzsd.ignore_sweeper_bossbar +execute if score @s fzsd.module.interactor.trigger matches 3500 run tag @s add fzsd.ignore_sweeper_sound execute if score @s fzsd.module.interactor.trigger matches 3500 run tag @s add fzsd.ignore_sweeper_sound execute if score @s fzsd.module.interactor.trigger matches 3501 run tag @s remove fzsd.ignore_sweeper_sound +execute if score @s fzsd.module.interactor.trigger matches 3501 run tag @s remove fzsd.ignore_sweeper_sound +execute if score @s fzsd.module.interactor.trigger matches 3600 run tag @s add fzsd.ignore_sweeper_message execute if score @s fzsd.module.interactor.trigger matches 3600 run tag @s add fzsd.ignore_sweeper_message execute if score @s fzsd.module.interactor.trigger matches 3601 run tag @s remove fzsd.ignore_sweeper_message -execute if score @s fzsd.module.interactor.trigger matches -3300 run function #fzsd:module/sweeper/sweep -execute if score @s fzsd.module.interactor.trigger matches -3000 run function #fzsd:module/sweeper/stop_loop -execute if score @s fzsd.module.interactor.trigger matches -3240..-3010 run function #fzsd:module/sweeper/start_loop \ No newline at end of file +execute if score @s fzsd.module.interactor.trigger matches 3601 run tag @s remove fzsd.ignore_sweeper_message +execute if score @s fzsd.module.interactor.trigger matches -3300 if data storage fzsd:perm {sweeper:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/sweeper/sweep +execute if score @s fzsd.module.interactor.trigger matches -3300 unless data storage fzsd:perm {sweeper:1} run function #fzsd:module/sweeper/sweep +execute if score @s fzsd.module.interactor.trigger matches -3000 if data storage fzsd:perm {sweeper:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/sweeper/stop_loop +execute if score @s fzsd.module.interactor.trigger matches -3000 unless data storage fzsd:perm {sweeper:1} run function #fzsd:module/sweeper/stop_loop +execute if score @s fzsd.module.interactor.trigger matches -3240..-3010 if data storage fzsd:perm {sweeper:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/sweeper/start_loop +execute if score @s fzsd.module.interactor.trigger matches -3240..-3010 unless data storage fzsd:perm {sweeper:1} run function #fzsd:module/sweeper/start_loop diff --git a/data/fzsd/functions/module/here/interactor/display.mcfunction b/data/fzsd/functions/module/here/interactor/display.mcfunction index bc39fc1..04722c3 100644 --- a/data/fzsd/functions/module/here/interactor/display.mcfunction +++ b/data/fzsd/functions/module/here/interactor/display.mcfunction @@ -1 +1,4 @@ -execute if data storage fzsd:install fzsd.module{last_nether_portal:1b} run tellraw @s [{"text": "获取位置："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2000"}},{"text": "私信", "color": "aqua"},{"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：所有人"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2010"}},{"text": "广播", "color": "aqua"},{"text": "]"}]] \ No newline at end of file +execute if data storage fzsd:install fzsd.module{last_nether_portal:1b} unless data storage fzsd:perm {here:1} run tellraw @s [{"text": "获取位置："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2000"}},{"text": "私信", "color": "aqua"},{"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：所有人"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2010"}},{"text": "广播", "color": "aqua"},{"text": "]"}]] + +# 仅管理员 +execute if data storage fzsd:install fzsd.module{last_nether_portal:1b} if data storage fzsd:perm {here:1} if entity @s[tag=fzsd.admin] run tellraw @s [{"text": "获取位置："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2000"}},{"text": "私信", "color": "aqua"},{"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：所有人"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2010"}},{"text": "广播", "color": "aqua"},{"text": "]"}]] \ No newline at end of file diff --git a/data/fzsd/functions/module/here/interactor/on_click.mcfunction b/data/fzsd/functions/module/here/interactor/on_click.mcfunction index 18b4498..c169743 100644 --- a/data/fzsd/functions/module/here/interactor/on_click.mcfunction +++ b/data/fzsd/functions/module/here/interactor/on_click.mcfunction @@ -1,2 +1,4 @@ -execute if score @s fzsd.module.interactor.trigger matches -2000 run function #fzsd:module/here/private_message -execute if score @s fzsd.module.interactor.trigger matches -2010 run function #fzsd:module/here/global_message +execute if score @s fzsd.module.interactor.trigger matches -2000 if data storage fzsd:perm {here:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/here/private_message +execute if score @s fzsd.module.interactor.trigger matches -2000 unless data storage fzsd:perm {here:1} run function #fzsd:module/here/private_message +execute if score @s fzsd.module.interactor.trigger matches -2010 if data storage fzsd:perm {here:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/here/global_message +execute if score @s fzsd.module.interactor.trigger matches -2010 unless data storage fzsd:perm {here:1} run function #fzsd:module/here/global_message diff --git a/data/fzsd/functions/module/last_death/interactor/display.mcfunction b/data/fzsd/functions/module/last_death/interactor/display.mcfunction index 8f3a1ad..9449648 100644 --- a/data/fzsd/functions/module/last_death/interactor/display.mcfunction +++ b/data/fzsd/functions/module/last_death/interactor/display.mcfunction @@ -1 +1,2 @@ -execute if data storage fzsd:install fzsd.module{last_death:1b} run tellraw @s [{"text": "获取上一死亡点："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2100"}},{"text": "私信", "color": "aqua"},{"text": "]"}]] \ No newline at end of file +execute if data storage fzsd:install fzsd.module{last_death:1b} if data storage fzsd:perm {last_death:1} if entity @s[tag=fzsd.admin] run tellraw @s [{"text": "获取上一死亡点："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2100"}},{"text": "私信", "color": "aqua"},{"text": "]"}]] +execute if data storage fzsd:install fzsd.module{last_death:1b} unless data storage fzsd:perm {last_death:1} run tellraw @s [{"text": "获取上一死亡点："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2100"}},{"text": "私信", "color": "aqua"},{"text": "]"}]] diff --git a/data/fzsd/functions/module/last_death/interactor/on_click.mcfunction b/data/fzsd/functions/module/last_death/interactor/on_click.mcfunction index 5ce5872..072fd2a 100644 --- a/data/fzsd/functions/module/last_death/interactor/on_click.mcfunction +++ b/data/fzsd/functions/module/last_death/interactor/on_click.mcfunction @@ -1 +1,2 @@ -execute if score @s fzsd.module.interactor.trigger matches -2100 run function #fzsd:module/last_death/private_message \ No newline at end of file +execute if score @s fzsd.module.interactor.trigger matches -2100 if data storage fzsd:perm {last_death:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/last_death/private_message +execute if score @s fzsd.module.interactor.trigger matches -2100 unless data storage fzsd:perm {last_death:1} run function #fzsd:module/last_death/private_message \ No newline at end of file diff --git a/data/fzsd/functions/module/last_nether_portal/interactor/display.mcfunction b/data/fzsd/functions/module/last_nether_portal/interactor/display.mcfunction index 53d5e58..9f3fc75 100644 --- a/data/fzsd/functions/module/last_nether_portal/interactor/display.mcfunction +++ b/data/fzsd/functions/module/last_nether_portal/interactor/display.mcfunction @@ -1 +1,2 @@ -execute if data storage fzsd:install fzsd.module{last_nether_portal:1b} run tellraw @s [{"text": "获取上次穿出的下界传送门："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2200"}},{"text": "私信", "color": "aqua"},{"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：所有人"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2210"}},{"text": "广播", "color": "aqua"},{"text": "]"}]] \ No newline at end of file +execute if data storage fzsd:install fzsd.module{last_nether_portal:1b} if data storage fzsd:perm {last_nether_portal:1} if entity @s[tag=fzsd.admin] run tellraw @s [{"text": "获取上次穿出的下界传送门："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2200"}},{"text": "私信", "color": "aqua"},{"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：所有人"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2210"}},{"text": "广播", "color": "aqua"},{"text": "]"}]] +execute if data storage fzsd:install fzsd.module{last_nether_portal:1b} unless data storage fzsd:perm {last_nether_portal:1} run tellraw @s [{"text": "获取上次穿出的下界传送门："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2200"}},{"text": "私信", "color": "aqua"},{"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：所有人"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2210"}},{"text": "广播", "color": "aqua"},{"text": "]"}]] \ No newline at end of file diff --git a/data/fzsd/functions/module/last_nether_portal/interactor/on_click.mcfunction b/data/fzsd/functions/module/last_nether_portal/interactor/on_click.mcfunction index 40d1eea..59c082a 100644 --- a/data/fzsd/functions/module/last_nether_portal/interactor/on_click.mcfunction +++ b/data/fzsd/functions/module/last_nether_portal/interactor/on_click.mcfunction @@ -1,2 +1,4 @@ -execute if score @s fzsd.module.interactor.trigger matches -2200 run function #fzsd:module/last_nether_portal/private_message -execute if score @s fzsd.module.interactor.trigger matches -2210 run function #fzsd:module/last_nether_portal/global_message \ No newline at end of file +execute if score @s fzsd.module.interactor.trigger matches -2200 if data storage fzsd:perm {last_nether_portal:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/last_nether_portal/private_message +execute if score @s fzsd.module.interactor.trigger matches -2200 unless data storage fzsd:perm {last_nether_portal:1} run function #fzsd:module/last_nether_portal/private_message +execute if score @s fzsd.module.interactor.trigger matches -2210 if data storage fzsd:perm {last_nether_portal:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/last_nether_portal/global_message +execute if score @s fzsd.module.interactor.trigger matches -2210 unless data storage fzsd:perm {last_nether_portal:1} run function #fzsd:module/last_nether_portal/global_message \ No newline at end of file diff --git a/data/fzsd/functions/module/last_spawn_point/interactor/display.mcfunction b/data/fzsd/functions/module/last_spawn_point/interactor/display.mcfunction index 834c54f..596cab7 100644 --- a/data/fzsd/functions/module/last_spawn_point/interactor/display.mcfunction +++ b/data/fzsd/functions/module/last_spawn_point/interactor/display.mcfunction @@ -1 +1,2 @@ -execute if data storage fzsd:install fzsd.module{last_spawn_point:1b} run tellraw @s [{"text": "获取上一出生点："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2300"}},{"text": "私信", "color": "aqua"},{"text": "]"}]] \ No newline at end of file +execute if data storage fzsd:install fzsd.module{last_spawn_point:1b} if data storage fzsd:perm {last_spawn_point:1} if entity @s[tag=fzsd.admin] run tellraw @s [{"text": "获取上一出生点："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2300"}},{"text": "私信", "color": "aqua"},{"text": "]"}]] +execute if data storage fzsd:install fzsd.module{last_spawn_point:1b} unless data storage fzsd:perm {last_spawn_point:1} run tellraw @s [{"text": "获取上一出生点："},[{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "发送给：自己"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -2300"}},{"text": "私信", "color": "aqua"},{"text": "]"}]] \ No newline at end of file diff --git a/data/fzsd/functions/module/last_spawn_point/interactor/on_click.mcfunction b/data/fzsd/functions/module/last_spawn_point/interactor/on_click.mcfunction index d49c977..0e7d3fb 100644 --- a/data/fzsd/functions/module/last_spawn_point/interactor/on_click.mcfunction +++ b/data/fzsd/functions/module/last_spawn_point/interactor/on_click.mcfunction @@ -1 +1,2 @@ -execute if score @s fzsd.module.interactor.trigger matches -2300 run function #fzsd:module/last_spawn_point/private_message \ No newline at end of file +execute if score @s fzsd.module.interactor.trigger matches -2300 if data storage fzsd:perm {last_spawn_point:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/last_spawn_point/private_message +execute if score @s fzsd.module.interactor.trigger matches -2300 unless data storage fzsd:perm {last_spawn_point:1} run function #fzsd:module/last_spawn_point/private_message \ No newline at end of file diff --git a/data/fzsd/functions/module/phantom_warning/interactor/display.mcfunction b/data/fzsd/functions/module/phantom_warning/interactor/display.mcfunction index 2253ce4..868aaa5 100644 --- a/data/fzsd/functions/module/phantom_warning/interactor/display.mcfunction +++ b/data/fzsd/functions/module/phantom_warning/interactor/display.mcfunction @@ -1 +1,2 @@ -execute if data storage fzsd:install fzsd.module{phantom_warning:1b} run function fzsd:module/phantom_warning/interactor/display_0 \ No newline at end of file +execute if data storage fzsd:install fzsd.module{phantom_warning:1b} if data storage fzsd:perm {phantom_warning:1} if entity @s[tag=fzsd.admin] run function fzsd:module/phantom_warning/interactor/display_0 +execute if data storage fzsd:install fzsd.module{phantom_warning:1b} unless data storage fzsd:perm {phantom_warning:1} run function fzsd:module/phantom_warning/interactor/display_0 \ No newline at end of file diff --git a/data/fzsd/functions/module/phantom_warning/interactor/on_click.mcfunction b/data/fzsd/functions/module/phantom_warning/interactor/on_click.mcfunction index 5d3b3d8..1823f9d 100644 --- a/data/fzsd/functions/module/phantom_warning/interactor/on_click.mcfunction +++ b/data/fzsd/functions/module/phantom_warning/interactor/on_click.mcfunction @@ -1,2 +1,4 @@ -execute if score @s fzsd.module.interactor.trigger matches 4000 run tag @s add fzsd.ignore_phantom_warning -execute if score @s fzsd.module.interactor.trigger matches 4001 run tag @s remove fzsd.ignore_phantom_warning \ No newline at end of file +execute if score @s fzsd.module.interactor.trigger matches 4000 if data storage fzsd:perm {phantom_warning:1} if entity @s[tag=fzsd.admin] run tag @s add fzsd.ignore_phantom_warning +execute if score @s fzsd.module.interactor.trigger matches 4000 unless data storage fzsd:perm {phantom_warning:1} run tag @s add fzsd.ignore_phantom_warning +execute if score @s fzsd.module.interactor.trigger matches 4001 if data storage fzsd:perm {phantom_warning:1} if entity @s[tag=fzsd.admin] run tag @s remove fzsd.ignore_phantom_warning +execute if score @s fzsd.module.interactor.trigger matches 4001 unless data storage fzsd:perm {phantom_warning:1} run tag @s remove fzsd.ignore_phantom_warning \ No newline at end of file diff --git a/data/fzsd/functions/module/phantom_warning/send_phantom_warning.mcfunction b/data/fzsd/functions/module/phantom_warning/send_phantom_warning.mcfunction index 9edcc41..bde154d 100644 --- a/data/fzsd/functions/module/phantom_warning/send_phantom_warning.mcfunction +++ b/data/fzsd/functions/module/phantom_warning/send_phantom_warning.mcfunction @@ -1,6 +1,7 @@ # 调用者：tags\functions\module\phantom_warning\send_phantom_warning.json ## 对当前玩家发送提醒 -execute if score fzsd.logger.level fzsd.variable.integer matches ..600 run tellraw @s [{"nbt": "fzsd.level.alert", "interpret": true, "storage": "fzsd:logger"}, {"text": "今晚可能会生成幻翼，建议睡觉！"}] +execute if score fzsd.logger.level fzsd.variable.integer matches ..600 if data storage fzsd:perm {phantom_warning:1} if entity @s[tag=fzsd.admin] run tellraw @s [{"nbt": "fzsd.level.alert", "interpret": true, "storage": "fzsd:logger"}, {"text": "今晚可能会生成幻翼，建议睡觉！"}] +execute if score fzsd.logger.level fzsd.variable.integer matches ..600 unless data storage fzsd:perm {phantom_warning:1} run tellraw @s [{"nbt": "fzsd.level.alert", "interpret": true, "storage": "fzsd:logger"}, {"text": "今晚可能会生成幻翼，建议睡觉！"}] ## 调试 -execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "事件已触发：已向玩家"}, {"selector": "@s"}, {"text": "发送幻翼预警"}] \ No newline at end of file +execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "事件已触发：向玩家"}, {"selector": "@s"}, {"text": "发送幻翼预警"}] diff --git a/data/fzsd/functions/module/sweeper/interactor/display_0.mcfunction b/data/fzsd/functions/module/sweeper/interactor/display_0.mcfunction index d3a307b..1ab4983 100644 --- a/data/fzsd/functions/module/sweeper/interactor/display_0.mcfunction +++ b/data/fzsd/functions/module/sweeper/interactor/display_0.mcfunction @@ -9,4 +9,5 @@ tellraw @s[tag=fzsd.ignore_sweeper_sound] [{"text": "- 音效："}, [{"text": "[ tellraw @s[tag=!fzsd.ignore_sweeper_message] [{"text": "- 聊天栏："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "点击关闭"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set 3600"}}, {"text": "已启用", "color": "green"}, {"text": "]"}]] tellraw @s[tag=fzsd.ignore_sweeper_message] [{"text": "- 聊天栏："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "value": "点击启用"}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set 3601"}}, {"text": "已关闭", "color": "red"}, {"text": "]"}]] -tellraw @s [{"text": "- 开关："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3000"}}, {"text": "关", "color": "red"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "清理一次", "color": "aqua"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3300"}}, {"text": "清理一次", "color": "aqua"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "10s", "color": "#aa0000"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3010"}}, {"text": "10s", "color": "#aa0000"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "30s", "color": "#da7924"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3030"}}, {"text": "30s", "color": "#da7924"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "1min", "color": "#ffe34c"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3060"}}, {"text": "1min", "color": "#ffe34c"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "2min", "color": "#e3ff50"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3120"}}, {"text": "2min", "color": "#e3ff50"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "3min", "color": "#81d42c"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3180"}}, {"text": "3min", "color": "#81d42c"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "4min", "color": "#00aa00"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3240"}}, {"text": "4min", "color": "#00aa00"}, {"text": "]"}]] +execute if data storage fzsd:perm {sweeper:1} if entity @s[tag=fzsd.admin] run tellraw @s [{"text": "- 开关："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3000"}}, {"text": "关", "color": "red"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "清理一次", "color": "aqua"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3300"}}, {"text": "清理一次", "color": "aqua"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "10s", "color": "#aa0000"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3010"}}, {"text": "10s", "color": "#aa0000"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "30s", "color": "#da7924"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3030"}}, {"text": "30s", "color": "#da7924"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "1min", "color": "#ffe34c"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3060"}}, {"text": "1min", "color": "#ffe34c"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "2min", "color": "#e3ff50"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3120"}}, {"text": "2min", "color": "#e3ff50"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "3min", "color": "#81d42c"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3180"}}, {"text": "3min", "color": "#81d42c"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "4min", "color": "#00aa00"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3240"}}, {"text": "4min", "color": "#00aa00"}, {"text": "]"}]] +execute unless data storage fzsd:perm {sweeper:1} run tellraw @s [{"text": "- 开关："}, [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "关", "color": "red"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3000"}}, {"text": "关", "color": "red"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "清理一次", "color": "aqua"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3300"}}, {"text": "清理一次", "color": "aqua"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "10s", "color": "#aa0000"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3010"}}, {"text": "10s", "color": "#aa0000"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "30s", "color": "#da7924"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3030"}}, {"text": "30s", "color": "#da7924"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "1min", "color": "#ffe34c"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3060"}}, {"text": "1min", "color": "#ffe34c"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "2min", "color": "#e3ff50"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3120"}}, {"text": "2min", "color": "#e3ff50"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "3min", "color": "#81d42c"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3180"}}, {"text": "3min", "color": "#81d42c"}, {"text": "] "}], [{"text": "[", "color": "dark_gray", "hoverEvent": {"action": "show_text", "contents": {"text": "4min", "color": "#00aa00"}}, "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -3240"}}, {"text": "4min", "color": "#00aa00"}, {"text": "]"}]] diff --git a/data/fzsd/functions/module/sweeper/interactor/on_click.mcfunction b/data/fzsd/functions/module/sweeper/interactor/on_click.mcfunction index 4f9b385..dacace0 100644 --- a/data/fzsd/functions/module/sweeper/interactor/on_click.mcfunction +++ b/data/fzsd/functions/module/sweeper/interactor/on_click.mcfunction @@ -1,9 +1,18 @@ execute if score @s fzsd.module.interactor.trigger matches 3400 run tag @s add fzsd.ignore_sweeper_bossbar +execute if score @s fzsd.module.interactor.trigger matches 3400 run tag @s add fzsd.ignore_sweeper_bossbar execute if score @s fzsd.module.interactor.trigger matches 3401 run tag @s remove fzsd.ignore_sweeper_bossbar +execute if score @s fzsd.module.interactor.trigger matches 3401 run tag @s remove fzsd.ignore_sweeper_bossbar +execute if score @s fzsd.module.interactor.trigger matches 3500 run tag @s add fzsd.ignore_sweeper_sound execute if score @s fzsd.module.interactor.trigger matches 3500 run tag @s add fzsd.ignore_sweeper_sound execute if score @s fzsd.module.interactor.trigger matches 3501 run tag @s remove fzsd.ignore_sweeper_sound +execute if score @s fzsd.module.interactor.trigger matches 3501 run tag @s remove fzsd.ignore_sweeper_sound +execute if score @s fzsd.module.interactor.trigger matches 3600 run tag @s add fzsd.ignore_sweeper_message execute if score @s fzsd.module.interactor.trigger matches 3600 run tag @s add fzsd.ignore_sweeper_message execute if score @s fzsd.module.interactor.trigger matches 3601 run tag @s remove fzsd.ignore_sweeper_message -execute if score @s fzsd.module.interactor.trigger matches -3300 run function #fzsd:module/sweeper/sweep -execute if score @s fzsd.module.interactor.trigger matches -3000 run function #fzsd:module/sweeper/stop_loop -execute if score @s fzsd.module.interactor.trigger matches -3240..-3010 run function #fzsd:module/sweeper/start_loop \ No newline at end of file +execute if score @s fzsd.module.interactor.trigger matches 3601 run tag @s remove fzsd.ignore_sweeper_message +execute if score @s fzsd.module.interactor.trigger matches -3300 if data storage fzsd:perm {sweeper:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/sweeper/sweep +execute if score @s fzsd.module.interactor.trigger matches -3300 unless data storage fzsd:perm {sweeper:1} run function #fzsd:module/sweeper/sweep +execute if score @s fzsd.module.interactor.trigger matches -3000 if data storage fzsd:perm {sweeper:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/sweeper/stop_loop +execute if score @s fzsd.module.interactor.trigger matches -3000 unless data storage fzsd:perm {sweeper:1} run function #fzsd:module/sweeper/stop_loop +execute if score @s fzsd.module.interactor.trigger matches -3240..-3010 if data storage fzsd:perm {sweeper:1} if entity @s[tag=fzsd.admin] run function #fzsd:module/sweeper/start_loop +execute if score @s fzsd.module.interactor.trigger matches -3240..-3010 unless data storage fzsd:perm {sweeper:1} run function #fzsd:module/sweeper/start_loop