From 6e9d1289f338a64f51e934da295c8c1339cbbaa6 Mon Sep 17 00:00:00 2001 From: Ben Maurer Date: Tue, 2 Aug 2022 16:16:07 +0000 Subject: [PATCH] Rewriting most advancements to update location based criteria to use (type_specific) trigger --- data/canopy/advancements/a_good_start.json | 44 +++--- .../advancements/alright_i_give_up.json | 128 +++++++++++++++--- .../advancements/challenge_accepted.json | 41 +++--- .../advancements/challenge_complete.json | 41 +++--- .../canopy/advancements/diggy_diggy_hole.json | 32 ----- data/canopy/advancements/end.json | 64 ++++++--- data/canopy/advancements/enter_the_void.json | 72 ++++++---- data/canopy/advancements/far_out_man.json | 128 +++++++++++++++--- .../is_it_extra_hot_down_there.json | 74 ++++++---- .../canopy/advancements/long_may_he_live.json | 2 +- data/canopy/advancements/mobs.json | 36 ++--- .../canopy/advancements/now_were_talking.json | 65 ++++----- data/canopy/advancements/okay_too_far.json | 74 ++++++---- data/canopy/advancements/sword_go_brrr.json | 65 ++++----- data/canopy/advancements/this_takes_guts.json | 41 +++--- data/canopy/advancements/timeless.json | 41 +++--- data/canopy/advancements/touch_the_sky.json | 72 ++++++---- .../advancements/who_needs_sleep_anyway.json | 65 ++++----- data/canopy/advancements/yeet.json | 72 ++++++---- .../you_shouldnt_be_down_here.json | 74 ++++++---- 20 files changed, 768 insertions(+), 463 deletions(-) delete mode 100644 data/canopy/advancements/diggy_diggy_hole.json diff --git a/data/canopy/advancements/a_good_start.json b/data/canopy/advancements/a_good_start.json index 7abfd58..85581f9 100644 --- a/data/canopy/advancements/a_good_start.json +++ b/data/canopy/advancements/a_good_start.json @@ -1,22 +1,22 @@ -{ - "display": { - "icon": { - "item": "minecraft:phantom_membrane" - }, - "title": "A Good Start", - "description": "Kill a phantom, hopefully more to come.", - "frame": "task", - "announce_to_chat": true - }, - "parent": "canopy:mobs", - "criteria": { - "have_sed": { - "trigger": "minecraft:player_killed_entity", - "conditions": { - "entity": { - "type": "minecraft:phantom" - } - } - } - } -} +{ + "display": { + "icon": { + "item": "minecraft:phantom_membrane" + }, + "title": "A Good Start", + "description": "Kill a phantom, hopefully more to come.", + "frame": "task", + "announce_to_chat": true + }, + "parent": "canopy:mobs", + "criteria": { + "kill_1_phantom": { + "trigger": "minecraft:player_killed_entity", + "conditions": { + "entity": { + "type": "minecraft:phantom" + } + } + } + } +} diff --git a/data/canopy/advancements/alright_i_give_up.json b/data/canopy/advancements/alright_i_give_up.json index 7d5db40..c1e8292 100644 --- a/data/canopy/advancements/alright_i_give_up.json +++ b/data/canopy/advancements/alright_i_give_up.json @@ -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" + } + } + } } - } + ] } } }, diff --git a/data/canopy/advancements/challenge_accepted.json b/data/canopy/advancements/challenge_accepted.json index 65b14c6..1f9340e 100644 --- a/data/canopy/advancements/challenge_accepted.json +++ b/data/canopy/advancements/challenge_accepted.json @@ -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 + } + } + ] + } + } + } + } + } +} \ No newline at end of file diff --git a/data/canopy/advancements/challenge_complete.json b/data/canopy/advancements/challenge_complete.json index 56a5a87..2576da2 100644 --- a/data/canopy/advancements/challenge_complete.json +++ b/data/canopy/advancements/challenge_complete.json @@ -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 + } + } + ] + } + } + } + } + } +} \ No newline at end of file diff --git a/data/canopy/advancements/diggy_diggy_hole.json b/data/canopy/advancements/diggy_diggy_hole.json deleted file mode 100644 index 9c223e3..0000000 --- a/data/canopy/advancements/diggy_diggy_hole.json +++ /dev/null @@ -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 - } - } - ] - } - } - } - } - } -} diff --git a/data/canopy/advancements/end.json b/data/canopy/advancements/end.json index 3a5782e..31d52f8 100644 --- a/data/canopy/advancements/end.json +++ b/data/canopy/advancements/end.json @@ -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" + } + } + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/data/canopy/advancements/enter_the_void.json b/data/canopy/advancements/enter_the_void.json index 618b5e6..3240090 100644 --- a/data/canopy/advancements/enter_the_void.json +++ b/data/canopy/advancements/enter_the_void.json @@ -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" + } + } + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/data/canopy/advancements/far_out_man.json b/data/canopy/advancements/far_out_man.json index 8e6cede..a4a6912 100644 --- a/data/canopy/advancements/far_out_man.json +++ b/data/canopy/advancements/far_out_man.json @@ -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" + } + } + } } - } + ] } } }, diff --git a/data/canopy/advancements/is_it_extra_hot_down_there.json b/data/canopy/advancements/is_it_extra_hot_down_there.json index a8f86cd..e018d64 100644 --- a/data/canopy/advancements/is_it_extra_hot_down_there.json +++ b/data/canopy/advancements/is_it_extra_hot_down_there.json @@ -1,26 +1,48 @@ -{ - "display": { - "icon": { - "item": "minecraft:black_concrete" - }, - "title": "Is It Extra Hot Down There?", - "description": "The floor is lava... but what's below the floor?", - "frame": "challenge", - "hidden": false, - "announce_to_chat": true - }, - "parent": "canopy:enter_the_void", - "criteria": { - "height": { - "trigger": "minecraft:location", - "conditions": { - "dimension": "minecraft:the_nether", - "position": { - "y": { - "max": -65 - } - } - } - } - } -} +{ + "display": { + "icon": { + "item": "minecraft:black_concrete" + }, + "title": "Is It Extra Hot Down There?", + "description": "The floor is lava... but what's below the floor?", + "frame": "challenge", + "hidden": false, + "announce_to_chat": true + }, + "parent": "canopy:enter_the_void", + "criteria": { + "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" + } + } + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/data/canopy/advancements/long_may_he_live.json b/data/canopy/advancements/long_may_he_live.json index 68c1b22..2033988 100644 --- a/data/canopy/advancements/long_may_he_live.json +++ b/data/canopy/advancements/long_may_he_live.json @@ -10,7 +10,7 @@ }, "parent": "canopy:neature", "criteria": { - "interact": { + "name_axolotl": { "trigger": "minecraft:player_interacted_with_entity", "conditions": { "item": { diff --git a/data/canopy/advancements/mobs.json b/data/canopy/advancements/mobs.json index 5914837..c916cb5 100644 --- a/data/canopy/advancements/mobs.json +++ b/data/canopy/advancements/mobs.json @@ -1,18 +1,18 @@ -{ - "display": { - "icon": { - "item": "minecraft:zombie_head" - }, - "title": "Mobs", - "description": "Gotta kill 'em all!", - "frame": "task", - "show_toast": false, - "announce_to_chat": false - }, - "parent": "canopy:root", - "criteria": { - "mob_kill": { - "trigger": "minecraft:player_killed_entity" - } - } -} +{ + "display": { + "icon": { + "item": "minecraft:zombie_head" + }, + "title": "Mobs", + "description": "Gotta kill 'em all!", + "frame": "task", + "show_toast": false, + "announce_to_chat": false + }, + "parent": "canopy:root", + "criteria": { + "kill_any_mob": { + "trigger": "minecraft:player_killed_entity" + } + } +} diff --git a/data/canopy/advancements/now_were_talking.json b/data/canopy/advancements/now_were_talking.json index aafa489..95ad83e 100644 --- a/data/canopy/advancements/now_were_talking.json +++ b/data/canopy/advancements/now_were_talking.json @@ -1,32 +1,33 @@ -{ - "display": { - "icon": { - "item": "minecraft:diamond_sword" - }, - "title": "Now We're Talking", - "description": "Kill 100 phantoms... still not enough.", - "frame": "task", - "announce_to_chat": true - }, - "parent": "canopy:a_good_start", - "criteria": { - "100_phantoms": { - "trigger": "minecraft:location", - "conditions": { - "player": { - "player": { - "stats": [ - { - "type": "minecraft:killed", - "stat": "minecraft:phantom", - "value": { - "min": 100 - } - } - ] - } - } - } - } - } -} +{ + "display": { + "icon": { + "item": "minecraft:diamond_sword" + }, + "title": "Now We're Talking", + "description": "Kill 100 phantoms... still not enough.", + "frame": "task", + "announce_to_chat": true + }, + "parent": "canopy:a_good_start", + "criteria": { + "kill_100_phantoms": { + "trigger": "minecraft:location", + "conditions": { + "player": { + "type_specific": { + "type": "player", + "stats": [ + { + "type": "minecraft:killed", + "stat": "minecraft:phantom", + "value": { + "min": 100 + } + } + ] + } + } + } + } + } +} \ No newline at end of file diff --git a/data/canopy/advancements/okay_too_far.json b/data/canopy/advancements/okay_too_far.json index 3635756..39b3356 100644 --- a/data/canopy/advancements/okay_too_far.json +++ b/data/canopy/advancements/okay_too_far.json @@ -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" + } + } + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/data/canopy/advancements/sword_go_brrr.json b/data/canopy/advancements/sword_go_brrr.json index daa4e69..cbeb2d7 100644 --- a/data/canopy/advancements/sword_go_brrr.json +++ b/data/canopy/advancements/sword_go_brrr.json @@ -1,32 +1,33 @@ -{ - "display": { - "icon": { - "item": "minecraft:netherite_sword" - }, - "title": "Sword Go Brrr", - "description": "Kill 25,000 mobs", - "frame": "challenge", - "announce_to_chat": true - }, - "parent": "canopy:so_anyway_i_started_blasting", - "criteria": { - "height": { - "trigger": "minecraft:location", - "conditions": { - "player": { - "player": { - "stats": [ - { - "type": "minecraft:custom", - "stat": "minecraft:mob_kills", - "value": { - "min": 25000 - } - } - ] - } - } - } - } - } -} + { + "display": { + "icon": { + "item": "minecraft:netherite_sword" + }, + "title": "Sword Go Brrr", + "description": "Kill 25,000 mobs", + "frame": "challenge", + "announce_to_chat": true + }, + "parent": "canopy:so_anyway_i_started_blasting", + "criteria": { + "height": { + "trigger": "minecraft:location", + "conditions": { + "player": { + "type_specific": { + "type": "player", + "stats": [ + { + "type": "minecraft:custom", + "stat": "minecraft:mob_kills", + "value": { + "min": 25000 + } + } + ] + } + } + } + } + } +} \ No newline at end of file diff --git a/data/canopy/advancements/this_takes_guts.json b/data/canopy/advancements/this_takes_guts.json index c3c2205..fa49629 100644 --- a/data/canopy/advancements/this_takes_guts.json +++ b/data/canopy/advancements/this_takes_guts.json @@ -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 + } + } + ] + } + } + } + } + } +} \ No newline at end of file diff --git a/data/canopy/advancements/timeless.json b/data/canopy/advancements/timeless.json index 3db83a9..794690a 100644 --- a/data/canopy/advancements/timeless.json +++ b/data/canopy/advancements/timeless.json @@ -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 + } + } + ] + } + } + } + } + } +} \ No newline at end of file diff --git a/data/canopy/advancements/touch_the_sky.json b/data/canopy/advancements/touch_the_sky.json index 36049f0..67726d4 100644 --- a/data/canopy/advancements/touch_the_sky.json +++ b/data/canopy/advancements/touch_the_sky.json @@ -1,25 +1,47 @@ -{ - "display": { - "icon": { - "item": "minecraft:firework_rocket" - }, - "title": "Touch The Sky", - "description": "The nest looks so small from up here!", - "frame": "task", - "announce_to_chat": true - }, - "parent": "canopy:root", - "criteria": { - "height": { - "trigger": "minecraft:location", - "conditions": { - "dimension": "minecraft:overworld", - "position": { - "y": { - "min": 2000 - } - } - } - } - } -} +{ + "display": { + "icon": { + "item": "minecraft:firework_rocket" + }, + "title": "Touch The Sky", + "description": "The nest looks so small from up here!", + "frame": "task", + "announce_to_chat": true + }, + "parent": "canopy:root", + "criteria": { + "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" + } + } + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/data/canopy/advancements/who_needs_sleep_anyway.json b/data/canopy/advancements/who_needs_sleep_anyway.json index 62fe0ef..93815ac 100644 --- a/data/canopy/advancements/who_needs_sleep_anyway.json +++ b/data/canopy/advancements/who_needs_sleep_anyway.json @@ -1,32 +1,33 @@ -{ - "display": { - "icon": { - "item": "minecraft:red_bed" - }, - "title": "Who Needs Sleep Anyways?", - "description": "Kill 1000 phantoms... I don't think itll ever be enough honestly.", - "frame": "challenge", - "announce_to_chat": true - }, - "parent": "canopy:now_were_talking", - "criteria": { - "100_phantoms": { - "trigger": "minecraft:location", - "conditions": { - "player": { - "player": { - "stats": [ - { - "type": "minecraft:killed", - "stat": "minecraft:phantom", - "value": { - "min": 1000 - } - } - ] - } - } - } - } - } -} +{ + "display": { + "icon": { + "item": "minecraft:red_bed" + }, + "title": "Who Needs Sleep Anyways?", + "description": "Kill 1000 phantoms... I don't think itll ever be enough honestly.", + "frame": "challenge", + "announce_to_chat": true + }, + "parent": "canopy:now_were_talking", + "criteria": { + "kill_1000_phantoms": { + "trigger": "minecraft:location", + "conditions": { + "player": { + "type_specific": { + "type": "player", + "stats": [ + { + "type": "minecraft:killed", + "stat": "minecraft:phantom", + "value": { + "min": 1000 + } + } + ] + } + } + } + } + } +} \ No newline at end of file diff --git a/data/canopy/advancements/yeet.json b/data/canopy/advancements/yeet.json index 5161331..315bf21 100644 --- a/data/canopy/advancements/yeet.json +++ b/data/canopy/advancements/yeet.json @@ -1,25 +1,47 @@ -{ - "display": { - "icon": { - "item": "minecraft:ender_pearl" - }, - "title": "YEET!", - "description": "Die to the void. End gateways are overrated.", - "frame": "task", - "announce_to_chat": true - }, - "parent": "canopy:end", - "criteria": { - "height": { - "trigger": "minecraft:location", - "conditions": { - "dimension": "minecraft:the_end", - "position": { - "y": { - "max": -200 - } - } - } - } - } -} +{ + "display": { + "icon": { + "item": "minecraft:ender_pearl" + }, + "title": "YEET!", + "description": "Die to the void. End gateways are overrated.", + "frame": "task", + "announce_to_chat": true + }, + "parent": "canopy:end", + "criteria": { + "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" + } + } + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/data/canopy/advancements/you_shouldnt_be_down_here.json b/data/canopy/advancements/you_shouldnt_be_down_here.json index 00a3ce0..17d7b1d 100644 --- a/data/canopy/advancements/you_shouldnt_be_down_here.json +++ b/data/canopy/advancements/you_shouldnt_be_down_here.json @@ -1,26 +1,48 @@ -{ - "display": { - "icon": { - "item": "minecraft:black_concrete" - }, - "title": "You Shouldn't Be Here...", - "description": "I'm not even going to ask how.", - "frame": "challenge", - "hidden": false, - "announce_to_chat": true - }, - "parent": "canopy:enter_the_void", - "criteria": { - "height": { - "trigger": "minecraft:location", - "conditions": { - "dimension": "minecraft:overworld", - "position": { - "y": { - "max": -65 - } - } - } - } - } -} +{ + "display": { + "icon": { + "item": "minecraft:black_concrete" + }, + "title": "You Shouldn't Be Here...", + "description": "I'm not even going to ask how.", + "frame": "challenge", + "hidden": false, + "announce_to_chat": true + }, + "parent": "canopy:enter_the_void", + "criteria": { + "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" + } + } + } + } + ] + } + } + } +} \ No newline at end of file