Compare commits

..

11 Commits

Author SHA1 Message Date
延皓 8508d869e2 update README.md.
Signed-off-by: 延皓 <harvey_husky@foxmail.com>
2025-02-17 19:28:26 +00:00
延皓 52075ad98b Merge branch 'dev/3.1' of https://gitee.com/harvey-husky/fz-survival-datapack into dev/3.1 2025-01-22 12:14:46 +08:00
延皓 2233b3b95d fix #IBJ6VX 2025-01-22 12:14:42 +08:00
延皓 0241f6e5f0 update README.md.
Signed-off-by: 延皓 <harvey_husky@foxmail.com>
2025-01-08 18:14:53 +00:00
Harvey_Husky 12f5b34329 fix 缺失苍白橡木 2024-12-30 15:30:18 +08:00
Harvey_Husky a765aa75b9 fix 缺失苍白橡木 2024-12-30 15:25:45 +08:00
Harvey_Husky eb9931ea06 Merge branch 'dev/3.1' of https://gitee.com/harvey-husky/fz-survival-datapack into dev/3.1 2024-12-09 20:26:38 +08:00
Harvey_Husky 1971888161 fix 1.21.2以上击杀榜失效 2024-12-09 20:17:09 +08:00
延皓 82b1f0dcdd update README.md.
Signed-off-by: 延皓 <harvey_husky@foxmail.com>
2024-11-03 09:08:40 +00:00
Harvey_Husky 79ee77b42d update README.md 2024-10-05 19:48:06 +08:00
Harvey_Husky e9ad855fd9 fix 在1.20.1使用脚本修改/计算分数时不会刷新显示计分板;fix 重置分数时不会重新计算总分 2024-10-05 19:40:49 +08:00
14 changed files with 189 additions and 17 deletions
+3 -6
View File
@@ -2,9 +2,7 @@
为FZ服务器写的Minecraft生存辅助数据包
[![数据包版本](https://img.shields.io/badge/正式版-3.1.11-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases) [![MC版本](https://img.shields.io/badge/Minecraft-1.20+-blue.svg)](https://minecraft.net/)
> 其他版本见[发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases)
> [下载](https://gitee.com/harvey-husky/FZ-sDatapack/releases)
## 安装教程
@@ -13,7 +11,7 @@
- `数据包 v3.0.x` 支持 `Minecraft 1.18.2-1.19.x` (不再维护)
2. 前往[发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases)下载对应MC版本的数据包
3. 将数据包 `zip` 文件放入 `world/datapacks` 中(在客户端位于 `.minecraft/saves/<存档名>/datapacks`
4. (可选)下载并安装 [Carpet Mod](https://github.com/gnembon/fabric-carpet/releases)
4. (可选)下载并安装 Carpet Mod
5. (可选)从数据包 `zip` 文件的 `scripts` 目录中解压 `.sc` 文件,将其放入 `world/scripts` 中(在客户端位于 `.minecraft/saves/<存档名>/scripts`
- **注意:如果未正确安装该脚本,数据包会强制禁用 carpet mod 的 `player` 命令以避免假人污染记分板,需要在安装好脚本后手动启用 `player` 命令**
6. 执行 `reload` 指令(或重新打开存档;在一些第三方服务端中可能需要改为`/minecraft:reload`
@@ -67,7 +65,7 @@
### 地毯脚本
- 如果你不知道 Carpet Mod 或 Carpet 脚本,请忽略本节
- 需要安装 [Carpet Mod](https://github.com/gnembon/fabric-carpet/releases)
- 需要安装 Carpet Mod
- 从数据包 `zip` 文件的 `scripts` 目录中解压 `.sc` 文件,将其放入 `world/scripts` 中(在客户端位于 `.minecraft/saves/<存档名>/scripts`
- **注意:如果未正确安装该脚本,数据包会强制禁用 carpet mod 的 `player` 命令以避免假人污染记分板,需要在安装好脚本后手动启用 `player` 命令**
- 脚本:
@@ -78,7 +76,6 @@
- ***使用前请务必备份存档!请报告不符预期的结果***
- ***使用前请务必备份存档!请报告不符预期的结果***
- ***使用前请务必备份存档!请报告不符预期的结果***
- `updateFrom <version>`:用于从给定的数据包版本恢复计分板数据(需要测试!)
- `recalculate`:重新计算所有计分板总分
- `recalculate <scoreboardID>`:重新计算该计分板总分
- `set <player> <scoreboardID> <score>`:设置该玩家该计分板的分数
@@ -0,0 +1,101 @@
{
"condition": "minecraft:any_of",
"terms": [
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type": "item",
"nbt": "{Item:{id:\"minecraft:minecart\"}}"
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type": "item",
"nbt": "{Item:{id:\"minecraft:hopper_minecart\"}}"
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type": "item",
"nbt": "{Item:{id:\"minecraft:chest_minecart\"}}"
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type": "item",
"nbt": "{Item:{id:\"minecraft:furnace_minecart\"}}"
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type": "item",
"nbt": "{Item:{id:\"minecraft:oak_boat\"}}"
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type": "item",
"nbt": "{Item:{id:\"minecraft:birch_boat\"}}"
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type": "item",
"nbt": "{Item:{id:\"minecraft:acacia_boat\"}}"
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type": "item",
"nbt": "{Item:{id:\"minecraft:cherry_boat\"}}"
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type": "item",
"nbt": "{Item:{id:\"minecraft:jungle_boat\"}}"
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type": "item",
"nbt": "{Item:{id:\"minecraft:spruce_boat\"}}"
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type": "item",
"nbt": "{Item:{id:\"minecraft:mangrove_boat\"}}"
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type": "item",
"nbt": "{Item:{id:\"minecraft:bamboo_raft\"}}"
}
}
]
}
@@ -0,0 +1,25 @@
{
"replace": false,
"values": [
"minecraft:stripped_acacia_log",
"minecraft:stripped_acacia_wood",
"minecraft:stripped_birch_log",
"minecraft:stripped_birch_wood",
"minecraft:stripped_crimson_hyphae",
"minecraft:stripped_crimson_stem",
"minecraft:stripped_dark_oak_log",
"minecraft:stripped_dark_oak_wood",
"minecraft:stripped_jungle_log",
"minecraft:stripped_jungle_wood",
"minecraft:stripped_oak_log",
"minecraft:stripped_oak_wood",
"minecraft:stripped_spruce_log",
"minecraft:stripped_spruce_wood",
"minecraft:stripped_warped_hyphae",
"minecraft:stripped_warped_stem",
"minecraft:stripped_cherry_log",
"minecraft:stripped_cherry_wood",
"minecraft:stripped_mangrove_log",
"minecraft:stripped_mangrove_wood"
]
}
@@ -0,0 +1,12 @@
{
"replace": false,
"values": [
"minecraft:armor_stand",
"minecraft:boat",
"minecraft:shulker_bullet",
"minecraft:item_frame",
"minecraft:glow_item_frame",
"minecraft:painting",
"minecraft:end_crystal"
]
}
@@ -21,10 +21,7 @@
}
}
}
],
"killing_blow": {
"bypasses_invulnerability": false
}
]
}
}
},
+1 -1
View File
@@ -1,4 +1,4 @@
execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.1.10'}}
execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.1.14'}}
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
+1 -1
View File
@@ -1,4 +1,4 @@
execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.1.11'}}
execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.1.14'}}
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
@@ -85,6 +85,13 @@
"nbt": "{Item:{id:\"minecraft:mangrove_boat\"}}"
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"nbt": "{Item:{id:\"minecraft:pale_oak_boat\"}}"
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
+4 -2
View File
@@ -20,6 +20,8 @@
"minecraft:stripped_cherry_log",
"minecraft:stripped_cherry_wood",
"minecraft:stripped_mangrove_log",
"minecraft:stripped_mangrove_wood"
"minecraft:stripped_mangrove_wood",
"minecraft:stripped_pale_oak_log",
"minecraft:stripped_pale_oak_wood"
]
}
}
@@ -0,0 +1,7 @@
{
"replace": false,
"values": [
"#fzsd:liquid",
"minecraft:powder_snow"
]
}
@@ -2,7 +2,7 @@
"replace": false,
"values": [
"minecraft:armor_stand",
"minecraft:boat",
"#minecraft:boat",
"minecraft:minecart",
"minecraft:shulker_bullet",
"minecraft:item_frame",
@@ -0,0 +1,15 @@
{
"replace": false,
"values": [
"#fzsd:module/scoreboard/assign/scoreboard/general/activation",
"#fzsd:module/scoreboard/assign/scoreboard/general/aviating_distance",
"#fzsd:module/scoreboard/assign/scoreboard/general/bedrock_broke_count",
"#fzsd:module/scoreboard/assign/scoreboard/general/damage_taken",
"#fzsd:module/scoreboard/assign/scoreboard/general/death_count",
"#fzsd:module/scoreboard/assign/scoreboard/general/dig_count",
"#fzsd:module/scoreboard/assign/scoreboard/general/fishing_count",
"#fzsd:module/scoreboard/assign/scoreboard/general/kill_count",
"#fzsd:module/scoreboard/assign/scoreboard/general/placement_count",
"#fzsd:module/scoreboard/assign/scoreboard/general/trade_count"
]
}
+9 -2
View File
@@ -1,10 +1,10 @@
{
"pack": {
"description": "FZ Survival Datapack 3.1 | Author: Harvey_Husky",
"pack_format": 15,
"pack_format": 61,
"supported_formats": {
"min_inclusive": 15,
"max_inclusive": 48
"max_inclusive": 61
}
},
"overlays": {
@@ -29,6 +29,13 @@
"min_inclusive": 42,
"max_inclusive": 48
}
},
{
"directory": "compat_49",
"formats": {
"min_inclusive": 49,
"max_inclusive": 61
}
}
]
}
+2
View File
@@ -257,10 +257,12 @@ help() -> (
command_reset(player, scoreboard_id) -> (
if(scoreboard_id == null,
run('scoreboard players reset ' + player);
recalculate_general(null);
print('已重置' + player + '的所有分数');
return();
);
scoreboard_remove(scoreboard_id, player);
recalculate_general(scoreboard_id);
print('已重置' + player + '' + scoreboard_id + '分数');
);