From cdcf83267395765cb41ddc2295cacec76b5bedb5 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Mon, 25 Dec 2023 02:51:44 -0800
Subject: [PATCH] Update to adventure 4.15 (#10045)

---
 patches/api/Adventure.patch                   |  95 +++++++++--
 ...low-plugins-to-use-SLF4J-for-logging.patch |   2 +-
 patches/api/Complete-resource-pack-API.patch  |  27 ++--
 .../server/Add-PlayerKickEvent-causes.patch   |   4 +-
 patches/server/Adventure.patch                | 149 +++++++++++++++---
 patches/server/Brand-support.patch            |   2 +-
 .../server/Complete-resource-pack-API.patch   |  20 +--
 patches/server/Temp-adventure-update.patch    |  32 ----
 ...oleAppender-for-console-improvements.patch |   2 +-
 ...rt-serverside-behavior-of-keepalives.patch |   1 +
 10 files changed, 232 insertions(+), 102 deletions(-)
 delete mode 100644 patches/server/Temp-adventure-update.patch

diff --git a/patches/api/Adventure.patch b/patches/api/Adventure.patch
index acb17cdd86..11a1296aa8 100644
--- a/patches/api/Adventure.patch
+++ b/patches/api/Adventure.patch
@@ -14,7 +14,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
  val annotationsVersion = "24.0.1"
  val bungeeCordChatVersion = "1.20-R0.1"
-+val adventureVersion = "4.14.0"
++val adventureVersion = "4.15.0"
 +val apiAndDocs: Configuration by configurations.creating {
 +    attributes {
 +        attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
@@ -2481,11 +2481,21 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       */
      @Deprecated
      public void setTexturePack(@NotNull String url);
+@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      * @throws IllegalArgumentException Thrown if the URL is null.
+      * @throws IllegalArgumentException Thrown if the URL is too long. The
+      *     length restriction is an implementation specific arbitrary value.
++     * @deprecated in favour of {@link #sendResourcePacks(net.kyori.adventure.resource.ResourcePackRequest)}
+      */
++    @Deprecated // Paper - adventure
+     public void setResourcePack(@NotNull String url);
+ 
+     /**
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     pack correctly.
       * </ul>
       *
-+     * @deprecated in favour of {@link #setResourcePack(UUID, String, byte[], net.kyori.adventure.text.Component, boolean)}
++     * @deprecated in favour of {@link #sendResourcePacks(net.kyori.adventure.resource.ResourcePackRequest)}
       * @param url The URL from which the client will download the resource
       *     pack. The string must contain only US-ASCII characters and should
       *     be encoded as per RFC 1738.
@@ -2498,10 +2508,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
      /**
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      *     {@link PlayerResourcePackStatusEvent} to figure out whether or not
+      *     the player loaded the pack!
+      * <li>To remove a resource pack you can use
+-     *     {@link #removeResourcePack(UUID)} or {@link #removeResourcePacks()}.
++     *     {@link #removeResourcePacks(UUID, UUID...)} or {@link #clearResourcePacks()}.
+      * <li>The request is sent with empty string as the hash when the hash is
+      *     not provided. This might result in newer versions not loading the
       *     pack correctly.
       * </ul>
       *
-+     * @deprecated in favour of {@link #setResourcePack(UUID, String, byte[], net.kyori.adventure.text.Component, boolean)}
++     * @deprecated in favour of {@link #sendResourcePacks(net.kyori.adventure.resource.ResourcePackRequest)}
       * @param url The URL from which the client will download the resource
       *     pack. The string must contain only US-ASCII characters and should
       *     be encoded as per RFC 1738.
@@ -2534,6 +2551,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     *     case this method will have no affect on them. Use the
 +     *     {@link PlayerResourcePackStatusEvent} to figure out whether or not
 +     *     the player loaded the pack!
++     * <li>To remove a resource pack you can use
++     *     {@link #removeResourcePacks(UUID, UUID...)} or {@link #clearResourcePacks()}.
 +     * <li>The request is sent with empty string as the hash when the hash is
 +     *     not provided. This might result in newer versions not loading the
 +     *     pack correctly.
@@ -2551,6 +2570,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     *     length restriction is an implementation specific arbitrary value.
 +     * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
 +     *     long.
++     * @see #sendResourcePacks(net.kyori.adventure.resource.ResourcePackRequest)
 +     */
 +    default void setResourcePack(final @NotNull String url, final byte @Nullable [] hash, final net.kyori.adventure.text.@Nullable Component prompt) {
 +        this.setResourcePack(url, hash, prompt, false);
@@ -2561,16 +2581,38 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
       * Request that the player's client download and switch resource packs.
       * <p>
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      *     {@link PlayerResourcePackStatusEvent} to figure out whether or not
+      *     the player loaded the pack!
+      * <li>To remove a resource pack you can use
+-     *     {@link #removeResourcePack(UUID)} or {@link #removeResourcePacks()}.
++     *     {@link #removeResourcePacks(UUID, UUID...)} or {@link #clearResourcePacks()}.
+      * <li>The request is sent with empty string as the hash when the hash is
+      *     not provided. This might result in newer versions not loading the
       *     pack correctly.
-      * </ul>
-      *
-+     * @deprecated in favour of {@link #setResourcePack(String, byte[], net.kyori.adventure.text.Component, boolean)}
-      * @param url The URL from which the client will download the resource
-      *     pack. The string must contain only US-ASCII characters and should
-      *     be encoded as per RFC 1738.
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      *     length restriction is an implementation specific arbitrary value.
       * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
       *     long.
++     * @deprecated in favour of {@link #sendResourcePacks(net.kyori.adventure.resource.ResourcePackRequest)}
+      */
++    @Deprecated // Paper - adventure
+     public void setResourcePack(@NotNull String url, @Nullable byte[] hash, boolean force);
+ 
+     /**
+@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      *     {@link PlayerResourcePackStatusEvent} to figure out whether or not
+      *     the player loaded the pack!
+      * <li>To remove a resource pack you can use
+-     *     {@link #removeResourcePack(UUID)} or {@link #removeResourcePacks()}.
++     *     {@link #removeResourcePacks(UUID, UUID...)} or {@link #clearResourcePacks()}.
+      * <li>The request is sent with empty string as the hash when the hash is
+      *     not provided. This might result in newer versions not loading the
+      *     pack correctly.
+@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      *     length restriction is an implementation specific arbitrary value.
+      * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
+      *     long.
++     * @deprecated in favour of {@link #sendResourcePacks(net.kyori.adventure.resource.ResourcePackRequest)}
       */
 +    @Deprecated // Paper
      public void setResourcePack(@NotNull String url, @Nullable byte[] hash, @Nullable String prompt, boolean force);
@@ -2588,8 +2630,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * perform a file size check against the response content to determine if
 +     * the resource pack has changed and needs to be downloaded again. When
 +     * this request is sent for the very first time from a given server, the
-+     * client will first display a confirmation GUI to the player before
-+     * proceeding with the download.
++     * client will first display a confirmation GUI with a custom prompt
++     * to the player before proceeding with the download.
 +     * <p>
 +     * Notes:
 +     * <ul>
@@ -2597,6 +2639,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     *     case this method will have no affect on them. Use the
 +     *     {@link PlayerResourcePackStatusEvent} to figure out whether or not
 +     *     the player loaded the pack!
++     * <li>To remove a resource pack you can use
++     *     {@link #removeResourcePacks(UUID, UUID...)} or {@link #clearResourcePacks()}.
 +     * <li>The request is sent with empty string as the hash when the hash is
 +     *     not provided. This might result in newer versions not loading the
 +     *     pack correctly.
@@ -2616,6 +2660,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     *     length restriction is an implementation specific arbitrary value.
 +     * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
 +     *     long.
++     * @see #sendResourcePacks(net.kyori.adventure.resource.ResourcePackRequest)
 +     */
 +    default void setResourcePack(final @NotNull String url, final byte @Nullable [] hash, final net.kyori.adventure.text.@Nullable Component prompt, final boolean force) {
 +        this.setResourcePack(UUID.nameUUIDFromBytes(url.getBytes(java.nio.charset.StandardCharsets.UTF_8)), url, hash, prompt, force);
@@ -2625,11 +2670,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      /**
       * Request that the player's client download and switch resource packs.
       * <p>
+@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+      *     {@link PlayerResourcePackStatusEvent} to figure out whether or not
+      *     the player loaded the pack!
+      * <li>To remove a resource pack you can use
+-     *     {@link #removeResourcePack(UUID)} or {@link #removeResourcePacks()}.
++     *     {@link #removeResourcePacks(UUID, UUID...)} or {@link #clearResourcePacks()}.
+      * <li>The request is sent with empty string as the hash when the hash is
+      *     not provided. This might result in newer versions not loading the
+      *     pack correctly.
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *     length restriction is an implementation specific arbitrary value.
       * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
       *     long.
-+     * @deprecated use {@link #setResourcePack(UUID, String, byte[], net.kyori.adventure.text.Component, boolean)} )}
++     * @deprecated in favour of {@link #sendResourcePacks(net.kyori.adventure.resource.ResourcePackRequest)}
       */
 +    @Deprecated // Paper - adventure
      public void setResourcePack(@NotNull UUID id, @NotNull String url, @Nullable byte[] hash, @Nullable String prompt, boolean force);
@@ -2656,6 +2710,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     *     case this method will have no affect on them. Use the
 +     *     {@link PlayerResourcePackStatusEvent} to figure out whether or not
 +     *     the player loaded the pack!
++     * <li>To remove a resource pack you can use
++     *     {@link #removeResourcePacks(UUID, UUID...)} or {@link #clearResourcePacks()}.
 +     * <li>The request is sent with empty string as the hash when the hash is
 +     *     not provided. This might result in newer versions not loading the
 +     *     pack correctly.
@@ -2676,6 +2732,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     *     length restriction is an implementation specific arbitrary value.
 +     * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
 +     *     long.
++     * @see #sendResourcePacks(net.kyori.adventure.resource.ResourcePackRequest)
 +     */
 +    void setResourcePack(@NotNull UUID uuid, @NotNull String url, byte @Nullable [] hash, net.kyori.adventure.text.@Nullable Component prompt, boolean force);
 +    // Paper end
@@ -2683,6 +2740,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      /**
       * Request that the player's client remove a resource pack sent by the
       * server.
+      *
+      * @param id the id of the resource pack.
+      * @throws IllegalArgumentException If the ID is null.
++     * @see #removeResourcePacks(UUID, UUID...)
+      */
+     public void removeResourcePack(@NotNull UUID id);
+ 
+     /**
+      * Request that the player's client remove all loaded resource pack sent by
+      * the server.
++     * @see #clearResourcePacks()
+      */
+     public void removeResourcePacks();
+ 
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * @param title Title text
diff --git a/patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch
index de2a6f756d..38153e39f4 100644
--- a/patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch
+++ b/patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch
@@ -20,7 +20,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ java {
  val annotationsVersion = "24.0.1"
  val bungeeCordChatVersion = "1.20-R0.1"
- val adventureVersion = "4.14.0"
+ val adventureVersion = "4.15.0"
 +val slf4jVersion = "2.0.9"
 +val log4jVersion = "2.17.1"
  val apiAndDocs: Configuration by configurations.creating {
diff --git a/patches/api/Complete-resource-pack-API.patch b/patches/api/Complete-resource-pack-API.patch
index a9c5b4a6de..6b75b46bd6 100644
--- a/patches/api/Complete-resource-pack-API.patch
+++ b/patches/api/Complete-resource-pack-API.patch
@@ -8,16 +8,6 @@ diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/buk
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-      * @throws IllegalArgumentException Thrown if the URL is null.
-      * @throws IllegalArgumentException Thrown if the URL is too long. The
-      *     length restriction is an implementation specific arbitrary value.
-+     * @deprecated use {@link #setResourcePack(String, String)}
-      */
-+    @Deprecated // Paper
-     public void setResourcePack(@NotNull String url);
- 
-     /**
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      void setResourcePack(@NotNull UUID uuid, @NotNull String url, byte @Nullable [] hash, net.kyori.adventure.text.@Nullable Component prompt, boolean force);
      // Paper end
@@ -39,6 +29,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * <ul>
 +     * <li>Players can disable server resources on their client, in which
 +     *     case this method will have no affect on them.
++     * <li>To remove a resource pack you can use
++     *     {@link #removeResourcePacks(UUID, UUID...)} or {@link #clearResourcePacks()}.
 +     * </ul>
 +     *
 +     * @param url The URL from which the client will download the resource
@@ -70,6 +62,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * <ul>
 +     * <li>Players can disable server resources on their client, in which
 +     *     case this method will have no affect on them.
++     * <li>To remove a resource pack you can use
++     *     {@link #removeResourcePacks(UUID, UUID...)} or {@link #clearResourcePacks()}.
 +     * </ul>
 +     *
 +     * @param url The URL from which the client will download the resource
@@ -102,6 +96,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * <ul>
 +     * <li>Players can disable server resources on their client, in which
 +     *     case this method will have no affect on them.
++     * <li>To remove a resource pack you can use
++     *     {@link #removeResourcePacks(UUID, UUID...)} or {@link #clearResourcePacks()}.
 +     * </ul>
 +     *
 +     * @param url The URL from which the client will download the resource
@@ -135,6 +131,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * <ul>
 +     * <li>Players can disable server resources on their client, in which
 +     *     case this method will have no affect on them.
++     * <li>To remove a resource pack you can use
++     *     {@link #removeResourcePacks(UUID, UUID...)} or {@link #clearResourcePacks()}.
 +     * </ul>
 +     *
 +     * @param uuid Unique resource pack ID.
@@ -149,7 +147,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @throws IllegalArgumentException Thrown if the URL is too long. The
 +     *     length restriction is an implementation specific arbitrary value.
 +     */
-+    void setResourcePack(@NotNull UUID uuid, @NotNull String url, @NotNull String hash, net.kyori.adventure.text.@Nullable Component resourcePackPrompt, boolean required);
++    default void setResourcePack(final @NotNull UUID uuid, final @NotNull String url, final @NotNull String hash, final net.kyori.adventure.text.@Nullable Component resourcePackPrompt, final boolean required) {
++        this.sendResourcePacks(net.kyori.adventure.resource.ResourcePackRequest.resourcePackRequest()
++            .required(required)
++            .replace(true)
++            .prompt(resourcePackPrompt)
++            .packs(net.kyori.adventure.resource.ResourcePackInfo.resourcePackInfo(uuid, java.net.URI.create(url), hash))
++        );
++    }
 +
 +    /**
 +     * Gets the most recent resource pack status from the player.
diff --git a/patches/server/Add-PlayerKickEvent-causes.patch b/patches/server/Add-PlayerKickEvent-causes.patch
index 150dae0a44..4fdff83987 100644
--- a/patches/server/Add-PlayerKickEvent-causes.patch
+++ b/patches/server/Add-PlayerKickEvent-causes.patch
@@ -146,8 +146,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -            this.disconnect(Component.translatable("multiplayer.requiredTexturePrompt.disconnect"));
 +            this.disconnect(Component.translatable("multiplayer.requiredTexturePrompt.disconnect"), org.bukkit.event.player.PlayerKickEvent.Cause.RESOURCE_PACK_REJECTION); // Paper - kick event cause
          }
-         // Paper start
-         PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packet.action().ordinal()];
+         // Paper start - adventure pack callbacks
+         // call the callbacks before the previously-existing event so the event has final say
 @@ -0,0 +0,0 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
          if (this.keepAlivePending) {
              if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
diff --git a/patches/server/Adventure.patch b/patches/server/Adventure.patch
index 678fca5d54..1988ae368d 100644
--- a/patches/server/Adventure.patch
+++ b/patches/server/Adventure.patch
@@ -39,6 +39,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import net.kyori.adventure.nbt.api.BinaryTagHolder;
 +import net.kyori.adventure.text.BlockNBTComponent;
 +import net.kyori.adventure.text.Component;
++import net.kyori.adventure.text.ComponentLike;
 +import net.kyori.adventure.text.EntityNBTComponent;
 +import net.kyori.adventure.text.KeybindComponent;
 +import net.kyori.adventure.text.NBTComponent;
@@ -48,6 +49,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import net.kyori.adventure.text.StorageNBTComponent;
 +import net.kyori.adventure.text.TextComponent;
 +import net.kyori.adventure.text.TranslatableComponent;
++import net.kyori.adventure.text.TranslationArgument;
 +import net.kyori.adventure.text.event.ClickEvent;
 +import net.kyori.adventure.text.event.HoverEvent;
 +import net.kyori.adventure.text.format.NamedTextColor;
@@ -76,6 +78,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import static com.mojang.serialization.codecs.RecordCodecBuilder.mapCodec;
 +import static java.util.function.Function.identity;
 +import static net.kyori.adventure.text.Component.text;
++import static net.kyori.adventure.text.TranslationArgument.bool;
++import static net.kyori.adventure.text.TranslationArgument.component;
++import static net.kyori.adventure.text.TranslationArgument.numeric;
 +import static net.minecraft.util.ExtraCodecs.recursive;
 +import static net.minecraft.util.ExtraCodecs.strictOptionalField;
 +
@@ -246,16 +251,36 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        return instance.group(Codec.STRING.fieldOf("text").forGetter(TextComponent::content)).apply(instance, Component::text);
 +    });
 +    static final Codec<Object> PRIMITIVE_ARG_CODEC = ExtraCodecs.validate(ExtraCodecs.JAVA, TranslatableContents::filterAllowedArguments);
-+    static final Codec<Component> ARG_CODEC = Codec.either(PRIMITIVE_ARG_CODEC, COMPONENT_CODEC).xmap((primitiveOrComponent) -> {
-+        // just toString all primitives (not 100% correct to vanilla spec)
-+        // vanilla allows primitive translatable args, but adventure doesn't (in 4.14)
-+        return primitiveOrComponent.map(o -> text(String.valueOf(o)), identity());
-+    }, Either::right);
++    static final Codec<TranslationArgument> ARG_CODEC = Codec.either(PRIMITIVE_ARG_CODEC, COMPONENT_CODEC).flatXmap((primitiveOrComponent) -> {
++        return primitiveOrComponent.map(o -> {
++            final TranslationArgument arg;
++            if (o instanceof String s) {
++                arg = component(text(s));
++            } else if (o instanceof Boolean bool) {
++                arg = bool(bool);
++            } else if (o instanceof Number num) {
++                arg = numeric(num);
++            } else {
++                return DataResult.error(() -> o + " is not a valid translation argument primitive");
++            }
++            return DataResult.success(arg);
++        }, component -> DataResult.success(component(component)));
++    }, translationArgument -> {
++        if (translationArgument.value() instanceof Number || translationArgument.value() instanceof Boolean) {
++            return DataResult.success(Either.left(translationArgument.value()));
++        }
++        final Component component = translationArgument.asComponent();
++        final @Nullable String collapsed = tryCollapseToString(component);
++        if (collapsed != null) {
++            return DataResult.success(Either.left(collapsed)); // attempt to collapse all text components to strings
++        }
++        return DataResult.success(Either.right(component));
++    });
 +    static final MapCodec<TranslatableComponent> TRANSLATABLE_COMPONENT_MAP_CODEC = mapCodec((instance) -> {
 +        return instance.group(
 +            Codec.STRING.fieldOf("translate").forGetter(TranslatableComponent::key),
 +            Codec.STRING.optionalFieldOf("fallback").forGetter(nullableGetter(TranslatableComponent::fallback)),
-+            strictOptionalField(ARG_CODEC.listOf(), "with").forGetter(c -> c.args().isEmpty() ? Optional.empty() : Optional.of(c.args()))
++            strictOptionalField(ARG_CODEC.listOf(), "with").forGetter(c -> c.arguments().isEmpty() ? Optional.empty() : Optional.of(c.arguments()))
 +        ).apply(instance, (key, fallback, components) -> {
 +            return Component.translatable(key, components.orElse(Collections.emptyList())).fallback(fallback.orElse(null));
 +        });
@@ -518,6 +543,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import org.checkerframework.checker.nullness.qual.NonNull;
 +import org.jetbrains.annotations.NotNull;
 +
++@SuppressWarnings("UnstableApiUsage")
 +public final class BossBarImplementationImpl implements BossBar.Listener, BossBarImplementation {
 +    private final BossBar bar;
 +    private ServerBossEvent vanilla;
@@ -1239,6 +1265,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import java.util.function.BiConsumer;
 +import java.util.regex.Matcher;
 +import java.util.regex.Pattern;
++import java.util.stream.StreamSupport;
 +import net.kyori.adventure.bossbar.BossBar;
 +import net.kyori.adventure.inventory.Book;
 +import net.kyori.adventure.key.Key;
@@ -1246,6 +1273,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import net.kyori.adventure.sound.Sound;
 +import net.kyori.adventure.text.Component;
 +import net.kyori.adventure.text.TranslatableComponent;
++import net.kyori.adventure.text.TranslationArgument;
 +import net.kyori.adventure.text.flattener.ComponentFlattener;
 +import net.kyori.adventure.text.format.TextColor;
 +import net.kyori.adventure.text.serializer.ComponentSerializer;
@@ -1298,7 +1326,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            final @NotNull String translated = Language.getInstance().getOrDefault(translatable.key(), fallback != null ? fallback : translatable.key());
 +
 +            final Matcher matcher = LOCALIZATION_PATTERN.matcher(translated);
-+            final List<Component> args = translatable.args();
++            final List<TranslationArgument> args = translatable.arguments();
 +            int argPosition = 0;
 +            int lastIdx = 0;
 +            while (matcher.find()) {
@@ -1314,7 +1342,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                    try {
 +                        final int idx = Integer.parseInt(argIdx) - 1;
 +                        if (idx < args.size()) {
-+                            consumer.accept(args.get(idx));
++                            consumer.accept(args.get(idx).asComponent());
 +                        }
 +                    } catch (final NumberFormatException ex) {
 +                        // ignore, drop the format placeholder
@@ -1322,7 +1350,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                } else {
 +                    final int idx = argPosition++;
 +                    if (idx < args.size()) {
-+                        consumer.accept(args.get(idx));
++                        consumer.accept(args.get(idx).asComponent());
 +                    }
 +                }
 +            }
@@ -1375,7 +1403,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        return component == null ? Component.empty() : WRAPPER_AWARE_SERIALIZER.deserialize(component);
 +    }
 +
-+    public static ArrayList<Component> asAdventure(final List<net.minecraft.network.chat.Component> vanillas) {
++    public static ArrayList<Component> asAdventure(final List<? extends net.minecraft.network.chat.Component> vanillas) {
 +        final ArrayList<Component> adventures = new ArrayList<>(vanillas.size());
 +        for (final net.minecraft.network.chat.Component vanilla : vanillas) {
 +            adventures.add(asAdventure(vanilla));
@@ -1405,7 +1433,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        return WRAPPER_AWARE_SERIALIZER.serialize(component);
 +    }
 +
-+    public static List<net.minecraft.network.chat.Component> asVanilla(final List<Component> adventures) {
++    public static List<net.minecraft.network.chat.Component> asVanilla(final List<? extends Component> adventures) {
 +        final List<net.minecraft.network.chat.Component> vanillas = new ArrayList<>(adventures.size());
 +        for (final Component adventure : adventures) {
 +            vanillas.add(asVanilla(adventure));
@@ -1417,6 +1445,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        return GsonComponentSerializer.gson().serialize(translated(component, locale));
 +    }
 +
++    public static boolean hasAnyTranslations() {
++        return StreamSupport.stream(GlobalTranslator.translator().sources().spliterator(), false)
++            .anyMatch(t -> t.hasAnyTranslations().toBooleanOrElse(true));
++    }
++
 +    private static final Map<Locale, com.mojang.serialization.Codec<Component>> LOCALIZED_CODECS = new ConcurrentHashMap<>();
 +
 +    public static com.mojang.serialization.Codec<Component> localizedCodec(final @Nullable Locale l) {
@@ -1434,6 +1467,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +
 +    private static Component translated(final Component component, final Locale locale) {
++        //noinspection ConstantValue
 +        return GlobalTranslator.render(
 +            component,
 +            // play it safe
@@ -1452,7 +1486,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        }
 +        try {
 +            return asAdventure(ComponentUtils.updateForEntity(css, asVanilla(component), scoreboardSubject == null ? null : ((CraftEntity) scoreboardSubject).getHandle(), 0));
-+        } catch (CommandSyntaxException e) {
++        } catch (final CommandSyntaxException e) {
 +            throw new IOException(e);
 +        } finally {
 +            if (css != null && previous != null) {
@@ -1534,10 +1568,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +
 +    private static String validateField(final String content, final int length, final String name) {
-+        if (content == null) {
-+            return content;
-+        }
-+
 +        final int actual = content.length();
 +        if (actual > length) {
 +            throw new IllegalArgumentException("Field '" + name + "' has a maximum length of " + length + " but was passed '" + content + "', which was " + actual + " characters long.");
@@ -1805,6 +1835,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import org.jetbrains.annotations.NotNull;
 +import org.slf4j.LoggerFactory;
 +
++@SuppressWarnings("UnstableApiUsage")
 +public class ComponentLoggerProviderImpl implements ComponentLoggerProvider {
 +    @Override
 +    public @NotNull ComponentLogger logger(@NotNull LoggerHelper helper, @NotNull String name) {
@@ -1928,19 +1959,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +package io.papermc.paper.adventure.providers;
 +
 +import com.mojang.brigadier.exceptions.CommandSyntaxException;
++import java.io.IOException;
++import java.util.UUID;
 +import net.kyori.adventure.key.Key;
 +import net.kyori.adventure.nbt.api.BinaryTagHolder;
 +import net.kyori.adventure.text.Component;
 +import net.kyori.adventure.text.event.HoverEvent;
-+import net.kyori.adventure.text.serializer.gson.LegacyHoverEventSerializer;
++import net.kyori.adventure.text.serializer.json.LegacyHoverEventSerializer;
 +import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 +import net.kyori.adventure.util.Codec;
 +import net.minecraft.nbt.CompoundTag;
 +import net.minecraft.nbt.Tag;
 +import net.minecraft.nbt.TagParser;
-+
-+import java.io.IOException;
-+import java.util.UUID;
++import org.intellij.lang.annotations.Subst;
 +
 +final class NBTLegacyHoverEventSerializer implements LegacyHoverEventSerializer {
 +    public static final NBTLegacyHoverEventSerializer INSTANCE = new NBTLegacyHoverEventSerializer();
@@ -1963,8 +1994,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        try {
 +            final CompoundTag contents = SNBT_CODEC.decode(raw);
 +            final CompoundTag tag = contents.getCompound(ITEM_TAG);
-+            return HoverEvent.ShowItem.of(
-+                Key.key(contents.getString(ITEM_TYPE)),
++            @Subst("key") final String keyString = contents.getString(ITEM_TYPE);
++            return HoverEvent.ShowItem.showItem(
++                Key.key(keyString),
 +                contents.contains(ITEM_COUNT) ? contents.getByte(ITEM_COUNT) : 1,
 +                tag.isEmpty() ? null : BinaryTagHolder.encode(tag, SNBT_CODEC)
 +            );
@@ -1978,8 +2010,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        final String raw = PlainTextComponentSerializer.plainText().serialize(input);
 +        try {
 +            final CompoundTag contents = SNBT_CODEC.decode(raw);
-+            return HoverEvent.ShowEntity.of(
-+                Key.key(contents.getString(ENTITY_TYPE)),
++            @Subst("key") final String keyString = contents.getString(ENTITY_TYPE);
++            return HoverEvent.ShowEntity.showEntity(
++                Key.key(keyString),
 +                UUID.fromString(contents.getString(ENTITY_ID)),
 +                componentCodec.decode(contents.getString(ENTITY_NAME))
 +            );
@@ -2004,7 +2037,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +
 +    @Override
-+    public Component serializeShowEntity(final HoverEvent.ShowEntity input, final Codec.Encoder<Component, String, ? extends RuntimeException> componentCodec) throws IOException {
++    public Component serializeShowEntity(final HoverEvent.ShowEntity input, final Codec.Encoder<Component, String, ? extends RuntimeException> componentCodec) {
 +        final CompoundTag tag = new CompoundTag();
 +        tag.putString(ENTITY_ID, input.id().toString());
 +        tag.putString(ENTITY_TYPE, input.type().asString());
@@ -2290,7 +2323,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                final net.kyori.adventure.text.Component adventureComponent;
 +                if (input instanceof io.papermc.paper.adventure.AdventureComponent adv) {
 +                    adventureComponent = adv.adventure$component();
-+                } else if (locale != null && input.getContents() instanceof TranslatableContents) {
++                } else if (locale != null && input.getContents() instanceof TranslatableContents && io.papermc.paper.adventure.PaperAdventure.hasAnyTranslations()) {
 +                    adventureComponent = io.papermc.paper.adventure.PaperAdventure.asAdventure(input);
 +                } else {
 +                    return origCodec.encode(input, ops, prefix);
@@ -2768,6 +2801,31 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private long keepAliveTime;
      private boolean keepAlivePending;
      private long keepAliveChallenge;
+     private int latency;
+     private volatile boolean suspendFlushingOnServerThread = false;
++    public final java.util.Map<java.util.UUID, net.kyori.adventure.resource.ResourcePackCallback> packCallbacks = new java.util.concurrent.ConcurrentHashMap<>(); // Paper - adventure resource pack callbacks
+ 
+     public ServerCommonPacketListenerImpl(MinecraftServer minecraftserver, Connection networkmanager, CommonListenerCookie commonlistenercookie, ServerPlayer player) { // CraftBukkit
+         this.server = minecraftserver;
+@@ -0,0 +0,0 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
+             ServerCommonPacketListenerImpl.LOGGER.info("Disconnecting {} due to resource pack {} rejection", this.playerProfile().getName(), packet.id());
+             this.disconnect(Component.translatable("multiplayer.requiredTexturePrompt.disconnect"));
+         }
++        // Paper start - adventure pack callbacks
++        // call the callbacks before the previously-existing event so the event has final say
++        final net.kyori.adventure.resource.ResourcePackCallback callback;
++        if (packet.action().isTerminal()) {
++            callback = this.packCallbacks.remove(packet.id());
++        } else {
++            callback = this.packCallbacks.get(packet.id());
++        }
++        if (callback != null) {
++            callback.packEventReceived(packet.id(), net.kyori.adventure.resource.ResourcePackStatus.valueOf(packet.action().name()), this.getCraftPlayer());
++        }
++        // Paper end
+         this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packet.id(), PlayerResourcePackStatusEvent.Status.values()[packet.action().ordinal()])); // CraftBukkit
+ 
+     }
 @@ -0,0 +0,0 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
  
      // CraftBukkit start
@@ -4230,6 +4288,42 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        this.getHandle().connection.send(new ClientboundResourcePackPopPacket(Optional.empty()));
 +        this.getHandle().connection.send(new ClientboundResourcePackPushPacket(uuid, url, hash, force, io.papermc.paper.adventure.PaperAdventure.asVanilla(prompt)));
 +    }
++
++    @SuppressWarnings({"unchecked", "rawtypes"})
++    void sendBundle(final List<? extends net.minecraft.network.protocol.Packet<? extends net.minecraft.network.protocol.common.ClientCommonPacketListener>> packet) {
++        this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundBundlePacket((List) packet));
++    }
++
++    @Override
++    public void sendResourcePacks(final net.kyori.adventure.resource.ResourcePackRequest request) {
++        if (this.getHandle().connection == null) return;
++        final List<ClientboundResourcePackPushPacket> packs = new java.util.ArrayList<>(request.packs().size());
++        if (request.replace()) {
++            this.clearResourcePacks();
++        }
++        final Component prompt = io.papermc.paper.adventure.PaperAdventure.asVanilla(request.prompt());
++        for (final java.util.Iterator<net.kyori.adventure.resource.ResourcePackInfo> iter = request.packs().iterator(); iter.hasNext();) {
++            final net.kyori.adventure.resource.ResourcePackInfo pack = iter.next();
++            packs.add(new ClientboundResourcePackPushPacket(pack.id(), pack.uri().toASCIIString(), pack.hash(), request.required(), iter.hasNext() ? null : prompt));
++            if (request.callback() != net.kyori.adventure.resource.ResourcePackCallback.noOp()) {
++                this.getHandle().connection.packCallbacks.put(pack.id(), request.callback()); // just override if there is a previously existing callback
++            }
++        }
++        this.sendBundle(packs);
++        super.sendResourcePacks(request);
++    }
++
++    @Override
++    public void removeResourcePacks(final UUID id, final UUID ... others) {
++        if (this.getHandle().connection == null) return;
++        this.sendBundle(net.kyori.adventure.util.MonkeyBars.nonEmptyArrayToList(pack -> new ClientboundResourcePackPopPacket(Optional.of(pack)), id, others));
++    }
++
++    @Override
++    public void clearResourcePacks() {
++        if (this.getHandle().connection == null) return;
++        this.getHandle().connection.send(new ClientboundResourcePackPopPacket(Optional.empty()));
++    }
 +    // Paper end - adventure
 +
      @Override
@@ -5526,6 +5620,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import static net.kyori.adventure.text.Component.storageNBT;
 +import static net.kyori.adventure.text.Component.text;
 +import static net.kyori.adventure.text.Component.translatable;
++import static net.kyori.adventure.text.TranslationArgument.bool;
++import static net.kyori.adventure.text.TranslationArgument.numeric;
 +import static net.kyori.adventure.text.event.ClickEvent.openUrl;
 +import static net.kyori.adventure.text.event.ClickEvent.suggestCommand;
 +import static net.kyori.adventure.text.event.HoverEvent.showEntity;
@@ -5773,6 +5869,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                .key("thisIsA")
 +                .fallback("This is a test.")
 +                .build(),
++            translatable(key, numeric(5), text("HEY")), // boolean doesn't work in vanilla, can't test here
 +            translatable(
 +                key,
 +                text().content(name)
diff --git a/patches/server/Brand-support.patch b/patches/server/Brand-support.patch
index 6bb914e368..cc08d38b25 100644
--- a/patches/server/Brand-support.patch
+++ b/patches/server/Brand-support.patch
@@ -21,8 +21,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -0,0 +0,0 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
-     private int latency;
      private volatile boolean suspendFlushingOnServerThread = false;
+     public final java.util.Map<java.util.UUID, net.kyori.adventure.resource.ResourcePackCallback> packCallbacks = new java.util.concurrent.ConcurrentHashMap<>(); // Paper - adventure resource pack callbacks
      private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit
 +    protected static final ResourceLocation MINECRAFT_BRAND = new ResourceLocation("brand"); // Paper - Brand support
  
diff --git a/patches/server/Complete-resource-pack-API.patch b/patches/server/Complete-resource-pack-API.patch
index f11a740b52..eb432157c6 100644
--- a/patches/server/Complete-resource-pack-API.patch
+++ b/patches/server/Complete-resource-pack-API.patch
@@ -9,15 +9,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
 @@ -0,0 +0,0 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
-             ServerCommonPacketListenerImpl.LOGGER.info("Disconnecting {} due to resource pack {} rejection", this.playerProfile().getName(), packet.id());
-             this.disconnect(Component.translatable("multiplayer.requiredTexturePrompt.disconnect"));
+             callback.packEventReceived(packet.id(), net.kyori.adventure.resource.ResourcePackStatus.valueOf(packet.action().name()), this.getCraftPlayer());
          }
+         // Paper end
 -        this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packet.id(), PlayerResourcePackStatusEvent.Status.values()[packet.action().ordinal()])); // CraftBukkit
-+        // Paper start
++        // Paper start - store last pack status
 +        PlayerResourcePackStatusEvent.Status packStatus = PlayerResourcePackStatusEvent.Status.values()[packet.action().ordinal()];
 +        player.getBukkitEntity().resourcePackStatus = packStatus;
 +        this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packet.id(), packStatus)); // CraftBukkit
-+        // Paper end
++        // Paper end - store last pack status
  
      }
  
@@ -39,18 +39,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
 +    // Paper start - more resource pack API
 +    @Override
-+    public void setResourcePack(@NotNull UUID uuid, @NotNull String url, @NotNull String hash, net.kyori.adventure.text.Component resourcePackPrompt, boolean required) {
-+        Preconditions.checkArgument(uuid != null, "Resource pack UUID cannot be null");
-+        Preconditions.checkArgument(url != null, "Resource pack URL cannot be null");
-+        Preconditions.checkArgument(hash != null, "Hash cannot be null");
-+        final net.minecraft.network.chat.Component promptComponent = resourcePackPrompt != null ?
-+            io.papermc.paper.adventure.PaperAdventure.asVanilla(resourcePackPrompt) :
-+            null;
-+        this.getHandle().connection.send(new ClientboundResourcePackPopPacket(Optional.empty()));
-+        this.getHandle().connection.send(new ClientboundResourcePackPushPacket(uuid, url, hash, required, promptComponent));
-+    }
-+
-+    @Override
 +    public org.bukkit.event.player.PlayerResourcePackStatusEvent.Status getResourcePackStatus() {
 +        return this.resourcePackStatus;
 +    }
diff --git a/patches/server/Temp-adventure-update.patch b/patches/server/Temp-adventure-update.patch
deleted file mode 100644
index a1820b3805..0000000000
--- a/patches/server/Temp-adventure-update.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Wed, 6 Dec 2023 21:21:46 -0700
-Subject: [PATCH] Temp adventure update
-
-
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -0,0 +0,0 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
- }
- val alsoShade: Configuration by configurations.creating
- 
-+val extraRuntime: Configuration by configurations.creating
-+configurations.runtimeClasspath {
-+    extendsFrom(extraRuntime)
-+}
-+repositories {
-+    maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") {
-+        mavenContent {
-+            snapshotsOnly()
-+            includeGroup("net.kyori")
-+        }
-+    }
-+}
-+
- dependencies {
-+    extraRuntime(platform("net.kyori:adventure-bom:4.15.0-SNAPSHOT"))
-     implementation(project(":paper-api"))
-     implementation(project(":paper-mojangapi"))
-     // Paper start
diff --git a/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch
index 6aa56bb74e..f626b01790 100644
--- a/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -209,7 +209,7 @@ diff --git a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java b/src/
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
 +++ b/src/main/java/io/papermc/paper/adventure/PaperAdventure.java
-@@ -0,0 +0,0 @@ import net.kyori.adventure.text.TranslatableComponent;
+@@ -0,0 +0,0 @@ import net.kyori.adventure.text.TranslationArgument;
  import net.kyori.adventure.text.flattener.ComponentFlattener;
  import net.kyori.adventure.text.format.TextColor;
  import net.kyori.adventure.text.serializer.ComponentSerializer;
diff --git a/patches/server/revert-serverside-behavior-of-keepalives.patch b/patches/server/revert-serverside-behavior-of-keepalives.patch
index edf15084fd..2ec04dac59 100644
--- a/patches/server/revert-serverside-behavior-of-keepalives.patch
+++ b/patches/server/revert-serverside-behavior-of-keepalives.patch
@@ -30,6 +30,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private long keepAliveChallenge;
      private int latency;
      private volatile boolean suspendFlushingOnServerThread = false;
+     public final java.util.Map<java.util.UUID, net.kyori.adventure.resource.ResourcePackCallback> packCallbacks = new java.util.concurrent.ConcurrentHashMap<>(); // Paper - adventure resource pack callbacks
 +    private static final long KEEPALIVE_LIMIT = Long.getLong("paper.playerconnection.keepalive", 30) * 1000; // Paper - provide property to set keepalive limit
  
      public ServerCommonPacketListenerImpl(MinecraftServer minecraftserver, Connection networkmanager, CommonListenerCookie commonlistenercookie, ServerPlayer player) { // CraftBukkit