Fortern/fz-survival-datapack
1
0
Fork 0
Code Actions Releases Activity

2.1.0

Browse Source
This commit is contained in:
延皓
2021-07-03 06:21:34 +08:00
parent 5e41b7d950
commit b2843145af
52 changed files with 1523 additions and 1844 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/fz/functions/carpet/carpet.mcfunction
+2 -2
View File
@@ -1,5 +1,5 @@
#初始化tagplayer
carpet setDefault commandScript true
carpet setDefault commandScriptACE ops
carpet setDefault scriptsAutoload true
carpet setDefault commandPlayer ops
script run carpet_rules = system_info('world_carpet_rules'); if(carpet_rules:'scriptsAutoload' != 'true', run('carpet setDefault scriptsAutoload true'); run('tellraw @a {"text":"[错误]假人插件未正确加载，已自动将“scriptsAutoload”设为true。正在重载，如仍未加载，请手动加载...", "color":"#ff6100"}'); run('reload'))
script unload player
data/fz/functions/config/display.mcfunction
+15 -12
View File
@@ -2,23 +2,26 @@
schedule function fz:config/timeout 300s
#输出玩家可见的设置页面
##扫地机
execute if data storage fz.installed {sweeper:1b} run tellraw @s {"text": "扫地机：","color": "#ccff00"}
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": "- "},{"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"}}]
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 keepMinecart parameter matches 1 run tellraw @s [{"text": "- "},{"text": "矿车白名单：","color": "#8c8f91"},{"text": "[已关闭]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966216"}}]
execute if data storage fz.installed {sweeper: 1b} unless score keepMinecart 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 keepMinecart 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 {sweeper: 1b} if score keepMinecart 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 {sweeper:1b} run tellraw @s[tag=!fz.sweeperSoundOff] [{"text": "- "},{"text": "声音：","color": "#8c8f91"},{"text": "[已开启]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966209"}}]
execute if data storage fz.installed {sweeper:1b} run tellraw @s[tag=fz.sweeperSoundOff] [{"text": "- "},{"text": "声音：","color": "#8c8f91"},{"text": "[已关闭]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966208"}}]
execute if data storage fz.installed {sweeper: 1b} run tellraw @s[tag=!fz.sweeperSoundOff] [{"text": "- "},{"text": "声音：","color": "#8c8f91"},{"text": "[已开启]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966209"}}]
execute if data storage fz.installed {sweeper: 1b} run tellraw @s[tag=fz.sweeperSoundOff] [{"text": "- "},{"text": "声音：","color": "#8c8f91"},{"text": "[已关闭]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966208"}}]
##消息提示
execute if data storage fz.installed {sweeper:1b} run tellraw @s[tag=!fz.sweeperMessageOff] [{"text": "- "},{"text": "消息：","color": "#8c8f91"},{"text": "[已开启]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966205"}}]
execute if data storage fz.installed {sweeper:1b} run tellraw @s[tag=fz.sweeperMessageOff] [{"text": "- "},{"text": "消息：","color": "#8c8f91"},{"text": "[已关闭]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966204"}}]
execute if data storage fz.installed {sweeper: 1b} run tellraw @s[tag=!fz.sweeperMessageOff] [{"text": "- "},{"text": "消息：","color": "#8c8f91"},{"text": "[已开启]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966205"}}]
execute if data storage fz.installed {sweeper: 1b} run tellraw @s[tag=fz.sweeperMessageOff] [{"text": "- "},{"text": "消息：","color": "#8c8f91"},{"text": "[已关闭]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966204"}}]
##血条栏提示
execute if data storage fz.installed {sweeper:1b} run tellraw @s[tag=!fz.sweeperBossbarOff] [{"text": "- "},{"text": "血条栏：","color": "#8c8f91"},{"text": "[已开启]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966207"}}]
execute if data storage fz.installed {sweeper:1b} run tellraw @s[tag=fz.sweeperBossbarOff] [{"text": "- "},{"text": "血条栏：","color": "#8c8f91"},{"text": "[已关闭]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966206"}}]
execute if data storage fz.installed {sweeper: 1b} run tellraw @s[tag=!fz.sweeperBossbarOff] [{"text": "- "},{"text": "血条栏：","color": "#8c8f91"},{"text": "[已开启]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966207"}}]
execute if data storage fz.installed {sweeper: 1b} run tellraw @s[tag=fz.sweeperBossbarOff] [{"text": "- "},{"text": "血条栏：","color": "#8c8f91"},{"text": "[已关闭]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966206"}}]
##记分板
execute if data storage fz.installed {scoreboards:1b} run tellraw @s {"text": "记分板：","color": "#ccff00"}
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": "- "},{"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"}}]
execute if data storage fz.installed {scoreboards: 1b} unless score 全员头铁 bedrockBreaked matches 1.. run tellraw @s [{"text": "- "},{"text": "[关]","color": "#ff0000","hoverEvent": {"action": "show_text","contents": {"text": "关", "color": "#ff0000"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019370"}},{"text": "[轮播]","color": "gold","hoverEvent": {"action": "show_text","contents": {"text": "轮播", "color": "gold"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019371"}},{"text": "[总量]","color": "dark_aqua","hoverEvent": {"action": "show_text","contents": {"text": "总量","color": "dark_aqua"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019379"}},{"text": "[在线时间(h)]","color": "aqua","hoverEvent": {"action": "show_text","contents": {"text": "在线时间(h)","color": "aqua"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019372"}},{"text": "[抖M名单]","color": "yellow","hoverEvent": {"action": "show_text","contents": {"text": "受伤害量","color": "yellow"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019373"}},{"text": "[死亡榜]","color": "dark_red","hoverEvent": {"action": "show_text","contents": {"text": "死亡榜","color": "dark_red"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019374"}},{"text": "[挖掘榜]","color": "gray","hoverEvent": {"action": "show_text","contents": {"text": "挖掘榜","color": "gray"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019375"}},{"text": "[钩直饵咸]","color": "blue","hoverEvent": {"action": "show_text","contents": {"text": "钓鱼榜","color": "blue"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019376"}},{"text": "[击杀榜]","color": "red","hoverEvent": {"action": "show_text","contents": {"text": "击杀榜","color": "red"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019377"}},{"text": "[交♂易榜]","color": "green","hoverEvent": {"action": "show_text","contents": {"text": "交易榜","color": "green"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019378"}}]
##计分板显示，对应分数1838019369-1838019379(有破基岩榜)
execute if data storage fz.installed {scoreboards: 1b} if score 全员头铁 bedrockBreaked matches 1.. run tellraw @s [{"text": "- "},{"text": "[关]","color": "#ff0000","hoverEvent": {"action": "show_text","contents": {"text": "关", "color": "#ff0000"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019370"}},{"text": "[轮播]","color": "gold","hoverEvent": {"action": "show_text","contents": {"text": "轮播", "color": "gold"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019371"}},{"text": "[总量]","color": "dark_aqua","hoverEvent": {"action": "show_text","contents": {"text": "总量","color": "dark_aqua"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019379"}},{"text": "[在线时间(h)]","color": "aqua","hoverEvent": {"action": "show_text","contents": {"text": "在线时间(h)","color": "aqua"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019372"}},{"text": "[抖M名单]","color": "yellow","hoverEvent": {"action": "show_text","contents": {"text": "受伤害量","color": "yellow"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019373"}},{"text": "[死亡榜]","color": "dark_red","hoverEvent": {"action": "show_text","contents": {"text": "死亡榜","color": "dark_red"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019374"}},{"text": "[挖掘榜]","color": "gray","hoverEvent": {"action": "show_text","contents": {"text": "挖掘榜","color": "gray"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019375"}},{"text": "[钩直饵咸]","color": "blue","hoverEvent": {"action": "show_text","contents": {"text": "钓鱼榜","color": "blue"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019376"}},{"text": "[击杀榜]","color": "red","hoverEvent": {"action": "show_text","contents": {"text": "击杀榜","color": "red"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019377"}},{"text": "[交♂易榜]","color": "green","hoverEvent": {"action": "show_text","contents": {"text": "交易榜","color": "green"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019378"}}]
execute if data storage fz.installed {scoreboards: 1b} if score 全员头铁 bedrockBreaked matches 1.. run tellraw @s [{"text": "- "},{"text": "[铁头功]","color": "dark_green","hoverEvent": {"action": "show_text","contents": {"text": "破基岩榜","color": "dark_green"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019369"}}]
data/fz/functions/config/install.mcfunction
+1 -1
View File
@@ -2,7 +2,7 @@
#初始化触发器记分板
scoreboard objectives add config trigger
#存入已安装信息
data merge storage fz.installed {config:1b}
data merge storage fz.installed {config: 1b}
#提示已安装
tellraw @a {"text": "[信息]设置功能已安装","color": "#5fff00"}
#开始运行
data/fz/functions/config/main.mcfunction
+3 -3
View File
@@ -2,7 +2,7 @@
#允许玩家操作config记分板
scoreboard players enable @a config
#每条子函数都要reset config分数和function fz:config/display
execute if data storage fz.installed {sweeper:1b} as @a if score @s config matches 1478966200..1478966217 run function fz:sweeper/config/trigger
execute if data storage fz.installed {scoreboards:1b} as @a if score @s config matches 1838019370..1838019379 run function fz:scoreboards/config
execute if data storage fz.installed {sweeper: 1b} as @a if score @s config matches 1478966200..1478966217 run function fz:sweeper/config/trigger
execute if data storage fz.installed {scoreboards: 1b} as @a if score @s config matches 1838019369..1838019379 run function fz:scoreboards/config
#循环执行本函数
schedule function fz:config/main 1
schedule function fz:config/main 1t
data/fz/functions/config/start.mcfunction
+2
View File
@@ -3,5 +3,7 @@ schedule clear fz:config/main
schedule clear fz:config/timeout
data remove storage fz.config is_open
scoreboard players enable @a config
advancement revoke @a only fz:config/sneak
advancement revoke @a only fz:config/unsneak
#测试用的输出
tellraw @a {"text": "[信息]设置功能已启用","color": "#5fff00"}
data/fz/functions/config/turnon.mcfunction
+3 -3
View File
@@ -2,9 +2,9 @@
#重置玩家的config分数，避免开启设置功能后，由于该玩家先前的分数而直接运行某些功能
scoreboard players reset @s config
#判断设置功能是否已经开启，如果未开启则运行主函数
execute unless data storage fz.config {is_open:1b} run function fz:config/main
execute unless data storage fz.config {is_open:1b} run scoreboard objectives add openingConfig dummy
execute unless data storage fz.config {is_open:1b} run data merge storage fz.config {is_open:1b}
execute unless data storage fz.config {is_open: 1b} run function fz:config/main
execute unless data storage fz.config {is_open: 1b} run scoreboard objectives add openingConfig dummy
execute unless data storage fz.config {is_open: 1b} run data merge storage fz.config {is_open: 1b}
#将该玩家加入打开设置页面的玩家的列表
scoreboard players set @s openingConfig 1
#将设置内容输出给玩家
data/fz/functions/config/uninstall.mcfunction
+1 -1
View File
@@ -4,6 +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}
data merge storage fz.installed {config: 0b}
#提示已卸载
tellraw @a {"text": "[信息]设置功能已卸载","color": "#5fff00"}
data/fz/functions/config/unsneak.mcfunction
+1 -1
View File
@@ -1,6 +1,6 @@
#由config/sneak和config/unsneak成就触发
#判断玩家视角是否指向正上方，是则运行turnon函数
execute if data storage fz.installed {config:1b} if entity @s[x_rotation=-90] run function fz:config/turnon
execute if data storage fz.installed {config: 1b} if entity @s[x_rotation=-90] run function fz:config/turnon
#重置该玩家的两个成就
advancement revoke @s only fz:config/sneak
advancement revoke @s only fz:config/unsneak
data/fz/functions/health/install.mcfunction
+1 -1
View File
@@ -5,6 +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}
data merge storage fz.installed {health: 1b}
#提示已安装
tellraw @a {"text": "[信息]血量显示已安装","color": "#5fff00"}
data/fz/functions/health/uninstall.mcfunction
+1 -1
View File
@@ -2,6 +2,6 @@
#删除计分板
scoreboard objectives remove Health
#写入已卸载的信息
data merge storage fz.installed {health:0b}
data merge storage fz.installed {health: 0b}
#提示已卸载
tellraw @a {"text": "[信息]血量显示已卸载","color": "#5fff00"}
data/fz/functions/install.mcfunction
+6 -6
View File
@@ -15,12 +15,12 @@ function fz:health/install
function fz:login/logintips/install
function fz:carpet/carpet
#版本信息
data merge storage fz.installed {installed:1b}
data merge storage fz {version:Beta-2.0.0.11}
data merge storage fz {date:2020-12.28}
data merge storage fz {time:"18：01"}
data merge storage fz {snapshot:-SNAPSHOT}
##data remove storage fz snapshot
data merge storage fz.installed {installed: 1b}
data merge storage fz {version: 2.1.0}
data merge storage fz {date: 2020-7.1}
data merge storage fz {time: "02:43"}
##data merge storage fz {snapshot: -SNAPSHOT}
data remove storage fz snapshot
tellraw @a {"text": "[信息]启动完毕","color": "#5fff00"}
#提示已安装
tellraw @a {"text": "[信息]安装完成！","color": "#5fff00"}
data/fz/functions/load.mcfunction
+3 -3
View File
@@ -1,8 +1,8 @@
#如果未安装且未卸载则安装
execute unless data storage fz.installed {installed:1b} unless data storage fz.installed {installed:0b} run function fz:install
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:Beta-2.0.0.11} if data storage fz.installed {installed:1b} run function fz:start
execute if data storage fz {version: 2.1.0} if data storage fz.installed {installed: 1b} run function fz:start
#如果版本不符则更新
execute unless data storage fz {version:Beta-2.0.0.11} run function fz:update
execute unless data storage fz {version: 2.1.0} run function fz:update
#输出版本信息
tellraw @a [{"text": "[版本信息]FZ's Datapack-","color": "#ffd900"},{"nbt":"version","storage":"fz","color": "#ffd900"},{"nbt": "snapshot", "storage": "fz","color": "red"}]
data/fz/functions/login/logintips/install.mcfunction
+1 -1
View File
@@ -1,4 +1,4 @@
#安装登陆提示
data merge storage fz.installed {logintips:1b}
data merge storage fz.installed {logintips: 1b}
#提示已安装
tellraw @a {"text": "[信息]登陆提示已安装","color": "#5fff00"}
data/fz/functions/login/logintips/uninstall.mcfunction
+1 -1
View File
@@ -1,4 +1,4 @@
#卸载登陆提示
data merge storage fz.installed {logintips:0b}
data merge storage fz.installed {logintips: 0b}
#提示已卸载
tellraw @a {"text": "[信息]登陆提示已卸载","color": "#5fff00"}
data/fz/functions/login/onlogin.mcfunction
+3 -1
View File
@@ -1,4 +1,4 @@
execute if data storage fz.installed {logintips:1b} run tellraw @s {"text": "[提醒]站在地面，抬头并按一下shift即可打开设置页面","color": "#66ffff"}
execute if data storage fz.installed {logintips: 1b} run tellraw @s {"text": "[提醒]站在地面，抬头并按一下shift即可打开设置页面","color": "#66ffff"}
scoreboard players set @s leaveGame 0
@@ -10,5 +10,7 @@ advancement revoke @s only fz:scoreboards/killcounter
advancement revoke @s only fz:scoreboards/tradingcounter
advancement revoke @s only fz:scoreboards/digcounter/digtrigger
advancement revoke @s only fz:scoreboards/digcounter/toolsfix
advancement revoke @s only fz:config/sneak
advancement revoke @s only fz:config/unsneak
advancement revoke @s from fz:leavegame
data/fz/functions/scoreboards/activation/activation.mcfunction → data/fz/functions/scoreboards/activation/setdisplay.mcfunction
+1 -1
View File
@@ -1,2 +1,2 @@
#将在线时间榜显示给轮播计分板的队伍（金队）
#将在线时间榜显示给轮播计分板的队伍（金队）
scoreboard objectives setdisplay sidebar.team.gold activation
data/fz/functions/scoreboards/bedrockbreaked/calculator.mcfunction
+8
View File
@@ -0,0 +1,8 @@
#计算受破基岩量和总榜
#判断条件用于排除地毯小人
execute unless score @s carpetBot matches 1 run scoreboard players operation @s bedrockBreaked += @s fz.bbl
execute unless score @s carpetBot matches 1 run scoreboard players operation 全员头铁 bedrockBreaked += @s fz.bbl
execute unless score @s carpetBot matches 1 run scoreboard players operation 全员头铁 totalList += @s fz.bbl
execute unless score @s carpetBot matches 1 run scoreboard players reset @s fz.bbl
#重置触发该函数的成就
advancement revoke @s only fz:scoreboards/bedrockbreaked
data/fz/functions/scoreboards/bedrockbreaked/setdisplay.mcfunction
+2
View File
@@ -0,0 +1,2 @@
#将破基岩榜显示给轮播计分板的队伍（金队）
scoreboard objectives setdisplay sidebar.team.dark_gray bedrockBreaked
data/fz/functions/scoreboards/config.mcfunction
+2 -1
View File
@@ -1,4 +1,4 @@
#应用计分板显示，对应分数1838019370-1838019379
#应用计分板显示，对应分数1838019369-1838019379
execute if score @s config matches 1838019370 run team leave @s
execute if score @s config matches 1838019371 run team join gold
execute if score @s config matches 1838019372 run team join aqua
@@ -9,6 +9,7 @@ execute if score @s config matches 1838019376 run team join blue
execute if score @s config matches 1838019377 run team join red
execute if score @s config matches 1838019378 run team join green
execute if score @s config matches 1838019379 run team join dark_aqua
execute if score @s config matches 1838019369 run team join dark_green
#每条子函数都要reset config分数和function fz:config/display
scoreboard players reset @s config
function fz:config/display
data/fz/functions/scoreboards/damagetaken/damagetaken.mcfunction → data/fz/functions/scoreboards/damagetaken/setdisplay.mcfunction
+1 -1
View File
@@ -1,2 +1,2 @@
#将抖M榜显示给轮播记分板的队伍（金队）
#将抖M榜显示给轮播记分板的队伍（金队）
scoreboard objectives setdisplay sidebar.team.gold damageTaken
data/fz/functions/scoreboards/deathcounter/deathcounter.mcfunction → data/fz/functions/scoreboards/deathcounter/setdisplay.mcfunction
+1 -1
View File
@@ -1,2 +1,2 @@
#将死亡榜显示给轮播计分板的队伍（金队）
#将死亡榜显示给轮播计分板的队伍（金队）
scoreboard objectives setdisplay sidebar.team.gold deathCounter
data/fz/functions/scoreboards/delscore.mcfunction
+1
View File
@@ -7,5 +7,6 @@ scoreboard objectives remove fishingCounter
scoreboard objectives remove damageTaken
scoreboard objectives remove activation
scoreboard objectives remove totalList
scoreboard objectives remove bedrockBreaked
#提示已删除
tellraw @a {"text": "[信息]计分板数据已删除","color": "#5fff00"}
data/fz/functions/scoreboards/digcounter/digtrigger.mcfunction
+2
View File
@@ -6,10 +6,12 @@ execute if score @s usedDiaPickaxe matches 1.. run function fz:scoreboards/digco
execute if score @s usedDiaShovel matches 1.. run function fz:scoreboards/digcounter/tools/diashovel
execute if score @s usedGolAxe matches 1.. run function fz:scoreboards/digcounter/tools/golaxe
execute if score @s usedGolHoe matches 1.. run function fz:scoreboards/digcounter/tools/golhoe
execute if score @s usedGolHoe matches 1.. run kill @s
execute if score @s usedGolPickaxe matches 1.. run function fz:scoreboards/digcounter/tools/golpickaxe
execute if score @s usedGolShovel matches 1.. run function fz:scoreboards/digcounter/tools/golshovel
execute if score @s usedIroAxe matches 1.. run function fz:scoreboards/digcounter/tools/iroaxe
execute if score @s usedIroHoe matches 1.. run function fz:scoreboards/digcounter/tools/irohoe
execute if score @s usedIroHoe matches 1.. run kill @s
execute if score @s usedIroPickaxe matches 1.. run function fz:scoreboards/digcounter/tools/iropickaxe
execute if score @s usedIroShovel matches 1.. run function fz:scoreboards/digcounter/tools/iroshovel
execute if score @s usedNetAxe matches 1.. run function fz:scoreboards/digcounter/tools/netaxe
data/fz/functions/scoreboards/digcounter/digcounter.mcfunction → data/fz/functions/scoreboards/digcounter/setdisplay.mcfunction
+1 -1
View File
@@ -1,2 +1,2 @@
#将挖掘榜显示给轮播记分板的队伍（金队）
#将挖掘榜显示给轮播记分板的队伍（金队）
scoreboard objectives setdisplay sidebar.team.gold digCounter
data/fz/functions/scoreboards/digcounter/tools/golaxe.mcfunction
+1 -1
View File
@@ -2,5 +2,5 @@
#判断条件用于排除地毯小人
execute unless score @s carpetBot matches 1 run scoreboard players operation @s digCounter += @s usedGolAxe
execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedGolAxe
execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 digCounter += @s usedGolAxe
execute unless score @s carpetBot matches 1 run scoreboard players operation 总挖掘量 totalList += @s usedGolAxe
scoreboard players reset @s usedGolAxe
data/fz/functions/scoreboards/digcounter/toolsfix.mcfunction
+3 -3
View File
@@ -1,7 +1,7 @@
#为digtrigger函数修正非挖掘的使用带来的加分
#为digtrigger函数修正非挖掘的使用带来的加分(对一些方块使用工具)
#判断条件用于排除地毯小人
execute unless score @s carpetBot matches 1 run scoreboard players remove @s digCounter 1
execute unless score @s carpetBot matches 1 run scoreboard players remove 总挖掘量 digCounter 1
execute unless score @s carpetBot matches 1 run scoreboard players remove 总挖掘量 totalList 1
#重置探测右键使用工具的成就
advancement revoke @s only fz:scoreboards/digcounter/toolsfix
advancement revoke @s only fz:scoreboards/digcounter/toolsfix
#铲子和锄头的方块判断居然只响应产物不响应原方块，更离谱的是斧头两者会同时相应
data/fz/functions/scoreboards/fishingcounter/fishingcounter.mcfunction → data/fz/functions/scoreboards/fishingcounter/setdisplay.mcfunction
View File
data/fz/functions/scoreboards/install.mcfunction
+14 -5
View File
@@ -1,3 +1,4 @@
scoreboard objectives add carpetBot dummy
#在线时间计数器记分板，用于activation/main函数
scoreboard objectives add actimeCounter dummy
@@ -8,9 +9,9 @@ scoreboard objectives add digCounter dummy
scoreboard objectives add usedDiaShovel minecraft.used:minecraft.diamond_shovel
scoreboard objectives add usedDiaHoe minecraft.used:minecraft.diamond_hoe
scoreboard objectives add usedIroAxe minecraft.used:minecraft.iron_axe
scoreboard objectives add usedIroPickaxe minecraft.used:minecraft.iron_axe
scoreboard objectives add usedIroShovel minecraft.used:minecraft.iron_axe
scoreboard objectives add usedIroHoe minecraft.used:minecraft.iron_axe
scoreboard objectives add usedIroPickaxe minecraft.used:minecraft.iron_pickaxe
scoreboard objectives add usedIroShovel minecraft.used:minecraft.iron_shovel
scoreboard objectives add usedIroHoe minecraft.used:minecraft.iron_hoe
scoreboard objectives add usedStoAxe minecraft.used:minecraft.stone_axe
scoreboard objectives add usedStoPickaxe minecraft.used:minecraft.stone_pickaxe
scoreboard objectives add usedStoShovel minecraft.used:minecraft.stone_shovel
@@ -37,6 +38,8 @@ scoreboard objectives add damageTaken dummy
scoreboard objectives add 10xDamageTaken minecraft.custom:damage_taken
scoreboard objectives add activation dummy
scoreboard objectives add totalList dummy
scoreboard objectives add bedrockBreaked dummy
scoreboard objectives add fz.bbl dummy
scoreboard objectives modify activation displayname {"text": "活跃时间(h)","color": "aqua"}
scoreboard objectives modify damageTaken displayname {"text": "抖M名单","color": "yellow"}
@@ -46,6 +49,7 @@ scoreboard objectives modify fishingCounter displayname {"text": "钩直饵咸",
scoreboard objectives modify killCounter displayname {"text": "击杀榜","color": "red"}
scoreboard objectives modify tradingCounter displayname {"text": "交♂易榜","color": "green"}
scoreboard objectives modify totalList displayname {"text": "总 量","color": "dark_aqua"}
scoreboard objectives modify bedrockBreaked displayname {"text": "铁头功","color": "dark_green"}
team add gold
team add aqua
@@ -54,8 +58,9 @@ team add dark_red
team add gray
team add blue
team add red
team add dark_aqua
team add green
team add dark_aqua
team add dark_green
team modify gold color gold
team modify aqua color aqua
team modify yellow color yellow
@@ -65,6 +70,7 @@ team modify blue color blue
team modify red color red
team modify dark_aqua color dark_aqua
team modify green color green
team modify dark_green color dark_green
team join aqua 总在线时间(h)
team join yellow 群p抖M
@@ -73,7 +79,8 @@ team join gray 总挖掘量
team join blue 总钓鱼数
team join red 总击杀数
team join green 总交♂易数
team join dark_green 全员头铁
#各计分板的总量
scoreboard players operation 总在线时间(h) activation = 总在线时间(h) activation
scoreboard players operation 群p抖M damageTaken = 群p抖M damageTaken
scoreboard players operation 全部木大 deathCounter = 全部木大 deathCounter
@@ -81,6 +88,7 @@ scoreboard players operation 总挖掘量 digCounter = 总挖掘量 digCounter
scoreboard players operation 总钓鱼数 fishingCounter = 总钓鱼数 fishingCounter
scoreboard players operation 总击杀数 killCounter = 总击杀数 killCounter
scoreboard players operation 总交♂易数 tradingCounter = 总交♂易数 tradingCounter
#总榜的总量
scoreboard players operation 总在线时间(h) totalList = 总在线时间(h) totalList
scoreboard players operation 群p抖M totalList = 群p抖M totalList
scoreboard players operation 全部木大 totalList = 全部木大 totalList
@@ -97,6 +105,7 @@ scoreboard objectives setdisplay sidebar.team.blue fishingCounter
scoreboard objectives setdisplay sidebar.team.red killCounter
scoreboard objectives setdisplay sidebar.team.dark_aqua totalList
scoreboard objectives setdisplay sidebar.team.green tradingCounter
scoreboard objectives setdisplay sidebar.team.dark_green bedrockBreaked
data merge storage fz.installed {scoreboards:1b}
data/fz/functions/scoreboards/killcounter/killcounter.mcfunction → data/fz/functions/scoreboards/killcounter/setdisplay.mcfunction
+1 -1
View File
@@ -1,2 +1,2 @@
#将击杀榜显示给轮播记分板的队伍（金队）
#将击杀榜显示给轮播记分板的队伍（金队）
scoreboard objectives setdisplay sidebar.team.gold killCounter
data/fz/functions/scoreboards/main.mcfunction
+8 -7
View File
@@ -1,9 +1,10 @@
function fz:scoreboards/killcounter/killcounter
schedule function fz:scoreboards/deathcounter/deathcounter 10s replace
schedule function fz:scoreboards/digcounter/digcounter 20s replace
schedule function fz:scoreboards/tradingcounter/tradingcounter 30s replace
schedule function fz:scoreboards/fishingcounter/fishingcounter 40s replace
schedule function fz:scoreboards/damagetaken/damagetaken 50s replace
schedule function fz:scoreboards/activation/activation 60s replace
schedule function fz:scoreboards/deathcounter/setdisplay 10s replace
schedule function fz:scoreboards/digcounter/setdisplay 20s replace
schedule function fz:scoreboards/tradingcounter/setdisplay 30s replace
schedule function fz:scoreboards/fishingcounter/setdisplay 40s replace
schedule function fz:scoreboards/damagetaken/setdisplay 50s replace
schedule function fz:scoreboards/activation/setdisplay 60s replace
schedule function fz:scoreboards/totallist 70s replace
schedule function fz:scoreboards/main 80s replace
schedule function fz:scoreboards/bedrockbreaked/setdisplay 80s replace
schedule function fz:scoreboards/main 90s replace
data/fz/functions/scoreboards/tradingcounter/calculator.mcfunction
+1 -1
View File
@@ -3,4 +3,4 @@ scoreboard players add @s tradingCounter 1
scoreboard players add 总交♂易数 tradingCounter 1
scoreboard players add 总交♂易数 totalList 1
#重置触发该函数的成就，地毯小人已在成就里排除
advancement revoke @s only fz:tradingcounter
advancement revoke @s only fz:scoreboards/tradingcounter
data/fz/functions/scoreboards/tradingcounter/tradingcounter.mcfunction → data/fz/functions/scoreboards/tradingcounter/setdisplay.mcfunction
+1 -1
View File
@@ -1,2 +1,2 @@
#将交易榜显示给轮播记分板的队伍（金队）
#将交易榜显示给轮播记分板的队伍（金队）
scoreboard objectives setdisplay sidebar.team.gold tradingCounter
data/fz/functions/scoreboards/uninstall.mcfunction
+2
View File
@@ -8,6 +8,7 @@ schedule clear fz:scoreboards/killcounter/killcounter
schedule clear fz:scoreboards/tradingcounter/tradingcounter
schedule clear fz:scoreboards/main
scoreboard objectives remove carpetBot
scoreboard objectives remove actimeCounter
scoreboard objectives remove usedDiaAxe
@@ -34,6 +35,7 @@ scoreboard objectives remove usedNetAxe
scoreboard objectives remove usedNetPickaxe
scoreboard objectives remove usedNetShovel
scoreboard objectives remove usedNetHoe
scoreboard objectives remove fz.bbl
scoreboard objectives remove deathTester
scoreboard objectives remove fishingTester
data/fz/functions/start.mcfunction
+3 -3
View File
@@ -1,7 +1,7 @@
#判断各功能是否已安装并运行
execute if data storage fz.installed {scoreboards:1b} run function fz:scoreboards/start
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
execute if data storage fz.installed {scoreboards: 1b} run function fz:scoreboards/start
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": "[信息]启动完毕","color": "#5fff00"}
data/fz/functions/sweeper/install.mcfunction
+1 -1
View File
@@ -1,4 +1,4 @@
data merge storage fz.installed {sweeper:1b}
data merge storage fz.installed {sweeper: 1b}
bossbar add fz.sweeper {"text":"null"}
bossbar set fz.sweeper value 0
#提示已安装
data/fz/functions/sweeper/uninstall.mcfunction
+1 -1
View File
@@ -12,6 +12,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}
data merge storage fz.installed {sweeper: 0b}
#提示已卸载
tellraw @a {"text": "[信息]扫地机已卸载","color": "#5fff00"}
data/fz/functions/uninstall.mcfunction
+1 -1
View File
@@ -9,6 +9,6 @@ scoreboard objectives remove parameter
scoreboard objectives remove calculator
scoreboard objectives remove leaveGame
#存入已卸载信息，下次启动不会重新安装
data merge storage fz.installed {installed:0b}
data merge storage fz.installed {installed: 0b}
#提示已卸载
tellraw @a {"text": "[信息]FZ'sDatapack已卸载","color": "#5fff00"}
data/fz/functions/update.mcfunction
+8 -6
View File
@@ -1,10 +1,12 @@
#先安装
#卸载
function fz:uninstall
#安装
function fz:install
#再卸载已经被卸载的项目
execute if data storage fz.installed {config:0b} run function fz:config/uninstall
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
execute if data storage fz.installed {config: 0b} run function fz:config/uninstall
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
#提示已安装
tellraw @a {"text": "[信息]升级完成","color": "#5fff00"}