From 92f255c3742197b6816a07f0604a605791eed62b Mon Sep 17 00:00:00 2001
From: Kieran Wallbanks <kieran.wallbanks@gmail.com>
Date: Wed, 14 May 2025 13:12:32 +0100
Subject: [PATCH] feature(api): Expand ResourcePackCallback to accept
 Identified

This is required for sending resource packs during the config phase.
---
 .../resource/ResourcePackCallback.java        | 44 +++++++++++++++++++
 .../resource/ResourcePackCallbacks.java       | 15 ++++++-
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/api/src/main/java/net/kyori/adventure/resource/ResourcePackCallback.java b/api/src/main/java/net/kyori/adventure/resource/ResourcePackCallback.java
index 64f92f3787..eeda704233 100644
--- a/api/src/main/java/net/kyori/adventure/resource/ResourcePackCallback.java
+++ b/api/src/main/java/net/kyori/adventure/resource/ResourcePackCallback.java
@@ -26,6 +26,7 @@
 import java.util.UUID;
 import java.util.function.BiConsumer;
 import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.identity.Identified;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -47,6 +48,31 @@ public interface ResourcePackCallback {
     return ResourcePackCallbacks.NO_OP;
   }
 
+  /**
+   * Create a pack callback that will only execute the provided functions when the pack application has completed, discarding all intermediate events.
+   *
+   * @param success the success callback
+   * @param failure the failure callback
+   * @return the created callback
+   * @since 4.22.0
+   */
+  static @NotNull ResourcePackCallback onIdentifiedTerminal(final @NotNull BiConsumer<UUID, Identified> success, final @NotNull BiConsumer<UUID, Identified> failure) {
+    return new ResourcePackCallback() {
+      @Override
+      public void packEventReceived(final @NotNull UUID uuid, final @NotNull ResourcePackStatus status, final @NotNull Identified identified) {
+        if (status == ResourcePackStatus.SUCCESSFULLY_LOADED) {
+          success.accept(uuid, identified);
+        } else if (!status.intermediate()) {
+          failure.accept(uuid, identified);
+        }
+      }
+
+      @Override
+      public void packEventReceived(final @NotNull UUID uuid, final @NotNull ResourcePackStatus status, final @NotNull Audience audience) {
+      }
+    };
+  }
+
   /**
    * Create a pack callback that will only execute the provided functions when the pack application has completed, discarding all intermediate events.
    *
@@ -65,12 +91,30 @@ public interface ResourcePackCallback {
     };
   }
 
+  /**
+   * Called when a pack event has been received.
+   *
+   * @param uuid the uuid of the pack that has been applied.
+   * @param status the current pack status
+   * @param identified the identified instance the pack is being applied to
+   * @since 4.22.0
+   */
+  default void packEventReceived(final @NotNull UUID uuid, final @NotNull ResourcePackStatus status, final @NotNull Identified identified) {
+    if (identified instanceof Audience) {
+      this.packEventReceived(uuid, status, (Audience) identified);
+    }
+  }
+
   /**
    * Called when a pack event has been received.
    *
    * <p>If the pack apply action was executed on a group audience, {@code audience} will referer to the
    * individual member audiences the action is executed on. Forwarding audiences may wrap callbacks to ensure they receive the appropriate wrapped audience.</p>
    *
+   * <p>Unless {@link #packEventReceived(UUID, ResourcePackStatus, Identified)} is
+   * overridden, this method will only be called if the {@link Identified} instance
+   * passed to that method is an {@link Audience}.</p>
+   *
    * @param uuid the uuid of the pack that has been applied.
    * @param status the current pack status
    * @param audience the audience the pack is being applied to
diff --git a/api/src/main/java/net/kyori/adventure/resource/ResourcePackCallbacks.java b/api/src/main/java/net/kyori/adventure/resource/ResourcePackCallbacks.java
index f803c6d024..6731f7d5d1 100644
--- a/api/src/main/java/net/kyori/adventure/resource/ResourcePackCallbacks.java
+++ b/api/src/main/java/net/kyori/adventure/resource/ResourcePackCallbacks.java
@@ -23,9 +23,22 @@
  */
 package net.kyori.adventure.resource;
 
+import java.util.UUID;
+import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.identity.Identified;
+import org.jetbrains.annotations.NotNull;
+
 final class ResourcePackCallbacks {
   private ResourcePackCallbacks() {
   }
 
-  static final ResourcePackCallback NO_OP = (uuid, status, audience) -> {};
+  static final ResourcePackCallback NO_OP = new ResourcePackCallback() {
+    @Override
+    public void packEventReceived(final @NotNull UUID uuid, final @NotNull ResourcePackStatus status, final @NotNull Identified identified) {
+    }
+
+    @Override
+    public void packEventReceived(final @NotNull UUID uuid, final @NotNull ResourcePackStatus status, final @NotNull Audience audience) {
+    }
+  };
 }