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

添加交互器打开方式选项、添加将假人分数忽略的地毯脚本

Browse Source
This commit is contained in:
延皓
2022-07-25 13:34:40 +08:00
parent 4ef9270a21
commit 696adfa9d7
87 changed files with 439 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/fz/advancements/game_event/on_aviate_one_meter.json
+1 -1
View File
@@ -19,6 +19,6 @@
}
},
"rewards": {
"function": "fz:game_event/player/on_aviate_one_meter"
"function": "fz:game_event/advancement/on_aviate_one_meter"
}
}
data/fz/advancements/game_event/on_dead.json
+1 -1
View File
@@ -19,6 +19,6 @@
}
},
"rewards": {
"function": "fz:game_event/player/on_dead"
"function": "fz:game_event/advancement/on_dead"
}
}
data/fz/advancements/game_event/on_entered_nether_portal.json
+19 -8
View File
@@ -1,21 +1,32 @@
{
"parent": "fz:game_event",
"criteria": {
"on_entered_nether_portal": {
"trigger": "minecraft:changed_dimension",
"conditions": {
"player": {
"location": {
"block": {
"blocks": [
"minecraft:nether_portal"
]
"player": [
{
"condition": "minecraft:reference",
"name": "fz:is_real_player"
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"location": {
"block": {
"blocks": [
"minecraft:nether_portal"
]
}
}
}
}
}
]
}
}
},
"rewards": {
"function": "fz:game_event/player/on_entered_nether_portal"
"function": "fz:game_event/advancement/on_entered_nether_portal"
}
}
data/fz/advancements/game_event/on_fished.json
+7 -1
View File
@@ -4,6 +4,12 @@
"on_fished": {
"trigger": "minecraft:fishing_rod_hooked",
"conditions": {
"player": [
{
"condition": "minecraft:reference",
"name": "fz:is_real_player"
}
],
"item": {
"tag": "fz:raw_fishes"
}
@@ -11,6 +17,6 @@
}
},
"rewards": {
"function": "fz:game_event/player/on_fished"
"function": "fz:game_event/advancement/on_fished"
}
}
data/fz/advancements/game_event/on_hurt_entity_with_tools.json
+16 -6
View File
@@ -4,17 +4,27 @@
"on_hurt_entity_with_tools": {
"trigger": "minecraft:player_hurt_entity",
"conditions": {
"player": {
"equipment": {
"mainhand": {
"tag": "fz:tools"
"player": [
{
"condition": "minecraft:reference",
"name": "fz:is_real_player"
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"equipment": {
"mainhand": {
"tag": "fz:tools"
}
}
}
}
}
]
}
}
},
"rewards": {
"function": "fz:game_event/player/on_hurt_entity_with_tools"
"function": "fz:game_event/advancement/on_hurt_entity_with_tools"
}
}
data/fz/advancements/game_event/on_killed_mob_or_player.json
+7 -1
View File
@@ -4,6 +4,12 @@
"on_killed_mob_or_player": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"player": [
{
"condition": "minecraft:reference",
"name": "fz:is_real_player"
}
],
"entity": [
{
"condition": "minecraft:inverted",
@@ -23,6 +29,6 @@
}
},
"rewards": {
"function": "fz:game_event/player/on_killed_mob_or_player"
"function": "fz:game_event/advancement/on_killed_mob_or_player"
}
}
data/fz/advancements/game_event/on_login.json
+1 -1
View File
@@ -22,6 +22,6 @@
}
},
"rewards": {
"function": "fz:game_event/player/on_login"
"function": "fz:game_event/advancement/on_login"
}
}
data/fz/advancements/game_event/on_piglin_trade.json
+7 -1
View File
@@ -4,6 +4,12 @@
"on_piglin_trade": {
"trigger": "minecraft:thrown_item_picked_up_by_entity",
"conditions": {
"player": [
{
"condition": "minecraft:reference",
"name": "fz:is_real_player"
}
],
"entity": {
"type": "minecraft:piglin",
"flags": {
@@ -14,6 +20,6 @@
}
},
"rewards": {
"function": "fz:game_event/player/on_piglin_trade"
"function": "fz:game_event/advancement/on_piglin_trade"
}
}
data/fz/advancements/game_event/on_placed_block.json
+10 -2
View File
@@ -2,10 +2,18 @@
"parent": "fz:game_event",
"criteria": {
"on_placed_block": {
"trigger": "minecraft:placed_block"
"trigger": "minecraft:placed_block",
"conditions": {
"player": [
{
"condition": "minecraft:reference",
"name": "fz:is_real_player"
}
]
}
}
},
"rewards": {
"function": "fz:game_event/player/on_placed_block"
"function": "fz:game_event/advancement/on_placed_block"
}
}
data/fz/advancements/game_event/on_play_one_hour.json
+1 -1
View File
@@ -19,6 +19,6 @@
}
},
"rewards": {
"function": "fz:game_event/player/on_play_one_hour"
"function": "fz:game_event/advancement/on_play_one_hour"
}
}
data/fz/advancements/game_event/on_shears_used_on_entity.json
+7 -1
View File
@@ -4,6 +4,12 @@
"on_shears_used_on_entity": {
"trigger": "minecraft:player_interacted_with_entity",
"conditions": {
"player": [
{
"condition": "minecraft:reference",
"name": "fz:is_real_player"
}
],
"entity": {
"type": "#fz:shearable"
},
@@ -14,6 +20,6 @@
}
},
"rewards": {
"function": "fz:game_event/player/on_shears_used_on_entity"
"function": "fz:game_event/advancement/on_shears_used_on_entity"
}
}
data/fz/advancements/game_event/on_sneak.json
+15 -5
View File
@@ -4,15 +4,25 @@
"on_sneak": {
"trigger": "minecraft:tick",
"conditions": {
"player": {
"flags": {
"is_sneaking": true
"player": [
{
"condition": "minecraft:reference",
"name": "fz:is_real_player"
},
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"flags": {
"is_sneaking": true
}
}
}
}
]
}
}
},
"rewards": {
"function": "fz:game_event/player/on_sneak"
"function": "fz:game_event/advancement/on_sneak"
}
}
data/fz/advancements/game_event/on_took_damage.json
+1 -1
View File
@@ -19,6 +19,6 @@
}
},
"rewards": {
"function": "fz:game_event/player/on_took_damage"
"function": "fz:game_event/advancement/on_took_damage"
}
}
data/fz/advancements/game_event/on_tools_used_on_block.json
+7 -1
View File
@@ -5,6 +5,12 @@
"__comment": "斧子剥树皮会触发两次！",
"trigger": "minecraft:item_used_on_block",
"conditions": {
"player": [
{
"condition": "minecraft:reference",
"name": "fz:is_real_player"
}
],
"item": {
"tag": "fz:tools"
}
@@ -12,6 +18,6 @@
}
},
"rewards": {
"function": "fz:game_event/player/on_tools_used_on_block"
"function": "fz:game_event/advancement/on_tools_used_on_block"
}
}
data/fz/advancements/game_event/on_unsneak.json
+19 -9
View File
@@ -4,21 +4,31 @@
"on_unsneak": {
"trigger": "minecraft:tick",
"conditions": {
"player": {
"flags": {
"is_sneaking": false
"player": [
{
"condition": "minecraft:reference",
"name": "fz:is_real_player"
},
"type_specific": {
"type": "player",
"advancements": {
"fz:game_event/on_sneak": true
{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"flags": {
"is_sneaking": false
},
"type_specific": {
"type": "player",
"advancements": {
"fz:game_event/on_sneak": true
}
}
}
}
}
]
}
}
},
"rewards": {
"function": "fz:game_event/player/on_unsneak"
"function": "fz:game_event/advancement/on_unsneak"
}
}
data/fz/advancements/game_event/on_used_tool.json
+1 -1
View File
@@ -15,6 +15,6 @@
}
},
"rewards": {
"function": "fz:game_event/player/on_used_tool"
"function": "fz:game_event/advancement/on_used_tool"
}
}
data/fz/advancements/game_event/on_villager_trade.json
+10 -2
View File
@@ -2,10 +2,18 @@
"parent": "fz:game_event",
"criteria": {
"on_villager_trade": {
"trigger": "minecraft:villager_trade"
"trigger": "minecraft:villager_trade",
"conditions": {
"player": [
{
"condition": "minecraft:reference",
"name": "fz:is_real_player"
}
]
}
}
},
"rewards": {
"function": "fz:game_event/player/on_villager_trade"
"function": "fz:game_event/advancement/on_villager_trade"
}
}