From f9315e180c14b58252a214df391a8aebe9e7d13e Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 31 Dec 2019 23:00:07 -0600 Subject: [PATCH] Remove pointless annotations and deprecations --- src/main/java/org/bukkit/Bukkit.java | 3 --- src/main/java/org/bukkit/Server.java | 3 --- src/main/java/org/bukkit/command/CommandExecutor.java | 2 +- src/main/java/org/bukkit/command/TabCompleter.java | 2 +- src/main/java/org/bukkit/inventory/ItemStack.java | 8 -------- src/main/java/org/bukkit/plugin/java/JavaPlugin.java | 4 ++-- src/test/java/org/bukkit/AnnotationTest.java | 5 +++++ 7 files changed, 9 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java index b6f8942c0..ebb4ff682 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -793,13 +793,10 @@ public final class Bukkit { * This will return an object even if the player does not exist. To this * method, all players will exist. * - * @deprecated Persistent storage of users should be by UUID as names are no longer - * unique past a single session. * @param name the name the player to retrieve * @return an offline player * @see #getOfflinePlayer(java.util.UUID) */ - @Deprecated @NotNull public static OfflinePlayer getOfflinePlayer(@NotNull String name) { return server.getOfflinePlayer(name); diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java index ee768158b..fb85ad18a 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -660,13 +660,10 @@ public interface Server extends PluginMessageRecipient { * This will return an object even if the player does not exist. To this * method, all players will exist. * - * @deprecated Persistent storage of users should be by UUID as names are no longer - * unique past a single session. * @param name the name the player to retrieve * @return an offline player * @see #getOfflinePlayer(java.util.UUID) */ - @Deprecated @NotNull public OfflinePlayer getOfflinePlayer(@NotNull String name); diff --git a/src/main/java/org/bukkit/command/CommandExecutor.java b/src/main/java/org/bukkit/command/CommandExecutor.java index 45cb8da12..383b43e1b 100644 --- a/src/main/java/org/bukkit/command/CommandExecutor.java +++ b/src/main/java/org/bukkit/command/CommandExecutor.java @@ -19,5 +19,5 @@ public interface CommandExecutor { * @param args Passed command arguments * @return true if a valid command, otherwise false */ - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args); + public boolean onCommand(CommandSender sender, Command command, String label, String[] args); // Purpur - remove pointless annotations } diff --git a/src/main/java/org/bukkit/command/TabCompleter.java b/src/main/java/org/bukkit/command/TabCompleter.java index e9cf71f5c..34d3462c7 100644 --- a/src/main/java/org/bukkit/command/TabCompleter.java +++ b/src/main/java/org/bukkit/command/TabCompleter.java @@ -23,5 +23,5 @@ public interface TabCompleter { * to default to the command executor */ @Nullable - public List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args); + public List onTabComplete(CommandSender sender, Command command, String alias, String[] args); // Purpur - remove pointless annotations } diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java index 5426e7c2f..cc324fe23 100644 --- a/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java @@ -204,13 +204,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { * Sets the durability of this item * * @param durability Durability of this item - * @deprecated durability is now part of ItemMeta. To avoid confusion and - * misuse, {@link #getItemMeta()}, {@link #setItemMeta(ItemMeta)} and - * {@link Damageable#setDamage(int)} should be used instead. This is because - * any call to this method will be overwritten by subsequent setting of - * ItemMeta which was created before this call. */ - @Deprecated public void setDurability(final short durability) { ItemMeta meta = getItemMeta(); if (meta != null) { @@ -223,9 +217,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { * Gets the durability of this item * * @return Durability of this item - * @deprecated see {@link #setDurability(short)} */ - @Deprecated public short getDurability() { ItemMeta meta = getItemMeta(); return (meta == null) ? 0 : (short) ((Damageable) meta).getDamage(); diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java index 04fa3991f..24d65491c 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java @@ -287,7 +287,7 @@ public abstract class JavaPlugin extends PluginBase { * {@inheritDoc} */ @Override - public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) { + public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { // Purpur - remove pointless annotations return false; } @@ -296,7 +296,7 @@ public abstract class JavaPlugin extends PluginBase { */ @Override @Nullable - public List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) { + public List onTabComplete(CommandSender sender, Command command, String alias, String[] args) { // Purpur - remove pointless annotations return null; } diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java index a48be38b1..951b81e79 100644 --- a/src/test/java/org/bukkit/AnnotationTest.java +++ b/src/test/java/org/bukkit/AnnotationTest.java @@ -41,6 +41,11 @@ public class AnnotationTest { "org/bukkit/plugin/java/PluginClassLoader", // Generic functional interface "org/bukkit/util/Consumer", + // Purpur start + "org/bukkit/command/CommandExecutor", + "org/bukkit/command/TabCompleter", + "org/bukkit/plugin/java/JavaPlugin", + // Purpur end // Paper start // Timings history is broken in terms of nullability due to guavas Function defining that the param is NonNull "co/aikar/timings/TimingHistory$2", -- 2.24.0