diff --git a/README.md b/README.md index af77513..0ddb6d6 100644 --- a/README.md +++ b/README.md @@ -2,7 +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://img.shields.io/badge/正式版-3.1.12-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) diff --git a/compat_42/data/fzsd/advancements/game_event/on_killed_mob_or_player.json b/compat_42/data/fzsd/advancements/game_event/on_killed_mob_or_player.json new file mode 100644 index 0000000..e9982f5 --- /dev/null +++ b/compat_42/data/fzsd/advancements/game_event/on_killed_mob_or_player.json @@ -0,0 +1,34 @@ +{ + "parent": "fzsd:game_event", + "criteria": { + "on_killed_mob_or_player": { + "trigger": "minecraft:player_killed_entity", + "conditions": { + "player": [ + { + "condition": "minecraft:reference", + "name": "fzsd:is_real_player" + } + ], + "entity": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "type": "#fzsd:ignore_on_player_killed_entity" + } + } + } + ], + "killing_blow": { + "bypasses_invulnerability": false + } + } + } + }, + "rewards": { + "function": "fzsd:game_event/advancement/on_killed_mob_or_player" + } +} \ No newline at end of file diff --git a/data/fzsd/advancement/game_event/on_killed_mob_or_player.json b/data/fzsd/advancement/game_event/on_killed_mob_or_player.json index e9982f5..ab17360 100644 --- a/data/fzsd/advancement/game_event/on_killed_mob_or_player.json +++ b/data/fzsd/advancement/game_event/on_killed_mob_or_player.json @@ -23,7 +23,12 @@ } ], "killing_blow": { - "bypasses_invulnerability": false + "tags": [ + { + "expected": false, + "id": "bypasses_invulnerability" + } + ] } } } diff --git a/data/fzsd/function/boot.mcfunction b/data/fzsd/function/boot.mcfunction index f8d5d45..82e1412 100644 --- a/data/fzsd/function/boot.mcfunction +++ b/data/fzsd/function/boot.mcfunction @@ -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.12'}} 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 diff --git a/data/fzsd/functions/boot.mcfunction b/data/fzsd/functions/boot.mcfunction index eb4e5de..82e1412 100644 --- a/data/fzsd/functions/boot.mcfunction +++ b/data/fzsd/functions/boot.mcfunction @@ -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.12'}} 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 diff --git a/pack.mcmeta b/pack.mcmeta index 08e5ffc..0f44520 100644 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -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 + } } ] }