From b4b296ea9b3b7d3d1415efc05eeda5f633727b72 Mon Sep 17 00:00:00 2001 From: Harvey_Husky Date: Tue, 6 Jun 2023 19:43:35 +0800 Subject: [PATCH] mc1.20! --- .vscode/settings.json | 5 +-- LICENSE | 4 +- README.md | 7 ++-- .../game_event/on_placed_block.json | 2 +- .../on_placed_block/on_placed_liquid.json | 20 ++++++++-- .../on_placed_block/on_placed_solid.json | 31 ++++++++++++++++ .../on_tool_axes_used_on_block.json | 28 ++++++++------ .../on_tools_exclude_axes_used_on_block.json | 13 ++++--- .../advancements/game_event/on_unsneak.json | 7 ---- .../module/interactor/on_click.json | 2 +- data/fzsd/functions/boot.mcfunction | 2 +- .../advancement/on_placed_block.mcfunction | 6 +-- .../on_placed_liquid.mcfunction | 6 +++ .../on_placed_solid.mcfunction | 6 +++ .../callback/on_placed_solid.mcfunction | 2 +- .../set_display/activation.mcfunction | 7 +++- .../set_display/aviating_distance.mcfunction | 6 ++- .../set_display/damage_taken.mcfunction | 6 ++- .../set_display/death_count.mcfunction | 6 ++- .../carousel/set_display/dig_count.mcfunction | 6 ++- .../set_display/fishing_count.mcfunction | 6 ++- .../carousel/set_display/general.mcfunction | 6 ++- .../set_display/kill_count.mcfunction | 6 ++- .../set_display/placement_count.mcfunction | 6 ++- .../set_display/trade_count.mcfunction | 6 ++- .../predicates/axe_in_hand_effective.json | 37 +++++++++---------- data/fzsd/predicates/not_real_player.json | 2 +- data/fzsd/predicates/used_tool.json | 2 +- data/fzsd/tags/blocks/liquid.json | 7 ++++ pack.mcmeta | 4 +- 30 files changed, 176 insertions(+), 78 deletions(-) create mode 100644 data/fzsd/advancements/game_event/on_placed_block/on_placed_solid.json create mode 100644 data/fzsd/functions/game_event/advancement/on_placed_block/on_placed_liquid.mcfunction create mode 100644 data/fzsd/functions/game_event/advancement/on_placed_block/on_placed_solid.mcfunction create mode 100644 data/fzsd/tags/blocks/liquid.json diff --git a/.vscode/settings.json b/.vscode/settings.json index 34c531a..6b6ceb0 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -17,7 +17,6 @@ "storageText": "{\"nbt\": \"${1:NBT}\", \"interpret\": true, \"storage\": \"${2:A namespaced ID}\"}", "ifInstalled": "execute if data storage fzsd:installed fzsd.module{${1:module_name}:1b} run ${tellraw}" }, - "datapack.env.cmdVersion": "1.19", - "datapack.env.jsonVersion": "1.19", - "datapack.env.dataVersion": "1.19" + "datapack.env.cmdVersion": "1.20", + "datapack.env.dataVersion": "1.20" } \ No newline at end of file diff --git a/LICENSE b/LICENSE index a52f8b9..cc90979 100644 --- a/LICENSE +++ b/LICENSE @@ -1,9 +1,9 @@ FZSD许可协议 -2022/11/19 https://gitee.com/harvey-husky/fz-survival-datapack/blob/dev/3.0/LICENSE +2023/6/6 https://gitee.com/harvey-husky/fz-survival-datapack/blob/dev/3.0/LICENSE -版权所有 © 2019-2022 延皓 +版权所有 © 2019-2023 延皓 定义： “该许可协议”指FZSD许可协议。 diff --git a/README.md b/README.md index 22db9d4..340b171 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ -# 消极怠工中，相信你们可以自己写出更好用的！:) - # FZ生存数据包 为FZ服务器写的Minecraft生存辅助数据包 @@ -13,6 +11,7 @@ ## 安装教程 1. 兼容性 + - `数据包 v3.1.x` 支持 `Minecraft 1.20.x` - `数据包 v3.0.x` 支持 `Minecraft 1.18.2-1.19.x` - `数据包 v2.2.x` 支持 `Minecraft 1.19.x` - `数据包 v2.1.x` 支持 `Minecraft 1.17.x-1.18.x` @@ -27,7 +26,7 @@ # FZ生存数据包 3.0 -[![数据包版本](https://img.shields.io/badge/正式版-3.0.5-blue.svg)](https://gitee.com/harvey-husky/FZ-sDatapack/releases) [![MC版本](https://img.shields.io/badge/Minecraft-1.19+-blue.svg)](https://minecraft.net/) +[![数据包版本](https://img.shields.io/badge/正式版-3.1.0-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) @@ -68,7 +67,7 @@ - 需要安装 [Carpet Mod](https://github.com/gnembon/fabric-carpet/releases) - 从数据包 `zip` 文件的 `scripts` 目录中解压 `.sc` 文件，将其放入 `world/scripts` 中（在客户端位于 `.minecraft/saves/<存档名>/scripts` ） - 脚本： - - `fzsd_score.sc`（**开发中！此处列举目前已完成的**）： + - `fzsd_score.sc`： - 可避免Carpet假人污染计分板 - 可以标记哪些玩家是假人 - *注：请不要使用为假人名添加“bot”前缀的carpet扩展，本插件不支持此类假人！* diff --git a/data/fzsd/advancements/game_event/on_placed_block.json b/data/fzsd/advancements/game_event/on_placed_block.json index f587037..8e6656c 100644 --- a/data/fzsd/advancements/game_event/on_placed_block.json +++ b/data/fzsd/advancements/game_event/on_placed_block.json @@ -4,7 +4,7 @@ "on_placed_block": { "trigger": "minecraft:placed_block", "conditions": { - "player": [ + "location": [ { "condition": "minecraft:reference", "name": "fzsd:is_real_player" diff --git a/data/fzsd/advancements/game_event/on_placed_block/on_placed_liquid.json b/data/fzsd/advancements/game_event/on_placed_block/on_placed_liquid.json index 761c63d..43e8926 100644 --- a/data/fzsd/advancements/game_event/on_placed_block/on_placed_liquid.json +++ b/data/fzsd/advancements/game_event/on_placed_block/on_placed_liquid.json @@ -4,10 +4,24 @@ "on_placed_liquid": { "trigger": "minecraft:placed_block", "conditions": { - "item": { - "tag": "fzsd:bucket_of_liquid" - } + "location": [ + { + "condition": "minecraft:reference", + "name": "fzsd:is_real_player" + }, + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "tag": "fzsd:liquid" + } + } + } + ] } } + }, + "rewards": { + "function": "fzsd:game_event/advancement/on_placed_block/on_placed_liquid" } } \ No newline at end of file diff --git a/data/fzsd/advancements/game_event/on_placed_block/on_placed_solid.json b/data/fzsd/advancements/game_event/on_placed_block/on_placed_solid.json new file mode 100644 index 0000000..c338dd9 --- /dev/null +++ b/data/fzsd/advancements/game_event/on_placed_block/on_placed_solid.json @@ -0,0 +1,31 @@ +{ + "parent": "fzsd:game_event/on_placed_block", + "criteria": { + "on_placed_solid": { + "trigger": "minecraft:placed_block", + "conditions": { + "location": [ + { + "condition": "minecraft:reference", + "name": "fzsd:is_real_player" + }, + { + "condition": "minecraft:inverted", + "term": + { + "condition": "minecraft:location_check", + "predicate": { + "block": { + "tag": "fzsd:liquid" + } + } + } + } + ] + } + } + }, + "rewards": { + "function": "fzsd:game_event/advancement/on_placed_block/on_placed_solid" + } +} \ No newline at end of file diff --git a/data/fzsd/advancements/game_event/on_tool_axes_used_on_block.json b/data/fzsd/advancements/game_event/on_tool_axes_used_on_block.json index 6afff2e..bd0ad64 100644 --- a/data/fzsd/advancements/game_event/on_tool_axes_used_on_block.json +++ b/data/fzsd/advancements/game_event/on_tool_axes_used_on_block.json @@ -4,21 +4,27 @@ "on_tools_exclude_axes_used_on_block": { "trigger": "minecraft:item_used_on_block", "conditions": { - "player": [ + "location": [ { "condition": "minecraft:reference", "name": "fzsd:is_real_player" + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "tag": "fzsd:tool/axes" + } + }, + { + "condition": "minecraft:location_check", + "predicate": { + "__comment": "斧子剥树皮会触发两次，所以用目标方块限定只触发一次", + "block": { + "tag": "fzsd:stripped_blocks" + } + } } - ], - "item": { - "tag": "fzsd:tool/axes" - }, - "location": { - "__comment": "斧子剥树皮会触发两次，所以用目标方块限定只触发一次", - "block": { - "tag": "fzsd:stripped_blocks" - } - } + ] } } }, diff --git a/data/fzsd/advancements/game_event/on_tools_exclude_axes_used_on_block.json b/data/fzsd/advancements/game_event/on_tools_exclude_axes_used_on_block.json index 859ab54..db38b48 100644 --- a/data/fzsd/advancements/game_event/on_tools_exclude_axes_used_on_block.json +++ b/data/fzsd/advancements/game_event/on_tools_exclude_axes_used_on_block.json @@ -5,15 +5,18 @@ "__comment": "斧子剥树皮会触发两次！", "trigger": "minecraft:item_used_on_block", "conditions": { - "player": [ + "location": [ { "condition": "minecraft:reference", "name": "fzsd:is_real_player" + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "tag": "fzsd:tools_exclude_axes" + } } - ], - "item": { - "tag": "fzsd:tools_exclude_axes" - } + ] } } }, diff --git a/data/fzsd/advancements/game_event/on_unsneak.json b/data/fzsd/advancements/game_event/on_unsneak.json index 93e9353..c2b20c4 100644 --- a/data/fzsd/advancements/game_event/on_unsneak.json +++ b/data/fzsd/advancements/game_event/on_unsneak.json @@ -16,18 +16,11 @@ "flags": { "is_sneaking": false }, - "__comment_type_specific": "1.19+", "type_specific": { "type": "player", "advancements": { "fzsd:game_event/on_sneak": true } - }, - "__comment_player": "1.18 compat", - "player": { - "advancements": { - "fzsd:game_event/on_sneak": true - } } } } diff --git a/data/fzsd/advancements/module/interactor/on_click.json b/data/fzsd/advancements/module/interactor/on_click.json index a6a43f3..5f11175 100644 --- a/data/fzsd/advancements/module/interactor/on_click.json +++ b/data/fzsd/advancements/module/interactor/on_click.json @@ -10,7 +10,7 @@ "name": "fzsd:is_real_player" }, { - "condition": "minecraft:alternative", + "condition": "minecraft:any_of", "terms": [ { "condition": "minecraft:entity_scores", diff --git a/data/fzsd/functions/boot.mcfunction b/data/fzsd/functions/boot.mcfunction index ec55bcd..063b6fb 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.7'}} +execute store success storage fzsd:version fzsd.need_update int 1 run data merge storage fzsd:version {fzsd: {version: '3.1.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 diff --git a/data/fzsd/functions/game_event/advancement/on_placed_block.mcfunction b/data/fzsd/functions/game_event/advancement/on_placed_block.mcfunction index 6e7d491..c9e2aa5 100644 --- a/data/fzsd/functions/game_event/advancement/on_placed_block.mcfunction +++ b/data/fzsd/functions/game_event/advancement/on_placed_block.mcfunction @@ -1,10 +1,6 @@ # 调用者：advancements/fzsd:~ -## 运行事件 -execute if entity @s[advancements={fzsd:game_event/on_placed_block/on_placed_liquid=true}] run function #fzsd:game_event/player/on_placed_liquid -execute if entity @s[advancements={fzsd:game_event/on_placed_block/on_placed_liquid=false}] run function #fzsd:game_event/player/on_placed_solid function #fzsd:game_event/player/on_placed_block ## 重置事件进度 -advancement revoke @s from fzsd:game_event/on_placed_block -advancement revoke @s from fzsd:game_event/on_placed_block/on_placed_liquid \ No newline at end of file +advancement revoke @s from fzsd:game_event/on_placed_block \ No newline at end of file diff --git a/data/fzsd/functions/game_event/advancement/on_placed_block/on_placed_liquid.mcfunction b/data/fzsd/functions/game_event/advancement/on_placed_block/on_placed_liquid.mcfunction new file mode 100644 index 0000000..ce86674 --- /dev/null +++ b/data/fzsd/functions/game_event/advancement/on_placed_block/on_placed_liquid.mcfunction @@ -0,0 +1,6 @@ +# 调用者：advancements/fzsd:~ + +function #fzsd:game_event/player/on_placed_liquid + +## 重置事件进度 +advancement revoke @s from fzsd:game_event/on_placed_block/on_placed_liquid \ No newline at end of file diff --git a/data/fzsd/functions/game_event/advancement/on_placed_block/on_placed_solid.mcfunction b/data/fzsd/functions/game_event/advancement/on_placed_block/on_placed_solid.mcfunction new file mode 100644 index 0000000..4bc0a6c --- /dev/null +++ b/data/fzsd/functions/game_event/advancement/on_placed_block/on_placed_solid.mcfunction @@ -0,0 +1,6 @@ +# 调用者：advancements/fzsd:~ + +function #fzsd:game_event/player/on_placed_solid + +## 重置事件进度 +advancement revoke @s from fzsd:game_event/on_placed_block/on_placed_solid \ No newline at end of file diff --git a/data/fzsd/functions/game_event/callback/on_placed_solid.mcfunction b/data/fzsd/functions/game_event/callback/on_placed_solid.mcfunction index 8886c41..e9c1a2e 100644 --- a/data/fzsd/functions/game_event/callback/on_placed_solid.mcfunction +++ b/data/fzsd/functions/game_event/callback/on_placed_solid.mcfunction @@ -1,2 +1,2 @@ ## 调试 -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": "放置了实体方块"}] \ No newline at end of file +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": "放置了方块"}] \ No newline at end of file diff --git a/data/fzsd/functions/module/scoreboard/display/carousel/set_display/activation.mcfunction b/data/fzsd/functions/module/scoreboard/display/carousel/set_display/activation.mcfunction index 2e9fa28..abb7127 100644 --- a/data/fzsd/functions/module/scoreboard/display/carousel/set_display/activation.mcfunction +++ b/data/fzsd/functions/module/scoreboard/display/carousel/set_display/activation.mcfunction @@ -1,13 +1,18 @@ # 调用者：fzsd:module/scoreboard/carousel/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 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.activation +### 默认值金色放到第一位 +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 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": "fzsd.scoreboard.text.activation", "interpret": true, "storage": "fzsd:module"}, {"text": "计分板"}] +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run return 6 + execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.activation 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.activation 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.activation 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.activation 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.activation 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.activation -execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.activation execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fzsd.module.scoreboard.display.activation 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.activation execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fzsd.module.scoreboard.display.activation diff --git a/data/fzsd/functions/module/scoreboard/display/carousel/set_display/aviating_distance.mcfunction b/data/fzsd/functions/module/scoreboard/display/carousel/set_display/aviating_distance.mcfunction index 7225b06..b56404c 100644 --- a/data/fzsd/functions/module/scoreboard/display/carousel/set_display/aviating_distance.mcfunction +++ b/data/fzsd/functions/module/scoreboard/display/carousel/set_display/aviating_distance.mcfunction @@ -1,13 +1,17 @@ # 调用者：fzsd:module/scoreboard/carousel/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 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.aviating_distance +### 默认值金色放到第一位 +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 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": "fzsd.scoreboard.text.aviating_distance", "interpret": true, "storage": "fzsd:module"}, {"text": "计分板"}] +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run return 6 + execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.aviating_distance 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.aviating_distance 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.aviating_distance 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.aviating_distance 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.aviating_distance 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.aviating_distance -execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.aviating_distance execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fzsd.module.scoreboard.display.aviating_distance 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.aviating_distance execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fzsd.module.scoreboard.display.aviating_distance diff --git a/data/fzsd/functions/module/scoreboard/display/carousel/set_display/damage_taken.mcfunction b/data/fzsd/functions/module/scoreboard/display/carousel/set_display/damage_taken.mcfunction index 78d5f45..db3bc9a 100644 --- a/data/fzsd/functions/module/scoreboard/display/carousel/set_display/damage_taken.mcfunction +++ b/data/fzsd/functions/module/scoreboard/display/carousel/set_display/damage_taken.mcfunction @@ -1,13 +1,17 @@ # 调用者：fzsd:module/scoreboard/carousel/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 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.damage_taken +### 默认值金色放到第一位 +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 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": "fzsd.scoreboard.text.damage_taken", "interpret": true, "storage": "fzsd:module"}, {"text": "计分板"}] +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run return 6 + execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.damage_taken 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.damage_taken 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.damage_taken 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.damage_taken 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.damage_taken 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.damage_taken -execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.damage_taken execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fzsd.module.scoreboard.display.damage_taken 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.damage_taken execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fzsd.module.scoreboard.display.damage_taken diff --git a/data/fzsd/functions/module/scoreboard/display/carousel/set_display/death_count.mcfunction b/data/fzsd/functions/module/scoreboard/display/carousel/set_display/death_count.mcfunction index 4b77bf4..69e76a8 100644 --- a/data/fzsd/functions/module/scoreboard/display/carousel/set_display/death_count.mcfunction +++ b/data/fzsd/functions/module/scoreboard/display/carousel/set_display/death_count.mcfunction @@ -1,13 +1,17 @@ # 调用者：fzsd:module/scoreboard/carousel/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 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.death_count +### 默认值金色放到第一位 +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 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": "fzsd.scoreboard.text.death_count", "interpret": true, "storage": "fzsd:module"}, {"text": "计分板"}] +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run return 6 + execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.death_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.death_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.death_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.death_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.death_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.death_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.death_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.death_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.death_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.death_count diff --git a/data/fzsd/functions/module/scoreboard/display/carousel/set_display/dig_count.mcfunction b/data/fzsd/functions/module/scoreboard/display/carousel/set_display/dig_count.mcfunction index d9641d4..e77a8fd 100644 --- a/data/fzsd/functions/module/scoreboard/display/carousel/set_display/dig_count.mcfunction +++ b/data/fzsd/functions/module/scoreboard/display/carousel/set_display/dig_count.mcfunction @@ -1,13 +1,17 @@ # 调用者：fzsd:module/scoreboard/carousel/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 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.dig_count +### 默认值金色放到第一位 +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 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": "fzsd.scoreboard.text.dig_count", "interpret": true, "storage": "fzsd:module"}, {"text": "计分板"}] +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run return 6 + execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.dig_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.dig_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.dig_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.dig_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.dig_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.dig_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.dig_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.dig_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.dig_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.dig_count diff --git a/data/fzsd/functions/module/scoreboard/display/carousel/set_display/fishing_count.mcfunction b/data/fzsd/functions/module/scoreboard/display/carousel/set_display/fishing_count.mcfunction index 19bbe4c..40ca5d1 100644 --- a/data/fzsd/functions/module/scoreboard/display/carousel/set_display/fishing_count.mcfunction +++ b/data/fzsd/functions/module/scoreboard/display/carousel/set_display/fishing_count.mcfunction @@ -1,13 +1,17 @@ # 调用者：fzsd:module/scoreboard/carousel/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 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.fishing_count +### 默认值金色放到第一位 +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 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": "fzsd.scoreboard.text.fishing_count", "interpret": true, "storage": "fzsd:module"}, {"text": "计分板"}] +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run return 6 + execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.fishing_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.fishing_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.fishing_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.fishing_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.fishing_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.fishing_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.fishing_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.fishing_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.fishing_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.fishing_count diff --git a/data/fzsd/functions/module/scoreboard/display/carousel/set_display/general.mcfunction b/data/fzsd/functions/module/scoreboard/display/carousel/set_display/general.mcfunction index b637c7f..c7457d9 100644 --- a/data/fzsd/functions/module/scoreboard/display/carousel/set_display/general.mcfunction +++ b/data/fzsd/functions/module/scoreboard/display/carousel/set_display/general.mcfunction @@ -1,13 +1,17 @@ # 调用者：fzsd:module/scoreboard/carousel/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 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.general +### 默认值金色放到第一位 +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 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": "fzsd.scoreboard.text.general", "interpret": true, "storage": "fzsd:module"}, {"text": "计分板"}] +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run return 6 + execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.general 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.general 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.general 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.general 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.general 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.general -execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.general execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 7 run scoreboard objectives setdisplay sidebar.team.gray fzsd.module.scoreboard.display.general 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.general execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 9 run scoreboard objectives setdisplay sidebar.team.blue fzsd.module.scoreboard.display.general diff --git a/data/fzsd/functions/module/scoreboard/display/carousel/set_display/kill_count.mcfunction b/data/fzsd/functions/module/scoreboard/display/carousel/set_display/kill_count.mcfunction index fa0ef05..7c6a09d 100644 --- a/data/fzsd/functions/module/scoreboard/display/carousel/set_display/kill_count.mcfunction +++ b/data/fzsd/functions/module/scoreboard/display/carousel/set_display/kill_count.mcfunction @@ -1,13 +1,17 @@ # 调用者：fzsd:module/scoreboard/carousel/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 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.kill_count +### 默认值金色放到第一位 +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 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": "fzsd.scoreboard.text.kill_count", "interpret": true, "storage": "fzsd:module"}, {"text": "计分板"}] +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run return 6 + execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.kill_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.kill_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.kill_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.kill_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.kill_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.kill_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.kill_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.kill_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.kill_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.kill_count diff --git a/data/fzsd/functions/module/scoreboard/display/carousel/set_display/placement_count.mcfunction b/data/fzsd/functions/module/scoreboard/display/carousel/set_display/placement_count.mcfunction index 5a443ef..ab31354 100644 --- a/data/fzsd/functions/module/scoreboard/display/carousel/set_display/placement_count.mcfunction +++ b/data/fzsd/functions/module/scoreboard/display/carousel/set_display/placement_count.mcfunction @@ -1,13 +1,17 @@ # 调用者：fzsd:module/scoreboard/carousel/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 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.placement_count +### 默认值金色放到第一位 +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 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": "fzsd.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}, {"text": "计分板"}] +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run return 6 + execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.placement_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.placement_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.placement_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.placement_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.placement_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.placement_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.placement_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.placement_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.placement_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.placement_count diff --git a/data/fzsd/functions/module/scoreboard/display/carousel/set_display/trade_count.mcfunction b/data/fzsd/functions/module/scoreboard/display/carousel/set_display/trade_count.mcfunction index ed3b616..8718374 100644 --- a/data/fzsd/functions/module/scoreboard/display/carousel/set_display/trade_count.mcfunction +++ b/data/fzsd/functions/module/scoreboard/display/carousel/set_display/trade_count.mcfunction @@ -1,13 +1,17 @@ # 调用者：fzsd:module/scoreboard/carousel/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 6 run scoreboard objectives setdisplay sidebar.team.gold fzsd.module.scoreboard.display.trade_count +### 默认值金色放到第一位 +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 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": "fzsd.scoreboard.text.trade_count", "interpret": true, "storage": "fzsd:module"}, {"text": "计分板"}] +execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 6 run return 6 + execute if score fzsd.module.scoreboard.carousel.color fzsd.variable.integer matches 0 run scoreboard objectives setdisplay sidebar.team.black fzsd.module.scoreboard.display.trade_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.trade_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.trade_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.trade_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.trade_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.trade_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.trade_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.trade_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.trade_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.trade_count diff --git a/data/fzsd/predicates/axe_in_hand_effective.json b/data/fzsd/predicates/axe_in_hand_effective.json index 6693fd6..0620111 100644 --- a/data/fzsd/predicates/axe_in_hand_effective.json +++ b/data/fzsd/predicates/axe_in_hand_effective.json @@ -1,5 +1,5 @@ { - "condition": "minecraft:alternative", + "condition": "minecraft:any_of", "terms": [ { "__comment": "主手==斧子", @@ -15,11 +15,11 @@ }, { "__comment": "主手!=工具&&副手==斧子", - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:alternative", - "terms": [ - { + "condition": "minecraft:all_of", + "terms": [ + { + "condition": "minecraft:inverted", + "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": { @@ -29,23 +29,20 @@ } } } - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "equipment": { - "offhand": { - "tag": "fzsd:tool/axes" - } - } + } + }, + { + "condition": "minecraft:entity_properties", + "entity": "this", + "predicate": { + "equipment": { + "offhand": { + "tag": "fzsd:tool/axes" } } } - ] - } + } + ] } ] } \ No newline at end of file diff --git a/data/fzsd/predicates/not_real_player.json b/data/fzsd/predicates/not_real_player.json index a89beb5..c18b150 100644 --- a/data/fzsd/predicates/not_real_player.json +++ b/data/fzsd/predicates/not_real_player.json @@ -1,5 +1,5 @@ { - "condition": "minecraft:alternative", + "condition": "minecraft:any_of", "terms": [ { "condition": "minecraft:reference", diff --git a/data/fzsd/predicates/used_tool.json b/data/fzsd/predicates/used_tool.json index a192834..1a62526 100644 --- a/data/fzsd/predicates/used_tool.json +++ b/data/fzsd/predicates/used_tool.json @@ -1,5 +1,5 @@ { - "condition": "minecraft:alternative", + "condition": "minecraft:any_of", "terms": [ { "condition": "minecraft:entity_scores", diff --git a/data/fzsd/tags/blocks/liquid.json b/data/fzsd/tags/blocks/liquid.json new file mode 100644 index 0000000..43ed7cb --- /dev/null +++ b/data/fzsd/tags/blocks/liquid.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "minecraft:water", + "minecraft:lava" + ] +} \ No newline at end of file diff --git a/pack.mcmeta b/pack.mcmeta index 7647b26..ad94de9 100644 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "description": "FZ Survival Datapack 3.0 | Author: Harvey_Husky", - "pack_format": 10 + "description": "FZ Survival Datapack 3.1 | Author: Harvey_Husky", + "pack_format": 15 } } \ No newline at end of file