diff --git a/patches/api/0039-Conflict-on-change-for-adventure-deprecations.patch b/patches/api/0039-Conflict-on-change-for-adventure-deprecations.patch new file mode 100644 index 000000000..1d88fa9bb --- /dev/null +++ b/patches/api/0039-Conflict-on-change-for-adventure-deprecations.patch @@ -0,0 +1,867 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: BillyGalbreath +Date: Wed, 17 Mar 2021 15:56:47 -0500 +Subject: [PATCH] Conflict on change for adventure deprecations + + +diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java +index 801bef2a060962b5c4f92234401e5bc34a62141a..d754200879bda29d582998433e1a304a6988bbbb 100644 +--- a/src/main/java/org/bukkit/Bukkit.java ++++ b/src/main/java/org/bukkit/Bukkit.java +@@ -303,7 +303,7 @@ public final class Bukkit { + * @return the number of players + * @deprecated in favour of {@link Server#sendMessage(net.kyori.adventure.text.Component)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public static int broadcastMessage(@NotNull String message) { + return server.broadcastMessage(message); + } +@@ -935,7 +935,7 @@ public final class Bukkit { + * @return number of message recipients + * @deprecated in favour of {@link #broadcast(net.kyori.adventure.text.Component, String)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public static int broadcast(@NotNull String message, @NotNull String permission) { + return server.broadcast(message, permission); + } +@@ -1212,7 +1212,7 @@ public final class Bukkit { + * + * @see InventoryType#isCreatable() + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + @NotNull + public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) { + return server.createInventory(owner, type, title); +@@ -1262,7 +1262,7 @@ public final class Bukkit { + * @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 ++ @Deprecated // Paper // Purpur - conflict on change + @NotNull + public static Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException { + return server.createInventory(owner, size, title); +@@ -1289,7 +1289,7 @@ public final class Bukkit { + * @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)} + */ + @NotNull +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public static Merchant createMerchant(@Nullable String title) { + return server.createMerchant(title); + } +@@ -1378,7 +1378,7 @@ public final class Bukkit { + * @deprecated in favour of {@link #motd()} + */ + @NotNull +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public static String getMotd() { + return server.getMotd(); + } +@@ -1400,7 +1400,7 @@ public final class Bukkit { + * @deprecated in favour of {@link #shutdownMessage()} + */ + @Nullable +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public static String getShutdownMessage() { + return server.getShutdownMessage(); + } +diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java +index 7a3be414ef9d54d7a852ba92d704011fa7f125ac..0a3acc1aa156900aa2a6a5682ffb8c3dc25e7534 100644 +--- a/src/main/java/org/bukkit/Server.java ++++ b/src/main/java/org/bukkit/Server.java +@@ -250,7 +250,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi + * @return the number of players + * @deprecated use {@code sendMessage} methods that accept {@link net.kyori.adventure.text.Component} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public int broadcastMessage(@NotNull String message); + + // Paper start +@@ -773,7 +773,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi + * @return number of message recipients + * @deprecated in favour of {@link #broadcast(net.kyori.adventure.text.Component, String)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public int broadcast(@NotNull String message, @NotNull String permission); + // Paper start + /** +@@ -1024,7 +1024,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi + * + * @see InventoryType#isCreatable() + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + @NotNull + Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title); + +@@ -1068,7 +1068,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi + * @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 ++ @Deprecated // Paper // Purpur - conflict on change + @NotNull + Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException; + +@@ -1091,7 +1091,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi + * @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)} + */ + @NotNull +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + Merchant createMerchant(@Nullable String title); + + /** +@@ -1164,7 +1164,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi + * @deprecated in favour of {@link #motd()} + */ + @NotNull +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + String getMotd(); + + // Paper start +@@ -1182,7 +1182,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi + * @deprecated in favour of {@link #shutdownMessage()} + */ + @Nullable +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + String getShutdownMessage(); + + /** +diff --git a/src/main/java/org/bukkit/block/Sign.java b/src/main/java/org/bukkit/block/Sign.java +index 6ea9b54d95d80070c01a612c0ce2ab37f0b4ad41..fe9ec9cb7875df4a40d1c4155e13cca9b3628b30 100644 +--- a/src/main/java/org/bukkit/block/Sign.java ++++ b/src/main/java/org/bukkit/block/Sign.java +@@ -48,7 +48,7 @@ public interface Sign extends TileState, Colorable { + * @deprecated in favour of {@link #lines()} + */ + @NotNull +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public String[] getLines(); + + /** +@@ -62,7 +62,7 @@ public interface Sign extends TileState, Colorable { + * @deprecated in favour of {@link #line(int)} + */ + @NotNull +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public String getLine(int index) throws IndexOutOfBoundsException; + + /** +@@ -76,7 +76,7 @@ public interface Sign extends TileState, Colorable { + * @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 ++ @Deprecated // Paper // Purpur - conflict on change + public void setLine(int index, @NotNull String line) throws IndexOutOfBoundsException; + + /** +diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java +index 1f667efd4b9bf00c0be8707849a6927483aef7ca..3821db949b890434857cbc8469f9416056f01093 100644 +--- a/src/main/java/org/bukkit/entity/Player.java ++++ b/src/main/java/org/bukkit/entity/Player.java +@@ -72,7 +72,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM + * @return the friendly name + * @deprecated in favour of {@link #displayName()} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + @NotNull + public String getDisplayName(); + +@@ -86,7 +86,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM + * @param name The new display name. + * @deprecated in favour of {@link #displayName(net.kyori.adventure.text.Component)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public void setDisplayName(@Nullable String name); + + // Paper start +@@ -127,7 +127,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM + * @deprecated in favour of {@link #playerListName()} + */ + @NotNull +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public String getPlayerListName(); + + /** +@@ -138,7 +138,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM + * @param name new player list name + * @deprecated in favour of {@link #playerListName(net.kyori.adventure.text.Component)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public void setPlayerListName(@Nullable String name); + + /** +@@ -147,7 +147,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM + * @return player list header or null + * @deprecated in favour of {@link #playerListHeader()} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + @Nullable + public String getPlayerListHeader(); + +@@ -157,7 +157,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM + * @return player list header or null + * @deprecated in favour of {@link #playerListFooter()} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + @Nullable + public String getPlayerListFooter(); + +@@ -167,7 +167,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM + * @param header player list header, null for empty + * @deprecated in favour of {@link #sendPlayerListHeader(net.kyori.adventure.text.Component)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public void setPlayerListHeader(@Nullable String header); + + /** +@@ -176,7 +176,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM + * @param footer player list footer, null for empty + * @deprecated in favour of {@link #sendPlayerListFooter(net.kyori.adventure.text.Component)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public void setPlayerListFooter(@Nullable String footer); + + /** +@@ -187,7 +187,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM + * @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 ++ @Deprecated // Paper // Purpur - conflict on change + public void setPlayerListHeaderFooter(@Nullable String header, @Nullable String footer); + + /** +@@ -227,7 +227,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM + * @param message kick message + * @deprecated in favour of {@link #kick(net.kyori.adventure.text.Component)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public void kickPlayer(@Nullable String message); + + // Paper start +@@ -590,7 +590,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM + * @throws IllegalArgumentException if lines is non-null and has a length less than 4 + * @deprecated in favour of {@link #sendSignChange(org.bukkit.Location, java.util.List)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public void sendSignChange(@NotNull Location loc, @Nullable String[] lines) throws IllegalArgumentException; + + +@@ -612,7 +612,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM + * @throws IllegalArgumentException if lines is non-null and has a length less than 4 + * @deprecated in favour of {@link #sendSignChange(org.bukkit.Location, java.util.List, org.bukkit.DyeColor)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public void sendSignChange(@NotNull Location loc, @Nullable String[] lines, @NotNull DyeColor dyeColor) throws IllegalArgumentException; + + /** +@@ -1746,7 +1746,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM + * @deprecated in favour of {@link #locale()} + */ + @NotNull +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public String getLocale(); + + // Paper start +diff --git a/src/main/java/org/bukkit/entity/minecart/CommandMinecart.java b/src/main/java/org/bukkit/entity/minecart/CommandMinecart.java +index 078228106b299a8e38495f7f881d38de4f87bc95..bd5b3142a88c31a676c08fa3e8175f81f4259835 100644 +--- a/src/main/java/org/bukkit/entity/minecart/CommandMinecart.java ++++ b/src/main/java/org/bukkit/entity/minecart/CommandMinecart.java +@@ -37,7 +37,7 @@ public interface CommandMinecart extends Minecart { + * @param name New name for this CommandMinecart. + * @deprecated in favour of {@link #customName(net.kyori.adventure.text.Component)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public void setName(@Nullable String name); + + } +diff --git a/src/main/java/org/bukkit/event/block/SignChangeEvent.java b/src/main/java/org/bukkit/event/block/SignChangeEvent.java +index 1f79f704abf339150df08900b8ea7da4cefef258..004106913655446774f875015cb79863d21263c8 100644 +--- a/src/main/java/org/bukkit/event/block/SignChangeEvent.java ++++ b/src/main/java/org/bukkit/event/block/SignChangeEvent.java +@@ -90,7 +90,7 @@ public class SignChangeEvent extends BlockEvent implements Cancellable { + * @deprecated in favour of {@link #lines()} + */ + @NotNull +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public String[] getLines() { + return adventure$lines.stream().map(org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer()::serialize).toArray(String[]::new); // Paper + } +@@ -106,7 +106,7 @@ public class SignChangeEvent extends BlockEvent implements Cancellable { + * @deprecated in favour of {@link #line(int)} + */ + @Nullable +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public String getLine(int index) throws IndexOutOfBoundsException { + return org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().serialize(this.adventure$lines.get(index)); // Paper + } +@@ -120,7 +120,7 @@ public class SignChangeEvent extends BlockEvent implements Cancellable { + * or < 0} + * @deprecated in favour of {@link #line(int, net.kyori.adventure.text.Component)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public void setLine(int index, @Nullable String line) throws IndexOutOfBoundsException { + adventure$lines.set(index, line != null ? org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().deserialize(line) : null); // Paper + } +diff --git a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java +index 3d45d2e41aad6992b40a22030f2a63baeec78757..3cecfe9f7c253ab474829c612cca2dc05fd5d111 100644 +--- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java ++++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java +@@ -151,7 +151,7 @@ public class PlayerDeathEvent extends EntityDeathEvent { + * @param deathMessage Message to appear to other players on the server. + * @deprecated in favour of {@link #deathMessage(net.kyori.adventure.text.Component)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public void setDeathMessage(@Nullable String deathMessage) { + this.deathMessage = deathMessage; + this.adventure$deathMessage = deathMessage != null ? org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().deserialize(deathMessage) : net.kyori.adventure.text.Component.empty(); // Paper +@@ -164,7 +164,7 @@ public class PlayerDeathEvent extends EntityDeathEvent { + * @deprecated in favour of {@link #deathMessage()} + */ + @Nullable +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public String getDeathMessage() { + return this.deathMessage != null ? this.deathMessage : (this.adventure$deathMessage != null ? getDeathMessageString(this.adventure$deathMessage) : null); // Paper + } +diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java +index 129eac25da4f27489038fb15ab1aeecb172b60cc..670aca11bbaa2d155cd9d2105ac94c9df71d7d8d 100644 +--- a/src/main/java/org/bukkit/event/inventory/InventoryType.java ++++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java +@@ -170,7 +170,7 @@ public enum InventoryType { + } + + @NotNull +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public String getDefaultTitle() { + return title; + } +diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java +index c9af02b0f62b3d18da1e91d1ea02ce0864fc60b9..5e4ade542c79b87a5174e7affb649d818d546362 100644 +--- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java ++++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java +@@ -161,7 +161,7 @@ public class AsyncPlayerPreLoginEvent extends Event { + * @deprecated in favour of {@link #kickMessage()} + */ + @NotNull +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public String getKickMessage() { + return org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().serialize(this.message); // Paper + } +@@ -172,7 +172,7 @@ public class AsyncPlayerPreLoginEvent extends Event { + * @param message New kick message + * @deprecated in favour of {@link #kickMessage(net.kyori.adventure.text.Component)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public void setKickMessage(@NotNull final String message) { + this.message = org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().deserialize(message); // Paper + } +@@ -192,7 +192,7 @@ public class AsyncPlayerPreLoginEvent extends Event { + * @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 ++ @Deprecated // Paper // Purpur - conflict on change + public void disallow(@NotNull final Result result, @NotNull final String message) { + this.result = result; + this.message = org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().deserialize(message); // Paper +diff --git a/src/main/java/org/bukkit/event/player/PlayerJoinEvent.java b/src/main/java/org/bukkit/event/player/PlayerJoinEvent.java +index 851a189d42e271679abc78f95049d8badf7a2b64..7057c2e95267ad32190c5666f20a0566f7fe32fa 100644 +--- a/src/main/java/org/bukkit/event/player/PlayerJoinEvent.java ++++ b/src/main/java/org/bukkit/event/player/PlayerJoinEvent.java +@@ -17,7 +17,7 @@ public class PlayerJoinEvent extends PlayerEvent { + this.joinMessage = joinMessage; + } + +- @Deprecated // Paper end ++ @Deprecated // Paper end // Purpur - conflict on change + public PlayerJoinEvent(@NotNull final Player playerJoined, @Nullable final String joinMessage) { + super(playerJoined); + this.joinMessage = joinMessage != null ? org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().deserialize(joinMessage) : null; // Paper end +@@ -50,7 +50,7 @@ public class PlayerJoinEvent extends PlayerEvent { + * @deprecated in favour of {@link #joinMessage()} + */ + @Nullable +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public String getJoinMessage() { + return this.joinMessage == null ? null : org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().serialize(this.joinMessage); // Paper + } +@@ -61,7 +61,7 @@ public class PlayerJoinEvent extends PlayerEvent { + * @param joinMessage join message. If null, no message will be sent + * @deprecated in favour of {@link #joinMessage(net.kyori.adventure.text.Component)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public void setJoinMessage(@Nullable String joinMessage) { + this.joinMessage = joinMessage != null ? org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().deserialize(joinMessage) : null; // Paper + } +diff --git a/src/main/java/org/bukkit/event/player/PlayerKickEvent.java b/src/main/java/org/bukkit/event/player/PlayerKickEvent.java +index 5c0efe74237dbe6803ce023fde99682ff70d1a92..253e15eb42cab4f578aa89af1e298177779e5cdc 100644 +--- a/src/main/java/org/bukkit/event/player/PlayerKickEvent.java ++++ b/src/main/java/org/bukkit/event/player/PlayerKickEvent.java +@@ -73,7 +73,7 @@ public class PlayerKickEvent extends PlayerEvent implements Cancellable { + * @deprecated in favour of {@link #reason()} + */ + @NotNull +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public String getReason() { + return org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().serialize(this.kickReason); // Paper + } +@@ -85,7 +85,7 @@ public class PlayerKickEvent extends PlayerEvent implements Cancellable { + * @deprecated in favour of {@link #leaveMessage()} + */ + @NotNull +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public String getLeaveMessage() { + return org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().serialize(this.leaveMessage); // Paper + } +@@ -106,7 +106,7 @@ public class PlayerKickEvent extends PlayerEvent implements Cancellable { + * @param kickReason kick reason + * @deprecated in favour of {@link #reason(net.kyori.adventure.text.Component)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public void setReason(@NotNull String kickReason) { + this.kickReason = org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().deserialize(kickReason); // Paper + } +@@ -117,7 +117,7 @@ public class PlayerKickEvent extends PlayerEvent implements Cancellable { + * @param leaveMessage leave message + * @deprecated in favour of {@link #leaveMessage(net.kyori.adventure.text.Component)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public void setLeaveMessage(@NotNull String leaveMessage) { + this.leaveMessage = org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().deserialize(leaveMessage); // Paper + } +diff --git a/src/main/java/org/bukkit/event/player/PlayerLocaleChangeEvent.java b/src/main/java/org/bukkit/event/player/PlayerLocaleChangeEvent.java +index 84521186404b8e43c81a2f9513dce2be40d27840..8c65e9e1476d27fc55419290fb53e46dee9b304d 100644 +--- a/src/main/java/org/bukkit/event/player/PlayerLocaleChangeEvent.java ++++ b/src/main/java/org/bukkit/event/player/PlayerLocaleChangeEvent.java +@@ -37,7 +37,7 @@ public class PlayerLocaleChangeEvent extends PlayerEvent { + * @deprecated in favour of {@link #locale()} + */ + @NotNull +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + 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 75cc54739ef841cd90568d74927d6002d4cfa7e0..712900c9afc3b79806d2b564c0734facf969a6fe 100644 +--- a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java ++++ b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java +@@ -139,7 +139,7 @@ public class PlayerLoginEvent extends PlayerEvent { + * @deprecated in favour of {@link #kickMessage()} + */ + @NotNull +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public String getKickMessage() { + return org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().serialize(this.message); // Paper + } +@@ -150,7 +150,7 @@ public class PlayerLoginEvent extends PlayerEvent { + * @param message New kick message + * @deprecated in favour of {@link #kickMessage(net.kyori.adventure.text.Component)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public void setKickMessage(@NotNull final String message) { + this.message = org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().deserialize(message); // Paper + } +@@ -181,7 +181,7 @@ public class PlayerLoginEvent extends PlayerEvent { + * @param message Kick message to display to the user + * @deprecated in favour of {@link #disallow(Result, net.kyori.adventure.text.Component)} + */ +- @Deprecated // Paper start ++ @Deprecated // Paper start // Purpur - conflict on change + public void disallow(@NotNull final Result result, @NotNull final String message) { + this.result = result; + this.message = org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().deserialize(message); +diff --git a/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java +index 123979ed64939d615b061f91c19c630e1e1db8c7..5b85579964dc6a6150f0c0be650a4bf731414838 100644 +--- a/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java ++++ b/src/main/java/org/bukkit/event/player/PlayerPreLoginEvent.java +@@ -95,7 +95,7 @@ public class PlayerPreLoginEvent extends Event { + * @return Current kick message + * @deprecated in favour of {@link #kickMessage()} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + @NotNull + public String getKickMessage() { + return org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().serialize(this.message); // Paper +@@ -107,7 +107,7 @@ public class PlayerPreLoginEvent extends Event { + * @param message New kick message + * @deprecated in favour of {@link #kickMessage(net.kyori.adventure.text.Component)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public void setKickMessage(@NotNull final String message) { + this.message = org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().deserialize(message); // Paper + } +@@ -127,7 +127,7 @@ public class PlayerPreLoginEvent extends Event { + * @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 ++ @Deprecated // Paper // Purpur - conflict on change + public void disallow(@NotNull final Result result, @NotNull final String message) { + this.result = result; + this.message = org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().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 e43acfb570036adb73d195136573620378cc6a61..1826d11d8b18702ee12c669b50df7f538c324582 100644 +--- a/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java ++++ b/src/main/java/org/bukkit/event/player/PlayerQuitEvent.java +@@ -61,7 +61,7 @@ public class PlayerQuitEvent extends PlayerEvent { + * @deprecated in favour of {@link #quitMessage()} + */ + @Nullable +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public String getQuitMessage() { + return this.quitMessage == null ? null : org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().serialize(this.quitMessage); // Paper + } +@@ -72,7 +72,7 @@ public class PlayerQuitEvent extends PlayerEvent { + * @param quitMessage quit message + * @deprecated in favour of {@link #quitMessage(net.kyori.adventure.text.Component)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public void setQuitMessage(@Nullable String quitMessage) { + this.quitMessage = quitMessage != null ? org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().deserialize(quitMessage) : null; // Paper + } +diff --git a/src/main/java/org/bukkit/event/server/BroadcastMessageEvent.java b/src/main/java/org/bukkit/event/server/BroadcastMessageEvent.java +index 4f8c85222c7bd33217c7db0ff5f47bf397f8f3e5..c18d6d979bd22814ebdc52b995d2cc7ed46dd87f 100644 +--- a/src/main/java/org/bukkit/event/server/BroadcastMessageEvent.java ++++ b/src/main/java/org/bukkit/event/server/BroadcastMessageEvent.java +@@ -73,7 +73,7 @@ public class BroadcastMessageEvent extends ServerEvent implements Cancellable { + * @deprecated in favour of {@link #message()} + */ + @NotNull +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public String getMessage() { + return org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().serialize(this.message); // Paper + } +@@ -84,7 +84,7 @@ public class BroadcastMessageEvent extends ServerEvent implements Cancellable { + * @param message New message to broadcast + * @deprecated in favour of {@link #message(net.kyori.adventure.text.Component)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public void setMessage(@NotNull String message) { + this.message = org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().deserialize(message); // Paper + } +diff --git a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java +index ede5a41bc071a9c9cea369b227b37a50222f295d..6c6501d73041a6c69e78f34d3bf2a96a7de5f690 100644 +--- a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java ++++ b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java +@@ -109,7 +109,7 @@ public class ServerListPingEvent extends ServerEvent implements Iterable + * @deprecated in favour of {@link #motd()} + */ + @NotNull +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public String getMotd() { + return org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().serialize(this.motd); // Paper + } +@@ -120,7 +120,7 @@ public class ServerListPingEvent extends ServerEvent implements Iterable + * @param motd the message of the day + * @deprecated in favour of {@link #motd(net.kyori.adventure.text.Component)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public void setMotd(@NotNull String motd) { + this.motd = org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().deserialize(motd); // Paper + } +diff --git a/src/main/java/org/bukkit/inventory/InventoryView.java b/src/main/java/org/bukkit/inventory/InventoryView.java +index b06995aa57aa9cba0bb59f1d26d81015619a08e6..5e33fe46ab9bb034acc6a38a3c00c33c8f029ca6 100644 +--- a/src/main/java/org/bukkit/inventory/InventoryView.java ++++ b/src/main/java/org/bukkit/inventory/InventoryView.java +@@ -464,7 +464,7 @@ public abstract class InventoryView { + * @return The title. + * @deprecated in favour of {@link #title()} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + @NotNull + public abstract String getTitle(); + } +diff --git a/src/main/java/org/bukkit/inventory/meta/BookMeta.java b/src/main/java/org/bukkit/inventory/meta/BookMeta.java +index 1378c8fc2fd187035fc159c8d025d58b5a61f535..2cbeb4ced49cab055e96268077df2ee2e445c980 100644 +--- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java ++++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java +@@ -234,7 +234,7 @@ public interface BookMeta extends ItemMeta, net.kyori.adventure.inventory.Book { + * @deprecated in favour of {@link #page(int)} + */ + @NotNull +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + String getPage(int page); + + /** +@@ -250,7 +250,7 @@ public interface BookMeta extends ItemMeta, net.kyori.adventure.inventory.Book { + * @param data the data to set for that page + * @deprecated in favour of {@link #page(int, net.kyori.adventure.text.Component)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + void setPage(int page, @NotNull String data); + + /** +@@ -260,7 +260,7 @@ public interface BookMeta extends ItemMeta, net.kyori.adventure.inventory.Book { + * @deprecated in favour of {@link #pages()} + */ + @NotNull +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + List getPages(); + + /** +@@ -270,7 +270,7 @@ public interface BookMeta extends ItemMeta, net.kyori.adventure.inventory.Book { + * @param pages A list of pages to set the book to use + * @deprecated in favour of {@link #pages(List)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + void setPages(@NotNull List pages); + + /** +@@ -280,7 +280,7 @@ public interface BookMeta extends ItemMeta, net.kyori.adventure.inventory.Book { + * @param pages A list of strings, each being a page + * @deprecated in favour of {@link #pages(net.kyori.adventure.text.Component...)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + void setPages(@NotNull String... pages); + + /** +@@ -290,7 +290,7 @@ public interface BookMeta extends ItemMeta, net.kyori.adventure.inventory.Book { + * @param pages A list of strings, each being a page + * @deprecated in favour of {@link #addPages(net.kyori.adventure.text.Component...)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + void addPage(@NotNull String... pages); + + /** +diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +index f093f991f1fedd20fcef041b093398250b7fb286..49d8b1bdad79f452c863f83557ffde7e8f4749c6 100644 +--- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java ++++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +@@ -59,7 +59,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste + * @return the display name that is set + * @deprecated in favour of {@link #displayName()} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + @NotNull + String getDisplayName(); + +@@ -83,7 +83,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste + * @param name the name to set + * @deprecated in favour of {@link #displayName(net.kyori.adventure.text.Component)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + void setDisplayName(@Nullable String name); + + // Paper start +@@ -155,7 +155,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste + * @return a list of lore that is set + * @deprecated in favour of {@link #lore()} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + @Nullable + List getLore(); + +@@ -179,7 +179,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste + * @param lore the lore that will be set + * @deprecated in favour of {@link #lore(List)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + void setLore(@Nullable List lore); + + /** +diff --git a/src/main/java/org/bukkit/map/MapCursor.java b/src/main/java/org/bukkit/map/MapCursor.java +index ed0bc2024a0bb85837e25f75ae89d1fe257b2e60..f6e831f844e1fe99a2617bd64c2290d1f2e96d81 100644 +--- a/src/main/java/org/bukkit/map/MapCursor.java ++++ b/src/main/java/org/bukkit/map/MapCursor.java +@@ -259,7 +259,7 @@ public final class MapCursor { + * @deprecated in favour of {@link #caption()} + */ + @Nullable +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public String getCaption() { + return this.caption == null ? null : org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().serialize(this.caption); // Paper + } +@@ -270,7 +270,7 @@ public final class MapCursor { + * @param caption new caption + * @deprecated in favour of {@link #caption(net.kyori.adventure.text.Component)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + public void setCaption(@Nullable String caption) { + this.caption = caption == null ? null : org.bukkit.Bukkit.getUnsafe().legacyComponentSerializer().deserialize(caption); // Paper + } +diff --git a/src/main/java/org/bukkit/scoreboard/Objective.java b/src/main/java/org/bukkit/scoreboard/Objective.java +index 58bddb11fd534e7c33a4ffd7b72b055ba92c767a..a1b6b1123808378d58c855cacac391ce97df6f19 100644 +--- a/src/main/java/org/bukkit/scoreboard/Objective.java ++++ b/src/main/java/org/bukkit/scoreboard/Objective.java +@@ -47,7 +47,7 @@ public interface Objective { + * @deprecated in favour of {@link #displayName()} + */ + @NotNull +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + String getDisplayName() throws IllegalStateException; + + /** +@@ -60,7 +60,7 @@ public interface Objective { + * characters. + * @deprecated in favour of {@link #displayName(net.kyori.adventure.text.Component)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + 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 f09ff32cc3ffc16af379a378b1948991435393e8..e9db79d10522895e6f119c0cc87eec1cbc45ba6e 100644 +--- a/src/main/java/org/bukkit/scoreboard/Scoreboard.java ++++ b/src/main/java/org/bukkit/scoreboard/Scoreboard.java +@@ -89,7 +89,7 @@ public interface Scoreboard { + * @deprecated in favour of {@link #registerNewObjective(String, String, net.kyori.adventure.text.Component)} + */ + @NotNull +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + Objective registerNewObjective(@NotNull String name, @NotNull String criteria, @NotNull String displayName) throws IllegalArgumentException; + + /** +@@ -113,7 +113,7 @@ public interface Scoreboard { + * @deprecated in favour of {@link #registerNewObjective(String, String, net.kyori.adventure.text.Component, RenderType)} + */ + @NotNull +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + 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 f0af10a5b9ad048be197ed5ec6c8ed2672eb3dd5..705b2268b1c227b34852c14601381230dc626a08 100644 +--- a/src/main/java/org/bukkit/scoreboard/Team.java ++++ b/src/main/java/org/bukkit/scoreboard/Team.java +@@ -110,7 +110,7 @@ public interface Team { + * @deprecated in favour of {@link #displayName()} + */ + @NotNull +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + String getDisplayName() throws IllegalStateException; + + /** +@@ -122,7 +122,7 @@ public interface Team { + * @throws IllegalStateException if this team has been unregistered + * @deprecated in favour of {@link #displayName(net.kyori.adventure.text.Component)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + void setDisplayName(@NotNull String displayName) throws IllegalStateException, IllegalArgumentException; + + /** +@@ -133,7 +133,7 @@ public interface Team { + * @deprecated in favour of {@link #prefix()} + */ + @NotNull +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + String getPrefix() throws IllegalStateException; + + /** +@@ -146,7 +146,7 @@ public interface Team { + * @throws IllegalStateException if this team has been unregistered + * @deprecated in favour of {@link #prefix(net.kyori.adventure.text.Component)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + void setPrefix(@NotNull String prefix) throws IllegalStateException, IllegalArgumentException; + + /** +@@ -157,7 +157,7 @@ public interface Team { + * @deprecated in favour of {@link #suffix()} + */ + @NotNull +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + String getSuffix() throws IllegalStateException; + + /** +@@ -170,7 +170,7 @@ public interface Team { + * @throws IllegalStateException if this team has been unregistered + * @deprecated in favour of {@link #suffix(net.kyori.adventure.text.Component)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + void setSuffix(@NotNull String suffix) throws IllegalStateException, IllegalArgumentException; + + /** +@@ -184,7 +184,7 @@ public interface Team { + * @deprecated in favour of {@link #color()} + */ + @NotNull +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + ChatColor getColor() throws IllegalStateException; + + /** +@@ -197,7 +197,7 @@ public interface Team { + * no color + * @deprecated in favour of {@link #color(net.kyori.adventure.text.format.NamedTextColor)} + */ +- @Deprecated // Paper ++ @Deprecated // Paper // Purpur - conflict on change + void setColor(@NotNull ChatColor color); + + /**