SPIGOT-76: Remove almost all Bukkit commands

By: Thinkofdeath <thinkofdeath@spigotmc.org>

paper-api/src/main/java/org/bukkit/command/SimpleCommandMap.java

@@ -28,10 +28,6 @@ public class SimpleCommandMap implements CommandMap {
     }
 
     private void setDefaultCommands() {
-        register("bukkit", new SaveCommand());
-        register("bukkit", new SaveOnCommand());
-        register("bukkit", new SaveOffCommand());
-        register("bukkit", new StopCommand());
         register("bukkit", new VersionCommand("version"));
         register("bukkit", new ReloadCommand("reload"));
         register("bukkit", new PluginsCommand("plugins"));
@@ -39,43 +35,7 @@ public class SimpleCommandMap implements CommandMap {
     }
 
     public void setFallbackCommands() {
-        register("bukkit", new ListCommand());
-        register("bukkit", new OpCommand());
-        register("bukkit", new DeopCommand());
-        register("bukkit", new BanIpCommand());
-        register("bukkit", new PardonIpCommand());
-        register("bukkit", new BanCommand());
-        register("bukkit", new PardonCommand());
-        register("bukkit", new KickCommand());
-        register("bukkit", new TeleportCommand());
-        register("bukkit", new GiveCommand());
-        register("bukkit", new TimeCommand());
-        register("bukkit", new SayCommand());
-        register("bukkit", new WhitelistCommand());
-        register("bukkit", new TellCommand());
-        register("bukkit", new MeCommand());
-        register("bukkit", new KillCommand());
-        register("bukkit", new GameModeCommand());
         register("bukkit", new HelpCommand());
-        register("bukkit", new ExpCommand());
-        register("bukkit", new ToggleDownfallCommand());
-        register("bukkit", new BanListCommand());
-        register("bukkit", new DefaultGameModeCommand());
-        register("bukkit", new SeedCommand());
-        register("bukkit", new DifficultyCommand());
-        register("bukkit", new WeatherCommand());
-        register("bukkit", new SpawnpointCommand());
-        register("bukkit", new ClearCommand());
-        register("bukkit", new GameRuleCommand());
-        register("bukkit", new EnchantCommand());
-        register("bukkit", new TestForCommand());
-        register("bukkit", new EffectCommand());
-        register("bukkit", new ScoreboardCommand());
-        register("bukkit", new PlaySoundCommand());
-        register("bukkit", new SpreadPlayersCommand());
-        register("bukkit", new SetWorldSpawnCommand());
-        register("bukkit", new SetIdleTimeoutCommand());
-        register("bukkit", new AchievementCommand());
     }
 
     /**

paper-api/src/main/java/org/bukkit/command/defaults/AchievementCommand.java

@@ -20,6 +20,7 @@ import org.bukkit.event.player.PlayerStatisticIncrementEvent;
 
 import com.google.common.collect.ImmutableList;
 
+@Deprecated
 public class AchievementCommand extends VanillaCommand {
     public AchievementCommand() {
         super("achievement");

paper-api/src/main/java/org/bukkit/command/defaults/BanCommand.java

@@ -13,6 +13,7 @@ import org.bukkit.entity.Player;
 
 import com.google.common.collect.ImmutableList;
 
+@Deprecated
 public class BanCommand extends VanillaCommand {
     public BanCommand() {
         super("ban");

paper-api/src/main/java/org/bukkit/command/defaults/BanIpCommand.java

@@ -14,6 +14,7 @@ import org.bukkit.entity.Player;
 
 import com.google.common.collect.ImmutableList;
 
+@Deprecated
 public class BanIpCommand extends VanillaCommand {
     public static final Pattern ipValidity = Pattern.compile("^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])$");
 

paper-api/src/main/java/org/bukkit/command/defaults/BanListCommand.java

@@ -15,6 +15,7 @@ import org.bukkit.util.StringUtil;
 
 import com.google.common.collect.ImmutableList;
 
+@Deprecated
 public class BanListCommand extends VanillaCommand {
     private static final List<String> BANLIST_TYPES = ImmutableList.of("ips", "players");
 

paper-api/src/main/java/org/bukkit/command/defaults/ClearCommand.java

@@ -14,6 +14,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+@Deprecated
 public class ClearCommand extends VanillaCommand {
     private static List<String> materials;
     static {

paper-api/src/main/java/org/bukkit/command/defaults/DefaultGameModeCommand.java

@@ -12,6 +12,7 @@ import org.bukkit.util.StringUtil;
 
 import com.google.common.collect.ImmutableList;
 
+@Deprecated
 public class DefaultGameModeCommand extends VanillaCommand {
     private static final List<String> GAMEMODE_NAMES = ImmutableList.of("adventure", "creative", "survival");
 

paper-api/src/main/java/org/bukkit/command/defaults/DeopCommand.java

@@ -14,6 +14,7 @@ import org.bukkit.util.StringUtil;
 
 import com.google.common.collect.ImmutableList;
 
+@Deprecated
 public class DeopCommand extends VanillaCommand {
     public DeopCommand() {
         super("deop");

paper-api/src/main/java/org/bukkit/command/defaults/DifficultyCommand.java

@@ -12,6 +12,7 @@ import org.bukkit.Difficulty;
 import java.util.ArrayList;
 import java.util.List;
 
+@Deprecated
 public class DifficultyCommand extends VanillaCommand {
     private static final List<String> DIFFICULTY_NAMES = ImmutableList.of("peaceful", "easy", "normal", "hard");
 

paper-api/src/main/java/org/bukkit/command/defaults/EffectCommand.java

@@ -10,6 +10,7 @@ import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.util.StringUtil;
 
+@Deprecated
 public class EffectCommand extends VanillaCommand {
     private static final List<String> effects;
 

paper-api/src/main/java/org/bukkit/command/defaults/EnchantCommand.java

@@ -19,6 +19,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.util.StringUtil;
 
+@Deprecated
 public class EnchantCommand extends VanillaCommand {
     private static final List<String> ENCHANTMENT_NAMES = new ArrayList<String>();
 

paper-api/src/main/java/org/bukkit/command/defaults/ExpCommand.java

@@ -11,6 +11,7 @@ import org.bukkit.entity.Player;
 
 import com.google.common.collect.ImmutableList;
 
+@Deprecated
 public class ExpCommand extends VanillaCommand {
     public ExpCommand() {
         super("xp");

paper-api/src/main/java/org/bukkit/command/defaults/GameModeCommand.java

@@ -14,6 +14,7 @@ import org.bukkit.util.StringUtil;
 
 import com.google.common.collect.ImmutableList;
 
+@Deprecated
 public class GameModeCommand extends VanillaCommand {
     private static final List<String> GAMEMODE_NAMES = ImmutableList.of("adventure", "creative", "survival", "spectator");
 

paper-api/src/main/java/org/bukkit/command/defaults/GameRuleCommand.java

@@ -15,6 +15,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.entity.HumanEntity;
 
+@Deprecated
 public class GameRuleCommand extends VanillaCommand {
     private static final List<String> GAMERULE_STATES = ImmutableList.of("true", "false");
 

paper-api/src/main/java/org/bukkit/command/defaults/GiveCommand.java

@@ -18,6 +18,7 @@ import org.bukkit.util.StringUtil;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 
+@Deprecated
 public class GiveCommand extends VanillaCommand {
     private static List<String> materials;
     static {

paper-api/src/main/java/org/bukkit/command/defaults/KickCommand.java

@@ -11,6 +11,7 @@ import org.bukkit.entity.Player;
 
 import com.google.common.collect.ImmutableList;
 
+@Deprecated
 public class KickCommand extends VanillaCommand {
     public KickCommand() {
         super("kick");

paper-api/src/main/java/org/bukkit/command/defaults/KillCommand.java

@@ -10,6 +10,7 @@ import org.bukkit.event.entity.EntityDamageEvent;
 
 import com.google.common.collect.ImmutableList;
 
+@Deprecated
 public class KillCommand extends VanillaCommand {
     public KillCommand() {
         super("kill");

paper-api/src/main/java/org/bukkit/command/defaults/ListCommand.java

@@ -10,6 +10,7 @@ import org.bukkit.entity.Player;
 
 import com.google.common.collect.ImmutableList;
 
+@Deprecated
 public class ListCommand extends VanillaCommand {
     public ListCommand() {
         super("list");

paper-api/src/main/java/org/bukkit/command/defaults/MeCommand.java

@@ -4,6 +4,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
+@Deprecated
 public class MeCommand extends VanillaCommand {
     public MeCommand() {
         super("me");

paper-api/src/main/java/org/bukkit/command/defaults/OpCommand.java

@@ -15,6 +15,7 @@ import org.bukkit.util.StringUtil;
 
 import com.google.common.collect.ImmutableList;
 
+@Deprecated
 public class OpCommand extends VanillaCommand {
     public OpCommand() {
         super("op");

paper-api/src/main/java/org/bukkit/command/defaults/PardonCommand.java

@@ -14,6 +14,7 @@ import org.bukkit.util.StringUtil;
 
 import com.google.common.collect.ImmutableList;
 
+@Deprecated
 public class PardonCommand extends VanillaCommand {
     public PardonCommand() {
         super("pardon");

paper-api/src/main/java/org/bukkit/command/defaults/PardonIpCommand.java

@@ -12,6 +12,7 @@ import org.bukkit.util.StringUtil;
 
 import com.google.common.collect.ImmutableList;
 
+@Deprecated
 public class PardonIpCommand extends VanillaCommand {
     public PardonIpCommand() {
         super("pardon-ip");

paper-api/src/main/java/org/bukkit/command/defaults/PlaySoundCommand.java

@@ -6,6 +6,7 @@ import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@Deprecated
 public class PlaySoundCommand extends VanillaCommand {
     public PlaySoundCommand() {
         super("playsound");

paper-api/src/main/java/org/bukkit/command/defaults/SaveCommand.java

@@ -10,6 +10,7 @@ import org.bukkit.command.CommandSender;
 
 import com.google.common.collect.ImmutableList;
 
+@Deprecated
 public class SaveCommand extends VanillaCommand {
     public SaveCommand() {
         super("save-all");

paper-api/src/main/java/org/bukkit/command/defaults/SaveOffCommand.java

@@ -10,6 +10,7 @@ import org.bukkit.command.CommandSender;
 
 import com.google.common.collect.ImmutableList;
 
+@Deprecated
 public class SaveOffCommand extends VanillaCommand {
     public SaveOffCommand() {
         super("save-off");

paper-api/src/main/java/org/bukkit/command/defaults/SaveOnCommand.java

@@ -10,6 +10,7 @@ import org.bukkit.command.CommandSender;
 
 import com.google.common.collect.ImmutableList;
 
+@Deprecated
 public class SaveOnCommand extends VanillaCommand {
     public SaveOnCommand() {
         super("save-on");

paper-api/src/main/java/org/bukkit/command/defaults/SayCommand.java

@@ -11,6 +11,7 @@ import org.bukkit.entity.Player;
 
 import com.google.common.collect.ImmutableList;
 
+@Deprecated
 public class SayCommand extends VanillaCommand {
     public SayCommand() {
         super("say");

paper-api/src/main/java/org/bukkit/command/defaults/ScoreboardCommand.java

@@ -26,6 +26,7 @@ import org.bukkit.util.StringUtil;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 
+@Deprecated
 public class ScoreboardCommand extends VanillaCommand {
 
     private static final List<String> MAIN_CHOICES = ImmutableList.of("objectives", "players", "teams");

paper-api/src/main/java/org/bukkit/command/defaults/SeedCommand.java

@@ -9,6 +9,7 @@ import org.bukkit.entity.Player;
 
 import com.google.common.collect.ImmutableList;
 
+@Deprecated
 public class SeedCommand extends VanillaCommand {
     public SeedCommand() {
         super("seed");

paper-api/src/main/java/org/bukkit/command/defaults/SetIdleTimeoutCommand.java

@@ -10,6 +10,7 @@ import org.bukkit.command.CommandSender;
 
 import java.util.List;
 
+@Deprecated
 public class SetIdleTimeoutCommand extends VanillaCommand {
 
     public SetIdleTimeoutCommand() {

paper-api/src/main/java/org/bukkit/command/defaults/SetWorldSpawnCommand.java

@@ -12,6 +12,7 @@ import org.bukkit.entity.Player;
 
 import java.util.List;
 
+@Deprecated
 public class SetWorldSpawnCommand extends VanillaCommand {
 
     public SetWorldSpawnCommand() {

paper-api/src/main/java/org/bukkit/command/defaults/SpawnpointCommand.java

@@ -12,6 +12,7 @@ import org.bukkit.entity.Player;
 
 import java.util.List;
 
+@Deprecated
 public class SpawnpointCommand extends VanillaCommand {
 
     public SpawnpointCommand() {

paper-api/src/main/java/org/bukkit/command/defaults/SpreadPlayersCommand.java

@@ -16,6 +16,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.scoreboard.Team;
 
+@Deprecated
 public class SpreadPlayersCommand extends VanillaCommand {
     private static final Random random = new Random();
 

paper-api/src/main/java/org/bukkit/command/defaults/StopCommand.java

@@ -12,6 +12,7 @@ import org.bukkit.entity.Player;
 
 import com.google.common.collect.ImmutableList;
 
+@Deprecated
 public class StopCommand extends VanillaCommand {
     public StopCommand() {
         super("stop");

paper-api/src/main/java/org/bukkit/command/defaults/TeleportCommand.java

@@ -13,6 +13,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
 
 import com.google.common.collect.ImmutableList;
 
+@Deprecated
 public class TeleportCommand extends VanillaCommand {
 
     public TeleportCommand() {

paper-api/src/main/java/org/bukkit/command/defaults/TellCommand.java

@@ -7,6 +7,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
+@Deprecated
 public class TellCommand extends VanillaCommand {
     public TellCommand() {
         super("tell");

paper-api/src/main/java/org/bukkit/command/defaults/TestForCommand.java

@@ -4,6 +4,7 @@ import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
+@Deprecated
 public class TestForCommand extends VanillaCommand {
     public TestForCommand() {
         super("testfor");

paper-api/src/main/java/org/bukkit/command/defaults/TimeCommand.java

@@ -13,6 +13,7 @@ import org.bukkit.util.StringUtil;
 
 import com.google.common.collect.ImmutableList;
 
+@Deprecated
 public class TimeCommand extends VanillaCommand {
     private static final List<String> TABCOMPLETE_ADD_SET = ImmutableList.of("add", "set");
     private static final List<String> TABCOMPLETE_DAY_NIGHT = ImmutableList.of("day", "night");

paper-api/src/main/java/org/bukkit/command/defaults/ToggleDownfallCommand.java

@@ -12,6 +12,7 @@ import org.bukkit.entity.Player;
 
 import com.google.common.collect.ImmutableList;
 
+@Deprecated
 public class ToggleDownfallCommand extends VanillaCommand {
     public ToggleDownfallCommand() {
         super("toggledownfall");

paper-api/src/main/java/org/bukkit/command/defaults/VanillaCommand.java

@@ -5,6 +5,7 @@ import java.util.List;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
+@Deprecated
 public abstract class VanillaCommand extends Command {
     static final int MAX_COORD = 30000000;
     static final int MIN_COORD_MINUS_ONE = -30000001;

paper-api/src/main/java/org/bukkit/command/defaults/WeatherCommand.java

@@ -13,6 +13,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
+@Deprecated
 public class WeatherCommand extends VanillaCommand {
     private static final List<String> WEATHER_TYPES = ImmutableList.of("clear", "rain", "thunder");
 

paper-api/src/main/java/org/bukkit/command/defaults/WhitelistCommand.java

@@ -13,6 +13,7 @@ import org.bukkit.util.StringUtil;
 
 import com.google.common.collect.ImmutableList;
 
+@Deprecated
 public class WhitelistCommand extends VanillaCommand {
     private static final List<String> WHITELIST_SUBCOMMANDS = ImmutableList.of("add", "remove", "on", "off", "list", "reload");