Add your command caller back

src/main/java/com/intellectualcrafters/plot/commands/Add.java

@@ -33,7 +33,7 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualsites.commands.Argument;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 import com.plotsquared.bukkit.util.UUIDHandler;
 import com.plotsquared.bukkit.util.bukkit.uuid.SQLUUIDHandler;

src/main/java/com/intellectualcrafters/plot/commands/Auto.java

@@ -34,7 +34,7 @@ import com.intellectualcrafters.plot.util.EconHandler;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "auto",

src/main/java/com/intellectualcrafters/plot/commands/Buy.java

@@ -35,7 +35,7 @@ import com.intellectualcrafters.plot.object.PlotWorld;
 import com.intellectualcrafters.plot.util.EconHandler;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import com.plotsquared.bukkit.util.UUIDHandler;
 
 @CommandDeclaration(

src/main/java/com/intellectualcrafters/plot/commands/Chat.java

@@ -5,7 +5,7 @@ import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.object.PlotWorld;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "chat",

src/main/java/com/intellectualcrafters/plot/commands/Claim.java

@@ -35,7 +35,7 @@ import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualcrafters.plot.util.SchematicHandler;
 import com.intellectualcrafters.plot.util.SchematicHandler.Schematic;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "claim",

src/main/java/com/intellectualcrafters/plot/commands/Clear.java

@@ -35,7 +35,7 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualcrafters.plot.util.TaskManager;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import com.plotsquared.bukkit.util.UUIDHandler;
 
 @CommandDeclaration(

src/main/java/com/intellectualcrafters/plot/commands/Cluster.java

@@ -29,7 +29,7 @@ import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.generator.PlotGenerator;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import com.plotsquared.bukkit.generator.AugmentedPopulator;
 import com.plotsquared.bukkit.generator.HybridGen;
 import com.intellectualcrafters.plot.object.BlockLoc;

src/main/java/com/intellectualcrafters/plot/commands/Comment.java

@@ -23,7 +23,7 @@ package com.intellectualcrafters.plot.commands;
 import java.util.Arrays;
 
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import org.apache.commons.lang.StringUtils;
 
 import com.intellectualcrafters.plot.config.C;

src/main/java/com/intellectualcrafters/plot/commands/Condense.java

@@ -27,7 +27,7 @@ import java.util.List;
 import java.util.Set;
 
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import org.apache.commons.lang.StringUtils;
 
 import com.intellectualcrafters.plot.PS;

src/main/java/com/intellectualcrafters/plot/commands/Confirm.java

@@ -28,7 +28,7 @@ import com.intellectualcrafters.plot.util.CmdConfirm;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.TaskManager;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
 		command = "confirm",

src/main/java/com/intellectualcrafters/plot/commands/Copy.java

@@ -29,7 +29,7 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualsites.commands.Argument;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "copy",

src/main/java/com/intellectualcrafters/plot/commands/CreateRoadSchematic.java

@@ -29,7 +29,7 @@ import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "createroadschematic",

src/main/java/com/intellectualcrafters/plot/commands/Database.java

@@ -15,7 +15,7 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.StringComparison;
 import com.intellectualcrafters.plot.util.TaskManager;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import com.plotsquared.bukkit.util.UUIDHandler;
 
 @CommandDeclaration(

src/main/java/com/intellectualcrafters/plot/commands/Debug.java

@@ -27,7 +27,7 @@ import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.Lag;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "debug",

src/main/java/com/intellectualcrafters/plot/commands/DebugAllowUnsafe.java

@@ -9,7 +9,7 @@ import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "debugallowunsafe",

src/main/java/com/intellectualcrafters/plot/commands/DebugClaimTest.java

@@ -40,7 +40,7 @@ import com.intellectualcrafters.plot.util.ChunkManager;
 import com.intellectualcrafters.plot.util.EventUtil;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import com.plotsquared.bukkit.util.UUIDHandler;
 
 @CommandDeclaration(

src/main/java/com/intellectualcrafters/plot/commands/DebugClear.java

@@ -32,7 +32,7 @@ import com.intellectualcrafters.plot.util.ChunkManager;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import com.plotsquared.bukkit.util.UUIDHandler;
 
 @CommandDeclaration(

src/main/java/com/intellectualcrafters/plot/commands/DebugExec.java

@@ -32,7 +32,7 @@ import java.util.UUID;
 
 import com.intellectualcrafters.plot.commands.callers.PlotPlayerCaller;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import com.plotsquared.bukkit.util.UUIDHandler;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.Bukkit;

src/main/java/com/intellectualcrafters/plot/commands/DebugFill.java

@@ -30,7 +30,7 @@ import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualcrafters.plot.util.SetBlockQueue;
 import com.intellectualcrafters.plot.util.TaskManager;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "fill",

src/main/java/com/intellectualcrafters/plot/commands/DebugFixFlags.java

@@ -35,7 +35,7 @@ import com.intellectualcrafters.plot.util.BlockManager;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualsites.commands.Argument;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "debugfixflags",

src/main/java/com/intellectualcrafters/plot/commands/DebugLoadTest.java

@@ -27,7 +27,7 @@ import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "debugloadtest",

src/main/java/com/intellectualcrafters/plot/commands/DebugPaste.java

@@ -1,7 +1,7 @@
 package com.intellectualcrafters.plot.commands;
 
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import com.plotsquared.bukkit.BukkitMain;
 import com.intellectualcrafters.plot.PS;
 import com.intellectualcrafters.plot.config.C;

src/main/java/com/intellectualcrafters/plot/commands/DebugRoadRegen.java

@@ -29,7 +29,7 @@ import com.intellectualcrafters.plot.object.Location;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "debugroadregen",

src/main/java/com/intellectualcrafters/plot/commands/DebugSaveTest.java

@@ -28,7 +28,7 @@ import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "debugsavetest",

src/main/java/com/intellectualcrafters/plot/commands/DebugSetup.java

@@ -25,7 +25,7 @@ import java.util.Map.Entry;
 import com.intellectualcrafters.plot.commands.callers.PlotPlayerCaller;
 import com.intellectualcrafters.plot.generator.PlotGenerator;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import org.bukkit.generator.ChunkGenerator;
 
 import com.intellectualcrafters.plot.config.C;

src/main/java/com/intellectualcrafters/plot/commands/DebugUUID.java

@@ -30,7 +30,7 @@ import java.util.UUID;
 
 import com.intellectualsites.commands.Argument;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import com.plotsquared.bukkit.util.UUIDHandler;
 import org.bukkit.Bukkit;
 

src/main/java/com/intellectualcrafters/plot/commands/Delete.java

@@ -33,7 +33,7 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualcrafters.plot.util.TaskManager;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import com.plotsquared.bukkit.util.UUIDHandler;
 
 @CommandDeclaration(

src/main/java/com/intellectualcrafters/plot/commands/Deny.java

@@ -33,7 +33,7 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualsites.commands.Argument;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 import com.plotsquared.bukkit.util.UUIDHandler;
 import com.plotsquared.bukkit.util.bukkit.uuid.SQLUUIDHandler;

src/main/java/com/intellectualcrafters/plot/commands/Download.java

@@ -14,7 +14,7 @@ import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualcrafters.plot.util.SchematicHandler;
 import com.intellectualcrafters.plot.util.TaskManager;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "download",

src/main/java/com/intellectualcrafters/plot/commands/FlagCmd.java

@@ -25,7 +25,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import org.apache.commons.lang.StringUtils;
 
 import com.intellectualcrafters.plot.config.C;

src/main/java/com/intellectualcrafters/plot/commands/Help.java

@@ -8,7 +8,7 @@
 package com.intellectualcrafters.plot.commands;
 
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "help",

src/main/java/com/intellectualcrafters/plot/commands/Home.java

@@ -28,7 +28,7 @@ import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "home",

src/main/java/com/intellectualcrafters/plot/commands/Inbox.java

@@ -24,7 +24,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import org.apache.commons.lang.StringUtils;
 
 import com.intellectualcrafters.plot.config.C;

src/main/java/com/intellectualcrafters/plot/commands/Info.java

@@ -28,7 +28,7 @@ import java.util.regex.Matcher;
 import com.intellectualcrafters.plot.commands.callers.PlotPlayerCaller;
 import com.intellectualcrafters.plot.flag.Flag;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import com.plotsquared.bukkit.util.UUIDHandler;
 import org.apache.commons.lang.StringUtils;
 

src/main/java/com/intellectualcrafters/plot/commands/Kick.java

@@ -28,7 +28,7 @@ import com.intellectualcrafters.plot.util.BlockManager;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import com.plotsquared.bukkit.util.UUIDHandler;
 
 @CommandDeclaration(

src/main/java/com/intellectualcrafters/plot/commands/Load.java

@@ -17,7 +17,7 @@ import com.intellectualcrafters.plot.util.SchematicHandler;
 import com.intellectualcrafters.plot.util.SchematicHandler.Schematic;
 import com.intellectualcrafters.plot.util.TaskManager;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "load",

src/main/java/com/intellectualcrafters/plot/commands/MainCommand.java

@@ -37,7 +37,7 @@ import com.intellectualsites.commands.Argument;
 import com.intellectualsites.commands.Command;
 import com.intellectualsites.commands.CommandHandlingOutput;
 import com.intellectualsites.commands.CommandManager;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import com.intellectualsites.commands.util.StringUtil;
 
 /**
@@ -247,7 +247,7 @@ public class MainCommand extends CommandManager {
     public int handle(CommandCaller caller, String input) {
         String[] parts = input.split(" ");
         String[] args;
-        String command = parts[0];
+        String command = parts[0].toLowerCase();
         if (parts.length == 1) {
             args = new String[0];
         } else {
@@ -256,7 +256,7 @@ public class MainCommand extends CommandManager {
         }
         Command cmd = null;
         for (Command c1 : this.commands) {
-            if (c1.getCommand().equalsIgnoreCase(command) || StringUtil.inArray(command, c1.getAliases(), false)) {
+            if (c1.getCommand().equalsIgnoreCase(command) || c1.getAliases().contains(command)) {
                 cmd = c1;
                 break;
             }
@@ -268,7 +268,7 @@ public class MainCommand extends CommandManager {
                 for (int i = 0; i < commands.length; i++) {
                     commands[i] = this.commands.get(i).getCommand();
                 }
-                final String bestMatch = new StringComparison(args[0], commands).getBestMatch();
+                final String bestMatch = new StringComparison<String>(args[0], commands).getBestMatch();
                 caller.message(C.DID_YOU_MEAN, "/plot " + bestMatch);
             }
             return CommandHandlingOutput.NOT_FOUND;

src/main/java/com/intellectualcrafters/plot/commands/Merge.java

@@ -26,7 +26,7 @@ import java.util.UUID;
 
 import com.intellectualsites.commands.Argument;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import com.plotsquared.bukkit.util.UUIDHandler;
 import org.apache.commons.lang.StringUtils;
 

src/main/java/com/intellectualcrafters/plot/commands/Move.java

@@ -31,7 +31,7 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualsites.commands.Argument;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "move",

src/main/java/com/intellectualcrafters/plot/commands/MusicSubcommand.java

@@ -32,7 +32,7 @@ import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.BlockManager;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "music",

src/main/java/com/intellectualcrafters/plot/commands/Purge.java

@@ -32,7 +32,7 @@ import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.object.PlotId;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import com.plotsquared.bukkit.util.UUIDHandler;
 
 

src/main/java/com/intellectualcrafters/plot/commands/Rate.java

@@ -27,7 +27,7 @@ import java.util.Map.Entry;
 import java.util.UUID;
 
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.mutable.MutableInt;
 import org.bukkit.Bukkit;

src/main/java/com/intellectualcrafters/plot/commands/RegenAllRoads.java

@@ -32,7 +32,7 @@ import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.ChunkManager;
 import com.intellectualsites.commands.Argument;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "regenallroads",

src/main/java/com/intellectualcrafters/plot/commands/Reload.java

@@ -25,7 +25,7 @@ import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.PlotWorld;
 
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "reload",

src/main/java/com/intellectualcrafters/plot/commands/Remove.java

@@ -32,7 +32,7 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualsites.commands.Argument;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 import com.plotsquared.bukkit.util.UUIDHandler;
 import com.plotsquared.bukkit.util.bukkit.uuid.SQLUUIDHandler;

src/main/java/com/intellectualcrafters/plot/commands/Save.java

@@ -17,7 +17,7 @@ import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualcrafters.plot.util.SchematicHandler;
 import com.intellectualcrafters.plot.util.TaskManager;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "save",

src/main/java/com/intellectualcrafters/plot/commands/SchematicCmd.java

@@ -41,7 +41,7 @@ import com.intellectualcrafters.plot.util.SchematicHandler;
 import com.intellectualcrafters.plot.util.SchematicHandler.Schematic;
 import com.intellectualcrafters.plot.util.TaskManager;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 // TODO Add sub-subcommands
 

src/main/java/com/intellectualcrafters/plot/commands/Set.java

@@ -25,7 +25,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import com.plotsquared.bukkit.util.UUIDHandler;
 import org.apache.commons.lang.StringUtils;
 

src/main/java/com/intellectualcrafters/plot/commands/SetOwner.java

@@ -35,7 +35,7 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualsites.commands.Argument;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import com.plotsquared.bukkit.util.UUIDHandler;
 
 @CommandDeclaration(

src/main/java/com/intellectualcrafters/plot/commands/Setup.java

@@ -28,7 +28,7 @@ import java.util.Map.Entry;
 import com.intellectualcrafters.plot.commands.callers.PlotPlayerCaller;
 import com.intellectualcrafters.plot.generator.PlotGenerator;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.generator.ChunkGenerator;
 

src/main/java/com/intellectualcrafters/plot/commands/Swap.java

@@ -34,7 +34,7 @@ import com.intellectualcrafters.plot.util.ClusterManager;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "swap",

src/main/java/com/intellectualcrafters/plot/commands/TP.java

@@ -22,7 +22,7 @@ package com.intellectualcrafters.plot.commands;
 
 import com.intellectualsites.commands.Argument;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import com.plotsquared.bukkit.util.UUIDHandler;
 import org.apache.commons.lang.StringUtils;
 

src/main/java/com/intellectualcrafters/plot/commands/Target.java

@@ -28,7 +28,7 @@ import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualsites.commands.Argument;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "target",

src/main/java/com/intellectualcrafters/plot/commands/Template.java

@@ -42,7 +42,7 @@ import com.intellectualcrafters.plot.object.SetupObject;
 import com.intellectualcrafters.plot.util.BlockManager;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import com.plotsquared.bukkit.util.SetupUtils;
 import com.intellectualcrafters.plot.util.TaskManager;
 

src/main/java/com/intellectualcrafters/plot/commands/Toggle.java

@@ -24,7 +24,7 @@ import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 //     TOGGLE("toggle", "attribute"),
 

src/main/java/com/intellectualcrafters/plot/commands/Trim.java

@@ -40,7 +40,7 @@ import com.intellectualcrafters.plot.util.ChunkManager;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.TaskManager;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "trim",

src/main/java/com/intellectualcrafters/plot/commands/Trust.java

@@ -33,7 +33,7 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualsites.commands.Argument;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import com.plotsquared.bukkit.util.UUIDHandler;
 import com.plotsquared.bukkit.util.bukkit.uuid.SQLUUIDHandler;
 

src/main/java/com/intellectualcrafters/plot/commands/Unclaim.java

@@ -30,7 +30,7 @@ import com.intellectualcrafters.plot.util.EconHandler;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "unclaim",

src/main/java/com/intellectualcrafters/plot/commands/Undeny.java

@@ -31,7 +31,7 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualsites.commands.Argument;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 import com.plotsquared.bukkit.util.UUIDHandler;
 import com.plotsquared.bukkit.util.bukkit.uuid.SQLUUIDHandler;

src/main/java/com/intellectualcrafters/plot/commands/Unlink.java

@@ -30,7 +30,7 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualcrafters.plot.util.TaskManager;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "unlink",

src/main/java/com/intellectualcrafters/plot/commands/Untrust.java

@@ -31,7 +31,7 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualsites.commands.Argument;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import com.plotsquared.bukkit.util.UUIDHandler;
 
 //     UNTRUST("untrust", "ut"),

src/main/java/com/intellectualcrafters/plot/commands/Update.java

@@ -28,7 +28,7 @@ import com.intellectualcrafters.plot.config.C;
 
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "update",

src/main/java/com/intellectualcrafters/plot/commands/Visit.java

@@ -32,7 +32,7 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.Permissions;
 import com.intellectualsites.commands.Argument;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import com.plotsquared.bukkit.util.UUIDHandler;
 
 @CommandDeclaration(

src/main/java/com/intellectualcrafters/plot/commands/WE_Anywhere.java

@@ -23,7 +23,7 @@ package com.intellectualcrafters.plot.commands;
 import com.intellectualcrafters.plot.PS;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import com.plotsquared.bukkit.listeners.worldedit.WEManager;
 import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.MainUtil;

src/main/java/com/intellectualcrafters/plot/commands/callers/ConsoleCaller.java

@@ -6,7 +6,7 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualsites.commands.Argument;
 import com.intellectualsites.commands.Command;
 import com.intellectualsites.commands.CommandManager;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 public class ConsoleCaller implements CommandCaller<PS> {
     @Override

src/main/java/com/intellectualcrafters/plot/commands/callers/PlotPlayerCaller.java

@@ -5,8 +5,8 @@ import com.intellectualcrafters.plot.object.PlotPlayer;
 import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualsites.commands.Argument;
 import com.intellectualsites.commands.Command;
+import com.intellectualsites.commands.CommandCaller;
 import com.intellectualsites.commands.CommandManager;
-import com.intellectualsites.commands.callers.CommandCaller;
 
 public class PlotPlayerCaller implements CommandCaller<PlotPlayer> {
 

src/main/java/com/intellectualcrafters/plot/commands/list.java

@@ -31,7 +31,7 @@ import java.util.UUID;
 
 import com.intellectualcrafters.plot.commands.callers.PlotPlayerCaller;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import com.plotsquared.bukkit.util.UUIDHandler;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;

src/main/java/com/intellectualcrafters/plot/commands/plugin.java

@@ -34,7 +34,7 @@ import com.intellectualcrafters.plot.util.MainUtil;
 import com.intellectualcrafters.plot.util.StringMan;
 import com.intellectualcrafters.plot.util.TaskManager;
 import com.intellectualsites.commands.CommandDeclaration;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 
 @CommandDeclaration(
         command = "plugin",

src/main/java/com/intellectualcrafters/plot/util/MainUtil.java

@@ -31,7 +31,7 @@ import com.intellectualcrafters.plot.PS;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.config.Settings;
 import com.intellectualcrafters.plot.database.DBFunc;
-import com.intellectualsites.commands.callers.CommandCaller;
+import com.intellectualsites.commands.CommandCaller;
 import com.plotsquared.bukkit.listeners.PlotListener;
 import com.intellectualcrafters.plot.object.BlockLoc;
 import com.intellectualcrafters.plot.object.ChunkLoc;

src/main/java/com/intellectualcrafters/plot/util/StringComparison.java

@@ -21,6 +21,7 @@
 package com.intellectualcrafters.plot.util;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 
 /**
@@ -46,6 +47,10 @@ public class StringComparison<T> {
         init(input, objects);
     }
     
+    public StringComparison(String input, final Collection<T> objects) {
+        init(input, (T[]) objects.toArray());
+    }
+    
     /**
      * You should call init(...) when you are ready to get a String comparison value
      */

src/main/java/com/intellectualcrafters/plot/util/StringMan.java

@@ -26,6 +26,32 @@ public class StringMan {
         return sb.toString();
     }
     
+    public static String replaceFirst(char c, String s) {
+        if (s == null) {
+            return "";
+        }
+        if (s.isEmpty()) {
+            return s;
+        }
+        char[] chars = s.toCharArray();
+        char[] newChars = new char[chars.length];
+        int used = 0;
+        boolean found = false;
+        for (char cc : chars) {
+            if (!found && c == cc) {
+                found = true;
+            } else {
+                newChars[used++] = cc;
+            }
+        }
+        if (found) {
+            chars = new char[newChars.length - 1];
+            System.arraycopy(newChars, 0, chars, 0, chars.length);
+            return String.valueOf(chars);
+        }
+        return s;
+    }
+    
     public static String replaceAll(String string, Object... pairs) {
         StringBuilder sb = new StringBuilder(string);
         for (int i = 0; i < pairs.length; i+=2) {

src/main/java/com/intellectualsites/commands/Command.java

@@ -1,16 +1,18 @@
 package com.intellectualsites.commands;
 
-import com.intellectualcrafters.plot.commands.CommandCategory;
-import com.intellectualsites.commands.callers.CommandCaller;
-
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import com.intellectualcrafters.plot.commands.CommandCategory;
 
 public abstract class Command extends CommandManager {
 
     private Class requiredType = Object.class;
     private String command, usage = "", description = "", permission = "";
-    private String[] aliases = new String[0];
+    private Set<String> aliases = new HashSet<>();
     private CommandCategory category;
     protected Argument[] requiredArguments;
 
@@ -47,14 +49,14 @@ public abstract class Command extends CommandManager {
     public Command(String command, String[] aliases, String usage) {
         super(null, new ArrayList<Command>());
         this.command = command;
-        this.aliases = aliases;
+        this.aliases = new HashSet<>(Arrays.asList(aliases));
         this.usage = usage;
     }
 
     public Command(String command, String[] aliases) {
         super(null, new ArrayList<Command>());
         this.command = command;
-        this.aliases = aliases;
+        this.aliases = new HashSet<>(Arrays.asList(aliases));
     }
 
     public Command(String command, String usage, String description, String permission, String[] aliases, Class requiredType) {
@@ -63,7 +65,7 @@ public abstract class Command extends CommandManager {
         this.usage = usage;
         this.description = description;
         this.permission = permission;
-        this.aliases = aliases;
+        this.aliases = new HashSet<>(Arrays.asList(aliases));
         this.requiredType = requiredType;
     }
 
@@ -82,7 +84,7 @@ public abstract class Command extends CommandManager {
         this.description = declaration.description();
         this.usage = declaration.usage();
         this.permission = declaration.permission();
-        this.aliases = declaration.aliases();
+        this.aliases = new HashSet<>(Arrays.asList(declaration.aliases()));
         this.requiredType = declaration.requiredType();
         this.category = declaration.category();
     }
@@ -126,7 +128,7 @@ public abstract class Command extends CommandManager {
         return this.description;
     }
 
-    final public String[] getAliases() {
+    final public Set<String> getAliases() {
         return this.aliases;
     }
 

src/main/java/com/intellectualsites/commands/CommandCaller.java

@@ -0,0 +1,19 @@
+package com.intellectualsites.commands;
+
+import com.intellectualcrafters.plot.config.C;
+import com.intellectualsites.commands.Argument;
+import com.intellectualsites.commands.Command;
+import com.intellectualsites.commands.CommandManager;
+
+public interface CommandCaller<T> {
+
+    boolean hasPermission(String permission);
+
+    void message(String message);
+
+    T getSuperCaller();
+
+    void message(C c, String ... args);
+
+    void sendRequiredArgumentsList(CommandManager manager, Command cmd, Argument[] required);
+}

src/main/java/com/intellectualsites/commands/CommandManager.java

@@ -1,16 +1,16 @@
 package com.intellectualsites.commands;
 
-import com.intellectualsites.commands.callers.CommandCaller;
-import com.intellectualsites.commands.util.StringUtil;
-
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Collection;
 import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.intellectualsites.commands.util.StringUtil;
 
 @SuppressWarnings("unused")
 public class CommandManager {
 
-    protected final List<Command> commands;
+    protected final ConcurrentHashMap<String, Command> commands;
     protected final Character initialCharacter;
 
     public CommandManager() {
@@ -18,12 +18,18 @@ public class CommandManager {
     }
 
     public CommandManager(Character initialCharacter, List<Command> commands) {
-        this.commands = Collections.synchronizedList(commands);
+        this.commands = new ConcurrentHashMap<>();
+        for (Command command : commands) {
+            addCommand(command);
+        }
         this.initialCharacter = initialCharacter;
     }
 
     final public void addCommand(final Command command) {
-        this.commands.add(command);
+        this.commands.put(command.getCommand().toLowerCase(), command);
+        for (String alias : command.getAliases()) {
+            this.commands.put(alias.toLowerCase(), command);
+        }
     }
 
     final public boolean createCommand(final Command command) {
@@ -34,24 +40,24 @@ public class CommandManager {
             return false;
         }
         if (command.getCommand() != null) {
-            commands.add(command);
+            addCommand(command);
             return true;
         }
         return false;
     }
 
-    final public List<Command> getCommands() {
+    final public Collection<Command> getCommands() {
-        return this.commands;
+        return this.commands.values();
     }
 
     public int handle(CommandCaller caller, String input) {
         if (initialCharacter != null && !StringUtil.startsWith(initialCharacter, input)) {
             return CommandHandlingOutput.NOT_COMMAND;
         }
-        input = initialCharacter == null ? input : StringUtil.replaceFirst(initialCharacter, input);
+        input = initialCharacter == null ? input : input.substring(1);
         String[] parts = input.split(" ");
         String[] args;
-        String command = parts[0];
+        String command = parts[0].toLowerCase();
         if (parts.length == 1) {
             args = new String[0];
         } else {
@@ -59,12 +65,7 @@ public class CommandManager {
             System.arraycopy(parts, 1, args, 0, args.length);
         }
         Command cmd = null;
-        for (Command c1 : this.commands) {
+        cmd = commands.get(command);
-            if (c1.getCommand().equalsIgnoreCase(command) || StringUtil.inArray(command, c1.getAliases(), false)) {
-                cmd = c1;
-                break;
-            }
-        }
         if (cmd == null) {
             return CommandHandlingOutput.NOT_FOUND;
         }

src/main/java/com/intellectualsites/commands/util/StringUtil.java

@@ -8,32 +8,6 @@ public class StringUtil {
         return !(s == null || s.isEmpty()) && s.toCharArray()[0] == c;
     }
 
-    public static String replaceFirst(char c, String s) {
-        if (s == null) {
-            return "";
-        }
-        if (s.isEmpty()) {
-            return s;
-        }
-        char[] chars = s.toCharArray();
-        char[] newChars = new char[chars.length];
-        int used = 0;
-        boolean found = false;
-        for (char cc : chars) {
-            if (!found && c == cc) {
-                found = true;
-            } else {
-                newChars[used++] = cc;
-            }
-        }
-        if (found) {
-            chars = new char[newChars.length - 1];
-            System.arraycopy(newChars, 0, chars, 0, chars.length);
-            return String.valueOf(chars);
-        }
-        return s;
-    }
-
     public static boolean inArray(String s, String[] a, boolean matchCase) {
         for (String aS : a) {
             if (matchCase) {