MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Removed explicit frame and requirement methods

Browse source
This commit is contained in:
Frank 2023-12-19 12:49:34 +01:00
parent a553bdcc7b
commit 5280488024
1 changed files with 42 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

86
src/main/java/org/betterx/datagen/betterend/advancement/EndAdvancementDataProvider.java
View file

@ -12,8 +12,6 @@ import org.betterx.betterend.registry.EndStructures;
import org.betterx.betterend.registry.EndTemplates; import org.betterx.betterend.registry.EndTemplates;
import org.betterx.betterend.world.biome.EndBiome; import org.betterx.betterend.world.biome.EndBiome;
import net.minecraft.advancements.FrameType;
import net.minecraft.advancements.RequirementsStrategy;
import net.minecraft.advancements.critereon.ChangeDimensionTrigger; import net.minecraft.advancements.critereon.ChangeDimensionTrigger;
import net.minecraft.advancements.critereon.LocationPredicate; import net.minecraft.advancements.critereon.LocationPredicate;
import net.minecraft.advancements.critereon.PlayerTrigger; import net.minecraft.advancements.critereon.PlayerTrigger;
@ -37,7 +35,7 @@ public class EndAdvancementDataProvider extends AdvancementDataProvider {
ResourceLocation root = AdvancementManager.Builder ResourceLocation root = AdvancementManager.Builder
.create(BetterEnd.makeID("root")) .create(BetterEnd.makeID("root"))
.startDisplay(EndBlocks.END_MYCELIUM) .startDisplay(EndBlocks.END_MYCELIUM)
.frame(FrameType.TASK) .task()
.hideFromChat() .hideFromChat()
.background(new ResourceLocation("textures/gui/advancements/backgrounds/end.png")) .background(new ResourceLocation("textures/gui/advancements/backgrounds/end.png"))
.endDisplay() .endDisplay()
@ -45,7 +43,7 @@ public class EndAdvancementDataProvider extends AdvancementDataProvider {
"welcome", "welcome",
PlayerTrigger.TriggerInstance.located(LocationPredicate.ANY) PlayerTrigger.TriggerInstance.located(LocationPredicate.ANY)
) )
.requirements(RequirementsStrategy.OR) .requireOne()
.build(); .build();
ResourceLocation enterEnd = AdvancementManager.Builder ResourceLocation enterEnd = AdvancementManager.Builder
@ -59,17 +57,17 @@ public class EndAdvancementDataProvider extends AdvancementDataProvider {
.TriggerInstance .TriggerInstance
.changedDimensionTo(Level.END) .changedDimensionTo(Level.END)
) )
.requirements(RequirementsStrategy.OR) .requireOne()
.build(); .build();
ResourceLocation portal = AdvancementManager.Builder ResourceLocation portal = AdvancementManager.Builder
.create(BetterEnd.makeID("portal")) .create(BetterEnd.makeID("portal"))
.parent(enterEnd) .parent(enterEnd)
.startDisplay(EndBlocks.ETERNAL_PEDESTAL) .startDisplay(EndBlocks.ETERNAL_PEDESTAL)
.frame(FrameType.GOAL) .goal()
.endDisplay() .endDisplay()
.addAtStructureCriterion("eternal_portal", EndStructures.ETERNAL_PORTAL) .addAtStructureCriterion("eternal_portal", EndStructures.ETERNAL_PORTAL)
.requirements(RequirementsStrategy.OR) .requireOne()
.build(); .build();
ResourceLocation portalOn = AdvancementManager.Builder ResourceLocation portalOn = AdvancementManager.Builder
@ -78,27 +76,27 @@ public class EndAdvancementDataProvider extends AdvancementDataProvider {
.startDisplay(EndItems.ETERNAL_CRYSTAL) .startDisplay(EndItems.ETERNAL_CRYSTAL)
.endDisplay() .endDisplay()
.addCriterion("turn_on", BECriteria.PORTAL_ON_TRIGGER) .addCriterion("turn_on", BECriteria.PORTAL_ON_TRIGGER)
.requirements(RequirementsStrategy.OR) .requireOne()
.build(); .build();
ResourceLocation portalTravel = AdvancementManager.Builder ResourceLocation portalTravel = AdvancementManager.Builder
.create(BetterEnd.makeID("portal_travel")) .create(BetterEnd.makeID("portal_travel"))
.parent(portalOn) .parent(portalOn)
.startDisplay(Items.GRASS_BLOCK) .startDisplay(Items.GRASS_BLOCK)
.frame(FrameType.CHALLENGE) .challenge()
.endDisplay() .endDisplay()
.addCriterion("travel", BECriteria.PORTAL_TRAVEL_TRIGGER) .addCriterion("travel", BECriteria.PORTAL_TRAVEL_TRIGGER)
.requirements(RequirementsStrategy.OR) .requireOne()
.build(); .build();
ResourceLocation allTheBiomes = AdvancementManager.Builder ResourceLocation allTheBiomes = AdvancementManager.Builder
.create(BetterEnd.makeID("all_the_biomes")) .create(BetterEnd.makeID("all_the_biomes"))
.parent(enterEnd) .parent(enterEnd)
.startDisplay(EndItems.AETERNIUM_BOOTS) .startDisplay(EndItems.AETERNIUM_BOOTS)
.frame(FrameType.CHALLENGE) .challenge()
.endDisplay() .endDisplay()
.addVisitBiomesCriterion(EndBiome.getAllBeBiomes().stream().map(b -> b.getBiomeKey()).toList()) .addVisitBiomesCriterion(EndBiome.getAllBeBiomes().stream().map(b -> b.getBiomeKey()).toList())
.requirements(RequirementsStrategy.AND) .requireAll()
.rewardXP(1500) .rewardXP(1500)
.build(); .build();
@ -106,22 +104,22 @@ public class EndAdvancementDataProvider extends AdvancementDataProvider {
.create(BetterEnd.makeID("village")) .create(BetterEnd.makeID("village"))
.parent(allTheBiomes) .parent(allTheBiomes)
.startDisplay(EndBlocks.TENANEA.getBlock(WoodSlots.DOOR)) .startDisplay(EndBlocks.TENANEA.getBlock(WoodSlots.DOOR))
.frame(FrameType.GOAL) .goal()
.endDisplay() .endDisplay()
.addAtStructureCriterion("end_village", EndStructures.END_VILLAGE) .addAtStructureCriterion("end_village", EndStructures.END_VILLAGE)
.requirements(RequirementsStrategy.OR) .requireOne()
.build(); .build();
ResourceLocation allElytras = AdvancementManager.Builder ResourceLocation allElytras = AdvancementManager.Builder
.create(BetterEnd.makeID("all_elytras")) .create(BetterEnd.makeID("all_elytras"))
.parent(enterEnd) .parent(enterEnd)
.startDisplay(EndItems.CRYSTALITE_ELYTRA) .startDisplay(EndItems.CRYSTALITE_ELYTRA)
.frame(FrameType.GOAL) .goal()
.endDisplay() .endDisplay()
.addInventoryChangedCriterion("vanilla", Items.ELYTRA) .addInventoryChangedCriterion("vanilla", Items.ELYTRA)
.addInventoryChangedCriterion("crystalite", EndItems.CRYSTALITE_ELYTRA) .addInventoryChangedCriterion("crystalite", EndItems.CRYSTALITE_ELYTRA)
.addInventoryChangedCriterion("armored", EndItems.ARMORED_ELYTRA) .addInventoryChangedCriterion("armored", EndItems.ARMORED_ELYTRA)
.requirements(RequirementsStrategy.AND) .requireAll()
.build(); .build();
ResourceLocation infusion = AdvancementManager.Builder ResourceLocation infusion = AdvancementManager.Builder
@ -130,17 +128,17 @@ public class EndAdvancementDataProvider extends AdvancementDataProvider {
.startDisplay(EndBlocks.INFUSION_PEDESTAL) .startDisplay(EndBlocks.INFUSION_PEDESTAL)
.endDisplay() .endDisplay()
.addInventoryChangedCriterion("infusion_pedestal", EndBlocks.INFUSION_PEDESTAL) .addInventoryChangedCriterion("infusion_pedestal", EndBlocks.INFUSION_PEDESTAL)
.requirements(RequirementsStrategy.OR) .requireOne()
.build(); .build();
ResourceLocation infusionFinished = AdvancementManager.Builder ResourceLocation infusionFinished = AdvancementManager.Builder
.create(BetterEnd.makeID("infusion_finished")) .create(BetterEnd.makeID("infusion_finished"))
.parent(infusion) .parent(infusion)
.startDisplay(Items.ENDER_EYE) .startDisplay(Items.ENDER_EYE)
.frame(FrameType.GOAL) .goal()
.endDisplay() .endDisplay()
.addCriterion("finished", BECriteria.INFUSION_FINISHED_TRIGGER) .addCriterion("finished", BECriteria.INFUSION_FINISHED_TRIGGER)
.requirements(RequirementsStrategy.OR) .requireOne()
.build(); .build();
@ -148,7 +146,7 @@ public class EndAdvancementDataProvider extends AdvancementDataProvider {
.create(BetterEnd.makeID("all_the_templates")) .create(BetterEnd.makeID("all_the_templates"))
.parent(enterEnd) .parent(enterEnd)
.startDisplay(EndTemplates.TOOL_ASSEMBLY) .startDisplay(EndTemplates.TOOL_ASSEMBLY)
.frame(FrameType.CHALLENGE) .challenge()
.endDisplay() .endDisplay()
.addInventoryChangedAnyCriterion("got_handle", EndTemplates.HANDLE_ATTACHMENT) .addInventoryChangedAnyCriterion("got_handle", EndTemplates.HANDLE_ATTACHMENT)
.addInventoryChangedAnyCriterion("got_tool", EndTemplates.TOOL_ASSEMBLY) .addInventoryChangedAnyCriterion("got_tool", EndTemplates.TOOL_ASSEMBLY)
@ -158,7 +156,7 @@ public class EndAdvancementDataProvider extends AdvancementDataProvider {
.addInventoryChangedAnyCriterion("got_aeternium", EndTemplates.AETERNIUM_UPGRADE) .addInventoryChangedAnyCriterion("got_aeternium", EndTemplates.AETERNIUM_UPGRADE)
.addInventoryChangedAnyCriterion("got_thallasium", EndTemplates.THALLASIUM_UPGRADE) .addInventoryChangedAnyCriterion("got_thallasium", EndTemplates.THALLASIUM_UPGRADE)
.addInventoryChangedAnyCriterion("got_netherite", EndTemplates.NETHERITE_UPGRADE) .addInventoryChangedAnyCriterion("got_netherite", EndTemplates.NETHERITE_UPGRADE)
.requirements(RequirementsStrategy.AND) .requireAll()
.rewardXP(1500) .rewardXP(1500)
.build(); .build();
@ -170,7 +168,7 @@ public class EndAdvancementDataProvider extends AdvancementDataProvider {
.addInventoryChangedCriterion("got_diamond_hammer", EndItems.DIAMOND_HAMMER) .addInventoryChangedCriterion("got_diamond_hammer", EndItems.DIAMOND_HAMMER)
.addInventoryChangedCriterion("got_thallasium_hammer", EndBlocks.THALLASIUM.hammer) .addInventoryChangedCriterion("got_thallasium_hammer", EndBlocks.THALLASIUM.hammer)
.addInventoryChangedCriterion("got_terminite_hammer", EndBlocks.TERMINITE.hammer) .addInventoryChangedCriterion("got_terminite_hammer", EndBlocks.TERMINITE.hammer)
.requirements(RequirementsStrategy.OR) .requireOne()
.build(); .build();
ResourceLocation thallasiumAnvil = AdvancementManager.Builder ResourceLocation thallasiumAnvil = AdvancementManager.Builder
@ -179,7 +177,7 @@ public class EndAdvancementDataProvider extends AdvancementDataProvider {
.startDisplay(EndBlocks.THALLASIUM.anvilBlock) .startDisplay(EndBlocks.THALLASIUM.anvilBlock)
.endDisplay() .endDisplay()
.addInventoryChangedCriterion("got_thallasium_anvil", EndBlocks.THALLASIUM.anvilBlock) .addInventoryChangedCriterion("got_thallasium_anvil", EndBlocks.THALLASIUM.anvilBlock)
.requirements(RequirementsStrategy.OR) .requireOne()
.build(); .build();
ResourceLocation thallasiumPlate = AdvancementManager.Builder ResourceLocation thallasiumPlate = AdvancementManager.Builder
@ -188,7 +186,7 @@ public class EndAdvancementDataProvider extends AdvancementDataProvider {
.startDisplay(EndBlocks.THALLASIUM.forgedPlate) .startDisplay(EndBlocks.THALLASIUM.forgedPlate)
.endDisplay() .endDisplay()
.addInventoryChangedCriterion("got_thallasium_plate", EndBlocks.THALLASIUM.forgedPlate) .addInventoryChangedCriterion("got_thallasium_plate", EndBlocks.THALLASIUM.forgedPlate)
.requirements(RequirementsStrategy.OR) .requireOne()
.build(); .build();
ResourceLocation terminiteAnvil = AdvancementManager.Builder ResourceLocation terminiteAnvil = AdvancementManager.Builder
@ -197,7 +195,7 @@ public class EndAdvancementDataProvider extends AdvancementDataProvider {
.startDisplay(EndBlocks.TERMINITE.anvilBlock) .startDisplay(EndBlocks.TERMINITE.anvilBlock)
.endDisplay() .endDisplay()
.addInventoryChangedCriterion("got_terminite_anvil", EndBlocks.TERMINITE.anvilBlock) .addInventoryChangedCriterion("got_terminite_anvil", EndBlocks.TERMINITE.anvilBlock)
.requirements(RequirementsStrategy.OR) .requireOne()
.build(); .build();
ResourceLocation terminitePlate = AdvancementManager.Builder ResourceLocation terminitePlate = AdvancementManager.Builder
@ -206,17 +204,17 @@ public class EndAdvancementDataProvider extends AdvancementDataProvider {
.startDisplay(EndBlocks.TERMINITE.forgedPlate) .startDisplay(EndBlocks.TERMINITE.forgedPlate)
.endDisplay() .endDisplay()
.addInventoryChangedCriterion("got_erminite_plate", EndBlocks.TERMINITE.forgedPlate) .addInventoryChangedCriterion("got_erminite_plate", EndBlocks.TERMINITE.forgedPlate)
.requirements(RequirementsStrategy.OR) .requireOne()
.build(); .build();
ResourceLocation aeterniumAnvil = AdvancementManager.Builder ResourceLocation aeterniumAnvil = AdvancementManager.Builder
.create(BetterEnd.makeID("aeternium_anvil")) .create(BetterEnd.makeID("aeternium_anvil"))
.parent(terminiteAnvil) .parent(terminiteAnvil)
.startDisplay(EndBlocks.AETERNIUM_ANVIL) .startDisplay(EndBlocks.AETERNIUM_ANVIL)
.frame(FrameType.CHALLENGE) .challenge()
.endDisplay() .endDisplay()
.addInventoryChangedCriterion("got_aeternium_anvil", EndBlocks.AETERNIUM_ANVIL) .addInventoryChangedCriterion("got_aeternium_anvil", EndBlocks.AETERNIUM_ANVIL)
.requirements(RequirementsStrategy.OR) .requireOne()
.rewardXP(500) .rewardXP(500)
.build(); .build();
@ -226,7 +224,7 @@ public class EndAdvancementDataProvider extends AdvancementDataProvider {
.startDisplay(EndItems.AETERNIUM_HAMMER_HEAD) .startDisplay(EndItems.AETERNIUM_HAMMER_HEAD)
.endDisplay() .endDisplay()
.addInventoryChangedCriterion("got_aeternium_hammer_head", EndItems.AETERNIUM_HAMMER_HEAD) .addInventoryChangedCriterion("got_aeternium_hammer_head", EndItems.AETERNIUM_HAMMER_HEAD)
.requirements(RequirementsStrategy.OR) .requireOne()
.build(); .build();
ResourceLocation aeterniumHammer = AdvancementManager.Builder ResourceLocation aeterniumHammer = AdvancementManager.Builder
@ -235,55 +233,55 @@ public class EndAdvancementDataProvider extends AdvancementDataProvider {
.startDisplay(EndItems.AETERNIUM_HAMMER) .startDisplay(EndItems.AETERNIUM_HAMMER)
.endDisplay() .endDisplay()
.addInventoryChangedCriterion("got_aeternium_hammer", EndItems.AETERNIUM_HAMMER) .addInventoryChangedCriterion("got_aeternium_hammer", EndItems.AETERNIUM_HAMMER)
.requirements(RequirementsStrategy.OR) .requireOne()
.build(); .build();
ResourceLocation aeterniumPlate = AdvancementManager.Builder ResourceLocation aeterniumPlate = AdvancementManager.Builder
.create(BetterEnd.makeID("aeternium_plate")) .create(BetterEnd.makeID("aeternium_plate"))
.parent(aeterniumHammer) .parent(aeterniumHammer)
.startDisplay(EndItems.AETERNIUM_FORGED_PLATE) .startDisplay(EndItems.AETERNIUM_FORGED_PLATE)
.frame(FrameType.GOAL) .goal()
.endDisplay() .endDisplay()
.addInventoryChangedCriterion("got_aeternium_plate", EndItems.AETERNIUM_FORGED_PLATE) .addInventoryChangedCriterion("got_aeternium_plate", EndItems.AETERNIUM_FORGED_PLATE)
.requirements(RequirementsStrategy.OR) .requireOne()
.rewardXP(200) .rewardXP(200)
.build(); .build();
ResourceLocation thallasiumArmor = addArmor(EndBlocks.THALLASIUM) ResourceLocation thallasiumArmor = addArmor(EndBlocks.THALLASIUM)
.parent(thallasiumPlate) .parent(thallasiumPlate)
.requirements(RequirementsStrategy.OR) .requireOne()
.build(); .build();
ResourceLocation thallasiumHead = addToolHeads(EndBlocks.THALLASIUM) ResourceLocation thallasiumHead = addToolHeads(EndBlocks.THALLASIUM)
.parent(thallasiumAnvil) .parent(thallasiumAnvil)
.requirements(RequirementsStrategy.OR) .requireOne()
.build(); .build();
ResourceLocation thallasium = addTools(EndBlocks.THALLASIUM) ResourceLocation thallasium = addTools(EndBlocks.THALLASIUM)
.parent(thallasiumHead) .parent(thallasiumHead)
.requirements(RequirementsStrategy.OR) .requireOne()
.build(); .build();
ResourceLocation terminiteHead = addToolHeads(EndBlocks.TERMINITE) ResourceLocation terminiteHead = addToolHeads(EndBlocks.TERMINITE)
.parent(terminiteAnvil) .parent(terminiteAnvil)
.requirements(RequirementsStrategy.OR) .requireOne()
.build(); .build();
ResourceLocation terminite = addTools(EndBlocks.TERMINITE) ResourceLocation terminite = addTools(EndBlocks.TERMINITE)
.parent(terminiteHead) .parent(terminiteHead)
.requirements(RequirementsStrategy.OR) .requireOne()
.build(); .build();
ResourceLocation terminiteArmor = addArmor(EndBlocks.TERMINITE) ResourceLocation terminiteArmor = addArmor(EndBlocks.TERMINITE)
.parent(terminitePlate) .parent(terminitePlate)
.requirements(RequirementsStrategy.OR) .requireOne()
.build(); .build();
ResourceLocation aeterniumHead = AdvancementManager.Builder ResourceLocation aeterniumHead = AdvancementManager.Builder
.create(BetterEnd.makeID("aeternium_tool_head")) .create(BetterEnd.makeID("aeternium_tool_head"))
.startDisplay(EndItems.AETERNIUM_PICKAXE_HEAD) .startDisplay(EndItems.AETERNIUM_PICKAXE_HEAD)
.frame(FrameType.GOAL) .goal()
.endDisplay() .endDisplay()
.parent(aeterniumHammer) .parent(aeterniumHammer)
.addInventoryChangedCriterion("got_aeternium_pickaxe_head", EndItems.AETERNIUM_PICKAXE_HEAD) .addInventoryChangedCriterion("got_aeternium_pickaxe_head", EndItems.AETERNIUM_PICKAXE_HEAD)
@ -295,14 +293,14 @@ public class EndAdvancementDataProvider extends AdvancementDataProvider {
EndItems.AETERNIUM_SWORD_BLADE, EndItems.AETERNIUM_SWORD_BLADE,
EndItems.AETERNIUM_SWORD_HANDLE EndItems.AETERNIUM_SWORD_HANDLE
) )
.requirements(RequirementsStrategy.AND) .requireAll()
.rewardXP(200) .rewardXP(200)
.build(); .build();
ResourceLocation aeternium = AdvancementManager.Builder ResourceLocation aeternium = AdvancementManager.Builder
.create(BetterEnd.makeID("aeternium_tool")) .create(BetterEnd.makeID("aeternium_tool"))
.startDisplay(EndItems.AETERNIUM_PICKAXE) .startDisplay(EndItems.AETERNIUM_PICKAXE)
.frame(FrameType.CHALLENGE) .challenge()
.endDisplay() .endDisplay()
.parent(aeterniumHead) .parent(aeterniumHead)
.addInventoryChangedCriterion("got_aeternium_pickaxe", EndItems.AETERNIUM_PICKAXE) .addInventoryChangedCriterion("got_aeternium_pickaxe", EndItems.AETERNIUM_PICKAXE)
@ -310,21 +308,21 @@ public class EndAdvancementDataProvider extends AdvancementDataProvider {
.addInventoryChangedCriterion("got_aeternium_axe", EndItems.AETERNIUM_AXE) .addInventoryChangedCriterion("got_aeternium_axe", EndItems.AETERNIUM_AXE)
.addInventoryChangedCriterion("got_aeternium_shovel", EndItems.AETERNIUM_SHOVEL) .addInventoryChangedCriterion("got_aeternium_shovel", EndItems.AETERNIUM_SHOVEL)
.addInventoryChangedCriterion("got_aeternium_sword", EndItems.AETERNIUM_SWORD) .addInventoryChangedCriterion("got_aeternium_sword", EndItems.AETERNIUM_SWORD)
.requirements(RequirementsStrategy.AND) .requireAll()
.rewardXP(2000) .rewardXP(2000)
.build(); .build();
ResourceLocation aeterniumArmor = AdvancementManager.Builder ResourceLocation aeterniumArmor = AdvancementManager.Builder
.create(BetterEnd.makeID("aeternium_armor")) .create(BetterEnd.makeID("aeternium_armor"))
.startDisplay(EndItems.AETERNIUM_CHESTPLATE) .startDisplay(EndItems.AETERNIUM_CHESTPLATE)
.frame(FrameType.CHALLENGE) .challenge()
.endDisplay() .endDisplay()
.parent(aeterniumPlate) .parent(aeterniumPlate)
.addInventoryChangedCriterion("got_aeternium_helmet", EndItems.AETERNIUM_HELMET) .addInventoryChangedCriterion("got_aeternium_helmet", EndItems.AETERNIUM_HELMET)
.addInventoryChangedCriterion("got_aeternium_chestplate", EndItems.AETERNIUM_CHESTPLATE) .addInventoryChangedCriterion("got_aeternium_chestplate", EndItems.AETERNIUM_CHESTPLATE)
.addInventoryChangedCriterion("got_aeternium_leggings", EndItems.AETERNIUM_LEGGINGS) .addInventoryChangedCriterion("got_aeternium_leggings", EndItems.AETERNIUM_LEGGINGS)
.addInventoryChangedCriterion("got_aeternium_boots", EndItems.AETERNIUM_BOOTS) .addInventoryChangedCriterion("got_aeternium_boots", EndItems.AETERNIUM_BOOTS)
.requirements(RequirementsStrategy.AND) .requireAll()
.rewardXP(2000) .rewardXP(2000)
.build(); .build();
} }