From 6cf4d7fccb9e8ce92daaedadccac7d55b5f93696 Mon Sep 17 00:00:00 2001
From: Frank <developer@ambertation.de>
Date: Tue, 19 Dec 2023 15:26:39 +0100
Subject: [PATCH] Use `AdvancementHolder` when hooking into other awards

---
 .../betterx/betterend/events/PlayerAdvancementsCallback.java  | 4 ++--
 .../java/org/betterx/betterend/integration/Integrations.java  | 2 +-
 .../betterend/mixin/common/PlayerAdvancementsMixin.java       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/betterx/betterend/events/PlayerAdvancementsCallback.java b/src/main/java/org/betterx/betterend/events/PlayerAdvancementsCallback.java
index 6d4bdf8b..b528bebb 100644
--- a/src/main/java/org/betterx/betterend/events/PlayerAdvancementsCallback.java
+++ b/src/main/java/org/betterx/betterend/events/PlayerAdvancementsCallback.java
@@ -1,6 +1,6 @@
 package org.betterx.betterend.events;
 
-import net.minecraft.advancements.Advancement;
+import net.minecraft.advancements.AdvancementHolder;
 import net.minecraft.server.level.ServerPlayer;
 
 import net.fabricmc.fabric.api.event.Event;
@@ -17,5 +17,5 @@ public interface PlayerAdvancementsCallback {
             }
     );
 
-    void onAdvancementComplete(ServerPlayer player, Advancement advancement, String criterionName);
+    void onAdvancementComplete(ServerPlayer player, AdvancementHolder advancement, String criterionName);
 }
diff --git a/src/main/java/org/betterx/betterend/integration/Integrations.java b/src/main/java/org/betterx/betterend/integration/Integrations.java
index 8e02353d..8d86621d 100644
--- a/src/main/java/org/betterx/betterend/integration/Integrations.java
+++ b/src/main/java/org/betterx/betterend/integration/Integrations.java
@@ -28,7 +28,7 @@ public class Integrations {
 
             PlayerAdvancementsCallback.PLAYER_ADVANCEMENT_COMPLETE.register((player, advancement, criterionName) -> {
                 ResourceLocation advId = new ResourceLocation("minecraft:end/enter_end_gateway");
-                if (advId.equals(advancement.getId())) {
+                if (advId.equals(advancement.id())) {
                     player.addItem(new ItemStack(GuideBookItem.GUIDE_BOOK));
                 }
             });
diff --git a/src/main/java/org/betterx/betterend/mixin/common/PlayerAdvancementsMixin.java b/src/main/java/org/betterx/betterend/mixin/common/PlayerAdvancementsMixin.java
index 0139bec2..11cf9815 100644
--- a/src/main/java/org/betterx/betterend/mixin/common/PlayerAdvancementsMixin.java
+++ b/src/main/java/org/betterx/betterend/mixin/common/PlayerAdvancementsMixin.java
@@ -2,7 +2,7 @@ package org.betterx.betterend.mixin.common;
 
 import org.betterx.betterend.events.PlayerAdvancementsCallback;
 
-import net.minecraft.advancements.Advancement;
+import net.minecraft.advancements.AdvancementHolder;
 import net.minecraft.server.PlayerAdvancements;
 import net.minecraft.server.level.ServerPlayer;
 
@@ -19,7 +19,7 @@ public abstract class PlayerAdvancementsMixin {
     private ServerPlayer player;
 
     @Inject(method = "award", at = @At(value = "INVOKE", target = "Lnet/minecraft/advancements/AdvancementRewards;grant(Lnet/minecraft/server/level/ServerPlayer;)V", shift = Shift.AFTER))
-    public void be_award(Advancement advancement, String criterionName, CallbackInfoReturnable<Boolean> info) {
+    public void be_award(AdvancementHolder advancement, String criterionName, CallbackInfoReturnable<Boolean> info) {
         PlayerAdvancementsCallback.PLAYER_ADVANCEMENT_COMPLETE.invoker()
                                                               .onAdvancementComplete(
                                                                       player,