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

Fixed Custom Advancement Triggers

Browse source
This commit is contained in:
Frank 2023-12-19 13:17:44 +01:00
parent 3de73aa1dc
commit 5ab2c8c34e
2 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/main/java/org/betterx/betterend/advancements/BECriteria.java
View file

@ -2,36 +2,36 @@ package org.betterx.betterend.advancements;
import org.betterx.betterend.BetterEnd; import org.betterx.betterend.BetterEnd;
import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.advancements.Criterion;
import net.minecraft.advancements.critereon.ContextAwarePredicate; import net.minecraft.advancements.CriterionTrigger;
import net.minecraft.advancements.critereon.PlayerTrigger; import net.minecraft.advancements.critereon.PlayerTrigger;
import net.minecraft.core.Registry;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.resources.ResourceLocation;
import java.util.Optional;
public class BECriteria { public class BECriteria {
public static PlayerTrigger PORTAL_ON; public static PlayerTrigger PORTAL_ON;
public static PlayerTrigger PORTAL_TRAVEL; public static PlayerTrigger PORTAL_TRAVEL;
public static PlayerTrigger INFUSION_FINISHED; public static PlayerTrigger INFUSION_FINISHED;
public static PlayerTrigger.TriggerInstance PORTAL_ON_TRIGGER; public static Criterion<PlayerTrigger.TriggerInstance> PORTAL_ON_TRIGGER;
public static PlayerTrigger.TriggerInstance PORTAL_TRAVEL_TRIGGER; public static Criterion<PlayerTrigger.TriggerInstance> PORTAL_TRAVEL_TRIGGER;
public static PlayerTrigger.TriggerInstance INFUSION_FINISHED_TRIGGER; public static Criterion<PlayerTrigger.TriggerInstance> INFUSION_FINISHED_TRIGGER;
public static <T extends CriterionTrigger<?>> T register(ResourceLocation id, T trigger) {
return Registry.register(BuiltInRegistries.TRIGGER_TYPES, id, trigger);
}
public static void register() { public static void register() {
PORTAL_ON = CriteriaTriggers.register(new PlayerTrigger(BetterEnd.makeID("portal_on"))); PORTAL_ON = register(BetterEnd.makeID("portal_on"), new PlayerTrigger());
PORTAL_TRAVEL = CriteriaTriggers.register(new PlayerTrigger(BetterEnd.makeID("portal_travel"))); PORTAL_TRAVEL = register(BetterEnd.makeID("portal_travel"), new PlayerTrigger());
INFUSION_FINISHED = CriteriaTriggers.register(new PlayerTrigger(BetterEnd.makeID("infusion_finished"))); INFUSION_FINISHED = register(BetterEnd.makeID("infusion_finished"), new PlayerTrigger());
PORTAL_ON_TRIGGER = new PlayerTrigger.TriggerInstance( PORTAL_ON_TRIGGER = PORTAL_ON.createCriterion(new PlayerTrigger.TriggerInstance(Optional.empty()));
PORTAL_ON.getId(), PORTAL_TRAVEL_TRIGGER = PORTAL_TRAVEL.createCriterion(new PlayerTrigger.TriggerInstance(Optional.empty()));
ContextAwarePredicate.ANY INFUSION_FINISHED_TRIGGER = INFUSION_FINISHED.createCriterion(new PlayerTrigger.TriggerInstance(Optional.empty()));
);
PORTAL_TRAVEL_TRIGGER = new PlayerTrigger.TriggerInstance(
PORTAL_TRAVEL.getId(),
ContextAwarePredicate.ANY
);
INFUSION_FINISHED_TRIGGER = new PlayerTrigger.TriggerInstance(
INFUSION_FINISHED.getId(),
ContextAwarePredicate.ANY
);
} }
} }

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

@ -41,7 +41,7 @@ public class EndAdvancementDataProvider extends AdvancementDataProvider {
.endDisplay() .endDisplay()
.addCriterion( .addCriterion(
"welcome", "welcome",
PlayerTrigger.TriggerInstance.located(LocationPredicate.ANY) PlayerTrigger.TriggerInstance.located(LocationPredicate.Builder.location())
) )
.requireOne() .requireOne()
.build(); .build();