PonyMirrors/Unicopia
1
0
Fork 0
mirror of https://github.com/Sollace/Unicopia.git synced 2024-11-27 15:17:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix some advancement names and heirarchy

Browse source
This commit is contained in:
Sollace 2024-03-24 22:08:11 +00:00
parent a266253d53
commit c59b9366f6
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/com/minelittlepony/unicopia/datagen/providers/UAdvancementsProvider.java
View file

@ -64,7 +64,8 @@ public class UAdvancementsProvider extends FabricAdvancementProvider {
p.child(Items.CHIPPED_ANVIL).hidden().frame(AdvancementFrame.CHALLENGE).criterion("ding_sun", dingCelestia(Set.of(), Set.of(Race.BAT))).build(consumer, "blasphemy");
p.child(Items.CHIPPED_ANVIL).hidden().frame(AdvancementFrame.CHALLENGE).criterion("ding_sun", dingCelestia(Set.of(Race.BAT), Set.of())).build(consumer, "sweet_sweet_revenge");
});
root.child(UItems.OATS).criterion("has_oats", hasItems(UItems.OATS)).build(consumer, "what_the_hay");
root.child(UItems.OATS).criterion("has_oats", hasItems(UItems.OATS)).build(consumer, "oats_so_easy");
root.child(Items.HAY_BLOCK).criterion("eat_hay", ConsumeItemCriterion.Conditions.item(Items.HAY_BLOCK)).build(consumer, "what_the_hay");
root.child(UItems.IRON_HORSE_SHOE).criterion("killed_entity_with_horseshoe", killWithItems(UTags.FROM_HORSESHOES)).build(consumer, "dead_ringer");
root.child(UItems.PINECONE).frame(AdvancementFrame.CHALLENGE).criterion("eat_pinecone", ConsumeItemCriterion.Conditions.item(UItems.PINECONE)).build(consumer, "eat_pinecone");
root.child(UItems.GIANT_BALLOON).criterion("ride_balloon", CustomEventCriterion.create("ride_balloon")).build(consumer, "travelling_in_style");
@ -152,7 +153,7 @@ public class UAdvancementsProvider extends FabricAdvancementProvider {
p.child(UItems.CRYSTAL_SHARD).criterion("has_shard", hasItems(UItems.CRYSTAL_SHARD)).build(consumer, "crystaline").children(pp -> {
pp.child(UItems.CRYSTAL_HEART).criterion("power_up_heart", CustomEventCriterion.create("power_up_heart")).rewards(AdvancementRewards.Builder.experience(105)).build(consumer, "power_up_heart");
});
p.child(UItems.ALICORN_AMULET).criterion("has_alicorn_amulet", hasItems(UItems.ALICORN_AMULET)).build(consumer, "tempting")
p.child(UItems.ALICORN_AMULET).criterion("has_alicorn_amulet", hasItems(UItems.ALICORN_AMULET)).build(consumer, "tempted")
.child(Items.CRYING_OBSIDIAN).criterion("light_altar", CustomEventCriterion.create("light_altar")).build(consumer, "hello_darkness_my_old_friend")
.child(UItems.BROKEN_ALICORN_AMULET).frame(AdvancementFrame.GOAL).criterion("defeat_sombra", CustomEventCriterion.create("defeat_sombra")).rewards(AdvancementRewards.Builder.experience(2000)).build(consumer, "save_the_day")
.children(pp -> {
@ -177,7 +178,7 @@ public class UAdvancementsProvider extends FabricAdvancementProvider {
}
private void generateEnchantmentsAdvancementsTree(Consumer<Advancement> consumer) {
AdvancementDisplayBuilder.create(Items.NETHERITE_SCRAP)
AdvancementDisplayBuilder.create(Items.NETHERITE_SCRAP).showToast().announce()
.criterion("enchant_with_consumption", enchant(UEnchantments.CONSUMPTION))
.rewards(AdvancementRewards.Builder.experience(120))
.parent(new Identifier("story/enchant_item"))
@ -189,9 +190,10 @@ public class UAdvancementsProvider extends FabricAdvancementProvider {
.group("enchanting")
.hidden()
.build(consumer, "xp_miner");
AdvancementDisplayBuilder.create(Items.GOLDEN_APPLE)
AdvancementDisplayBuilder.create(Items.GOLDEN_APPLE).showToast().announce()
.criterion("enchant_with_heart_bound", enchant(UEnchantments.HEART_BOUND))
.rewards(AdvancementRewards.Builder.experience(120))
.parent(new Identifier("story/enchant_item"))
.group("enchanting")
.build(consumer, "hearts_stronger_than_horses")
.child(Items.GOLDEN_PICKAXE)

16
src/main/resources/assets/unicopia/lang/en_us.json
View file

@ -1618,6 +1618,10 @@
"advancements.unicopia.eat_trick_apple.description": "Bite into a zap apple",
"advancements.unicopia.eat_pinecone.title": "Desperation",
"advancements.unicopia.eat_pinecone.description": "Eat a pinecone",
"advancements.unicopia.what_the_hay.title": "What The Hay",
"advancements.unicopia.what_the_hay.description": "Eat an entire block of hay",
"advancements.unicopia.oats_so_easy.title": "Oats So Easy",
"advancements.unicopia.oats_so_easy.description": "Farm some oats",
"advancements.unicopia.imported_oats.title": "Delicious As They Are Expensive",
"advancements.unicopia.imported_oats.description": "Send or receive fancy imported oats",
@ -1650,8 +1654,8 @@
"advancements.unicopia.travelling_in_style.title": "Travelling in Style",
"advancements.unicopia.travelling_in_style.description": "Ride a hot air balloon",
"advancements.unicopia.night_route.title": "Children of The Night",
"advancements.unicopia.night_route.description": "Walk the path of the night",
"advancements.unicopia.bat_route.title": "Children of The Night",
"advancements.unicopia.bat_route.description": "Walk the path of the night",
"advancements.unicopia.screech_twenty_mobs.title": "Terror From The Skies",
"advancements.unicopia.screech_twenty_mobs.description": "Rain down terror on at least 20 mobs at once",
"advancements.unicopia.screech_self.title": "Jeepers!",
@ -1675,8 +1679,8 @@
"advancements.unicopia.thats_unusual.title": "That's Unusual",
"advancements.unicopia.thats_unusual.description": "But what does it do?",
"advancements.unicopia.sky_route.title": "Path of the Pegasus",
"advancements.unicopia.sky_route.description": "Join the Clousdale Pegasi",
"advancements.unicopia.pegasus_route.title": "Path of the Pegasus",
"advancements.unicopia.pegasus_route.description": "Join the Clousdale Pegasi",
"advancements.unicopia.molting_season_1.title": "Molting Season",
"advancements.unicopia.molting_season_1.description": "Drop your first feather whilst flying",
"advancements.unicopia.molting_season_2.title": "Molting Season 2",
@ -1708,8 +1712,8 @@
"advancements.unicopia.deter_phantom.title": "What Flies Around",
"advancements.unicopia.deter_phantom.description": "Get up there and give those phantoms a taste of their own medicine",
"advancements.unicopia.magical_route.title": "Horn of the Unicorn",
"advancements.unicopia.magical_route.description": "Delve into the world of glitter and rainbows",
"advancements.unicopia.unicorn_route.title": "Horn of the Unicorn",
"advancements.unicopia.unicorn_route.description": "Delve into the world of glitter and rainbows",
"advancements.unicopia.books.title": "Books!",
"advancements.unicopia.books.description": "This is MY spellbook and I'm going to READ it!",