diff --git a/paper-api/src/main/java/org/bukkit/Bukkit.java b/paper-api/src/main/java/org/bukkit/Bukkit.java index 52ca9eb5408b..aad847392e3b 100644 --- a/paper-api/src/main/java/org/bukkit/Bukkit.java +++ b/paper-api/src/main/java/org/bukkit/Bukkit.java @@ -1079,11 +1079,11 @@ public static Logger getLogger() { * * @param name the name of the command to retrieve * @return a plugin command if found, null otherwise - * @apiNote plugin developers should prefer to use the + * @deprecated plugin developers should prefer to use the * Brigadier command API. * For a direct alternative to Bukkit commands, Basic commands are recommended. */ - @ApiStatus.Obsolete(since = "26.3") + @Deprecated(since = "26.4") @Nullable public static PluginCommand getPluginCommand(@NotNull String name) { return server.getPluginCommand(name); @@ -2658,11 +2658,11 @@ public static UnsafeValues getUnsafe() { * Gets the active {@link org.bukkit.command.CommandMap} * * @return the active command map - * @apiNote plugin developers should prefer to use the + * @deprecated plugin developers should prefer to use the * Brigadier command API. * For a direct alternative to Bukkit commands, Basic commands are recommended */ - @ApiStatus.Obsolete(since = "26.3") + @Deprecated(since = "26.4") @NotNull public static org.bukkit.command.CommandMap getCommandMap() { return server.getCommandMap(); diff --git a/paper-api/src/main/java/org/bukkit/Server.java b/paper-api/src/main/java/org/bukkit/Server.java index ef0069ed4c1d..519c906334a3 100644 --- a/paper-api/src/main/java/org/bukkit/Server.java +++ b/paper-api/src/main/java/org/bukkit/Server.java @@ -995,11 +995,11 @@ default ItemStack createExplorerMap(@NotNull World world, @NotNull Location loca * * @param name the name of the command to retrieve * @return a plugin command if found, null otherwise - * @apiNote plugin developers should prefer to use the + * @deprecated plugin developers should prefer to use the * Brigadier command API. * For a direct alternative to Bukkit commands, Basic commands are recommended */ - @ApiStatus.Obsolete(since = "26.3") + @Deprecated(since = "26.4") @Nullable public PluginCommand getPluginCommand(@NotNull String name); @@ -2211,11 +2211,11 @@ default int getAmbientSpawnLimit() { * Gets the active {@link org.bukkit.command.CommandMap} * * @return the active command map - * @apiNote plugin developers should prefer to use the + * @deprecated plugin developers should prefer to use the * Brigadier command API. * For a direct alternative to Bukkit commands, Basic commands are recommended */ - @ApiStatus.Obsolete(since = "26.3") + @Deprecated(since = "26.4") @NotNull org.bukkit.command.CommandMap getCommandMap(); diff --git a/paper-api/src/main/java/org/bukkit/command/Command.java b/paper-api/src/main/java/org/bukkit/command/Command.java index f43b64c0b7ae..f07093d2c4cf 100644 --- a/paper-api/src/main/java/org/bukkit/command/Command.java +++ b/paper-api/src/main/java/org/bukkit/command/Command.java @@ -15,18 +15,17 @@ import org.bukkit.permissions.Permissible; import org.bukkit.plugin.PluginDescriptionFile; import org.bukkit.util.StringUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** * Represents a Command, which executes various tasks upon user input * - * @apiNote plugin developers should prefer to use the + * @deprecated plugin developers should prefer to use the * Brigadier command API. * For a direct alternative to Bukkit commands, Basic commands are recommended */ -@ApiStatus.Obsolete(since = "26.3") +@Deprecated(since = "26.4") public abstract class Command { private String name; private String nextLabel; diff --git a/paper-api/src/main/java/org/bukkit/command/CommandExecutor.java b/paper-api/src/main/java/org/bukkit/command/CommandExecutor.java index faf5f09d98e9..0615511810f1 100644 --- a/paper-api/src/main/java/org/bukkit/command/CommandExecutor.java +++ b/paper-api/src/main/java/org/bukkit/command/CommandExecutor.java @@ -1,16 +1,15 @@ package org.bukkit.command; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** * Represents a class which contains a single method for executing commands * - * @apiNote plugin developers should prefer to use the + * @deprecated plugin developers should prefer to use the * Brigadier command API. * For a direct alternative to Bukkit commands, Basic commands are recommended */ -@ApiStatus.Obsolete(since = "26.3") +@Deprecated(since = "26.4") public interface CommandExecutor { /** @@ -24,10 +23,10 @@ public interface CommandExecutor { * @param label Alias of the command which was used * @param args Passed command arguments * @return true if a valid command, otherwise false - * @apiNote plugin developers should prefer to use the + * @deprecated plugin developers should prefer to use the * Brigadier command API. * For a direct alternative to Bukkit commands, Basic commands are recommended */ - @ApiStatus.Obsolete(since = "26.3") + @Deprecated(since = "26.4") public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String @NotNull [] args); } diff --git a/paper-api/src/main/java/org/bukkit/command/CommandMap.java b/paper-api/src/main/java/org/bukkit/command/CommandMap.java index 0438f33906c6..d7ba37b0c918 100644 --- a/paper-api/src/main/java/org/bukkit/command/CommandMap.java +++ b/paper-api/src/main/java/org/bukkit/command/CommandMap.java @@ -2,16 +2,15 @@ import java.util.List; import org.bukkit.Location; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** - * @apiNote plugin developers should prefer to use the - * Brigadier command API + * @deprecated plugin developers should prefer to use the + * Brigadier command API. * For a direct alternative to Bukkit commands, Basic commands are recommended */ -@ApiStatus.Obsolete(since = "26.3") +@Deprecated(since = "26.4") public interface CommandMap { /** diff --git a/paper-api/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/paper-api/src/main/java/org/bukkit/command/FormattedCommandAlias.java index 7a15cfccc2e5..c960589e4893 100644 --- a/paper-api/src/main/java/org/bukkit/command/FormattedCommandAlias.java +++ b/paper-api/src/main/java/org/bukkit/command/FormattedCommandAlias.java @@ -7,15 +7,14 @@ import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; import org.bukkit.Bukkit; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** - * @apiNote plugin developers should prefer to use the + * @deprecated plugin developers should prefer to use the * Brigadier command API. * For a direct alternative to Bukkit commands, Basic commands are recommended */ -@ApiStatus.Obsolete(since = "26.3") +@Deprecated(since = "26.4") public class FormattedCommandAlias extends Command { private final String[] formatStrings; diff --git a/paper-api/src/main/java/org/bukkit/command/MultipleCommandAlias.java b/paper-api/src/main/java/org/bukkit/command/MultipleCommandAlias.java index bac82f4b5c06..67e544f6b491 100644 --- a/paper-api/src/main/java/org/bukkit/command/MultipleCommandAlias.java +++ b/paper-api/src/main/java/org/bukkit/command/MultipleCommandAlias.java @@ -1,16 +1,15 @@ package org.bukkit.command; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** * Represents a command that delegates to one or more other commands * - * @apiNote plugin developers should prefer to use the + * @deprecated plugin developers should prefer to use the * Brigadier command API. * For a direct alternative to Bukkit commands, Basic commands are recommended */ -@ApiStatus.Obsolete(since = "26.3") +@Deprecated(since = "26.4") public class MultipleCommandAlias extends Command { private Command[] commands; diff --git a/paper-api/src/main/java/org/bukkit/command/PluginCommand.java b/paper-api/src/main/java/org/bukkit/command/PluginCommand.java index c771612d7b51..edc246c02bb3 100644 --- a/paper-api/src/main/java/org/bukkit/command/PluginCommand.java +++ b/paper-api/src/main/java/org/bukkit/command/PluginCommand.java @@ -3,18 +3,17 @@ import com.google.common.base.Preconditions; import java.util.List; import org.bukkit.plugin.Plugin; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** * Represents a {@link Command} belonging to a plugin * - * @apiNote plugin developers should prefer to use the + * @deprecated plugin developers should prefer to use the * Brigadier command API. * For a direct alternative to Bukkit commands, Basic commands are recommended */ -@ApiStatus.Obsolete(since = "26.3") +@Deprecated(since = "26.4") public final class PluginCommand extends Command implements PluginIdentifiableCommand { private final Plugin owningPlugin; private CommandExecutor executor; diff --git a/paper-api/src/main/java/org/bukkit/command/PluginCommandYamlParser.java b/paper-api/src/main/java/org/bukkit/command/PluginCommandYamlParser.java index 08902d479983..5e4986869158 100644 --- a/paper-api/src/main/java/org/bukkit/command/PluginCommandYamlParser.java +++ b/paper-api/src/main/java/org/bukkit/command/PluginCommandYamlParser.java @@ -6,15 +6,14 @@ import java.util.Map.Entry; import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** - * @apiNote plugin developers should prefer to use the + * @deprecated plugin developers should prefer to use the * Brigadier command API. * For a direct alternative to Bukkit commands, Basic commands are recommended */ -@ApiStatus.Obsolete(since = "26.3") +@Deprecated(since = "26.4") public class PluginCommandYamlParser { @NotNull diff --git a/paper-api/src/main/java/org/bukkit/command/PluginIdentifiableCommand.java b/paper-api/src/main/java/org/bukkit/command/PluginIdentifiableCommand.java index 78e1b384564f..5cbf34508d0a 100644 --- a/paper-api/src/main/java/org/bukkit/command/PluginIdentifiableCommand.java +++ b/paper-api/src/main/java/org/bukkit/command/PluginIdentifiableCommand.java @@ -1,7 +1,6 @@ package org.bukkit.command; import org.bukkit.plugin.Plugin; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -10,11 +9,11 @@ * implementations will need to implement this interface to have a sub-index * automatically generated on the plugin's behalf. * - * @apiNote plugin developers should prefer to use the + * @deprecated plugin developers should prefer to use the * Brigadier command API. * For a direct alternative to Bukkit commands, Basic commands are recommended */ -@ApiStatus.Obsolete(since = "26.3") +@Deprecated(since = "26.4") public interface PluginIdentifiableCommand { /** diff --git a/paper-api/src/main/java/org/bukkit/command/SimpleCommandMap.java b/paper-api/src/main/java/org/bukkit/command/SimpleCommandMap.java index f373e0f920ea..b9bfae4d4cd6 100644 --- a/paper-api/src/main/java/org/bukkit/command/SimpleCommandMap.java +++ b/paper-api/src/main/java/org/bukkit/command/SimpleCommandMap.java @@ -16,16 +16,15 @@ import org.bukkit.command.defaults.ReloadCommand; import org.bukkit.entity.Player; import org.bukkit.util.StringUtil; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** - * @apiNote plugin developers should prefer to use the + * @deprecated plugin developers should prefer to use the * Brigadier command API. * For a direct alternative to Bukkit commands, Basic commands are recommended */ -@ApiStatus.Obsolete(since = "26.3") +@Deprecated(since = "26.4") public class SimpleCommandMap implements CommandMap { protected final Map knownCommands; private final Server server; diff --git a/paper-api/src/main/java/org/bukkit/command/TabCompleter.java b/paper-api/src/main/java/org/bukkit/command/TabCompleter.java index c0ab974eb3fe..233c6404fb0d 100644 --- a/paper-api/src/main/java/org/bukkit/command/TabCompleter.java +++ b/paper-api/src/main/java/org/bukkit/command/TabCompleter.java @@ -1,18 +1,17 @@ package org.bukkit.command; import java.util.List; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** * Represents a class which can suggest tab completions for commands. * - * @apiNote plugin developers should prefer to use the + * @deprecated plugin developers should prefer to use the * Brigadier command API. * For a direct alternative to Bukkit commands, Basic commands are recommended */ -@ApiStatus.Obsolete(since = "26.3") +@Deprecated(since = "26.4") public interface TabCompleter { /** @@ -27,11 +26,11 @@ public interface TabCompleter { * partial argument to be completed * @return A List of possible completions for the final argument, or null * to default to the command executor - * @apiNote plugin developers should prefer to use the + * @deprecated plugin developers should prefer to use the * Brigadier command API. * For a direct alternative to Bukkit commands, Basic commands are recommended */ - @ApiStatus.Obsolete(since = "26.3") + @Deprecated(since = "26.4") @Nullable public List onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String @NotNull [] args); } diff --git a/paper-api/src/main/java/org/bukkit/command/TabExecutor.java b/paper-api/src/main/java/org/bukkit/command/TabExecutor.java index 924a4f8cec8f..454cccd05415 100644 --- a/paper-api/src/main/java/org/bukkit/command/TabExecutor.java +++ b/paper-api/src/main/java/org/bukkit/command/TabExecutor.java @@ -1,15 +1,13 @@ package org.bukkit.command; -import org.jetbrains.annotations.ApiStatus; - /** * This class is provided as a convenience to implement both TabCompleter and * CommandExecutor. * - * @apiNote plugin developers should prefer to use the + * @deprecated plugin developers should prefer to use the * Brigadier command API. * For a direct alternative to Bukkit commands, Basic commands are recommended */ -@ApiStatus.Obsolete(since = "26.3") +@Deprecated(since = "26.4") public interface TabExecutor extends TabCompleter, CommandExecutor { } diff --git a/paper-api/src/main/java/org/bukkit/command/defaults/BukkitCommand.java b/paper-api/src/main/java/org/bukkit/command/defaults/BukkitCommand.java index 21ce80ae3f45..32ad948e8414 100644 --- a/paper-api/src/main/java/org/bukkit/command/defaults/BukkitCommand.java +++ b/paper-api/src/main/java/org/bukkit/command/defaults/BukkitCommand.java @@ -2,15 +2,14 @@ import java.util.List; import org.bukkit.command.Command; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** - * @apiNote plugin developers should prefer to use the + * @deprecated plugin developers should prefer to use the * Brigadier command API. * For a direct alternative to Bukkit commands, Basic commands are recommended */ -@ApiStatus.Obsolete(since = "26.3") +@Deprecated(since = "26.4") public abstract class BukkitCommand extends Command { protected BukkitCommand(@NotNull String name) { super(name); diff --git a/paper-api/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/paper-api/src/main/java/org/bukkit/plugin/java/JavaPlugin.java index 3349fef57897..5ba7a0e0258f 100644 --- a/paper-api/src/main/java/org/bukkit/plugin/java/JavaPlugin.java +++ b/paper-api/src/main/java/org/bukkit/plugin/java/JavaPlugin.java @@ -31,7 +31,6 @@ import org.bukkit.plugin.PluginBase; import org.bukkit.plugin.PluginDescriptionFile; import org.bukkit.plugin.PluginLoader; -import org.jetbrains.annotations.ApiStatus; import org.jspecify.annotations.NullMarked; import org.jspecify.annotations.Nullable; @@ -311,12 +310,12 @@ public final void init(Server server, PluginDescriptionFile description, File da /** * {@inheritDoc} * - * @apiNote plugin developers should prefer to use the + * @deprecated plugin developers should prefer to use the * Brigadier command API. * For a direct alternative to Bukkit commands, Basic commands are recommended */ @Override - @ApiStatus.Obsolete(since = "26.3") + @Deprecated(since = "26.4") public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { return false; } @@ -324,12 +323,12 @@ public boolean onCommand(CommandSender sender, Command command, String label, St /** * {@inheritDoc} * - * @apiNote plugin developers should prefer to use the + * @deprecated plugin developers should prefer to use the * Brigadier command API. * For a direct alternative to Bukkit commands, Basic commands are recommended */ @Override - @ApiStatus.Obsolete(since = "26.3") + @Deprecated(since = "26.4") public @Nullable List onTabComplete(CommandSender sender, Command command, String alias, String[] args) { return null; } @@ -343,11 +342,11 @@ public boolean onCommand(CommandSender sender, Command command, String label, St * @return the plugin command if found, otherwise null * @throws UnsupportedOperationException if this plugin is a paper plugin and the method is called in {@link #onEnable()} * @see #registerCommand(String, String, Collection, BasicCommand) - * @apiNote plugin developers should prefer to use the + * @deprecated plugin developers should prefer to use the * Brigadier command API. * For a direct alternative to Bukkit commands, Basic commands are recommended */ - @ApiStatus.Obsolete(since = "26.3") + @Deprecated(since = "26.4") public @Nullable PluginCommand getCommand(String name) { if (this.isBeingEnabled && !(pluginMeta instanceof PluginDescriptionFile)) { throw new UnsupportedOperationException(""" diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 478f4461ab3f..78741accfcb5 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -256,7 +256,6 @@ import org.bukkit.scoreboard.Criteria; import org.bukkit.structure.StructureManager; import org.bukkit.util.permissions.DefaultPermissions; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.yaml.snakeyaml.LoaderOptions; @@ -1427,7 +1426,7 @@ public Logger getLogger() { } @Override - @ApiStatus.Obsolete + @Deprecated public PluginCommand getPluginCommand(String name) { Command command = this.commandMap.getCommand(name); @@ -2281,7 +2280,7 @@ public HelpMap getHelpMap() { } @Override - @ApiStatus.Obsolete + @Deprecated public SimpleCommandMap getCommandMap() { return this.commandMap; }