Rewriting most advancements to update location based criteria to use (type_specific) trigger

master
Ben Maurer 2022-08-02 16:16:07 +00:00
parent 1768c73dcb
commit 6e9d1289f3
20 changed files with 768 additions and 463 deletions

View File

@ -10,7 +10,7 @@
}, },
"parent": "canopy:mobs", "parent": "canopy:mobs",
"criteria": { "criteria": {
"have_sed": { "kill_1_phantom": {
"trigger": "minecraft:player_killed_entity", "trigger": "minecraft:player_killed_entity",
"conditions": { "conditions": {
"entity": { "entity": {

View File

@ -14,48 +14,136 @@
"outer_pos_x": { "outer_pos_x": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"dimension": "the_end", "player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"location": {
"dimension": "minecraft:overworld",
"position": { "position": {
"x": { "x": {
"min": 1000000.0 "min": 1000000.0
} }
} }
} }
}
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type_specific": {
"type": "player",
"gamemode": "spectator"
}
}
}
}
]
}
}, },
"outer_pos_z": { "outer_pos_z": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"dimension": "the_end", "player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"location": {
"dimension": "minecraft:overworld",
"position": { "position": {
"z": { "z": {
"min": 1000000.0 "min": 1000000.0
} }
} }
} }
}
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type_specific": {
"type": "player",
"gamemode": "spectator"
}
}
}
}
]
}
}, },
"outer_neg_x": { "outer_neg_x": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"dimension": "the_end", "player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"location": {
"dimension": "minecraft:overworld",
"position": { "position": {
"x": { "x": {
"max": -1000000.0 "min": -1000000.0
} }
} }
} }
}
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type_specific": {
"type": "player",
"gamemode": "spectator"
}
}
}
}
]
}
}, },
"outer_neg_z": { "outer_neg_z": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"dimension": "the_end", "player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"location": {
"dimension": "minecraft:overworld",
"position": { "position": {
"z": { "x": {
"max": -1000000.0 "min": -1000000.0
} }
} }
} }
} }
}, },
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type_specific": {
"type": "player",
"gamemode": "spectator"
}
}
}
}
]
}
}
},
"requirements": [ "requirements": [
[ [
"outer_pos_x", "outer_pos_x",

View File

@ -10,11 +10,12 @@
}, },
"parent": "canopy:root", "parent": "canopy:root",
"criteria": { "criteria": {
"alive_time": { "alive_1_day": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"player": { "player": {
"player": { "type_specific": {
"type": "player",
"stats": [ "stats": [
{ {
"type": "minecraft:custom", "type": "minecraft:custom",

View File

@ -10,11 +10,12 @@
}, },
"parent": "canopy:challenge_accepted", "parent": "canopy:challenge_accepted",
"criteria": { "criteria": {
"alive_time": { "alive_100_days": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"player": { "player": {
"player": { "type_specific": {
"type": "player",
"stats": [ "stats": [
{ {
"type": "minecraft:custom", "type": "minecraft:custom",

View File

@ -1,32 +0,0 @@
{
"display": {
"icon": {
"item": "minecraft:red_bed"
},
"title": "Diggy Diggy Hole",
"description": "Mine 1,000,000 stone.",
"frame": "challenge",
"announce_to_chat": true
},
"parent": "canopy:root",
"criteria": {
"mine_stone": {
"trigger": "minecraft:location",
"conditions": {
"player": {
"player": {
"stats": [
{
"type": "minecraft:mined",
"stat": "minecraft:stone",
"value": {
"min": 1000000
}
}
]
}
}
}
}
}
}

View File

@ -11,11 +11,33 @@
}, },
"parent": "canopy:root", "parent": "canopy:root",
"criteria": { "criteria": {
"in_end": { "reach_the_end": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"location": {
"dimension": "minecraft:the_end" "dimension": "minecraft:the_end"
} }
} }
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type_specific": {
"type": "player",
"gamemode": "spectator"
}
}
}
}
]
}
}
} }
} }

View File

@ -10,16 +10,38 @@
}, },
"parent": "canopy:end", "parent": "canopy:end",
"criteria": { "criteria": {
"height": { "below_-65y": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"location": {
"dimension": "minecraft:the_end", "dimension": "minecraft:the_end",
"position": { "position": {
"y": { "y": {
"max": -65 "max": -65.0
} }
} }
} }
} }
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type_specific": {
"type": "player",
"gamemode": "spectator"
}
}
}
}
]
}
}
} }
} }

View File

@ -14,48 +14,136 @@
"outer_pos_x": { "outer_pos_x": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"dimension": "the_end", "player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"location": {
"dimension": "minecraft:the_end",
"position": { "position": {
"x": { "x": {
"min": 100000.0 "min": 100000.0
} }
} }
} }
}
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type_specific": {
"type": "player",
"gamemode": "spectator"
}
}
}
}
]
}
}, },
"outer_pos_z": { "outer_pos_z": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"dimension": "the_end", "player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"location": {
"dimension": "minecraft:the_end",
"position": { "position": {
"z": { "z": {
"min": 100000.0 "min": 100000.0
} }
} }
} }
}
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type_specific": {
"type": "player",
"gamemode": "spectator"
}
}
}
}
]
}
}, },
"outer_neg_x": { "outer_neg_x": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"dimension": "the_end", "player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"location": {
"dimension": "minecraft:the_end",
"position": { "position": {
"x": { "x": {
"max": -100000.0 "min": -100000.0
} }
} }
} }
}
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type_specific": {
"type": "player",
"gamemode": "spectator"
}
}
}
}
]
}
}, },
"outer_neg_z": { "outer_neg_z": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"dimension": "the_end", "player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"location": {
"dimension": "minecraft:the_end",
"position": { "position": {
"z": { "x": {
"max": -100000.0 "min": -100000.0
} }
} }
} }
} }
}, },
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type_specific": {
"type": "player",
"gamemode": "spectator"
}
}
}
}
]
}
}
},
"requirements": [ "requirements": [
[ [
"outer_pos_x", "outer_pos_x",

View File

@ -11,16 +11,38 @@
}, },
"parent": "canopy:enter_the_void", "parent": "canopy:enter_the_void",
"criteria": { "criteria": {
"height": { "below_-65y": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"location": {
"dimension": "minecraft:the_nether", "dimension": "minecraft:the_nether",
"position": { "position": {
"y": { "y": {
"max": -65 "max": -65.0
} }
} }
} }
} }
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type_specific": {
"type": "player",
"gamemode": "spectator"
}
}
}
}
]
}
}
} }
} }

View File

@ -10,7 +10,7 @@
}, },
"parent": "canopy:neature", "parent": "canopy:neature",
"criteria": { "criteria": {
"interact": { "name_axolotl": {
"trigger": "minecraft:player_interacted_with_entity", "trigger": "minecraft:player_interacted_with_entity",
"conditions": { "conditions": {
"item": { "item": {

View File

@ -11,7 +11,7 @@
}, },
"parent": "canopy:root", "parent": "canopy:root",
"criteria": { "criteria": {
"mob_kill": { "kill_any_mob": {
"trigger": "minecraft:player_killed_entity" "trigger": "minecraft:player_killed_entity"
} }
} }

View File

@ -10,11 +10,12 @@
}, },
"parent": "canopy:a_good_start", "parent": "canopy:a_good_start",
"criteria": { "criteria": {
"100_phantoms": { "kill_100_phantoms": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"player": { "player": {
"player": { "type_specific": {
"type": "player",
"stats": [ "stats": [
{ {
"type": "minecraft:killed", "type": "minecraft:killed",

View File

@ -11,16 +11,38 @@
}, },
"parent": "canopy:touch_the_sky", "parent": "canopy:touch_the_sky",
"criteria": { "criteria": {
"height": { "reach_100k": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"location": {
"dimension": "minecraft:overworld", "dimension": "minecraft:overworld",
"position": { "position": {
"y": { "y": {
"min": 100000 "min": 100000.0
} }
} }
} }
} }
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type_specific": {
"type": "player",
"gamemode": "spectator"
}
}
}
}
]
}
}
} }
} }

View File

@ -14,7 +14,8 @@
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"player": { "player": {
"player": { "type_specific": {
"type": "player",
"stats": [ "stats": [
{ {
"type": "minecraft:custom", "type": "minecraft:custom",

View File

@ -10,11 +10,12 @@
}, },
"parent": "canopy:root", "parent": "canopy:root",
"criteria": { "criteria": {
"eat": { "eat_100_rotten_flesh": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"player": { "player": {
"player": { "type_specific": {
"type": "player",
"stats": [ "stats": [
{ {
"type": "minecraft:used", "type": "minecraft:used",

View File

@ -11,11 +11,12 @@
}, },
"parent": "canopy:challenge_complete", "parent": "canopy:challenge_complete",
"criteria": { "criteria": {
"alive_time": { "alive_1000_days": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"player": { "player": {
"player": { "type_specific": {
"type": "player",
"stats": [ "stats": [
{ {
"type": "minecraft:custom", "type": "minecraft:custom",

View File

@ -10,16 +10,38 @@
}, },
"parent": "canopy:root", "parent": "canopy:root",
"criteria": { "criteria": {
"height": { "reach_2k": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"location": {
"dimension": "minecraft:overworld", "dimension": "minecraft:overworld",
"position": { "position": {
"y": { "y": {
"min": 2000 "min": 2000.0
} }
} }
} }
} }
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type_specific": {
"type": "player",
"gamemode": "spectator"
}
}
}
}
]
}
}
} }
} }

View File

@ -10,11 +10,12 @@
}, },
"parent": "canopy:now_were_talking", "parent": "canopy:now_were_talking",
"criteria": { "criteria": {
"100_phantoms": { "kill_1000_phantoms": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"player": { "player": {
"player": { "type_specific": {
"type": "player",
"stats": [ "stats": [
{ {
"type": "minecraft:killed", "type": "minecraft:killed",

View File

@ -10,16 +10,38 @@
}, },
"parent": "canopy:end", "parent": "canopy:end",
"criteria": { "criteria": {
"height": { "below_-200y": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"location": {
"dimension": "minecraft:the_end", "dimension": "minecraft:the_end",
"position": { "position": {
"y": { "y": {
"max": -200 "max": -200.0
} }
} }
} }
} }
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type_specific": {
"type": "player",
"gamemode": "spectator"
}
}
}
}
]
}
}
} }
} }

View File

@ -11,16 +11,38 @@
}, },
"parent": "canopy:enter_the_void", "parent": "canopy:enter_the_void",
"criteria": { "criteria": {
"height": { "below_-65y": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"location": {
"dimension": "minecraft:overworld", "dimension": "minecraft:overworld",
"position": { "position": {
"y": { "y": {
"max": -65 "max": -65.0
} }
} }
} }
} }
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type_specific": {
"type": "player",
"gamemode": "spectator"
}
}
}
}
]
}
}
} }
} }