diff --git a/src/main/resources/assets/unicopia/lang/en_us.json b/src/main/resources/assets/unicopia/lang/en_us.json index e50d16a7..47e31109 100644 --- a/src/main/resources/assets/unicopia/lang/en_us.json +++ b/src/main/resources/assets/unicopia/lang/en_us.json @@ -899,7 +899,9 @@ "advancements.unicopia.love_is_power.description": "Banish King Sombra with a Crystal Heart", "advancements.unicopia.save_the_day.title": "Save the Day", "advancements.unicopia.save_the_day.description": "Defeat King Sombra once and for all", - "advancements.unicopia.doctor_sombrero.title": "Doctor Sombrero", + "advancements.unicopia.ascension.title": "Ascension", + "advancements.unicopia.ascension.description": "Ascension", + "advancements.unicopia.doctor_sombrero.title": "Complete Sombra's Work", "advancements.unicopia.doctor_sombrero.description": "That's not mare-iachi!", "unicopia.toast.discoveries.title": "New Discoveries!", diff --git a/src/main/resources/data/unicopia/advancements/recipes/unicorn_amulet.json b/src/main/resources/data/unicopia/advancements/recipes/unicorn_amulet.json new file mode 100644 index 00000000..a0de0620 --- /dev/null +++ b/src/main/resources/data/unicopia/advancements/recipes/unicorn_amulet.json @@ -0,0 +1,30 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "unicopia:unicorn_amulet" + ] + }, + "criteria": { + "has_ingredients": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "items": [ "unicopia:broken_alicorn_amulet" ] } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "unicopia:broken_alicorn_amulet" + } + } + }, + "requirements": [ + [ + "has_ingredients", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/main/resources/data/unicopia/advancements/unicopia/ascension.json b/src/main/resources/data/unicopia/advancements/unicopia/ascension.json new file mode 100644 index 00000000..37c6499d --- /dev/null +++ b/src/main/resources/data/unicopia/advancements/unicopia/ascension.json @@ -0,0 +1,31 @@ +{ + "parent": "unicopia:unicopia/save_the_day", + "display": { + "icon": { + "item": "unicopia:alicorn_amulet" + }, + "title": { + "translate": "advancements.unicopia.ascension.title" + }, + "description": { + "translate": "advancements.unicopia.ascension.description" + }, + "frame": "goal", + "show_toast": true, + "announce_to_chat": true, + "hidden": false + }, + "criteria": { + "obtain_the_thing": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { "items": [ "unicopia:unicorn_amulet" ] } + ] + } + } + }, + "requirements": [ + [ "obtain_the_thing" ] + ] +} diff --git a/src/main/resources/data/unicopia/advancements/unicopia/save_the_day.json b/src/main/resources/data/unicopia/advancements/unicopia/save_the_day.json index 2462c6fa..5f18bd0e 100644 --- a/src/main/resources/data/unicopia/advancements/unicopia/save_the_day.json +++ b/src/main/resources/data/unicopia/advancements/unicopia/save_the_day.json @@ -10,7 +10,7 @@ "description": { "translate": "advancements.unicopia.save_the_day.description" }, - "frame": "goal", + "frame": "challenge", "show_toast": true, "announce_to_chat": true, "hidden": false diff --git a/src/main/resources/data/unicopia/recipes/unicorn_amulet.json b/src/main/resources/data/unicopia/recipes/unicorn_amulet.json index 4bfe2b2b..b5a4f434 100644 --- a/src/main/resources/data/unicopia/recipes/unicorn_amulet.json +++ b/src/main/resources/data/unicopia/recipes/unicorn_amulet.json @@ -5,9 +5,10 @@ }, "traits": {}, "ingredients": [ - { "item": "unicopia:crystal_shard" }, - { "item": "unicopia:crystal_shard" }, - { "item": "unicopia:crystal_shard" } + { "item": "unicopia:pegasus_amulet" }, + { "item": "unicopia:crystal_heart" }, + { "item": "unicopia:grogars_bell" }, + { "item": "minecraft:totem_of_undying" } ], "result": { "item": "unicopia:unicorn_amulet"