Compare commits

..

12 Commits

Author SHA1 Message Date
延皓 c39ff19f1d 初步实现从统计信息恢复计分板 2022-09-21 08:20:01 +08:00
延皓 28d8625cb6 update readme 2022-09-12 23:34:49 +08:00
延皓 0905d460b6 添加reset命令 2022-09-12 21:53:54 +08:00
延皓 a40a33b19c release 3.0.0 2022-09-02 10:57:29 +08:00
延皓 423447dfe0 . 2022-09-02 10:53:30 +08:00
延皓 c11e3ea966 version beta.13 2022-09-02 10:45:23 +08:00
延皓 95c003825a fix #I5KIYF 2022-09-02 10:43:26 +08:00
延皓 40088893b5 修复挖掘榜失效的bug 2022-09-02 10:36:03 +08:00
延皓 c305885777 还是换回纯黑吧,, 2022-09-02 10:16:49 +08:00
延皓 284a7594ec . 2022-09-02 07:46:07 +08:00
延皓 faad8f7f24 . 2022-09-02 07:45:00 +08:00
延皓 cccc793446 修复拼写错误 2022-09-02 07:30:25 +08:00
51 changed files with 439 additions and 229 deletions
-5
View File
@@ -25,11 +25,6 @@
- 函数调用尽量不要使用`function`命令,应改在标签中按顺序调用!
## 未来计划
- 细化版本管理,提供不同版本之间的升级函数,由`update_manager`控制。*务必仔细测试再发布,一旦升级无法降级!*
- playerdata相关功能
## 系统模块
### 频繁使用的计算单元
+8 -6
View File
@@ -25,9 +25,7 @@
# FZ生存数据包 3.0
## *目前仍在测试阶段,请先备份服务器再使用!*
[![数据包版本](https://img.shields.io/badge/测试版-3.0+beta.11-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases/v3.0-beta.11) [![MC版本](https://img.shields.io/badge/Minecraft-1.19+-blue.svg)](https://minecraft.net/)
[![数据包版本](https://img.shields.io/badge/正式版-3.0.1-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases/v3.0-beta.12) [![MC版本](https://img.shields.io/badge/Minecraft-1.19+-blue.svg)](https://minecraft.net/)
> 其他版本见[发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases)
@@ -59,7 +57,7 @@
| 默认名称 | 计分板ID |
| :------: | :----------------------------------------------: |
| 破基岩榜 |fzsd.module.scoreboard.display.bedrock_broke_count|
| 破基岩榜 |fzsd.module.scoreboard.display.bedrock_broken_count|
### 地毯脚本
@@ -72,8 +70,12 @@
- 可避免Carpet假人污染计分板
- 执行 `reload` 指令后自动生效
- 子命令( `/fzsd_score <子命令>` ):
- `update_from <version>`:用于从给定的数据包版本恢复计分板数据(需要测试!)
- `recalculate_total`:重新计算总分
- `updateFrom <version>`:用于从给定的数据包版本恢复计分板数据(需要测试!)
- `recalculate`:重新计算所有计分板总分
- `recalculate <scoreboardID>`:重新计算该计分板总分
- `reset <player>`:重置该玩家的所有分数
- `reset <player> <scoreboardID>`:重置该玩家该计分板的分数
- `commandPlayer <permissionType>`:设置player命令权限类型
### 其他
- 见游戏内交互器按钮
@@ -1,5 +1,5 @@
# 见#fzsd.extra.bbl:event/broke_bedrock
## id不存在则注册运行时id
execute unless score fzsd.module.scoreboard.display.bedrock_broke_count.id fzsd.variable.integer matches 0.. run function fzsd.extra.bbl:display/register_id
scoreboard players operation @s fzsd.module.scoreboard.display.bedrock_broke_count += fzsd.var.score fzsd.variable.integer
scoreboard players operation fzsd.module.scoreboard.total.bedrock_broke_count fzsd.module.scoreboard.assign.general += fzsd.var.score fzsd.variable.integer
execute unless score fzsd.module.scoreboard.display.bedrock_broken_count.id fzsd.variable.integer matches 0.. run function fzsd.extra.bbl:display/register_id
scoreboard players operation @s fzsd.module.scoreboard.display.bedrock_broken_count += fzsd.var.score fzsd.variable.integer
scoreboard players operation fzsd.module.scoreboard.total.bedrock_broken_count fzsd.module.scoreboard.assign.general += fzsd.var.score fzsd.variable.integer
@@ -1,5 +1,5 @@
# 见#fzsd.extra.bbl:event/broke_bedrock
team join fzsd.module.scoreboard.display.bedrock_broke_count
team join fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard players operation fzsd.module.scoreboard.display.general = fzsd.module.scoreboard.total.bedrock_broke_count fzsd.module.scoreboard.assign.general
scoreboard players operation fzsd.module.scoreboard.display.bedrock_broke_count = fzsd.module.scoreboard.total.bedrock_broke_count fzsd.module.scoreboard.assign.general
scoreboard players operation fzsd.module.scoreboard.display.general = fzsd.module.scoreboard.total.bedrock_broken_count fzsd.module.scoreboard.assign.general
scoreboard players operation fzsd.module.scoreboard.display.bedrock_broken_count = fzsd.module.scoreboard.total.bedrock_broken_count fzsd.module.scoreboard.assign.general
@@ -1,3 +1,3 @@
# 见#fzsd:module/scoreboard/clear_data
##
scoreboard objectives remove fzsd.module.scoreboard.display.bedrock_broke_count
scoreboard objectives remove fzsd.module.scoreboard.display.bedrock_broken_count
@@ -1,21 +1,21 @@
# 见./try_display
## https://minecraft.fandom.com/zh/wiki/%E6%A0%BC%E5%BC%8F%E5%8C%96%E4%BB%A3%E7%A0%81
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.bedrock_broke_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fzsd.module.scoreboard.display.bedrock_broke_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fzsd.module.scoreboard.display.bedrock_broke_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fzsd.module.scoreboard.display.bedrock_broke_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fzsd.module.scoreboard.display.bedrock_broke_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fzsd.module.scoreboard.display.bedrock_broke_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.bedrock_broke_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fzsd.module.scoreboard.display.bedrock_broke_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fzsd.module.scoreboard.display.bedrock_broke_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fzsd.module.scoreboard.display.bedrock_broke_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 10 run scoreboard objectives setdisplay sidebar.team.green fzsd.module.scoreboard.display.bedrock_broke_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 11 run scoreboard objectives setdisplay sidebar.team.aqua fzsd.module.scoreboard.display.bedrock_broke_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 12 run scoreboard objectives setdisplay sidebar.team.red fzsd.module.scoreboard.display.bedrock_broke_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fzsd.module.scoreboard.display.bedrock_broke_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fzsd.module.scoreboard.display.bedrock_broke_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fzsd.module.scoreboard.display.bedrock_broke_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.bedrock_broken_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 1 run scoreboard objectives setdisplay sidebar.team.dark_blue fzsd.module.scoreboard.display.bedrock_broken_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 2 run scoreboard objectives setdisplay sidebar.team.dark_green fzsd.module.scoreboard.display.bedrock_broken_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 3 run scoreboard objectives setdisplay sidebar.team.dark_aqua fzsd.module.scoreboard.display.bedrock_broken_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 4 run scoreboard objectives setdisplay sidebar.team.dark_red fzsd.module.scoreboard.display.bedrock_broken_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 5 run scoreboard objectives setdisplay sidebar.team.dark_purple fzsd.module.scoreboard.display.bedrock_broken_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.bedrock_broken_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fzsd.module.scoreboard.display.bedrock_broken_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 8 run scoreboard objectives setdisplay sidebar.team.dark_gray fzsd.module.scoreboard.display.bedrock_broken_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fzsd.module.scoreboard.display.bedrock_broken_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 10 run scoreboard objectives setdisplay sidebar.team.green fzsd.module.scoreboard.display.bedrock_broken_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 11 run scoreboard objectives setdisplay sidebar.team.aqua fzsd.module.scoreboard.display.bedrock_broken_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 12 run scoreboard objectives setdisplay sidebar.team.red fzsd.module.scoreboard.display.bedrock_broken_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 13 run scoreboard objectives setdisplay sidebar.team.light_purple fzsd.module.scoreboard.display.bedrock_broken_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 14 run scoreboard objectives setdisplay sidebar.team.yellow fzsd.module.scoreboard.display.bedrock_broken_count
execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 15 run scoreboard objectives setdisplay sidebar.team.white fzsd.module.scoreboard.display.bedrock_broken_count
##
execute if score fzsd.logger.level fzsd.variable.integer matches ..300 run tellraw @a [{"nbt": "fzsd.level.fine", "interpret": true, "storage": "fzsd:logger"}, {"text": "已为队伍"}, {"nbt": "fzsd.scoreboard.text.carousel", "interpret": true, "storage": "fzsd:module"}, {"text": "显示"}, {"nbt": "text", "interpret": true, "storage": "fzsd.extra.bbl:text"}, {"text": "计分板"}]
@@ -1,2 +1,2 @@
# 见#fzsd:module/scoreboard/display/carousel/try_display
execute if score fzsd.module.scoreboard.display.current_id fzsd.variable.integer = fzsd.module.scoreboard.display.id.bedrock_broke_count fzsd.variable.integer run function fzsd.extra.bbl:display/carousel/set_display
execute if score fzsd.module.scoreboard.display.current_id fzsd.variable.integer = fzsd.module.scoreboard.display.id.bedrock_broken_count fzsd.variable.integer run function fzsd.extra.bbl:display/carousel/set_display
@@ -1,6 +1,6 @@
# 见#fzsd:module/scoreboard/display/register_id
#### 0id
execute if score fzsd.module.scoreboard.total.bedrock_broke_count fzsd.module.scoreboard.assign.general matches 1.. run function #fzsd:calculation/highest_id_add_1
execute if score fzsd.module.scoreboard.total.bedrock_broke_count fzsd.module.scoreboard.assign.general matches 1.. run scoreboard players operation fzsd.module.scoreboard.display.id.bedrock_broke_count fzsd.variable.integer = fzsd.module.scoreboard.display.highest_id fzsd.variable.integer
execute if score fzsd.module.scoreboard.total.bedrock_broken_count fzsd.module.scoreboard.assign.general matches 1.. run function #fzsd:calculation/highest_id_add_1
execute if score fzsd.module.scoreboard.total.bedrock_broken_count fzsd.module.scoreboard.assign.general matches 1.. run scoreboard players operation fzsd.module.scoreboard.display.id.bedrock_broken_count fzsd.variable.integer = fzsd.module.scoreboard.display.highest_id fzsd.variable.integer
execute if score fzsd.module.scoreboard.total.bedrock_broke_count fzsd.module.scoreboard.assign.general matches 1.. if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "注册"}, {"nbt": "fzsd.scoreboard.text.bedrock_broke_count", "interpret": true, "storage": "fzsd:module"}, {"text": "id为:"}, {"score": {"name": "fzsd.module.scoreboard.display.id.bedrock_broke_count", "objective": "fzsd.variable.integer"}}]
execute if score fzsd.module.scoreboard.total.bedrock_broken_count fzsd.module.scoreboard.assign.general matches 1.. if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "注册"}, {"nbt": "fzsd.scoreboard.text.bedrock_broken_count", "interpret": true, "storage": "fzsd:module"}, {"text": "id为:"}, {"score": {"name": "fzsd.module.scoreboard.display.id.bedrock_broken_count", "objective": "fzsd.variable.integer"}}]
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "aqua"}'
scoreboard objectives setdisplay sidebar.team.aqua fzsd.module.scoreboard.display.bedrock_broke_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "aqua"}
team modify fzsd.module.scoreboard.display.bedrock_broke_count color aqua
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "aqua"}
data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "aqua"}'
scoreboard objectives setdisplay sidebar.team.aqua fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "aqua"}
team modify fzsd.module.scoreboard.display.bedrock_broken_count color aqua
team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "aqua"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "#202020"}'
scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.bedrock_broke_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "#202020"}
team modify fzsd.module.scoreboard.display.bedrock_broke_count color black
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "#202020"}
data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "black"}'
scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "black"}
team modify fzsd.module.scoreboard.display.bedrock_broken_count color black
team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "black"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "blue"}'
scoreboard objectives setdisplay sidebar.team.blue fzsd.module.scoreboard.display.bedrock_broke_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "blue"}
team modify fzsd.module.scoreboard.display.bedrock_broke_count color blue
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "blue"}
data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "blue"}'
scoreboard objectives setdisplay sidebar.team.blue fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "blue"}
team modify fzsd.module.scoreboard.display.bedrock_broken_count color blue
team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "blue"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "dark_aqua"}'
scoreboard objectives setdisplay sidebar.team.dark_aqua fzsd.module.scoreboard.display.bedrock_broke_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "dark_aqua"}
team modify fzsd.module.scoreboard.display.bedrock_broke_count color dark_aqua
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "dark_aqua"}
data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "dark_aqua"}'
scoreboard objectives setdisplay sidebar.team.dark_aqua fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "dark_aqua"}
team modify fzsd.module.scoreboard.display.bedrock_broken_count color dark_aqua
team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "dark_aqua"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "dark_blue"}'
scoreboard objectives setdisplay sidebar.team.dark_blue fzsd.module.scoreboard.display.bedrock_broke_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "dark_blue"}
team modify fzsd.module.scoreboard.display.bedrock_broke_count color dark_blue
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "dark_blue"}
data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "dark_blue"}'
scoreboard objectives setdisplay sidebar.team.dark_blue fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "dark_blue"}
team modify fzsd.module.scoreboard.display.bedrock_broken_count color dark_blue
team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "dark_blue"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "dark_gray"}'
scoreboard objectives setdisplay sidebar.team.dark_gray fzsd.module.scoreboard.display.bedrock_broke_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "dark_gray"}
team modify fzsd.module.scoreboard.display.bedrock_broke_count color dark_gray
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "dark_gray"}
data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "dark_gray"}'
scoreboard objectives setdisplay sidebar.team.dark_gray fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "dark_gray"}
team modify fzsd.module.scoreboard.display.bedrock_broken_count color dark_gray
team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "dark_gray"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "dark_green"}'
scoreboard objectives setdisplay sidebar.team.dark_green fzsd.module.scoreboard.display.bedrock_broke_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "dark_green"}
team modify fzsd.module.scoreboard.display.bedrock_broke_count color dark_green
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "dark_green"}
data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "dark_green"}'
scoreboard objectives setdisplay sidebar.team.dark_green fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "dark_green"}
team modify fzsd.module.scoreboard.display.bedrock_broken_count color dark_green
team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "dark_green"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "dark_purple"}'
scoreboard objectives setdisplay sidebar.team.dark_purple fzsd.module.scoreboard.display.bedrock_broke_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "dark_purple"}
team modify fzsd.module.scoreboard.display.bedrock_broke_count color dark_purple
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "dark_purple"}
data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "dark_purple"}'
scoreboard objectives setdisplay sidebar.team.dark_purple fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "dark_purple"}
team modify fzsd.module.scoreboard.display.bedrock_broken_count color dark_purple
team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "dark_purple"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "dark_red"}'
scoreboard objectives setdisplay sidebar.team.dark_red fzsd.module.scoreboard.display.bedrock_broke_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "dark_red"}
team modify fzsd.module.scoreboard.display.bedrock_broke_count color dark_red
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "dark_red"}
data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "dark_red"}'
scoreboard objectives setdisplay sidebar.team.dark_red fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "dark_red"}
team modify fzsd.module.scoreboard.display.bedrock_broken_count color dark_red
team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "dark_red"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "gold"}'
scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.bedrock_broke_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "gold"}
team modify fzsd.module.scoreboard.display.bedrock_broke_count color gold
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "gold"}
data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "gold"}'
scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "gold"}
team modify fzsd.module.scoreboard.display.bedrock_broken_count color gold
team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "gold"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "gray"}'
scoreboard objectives setdisplay sidebar.team.gray fzsd.module.scoreboard.display.bedrock_broke_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "gray"}
team modify fzsd.module.scoreboard.display.bedrock_broke_count color gray
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "gray"}
data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "gray"}'
scoreboard objectives setdisplay sidebar.team.gray fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "gray"}
team modify fzsd.module.scoreboard.display.bedrock_broken_count color gray
team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "gray"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "green"}'
scoreboard objectives setdisplay sidebar.team.green fzsd.module.scoreboard.display.bedrock_broke_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "green"}
team modify fzsd.module.scoreboard.display.bedrock_broke_count color green
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "green"}
data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "green"}'
scoreboard objectives setdisplay sidebar.team.green fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "green"}
team modify fzsd.module.scoreboard.display.bedrock_broken_count color green
team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "green"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "purple"}'
scoreboard objectives setdisplay sidebar.team.light_purple fzsd.module.scoreboard.display.bedrock_broke_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "purple"}
team modify fzsd.module.scoreboard.display.bedrock_broke_count color light_purple
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "purple"}
data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "purple"}'
scoreboard objectives setdisplay sidebar.team.light_purple fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "purple"}
team modify fzsd.module.scoreboard.display.bedrock_broken_count color light_purple
team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "purple"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "red"}'
scoreboard objectives setdisplay sidebar.team.red fzsd.module.scoreboard.display.bedrock_broke_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "red"}
team modify fzsd.module.scoreboard.display.bedrock_broke_count color red
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "red"}
data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "red"}'
scoreboard objectives setdisplay sidebar.team.red fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "red"}
team modify fzsd.module.scoreboard.display.bedrock_broken_count color red
team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "red"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "white"}'
scoreboard objectives setdisplay sidebar.team.white fzsd.module.scoreboard.display.bedrock_broke_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "white"}
team modify fzsd.module.scoreboard.display.bedrock_broke_count color white
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "white"}
data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "white"}'
scoreboard objectives setdisplay sidebar.team.white fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "white"}
team modify fzsd.module.scoreboard.display.bedrock_broken_count color white
team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "white"}
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd.extra.bbl:text text set value '{"text": "破基岩榜", "color": "yellow"}'
scoreboard objectives setdisplay sidebar.team.yellow fzsd.module.scoreboard.display.bedrock_broke_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broke_count displayname {"text": "破基岩榜", "color": "yellow"}
team modify fzsd.module.scoreboard.display.bedrock_broke_count color yellow
team modify fzsd.module.scoreboard.display.bedrock_broke_count displayName {"text": "破基岩榜", "color": "yellow"}
data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "yellow"}'
scoreboard objectives setdisplay sidebar.team.yellow fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "yellow"}
team modify fzsd.module.scoreboard.display.bedrock_broken_count color yellow
team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "yellow"}
@@ -3,9 +3,9 @@
##
scoreboard objectives add fzsd.extra.bbl dummy
##
scoreboard objectives add fzsd.module.scoreboard.display.bedrock_broke_count dummy
scoreboard objectives add fzsd.module.scoreboard.display.bedrock_broken_count dummy
##
team add fzsd.module.scoreboard.display.bedrock_broke_count
team add fzsd.module.scoreboard.display.bedrock_broken_count
##
data modify storage fzsd:install fzsd.extra.bbl set value 1b
execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已安装扩展:破基岩榜"}]
@@ -1,3 +1,3 @@
# 见#fzsd:module/scoreboard/interactor/display
## 0
execute if data storage fzsd:install fzsd.extra{bbl:1b} if score fzsd.module.scoreboard.total.bedrock_broke_count fzsd.module.scoreboard.assign.general matches 1.. run tellraw @s [{"text": "[", "color": "dark_gray", "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1210"}, "hoverEvent": {"action": "show_text", "contents": {"nbt": "text", "interpret": true, "storage": "fzsd.extra.bbl:text"}}}, {"nbt": "text", "interpret": true, "storage": "fzsd.extra.bbl:text"}, {"text": "]"}]
execute if data storage fzsd:install fzsd.extra{bbl:1b} if score fzsd.module.scoreboard.total.bedrock_broken_count fzsd.module.scoreboard.assign.general matches 1.. run tellraw @s [{"text": "[", "color": "dark_gray", "clickEvent": {"action": "run_command", "value": "/trigger fzsd.module.interactor.trigger set -1210"}, "hoverEvent": {"action": "show_text", "contents": {"nbt": "text", "interpret": true, "storage": "fzsd.extra.bbl:text"}}}, {"nbt": "fzsd.scoreboard.text.bedrock_broken_count", "interpret": true, "storage": "fzsd:module"}, {"text": "]"}]
@@ -1,6 +1,6 @@
# 见./on_click
team join fzsd.module.scoreboard.display.bedrock_broke_count @s
team join fzsd.module.scoreboard.display.bedrock_broken_count @s
##
execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "玩家"}, {"selector": "@s"}, {"text": "订阅了"}, {"nbt": "text", "interpret": true, "storage": "fzsd.extra.bbl:text"}, {"text": "计分板"}]
@@ -0,0 +1,3 @@
execute if data storage fzsd:install fzsd.extra{bbl:1b} if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"text": "", "color": "green"}, {"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "fzsd.module.scoreboard.display.bedrock_broken_count - "}, {"nbt": "fzsd.scoreboard.text.bedrock_broken_count", "interpret": true, "storage": "fzsd:module"}]
execute if data storage fzsd:install fzsd.extra{bbl:1b} if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已加载扩展:破基岩榜"}]
@@ -2,7 +2,7 @@
##
scoreboard objectives remove fzsd.extra.bbl
##
team remove fzsd.module.scoreboard.display.bedrock_broke_count
team remove fzsd.module.scoreboard.display.bedrock_broken_count
##
data modify storage fzsd:install fzsd.extra.bbl set value 0b
execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "已卸载扩展:破基岩榜"}]
@@ -0,0 +1,28 @@
{
"parent": "fzsd:game_event",
"criteria": {
"on_tools_exclude_axes_used_on_block": {
"trigger": "minecraft:item_used_on_block",
"conditions": {
"player": [
{
"condition": "minecraft:reference",
"name": "fzsd:is_real_player"
}
],
"item": {
"tag": "fzsd:tool/axes"
},
"location": {
"__comment": "斧子剥树皮会触发两次,所以用目标方块限定只触发一次",
"block": {
"tag": "fzsd:stripped_blocks"
}
}
}
}
},
"rewards": {
"function": "fzsd:game_event/advancement/on_tools_used_on_block"
}
}
@@ -1,7 +1,7 @@
{
"parent": "fzsd:game_event",
"criteria": {
"on_tools_used_on_block": {
"on_tools_exclude_axes_used_on_block": {
"__comment": "斧子剥树皮会触发两次!",
"trigger": "minecraft:item_used_on_block",
"conditions": {
@@ -12,7 +12,7 @@
}
],
"item": {
"tag": "fzsd:tools"
"tag": "fzsd:tools_exclude_axes"
}
}
}
+2 -2
View File
@@ -1,5 +1,5 @@
execute store success storage fzsd:version fzsd.need_update int 1 run data merge storage fzsd:version {fzsd: {version: '3.0.0-beta.11'}}
execute store success storage fzsd:version fzsd.need_update int 1 run data merge storage fzsd:version {fzsd: {version: '3.0.0'}}
execute if data storage fzsd:version fzsd{need_update: 1} run function fzsd:system/update
function fzsd:system/carpet/try_load_fzsd_score
function #fzsd:load
execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "FZ Survival Data Pack,当前版本:", "color": "gold"}, {"nbt":"fzsd.version", "storage": "fzsd:version", "color": "yellow"}]
execute if score fzsd.logger.level fzsd.variable.integer matches ..500 run tellraw @a [{"nbt": "fzsd.level.info", "interpret": true, "storage": "fzsd:logger"}, {"text": "FZ Survival Data Pack,当前版本:", "color": "gold"}, {"nbt":"fzsd.version", "storage": "fzsd:version", "color": "red"}]
@@ -1,5 +1,4 @@
# 调用者:advancements/fzsd:~
##
##
execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "事件已触发:玩家"}, {"selector": "@s"}, {"text": "在方块上使用了工具"}]
@@ -11,4 +10,5 @@ scoreboard players remove @s fzsd.event.used_tool.dig_offset 1
function #fzsd:game_event/player/on_tools_used_on_block
##
advancement revoke @s only fzsd:game_event/on_tools_used_on_block
advancement revoke @s only fzsd:game_event/on_tool_axes_used_on_block
advancement revoke @s only fzsd:game_event/on_tools_exclude_axes_used_on_block
@@ -1,3 +1,3 @@
scoreboard players add @a[predicate=fzsd:is_real_player] fz.event.play_ticks 1
scoreboard players add @a[predicate=fzsd:is_real_player] fzsd.event.play_ticks 1
function #fzsd:game_event/on_tick
schedule function fzsd:game_event/on_tick 1t replace
@@ -30,7 +30,7 @@ scoreboard players operation fzsd.var.score fzsd.variable.integer += @s fzsd.eve
scoreboard players operation fzsd.var.score fzsd.variable.integer += @s fzsd.event.used_tool.wooden_pickaxe
scoreboard players operation fzsd.var.score fzsd.variable.integer += @s fzsd.event.used_tool.wooden_shovel
scoreboard players operation fzsd.var.score fzsd.variable.integer += @s fzsd.event.used_tool.wooden_sword
scoreboard players operation fzsd.var.score fzsd.variable.integer += @s fzsd.event.used_tool.offset
scoreboard players operation fzsd.var.score fzsd.variable.integer += @s fzsd.event.used_tool.dig_offset
##
execute unless score fzsd.var.score fzsd.variable.integer matches ..0 run function fzsd:game_event/player/on_broke_block_with_tool
@@ -1,4 +1,4 @@
scoreboard players set @s fzsd.event.used_tool.offset 0
scoreboard players set @s fzsd.event.used_tool.dig_offset 0
scoreboard players set @s fzsd.event.used_tool.diamond_axe 0
scoreboard players set @s fzsd.event.used_tool.diamond_hoe 0
scoreboard players set @s fzsd.event.used_tool.diamond_pickaxe 0
@@ -1,7 +1,7 @@
# 调用者:#fzsd:module/scoreboard/display/set_text/activation
data modify storage fzsd:module fzsd.scoreboard.text.activation set value '{"text": "活跃时间(h", "color": "#202020"}'
data modify storage fzsd:module fzsd.scoreboard.text.activation set value '{"text": "活跃时间(h", "color": "black"}'
scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.activation
scoreboard objectives modify fzsd.module.scoreboard.display.activation displayname {"text": "活跃时间(h", "color": "#202020"}
scoreboard objectives modify fzsd.module.scoreboard.display.activation displayname {"text": "活跃时间(h", "color": "black"}
team modify fzsd.module.scoreboard.display.activation color black
team modify fzsd.module.scoreboard.display.activation displayName {"text": "活跃时间(h", "color": "#202020"}
team modify fzsd.module.scoreboard.display.activation displayName {"text": "活跃时间(h", "color": "black"}
@@ -1,7 +1,7 @@
# 调用者:#fzsd:module/scoreboard/display/set_text/aviating_distance
data modify storage fzsd:module fzsd.scoreboard.text.aviating_distance set value '{"text": "飞行距离", "color": "#202020"}'
data modify storage fzsd:module fzsd.scoreboard.text.aviating_distance set value '{"text": "飞行距离", "color": "black"}'
scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.aviating_distance
scoreboard objectives modify fzsd.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "#202020"}
scoreboard objectives modify fzsd.module.scoreboard.display.aviating_distance displayname {"text": "飞行距离", "color": "black"}
team modify fzsd.module.scoreboard.display.aviating_distance color black
team modify fzsd.module.scoreboard.display.aviating_distance displayName {"text": "飞行距离", "color": "#202020"}
team modify fzsd.module.scoreboard.display.aviating_distance displayName {"text": "飞行距离", "color": "black"}
@@ -1,6 +1,6 @@
# 调用者:#fzsd:module/scoreboard/display/set_text/carousel
data modify storage fzsd:module fzsd.scoreboard.text.carousel set value '{"text": "轮播", "color": "#202020"}'
data modify storage fzsd:module fzsd.scoreboard.text.carousel set value '{"text": "轮播", "color": "black"}'
team modify fzsd.module.scoreboard.display.carousel color black
team modify fzsd.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "#202020"}
team modify fzsd.module.scoreboard.display.carousel displayName {"text": "轮播", "color": "black"}
scoreboard players set fzsd.module.scoreboard.carousel.color fzsd.variable.integer 0
@@ -1,7 +1,7 @@
# 调用者:#fzsd:module/scoreboard/display/set_text/damage_taken
data modify storage fzsd:module fzsd.scoreboard.text.damage_taken set value '{"text": "抖M榜", "color": "#202020"}'
data modify storage fzsd:module fzsd.scoreboard.text.damage_taken set value '{"text": "抖M榜", "color": "black"}'
scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.damage_taken
scoreboard objectives modify fzsd.module.scoreboard.display.damage_taken displayname {"text": "抖M榜", "color": "#202020"}
scoreboard objectives modify fzsd.module.scoreboard.display.damage_taken displayname {"text": "抖M榜", "color": "black"}
team modify fzsd.module.scoreboard.display.damage_taken color black
team modify fzsd.module.scoreboard.display.damage_taken displayName {"text": "抖M榜", "color": "#202020"}
team modify fzsd.module.scoreboard.display.damage_taken displayName {"text": "抖M榜", "color": "black"}
@@ -1,7 +1,7 @@
# 调用者:#fzsd:module/scoreboard/display/set_text/death_count
data modify storage fzsd:module fzsd.scoreboard.text.death_count set value '{"text": "死亡榜", "color": "#202020"}'
data modify storage fzsd:module fzsd.scoreboard.text.death_count set value '{"text": "死亡榜", "color": "black"}'
scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.death_count
scoreboard objectives modify fzsd.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "#202020"}
scoreboard objectives modify fzsd.module.scoreboard.display.death_count displayname {"text": "死亡榜", "color": "black"}
team modify fzsd.module.scoreboard.display.death_count color black
team modify fzsd.module.scoreboard.display.death_count displayName {"text": "死亡榜", "color": "#202020"}
team modify fzsd.module.scoreboard.display.death_count displayName {"text": "死亡榜", "color": "black"}
@@ -1,7 +1,7 @@
# 调用者:#fzsd:module/scoreboard/display/set_text/dig_count
data modify storage fzsd:module fzsd.scoreboard.text.dig_count set value '{"text": "挖掘榜", "color": "#202020"}'
data modify storage fzsd:module fzsd.scoreboard.text.dig_count set value '{"text": "挖掘榜", "color": "black"}'
scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.dig_count
scoreboard objectives modify fzsd.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "#202020"}
scoreboard objectives modify fzsd.module.scoreboard.display.dig_count displayname {"text": "挖掘榜", "color": "black"}
team modify fzsd.module.scoreboard.display.dig_count color black
team modify fzsd.module.scoreboard.display.dig_count displayName {"text": "挖掘榜", "color": "#202020"}
team modify fzsd.module.scoreboard.display.dig_count displayName {"text": "挖掘榜", "color": "black"}
@@ -1,7 +1,7 @@
# 调用者:#fzsd:module/scoreboard/display/set_text/fishing_count
data modify storage fzsd:module fzsd.scoreboard.text.fishing_count set value '{"text": "钓鱼榜", "color": "#202020"}'
data modify storage fzsd:module fzsd.scoreboard.text.fishing_count set value '{"text": "钓鱼榜", "color": "black"}'
scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.fishing_count
scoreboard objectives modify fzsd.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "#202020"}
scoreboard objectives modify fzsd.module.scoreboard.display.fishing_count displayname {"text": "钓鱼榜", "color": "black"}
team modify fzsd.module.scoreboard.display.fishing_count color black
team modify fzsd.module.scoreboard.display.fishing_count displayName {"text": "钓鱼榜", "color": "#202020"}
team modify fzsd.module.scoreboard.display.fishing_count displayName {"text": "钓鱼榜", "color": "black"}
@@ -1,7 +1,7 @@
# 调用者:#fzsd:module/scoreboard/display/set_text/general
data modify storage fzsd:module fzsd.scoreboard.text.general set value '{"text": "总榜", "color": "#202020"}'
data modify storage fzsd:module fzsd.scoreboard.text.general set value '{"text": "总榜", "color": "black"}'
scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.general
scoreboard objectives modify fzsd.module.scoreboard.display.general displayname {"text": "总榜", "color": "#202020"}
scoreboard objectives modify fzsd.module.scoreboard.display.general displayname {"text": "总榜", "color": "black"}
team modify fzsd.module.scoreboard.display.general color black
team modify fzsd.module.scoreboard.display.general displayName {"text": "总榜", "color": "#202020"}
team modify fzsd.module.scoreboard.display.general displayName {"text": "总榜", "color": "black"}
@@ -1,7 +1,7 @@
# 调用者:#fzsd:module/scoreboard/display/set_text/kill_count
data modify storage fzsd:module fzsd.scoreboard.text.kill_count set value '{"text": "击杀榜", "color": "#202020"}'
data modify storage fzsd:module fzsd.scoreboard.text.kill_count set value '{"text": "击杀榜", "color": "black"}'
scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.kill_count
scoreboard objectives modify fzsd.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "#202020"}
scoreboard objectives modify fzsd.module.scoreboard.display.kill_count displayname {"text": "击杀榜", "color": "black"}
team modify fzsd.module.scoreboard.display.kill_count color black
team modify fzsd.module.scoreboard.display.kill_count displayName {"text": "击杀榜", "color": "#202020"}
team modify fzsd.module.scoreboard.display.kill_count displayName {"text": "击杀榜", "color": "black"}
@@ -1,7 +1,7 @@
# 调用者:#fzsd:module/scoreboard/display/set_text/placement_count
data modify storage fzsd:module fzsd.scoreboard.text.placement_count set value '{"text": "方块放置榜", "color": "#202020"}'
data modify storage fzsd:module fzsd.scoreboard.text.placement_count set value '{"text": "方块放置榜", "color": "black"}'
scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.placement_count
scoreboard objectives modify fzsd.module.scoreboard.display.placement_count displayname {"text": "方块放置榜", "color": "#202020"}
scoreboard objectives modify fzsd.module.scoreboard.display.placement_count displayname {"text": "方块放置榜", "color": "black"}
team modify fzsd.module.scoreboard.display.placement_count color black
team modify fzsd.module.scoreboard.display.placement_count displayName {"text": "方块放置榜", "color": "#202020"}
team modify fzsd.module.scoreboard.display.placement_count displayName {"text": "方块放置榜", "color": "black"}
@@ -1,7 +1,7 @@
# 调用者:#fzsd:module/scoreboard/display/set_text/trade_count
data modify storage fzsd:module fzsd.scoreboard.text.trade_count set value '{"text": "交易榜", "color": "#202020"}'
data modify storage fzsd:module fzsd.scoreboard.text.trade_count set value '{"text": "交易榜", "color": "black"}'
scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.trade_count
scoreboard objectives modify fzsd.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "#202020"}
scoreboard objectives modify fzsd.module.scoreboard.display.trade_count displayname {"text": "交易榜", "color": "black"}
team modify fzsd.module.scoreboard.display.trade_count color black
team modify fzsd.module.scoreboard.display.trade_count displayName {"text": "交易榜", "color": "#202020"}
team modify fzsd.module.scoreboard.display.trade_count displayName {"text": "交易榜", "color": "black"}
@@ -1,6 +1,5 @@
{
"replace": false,
"values": [
]
}
@@ -6,6 +6,7 @@
"#fzsd:module/scoreboard/display/set_text",
"fzsd:module/scoreboard/display/carousel/loop",
"fzsd:module/scoreboard/load",
"fzsd.extra.bbl:try_install"
"fzsd.extra.bbl:try_install",
"fzsd.extra.bbl:load"
]
}
@@ -0,0 +1,10 @@
{
"replace": false,
"values": [
"#fzsd:tool/hoes",
"#fzsd:tool/pickaxes",
"#fzsd:tool/shears",
"#fzsd:tool/shovels",
"#fzsd:tool/swords"
]
}
+235 -63
View File
@@ -1,7 +1,20 @@
// 计分板模块扩展插件
// 忽略假人分数
// **请勿修改文件名**
global_app_version = '1.0-beta.8';
global_app_version = '1.0-beta.12';
global_current_scoreboard_list = [
'fzsd.module.scoreboard.display.activation',
'fzsd.module.scoreboard.display.damage_taken',
'fzsd.module.scoreboard.display.death_count',
'fzsd.module.scoreboard.display.dig_count',
'fzsd.module.scoreboard.display.fishing_count',
'fzsd.module.scoreboard.display.kill_count',
'fzsd.module.scoreboard.display.trade_count',
'fzsd.module.scoreboard.display.bedrock_broken_count',
'fzsd.module.scoreboard.display.aviating_distance',
'fzsd.module.scoreboard.display.placement_count'
];
global_app_name = system_info('app_name');
__config() -> {
'scope' -> 'global',
@@ -9,21 +22,51 @@ __config() -> {
'carpet' -> '>=1.4.45',
'minecraft' -> '>=1.17'
},
'command_permission' -> 4,
'command_permission' -> 2,
'commands' -> {
'' -> 'help',
'help' -> 'help',
'delete_old <delete_old>' -> 'delete_old',
'update_from <update_from>' -> 'update_from',
'restore_from_stats' -> 'restore_from_stats',
'recalculate_total' -> 'recalculate_total_scores',
'commandPlayer <boolean>' -> 'command_player'
'delete <version>' -> 'command_delete',
'update <version>' -> 'command_update',
'restore whitelist' -> ['command_restore', null, null],
'restore whitelist <scoreboardID>' -> _(scoreboardID) -> command_restore(null, scoreboardID),
'restore player <playerName>' -> ['command_restore', null],
'restore player <playerName> <scoreboardID>' -> 'command_restore',
'restore <custom> whitelist <trade_count>' -> _(custom, trade_count) -> command_restore_trade_count_confirm(custom, null, trade_count),
'restore <custom> player <playerName> <trade_count>' -> 'command_restore_trade_count_confirm',
'recalculate <scoreboardID>' -> 'recalculate_total_score',
'recalculate' -> ['recalculate_total_score', null],
'commandPlayer <permissionType>' -> 'carpet_command_player',
'reset <scoreboardPlayer> <scoreboardID>' -> 'command_reset',
'reset <scoreboardPlayer>' -> ['command_reset', null],
'set <playerName> <scoreboardID> <score>' -> 'command_set'
},
'arguments' -> {
'boolean' -> {
'type' -> 'bool'
'trade_count' -> {
'type' -> 'term',
'suggest' -> ['fzsd.module.scoreboard.display.trade_count']
},
'update_from' -> {
'playerName' -> {
'type' -> 'term',
'suggester' -> _(args) -> player('all')
},
'scoreboardID' -> {
'type' -> 'term',
'suggest' -> global_current_scoreboard_list
},
'scoreboardPlayer' -> {
'type' -> 'term',
'suggester' -> _(args) -> get_scoreboard_player_list()
},
'permissionType' -> {
'type' -> 'term',
'suggest' -> [
'true',
'false',
'ops'
]
},
'version' -> {
'type' -> 'term',
'suggest' -> [
'2.x',
@@ -32,13 +75,13 @@ __config() -> {
'3.0-beta.10'
]
},
'delete_old' -> {
'score' -> {
'type' -> 'int',
'suggest' -> []
},
'custom' -> {
'type' -> 'term',
'suggest' -> [
'2.x',
'3.0-beta.4',
'3.0-beta.9'
]
'suggest' -> []
}
}
};
@@ -78,6 +121,36 @@ __on_player_disconnects(player, reason) -> (
try_restore_team_from_cache(player);
);
// 获取所有计分板下的所有玩家列表
get_scoreboard_player_list() -> (
set = m();
for(global_current_scoreboard_list,
for(scoreboard(_),
if(_ ~ '\\w',
put(set:_, null);
);
);
);
return(keys(set));
);
// 重置玩家计分板分数
command_reset(player, scoreboard) -> (
if(scoreboard == null,
for(scoreboard(),
scoreboard_remove(_, player);
);
recalculate_total_score(null);
print('已重置' + player + '的所有分数');
return();
);
scoreboard_remove(scoreboard, player);
recalculate_total_score(scoreboard);
print('已重置' + player + '' + scoreboard + '分数');
return();
);
// 尝试从缓存恢复玩家队伍玩家/假人上下线时执行
try_restore_team_from_cache(player) -> (
player_team = player ~ 'team';
player_name = player ~ 'name';
@@ -99,11 +172,15 @@ help() -> (
return();
);
delete_old(fzsd_version) -> (
if(fzsd_version == '3.0-beta.9',
// 删除旧版的计分板
command_delete(fzsd_version) -> (
if(fzsd_version == '3.0-beta.10',
(
old_scoreboards = ['fzsd.extra.bbl.display'];
for(old_scoreboards, scoreboard_remove(_));
scoreboard_remove('fzsd.module.scoreboard.display.bedrock_broke_count');
),
fzsd_version == '3.0-beta.9',
(
scoreboard_remove('fzsd.extra.bbl.display');
),
fzsd_version == '2.x',
(
@@ -126,19 +203,19 @@ delete_old(fzsd_version) -> (
return();
);
update_from(fzsd_version) -> (
// 从某一旧版升级
command_update(fzsd_version) -> (
if(fzsd_version == '3.0-beta.10',
(
merge_score('fzsd.module.scoreboard.display.bedrock_broke_count', 'fzsd.module.scoreboard.display.bedrock_broken_count', fzsd_version);
command_delete(fzsd_version);
scoreboard_remove('fzsd.module.scoreboard.display.placement_count', '总放置方块数');
scoreboard_remove('fzsd.module.scoreboard.display.general', '总放置方块数');
),
fzsd_version == '3.0-beta.9',
(
params = [
['fzsd.extra.bbl.display', 'fzsd.module.scoreboard.display.bedrock_broke_count']
];
for(params, merge_score(..._, fzsd_version));
// 清除旧计分板
delete_old(fzsd_version);
merge_score('fzsd.extra.bbl.display', 'fzsd.module.scoreboard.display.bedrock_broken_count', fzsd_version);
command_delete(fzsd_version);
),
fzsd_version == '2.x',
(
@@ -150,12 +227,11 @@ update_from(fzsd_version) -> (
['fishingCounter', 'fzsd.module.scoreboard.display.fishing_count'],
['killCounter', 'fzsd.module.scoreboard.display.kill_count'],
['tradingCounter', 'fzsd.module.scoreboard.display.trade_count'],
['bedrockBreaked', 'fzsd.module.scoreboard.display.bedrock_broke_count'],
['bedrockBreaked', 'fzsd.module.scoreboard.display.bedrock_broken_count'],
['fz.aviate1m', 'fzsd.module.scoreboard.display.aviating_distance']
];
for(params, merge_score(..._, fzsd_version));
// 清除旧计分板
delete_old(fzsd_version);
command_delete(fzsd_version);
),
fzsd_version == '3.0-beta.4',
(
@@ -167,22 +243,22 @@ update_from(fzsd_version) -> (
['fz.module.scoreboard.display.fishing_count', 'fzsd.module.scoreboard.display.fishing_count'],
['fz.module.scoreboard.display.kill_count', 'fzsd.module.scoreboard.display.kill_count'],
['fz.module.scoreboard.display.trade_count', 'fzsd.module.scoreboard.display.trade_count'],
['fz.module.scoreboard.display.bedrock_broke_count', 'fzsd.module.scoreboard.display.bedrock_broke_count'],
['fz.module.scoreboard.display.bedrock_broke_count', 'fzsd.module.scoreboard.display.bedrock_broken_count'],
['fz.module.scoreboard.display.aviating_distance', 'fzsd.module.scoreboard.display.aviating_distance'],
['fz.module.scoreboard.display.placement_count', 'fzsd.module.scoreboard.display.placement_count']
];
for(params, merge_score(..._, fzsd_version));
// 清除旧计分板
delete_old(fzsd_version);
command_delete(fzsd_version);
),
print('参数错误!');
return();
);
recalculate_total_scores();
recalculate_total_score(null);
print('已从' + fzsd_version + '升级!');
return();
);
// 将两计分板分数合并到后者
merge_score(from, to, fzsd_version) -> (
// 如果目标计分板不存在则创建
if(scoreboard() ~ to == null, scoreboard_add(to));
@@ -215,7 +291,8 @@ merge_score(from, to, fzsd_version) -> (
return();
);
// 因为新计分板允许玩家自定义显示的总榜名称故续做复杂判断才能使脚本确定之
// 获取承载总榜数据的玩家名
// 因为新计分板允许玩家自定义显示的总榜名称故做复杂判断才能使脚本确定用来承载总榜数据的玩家名
get_total_score_name_new(scoreboard) -> (
INT_MIN = -2147483648;
// 获取系统总榜id
@@ -235,7 +312,7 @@ get_total_score_name_new(scoreboard) -> (
// 将总分赋值到显示计分板上
display_total_score(scoreboard);
// 查找榜内最低分
// 查找显示计分板内的最低分玩家名
last_min_player = null;
for(scoreboard(scoreboard),
if(last_min_player == null,
@@ -259,29 +336,17 @@ get_total_score_name_new(scoreboard) -> (
);
display_total_score(scoreboard);
// 返回榜内最低分的名称
// 返回榜内最低分的玩家名承载总榜数据的玩家名
return(last_min_player);
);
recalculate_total_scores() -> (
scoreboards = [
'fzsd.module.scoreboard.display.activation',
'fzsd.module.scoreboard.display.damage_taken',
'fzsd.module.scoreboard.display.death_count',
'fzsd.module.scoreboard.display.dig_count',
'fzsd.module.scoreboard.display.fishing_count',
'fzsd.module.scoreboard.display.kill_count',
'fzsd.module.scoreboard.display.trade_count',
'fzsd.module.scoreboard.display.bedrock_broke_count',
'fzsd.module.scoreboard.display.placement_count',
'fzsd.module.scoreboard.display.aviating_distance'
];
for(scoreboards,recalculate_total_score(_, get_total_score_name_new(_)));
print('已重新计算总分!');
return();
);
recalculate_total_score(scoreboard, total_score_name_new) -> (
// 重算总分scoreboard == null 时重算所有总分
recalculate_total_score(scoreboard) -> (
if(scoreboard == null,
for(global_current_scoreboard_list, recalculate_total_score(_));
return();
);
total_score_name_new = get_total_score_name_new(scoreboard);
// 计算总分
total_score = 0;
for(scoreboard(scoreboard),
@@ -299,6 +364,7 @@ recalculate_total_score(scoreboard, total_score_name_new) -> (
return();
);
// 使用数据包函数标签将总分赋值到显示计分板上
display_total_score(scoreboard) -> (
// 获取计算总榜的函数标签名
str_1 = split('\\.', scoreboard);
@@ -308,18 +374,124 @@ display_total_score(scoreboard) -> (
return();
);
restore_from_stats() -> (
print('暂未开发');
// 恢复计分板分数player == null 时恢复所有玩家分数scoreboard == null 时恢复所有计分板分数
command_restore(player, scoreboard) -> (
if(player == null,
for(keys(system_info('server_whitelist')), restore_score(_, scoreboard));
if(scoreboard == null,
print('已恢复所有玩家的所有分数')
,
print('已恢复所有玩家的' + scoreboard + '分数');
);
return();
);
if(scoreboard == null,
for(global_current_scoreboard_list, restore_score(player, _));
print('已恢复' + player + '的所有分数');
return();
);
if(restore_score(player, scoreboard),
print('已恢复' + player + '' + scoreboard + '分数');
);
return();
);
merge_stat(scoreboard, ...stats) -> (
print('暂未开发');
// 恢复玩家的计分板分数
restore_score(player, scoreboard) -> (
if(scoreboard == 'fzsd.module.scoreboard.display.activation',
(
play_ticks = statistic(player, 'custom', 'play_time');
scoreboard('fzsd.event.play_ticks', player, play_ticks%72000);
scoreboard(scoreboard, player, play_ticks/72000);
),
scoreboard == 'fzsd.module.scoreboard.display.damage_taken',
restore_from_stat(scoreboard, player, 'custom', 'damage_taken');
,
scoreboard == 'fzsd.module.scoreboard.display.death_count',
restore_from_stat(scoreboard, player, 'custom', 'deaths');
,
scoreboard == 'fzsd.module.scoreboard.display.dig_count',
(
scoreboard(scoreboard, player, 0);
for(block_list(),
append_from_stat(scoreboard, player, 'mined', _);
);
),
scoreboard == 'fzsd.module.scoreboard.display.fishing_count',
scoreboard(scoreboard, player, statistic(player, 'custom', 'fish_caught'));
,
scoreboard == 'fzsd.module.scoreboard.display.kill_count',
(
scoreboard(scoreboard, player, 0);
for(entity_types('living'),
append_from_stat(scoreboard, player, 'killed', _);
);
),
scoreboard == 'fzsd.module.scoreboard.display.trade_count',
(
print('此操作会丢失猪灵交易分数,请输入\n“/' + global_app_name + ' restore confirm whitelist fzsd.module.scoreboard.display.trade_count”或\n“/' + global_app_name + ' restore confirm player <playerName> fzsd.module.scoreboard.display.trade_count”继续执行');
return(false);
),
scoreboard == 'fzsd.module.scoreboard.display.bedrock_broken_count',
(
print('无法还原破基岩榜,已忽略');
return(false);
),
scoreboard == 'fzsd.module.scoreboard.display.aviating_distance',
scoreboard(scoreboard, player, statistic(player, 'custom', 'aviate_one_cm')/200);
,
scoreboard == 'fzsd.module.scoreboard.display.placement_count',
(
scoreboard(scoreboard, player, 0);
for(block_list(),
append_from_stat(scoreboard, player, 'used', _);
);
),
print('未识别的计分板ID');
return(false);
);
recalculate_total_score(scoreboard);
return(true);
);
// 确定恢复交易榜
command_restore_trade_count_confirm(confirm, player, trade_count) -> (
if(confirm != 'confirm' || trade_count != 'fzsd.module.scoreboard.display.trade_count',
print('命令格式错误!');
return();
);
if(player == null,
for(keys(system_info('server_whitelist')),
restore_from_stat(scoreboard, _, 'custom', 'traded_with_villager');
);
return();
);
restore_from_stat(scoreboard, player, 'custom', 'traded_with_villager');
return();
);
command_player(boolean) -> (
print(run('carpet setDefault commandPlayer ' + str(boolean)):1:0);
restore_from_stat(scoreboard, player, category, entry) -> (
scoreboard(scoreboard, player, statistic(player, category, entry));
);
append_from_stat(scoreboard, player, category, entry) -> (
scoreboard(scoreboard, player,
statistic(player, category, entry) + scoreboard(scoreboard, player)
);
);
// 修改地毯假人规则
carpet_command_player(level) -> (
print(run('carpet setDefault commandPlayer ' + level):1:0);
return();
);
// 设置玩家的计分板分数
command_set(player, scoreboard, score) -> (
i = scoreboard(scoreboard, player, score);
print('玩家' + player + '修改前的分数为:' + i);
recalculate_total_score(scoreboard);
return(i);
);
// 工具函数
@@ -331,4 +503,4 @@ contains(list, value) -> (
debug(msg) -> (
logger('debug', msg);
return();
);
);