From 4526f5541d0ee887148b581a3c926f3041f8701d Mon Sep 17 00:00:00 2001 From: Harveykang <1214946206@qq.com> Date: Sat, 5 Dec 2020 07:27:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=92=94=E5=8B=92=E5=90=A6=20=E7=93=A6?= =?UTF-8?q?=E9=B2=81=E5=A4=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 ++++- data/fz/functions/carpet/carpet.mcfunction | 4 +++- data/fz/functions/config/display.mcfunction | 12 ++++++------ data/fz/functions/config/install.mcfunction | 2 ++ data/fz/functions/config/start.mcfunction | 2 +- data/fz/functions/config/timeout.mcfunction | 2 +- data/fz/functions/config/uninstall.mcfunction | 4 +++- data/fz/functions/health/install.mcfunction | 4 +++- data/fz/functions/health/uninstall.mcfunction | 4 +++- data/fz/functions/install.mcfunction | 14 ++++++++++---- data/fz/functions/load.mcfunction | 6 +++--- .../functions/login/logintips/install.mcfunction | 4 +++- .../functions/login/logintips/uninstall.mcfunction | 4 +++- data/fz/functions/login/onlogin.mcfunction | 2 +- data/fz/functions/scoreboards/delscore.mcfunction | 4 +++- data/fz/functions/scoreboards/install.mcfunction | 2 ++ data/fz/functions/scoreboards/start.mcfunction | 2 +- data/fz/functions/scoreboards/uninstall.mcfunction | 4 +++- data/fz/functions/start.mcfunction | 2 +- data/fz/functions/sweeper/config/off.mcfunction | 2 +- data/fz/functions/sweeper/install.mcfunction | 2 ++ data/fz/functions/sweeper/main.mcfunction | 2 +- data/fz/functions/sweeper/start.mcfunction | 2 +- data/fz/functions/sweeper/timer/10s.mcfunction | 2 +- data/fz/functions/sweeper/timer/1min.mcfunction | 2 +- data/fz/functions/sweeper/timer/1s.mcfunction | 2 +- data/fz/functions/sweeper/timer/2min.mcfunction | 2 +- data/fz/functions/sweeper/timer/2s.mcfunction | 2 +- data/fz/functions/sweeper/timer/30s.mcfunction | 2 +- data/fz/functions/sweeper/timer/3min.mcfunction | 2 +- data/fz/functions/sweeper/timer/3s.mcfunction | 2 +- data/fz/functions/sweeper/timer/4min.mcfunction | 2 +- data/fz/functions/sweeper/timer/4s.mcfunction | 2 +- data/fz/functions/sweeper/timer/5s.mcfunction | 2 +- data/fz/functions/sweeper/uninstall.mcfunction | 4 +++- data/fz/functions/uninstall.mcfunction | 4 +++- data/fz/functions/update.mcfunction | 4 +++- 37 files changed, 81 insertions(+), 44 deletions(-) diff --git a/README.md b/README.md index 245dbe9..0377964 100644 --- a/README.md +++ b/README.md @@ -12,5 +12,8 @@ A Minecraft Datapack - tagplayer.sc包含在压缩包中啦，把它放在world/scripts中然后“/reload”！ - 使用/tagplayer 命令生成假人可以避免假人被数据包提供的记分板捕捉到~ - tagplayer需要地毯mod1.4.15或以上版本来运行 -- v2.0.0.3 +##### - v2.0.0.3 + - tagplayer需要地毯mod1.4.18或以上版本来运行 - 优化了tagplayer体验及修复若干bug +##### - v2.0.0.4 + - 添加彩色字体 \ No newline at end of file diff --git a/data/fz/functions/carpet/carpet.mcfunction b/data/fz/functions/carpet/carpet.mcfunction index 6679dc9..6012e7e 100644 --- a/data/fz/functions/carpet/carpet.mcfunction +++ b/data/fz/functions/carpet/carpet.mcfunction @@ -3,4 +3,6 @@ carpet setDefault commandScript true carpet setDefault commandScriptACE ops carpet setDefault scriptsAutoload true carpet setDefault commandPlayer ops -script load tagplayer \ No newline at end of file +execute store success score tagplayer parameter run script load tagplayer +#提示已安装 +execute if score tagplayer parameter matches 1 run tellraw @a {"text": "[信息]Tagplayer已启用","color": "#5fff00"} \ No newline at end of file diff --git a/data/fz/functions/config/display.mcfunction b/data/fz/functions/config/display.mcfunction index a776cfd..5c7947c 100644 --- a/data/fz/functions/config/display.mcfunction +++ b/data/fz/functions/config/display.mcfunction @@ -1,13 +1,13 @@ #设置或重设超时时间为300s，超时后运行timeout函数 schedule function fz:config/timeout 300s #输出玩家可见的设置页面 -execute if data storage fz.installed {sweeper:1b} run tellraw @s {"text": "扫地机："} +execute if data storage fz.installed {sweeper:1b} run tellraw @s {"text": "扫地机：","color": "#ccff00"} ##扫地机时间，对应分数1478966210-1478966215 - execute if data storage fz.installed {sweeper:1b} run tellraw @s [{"text": "- [关]","clickEvent": {"action": "run_command","value": "/trigger config set 1478966210"}},{"text": "[30秒]","clickEvent": {"action": "run_command","value": "/trigger config set 1478966211"}},{"text": "[1分钟]","clickEvent": {"action": "run_command","value": "/trigger config set 1478966212"}},{"text": "[2分钟]","clickEvent": {"action": "run_command","value": "/trigger config set 1478966213"}},{"text": "[3分钟]","clickEvent": {"action": "run_command","value": "/trigger config set 1478966214"}},{"text": "[4分钟]","clickEvent": {"action": "run_command","value": "/trigger config set 1478966215"}}] + execute if data storage fz.installed {sweeper:1b} run tellraw @s [{"text": "- "},{"text": "[关]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966210"}},{"text": "[30秒]","color": "#5fff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966211"}},{"text": "[1分钟]","color": "#d7ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966212"}},{"text": "[2分钟]","color": "#ffd900","clickEvent": {"action": "run_command","value": "/trigger config set 1478966213"}},{"text": "[3分钟]","color": "#ff6100","clickEvent": {"action": "run_command","value": "/trigger config set 1478966214"}},{"text": "[4分钟]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966215"}}] ##开启矿车白名单1478966216 - execute if data storage fz.installed {sweeper:1b} unless score sweepMinecart parameter matches 1 run tellraw @s [{"text": "- 矿车白名单："},{"text": "[已关闭]","clickEvent": {"action": "run_command","value": "/trigger config set 1478966216"}}] + execute if data storage fz.installed {sweeper:1b} unless score sweepMinecart parameter matches 1 run tellraw @s [{"text": "- "},{"text": "矿车白名单：","color": "#8c8f91"},{"text": "[已关闭]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966216"}}] ##关闭矿车白名单1478966217 - execute if data storage fz.installed {sweeper:1b} if score sweepMinecart parameter matches 1 run tellraw @s [{"text": "- 矿车白名单："},{"text": "[已开启]","clickEvent": {"action": "run_command","value": "/trigger config set 1478966217"}}] -execute if data storage fz.installed {scoreboards:1b} run tellraw @s {"text": "记分板："} + execute if data storage fz.installed {sweeper:1b} if score sweepMinecart parameter matches 1 run tellraw @s [{"text": "- "},{"text": "矿车白名单：","color": "#8c8f91"},{"text": "[已开启]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966217"}}] +execute if data storage fz.installed {scoreboards:1b} run tellraw @s {"text": "记分板：","color": "#ccff00"} ##计分板显示，对应分数1838019370-1838019379 - execute if data storage fz.installed {scoreboards:1b} run tellraw @s [{"text": "- [关]","clickEvent": {"action": "run_command","value": "/trigger config set 1838019370"}},{"text": "[轮播]","clickEvent": {"action": "run_command","value": "/trigger config set 1838019371"}},{"text": "[总量]","clickEvent": {"action": "run_command","value": "/trigger config set 1838019379"}},{"text": "[在线时间(h)]","clickEvent": {"action": "run_command","value": "/trigger config set 1838019372"}},{"text": "[抖M名单]","clickEvent": {"action": "run_command","value": "/trigger config set 1838019373"}},{"text": "[死亡榜]","clickEvent": {"action": "run_command","value": "/trigger config set 1838019374"}},{"text": "[挖掘榜]","clickEvent": {"action": "run_command","value": "/trigger config set 1838019375"}},{"text": "[钩直饵咸]","clickEvent": {"action": "run_command","value": "/trigger config set 1838019376"}},{"text": "[击杀榜]","clickEvent": {"action": "run_command","value": "/trigger config set 1838019377"}},{"text": "[交♂易榜]","clickEvent": {"action": "run_command","value": "/trigger config set 1838019378"}}] \ No newline at end of file + execute if data storage fz.installed {scoreboards:1b} run tellraw @s [{"text": "- "},{"text": "[关]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1838019370"}},{"text": "[轮播]","color": "gold","clickEvent": {"action": "run_command","value": "/trigger config set 1838019371"}},{"text": "[总量]","color": "dark_aqua","clickEvent": {"action": "run_command","value": "/trigger config set 1838019379"}},{"text": "[在线时间(h)]","color": "aqua","clickEvent": {"action": "run_command","value": "/trigger config set 1838019372"}},{"text": "[抖M名单]","color": "yellow","clickEvent": {"action": "run_command","value": "/trigger config set 1838019373"}},{"text": "[死亡榜]","color": "dark_red","clickEvent": {"action": "run_command","value": "/trigger config set 1838019374"}},{"text": "[挖掘榜]","color": "gray","clickEvent": {"action": "run_command","value": "/trigger config set 1838019375"}},{"text": "[钩直饵咸]","color": "blue","clickEvent": {"action": "run_command","value": "/trigger config set 1838019376"}},{"text": "[击杀榜]","color": "red","clickEvent": {"action": "run_command","value": "/trigger config set 1838019377"}},{"text": "[交♂易榜]","color": "green","clickEvent": {"action": "run_command","value": "/trigger config set 1838019378"}}] \ No newline at end of file diff --git a/data/fz/functions/config/install.mcfunction b/data/fz/functions/config/install.mcfunction index 8e9a6c9..7a5d4a4 100644 --- a/data/fz/functions/config/install.mcfunction +++ b/data/fz/functions/config/install.mcfunction @@ -3,5 +3,7 @@ scoreboard objectives add config trigger #存入已安装信息 data merge storage fz.installed {config:1b} +#提示已安装 +tellraw @a {"text": "[信息]设置功能已安装","color": "#5fff00"} #开始运行 function fz:config/start \ No newline at end of file diff --git a/data/fz/functions/config/start.mcfunction b/data/fz/functions/config/start.mcfunction index 13a55d7..3a4d241 100644 --- a/data/fz/functions/config/start.mcfunction +++ b/data/fz/functions/config/start.mcfunction @@ -4,4 +4,4 @@ schedule clear fz:config/timeout data remove storage fz.config is_open scoreboard players enable @a config #测试用的输出 -tellraw @a {"text": "设置ok"} \ No newline at end of file +tellraw @a {"text": "[信息]设置功能已启用","color": "#5fff00"} \ No newline at end of file diff --git a/data/fz/functions/config/timeout.mcfunction b/data/fz/functions/config/timeout.mcfunction index 5d1d62e..45b9a51 100644 --- a/data/fz/functions/config/timeout.mcfunction +++ b/data/fz/functions/config/timeout.mcfunction @@ -1,7 +1,7 @@ #关闭主进程 schedule clear fz:config/main #输出给打开过设置界面的玩家的消息 -tellraw @a[scores={openingConfig=1}] {"text": "5分钟无任何人回应，为节省性能，已关闭设置功能，请重新唤起"} +tellraw @a[scores={openingConfig=1}] {"text": "[提醒]5分钟无任何人回应，为节省性能，已关闭设置功能，请重新唤起","color": "#d7ff00"} #重置打开过设置界面的玩家的列表 scoreboard objectives remove openingConfig #移除设置界面被打开的信息 diff --git a/data/fz/functions/config/uninstall.mcfunction b/data/fz/functions/config/uninstall.mcfunction index a1312cc..affb5f5 100644 --- a/data/fz/functions/config/uninstall.mcfunction +++ b/data/fz/functions/config/uninstall.mcfunction @@ -4,4 +4,6 @@ schedule clear fz:config/main schedule clear fz:config/timeout data remove storage fz.config is_open #写入已卸载的信息 -data merge storage fz.installed {config:0b} \ No newline at end of file +data merge storage fz.installed {config:0b} +#提示已卸载 +tellraw @a {"text": "[信息]设置功能已卸载","color": "#5fff00"} \ No newline at end of file diff --git a/data/fz/functions/health/install.mcfunction b/data/fz/functions/health/install.mcfunction index c7d7dc3..fcaf0e9 100644 --- a/data/fz/functions/health/install.mcfunction +++ b/data/fz/functions/health/install.mcfunction @@ -5,4 +5,6 @@ scoreboard objectives modify Health rendertype hearts scoreboard objectives setdisplay list Health scoreboard objectives setdisplay belowName Health #写入已安装的信息 -data merge storage fz.installed {health:1b} \ No newline at end of file +data merge storage fz.installed {health:1b} +#提示已安装 +tellraw @a {"text": "[信息]血量显示已安装","color": "#5fff00"} \ No newline at end of file diff --git a/data/fz/functions/health/uninstall.mcfunction b/data/fz/functions/health/uninstall.mcfunction index a569aca..92a78bc 100644 --- a/data/fz/functions/health/uninstall.mcfunction +++ b/data/fz/functions/health/uninstall.mcfunction @@ -2,4 +2,6 @@ #删除计分板 scoreboard objectives remove Health #写入已卸载的信息 -data merge storage fz.installed {health:0b} \ No newline at end of file +data merge storage fz.installed {health:0b} +#提示已卸载 +tellraw @a {"text": "[信息]血量显示已卸载","color": "#5fff00"} \ No newline at end of file diff --git a/data/fz/functions/install.mcfunction b/data/fz/functions/install.mcfunction index 53f1a16..3f3a49e 100644 --- a/data/fz/functions/install.mcfunction +++ b/data/fz/functions/install.mcfunction @@ -15,8 +15,14 @@ function fz:login/logintips/install function fz:carpet/carpet #版本信息 data merge storage fz.installed {installed:1b} -data merge storage fz {version:Alpha-2.0.0.3} -data merge storage fz {date:2020-11.27} -data merge storage fz {time:"22:18"} +data merge storage fz {version:Alpha-2.0.0.4} +data merge storage fz {date:2020-12.25} +data merge storage fz {time:"07:01"} data merge storage fz {snapshot:-SNAPSHOT} -##data remove storage fz snapshot \ No newline at end of file +##data remove storage fz snapshot +#提示已安装 +tellraw @a {"text": "[信息]安装完成！","color": "#5fff00"} +#info: #5fff00 +#alert: #d7ff00 +#warn: #ffd900 +#error: #ff6100 \ No newline at end of file diff --git a/data/fz/functions/load.mcfunction b/data/fz/functions/load.mcfunction index 7107960..8ebf929 100644 --- a/data/fz/functions/load.mcfunction +++ b/data/fz/functions/load.mcfunction @@ -1,8 +1,8 @@ #如果未安装且未卸载则安装 execute unless data storage fz.installed {installed:1b} unless data storage fz.installed {installed:0b} run function fz:install #如果版本正确且已安装则开始运行 -execute if data storage fz {version:Alpha-2.0.0.3} if data storage fz.installed {installed:1b} run function fz:start +execute if data storage fz {version:Alpha-2.0.0.4} if data storage fz.installed {installed:1b} run function fz:start #如果版本不符则更新 -execute unless data storage fz {version:Alpha-2.0.0.3} run function fz:update +execute unless data storage fz {version:Alpha-2.0.0.4} run function fz:update #输出版本信息 -tellraw @a [{"text": "FZ's Datapack-"},{"nbt":"version","storage":"fz"},{"nbt": "snapshot", "storage": "fz"}] \ No newline at end of file +tellraw @a [{"text": "[版本信息]FZ's Datapack-","color": "#ffd900"},{"nbt":"version","storage":"fz","color": "#ffd900"},{"nbt": "snapshot", "storage": "fz","color": "red"}] \ No newline at end of file diff --git a/data/fz/functions/login/logintips/install.mcfunction b/data/fz/functions/login/logintips/install.mcfunction index ae8a44c..0c7b5b9 100644 --- a/data/fz/functions/login/logintips/install.mcfunction +++ b/data/fz/functions/login/logintips/install.mcfunction @@ -1,2 +1,4 @@ #安装登陆提示 -data merge storage fz.installed {logintips:1b} \ No newline at end of file +data merge storage fz.installed {logintips:1b} +#提示已安装 +tellraw @a {"text": "[信息]登陆提示已安装","color": "#5fff00"} \ No newline at end of file diff --git a/data/fz/functions/login/logintips/uninstall.mcfunction b/data/fz/functions/login/logintips/uninstall.mcfunction index ba4bb86..ad8c84f 100644 --- a/data/fz/functions/login/logintips/uninstall.mcfunction +++ b/data/fz/functions/login/logintips/uninstall.mcfunction @@ -1,2 +1,4 @@ #卸载登陆提示 -data merge storage fz.installed {logintips:0b} \ No newline at end of file +data merge storage fz.installed {logintips:0b} +#提示已卸载 +tellraw @a {"text": "[信息]登陆提示已卸载","color": "#5fff00"} \ No newline at end of file diff --git a/data/fz/functions/login/onlogin.mcfunction b/data/fz/functions/login/onlogin.mcfunction index 9b31843..5ea633e 100644 --- a/data/fz/functions/login/onlogin.mcfunction +++ b/data/fz/functions/login/onlogin.mcfunction @@ -1,4 +1,4 @@ -execute if data storage fz.installed {logintips:1b} run tellraw @s {"text": "提示：站在地面，抬头并按一下shift即可打开设置页面"} +execute if data storage fz.installed {logintips:1b} run tellraw @s {"text": "[提醒]站在地面，抬头并按一下shift即可打开设置页面","color": "#d7ff00"} scoreboard players set @s leaveGame 0 diff --git a/data/fz/functions/scoreboards/delscore.mcfunction b/data/fz/functions/scoreboards/delscore.mcfunction index dae17af..47b261b 100644 --- a/data/fz/functions/scoreboards/delscore.mcfunction +++ b/data/fz/functions/scoreboards/delscore.mcfunction @@ -6,4 +6,6 @@ scoreboard objectives remove tradingCounter scoreboard objectives remove fishingCounter scoreboard objectives remove damageTaken scoreboard objectives remove activation -scoreboard objectives remove totalList \ No newline at end of file +scoreboard objectives remove totalList +#提示已删除 +tellraw @a {"text": "[信息]计分板数据已删除","color": "#5fff00"} \ No newline at end of file diff --git a/data/fz/functions/scoreboards/install.mcfunction b/data/fz/functions/scoreboards/install.mcfunction index a1e28d7..c7684f3 100644 --- a/data/fz/functions/scoreboards/install.mcfunction +++ b/data/fz/functions/scoreboards/install.mcfunction @@ -99,4 +99,6 @@ scoreboard objectives setdisplay sidebar.team.green tradingCounter data merge storage fz.installed {scoreboards:1b} +#提示已安装 +tellraw @a {"text": "[信息]记分板已安装","color": "#5fff00"} function fz:scoreboards/start \ No newline at end of file diff --git a/data/fz/functions/scoreboards/start.mcfunction b/data/fz/functions/scoreboards/start.mcfunction index c53ae73..bfc34bb 100644 --- a/data/fz/functions/scoreboards/start.mcfunction +++ b/data/fz/functions/scoreboards/start.mcfunction @@ -10,4 +10,4 @@ advancement revoke @a only fz:scoreboards/tradingcounter advancement revoke @a only fz:scoreboards/digcounter/digtrigger advancement revoke @a only fz:scoreboards/digcounter/toolsfix -tellraw @a {"text": "记分板ok"} \ No newline at end of file +tellraw @a {"text": "[信息]记分板已启用","color": "#5fff00"} \ No newline at end of file diff --git a/data/fz/functions/scoreboards/uninstall.mcfunction b/data/fz/functions/scoreboards/uninstall.mcfunction index 8e82c15..d5f078d 100644 --- a/data/fz/functions/scoreboards/uninstall.mcfunction +++ b/data/fz/functions/scoreboards/uninstall.mcfunction @@ -49,6 +49,8 @@ scoreboard objectives setdisplay sidebar.team.light_purple scoreboard objectives setdisplay sidebar.team.green scoreboard objectives setdisplay sidebar.team.gold -tellraw @s [{"text": "您要删除计分板数据吗，它将会永久失去！(真的很久！)", "color": "red"},{"text": "[确定]","clickEvent": {"action": "run_command", "value": "/function fz:scoreboards/delscore"}, "color": "green"}] +#提示已卸载 +tellraw @a {"text": "[信息]记分板已卸载","color": "#5fff00"} +tellraw @s [{"text": "[警告]您要删除计分板数据吗，它将会永久失去！(真的很久！)", "color": "#ffd900"},{"text": "[确定]","clickEvent": {"action": "run_command", "value": "/function fz:scoreboards/delscore"}, "color": "#00ff00"}] data merge storage fz.installed {scoreboards:0b} \ No newline at end of file diff --git a/data/fz/functions/start.mcfunction b/data/fz/functions/start.mcfunction index 29286d2..3b9ff03 100644 --- a/data/fz/functions/start.mcfunction +++ b/data/fz/functions/start.mcfunction @@ -4,4 +4,4 @@ execute if data storage fz.installed {sweeper:1b} run function fz:sweeper/start execute if data storage fz.installed {config:1b} run function fz:config/start function fz:carpet/carpet #测试用的输出 -tellraw @a {"text": "ok"} \ No newline at end of file +tellraw @a {"text": "[信息]启动完毕","color": "#5fff00"} \ No newline at end of file diff --git a/data/fz/functions/sweeper/config/off.mcfunction b/data/fz/functions/sweeper/config/off.mcfunction index a2e753d..1cb3380 100644 --- a/data/fz/functions/sweeper/config/off.mcfunction +++ b/data/fz/functions/sweeper/config/off.mcfunction @@ -11,5 +11,5 @@ schedule clear fz:sweeper/timer/1min schedule clear fz:sweeper/timer/2min schedule clear fz:sweeper/timer/3min schedule clear fz:sweeper/timer/4min -tellraw @a {"text": "扫地机已关闭"} +tellraw @a {"text": "[信息]扫地机已关闭","color": "#5fff00"} execute as @a at @a run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 2 \ No newline at end of file diff --git a/data/fz/functions/sweeper/install.mcfunction b/data/fz/functions/sweeper/install.mcfunction index 325ea4b..56653c4 100644 --- a/data/fz/functions/sweeper/install.mcfunction +++ b/data/fz/functions/sweeper/install.mcfunction @@ -1,3 +1,5 @@ data merge storage fz.installed {sweeper:1b} +#提示已安装 +tellraw @a {"text": "[信息]扫地机已安装","color": "#5fff00"} function fz:sweeper/start \ No newline at end of file diff --git a/data/fz/functions/sweeper/main.mcfunction b/data/fz/functions/sweeper/main.mcfunction index ed7b4d6..96c0a09 100644 --- a/data/fz/functions/sweeper/main.mcfunction +++ b/data/fz/functions/sweeper/main.mcfunction @@ -1,6 +1,6 @@ execute if score sweepMinecart parameter matches 1 run execute store result score sweeperItem parameter run kill @e[type=item] execute unless score sweepMinecart parameter matches 1 run execute store result score sweeperItem parameter run kill @e[type=item,predicate=!fz:sweeper/minecart] -tellraw @a [{"text": "本次清理了"},{"score": {"objective": "parameter", "name": "sweeperItem"}},{"text": "堆物品"}] +tellraw @a [{"text": "[信息]本次清理了","color": "#5fff00"},{"score": {"objective": "parameter", "name": "sweeperItem"},"color": "#5fff00"},{"text": "堆物品","color": "#5fff00"}] execute as @a at @a run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 2 execute if score sweeperTime parameter matches 30 run function fz:sweeper/timer/30s execute if score sweeperTime parameter matches 60 run function fz:sweeper/timer/1min diff --git a/data/fz/functions/sweeper/start.mcfunction b/data/fz/functions/sweeper/start.mcfunction index 43cb78e..0226285 100644 --- a/data/fz/functions/sweeper/start.mcfunction +++ b/data/fz/functions/sweeper/start.mcfunction @@ -10,4 +10,4 @@ schedule clear fz:sweeper/timer/2min schedule clear fz:sweeper/timer/3min schedule clear fz:sweeper/timer/4min -tellraw @a {"text": "扫地机ok"} \ No newline at end of file +tellraw @a {"text": "[信息]扫地机已启用","color": "#5fff00"} \ No newline at end of file diff --git a/data/fz/functions/sweeper/timer/10s.mcfunction b/data/fz/functions/sweeper/timer/10s.mcfunction index 74af4ad..8fa9769 100644 --- a/data/fz/functions/sweeper/timer/10s.mcfunction +++ b/data/fz/functions/sweeper/timer/10s.mcfunction @@ -1,3 +1,3 @@ -tellraw @a {"text": "10s后清理掉落物"} +tellraw @a {"text": "[提醒]10s后清理掉落物","color": "#d7ff00"} execute as @a at @a run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1 schedule function fz:sweeper/timer/5s 5s \ No newline at end of file diff --git a/data/fz/functions/sweeper/timer/1min.mcfunction b/data/fz/functions/sweeper/timer/1min.mcfunction index 25b7774..30e94e1 100644 --- a/data/fz/functions/sweeper/timer/1min.mcfunction +++ b/data/fz/functions/sweeper/timer/1min.mcfunction @@ -1,3 +1,3 @@ -tellraw @a {"text": "1min后清理掉落物"} +tellraw @a {"text": "[提醒]1min后清理掉落物","color": "#d7ff00"} execute as @a at @a run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1 schedule function fz:sweeper/timer/30s 30s \ No newline at end of file diff --git a/data/fz/functions/sweeper/timer/1s.mcfunction b/data/fz/functions/sweeper/timer/1s.mcfunction index 964904d..2572066 100644 --- a/data/fz/functions/sweeper/timer/1s.mcfunction +++ b/data/fz/functions/sweeper/timer/1s.mcfunction @@ -1,3 +1,3 @@ -tellraw @a {"text": "1s后清理掉落物"} +tellraw @a {"text": "[提醒]1s后清理掉落物","color": "#d7ff00"} execute as @a at @a run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1 schedule function fz:sweeper/main 1s \ No newline at end of file diff --git a/data/fz/functions/sweeper/timer/2min.mcfunction b/data/fz/functions/sweeper/timer/2min.mcfunction index 53ea459..116c3c4 100644 --- a/data/fz/functions/sweeper/timer/2min.mcfunction +++ b/data/fz/functions/sweeper/timer/2min.mcfunction @@ -1,3 +1,3 @@ -tellraw @a {"text": "2min后清理掉落物"} +tellraw @a {"text": "[提醒]2min后清理掉落物","color": "#d7ff00"} execute as @a at @a run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1 schedule function fz:sweeper/timer/1min 60s \ No newline at end of file diff --git a/data/fz/functions/sweeper/timer/2s.mcfunction b/data/fz/functions/sweeper/timer/2s.mcfunction index f526d2e..a16aba1 100644 --- a/data/fz/functions/sweeper/timer/2s.mcfunction +++ b/data/fz/functions/sweeper/timer/2s.mcfunction @@ -1,3 +1,3 @@ -tellraw @a {"text": "2s后清理掉落物"} +tellraw @a {"text": "[提醒]2s后清理掉落物","color": "#d7ff00"} execute as @a at @a run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1 schedule function fz:sweeper/timer/1s 1s \ No newline at end of file diff --git a/data/fz/functions/sweeper/timer/30s.mcfunction b/data/fz/functions/sweeper/timer/30s.mcfunction index cb5bc58..658dc72 100644 --- a/data/fz/functions/sweeper/timer/30s.mcfunction +++ b/data/fz/functions/sweeper/timer/30s.mcfunction @@ -1,3 +1,3 @@ -tellraw @a {"text": "30s后清理掉落物"} +tellraw @a {"text": "[提醒]30s后清理掉落物","color": "#d7ff00"} execute as @a at @a run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1 schedule function fz:sweeper/timer/10s 20s \ No newline at end of file diff --git a/data/fz/functions/sweeper/timer/3min.mcfunction b/data/fz/functions/sweeper/timer/3min.mcfunction index c987016..122a57c 100644 --- a/data/fz/functions/sweeper/timer/3min.mcfunction +++ b/data/fz/functions/sweeper/timer/3min.mcfunction @@ -1,3 +1,3 @@ -tellraw @a {"text": "3min后清理掉落物"} +tellraw @a {"text": "[提醒]3min后清理掉落物","color": "#d7ff00"} execute as @a at @a run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1 schedule function fz:sweeper/timer/2min 60s \ No newline at end of file diff --git a/data/fz/functions/sweeper/timer/3s.mcfunction b/data/fz/functions/sweeper/timer/3s.mcfunction index 1b3d9d9..5a770b9 100644 --- a/data/fz/functions/sweeper/timer/3s.mcfunction +++ b/data/fz/functions/sweeper/timer/3s.mcfunction @@ -1,3 +1,3 @@ -tellraw @a {"text": "3s后清理掉落物"} +tellraw @a {"text": "[提醒]3s后清理掉落物","color": "#d7ff00"} execute as @a at @a run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1 schedule function fz:sweeper/timer/2s 1s \ No newline at end of file diff --git a/data/fz/functions/sweeper/timer/4min.mcfunction b/data/fz/functions/sweeper/timer/4min.mcfunction index 826eb40..93540cf 100644 --- a/data/fz/functions/sweeper/timer/4min.mcfunction +++ b/data/fz/functions/sweeper/timer/4min.mcfunction @@ -1,3 +1,3 @@ -tellraw @a {"text": "4min后清理掉落物"} +tellraw @a {"text": "[提醒]4min后清理掉落物","color": "#d7ff00"} execute as @a at @a run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1 schedule function fz:sweeper/timer/3min 60s \ No newline at end of file diff --git a/data/fz/functions/sweeper/timer/4s.mcfunction b/data/fz/functions/sweeper/timer/4s.mcfunction index 73162ac..dc94b8e 100644 --- a/data/fz/functions/sweeper/timer/4s.mcfunction +++ b/data/fz/functions/sweeper/timer/4s.mcfunction @@ -1,3 +1,3 @@ -tellraw @a {"text": "4s后清理掉落物"} +tellraw @a {"text": "[提醒]4s后清理掉落物","color": "#d7ff00"} execute as @a at @a run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1 schedule function fz:sweeper/timer/3s 1s \ No newline at end of file diff --git a/data/fz/functions/sweeper/timer/5s.mcfunction b/data/fz/functions/sweeper/timer/5s.mcfunction index d160d46..4ce3392 100644 --- a/data/fz/functions/sweeper/timer/5s.mcfunction +++ b/data/fz/functions/sweeper/timer/5s.mcfunction @@ -1,3 +1,3 @@ -tellraw @a {"text": "5s后清理掉落物"} +tellraw @a {"text": "[提醒]5s后清理掉落物","color": "#d7ff00"} execute as @a at @a run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 1 schedule function fz:sweeper/timer/4s 1s \ No newline at end of file diff --git a/data/fz/functions/sweeper/uninstall.mcfunction b/data/fz/functions/sweeper/uninstall.mcfunction index 8a96c0b..4df27ae 100644 --- a/data/fz/functions/sweeper/uninstall.mcfunction +++ b/data/fz/functions/sweeper/uninstall.mcfunction @@ -11,4 +11,6 @@ schedule clear fz:sweeper/timer/2min schedule clear fz:sweeper/timer/3min schedule clear fz:sweeper/timer/4min -data merge storage fz.installed {sweeper:0b} \ No newline at end of file +data merge storage fz.installed {sweeper:0b} +#提示已卸载 +tellraw @a {"text": "[信息]扫地机已卸载","color": "#5fff00"} \ No newline at end of file diff --git a/data/fz/functions/uninstall.mcfunction b/data/fz/functions/uninstall.mcfunction index 0019478..39987ed 100644 --- a/data/fz/functions/uninstall.mcfunction +++ b/data/fz/functions/uninstall.mcfunction @@ -9,4 +9,6 @@ scoreboard objectives remove parameter scoreboard objectives remove calculator scoreboard objectives remove leaveGame #存入已卸载信息，下次启动不会重新安装 -data merge storage fz.installed {installed:0b} \ No newline at end of file +data merge storage fz.installed {installed:0b} +#提示已卸载 +tellraw @a {"text": "[信息]FZ'sDatapack已卸载","color": "#5fff00"} \ No newline at end of file diff --git a/data/fz/functions/update.mcfunction b/data/fz/functions/update.mcfunction index da84b23..daf75ce 100644 --- a/data/fz/functions/update.mcfunction +++ b/data/fz/functions/update.mcfunction @@ -5,4 +5,6 @@ execute if data storage fz.installed {config:0b} run function fz:config/uninstal execute if data storage fz.installed {sweeper:0b} run function fz:sweeper/uninstall execute if data storage fz.installed {scoreboards:0b} run function fz:scoreboards/uninstall execute if data storage fz.installed {health:0b} run function fz:health/uninstall -execute if data storage fz.installed {logintips:0b} run function fz:login/logintips/uninstall \ No newline at end of file +execute if data storage fz.installed {logintips:0b} run function fz:login/logintips/uninstall +#提示已安装 +tellraw @a {"text": "[信息]升级完成","color": "#5fff00"} \ No newline at end of file