diff --git a/README.md b/README.md index b2bcbba..6cea686 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ # FZ生存数据包 3.0 -[![数据包版本](https://img.shields.io/badge/正式版-3.0.9-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases) [![MC版本](https://img.shields.io/badge/Minecraft-1.18+-blue.svg)](https://minecraft.net/) +[![数据包版本](https://img.shields.io/badge/正式版-3.0.10-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases) [![MC版本](https://img.shields.io/badge/Minecraft-1.18+-blue.svg)](https://minecraft.net/) > 其他版本见[发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases) diff --git a/data/fzsd/functions/boot.mcfunction b/data/fzsd/functions/boot.mcfunction index 1bf8665..c46dbf1 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 int 1 run data merge storage fzsd:version {fzsd: {version: '3.0.9'}} +execute store success storage fzsd:version fzsd.need_update int 1 run data merge storage fzsd:version {fzsd: {version: '3.0.10'}} 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 diff --git a/data/fzsd/functions/module/here/global_message.mcfunction b/data/fzsd/functions/module/here/global_message.mcfunction index edb20b3..e6dc1ef 100644 --- a/data/fzsd/functions/module/here/global_message.mcfunction +++ b/data/fzsd/functions/module/here/global_message.mcfunction @@ -1 +1 @@ -tellraw @a [{"text": ""}, [{"selector": "@s"}, {"text": "说:我在", "color": "white"}, {"nbt": "fzsd.dimension.name", "interpret": true, "storage": "fzsd:here"}, [{"text": " [", "color": "green"}, {"nbt": "fzsd.x", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.y", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.z", "storage": "fzsd:here"}, {"text": "]"}], {"nbt": "fzsd.message.append", "interpret": true, "storage": "fzsd:here"}]] \ No newline at end of file +tellraw @a [{"text": ""}, [{"selector": "@s"}, {"text": "说:我在", "color": "white"}, {"nbt": "fzsd.dimension.name", "interpret": true, "storage": "fzsd:here"}, [{"text": "[", "color": "green"}, {"nbt": "fzsd.x", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.y", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.z", "storage": "fzsd:here"}, {"text": "]"}], {"nbt": "fzsd.message.append", "interpret": true, "storage": "fzsd:here"}]] \ No newline at end of file diff --git a/data/fzsd/functions/module/here/private_message.mcfunction b/data/fzsd/functions/module/here/private_message.mcfunction index 9da0724..cf28c6d 100644 --- a/data/fzsd/functions/module/here/private_message.mcfunction +++ b/data/fzsd/functions/module/here/private_message.mcfunction @@ -1 +1 @@ -tellraw @s [{"text": "你在", "color": "white"}, {"nbt": "fzsd.dimension.name", "interpret": true, "storage": "fzsd:here"}, [{"text": " [", "color": "green"}, {"nbt": "fzsd.x", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.y", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.z", "storage": "fzsd:here"}, {"text": "]"}], {"nbt": "fzsd.message.append", "interpret": true, "storage": "fzsd:here"}] \ No newline at end of file +tellraw @s [{"text": "你在", "color": "white"}, {"nbt": "fzsd.dimension.name", "interpret": true, "storage": "fzsd:here"}, [{"text": "[", "color": "green"}, {"nbt": "fzsd.x", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.y", "storage": "fzsd:here"}, {"text": ", "}, {"nbt": "fzsd.z", "storage": "fzsd:here"}, {"text": "]"}], {"nbt": "fzsd.message.append", "interpret": true, "storage": "fzsd:here"}] \ No newline at end of file diff --git a/data/fzsd/predicates/sweeper/whitelist.json b/data/fzsd/predicates/sweeper/whitelist.json index 572afc0..0e37c24 100644 --- a/data/fzsd/predicates/sweeper/whitelist.json +++ b/data/fzsd/predicates/sweeper/whitelist.json @@ -1,7 +1,54 @@ { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "nbt": "{Item:{id:\"minecraft:minecart\"}}" - } -} \ No newline at end of file + "condition": "minecraft:alternative", + "terms": [ + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "nbt": "{Item:{id:\"minecraft: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: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\"}}" + } + } + ] +}