++ * There are 2 types of registries, identified as "built-in"
++ * or "data-driven". The former are not changeable by datapacks (which
++ * doesn't necessarily mean they aren't changeable in the API) and
++ * are loaded first. "Data-driven" registries are all created by
++ * reading in data from the vanilla and other datapacks.
++ *
++ * @param The set returned is not guaranteed to be mutable and may auto-populate
-+ * on access. Any listener accessing the returned set should be aware that
-+ * it may reduce performance for a lazy set implementation. Listeners should be aware that modifying the list may throw {@link
-+ * UnsupportedOperationException} if the event caller provides an
-+ * unmodifiable set. Implementations may provide a serializer capable of processing any
-+ * information that requires access to implementation details. Implementations may provide a serializer capable of processing any
-+ * information that requires access to implementation details. Implementations may provide a serializer capable of processing any
-+ * information that requires implementation details, such as legacy
-+ * (pre-1.16) hover events. Implementations may provide a serializer capable of processing any
-+ * information that requires implementation details, such as legacy
-+ * (pre-1.16) hover events. This legacy serializer uses the standard section symbol to mark
-+ * formatting characters. Implementations may provide a serializer capable of processing any
-+ * information that requires access to implementation details.
-+ * This is the same as calling {@link #broadcast(net.kyori.adventure.text.Component,
-+ * java.lang.String)} with the {@link Server#BROADCAST_CHANNEL_USERS} permission.
-+ *
-+ * @param message the message
-+ * @return the number of players
-+ */
-+ public static int broadcast(@NotNull net.kyori.adventure.text.Component message) {
-+ return server.broadcast(message);
-+ }
- /**
- * Broadcasts the specified message to every user with the given
- * permission name.
-@@ -1080,6 +1095,21 @@ public final class Bukkit {
- * permissibles} must have to receive the broadcast
- * @return number of message recipients
- */
-+ public static int broadcast(@NotNull net.kyori.adventure.text.Component message, @NotNull String permission) {
-+ return server.broadcast(message, permission);
-+ }
-+ // Paper end
-+ /**
-+ * Broadcasts the specified message to every user with the given
-+ * permission name.
-+ *
-+ * @param message message to broadcast
-+ * @param permission the required permission {@link Permissible
-+ * permissibles} must have to receive the broadcast
-+ * @return number of message recipients
-+ * @deprecated in favour of {@link #broadcast(net.kyori.adventure.text.Component, String)}
-+ */
-+ @Deprecated // Paper
- public static int broadcast(@NotNull String message, @NotNull String permission) {
- return server.broadcast(message, permission);
- }
-@@ -1318,6 +1348,7 @@ public final class Bukkit {
- return server.createInventory(owner, type);
- }
-
-+ // Paper start
- /**
- * Creates an empty inventory with the specified type and title. If the type
- * is {@link InventoryType#CHEST}, the new inventory has a size of 27;
-@@ -1343,6 +1374,38 @@ public final class Bukkit {
- * @see InventoryType#isCreatable()
- */
- @NotNull
-+ public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull net.kyori.adventure.text.Component title) {
-+ return server.createInventory(owner, type, title);
-+ }
-+ // Paper end
-+
-+ /**
-+ * Creates an empty inventory with the specified type and title. If the type
-+ * is {@link InventoryType#CHEST}, the new inventory has a size of 27;
-+ * otherwise the new inventory has the normal size for its type. This value has no effect on players, they will always use their real name. This name will be used in death messages and can be sent to the client as a nameplate over the mob. Setting the name to {@code null} will clear it. This value has no effect on players, they will always use their real name.
-- * For use in {@link #broadcast(java.lang.String, java.lang.String)}.
-+ * For use in {@link #broadcast(net.kyori.adventure.text.Component, java.lang.String)}.
- */
- public static final String BROADCAST_CHANNEL_ADMINISTRATIVE = "bukkit.broadcast.admin";
-
-@@ -72,7 +72,7 @@ public interface Server extends PluginMessageRecipient {
- * Used for all announcement messages, such as informing users that a
- * player has joined.
- *
-- * For use in {@link #broadcast(java.lang.String, java.lang.String)}.
-+ * For use in {@link #broadcast(net.kyori.adventure.text.Component, java.lang.String)}.
- */
- public static final String BROADCAST_CHANNEL_USERS = "bukkit.broadcast.user";
-
-@@ -294,7 +294,9 @@ public interface Server extends PluginMessageRecipient {
- *
- * @param message the message
- * @return the number of players
-+ * @deprecated use {@link #broadcast(net.kyori.adventure.text.Component)}
- */
-+ @Deprecated // Paper
- public int broadcastMessage(@NotNull String message);
-
- /**
-@@ -910,8 +912,33 @@ public interface Server extends PluginMessageRecipient {
- * @param permission the required permission {@link Permissible
- * permissibles} must have to receive the broadcast
- * @return number of message recipients
-+ * @deprecated in favour of {@link #broadcast(net.kyori.adventure.text.Component, String)}
- */
-+ @Deprecated // Paper
- public int broadcast(@NotNull String message, @NotNull String permission);
-+ // Paper start
-+ /**
-+ * Broadcast a message to all players.
-+ *
-+ * This is the same as calling {@link #broadcast(net.kyori.adventure.text.Component,
-+ * java.lang.String)} with the {@link #BROADCAST_CHANNEL_USERS} permission.
-+ *
-+ * @param message the message
-+ * @return the number of players
-+ */
-+ int broadcast(@NotNull net.kyori.adventure.text.Component message);
-+
-+ /**
-+ * Broadcasts the specified message to every user with the given
-+ * permission name.
-+ *
-+ * @param message message to broadcast
-+ * @param permission the required permission {@link Permissible
-+ * permissibles} must have to receive the broadcast
-+ * @return number of message recipients
-+ */
-+ int broadcast(@NotNull net.kyori.adventure.text.Component message, @NotNull String permission);
-+ // Paper end
-
- /**
- * Gets the player by the given name, regardless if they are offline or
-@@ -1109,6 +1136,7 @@ public interface Server extends PluginMessageRecipient {
- @NotNull
- Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type);
-
-+ // Paper start
- /**
- * Creates an empty inventory with the specified type and title. If the type
- * is {@link InventoryType#CHEST}, the new inventory has a size of 27;
-@@ -1134,6 +1162,36 @@ public interface Server extends PluginMessageRecipient {
- * @see InventoryType#isCreatable()
- */
- @NotNull
-+ Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull net.kyori.adventure.text.Component title);
-+ // Paper end
-+
-+ /**
-+ * Creates an empty inventory with the specified type and title. If the type
-+ * is {@link InventoryType#CHEST}, the new inventory has a size of 27;
-+ * otherwise the new inventory has the normal size for its type.
-+ * For example, getLine(0) will return the first line of text.
-+ *
-+ * @param index Line number to get the text from, starting at 0
-+ * @throws IndexOutOfBoundsException Thrown when the line does not exist
-+ * @return Text on the given line
-+ */
-+ @NotNull
-+ public net.kyori.adventure.text.Component line(int index) throws IndexOutOfBoundsException;
-+
-+ /**
-+ * Sets the line of text at the specified index.
-+ *
-+ * For example, setLine(0, "Line One") will set the first line of text to
-+ * "Line One".
-+ *
-+ * @param index Line number to set the text at, starting from 0
-+ * @param line New text to set at the specified index
-+ * @throws IndexOutOfBoundsException If the index is out of the range 0..3
-+ */
-+ public void line(int index, @NotNull net.kyori.adventure.text.Component line) throws IndexOutOfBoundsException;
-+ // Paper end
-
- /**
- * Gets all the lines of text currently on this sign.
- *
- * @return Array of Strings containing each line of text
-+ * @deprecated in favour of {@link #lines()}
- */
- @NotNull
-+ @Deprecated // Paper
- public String[] getLines();
-
- /**
-@@ -24,8 +59,10 @@ public interface Sign extends TileState, Colorable {
- * @param index Line number to get the text from, starting at 0
- * @return Text on the given line
- * @throws IndexOutOfBoundsException Thrown when the line does not exist
-+ * @deprecated in favour of {@link #line(int)}
- */
- @NotNull
-+ @Deprecated // Paper
- public String getLine(int index) throws IndexOutOfBoundsException;
-
- /**
-@@ -37,7 +74,9 @@ public interface Sign extends TileState, Colorable {
- * @param index Line number to set the text at, starting from 0
- * @param line New text to set at the specified index
- * @throws IndexOutOfBoundsException If the index is out of the range 0..3
-+ * @deprecated in favour of {@link #line(int, net.kyori.adventure.text.Component)}
- */
-+ @Deprecated // Paper
- public void setLine(int index, @NotNull String line) throws IndexOutOfBoundsException;
-
- /**
-diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 80209bb88a0294d4eedc78509533a6257315d856..57ade3963faae3724d9a01eeeb6d02168acb567e 100644
---- a/src/main/java/org/bukkit/command/Command.java
-+++ b/src/main/java/org/bukkit/command/Command.java
-@@ -32,8 +32,7 @@ public abstract class Command {
- protected String description;
- protected String usageMessage;
- private String permission;
-- private String permissionMessage;
-- public org.spigotmc.CustomTimingsHandler timings; // Spigot
-+ private net.kyori.adventure.text.Component permissionMessage; // Paper
-
- protected Command(@NotNull String name) {
- this(name, "", "/" + name, new ArrayList
-+ * See MiniMessage docs
-+ * for more information on the format.
-+ *
-+ * @param message MiniMessage content
-+ */
-+ default void sendRichMessage(final @NotNull String message) {
-+ this.sendMessage(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(message));
-+ }
-+
-+ /**
-+ * Sends a plain message to the command sender.
-+ *
-+ * @param message plain message
-+ */
-+ default void sendPlainMessage(final @NotNull String message) {
-+ this.sendMessage(net.kyori.adventure.text.Component.text(message));
-+ }
-+ // Paper end
- }
-diff --git a/src/main/java/org/bukkit/command/PluginCommandYamlParser.java b/src/main/java/org/bukkit/command/PluginCommandYamlParser.java
-index a542c4bb3c973bbe4b976642feccde6a4d90cb7b..ef870b864c1e36032b54b31f3f85707edc06d764 100644
---- a/src/main/java/org/bukkit/command/PluginCommandYamlParser.java
-+++ b/src/main/java/org/bukkit/command/PluginCommandYamlParser.java
-@@ -67,7 +67,7 @@ public class PluginCommandYamlParser {
- }
-
- if (permissionMessage != null) {
-- newCmd.setPermissionMessage(permissionMessage.toString());
-+ newCmd.permissionMessage(net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(permissionMessage.toString())); // Paper
- }
-
- pluginCmds.add(newCmd);
-diff --git a/src/main/java/org/bukkit/command/ProxiedCommandSender.java b/src/main/java/org/bukkit/command/ProxiedCommandSender.java
-index fcc34b640265f4dccb46b9f09466ab8e1d96043e..74599b4ee0518481c0e3a5f6ab2f5302837f1ae3 100644
---- a/src/main/java/org/bukkit/command/ProxiedCommandSender.java
-+++ b/src/main/java/org/bukkit/command/ProxiedCommandSender.java
-@@ -3,7 +3,7 @@ package org.bukkit.command;
-
- import org.jetbrains.annotations.NotNull;
-
--public interface ProxiedCommandSender extends CommandSender {
-+public interface ProxiedCommandSender extends CommandSender, net.kyori.adventure.audience.ForwardingAudience.Single { // Paper
-
- /**
- * Returns the CommandSender which triggered this proxied command
-@@ -21,4 +21,16 @@ public interface ProxiedCommandSender extends CommandSender {
- @NotNull
- CommandSender getCallee();
-
-+ // Paper start
-+ @Override
-+ default void sendMessage(final @NotNull net.kyori.adventure.identity.Identity source, final @NotNull net.kyori.adventure.text.Component message, final @NotNull net.kyori.adventure.audience.MessageType type) {
-+ net.kyori.adventure.audience.ForwardingAudience.Single.super.sendMessage(source, message, type);
-+ }
-+
-+ @NotNull
-+ @Override
-+ default net.kyori.adventure.audience.Audience audience() {
-+ return this.getCaller();
-+ }
-+ // Paper end
- }
-diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java
-index e2800dc97af5bbb02c555069285a0fa155a9799d..5744a9f432ec75f6b6b1991ff488dffb9591c934 100644
---- a/src/main/java/org/bukkit/enchantments/Enchantment.java
-+++ b/src/main/java/org/bukkit/enchantments/Enchantment.java
-@@ -299,6 +299,19 @@ public abstract class Enchantment implements Keyed {
- * @return True if the enchantment may be applied, otherwise False
- */
- public abstract boolean canEnchantItem(@NotNull ItemStack item);
-+ // Paper start
-+ /**
-+ * Get the name of the enchantment with its applied level.
-+ *
-+ * If the given {@code level} is either less than the {@link #getStartLevel()} or greater than the {@link #getMaxLevel()},
-+ * the level may not be shown in the numeral format one may otherwise expect.
-+ *
-+ * If the value is null, the name will be identical to {@link #getName()}.
-+ *
-+ * @param name new player list name
-+ */
-+ void playerListName(@Nullable net.kyori.adventure.text.Component name);
-+
-+ /**
-+ * Gets the name that is shown on the in-game player list.
-+ *
-+ * @return the player list name
-+ */
-+ @NotNull net.kyori.adventure.text.Component playerListName();
-+
-+ /**
-+ * Gets the currently displayed player list header for this player.
-+ *
-+ * @return player list header or null
-+ */
-+ @Nullable net.kyori.adventure.text.Component playerListHeader();
-+
-+ /**
-+ * Gets the currently displayed player list footer for this player.
-+ *
-+ * @return player list footer or null
-+ */
-+ @Nullable net.kyori.adventure.text.Component playerListFooter();
-+ // Paper end
- /**
- * Gets the name that is shown on the player list.
- *
- * @return the player list name
-+ * @deprecated in favour of {@link #playerListName()}
- */
- @NotNull
-+ @Deprecated // Paper
- public String getPlayerListName();
-
- /**
-@@ -76,14 +134,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
- * If the value is null, the name will be identical to {@link #getName()}.
- *
- * @param name new player list name
-+ * @deprecated in favour of {@link #playerListName(net.kyori.adventure.text.Component)}
- */
-+ @Deprecated // Paper
- public void setPlayerListName(@Nullable String name);
-
- /**
- * Gets the currently displayed player list header for this player.
- *
- * @return player list header or null
-+ * @deprecated in favour of {@link #playerListHeader()}
- */
-+ @Deprecated // Paper
- @Nullable
- public String getPlayerListHeader();
-
-@@ -91,7 +153,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
- * Gets the currently displayed player list footer for this player.
- *
- * @return player list header or null
-+ * @deprecated in favour of {@link #playerListFooter()}
- */
-+ @Deprecated // Paper
- @Nullable
- public String getPlayerListFooter();
-
-@@ -99,14 +163,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
- * Sets the currently displayed player list header for this player.
- *
- * @param header player list header, null for empty
-+ * @deprecated in favour of {@link #sendPlayerListHeader(net.kyori.adventure.text.Component)}
- */
-+ @Deprecated // Paper
- public void setPlayerListHeader(@Nullable String header);
-
- /**
- * Sets the currently displayed player list footer for this player.
- *
- * @param footer player list footer, null for empty
-+ * @deprecated in favour of {@link #sendPlayerListFooter(net.kyori.adventure.text.Component)}
- */
-+ @Deprecated // Paper
- public void setPlayerListFooter(@Nullable String footer);
-
- /**
-@@ -115,7 +183,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
- *
- * @param header player list header, null for empty
- * @param footer player list footer, null for empty
-+ * @deprecated in favour of {@link #sendPlayerListHeaderAndFooter(net.kyori.adventure.text.Component, net.kyori.adventure.text.Component)}
- */
-+ @Deprecated // Paper
- public void setPlayerListHeaderFooter(@Nullable String header, @Nullable String footer);
-
- /**
-@@ -153,9 +223,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
- * Kicks player with custom kick message.
- *
- * @param message kick message
-+ * @deprecated in favour of {@link #kick(net.kyori.adventure.text.Component)}
- */
-+ @Deprecated // Paper
- public void kickPlayer(@Nullable String message);
-
-+ // Paper start
-+ /**
-+ * Kicks the player with the default kick message.
-+ * @see #kick(Component)
-+ */
-+ void kick();
-+ /**
-+ * Kicks player with custom kick message.
-+ *
-+ * @param message kick message
-+ */
-+ void kick(final @Nullable net.kyori.adventure.text.Component message);
-+ // Paper end
-+
- /**
- * Says a message (or runs a command).
- *
-@@ -507,6 +593,90 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
- */
- public void sendEquipmentChange(@NotNull LivingEntity entity, @NotNull EquipmentSlot slot, @NotNull ItemStack item);
-
-+ // Paper start
-+ /**
-+ * Send a sign change. This fakes a sign change packet for a user at
-+ * a certain location. This will not actually change the world in any way.
-+ * This method will use a sign at the location's block or a faked sign
-+ * sent via
-+ * {@link #sendBlockChange(org.bukkit.Location, org.bukkit.Material, byte)}.
-+ *
-+ * If the client does not have a sign at the given location it will
-+ * display an error message to the user.
-+ *
-+ * @param loc the location of the sign
-+ * @param lines the new text on the sign or null to clear it
-+ * @throws IllegalArgumentException if location is null
-+ * @throws IllegalArgumentException if lines is non-null and has a length less than 4
-+ */
-+ default void sendSignChange(@NotNull Location loc, @Nullable java.util.List
-+ * If the client does not have a sign at the given location it will
-+ * display an error message to the user.
-+ *
-+ * @param loc the location of the sign
-+ * @param lines the new text on the sign or null to clear it
-+ * @param dyeColor the color of the sign
-+ * @throws IllegalArgumentException if location is null
-+ * @throws IllegalArgumentException if dyeColor is null
-+ * @throws IllegalArgumentException if lines is non-null and has a length less than 4
-+ */
-+ default void sendSignChange(@NotNull Location loc, @Nullable java.util.List
-+ * If the client does not have a sign at the given location it will
-+ * display an error message to the user.
-+ *
-+ * @param loc the location of the sign
-+ * @param lines the new text on the sign or null to clear it
-+ * @param hasGlowingText whether the text of the sign should glow as if dyed with a glowing ink sac
-+ * @throws IllegalArgumentException if location is null
-+ * @throws IllegalArgumentException if dyeColor is null
-+ * @throws IllegalArgumentException if lines is non-null and has a length less than 4
-+ */
-+ default void sendSignChange(@NotNull Location loc, @Nullable java.util.List
-+ * If the client does not have a sign at the given location it will
-+ * display an error message to the user.
-+ *
-+ * @param loc the location of the sign
-+ * @param lines the new text on the sign or null to clear it
-+ * @param dyeColor the color of the sign
-+ * @param hasGlowingText whether the text of the sign should glow as if dyed with a glowing ink sac
-+ * @throws IllegalArgumentException if location is null
-+ * @throws IllegalArgumentException if dyeColor is null
-+ * @throws IllegalArgumentException if lines is non-null and has a length less than 4
-+ */
-+ void sendSignChange(@NotNull Location loc, @Nullable java.util.List
-+ * The player's client will download the new resource pack asynchronously
-+ * in the background, and will automatically switch to it once the
-+ * download is complete. If the client has downloaded and cached a
-+ * resource pack with the same hash in the past it will not download but
-+ * directly apply the cached pack. If the hash is null and the client has
-+ * downloaded and cached the same resource pack in the past, it will
-+ * 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.
-+ *
-+ * Notes:
-+ *
-@@ -1124,6 +1350,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
- * pack correctly.
- *
- *
-+ * @deprecated in favour of {@link #setResourcePack(String, byte[], 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.
-@@ -1139,8 +1366,57 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
- * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
- * long.
- */
-+ @Deprecated // Paper
- public void setResourcePack(@NotNull String url, @Nullable byte[] hash, @Nullable String prompt, boolean force);
-
-+ // Paper start
-+ /**
-+ * Request that the player's client download and switch resource packs.
-+ *
-+ * The player's client will download the new resource pack asynchronously
-+ * in the background, and will automatically switch to it once the
-+ * download is complete. If the client has downloaded and cached a
-+ * resource pack with the same hash in the past it will not download but
-+ * directly apply the cached pack. If the hash is null and the client has
-+ * downloaded and cached the same resource pack in the past, it will
-+ * 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.
-+ *
-+ * Notes:
-+ *
-diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-index 441362d2fbdc9413ed64a1f00b50fb6d06327e79..e1e7f45fd0f65d0874dd0698da436c7ac2e7951b 100644
---- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
-+++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
-@@ -140,6 +140,18 @@ public enum InventoryType {
- private final String title;
- private final boolean isCreatable;
-
-+ // Paper start
-+ private final net.kyori.adventure.text.Component defaultTitleComponent;
-+
-+ /**
-+ * Gets the inventory's default title.
-+ *
-+ * @return the inventory's default title
-+ */
-+ public @NotNull net.kyori.adventure.text.Component defaultTitle() {
-+ return defaultTitleComponent;
-+ }
-+ // Paper end
- private InventoryType(int defaultSize, /*@NotNull*/ String defaultTitle) {
- this(defaultSize, defaultTitle, true);
- }
-@@ -148,6 +160,7 @@ public enum InventoryType {
- size = defaultSize;
- title = defaultTitle;
- this.isCreatable = isCreatable;
-+ this.defaultTitleComponent = net.kyori.adventure.text.Component.text(defaultTitle); // Paper - Adventure
- }
-
- public int getDefaultSize() {
-@@ -155,6 +168,7 @@ public enum InventoryType {
- }
-
- @NotNull
-+ @Deprecated // Paper
- public String getDefaultTitle() {
- return title;
- }
-diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerChatEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerChatEvent.java
-index 9c68c3f2d61500479f48b80264f625aaae2f3204..399afcd19fcb6acd24857ed6ab48cf0d105a01a3 100644
---- a/src/main/java/org/bukkit/event/player/AsyncPlayerChatEvent.java
-+++ b/src/main/java/org/bukkit/event/player/AsyncPlayerChatEvent.java
-@@ -22,7 +22,11 @@ import org.jetbrains.annotations.NotNull;
- *
- * Care should be taken to check {@link #isAsynchronous()} and treat the event
- * appropriately.
-+ *
-+ * @deprecated use {@link io.papermc.paper.event.player.AsyncChatEvent} instead
- */
-+@Deprecated // Paper
-+@org.bukkit.Warning(value = false, reason = "Don't nag on old event yet") // Paper
- public class AsyncPlayerChatEvent extends PlayerEvent implements Cancellable {
- private static final HandlerList handlers = new HandlerList();
- private boolean cancel = false;
-diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-index 9866c07c999f46cb585709804aaad710c3031d5a..c7c45e2de8cca1bf8b8e12752e08db62403efa6a 100644
---- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-+++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
-@@ -14,7 +14,7 @@ import org.jetbrains.annotations.NotNull;
- public class AsyncPlayerPreLoginEvent extends Event {
- private static final HandlerList handlers = new HandlerList();
- private Result result;
-- private String message;
-+ private net.kyori.adventure.text.Component message; // Paper
- private final String name;
- private final InetAddress ipAddress;
- private final UUID uniqueId;
-@@ -27,7 +27,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
- public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId) {
- super(true);
- this.result = Result.ALLOWED;
-- this.message = "";
-+ this.message = net.kyori.adventure.text.Component.empty(); // Paper
- this.name = name;
- this.ipAddress = ipAddress;
- this.uniqueId = uniqueId;
-@@ -79,6 +79,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
- this.result = result == null ? null : Result.valueOf(result.name());
- }
-
-+ // Paper start
- /**
- * Gets the current kick message that will be used if getResult() !=
- * Result.ALLOWED
-@@ -86,7 +87,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
- * @return Current kick message
- */
- @NotNull
-- public String getKickMessage() {
-+ public net.kyori.adventure.text.Component kickMessage() {
- return message;
- }
-
-@@ -95,16 +96,66 @@ public class AsyncPlayerPreLoginEvent extends Event {
- *
- * @param message New kick message
- */
-- public void setKickMessage(@NotNull final String message) {
-+ public void kickMessage(@NotNull final net.kyori.adventure.text.Component message) {
-+ this.message = message;
-+ }
-+
-+ /**
-+ * Disallows the player from logging in, with the given reason
-+ *
-+ * @param result New result for disallowing the player
-+ * @param message Kick message to display to the user
-+ */
-+ public void disallow(@NotNull final Result result, @NotNull final net.kyori.adventure.text.Component message) {
-+ this.result = result;
- this.message = message;
- }
-
-+ /**
-+ * Disallows the player from logging in, with the given reason
-+ *
-+ * @param result New result for disallowing the player
-+ * @param message Kick message to display to the user
-+ * @deprecated This method uses a deprecated enum from {@link
-+ * PlayerPreLoginEvent}
-+ * @see #disallow(Result, String)
-+ */
-+ @Deprecated
-+ public void disallow(@NotNull final PlayerPreLoginEvent.Result result, @NotNull final net.kyori.adventure.text.Component message) {
-+ this.result = result == null ? null : Result.valueOf(result.name());
-+ this.message = message;
-+ }
-+ // Paper end
-+ /**
-+ * Gets the current kick message that will be used if getResult() !=
-+ * Result.ALLOWED
-+ *
-+ * @return Current kick message
-+ * @deprecated in favour of {@link #kickMessage()}
-+ */
-+ @NotNull
-+ @Deprecated // Paper
-+ public String getKickMessage() {
-+ return net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serialize(this.message); // Paper
-+ }
-+
-+ /**
-+ * Sets the kick message to display if getResult() != Result.ALLOWED
-+ *
-+ * @param message New kick message
-+ * @deprecated in favour of {@link #kickMessage(net.kyori.adventure.text.Component)}
-+ */
-+ @Deprecated // Paper
-+ public void setKickMessage(@NotNull final String message) {
-+ this.message = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(message); // Paper
-+ }
-+
- /**
- * Allows the player to log in
- */
- public void allow() {
- result = Result.ALLOWED;
-- message = "";
-+ message = net.kyori.adventure.text.Component.empty(); // Paper
- }
-
- /**
-@@ -112,10 +163,12 @@ public class AsyncPlayerPreLoginEvent extends Event {
- *
- * @param result New result for disallowing the player
- * @param message Kick message to display to the user
-+ * @deprecated in favour of {@link #disallow(org.bukkit.event.player.AsyncPlayerPreLoginEvent.Result, net.kyori.adventure.text.Component)}
- */
-+ @Deprecated // Paper
- public void disallow(@NotNull final Result result, @NotNull final String message) {
- this.result = result;
-- this.message = message;
-+ this.message = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(message); // Paper
- }
-
- /**
-@@ -130,7 +183,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
- @Deprecated
- public void disallow(@NotNull final PlayerPreLoginEvent.Result result, @NotNull final String message) {
- this.result = result == null ? null : Result.valueOf(result.name());
-- this.message = message;
-+ this.message = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(message); // Paper
- }
-
- /**
-diff --git a/src/main/java/org/bukkit/event/player/PlayerChatEvent.java b/src/main/java/org/bukkit/event/player/PlayerChatEvent.java
-index a1f4261eaa1497554f1e51d1d5a072c2eb9226df..3a1da86e3dbf18c6e1040086c1df4b8976bc2b9d 100644
---- a/src/main/java/org/bukkit/event/player/PlayerChatEvent.java
-+++ b/src/main/java/org/bukkit/event/player/PlayerChatEvent.java
-@@ -18,6 +18,7 @@ import org.jetbrains.annotations.NotNull;
- * Listening to this event forces chat to wait for the main thread which
- * causes delays for chat. {@link AsyncPlayerChatEvent} is the encouraged
- * alternative for thread safe implementations.
-+ * @deprecated use {@link io.papermc.paper.event.player.ChatEvent} instead
- */
- @Deprecated
- @Warning(reason = "Listening to this event forces chat to wait for the main thread, delaying chat messages.")
-diff --git a/src/main/java/org/bukkit/event/player/PlayerEvent.java b/src/main/java/org/bukkit/event/player/PlayerEvent.java
-index 793b661b6d2d05de3d7f4fc26a4c018a2af58e62..f6d3b817de3001f04ea4554c7c39a1290af3fd6d 100644
---- a/src/main/java/org/bukkit/event/player/PlayerEvent.java
-+++ b/src/main/java/org/bukkit/event/player/PlayerEvent.java
-@@ -14,7 +14,7 @@ public abstract class PlayerEvent extends Event {
- player = who;
- }
-
-- PlayerEvent(@NotNull final Player who, boolean async) {
-+ public PlayerEvent(@NotNull final Player who, boolean async) { // Paper - public
- super(async);
- player = who;
-
-diff --git a/src/main/java/org/bukkit/event/player/PlayerJoinEvent.java b/src/main/java/org/bukkit/event/player/PlayerJoinEvent.java
-index d06684aba7688ce06777dbd837a46856a9d7767f..4af1d064fcb57773dfa8f6ad40d6482973f8e1a8 100644
---- a/src/main/java/org/bukkit/event/player/PlayerJoinEvent.java
-+++ b/src/main/java/org/bukkit/event/player/PlayerJoinEvent.java
-@@ -10,30 +10,60 @@ import org.jetbrains.annotations.Nullable;
- */
- public class PlayerJoinEvent extends PlayerEvent {
- private static final HandlerList handlers = new HandlerList();
-- private String joinMessage;
-+ // Paper start
-+ private net.kyori.adventure.text.Component joinMessage;
-+ public PlayerJoinEvent(@NotNull final Player playerJoined, @Nullable final net.kyori.adventure.text.Component joinMessage) {
-+ super(playerJoined);
-+ this.joinMessage = joinMessage;
-+ }
-
-+ @Deprecated // Paper end
- public PlayerJoinEvent(@NotNull final Player playerJoined, @Nullable final String joinMessage) {
- super(playerJoined);
-+ this.joinMessage = joinMessage != null ? net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(joinMessage) : null; // Paper end
-+ }
-+
-+ // Paper start
-+ /**
-+ * Gets the join message to send to all online players
-+ *
-+ * @return string join message. Can be null
-+ */
-+ public @Nullable net.kyori.adventure.text.Component joinMessage() {
-+ return this.joinMessage;
-+ }
-+
-+ /**
-+ * Sets the join message to send to all online players
-+ *
-+ * @param joinMessage join message. If null, no message will be sent
-+ */
-+ public void joinMessage(@Nullable net.kyori.adventure.text.Component joinMessage) {
- this.joinMessage = joinMessage;
- }
-+ // Paper end
-
- /**
- * Gets the join message to send to all online players
- *
- * @return string join message. Can be null
-+ * @deprecated in favour of {@link #joinMessage()}
- */
- @Nullable
-+ @Deprecated // Paper
- public String getJoinMessage() {
-- return joinMessage;
-+ return this.joinMessage == null ? null : net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serialize(this.joinMessage); // Paper
- }
-
- /**
- * Sets the join message to send to all online players
- *
- * @param joinMessage join message. If null, no message will be sent
-+ * @deprecated in favour of {@link #joinMessage(net.kyori.adventure.text.Component)}
- */
-+ @Deprecated // Paper
- public void setJoinMessage(@Nullable String joinMessage) {
-- this.joinMessage = joinMessage;
-+ this.joinMessage = joinMessage != null ? net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(joinMessage) : null; // Paper
- }
-
- @NotNull
-diff --git a/src/main/java/org/bukkit/event/player/PlayerKickEvent.java b/src/main/java/org/bukkit/event/player/PlayerKickEvent.java
-index 2f6ca42330675733b2b4132cbb66e433788d05d5..efbf4b657c99ce3a5096d041d275af9ccaea7911 100644
---- a/src/main/java/org/bukkit/event/player/PlayerKickEvent.java
-+++ b/src/main/java/org/bukkit/event/player/PlayerKickEvent.java
-@@ -10,35 +10,84 @@ import org.jetbrains.annotations.NotNull;
- */
- public class PlayerKickEvent extends PlayerEvent implements Cancellable {
- private static final HandlerList handlers = new HandlerList();
-- private String leaveMessage;
-- private String kickReason;
-+ private net.kyori.adventure.text.Component leaveMessage; // Paper
-+ private net.kyori.adventure.text.Component kickReason; // Paper
- private boolean cancel;
-
-+ @Deprecated // Paper
- public PlayerKickEvent(@NotNull final Player playerKicked, @NotNull final String kickReason, @NotNull final String leaveMessage) {
-+ super(playerKicked);
-+ this.kickReason = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(kickReason); // Paper
-+ this.leaveMessage = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(leaveMessage); // Paper
-+ this.cancel = false;
-+ }
-+ // Paper start
-+ public PlayerKickEvent(@NotNull final Player playerKicked, @NotNull final net.kyori.adventure.text.Component kickReason, @NotNull final net.kyori.adventure.text.Component leaveMessage) {
- super(playerKicked);
- this.kickReason = kickReason;
- this.leaveMessage = leaveMessage;
- this.cancel = false;
- }
-
-+ /**
-+ * Gets the leave message send to all online players
-+ *
-+ * @return string kick reason
-+ */
-+ public @NotNull net.kyori.adventure.text.Component leaveMessage() {
-+ return this.leaveMessage;
-+ }
-+
-+ /**
-+ * Sets the leave message send to all online players
-+ *
-+ * @param leaveMessage leave message
-+ */
-+ public void leaveMessage(@NotNull net.kyori.adventure.text.Component leaveMessage) {
-+ this.leaveMessage = leaveMessage;
-+ }
-+
- /**
- * Gets the reason why the player is getting kicked
- *
- * @return string kick reason
- */
-+ public @NotNull net.kyori.adventure.text.Component reason() {
-+ return this.kickReason;
-+ }
-+
-+ /**
-+ * Sets the reason why the player is getting kicked
-+ *
-+ * @param kickReason kick reason
-+ */
-+ public void reason(@NotNull net.kyori.adventure.text.Component kickReason) {
-+ this.kickReason = kickReason;
-+ }
-+ // Paper end
-+
-+ /**
-+ * Gets the reason why the player is getting kicked
-+ *
-+ * @return string kick reason
-+ * @deprecated in favour of {@link #reason()}
-+ */
- @NotNull
-+ @Deprecated // Paper
- public String getReason() {
-- return kickReason;
-+ return net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serialize(this.kickReason); // Paper
- }
-
- /**
- * Gets the leave message send to all online players
- *
- * @return string kick reason
-+ * @deprecated in favour of {@link #leaveMessage()}
- */
- @NotNull
-+ @Deprecated // Paper
- public String getLeaveMessage() {
-- return leaveMessage;
-+ return net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serialize(this.leaveMessage); // Paper
- }
-
- @Override
-@@ -55,18 +104,22 @@ public class PlayerKickEvent extends PlayerEvent implements Cancellable {
- * Sets the reason why the player is getting kicked
- *
- * @param kickReason kick reason
-+ * @deprecated in favour of {@link #reason(net.kyori.adventure.text.Component)}
- */
-+ @Deprecated // Paper
- public void setReason(@NotNull String kickReason) {
-- this.kickReason = kickReason;
-+ this.kickReason = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(kickReason); // Paper
- }
-
- /**
- * Sets the leave message send to all online players
- *
- * @param leaveMessage leave message
-+ * @deprecated in favour of {@link #leaveMessage(net.kyori.adventure.text.Component)}
- */
-+ @Deprecated // Paper
- public void setLeaveMessage(@NotNull String leaveMessage) {
-- this.leaveMessage = leaveMessage;
-+ this.leaveMessage = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(leaveMessage); // Paper
- }
-
- @NotNull
-diff --git a/src/main/java/org/bukkit/event/player/PlayerLocaleChangeEvent.java b/src/main/java/org/bukkit/event/player/PlayerLocaleChangeEvent.java
-index 36b436e145a7215682b692a87ab894df25752c1d..ebd499c1a2d11ea068e8c374edbc3967e4cece3d 100644
---- a/src/main/java/org/bukkit/event/player/PlayerLocaleChangeEvent.java
-+++ b/src/main/java/org/bukkit/event/player/PlayerLocaleChangeEvent.java
-@@ -12,17 +12,31 @@ public class PlayerLocaleChangeEvent extends PlayerEvent {
- private static final HandlerList handlers = new HandlerList();
- //
- private final String locale;
-+ // Paper start
-+ private final java.util.Locale adventure$locale;
-+ /**
-+ * @see Player#getLocale()
-+ *
-+ * @return the player's new locale
-+ */
-+ public @NotNull java.util.Locale locale() {
-+ return this.adventure$locale;
-+ }
-+ // Paper end
-
- public PlayerLocaleChangeEvent(@NotNull Player who, @NotNull String locale) {
- super(who);
- this.locale = locale;
-+ this.adventure$locale = net.kyori.adventure.translation.Translator.parseLocale(locale); // Paper
- }
-
- /**
- * @return the player's new locale
- * @see Player#getLocale()
-+ * @deprecated in favour of {@link #locale()}
- */
- @NotNull
-+ @Deprecated // Paper
- public String getLocale() {
- return locale;
- }
-diff --git a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
-index 084ca8cfcb7381bfa4fa6280748cf9b81210a9c1..95c53d934f928d25f7b20cfbf2e5faa3df31ddc4 100644
---- a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
-+++ b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
-@@ -17,7 +17,7 @@ public class PlayerLoginEvent extends PlayerEvent {
- private final InetAddress address;
- private final String hostname;
- private Result result = Result.ALLOWED;
-- private String message = "";
-+ private net.kyori.adventure.text.Component message = net.kyori.adventure.text.Component.empty();
- private final InetAddress realAddress; // Spigot
-
- /**
-@@ -53,12 +53,52 @@ public class PlayerLoginEvent extends PlayerEvent {
- * @param result The result status for this event
- * @param message The message to be displayed if result denies login
- * @param realAddress the actual, unspoofed connecting address
-+ * @deprecated in favour of {@link #PlayerLoginEvent(Player, String, InetAddress, Result, net.kyori.adventure.text.Component, InetAddress)}
- */
-+ @Deprecated // Paper
- public PlayerLoginEvent(@NotNull final Player player, @NotNull String hostname, @NotNull final InetAddress address, @NotNull final Result result, @NotNull final String message, @NotNull final InetAddress realAddress) { // Spigot
- this(player, hostname, address, realAddress); // Spigot
- this.result = result;
-+ this.message = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(message); // Paper
-+ }
-+
-+ // Paper start
-+ /**
-+ * This constructor pre-configures the event with a result and message
-+ *
-+ * @param player The {@link Player} for this event
-+ * @param hostname The hostname that was used to connect to the server
-+ * @param address The address the player used to connect, provided for
-+ * timing issues
-+ * @param result The result status for this event
-+ * @param message The message to be displayed if result denies login
-+ * @param realAddress the actual, unspoofed connecting address
-+ */
-+ public PlayerLoginEvent(@NotNull final Player player, @NotNull String hostname, @NotNull final InetAddress address, @NotNull final Result result, @NotNull final net.kyori.adventure.text.Component message, @NotNull final InetAddress realAddress) { // Spigot
-+ this(player, hostname, address, realAddress); // Spigot
-+ this.result = result;
-+ this.message = message;
-+ }
-+
-+ /**
-+ * Gets the current kick message that will be used if getResult() !=
-+ * Result.ALLOWED
-+ *
-+ * @return Current kick message
-+ */
-+ public @NotNull net.kyori.adventure.text.Component kickMessage() {
-+ return this.message;
-+ }
-+
-+ /**
-+ * Sets the kick message to display if getResult() != Result.ALLOWED
-+ *
-+ * @param message New kick message
-+ */
-+ public void kickMessage(@NotNull net.kyori.adventure.text.Component message) {
- this.message = message;
- }
-+ // Paper end
-
- // Spigot start
- /**
-@@ -96,19 +136,23 @@ public class PlayerLoginEvent extends PlayerEvent {
- * Result.ALLOWED
- *
- * @return Current kick message
-+ * @deprecated in favour of {@link #kickMessage()}
- */
- @NotNull
-+ @Deprecated // Paper
- public String getKickMessage() {
-- return message;
-+ return net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serialize(this.message); // Paper
- }
-
- /**
- * Sets the kick message to display if getResult() != Result.ALLOWED
- *
- * @param message New kick message
-+ * @deprecated in favour of {@link #kickMessage(net.kyori.adventure.text.Component)}
- */
-+ @Deprecated // Paper
- public void setKickMessage(@NotNull final String message) {
-- this.message = message;
-+ this.message = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(message); // Paper
- }
-
- /**
-@@ -127,7 +171,7 @@ public class PlayerLoginEvent extends PlayerEvent {
- */
- public void allow() {
- result = Result.ALLOWED;
-- message = "";
-+ message = net.kyori.adventure.text.Component.empty(); // Paper
- }
-
- /**
-@@ -135,8 +179,21 @@ public class PlayerLoginEvent extends PlayerEvent {
- *
- * @param result New result for disallowing the player
- * @param message Kick message to display to the user
-+ * @deprecated in favour of {@link #disallow(Result, net.kyori.adventure.text.Component)}
- */
-+ @Deprecated // Paper start
- public void disallow(@NotNull final Result result, @NotNull final String message) {
-+ this.result = result;
-+ this.message = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(message);
-+ }
-+ /**
-+ * Disallows the player from logging in, with the given reason
-+ *
-+ * @param result New result for disallowing the player
-+ * @param message Kick message to display to the user
-+ */
-+ public void disallow(@NotNull final Result result, @NotNull final net.kyori.adventure.text.Component message) {
-+ // Paper end
- this.result = result;
- this.message = message;
- }
-diff --git a/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java
-index fb066251f793ec3b41bfc075b9478901b15ee549..6800132c6288b4588fd02b08d26f016c38f27129 100644
---- a/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java
-+++ b/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java
-@@ -19,7 +19,7 @@ import org.jetbrains.annotations.NotNull;
- public class PlayerPreLoginEvent extends Event {
- private static final HandlerList handlers = new HandlerList();
- private Result result;
-- private String message;
-+ private net.kyori.adventure.text.Component message; // Paper
- private final String name;
- private final InetAddress ipAddress;
- private final UUID uniqueId;
-@@ -31,7 +31,7 @@ public class PlayerPreLoginEvent extends Event {
-
- public PlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId) {
- this.result = Result.ALLOWED;
-- this.message = "";
-+ this.message = net.kyori.adventure.text.Component.empty(); // Paper
- this.name = name;
- this.ipAddress = ipAddress;
- this.uniqueId = uniqueId;
-@@ -56,6 +56,7 @@ public class PlayerPreLoginEvent extends Event {
- this.result = result;
- }
-
-+ // Paper start
- /**
- * Gets the current kick message that will be used if getResult() !=
- * Result.ALLOWED
-@@ -63,7 +64,7 @@ public class PlayerPreLoginEvent extends Event {
- * @return Current kick message
- */
- @NotNull
-- public String getKickMessage() {
-+ public net.kyori.adventure.text.Component kickMessage() {
- return message;
- }
-
-@@ -72,16 +73,51 @@ public class PlayerPreLoginEvent extends Event {
- *
- * @param message New kick message
- */
-- public void setKickMessage(@NotNull final String message) {
-+ public void kickMessage(@NotNull final net.kyori.adventure.text.Component message) {
- this.message = message;
- }
-
-+ /**
-+ * Disallows the player from logging in, with the given reason
-+ *
-+ * @param result New result for disallowing the player
-+ * @param message Kick message to display to the user
-+ */
-+ public void disallow(@NotNull final Result result, @NotNull final net.kyori.adventure.text.Component message) {
-+ this.result = result;
-+ this.message = message;
-+ }
-+ // Paper end
-+ /**
-+ * Gets the current kick message that will be used if getResult() !=
-+ * Result.ALLOWED
-+ *
-+ * @return Current kick message
-+ * @deprecated in favour of {@link #kickMessage()}
-+ */
-+ @Deprecated // Paper
-+ @NotNull
-+ public String getKickMessage() {
-+ return net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serialize(this.message); // Paper
-+ }
-+
-+ /**
-+ * Sets the kick message to display if getResult() != Result.ALLOWED
-+ *
-+ * @param message New kick message
-+ * @deprecated in favour of {@link #kickMessage(net.kyori.adventure.text.Component)}
-+ */
-+ @Deprecated // Paper
-+ public void setKickMessage(@NotNull final String message) {
-+ this.message = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(message); // Paper
-+ }
-+
- /**
- * Allows the player to log in
- */
- public void allow() {
- result = Result.ALLOWED;
-- message = "";
-+ message = net.kyori.adventure.text.Component.empty(); // Paper
- }
-
- /**
-@@ -89,10 +125,12 @@ public class PlayerPreLoginEvent extends Event {
- *
- * @param result New result for disallowing the player
- * @param message Kick message to display to the user
-+ * @deprecated in favour of {@link #disallow(org.bukkit.event.player.PlayerPreLoginEvent.Result, net.kyori.adventure.text.Component)}
- */
-+ @Deprecated // Paper
- public void disallow(@NotNull final Result result, @NotNull final String message) {
- this.result = result;
-- this.message = message;
-+ this.message = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(message); // Paper
- }
-
- /**
-diff --git a/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java b/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
-index d70c25f404e994766a9ebce89a917c8d0719777c..0395ca85a466f6356259078d3bad48b2ce6e57b7 100644
---- a/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
-+++ b/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
-@@ -10,30 +10,59 @@ import org.jetbrains.annotations.Nullable;
- */
- public class PlayerQuitEvent extends PlayerEvent {
- private static final HandlerList handlers = new HandlerList();
-- private String quitMessage;
-+ private net.kyori.adventure.text.Component quitMessage; // Paper
-
-+ @Deprecated // Paper
- public PlayerQuitEvent(@NotNull final Player who, @Nullable final String quitMessage) {
- super(who);
-+ this.quitMessage = quitMessage != null ? net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(quitMessage) : null; // Paper
-+ }
-+ // Paper start
-+ public PlayerQuitEvent(@NotNull final Player who, @Nullable final net.kyori.adventure.text.Component quitMessage) {
-+ super(who);
-+ this.quitMessage = quitMessage;
-+ }
-+
-+ /**
-+ * Gets the quit message to send to all online players
-+ *
-+ * @return string quit message
-+ */
-+ public @Nullable net.kyori.adventure.text.Component quitMessage() {
-+ return quitMessage;
-+ }
-+
-+ /**
-+ * Sets the quit message to send to all online players
-+ *
-+ * @param quitMessage quit message
-+ */
-+ public void quitMessage(@Nullable net.kyori.adventure.text.Component quitMessage) {
- this.quitMessage = quitMessage;
- }
-+ // Paper end
-
- /**
- * Gets the quit message to send to all online players
- *
- * @return string quit message
-+ * @deprecated in favour of {@link #quitMessage()}
- */
- @Nullable
-+ @Deprecated // Paper
- public String getQuitMessage() {
-- return quitMessage;
-+ return this.quitMessage == null ? null : net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serialize(this.quitMessage); // Paper
- }
-
- /**
- * Sets the quit message to send to all online players
- *
- * @param quitMessage quit message
-+ * @deprecated in favour of {@link #quitMessage(net.kyori.adventure.text.Component)}
- */
-+ @Deprecated // Paper
- public void setQuitMessage(@Nullable String quitMessage) {
-- this.quitMessage = quitMessage;
-+ this.quitMessage = quitMessage != null ? net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(quitMessage) : null; // Paper
- }
-
- @NotNull
-diff --git a/src/main/java/org/bukkit/event/server/BroadcastMessageEvent.java b/src/main/java/org/bukkit/event/server/BroadcastMessageEvent.java
-index 03bfca9d368bbe4b7c1353d52c883e756bf69bda..943d324435350d3f16fad3e21cb472a01a3ff60b 100644
---- a/src/main/java/org/bukkit/event/server/BroadcastMessageEvent.java
-+++ b/src/main/java/org/bukkit/event/server/BroadcastMessageEvent.java
-@@ -18,7 +18,7 @@ import org.jetbrains.annotations.NotNull;
- public class BroadcastMessageEvent extends ServerEvent implements Cancellable {
-
- private static final HandlerList handlers = new HandlerList();
-- private String message;
-+ private net.kyori.adventure.text.Component message; // Paper
- private final Set
-+ * Plugins should check that hasTitle() returns true before calling this
-+ * method.
-+ *
-+ * @return the title of the book
-+ */
-+ @Nullable
-+ @Override
-+ net.kyori.adventure.text.Component title();
-+
-+ /**
-+ * Sets the title of the book.
-+ *
-+ * Limited to 32 characters. Removes title when given null.
-+ *
-+ * @param title the title to set
-+ * @return the same {@link BookMeta} instance
-+ */
-+ @NotNull
-+ @Override
-+ @org.checkerframework.common.returnsreceiver.qual.This BookMeta title(@Nullable net.kyori.adventure.text.Component title);
-+
-+ /**
-+ * Gets the author of the book.
-+ *
-+ * Plugins should check that hasAuthor() returns true before calling this
-+ * method.
-+ *
-+ * @return the author of the book
-+ */
-+ @Nullable
-+ @Override
-+ net.kyori.adventure.text.Component author();
-+
-+ /**
-+ * Sets the author of the book. Removes author when given null.
-+ *
-+ * @param author the author to set
-+ * @return the same {@link BookMeta} instance
-+ */
-+ @NotNull
-+ @Override
-+ @org.checkerframework.common.returnsreceiver.qual.This BookMeta author(@Nullable net.kyori.adventure.text.Component author);
-+
-+ /**
-+ * Gets the specified page in the book. The page must exist.
-+ *
-+ * Pages are 1-indexed.
-+ *
-+ * @param page the page number to get, in range [1, getPageCount()]
-+ * @return the page from the book
-+ */
-+ @NotNull net.kyori.adventure.text.Component page(int page);
-+
-+ /**
-+ * Sets the specified page in the book. Pages of the book must be
-+ * contiguous.
-+ *
-+ * The data can be up to 256 characters in length, additional characters
-+ * are truncated.
-+ *
-+ * Pages are 1-indexed.
-+ *
-+ * @param page the page number to set, in range [1, getPageCount()]
-+ * @param data the data to set for that page
-+ */
-+ void page(int page, @NotNull net.kyori.adventure.text.Component data);
-+
-+ /**
-+ * Adds new pages to the end of the book. Up to a maximum of 50 pages with
-+ * 256 characters per page.
-+ *
-+ * @param pages A list of strings, each being a page
-+ */
-+ void addPages(@NotNull net.kyori.adventure.text.Component... pages);
-+
-+ interface BookMetaBuilder extends Builder {
-+
-+ @NotNull
-+ @Override
-+ BookMetaBuilder title(@Nullable net.kyori.adventure.text.Component title);
-+
-+ @NotNull
-+ @Override
-+ BookMetaBuilder author(@Nullable net.kyori.adventure.text.Component author);
-+
-+ @NotNull
-+ @Override
-+ BookMetaBuilder addPage(@NotNull net.kyori.adventure.text.Component page);
-+
-+ @NotNull
-+ @Override
-+ BookMetaBuilder pages(@NotNull net.kyori.adventure.text.Component... pages);
-+
-+ @NotNull
-+ @Override
-+ BookMetaBuilder pages(@NotNull java.util.Collection
-@@ -126,8 +238,10 @@ public interface BookMeta extends ItemMeta {
- *
- * @param page the page number to get, in range [1, getPageCount()]
- * @return the page from the book
-+ * @deprecated in favour of {@link #page(int)}
- */
- @NotNull
-+ @Deprecated // Paper
- String getPage(int page);
-
- /**
-@@ -141,15 +255,19 @@ public interface BookMeta extends ItemMeta {
- *
- * @param page the page number to set, in range [1, getPageCount()]
- * @param data the data to set for that page
-+ * @deprecated in favour of {@link #page(int, net.kyori.adventure.text.Component)}
- */
-+ @Deprecated // Paper
- void setPage(int page, @NotNull String data);
-
- /**
- * Gets all the pages in the book.
- *
- * @return list of all the pages in the book
-+ * @deprecated in favour of {@link #pages()}
- */
- @NotNull
-+ @Deprecated // Paper
- List Plugins should check that {@link #hasDisplayName()} returns
-@@ -38,7 +56,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
- * before calling this method.
- *
- * @return the display name that is set
-+ * @deprecated in favour of {@link #displayName()}
- */
-+ @Deprecated // Paper
- @NotNull
- String getDisplayName();
-
-@@ -46,7 +66,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
- * Sets the display name.
- *
- * @param name the name to set
-+ * @deprecated in favour of {@link #displayName(net.kyori.adventure.text.Component)}
- */
-+ @Deprecated // Paper
- void setDisplayName(@Nullable String name);
-
- /**
-@@ -81,6 +103,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
- */
- boolean hasLore();
-
-+ // Paper start
-+ /**
-+ * Gets the lore.
-+ *
-+ * Plugins should check that {@link #hasLore()} returns
-@@ -88,7 +128,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
- * calling this method.
- *
- * @return a list of lore that is set
-+ * @deprecated in favour of {@link #lore()}
- */
-+ @Deprecated // Paper
- @Nullable
- List
-diff --git a/src/main/java/org/bukkit/scoreboard/Objective.java b/src/main/java/org/bukkit/scoreboard/Objective.java
-index ff3fcb2697eb00736238d0efdcaefe43043334d3..75acd6f8f3d774bb79e8e513125e801c5569a244 100644
---- a/src/main/java/org/bukkit/scoreboard/Objective.java
-+++ b/src/main/java/org/bukkit/scoreboard/Objective.java
-@@ -19,14 +19,35 @@ public interface Objective {
- */
- @NotNull
- String getName() throws IllegalStateException;
-+ // Paper start
-+ /**
-+ * Gets the name displayed to players for this objective
-+ *
-+ * @return this objective's display name
-+ * @throws IllegalStateException if this objective has been unregistered
-+ */
-+ @NotNull net.kyori.adventure.text.Component displayName() throws IllegalStateException;
-+ /**
-+ * Sets the name displayed to players for this objective.
-+ *
-+ * @param displayName Display name to set
-+ * @throws IllegalStateException if this objective has been unregistered
-+ * @throws IllegalArgumentException if displayName is null
-+ * @throws IllegalArgumentException if displayName is longer than 128
-+ * characters.
-+ */
-+ void displayName(@Nullable net.kyori.adventure.text.Component displayName) throws IllegalStateException, IllegalArgumentException;
-+ // Paper end
-
- /**
- * Gets the name displayed to players for this objective
- *
- * @return this objective's display name
- * @throws IllegalStateException if this objective has been unregistered
-+ * @deprecated in favour of {@link #displayName()}
- */
- @NotNull
-+ @Deprecated // Paper
- String getDisplayName() throws IllegalStateException;
-
- /**
-@@ -37,7 +58,9 @@ public interface Objective {
- * @throws IllegalArgumentException if displayName is null
- * @throws IllegalArgumentException if displayName is longer than 128
- * characters.
-+ * @deprecated in favour of {@link #displayName(net.kyori.adventure.text.Component)}
- */
-+ @Deprecated // Paper
- void setDisplayName(@NotNull String displayName) throws IllegalStateException, IllegalArgumentException;
-
- /**
-diff --git a/src/main/java/org/bukkit/scoreboard/Scoreboard.java b/src/main/java/org/bukkit/scoreboard/Scoreboard.java
-index 5c855dbd0da895392f7a6e92cdc90782baf614ad..1ada91d790abedbc9b3aeb6e96467a0d78560f15 100644
---- a/src/main/java/org/bukkit/scoreboard/Scoreboard.java
-+++ b/src/main/java/org/bukkit/scoreboard/Scoreboard.java
-@@ -27,6 +27,48 @@ public interface Scoreboard {
- @Deprecated
- @NotNull
- Objective registerNewObjective(@NotNull String name, @NotNull String criteria) throws IllegalArgumentException;
-+ // Paper start
-+ /**
-+ * Registers an Objective on this Scoreboard
-+ *
-+ * @param name Name of the Objective
-+ * @param criteria Criteria for the Objective
-+ * @param displayName Name displayed to players for the Objective.
-+ * @return The registered Objective
-+ * @throws IllegalArgumentException if name is null
-+ * @throws IllegalArgumentException if name is longer than 32767
-+ * characters.
-+ * @throws IllegalArgumentException if criteria is null
-+ * @throws IllegalArgumentException if displayName is null
-+ * @throws IllegalArgumentException if displayName is longer than 128
-+ * characters.
-+ * @throws IllegalArgumentException if an objective by that name already
-+ * exists
-+ */
-+ @NotNull
-+ Objective registerNewObjective(@NotNull String name, @NotNull String criteria, @Nullable net.kyori.adventure.text.Component displayName) throws IllegalArgumentException;
-+ /**
-+ * Registers an Objective on this Scoreboard
-+ *
-+ * @param name Name of the Objective
-+ * @param criteria Criteria for the Objective
-+ * @param displayName Name displayed to players for the Objective.
-+ * @param renderType Manner of rendering the Objective
-+ * @return The registered Objective
-+ * @throws IllegalArgumentException if name is null
-+ * @throws IllegalArgumentException if name is longer than 32767
-+ * characters.
-+ * @throws IllegalArgumentException if criteria is null
-+ * @throws IllegalArgumentException if displayName is null
-+ * @throws IllegalArgumentException if displayName is longer than 128
-+ * characters.
-+ * @throws IllegalArgumentException if renderType is null
-+ * @throws IllegalArgumentException if an objective by that name already
-+ * exists
-+ */
-+ @NotNull
-+ Objective registerNewObjective(@NotNull String name, @NotNull String criteria, @Nullable net.kyori.adventure.text.Component displayName, @NotNull RenderType renderType) throws IllegalArgumentException;
-+ // Paper end
-
- /**
- * Registers an Objective on this Scoreboard
-@@ -44,8 +86,10 @@ public interface Scoreboard {
- * characters.
- * @throws IllegalArgumentException if an objective by that name already
- * exists
-+ * @deprecated in favour of {@link #registerNewObjective(String, String, net.kyori.adventure.text.Component)}
- */
- @NotNull
-+ @Deprecated // Paper
- Objective registerNewObjective(@NotNull String name, @NotNull String criteria, @NotNull String displayName) throws IllegalArgumentException;
-
- /**
-@@ -66,8 +110,10 @@ public interface Scoreboard {
- * @throws IllegalArgumentException if renderType is null
- * @throws IllegalArgumentException if an objective by that name already
- * exists
-+ * @deprecated in favour of {@link #registerNewObjective(String, String, net.kyori.adventure.text.Component, RenderType)}
- */
- @NotNull
-+ @Deprecated // Paper
- Objective registerNewObjective(@NotNull String name, @NotNull String criteria, @NotNull String displayName, @NotNull RenderType renderType) throws IllegalArgumentException;
-
- /**
-diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
-index 0db7fe1b9fe5621ceed3f4f046691e359f5949dd..47b10df619ad2520b9bb673e2220f36391680f1b 100644
---- a/src/main/java/org/bukkit/scoreboard/Team.java
-+++ b/src/main/java/org/bukkit/scoreboard/Team.java
-@@ -22,14 +22,100 @@ public interface Team {
- */
- @NotNull
- String getName() throws IllegalStateException;
-+ // Paper start
-+ /**
-+ * Gets the name displayed to entries for this team
-+ *
-+ * @return Team display name
-+ * @throws IllegalStateException if this team has been unregistered
-+ */
-+ @NotNull net.kyori.adventure.text.Component displayName() throws IllegalStateException;
-+
-+ /**
-+ * Sets the name displayed to entries for this team
-+ *
-+ * @param displayName New display name
-+ * @throws IllegalStateException if this team has been unregistered
-+ */
-+ void displayName(@Nullable net.kyori.adventure.text.Component displayName) throws IllegalStateException, IllegalArgumentException;
-+
-+ /**
-+ * Gets the prefix prepended to the display of entries on this team.
-+ *
-+ * @return Team prefix
-+ * @throws IllegalStateException if this team has been unregistered
-+ */
-+ @NotNull net.kyori.adventure.text.Component prefix() throws IllegalStateException;
-+
-+ /**
-+ * Sets the prefix prepended to the display of entries on this team.
-+ *
-+ * @param prefix New prefix
-+ * @throws IllegalArgumentException if prefix is null
-+ * characters
-+ * @throws IllegalStateException if this team has been unregistered
-+ */
-+ void prefix(@Nullable net.kyori.adventure.text.Component prefix) throws IllegalStateException, IllegalArgumentException;
-+
-+ /**
-+ * Gets the suffix appended to the display of entries on this team.
-+ *
-+ * @return the team's current suffix
-+ * @throws IllegalStateException if this team has been unregistered
-+ */
-+ @NotNull net.kyori.adventure.text.Component suffix() throws IllegalStateException;
-+
-+ /**
-+ * Sets the suffix appended to the display of entries on this team.
-+ *
-+ * @param suffix the new suffix for this team.
-+ * @throws IllegalArgumentException if suffix is null
-+ * characters
-+ * @throws IllegalStateException if this team has been unregistered
-+ */
-+ void suffix(@Nullable net.kyori.adventure.text.Component suffix) throws IllegalStateException, IllegalArgumentException;
-+
-+ /**
-+ * Checks if the team has a color specified
-+ *
-+ * @return true if it has a color
-+ * @throws IllegalStateException if this team has been unregistered
-+ */
-+ boolean hasColor();
-+
-+ /**
-+ * Gets the color of the team.
-+ * The set returned may auto-populate on access. Any listener accessing the returned set should be aware that
++ * it may reduce performance for a lazy set implementation.
++ * Certain commands request decorations without a player context
++ * which is why this is possibly null.
++ *
++ * @return the player or {@code null}
++ */
++ public @Nullable Player player() {
++ return this.player;
++ }
++
++ /**
++ * Gets the original decoration input
++ *
++ * @return the input
++ */
++ public Component originalMessage() {
++ return this.originalMessage;
++ }
++
++ /**
++ * Gets the decoration result. This may already be different from
++ * {@link #originalMessage()} if some other listener to this event
++ * changed the result.
++ *
++ * @return the result
++ */
++ public Component result() {
++ return this.result;
++ }
++
++ /**
++ * Sets the resulting decorated component.
++ *
++ * @param result the result
++ */
++ public void result(final Component result) {
++ this.result = result;
++ }
++
++ @Override
++ public boolean isCancelled() {
++ return this.cancelled;
++ }
++
++ /**
++ * A cancelled decorating event means that no changes to the result component
++ * will have any effect. The decorated component will be equal to the original
++ * component.
++ */
++ @Override
++ public void setCancelled(final boolean cancel) {
++ this.cancelled = cancel;
++ }
++
++ @Override
++ public HandlerList getHandlers() {
++ return HANDLER_LIST;
++ }
++
++ public static HandlerList getHandlerList() {
++ return HANDLER_LIST;
++ }
++}
+diff --git a/src/main/java/io/papermc/paper/event/player/AsyncChatEvent.java b/src/main/java/io/papermc/paper/event/player/AsyncChatEvent.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..50c3e117dec63811823b4e6395bf4f090692ee8c
+--- /dev/null
++++ b/src/main/java/io/papermc/paper/event/player/AsyncChatEvent.java
+@@ -0,0 +1,44 @@
++package io.papermc.paper.event.player;
++
++import io.papermc.paper.chat.ChatRenderer;
++import java.util.Set;
++import net.kyori.adventure.audience.Audience;
++import net.kyori.adventure.chat.SignedMessage;
++import net.kyori.adventure.text.Component;
++import org.bukkit.entity.Player;
++import org.bukkit.event.HandlerList;
++import org.jetbrains.annotations.ApiStatus;
++import org.jspecify.annotations.NullMarked;
++
++/**
++ * An event fired when a {@link Player} sends a chat message to the server.
++ *
++ * This event will sometimes fire synchronously, depending on how it was
++ * triggered.
++ *
++ * If a player is the direct cause of this event by an incoming packet, this
++ * event will be asynchronous. If a plugin triggers this event by compelling a
++ * player to chat, this event will be synchronous.
++ *
++ * Care should be taken to check {@link #isAsynchronous()} and treat the event
++ * appropriately.
++ */
++@NullMarked
++public final class AsyncChatEvent extends AbstractChatEvent {
++
++ private static final HandlerList HANDLER_LIST = new HandlerList();
++
++ @ApiStatus.Internal
++ public AsyncChatEvent(final boolean async, final Player player, final Set
++ * Note that in Vanilla, elevated permissions are usually required to use
++ * '@' selectors in various component types, but this method should not
++ * check such permissions from the sender.
++ *
++ * A {@link CommandSender} argument is required to resolve:
++ *
++ * Note that in Vanilla, elevated permissions are required to use
++ * '@' selectors in various component types. If the boolean {@code bypassPermissions}
++ * argument is {@code false}, the {@link CommandSender} argument will be used to query
++ * those permissions.
++ *
++ * A {@link CommandSender} argument is required to resolve:
++ * Implementations may provide a serializer capable of processing any
++ * information that requires access to implementation details. Implementations may provide a serializer capable of processing any
++ * information that requires access to implementation details. Implementations may provide a serializer capable of processing any
++ * information that requires implementation details, such as legacy
++ * (pre-1.16) hover events. Implementations may provide a serializer capable of processing any
++ * information that requires implementation details, such as legacy
++ * (pre-1.16) hover events. This legacy serializer uses the standard section symbol to mark
++ * formatting characters. Implementations may provide a serializer capable of processing any
++ * information that requires access to implementation details.
++ * This is the same as calling {@link #broadcast(net.kyori.adventure.text.Component,
++ * java.lang.String)} with the {@link Server#BROADCAST_CHANNEL_USERS} permission.
++ *
++ * @param message the message
++ * @return the number of players
++ */
++ public static int broadcast(net.kyori.adventure.text.@NotNull Component message) {
++ return server.broadcast(message);
++ }
+ /**
+ * Broadcasts the specified message to every user with the given
+ * permission name.
+@@ -1236,6 +1251,21 @@ public final class Bukkit {
+ * permissibles} must have to receive the broadcast
+ * @return number of message recipients
+ */
++ public static int broadcast(net.kyori.adventure.text.@NotNull Component message, @NotNull String permission) {
++ return server.broadcast(message, permission);
++ }
++ // Paper end
++ /**
++ * Broadcasts the specified message to every user with the given
++ * permission name.
++ *
++ * @param message message to broadcast
++ * @param permission the required permission {@link Permissible
++ * permissibles} must have to receive the broadcast
++ * @return number of message recipients
++ * @deprecated in favour of {@link #broadcast(net.kyori.adventure.text.Component, String)}
++ */
++ @Deprecated // Paper
+ public static int broadcast(@NotNull String message, @NotNull String permission) {
+ return server.broadcast(message, permission);
+ }
+@@ -1497,6 +1527,7 @@ public final class Bukkit {
+ return server.createInventory(owner, type);
+ }
+
++ // Paper start
+ /**
+ * Creates an empty inventory with the specified type and title. If the type
+ * is {@link InventoryType#CHEST}, the new inventory has a size of 27;
+@@ -1522,6 +1553,38 @@ public final class Bukkit {
+ * @see InventoryType#isCreatable()
+ */
+ @NotNull
++ public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, net.kyori.adventure.text.@NotNull Component title) {
++ return server.createInventory(owner, type, title);
++ }
++ // Paper end
++
++ /**
++ * Creates an empty inventory with the specified type and title. If the type
++ * is {@link InventoryType#CHEST}, the new inventory has a size of 27;
++ * otherwise the new inventory has the normal size for its type. This value has no effect on players, they will always use their real name. This name will be used in death messages and can be sent to the client as a nameplate over the mob. Setting the name to {@code null} will clear it. This value has no effect on players, they will always use their real name.
+- * For use in {@link #broadcast(java.lang.String, java.lang.String)}.
++ * For use in {@link #broadcast(net.kyori.adventure.text.Component, java.lang.String)}.
+ */
+ public static final String BROADCAST_CHANNEL_ADMINISTRATIVE = "bukkit.broadcast.admin";
+
+@@ -80,7 +80,7 @@ public interface Server extends PluginMessageRecipient {
+ * Used for all announcement messages, such as informing users that a
+ * player has joined.
+ *
+- * For use in {@link #broadcast(java.lang.String, java.lang.String)}.
++ * For use in {@link #broadcast(net.kyori.adventure.text.Component, java.lang.String)}.
+ */
+ public static final String BROADCAST_CHANNEL_USERS = "bukkit.broadcast.user";
+
+@@ -356,7 +356,9 @@ public interface Server extends PluginMessageRecipient {
+ *
+ * @param message the message
+ * @return the number of players
++ * @deprecated use {@link #broadcast(net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ public int broadcastMessage(@NotNull String message);
+
+ /**
+@@ -1053,8 +1055,33 @@ public interface Server extends PluginMessageRecipient {
+ * @param permission the required permission {@link Permissible
+ * permissibles} must have to receive the broadcast
+ * @return number of message recipients
++ * @deprecated in favour of {@link #broadcast(net.kyori.adventure.text.Component, String)}
+ */
++ @Deprecated // Paper
+ public int broadcast(@NotNull String message, @NotNull String permission);
++ // Paper start
++ /**
++ * Broadcast a message to all players.
++ *
++ * This is the same as calling {@link #broadcast(net.kyori.adventure.text.Component,
++ * java.lang.String)} with the {@link #BROADCAST_CHANNEL_USERS} permission.
++ *
++ * @param message the message
++ * @return the number of players
++ */
++ int broadcast(net.kyori.adventure.text.@NotNull Component message);
++
++ /**
++ * Broadcasts the specified message to every user with the given
++ * permission name.
++ *
++ * @param message message to broadcast
++ * @param permission the required permission {@link Permissible
++ * permissibles} must have to receive the broadcast
++ * @return number of message recipients
++ */
++ int broadcast(net.kyori.adventure.text.@NotNull Component message, @NotNull String permission);
++ // Paper end
+
+ /**
+ * Gets the player by the given name, regardless if they are offline or
+@@ -1271,6 +1298,35 @@ public interface Server extends PluginMessageRecipient {
+ @NotNull
+ Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type);
+
++ // Paper start
++ /**
++ * Creates an empty inventory with the specified type and title. If the type
++ * is {@link InventoryType#CHEST}, the new inventory has a size of 27;
++ * otherwise the new inventory has the normal size for its type.
++ * For example, getLine(0) will return the first line of text.
++ *
++ * @param index Line number to get the text from, starting at 0
++ * @throws IndexOutOfBoundsException Thrown when the line does not exist
++ * @return Text on the given line
++ * @deprecated A sign may have multiple writable sides now. Use {@link #getSide(Side)} and {@link SignSide#line(int)}.
++ */
++ @NotNull
++ @Deprecated
++ public net.kyori.adventure.text.Component line(int index) throws IndexOutOfBoundsException;
++
++ /**
++ * Sets the line of text at the specified index on the {@link Side#FRONT}.
++ *
++ * For example, setLine(0, "Line One") will set the first line of text to
++ * "Line One".
++ *
++ * @param index Line number to set the text at, starting from 0
++ * @param line New text to set at the specified index
++ * @throws IndexOutOfBoundsException If the index is out of the range 0..3
++ * @deprecated A sign may have multiple writable sides now. Use {@link #getSide(Side)} and {@link SignSide#line(int, net.kyori.adventure.text.Component)}.
++ */
++ @Deprecated
++ public void line(int index, net.kyori.adventure.text.@NotNull Component line) throws IndexOutOfBoundsException;
++ // Paper end
+
+ /**
+ * Gets all the lines of text currently on the {@link Side#FRONT} of this sign.
+ *
+ * @return Array of Strings containing each line of text
+- * @deprecated A sign may have multiple writable sides now. Use {@link Sign#getSide(Side)} and {@link SignSide#getLines()}.
++ * @deprecated A sign may have multiple writable sides now. Use {@link Sign#getSide(Side)} and {@link SignSide#lines()}.
+ */
+ @Deprecated(since = "1.20")
+ @NotNull
+@@ -31,7 +70,7 @@ public interface Sign extends TileState, Colorable {
+ * @param index Line number to get the text from, starting at 0
+ * @return Text on the given line
+ * @throws IndexOutOfBoundsException Thrown when the line does not exist
+- * @deprecated A sign may have multiple writable sides now. Use {@link #getSide(Side)} and {@link SignSide#getLine(int)}.
++ * @deprecated A sign may have multiple writable sides now. Use {@link #getSide(Side)} and {@link SignSide#line(int)}.
+ */
+ @Deprecated(since = "1.20")
+ @NotNull
+@@ -46,7 +85,7 @@ public interface Sign extends TileState, Colorable {
+ * @param index Line number to set the text at, starting from 0
+ * @param line New text to set at the specified index
+ * @throws IndexOutOfBoundsException If the index is out of the range 0..3
+- * @deprecated A sign may have multiple writable sides now. Use {@link #getSide(Side)} and {@link SignSide#setLine(int, String)}.
++ * @deprecated A sign may have multiple writable sides now. Use {@link #getSide(Side)} and {@link SignSide#line(int, net.kyori.adventure.text.Component)}.
+ */
+ @Deprecated(since = "1.20")
+ public void setLine(int index, @NotNull String line) throws IndexOutOfBoundsException;
+diff --git a/src/main/java/org/bukkit/block/sign/SignSide.java b/src/main/java/org/bukkit/block/sign/SignSide.java
+index 0f4ae7bd2ad379b5edb40f49f93de9e18c38f415..575e545a69b5279b90067d7ebee08b7b59288496 100644
+--- a/src/main/java/org/bukkit/block/sign/SignSide.java
++++ b/src/main/java/org/bukkit/block/sign/SignSide.java
+@@ -7,13 +7,48 @@ import org.jetbrains.annotations.NotNull;
+ * Represents a side of a sign.
+ */
+ public interface SignSide extends Colorable {
++ // Paper start
++ /**
++ * Gets all the lines of text currently on the sign.
++ *
++ * @return List of components containing each line of text
++ */
++ @NotNull
++ public java.util.List
++ * For example, getLine(0) will return the first line of text.
++ *
++ * @param index Line number to get the text from, starting at 0
++ * @throws IndexOutOfBoundsException Thrown when the line does not exist
++ * @return Text on the given line
++ */
++ @NotNull
++ public net.kyori.adventure.text.Component line(int index) throws IndexOutOfBoundsException;
++
++ /**
++ * Sets the line of text at the specified index.
++ *
++ * For example, setLine(0, "Line One") will set the first line of text to
++ * "Line One".
++ *
++ * @param index Line number to set the text at, starting from 0
++ * @param line New text to set at the specified index
++ * @throws IndexOutOfBoundsException If the index is out of the range 0..3
++ */
++ public void line(int index, net.kyori.adventure.text.@NotNull Component line) throws IndexOutOfBoundsException;
++ // Paper end
+
+ /**
+ * Gets all the lines of text currently on this side of the sign.
+ *
+ * @return Array of Strings containing each line of text
++ * @deprecated in favour of {@link #lines()}
+ */
+ @NotNull
++ @Deprecated // Paper
+ public String[] getLines();
+
+ /**
+@@ -24,8 +59,10 @@ public interface SignSide extends Colorable {
+ * @param index Line number to get the text from, starting at 0
+ * @return Text on the given line
+ * @throws IndexOutOfBoundsException Thrown when the line does not exist
++ * @deprecated in favour of {@link #line(int)}
+ */
+ @NotNull
++ @Deprecated // Paper
+ public String getLine(int index) throws IndexOutOfBoundsException;
+
+ /**
+@@ -37,7 +74,9 @@ public interface SignSide extends Colorable {
+ * @param index Line number to set the text at, starting from 0
+ * @param line New text to set at the specified index
+ * @throws IndexOutOfBoundsException If the index is out of the range 0..3
++ * @deprecated in favour of {@link #line(int, net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ public void setLine(int index, @NotNull String line) throws IndexOutOfBoundsException;
+
+ /**
+diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
+index 9019ebeefc9492d7c982b09fc9438d58c4233df0..6686d025222dc50156347a1757c88da02f882eec 100644
+--- a/src/main/java/org/bukkit/command/Command.java
++++ b/src/main/java/org/bukkit/command/Command.java
+@@ -32,7 +32,7 @@ public abstract class Command {
+ protected String description;
+ protected String usageMessage;
+ private String permission;
+- private String permissionMessage;
++ private net.kyori.adventure.text.Component permissionMessage; // Paper
+ public org.spigotmc.CustomTimingsHandler timings; // Spigot
+
+ protected Command(@NotNull String name) {
+@@ -186,10 +186,10 @@ public abstract class Command {
+
+ if (permissionMessage == null) {
+ target.sendMessage(ChatColor.RED + "I'm sorry, but you do not have permission to perform this command. Please contact the server administrators if you believe that this is a mistake.");
+- } else if (permissionMessage.length() != 0) {
+- for (String line : permissionMessage.replace("
++ * See MiniMessage docs
++ * for more information on the format.
++ *
++ * @param message MiniMessage content
++ */
++ default void sendRichMessage(final @NotNull String message) {
++ this.sendMessage(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(message));
++ }
++
++ /**
++ * Sends a message with the MiniMessage format to the command sender.
++ *
++ * See MiniMessage docs and MiniMessage Placeholders docs
++ * for more information on the format.
++ *
++ * @param message MiniMessage content
++ * @param resolvers resolvers to use
++ */
++ default void sendRichMessage(final @NotNull String message, final net.kyori.adventure.text.minimessage.tag.resolver.@NotNull TagResolver... resolvers) {
++ this.sendMessage(net.kyori.adventure.text.minimessage.MiniMessage.miniMessage().deserialize(message, resolvers));
++ }
++
++ /**
++ * Sends a plain message to the command sender.
++ *
++ * @param message plain message
++ */
++ default void sendPlainMessage(final @NotNull String message) {
++ this.sendMessage(net.kyori.adventure.text.Component.text(message));
++ }
++ // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/command/PluginCommandYamlParser.java b/src/main/java/org/bukkit/command/PluginCommandYamlParser.java
+index a542c4bb3c973bbe4b976642feccde6a4d90cb7b..ef870b864c1e36032b54b31f3f85707edc06d764 100644
+--- a/src/main/java/org/bukkit/command/PluginCommandYamlParser.java
++++ b/src/main/java/org/bukkit/command/PluginCommandYamlParser.java
+@@ -67,7 +67,7 @@ public class PluginCommandYamlParser {
+ }
+
+ if (permissionMessage != null) {
+- newCmd.setPermissionMessage(permissionMessage.toString());
++ newCmd.permissionMessage(net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(permissionMessage.toString())); // Paper
+ }
+
+ pluginCmds.add(newCmd);
+diff --git a/src/main/java/org/bukkit/command/ProxiedCommandSender.java b/src/main/java/org/bukkit/command/ProxiedCommandSender.java
+index fcc34b640265f4dccb46b9f09466ab8e1d96043e..5c813ac024f675951159a59d88d8baa0d49840e9 100644
+--- a/src/main/java/org/bukkit/command/ProxiedCommandSender.java
++++ b/src/main/java/org/bukkit/command/ProxiedCommandSender.java
+@@ -3,7 +3,7 @@ package org.bukkit.command;
+
+ import org.jetbrains.annotations.NotNull;
+
+-public interface ProxiedCommandSender extends CommandSender {
++public interface ProxiedCommandSender extends CommandSender, net.kyori.adventure.audience.ForwardingAudience.Single { // Paper
+
+ /**
+ * Returns the CommandSender which triggered this proxied command
+@@ -21,4 +21,16 @@ public interface ProxiedCommandSender extends CommandSender {
+ @NotNull
+ CommandSender getCallee();
+
++ // Paper start
++ @Override
++ default void sendMessage(final net.kyori.adventure.identity.@NotNull Identity source, final net.kyori.adventure.text.@NotNull Component message, final net.kyori.adventure.audience.@NotNull MessageType type) {
++ net.kyori.adventure.audience.ForwardingAudience.Single.super.sendMessage(source, message, type);
++ }
++
++ @NotNull
++ @Override
++ default net.kyori.adventure.audience.Audience audience() {
++ return this.getCaller();
++ }
++ // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/configuration/ConfigurationSection.java b/src/main/java/org/bukkit/configuration/ConfigurationSection.java
+index b6b00af08f12f838411845e4f4e29e62826dfc7f..d168b1e58b4b4ad00466fab60232d516551668e0 100644
+--- a/src/main/java/org/bukkit/configuration/ConfigurationSection.java
++++ b/src/main/java/org/bukkit/configuration/ConfigurationSection.java
+@@ -1058,4 +1058,98 @@ public interface ConfigurationSection {
+ * one line.
+ */
+ public void setInlineComments(@NotNull String path, @Nullable List
++ * If the Component does not exist but a default value has been specified,
++ * this will return the default value. If the Component does not exist and no
++ * default value was specified, this will return null.
++ *
++ * @param path Path of the Component to get.
++ * @return Requested Component.
++ */
++ default net.kyori.adventure.text.@Nullable Component getRichMessage(final @NotNull String path) {
++ return this.getRichMessage(path, null);
++ }
++
++ /**
++ * Gets the requested MiniMessage formatted String as Component by path.
++ *
++ * If the Component does not exist but a default value has been specified,
++ * this will return the default value. If the Component does not exist and no
++ * default value was specified, this will return null.
++ *
++ * @param path Path of the Component to get.
++ * @param fallback component that will be used as fallback
++ * @return Requested Component.
++ */
++ @Contract("_, !null -> !null")
++ default net.kyori.adventure.text.@Nullable Component getRichMessage(final @NotNull String path, final net.kyori.adventure.text.@Nullable Component fallback) {
++ return this.getComponent(path, net.kyori.adventure.text.minimessage.MiniMessage.miniMessage(), fallback);
++ }
++
++ /**
++ * Sets the specified path to the given value.
++ *
++ * If value is null, the entry will be removed. Any existing entry will be
++ * replaced, regardless of what the new value is.
++ *
++ * @param path Path of the object to set.
++ * @param value New value to set the path to.
++ */
++ default void setRichMessage(final @NotNull String path, final net.kyori.adventure.text.@Nullable Component value) {
++ this.setComponent(path, net.kyori.adventure.text.minimessage.MiniMessage.miniMessage(), value);
++ }
++
++ /**
++ * Gets the requested formatted String as Component by path deserialized by the ComponentDecoder.
++ *
++ * If the Component does not exist but a default value has been specified,
++ * this will return the default value. If the Component does not exist and no
++ * default value was specified, this will return null.
++ *
++ * @param path Path of the Component to get.
++ * @param decoder ComponentDecoder instance used for deserialization
++ * @return Requested Component.
++ */
++ default
++ * If the Component does not exist but a default value has been specified,
++ * this will return the default value. If the Component does not exist and no
++ * default value was specified, this will return null.
++ *
++ * @param path Path of the Component to get.
++ * @param decoder ComponentDecoder instance used for deserialization
++ * @param fallback component that will be used as fallback
++ * @return Requested Component.
++ */
++ @Contract("_, _, !null -> !null")
++ default
++ * If value is null, the entry will be removed. Any existing entry will be
++ * replaced, regardless of what the new value is.
++ *
++ * @param path Path of the object to set.
++ * @param encoder the encoder used to transform the value
++ * @param value New value to set the path to.
++ */
++ default
++ * If the given {@code level} is either less than the {@link #getStartLevel()} or greater than the {@link #getMaxLevel()},
++ * the level may not be shown in the numeral format one may otherwise expect.
++ *
++ * This currently only returns bossbars shown to the player via
++ * {@link #showBossBar(net.kyori.adventure.bossbar.BossBar)} and does not contain bukkit
++ * {@link org.bukkit.boss.BossBar} instances shown to the player.
++ *
++ * @return an unmodifiable view of all known currently active bossbars
++ * @since 4.14.0
++ */
++ @Override
++ @org.jetbrains.annotations.UnmodifiableView @NotNull Iterable activeBossBars();
++
++ /**
++ * Gets the "friendly" name to display of this player.
++ *
++ * @return the display name
++ */
++ net.kyori.adventure.text.@NotNull Component displayName();
++
++ /**
++ * Sets the "friendly" name to display of this player.
++ *
++ * @param displayName the display name to set
++ */
++ void displayName(final net.kyori.adventure.text.@Nullable Component displayName);
++ // Paper end
+
+ /**
+ * {@inheritDoc}
+@@ -75,7 +109,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+ * places defined by plugins.
+ *
+ * @return the friendly name
++ * @deprecated in favour of {@link #displayName()}
+ */
++ @Deprecated // Paper
+ @NotNull
+ public String getDisplayName();
+
+@@ -87,15 +123,50 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+ * places defined by plugins.
+ *
+ * @param name The new display name.
++ * @deprecated in favour of {@link #displayName(net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ public void setDisplayName(@Nullable String name);
+
++ // Paper start
++ /**
++ * Sets the name that is shown on the in-game player list.
++ *
++ * If the value is null, the name will be identical to {@link #getName()}.
++ *
++ * @param name new player list name
++ */
++ void playerListName(net.kyori.adventure.text.@Nullable Component name);
++
++ /**
++ * Gets the name that is shown on the in-game player list.
++ *
++ * @return the player list name
++ */
++ net.kyori.adventure.text.@NotNull Component playerListName();
++
++ /**
++ * Gets the currently displayed player list header for this player.
++ *
++ * @return player list header or null
++ */
++ net.kyori.adventure.text.@Nullable Component playerListHeader();
++
++ /**
++ * Gets the currently displayed player list footer for this player.
++ *
++ * @return player list footer or null
++ */
++ net.kyori.adventure.text.@Nullable Component playerListFooter();
++ // Paper end
+ /**
+ * Gets the name that is shown on the player list.
+ *
+ * @return the player list name
++ * @deprecated in favour of {@link #playerListName()}
+ */
+ @NotNull
++ @Deprecated // Paper
+ public String getPlayerListName();
+
+ /**
+@@ -104,7 +175,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+ * If the value is null, the name will be identical to {@link #getName()}.
+ *
+ * @param name new player list name
++ * @deprecated in favour of {@link #playerListName(net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ public void setPlayerListName(@Nullable String name);
+
+ /**
+@@ -126,7 +199,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+ * Gets the currently displayed player list header for this player.
+ *
+ * @return player list header or null
++ * @deprecated in favour of {@link #playerListHeader()}
+ */
++ @Deprecated // Paper
+ @Nullable
+ public String getPlayerListHeader();
+
+@@ -134,7 +209,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+ * Gets the currently displayed player list footer for this player.
+ *
+ * @return player list header or null
++ * @deprecated in favour of {@link #playerListFooter()}
+ */
++ @Deprecated // Paper
+ @Nullable
+ public String getPlayerListFooter();
+
+@@ -142,14 +219,18 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+ * Sets the currently displayed player list header for this player.
+ *
+ * @param header player list header, null for empty
++ * @deprecated in favour of {@link #sendPlayerListHeader(net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ public void setPlayerListHeader(@Nullable String header);
+
+ /**
+ * Sets the currently displayed player list footer for this player.
+ *
+ * @param footer player list footer, null for empty
++ * @deprecated in favour of {@link #sendPlayerListFooter(net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ public void setPlayerListFooter(@Nullable String footer);
+
+ /**
+@@ -158,7 +239,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+ *
+ * @param header player list header, null for empty
+ * @param footer player list footer, null for empty
++ * @deprecated in favour of {@link #sendPlayerListHeaderAndFooter(net.kyori.adventure.text.Component, net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ public void setPlayerListHeaderFooter(@Nullable String header, @Nullable String footer);
+
+ /**
+@@ -235,9 +318,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+ * Kicks player with custom kick message.
+ *
+ * @param message kick message
++ * @deprecated in favour of {@link #kick(net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ public void kickPlayer(@Nullable String message);
+
++ // Paper start
++ /**
++ * Kicks the player with the default kick message.
++ * @see #kick(net.kyori.adventure.text.Component)
++ */
++ void kick();
++ /**
++ * Kicks player with custom kick message.
++ *
++ * @param message kick message
++ */
++ void kick(final net.kyori.adventure.text.@Nullable Component message);
++ // Paper end
++
+ /**
+ * Adds this user to the {@link ProfileBanList}. If a previous ban exists, this will
+ * update the entry.
+@@ -924,6 +1023,106 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+ */
+ public void sendEquipmentChange(@NotNull LivingEntity entity, @NotNull Map
++ * If the client does not have a sign at the given location it will
++ * display an error message to the user.
++ *
++ * @param loc the location of the sign
++ * @param lines the new text on the sign or null to clear it
++ * @throws IllegalArgumentException if location is null
++ * @throws IllegalArgumentException if lines is non-null and has a length less than 4
++ * @deprecated Use {@link #sendBlockUpdate(Location, TileState)} by creating a new virtual
++ * {@link org.bukkit.block.Sign} block state via {@link BlockData#createBlockState()}
++ * (constructed e.g. via {@link Material#createBlockData()})
++ */
++ @Deprecated
++ default void sendSignChange(@NotNull Location loc, @Nullable java.util.List lines) throws IllegalArgumentException {
++ this.sendSignChange(loc, lines, DyeColor.BLACK);
++ }
++
++ /**
++ * Send a sign change. This fakes a sign change packet for a user at
++ * a certain location. This will not actually change the world in any way.
++ * This method will use a sign at the location's block or a faked sign
++ * sent via
++ * {@link #sendBlockChange(org.bukkit.Location, org.bukkit.Material, byte)}.
++ *
++ * If the client does not have a sign at the given location it will
++ * display an error message to the user.
++ *
++ * @param loc the location of the sign
++ * @param lines the new text on the sign or null to clear it
++ * @param dyeColor the color of the sign
++ * @throws IllegalArgumentException if location is null
++ * @throws IllegalArgumentException if dyeColor is null
++ * @throws IllegalArgumentException if lines is non-null and has a length less than 4
++ * @deprecated Use {@link #sendBlockUpdate(Location, TileState)} by creating a new virtual
++ * {@link org.bukkit.block.Sign} block state via {@link BlockData#createBlockState()}
++ * (constructed e.g. via {@link Material#createBlockData()})
++ */
++ @Deprecated
++ default void sendSignChange(@NotNull Location loc, @Nullable java.util.List lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException {
++ this.sendSignChange(loc, lines, dyeColor, false);
++ }
++
++ /**
++ * Send a sign change. This fakes a sign change packet for a user at
++ * a certain location. This will not actually change the world in any way.
++ * This method will use a sign at the location's block or a faked sign
++ * sent via
++ * {@link #sendBlockChange(org.bukkit.Location, org.bukkit.Material, byte)}.
++ *
++ * If the client does not have a sign at the given location it will
++ * display an error message to the user.
++ *
++ * @param loc the location of the sign
++ * @param lines the new text on the sign or null to clear it
++ * @param hasGlowingText whether the text of the sign should glow as if dyed with a glowing ink sac
++ * @throws IllegalArgumentException if location is null
++ * @throws IllegalArgumentException if dyeColor is null
++ * @throws IllegalArgumentException if lines is non-null and has a length less than 4
++ * @deprecated Use {@link #sendBlockUpdate(Location, TileState)} by creating a new virtual
++ * {@link org.bukkit.block.Sign} block state via {@link BlockData#createBlockState()}
++ * (constructed e.g. via {@link Material#createBlockData()})
++ */
++ @Deprecated
++ default void sendSignChange(@NotNull Location loc, @Nullable java.util.List lines, boolean hasGlowingText) throws IllegalArgumentException {
++ this.sendSignChange(loc, lines, DyeColor.BLACK, hasGlowingText);
++ }
++
++ /**
++ * Send a sign change. This fakes a sign change packet for a user at
++ * a certain location. This will not actually change the world in any way.
++ * This method will use a sign at the location's block or a faked sign
++ * sent via
++ * {@link #sendBlockChange(org.bukkit.Location, org.bukkit.Material, byte)}.
++ *
++ * If the client does not have a sign at the given location it will
++ * display an error message to the user.
++ *
++ * @param loc the location of the sign
++ * @param lines the new text on the sign or null to clear it
++ * @param dyeColor the color of the sign
++ * @param hasGlowingText whether the text of the sign should glow as if dyed with a glowing ink sac
++ * @throws IllegalArgumentException if location is null
++ * @throws IllegalArgumentException if dyeColor is null
++ * @throws IllegalArgumentException if lines is non-null and has a length less than 4
++ * @deprecated Use {@link #sendBlockUpdate(Location, TileState)} by creating a new virtual
++ * {@link org.bukkit.block.Sign} block state via {@link BlockData#createBlockState()}
++ * (constructed e.g. via {@link Material#createBlockData()})
++ */
++ @Deprecated
++ void sendSignChange(@NotNull Location loc, @Nullable java.util.List lines, @NotNull DyeColor dyeColor, boolean hasGlowingText)
++ throws IllegalArgumentException;
++ // Paper end
++
+ /**
+ * Send a sign change. This fakes a sign change packet for a user at
+ * a certain location. This will not actually change the world in any way.
+@@ -941,7 +1140,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+ * @param lines the new text on the sign or null to clear it
+ * @throws IllegalArgumentException if location is null
+ * @throws IllegalArgumentException if lines is non-null and has a length less than 4
++ * @deprecated Use {@link #sendBlockUpdate(Location, TileState)} by creating a new virtual
++ * {@link org.bukkit.block.Sign} block state via {@link BlockData#createBlockState()}
++ * (constructed e.g. via {@link Material#createBlockData()})
+ */
++ @Deprecated // Paper
+ public void sendSignChange(@NotNull Location loc, @Nullable String[] lines) throws IllegalArgumentException;
+
+ /**
+@@ -963,7 +1166,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+ * @throws IllegalArgumentException if location is null
+ * @throws IllegalArgumentException if dyeColor is null
+ * @throws IllegalArgumentException if lines is non-null and has a length less than 4
++ * @deprecated Use {@link #sendBlockUpdate(Location, TileState)} by creating a new virtual
++ * {@link org.bukkit.block.Sign} block state via {@link BlockData#createBlockState()}
++ * (constructed e.g. via {@link Material#createBlockData()})
+ */
++ @Deprecated // Paper
+ public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException;
+
+ /**
+@@ -986,7 +1193,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+ * @throws IllegalArgumentException if location is null
+ * @throws IllegalArgumentException if dyeColor is null
+ * @throws IllegalArgumentException if lines is non-null and has a length less than 4
++ * @deprecated Use {@link #sendBlockUpdate(Location, TileState)} by creating a new virtual
++ * {@link org.bukkit.block.Sign} block state via {@link BlockData#createBlockState()}
++ * (constructed e.g. via {@link Material#createBlockData()})
+ */
++ @Deprecated // Paper
+ public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor, boolean hasGlowingText) throws IllegalArgumentException;
+
+ /**
+@@ -1461,7 +1672,7 @@ 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.
+ * @deprecated Minecraft no longer uses textures packs. Instead you
+- * should use {@link #setResourcePack(String)}.
++ * should use {@link #setResourcePack(UUID, String, byte[], net.kyori.adventure.text.Component, boolean)}.
+ */
+ @Deprecated(since = "1.7.2")
+ public void setTexturePack(@NotNull String url);
+@@ -1497,7 +1708,9 @@ 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);
+
+ /**
+@@ -1529,6 +1742,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+ * pack correctly.
+ *
+ *
++ * @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.
+@@ -1541,6 +1755,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+ * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
+ * long.
+ */
++ @Deprecated // Paper - adventure
+ public void setResourcePack(@NotNull String url, @Nullable byte[] hash);
+
+ /**
+@@ -1565,12 +1780,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+ * {@link PlayerResourcePackStatusEvent} to figure out whether or not
+ * the player loaded the pack!
+ *
+@@ -1608,7 +1826,54 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+ * {@link PlayerResourcePackStatusEvent} to figure out whether or not
+ * the player loaded the pack!
+ *
++ * The player's client will download the new resource pack asynchronously
++ * in the background, and will automatically switch to it once the
++ * download is complete. If the client has downloaded and cached a
++ * resource pack with the same hash in the past it will not download but
++ * directly apply the cached pack. If the hash is null and the client has
++ * downloaded and cached the same resource pack in the past, it will
++ * 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.
++ *
++ * Notes:
++ *
++ * The player's client will download the new resource pack asynchronously
++ * in the background, and will automatically switch to it once the
++ * download is complete. If the client has downloaded and cached a
++ * resource pack with the same hash in the past it will not download but
++ * directly apply the cached pack. If the hash is null and the client has
++ * downloaded and cached the same resource pack in the past, it will
++ * 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 with a custom prompt
++ * to the player before proceeding with the download.
++ *
++ * Notes:
++ *
+@@ -1697,7 +2016,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+ * {@link PlayerResourcePackStatusEvent} to figure out whether or not
+ * the player loaded the pack!
+ *
++ * The player's client will download the new resource pack asynchronously
++ * in the background, and will automatically switch to it once the
++ * download is complete. If the client has downloaded and cached a
++ * resource pack with the same hash in the past it will not download but
++ * directly apply the cached pack. If the hash is null and the client has
++ * downloaded and cached the same resource pack in the past, it will
++ * 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.
++ *
++ * Notes:
++ *
+@@ -1773,12 +2143,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+ *
+ * @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();
+
+@@ -1916,7 +2288,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+ *
+ * @param title Title text
+ * @param subtitle Subtitle text
+- * @deprecated API behavior subject to change
++ * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
+ */
+ @Deprecated(since = "1.8.7")
+ public void sendTitle(@Nullable String title, @Nullable String subtitle);
+@@ -1935,7 +2307,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+ * @param fadeIn time in ticks for titles to fade in. Defaults to 10.
+ * @param stay time in ticks for titles to stay. Defaults to 70.
+ * @param fadeOut time in ticks for titles to fade out. Defaults to 20.
++ * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
+ */
++ @Deprecated // Paper - Adventure
+ public void sendTitle(@Nullable String title, @Nullable String subtitle, int fadeIn, int stay, int fadeOut);
+
+ /**
+@@ -2210,6 +2584,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+ */
+ public int getClientViewDistance();
+
++ // Paper start
++ /**
++ * Gets the player's current locale.
++ *
++ * @return the player's locale
++ */
++ @NotNull java.util.Locale locale();
++ // Paper end
+ /**
+ * Gets the player's estimated ping in milliseconds.
+ *
+@@ -2235,8 +2617,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+ * they wish.
+ *
+ * @return the player's locale
++ * @deprecated in favour of {@link #locale()}
+ */
+ @NotNull
++ @Deprecated // Paper
+ public String getLocale();
+
+ /**
+@@ -2288,6 +2672,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+ */
+ public boolean isAllowingServerListings();
+
++ // Paper start
++ @NotNull
++ @Override
++ default net.kyori.adventure.text.event.HoverEvent
+diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java
+index c2af9a9832fb7c3ebb397a4c5fb8604b90216f0c..f80d5bc893efd8846365b4677ef1407158b1abc8 100644
+--- a/src/main/java/org/bukkit/event/inventory/InventoryType.java
++++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java
+@@ -163,7 +163,18 @@ public enum InventoryType {
+ private final String title;
+ private final MenuType menuType;
+ private final boolean isCreatable;
++ // Paper start
++ private final net.kyori.adventure.text.Component defaultTitleComponent;
+
++ /**
++ * Gets the inventory's default title.
++ *
++ * @return the inventory's default title
++ */
++ public net.kyori.adventure.text.@NotNull Component defaultTitle() {
++ return defaultTitleComponent;
++ }
++ // Paper end
+ private InventoryType(int defaultSize, /*@NotNull*/ String defaultTitle, @Nullable MenuType type) {
+ this(defaultSize, defaultTitle, type, true);
+ }
+@@ -173,6 +184,7 @@ public enum InventoryType {
+ title = defaultTitle;
+ this.menuType = type;
+ this.isCreatable = isCreatable;
++ this.defaultTitleComponent = net.kyori.adventure.text.Component.text(defaultTitle); // Paper - Adventure
+ }
+
+ public int getDefaultSize() {
+@@ -180,6 +192,7 @@ public enum InventoryType {
+ }
+
+ @NotNull
++ @Deprecated // Paper
+ public String getDefaultTitle() {
+ return title;
+ }
+diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerChatEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerChatEvent.java
+index 9c68c3f2d61500479f48b80264f625aaae2f3204..399afcd19fcb6acd24857ed6ab48cf0d105a01a3 100644
+--- a/src/main/java/org/bukkit/event/player/AsyncPlayerChatEvent.java
++++ b/src/main/java/org/bukkit/event/player/AsyncPlayerChatEvent.java
+@@ -22,7 +22,11 @@ import org.jetbrains.annotations.NotNull;
+ *
+ * Care should be taken to check {@link #isAsynchronous()} and treat the event
+ * appropriately.
++ *
++ * @deprecated use {@link io.papermc.paper.event.player.AsyncChatEvent} instead
+ */
++@Deprecated // Paper
++@org.bukkit.Warning(value = false, reason = "Don't nag on old event yet") // Paper
+ public class AsyncPlayerChatEvent extends PlayerEvent implements Cancellable {
+ private static final HandlerList handlers = new HandlerList();
+ private boolean cancel = false;
+diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
+index 23257ae3953d1aa5ba96c69485a5e3d7889ad8de..b2f32debd32f78e7df4851866a47da3ff0d1f015 100644
+--- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
++++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java
+@@ -10,11 +10,18 @@ import org.jetbrains.annotations.NotNull;
+ * Stores details for players attempting to log in.
+ *
+ * This event is asynchronous, and not run using main thread.
++ *
++ * When this event is fired, the player's locale is not
++ * available. Therefore, any translatable component will be
++ * rendered with the default locale, {@link java.util.Locale#US}.
++ *
++ * Consider rendering any translatable yourself with {@link net.kyori.adventure.translation.GlobalTranslator#render}
++ * if the client's language is known.
+ */
+ public class AsyncPlayerPreLoginEvent extends Event {
+ private static final HandlerList handlers = new HandlerList();
+ private Result result;
+- private String message;
++ private net.kyori.adventure.text.Component message; // Paper
+ private final String name;
+ private final InetAddress ipAddress;
+ private final UUID uniqueId;
+@@ -33,7 +40,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
+ public AsyncPlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId, boolean transferred) {
+ super(true);
+ this.result = Result.ALLOWED;
+- this.message = "";
++ this.message = net.kyori.adventure.text.Component.empty(); // Paper
+ this.name = name;
+ this.ipAddress = ipAddress;
+ this.uniqueId = uniqueId;
+@@ -86,6 +93,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
+ this.result = result == null ? null : Result.valueOf(result.name());
+ }
+
++ // Paper start
+ /**
+ * Gets the current kick message that will be used if getResult() !=
+ * Result.ALLOWED
+@@ -93,7 +101,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
+ * @return Current kick message
+ */
+ @NotNull
+- public String getKickMessage() {
++ public net.kyori.adventure.text.Component kickMessage() {
+ return message;
+ }
+
+@@ -102,16 +110,66 @@ public class AsyncPlayerPreLoginEvent extends Event {
+ *
+ * @param message New kick message
+ */
+- public void setKickMessage(@NotNull final String message) {
++ public void kickMessage(@NotNull final net.kyori.adventure.text.Component message) {
++ this.message = message;
++ }
++
++ /**
++ * Disallows the player from logging in, with the given reason
++ *
++ * @param result New result for disallowing the player
++ * @param message Kick message to display to the user
++ */
++ public void disallow(@NotNull final Result result, @NotNull final net.kyori.adventure.text.Component message) {
++ this.result = result;
++ this.message = message;
++ }
++
++ /**
++ * Disallows the player from logging in, with the given reason
++ *
++ * @param result New result for disallowing the player
++ * @param message Kick message to display to the user
++ * @deprecated This method uses a deprecated enum from {@link
++ * PlayerPreLoginEvent}
++ * @see #disallow(Result, String)
++ */
++ @Deprecated
++ public void disallow(@NotNull final PlayerPreLoginEvent.Result result, @NotNull final net.kyori.adventure.text.Component message) {
++ this.result = result == null ? null : Result.valueOf(result.name());
+ this.message = message;
+ }
++ // Paper end
++ /**
++ * Gets the current kick message that will be used if getResult() !=
++ * Result.ALLOWED
++ *
++ * @return Current kick message
++ * @deprecated in favour of {@link #kickMessage()}
++ */
++ @NotNull
++ @Deprecated // Paper
++ public String getKickMessage() {
++ return net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serialize(this.message); // Paper
++ }
++
++ /**
++ * Sets the kick message to display if getResult() != Result.ALLOWED
++ *
++ * @param message New kick message
++ * @deprecated in favour of {@link #kickMessage(net.kyori.adventure.text.Component)}
++ */
++ @Deprecated // Paper
++ public void setKickMessage(@NotNull final String message) {
++ this.message = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(message); // Paper
++ }
+
+ /**
+ * Allows the player to log in
+ */
+ public void allow() {
+ result = Result.ALLOWED;
+- message = "";
++ message = net.kyori.adventure.text.Component.empty(); // Paper
+ }
+
+ /**
+@@ -119,10 +177,12 @@ public class AsyncPlayerPreLoginEvent extends Event {
+ *
+ * @param result New result for disallowing the player
+ * @param message Kick message to display to the user
++ * @deprecated in favour of {@link #disallow(org.bukkit.event.player.AsyncPlayerPreLoginEvent.Result, net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ public void disallow(@NotNull final Result result, @NotNull final String message) {
+ this.result = result;
+- this.message = message;
++ this.message = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(message); // Paper
+ }
+
+ /**
+@@ -137,7 +197,7 @@ public class AsyncPlayerPreLoginEvent extends Event {
+ @Deprecated(since = "1.3.2")
+ public void disallow(@NotNull final PlayerPreLoginEvent.Result result, @NotNull final String message) {
+ this.result = result == null ? null : Result.valueOf(result.name());
+- this.message = message;
++ this.message = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(message); // Paper
+ }
+
+ /**
+diff --git a/src/main/java/org/bukkit/event/player/PlayerChatEvent.java b/src/main/java/org/bukkit/event/player/PlayerChatEvent.java
+index eb1018a84aac4f8265f3f848fa6f78781d85de4f..373162d96fbf65286adf35a1c32031e1ac846346 100644
+--- a/src/main/java/org/bukkit/event/player/PlayerChatEvent.java
++++ b/src/main/java/org/bukkit/event/player/PlayerChatEvent.java
+@@ -12,12 +12,7 @@ import org.jetbrains.annotations.NotNull;
+ /**
+ * Holds information for player chat and commands
+ *
+- * @deprecated This event will fire from the main thread and allows the use of
+- * all of the Bukkit API, unlike the {@link AsyncPlayerChatEvent}.
+- *
+- * Listening to this event forces chat to wait for the main thread which
+- * causes delays for chat. {@link AsyncPlayerChatEvent} is the encouraged
+- * alternative for thread safe implementations.
++ * @deprecated Listening to this event forces chat to wait for the main thread, delaying chat messages. It is recommended to use {@link io.papermc.paper.event.player.AsyncChatEvent} instead, wherever possible.
+ */
+ @Deprecated(since = "1.3.1")
+ @Warning(reason = "Listening to this event forces chat to wait for the main thread, delaying chat messages.")
+diff --git a/src/main/java/org/bukkit/event/player/PlayerEvent.java b/src/main/java/org/bukkit/event/player/PlayerEvent.java
+index 793b661b6d2d05de3d7f4fc26a4c018a2af58e62..f6d3b817de3001f04ea4554c7c39a1290af3fd6d 100644
+--- a/src/main/java/org/bukkit/event/player/PlayerEvent.java
++++ b/src/main/java/org/bukkit/event/player/PlayerEvent.java
+@@ -14,7 +14,7 @@ public abstract class PlayerEvent extends Event {
+ player = who;
+ }
+
+- PlayerEvent(@NotNull final Player who, boolean async) {
++ public PlayerEvent(@NotNull final Player who, boolean async) { // Paper - public
+ super(async);
+ player = who;
+
+diff --git a/src/main/java/org/bukkit/event/player/PlayerJoinEvent.java b/src/main/java/org/bukkit/event/player/PlayerJoinEvent.java
+index d06684aba7688ce06777dbd837a46856a9d7767f..3e1e7cd0415509da4dd887db59efa55011b1dab4 100644
+--- a/src/main/java/org/bukkit/event/player/PlayerJoinEvent.java
++++ b/src/main/java/org/bukkit/event/player/PlayerJoinEvent.java
+@@ -10,30 +10,60 @@ import org.jetbrains.annotations.Nullable;
+ */
+ public class PlayerJoinEvent extends PlayerEvent {
+ private static final HandlerList handlers = new HandlerList();
+- private String joinMessage;
++ // Paper start
++ private net.kyori.adventure.text.Component joinMessage;
++ public PlayerJoinEvent(@NotNull final Player playerJoined, @Nullable final net.kyori.adventure.text.Component joinMessage) {
++ super(playerJoined);
++ this.joinMessage = joinMessage;
++ }
+
++ @Deprecated // Paper end
+ public PlayerJoinEvent(@NotNull final Player playerJoined, @Nullable final String joinMessage) {
+ super(playerJoined);
++ this.joinMessage = joinMessage != null ? net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(joinMessage) : null; // Paper end
++ }
++
++ // Paper start
++ /**
++ * Gets the join message to send to all online players
++ *
++ * @return string join message. Can be null
++ */
++ public net.kyori.adventure.text.@Nullable Component joinMessage() {
++ return this.joinMessage;
++ }
++
++ /**
++ * Sets the join message to send to all online players
++ *
++ * @param joinMessage join message. If null, no message will be sent
++ */
++ public void joinMessage(net.kyori.adventure.text.@Nullable Component joinMessage) {
+ this.joinMessage = joinMessage;
+ }
++ // Paper end
+
+ /**
+ * Gets the join message to send to all online players
+ *
+ * @return string join message. Can be null
++ * @deprecated in favour of {@link #joinMessage()}
+ */
+ @Nullable
++ @Deprecated // Paper
+ public String getJoinMessage() {
+- return joinMessage;
++ return this.joinMessage == null ? null : net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serialize(this.joinMessage); // Paper
+ }
+
+ /**
+ * Sets the join message to send to all online players
+ *
+ * @param joinMessage join message. If null, no message will be sent
++ * @deprecated in favour of {@link #joinMessage(net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ public void setJoinMessage(@Nullable String joinMessage) {
+- this.joinMessage = joinMessage;
++ this.joinMessage = joinMessage != null ? net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(joinMessage) : null; // Paper
+ }
+
+ @NotNull
+diff --git a/src/main/java/org/bukkit/event/player/PlayerKickEvent.java b/src/main/java/org/bukkit/event/player/PlayerKickEvent.java
+index 2f6ca42330675733b2b4132cbb66e433788d05d5..997b06c19a5277656521e0e298f2958c209f1da1 100644
+--- a/src/main/java/org/bukkit/event/player/PlayerKickEvent.java
++++ b/src/main/java/org/bukkit/event/player/PlayerKickEvent.java
+@@ -10,35 +10,84 @@ import org.jetbrains.annotations.NotNull;
+ */
+ public class PlayerKickEvent extends PlayerEvent implements Cancellable {
+ private static final HandlerList handlers = new HandlerList();
+- private String leaveMessage;
+- private String kickReason;
++ private net.kyori.adventure.text.Component leaveMessage; // Paper
++ private net.kyori.adventure.text.Component kickReason; // Paper
+ private boolean cancel;
+
++ @Deprecated // Paper
+ public PlayerKickEvent(@NotNull final Player playerKicked, @NotNull final String kickReason, @NotNull final String leaveMessage) {
++ super(playerKicked);
++ this.kickReason = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(kickReason); // Paper
++ this.leaveMessage = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(leaveMessage); // Paper
++ this.cancel = false;
++ }
++ // Paper start
++ public PlayerKickEvent(@NotNull final Player playerKicked, @NotNull final net.kyori.adventure.text.Component kickReason, @NotNull final net.kyori.adventure.text.Component leaveMessage) {
+ super(playerKicked);
+ this.kickReason = kickReason;
+ this.leaveMessage = leaveMessage;
+ this.cancel = false;
+ }
+
++ /**
++ * Gets the leave message send to all online players
++ *
++ * @return string kick reason
++ */
++ public net.kyori.adventure.text.@NotNull Component leaveMessage() {
++ return this.leaveMessage;
++ }
++
++ /**
++ * Sets the leave message send to all online players
++ *
++ * @param leaveMessage leave message
++ */
++ public void leaveMessage(net.kyori.adventure.text.@NotNull Component leaveMessage) {
++ this.leaveMessage = leaveMessage;
++ }
++
+ /**
+ * Gets the reason why the player is getting kicked
+ *
+ * @return string kick reason
+ */
++ public net.kyori.adventure.text.@NotNull Component reason() {
++ return this.kickReason;
++ }
++
++ /**
++ * Sets the reason why the player is getting kicked
++ *
++ * @param kickReason kick reason
++ */
++ public void reason(net.kyori.adventure.text.@NotNull Component kickReason) {
++ this.kickReason = kickReason;
++ }
++ // Paper end
++
++ /**
++ * Gets the reason why the player is getting kicked
++ *
++ * @return string kick reason
++ * @deprecated in favour of {@link #reason()}
++ */
+ @NotNull
++ @Deprecated // Paper
+ public String getReason() {
+- return kickReason;
++ return net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serialize(this.kickReason); // Paper
+ }
+
+ /**
+ * Gets the leave message send to all online players
+ *
+ * @return string kick reason
++ * @deprecated in favour of {@link #leaveMessage()}
+ */
+ @NotNull
++ @Deprecated // Paper
+ public String getLeaveMessage() {
+- return leaveMessage;
++ return net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serialize(this.leaveMessage); // Paper
+ }
+
+ @Override
+@@ -55,18 +104,22 @@ public class PlayerKickEvent extends PlayerEvent implements Cancellable {
+ * Sets the reason why the player is getting kicked
+ *
+ * @param kickReason kick reason
++ * @deprecated in favour of {@link #reason(net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ public void setReason(@NotNull String kickReason) {
+- this.kickReason = kickReason;
++ this.kickReason = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(kickReason); // Paper
+ }
+
+ /**
+ * Sets the leave message send to all online players
+ *
+ * @param leaveMessage leave message
++ * @deprecated in favour of {@link #leaveMessage(net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ public void setLeaveMessage(@NotNull String leaveMessage) {
+- this.leaveMessage = leaveMessage;
++ this.leaveMessage = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(leaveMessage); // Paper
+ }
+
+ @NotNull
+diff --git a/src/main/java/org/bukkit/event/player/PlayerLocaleChangeEvent.java b/src/main/java/org/bukkit/event/player/PlayerLocaleChangeEvent.java
+index 36b436e145a7215682b692a87ab894df25752c1d..dc6b41950570c3a8b02415dd9017b2336e6e7f0c 100644
+--- a/src/main/java/org/bukkit/event/player/PlayerLocaleChangeEvent.java
++++ b/src/main/java/org/bukkit/event/player/PlayerLocaleChangeEvent.java
+@@ -12,17 +12,31 @@ public class PlayerLocaleChangeEvent extends PlayerEvent {
+ private static final HandlerList handlers = new HandlerList();
+ //
+ private final String locale;
++ // Paper start
++ private final java.util.Locale adventure$locale;
++ /**
++ * @see Player#locale()
++ *
++ * @return the player's new locale
++ */
++ public @NotNull java.util.Locale locale() {
++ return this.adventure$locale;
++ }
++ // Paper end
+
+ public PlayerLocaleChangeEvent(@NotNull Player who, @NotNull String locale) {
+ super(who);
+ this.locale = locale;
++ this.adventure$locale = java.util.Objects.requireNonNullElse(net.kyori.adventure.translation.Translator.parseLocale(locale), java.util.Locale.US); // Paper start
+ }
+
+ /**
+ * @return the player's new locale
+ * @see Player#getLocale()
++ * @deprecated in favour of {@link #locale()}
+ */
+ @NotNull
++ @Deprecated // Paper
+ public String getLocale() {
+ return locale;
+ }
+diff --git a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
+index 2bc81b0aa73f7f5b0352121f6bf18fa63acf7a83..eaa0548cf430bf5b58ff84e0a4403c451699db28 100644
+--- a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
++++ b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
+@@ -18,7 +18,7 @@ public class PlayerLoginEvent extends PlayerEvent {
+ private final InetAddress realAddress;
+ private final String hostname;
+ private Result result = Result.ALLOWED;
+- private String message = "";
++ private net.kyori.adventure.text.Component message = net.kyori.adventure.text.Component.empty();
+
+ /**
+ * This constructor defaults message to an empty string, and result to
+@@ -60,13 +60,53 @@ public class PlayerLoginEvent extends PlayerEvent {
+ * @param result The result status for this event
+ * @param message The message to be displayed if result denies login
+ * @param realAddress the actual, unspoofed connecting address
++ * @deprecated in favour of {@link #PlayerLoginEvent(Player, String, InetAddress, Result, net.kyori.adventure.text.Component, InetAddress)}
+ */
++ @Deprecated // Paper
+ public PlayerLoginEvent(@NotNull final Player player, @NotNull String hostname, @NotNull final InetAddress address, @NotNull final Result result, @NotNull final String message, @NotNull final InetAddress realAddress) {
+ this(player, hostname, address, realAddress);
+ this.result = result;
++ this.message = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(message); // Paper
++ }
++
++ // Paper start
++ /**
++ * This constructor pre-configures the event with a result and message
++ *
++ * @param player The {@link Player} for this event
++ * @param hostname The hostname that was used to connect to the server
++ * @param address The address the player used to connect, provided for
++ * timing issues
++ * @param result The result status for this event
++ * @param message The message to be displayed if result denies login
++ * @param realAddress the actual, unspoofed connecting address
++ */
++ public PlayerLoginEvent(@NotNull final Player player, @NotNull String hostname, @NotNull final InetAddress address, @NotNull final Result result, @NotNull final net.kyori.adventure.text.Component message, @NotNull final InetAddress realAddress) {
++ this(player, hostname, address, realAddress); // Spigot
++ this.result = result;
+ this.message = message;
+ }
+
++ /**
++ * Gets the current kick message that will be used if getResult() !=
++ * Result.ALLOWED
++ *
++ * @return Current kick message
++ */
++ public net.kyori.adventure.text.@NotNull Component kickMessage() {
++ return this.message;
++ }
++
++ /**
++ * Sets the kick message to display if getResult() != Result.ALLOWED
++ *
++ * @param message New kick message
++ */
++ public void kickMessage(net.kyori.adventure.text.@NotNull Component message) {
++ this.message = message;
++ }
++ // Paper end
++
+ /**
+ * Gets the current result of the login, as an enum
+ *
+@@ -91,19 +131,23 @@ public class PlayerLoginEvent extends PlayerEvent {
+ * Result.ALLOWED
+ *
+ * @return Current kick message
++ * @deprecated in favour of {@link #kickMessage()}
+ */
+ @NotNull
++ @Deprecated // Paper
+ public String getKickMessage() {
+- return message;
++ return net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serialize(this.message); // Paper
+ }
+
+ /**
+ * Sets the kick message to display if getResult() != Result.ALLOWED
+ *
+ * @param message New kick message
++ * @deprecated in favour of {@link #kickMessage(net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ public void setKickMessage(@NotNull final String message) {
+- this.message = message;
++ this.message = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(message); // Paper
+ }
+
+ /**
+@@ -122,7 +166,7 @@ public class PlayerLoginEvent extends PlayerEvent {
+ */
+ public void allow() {
+ result = Result.ALLOWED;
+- message = "";
++ message = net.kyori.adventure.text.Component.empty(); // Paper
+ }
+
+ /**
+@@ -130,8 +174,21 @@ public class PlayerLoginEvent extends PlayerEvent {
+ *
+ * @param result New result for disallowing the player
+ * @param message Kick message to display to the user
++ * @deprecated in favour of {@link #disallow(Result, net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper start
+ public void disallow(@NotNull final Result result, @NotNull final String message) {
++ this.result = result;
++ this.message = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(message);
++ }
++ /**
++ * Disallows the player from logging in, with the given reason
++ *
++ * @param result New result for disallowing the player
++ * @param message Kick message to display to the user
++ */
++ public void disallow(@NotNull final Result result, @NotNull final net.kyori.adventure.text.Component message) {
++ // Paper end
+ this.result = result;
+ this.message = message;
+ }
+diff --git a/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java
+index 203d030dbb2312a06bfb526351c1af92ddbc351a..b323212f11f831a96d87f6c9d746a90d119a3efd 100644
+--- a/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java
++++ b/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java
+@@ -9,6 +9,13 @@ import org.jetbrains.annotations.NotNull;
+
+ /**
+ * Stores details for players attempting to log in
++ *
++ * When this event is fired, the player's locale is not
++ * available. Therefore, any translatable component will be
++ * rendered with the default locale, {@link java.util.Locale#US}.
++ *
++ * Consider rendering any translatable yourself with {@link net.kyori.adventure.translation.GlobalTranslator#render}
++ * if the client's language is known.
+ *
+ * @deprecated This event causes synchronization from the login thread; {@link
+ * AsyncPlayerPreLoginEvent} is preferred to keep the secondary threads
+@@ -19,7 +26,7 @@ import org.jetbrains.annotations.NotNull;
+ public class PlayerPreLoginEvent extends Event {
+ private static final HandlerList handlers = new HandlerList();
+ private Result result;
+- private String message;
++ private net.kyori.adventure.text.Component message; // Paper
+ private final String name;
+ private final InetAddress ipAddress;
+ private final UUID uniqueId;
+@@ -31,7 +38,7 @@ public class PlayerPreLoginEvent extends Event {
+
+ public PlayerPreLoginEvent(@NotNull final String name, @NotNull final InetAddress ipAddress, @NotNull final UUID uniqueId) {
+ this.result = Result.ALLOWED;
+- this.message = "";
++ this.message = net.kyori.adventure.text.Component.empty(); // Paper
+ this.name = name;
+ this.ipAddress = ipAddress;
+ this.uniqueId = uniqueId;
+@@ -56,6 +63,7 @@ public class PlayerPreLoginEvent extends Event {
+ this.result = result;
+ }
+
++ // Paper start
+ /**
+ * Gets the current kick message that will be used if getResult() !=
+ * Result.ALLOWED
+@@ -63,7 +71,7 @@ public class PlayerPreLoginEvent extends Event {
+ * @return Current kick message
+ */
+ @NotNull
+- public String getKickMessage() {
++ public net.kyori.adventure.text.Component kickMessage() {
+ return message;
+ }
+
+@@ -72,16 +80,51 @@ public class PlayerPreLoginEvent extends Event {
+ *
+ * @param message New kick message
+ */
+- public void setKickMessage(@NotNull final String message) {
++ public void kickMessage(@NotNull final net.kyori.adventure.text.Component message) {
+ this.message = message;
+ }
+
++ /**
++ * Disallows the player from logging in, with the given reason
++ *
++ * @param result New result for disallowing the player
++ * @param message Kick message to display to the user
++ */
++ public void disallow(@NotNull final Result result, @NotNull final net.kyori.adventure.text.Component message) {
++ this.result = result;
++ this.message = message;
++ }
++ // Paper end
++ /**
++ * Gets the current kick message that will be used if getResult() !=
++ * Result.ALLOWED
++ *
++ * @return Current kick message
++ * @deprecated in favour of {@link #kickMessage()}
++ */
++ @Deprecated // Paper
++ @NotNull
++ public String getKickMessage() {
++ return net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serialize(this.message); // Paper
++ }
++
++ /**
++ * Sets the kick message to display if getResult() != Result.ALLOWED
++ *
++ * @param message New kick message
++ * @deprecated in favour of {@link #kickMessage(net.kyori.adventure.text.Component)}
++ */
++ @Deprecated // Paper
++ public void setKickMessage(@NotNull final String message) {
++ this.message = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(message); // Paper
++ }
++
+ /**
+ * Allows the player to log in
+ */
+ public void allow() {
+ result = Result.ALLOWED;
+- message = "";
++ message = net.kyori.adventure.text.Component.empty(); // Paper
+ }
+
+ /**
+@@ -89,10 +132,12 @@ public class PlayerPreLoginEvent extends Event {
+ *
+ * @param result New result for disallowing the player
+ * @param message Kick message to display to the user
++ * @deprecated in favour of {@link #disallow(org.bukkit.event.player.PlayerPreLoginEvent.Result, net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ public void disallow(@NotNull final Result result, @NotNull final String message) {
+ this.result = result;
+- this.message = message;
++ this.message = net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(message); // Paper
+ }
+
+ /**
+diff --git a/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java b/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
+index d70c25f404e994766a9ebce89a917c8d0719777c..14b27eaaf744736b3e56bb1383481df98a218c43 100644
+--- a/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
++++ b/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java
+@@ -10,30 +10,59 @@ import org.jetbrains.annotations.Nullable;
+ */
+ public class PlayerQuitEvent extends PlayerEvent {
+ private static final HandlerList handlers = new HandlerList();
+- private String quitMessage;
++ private net.kyori.adventure.text.Component quitMessage; // Paper
+
++ @Deprecated // Paper
+ public PlayerQuitEvent(@NotNull final Player who, @Nullable final String quitMessage) {
+ super(who);
++ this.quitMessage = quitMessage != null ? net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(quitMessage) : null; // Paper
++ }
++ // Paper start
++ public PlayerQuitEvent(@NotNull final Player who, @Nullable final net.kyori.adventure.text.Component quitMessage) {
++ super(who);
++ this.quitMessage = quitMessage;
++ }
++
++ /**
++ * Gets the quit message to send to all online players
++ *
++ * @return string quit message
++ */
++ public net.kyori.adventure.text.@Nullable Component quitMessage() {
++ return quitMessage;
++ }
++
++ /**
++ * Sets the quit message to send to all online players
++ *
++ * @param quitMessage quit message
++ */
++ public void quitMessage(net.kyori.adventure.text.@Nullable Component quitMessage) {
+ this.quitMessage = quitMessage;
+ }
++ // Paper end
+
+ /**
+ * Gets the quit message to send to all online players
+ *
+ * @return string quit message
++ * @deprecated in favour of {@link #quitMessage()}
+ */
+ @Nullable
++ @Deprecated // Paper
+ public String getQuitMessage() {
+- return quitMessage;
++ return this.quitMessage == null ? null : net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serialize(this.quitMessage); // Paper
+ }
+
+ /**
+ * Sets the quit message to send to all online players
+ *
+ * @param quitMessage quit message
++ * @deprecated in favour of {@link #quitMessage(net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ public void setQuitMessage(@Nullable String quitMessage) {
+- this.quitMessage = quitMessage;
++ this.quitMessage = quitMessage != null ? net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(quitMessage) : null; // Paper
+ }
+
+ @NotNull
+diff --git a/src/main/java/org/bukkit/event/server/BroadcastMessageEvent.java b/src/main/java/org/bukkit/event/server/BroadcastMessageEvent.java
+index 24d57cf17639f51b9557aec17a3686816542cfc6..173cdb379217d38af0df7a38e009553d0b257ea6 100644
+--- a/src/main/java/org/bukkit/event/server/BroadcastMessageEvent.java
++++ b/src/main/java/org/bukkit/event/server/BroadcastMessageEvent.java
+@@ -9,16 +9,16 @@ import org.jetbrains.annotations.NotNull;
+
+ /**
+ * Event triggered for server broadcast messages such as from
+- * {@link org.bukkit.Server#broadcast(String, String)}.
++ * {@link org.bukkit.Server#broadcast(net.kyori.adventure.text.Component)} (String, String)}.
+ *
+- * This event behaves similarly to {@link AsyncPlayerChatEvent} in that it
++ * This event behaves similarly to {@link io.papermc.paper.event.player.AsyncChatEvent} in that it
+ * should be async if fired from an async thread. Please see that event for
+ * further information.
+ */
+ public class BroadcastMessageEvent extends ServerEvent implements Cancellable {
+
+ private static final HandlerList handlers = new HandlerList();
+- private String message;
++ private net.kyori.adventure.text.Component message; // Paper
+ private final Set
++ * The player provided to create this view must be the player the view
++ * is opened for. See {@link HumanEntity#openInventory(InventoryView)}
++ * for more information.
++ *
++ * @param player the player the view belongs to
++ * @param title the title of the view
++ * @return the created {@link InventoryView}
++ */
++ @NotNull
++ V create(@NotNull HumanEntity player, @NotNull net.kyori.adventure.text.Component title);
++ // Paper end - adventure
+ }
+
++ // Paper start - adventure
++ /**
++ * Creates a view of the specified menu type.
++ *
++ * The player provided to create this view must be the player the view
++ * is opened for. See {@link HumanEntity#openInventory(InventoryView)}
++ * for more information.
++ *
++ * @param player the player the view belongs to
++ * @param title the title of the view
++ * @return the created {@link InventoryView}
++ */
++ @NotNull
++ InventoryView create(@NotNull HumanEntity player, @NotNull net.kyori.adventure.text.Component title);
++ // Paper end - adventure
++
+ /**
+ * Yields this MenuType as a typed version of itself with a plain
+ * {@link InventoryView} representing it.
+diff --git a/src/main/java/org/bukkit/inventory/meta/BookMeta.java b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
+index 9bab73c3c2ca759b8e1c7d07d98cc593c961666a..f0c6943da3f783101ca647b75b3230fae3a310da 100644
+--- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java
++++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java
+@@ -7,10 +7,15 @@ import org.jetbrains.annotations.NotNull;
+ import org.jetbrains.annotations.Nullable;
+
+ /**
+- * Represents a {@link Material#WRITTEN_BOOK}) that can have a title, an author,
++ * Represents a {@link Material#WRITTEN_BOOK} that can have a title, an author,
+ * and pages.
++ *
++ * Before using this type, make sure to check the itemstack's material with
++ * {@link org.bukkit.inventory.ItemStack#getType()}. {@code instanceof} on
++ * the meta instance is not sufficient due to unusual inheritance
++ * with relation to {@link WritableBookMeta}.
+ */
+-public interface BookMeta extends WritableBookMeta {
++public interface BookMeta extends WritableBookMeta, net.kyori.adventure.inventory.Book { // Paper - adventure
+
+ /**
+ * Represents the generation (or level of copying) of a written book
+@@ -116,6 +121,153 @@ public interface BookMeta extends WritableBookMeta {
+ @NotNull
+ BookMeta clone();
+
++ // Paper start - adventure
++ //
++ * Plugins should check that hasTitle() returns true before calling this
++ * method.
++ *
++ * @return the title of the book
++ */
++ @Override
++ net.kyori.adventure.text.@Nullable Component title();
++
++ /**
++ * Sets the title of the book.
++ *
++ * Limited to 32 characters. Removes title when given null.
++ *
++ * @param title the title to set
++ * @return the same {@link BookMeta} instance
++ */
++ @org.jetbrains.annotations.Contract(value = "_ -> this", pure = false)
++ @Override
++ @NotNull BookMeta title(net.kyori.adventure.text.@Nullable Component title);
++
++ /**
++ * Gets the author of the book.
++ *
++ * Plugins should check that hasAuthor() returns true before calling this
++ * method.
++ *
++ * @return the author of the book
++ */
++ @Override
++ net.kyori.adventure.text.@Nullable Component author();
++
++ /**
++ * Sets the author of the book. Removes author when given null.
++ *
++ * @param author the author to set
++ * @return the same {@link BookMeta} instance
++ */
++ @org.jetbrains.annotations.Contract(value = "_ -> this", pure = false)
++ @Override
++ @NotNull BookMeta author(net.kyori.adventure.text.@Nullable Component author);
++
++
++ /**
++ * Gets the specified page in the book. The page must exist.
++ *
++ * Pages are 1-indexed.
++ *
++ * @param page the page number to get, in range [1, getPageCount()]
++ * @return the page from the book
++ */
++ net.kyori.adventure.text.@NotNull Component page(int page);
++
++ /**
++ * Sets the specified page in the book. Pages of the book must be
++ * contiguous.
++ *
++ * The data can be up to 1024 characters in length, additional characters
++ * are truncated.
++ *
++ * Pages are 1-indexed.
++ *
++ * @param page the page number to set, in range [1, getPageCount()]
++ * @param data the data to set for that page
++ */
++ void page(int page, net.kyori.adventure.text.@NotNull Component data);
++
++ /**
++ * Adds new pages to the end of the book. Up to a maximum of 100 pages with
++ * 1024 characters per page.
++ *
++ * @param pages A list of strings, each being a page
++ */
++ void addPages(net.kyori.adventure.text.@NotNull Component @NotNull ... pages);
++
++ interface BookMetaBuilder extends net.kyori.adventure.inventory.Book.Builder {
++
++ @Override
++ @NotNull BookMetaBuilder title(net.kyori.adventure.text.@Nullable Component title);
++
++ @Override
++ @NotNull BookMetaBuilder author(net.kyori.adventure.text.@Nullable Component author);
++
++ @Override
++ @NotNull BookMetaBuilder addPage(net.kyori.adventure.text.@NotNull Component page);
++
++ @Override
++ @NotNull BookMetaBuilder pages(net.kyori.adventure.text.@NotNull Component @NotNull ... pages);
++
++ @Override
++ @NotNull BookMetaBuilder pages(java.util.@NotNull Collection Plugins should check that {@link #hasCustomName()} returns {@code true} before calling this method. Plugins should check that {@link #hasDisplayName()} returns
++ * Plugins should check that {@link #hasItemName()} returns Plugins should check that {@link #hasLore()} returns
+@@ -142,7 +247,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+ * calling this method.
+ *
+ * @return a list of lore that is set
++ * @deprecated in favour of {@link #lore()}
+ */
++ @Deprecated // Paper
+ @Nullable
+ List
+- * Plugins should check that hasCustomName() returns
++ * Plugins should check that {@link #hasCustomPotionName()} returns {@code true}
++ * before calling this method.
++ *
++ * @return the potion name that is set
++ */
++ @Nullable
++ String getCustomPotionName();
++
++ /**
++ * Sets the potion name translation suffix.
++ *
++ * @param name the name to set
++ */
++ void setCustomPotionName(@Nullable String name);
+
+ @Override
+ PotionMeta clone();
+diff --git a/src/main/java/org/bukkit/inventory/meta/WritableBookMeta.java b/src/main/java/org/bukkit/inventory/meta/WritableBookMeta.java
+index 12595536080ffe09df2b6ecdb83d846f50100d38..9fc47c879ee6b8edf2503f20e4736c2997d2de2e 100644
+--- a/src/main/java/org/bukkit/inventory/meta/WritableBookMeta.java
++++ b/src/main/java/org/bukkit/inventory/meta/WritableBookMeta.java
+@@ -5,8 +5,14 @@ import org.bukkit.Material;
+ import org.jetbrains.annotations.NotNull;
+
+ /**
+- * Represents a book ({@link Material#WRITABLE_BOOK} or {@link
+- * Material#WRITTEN_BOOK}) that can have pages.
++ * Represents a book ({@link Material#WRITABLE_BOOK}) that can have pages.
++ *
++ * For {@link Material#WRITTEN_BOOK}, use {@link BookMeta}.
++ *
++ * Before using this type, make sure to check the itemstack's material with
++ * {@link org.bukkit.inventory.ItemStack#getType()}. {@code instanceof} on
++ * the meta instance is not sufficient due to unusual inheritance
++ * with relation to {@link BookMeta}.
+ */
+ public interface WritableBookMeta extends ItemMeta {
+
+diff --git a/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java b/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java
+index ebfd6f5523205cfc932e3d6b351ff26da855fb15..cc38bee3c412bef4767f08407c0f5559a113fce5 100644
+--- a/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java
++++ b/src/main/java/org/bukkit/inventory/meta/trim/TrimMaterial.java
+@@ -61,4 +61,21 @@ public interface TrimMaterial extends Keyed, Translatable {
+ private static TrimMaterial getTrimMaterial(@NotNull String key) {
+ return Registry.TRIM_MATERIAL.getOrThrow(NamespacedKey.minecraft(key));
+ }
++
++ // Paper start - adventure
++ /**
++ * Get the description of this {@link TrimMaterial}.
++ *
++ * @return the description
++ */
++ net.kyori.adventure.text.@org.jetbrains.annotations.NotNull Component description();
++
++ /**
++ * @deprecated this method assumes that {@link #description()} will
++ * always be a translatable component which is not guaranteed.
++ */
++ @Override
++ @Deprecated(forRemoval = true)
++ @org.jetbrains.annotations.NotNull String getTranslationKey();
++ // Paper end - adventure
+ }
+diff --git a/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java b/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java
+index e8e0786467bfcea14d30b352489b7bfb1a06addc..56cfe665daba1754e41f633d7c18172bebf87028 100644
+--- a/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java
++++ b/src/main/java/org/bukkit/inventory/meta/trim/TrimPattern.java
+@@ -89,4 +89,21 @@ public interface TrimPattern extends Keyed, Translatable {
+ private static TrimPattern getTrimPattern(@NotNull String key) {
+ return Registry.TRIM_PATTERN.getOrThrow(NamespacedKey.minecraft(key));
+ }
++
++ // Paper start - adventure
++ /**
++ * Get the description of this {@link TrimPattern}.
++ *
++ * @return the description
++ */
++ net.kyori.adventure.text.@org.jetbrains.annotations.NotNull Component description();
++
++ /**
++ * @deprecated this method assumes that {@link #description()} will
++ * always be a translatable component which is not guaranteed.
++ */
++ @Override
++ @Deprecated(forRemoval = true)
++ @org.jetbrains.annotations.NotNull String getTranslationKey();
++ // Paper end - adventure
+ }
+diff --git a/src/main/java/org/bukkit/map/MapCursor.java b/src/main/java/org/bukkit/map/MapCursor.java
+index 3ca6d94e9930c93013ee654d5bc5a5d6656c6c0e..8de6d0c53bce0279a82b84b408e83d2128077400 100644
+--- a/src/main/java/org/bukkit/map/MapCursor.java
++++ b/src/main/java/org/bukkit/map/MapCursor.java
+@@ -17,7 +17,7 @@ public final class MapCursor {
+ private byte x, y;
+ private byte direction;
+ private boolean visible;
+- private String caption;
++ private net.kyori.adventure.text.Component caption; // Paper
+ private Type type;
+
+ /**
+@@ -32,7 +32,7 @@ public final class MapCursor {
+ */
+ @Deprecated(since = "1.6.2")
+ public MapCursor(byte x, byte y, byte direction, byte type, boolean visible) {
+- this(x, y, direction, type, visible, null);
++ this(x, y, direction, type, visible, (String) null); // Paper
+ }
+
+ /**
+@@ -45,7 +45,7 @@ public final class MapCursor {
+ * @param visible Whether the cursor is visible by default.
+ */
+ public MapCursor(byte x, byte y, byte direction, @NotNull Type type, boolean visible) {
+- this(x, y, direction, type, visible, null);
++ this(x, y, direction, type, visible, (String) null); // Paper
+ }
+
+ /**
+@@ -57,7 +57,7 @@ public final class MapCursor {
+ * @param type The type (color/style) of the map cursor.
+ * @param visible Whether the cursor is visible by default.
+ * @param caption cursor caption
+- * @deprecated Magic value, use {@link #MapCursor(byte, byte, byte, Type, boolean, String)}
++ * @deprecated Magic value. Use {@link #MapCursor(byte, byte, byte, Type, boolean, net.kyori.adventure.text.Component)}
+ */
+ @Deprecated(since = "1.13")
+ public MapCursor(byte x, byte y, byte direction, byte type, boolean visible, @Nullable String caption) {
+@@ -66,8 +66,42 @@ public final class MapCursor {
+ setDirection(direction);
+ setRawType(type);
+ this.visible = visible;
+- this.caption = caption;
++ this.caption = caption == null ? null : net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(caption); // Paper
++ }
++ // Paper start
++ /**
++ * Initialize the map cursor.
++ *
++ * @param x The x coordinate, from -128 to 127.
++ * @param y The y coordinate, from -128 to 127.
++ * @param direction The facing of the cursor, from 0 to 15.
++ * @param type The type (color/style) of the map cursor.
++ * @param visible Whether the cursor is visible by default.
++ * @param caption cursor caption
++ * @deprecated Magic value
++ */
++ @Deprecated
++ public MapCursor(byte x, byte y, byte direction, byte type, boolean visible, net.kyori.adventure.text.@Nullable Component caption) {
++ this.x = x; this.y = y; this.visible = visible; this.caption = caption;
++ setDirection(direction);
++ setRawType(type);
++ }
++ /**
++ * Initialize the map cursor.
++ *
++ * @param x The x coordinate, from -128 to 127.
++ * @param y The y coordinate, from -128 to 127.
++ * @param direction The facing of the cursor, from 0 to 15.
++ * @param type The type (color/style) of the map cursor.
++ * @param visible Whether the cursor is visible by default.
++ * @param caption cursor caption
++ */
++ public MapCursor(byte x, byte y, byte direction, @NotNull Type type, boolean visible, net.kyori.adventure.text.@Nullable Component caption) {
++ this.x = x; this.y = y; this.visible = visible; this.caption = caption;
++ setDirection(direction);
++ setType(type);
+ }
++ // Paper end
+
+ /**
+ * Initialize the map cursor.
+@@ -85,7 +119,7 @@ public final class MapCursor {
+ setDirection(direction);
+ this.type = type;
+ this.visible = visible;
+- this.caption = caption;
++ this.caption = caption == null ? null : net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(caption); // Paper
+ }
+
+ /**
+@@ -204,23 +238,45 @@ public final class MapCursor {
+ this.visible = visible;
+ }
+
++ // Paper start
+ /**
+ * Gets the caption on this cursor.
+ *
+ * @return caption
+ */
++ public net.kyori.adventure.text.@Nullable Component caption() {
++ return this.caption;
++ }
++ /**
++ * Sets the caption on this cursor.
++ *
++ * @param caption new caption
++ */
++ public void caption(net.kyori.adventure.text.@Nullable Component caption) {
++ this.caption = caption;
++ }
++ // Paper end
++ /**
++ * Gets the caption on this cursor.
++ *
++ * @return caption
++ * @deprecated in favour of {@link #caption()}
++ */
+ @Nullable
++ @Deprecated // Paper
+ public String getCaption() {
+- return caption;
++ return this.caption == null ? null : net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().serialize(this.caption); // Paper
+ }
+
+ /**
+ * Sets the caption on this cursor.
+ *
+ * @param caption new caption
++ * @deprecated in favour of {@link #caption(net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ public void setCaption(@Nullable String caption) {
+- this.caption = caption;
++ this.caption = caption == null ? null : net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer.legacySection().deserialize(caption); // Paper
+ }
+
+ /**
+diff --git a/src/main/java/org/bukkit/map/MapCursorCollection.java b/src/main/java/org/bukkit/map/MapCursorCollection.java
+index 986f9c8a659ed5cdda9fc4528bff23bf0e9f801e..f95a9aaa0cb020ea71d4c8a8e71bceb7147cbe4d 100644
+--- a/src/main/java/org/bukkit/map/MapCursorCollection.java
++++ b/src/main/java/org/bukkit/map/MapCursorCollection.java
+@@ -117,4 +117,22 @@ public final class MapCursorCollection {
+ public MapCursor addCursor(int x, int y, byte direction, byte type, boolean visible, @Nullable String caption) {
+ return addCursor(new MapCursor((byte) x, (byte) y, direction, type, visible, caption));
+ }
++ // Paper start
++ /**
++ * Add a cursor to the collection.
++ *
++ * @param x The x coordinate, from -128 to 127.
++ * @param y The y coordinate, from -128 to 127.
++ * @param direction The facing of the cursor, from 0 to 15.
++ * @param type The type (color/style) of the map cursor.
++ * @param visible Whether the cursor is visible.
++ * @param caption banner caption
++ * @return The newly added MapCursor.
++ * @deprecated Magic value
++ */
++ @Deprecated
++ public @NotNull MapCursor addCursor(int x, int y, byte direction, byte type, boolean visible, net.kyori.adventure.text.@Nullable Component caption) {
++ return addCursor(new MapCursor((byte) x, (byte) y, direction, type, visible, caption));
++ }
++ // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/permissions/Permissible.java b/src/main/java/org/bukkit/permissions/Permissible.java
+index 228421154913116069c20323afb519bdde2134df..26791db3c267670d5782f1d2b67ff7d5b55b9dac 100644
+--- a/src/main/java/org/bukkit/permissions/Permissible.java
++++ b/src/main/java/org/bukkit/permissions/Permissible.java
+@@ -126,4 +126,34 @@ public interface Permissible extends ServerOperator {
+ */
+ @NotNull
+ public Set
+diff --git a/src/main/java/org/bukkit/scoreboard/Objective.java b/src/main/java/org/bukkit/scoreboard/Objective.java
+index c15e056e7697aac9079d3506911d82cb71aa9d23..d57634dd3796a695aba7623d2b04e35d630887b3 100644
+--- a/src/main/java/org/bukkit/scoreboard/Objective.java
++++ b/src/main/java/org/bukkit/scoreboard/Objective.java
+@@ -20,13 +20,35 @@ public interface Objective {
+ @NotNull
+ String getName();
+
++ // Paper start - Adventure
++ /**
++ * Gets the display name for this objective
++ *
++ * @return this objective's display name
++ * @throws IllegalStateException if this objective has been unregistered
++ */
++ net.kyori.adventure.text.@NotNull Component displayName();
++ /**
++ * Sets the name displayed to players for this objective.
++ *
++ * @param displayName Display name to set
++ * @throws IllegalStateException if this objective has been unregistered
++ * @throws IllegalArgumentException if displayName is null
++ * @throws IllegalArgumentException if displayName is longer than 128
++ * characters.
++ */
++ void displayName(net.kyori.adventure.text.@Nullable Component displayName);
++ // Paper end - Adventure
++
+ /**
+ * Gets the name displayed to players for this objective
+ *
+ * @return this objective's display name
+ * @throws IllegalStateException if this objective has been unregistered
++ * @deprecated in favour of {@link #displayName()}
+ */
+ @NotNull
++ @Deprecated // Paper
+ String getDisplayName();
+
+ /**
+@@ -34,7 +56,9 @@ public interface Objective {
+ *
+ * @param displayName Display name to set
+ * @throws IllegalStateException if this objective has been unregistered
++ * @deprecated in favour of {@link #displayName(net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ void setDisplayName(@NotNull String displayName);
+
+ /**
+diff --git a/src/main/java/org/bukkit/scoreboard/Scoreboard.java b/src/main/java/org/bukkit/scoreboard/Scoreboard.java
+index a55188ec3ec1c038fdd96da62f534cb71686da97..1cba9a96cc7efce2a4394add33e4c0369f94be31 100644
+--- a/src/main/java/org/bukkit/scoreboard/Scoreboard.java
++++ b/src/main/java/org/bukkit/scoreboard/Scoreboard.java
+@@ -26,6 +26,71 @@ public interface Scoreboard {
+ @NotNull
+ Objective registerNewObjective(@NotNull String name, @NotNull String criteria);
+
++ // Paper start - Adventure
++ /**
++ * Registers an Objective on this Scoreboard
++ *
++ * @param name Name of the Objective
++ * @param criteria Criteria for the Objective
++ * @param displayName display name for the Objective.
++ * @return The registered Objective
++ * @throws IllegalArgumentException if name is longer than 32767
++ * characters.
++ * @throws IllegalArgumentException if an objective by that name already
++ * exists
++ * @deprecated use {@link #registerNewObjective(String, Criteria, net.kyori.adventure.text.Component)}
++ */
++ @NotNull
++ @Deprecated
++ Objective registerNewObjective(@NotNull String name, @NotNull String criteria, net.kyori.adventure.text.@Nullable Component displayName);
++ /**
++ * Registers an Objective on this Scoreboard
++ *
++ * @param name Name of the Objective
++ * @param criteria Criteria for the Objective
++ * @param displayName Name displayed to players for the Objective.
++ * @param renderType Manner of rendering the Objective
++ * @return The registered Objective
++ * @throws IllegalArgumentException if name is longer than 32767
++ * characters.
++ * @throws IllegalArgumentException if an objective by that name already
++ * exists
++ * @deprecated use {@link #registerNewObjective(String, Criteria, net.kyori.adventure.text.Component, RenderType)}
++ */
++ @NotNull
++ @Deprecated
++ Objective registerNewObjective(@NotNull String name, @NotNull String criteria, net.kyori.adventure.text.@Nullable Component displayName, @NotNull RenderType renderType) throws IllegalArgumentException;
++ /**
++ * Registers an Objective on this Scoreboard
++ *
++ * @param name Name of the Objective
++ * @param criteria Criteria for the Objective
++ * @param displayName Name displayed to players for the Objective.
++ * @return The registered Objective
++ * @throws IllegalArgumentException if name is longer than 32767
++ * characters.
++ * @throws IllegalArgumentException if an objective by that name already
++ * exists
++ */
++ @NotNull
++ Objective registerNewObjective(@NotNull String name, @NotNull Criteria criteria, net.kyori.adventure.text.@Nullable Component displayName) throws IllegalArgumentException;
++ /**
++ * Registers an Objective on this Scoreboard
++ *
++ * @param name Name of the Objective
++ * @param criteria Criteria for the Objective
++ * @param displayName Name displayed to players for the Objective.
++ * @param renderType Manner of rendering the Objective
++ * @return The registered Objective
++ * @throws IllegalArgumentException if name is longer than 32767
++ * characters.
++ * @throws IllegalArgumentException if an objective by that name already
++ * exists
++ */
++ @NotNull
++ Objective registerNewObjective(@NotNull String name, @NotNull Criteria criteria, net.kyori.adventure.text.@Nullable Component displayName, @NotNull RenderType renderType) throws IllegalArgumentException;
++ // Paper end - Adventure
++
+ /**
+ * Registers an Objective on this Scoreboard
+ *
+@@ -37,7 +102,7 @@ public interface Scoreboard {
+ * characters.
+ * @throws IllegalArgumentException if an objective by that name already
+ * exists
+- * @deprecated use {@link #registerNewObjective(String, Criteria, String)}
++ * @deprecated use {@link #registerNewObjective(String, Criteria, net.kyori.adventure.text.Component)}
+ */
+ @Deprecated(since = "1.20.5")
+ @NotNull
+@@ -55,7 +120,7 @@ public interface Scoreboard {
+ * characters.
+ * @throws IllegalArgumentException if an objective by that name already
+ * exists
+- * @deprecated use {@link #registerNewObjective(String, Criteria, String, RenderType)}
++ * @deprecated use {@link #registerNewObjective(String, Criteria, net.kyori.adventure.text.Component, RenderType)}
+ */
+ @Deprecated(since = "1.20.5")
+ @NotNull
+@@ -72,8 +137,10 @@ public interface Scoreboard {
+ * characters.
+ * @throws IllegalArgumentException if an objective by that name already
+ * exists
++ * @deprecated in favour of {@link #registerNewObjective(String, Criteria, net.kyori.adventure.text.Component)}
+ */
+ @NotNull
++ @Deprecated // Paper
+ Objective registerNewObjective(@NotNull String name, @NotNull Criteria criteria, @NotNull String displayName);
+
+ /**
+@@ -88,8 +155,10 @@ public interface Scoreboard {
+ * characters.
+ * @throws IllegalArgumentException if an objective by that name already
+ * exists
++ * @deprecated in favour of {@link #registerNewObjective(String, Criteria, net.kyori.adventure.text.Component, RenderType)}
+ */
+ @NotNull
++ @Deprecated // Paper
+ Objective registerNewObjective(@NotNull String name, @NotNull Criteria criteria, @NotNull String displayName, @NotNull RenderType renderType);
+
+ /**
+diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
+index f6e684853fbca3f015f4948db5603eb155ea1f2f..284468fd3d310a7acdffa31f0f6593f5a98419ba 100644
+--- a/src/main/java/org/bukkit/scoreboard/Team.java
++++ b/src/main/java/org/bukkit/scoreboard/Team.java
+@@ -12,7 +12,7 @@ import org.jetbrains.annotations.Nullable;
+ * properties. This team is only relevant to the display of the associated
+ * {@link #getScoreboard() scoreboard}.
+ */
+-public interface Team {
++public interface Team extends net.kyori.adventure.audience.ForwardingAudience { // Paper - Make Team extend ForwardingAudience
+
+ /**
+ * Gets the name of this Team
+@@ -23,13 +23,96 @@ public interface Team {
+ @NotNull
+ String getName();
+
++ // Paper start - Adventure
++ /**
++ * Gets the display name for this team
++ *
++ * @return Team display name
++ * @throws IllegalStateException if this team has been unregistered
++ */
++ net.kyori.adventure.text.@NotNull Component displayName();
++
++ /**
++ * Sets the name displayed to entries for this team
++ *
++ * @param displayName New display name
++ * @throws IllegalStateException if this team has been unregistered
++ */
++ void displayName(net.kyori.adventure.text.@Nullable Component displayName);
++
++ /**
++ * Gets the prefix prepended to the display of entries on this team.
++ *
++ * @return Team prefix
++ * @throws IllegalStateException if this team has been unregistered
++ */
++ net.kyori.adventure.text.@NotNull Component prefix();
++
++ /**
++ * Sets the prefix prepended to the display of entries on this team.
++ *
++ * @param prefix New prefix
++ * @throws IllegalStateException if this team has been unregistered
++ */
++ void prefix(net.kyori.adventure.text.@Nullable Component prefix);
++
++ /**
++ * Gets the suffix appended to the display of entries on this team.
++ *
++ * @return the team's current suffix
++ * @throws IllegalStateException if this team has been unregistered
++ */
++ net.kyori.adventure.text.@NotNull Component suffix();
++
++ /**
++ * Sets the suffix appended to the display of entries on this team.
++ *
++ * @param suffix the new suffix for this team.
++ * @throws IllegalStateException if this team has been unregistered
++ */
++ void suffix(net.kyori.adventure.text.@Nullable Component suffix);
++
++ /**
++ * Checks if the team has a color specified
++ *
++ * @return true if it has a color
++ * @throws IllegalStateException if this team has been unregistered
++ */
++ boolean hasColor();
++
++ /**
++ * Gets the color of the team.
++ * Stops timing and records the data. Propagates the data up to group handlers. Stops timing and records the data. Propagates the data up to group handlers. Will automatically be called when this Timing is used with try-with-resources Lightweight object for tracking timing data
-+ * It should be noted that some inventory types do not support titles and
-+ * may not render with said titles on the Minecraft client.
-+ *
-+ * {@link InventoryType#WORKBENCH} will not process crafting recipes if
-+ * created with this method. Use
-+ * {@link Player#openWorkbench(Location, boolean)} instead.
-+ *
-+ * {@link InventoryType#ENCHANTING} will not process {@link ItemStack}s
-+ * for possible enchanting results. Use
-+ * {@link Player#openEnchanting(Location, boolean)} instead.
-+ *
-+ * @param owner The holder of the inventory; can be null if there's no holder.
-+ * @param type The type of inventory to create.
-+ * @param title The title of the inventory, to be displayed when it is viewed.
-+ * @return The new inventory.
-+ * @throws IllegalArgumentException if the {@link InventoryType} cannot be
-+ * viewed.
-+ * @deprecated in favour of {@link #createInventory(InventoryHolder, InventoryType, net.kyori.adventure.text.Component)}
-+ *
-+ * @see InventoryType#isCreatable()
-+ */
-+ @Deprecated // Paper
-+ @NotNull
- public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) {
- return server.createInventory(owner, type, title);
- }
-@@ -1361,6 +1424,7 @@ public final class Bukkit {
- return server.createInventory(owner, size);
- }
-
-+ // Paper start
- /**
- * Creates an empty inventory of type {@link InventoryType#CHEST} with the
- * specified size and title.
-@@ -1373,10 +1437,30 @@ public final class Bukkit {
- * @throws IllegalArgumentException if the size is not a multiple of 9
- */
- @NotNull
-+ public static Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull net.kyori.adventure.text.Component title) throws IllegalArgumentException {
-+ return server.createInventory(owner, size, title);
-+ }
-+ // Paper end
-+
-+ /**
-+ * Creates an empty inventory of type {@link InventoryType#CHEST} with the
-+ * specified size and title.
-+ *
-+ * @param owner the holder of the inventory, or null to indicate no holder
-+ * @param size a multiple of 9 as the size of inventory to create
-+ * @param title the title of the inventory, displayed when inventory is
-+ * viewed
-+ * @return a new inventory
-+ * @throws IllegalArgumentException if the size is not a multiple of 9
-+ * @deprecated in favour of {@link #createInventory(InventoryHolder, InventoryType, net.kyori.adventure.text.Component)}
-+ */
-+ @Deprecated // Paper
-+ @NotNull
- public static Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException {
- return server.createInventory(owner, size, title);
- }
-
-+ // Paper start
- /**
- * Creates an empty merchant.
- *
-@@ -1384,7 +1468,20 @@ public final class Bukkit {
- * when the merchant inventory is viewed
- * @return a new merchant
- */
-+ public static @NotNull Merchant createMerchant(@Nullable net.kyori.adventure.text.Component title) {
-+ return server.createMerchant(title);
-+ }
-+ // Paper start
-+ /**
-+ * Creates an empty merchant.
-+ *
-+ * @param title the title of the corresponding merchant inventory, displayed
-+ * when the merchant inventory is viewed
-+ * @return a new merchant
-+ * @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)}
-+ */
- @NotNull
-+ @Deprecated // Paper
- public static Merchant createMerchant(@Nullable String title) {
- return server.createMerchant(title);
- }
-@@ -1501,22 +1598,47 @@ public final class Bukkit {
- return server.isPrimaryThread();
- }
-
-+ // Paper start
-+ /**
-+ * Gets the message that is displayed on the server list.
-+ *
-+ * @return the server's MOTD
-+ */
-+ @NotNull public static net.kyori.adventure.text.Component motd() {
-+ return server.motd();
-+ }
-+ // Paper end
-+
- /**
- * Gets the message that is displayed on the server list.
- *
- * @return the servers MOTD
-+ * @deprecated in favour of {@link #motd()}
- */
- @NotNull
-+ @Deprecated // Paper
- public static String getMotd() {
- return server.getMotd();
- }
-
-+ // Paper start
-+ /**
-+ * Gets the default message that is displayed when the server is stopped.
-+ *
-+ * @return the shutdown message
-+ */
-+ public static @Nullable net.kyori.adventure.text.Component shutdownMessage() {
-+ return server.shutdownMessage();
-+ }
-+ // Paper end
- /**
- * Gets the default message that is displayed when the server is stopped.
- *
- * @return the shutdown message
-+ * @deprecated in favour of {@link #shutdownMessage()}
- */
- @Nullable
-+ @Deprecated // Paper
- public static String getShutdownMessage() {
- return server.getShutdownMessage();
- }
-diff --git a/src/main/java/org/bukkit/Keyed.java b/src/main/java/org/bukkit/Keyed.java
-index 32c92621c2c15eec14c50965f5ecda00c46e6c80..e076d447da62445764a9776ee2554c077637d270 100644
---- a/src/main/java/org/bukkit/Keyed.java
-+++ b/src/main/java/org/bukkit/Keyed.java
-@@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull;
- /**
- * Represents an object which has a {@link NamespacedKey} attached to it.
- */
--public interface Keyed {
-+public interface Keyed extends net.kyori.adventure.key.Keyed { // Paper -- extend Adventure Keyed
-
- /**
- * Return the namespaced identifier for this object.
-@@ -14,4 +14,16 @@ public interface Keyed {
- */
- @NotNull
- NamespacedKey getKey();
-+
-+ // Paper start
-+ /**
-+ * Returns the unique identifier for this object.
-+ *
-+ * @return this object's key
-+ */
-+ @Override
-+ default net.kyori.adventure.key.@NotNull Key key() {
-+ return this.getKey();
-+ }
-+ // Paper end
- }
-diff --git a/src/main/java/org/bukkit/Nameable.java b/src/main/java/org/bukkit/Nameable.java
-index fee814e01a653d2b53c56e8b566383ca44aa5346..b71b780792b672b37c8fe65d43489b860a227381 100644
---- a/src/main/java/org/bukkit/Nameable.java
-+++ b/src/main/java/org/bukkit/Nameable.java
-@@ -4,6 +4,30 @@ import org.jetbrains.annotations.Nullable;
-
- public interface Nameable {
-
-+ // Paper start
-+ /**
-+ * Gets the custom name.
-+ *
-+ *
-+ * It should be noted that some inventory types do not support titles and
-+ * may not render with said titles on the Minecraft client.
-+ *
-+ * {@link InventoryType#WORKBENCH} will not process crafting recipes if
-+ * created with this method. Use
-+ * {@link Player#openWorkbench(Location, boolean)} instead.
-+ *
-+ * {@link InventoryType#ENCHANTING} will not process {@link ItemStack}s
-+ * for possible enchanting results. Use
-+ * {@link Player#openEnchanting(Location, boolean)} instead.
-+ *
-+ * @param owner The holder of the inventory; can be null if there's no holder.
-+ * @param type The type of inventory to create.
-+ * @param title The title of the inventory, to be displayed when it is viewed.
-+ * @return The new inventory.
-+ * @throws IllegalArgumentException if the {@link InventoryType} cannot be
-+ * viewed.
-+ * @deprecated in favour of {@link #createInventory(InventoryHolder, InventoryType, net.kyori.adventure.text.Component)}
-+ *
-+ * @see InventoryType#isCreatable()
-+ */
-+ @Deprecated // Paper
-+ @NotNull
- Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title);
-
- /**
-@@ -1148,6 +1206,22 @@ public interface Server extends PluginMessageRecipient {
- @NotNull
- Inventory createInventory(@Nullable InventoryHolder owner, int size) throws IllegalArgumentException;
-
-+ // Paper start
-+ /**
-+ * Creates an empty inventory of type {@link InventoryType#CHEST} with the
-+ * specified size and title.
-+ *
-+ * @param owner the holder of the inventory, or null to indicate no holder
-+ * @param size a multiple of 9 as the size of inventory to create
-+ * @param title the title of the inventory, displayed when inventory is
-+ * viewed
-+ * @return a new inventory
-+ * @throws IllegalArgumentException if the size is not a multiple of 9
-+ */
-+ @NotNull
-+ Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull net.kyori.adventure.text.Component title) throws IllegalArgumentException;
-+ // Paper end
-+
- /**
- * Creates an empty inventory of type {@link InventoryType#CHEST} with the
- * specified size and title.
-@@ -1158,10 +1232,13 @@ public interface Server extends PluginMessageRecipient {
- * viewed
- * @return a new inventory
- * @throws IllegalArgumentException if the size is not a multiple of 9
-+ * @deprecated in favour of {@link #createInventory(InventoryHolder, int, net.kyori.adventure.text.Component)}
- */
-+ @Deprecated // Paper
- @NotNull
- Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException;
-
-+ // Paper start
- /**
- * Creates an empty merchant.
- *
-@@ -1169,7 +1246,18 @@ public interface Server extends PluginMessageRecipient {
- * when the merchant inventory is viewed
- * @return a new merchant
- */
-+ @NotNull Merchant createMerchant(@Nullable net.kyori.adventure.text.Component title);
-+ // Paper start
-+ /**
-+ * Creates an empty merchant.
-+ *
-+ * @param title the title of the corresponding merchant inventory, displayed
-+ * when the merchant inventory is viewed
-+ * @return a new merchant
-+ * @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)}
-+ */
- @NotNull
-+ @Deprecated // Paper
- Merchant createMerchant(@Nullable String title);
-
- /**
-@@ -1265,20 +1353,41 @@ public interface Server extends PluginMessageRecipient {
- */
- boolean isPrimaryThread();
-
-+ // Paper start
-+ /**
-+ * Gets the message that is displayed on the server list.
-+ *
-+ * @return the server's MOTD
-+ */
-+ @NotNull net.kyori.adventure.text.Component motd();
-+ // Paper end
-+
- /**
- * Gets the message that is displayed on the server list.
- *
- * @return the servers MOTD
-+ * @deprecated in favour of {@link #motd()}
- */
- @NotNull
-+ @Deprecated // Paper
- String getMotd();
-
-+ // Paper start
-+ /**
-+ * Gets the default message that is displayed when the server is stopped.
-+ *
-+ * @return the shutdown message
-+ */
-+ @Nullable net.kyori.adventure.text.Component shutdownMessage();
-+ // Paper end
- /**
- * Gets the default message that is displayed when the server is stopped.
- *
- * @return the shutdown message
-+ * @deprecated in favour of {@link #shutdownMessage()}
- */
- @Nullable
-+ @Deprecated // Paper
- String getShutdownMessage();
-
- /**
-@@ -1650,7 +1759,9 @@ public interface Server extends PluginMessageRecipient {
- * Sends the component to the player
- *
- * @param component the components to send
-+ * @deprecated use {@link #broadcast(net.kyori.adventure.text.Component)}
- */
-+ @Deprecated // Paper
- public void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-@@ -1659,7 +1770,9 @@ public interface Server extends PluginMessageRecipient {
- * Sends an array of components as a single message to the player
- *
- * @param components the components to send
-+ * @deprecated use {@link #broadcast(net.kyori.adventure.text.Component)}
- */
-+ @Deprecated // Paper
- public void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
- throw new UnsupportedOperationException("Not supported yet.");
- }
-diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java
-index 21b95d404fbdf7f972f8a13ecd07dc28481f2286..da844079a9d3efd1a92c892de79fc7b3aeecaf4b 100644
---- a/src/main/java/org/bukkit/Sound.java
-+++ b/src/main/java/org/bukkit/Sound.java
-@@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
- * guarantee values will not be removed from this Enum. As such, you should not
- * depend on the ordinal values of this class.
- */
--public enum Sound implements Keyed {
-+public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Paper - implement Sound.Type
-
- AMBIENT_BASALT_DELTAS_ADDITIONS("ambient.basalt_deltas.additions"),
- AMBIENT_BASALT_DELTAS_LOOP("ambient.basalt_deltas.loop"),
-@@ -1345,4 +1345,12 @@ public enum Sound implements Keyed {
- public NamespacedKey getKey() {
- return key;
- }
-+
-+ // Paper start
-+ @NotNull
-+ @Override
-+ public net.kyori.adventure.key.@org.checkerframework.checker.nullness.qual.NonNull Key key() {
-+ return this.key;
-+ }
-+ // Paper end
- }
-diff --git a/src/main/java/org/bukkit/SoundCategory.java b/src/main/java/org/bukkit/SoundCategory.java
-index ac5e263d737973af077e3406a84a84baca4370db..2d91924b7f5ef16a91d40cdc1bfc3d68e0fda38d 100644
---- a/src/main/java/org/bukkit/SoundCategory.java
-+++ b/src/main/java/org/bukkit/SoundCategory.java
-@@ -3,7 +3,7 @@ package org.bukkit;
- /**
- * An Enum of categories for sounds.
- */
--public enum SoundCategory {
-+public enum SoundCategory implements net.kyori.adventure.sound.Sound.Source.Provider { // Paper - implement Sound.Source.Provider
-
- MASTER,
- MUSIC,
-@@ -15,4 +15,22 @@ public enum SoundCategory {
- PLAYERS,
- AMBIENT,
- VOICE;
-+
-+ // Paper start - implement Sound.Source.Provider
-+ @Override
-+ public net.kyori.adventure.sound.Sound.@org.jetbrains.annotations.NotNull Source soundSource() {
-+ return switch (this) {
-+ case MASTER -> net.kyori.adventure.sound.Sound.Source.MASTER;
-+ case MUSIC -> net.kyori.adventure.sound.Sound.Source.MUSIC;
-+ case RECORDS -> net.kyori.adventure.sound.Sound.Source.RECORD;
-+ case WEATHER -> net.kyori.adventure.sound.Sound.Source.WEATHER;
-+ case BLOCKS -> net.kyori.adventure.sound.Sound.Source.BLOCK;
-+ case HOSTILE -> net.kyori.adventure.sound.Sound.Source.HOSTILE;
-+ case NEUTRAL -> net.kyori.adventure.sound.Sound.Source.NEUTRAL;
-+ case PLAYERS -> net.kyori.adventure.sound.Sound.Source.PLAYER;
-+ case AMBIENT -> net.kyori.adventure.sound.Sound.Source.AMBIENT;
-+ case VOICE -> net.kyori.adventure.sound.Sound.Source.VOICE;
-+ };
-+ }
-+ // Paper end
- }
-diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 01e11f882abb6c631f810584aa23646042688435..fa28b5bb0efd9d400277cd8969f38e039e6ea8ac 100644
---- a/src/main/java/org/bukkit/UnsafeValues.java
-+++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -22,6 +22,14 @@ import org.bukkit.plugin.PluginDescriptionFile;
- */
- @Deprecated
- public interface UnsafeValues {
-+ // Paper start
-+ net.kyori.adventure.text.flattener.ComponentFlattener componentFlattener();
-+ @Deprecated(forRemoval = true) net.kyori.adventure.text.serializer.plain.PlainComponentSerializer plainComponentSerializer();
-+ @Deprecated(forRemoval = true) net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer plainTextSerializer();
-+ @Deprecated(forRemoval = true) net.kyori.adventure.text.serializer.gson.GsonComponentSerializer gsonComponentSerializer();
-+ @Deprecated(forRemoval = true) net.kyori.adventure.text.serializer.gson.GsonComponentSerializer colorDownsamplingGsonComponentSerializer();
-+ @Deprecated(forRemoval = true) net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer legacyComponentSerializer();
-+ // Paper end
-
- Material toLegacy(Material material);
-
-diff --git a/src/main/java/org/bukkit/Warning.java b/src/main/java/org/bukkit/Warning.java
-index efb97712cc9dc7c1e12a59f5b94e4f2ad7c6b7d8..3024468af4c073324e536c1cb26beffb1e09f3f4 100644
---- a/src/main/java/org/bukkit/Warning.java
-+++ b/src/main/java/org/bukkit/Warning.java
-@@ -67,6 +67,7 @@ public @interface Warning {
- *
- */
- public boolean printFor(@Nullable Warning warning) {
-+ if (Boolean.getBoolean("paper.alwaysPrintWarningState")) return true; // Paper
- if (this == DEFAULT) {
- return warning == null || warning.value();
- }
-diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 7e0c6c57976a00f989fe4e5dce83cd986b460e72..1d3bb553c944f5920e81e295f8cd5b7194d37aac 100644
---- a/src/main/java/org/bukkit/World.java
-+++ b/src/main/java/org/bukkit/World.java
-@@ -43,7 +43,7 @@ import org.jetbrains.annotations.Nullable;
- /**
- * Represents a world, which may contain entities, chunks and blocks
- */
--public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient, Metadatable, PersistentDataHolder, Keyed {
-+public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient, Metadatable, PersistentDataHolder, Keyed, net.kyori.adventure.audience.ForwardingAudience { // Paper
-
- /**
- * Gets the {@link Block} at the given coordinates
-@@ -638,6 +638,14 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
- @NotNull
- public List
-+ *
-+ *
-+ * @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.
-+ * @param hash The sha1 hash sum of the resource pack file which is used
-+ * to apply a cached version of the pack directly without downloading
-+ * if it is available. Hast to be 20 bytes long!
-+ * @param prompt The optional custom prompt message to be shown to client.
-+ * @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.
-+ * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
-+ * long.
-+ */
-+ default void setResourcePack(@NotNull String url, byte @Nullable [] hash, net.kyori.adventure.text.@Nullable Component prompt) {
-+ this.setResourcePack(url, hash, prompt, false);
-+ }
-+ // Paper end
-+
- /**
- * Request that the player's client download and switch resource packs.
- *
-+ *
-+ *
-+ * @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.
-+ * @param hash The sha1 hash sum of the resource pack file which is used
-+ * to apply a cached version of the pack directly without downloading
-+ * if it is available. Hast to be 20 bytes long!
-+ * @param prompt The optional custom prompt message to be shown to client.
-+ * @param force If true, the client will be disconnected from the server
-+ * when it declines to use the resource pack.
-+ * @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.
-+ * @throws IllegalArgumentException Thrown if the hash is not 20 bytes
-+ * long.
-+ */
-+ public void setResourcePack(@NotNull String url, byte @Nullable [] hash, net.kyori.adventure.text.@Nullable Component prompt, boolean force);
-+ // Paper end
-+
- /**
- * Gets the Scoreboard displayed to this player
- *
-@@ -1256,7 +1532,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
- *
- * @param title Title text
- * @param subtitle Subtitle text
-- * @deprecated API behavior subject to change
-+ * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
- */
- @Deprecated
- public void sendTitle(@Nullable String title, @Nullable String subtitle);
-@@ -1275,7 +1551,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
- * @param fadeIn time in ticks for titles to fade in. Defaults to 10.
- * @param stay time in ticks for titles to stay. Defaults to 70.
- * @param fadeOut time in ticks for titles to fade out. Defaults to 20.
-+ * @deprecated Use {@link #showTitle(net.kyori.adventure.title.Title)} or {@link #sendTitlePart(net.kyori.adventure.title.TitlePart, Object)}
- */
-+ @Deprecated // Paper - Adventure
- public void sendTitle(@Nullable String title, @Nullable String subtitle, int fadeIn, int stay, int fadeOut);
-
- /**
-@@ -1502,6 +1780,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
- */
- public int getClientViewDistance();
-
-+ // Paper start
-+ /**
-+ * Gets the player's current locale.
-+ *
-+ * @return the player's locale
-+ */
-+ @NotNull java.util.Locale locale();
-+ // Paper end
- /**
- * Gets the player's estimated ping in milliseconds.
- *
-@@ -1527,8 +1813,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
- * they wish.
- *
- * @return the player's locale
-+ * @deprecated in favour of {@link #locale()}
- */
- @NotNull
-+ @Deprecated // Paper
- public String getLocale();
-
- /**
-@@ -1570,6 +1858,14 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
- */
- public boolean isAllowingServerListings();
-
-+ // Paper start
-+ @NotNull
-+ @Override
-+ default net.kyori.adventure.text.event.HoverEventtrue before calling this method.true before calling this method.
-+ * This only sets the team outline, other occurrences of colors such as in
-+ * names are handled by prefixes / suffixes.
-+ *
-+ * @return team color
-+ * @throws IllegalStateException if this team has been unregistered
-+ * @throws IllegalStateException if the team doesn't have a color
-+ * @see #hasColor()
-+ */
-+ @NotNull net.kyori.adventure.text.format.TextColor color() throws IllegalStateException;
-+
-+ /**
-+ * Sets the color of the team.
-+ *
-+ * This only sets the team outline, other occurrences of colors such as in
-+ * names are handled by prefixes / suffixes.
-+ *
-+ * @param color new color, null for no color
-+ */
-+ void color(@Nullable net.kyori.adventure.text.format.NamedTextColor color);
-+ // Paper end
-
- /**
- * Gets the name displayed to entries for this team
- *
- * @return Team display name
- * @throws IllegalStateException if this team has been unregistered
-+ * @deprecated in favour of {@link #displayName()}
- */
- @NotNull
-+ @Deprecated // Paper
- String getDisplayName() throws IllegalStateException;
-
- /**
-@@ -39,7 +125,9 @@ public interface Team {
- * @throws IllegalArgumentException if displayName is longer than 128
- * characters.
- * @throws IllegalStateException if this team has been unregistered
-+ * @deprecated in favour of {@link #displayName(net.kyori.adventure.text.Component)}
- */
-+ @Deprecated // Paper
- void setDisplayName(@NotNull String displayName) throws IllegalStateException, IllegalArgumentException;
-
- /**
-@@ -47,8 +135,10 @@ public interface Team {
- *
- * @return Team prefix
- * @throws IllegalStateException if this team has been unregistered
-+ * @deprecated in favour of {@link #prefix()}
- */
- @NotNull
-+ @Deprecated // Paper
- String getPrefix() throws IllegalStateException;
-
- /**
-@@ -59,7 +149,9 @@ public interface Team {
- * @throws IllegalArgumentException if prefix is longer than 64
- * characters
- * @throws IllegalStateException if this team has been unregistered
-+ * @deprecated in favour of {@link #prefix(net.kyori.adventure.text.Component)}
- */
-+ @Deprecated // Paper
- void setPrefix(@NotNull String prefix) throws IllegalStateException, IllegalArgumentException;
-
- /**
-@@ -67,8 +159,10 @@ public interface Team {
- *
- * @return the team's current suffix
- * @throws IllegalStateException if this team has been unregistered
-+ * @deprecated in favour of {@link #suffix()}
- */
- @NotNull
-+ @Deprecated // Paper
- String getSuffix() throws IllegalStateException;
-
- /**
-@@ -79,7 +173,9 @@ public interface Team {
- * @throws IllegalArgumentException if suffix is longer than 64
- * characters
- * @throws IllegalStateException if this team has been unregistered
-+ * @deprecated in favour of {@link #suffix(net.kyori.adventure.text.Component)}
- */
-+ @Deprecated // Paper
- void setSuffix(@NotNull String suffix) throws IllegalStateException, IllegalArgumentException;
-
- /**
-@@ -90,8 +186,10 @@ public interface Team {
- *
- * @return team color, defaults to {@link ChatColor#RESET}
- * @throws IllegalStateException if this team has been unregistered
-+ * @deprecated in favour of {@link #color()}
- */
- @NotNull
-+ @Deprecated // Paper
- ChatColor getColor() throws IllegalStateException;
-
- /**
-@@ -102,7 +200,9 @@ public interface Team {
- *
- * @param color new color, must be non-null. Use {@link ChatColor#RESET} for
- * no color
-+ * @deprecated in favour of {@link #color(net.kyori.adventure.text.format.NamedTextColor)}
- */
-+ @Deprecated // Paper
- void setColor(@NotNull ChatColor color);
-
- /**
-diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index c6a8a37a933cfc5a5885602a8a70fdda8fb6aa10..93498307004b68b934fbfa1aeb3aaf0e97cbdac7 100644
---- a/src/test/java/org/bukkit/AnnotationTest.java
-+++ b/src/test/java/org/bukkit/AnnotationTest.java
-@@ -26,6 +26,12 @@ import org.objectweb.asm.tree.ParameterNode;
- public class AnnotationTest {
-
- private static final String[] ACCEPTED_ANNOTATIONS = {
-+ // Paper start
-+ "Lorg/checkerframework/checker/nullness/qual/Nullable;",
-+ "Lorg/checkerframework/checker/nullness/qual/NonNull;",
-+ "Lorg/checkerframework/checker/nullness/qual/PolyNull;",
-+ "Lorg/checkerframework/checker/nullness/qual/MonotonicNonNull;",
-+ // Paper end
- "Lorg/jetbrains/annotations/Nullable;",
- "Lorg/jetbrains/annotations/NotNull;",
- "Lorg/jetbrains/annotations/Contract;",
-@@ -105,7 +111,7 @@ public class AnnotationTest {
- if (method.invisibleTypeAnnotations != null) {
- for (final org.objectweb.asm.tree.TypeAnnotationNode invisibleTypeAnnotation : method.invisibleTypeAnnotations) {
- final org.objectweb.asm.TypeReference ref = new org.objectweb.asm.TypeReference(invisibleTypeAnnotation.typeRef);
-- if (ref.getSort() == org.objectweb.asm.TypeReference.METHOD_FORMAL_PARAMETER && ref.getTypeParameterIndex() == i && java.util.Arrays.binarySearch(ACCEPTED_ANNOTATIONS, invisibleTypeAnnotation.desc) >= 0) {
-+ if (ref.getSort() == org.objectweb.asm.TypeReference.METHOD_FORMAL_PARAMETER && ref.getTypeParameterIndex() == i && java.util.Arrays.asList(ACCEPTED_ANNOTATIONS).contains(invisibleTypeAnnotation.desc)) {
- continue dancing;
- }
- }
diff --git a/patches/api/0006-Adventure.patch b/patches/api/0006-Adventure.patch
new file mode 100644
index 000000000000..43d2ca554749
--- /dev/null
+++ b/patches/api/0006-Adventure.patch
@@ -0,0 +1,5660 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Riley Park
++ * See {@link AsyncChatCommandDecorateEvent} for the decoration of messages sent via commands
++ */
++@ApiStatus.Experimental
++@NullMarked
++public class AsyncChatDecorateEvent extends ServerEvent implements Cancellable {
++
++ private static final HandlerList HANDLER_LIST = new HandlerList();
++
++ private final @Nullable Player player;
++ private final Component originalMessage;
++ private Component result;
++
++ private boolean cancelled;
++
++ @ApiStatus.Internal
++ public AsyncChatDecorateEvent(final @Nullable Player player, final Component originalMessage) {
++ super(true);
++ this.player = player;
++ this.originalMessage = originalMessage;
++ this.result = originalMessage;
++ }
++
++ /**
++ * Gets the player (if available) associated with this event.
++ *
++ *
++ * A {@link Entity} argument is optional to help resolve:
++ *
++ *
++ * {@link net.kyori.adventure.text.TranslatableComponent}s don't require any extra arguments.
++ *
++ * @param input the component to resolve
++ * @param context the command sender to resolve with
++ * @param scoreboardSubject the scoreboard subject to use (for use with {@link net.kyori.adventure.text.ScoreComponent}s)
++ * @return the resolved component
++ * @throws IOException if a syntax error tripped during resolving
++ */
++ public static Component resolveWithContext(final Component input, final @Nullable CommandSender context, final @Nullable Entity scoreboardSubject) throws IOException {
++ return resolveWithContext(input, context, scoreboardSubject, true);
++ }
++
++ /**
++ * Resolves a component with a specific command sender and subject.
++ *
++ *
++ * A {@link Entity} argument is optional to help resolve:
++ *
++ *
++ * {@link net.kyori.adventure.text.TranslatableComponent}s don't require any extra arguments.
++ *
++ * @param input the component to resolve
++ * @param context the command sender to resolve with
++ * @param scoreboardSubject the scoreboard subject to use (for use with {@link net.kyori.adventure.text.ScoreComponent}s)
++ * @param bypassPermissions true to bypass permissions checks for resolving components
++ * @return the resolved component
++ * @throws IOException if a syntax error tripped during resolving
++ */
++ @SuppressWarnings("deprecation") // using unsafe as a bridge
++ public static Component resolveWithContext(final Component input, final @Nullable CommandSender context, final @Nullable Entity scoreboardSubject, final boolean bypassPermissions) throws IOException {
++ return Bukkit.getUnsafe().resolveWithContext(input, context, scoreboardSubject, bypassPermissions);
++ }
++
++ /**
++ * Return a component flattener that can use game data to resolve extra information about components.
++ *
++ * @return a component flattener
++ */
++ @SuppressWarnings("deprecation") // using unsafe as a bridge
++ public static ComponentFlattener flattener() {
++ return Bukkit.getUnsafe().componentFlattener();
++ }
++
++ /**
++ * Get a serializer for {@link Component}s that will convert components to
++ * a plain-text string.
++ *
++ *
++ * It should be noted that some inventory types do not support titles and
++ * may not render with said titles on the Minecraft client.
++ *
++ * {@link InventoryType#WORKBENCH} will not process crafting recipes if
++ * created with this method. Use
++ * {@link Player#openWorkbench(Location, boolean)} instead.
++ *
++ * {@link InventoryType#ENCHANTING} will not process {@link ItemStack}s
++ * for possible enchanting results. Use
++ * {@link Player#openEnchanting(Location, boolean)} instead.
++ *
++ * @param owner The holder of the inventory; can be null if there's no holder.
++ * @param type The type of inventory to create.
++ * @param title The title of the inventory, to be displayed when it is viewed.
++ * @return The new inventory.
++ * @throws IllegalArgumentException if the {@link InventoryType} cannot be
++ * viewed.
++ * @deprecated in favour of {@link #createInventory(InventoryHolder, InventoryType, net.kyori.adventure.text.Component)}
++ *
++ * @see InventoryType#isCreatable()
++ */
++ @Deprecated // Paper
++ @NotNull
+ public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) {
+ return server.createInventory(owner, type, title);
+ }
+@@ -1540,6 +1603,7 @@ public final class Bukkit {
+ return server.createInventory(owner, size);
+ }
+
++ // Paper start
+ /**
+ * Creates an empty inventory of type {@link InventoryType#CHEST} with the
+ * specified size and title.
+@@ -1552,10 +1616,30 @@ public final class Bukkit {
+ * @throws IllegalArgumentException if the size is not a multiple of 9
+ */
+ @NotNull
++ public static Inventory createInventory(@Nullable InventoryHolder owner, int size, net.kyori.adventure.text.@NotNull Component title) throws IllegalArgumentException {
++ return server.createInventory(owner, size, title);
++ }
++ // Paper end
++
++ /**
++ * Creates an empty inventory of type {@link InventoryType#CHEST} with the
++ * specified size and title.
++ *
++ * @param owner the holder of the inventory, or null to indicate no holder
++ * @param size a multiple of 9 as the size of inventory to create
++ * @param title the title of the inventory, displayed when inventory is
++ * viewed
++ * @return a new inventory
++ * @throws IllegalArgumentException if the size is not a multiple of 9
++ * @deprecated in favour of {@link #createInventory(InventoryHolder, InventoryType, net.kyori.adventure.text.Component)}
++ */
++ @Deprecated // Paper
++ @NotNull
+ public static Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException {
+ return server.createInventory(owner, size, title);
+ }
+
++ // Paper start
+ /**
+ * Creates an empty merchant.
+ *
+@@ -1563,7 +1647,20 @@ public final class Bukkit {
+ * when the merchant inventory is viewed
+ * @return a new merchant
+ */
++ public static @NotNull Merchant createMerchant(net.kyori.adventure.text.@Nullable Component title) {
++ return server.createMerchant(title);
++ }
++ // Paper start
++ /**
++ * Creates an empty merchant.
++ *
++ * @param title the title of the corresponding merchant inventory, displayed
++ * when the merchant inventory is viewed
++ * @return a new merchant
++ * @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)}
++ */
+ @NotNull
++ @Deprecated // Paper
+ public static Merchant createMerchant(@Nullable String title) {
+ return server.createMerchant(title);
+ }
+@@ -1680,12 +1777,43 @@ public final class Bukkit {
+ return server.isPrimaryThread();
+ }
+
++ // Paper start
++ /**
++ * Gets the message that is displayed on the server list.
++ *
++ * @return the server's MOTD
++ */
++ @NotNull public static net.kyori.adventure.text.Component motd() {
++ return server.motd();
++ }
++
++ /**
++ * Set the message that is displayed on the server list.
++ *
++ * @param motd The message to be displayed
++ */
++ public static void motd(final net.kyori.adventure.text.@NotNull Component motd) {
++ server.motd(motd);
++ }
++
++ /**
++ * Gets the default message that is displayed when the server is stopped.
++ *
++ * @return the shutdown message
++ */
++ public static net.kyori.adventure.text.@Nullable Component shutdownMessage() {
++ return server.shutdownMessage();
++ }
++ // Paper end
++
+ /**
+ * Gets the message that is displayed on the server list.
+ *
+ * @return the servers MOTD
++ * @deprecated in favour of {@link #motd()}
+ */
+ @NotNull
++ @Deprecated // Paper
+ public static String getMotd() {
+ return server.getMotd();
+ }
+@@ -1694,7 +1822,9 @@ public final class Bukkit {
+ * Set the message that is displayed on the server list.
+ *
+ * @param motd The message to be displayed
++ * @deprecated in favour of {@link #motd(net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ public static void setMotd(@NotNull String motd) {
+ server.setMotd(motd);
+ }
+@@ -1714,8 +1844,10 @@ public final class Bukkit {
+ * Gets the default message that is displayed when the server is stopped.
+ *
+ * @return the shutdown message
++ * @deprecated in favour of {@link #shutdownMessage()}
+ */
+ @Nullable
++ @Deprecated // Paper
+ public static String getShutdownMessage() {
+ return server.getShutdownMessage();
+ }
+diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java
+index e3f185dc982d1c38195a4e01ddd485c13ffa58c0..918a045165cdcde264bc24082b7afebb407271de 100644
+--- a/src/main/java/org/bukkit/ChatColor.java
++++ b/src/main/java/org/bukkit/ChatColor.java
+@@ -10,7 +10,9 @@ import org.jetbrains.annotations.Nullable;
+
+ /**
+ * All supported color values for chat
++ * @deprecated ChatColor has been deprecated in favor of Adventure API. See {@link net.kyori.adventure.text.format.NamedTextColor} for the adventure equivalent of pre-defined text colors
+ */
++@Deprecated // Paper
+ public enum ChatColor {
+ /**
+ * Represents black
+diff --git a/src/main/java/org/bukkit/JukeboxSong.java b/src/main/java/org/bukkit/JukeboxSong.java
+index 5872188c2f3c610ab220a30cf60f45c1eba1b372..c6feb13c735fabbd08676fa8828ce0b9fd54da32 100644
+--- a/src/main/java/org/bukkit/JukeboxSong.java
++++ b/src/main/java/org/bukkit/JukeboxSong.java
+@@ -33,4 +33,14 @@ public interface JukeboxSong extends Keyed, Translatable {
+ private static JukeboxSong get(@NotNull String key) {
+ return Registry.JUKEBOX_SONG.getOrThrow(NamespacedKey.minecraft(key));
+ }
++
++ // Paper start - adventure
++ /**
++ * @deprecated this method assumes that jukebox song description will
++ * always be a translatable component which is not guaranteed.
++ */
++ @Override
++ @Deprecated(forRemoval = true)
++ @org.jetbrains.annotations.NotNull String getTranslationKey();
++ // Paper end - adventure
+ }
+diff --git a/src/main/java/org/bukkit/Keyed.java b/src/main/java/org/bukkit/Keyed.java
+index 32c92621c2c15eec14c50965f5ecda00c46e6c80..e076d447da62445764a9776ee2554c077637d270 100644
+--- a/src/main/java/org/bukkit/Keyed.java
++++ b/src/main/java/org/bukkit/Keyed.java
+@@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull;
+ /**
+ * Represents an object which has a {@link NamespacedKey} attached to it.
+ */
+-public interface Keyed {
++public interface Keyed extends net.kyori.adventure.key.Keyed { // Paper -- extend Adventure Keyed
+
+ /**
+ * Return the namespaced identifier for this object.
+@@ -14,4 +14,16 @@ public interface Keyed {
+ */
+ @NotNull
+ NamespacedKey getKey();
++
++ // Paper start
++ /**
++ * Returns the unique identifier for this object.
++ *
++ * @return this object's key
++ */
++ @Override
++ default net.kyori.adventure.key.@NotNull Key key() {
++ return this.getKey();
++ }
++ // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/Nameable.java b/src/main/java/org/bukkit/Nameable.java
+index b79daa857fc686f00ac06b8851e0ab68d83ae949..45d996878ba8d314a47078589b6da59dc84d589e 100644
+--- a/src/main/java/org/bukkit/Nameable.java
++++ b/src/main/java/org/bukkit/Nameable.java
+@@ -7,6 +7,30 @@ import org.jetbrains.annotations.Nullable;
+ */
+ public interface Nameable {
+
++ // Paper start
++ /**
++ * Gets the custom name.
++ *
++ *
++ * It should be noted that some inventory types do not support titles and
++ * may not render with said titles on the Minecraft client.
++ *
++ * {@link InventoryType#WORKBENCH} will not process crafting recipes if
++ * created with this method. Use
++ * {@link Player#openWorkbench(Location, boolean)} instead.
++ *
++ * {@link InventoryType#ENCHANTING} will not process {@link ItemStack}s
++ * for possible enchanting results. Use
++ * {@link Player#openEnchanting(Location, boolean)} instead.
++ *
++ * @param owner The holder of the inventory; can be null if there's no holder.
++ * @param type The type of inventory to create.
++ * @param title The title of the inventory, to be displayed when it is viewed.
++ * @return The new inventory.
++ * @throws IllegalArgumentException if the {@link InventoryType} cannot be
++ * viewed.
++ *
++ * @see InventoryType#isCreatable()
++ */
++ @NotNull
++ Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, net.kyori.adventure.text.@NotNull Component title);
++ // Paper end
++
+ /**
+ * Creates an empty inventory with the specified type and title. If the type
+ * is {@link InventoryType#CHEST}, the new inventory has a size of 27;
+@@ -1292,9 +1348,11 @@ public interface Server extends PluginMessageRecipient {
+ * @return The new inventory.
+ * @throws IllegalArgumentException if the {@link InventoryType} cannot be
+ * viewed.
++ * @deprecated in favour of {@link #createInventory(InventoryHolder, InventoryType, net.kyori.adventure.text.Component)}
+ *
+ * @see InventoryType#isCreatable()
+ */
++ @Deprecated // Paper
+ @NotNull
+ Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title);
+
+@@ -1310,6 +1368,22 @@ public interface Server extends PluginMessageRecipient {
+ @NotNull
+ Inventory createInventory(@Nullable InventoryHolder owner, int size) throws IllegalArgumentException;
+
++ // Paper start
++ /**
++ * Creates an empty inventory of type {@link InventoryType#CHEST} with the
++ * specified size and title.
++ *
++ * @param owner the holder of the inventory, or null to indicate no holder
++ * @param size a multiple of 9 as the size of inventory to create
++ * @param title the title of the inventory, displayed when inventory is
++ * viewed
++ * @return a new inventory
++ * @throws IllegalArgumentException if the size is not a multiple of 9
++ */
++ @NotNull
++ Inventory createInventory(@Nullable InventoryHolder owner, int size, net.kyori.adventure.text.@NotNull Component title) throws IllegalArgumentException;
++ // Paper end
++
+ /**
+ * Creates an empty inventory of type {@link InventoryType#CHEST} with the
+ * specified size and title.
+@@ -1320,18 +1394,32 @@ public interface Server extends PluginMessageRecipient {
+ * viewed
+ * @return a new inventory
+ * @throws IllegalArgumentException if the size is not a multiple of 9
++ * @deprecated in favour of {@link #createInventory(InventoryHolder, int, net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ @NotNull
+ Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException;
+
++ // Paper start
++ /**
++ * Creates an empty merchant.
++ *
++ * @param title the title of the corresponding merchant inventory, displayed
++ * when the merchant inventory is viewed
++ * @return a new merchant
++ */
++ @NotNull Merchant createMerchant(net.kyori.adventure.text.@Nullable Component title);
++ // Paper start
+ /**
+ * Creates an empty merchant.
+ *
+ * @param title the title of the corresponding merchant inventory, displayed
+ * when the merchant inventory is viewed
+ * @return a new merchant
++ * @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)}
+ */
+ @NotNull
++ @Deprecated // Paper
+ Merchant createMerchant(@Nullable String title);
+
+ /**
+@@ -1427,19 +1515,46 @@ public interface Server extends PluginMessageRecipient {
+ */
+ boolean isPrimaryThread();
+
++ // Paper start
++ /**
++ * Gets the message that is displayed on the server list.
++ *
++ * @return the server's MOTD
++ */
++ net.kyori.adventure.text.@NotNull Component motd();
++
++ /**
++ * Set the message that is displayed on the server list.
++ *
++ * @param motd The message to be displayed
++ */
++ void motd(final net.kyori.adventure.text.@NotNull Component motd);
++
++ /**
++ * Gets the default message that is displayed when the server is stopped.
++ *
++ * @return the shutdown message
++ */
++ net.kyori.adventure.text.@Nullable Component shutdownMessage();
++ // Paper end
++
+ /**
+ * Gets the message that is displayed on the server list.
+ *
+ * @return the servers MOTD
++ * @deprecated in favour of {@link #motd()}
+ */
+ @NotNull
++ @Deprecated // Paper
+ String getMotd();
+
+ /**
+ * Set the message that is displayed on the server list.
+ *
+ * @param motd The message to be displayed
++ * @deprecated in favour of {@link #motd(net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ void setMotd(@NotNull String motd);
+
+ /**
+@@ -1455,8 +1570,10 @@ public interface Server extends PluginMessageRecipient {
+ * Gets the default message that is displayed when the server is stopped.
+ *
+ * @return the shutdown message
++ * @deprecated in favour of {@link #shutdownMessage()}
+ */
+ @Nullable
++ @Deprecated // Paper
+ String getShutdownMessage();
+
+ /**
+@@ -1865,7 +1982,9 @@ public interface Server extends PluginMessageRecipient {
+ * Sends the component to the player
+ *
+ * @param component the components to send
++ * @deprecated use {@link #broadcast(net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ public void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent component) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+@@ -1874,7 +1993,9 @@ public interface Server extends PluginMessageRecipient {
+ * Sends an array of components as a single message to the player
+ *
+ * @param components the components to send
++ * @deprecated use {@link #broadcast(net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ public void broadcast(@NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+diff --git a/src/main/java/org/bukkit/ServerLinks.java b/src/main/java/org/bukkit/ServerLinks.java
+index 18a53194483410c4d5ad35f901c90d44efaeef60..aff43d77f31d81b82e5fc5fea6272dda24506562 100644
+--- a/src/main/java/org/bukkit/ServerLinks.java
++++ b/src/main/java/org/bukkit/ServerLinks.java
+@@ -50,13 +50,27 @@ public interface ServerLinks {
+ @NotNull
+ ServerLink addLink(@NotNull Type type, @NotNull URI url);
+
++ // Paper start - Adventure
++ /**
++ * Adds the given link to the list of links.
++ *
++ * @param displayName link name / display text Component
++ * @param url link url
++ * @return the added link
++ */
++ @NotNull
++ ServerLink addLink(@NotNull net.kyori.adventure.text.Component displayName, @NotNull URI url);
++ // Paper end - Adventure
++
+ /**
+ * Adds the given link to the list of links.
+ *
+ * @param displayName link name / display text
+ * @param url link url
+ * @return the added link
++ * @deprecated in favour of {@link ServerLinks#addLink(net.kyori.adventure.text.Component, URI)}
+ */
++ @Deprecated // Paper - Adventure
+ @NotNull
+ ServerLink addLink(@NotNull String displayName, @NotNull URI url);
+
+@@ -89,11 +103,23 @@ public interface ServerLinks {
+ @Nullable
+ Type getType();
+
++ // Paper start - Adventure
++ /**
++ * Gets the display name/text Component of this link.
++ *
++ * @return display name Component
++ */
++ @NotNull
++ net.kyori.adventure.text.Component displayName();
++ // Paper end - Adventure
++
+ /**
+ * Gets the display name/text of this link.
+ *
+ * @return display name
++ * @deprecated in favour of {@link ServerLink#displayName()}
+ */
++ @Deprecated // Paper - Adventure
+ @NotNull
+ String getDisplayName();
+
+diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java
+index fab510afe4fa67d3171e23d739765095916197cb..779fd6dd572dea41e7e22464c9c6068a0fb71b9d 100644
+--- a/src/main/java/org/bukkit/Sound.java
++++ b/src/main/java/org/bukkit/Sound.java
+@@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull;
+ * guarantee values will not be removed from this interface. As such, you should not
+ * depend on the ordinal values of this class.
+ */
+-public interface Sound extends OldEnum
++ *
++ *
++ *
++ * @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.
++ * @param hash The sha1 hash sum of the resource pack file which is used
++ * to apply a cached version of the pack directly without downloading
++ * if it is available. Hast to be 20 bytes long!
++ * @param prompt The optional custom prompt message to be shown to client.
++ * @param force If true, the client will be disconnected from the server
++ * when it declines to use the resource pack.
++ * @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.
++ * @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);
++ }
++ // Paper end
++
+ /**
+ * Request that the player's client download and switch resource packs.
+ *
++ *
++ *
++ * @param uuid Unique resource pack ID.
++ * @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.
++ * @param hash The sha1 hash sum of the resource pack file which is used
++ * to apply a cached version of the pack directly without downloading
++ * if it is available. Hast to be 20 bytes long!
++ * @param prompt The optional custom prompt message to be shown to client.
++ * @param force If true, the client will be disconnected from the server
++ * when it declines to use the resource pack.
++ * @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.
++ * @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
++
+ /**
+ * Request that the player's client download and include another resource pack.
+ * true before calling this method.
++ * Item name differs from display name in that it is cannot be edited by an
++ * anvil, is not styled with italics, and does not show labels.
++ * true before
++ * calling this method.
++ *
++ * @return the item name that is set
++ * @see #hasItemName()
++ */
++ @org.jetbrains.annotations.NotNull
++ Component itemName();
++
++ /**
++ * Sets the item name.
++ *
++ * Item name differs from display name in that it is cannot be edited by an
++ * anvil, is not styled with italics, and does not show labels.
++ *
++ * @param name the name to set, null to remove it
++ */
++ void itemName(@Nullable final Component name);
++ // Paper end
+ /**
+ * Gets the item name that is set.
+ *
+@@ -83,7 +166,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+ * calling this method.
+ *
+ * @return the item name that is set
++ * @deprecated in favour of {@link #itemName()}
+ */
++ @Deprecated // Paper
+ @NotNull
+ String getItemName();
+
+@@ -94,7 +179,9 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+ * anvil, is not styled with italics, and does not show labels.
+ *
+ * @param name the name to set
++ * @deprecated in favour of {@link #itemName(Component)}
+ */
++ @Deprecated // Paper
+ void setItemName(@Nullable String name);
+
+ /**
+@@ -135,6 +222,24 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste
+ */
+ boolean hasLore();
+
++ // Paper start
++ /**
++ * Gets the lore.
++ *
++ * true before calling this method.true
++ * Plugins should check that {@link #hasCustomPotionName()} returns {@code true}
+ * before calling this method.
+ *
++ * @deprecated conflicting name, use {@link #getCustomPotionName()}
+ * @return the potion name that is set
+ */
++ @Deprecated(forRemoval = true, since = "1.21.4")
+ @Nullable
+- String getCustomName();
++ default String getCustomName() {
++ return this.getCustomPotionName();
++ }
+
+ /**
+ * Sets the potion name translation suffix.
+ *
++ * @deprecated conflicting name, use {@link #setCustomPotionName(String)}
+ * @param name the name to set
+ */
+- void setCustomName(@Nullable String name);
++ @Deprecated(forRemoval = true, since = "1.21.4")
++ default void setCustomName(@Nullable String name) {
++ this.setCustomPotionName(name);
++ }
++
++ /**
++ * Checks for existence of a custom potion name translation suffix.
++ *
++ * @return true if this has a custom potion name
++ */
++ boolean hasCustomPotionName();
++
++ /**
++ * Gets the potion name translation suffix that is set.
++ *
++ * This only sets the team outline, other occurrences of colors such as in
++ * names are handled by prefixes / suffixes.
++ *
++ * @return team color
++ * @throws IllegalStateException if this team has been unregistered
++ * @throws IllegalStateException if the team doesn't have a color
++ * @see #hasColor()
++ */
++ net.kyori.adventure.text.format.@NotNull TextColor color();
++
++ /**
++ * Sets the color of the team.
++ *
++ * This only sets the team outline, other occurrences of colors such as in
++ * names are handled by prefixes / suffixes.
++ *
++ * @param color new color, null for no color
++ */
++ void color(net.kyori.adventure.text.format.@Nullable NamedTextColor color);
++ // Paper end - Adventure
++
+ /**
+ * Gets the name displayed to entries for this team
+ *
+ * @return Team display name
+ * @throws IllegalStateException if this team has been unregistered
++ * @deprecated in favour of {@link #displayName()}
+ */
+ @NotNull
++ @Deprecated // Paper
+ String getDisplayName();
+
+ /**
+@@ -37,7 +120,9 @@ public interface Team {
+ *
+ * @param displayName New display name
+ * @throws IllegalStateException if this team has been unregistered
++ * @deprecated in favour of {@link #displayName(net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ void setDisplayName(@NotNull String displayName);
+
+ /**
+@@ -45,8 +130,10 @@ public interface Team {
+ *
+ * @return Team prefix
+ * @throws IllegalStateException if this team has been unregistered
++ * @deprecated in favour of {@link #prefix()}
+ */
+ @NotNull
++ @Deprecated // Paper
+ String getPrefix();
+
+ /**
+@@ -54,7 +141,9 @@ public interface Team {
+ *
+ * @param prefix New prefix
+ * @throws IllegalStateException if this team has been unregistered
++ * @deprecated in favour of {@link #prefix(net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ void setPrefix(@NotNull String prefix);
+
+ /**
+@@ -62,8 +151,10 @@ public interface Team {
+ *
+ * @return the team's current suffix
+ * @throws IllegalStateException if this team has been unregistered
++ * @deprecated in favour of {@link #suffix()}
+ */
+ @NotNull
++ @Deprecated // Paper
+ String getSuffix();
+
+ /**
+@@ -71,7 +162,9 @@ public interface Team {
+ *
+ * @param suffix the new suffix for this team.
+ * @throws IllegalStateException if this team has been unregistered
++ * @deprecated in favour of {@link #suffix(net.kyori.adventure.text.Component)}
+ */
++ @Deprecated // Paper
+ void setSuffix(@NotNull String suffix);
+
+ /**
+@@ -82,8 +175,10 @@ public interface Team {
+ *
+ * @return team color, defaults to {@link ChatColor#RESET}
+ * @throws IllegalStateException if this team has been unregistered
++ * @deprecated in favour of {@link #color()}
+ */
+ @NotNull
++ @Deprecated // Paper
+ ChatColor getColor();
+
+ /**
+@@ -94,7 +189,9 @@ public interface Team {
+ *
+ * @param color new color, must be non-null. Use {@link ChatColor#RESET} for
+ * no color
++ * @deprecated in favour of {@link #color(net.kyori.adventure.text.format.NamedTextColor)}
+ */
++ @Deprecated // Paper
+ void setColor(@NotNull ChatColor color);
+
+ /**
+diff --git a/src/test/java/io/papermc/paper/adventure/KeyTest.java b/src/test/java/io/papermc/paper/adventure/KeyTest.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..7ede17d60358e0e3a04f3166ea9657e5239e0d8f
+--- /dev/null
++++ b/src/test/java/io/papermc/paper/adventure/KeyTest.java
+@@ -0,0 +1,31 @@
++package io.papermc.paper.adventure;
++
++import java.util.HashSet;
++import java.util.Set;
++import net.kyori.adventure.key.Key;
++import org.bukkit.NamespacedKey;
++import org.junit.jupiter.api.Test;
++
++import static org.junit.jupiter.api.Assertions.assertEquals;
++import static org.junit.jupiter.api.Assertions.assertTrue;
++
++public class KeyTest {
++
++ @Test
++ public void equalsTest() {
++ Key key = new NamespacedKey("test", "key");
++ Key key1 = Key.key("test", "key");
++ assertEquals(key, key1);
++ assertEquals(key1, key);
++ }
++
++ @Test
++ public void setTest() {
++ Key key = new NamespacedKey("test", "key");
++ Key key1 = Key.key("test", "key");
++ Set