Update README.md

2.0.0.11

README.md

@@ -4,73 +4,47 @@ A Minecraft Datapack
 
 #### This project is licensed under the terms of the GNU General Public License v3.0.
 #### Copyright (C)2019-2021 Harvey_Husky
-[B站链接](https://www.bilibili.com/read/cv4267319)
+### 总览
-## 总览
+- v2.1.x支持Minecraft1.17+
-
+- v2.0.x支持Minecraft1.16.3-1.16.5
 - 抬头并按一下shift来打开设置界面
-- 提供玩家挖掘、死亡、击杀、受伤、交易、钓鱼、滑翔、（破基岩）数据的榜单
+- 提供一些地毯脚本：*请在升级数据包的同时替换这些工具！！*
-- 提供扫地机
-- 配套的无需配置即可支持该铁头功破基岩榜Mod：[FZ-BBL](https://gitee.com/harvey-husky/FZ-BBL/releases)
-	- 破基岩榜的分数和订阅设置会在铁头功记分板的总分大于0时显示，以免未添加该mod的服务器显示破基岩榜
-- 记分板对照表：
-    | Object Name | 内容 |
-	| ----------- | ---- |
-	| activation | 活跃时间(h) |
-    | damageTaken | 受伤害榜 |
-    | deathCounter | 死亡榜 |
-    | digCounter | 挖掘榜 |
-    | fishingCounter | 钓鱼榜 |
-    | killCounter | 击杀榜 |
-    | tradingCounter | 交易榜 |
-    | totalList | 总 量 |
-    | bedrockBreaked（最开始拼错了，后来不方便改了，不要在意） | [铁头功破基岩](https://www.bilibili.com/video/BV1KJ411b73z) |
-    | fz.aviate1m | 滑翔距离 |
-- 提供一些地毯脚本（.sc文件）：***请在升级数据包的同时替换这些工具！！***
 	- 安装方法：
-		- 需要[carpet mod](https://github.com/gnembon/fabric-carpet/releases) 1.4.24+
+		- 需要carpet mod 1.4.24+：https://github.com/gnembon/fabric-carpet/releases
-		- 将其放入`world/scripts`中（在客户端位于`.minecraft/saves/存档名/scripts`或`.minecraft/config/carpet/scripts`）
+		- 将其放入“world/scripts”中(在客户端位于“.minecraft/saves/存档名/scripts”或“.minecraft/config/carpet/scripts”)
-### `here.sc`：
+	- here.sc：
-- `/here`向所有人发送自己的位置和所在维度
+		- “/here”向所有人发送自己的位置和所在维度
 			- 发送的消息使用voxelmap可识别的数组格式
-	- 安装[voxelmap mod](https://www.curseforge.com/minecraft/mc-mods/voxelmap/files)后，左键高亮该坐标，ctrl+左键新建坐标点
+			- 安装voxelmap mod后，左键高亮该坐标，ctrl+左键新建坐标点
-### `c.sc`
+	- c.sc
-- `/c`修改玩家模式为旁观模式
+		- “/c”修改玩家模式为旁观模式
-### `s.sc`
+	- s.sc
-- `/s`修改玩家模式为生存模式
+		- “/s”修改玩家模式为生存模式
-### `tagplayer.sc`：
+	- tagplayer.sc：
-- [B站链接](https://www.bilibili.com/read/cv9178207)
 		- 这个工具可以防止将地毯mod生成的假人计入记分板
 		- 可以通过自定义文件名来自定义游戏内命令
         - 配置文件：
-    - `allow_bot_tp`：用于控制是否允许tp假人
+            - “allow_bot_tp”：用于控制是否允许tp假人
-    - `allow_spawning_whitelist_players`：用于控制是否允许生成白名单内的玩家
+            - “allow_spawning_whitelist_players”：用于控制是否允许生成白名单内的玩家
 		- 使用方法：
-    - 安装[carpet mod](https://github.com/gnembon/fabric-carpet/releases)
+			- 输入“/script load tagplayer”加载工具
-	- 输入`/script load tagplayer`加载工具
+			- 包含全部地毯假人自带的功能，以及新功能，如：
-	- 包含全部地毯假人自带的功能，如：
+				- “/tagplayer check xxx”：检查玩家的状态
-	    - `/tagplayer use xxx once`让假人xxx按一次使用键
+				- “/tagplayer checkall”：检查所有玩家的状态
-	- 包含新功能，如：
+				- “/tagplayer killall”：清除所有假人
-		- `/tagplayer check xxx`：检查玩家的状态
+				- 其他用法可以在游戏内输入“/tagplayer”查看
-		- `/tagplayer checkall`：检查所有玩家的状态
+	- restore_scores.sc：
-		- `/tagplayer killall`：清除所有假人
-	- 其他用法可以在游戏内输入`/tagplayer`查看
-
-### `restore_scores.sc`：
 		- 从数据包1.4升级时也需要使用这个工具
 		- 这个工具可以从白名单读取玩家列表，逐一召唤假人，读取统计信息并赋值给记分板
 			- 悄悄说一句没白名单的服把usercache.json复制一份改成whitelist.json就可以啦
 		- *注意：原有的记分板会被删除*
 		- 使用方法：
-	- 输入`/script load restore_scores`加载工具
+			- 输入“/script load restore_scores”加载工具
-	- 输入`/restore_scores by_whitelist`开始恢复
+			- 输入“/restore_scores by_whitelist”开始恢复
-	- 输入`/script unload restore_scores`卸载工具
+			- 输入“/script unload restore_scores”卸载工具
 			- 记得用完就删掉它！
-
+- 无需配置即可支持该铁头功破基岩榜Mod：https://gitee.com/harvey-husky/FZ-BBL/releases
-### 更新日志
+	- 破基岩榜的分数和订阅设置会在铁头功记分板的总分大于0时显示，以免未添加该mod的服务器显示破基岩榜
-- v2.1.x支持Minecraft1.17+
-- v2.0.x支持Minecraft1.16.3-1.16.5
-##### v2.1.2/2.0.10
-- 添加鞘翅滑翔距离榜单
 ##### v2.1.0
 - 仅支持1.17+
 - 修复使用部分工具和方块交互时挖掘榜会减分的bug
@@ -103,7 +77,7 @@ A Minecraft Datapack
 - 无需配置即可支持该铁头功破基岩榜Mod：https://gitee.com/harvey-husky/FZ-BBL/releases
 	- 破基岩榜的分数和订阅设置会在铁头功记分板的总分大于0时显示，以免未添加该mod的服务器显示破基岩榜
 ##### v2.0.0.11
-- `/tagplayer spawn xxx`后面现在可以追加`at`、`facing`、`in`参数
+- “/tagplayer spawn xxx”后面现在可以追加“at”、“facing”、“in”参数
 ##### v2.0.0.10
 - 扫地机添加了位于怪物血条栏的文字提示，同时添加了各种提示的开关功能
 ##### v2.0.0.9
@@ -114,7 +88,7 @@ A Minecraft Datapack
 - tagplayer添加了新版carpet新指令，可以为假人切换热键栏
 - 现在tagplayer需要carpet1.4.21或以上版本运行！
 - 现在tagplayer可以给自己设置动作了
-- 添加`/tagplayer shadow`指令将自己变为前缀为`挂机`的假人
+- 添加“/tagplayer shadow”指令将自己变为前缀为“挂机”的假人
 ##### v2.0.0.6
 - 修复restore_scores.sc工具不能恢复受伤害榜(抖M榜)的bug
 ##### v2.0.0.5

data/fz/advancements/scoreboards/activation.json

@@ -9,6 +9,7 @@
                         "entity": "this",
                         "scores": {
                             "actimeCounter": {
+                                "max": 3600,
                                 "min": 3600
                             }
                         }

data/fz/advancements/scoreboards/aviate1m.json

@@ -1,23 +0,0 @@
-{
-    "criteria": {
-        "activation": {
-            "trigger": "minecraft:tick",
-            "conditions": {
-                "player": [
-                    {
-                        "condition": "minecraft:entity_scores",
-                        "entity": "this",
-                        "scores": {
-                            "fz.aviateCounter": {
-                                "min": 200
-                            }
-                        }
-                    }
-                ]
-            }
-        }
-    },
-    "rewards": {
-        "function": "fz:scoreboards/aviate1m/calculator"
-    }
-}

data/fz/functions/config/display.mcfunction

@@ -21,8 +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": "[受伤害榜]","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": "[抖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": "light_purple", "hoverEvent": {"action": "show_text","contents": {"text": "滑翔距离", "color": "light_purple"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019368"}}]
     ##计分板显示，对应分数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": "[受伤害榜]","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": "#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": "light_purple", "hoverEvent": {"action": "show_text","contents": {"text": "滑翔距离", "color": "light_purple"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019368"}},{"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": "dark_green","hoverEvent": {"action": "show_text","contents": {"text": "破基岩榜","color": "dark_green"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019369"}}]

data/fz/functions/config/main.mcfunction

@@ -3,6 +3,6 @@
 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 1838019368..1838019379 run function fz:scoreboards/config
+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 1t

data/fz/functions/health/install.mcfunction

@@ -1,6 +1,6 @@
 #安装血量显示
 #初始化
-scoreboard objectives add Health health {"text": "HP"}
+scoreboard objectives add Health health {"text": "cm","color": "yellow"}
 scoreboard objectives modify Health rendertype hearts
 scoreboard objectives setdisplay list Health
 scoreboard objectives setdisplay belowName Health

data/fz/functions/install.mcfunction

@@ -3,8 +3,6 @@
 scoreboard objectives add parameter dummy
 #用于数学计算的记分板
 scoreboard objectives add calculator dummy
-scoreboard players set 200 calculator 200
-scoreboard players set 100 calculator 100
 scoreboard players set 10 calculator 10
 scoreboard players set 1 calculator 1
 #检测玩家退出游戏的记分板
@@ -18,28 +16,15 @@ function fz:login/logintips/install
 function fz:carpet/carpet
 #版本信息
 data merge storage fz.installed {installed: 1b}
-data merge storage fz {version: 2.1.2}
+data merge storage fz {version: 2.1.0}
-data merge storage fz {date: 2020-7.21}
+data merge storage fz {date: 2020-7.1}
-data merge storage fz {time: "1:14"}
+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"}
-#测试用的输出
-tellraw @a {"text": "[信息]启动完毕","color": "#5fff00"}
 #info: #5fff00 信息
 #alert: #d7ff00 提醒
 #warn: #ffd900 警告
 #error: #ff6100 错误
-
-#抖M名单 - 受伤害榜
-#钩直饵咸 - 钓鱼榜
-#交♂易榜 - 交易榜
-#铁头功 - 破基岩榜
-
-#群p抖M - 总受伤害量
-#全部木大 - 总死亡数
-#总交♂易数 - 总交易数
-#全员头铁 - 总破基岩数
-
-#{"text": "cm","color": "yellow"} - {"text": "HP"}

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: 2.1.2} 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: 2.1.2} 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/scoreboards/aviate1m/calculator.mcfunction

@@ -1,11 +0,0 @@
-#计算滑翔距离和总榜
-#判断条件用于排除地毯小人
-execute unless score @s carpetBot matches 1 run scoreboard players operation @s fz.aviateOneTime = @s fz.aviateCounter
-execute unless score @s carpetBot matches 1 run scoreboard players operation @s fz.aviateOneTime /= 200 calculator
-execute unless score @s carpetBot matches 1 run scoreboard players operation @s fz.aviate1m += @s fz.aviateOneTime
-execute unless score @s carpetBot matches 1 run scoreboard players operation 总滑翔距离 fz.aviate1m += @s fz.aviateOneTime
-execute unless score @s carpetBot matches 1 run scoreboard players operation 总滑翔距离 totalList += @s fz.aviateOneTime
-#重置滑翔探测记分板
-scoreboard players operation @s fz.aviateCounter %= 200 calculator
-#重置触发该函数的成就
-advancement revoke @s only fz:scoreboards/aviate1m

data/fz/functions/scoreboards/aviate1m/setdisplay.mcfunction

@@ -1,2 +0,0 @@
-#将交易榜显示给轮播记分板的队伍（金队）
-scoreboard objectives setdisplay sidebar.team.gold fz.aviate1m

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

@@ -1,8 +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 全员头铁 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 operation 全员头铁 totalList += @s fz.bbl
-scoreboard players reset @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

@@ -1,2 +1,2 @@
 #将破基岩榜显示给轮播计分板的队伍（金队）
-scoreboard objectives setdisplay sidebar.team.gold bedrockBreaked
+scoreboard objectives setdisplay sidebar.team.dark_gray bedrockBreaked

data/fz/functions/scoreboards/config.mcfunction

@@ -10,7 +10,6 @@ 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
-execute if score @s config matches 1838019368 run team join light_purple
 #每条子函数都要reset config分数和function fz:config/display
 scoreboard players reset @s config
 function fz:config/display

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 总受伤害量 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 总受伤害量 totalList += @s 10xDamageTaken
+execute unless score @s carpetBot matches 1 run scoreboard players operation 群p抖M 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 全部木大 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 全部木大 totalList += @s deathTester
 #重置死亡探测记分板
 scoreboard players reset @s deathTester
 #重置触发该函数的成就

data/fz/functions/scoreboards/delscore.mcfunction

@@ -8,6 +8,5 @@ scoreboard objectives remove damageTaken
 scoreboard objectives remove activation
 scoreboard objectives remove totalList
 scoreboard objectives remove bedrockBreaked
-scoreboard objectives remove fz.aviate1m
 #提示已删除
 tellraw @a {"text": "[信息]计分板数据已删除","color": "#5fff00"}

data/fz/functions/scoreboards/install.mcfunction

@@ -40,20 +40,16 @@ scoreboard objectives add activation dummy
 scoreboard objectives add totalList dummy
 scoreboard objectives add bedrockBreaked dummy
 scoreboard objectives add fz.bbl dummy
-scoreboard objectives add fz.aviate1m dummy
-    scoreboard objectives add fz.aviateCounter minecraft.custom:aviate_one_cm
-    scoreboard objectives add fz.aviateOneTime dummy
 
 scoreboard objectives modify activation displayname {"text": "活跃时间(h)","color": "aqua"}
-scoreboard objectives modify damageTaken displayname {"text": "受伤害榜","color": "yellow"}
+scoreboard objectives modify damageTaken displayname {"text": "抖M名单","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"}
-scoreboard objectives modify fz.aviate1m displayname {"text": "滑翔距离","color": "light_purple"}
 
 team add gold
 team add aqua
@@ -65,8 +61,6 @@ team add red
 team add green
 team add dark_aqua
 team add dark_green
-team add light_purple
-
 team modify gold color gold
 team modify aqua color aqua
 team modify yellow color yellow
@@ -77,35 +71,31 @@ 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 modify light_purple color light_purple
 
 team join aqua 总在线时间(h)
-team join yellow 总受伤害量
+team join yellow 群p抖M
-team join dark_red 总死亡数
+team join dark_red 全部木大
 team join gray 总挖掘量
 team join blue 总钓鱼数
 team join red 总击杀数
-team join green 总交易数
+team join green 总交♂易数
-team join dark_green 总破基岩数
+team join dark_green 全员头铁
-team join light_purple 总滑翔距离
 #各计分板的总量
 scoreboard players operation 总在线时间(h) activation = 总在线时间(h) activation
-scoreboard players operation 总受伤害量 damageTaken = 总受伤害量 damageTaken
+scoreboard players operation 群p抖M damageTaken = 群p抖M damageTaken
-scoreboard players operation 总死亡数 deathCounter = 总死亡数 deathCounter
+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 总滑翔距离 fz.aviate1m = 总滑翔距离 fz.aviate1m
 #总榜的总量
 scoreboard players operation 总在线时间(h) totalList = 总在线时间(h) totalList
-scoreboard players operation 总受伤害量 totalList = 总受伤害量 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
@@ -116,7 +106,6 @@ 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
-scoreboard objectives setdisplay sidebar.team.light_purple fz.aviate1m
 
 data merge storage fz.installed {scoreboards:1b}
 

data/fz/functions/scoreboards/main.mcfunction

@@ -5,8 +5,7 @@ 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/aviate1m/setdisplay 70s replace
+schedule function fz:scoreboards/totallist 70s replace
-schedule function fz:scoreboards/totallist 80s replace
+execute if score 全员头铁 bedrockBreaked matches 1.. run schedule function fz:scoreboards/bedrockbreaked/setdisplay 80s replace
-execute if score 总破基岩数 bedrockBreaked matches 1.. run schedule function fz:scoreboards/bedrockbreaked/setdisplay 90s replace
+execute if score 全员头铁 bedrockBreaked matches 1.. run schedule function fz:scoreboards/main 90s replace
-execute if score 总破基岩数 bedrockBreaked matches 1.. run schedule function fz:scoreboards/main 100s replace
+execute unless score 全员头铁 bedrockBreaked matches 1.. run schedule function fz:scoreboards/main 80s replace
-execute unless score 总破基岩数 bedrockBreaked matches 1.. run schedule function fz:scoreboards/main 90s replace

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 总交♂易数 tradingCounter 1
-scoreboard players add 总交易数 totalList 1
+scoreboard players add 总交♂易数 totalList 1
 #重置触发该函数的成就，地毯小人已在成就里排除
 advancement revoke @s only fz:scoreboards/tradingcounter

data/fz/functions/scoreboards/uninstall.mcfunction

@@ -35,13 +35,11 @@ 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
 scoreboard objectives remove 10xDamageTaken
-scoreboard objectives remove fz.aviateCounter
-scoreboard objectives remove fz.aviateOneTime
 
 scoreboard objectives setdisplay sidebar.team.aqua
 scoreboard objectives setdisplay sidebar.team.yellow

restore_scores.sc

@@ -1,4 +1,4 @@
-global_version = '1.3.0';
+global_version = '1.2.0';
 __config() -> {
 	'scope' -> 'global',
 	'stay_loaded' -> false
@@ -124,7 +124,6 @@ global_bl = ['stone', 'granite', 'polished_granite', 'diorite', 'polished_diorit
     'cyan_candle', 'purple_candle', 'blue_candle', 'brown_candle', 'green_candle', 'red_candle', 'black_candle'
 ];
 __restore(pl, s_player) ->(
-	scoreboard_remove('fz.aviate1m');
 	scoreboard_remove('killCounter');
 	scoreboard_remove('digCounter');
 	scoreboard_remove('deathCounter');
@@ -133,7 +132,6 @@ __restore(pl, s_player) ->(
 	scoreboard_remove('damageTaken');
 	scoreboard_remove('activation');
 	scoreboard_remove('totalList');
-    scoreboard_add('fz.aviate1m');
 	scoreboard_add('killCounter');
 	scoreboard_add('digCounter');
 	scoreboard_add('deathCounter');
@@ -149,21 +147,15 @@ __restore(pl, s_player) ->(
 	total_killed = 0;
 	total_traded = 0;
 	total_hurt = 0;
-    total_aviate = 0;
 	c_for(i = 0, i < length(pl), i += 1,
 		run('player ' + pl:i + ' spawn');
 		game_tick(50);
 		//活跃时间
-		actime = statistic(pl:i, 'custom', 'play_time')/72000;
+		actime = statistic(pl:i, 'custom', 'play_one_minute')/72000;
 		print(actime);
 		scoreboard('activation', pl:i, actime);
 		total_actime += actime;
-		//滑翔距离
+		//抖M榜
-		aviate = statistic(pl:i, 'custom', 'aviate_one_cm')/100;
-		print(aviate);
-		scoreboard('fz.aviate1m', pl:i, aviate);
-		total_aviate += aviate;
-		//受伤害榜
 		hurt = statistic(pl:i, 'custom', 'damage_taken')/100;
 		print(hurt);
 		scoreboard('damageTaken', pl:i, hurt);
@@ -199,22 +191,20 @@ __restore(pl, s_player) ->(
 		total_traded += traded;
 		run('player ' + pl:i + ' kill')
 	);
-	scoreboard('tradingCounter', '总交易数', total_traded);
+	scoreboard('tradingCounter', '总交♂易数', total_traded);
-	scoreboard('totalList', '总交易数', total_traded);
+	scoreboard('totalList', '总交♂易数', total_traded);
 	scoreboard('killCounter', '总击杀数', total_killed);
 	scoreboard('totalList', '总击杀数', total_killed);
 	scoreboard('fishingCounter', '总钓鱼数', total_fished);
 	scoreboard('totalList', '总钓鱼数', total_fished);
 	scoreboard('digCounter', '总挖掘量', total_mined);
 	scoreboard('totalList', '总挖掘量', total_mined);
-	scoreboard('deathCounter', '总死亡数', total_death);
+	scoreboard('deathCounter', '全部木大', total_death);
-	scoreboard('totalList', '总死亡数', total_death);
+	scoreboard('totalList', '全部木大', total_death);
 	scoreboard('activation', '总在线时间(h)', total_actime);
 	scoreboard('totalList', '总在线时间(h)', total_actime);
-	scoreboard('damageTaken', '总受伤害量', total_hurt);
+	scoreboard('damageTaken', '群p抖M', total_hurt);
-	scoreboard('totalList', '总受伤害量', total_hurt);
+	scoreboard('totalList', '群p抖M', total_hurt);
-	scoreboard('fz.aviate1m', '总滑翔距离', total_aviate);
-	scoreboard('totalList', '总滑翔距离', total_aviate);
 	game_tick(50);
     print('完成！');
 	run('function fz:scoreboards/install')
@@ -224,6 +214,5 @@ by_whitelist() ->(
 	s_player = player();
 	game_tick(50);
 	__restore(pl, s_player);
-    print('done! ');
 	return()
 )