Fixing adding aliases to commands.

src/com/massivecraft/factions/cmd/CmdFactions.java

@@ -4,6 +4,7 @@ import java.util.Collections;
 
 import com.massivecraft.factions.ConfServer;
 import com.massivecraft.factions.Factions;
+import com.massivecraft.mcore.cmd.HelpCommand;
 import com.massivecraft.mcore.util.Txt;
 
 public class CmdFactions extends FCommand
@@ -56,15 +57,10 @@ public class CmdFactions extends FCommand
 		// TODO: When is this required? Should this be added to MCore?
 		this.aliases.removeAll(Collections.singletonList(null));
 		
-		senderMustBePlayer = false;
-		senderMustBeMember = false;
-		senderMustBeOfficer = false;
-		senderMustBeLeader = false;
-		
 		this.setHelpShort("The faction base command");
 		this.helpLong.add(Txt.parse("<i>This command contains all faction stuff."));
 		
-		this.addSubCommand(Factions.get().cmdAutoHelp);
+		this.addSubCommand(HelpCommand.get());
 		this.addSubCommand(this.cmdFactionsList);
 		this.addSubCommand(this.cmdFactionsShow);
 		this.addSubCommand(this.cmdFactionsPower);
@@ -108,8 +104,8 @@ public class CmdFactions extends FCommand
 	@Override
 	public void perform()
 	{
-		this.commandChain.add(this);
+		this.getCommandChain().add(this);
-		Factions.get().cmdAutoHelp.execute(this.sender, this.args, this.commandChain);
+		HelpCommand.getInstance().execute(this.sender, this.args, this.commandChain);
 	}
 
 }

src/com/massivecraft/factions/cmd/CmdFactionsAccess.java

@@ -17,9 +17,10 @@ public class CmdFactionsAccess extends FCommand
 	public CmdFactionsAccess()
 	{
 		super();
-		this.aliases.add("access");
 		
-		this.optionalArgs.put("view|p|f|player|faction", "view");
+		this.addAliases("access");
+		
+		this.optionalArgs.put("view|p|player|f|faction", "view");
 		this.optionalArgs.put("name", "you");
 		
 		this.setHelpShort("view or grant access for the claimed territory you are in");
@@ -30,7 +31,7 @@ public class CmdFactionsAccess extends FCommand
 	@Override
 	public void perform()
 	{
-		String type = this.argAsString(0);
+		String type = this.arg(0);
 		type = (type == null) ? "" : type.toLowerCase();
 		PS chunk = PS.valueOf(me).getChunk(true);
 

src/com/massivecraft/factions/cmd/CmdFactionsAdmin.java

@@ -2,18 +2,19 @@ package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.Perm;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 
 public class CmdFactionsAdmin extends FCommand
 {
 	public CmdFactionsAdmin()
 	{
 		super();
-		this.aliases.add("admin");
 		
-		//this.requiredArgs.add("");
+		this.addAliases("admin");
+		
 		this.optionalArgs.put("on/off", "flip");
 		
-		this.permission = Perm.ADMIN.node;
+		this.addRequirements(ReqHasPerm.get(Perm.ADMIN.node));
 	}
 	
 	@Override

src/com/massivecraft/factions/cmd/CmdFactionsAutoClaim.java

@@ -3,6 +3,7 @@ package com.massivecraft.factions.cmd;
 import com.massivecraft.factions.FPerm;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.Perm;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 import com.massivecraft.mcore.cmd.req.ReqIsPlayer;
 
 public class CmdFactionsAutoClaim extends FCommand
@@ -10,13 +11,12 @@ public class CmdFactionsAutoClaim extends FCommand
 	public CmdFactionsAutoClaim()
 	{
 		super();
-		this.aliases.add("autoclaim");
 		
-		//this.requiredArgs.add("");
+		this.addAliases("autoclaim");
+		
 		this.optionalArgs.put("faction", "your");
 		
-		this.permission = Perm.AUTOCLAIM.node;
+		this.addRequirements(ReqHasPerm.get(Perm.AUTOCLAIM.node));
-		
 		this.addRequirements(ReqIsPlayer.get());
 	}
 

src/com/massivecraft/factions/cmd/CmdFactionsCape.java

@@ -1,7 +1,8 @@
 package com.massivecraft.factions.cmd;
 
-import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.Perm;
+import com.massivecraft.mcore.cmd.HelpCommand;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 
 public class CmdFactionsCape extends FCommand
 {
@@ -12,9 +13,10 @@ public class CmdFactionsCape extends FCommand
 	public CmdFactionsCape()
 	{
 		super();
-		this.aliases.add("cape");
 		
-		this.permission = Perm.CAPE.node;
+		this.addAliases("cape");
+		
+		this.addRequirements(ReqHasPerm.get(Perm.CAPE.node));
 		
 		this.addSubCommand(this.cmdCapeGet);
 		this.addSubCommand(this.cmdCapeSet);
@@ -24,8 +26,8 @@ public class CmdFactionsCape extends FCommand
 	@Override
 	public void perform()
 	{
-		this.commandChain.add(this);
+		this.getCommandChain().add(this);
-		Factions.get().cmdAutoHelp.execute(this.sender, this.args, this.commandChain);
+		HelpCommand.getInstance().execute(this.sender, this.args, this.commandChain);
 	}
 	
 }

src/com/massivecraft/factions/cmd/CmdFactionsCapeGet.java

@@ -1,13 +1,15 @@
 package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.Perm;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 
 public class CmdFactionsCapeGet extends CmdFactionsCapeAbstract
 {
 	public CmdFactionsCapeGet()
 	{
-		this.aliases.add("get");
+		this.addAliases("get");
-		this.permission = Perm.CAPE_GET.node;
+		
+		this.addRequirements(ReqHasPerm.get(Perm.CAPE_GET.node));
 	}
 	
 	@Override

src/com/massivecraft/factions/cmd/CmdFactionsCapeRemove.java

@@ -3,18 +3,14 @@ package com.massivecraft.factions.cmd;
 import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.integration.SpoutFeatures;
 import com.massivecraft.factions.util.RelationUtil;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 
 public class CmdFactionsCapeRemove extends CmdFactionsCapeAbstract
 {
-	
 	public CmdFactionsCapeRemove()
 	{
-		this.aliases.add("rm");
+		this.addAliases("rm", "rem", "remove", "del", "delete");
-		this.aliases.add("rem");
+		this.addRequirements(ReqHasPerm.get(Perm.CAPE_REMOVE.node));
-		this.aliases.add("remove");
-		this.aliases.add("del");
-		this.aliases.add("delete");
-		this.permission = Perm.CAPE_REMOVE.node;
 	}
 	
 	@Override

src/com/massivecraft/factions/cmd/CmdFactionsCapeSet.java

@@ -5,15 +5,18 @@ import java.net.URL;
 import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.integration.SpoutFeatures;
 import com.massivecraft.factions.util.RelationUtil;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 
 public class CmdFactionsCapeSet extends CmdFactionsCapeAbstract
 {
 	
 	public CmdFactionsCapeSet()
 	{
-		this.aliases.add("set");
+		this.addAliases("set");
+		
 		this.requiredArgs.add("url");
-		this.permission = Perm.CAPE_SET.node;
+		
+		this.addRequirements(ReqHasPerm.get(Perm.CAPE_SET.node));
 	}
 	
 	@Override

src/com/massivecraft/factions/cmd/CmdFactionsClaim.java

@@ -4,6 +4,7 @@ import com.massivecraft.factions.ConfServer;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.util.SpiralTask;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 import com.massivecraft.mcore.cmd.req.ReqIsPlayer;
 import com.massivecraft.mcore.ps.PS;
 
@@ -14,13 +15,14 @@ public class CmdFactionsClaim extends FCommand
 	public CmdFactionsClaim()
 	{
 		super();
-		this.aliases.add("claim");
+		
+		this.addAliases("claim");
 		
 		//this.requiredArgs.add("");
 		this.optionalArgs.put("faction", "your");
 		this.optionalArgs.put("radius", "1");
 		
-		this.permission = Perm.CLAIM.node;
+		this.addRequirements(ReqHasPerm.get(Perm.CLAIM.node));
 		
 		this.addRequirements(ReqIsPlayer.get());
 	}

src/com/massivecraft/factions/cmd/CmdFactionsCreate.java

@@ -14,6 +14,7 @@ import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.Rel;
 import com.massivecraft.factions.event.FPlayerJoinEvent;
 import com.massivecraft.factions.event.FactionCreateEvent;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 import com.massivecraft.mcore.cmd.req.ReqIsPlayer;
 
 public class CmdFactionsCreate extends FCommand
@@ -21,12 +22,13 @@ public class CmdFactionsCreate extends FCommand
 	public CmdFactionsCreate()
 	{
 		super();
-		this.aliases.add("create");
+		
+		this.addAliases("create");
 		
 		this.requiredArgs.add("faction tag");
 		//this.optionalArgs.put("", "");
 		
-		this.permission = Perm.CREATE.node;
+		this.addRequirements(ReqHasPerm.get(Perm.CREATE.node));
 	}
 	
 	@Override

src/com/massivecraft/factions/cmd/CmdFactionsDeinvite.java

@@ -2,6 +2,7 @@ package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Perm;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 
 public class CmdFactionsDeinvite extends FCommand
 {
@@ -9,13 +10,13 @@ public class CmdFactionsDeinvite extends FCommand
 	public CmdFactionsDeinvite()
 	{
 		super();
-		this.aliases.add("deinvite");
+		
-		this.aliases.add("deinv");
+		this.addAliases("deinvite", "deinv");
 		
 		this.requiredArgs.add("player");
 		//this.optionalArgs.put("", "");
 		
-		this.permission = Perm.DEINVITE.node;
+		this.addRequirements(ReqHasPerm.get(Perm.DEINVITE.node));
 		
 		senderMustBeMember = false;
 		senderMustBeOfficer = true;

src/com/massivecraft/factions/cmd/CmdFactionsDemote.java

@@ -3,6 +3,7 @@ package com.massivecraft.factions.cmd;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.Rel;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 
 public class CmdFactionsDemote extends FCommand
 {
@@ -10,12 +11,13 @@ public class CmdFactionsDemote extends FCommand
 	public CmdFactionsDemote()
 	{
 		super();
-		this.aliases.add("demote");
+		
+		this.addAliases("demote");
 		
 		this.requiredArgs.add("player name");
 		//this.optionalArgs.put("", "");
 		
-		this.permission = Perm.DEMOTE.node;
+		this.addRequirements(ReqHasPerm.get(Perm.DEMOTE.node));
 		
 		//To demote someone from member -> recruit you must be an officer.
 		//To demote someone from officer -> member you must be a leader.

src/com/massivecraft/factions/cmd/CmdFactionsDescription.java

@@ -4,6 +4,7 @@ import com.massivecraft.factions.ConfServer;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.FPlayerColl;
 import com.massivecraft.factions.Perm;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 import com.massivecraft.mcore.util.Txt;
 
 public class CmdFactionsDescription extends FCommand
@@ -11,13 +12,14 @@ public class CmdFactionsDescription extends FCommand
 	public CmdFactionsDescription()
 	{
 		super();
-		this.aliases.add("desc");
+		
+		this.addAliases("desc");
 		
 		this.requiredArgs.add("desc");
 		this.errorOnToManyArgs = false;
 		//this.optionalArgs
 		
-		this.permission = Perm.DESCRIPTION.node;
+		this.addRequirements(ReqHasPerm.get(Perm.DESCRIPTION.node));
 		
 		senderMustBeOfficer = true;
 	}

src/com/massivecraft/factions/cmd/CmdFactionsDisband.java

@@ -14,18 +14,20 @@ import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.integration.SpoutFeatures;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 
 public class CmdFactionsDisband extends FCommand
 {
 	public CmdFactionsDisband()
 	{
 		super();
-		this.aliases.add("disband");
+		
+		this.addAliases("disband");
 		
 		//this.requiredArgs.add("");
 		this.optionalArgs.put("faction", "your");
 		
-		this.permission = Perm.DISBAND.node;
+		this.addRequirements(ReqHasPerm.get(Perm.DISBAND.node));
 	}
 	
 	@Override

src/com/massivecraft/factions/cmd/CmdFactionsFlag.java

@@ -3,6 +3,7 @@ package com.massivecraft.factions.cmd;
 import com.massivecraft.factions.FFlag;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.Perm;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 import com.massivecraft.mcore.util.Txt;
 
 public class CmdFactionsFlag extends FCommand
@@ -11,14 +12,15 @@ public class CmdFactionsFlag extends FCommand
 	public CmdFactionsFlag()
 	{
 		super();
-		this.aliases.add("flag");
+		
+		this.addAliases("flag");
 		
 		//this.requiredArgs.add("");
 		this.optionalArgs.put("faction", "your");
 		this.optionalArgs.put("flag", "all");
 		this.optionalArgs.put("yes/no", "read");
 		
-		this.permission = Perm.FLAG.node;
+		this.addRequirements(ReqHasPerm.get(Perm.FLAG.node));
 	}
 	
 	@Override

src/com/massivecraft/factions/cmd/CmdFactionsHome.java

@@ -16,6 +16,7 @@ import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.Rel;
 import com.massivecraft.factions.integration.EssentialsFeatures;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 import com.massivecraft.mcore.cmd.req.ReqIsPlayer;
 import com.massivecraft.mcore.ps.PS;
 import com.massivecraft.mcore.util.SmokeUtil;
@@ -27,12 +28,13 @@ public class CmdFactionsHome extends FCommand
 	public CmdFactionsHome()
 	{
 		super();
-		this.aliases.add("home");
+		
+		this.addAliases("home");
 		
 		//this.requiredArgs.add("");
 		//this.optionalArgs.put("", "");
 		
-		this.permission = Perm.HOME.node;
+		this.addRequirements(ReqHasPerm.get(Perm.HOME.node));
 		
 		this.addRequirements(ReqIsPlayer.get());
 		

src/com/massivecraft/factions/cmd/CmdFactionsInvite.java

@@ -4,6 +4,7 @@ import com.massivecraft.factions.ConfServer;
 import com.massivecraft.factions.FPerm;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Perm;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 import com.massivecraft.mcore.cmd.req.ReqIsPlayer;
 
 public class CmdFactionsInvite extends FCommand
@@ -11,15 +12,13 @@ public class CmdFactionsInvite extends FCommand
 	public CmdFactionsInvite()
 	{
 		super();
-		this.aliases.add("invite");
+		
-		this.aliases.add("inv");
+		this.addAliases("inv", "invite");
 		
 		this.requiredArgs.add("player");
 		//this.optionalArgs.put("", "");
 		
-		this.permission = Perm.INVITE.node;
+		this.addRequirements(ReqHasPerm.get(Perm.INVITE.node));
-		
-		
 		this.addRequirements(ReqIsPlayer.get());
 		
 		senderMustBeOfficer = true;

src/com/massivecraft/factions/cmd/CmdFactionsJoin.java

@@ -9,18 +9,20 @@ import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.event.FPlayerJoinEvent;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 
 public class CmdFactionsJoin extends FCommand
 {
 	public CmdFactionsJoin()
 	{
 		super();
-		this.aliases.add("join");
+		
+		this.addAliases("join");
 		
 		this.requiredArgs.add("faction");
 		this.optionalArgs.put("player", "you");
 		
-		this.permission = Perm.JOIN.node;
+		this.addRequirements(ReqHasPerm.get(Perm.JOIN.node));
 	}
 	
 	@Override

src/com/massivecraft/factions/cmd/CmdFactionsKick.java

@@ -10,6 +10,7 @@ import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.Rel;
 import com.massivecraft.factions.event.FPlayerLeaveEvent;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 
 public class CmdFactionsKick extends FCommand
 {
@@ -17,12 +18,13 @@ public class CmdFactionsKick extends FCommand
 	public CmdFactionsKick()
 	{
 		super();
-		this.aliases.add("kick");
+		
+		this.addAliases("kick");
 		
 		this.requiredArgs.add("player");
 		//this.optionalArgs.put("", "");
 		
-		this.permission = Perm.KICK.node;
+		this.addRequirements(ReqHasPerm.get(Perm.KICK.node));
 	}
 	
 	@Override

src/com/massivecraft/factions/cmd/CmdFactionsLeader.java

@@ -9,6 +9,7 @@ import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.Rel;
 import com.massivecraft.factions.event.FPlayerJoinEvent;
 import com.massivecraft.factions.util.RelationUtil;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 import com.massivecraft.mcore.util.Txt;
 
 public class CmdFactionsLeader extends FCommand
@@ -16,12 +17,13 @@ public class CmdFactionsLeader extends FCommand
 	public CmdFactionsLeader()
 	{
 		super();
-		this.aliases.add("leader");
+		
+		this.addAliases("leader");
 		
 		this.requiredArgs.add("player");
 		this.optionalArgs.put("faction", "your");
 		
-		this.permission = Perm.LEADER.node;
+		this.addRequirements(ReqHasPerm.get(Perm.LEADER.node));
 	}
 	
 	@Override

src/com/massivecraft/factions/cmd/CmdFactionsLeave.java

@@ -1,18 +1,17 @@
 package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.Perm;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 
 public class CmdFactionsLeave extends FCommand {
 	
 	public CmdFactionsLeave()
 	{
 		super();
-		this.aliases.add("leave");
 		
-		//this.requiredArgs.add("");
+		this.addAliases("leave");
-		//this.optionalArgs.put("", "");
 		
-		this.permission = Perm.LEAVE.node;
+		this.addRequirements(ReqHasPerm.get(Perm.LEAVE.node));
 		
 		senderMustBeMember = true;
 	}

src/com/massivecraft/factions/cmd/CmdFactionsList.java

@@ -8,6 +8,7 @@ import com.massivecraft.factions.ConfServer;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.FactionColl;
 import com.massivecraft.factions.Perm;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 import com.massivecraft.mcore.util.Txt;
 
 
@@ -17,13 +18,13 @@ public class CmdFactionsList extends FCommand
 	public CmdFactionsList()
 	{
 		super();
-		this.aliases.add("list");
+		
-		this.aliases.add("ls");
+		this.addAliases("ls", "list");
 		
 		//this.requiredArgs.add("");
 		this.optionalArgs.put("page", "1");
 		
-		this.permission = Perm.LIST.node;
+		this.addRequirements(ReqHasPerm.get(Perm.LIST.node));
 	}
 
 	@Override

src/com/massivecraft/factions/cmd/CmdFactionsMap.java

@@ -3,6 +3,7 @@ package com.massivecraft.factions.cmd;
 import com.massivecraft.factions.BoardColl;
 import com.massivecraft.factions.ConfServer;
 import com.massivecraft.factions.Perm;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 import com.massivecraft.mcore.cmd.req.ReqIsPlayer;
 import com.massivecraft.mcore.ps.PS;
 
@@ -12,12 +13,12 @@ public class CmdFactionsMap extends FCommand
 	public CmdFactionsMap()
 	{
 		super();
-		this.aliases.add("map");
 		
-		//this.requiredArgs.add("");
+		this.addAliases("map");
+		
 		this.optionalArgs.put("on/off", "once");
 		
-		this.permission = Perm.MAP.node;
+		this.addRequirements(ReqHasPerm.get(Perm.MAP.node));
 		
 		this.addRequirements(ReqIsPlayer.get());
 	}

src/com/massivecraft/factions/cmd/CmdFactionsMoney.java

@@ -1,6 +1,7 @@
 package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.Factions;
+import com.massivecraft.mcore.cmd.HelpCommand;
 import com.massivecraft.mcore.util.Txt;
 
 public class CmdFactionsMoney extends FCommand
@@ -15,10 +16,8 @@ public class CmdFactionsMoney extends FCommand
 	public CmdFactionsMoney()
 	{
 		super();
-		this.aliases.add("money");
 		
-		//this.requiredArgs.add("");
+		this.addAliases("money");
-		//this.optionalArgs.put("","")
 		
 		this.isMoneyCommand = true;
 		
@@ -41,8 +40,8 @@ public class CmdFactionsMoney extends FCommand
 	@Override
 	public void perform()
 	{
-		this.commandChain.add(this);
+		this.getCommandChain().add(this);
-		Factions.get().cmdAutoHelp.execute(this.sender, this.args, this.commandChain);
+		HelpCommand.getInstance().execute(this.sender, this.args, this.commandChain);
 	}
 	
 }

src/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java

@@ -3,19 +3,21 @@ package com.massivecraft.factions.cmd;
 import com.massivecraft.factions.integration.Econ;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.Perm;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 
 public class CmdFactionsMoneyBalance extends FCommand
 {
 	public CmdFactionsMoneyBalance()
 	{
 		super();
-		this.aliases.add("b");
+		
-		this.aliases.add("balance");
+		this.addAliases("b", "balance");
 		
 		//this.requiredArgs.add("");
 		this.optionalArgs.put("faction", "your");
 		
-		this.permission = Perm.MONEY_BALANCE.node;
+		this.addRequirements(ReqHasPerm.get(Perm.MONEY_BALANCE.node));
+		
 		this.setHelpShort("show faction balance");
 		
 		senderMustBePlayer = false;

src/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java

@@ -5,6 +5,7 @@ import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.iface.EconomyParticipator;
 import com.massivecraft.factions.integration.Econ;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 import com.massivecraft.mcore.util.Txt;
 
 import org.bukkit.ChatColor;
@@ -16,13 +17,14 @@ public class CmdFactionsMoneyDeposit extends FCommand
 	public CmdFactionsMoneyDeposit()
 	{
 		super();
-		this.aliases.add("d");
+		
-		this.aliases.add("deposit");
+		this.addAliases("d", "deposit");
 		
 		this.requiredArgs.add("amount");
 		this.optionalArgs.put("faction", "your");
 		
-		this.permission = Perm.MONEY_DEPOSIT.node;
+		this.addRequirements(ReqHasPerm.get(Perm.MONEY_DEPOSIT.node));
+		
 		this.setHelpShort("deposit money");
 		
 		senderMustBePlayer = true;

src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java

@@ -5,6 +5,7 @@ import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.iface.EconomyParticipator;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.integration.Econ;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 import com.massivecraft.mcore.util.Txt;
 
 import org.bukkit.ChatColor;
@@ -14,7 +15,7 @@ public class CmdFactionsMoneyTransferFf extends FCommand
 {
 	public CmdFactionsMoneyTransferFf()
 	{
-		this.aliases.add("ff");
+		this.addAliases("ff");
 		
 		this.requiredArgs.add("amount");
 		this.requiredArgs.add("faction");
@@ -22,7 +23,8 @@ public class CmdFactionsMoneyTransferFf extends FCommand
 		
 		//this.optionalArgs.put("", "");
 		
-		this.permission = Perm.MONEY_F2F.node;
+		this.addRequirements(ReqHasPerm.get(Perm.MONEY_F2F.node));
+		
 		this.setHelpShort("transfer f -> f");
 		
 		senderMustBePlayer = false;

src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java

@@ -5,6 +5,7 @@ import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.iface.EconomyParticipator;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.integration.Econ;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 import com.massivecraft.mcore.util.Txt;
 
 import org.bukkit.ChatColor;
@@ -14,7 +15,7 @@ public class CmdFactionsMoneyTransferFp extends FCommand
 {
 	public CmdFactionsMoneyTransferFp()
 	{
-		this.aliases.add("fp");
+		this.addAliases("fp");
 		
 		this.requiredArgs.add("amount");
 		this.requiredArgs.add("faction");
@@ -22,7 +23,8 @@ public class CmdFactionsMoneyTransferFp extends FCommand
 		
 		//this.optionalArgs.put("", "");
 		
-		this.permission = Perm.MONEY_F2P.node;
+		this.addRequirements(ReqHasPerm.get(Perm.MONEY_F2P.node));
+		
 		this.setHelpShort("transfer f -> p");
 		
 		senderMustBePlayer = false;

src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java

@@ -5,6 +5,7 @@ import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.iface.EconomyParticipator;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.integration.Econ;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 import com.massivecraft.mcore.util.Txt;
 
 import org.bukkit.ChatColor;
@@ -14,7 +15,7 @@ public class CmdFactionsMoneyTransferPf extends FCommand
 {
 	public CmdFactionsMoneyTransferPf()
 	{
-		this.aliases.add("pf");
+		this.addAliases("pf");
 		
 		this.requiredArgs.add("amount");
 		this.requiredArgs.add("player");
@@ -22,7 +23,8 @@ public class CmdFactionsMoneyTransferPf extends FCommand
 		
 		//this.optionalArgs.put("", "");
 		
-		this.permission = Perm.MONEY_P2F.node;
+		this.addRequirements(ReqHasPerm.get(Perm.MONEY_P2F.node));
+		
 		this.setHelpShort("transfer p -> f");
 		
 		senderMustBePlayer = false;

src/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java

@@ -5,6 +5,7 @@ import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.iface.EconomyParticipator;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.integration.Econ;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 import com.massivecraft.mcore.util.Txt;
 
 import org.bukkit.ChatColor;
@@ -14,13 +15,13 @@ public class CmdFactionsMoneyWithdraw extends FCommand
 {
 	public CmdFactionsMoneyWithdraw()
 	{
-		this.aliases.add("w");
+		this.addAliases("w", "withdraw");
-		this.aliases.add("withdraw");
 		
 		this.requiredArgs.add("amount");
 		this.optionalArgs.put("faction", "your");
 		
-		this.permission = Perm.MONEY_WITHDRAW.node;
+		this.addRequirements(ReqHasPerm.get(Perm.MONEY_WITHDRAW.node));
+		
 		this.setHelpShort("withdraw money");
 		
 		senderMustBePlayer = true;

src/com/massivecraft/factions/cmd/CmdFactionsOfficer.java

@@ -4,6 +4,7 @@ import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.Rel;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 
 public class CmdFactionsOfficer extends FCommand
 {
@@ -11,12 +12,13 @@ public class CmdFactionsOfficer extends FCommand
 	public CmdFactionsOfficer()
 	{
 		super();
-		this.aliases.add("officer");
+		
+		this.addAliases("officer");
 		
 		this.requiredArgs.add("player name");
 		//this.optionalArgs.put("", "");
 		
-		this.permission = Perm.OFFICER.node;
+		this.addRequirements(ReqHasPerm.get(Perm.OFFICER.node));
 	}
 	
 	@Override

src/com/massivecraft/factions/cmd/CmdFactionsOpen.java

@@ -4,18 +4,20 @@ import com.massivecraft.factions.ConfServer;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.FactionColl;
 import com.massivecraft.factions.Perm;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 
 public class CmdFactionsOpen extends FCommand
 {
 	public CmdFactionsOpen()
 	{
 		super();
-		this.aliases.add("open");
+		
+		this.addAliases("open");
 		
 		//this.requiredArgs.add("");
 		this.optionalArgs.put("yes/no", "flip");
 		
-		this.permission = Perm.OPEN.node;
+		this.addRequirements(ReqHasPerm.get(Perm.OPEN.node));
 		
 		senderMustBeOfficer = true;
 	}

src/com/massivecraft/factions/cmd/CmdFactionsPerm.java

@@ -4,6 +4,7 @@ import com.massivecraft.factions.FPerm;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.Rel;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 import com.massivecraft.mcore.util.Txt;
 
 public class CmdFactionsPerm extends FCommand
@@ -12,14 +13,15 @@ public class CmdFactionsPerm extends FCommand
 	public CmdFactionsPerm()
 	{
 		super();
-		this.aliases.add("perm");
+		
+		this.addAliases("perm");
 		
 		this.optionalArgs.put("faction", "your");
 		this.optionalArgs.put("perm", "all");
 		this.optionalArgs.put("relation", "read");
 		this.optionalArgs.put("yes/no", "read");
 		
-		this.permission = Perm.PERM.node;
+		this.addRequirements(ReqHasPerm.get(Perm.PERM.node));
 		
 		this.errorOnToManyArgs = false;
 	}

src/com/massivecraft/factions/cmd/CmdFactionsPower.java

@@ -3,6 +3,7 @@ package com.massivecraft.factions.cmd;
 import com.massivecraft.factions.ConfServer;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Perm;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 
 public class CmdFactionsPower extends FCommand
 {
@@ -10,13 +11,13 @@ public class CmdFactionsPower extends FCommand
 	public CmdFactionsPower()
 	{
 		super();
-		this.aliases.add("power");
+		
-		this.aliases.add("pow");
+		this.addAliases("power", "pow");
 		
 		//this.requiredArgs.add("faction tag");
 		this.optionalArgs.put("player", "you");
 		
-		this.permission = Perm.POWER.node;
+		this.addRequirements(ReqHasPerm.get(Perm.POWER.node));
 	}
 	
 	@Override

src/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java

@@ -4,19 +4,21 @@ import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.Perm;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 
 public class CmdFactionsPowerBoost extends FCommand
 {
 	public CmdFactionsPowerBoost()
 	{
 		super();
-		this.aliases.add("powerboost");
+		
+		this.addAliases("powerboost");
 		
 		this.requiredArgs.add("p|f|player|faction");
 		this.requiredArgs.add("name");
 		this.requiredArgs.add("#");
 		
-		this.permission = Perm.POWERBOOST.node;
+		this.addRequirements(ReqHasPerm.get(Perm.POWERBOOST.node));
 	}
 	
 	@Override

src/com/massivecraft/factions/cmd/CmdFactionsPromote.java

@@ -3,6 +3,7 @@ package com.massivecraft.factions.cmd;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.Rel;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 
 public class CmdFactionsPromote extends FCommand
 {
@@ -10,12 +11,13 @@ public class CmdFactionsPromote extends FCommand
 	public CmdFactionsPromote()
 	{
 		super();
-		this.aliases.add("promote");
+		
+		this.addAliases("promote");
 		
 		this.requiredArgs.add("player name");
 		//this.optionalArgs.put("", "");
 		
-		this.permission = Perm.PROMOTE.node;
+		this.addRequirements(ReqHasPerm.get(Perm.PROMOTE.node));
 		
 		//To promote someone from recruit -> member you must be an officer.
 		//To promote someone from member -> officer you must be a leader.

src/com/massivecraft/factions/cmd/CmdFactionsRelationAbstract.java

@@ -9,6 +9,7 @@ import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.Rel;
 import com.massivecraft.factions.event.FactionRelationEvent;
 import com.massivecraft.factions.integration.SpoutFeatures;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 import com.massivecraft.mcore.cmd.req.ReqIsPlayer;
 
 public abstract class CmdFactionsRelationAbstract extends FCommand
@@ -18,10 +19,10 @@ public abstract class CmdFactionsRelationAbstract extends FCommand
 	public CmdFactionsRelationAbstract()
 	{
 		super();
-		this.requiredArgs.add("faction");
-		//this.optionalArgs.put("", "");
 		
-		this.permission = Perm.RELATION.node;
+		this.addAliases("faction");
+		
+		this.addRequirements(ReqHasPerm.get(Perm.RELATION.node));
 		
 		senderMustBeOfficer = true;
 	}

src/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java

@@ -7,6 +7,7 @@ import org.bukkit.entity.Player;
 
 import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.util.VisualizeUtil;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 import com.massivecraft.mcore.cmd.req.ReqIsPlayer;
 
 public class CmdFactionsSeeChunk extends FCommand
@@ -14,10 +15,10 @@ public class CmdFactionsSeeChunk extends FCommand
 	public CmdFactionsSeeChunk()
 	{
 		super();
-		this.aliases.add("sc");
-		this.aliases.add("seechunk");
 		
-		this.permission = Perm.SEE_CHUNK.node;
+		this.addAliases("sc", "seechunk");
+		
+		this.addRequirements(ReqHasPerm.get(Perm.SEE_CHUNK.node));
 		
 		this.addRequirements(ReqIsPlayer.get());
 	}

src/com/massivecraft/factions/cmd/CmdFactionsSethome.java

@@ -5,6 +5,7 @@ import com.massivecraft.factions.ConfServer;
 import com.massivecraft.factions.FPerm;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.Perm;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 import com.massivecraft.mcore.cmd.req.ReqIsPlayer;
 import com.massivecraft.mcore.ps.PS;
 
@@ -12,12 +13,12 @@ public class CmdFactionsSethome extends FCommand
 {
 	public CmdFactionsSethome()
 	{
-		this.aliases.add("sethome");
+		this.addAliases("sethome");
 		
 		//this.requiredArgs.add("");
 		this.optionalArgs.put("faction", "your");
 		
-		this.permission = Perm.SETHOME.node;
+		this.addRequirements(ReqHasPerm.get(Perm.SETHOME.node));
 		
 		this.addRequirements(ReqIsPlayer.get());
 	}

src/com/massivecraft/factions/cmd/CmdFactionsShow.java

@@ -12,6 +12,7 @@ import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.Rel;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 import com.massivecraft.mcore.mixin.Mixin;
 import com.massivecraft.mcore.util.Txt;
 
@@ -19,13 +20,12 @@ public class CmdFactionsShow extends FCommand
 {
 	public CmdFactionsShow()
 	{
-		this.aliases.add("show");
+		this.addAliases("show", "who");
-		this.aliases.add("who");
 		
 		//this.requiredArgs.add("");
 		this.optionalArgs.put("faction", "your");
 		
-		this.permission = Perm.SHOW.node;
+		this.addRequirements(ReqHasPerm.get(Perm.SHOW.node));
 	}
 
 	@Override

src/com/massivecraft/factions/cmd/CmdFactionsTag.java

@@ -11,18 +11,18 @@ import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.event.FactionRenameEvent;
 import com.massivecraft.factions.integration.SpoutFeatures;
 import com.massivecraft.factions.util.MiscUtil;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 
 public class CmdFactionsTag extends FCommand
 {
 	
 	public CmdFactionsTag()
 	{
-		this.aliases.add("tag");
+		this.addAliases("tag");
 		
 		this.requiredArgs.add("new tag");
-		//this.optionalArgs.put("", "");
 		
-		this.permission = Perm.TAG.node;
+		this.addRequirements(ReqHasPerm.get(Perm.TAG.node));
 		
 		senderMustBeOfficer = true;
 	}

src/com/massivecraft/factions/cmd/CmdFactionsTitle.java

@@ -4,18 +4,19 @@ import com.massivecraft.factions.ConfServer;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.integration.SpoutFeatures;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 import com.massivecraft.mcore.util.Txt;
 
 public class CmdFactionsTitle extends FCommand
 {
 	public CmdFactionsTitle()
 	{
-		this.aliases.add("title");
+		this.addAliases("title");
 		
 		this.requiredArgs.add("player");
 		this.optionalArgs.put("title", "");
 		
-		this.permission = Perm.TITLE.node;
+		this.addRequirements(ReqHasPerm.get(Perm.TITLE.node));
 		
 		senderMustBeOfficer = true;
 	}

src/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java

@@ -11,6 +11,7 @@ import com.massivecraft.factions.FPerm;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.Perm;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 import com.massivecraft.mcore.cmd.req.ReqIsPlayer;
 import com.massivecraft.mcore.ps.PS;
 
@@ -18,13 +19,9 @@ public class CmdFactionsUnclaim extends FCommand
 {
 	public CmdFactionsUnclaim()
 	{
-		this.aliases.add("unclaim");
+		this.addAliases("unclaim", "declaim");
-		this.aliases.add("declaim");
 		
-		//this.requiredArgs.add("");
+		this.addRequirements(ReqHasPerm.get(Perm.UNCLAIM.node));
-		//this.optionalArgs.put("", "");
-		
-		this.permission = Perm.UNCLAIM.node;
 		
 		this.addRequirements(ReqIsPlayer.get());
 	}

src/com/massivecraft/factions/cmd/CmdFactionsUnclaimall.java

@@ -9,18 +9,15 @@ import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.event.LandUnclaimAllEvent;
 import com.massivecraft.factions.integration.Econ;
 import com.massivecraft.factions.integration.SpoutFeatures;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 
 public class CmdFactionsUnclaimall extends FCommand
 {	
 	public CmdFactionsUnclaimall()
 	{
-		this.aliases.add("unclaimall");
+		this.addAliases("unclaimall", "declaimall");
-		this.aliases.add("declaimall");
 		
-		//this.requiredArgs.add("");
+		this.addRequirements(ReqHasPerm.get(Perm.UNCLAIM_ALL.node));
-		//this.optionalArgs.put("", "");
-		
-		this.permission = Perm.UNCLAIM_ALL.node;
 		
 		senderMustBeOfficer = true;
 	}

src/com/massivecraft/factions/cmd/CmdFactionsVersion.java

@@ -2,15 +2,15 @@ package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.Perm;
+import com.massivecraft.mcore.cmd.req.ReqHasPerm;
 
 
 public class CmdFactionsVersion extends FCommand
 {
 	public CmdFactionsVersion()
 	{
-		this.aliases.add("version");
+		this.addAliases("version");
-		
+		this.addRequirements(ReqHasPerm.get(Perm.VERSION.node));
-		this.permission = Perm.VERSION.node;
 	}
 
 	@Override