diff --git a/data/canopy/advancements/a_flower_in_your_hare.json b/data/canopy/advancements/a_flower_in_your_hare.json index 8c0267b..2b2356b 100644 --- a/data/canopy/advancements/a_flower_in_your_hare.json +++ b/data/canopy/advancements/a_flower_in_your_hare.json @@ -3,12 +3,12 @@ "icon": { "item": "minecraft:dandelion" }, - "title": "A flower in your hare", + "title": "A Flower In Your Hare", "description": "Thanks Hanny!", "frame": "task", "announce_to_chat": true }, - "parent": "canopy:root", + "parent": "canopy:neature", "criteria": { "give_flower": { "trigger": "minecraft:player_interacted_with_entity", diff --git a/data/canopy/advancements/green_thumb.json b/data/canopy/advancements/green_thumb.json index 6ea1daa..8cc8ee8 100644 --- a/data/canopy/advancements/green_thumb.json +++ b/data/canopy/advancements/green_thumb.json @@ -8,7 +8,7 @@ "frame": "task", "announce_to_chat": true }, - "parent": "canopy:root", + "parent": "canopy:neature", "criteria": { "jungle": { "trigger": "minecraft:placed_block", 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 3124fd5..a8f86cd 100644 --- a/data/canopy/advancements/is_it_extra_hot_down_there.json +++ b/data/canopy/advancements/is_it_extra_hot_down_there.json @@ -4,7 +4,7 @@ "item": "minecraft:black_concrete" }, "title": "Is It Extra Hot Down There?", - "description": "Here I was, just boating along in the nether...", + "description": "The floor is lava... but what's below the floor?", "frame": "challenge", "hidden": false, "announce_to_chat": true diff --git a/data/canopy/advancements/long_may_he_live.json b/data/canopy/advancements/long_may_he_live.json new file mode 100644 index 0000000..68c1b22 --- /dev/null +++ b/data/canopy/advancements/long_may_he_live.json @@ -0,0 +1,25 @@ +{ + "display": { + "icon": { + "item": "minecraft:axolotl_bucket" + }, + "title": "LONG MAY HE LIVE.", + "description": "Name an Axolotl", + "frame": "task", + "announce_to_chat": true + }, + "parent": "canopy:neature", + "criteria": { + "interact": { + "trigger": "minecraft:player_interacted_with_entity", + "conditions": { + "item": { + "items": ["minecraft:name_tag"] + }, + "entity": { + "type": "minecraft:axolotl" + } + } + } + } +} diff --git a/data/canopy/advancements/neature.json b/data/canopy/advancements/neature.json new file mode 100644 index 0000000..474d10d --- /dev/null +++ b/data/canopy/advancements/neature.json @@ -0,0 +1,18 @@ +{ + "display": { + "icon": { + "item": "minecraft:grass_block" + }, + "title": "Neature", + "description": "Nature is neat... pretty neat.", + "frame": "task", + "show_toast": false, + "announce_to_chat": false + }, + "parent": "canopy:root", + "criteria": { + "instant": { + "trigger": "minecraft:tick" + } + } +} diff --git a/data/canopy/advancements/this_takes_guts.json b/data/canopy/advancements/this_takes_guts.json new file mode 100644 index 0000000..c3c2205 --- /dev/null +++ b/data/canopy/advancements/this_takes_guts.json @@ -0,0 +1,32 @@ +{ + "display": { + "icon": { + "item": "minecraft:rotten_flesh" + }, + "title": "This Takes Guts.", + "description": "Eat 100 rotten flesh.", + "frame": "task", + "announce_to_chat": true + }, + "parent": "canopy:root", + "criteria": { + "eat": { + "trigger": "minecraft:location", + "conditions": { + "player": { + "player": { + "stats": [ + { + "type": "minecraft:used", + "stat": "minecraft:rotten_flesh", + "value": { + "min": 100 + } + } + ] + } + } + } + } + } +} diff --git a/data/canopy/advancements/till_death_do_us_part.json b/data/canopy/advancements/till_death_do_us_part.json index 66cb08c..72afcd7 100644 --- a/data/canopy/advancements/till_death_do_us_part.json +++ b/data/canopy/advancements/till_death_do_us_part.json @@ -1,8 +1,7 @@ { "display": { "icon": { - "item": "minecraft:player_head", - "nbt":"{SkullOwner:\"MHF_Skeleton\"}" + "item": "minecraft:skeleton_skull" }, "title": "Till Death Do Us Part.", "description": "Wear a piece of fully cursed armor in every slot.", diff --git a/data/canopy/advancements/what_is_wrong_with_you.json b/data/canopy/advancements/what_is_wrong_with_you.json index 22efdd9..c8f4e86 100644 --- a/data/canopy/advancements/what_is_wrong_with_you.json +++ b/data/canopy/advancements/what_is_wrong_with_you.json @@ -3,7 +3,7 @@ "icon": { "item": "minecraft:netherite_block" }, - "title": "What is wrong with you...", + "title": "What Is Wrong With You...", "description": "Build a full beacon out of netherite blocks.", "frame": "challenge", "announce_to_chat": true