diff --git a/Xplat/src/generated/resources/.cache/ca0b139d7ffbdcad7e28a9e04c29c4ff458197e3 b/Xplat/src/generated/resources/.cache/ca0b139d7ffbdcad7e28a9e04c29c4ff458197e3 index 6b315e5197..7a6ac5c40a 100644 --- a/Xplat/src/generated/resources/.cache/ca0b139d7ffbdcad7e28a9e04c29c4ff458197e3 +++ b/Xplat/src/generated/resources/.cache/ca0b139d7ffbdcad7e28a9e04c29c4ff458197e3 @@ -1,21 +1,21 @@ // 1.20.1 Botania/Advancements -89bb4518bec139b44a7df0f34040b55587072be9 data/botania/advancements/challenge/alf_portal_bread.json -ffc024a6dff385077c6d09e67cb357e1de0efcf8 data/botania/advancements/challenge/flugel_eye.json -2605d2617560e838fcc9e7dcef7f514f04b7a401 data/botania/advancements/challenge/gaia_guardian_hardmode.json -e10869977a695f7df69049ad7e1b0104cefc4c70 data/botania/advancements/challenge/gaia_guardian_no_armor.json -29caa0d49faa54887ccc42a047255ddcdf04d933 data/botania/advancements/challenge/infinite_fruit.json -0e586640628e37e6b7eb640d38f3eae228e72289 data/botania/advancements/challenge/king_key.json -2705f831445089b489bbe61809108d41be9d5219 data/botania/advancements/challenge/l20_shard_use.json -ecb019b1f020ec9fb80a19c3b95fc0fc9772c742 data/botania/advancements/challenge/loki_ring.json -e81ded2f75a13be9d27f1509598d37f8a8c09bcb data/botania/advancements/challenge/loki_ring_many.json -a49a935acf83a2ca9e709040a32af3e249eb4b06 data/botania/advancements/challenge/odin_ring.json -31d0ecb4f287c97feb625626624d8815e0e319a3 data/botania/advancements/challenge/old_flower_pickup.json -6dc328bb1a46438456586e77ff6d3b8af696a2bd data/botania/advancements/challenge/pinkinator.json -b9fe06980e4f5837b5e6a651789ccee1fdfd0917 data/botania/advancements/challenge/rank_ss_pick.json +ab08543643f1a531a05c7a8c557a3ac02791af95 data/botania/advancements/challenge/alf_portal_bread.json +79ad7a7e7ea785cf536ec8396e1e11673650954b data/botania/advancements/challenge/flugel_eye.json +3e969f922b4184577d256b2c5e197c5dc8a50c4f data/botania/advancements/challenge/gaia_guardian_hardmode.json +90ca240ce76ccf798cf0fc68ba99c1623ed44af0 data/botania/advancements/challenge/gaia_guardian_no_armor.json +0c2f31f014bb451df1a374c6fbfca073939e3ed1 data/botania/advancements/challenge/infinite_fruit.json +a3e0e60eeb5a66f48aff240d65d8b4964ecd88ad data/botania/advancements/challenge/king_key.json +ff855599a23d362cddf9fc6f6a44e7461d1437ba data/botania/advancements/challenge/l20_shard_use.json +a5f104cd8d11b803c4488aa297944a3a9c93011e data/botania/advancements/challenge/loki_ring.json +30610a73f6704ba3e41535bdf5d371fc2e8c77a1 data/botania/advancements/challenge/loki_ring_many.json +a03c6f18fd1ece4373348c8fee64b3490998042e data/botania/advancements/challenge/odin_ring.json +69358eab5b9e2ebea227473f48621ae5c18c72d7 data/botania/advancements/challenge/old_flower_pickup.json +cca42e2cecc1da9168c83ee6bf5bdd797ce8c13a data/botania/advancements/challenge/pinkinator.json +82a9e600f43fd554b0122ad5916026f199922e56 data/botania/advancements/challenge/rank_ss_pick.json f94e927c7f883607070049552aeeb4e6f5974715 data/botania/advancements/challenge/root.json -63530900692ef86a45917c27de8dc97b5a94cb01 data/botania/advancements/challenge/super_corporea_request.json -18d8be4677160e018d41819894e640dcf88aaa77 data/botania/advancements/challenge/thor_ring.json -08a302c30a2e78340b97546a98597c714be2e23b data/botania/advancements/challenge/tiny_potato_birthday.json +a3b04670936bde0205386e5826a7c4247871b566 data/botania/advancements/challenge/super_corporea_request.json +9cf256ab8d592eab6d5e893f987da278a543a081 data/botania/advancements/challenge/thor_ring.json +8c80adcaa2b288f45a42df81ea4a9ceb5f4ab0a0 data/botania/advancements/challenge/tiny_potato_birthday.json a6eccb16ef7cfa521a9e7713d767f96536a11344 data/botania/advancements/main/apothecary_pickup.json 64df1dbc86bbea87ecf8ec0a57907ee78360a3a5 data/botania/advancements/main/bauble_wear.json c1dbf3b77cd3e4623f6c85705cb5e1ae0faa8d2b data/botania/advancements/main/brew_pickup.json diff --git a/Xplat/src/generated/resources/data/botania/advancements/challenge/alf_portal_bread.json b/Xplat/src/generated/resources/data/botania/advancements/challenge/alf_portal_bread.json index fa796aa530..70ae635e04 100644 --- a/Xplat/src/generated/resources/data/botania/advancements/challenge/alf_portal_bread.json +++ b/Xplat/src/generated/resources/data/botania/advancements/challenge/alf_portal_bread.json @@ -26,5 +26,8 @@ "bread" ] ], + "rewards": { + "experience": 40 + }, "sends_telemetry_event": true } \ No newline at end of file diff --git a/Xplat/src/generated/resources/data/botania/advancements/challenge/flugel_eye.json b/Xplat/src/generated/resources/data/botania/advancements/challenge/flugel_eye.json index 2407b4857e..d118deb54a 100644 --- a/Xplat/src/generated/resources/data/botania/advancements/challenge/flugel_eye.json +++ b/Xplat/src/generated/resources/data/botania/advancements/challenge/flugel_eye.json @@ -32,5 +32,8 @@ "eye" ] ], + "rewards": { + "experience": 50 + }, "sends_telemetry_event": true } \ No newline at end of file diff --git a/Xplat/src/generated/resources/data/botania/advancements/challenge/gaia_guardian_hardmode.json b/Xplat/src/generated/resources/data/botania/advancements/challenge/gaia_guardian_hardmode.json index aee65dfb65..6e56bc7b10 100644 --- a/Xplat/src/generated/resources/data/botania/advancements/challenge/gaia_guardian_hardmode.json +++ b/Xplat/src/generated/resources/data/botania/advancements/challenge/gaia_guardian_hardmode.json @@ -37,5 +37,8 @@ "guardian" ] ], + "rewards": { + "experience": 100 + }, "sends_telemetry_event": true } \ No newline at end of file diff --git a/Xplat/src/generated/resources/data/botania/advancements/challenge/gaia_guardian_no_armor.json b/Xplat/src/generated/resources/data/botania/advancements/challenge/gaia_guardian_no_armor.json index 862980725c..94ff0c9011 100644 --- a/Xplat/src/generated/resources/data/botania/advancements/challenge/gaia_guardian_no_armor.json +++ b/Xplat/src/generated/resources/data/botania/advancements/challenge/gaia_guardian_no_armor.json @@ -26,5 +26,8 @@ "no_armor" ] ], + "rewards": { + "experience": 1000 + }, "sends_telemetry_event": true } \ No newline at end of file diff --git a/Xplat/src/generated/resources/data/botania/advancements/challenge/infinite_fruit.json b/Xplat/src/generated/resources/data/botania/advancements/challenge/infinite_fruit.json index a6846b3205..c2ede7dc9f 100644 --- a/Xplat/src/generated/resources/data/botania/advancements/challenge/infinite_fruit.json +++ b/Xplat/src/generated/resources/data/botania/advancements/challenge/infinite_fruit.json @@ -32,5 +32,8 @@ "fruit" ] ], + "rewards": { + "experience": 50 + }, "sends_telemetry_event": true } \ No newline at end of file diff --git a/Xplat/src/generated/resources/data/botania/advancements/challenge/king_key.json b/Xplat/src/generated/resources/data/botania/advancements/challenge/king_key.json index 86d7f67482..f39cae9df2 100644 --- a/Xplat/src/generated/resources/data/botania/advancements/challenge/king_key.json +++ b/Xplat/src/generated/resources/data/botania/advancements/challenge/king_key.json @@ -32,5 +32,8 @@ "key" ] ], + "rewards": { + "experience": 50 + }, "sends_telemetry_event": true } \ No newline at end of file diff --git a/Xplat/src/generated/resources/data/botania/advancements/challenge/l20_shard_use.json b/Xplat/src/generated/resources/data/botania/advancements/challenge/l20_shard_use.json index a9aeecafe2..972a0ede35 100644 --- a/Xplat/src/generated/resources/data/botania/advancements/challenge/l20_shard_use.json +++ b/Xplat/src/generated/resources/data/botania/advancements/challenge/l20_shard_use.json @@ -35,5 +35,8 @@ "use_l20_shard" ] ], + "rewards": { + "experience": 65 + }, "sends_telemetry_event": true } \ No newline at end of file diff --git a/Xplat/src/generated/resources/data/botania/advancements/challenge/loki_ring.json b/Xplat/src/generated/resources/data/botania/advancements/challenge/loki_ring.json index 93889e2e37..9d8747e014 100644 --- a/Xplat/src/generated/resources/data/botania/advancements/challenge/loki_ring.json +++ b/Xplat/src/generated/resources/data/botania/advancements/challenge/loki_ring.json @@ -32,5 +32,8 @@ "ring" ] ], + "rewards": { + "experience": 50 + }, "sends_telemetry_event": true } \ No newline at end of file diff --git a/Xplat/src/generated/resources/data/botania/advancements/challenge/loki_ring_many.json b/Xplat/src/generated/resources/data/botania/advancements/challenge/loki_ring_many.json index 2d8bd81ff4..f673d7011a 100644 --- a/Xplat/src/generated/resources/data/botania/advancements/challenge/loki_ring_many.json +++ b/Xplat/src/generated/resources/data/botania/advancements/challenge/loki_ring_many.json @@ -30,5 +30,8 @@ "place_blocks" ] ], + "rewards": { + "experience": 85 + }, "sends_telemetry_event": true } \ No newline at end of file diff --git a/Xplat/src/generated/resources/data/botania/advancements/challenge/odin_ring.json b/Xplat/src/generated/resources/data/botania/advancements/challenge/odin_ring.json index de6cd2ef1f..5ac557b1b3 100644 --- a/Xplat/src/generated/resources/data/botania/advancements/challenge/odin_ring.json +++ b/Xplat/src/generated/resources/data/botania/advancements/challenge/odin_ring.json @@ -32,5 +32,8 @@ "ring" ] ], + "rewards": { + "experience": 50 + }, "sends_telemetry_event": true } \ No newline at end of file diff --git a/Xplat/src/generated/resources/data/botania/advancements/challenge/old_flower_pickup.json b/Xplat/src/generated/resources/data/botania/advancements/challenge/old_flower_pickup.json index d7ade0a6a0..a41ce93f6d 100644 --- a/Xplat/src/generated/resources/data/botania/advancements/challenge/old_flower_pickup.json +++ b/Xplat/src/generated/resources/data/botania/advancements/challenge/old_flower_pickup.json @@ -35,5 +35,8 @@ "flower" ] ], + "rewards": { + "experience": 40 + }, "sends_telemetry_event": true } \ No newline at end of file diff --git a/Xplat/src/generated/resources/data/botania/advancements/challenge/pinkinator.json b/Xplat/src/generated/resources/data/botania/advancements/challenge/pinkinator.json index 6459c5d0b6..9a74621837 100644 --- a/Xplat/src/generated/resources/data/botania/advancements/challenge/pinkinator.json +++ b/Xplat/src/generated/resources/data/botania/advancements/challenge/pinkinator.json @@ -32,5 +32,8 @@ "use_pinkinator" ] ], + "rewards": { + "experience": 40 + }, "sends_telemetry_event": true } \ No newline at end of file diff --git a/Xplat/src/generated/resources/data/botania/advancements/challenge/rank_ss_pick.json b/Xplat/src/generated/resources/data/botania/advancements/challenge/rank_ss_pick.json index d21d1ba3ce..7b797fb8c9 100644 --- a/Xplat/src/generated/resources/data/botania/advancements/challenge/rank_ss_pick.json +++ b/Xplat/src/generated/resources/data/botania/advancements/challenge/rank_ss_pick.json @@ -26,5 +26,8 @@ "code_triggered" ] ], + "rewards": { + "experience": 500 + }, "sends_telemetry_event": true } \ No newline at end of file diff --git a/Xplat/src/generated/resources/data/botania/advancements/challenge/super_corporea_request.json b/Xplat/src/generated/resources/data/botania/advancements/challenge/super_corporea_request.json index a2dc32c5b1..c1bb51787c 100644 --- a/Xplat/src/generated/resources/data/botania/advancements/challenge/super_corporea_request.json +++ b/Xplat/src/generated/resources/data/botania/advancements/challenge/super_corporea_request.json @@ -30,5 +30,8 @@ "big_request" ] ], + "rewards": { + "experience": 85 + }, "sends_telemetry_event": true } \ No newline at end of file diff --git a/Xplat/src/generated/resources/data/botania/advancements/challenge/thor_ring.json b/Xplat/src/generated/resources/data/botania/advancements/challenge/thor_ring.json index bb693d5457..93ee789a2a 100644 --- a/Xplat/src/generated/resources/data/botania/advancements/challenge/thor_ring.json +++ b/Xplat/src/generated/resources/data/botania/advancements/challenge/thor_ring.json @@ -32,5 +32,8 @@ "ring" ] ], + "rewards": { + "experience": 50 + }, "sends_telemetry_event": true } \ No newline at end of file diff --git a/Xplat/src/generated/resources/data/botania/advancements/challenge/tiny_potato_birthday.json b/Xplat/src/generated/resources/data/botania/advancements/challenge/tiny_potato_birthday.json index 00e0bb7495..1a18c35ee3 100644 --- a/Xplat/src/generated/resources/data/botania/advancements/challenge/tiny_potato_birthday.json +++ b/Xplat/src/generated/resources/data/botania/advancements/challenge/tiny_potato_birthday.json @@ -25,5 +25,8 @@ "code_triggered" ] ], + "rewards": { + "experience": 40 + }, "sends_telemetry_event": true } \ No newline at end of file diff --git a/Xplat/src/main/java/vazkii/botania/data/AdvancementProvider.java b/Xplat/src/main/java/vazkii/botania/data/AdvancementProvider.java index 74c1bfb535..f8f35f4be9 100644 --- a/Xplat/src/main/java/vazkii/botania/data/AdvancementProvider.java +++ b/Xplat/src/main/java/vazkii/botania/data/AdvancementProvider.java @@ -8,10 +8,7 @@ */ package vazkii.botania.data; -import net.minecraft.advancements.Advancement; -import net.minecraft.advancements.DisplayInfo; -import net.minecraft.advancements.FrameType; -import net.minecraft.advancements.RequirementsStrategy; +import net.minecraft.advancements.*; import net.minecraft.advancements.critereon.*; import net.minecraft.core.HolderLookup; import net.minecraft.core.registries.BuiltInRegistries; @@ -337,6 +334,7 @@ public void generate(HolderLookup.Provider lookup, Consumer consume Advancement hardMode = Advancement.Builder.advancement() .display(simple(BotaniaItems.lifeEssence, "gaiaGuardianHardmode", FrameType.CHALLENGE)) .parent(root) + .rewards(AdvancementRewards.Builder.experience(100)) .addCriterion("guardian", KilledTrigger.TriggerInstance.playerKilledEntity( EntityPredicate.Builder.entity() .of(BotaniaEntities.DOPPLEGANGER) @@ -353,6 +351,7 @@ public void generate(HolderLookup.Provider lookup, Consumer consume Advancement.Builder.advancement() .display(simple(BotaniaItems.lokiRing, "lokiRingMany", FrameType.CHALLENGE)) .parent(lokiRing) + .rewards(AdvancementRewards.Builder.experience(85)) .addCriterion("place_blocks", new LokiPlaceTrigger.Instance( ContextAwarePredicate.ANY, EntityPredicate.ANY, ItemPredicate.ANY, MinMaxBounds.Ints.atLeast(255) )) @@ -360,6 +359,7 @@ public void generate(HolderLookup.Provider lookup, Consumer consume Advancement.Builder.advancement() .display(simple(BotaniaItems.pinkinator, "pinkinator", FrameType.CHALLENGE)) .parent(hardMode) + .rewards(AdvancementRewards.Builder.experience(40)) .addCriterion("use_pinkinator", new UseItemSuccessTrigger.Instance( ContextAwarePredicate.ANY, matchItems(BotaniaItems.pinkinator), LocationPredicate.ANY)) .save(consumer, challengeId("pinkinator")); @@ -368,24 +368,28 @@ ContextAwarePredicate.ANY, matchItems(BotaniaItems.pinkinator), LocationPredicat Advancement.Builder.advancement() .display(simple(Blocks.PLAYER_HEAD, "gaiaGuardianNoArmor", FrameType.CHALLENGE)) .parent(root) + .rewards(AdvancementRewards.Builder.experience(1000)) .addCriterion("no_armor", new GaiaGuardianNoArmorTrigger.Instance( ContextAwarePredicate.ANY, EntityPredicate.ANY, DamageSourcePredicate.ANY)) .save(consumer, challengeId("gaia_guardian_no_armor")); Advancement.Builder.advancement() .display(hidden(BotaniaBlocks.motifDaybloom, "old_flower_pickup", FrameType.CHALLENGE)) .parent(root) + .rewards(AdvancementRewards.Builder.experience(40)) .addCriterion("flower", onPickup(BotaniaBlocks.motifDaybloom, BotaniaBlocks.motifNightshade)) .requirements(RequirementsStrategy.OR) .save(consumer, challengeId("old_flower_pickup")); Advancement.Builder.advancement() .display(simple(BotaniaBlocks.corporeaIndex, "superCorporeaRequest", FrameType.CHALLENGE)) .parent(root) + .rewards(AdvancementRewards.Builder.experience(85)) .addCriterion("big_request", new CorporeaRequestTrigger.Instance( ContextAwarePredicate.ANY, MinMaxBounds.Ints.atLeast(CorporeaIndexBlockEntity.MAX_REQUEST), LocationPredicate.ANY)) .save(consumer, challengeId("super_corporea_request")); Advancement.Builder.advancement() .display(simple(BotaniaItems.terraPick, "rankSSPick", FrameType.CHALLENGE)) .parent(root) + .rewards(AdvancementRewards.Builder.experience(500)) .addCriterion("code_triggered", new ImpossibleTrigger.TriggerInstance()) .save(consumer, challengeId("rank_ss_pick")); CompoundTag level20Shard = new CompoundTag(); @@ -393,17 +397,20 @@ ContextAwarePredicate.ANY, matchItems(BotaniaItems.pinkinator), LocationPredicat Advancement.Builder.advancement() .display(simple(BotaniaItems.laputaShard, "l20ShardUse", FrameType.CHALLENGE)) .parent(root) + .rewards(AdvancementRewards.Builder.experience(65)) .addCriterion("use_l20_shard", InventoryChangeTrigger.TriggerInstance.hasItems( ItemPredicate.Builder.item().of(BotaniaItems.laputaShard).hasNbt(level20Shard).build())) .save(consumer, challengeId("l20_shard_use")); Advancement.Builder.advancement() .display(hidden(Items.BREAD, "alfPortalBread", FrameType.CHALLENGE)) .parent(root) + .rewards(AdvancementRewards.Builder.experience(40)) .addCriterion("bread", new AlfheimPortalBreadTrigger.Instance(ContextAwarePredicate.ANY, LocationPredicate.ANY)) .save(consumer, challengeId("alf_portal_bread")); Advancement.Builder.advancement() .display(simple(BotaniaBlocks.tinyPotato, "tinyPotatoBirthday", FrameType.CHALLENGE)) .parent(root) + .rewards(AdvancementRewards.Builder.experience(40)) .addCriterion("code_triggered", new ImpossibleTrigger.TriggerInstance()) .save(consumer, challengeId("tiny_potato_birthday")); } @@ -415,6 +422,7 @@ private static Advancement relicBindAdvancement(Consumer consumer, return Advancement.Builder.advancement() .display(simple(relicItem, titleKey, FrameType.CHALLENGE)) .parent(parent) + .rewards(AdvancementRewards.Builder.experience(50)) .addCriterion(criterionName, new RelicBindTrigger.Instance(ContextAwarePredicate.ANY, ItemPredicate.Builder.item().of(relicItem).build())) .save(consumer, id);