From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath 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 94353ff03683425814f73c25ae2e5507c9ae20e6..3ef38fee9957243a4e52fefdb50a53b63a40f4a3 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -415,7 +415,7 @@ public final class Bukkit { * @return the number of players * @deprecated in favour of {@link Server#broadcast(net.kyori.adventure.text.Component)} */ - @Deprecated // Paper + @Deprecated // Paper // Purpur - conflict on change public static int broadcastMessage(@NotNull String message) { return server.broadcastMessage(message); } @@ -1182,7 +1182,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); } @@ -1517,7 +1517,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); @@ -1567,7 +1567,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); @@ -1594,7 +1594,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); } @@ -1718,7 +1718,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(); } @@ -1740,7 +1740,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 b423fca93820e48de1318c3c18b2f7669ff5b57b..1045c360c465a878f8119925d37f4738801ebae5 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -327,7 +327,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return the number of players * @deprecated use {@link #broadcast(net.kyori.adventure.text.Component)} */ - @Deprecated // Paper + @Deprecated // Paper // Purpur - conflict on change public int broadcastMessage(@NotNull String message); // Paper start @@ -963,7 +963,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 /** @@ -1275,7 +1275,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); @@ -1319,7 +1319,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; @@ -1342,7 +1342,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); /** @@ -1445,7 +1445,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 @@ -1463,7 +1463,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 c8d37184d8e882a4084a1bfef85faa330588600b..46bae5c13ce2b973b114682f6a338981eb8d95bf 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 4854aa5e9eafc340ef99b5b64cd351a9f0542748..a45e8af464c143cfae5c300aac8ce0093176e73a 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -71,7 +71,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(); @@ -85,7 +85,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 @@ -126,7 +126,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(); /** @@ -137,7 +137,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); /** @@ -146,7 +146,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(); @@ -156,7 +156,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(); @@ -166,7 +166,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); /** @@ -175,7 +175,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); /** @@ -186,7 +186,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); /** @@ -226,7 +226,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 @@ -711,7 +711,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; /** @@ -732,7 +732,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; /** @@ -2212,7 +2212,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 6a6021ad3a0e6aaf51f5144fa126e81bada9cfcf..1c5d268103cb6bd225c31f1ea1a49a52c412845a 100644 --- a/src/main/java/org/bukkit/entity/minecart/CommandMinecart.java +++ b/src/main/java/org/bukkit/entity/minecart/CommandMinecart.java @@ -34,7 +34,7 @@ public interface CommandMinecart extends Minecart, io.papermc.paper.command.Comm * @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 8175e5329f7fb6da4c7faf695162b51492114dc3..839fea07e3b3fe486cd8f7f8fa5d2593ed54594e 100644 --- a/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java +++ b/src/main/java/org/bukkit/event/entity/PlayerDeathEvent.java @@ -162,7 +162,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 @@ -175,7 +175,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 a31841b93964338c9325631dbfa59b3cad77b4f1..7d4a0375543a22a1e31d0506dcc72b1f12320ecd 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java @@ -174,7 +174,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 356d1154b0732e2daf242d60fa715dba9f2dc9db..032e76676890ccbe2e99117690487d02925f44c9 100644 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java @@ -188,7 +188,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 } @@ -199,7 +199,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 } @@ -219,7 +219,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 05ecfd8c133e72d198faeeded8c757c231c871cc..e57020767879b51f212d7a3e563a386adb390c5b 100644 --- a/src/main/java/org/bukkit/event/player/PlayerKickEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerKickEvent.java @@ -85,7 +85,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 } @@ -97,7 +97,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 } @@ -118,7 +118,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 } @@ -129,7 +129,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 ebd499c1a2d11ea068e8c374edbc3967e4cece3d..61895d8d9f01f7ad0409a1cbd902e8a21472d6d4 100644 --- a/src/main/java/org/bukkit/event/player/PlayerLocaleChangeEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerLocaleChangeEvent.java @@ -36,7 +36,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 b6016aa1e91863efc252eecab69ade6f54c89f27..c405d4fd32b329add1526f6502b2e87e4e6429ad 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 fd4db14bef92b893ddaf5424e14ee71da22dcf84..dd7d8d8f2f848bdc1c224805afe0b03fb80fe5cd 100644 --- a/src/main/java/org/bukkit/event/server/ServerListPingEvent.java +++ b/src/main/java/org/bukkit/event/server/ServerListPingEvent.java @@ -113,7 +113,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 } @@ -124,7 +124,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 36bcbb3f3acedf7ebecbf6f6b358cf64af0edfb2..8046b61a62f3cfecb6cd7cb7126b8cbc9617240e 100644 --- a/src/main/java/org/bukkit/inventory/meta/BookMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/BookMeta.java @@ -241,7 +241,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); /** @@ -257,7 +257,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); /** @@ -267,7 +267,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(); /** @@ -277,7 +277,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); /** @@ -287,7 +287,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); /** @@ -297,7 +297,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 77f52b117dec8b99a507995a587505229eadb89e..ba8c55f9ad20049d950813cc971c18aa9a33c172 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 @@ -161,7 +161,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(); @@ -185,7 +185,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 b93b1b0428d11589605c8edf5c053369e1031076..140ac3ebdb0aab58093429faf67a31f7e527e625 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 9a395b138be3f6fa9a52639f0ac4070c23f7d77c..3e1cddb86fd721683220c2a2d1e016c921cc3016 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 04c8cc55a2fe19c888aba842775cc66648dddb0c..de53b5fced3b825ab4b3626330b981b9c43898d4 100644 --- a/src/main/java/org/bukkit/scoreboard/Team.java +++ b/src/main/java/org/bukkit/scoreboard/Team.java @@ -108,7 +108,7 @@ public interface Team { * @deprecated in favour of {@link #displayName()} */ @NotNull - @Deprecated // Paper + @Deprecated // Paper // Purpur - conflict on change String getDisplayName() throws IllegalStateException; /** @@ -120,7 +120,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; /** @@ -131,7 +131,7 @@ public interface Team { * @deprecated in favour of {@link #prefix()} */ @NotNull - @Deprecated // Paper + @Deprecated // Paper // Purpur - conflict on change String getPrefix() throws IllegalStateException; /** @@ -144,7 +144,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; /** @@ -155,7 +155,7 @@ public interface Team { * @deprecated in favour of {@link #suffix()} */ @NotNull - @Deprecated // Paper + @Deprecated // Paper // Purpur - conflict on change String getSuffix() throws IllegalStateException; /** @@ -168,7 +168,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; /** @@ -182,7 +182,7 @@ public interface Team { * @deprecated in favour of {@link #color()} */ @NotNull - @Deprecated // Paper + @Deprecated // Paper // Purpur - conflict on change ChatColor getColor() throws IllegalStateException; /** @@ -195,7 +195,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); /**