Compare commits
24 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Harvey_Husky
|
6e8a38d027 | ||
|
Harvey_Husky
|
888d664897 | ||
|
Harvey_Husky
|
c46c3d0ec2 | ||
|
延皓
|
b398e27d89 | ||
|
Harvey_Husky
|
14f7fdc70c | ||
|
Harvey_Husky
|
664735720f | ||
|
Harvey_Husky
|
697957300b | ||
|
Harvey_Husky
|
1c9f10261a | ||
|
Harvey_Husky
|
a3642694e8 | ||
|
延皓
|
f2226d6c0e | ||
|
延皓
|
0c09cd467f | ||
|
延皓
|
4cd45d6ab1 | ||
|
延皓
|
3499fb0be3 | ||
|
延皓
|
0c93ee830c | ||
|
Harvey_Husky
|
09fcbb7891 | ||
|
Harvey_Husky
|
e13ab7619c | ||
|
Harvey_Husky
|
cfbd6da92a | ||
 延皓
|
b3582c3bab | ||
|
Harvey_Husky
|
2a96a9ee3a | ||
|
Harvey_Husky
|
4e79e3209e | ||
|
Harvey_Husky
|
09fac1082a | ||
|
Harvey_Husky
|
44d7a24b1b | ||
|
Harvey_Husky
|
667822c436 | ||
|
延皓
|
02330aec55 |
@@ -6,8 +6,6 @@
|
||||
|
||||
#### Copyright (C) 2019-2023 Harvey_Husky
|
||||
|
||||
[Bilibili专栏](https://www.bilibili.com/read/cv4267319)（年久失修）
|
||||
|
||||
## 安装教程
|
||||
|
||||
1. 兼容性
|
||||
@@ -17,16 +15,14 @@
|
||||
- `数据包 v2.1.x` 支持 `Minecraft 1.17.x-1.18.x`
|
||||
- `数据包 v2.0.x` 支持 `Minecraft 1.16.3-1.16.5`
|
||||
2. 前往[发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases)下载对应MC版本的数据包
|
||||
3. 从zip文件的 `scripts` 目录中挑选你需要的 `.sc` 文件
|
||||
4. 将数据包 `zip` 文件放入 `world/datapacks` 中（在客户端位于 `.minecraft/saves/<存档名>/datapacks`）
|
||||
5. （可选）下载并安装 [Carpet Mod **1.4.24**](https://github.com/gnembon/fabric-carpet/releases) 或以上版本
|
||||
6. （可选）从数据包 `zip` 文件的 `scripts` 目录中解压 `.sc` 文件，将其放入 `world/scripts` 中（在客户端位于 `.minecraft/saves/<存档名>/scripts` ）
|
||||
7. 执行 `reload` 指令（或重新打开存档；在一些第三方服务端中可能需要改为`/minecraft:reload`）
|
||||
|
||||
3. 将数据包 `zip` 文件放入 `world/datapacks` 中（在客户端位于 `.minecraft/saves/<存档名>/datapacks`）
|
||||
4. （可选）下载并安装 [Carpet Mod **1.4.24**](https://github.com/gnembon/fabric-carpet/releases) 或以上版本
|
||||
5. （可选）从数据包 `zip` 文件的 `scripts` 目录中解压 `.sc` 文件，将其放入 `world/scripts` 中（在客户端位于 `.minecraft/saves/<存档名>/scripts` ）
|
||||
6. 执行 `reload` 指令（或重新打开存档；在一些第三方服务端中可能需要改为`/minecraft:reload`）
|
||||
|
||||
# FZ生存数据包 3.1
|
||||
|
||||
[](https://gitee.com/harvey-husky/FZ-sDatapack/releases) [](https://minecraft.net/)
|
||||
[](https://gitee.com/harvey-husky/FZ-sDatapack/releases) [](https://minecraft.net/)
|
||||
|
||||
> 其他版本见[发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases)
|
||||
|
||||
@@ -60,6 +56,21 @@
|
||||
| :------: | :----------------------------------------------: |
|
||||
| 破基岩榜 |fzsd.module.scoreboard.display.bedrock_broken_count|
|
||||
|
||||
- 系统总榜计分板：`fzsd.module.scoreboard.assign.general`
|
||||
- 可以在在此记分板修改总分数据，下次加分时会刷新显示分数
|
||||
- 总计分项名称对照表：
|
||||
|
||||
| 默认名称 | 计分板ID |
|
||||
| :------: | :----------------------------------------------: |
|
||||
| 总活跃时间 | fzsd.module.scoreboard.total.activation |
|
||||
| 总飞行距离 | fzsd.module.scoreboard.total.aviating_distance |
|
||||
| 总受伤害量 | fzsd.module.scoreboard.total.damage_taken |
|
||||
| 总死亡数 | fzsd.module.scoreboard.total.death_count |
|
||||
| 总挖掘量 | fzsd.module.scoreboard.total.dig_count |
|
||||
| 总钓鱼数 | fzsd.module.scoreboard.total.fishing_count |
|
||||
| 总击杀数 | fzsd.module.scoreboard.total.kill_count |
|
||||
| 总放置方块数 | fzsd.module.scoreboard.total.placement_count |
|
||||
| 总交易量 | fzsd.module.scoreboard.total.trade_count |
|
||||
|
||||
### 地毯脚本
|
||||
|
||||
@@ -70,7 +81,6 @@
|
||||
- `fzsd_score.sc`：
|
||||
- 可避免Carpet假人污染计分板
|
||||
- 可以标记哪些玩家是假人
|
||||
- *注：请不要使用为假人名添加“bot”前缀的carpet扩展，本插件不支持此类假人！*
|
||||
- 子命令（ `/fzsd_score <子命令>` ）：
|
||||
- `updateFrom <version>`：用于从给定的数据包版本恢复计分板数据（需要测试！）
|
||||
- `recalculate`：重新计算所有计分板总分
|
||||
@@ -85,13 +95,21 @@
|
||||
- *副作用：恢复完成后玩家会被放置在出生点，请确保出生点完全安全*
|
||||
- `commandPlayer <permissionType>`：设置player命令权限类型
|
||||
|
||||
### 幻翼预警
|
||||
- 首次使用需要先睡一觉
|
||||
|
||||
### 管理员
|
||||
|
||||
- 使用`/function admin.fzsd:admin`命令管理（安装、卸载等）各模块
|
||||
|
||||
### 其他
|
||||
|
||||
- 见游戏内交互器按钮
|
||||
- 扫地机
|
||||
- 获取当前维度和坐标（以及对应的主世界、下界坐标）（私信/广播）
|
||||
- 获取上次死亡维度和坐标（私信/广播）
|
||||
- 获取上次穿出的下界传送门坐标（私信/广播）
|
||||
- 获取出生点维度和坐标（私信/广播）
|
||||
|
||||
## 开发者相关
|
||||
- 参见[开发文档](/DEVDOC.md)
|
||||
|
||||
- 见[开发文档](/DEVDOC.md)
|
||||
|
||||
@@ -36,3 +36,5 @@ tellraw @s [{"text": "计分板："}, [{"text": "", "color": "dark_gray"}, [{"te
|
||||
|
||||
|
||||
tellraw @s [{"text": "扫地机："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/sweeper/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/sweeper/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
|
||||
|
||||
tellraw @s [{"text": "幻翼预警："}, [{"text": "", "color": "dark_gray"}, [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/phantom_warning/install"}, "hoverEvent": {"action": "show_text", "contents": {"text": "安装", "color": "dark_green"}}}, {"text": "安装", "color": "dark_green"}, {"text": "]"}], [{"text": "[", "clickEvent": {"action": "run_command", "value": "/function #fzsd:module/phantom_warning/uninstall"}, "hoverEvent": {"action": "show_text", "contents": {"text": "卸载", "color": "dark_red"}}}, {"text": "卸载", "color": "dark_red"}, {"text": "]"}]]]
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"fzsd.extra.bbl:display/set_text/black"
|
||||
"fzsd.extra.bbl:display/set_text/dark_gray"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
{
|
||||
"parent": "fzsd:game_event",
|
||||
"criteria": {
|
||||
"on_sleeping": {
|
||||
"trigger": "minecraft:slept_in_bed",
|
||||
"conditions": {
|
||||
"player": [
|
||||
{
|
||||
"condition": "minecraft:reference",
|
||||
"name": "fzsd:is_real_player"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
"rewards": {
|
||||
"function": "fzsd:game_event/advancement/on_sleeping"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,2 @@
|
||||
# 游戏时间范围：0-2147483647
|
||||
execute store result score fzsd.var.cache fzsd.variable.integer run time query daytime
|
||||
@@ -0,0 +1,2 @@
|
||||
# 游戏时间范围：0-2147483647
|
||||
execute store result score fzsd.var.cache fzsd.variable.integer run time query gametime
|
||||
@@ -0,0 +1 @@
|
||||
scoreboard players operation fzsd.var.cache fzsd.variable.integer = @s fzsd.api.time_since_rest
|
||||
@@ -0,0 +1,5 @@
|
||||
## 距上次睡觉时间
|
||||
scoreboard objectives add fzsd.api.time_since_rest minecraft.custom:time_since_rest
|
||||
|
||||
## 调试
|
||||
execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "已安装系统组件：API"}]
|
||||
@@ -0,0 +1,5 @@
|
||||
## 距上次睡觉时间
|
||||
scoreboard objectives remove fzsd.api.time_since_rest
|
||||
|
||||
## 调试
|
||||
execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "已卸载系统组件：API"}]
|
||||
@@ -1,5 +1,5 @@
|
||||
execute store success storage fzsd:version fzsd.need_update int 1 run data merge storage fzsd:version {fzsd: {version: '3.1.0.rc.1'}}
|
||||
execute if data storage fzsd:version fzsd{need_update: 1} run function fzsd:system/update
|
||||
execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.1.4'}}
|
||||
execute if data storage fzsd:version fzsd{need_update: 1b} 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": "red"}]
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
# 调用者：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": "放置了流体"}]
|
||||
|
||||
function #fzsd:game_event/player/on_placed_liquid
|
||||
|
||||
## 重置事件进度
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
# 调用者：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": "放置了方块"}]
|
||||
|
||||
function #fzsd:game_event/player/on_placed_solid
|
||||
|
||||
## 重置事件进度
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
# 调用者：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": "正在睡觉"}]
|
||||
|
||||
## 运行事件
|
||||
function #fzsd:game_event/player/on_sleeping
|
||||
|
||||
## 重置事件进度
|
||||
advancement revoke @s from fzsd:game_event/on_sleeping
|
||||
@@ -1,2 +0,0 @@
|
||||
## 调试
|
||||
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": "放置了流体"}]
|
||||
@@ -1,2 +0,0 @@
|
||||
## 调试
|
||||
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": "放置了方块"}]
|
||||
@@ -0,0 +1,7 @@
|
||||
# 调用者：fzsd:game_event/game/on_night/on_tick
|
||||
|
||||
## 调试
|
||||
execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "事件已触发：夜幕降临"}]
|
||||
|
||||
## 运行事件
|
||||
function #fzsd:game_event/game/on_night
|
||||
@@ -0,0 +1,3 @@
|
||||
# 由fzsd:game_event/on_tick事件调用
|
||||
function #fzsd:api/get_current_daytime
|
||||
execute if score fzsd.var.cache fzsd.variable.integer matches 12516 run function fzsd:game_event/game/on_night
|
||||
@@ -1,4 +1,4 @@
|
||||
# 调用者：fzsd:game_event/player/on_used_tool
|
||||
# 调用者：fzsd:game_event/player/on_broke_block_with_tool/try_trigger
|
||||
|
||||
## 调试
|
||||
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": "挖掘了方块"}]
|
||||
|
||||
@@ -1,2 +1,4 @@
|
||||
# 调用者：#fzsd:game_event/player/on_used_tool
|
||||
|
||||
## 判断分数
|
||||
execute unless score fzsd.var.score fzsd.variable.integer matches ..0 run function fzsd:game_event/player/on_broke_block_with_tool
|
||||
@@ -1,5 +1,5 @@
|
||||
## 详细
|
||||
execute if score fzsd.logger.level fzsd.variable.integer matches ..300 run tellraw @a [{"nbt": "fzsd.level.fine", "interpret": true, "storage": "fzsd:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "使用了工具"}]
|
||||
## 调试
|
||||
execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.fine", "interpret": true, "storage": "fzsd:logger"}, {"text": "事件已触发：玩家"}, {"selector": "@s"}, {"text": "使用了工具"}]
|
||||
|
||||
## 运行事件
|
||||
function #fzsd:game_event/player/on_used_tool
|
||||
@@ -31,5 +31,5 @@ scoreboard players set @s fzsd.event.used_tool.wooden_pickaxe 0
|
||||
scoreboard players set @s fzsd.event.used_tool.wooden_shovel 0
|
||||
scoreboard players set @s fzsd.event.used_tool.wooden_sword 0
|
||||
|
||||
## 调试
|
||||
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": "的used_tool计分板"}]
|
||||
## 详细
|
||||
execute if score fzsd.logger.level fzsd.variable.integer matches ..300 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "重置了玩家"}, {"selector": "@s"}, {"text": "的used_tool计分板"}]
|
||||
@@ -0,0 +1,3 @@
|
||||
# TODO: 数字有待商榷
|
||||
function #fzsd:api/get_time_since_rest
|
||||
execute if score fzsd.var.cache fzsd.variable.integer matches 61766.. run function #fzsd:module/phantom_warning/send_phantom_warning
|
||||
@@ -0,0 +1 @@
|
||||
execute if data storage fzsd:install fzsd.module{phantom_warning:1b} as @a[predicate=fzsd:is_real_player] run function #fzsd:module/phantom_warning/check_time_since_rest
|
||||
@@ -0,0 +1,5 @@
|
||||
## 标记为已安装
|
||||
data modify storage fzsd:install fzsd.module.phantom_warning 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": "已安装组件：幻翼预警"}]
|
||||
@@ -0,0 +1,5 @@
|
||||
## 对当前玩家发送提醒
|
||||
execute if score fzsd.logger.level fzsd.variable.integer matches ..600 run tellraw @s [{"nbt": "fzsd.level.alert", "interpret": true, "storage": "fzsd:logger"}, {"text": "今晚可能会生成幻翼，建议睡觉！"}]
|
||||
|
||||
## 调试
|
||||
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": "发送幻翼预警"}]
|
||||
@@ -0,0 +1 @@
|
||||
execute unless data storage fzsd:install fzsd.module{phantom_warning:0b} run function #fzsd:module/phantom_warning/install
|
||||
@@ -0,0 +1,5 @@
|
||||
## 标记为已卸载
|
||||
data modify storage fzsd:install fzsd.module.phantom_warning 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": "已卸载组件：幻翼预警"}]
|
||||
@@ -1,2 +1,4 @@
|
||||
scoreboard players add @s fzsd.module.scoreboard.display.activation 1
|
||||
execute if score @s fzsd.module.scoreboard.display.activation matches ..-1 run scoreboard players set @s fzsd.module.scoreboard.display.activation 2147483647
|
||||
scoreboard players add fzsd.module.scoreboard.total.activation fzsd.module.scoreboard.assign.general 1
|
||||
execute if score fzsd.module.scoreboard.total.activation fzsd.module.scoreboard.assign.general matches ..-1 run scoreboard players set fzsd.module.scoreboard.total.activation fzsd.module.scoreboard.assign.general 2147483647
|
||||
@@ -1,2 +1,4 @@
|
||||
scoreboard players operation @s fzsd.module.scoreboard.display.aviating_distance += fzsd.var.score fzsd.variable.integer
|
||||
execute if score @s fzsd.module.scoreboard.display.aviating_distance matches ..-1 run scoreboard players set @s fzsd.module.scoreboard.display.aviating_distance 2147483647
|
||||
scoreboard players operation fzsd.module.scoreboard.total.aviating_distance fzsd.module.scoreboard.assign.general += fzsd.var.score fzsd.variable.integer
|
||||
execute if score fzsd.module.scoreboard.total.aviating_distance fzsd.module.scoreboard.assign.general matches ..-1 run scoreboard players set fzsd.module.scoreboard.total.aviating_distance fzsd.module.scoreboard.assign.general 2147483647
|
||||
@@ -1,2 +1,4 @@
|
||||
scoreboard players operation @s fzsd.module.scoreboard.display.damage_taken += fzsd.var.score fzsd.variable.integer
|
||||
execute if score @s fzsd.module.scoreboard.display.damage_taken matches ..-1 run scoreboard players set @s fzsd.module.scoreboard.display.damage_taken 2147483647
|
||||
scoreboard players operation fzsd.module.scoreboard.total.damage_taken fzsd.module.scoreboard.assign.general += fzsd.var.score fzsd.variable.integer
|
||||
execute if score fzsd.module.scoreboard.total.damage_taken fzsd.module.scoreboard.assign.general matches ..-1 run scoreboard players set fzsd.module.scoreboard.total.damage_taken fzsd.module.scoreboard.assign.general 2147483647
|
||||
@@ -1,2 +1,4 @@
|
||||
scoreboard players add @s fzsd.module.scoreboard.display.death_count 1
|
||||
execute if score @s fzsd.module.scoreboard.display.death_count matches ..-1 run scoreboard players set @s fzsd.module.scoreboard.display.death_count 2147483647
|
||||
scoreboard players add fzsd.module.scoreboard.total.death_count fzsd.module.scoreboard.assign.general 1
|
||||
execute if score fzsd.module.scoreboard.total.death_count fzsd.module.scoreboard.assign.general matches ..-1 run scoreboard players set fzsd.module.scoreboard.total.death_count fzsd.module.scoreboard.assign.general 2147483647
|
||||
@@ -1,2 +1,4 @@
|
||||
scoreboard players operation @s fzsd.module.scoreboard.display.dig_count += fzsd.var.score fzsd.variable.integer
|
||||
execute if score @s fzsd.module.scoreboard.display.dig_count matches ..-1 run scoreboard players set @s fzsd.module.scoreboard.display.dig_count 2147483647
|
||||
scoreboard players operation fzsd.module.scoreboard.total.dig_count fzsd.module.scoreboard.assign.general += fzsd.var.score fzsd.variable.integer
|
||||
execute if score fzsd.module.scoreboard.total.dig_count fzsd.module.scoreboard.assign.general matches ..-1 run scoreboard players set fzsd.module.scoreboard.total.dig_count fzsd.module.scoreboard.assign.general 2147483647
|
||||
@@ -1,2 +1,4 @@
|
||||
scoreboard players add @s fzsd.module.scoreboard.display.fishing_count 1
|
||||
execute if score @s fzsd.module.scoreboard.display.fishing_count matches ..-1 run scoreboard players set @s fzsd.module.scoreboard.display.fishing_count 2147483647
|
||||
scoreboard players add fzsd.module.scoreboard.total.fishing_count fzsd.module.scoreboard.assign.general 1
|
||||
execute if score fzsd.module.scoreboard.total.fishing_count fzsd.module.scoreboard.assign.general matches ..-1 run scoreboard players set fzsd.module.scoreboard.total.fishing_count fzsd.module.scoreboard.assign.general 2147483647
|
||||
@@ -1,2 +1,4 @@
|
||||
scoreboard players add @s fzsd.module.scoreboard.display.kill_count 1
|
||||
execute if score @s fzsd.module.scoreboard.display.kill_count matches ..-1 run scoreboard players set @s fzsd.module.scoreboard.display.kill_count 2147483647
|
||||
scoreboard players add fzsd.module.scoreboard.total.kill_count fzsd.module.scoreboard.assign.general 1
|
||||
execute if score fzsd.module.scoreboard.total.kill_count fzsd.module.scoreboard.assign.general matches ..-1 run scoreboard players set fzsd.module.scoreboard.total.kill_count fzsd.module.scoreboard.assign.general 2147483647
|
||||
@@ -1,2 +1,4 @@
|
||||
scoreboard players add @s fzsd.module.scoreboard.display.placement_count 1
|
||||
execute if score @s fzsd.module.scoreboard.display.placement_count matches ..-1 run scoreboard players set @s fzsd.module.scoreboard.display.placement_count 2147483647
|
||||
scoreboard players add fzsd.module.scoreboard.total.placement_count fzsd.module.scoreboard.assign.general 1
|
||||
execute if score fzsd.module.scoreboard.total.placement_count fzsd.module.scoreboard.assign.general matches ..-1 run scoreboard players set fzsd.module.scoreboard.total.placement_count fzsd.module.scoreboard.assign.general 2147483647
|
||||
@@ -1,2 +1,4 @@
|
||||
scoreboard players add @s fzsd.module.scoreboard.display.trade_count 1
|
||||
execute if score @s fzsd.module.scoreboard.display.trade_count matches ..-1 run scoreboard players set @s fzsd.module.scoreboard.display.trade_count 2147483647
|
||||
scoreboard players add fzsd.module.scoreboard.total.trade_count fzsd.module.scoreboard.assign.general 1
|
||||
execute if score fzsd.module.scoreboard.total.trade_count fzsd.module.scoreboard.assign.general matches ..-1 run scoreboard players set fzsd.module.scoreboard.total.trade_count fzsd.module.scoreboard.assign.general 2147483647
|
||||
@@ -2,4 +2,5 @@
|
||||
scoreboard players set -1 fzsd.variable.integer -1
|
||||
scoreboard players set 10 fzsd.variable.integer 10
|
||||
scoreboard players set 200 fzsd.variable.integer 200
|
||||
scoreboard players set 24000 fzsd.variable.integer 24000
|
||||
scoreboard players set 72000 fzsd.variable.integer 72000
|
||||
@@ -1,7 +1,96 @@
|
||||
{
|
||||
"condition": "minecraft:any_of",
|
||||
"terms": [
|
||||
{
|
||||
"condition": "minecraft:entity_properties",
|
||||
"entity": "this",
|
||||
"predicate": {
|
||||
"nbt": "{Item:{id:\"minecraft:minecart\"}}"
|
||||
}
|
||||
},
|
||||
{
|
||||
"condition": "minecraft:entity_properties",
|
||||
"entity": "this",
|
||||
"predicate": {
|
||||
"nbt": "{Item:{id:\"minecraft:hopper_minecart\"}}"
|
||||
}
|
||||
},
|
||||
{
|
||||
"condition": "minecraft:entity_properties",
|
||||
"entity": "this",
|
||||
"predicate": {
|
||||
"nbt": "{Item:{id:\"minecraft:chest_minecart\"}}"
|
||||
}
|
||||
},
|
||||
{
|
||||
"condition": "minecraft:entity_properties",
|
||||
"entity": "this",
|
||||
"predicate": {
|
||||
"nbt": "{Item:{id:\"minecraft:furnace_minecart\"}}"
|
||||
}
|
||||
},
|
||||
{
|
||||
"condition": "minecraft:entity_properties",
|
||||
"entity": "this",
|
||||
"predicate": {
|
||||
"nbt": "{Item:{id:\"minecraft:oak_boat\"}}"
|
||||
}
|
||||
},
|
||||
{
|
||||
"condition": "minecraft:entity_properties",
|
||||
"entity": "this",
|
||||
"predicate": {
|
||||
"nbt": "{Item:{id:\"minecraft:birch_boat\"}}"
|
||||
}
|
||||
},
|
||||
{
|
||||
"condition": "minecraft:entity_properties",
|
||||
"entity": "this",
|
||||
"predicate": {
|
||||
"nbt": "{Item:{id:\"minecraft:acacia_boat\"}}"
|
||||
}
|
||||
},
|
||||
{
|
||||
"condition": "minecraft:entity_properties",
|
||||
"entity": "this",
|
||||
"predicate": {
|
||||
"nbt": "{Item:{id:\"minecraft:cherry_boat\"}}"
|
||||
}
|
||||
},
|
||||
{
|
||||
"condition": "minecraft:entity_properties",
|
||||
"entity": "this",
|
||||
"predicate": {
|
||||
"nbt": "{Item:{id:\"minecraft:jungle_boat\"}}"
|
||||
}
|
||||
},
|
||||
{
|
||||
"condition": "minecraft:entity_properties",
|
||||
"entity": "this",
|
||||
"predicate": {
|
||||
"nbt": "{Item:{id:\"minecraft:spruce_boat\"}}"
|
||||
}
|
||||
},
|
||||
{
|
||||
"condition": "minecraft:entity_properties",
|
||||
"entity": "this",
|
||||
"predicate": {
|
||||
"nbt": "{Item:{id:\"minecraft:dark_oak_boat\"}}"
|
||||
}
|
||||
},
|
||||
{
|
||||
"condition": "minecraft:entity_properties",
|
||||
"entity": "this",
|
||||
"predicate": {
|
||||
"nbt": "{Item:{id:\"minecraft:mangrove_boat\"}}"
|
||||
}
|
||||
},
|
||||
{
|
||||
"condition": "minecraft:entity_properties",
|
||||
"entity": "this",
|
||||
"predicate": {
|
||||
"nbt": "{Item:{id:\"minecraft:bamboo_raft\"}}"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -16,6 +16,8 @@
|
||||
"minecraft:stripped_spruce_log",
|
||||
"minecraft:stripped_spruce_wood",
|
||||
"minecraft:stripped_warped_hyphae",
|
||||
"minecraft:stripped_warped_stem"
|
||||
"minecraft:stripped_warped_stem",
|
||||
"minecraft:stripped_cherry_log",
|
||||
"minecraft:stripped_cherry_wood"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"fzsd:api/get_current_daytime"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"fzsd:api/get_current_gametime"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"fzsd:api/get_time_since_rest"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"fzsd:api/install"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"fzsd:api/uninstall"
|
||||
]
|
||||
}
|
||||
@@ -2,7 +2,8 @@
|
||||
"__comment": "本标签将强制重装所有模块",
|
||||
"replace": false,
|
||||
"values": [
|
||||
"#fzsd:uninstall",
|
||||
"#fzsd:deep_install"
|
||||
"#fzsd:deep_uninstall",
|
||||
"#fzsd:deep_install",
|
||||
"#fzsd:load"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"#fzsd:module/phantom_warning/event/on_night"
|
||||
]
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
|
||||
"fzsd:game_event/game/on_night/on_tick"
|
||||
]
|
||||
}
|
||||
@@ -1,6 +1,5 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"fzsd:game_event/callback/on_placed_liquid"
|
||||
]
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"fzsd:game_event/callback/on_placed_solid",
|
||||
"#fzsd:module/scoreboard/assign/scoreboard/placement_count"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
|
||||
]
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"fzsd:module/join_message/default_message"
|
||||
]
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"#fzsd:module/join_message/default_message"
|
||||
"fzsd:module/join_message/default_message"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"fzsd:module/phantom_warning/check_time_since_rest"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"fzsd:module/phantom_warning/event/on_night"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"fzsd:module/phantom_warning/install"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"fzsd:module/phantom_warning/send_phantom_warning"
|
||||
]
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"fzsd:module/phantom_warning/uninstall"
|
||||
]
|
||||
}
|
||||
@@ -2,6 +2,7 @@
|
||||
"replace": false,
|
||||
"values": [
|
||||
"#fzsd:uninstall",
|
||||
"#fzsd:install"
|
||||
"#fzsd:install",
|
||||
"#fzsd:load"
|
||||
]
|
||||
}
|
||||
@@ -4,9 +4,11 @@
|
||||
"#fzsd:module/health/install",
|
||||
"#fzsd:module/here/install",
|
||||
"#fzsd:module/interactor/install",
|
||||
"#fzsd:module/join_message/install",
|
||||
"#fzsd:module/last_death/install",
|
||||
"#fzsd:module/last_nether_portal/install",
|
||||
"#fzsd:module/last_spawn_point/install",
|
||||
"#fzsd:module/phantom_warning/install",
|
||||
"#fzsd:module/scoreboard/install",
|
||||
"#fzsd:module/sweeper/install"
|
||||
]
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
"fzsd:module/last_death/try_install",
|
||||
"fzsd:module/last_nether_portal/try_install",
|
||||
"fzsd:module/last_spawn_point/try_install",
|
||||
"fzsd:module/phantom_warning/try_install",
|
||||
"fzsd:module/scoreboard/try_install",
|
||||
"fzsd:module/sweeper/try_install"
|
||||
]
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
"values": [
|
||||
"fzsd:system/install/install",
|
||||
"#fzsd:logger/install",
|
||||
"#fzsd:api/install",
|
||||
"#fzsd:game_event/install"
|
||||
]
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"#fzsd:api/uninstall",
|
||||
"#fzsd:game_event/uninstall",
|
||||
"#fzsd:logger/uninstall",
|
||||
"fzsd:system/uninstall/uninstall"
|
||||
|
||||
+18
-27
@@ -43,7 +43,6 @@ global_current_scoreboard_list = [
|
||||
'fzsd.module.scoreboard.display.aviating_distance',
|
||||
'fzsd.module.scoreboard.display.placement_count'
|
||||
];
|
||||
global_server_whitelist_cache = null;
|
||||
|
||||
__config() -> {
|
||||
'scope' -> 'global',
|
||||
@@ -184,10 +183,7 @@ __on_player_disconnects(player, reason) -> (
|
||||
|
||||
// 获取服务器白名单
|
||||
get_server_whitelist() -> (
|
||||
if(global_server_whitelist_cache == null,
|
||||
global_server_whitelist_cache = keys(system_info('server_whitelist'));
|
||||
);
|
||||
return(global_server_whitelist_cache);
|
||||
return(keys(system_info('server_whitelist')));
|
||||
);
|
||||
|
||||
// 重载配置文件
|
||||
@@ -387,20 +383,14 @@ merge_score(from, to, fzsd_version) -> (
|
||||
// 获取承载总榜数据的玩家名
|
||||
// 因为新计分板允许玩家自定义显示的总榜名称，故做复杂判断才能使脚本确定用来承载总榜数据的玩家名
|
||||
get_total_score_name_new(scoreboard) -> (
|
||||
INT_MIN = -2147483648;
|
||||
// 获取系统总榜id
|
||||
system_total_name = replace(scoreboard, 'display', 'total');
|
||||
// 系统总榜id
|
||||
sys_total_name = replace(scoreboard, 'display', 'total');
|
||||
|
||||
// 当前总分
|
||||
current_score = scoreboard('fzsd.module.scoreboard.assign.general', sys_total_name);
|
||||
|
||||
// 将系统总榜分数加上最小int值，使其成为最低分
|
||||
scoreboard(
|
||||
'fzsd.module.scoreboard.assign.general',
|
||||
system_total_name,
|
||||
scoreboard(
|
||||
'fzsd.module.scoreboard.assign.general',
|
||||
system_total_name
|
||||
) + INT_MIN
|
||||
);
|
||||
// 将系统总榜分数设为INT_MIN，使其成为最低分
|
||||
scoreboard('fzsd.module.scoreboard.assign.general', sys_total_name, -2147483648);
|
||||
|
||||
// 将总分赋值到显示计分板上
|
||||
display_total_score(scoreboard);
|
||||
@@ -419,14 +409,7 @@ get_total_score_name_new(scoreboard) -> (
|
||||
);
|
||||
|
||||
// 恢复总榜分数
|
||||
scoreboard(
|
||||
'fzsd.module.scoreboard.assign.general',
|
||||
system_total_name,
|
||||
scoreboard(
|
||||
'fzsd.module.scoreboard.assign.general',
|
||||
system_total_name
|
||||
) - INT_MIN
|
||||
);
|
||||
scoreboard('fzsd.module.scoreboard.assign.general', sys_total_name, current_score);
|
||||
display_total_score(scoreboard);
|
||||
|
||||
// 返回榜内最低分的玩家名（承载总榜数据的玩家名）
|
||||
@@ -444,7 +427,15 @@ command_recalculate_total_score(scoreboard) -> (
|
||||
total_score = 0;
|
||||
for(scoreboard(scoreboard),
|
||||
if(_ != total_score_name_new,
|
||||
total_score += scoreboard(scoreboard, _);
|
||||
current_player_score = scoreboard(scoreboard, _);
|
||||
if(current_player_score < 0, // 避免溢出
|
||||
current_player_score = 2147483647;
|
||||
scoreboard(scoreboard, _, 2147483647);
|
||||
);
|
||||
total_score += current_player_score;
|
||||
);
|
||||
if(total_score < 0, // 避免溢出
|
||||
total_score = 2147483647;
|
||||
);
|
||||
);
|
||||
// 赋值总分到系统总分计分板
|
||||
@@ -521,7 +512,7 @@ restore_score(player_name, scoreboard) -> (
|
||||
require_not_null(player_name);
|
||||
if(scoreboard == null,
|
||||
for(global_current_scoreboard_list, restore_score(player_name, _));
|
||||
return();
|
||||
return(true);
|
||||
);
|
||||
player = player(player_name);
|
||||
player_is_offline = false;
|
||||
|
||||
Reference in New Issue
Block a user