Fortern/fz-survival-datapack
1
0
Fork 0
Code Actions Releases Activity

1.20.6

Browse Source
This commit is contained in:
Harvey_Husky
2024-05-12 22:03:28 +08:00
parent 218b24b4a4
commit d6124efa12
20 changed files with 310 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/fzsd.extra.bbl/functions/display/set_text/light_purple.mcfunction
+3 -3
View File
@@ -1,7 +1,7 @@
# 见#fzsd.extra.bbl:display/set_text
data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "purple"}'
data modify storage fzsd:module fzsd.scoreboard.text.bedrock_broken_count set value '{"text": "破基岩榜", "color": "light_purple"}'
scoreboard objectives setdisplay sidebar.team.light_purple fzsd.module.scoreboard.display.bedrock_broken_count
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "purple"}
scoreboard objectives modify fzsd.module.scoreboard.display.bedrock_broken_count displayname {"text": "破基岩榜", "color": "light_purple"}
team modify fzsd.module.scoreboard.display.bedrock_broken_count color light_purple
team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "purple"}
team modify fzsd.module.scoreboard.display.bedrock_broken_count displayName {"text": "破基岩榜", "color": "light_purple"}
data/fzsd/advancements/game_event/on_tool_axes_used_on_block.json
-34
View File
@@ -1,34 +0,0 @@
{
"parent": "fzsd:game_event",
"criteria": {
"on_tools_exclude_axes_used_on_block": {
"trigger": "minecraft:item_used_on_block",
"conditions": {
"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"
}
}
}
]
}
}
},
"rewards": {
"function": "fzsd:game_event/advancement/on_tools_used_on_block"
}
}
data/fzsd/advancements/game_event/on_tools_exclude_axes_used_on_block.json
-26
View File
@@ -1,26 +0,0 @@
{
"parent": "fzsd:game_event",
"criteria": {
"on_tools_exclude_axes_used_on_block": {
"__comment": "斧子剥树皮会触发两次！",
"trigger": "minecraft:item_used_on_block",
"conditions": {
"location": [
{
"condition": "minecraft:reference",
"name": "fzsd:is_real_player"
},
{
"condition": "minecraft:match_tool",
"predicate": {
"tag": "fzsd:tools_exclude_axes"
}
}
]
}
}
},
"rewards": {
"function": "fzsd:game_event/advancement/on_tools_used_on_block"
}
}
data/fzsd/advancements/game_event/on_tools_used_on_block.json
+50
View File
@@ -0,0 +1,50 @@
{
"parent": "fzsd:game_event",
"criteria": {
"on_tools_exclude_axes_used_on_block": {
"trigger": "minecraft:item_used_on_block",
"conditions": {
"location": [
{
"condition": "minecraft:reference",
"name": "fzsd:is_real_player"
},
{
"condition": "minecraft:any_of",
"terms": [
{
"condition": "minecraft:match_tool",
"predicate": {
"tag": "fzsd:tools_exclude_axes"
}
},
{
"condition": "minecraft:all_of",
"terms": [
{
"condition": "minecraft:match_tool",
"predicate": {
"tag": "fzsd:tool/axes"
}
},
{
"condition": "minecraft:location_check",
"predicate": {
"__comment": "斧子剥树皮会触发两次，所以用目标方块限定只触发一次",
"block": {
"tag": "fzsd:stripped_blocks"
}
}
}
]
}
]
}
]
}
}
},
"rewards": {
"function": "fzsd:game_event/advancement/on_tools_used_on_block"
}
}
data/fzsd/functions/boot.mcfunction
+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.7'}}
execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.1.8-beta.1'}}
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
data/fzsd/functions/game_event/advancement/on_placed_block.mcfunction
+3
View File
@@ -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_block
## 重置事件进度
data/fzsd/functions/game_event/advancement/on_tools_used_on_block.mcfunction
+1 -2
View File
@@ -10,5 +10,4 @@ scoreboard players remove @s fzsd.event.used_tool.dig_offset 1
function #fzsd:game_event/player/on_tools_used_on_block
## 重置事件进度
advancement revoke @s from fzsd:game_event/on_tool_axes_used_on_block
advancement revoke @s from fzsd:game_event/on_tools_exclude_axes_used_on_block
advancement revoke @s from fzsd:game_event/on_tools_used_on_block
data/fzsd/functions/module/scoreboard/display/register_id.mcfunction
+1 -1
View File
@@ -56,4 +56,4 @@ execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellr
function #fzsd:calculation/highest_id_add_1
scoreboard players operation fzsd.module.scoreboard.display.id.placement_count fzsd.variable.integer = fzsd.module.scoreboard.display.highest_id fzsd.variable.integer
##### 日志
execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "注册"}, {"nbt": "fzsd.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}, {"text": "id为："}, {"score": {"name": "fzsd.module.scoreboard.display.id.placement_count", "objective": "fzsd.variable.integer"}}]
execute if score fzsd.logger.level fzsd.variable.integer matches ..400 run tellraw @a [{"nbt": "fzsd.level.debug", "interpret": true, "storage": "fzsd:logger"}, {"text": "注册"}, {"nbt": "fzsd.scoreboard.text.placement_count", "interpret": true, "storage": "fzsd:module"}, {"text": "id为："}, {"score": {"name": "fzsd.module.scoreboard.display.id.placement_count", "objective": "fzsd.variable.integer"}}]
data/fzsd/predicates/axe_in_hand_effective.json
-48
View File
@@ -1,48 +0,0 @@
{
"condition": "minecraft:any_of",
"terms": [
{
"__comment": "主手==斧子",
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"tag": "fzsd:tool/axes"
}
}
}
},
{
"__comment": "主手!=工具&&副手==斧子",
"condition": "minecraft:all_of",
"terms": [
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"tag": "fzsd:tools"
}
}
}
}
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"offhand": {
"tag": "fzsd:tool/axes"
}
}
}
}
]
}
]
}
data/fzsd/tags/functions/module/scoreboard/display/set_text/placement_count.json
+1 -1
View File
@@ -1,6 +1,6 @@
{
"replace": false,
"values": [
"fzsd:module/scoreboard/display/set_text/placement_count/dark_green"
"fzsd:module/scoreboard/display/set_text/placement_count/dark_blue"
]
}
data/fzsd/tags/functions/module/scoreboard/display/set_text/trade_count.json
+1 -1
View File
@@ -8,6 +8,6 @@
"replace": false,
"__comment_values": "此处只能填写一个函数！",
"values": [
"fzsd:module/scoreboard/display/set_text/trade_count/green"
"fzsd:module/scoreboard/display/set_text/trade_count/dark_green"
]
}