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",
"criteria": {
"have_sed": {
"kill_1_phantom": {
"trigger": "minecraft:player_killed_entity",
"conditions": {
"entity": {

View File

@ -14,45 +14,133 @@
"outer_pos_x": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "the_end",
"position": {
"x": {
"min": 1000000.0
"player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"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": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "the_end",
"position": {
"z": {
"min": 1000000.0
"player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"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": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "the_end",
"position": {
"x": {
"max": -1000000.0
"player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"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": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "the_end",
"position": {
"z": {
"max": -1000000.0
"player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"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",
"criteria": {
"alive_time": {
"trigger": "minecraft:location",
"conditions": {
"player": {
"player": {
"stats": [
{
"type": "minecraft:custom",
"stat": "minecraft:time_since_death",
"value": {
"min": 24000
}
}
]
}
}
}
}
}
"alive_1_day": {
"trigger": "minecraft:location",
"conditions": {
"player": {
"type_specific": {
"type": "player",
"stats": [
{
"type": "minecraft:custom",
"stat": "minecraft:time_since_death",
"value": {
"min": 24000
}
}
]
}
}
}
}
}
}

View File

@ -10,23 +10,24 @@
},
"parent": "canopy:challenge_accepted",
"criteria": {
"alive_time": {
"trigger": "minecraft:location",
"conditions": {
"player": {
"player": {
"stats": [
{
"type": "minecraft:custom",
"stat": "minecraft:time_since_death",
"value": {
"min": 2400000
}
}
]
}
}
}
}
}
"alive_100_days": {
"trigger": "minecraft:location",
"conditions": {
"player": {
"type_specific": {
"type": "player",
"stats": [
{
"type": "minecraft:custom",
"stat": "minecraft:time_since_death",
"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": {
"icon": {
"item": "minecraft:end_portal_frame"
},
"title": "The End.",
"description": "That was easy.",
"frame": "task",
"show_toast": false,
"announce_to_chat": false
},
"parent": "canopy:root",
"criteria": {
"in_end": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "minecraft:the_end"
}
}
}
"display": {
"icon": {
"item": "minecraft:end_portal_frame"
},
"title": "The End.",
"description": "That was easy.",
"frame": "task",
"show_toast": false,
"announce_to_chat": false
},
"parent": "canopy:root",
"criteria": {
"reach_the_end": {
"trigger": "minecraft:location",
"conditions": {
"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": {
"icon": {
"item": "minecraft:black_concrete"
},
"title": "Enter The Void",
"description": "At least this only exists in the end... right?",
"frame": "task",
"announce_to_chat": true
},
"parent": "canopy:end",
"criteria": {
"height": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "minecraft:the_end",
"position": {
"y": {
"max": -65
"display": {
"icon": {
"item": "minecraft:black_concrete"
},
"title": "Enter The Void",
"description": "At least this only exists in the end... right?",
"frame": "task",
"announce_to_chat": true
},
"parent": "canopy:end",
"criteria": {
"below_-65y": {
"trigger": "minecraft:location",
"conditions": {
"player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"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": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "the_end",
"position": {
"x": {
"min": 100000.0
"player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"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": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "the_end",
"position": {
"z": {
"min": 100000.0
"player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"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": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "the_end",
"position": {
"x": {
"max": -100000.0
"player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"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": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "the_end",
"position": {
"z": {
"max": -100000.0
"player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"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

@ -11,16 +11,38 @@
},
"parent": "canopy:enter_the_void",
"criteria": {
"height": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "minecraft:the_nether",
"position": {
"y": {
"max": -65
"below_-65y": {
"trigger": "minecraft:location",
"conditions": {
"player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"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",
"criteria": {
"interact": {
"name_axolotl": {
"trigger": "minecraft:player_interacted_with_entity",
"conditions": {
"item": {

View File

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

View File

@ -10,23 +10,24 @@
},
"parent": "canopy:a_good_start",
"criteria": {
"100_phantoms": {
"trigger": "minecraft:location",
"conditions": {
"player": {
"player": {
"stats": [
{
"type": "minecraft:killed",
"stat": "minecraft:phantom",
"value": {
"min": 100
}
}
]
}
}
}
}
}
"kill_100_phantoms": {
"trigger": "minecraft:location",
"conditions": {
"player": {
"type_specific": {
"type": "player",
"stats": [
{
"type": "minecraft:killed",
"stat": "minecraft:phantom",
"value": {
"min": 100
}
}
]
}
}
}
}
}
}

View File

@ -1,26 +1,48 @@
{
"display": {
"icon": {
"item": "minecraft:elytra",
"nbt": "{Damage:431}"
},
"title": "Okay, Too Far.",
"description": "100,000? How did you even get up here?",
"frame": "challenge",
"announce_to_chat": true
},
"parent": "canopy:touch_the_sky",
"criteria": {
"height": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "minecraft:overworld",
"position": {
"y": {
"min": 100000
"display": {
"icon": {
"item": "minecraft:elytra",
"nbt": "{Damage:431}"
},
"title": "Okay, Too Far.",
"description": "100,000? How did you even get up here?",
"frame": "challenge",
"announce_to_chat": true
},
"parent": "canopy:touch_the_sky",
"criteria": {
"reach_100k": {
"trigger": "minecraft:location",
"conditions": {
"player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"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,4 +1,4 @@
{
{
"display": {
"icon": {
"item": "minecraft:netherite_sword"
@ -14,19 +14,20 @@
"trigger": "minecraft:location",
"conditions": {
"player": {
"player": {
"stats": [
{
"type": "minecraft:custom",
"stat": "minecraft:mob_kills",
"value": {
"min": 25000
"type_specific": {
"type": "player",
"stats": [
{
"type": "minecraft:custom",
"stat": "minecraft:mob_kills",
"value": {
"min": 25000
}
}
]
}
}
]
}
}
}
}
}
}
}
}

View File

@ -10,23 +10,24 @@
},
"parent": "canopy:root",
"criteria": {
"eat": {
"trigger": "minecraft:location",
"conditions": {
"player": {
"player": {
"stats": [
{
"type": "minecraft:used",
"stat": "minecraft:rotten_flesh",
"value": {
"min": 100
}
}
]
}
}
}
}
}
"eat_100_rotten_flesh": {
"trigger": "minecraft:location",
"conditions": {
"player": {
"type_specific": {
"type": "player",
"stats": [
{
"type": "minecraft:used",
"stat": "minecraft:rotten_flesh",
"value": {
"min": 100
}
}
]
}
}
}
}
}
}

View File

@ -11,23 +11,24 @@
},
"parent": "canopy:challenge_complete",
"criteria": {
"alive_time": {
"trigger": "minecraft:location",
"conditions": {
"player": {
"player": {
"stats": [
{
"type": "minecraft:custom",
"stat": "minecraft:time_since_death",
"value": {
"min": 24000000
}
}
]
}
}
}
}
}
"alive_1000_days": {
"trigger": "minecraft:location",
"conditions": {
"player": {
"type_specific": {
"type": "player",
"stats": [
{
"type": "minecraft:custom",
"stat": "minecraft:time_since_death",
"value": {
"min": 24000000
}
}
]
}
}
}
}
}
}

View File

@ -10,16 +10,38 @@
},
"parent": "canopy:root",
"criteria": {
"height": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "minecraft:overworld",
"position": {
"y": {
"min": 2000
"reach_2k": {
"trigger": "minecraft:location",
"conditions": {
"player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"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

@ -10,23 +10,24 @@
},
"parent": "canopy:now_were_talking",
"criteria": {
"100_phantoms": {
"trigger": "minecraft:location",
"conditions": {
"player": {
"player": {
"stats": [
{
"type": "minecraft:killed",
"stat": "minecraft:phantom",
"value": {
"min": 1000
}
}
]
}
}
}
}
}
"kill_1000_phantoms": {
"trigger": "minecraft:location",
"conditions": {
"player": {
"type_specific": {
"type": "player",
"stats": [
{
"type": "minecraft:killed",
"stat": "minecraft:phantom",
"value": {
"min": 1000
}
}
]
}
}
}
}
}
}

View File

@ -10,16 +10,38 @@
},
"parent": "canopy:end",
"criteria": {
"height": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "minecraft:the_end",
"position": {
"y": {
"max": -200
}
}
}
"below_-200y": {
"trigger": "minecraft:location",
"conditions": {
"player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"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

@ -11,16 +11,38 @@
},
"parent": "canopy:enter_the_void",
"criteria": {
"height": {
"trigger": "minecraft:location",
"conditions": {
"dimension": "minecraft:overworld",
"position": {
"y": {
"max": -65
"below_-65y": {
"trigger": "minecraft:location",
"conditions": {
"player": [{
"condition": "minecraft:entity_properties",
"entity": "this",
"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"
}
}
}
}
]
}
}
}
}
}
}
}
}