2.0.8

LICENSE

@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
+<http://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

README.md

@@ -1,20 +1,19 @@
 # FZ-sDataPack
 A Minecraft Datapack
-#### @Author: Harveykang
+#### @Author: Harvey_Husky
 
 #### This project is licensed under the terms of the GNU General Public License v3.0.
-#### Copyright (C)2019-2020 Harvey.Kang
+#### Copyright (C)2019-2021 Harvey_Husky
-
+### 总览
-# 请移步国内平台：https://gitee.com/harvey-husky/FZ-sDatapack/releases
+- v2.1.x支持Minecraft1.17+
-
+- v2.0.x支持Minecraft1.16.3-1.16.5
-### v2.0.0
+- 为/tagplayer tp指令添加了配置文件
-- 支持Minecraft1.16.x
+- 为榜单恢复插件新增新版本的新方块
 - 抬头并按一下shift来打开设置界面
 - 提供一些地毯脚本：*请在升级数据包的同时替换这些工具！！*
 	- 安装方法：
-		- 需要carpet mod 1.4.21：https://github.com/gnembon/fabric-carpet/releases
+		- 需要carpet mod 1.4.24+：https://github.com/gnembon/fabric-carpet/releases
 		- 将其放入“world/scripts”中(在客户端位于“.minecraft/saves/存档名/scripts”或“.minecraft/config/carpet/scripts”)
-			- 这三个文件夹默认不会自动生成，直接新建即可
 	- here.sc：
 		- “/here”向所有人发送自己的位置和所在维度
 			- 发送的消息使用voxelmap可识别的数组格式
@@ -25,25 +24,60 @@ A Minecraft Datapack
 		- “/s”修改玩家模式为生存模式
 	- tagplayer.sc：
 		- 这个工具可以防止将地毯mod生成的假人计入记分板
+		- 可以通过自定义文件名来自定义游戏内命令
+        - 配置文件：
+            - “allow_bot_tp”：用于控制是否允许tp假人
+            - “allow_spawning_whitelist_players”：用于控制是否允许生成白名单内的玩家
 		- 使用方法：
-			- 输入“/scripts load tagplayer”加载工具
+			- 输入“/script load tagplayer”加载工具
 			- 包含全部地毯假人自带的功能，以及新功能，如：
-				- “/tagplayer check xxx”检查玩家的状态
+				- “/tagplayer check xxx”：检查玩家的状态
-				- “/tagplayer checkall”检查所有玩家的状态
+				- “/tagplayer checkall”：检查所有玩家的状态
-				- “/tagplayer killall”清除所有假人
+				- “/tagplayer killall”：清除所有假人
 				- 其他用法可以在游戏内输入“/tagplayer”查看
 	- restore_scores.sc：
 		- 从数据包1.4升级时也需要使用这个工具
 		- 这个工具可以从白名单读取玩家列表，逐一召唤假人，读取统计信息并赋值给记分板
 			- 悄悄说一句没白名单的服把usercache.json复制一份改成whitelist.json就可以啦
-		- 注意：原有的记分板会被删除
+		- *注意：原有的记分板会被删除*
 		- 使用方法：
-			- 输入“/scripts load restore_scores”加载工具
+			- 输入“/script load restore_scores”加载工具
 			- 输入“/restore_scores by_whitelist”开始恢复
-			- 输入“/scripts unload restore_scores”卸载工具
+			- 输入“/script unload restore_scores”卸载工具
 			- 记得用完就删掉它！
-- 计划
+- 无需配置即可支持该铁头功破基岩榜Mod：https://gitee.com/harvey-husky/FZ-BBL/releases
-	- 添加单独的记分板升级工具
+	- 破基岩榜的分数和订阅设置会在铁头功记分板的总分大于0时显示，以免未添加该mod的服务器显示破基岩榜
+##### v2.1.0
+- 仅支持1.17+
+- 修复使用部分工具和方块交互时挖掘榜会减分的bug
+- 为榜单恢复插件新增新版本的新方块
+##### v2.0.8
+- 修复在末地使用/here时，世界名称显示为世界id的bug
+- 修复tagplayer可以随意传送玩家的bug
+- 修复记分板轮播时不显示击杀榜的bug
+- 修复没有破基岩榜时依然会轮播破基岩榜的bug
+- 为/tagplayer tp指令添加了配置文件
+##### v2.0.3
+- 修复在不添加tagplayer工具时记分板不加分的bug
+##### v2.0.2
+- 修复在使用carpet-1.4.22或以上版本时，tagplayer的玩家名错乱的bug
+##### v2.0.1.8
+- 修复使用金斧头挖掘会导致总量+2的bug
+- 修复使用金锄头挖掘不会给挖掘榜加分
+- 修复主手有铲子，斧头，锄头时，副手放置方块会导致挖掘榜-1的bug(原版bug，通过toolsfix2成就修复)
+##### v2.0.1.7
+- 修复有时设置界面打不开的bug
+- 修复交易榜只加一次分的bug..
+- 修复tagplayer中的事件多次触发的bug
+##### v2.0.1.6
+- tagplayer现在可以通过自定义文件名来自定义游戏内命令
+- 修复铁制工具依然不统计记分板的bug...
+##### v2.0.1.3
+- 修复部分铁质工具不统计挖掘榜的bug
+##### v2.0.1.1
+- 为设置界面的计分板添加悬浮文本
+- 无需配置即可支持该铁头功破基岩榜Mod：https://gitee.com/harvey-husky/FZ-BBL/releases
+	- 破基岩榜的分数和订阅设置会在铁头功记分板的总分大于0时显示，以免未添加该mod的服务器显示破基岩榜
 ##### v2.0.0.11
 - “/tagplayer spawn xxx”后面现在可以追加“at”、“facing”、“in”参数
 ##### v2.0.0.10

data/fz/advancements/scoreboards/bedrockbreaked.json

@@ -0,0 +1,24 @@
+{
+    "criteria": {
+        "damage_taken": {
+            "trigger": "minecraft:tick",
+            "conditions": {
+                "player": [
+                    {
+                        "condition": "minecraft:entity_scores",
+                        "entity": "this",
+                        "scores": {
+                            "fz.bbl": {
+                                "min": 1,
+                                "max": 2147483647
+                            }
+                        }
+                    }
+                ]
+            }
+        }
+    },
+    "rewards": {
+        "function": "fz:scoreboards/bedrockbreaked/calculator"
+    }
+}

data/fz/advancements/scoreboards/digcounter/digtrigger.json

@@ -190,7 +190,7 @@
                             {
                                 "condition": "minecraft:entity_scores",
                                 "scores": {
-                                    "usedDiaHoe": {
+                                    "usedGolHoe": {
                                         "min": 1,
                                         "max": 2147483647
                                     }

data/fz/advancements/scoreboards/digcounter/toolsfix2.json

@@ -0,0 +1,217 @@
+{
+    "criteria": {
+        "offhand_placed_fix": {
+            "trigger": "minecraft:placed_block",
+            "conditions": {
+                "player": [
+                    {
+                        "condition": "minecraft:alternative",
+                        "terms": [
+                            {
+                                "condition": "minecraft:entity_properties",
+                                "entity": "this",
+                                "predicate": {
+                                    "equipment": {
+                                        "mainhand": {
+                                            "item": "minecraft:iron_shovel"
+                                        }
+                                    }
+                                }
+                            },
+                            {
+                                "condition": "minecraft:entity_properties",
+                                "entity": "this",
+                                "predicate": {
+                                    "equipment": {
+                                        "mainhand": {
+                                            "item": "minecraft:golden_shovel"
+                                        }
+                                    }
+                                }
+                            },
+                            {
+                                "condition": "minecraft:entity_properties",
+                                "entity": "this",
+                                "predicate": {
+                                    "equipment": {
+                                        "mainhand": {
+                                            "item": "minecraft:wooden_shovel"
+                                        }
+                                    }
+                                }
+                            },
+                            {
+                                "condition": "minecraft:entity_properties",
+                                "entity": "this",
+                                "predicate": {
+                                    "equipment": {
+                                        "mainhand": {
+                                            "item": "minecraft:stone_shovel"
+                                        }
+                                    }
+                                }
+                            },
+                            {
+                                "condition": "minecraft:entity_properties",
+                                "entity": "this",
+                                "predicate": {
+                                    "equipment": {
+                                        "mainhand": {
+                                            "item": "minecraft:diamond_shovel"
+                                        }
+                                    }
+                                }
+                            },
+                            {
+                                "condition": "minecraft:entity_properties",
+                                "entity": "this",
+                                "predicate": {
+                                    "equipment": {
+                                        "mainhand": {
+                                            "item": "minecraft:netherite_shovel"
+                                        }
+                                    }
+                                }
+                            },
+                            {
+                                "condition": "minecraft:entity_properties",
+                                "entity": "this",
+                                "predicate": {
+                                    "equipment": {
+                                        "mainhand": {
+                                            "item": "minecraft:iron_hoe"
+                                        }
+                                    }
+                                }
+                            },
+                            {
+                                "condition": "minecraft:entity_properties",
+                                "entity": "this",
+                                "predicate": {
+                                    "equipment": {
+                                        "mainhand": {
+                                            "item": "minecraft:golden_hoe"
+                                        }
+                                    }
+                                }
+                            },
+                            {
+                                "condition": "minecraft:entity_properties",
+                                "entity": "this",
+                                "predicate": {
+                                    "equipment": {
+                                        "mainhand": {
+                                            "item": "minecraft:wooden_hoe"
+                                        }
+                                    }
+                                }
+                            },
+                            {
+                                "condition": "minecraft:entity_properties",
+                                "entity": "this",
+                                "predicate": {
+                                    "equipment": {
+                                        "mainhand": {
+                                            "item": "minecraft:stone_hoe"
+                                        }
+                                    }
+                                }
+                            },
+                            {
+                                "condition": "minecraft:entity_properties",
+                                "entity": "this",
+                                "predicate": {
+                                    "equipment": {
+                                        "mainhand": {
+                                            "item": "minecraft:diamond_hoe"
+                                        }
+                                    }
+                                }
+                            },
+                            {
+                                "condition": "minecraft:entity_properties",
+                                "entity": "this",
+                                "predicate": {
+                                    "equipment": {
+                                        "mainhand": {
+                                            "item": "minecraft:netherite_hoe"
+                                        }
+                                    }
+                                }
+                            },
+                            {
+                                "condition": "minecraft:entity_properties",
+                                "entity": "this",
+                                "predicate": {
+                                    "equipment": {
+                                        "mainhand": {
+                                            "item": "minecraft:iron_axe"
+                                        }
+                                    }
+                                }
+                            },
+                            {
+                                "condition": "minecraft:entity_properties",
+                                "entity": "this",
+                                "predicate": {
+                                    "equipment": {
+                                        "mainhand": {
+                                            "item": "minecraft:golden_axe"
+                                        }
+                                    }
+                                }
+                            },
+                            {
+                                "condition": "minecraft:entity_properties",
+                                "entity": "this",
+                                "predicate": {
+                                    "equipment": {
+                                        "mainhand": {
+                                            "item": "minecraft:wooden_axe"
+                                        }
+                                    }
+                                }
+                            },
+                            {
+                                "condition": "minecraft:entity_properties",
+                                "entity": "this",
+                                "predicate": {
+                                    "equipment": {
+                                        "mainhand": {
+                                            "item": "minecraft:stone_axe"
+                                        }
+                                    }
+                                }
+                            },
+                            {
+                                "condition": "minecraft:entity_properties",
+                                "entity": "this",
+                                "predicate": {
+                                    "equipment": {
+                                        "mainhand": {
+                                            "item": "minecraft:diamond_axe"
+                                        }
+                                    }
+                                }
+                            },
+                            {
+                                "condition": "minecraft:entity_properties",
+                                "entity": "this",
+                                "predicate": {
+                                    "equipment": {
+                                        "mainhand": {
+                                            "item": "minecraft:netherite_axe"
+                                        }
+                                    }
+                                }
+                            }
+                        ]
+                    }
+                ]
+            }
+        }
+    },
+    "rewards": {
+        "function": "fz:scoreboards/digcounter/toolsfix2"
+    }
+}

data/fz/functions/carpet/carpet.mcfunction

@@ -1,5 +1,5 @@
 #初始化tagplayer
 carpet setDefault commandScript true
 carpet setDefault commandScriptACE ops
-carpet setDefault scriptsAutoload true
+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'))
-carpet setDefault commandPlayer ops
+script unload player

data/fz/functions/config/display.mcfunction

@@ -21,4 +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} 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/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 1838019370..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 1
+schedule function fz:config/main 1t

data/fz/functions/config/start.mcfunction

@@ -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/install.mcfunction

@@ -16,11 +16,11 @@ 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 {version: 2.0.3}
-data merge storage fz {date:2020-12.28}
+data merge storage fz {date: 2020-1.17}
-data merge storage fz {time:"18：01"}
+data merge storage fz {time: "18:21"}
-data merge storage fz {snapshot:-SNAPSHOT}
+##data merge storage fz {snapshot: -SNAPSHOT}
-##data remove storage fz snapshot
+data remove storage fz snapshot
 tellraw @a {"text": "[信息]启动完毕","color": "#5fff00"}
 #提示已安装
 tellraw @a {"text": "[信息]安装完成！","color": "#5fff00"}

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:Beta-2.0.0.11} if data storage fz.installed {installed:1b} run function fz:start
+execute if data storage fz {version: 2.0.3} 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.0.3} 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/onlogin.mcfunction

@@ -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/bedrockbreaked/calculator.mcfunction

@@ -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

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

data/fz/functions/scoreboards/config.mcfunction

@@ -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/delscore.mcfunction

@@ -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

@@ -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/tools/golaxe.mcfunction

@@ -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

@@ -1,4 +1,4 @@
-#为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

data/fz/functions/scoreboards/digcounter/toolsfix2.mcfunction

@@ -0,0 +1,7 @@
+#为digtrigger函数修正非挖掘的使用带来的加分(右键副手放置时主手有工具)
+#判断条件用于排除地毯小人
+execute unless score @s carpetBot matches 1 run scoreboard players add @s digCounter 1
+execute unless score @s carpetBot matches 1 run scoreboard players add 总挖掘量 digCounter 1
+execute unless score @s carpetBot matches 1 run scoreboard players add 总挖掘量 totalList 1
+#重置探测右键副手放置时主手有工具的成就
+advancement revoke @s only fz:scoreboards/digcounter/toolsfix2

data/fz/functions/scoreboards/install.mcfunction

@@ -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 usedIroPickaxe minecraft.used:minecraft.iron_pickaxe
-    scoreboard objectives add usedIroShovel minecraft.used:minecraft.iron_axe
+    scoreboard objectives add usedIroShovel minecraft.used:minecraft.iron_shovel
-    scoreboard objectives add usedIroHoe minecraft.used:minecraft.iron_axe
+    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/main.mcfunction

@@ -1,9 +1,11 @@
-function fz:scoreboards/killcounter/killcounter
+function fz:scoreboards/killcounter/setdisplay
-schedule function fz:scoreboards/deathcounter/deathcounter 10s replace
+schedule function fz:scoreboards/deathcounter/setdisplay 10s replace
-schedule function fz:scoreboards/digcounter/digcounter 20s replace
+schedule function fz:scoreboards/digcounter/setdisplay 20s replace
-schedule function fz:scoreboards/tradingcounter/tradingcounter 30s replace
+schedule function fz:scoreboards/tradingcounter/setdisplay 30s replace
-schedule function fz:scoreboards/fishingcounter/fishingcounter 40s replace
+schedule function fz:scoreboards/fishingcounter/setdisplay 40s replace
-schedule function fz:scoreboards/damagetaken/damagetaken 50s replace
+schedule function fz:scoreboards/damagetaken/setdisplay 50s replace
-schedule function fz:scoreboards/activation/activation 60s replace
+schedule function fz:scoreboards/activation/setdisplay 60s replace
 schedule function fz:scoreboards/totallist 70s replace
-schedule function fz:scoreboards/main 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/main 90s replace
+execute unless score 全员头铁 bedrockBreaked matches 1.. run schedule function fz:scoreboards/main 80s replace

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

@@ -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/uninstall.mcfunction

@@ -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/update.mcfunction

@@ -1,4 +1,6 @@
-#先安装
+#卸载
+function fz:uninstall
+#安装
 function fz:install
 #再卸载已经被卸载的项目
 execute if data storage fz.installed {config: 0b} run function fz:config/uninstall

data/minecraft/tags/functions/tick.json

@@ -1,4 +1,3 @@
 {
-	"values": [
+	"values": []
-	]
 }

here.sc

@@ -5,17 +5,33 @@ __command() -> (
 	s_player = player();
 	pos = query(s_player, 'pos');
 	dim = query(s_player, 'dimension');
-	scoreboard_add('here_pos_x');
+	if(dim == 'overworld',
-	scoreboard_add('here_pos_y');
+		(
-	scoreboard_add('here_pos_z');
+			run(str('tellraw @a [{"selector": "@s"},{"text":"说: 我在主世界[x:%d, y:%d, z:%d, dim:overworld]","color": "aqua"}]',
-	scoreboard('here_pos_x',s_player,round(get(pos, 0)));
+				round(pos:0), round(pos:1), round(pos:2)
-	scoreboard('here_pos_y',s_player,round(get(pos, 1)));
-	scoreboard('here_pos_z',s_player,round(get(pos, 2)));
-	run(str('tellraw @s [{"selector": "@s"},{"text":"说：我在[x:","color": "aqua"},{"score": {"objective": "here_pos_x","name": "%s"}},{"text": ", y:"},{"score": {"objective": "here_pos_y","name": "%s"}},{"text": ", z:"},{"score": {"objective": "here_pos_z","name": "%s"}},{"text": ", dim:%s]"}]',
-		s_player, s_player, s_player, dim
 			));
-	scoreboard_remove('here_pos_x');
+			run(str('tellraw @a [{"text":"- 对应地狱: [x:%d, y:128, z:%d, dim:the_nether]","color": "aqua"}]',
-	scoreboard_remove('here_pos_y');
+				round((pos:0)/8), round((pos:2)/8)
-	scoreboard_remove('here_pos_z');
+			))
+		),
+		dim == 'the_nether',
+		(
+			run(str('tellraw @a [{"selector": "@s"},{"text":"说: 我在下界[x:%d, y:%d, z:%d, dim:the_nether]","color": "aqua"}]',
+				round(pos:0), round(pos:1), round(pos:2)
+			));
+			run(str('tellraw @a [{"text":"- 对应主世界: [x:%d, y:64, z:%d, dim:overworld]","color": "aqua"}]',
+				round((pos:0)*8), round((pos:2)*8)
+			))
+		),
+		dim == 'the_end',
+		(
+		run(str('tellraw @a [{"selector": "@s"},{"text":"说: 我在末地[x:%d, y:%d, z:%d, dim:%s]","color": "aqua"}]',
+			round(pos:0), round(pos:1), round(pos:2), dim
+		))
+		),
+		run(str('tellraw @a [{"selector": "@s"},{"text":"说: 我在%s世界[x:%d, y:%d, z:%d, dim:%s]","color": "aqua"}]',
+			dim, round(pos:0), round(pos:1), round(pos:2), dim
+		))
+	);
 	exit()
 )

restore_scores.sc

@@ -1,4 +1,4 @@
-global_version = '1.1.0';
+global_version = '1.1.1';
 __config() -> {
 	'scope' -> 'global',
 	'stay_loaded' -> false
@@ -128,7 +128,7 @@ __restore(pl, s_player) ->(
 	total_traded = 0;
 	total_hurt = 0;
 	c_for(i = 0, i < length(pl), i += 1,
-		run('player ' + pl:i + ' spawn at ' + (s_player~'x'+0.1)+ ' ' +s_player~'y'+ ' ' +(s_player~'z'+0.1));
+		run('player ' + pl:i + ' spawn');
 		game_tick(50);
 		//活跃时间
 		actime = statistic(pl:i, 'custom', 'play_one_minute')/72000;
@@ -184,7 +184,7 @@ __restore(pl, s_player) ->(
 	scoreboard('activation', '总在线时间(h)', total_actime);
 	scoreboard('totalList', '总在线时间(h)', total_actime);
 	scoreboard('damageTaken', '群p抖M', total_hurt);
-	scoreboard('totalList', '群p抖M)', total_hurt);
+	scoreboard('totalList', '群p抖M', total_hurt);
 	game_tick(50);
 	run('function fz:scoreboards/install')
 );