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

@ -1,22 +1,22 @@
{ {
"display": { "display": {
"icon": { "icon": {
"item": "minecraft:phantom_membrane" "item": "minecraft:phantom_membrane"
}, },
"title": "A Good Start", "title": "A Good Start",
"description": "Kill a phantom, hopefully more to come.", "description": "Kill a phantom, hopefully more to come.",
"frame": "task", "frame": "task",
"announce_to_chat": true "announce_to_chat": true
}, },
"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": {
"type": "minecraft:phantom" "type": "minecraft:phantom"
} }
} }
} }
} }
} }

View File

@ -14,45 +14,133 @@
"outer_pos_x": { "outer_pos_x": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"dimension": "the_end", "player": [{
"position": { "condition": "minecraft:entity_properties",
"x": { "entity": "this",
"min": 1000000.0 "predicate": {
"location": {
"dimension": "minecraft:overworld",
"position": {
"x": {
"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": [{
"position": { "condition": "minecraft:entity_properties",
"z": { "entity": "this",
"min": 1000000.0 "predicate": {
"location": {
"dimension": "minecraft:overworld",
"position": {
"z": {
"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": [{
"position": { "condition": "minecraft:entity_properties",
"x": { "entity": "this",
"max": -1000000.0 "predicate": {
"location": {
"dimension": "minecraft:overworld",
"position": {
"x": {
"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": [{
"position": { "condition": "minecraft:entity_properties",
"z": { "entity": "this",
"max": -1000000.0 "predicate": {
"location": {
"dimension": "minecraft:overworld",
"position": {
"x": {
"min": -1000000.0
}
}
}
}
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type_specific": {
"type": "player",
"gamemode": "spectator"
}
}
}
} }
} ]
} }
} }
}, },

View File

@ -10,23 +10,24 @@
}, },
"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": {
"stats": [ "type": "player",
{ "stats": [
"type": "minecraft:custom", {
"stat": "minecraft:time_since_death", "type": "minecraft:custom",
"value": { "stat": "minecraft:time_since_death",
"min": 24000 "value": {
} "min": 24000
} }
] }
} ]
} }
} }
} }
} }
} }
}

View File

@ -10,23 +10,24 @@
}, },
"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": {
"stats": [ "type": "player",
{ "stats": [
"type": "minecraft:custom", {
"stat": "minecraft:time_since_death", "type": "minecraft:custom",
"value": { "stat": "minecraft:time_since_death",
"min": 2400000 "value": {
} "min": 2400000
} }
] }
} ]
} }
} }
} }
} }
} }
}

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

@ -1,21 +1,43 @@
{ {
"display": { "display": {
"icon": { "icon": {
"item": "minecraft:end_portal_frame" "item": "minecraft:end_portal_frame"
}, },
"title": "The End.", "title": "The End.",
"description": "That was easy.", "description": "That was easy.",
"frame": "task", "frame": "task",
"show_toast": false, "show_toast": false,
"announce_to_chat": false "announce_to_chat": false
}, },
"parent": "canopy:root", "parent": "canopy:root",
"criteria": { "criteria": {
"in_end": { "reach_the_end": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"dimension": "minecraft:the_end" "player": [{
} "condition": "minecraft:entity_properties",
} "entity": "this",
} "predicate": {
} "location": {
"dimension": "minecraft:the_end"
}
}
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type_specific": {
"type": "player",
"gamemode": "spectator"
}
}
}
}
]
}
}
}
}

View File

@ -1,25 +1,47 @@
{ {
"display": { "display": {
"icon": { "icon": {
"item": "minecraft:black_concrete" "item": "minecraft:black_concrete"
}, },
"title": "Enter The Void", "title": "Enter The Void",
"description": "At least this only exists in the end... right?", "description": "At least this only exists in the end... right?",
"frame": "task", "frame": "task",
"announce_to_chat": true "announce_to_chat": true
}, },
"parent": "canopy:end", "parent": "canopy:end",
"criteria": { "criteria": {
"height": { "below_-65y": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"dimension": "minecraft:the_end", "player": [{
"position": { "condition": "minecraft:entity_properties",
"y": { "entity": "this",
"max": -65 "predicate": {
} "location": {
} "dimension": "minecraft:the_end",
} "position": {
} "y": {
} "max": -65.0
} }
}
}
}
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type_specific": {
"type": "player",
"gamemode": "spectator"
}
}
}
}
]
}
}
}
}

View File

@ -14,45 +14,133 @@
"outer_pos_x": { "outer_pos_x": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"dimension": "the_end", "player": [{
"position": { "condition": "minecraft:entity_properties",
"x": { "entity": "this",
"min": 100000.0 "predicate": {
"location": {
"dimension": "minecraft:the_end",
"position": {
"x": {
"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": [{
"position": { "condition": "minecraft:entity_properties",
"z": { "entity": "this",
"min": 100000.0 "predicate": {
"location": {
"dimension": "minecraft:the_end",
"position": {
"z": {
"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": [{
"position": { "condition": "minecraft:entity_properties",
"x": { "entity": "this",
"max": -100000.0 "predicate": {
"location": {
"dimension": "minecraft:the_end",
"position": {
"x": {
"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": [{
"position": { "condition": "minecraft:entity_properties",
"z": { "entity": "this",
"max": -100000.0 "predicate": {
"location": {
"dimension": "minecraft:the_end",
"position": {
"x": {
"min": -100000.0
}
}
}
}
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type_specific": {
"type": "player",
"gamemode": "spectator"
}
}
}
} }
} ]
} }
} }
}, },

View File

@ -1,26 +1,48 @@
{ {
"display": { "display": {
"icon": { "icon": {
"item": "minecraft:black_concrete" "item": "minecraft:black_concrete"
}, },
"title": "Is It Extra Hot Down There?", "title": "Is It Extra Hot Down There?",
"description": "The floor is lava... but what's below the floor?", "description": "The floor is lava... but what's below the floor?",
"frame": "challenge", "frame": "challenge",
"hidden": false, "hidden": false,
"announce_to_chat": true "announce_to_chat": true
}, },
"parent": "canopy:enter_the_void", "parent": "canopy:enter_the_void",
"criteria": { "criteria": {
"height": { "below_-65y": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"dimension": "minecraft:the_nether", "player": [{
"position": { "condition": "minecraft:entity_properties",
"y": { "entity": "this",
"max": -65 "predicate": {
} "location": {
} "dimension": "minecraft:the_nether",
} "position": {
} "y": {
} "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

@ -1,18 +1,18 @@
{ {
"display": { "display": {
"icon": { "icon": {
"item": "minecraft:zombie_head" "item": "minecraft:zombie_head"
}, },
"title": "Mobs", "title": "Mobs",
"description": "Gotta kill 'em all!", "description": "Gotta kill 'em all!",
"frame": "task", "frame": "task",
"show_toast": false, "show_toast": false,
"announce_to_chat": false "announce_to_chat": false
}, },
"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

@ -1,32 +1,33 @@
{ {
"display": { "display": {
"icon": { "icon": {
"item": "minecraft:diamond_sword" "item": "minecraft:diamond_sword"
}, },
"title": "Now We're Talking", "title": "Now We're Talking",
"description": "Kill 100 phantoms... still not enough.", "description": "Kill 100 phantoms... still not enough.",
"frame": "task", "frame": "task",
"announce_to_chat": true "announce_to_chat": true
}, },
"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": {
"stats": [ "type": "player",
{ "stats": [
"type": "minecraft:killed", {
"stat": "minecraft:phantom", "type": "minecraft:killed",
"value": { "stat": "minecraft:phantom",
"min": 100 "value": {
} "min": 100
} }
] }
} ]
} }
} }
} }
} }
} }
}

View File

@ -1,26 +1,48 @@
{ {
"display": { "display": {
"icon": { "icon": {
"item": "minecraft:elytra", "item": "minecraft:elytra",
"nbt": "{Damage:431}" "nbt": "{Damage:431}"
}, },
"title": "Okay, Too Far.", "title": "Okay, Too Far.",
"description": "100,000? How did you even get up here?", "description": "100,000? How did you even get up here?",
"frame": "challenge", "frame": "challenge",
"announce_to_chat": true "announce_to_chat": true
}, },
"parent": "canopy:touch_the_sky", "parent": "canopy:touch_the_sky",
"criteria": { "criteria": {
"height": { "reach_100k": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"dimension": "minecraft:overworld", "player": [{
"position": { "condition": "minecraft:entity_properties",
"y": { "entity": "this",
"min": 100000 "predicate": {
} "location": {
} "dimension": "minecraft:overworld",
} "position": {
} "y": {
} "min": 100000.0
} }
}
}
}
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type_specific": {
"type": "player",
"gamemode": "spectator"
}
}
}
}
]
}
}
}
}

View File

@ -1,32 +1,33 @@
{ {
"display": { "display": {
"icon": { "icon": {
"item": "minecraft:netherite_sword" "item": "minecraft:netherite_sword"
}, },
"title": "Sword Go Brrr", "title": "Sword Go Brrr",
"description": "Kill 25,000 mobs", "description": "Kill 25,000 mobs",
"frame": "challenge", "frame": "challenge",
"announce_to_chat": true "announce_to_chat": true
}, },
"parent": "canopy:so_anyway_i_started_blasting", "parent": "canopy:so_anyway_i_started_blasting",
"criteria": { "criteria": {
"height": { "height": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"player": { "player": {
"player": { "type_specific": {
"stats": [ "type": "player",
{ "stats": [
"type": "minecraft:custom", {
"stat": "minecraft:mob_kills", "type": "minecraft:custom",
"value": { "stat": "minecraft:mob_kills",
"min": 25000 "value": {
} "min": 25000
} }
] }
} ]
} }
} }
} }
} }
} }
}

View File

@ -10,23 +10,24 @@
}, },
"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": {
"stats": [ "type": "player",
{ "stats": [
"type": "minecraft:used", {
"stat": "minecraft:rotten_flesh", "type": "minecraft:used",
"value": { "stat": "minecraft:rotten_flesh",
"min": 100 "value": {
} "min": 100
} }
] }
} ]
} }
} }
} }
} }
} }
}

View File

@ -11,23 +11,24 @@
}, },
"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": {
"stats": [ "type": "player",
{ "stats": [
"type": "minecraft:custom", {
"stat": "minecraft:time_since_death", "type": "minecraft:custom",
"value": { "stat": "minecraft:time_since_death",
"min": 24000000 "value": {
} "min": 24000000
} }
] }
} ]
} }
} }
} }
} }
} }
}

View File

@ -1,25 +1,47 @@
{ {
"display": { "display": {
"icon": { "icon": {
"item": "minecraft:firework_rocket" "item": "minecraft:firework_rocket"
}, },
"title": "Touch The Sky", "title": "Touch The Sky",
"description": "The nest looks so small from up here!", "description": "The nest looks so small from up here!",
"frame": "task", "frame": "task",
"announce_to_chat": true "announce_to_chat": true
}, },
"parent": "canopy:root", "parent": "canopy:root",
"criteria": { "criteria": {
"height": { "reach_2k": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"dimension": "minecraft:overworld", "player": [{
"position": { "condition": "minecraft:entity_properties",
"y": { "entity": "this",
"min": 2000 "predicate": {
} "location": {
} "dimension": "minecraft:overworld",
} "position": {
} "y": {
} "min": 2000.0
} }
}
}
}
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type_specific": {
"type": "player",
"gamemode": "spectator"
}
}
}
}
]
}
}
}
}

View File

@ -1,32 +1,33 @@
{ {
"display": { "display": {
"icon": { "icon": {
"item": "minecraft:red_bed" "item": "minecraft:red_bed"
}, },
"title": "Who Needs Sleep Anyways?", "title": "Who Needs Sleep Anyways?",
"description": "Kill 1000 phantoms... I don't think itll ever be enough honestly.", "description": "Kill 1000 phantoms... I don't think itll ever be enough honestly.",
"frame": "challenge", "frame": "challenge",
"announce_to_chat": true "announce_to_chat": true
}, },
"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": {
"stats": [ "type": "player",
{ "stats": [
"type": "minecraft:killed", {
"stat": "minecraft:phantom", "type": "minecraft:killed",
"value": { "stat": "minecraft:phantom",
"min": 1000 "value": {
} "min": 1000
} }
] }
} ]
} }
} }
} }
} }
} }
}

View File

@ -1,25 +1,47 @@
{ {
"display": { "display": {
"icon": { "icon": {
"item": "minecraft:ender_pearl" "item": "minecraft:ender_pearl"
}, },
"title": "YEET!", "title": "YEET!",
"description": "Die to the void. End gateways are overrated.", "description": "Die to the void. End gateways are overrated.",
"frame": "task", "frame": "task",
"announce_to_chat": true "announce_to_chat": true
}, },
"parent": "canopy:end", "parent": "canopy:end",
"criteria": { "criteria": {
"height": { "below_-200y": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"dimension": "minecraft:the_end", "player": [{
"position": { "condition": "minecraft:entity_properties",
"y": { "entity": "this",
"max": -200 "predicate": {
} "location": {
} "dimension": "minecraft:the_end",
} "position": {
} "y": {
} "max": -200.0
} }
}
}
}
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type_specific": {
"type": "player",
"gamemode": "spectator"
}
}
}
}
]
}
}
}
}

View File

@ -1,26 +1,48 @@
{ {
"display": { "display": {
"icon": { "icon": {
"item": "minecraft:black_concrete" "item": "minecraft:black_concrete"
}, },
"title": "You Shouldn't Be Here...", "title": "You Shouldn't Be Here...",
"description": "I'm not even going to ask how.", "description": "I'm not even going to ask how.",
"frame": "challenge", "frame": "challenge",
"hidden": false, "hidden": false,
"announce_to_chat": true "announce_to_chat": true
}, },
"parent": "canopy:enter_the_void", "parent": "canopy:enter_the_void",
"criteria": { "criteria": {
"height": { "below_-65y": {
"trigger": "minecraft:location", "trigger": "minecraft:location",
"conditions": { "conditions": {
"dimension": "minecraft:overworld", "player": [{
"position": { "condition": "minecraft:entity_properties",
"y": { "entity": "this",
"max": -65 "predicate": {
} "location": {
} "dimension": "minecraft:overworld",
} "position": {
} "y": {
} "max": -65.0
} }
}
}
}
},
{
"condition": "minecraft:inverted",
"term": {
"condition": "minecraft:entity_properties",
"entity": "this",
"predicate": {
"type_specific": {
"type": "player",
"gamemode": "spectator"
}
}
}
}
]
}
}
}
}