Refactor :D

src/com/drtshock/playervaults/commands/Commands.java

@@ -0,0 +1,54 @@
+package com.drtshock.playervaults.commands;
+
+import java.util.HashMap;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+public class Commands implements CommandExecutor {
+
+	public static HashMap<String, VaultViewInfo> inVault = new HashMap<String, VaultViewInfo>();
+	private final String pv = ChatColor.DARK_RED + "[" + ChatColor.WHITE + "PlayerVaults" + 
+			ChatColor.DARK_RED + "]" + ChatColor.WHITE + ": ";
+
+	@Override
+	public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
+		if(cmd.getName().equalsIgnoreCase("pv")) {
+			if(sender instanceof Player) {
+				Player p = (Player) sender;
+				switch(args.length) {
+				case 1:
+					if(VaultOperations.openOwnVault(p, args[0]))
+						inVault.put(sender.getName(), new VaultViewInfo(sender.getName(), Integer.parseInt(args[0])));
+					break;
+				case 2:
+					if(VaultOperations.openOtherVault(p,args[0], args[1])) {
+						inVault.put(sender.getName(), new VaultViewInfo(args[0], Integer.parseInt(args[1])));
+					}
+					break;
+				default:
+					Feedback.showHelp(sender, Feedback.Type.OPEN);
+				}
+			}
+			else sender.sendMessage(pv + "Sorry but that can only be run by a player!");
+		}
+		else if(cmd.getName().equalsIgnoreCase("pvdel")) {
+			if(sender instanceof Player) {
+				Player p = (Player) sender;
+				switch(args.length) {
+				case 1:
+					VaultOperations.deleteOwnVault(p, args[0]);
+					break;
+				default:
+					Feedback.showHelp(sender, Feedback.Type.DELETE);
+				}
+			}
+			else sender.sendMessage(pv + "Sorry but that can only be run by a player!");
+		}
+		return true;
+	}
+}

src/com/drtshock/playervaults/commands/Feedback.java

@@ -0,0 +1,39 @@
+package com.drtshock.playervaults.commands;
+
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+
+public class Feedback {
+	public enum Type {
+		OPEN,
+		DELETE,
+		WORKBENCH, //For later versions
+		FURNACE;
+	}
+	static String pv = ChatColor.DARK_RED + "[" + ChatColor.WHITE + "PlayerVaults" + 
+			ChatColor.DARK_RED + "]" + ChatColor.WHITE + ": ";
+	
+	public static void noPerms(CommandSender sender) {
+		sender.sendMessage(pv + "You don't have permission for that!");
+		return;
+	}
+	
+
+	public static void showHelp(CommandSender sender, Type t) {
+		if(t == Type.OPEN) {
+			sender.sendMessage(pv + "/pv <number>");
+			sender.sendMessage(pv + "/pv <player> <number>");
+		}
+		else if(t == Type.DELETE) {
+			sender.sendMessage(pv + "/pvdel <number>");
+			sender.sendMessage(pv + "/pvdel <player> <number>");
+		}
+	}
+	
+	public static void badWorld(Player sender) {
+		sender.sendMessage(pv + "You can't use this in that world!");
+		return;
+	}
+}

src/com/drtshock/playervaults/commands/VaultOperations.java

@@ -0,0 +1,122 @@
+package com.drtshock.playervaults.commands;
+
+import java.io.IOException;
+
+
+import org.bukkit.ChatColor;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.drtshock.playervaults.Main;
+import com.drtshock.playervaults.util.VaultManager;
+
+public class VaultOperations {
+
+	private static Main plugin;
+	private static VaultManager vm = new VaultManager(plugin);
+
+	static String pv = ChatColor.DARK_RED + "[" + ChatColor.WHITE + "PlayerVaults" + 
+			ChatColor.DARK_RED + "]" + ChatColor.WHITE + ": ";
+
+	
+	public static boolean checkPerms(CommandSender cs, int number) {
+		if(cs.hasPermission("playervaults.amount."+String.valueOf(number))) return true;
+		for(int x = number; x <= 99;x++) {
+			if(cs.hasPermission("playervaults.amount."+String.valueOf(x))) return true;
+		}
+		return false;
+	}
+	/*
+	 * TODO: Chenge how permissions are checked here.
+	 */
+	public static boolean openOwnVault(Player sender, String arg) {
+		if(allowedWorld(sender)) {
+			if(arg.matches("^[0-9]{1,2}$")) {
+				int number = 0;
+				try {
+					number = Integer.parseInt(arg);
+				}
+				catch(NumberFormatException nfe) {
+					sender.sendMessage(pv+ChatColor.RED+"You need to specify a number!");
+					return false;
+				}
+				if(checkPerms(sender, number)) {
+					vm.loadVault(sender, sender.getName(), number);
+					sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + number);
+					return true;
+				} else {
+					Feedback.noPerms(sender);
+				}
+			}
+		}
+		else {
+			Feedback.badWorld(sender);
+		}
+		return false;
+	}
+	
+	
+	public static boolean openOtherVault(Player sender, String user, String arg) {
+		if(sender.hasPermission("playervaults.admin")) {
+			if(arg.matches("^[0-9]{1,2}$")) {
+				int number = 0;
+				try {
+					number = Integer.parseInt(arg);
+				}
+				catch(NumberFormatException nfe) {
+					sender.sendMessage(pv+ChatColor.RED+"You need to specify a number!");
+				}
+				vm.loadVault(sender, user, number);
+				sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + number);
+				return true;
+			}
+			else {
+				Feedback.noPerms(sender);
+			}
+	}
+		return false;
+	}
+	public static void deleteOwnVault(Player sender, String arg) {
+		if(arg.matches("^[0-9]{1,2}$")) {
+			int number = 0;
+			try {
+				number = Integer.parseInt(arg);
+			}
+			catch(NumberFormatException nfe) {
+				sender.sendMessage(pv+ChatColor.RED+"You need to specify a number!");
+			}
+			try {
+				vm.deleteVault(sender, sender.getName(), number);
+			} catch (IOException e) {
+				sender.sendMessage(pv+"There was an error deleting that vault!");
+			}
+		}
+	}
+	public static void deleteOtherVault(Player sender, String user, String arg) {
+		if(sender.hasPermission("playervaults.delete")) {
+			if(arg.matches("^[0-9]{1,2}$")) {
+				int number = 0;
+				try {
+					number = Integer.parseInt(arg);
+				}
+				catch(NumberFormatException nfe) {
+					sender.sendMessage(pv+ChatColor.RED+"You need to specify a number!");
+				}
+				try {
+					vm.deleteVault(sender, user, number);
+				} catch (IOException e) {
+					sender.sendMessage(pv+"There was an error deleting that vault!");
+				}
+			}
+		}
+		else Feedback.noPerms(sender);
+	}
+
+	private static boolean allowedWorld(Player player) {
+		World world = player.getWorld();
+		if(plugin.disabledWorlds().contains(world))
+			return false;
+		return true;
+	}
+}

src/com/drtshock/playervaults/commands/VaultViewInfo.java

@@ -0,0 +1,21 @@
+package com.drtshock.playervaults.commands;
+
+public class VaultViewInfo {
+
+	String s;
+	int i;
+	
+	public VaultViewInfo(String s, int i) {
+		this.s = s;
+		this.i = i;
+	}
+	
+	public String getHolder() {
+		return this.s;
+	}
+	
+	public int getNumber() {
+		return this.i;
+	}
+	
+}