2.1.0

data/fz/functions/config/display.mcfunction

@@ -21,7 +21,7 @@ execute if data storage fz.installed {sweeper: 1b} run tellraw @s {"text": "扫
 ##记分板
 execute if data storage fz.installed {scoreboards: 1b} run tellraw @s {"text": "记分板：","color": "#ccff00"}
     ##计分板显示，对应分数1838019370-1838019379
-    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"}}]
+    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": "[受伤害榜]","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"}}]
+    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": "[受伤害榜]","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/scoreboards/damagetaken/calculator.mcfunction

@@ -2,8 +2,8 @@
 #判断条件用于排除地毯小人
 execute unless score @s carpetBot matches 1 run scoreboard players operation @s 10xDamageTaken /= 10 calculator
 execute unless score @s carpetBot matches 1 run scoreboard players operation @s damageTaken += @s 10xDamageTaken
-execute unless score @s carpetBot matches 1 run scoreboard players operation 群p抖M damageTaken += @s 10xDamageTaken
-execute unless score @s carpetBot matches 1 run scoreboard players operation 群p抖M totalList += @s 10xDamageTaken
+execute unless score @s carpetBot matches 1 run scoreboard players operation 总受伤害量 damageTaken += @s 10xDamageTaken
+execute unless score @s carpetBot matches 1 run scoreboard players operation 总受伤害量 totalList += @s 10xDamageTaken
 #重置伤害探测记分板
 scoreboard players reset @s 10xDamageTaken
 #重置触发该函数的成就

data/fz/functions/scoreboards/deathcounter/calculator.mcfunction

@@ -1,8 +1,8 @@
 #计算死亡数和总榜
 #判断条件用于排除地毯小人
 execute unless score @s carpetBot matches 1 run scoreboard players operation @s deathCounter += @s deathTester
-execute unless score @s carpetBot matches 1 run scoreboard players operation 全部木大 deathCounter += @s deathTester
-execute unless score @s carpetBot matches 1 run scoreboard players operation 全部木大 totalList += @s deathTester
+execute unless score @s carpetBot matches 1 run scoreboard players operation 总死亡数 deathCounter += @s deathTester
+execute unless score @s carpetBot matches 1 run scoreboard players operation 总死亡数 totalList += @s deathTester
 #重置死亡探测记分板
 scoreboard players reset @s deathTester
 #重置触发该函数的成就

data/fz/functions/scoreboards/install.mcfunction

@@ -42,14 +42,14 @@ 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"}
+scoreboard objectives modify damageTaken displayname {"text": "受伤害榜","color": "yellow"}
 scoreboard objectives modify deathCounter displayname {"text": "死亡榜","color": "dark_red"}
 scoreboard objectives modify digCounter displayname {"text": "挖掘榜","color": "gray"}
-scoreboard objectives modify fishingCounter displayname {"text": "钩直饵咸","color": "blue"}
+scoreboard objectives modify fishingCounter displayname {"text": "钓鱼榜","color": "blue"}
 scoreboard objectives modify killCounter displayname {"text": "击杀榜","color": "red"}
-scoreboard objectives modify tradingCounter displayname {"text": "交♂易榜","color": "green"}
+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"}
+scoreboard objectives modify bedrockBreaked displayname {"text": "破基岩榜","color": "dark_green"}
 
 team add gold
 team add aqua
@@ -73,29 +73,29 @@ team modify green color green
 team modify dark_green color dark_green
 
 team join aqua 总在线时间(h)
-team join yellow 群p抖M
-team join dark_red 全部木大
+team join yellow 总受伤害量
+team join dark_red 总死亡数
 team join gray 总挖掘量
 team join blue 总钓鱼数
 team join red 总击杀数
-team join green 总交♂易数
-team join dark_green 全员头铁
+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
+scoreboard players operation 总受伤害量 damageTaken = 总受伤害量 damageTaken
+scoreboard players operation 总死亡数 deathCounter = 总死亡数 deathCounter
 scoreboard players operation 总挖掘量 digCounter = 总挖掘量 digCounter
 scoreboard players operation 总钓鱼数 fishingCounter = 总钓鱼数 fishingCounter
 scoreboard players operation 总击杀数 killCounter = 总击杀数 killCounter
-scoreboard players operation 总交♂易数 tradingCounter = 总交♂易数 tradingCounter
+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
+scoreboard players operation 总受伤害量 totalList = 总受伤害量 totalList
+scoreboard players operation 总死亡数 totalList = 总死亡数 totalList
 scoreboard players operation 总挖掘量 totalList = 总挖掘量 totalList
 scoreboard players operation 总钓鱼数 totalList = 总钓鱼数 totalList
 scoreboard players operation 总击杀数 totalList = 总击杀数 totalList
-scoreboard players operation 总交♂易数 totalList = 总交♂易数 totalList
+scoreboard players operation 总交易数 totalList = 总交易数 totalList
 
 scoreboard objectives setdisplay sidebar.team.aqua activation
 scoreboard objectives setdisplay sidebar.team.yellow damageTaken

data/fz/functions/scoreboards/tradingcounter/calculator.mcfunction

@@ -1,6 +1,6 @@
 #计算交易榜和总榜
 scoreboard players add @s tradingCounter 1
-scoreboard players add 总交♂易数 tradingCounter 1
-scoreboard players add 总交♂易数 totalList 1
+scoreboard players add 总交易数 tradingCounter 1
+scoreboard players add 总交易数 totalList 1
 #重置触发该函数的成就，地毯小人已在成就里排除
 advancement revoke @s only fz:scoreboards/tradingcounter