Commands now have the ability to set a permission required before execution

1 files changed, 6 insertions, 144 deletions

diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index c641811b..178edabb 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -1,5 +1,8 @@
 package org.bukkit.command;
 
+import org.bukkit.command.defaults.ReloadCommand;
+import org.bukkit.command.defaults.PluginsCommand;
+import org.bukkit.command.defaults.*;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -13,7 +16,6 @@ import org.bukkit.ChatColor;
 import org.bukkit.Server;
 
 import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginDescriptionFile;
 import static org.bukkit.util.Java15Compat.Arrays_copyOfRange;
 
 public final class SimpleCommandMap implements CommandMap {
@@ -27,9 +29,9 @@ public final class SimpleCommandMap implements CommandMap {
     }
 
     private void setDefaultCommands(final Server server) {
-        register("bukkit", new VersionCommand("version", server));
-        register("bukkit", new ReloadCommand("reload", server));
-        register("bukkit", new PluginsCommand("plugins", server));
+        register("bukkit", new VersionCommand("version"));
+        register("bukkit", new ReloadCommand("reload"));
+        register("bukkit", new PluginsCommand("plugins"));
     }
 
     /**
@@ -182,144 +184,4 @@ public final class SimpleCommandMap implements CommandMap {
             }
         }
     }
-
-    private static class VersionCommand extends Command {
-        private final Server server;
-
-        public VersionCommand(String name, Server server) {
-            super(name);
-            this.server = server;
-            this.description = "Gets the version of this server including any plugins in use";
-            this.usageMessage = "/version [plugin name]";
-            this.setAliases(Arrays.asList("ver", "about"));
-        }
-
-        @Override
-        public boolean execute(CommandSender sender, String currentAlias, String[] args) {
-            if (args.length == 0) {
-                sender.sendMessage("This server is running " + ChatColor.GREEN + server.getName() + ChatColor.WHITE + " version " + ChatColor.GREEN + server.getVersion());
-                sender.sendMessage("This server is also sporting some funky dev build of Bukkit!");
-            } else {
-                StringBuilder name = new StringBuilder();
-
-                for (String arg : args) {
-                    if (name.length() > 0) {
-                        name.append(' ');
-                    }
-                    name.append(arg);
-                }
-
-                Plugin plugin = server.getPluginManager().getPlugin(name.toString());
-
-                if (plugin != null) {
-                    PluginDescriptionFile desc = plugin.getDescription();
-
-                    sender.sendMessage(ChatColor.GREEN + desc.getName() + ChatColor.WHITE + " version " + ChatColor.GREEN + desc.getVersion());
-
-                    if (desc.getDescription() != null) {
-                        sender.sendMessage(desc.getDescription());
-                    }
-
-                    if (desc.getWebsite() != null) {
-                        sender.sendMessage("Website: " + ChatColor.GREEN + desc.getWebsite());
-                    }
-
-                    if (!desc.getAuthors().isEmpty()) {
-                        if (desc.getAuthors().size() == 1) {
-                            sender.sendMessage("Author: " + getAuthors(desc));
-                        } else {
-                            sender.sendMessage("Authors: " + getAuthors(desc));
-                        }
-                    }
-                } else {
-                    sender.sendMessage("This server is not running any plugin by that name.");
-                    sender.sendMessage("Use /plugins to get a list of plugins.");
-                }
-            }
-
-            return true;
-        }
-
-        private String getAuthors(final PluginDescriptionFile desc) {
-            StringBuilder result = new StringBuilder();
-            ArrayList<String> authors = desc.getAuthors();
-
-            for (int i = 0; i < authors.size(); i++) {
-                if (result.length() > 0) {
-                    result.append(ChatColor.WHITE);
-
-                    if (i < authors.size() - 1) {
-                        result.append(", ");
-                    } else {
-                        result.append(" and ");
-                    }
-                }
-
-                result.append(ChatColor.GREEN);
-                result.append(authors.get(i));
-            }
-
-            return result.toString();
-        }
-    }
-
-    private static class ReloadCommand extends Command {
-
-        private final Server server;
-
-        public ReloadCommand(String name, Server server) {
-            super(name);
-            this.server = server;
-            this.description = "Reloads the server configuration and plugins";
-            this.usageMessage = "/reload";
-            this.setAliases(Arrays.asList("rl"));
-        }
-
-        @Override
-        public boolean execute(CommandSender sender, String currentAlias, String[] args) {
-            if (sender.isOp()) {
-                server.reload();
-                sender.sendMessage(ChatColor.GREEN + "Reload complete.");
-            } else {
-                sender.sendMessage(ChatColor.RED + "You do not have sufficient access to reload this server.");
-            }
-            return true;
-        }
-    }
-
-    private static class PluginsCommand extends Command {
-
-        private final Server server;
-
-        public PluginsCommand(String name, Server server) {
-            super(name);
-            this.server = server;
-            this.description = "Gets a list of plugins running on the server";
-            this.usageMessage = "/plugins";
-            this.setAliases(Arrays.asList("pl"));
-        }
-
-        @Override
-        public boolean execute(CommandSender sender, String currentAlias, String[] args) {
-            sender.sendMessage("Plugins: " + getPluginList());
-            return true;
-        }
-
-        private String getPluginList() {
-            StringBuilder pluginList = new StringBuilder();
-            Plugin[] plugins = server.getPluginManager().getPlugins();
-
-            for (Plugin plugin : plugins) {
-                if (pluginList.length() > 0) {
-                    pluginList.append(ChatColor.WHITE);
-                    pluginList.append(", ");
-                }
-
-                pluginList.append(plugin.isEnabled() ? ChatColor.GREEN : ChatColor.RED);
-                pluginList.append(plugin.getDescription().getName());
-            }
-
-            return pluginList.toString();
-        }
-    }
 }