From 77a25ad8e682ea4788237f2e2692eb71ce86cd2e Mon Sep 17 00:00:00 2001
From: Eric Stokes <fernferret@gmail.com>
Date: Sun, 10 Jul 2011 16:08:24 -0600
Subject: [PATCH] Added a bunch more short commands

---
 .../MultiverseCore/MultiverseCore.java        | 21 ++++-----
 .../command/commands/InfoCommand.java         |  4 +-
 src/plugin.yml                                | 45 +++++++++++++++++++
 3 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/src/com/onarandombox/MultiverseCore/MultiverseCore.java b/src/com/onarandombox/MultiverseCore/MultiverseCore.java
index 2443a9c1..fd6ac9e6 100644
--- a/src/com/onarandombox/MultiverseCore/MultiverseCore.java
+++ b/src/com/onarandombox/MultiverseCore/MultiverseCore.java
@@ -171,31 +171,32 @@ public class MultiverseCore extends JavaPlugin {
      * Register Multiverse-Core commands to Command Manager.
      */
     private void registerCommands() {
-        // Page 1
-        
-        this.commandHandler.registerCommand(new CoordCommand(this));
-        this.commandHandler.registerCommand(new TeleportCommand(this));
+        // Intro Commands
         this.commandHandler.registerCommand(new ListCommand(this));
-        this.commandHandler.registerCommand(new WhoCommand(this));
-        this.commandHandler.registerCommand(new SetSpawnCommand(this));
+        this.commandHandler.registerCommand(new InfoCommand(this));
         this.commandHandler.registerCommand(new CreateCommand(this));
         this.commandHandler.registerCommand(new ImportCommand(this));
+        this.commandHandler.registerCommand(new ReloadCommand(this));
+        this.commandHandler.registerCommand(new SetSpawnCommand(this));
+        this.commandHandler.registerCommand(new CoordCommand(this));
+        this.commandHandler.registerCommand(new TeleportCommand(this));
+        this.commandHandler.registerCommand(new WhoCommand(this));
         this.commandHandler.registerCommand(new SpawnCommand(this));
+        // Dangerous Commands
         this.commandHandler.registerCommand(new RemoveCommand(this));
         this.commandHandler.registerCommand(new DeleteCommand(this));
         this.commandHandler.registerCommand(new UnloadCommand(this));
         this.commandHandler.registerCommand(new ConfirmCommand(this));
-        this.commandHandler.registerCommand(new InfoCommand(this));
-        this.commandHandler.registerCommand(new ReloadCommand(this));
-
+        // Modification commands
+        this.commandHandler.registerCommand(new PurgeCommand(this));
         this.commandHandler.registerCommand(new ModifyAddCommand(this));
         this.commandHandler.registerCommand(new ModifySetCommand(this));
         this.commandHandler.registerCommand(new ModifyRemoveCommand(this));
         this.commandHandler.registerCommand(new ModifyClearCommand(this));
         // This modify MUST go last.
         this.commandHandler.registerCommand(new ModifyCommand(this));
+        // Misc Commands
         this.commandHandler.registerCommand(new EnvironmentCommand(this));
-        this.commandHandler.registerCommand(new PurgeCommand(this));
         this.commandHandler.registerCommand(new SleepCommand(this));
         this.commandHandler.registerCommand(new HelpCommand(this));
     }
diff --git a/src/com/onarandombox/MultiverseCore/command/commands/InfoCommand.java b/src/com/onarandombox/MultiverseCore/command/commands/InfoCommand.java
index 37123bdb..0ee7a442 100644
--- a/src/com/onarandombox/MultiverseCore/command/commands/InfoCommand.java
+++ b/src/com/onarandombox/MultiverseCore/command/commands/InfoCommand.java
@@ -17,10 +17,12 @@ public class InfoCommand extends Command {
         super(plugin);
         this.commandName = "World Information";
         this.commandDesc = "Returns detailed information on the world.";
-        this.commandUsage = "/mvinfo" + ChatColor.GOLD + " [WORLD] " + ChatColor.DARK_PURPLE + " <Page #>";
+        this.commandUsage = "/mvinfo" + ChatColor.GOLD + " [WORLD] ";
         this.minimumArgLength = 0;
         this.maximumArgLength = 2;
         this.commandKeys.add("mvinfo");
+        this.commandKeys.add("mv info");
+        this.commandKeys.add("mvi");
         this.permission = "multiverse.world.info";
         this.opRequired = false;
     }
diff --git a/src/plugin.yml b/src/plugin.yml
index 002957fc..c9a4562a 100644
--- a/src/plugin.yml
+++ b/src/plugin.yml
@@ -12,12 +12,24 @@ commands:
             /<command> <world> <environment>
             /<command> creative normal -- Creates a world called 'creative' with a NORMAL environment.
             /<command> hellworld nether -- Creates a world called 'hellworld' with a NETHER environment.
+  mvc:
+    description: World create command
+    usage: |
+            /<command> <world> <environment>
+            /<command> creative normal -- Creates a world called 'creative' with a NORMAL environment.
+            /<command> hellworld nether -- Creates a world called 'hellworld' with a NETHER environment.
   mvimport:
     description: World import command
     usage: |
             /<command> <world> <environment>
             /<command> creative normal -- Imports an existing world called 'creative' with a NORMAL environment.
             /<command> hellworld nether -- Imports an existing world called 'hellworld' with a NETHER environment.
+  mvim:
+    description: World import command
+    usage: |
+            /<command> <world> <environment>
+            /<command> creative normal -- Imports an existing world called 'creative' with a NORMAL environment.
+            /<command> hellworld nether -- Imports an existing world called 'hellworld' with a NETHER environment.
   mvremove:
     description: World remove command
     usage: |
@@ -35,6 +47,11 @@ commands:
     usage: |
             /<command> <world> <option>:<value>
             /<command> creative pvp:false -- Turns off PVP in the 'creative' world.
+  mvm:
+    description: Modify the settings of an existing world
+    usage: |
+            /<command> <world> <option>:<value>
+            /<command> creative pvp:false -- Turns off PVP in the 'creative' world.
   mvtp:
     description: Command to teleport between Worlds
     usage: |
@@ -47,24 +64,48 @@ commands:
             /<command> [environment]
             Example: /<command> NETHER - Shows all NETHER Worlds.
             Example: /<command> NORMAL - Shows all NORMAL Worlds. 
+  mvl:
+    description: Print list of loaded Worlds
+    usage: |
+            /<command> [environment]
+            Example: /<command> NETHER - Shows all NETHER Worlds.
+            Example: /<command> NORMAL - Shows all NORMAL Worlds. 
   mvsetspawn:
     description: Set the spawn area for a particular world
     usage: /<command> -- Sets the spawn area of the current world to your location.
+  mvss:
+    description: Set the spawn area for a particular world
+    usage: /<command> -- Sets the spawn area of the current world to your location.
   mvspawn:
     description: Teleport to the spawn area
     usage: /<command> -- Teleports you to the spawn area of your current world.
+  mvs:
+    description: Teleport to the spawn area
+    usage: /<command> -- Teleports you to the spawn area of your current world.
   mvcoord:
     description: Display World, Coordinates, Direction & Compression for a world.
     usage: |
             /<command> [world]
             /<command> -- Shows the relevant coordinates in your current world. 
             /<command> creative -- Shows the relevant coordinates if you were in the 'creative' world.
+  mvc:
+    description: Display World, Coordinates, Direction & Compression for a world.
+    usage: |
+            /<command> [world]
+            /<command> -- Shows the relevant coordinates in your current world. 
+            /<command> creative -- Shows the relevant coordinates if you were in the 'creative' world.
   mvwho:
     description: Display online users per world.
     usage: |
             /<command> [world]
             /<command> -- Shows who is online in each world.
             /<command> creative -- Shows who is online in the 'creative' world.
+  mvw:
+    description: Display online users per world.
+    usage: |
+            /<command> [world]
+            /<command> -- Shows who is online in each world.
+            /<command> creative -- Shows who is online in the 'creative' world.
   mvreload:
     description: Reload Configuration files.
     usage: /<command>
@@ -83,6 +124,10 @@ commands:
     description: Gets world info.
     usage: |
             /<command> [world]
+  mvi:
+    description: Gets world info.
+    usage: |
+            /<command> [world]
   mvenv:
     description: Tells the user all possible world types.
     usage: |