From 5ab2c8c34ea6091c2ebb6c815308d2ea54ecb651 Mon Sep 17 00:00:00 2001
From: Frank <developer@ambertation.de>
Date: Tue, 19 Dec 2023 13:17:44 +0100
Subject: [PATCH] Fixed Custom Advancement Triggers

---
 .../betterend/advancements/BECriteria.java    | 40 +++++++++----------
 .../EndAdvancementDataProvider.java           |  2 +-
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/main/java/org/betterx/betterend/advancements/BECriteria.java b/src/main/java/org/betterx/betterend/advancements/BECriteria.java
index 93c3b168..77a5f0cc 100644
--- a/src/main/java/org/betterx/betterend/advancements/BECriteria.java
+++ b/src/main/java/org/betterx/betterend/advancements/BECriteria.java
@@ -2,36 +2,36 @@ package org.betterx.betterend.advancements;
 
 import org.betterx.betterend.BetterEnd;
 
-import net.minecraft.advancements.CriteriaTriggers;
-import net.minecraft.advancements.critereon.ContextAwarePredicate;
+import net.minecraft.advancements.Criterion;
+import net.minecraft.advancements.CriterionTrigger;
 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 static PlayerTrigger PORTAL_ON;
     public static PlayerTrigger PORTAL_TRAVEL;
     public static PlayerTrigger INFUSION_FINISHED;
 
-    public static PlayerTrigger.TriggerInstance PORTAL_ON_TRIGGER;
-    public static PlayerTrigger.TriggerInstance PORTAL_TRAVEL_TRIGGER;
-    public static PlayerTrigger.TriggerInstance INFUSION_FINISHED_TRIGGER;
+    public static Criterion<PlayerTrigger.TriggerInstance> PORTAL_ON_TRIGGER;
+    public static Criterion<PlayerTrigger.TriggerInstance> PORTAL_TRAVEL_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() {
-        PORTAL_ON = CriteriaTriggers.register(new PlayerTrigger(BetterEnd.makeID("portal_on")));
-        PORTAL_TRAVEL = CriteriaTriggers.register(new PlayerTrigger(BetterEnd.makeID("portal_travel")));
-        INFUSION_FINISHED = CriteriaTriggers.register(new PlayerTrigger(BetterEnd.makeID("infusion_finished")));
+        PORTAL_ON = register(BetterEnd.makeID("portal_on"), new PlayerTrigger());
+        PORTAL_TRAVEL = register(BetterEnd.makeID("portal_travel"), new PlayerTrigger());
+        INFUSION_FINISHED = register(BetterEnd.makeID("infusion_finished"), new PlayerTrigger());
 
-        PORTAL_ON_TRIGGER = new PlayerTrigger.TriggerInstance(
-                PORTAL_ON.getId(),
-                ContextAwarePredicate.ANY
-        );
-        PORTAL_TRAVEL_TRIGGER = new PlayerTrigger.TriggerInstance(
-                PORTAL_TRAVEL.getId(),
-                ContextAwarePredicate.ANY
-        );
-        INFUSION_FINISHED_TRIGGER = new PlayerTrigger.TriggerInstance(
-                INFUSION_FINISHED.getId(),
-                ContextAwarePredicate.ANY
-        );
+        PORTAL_ON_TRIGGER = PORTAL_ON.createCriterion(new PlayerTrigger.TriggerInstance(Optional.empty()));
+        PORTAL_TRAVEL_TRIGGER = PORTAL_TRAVEL.createCriterion(new PlayerTrigger.TriggerInstance(Optional.empty()));
+        INFUSION_FINISHED_TRIGGER = INFUSION_FINISHED.createCriterion(new PlayerTrigger.TriggerInstance(Optional.empty()));
     }
 }
diff --git a/src/main/java/org/betterx/datagen/betterend/advancement/EndAdvancementDataProvider.java b/src/main/java/org/betterx/datagen/betterend/advancement/EndAdvancementDataProvider.java
index 10046c4f..64473c80 100644
--- a/src/main/java/org/betterx/datagen/betterend/advancement/EndAdvancementDataProvider.java
+++ b/src/main/java/org/betterx/datagen/betterend/advancement/EndAdvancementDataProvider.java
@@ -41,7 +41,7 @@ public class EndAdvancementDataProvider extends AdvancementDataProvider {
                 .endDisplay()
                 .addCriterion(
                         "welcome",
-                        PlayerTrigger.TriggerInstance.located(LocationPredicate.ANY)
+                        PlayerTrigger.TriggerInstance.located(LocationPredicate.Builder.location())
                 )
                 .requireOne()
                 .build();