Rename command files

src/com/massivecraft/factions/ConfServer.java

@@ -21,7 +21,7 @@ public class ConfServer extends SimpleConfig
 	// FIELDS
 	// -------------------------------------------- //
 	
-	public final static transient List<String> baseCommandAliases = MUtil.list("f");
+	public final static List<String> baseCommandAliases = MUtil.list("f");
 	
 	// Colors
 	public static ChatColor colorMember = ChatColor.GREEN;

src/com/massivecraft/factions/FPerm.java

@@ -162,7 +162,7 @@ public enum FPerm
 			fplayer.msg(errorpattern, hostFaction.describeTo(fplayer, true), this.getDescription());
 			if (Perm.ADMIN.has(fplayer.getPlayer()))
 			{
-				fplayer.msg("<i>You can bypass by using " + Factions.get().cmdBase.cmdBypass.getUseageTemplate(false));
+				fplayer.msg("<i>You can bypass by using " + Factions.get().cmdBase.cmdFactionsAdmin.getUseageTemplate(false));
 			}
 		}
 		return ret;

src/com/massivecraft/factions/Factions.java

@@ -61,8 +61,8 @@ public class Factions extends MPlugin
 	private Integer econLandRewardTaskID = null;
 	
 	// Commands
-	public FCmdRoot cmdBase;
-	public CmdAutoHelp cmdAutoHelp;
+	public CmdFactions cmdBase;
+	public CmdFactionsAutoHelp cmdAutoHelp;
 
 	// -------------------------------------------- //
 	// OVERRIDE
@@ -84,8 +84,8 @@ public class Factions extends MPlugin
 		Board.load();
 		
 		// Add Base Commands
-		this.cmdAutoHelp = new CmdAutoHelp();
-		this.cmdBase = new FCmdRoot();
+		this.cmdAutoHelp = new CmdFactionsAutoHelp();
+		this.cmdBase = new CmdFactions();
 
 		EssentialsFeatures.setup();
 		SpoutFeatures.setup();

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

@@ -0,0 +1,126 @@
+package com.massivecraft.factions.cmd;
+
+import java.util.Collections;
+
+import com.massivecraft.factions.ConfServer;
+import com.massivecraft.factions.Factions;
+import com.massivecraft.mcore.util.Txt;
+
+public class CmdFactions extends FCommand
+{
+	public CmdFactionsAccess cmdFactionsAccess = new CmdFactionsAccess();
+	public CmdFactionsLeader cmdFactionsLeader = new CmdFactionsLeader();
+	public CmdFactionsAutoClaim cmdFactionsAutoClaim = new CmdFactionsAutoClaim();
+	public CmdFactionsAdmin cmdFactionsAdmin = new CmdFactionsAdmin();
+	public CmdFactionsCape cmdFactionsCape = new CmdFactionsCape();
+	public CmdFactionsClaim cmdFactionsClaim = new CmdFactionsClaim();
+	public CmdFactionsCreate cmdFactionsCreate = new CmdFactionsCreate();
+	public CmdFactionsDeinvite cmdFactionsDeinvite = new CmdFactionsDeinvite();
+	public CmdFactionsDemote cmdFactionsDemote = new CmdFactionsDemote();
+	public CmdFactionsDescription cmdFactionsDescription = new CmdFactionsDescription();
+	public CmdFactionsDisband cmdFactionsDisband = new CmdFactionsDisband();
+	public CmdFactionsFlag cmdFactionsFlag = new CmdFactionsFlag();
+	public CmdFactionsHome cmdFactionsHome = new CmdFactionsHome();
+	public CmdFactionsInvite cmdFactionsInvite = new CmdFactionsInvite();
+	public CmdFactionsJoin cmdFactionsJoin = new CmdFactionsJoin();
+	public CmdFactionsKick cmdFactionsKick = new CmdFactionsKick();
+	public CmdFactionsLeave cmdFactionsLeave = new CmdFactionsLeave();
+	public CmdFactionsList cmdFactionsList = new CmdFactionsList();
+	public CmdFactionsLock cmdFactionsLock = new CmdFactionsLock();
+	public CmdFactionsMap cmdFactionsMap = new CmdFactionsMap();
+	public CmdFactionsOfficer cmdFactionsOfficer = new CmdFactionsOfficer();
+	public CmdFactionsMoney cmdFactionsMoney = new CmdFactionsMoney();
+	public CmdFactionsOpen cmdFactionsOpen = new CmdFactionsOpen();
+	public CmdFactionsPerm cmdFactionsPerm = new CmdFactionsPerm();
+	public CmdFactionsPower cmdFactionsPower = new CmdFactionsPower();
+	public CmdFactionsPowerBoost cmdFactionsPowerBoost = new CmdFactionsPowerBoost();
+	public CmdFactionsPromote cmdFactionsPromote = new CmdFactionsPromote();
+	public CmdFactionsRelationAlly cmdFactionsRelationAlly = new CmdFactionsRelationAlly();
+	public CmdFactionsRelationEnemy cmdFactionsRelationEnemy = new CmdFactionsRelationEnemy();
+	public CmdFactionsRelationNeutral cmdFactionsRelationNeutral = new CmdFactionsRelationNeutral();
+	public CmdFactionsRelationTruce cmdFactionsRelationTruce = new CmdFactionsRelationTruce();
+	public CmdFactionsReload cmdFactionsReload = new CmdFactionsReload();
+	public CmdFactionsSaveAll cmdFactionsSaveAll = new CmdFactionsSaveAll();
+	public CmdFactionsSeeChunk cmdFactionsSeeChunk = new CmdFactionsSeeChunk();
+	public CmdFactionsSethome cmdFactionsSethome = new CmdFactionsSethome();
+	public CmdFactionsShow cmdFactionsShow = new CmdFactionsShow();
+	public CmdFactionsTag cmdFactionsTag = new CmdFactionsTag();
+	public CmdFactionsTitle cmdFactionsTitle = new CmdFactionsTitle();
+	public CmdFactionsUnclaim cmdFactionsUnclaim = new CmdFactionsUnclaim();
+	public CmdFactionsUnclaimall cmdFactionsUnclaimall = new CmdFactionsUnclaimall();
+	public CmdFactionsVersion cmdFactionsVersion = new CmdFactionsVersion();
+	
+	public CmdFactions()
+	{
+		super();
+		this.aliases.addAll(ConfServer.baseCommandAliases);
+		
+		// remove any nulls from extra commas
+		// TODO: When is this required? Should this be added to MCore?
+		this.aliases.removeAll(Collections.singletonList(null));
+		
+		//this.requiredArgs.add("");
+		//this.optionalArgs.put("","")
+		
+		senderMustBePlayer = false;
+		senderMustBeMember = false;
+		senderMustBeOfficer = false;
+		senderMustBeLeader = false;
+		
+		this.disableOnLock = 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(this.cmdFactionsList);
+		this.addSubCommand(this.cmdFactionsShow);
+		this.addSubCommand(this.cmdFactionsPower);
+		this.addSubCommand(this.cmdFactionsJoin);
+		this.addSubCommand(this.cmdFactionsLeave);
+		this.addSubCommand(this.cmdFactionsHome);
+		this.addSubCommand(this.cmdFactionsCreate);
+		this.addSubCommand(this.cmdFactionsSethome);
+		this.addSubCommand(this.cmdFactionsTag);
+		this.addSubCommand(this.cmdFactionsDemote);
+		this.addSubCommand(this.cmdFactionsDescription);
+		this.addSubCommand(this.cmdFactionsCape);
+		this.addSubCommand(this.cmdFactionsPerm);
+		this.addSubCommand(this.cmdFactionsFlag);
+		this.addSubCommand(this.cmdFactionsInvite);
+		this.addSubCommand(this.cmdFactionsDeinvite);
+		this.addSubCommand(this.cmdFactionsOpen);
+		this.addSubCommand(this.cmdFactionsMoney);
+		this.addSubCommand(this.cmdFactionsClaim);
+		this.addSubCommand(this.cmdFactionsAutoClaim);
+		this.addSubCommand(this.cmdFactionsUnclaim);
+		this.addSubCommand(this.cmdFactionsUnclaimall);
+		this.addSubCommand(this.cmdFactionsAccess);
+		this.addSubCommand(this.cmdFactionsKick);
+		this.addSubCommand(this.cmdFactionsOfficer);
+		this.addSubCommand(this.cmdFactionsLeader);
+		this.addSubCommand(this.cmdFactionsTitle);
+		this.addSubCommand(this.cmdFactionsMap);
+		this.addSubCommand(this.cmdFactionsSeeChunk);
+		this.addSubCommand(this.cmdFactionsDisband);
+		this.addSubCommand(this.cmdFactionsRelationAlly);
+		this.addSubCommand(this.cmdFactionsRelationEnemy);
+		this.addSubCommand(this.cmdFactionsRelationNeutral);
+		this.addSubCommand(this.cmdFactionsRelationTruce);
+		this.addSubCommand(this.cmdFactionsAdmin);
+		this.addSubCommand(this.cmdFactionsPowerBoost);
+		this.addSubCommand(this.cmdFactionsPromote);
+		this.addSubCommand(this.cmdFactionsLock);
+		this.addSubCommand(this.cmdFactionsReload);
+		this.addSubCommand(this.cmdFactionsSaveAll);
+		this.addSubCommand(this.cmdFactionsVersion);
+	}
+	
+	@Override
+	public void perform()
+	{
+		this.commandChain.add(this);
+		Factions.get().cmdAutoHelp.execute(this.sender, this.args, this.commandChain);
+	}
+
+}

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

@@ -11,9 +11,9 @@ import com.massivecraft.factions.integration.SpoutFeatures;
 import com.massivecraft.mcore.util.Txt;
 
 
-public class CmdAccess extends FCommand
+public class CmdFactionsAccess extends FCommand
 {
-	public CmdAccess()
+	public CmdFactionsAccess()
 	{
 		super();
 		this.aliases.add("access");

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

@@ -3,9 +3,9 @@ package com.massivecraft.factions.cmd;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.Perm;
 
-public class CmdAdmin extends FCommand
+public class CmdFactionsAdmin extends FCommand
 {
-	public CmdAdmin()
+	public CmdFactionsAdmin()
 	{
 		super();
 		this.aliases.add("admin");

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

@@ -4,9 +4,9 @@ import com.massivecraft.factions.FPerm;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.Perm;
 
-public class CmdAutoClaim extends FCommand
+public class CmdFactionsAutoClaim extends FCommand
 {
-	public CmdAutoClaim()
+	public CmdFactionsAutoClaim()
 	{
 		super();
 		this.aliases.add("autoclaim");

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

@@ -7,9 +7,9 @@ import com.massivecraft.factions.zcore.CommandVisibility;
 import com.massivecraft.factions.zcore.MCommand;
 import com.massivecraft.mcore.util.Txt;
 
-public class CmdAutoHelp extends MCommand<Factions>
+public class CmdFactionsAutoHelp extends MCommand<Factions>
 {
-	public CmdAutoHelp()
+	public CmdFactionsAutoHelp()
 	{
 		super(Factions.get());
 		this.aliases.add("?");

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

@@ -3,13 +3,13 @@ package com.massivecraft.factions.cmd;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.Perm;
 
-public class CmdCape extends FCommand
+public class CmdFactionsCape extends FCommand
 {
-	public CmdCapeGet cmdCapeGet = new CmdCapeGet();
-	public CmdCapeSet cmdCapeSet = new CmdCapeSet();
-	public CmdCapeRemove cmdCapeRemove = new CmdCapeRemove();
+	public CmdFactionsCapeGet cmdCapeGet = new CmdFactionsCapeGet();
+	public CmdFactionsCapeSet cmdCapeSet = new CmdFactionsCapeSet();
+	public CmdFactionsCapeRemove cmdCapeRemove = new CmdFactionsCapeRemove();
 	
-	public CmdCape()
+	public CmdFactionsCape()
 	{
 		super();
 		this.aliases.add("cape");

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

@@ -7,12 +7,12 @@ import org.bukkit.command.CommandSender;
 import com.massivecraft.factions.FPerm;
 import com.massivecraft.factions.Faction;
 
-public abstract class CmdCapeAbstract extends FCommand
+public abstract class CmdFactionsCapeAbstract extends FCommand
 {
 	public Faction capeFaction;
 	public String currentCape;
 	
-	public CmdCapeAbstract()
+	public CmdFactionsCapeAbstract()
 	{
 		this.optionalArgs.put("faction", "your");
 		

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

@@ -2,9 +2,9 @@ package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.Perm;
 
-public class CmdCapeGet extends CmdCapeAbstract
+public class CmdFactionsCapeGet extends CmdFactionsCapeAbstract
 {
-	public CmdCapeGet()
+	public CmdFactionsCapeGet()
 	{
 		this.aliases.add("get");
 		this.permission = Perm.CAPE_GET.node;

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

@@ -4,10 +4,10 @@ import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.integration.SpoutFeatures;
 import com.massivecraft.factions.util.RelationUtil;
 
-public class CmdCapeRemove extends CmdCapeAbstract
+public class CmdFactionsCapeRemove extends CmdFactionsCapeAbstract
 {
 	
-	public CmdCapeRemove()
+	public CmdFactionsCapeRemove()
 	{
 		this.aliases.add("rm");
 		this.aliases.add("rem");

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

@@ -6,10 +6,10 @@ import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.integration.SpoutFeatures;
 import com.massivecraft.factions.util.RelationUtil;
 
-public class CmdCapeSet extends CmdCapeAbstract
+public class CmdFactionsCapeSet extends CmdFactionsCapeAbstract
 {
 	
-	public CmdCapeSet()
+	public CmdFactionsCapeSet()
 	{
 		this.aliases.add("set");
 		this.requiredArgs.add("url");

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

@@ -7,10 +7,10 @@ import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.util.SpiralTask;
 
 
-public class CmdClaim extends FCommand
+public class CmdFactionsClaim extends FCommand
 {
 	
-	public CmdClaim()
+	public CmdFactionsClaim()
 	{
 		super();
 		this.aliases.add("claim");

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

@@ -15,9 +15,9 @@ import com.massivecraft.factions.Rel;
 import com.massivecraft.factions.event.FPlayerJoinEvent;
 import com.massivecraft.factions.event.FactionCreateEvent;
 
-public class CmdCreate extends FCommand
+public class CmdFactionsCreate extends FCommand
 {
-	public CmdCreate()
+	public CmdFactionsCreate()
 	{
 		super();
 		this.aliases.add("create");
@@ -95,7 +95,7 @@ public class CmdCreate extends FCommand
 			follower.msg("%s<i> created a new faction %s", fme.describeTo(follower, true), faction.getTag(follower));
 		}
 		
-		msg("<i>You should now: %s", p.cmdBase.cmdDescription.getUseageTemplate());
+		msg("<i>You should now: %s", p.cmdBase.cmdFactionsDescription.getUseageTemplate());
 
 		if (ConfServer.logFactionCreate)
 			Factions.get().log(fme.getName()+" created a new faction: "+tag);

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

@@ -3,10 +3,10 @@ package com.massivecraft.factions.cmd;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Perm;
 
-public class CmdDeinvite extends FCommand
+public class CmdFactionsDeinvite extends FCommand
 {
 	
-	public CmdDeinvite()
+	public CmdFactionsDeinvite()
 	{
 		super();
 		this.aliases.add("deinvite");
@@ -33,7 +33,7 @@ public class CmdDeinvite extends FCommand
 		if (you.getFaction() == myFaction)
 		{
 			msg("%s<i> is already a member of %s", you.getName(), myFaction.getTag());
-			msg("<i>You might want to: %s", p.cmdBase.cmdKick.getUseageTemplate(false));
+			msg("<i>You might want to: %s", p.cmdBase.cmdFactionsKick.getUseageTemplate(false));
 			return;
 		}
 		

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

@@ -4,10 +4,10 @@ import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.Rel;
 
-public class CmdDemote extends FCommand
+public class CmdFactionsDemote extends FCommand
 {
 	
-	public CmdDemote()
+	public CmdFactionsDemote()
 	{
 		super();
 		this.aliases.add("demote");

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

@@ -6,9 +6,9 @@ import com.massivecraft.factions.FPlayerColl;
 import com.massivecraft.factions.Perm;
 import com.massivecraft.mcore.util.Txt;
 
-public class CmdDescription extends FCommand
+public class CmdFactionsDescription extends FCommand
 {
-	public CmdDescription()
+	public CmdFactionsDescription()
 	{
 		super();
 		this.aliases.add("desc");

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

@@ -15,9 +15,9 @@ import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.integration.SpoutFeatures;
 
-public class CmdDisband extends FCommand
+public class CmdFactionsDisband extends FCommand
 {
-	public CmdDisband()
+	public CmdFactionsDisband()
 	{
 		super();
 		this.aliases.add("disband");

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

@@ -5,10 +5,10 @@ import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.Perm;
 import com.massivecraft.mcore.util.Txt;
 
-public class CmdFlag extends FCommand
+public class CmdFactionsFlag extends FCommand
 {
 	
-	public CmdFlag()
+	public CmdFactionsFlag()
 	{
 		super();
 		this.aliases.add("flag");

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

@@ -20,10 +20,10 @@ import com.massivecraft.factions.integration.EssentialsFeatures;
 import com.massivecraft.mcore.util.SmokeUtil;
 
 
-public class CmdHome extends FCommand
+public class CmdFactionsHome extends FCommand
 {
 	
-	public CmdHome()
+	public CmdFactionsHome()
 	{
 		super();
 		this.aliases.add("home");
@@ -59,7 +59,7 @@ public class CmdHome extends FCommand
 		if ( ! myFaction.hasHome())
 		{
 			fme.msg("<b>Your faction does not have a home. " + (fme.getRole().isLessThan(Rel.OFFICER) ? "<i> Ask your leader to:" : "<i>You should:"));
-			fme.sendMessage(p.cmdBase.cmdSethome.getUseageTemplate());
+			fme.sendMessage(p.cmdBase.cmdFactionsSethome.getUseageTemplate());
 			return;
 		}
 		

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

@@ -5,9 +5,9 @@ import com.massivecraft.factions.FPerm;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Perm;
 
-public class CmdInvite extends FCommand
+public class CmdFactionsInvite extends FCommand
 {
-	public CmdInvite()
+	public CmdFactionsInvite()
 	{
 		super();
 		this.aliases.add("invite");
@@ -34,7 +34,7 @@ public class CmdInvite extends FCommand
 		if (you.getFaction() == myFaction)
 		{
 			msg("%s<i> is already a member of %s", you.getName(), myFaction.getTag());
-			msg("<i>You might want to: " +  p.cmdBase.cmdKick.getUseageTemplate(false));
+			msg("<i>You might want to: " +  p.cmdBase.cmdFactionsKick.getUseageTemplate(false));
 			return;
 		}
 

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

@@ -10,9 +10,9 @@ import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.event.FPlayerJoinEvent;
 
-public class CmdJoin extends FCommand
+public class CmdFactionsJoin extends FCommand
 {
-	public CmdJoin()
+	public CmdFactionsJoin()
 	{
 		super();
 		this.aliases.add("join");

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

@@ -11,10 +11,10 @@ import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.Rel;
 import com.massivecraft.factions.event.FPlayerLeaveEvent;
 
-public class CmdKick extends FCommand
+public class CmdFactionsKick extends FCommand
 {
 	
-	public CmdKick()
+	public CmdFactionsKick()
 	{
 		super();
 		this.aliases.add("kick");
@@ -40,7 +40,7 @@ public class CmdKick extends FCommand
 		if (fme == you)
 		{
 			msg("<b>You cannot kick yourself.");
-			msg("<i>You might want to: %s", p.cmdBase.cmdLeave.getUseageTemplate(false));
+			msg("<i>You might want to: %s", p.cmdBase.cmdFactionsLeave.getUseageTemplate(false));
 			return;
 		}
 		

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

@@ -11,9 +11,9 @@ import com.massivecraft.factions.event.FPlayerJoinEvent;
 import com.massivecraft.factions.util.RelationUtil;
 import com.massivecraft.mcore.util.Txt;
 
-public class CmdLeader extends FCommand
+public class CmdFactionsLeader extends FCommand
 {	
-	public CmdLeader()
+	public CmdFactionsLeader()
 	{
 		super();
 		this.aliases.add("leader");

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

@@ -2,9 +2,9 @@ package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.Perm;
 
-public class CmdLeave extends FCommand {
+public class CmdFactionsLeave extends FCommand {
 	
-	public CmdLeave()
+	public CmdFactionsLeave()
 	{
 		super();
 		this.aliases.add("leave");

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

@@ -11,10 +11,10 @@ import com.massivecraft.factions.Perm;
 import com.massivecraft.mcore.util.Txt;
 
 
-public class CmdList extends FCommand
+public class CmdFactionsList extends FCommand
 {
 	
-	public CmdList()
+	public CmdFactionsList()
 	{
 		super();
 		this.aliases.add("list");

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

@@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.Perm;
 
-public class CmdLock extends FCommand {
+public class CmdFactionsLock extends FCommand {
 	
 	// TODO: This solution needs refactoring.
 	/*
@@ -11,7 +11,7 @@ public class CmdLock extends FCommand {
 	   default: op
 	 */
 	
-	public CmdLock()
+	public CmdFactionsLock()
 	{
 		super();
 		this.aliases.add("lock");

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

@@ -6,9 +6,9 @@ import com.massivecraft.factions.FLocation;
 import com.massivecraft.factions.Perm;
 
 
-public class CmdMap extends FCommand
+public class CmdFactionsMap extends FCommand
 {
-	public CmdMap()
+	public CmdFactionsMap()
 	{
 		super();
 		this.aliases.add("map");

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

@@ -3,16 +3,16 @@ package com.massivecraft.factions.cmd;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.mcore.util.Txt;
 
-public class CmdMoney extends FCommand
+public class CmdFactionsMoney extends FCommand
 {
-	public CmdMoneyBalance cmdMoneyBalance = new CmdMoneyBalance();
-	public CmdMoneyDeposit cmdMoneyDeposit = new CmdMoneyDeposit();
-	public CmdMoneyWithdraw cmdMoneyWithdraw = new CmdMoneyWithdraw();
-	public CmdMoneyTransferFf cmdMoneyTransferFf = new CmdMoneyTransferFf();
-	public CmdMoneyTransferFp cmdMoneyTransferFp = new CmdMoneyTransferFp();
-	public CmdMoneyTransferPf cmdMoneyTransferPf = new CmdMoneyTransferPf();
+	public CmdFactionsMoneyBalance cmdMoneyBalance = new CmdFactionsMoneyBalance();
+	public CmdFactionsMoneyDeposit cmdMoneyDeposit = new CmdFactionsMoneyDeposit();
+	public CmdFactionsMoneyWithdraw cmdMoneyWithdraw = new CmdFactionsMoneyWithdraw();
+	public CmdFactionsMoneyTransferFf cmdMoneyTransferFf = new CmdFactionsMoneyTransferFf();
+	public CmdFactionsMoneyTransferFp cmdMoneyTransferFp = new CmdFactionsMoneyTransferFp();
+	public CmdFactionsMoneyTransferPf cmdMoneyTransferPf = new CmdFactionsMoneyTransferPf();
 	
-	public CmdMoney()
+	public CmdFactionsMoney()
 	{
 		super();
 		this.aliases.add("money");

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

@@ -4,9 +4,9 @@ import com.massivecraft.factions.integration.Econ;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.Perm;
 
-public class CmdMoneyBalance extends FCommand
+public class CmdFactionsMoneyBalance extends FCommand
 {
-	public CmdMoneyBalance()
+	public CmdFactionsMoneyBalance()
 	{
 		super();
 		this.aliases.add("b");

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

@@ -10,10 +10,10 @@ import com.massivecraft.mcore.util.Txt;
 import org.bukkit.ChatColor;
 
 
-public class CmdMoneyDeposit extends FCommand
+public class CmdFactionsMoneyDeposit extends FCommand
 {
 	
-	public CmdMoneyDeposit()
+	public CmdFactionsMoneyDeposit()
 	{
 		super();
 		this.aliases.add("d");

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

@@ -10,9 +10,9 @@ import com.massivecraft.mcore.util.Txt;
 import org.bukkit.ChatColor;
 
 
-public class CmdMoneyTransferFf extends FCommand
+public class CmdFactionsMoneyTransferFf extends FCommand
 {
-	public CmdMoneyTransferFf()
+	public CmdFactionsMoneyTransferFf()
 	{
 		this.aliases.add("ff");
 		

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

@@ -10,9 +10,9 @@ import com.massivecraft.mcore.util.Txt;
 import org.bukkit.ChatColor;
 
 
-public class CmdMoneyTransferFp extends FCommand
+public class CmdFactionsMoneyTransferFp extends FCommand
 {
-	public CmdMoneyTransferFp()
+	public CmdFactionsMoneyTransferFp()
 	{
 		this.aliases.add("fp");
 		

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

@@ -10,9 +10,9 @@ import com.massivecraft.mcore.util.Txt;
 import org.bukkit.ChatColor;
 
 
-public class CmdMoneyTransferPf extends FCommand
+public class CmdFactionsMoneyTransferPf extends FCommand
 {
-	public CmdMoneyTransferPf()
+	public CmdFactionsMoneyTransferPf()
 	{
 		this.aliases.add("pf");
 		

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

@@ -10,9 +10,9 @@ import com.massivecraft.mcore.util.Txt;
 import org.bukkit.ChatColor;
 
 
-public class CmdMoneyWithdraw extends FCommand
+public class CmdFactionsMoneyWithdraw extends FCommand
 {
-	public CmdMoneyWithdraw()
+	public CmdFactionsMoneyWithdraw()
 	{
 		this.aliases.add("w");
 		this.aliases.add("withdraw");

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

@@ -5,10 +5,10 @@ import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.Rel;
 
-public class CmdOfficer extends FCommand
+public class CmdFactionsOfficer extends FCommand
 {
 	
-	public CmdOfficer()
+	public CmdFactionsOfficer()
 	{
 		super();
 		this.aliases.add("officer");

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

@@ -5,9 +5,9 @@ import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.FactionColl;
 import com.massivecraft.factions.Perm;
 
-public class CmdOpen extends FCommand
+public class CmdFactionsOpen extends FCommand
 {
-	public CmdOpen()
+	public CmdFactionsOpen()
 	{
 		super();
 		this.aliases.add("open");

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

@@ -6,10 +6,10 @@ import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.Rel;
 import com.massivecraft.mcore.util.Txt;
 
-public class CmdPerm extends FCommand
+public class CmdFactionsPerm extends FCommand
 {
 	
-	public CmdPerm()
+	public CmdFactionsPerm()
 	{
 		super();
 		this.aliases.add("perm");

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

@@ -4,10 +4,10 @@ import com.massivecraft.factions.ConfServer;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Perm;
 
-public class CmdPower extends FCommand
+public class CmdFactionsPower extends FCommand
 {
 	
-	public CmdPower()
+	public CmdFactionsPower()
 	{
 		super();
 		this.aliases.add("power");

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

@@ -5,9 +5,9 @@ import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.Perm;
 
-public class CmdPowerBoost extends FCommand
+public class CmdFactionsPowerBoost extends FCommand
 {
-	public CmdPowerBoost()
+	public CmdFactionsPowerBoost()
 	{
 		super();
 		this.aliases.add("powerboost");

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

@@ -4,10 +4,10 @@ import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.Rel;
 
-public class CmdPromote extends FCommand
+public class CmdFactionsPromote extends FCommand
 {
 	
-	public CmdPromote()
+	public CmdFactionsPromote()
 	{
 		super();
 		this.aliases.add("promote");

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

@@ -10,11 +10,11 @@ import com.massivecraft.factions.Rel;
 import com.massivecraft.factions.event.FactionRelationEvent;
 import com.massivecraft.factions.integration.SpoutFeatures;
 
-public abstract class FRelationCommand extends FCommand
+public abstract class CmdFactionsRelationAbstract extends FCommand
 {
 	public Rel targetRelation;
 	
-	public FRelationCommand()
+	public CmdFactionsRelationAbstract()
 	{
 		super();
 		this.requiredArgs.add("faction");

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

@@ -2,9 +2,9 @@ package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.Rel;
 
-public class CmdRelationAlly extends FRelationCommand
+public class CmdFactionsRelationAlly extends CmdFactionsRelationAbstract
 {
-	public CmdRelationAlly()
+	public CmdFactionsRelationAlly()
 	{
 		aliases.add("ally");
 		targetRelation = Rel.ALLY;

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

@@ -2,9 +2,9 @@ package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.Rel;
 
-public class CmdRelationEnemy extends FRelationCommand
+public class CmdFactionsRelationEnemy extends CmdFactionsRelationAbstract
 {
-	public CmdRelationEnemy()
+	public CmdFactionsRelationEnemy()
 	{
 		aliases.add("enemy");
 		targetRelation = Rel.ENEMY;

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

@@ -2,9 +2,9 @@ package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.Rel;
 
-public class CmdRelationNeutral extends FRelationCommand
+public class CmdFactionsRelationNeutral extends CmdFactionsRelationAbstract
 {
-	public CmdRelationNeutral()
+	public CmdFactionsRelationNeutral()
 	{
 		aliases.add("neutral");
 		targetRelation = Rel.NEUTRAL;

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

@@ -2,9 +2,9 @@ package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.Rel;
 
-public class CmdRelationTruce extends FRelationCommand
+public class CmdFactionsRelationTruce extends CmdFactionsRelationAbstract
 {
-	public CmdRelationTruce()
+	public CmdFactionsRelationTruce()
 	{
 		aliases.add("truce");
 		targetRelation = Rel.TRUCE;

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

@@ -6,10 +6,10 @@ import com.massivecraft.factions.FactionColl;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.Perm;
 
-public class CmdReload extends FCommand
+public class CmdFactionsReload extends FCommand
 {
 	
-	public CmdReload()
+	public CmdFactionsReload()
 	{
 		super();
 		this.aliases.add("reload");

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

@@ -5,10 +5,10 @@ import com.massivecraft.factions.FPlayerColl;
 import com.massivecraft.factions.FactionColl;
 import com.massivecraft.factions.Perm;
 
-public class CmdSaveAll extends FCommand
+public class CmdFactionsSaveAll extends FCommand
 {
 	
-	public CmdSaveAll()
+	public CmdFactionsSaveAll()
 	{
 		super();
 		this.aliases.add("saveall");

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

@@ -8,9 +8,9 @@ import org.bukkit.entity.Player;
 import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.util.VisualizeUtil;
 
-public class CmdSeeChunk extends FCommand
+public class CmdFactionsSeeChunk extends FCommand
 {
-	public CmdSeeChunk()
+	public CmdFactionsSeeChunk()
 	{
 		super();
 		this.aliases.add("sc");

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

@@ -7,9 +7,9 @@ import com.massivecraft.factions.FPerm;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.Perm;
 
-public class CmdSethome extends FCommand
+public class CmdFactionsSethome extends FCommand
 {
-	public CmdSethome()
+	public CmdFactionsSethome()
 	{
 		this.aliases.add("sethome");
 		
@@ -60,7 +60,7 @@ public class CmdSethome extends FCommand
 		faction.setHome(me.getLocation());
 		
 		faction.msg("%s<i> set the home for your faction. You can now use:", fme.describeTo(myFaction, true));
-		faction.sendMessage(p.cmdBase.cmdHome.getUseageTemplate());
+		faction.sendMessage(p.cmdBase.cmdFactionsHome.getUseageTemplate());
 		if (faction != myFaction)
 		{
 			fme.msg("<b>You have set the home for the "+faction.getTag(fme)+"<i> faction.");

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

@@ -14,9 +14,9 @@ import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.Rel;
 import com.massivecraft.mcore.util.Txt;
 
-public class CmdShow extends FCommand
+public class CmdFactionsShow extends FCommand
 {
-	public CmdShow()
+	public CmdFactionsShow()
 	{
 		this.aliases.add("show");
 		this.aliases.add("who");

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

@@ -12,10 +12,10 @@ import com.massivecraft.factions.event.FactionRenameEvent;
 import com.massivecraft.factions.integration.SpoutFeatures;
 import com.massivecraft.factions.util.MiscUtil;
 
-public class CmdTag extends FCommand
+public class CmdFactionsTag extends FCommand
 {
 	
-	public CmdTag()
+	public CmdFactionsTag()
 	{
 		this.aliases.add("tag");
 		

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

@@ -6,9 +6,9 @@ import com.massivecraft.factions.Perm;
 import com.massivecraft.factions.integration.SpoutFeatures;
 import com.massivecraft.mcore.util.Txt;
 
-public class CmdTitle extends FCommand
+public class CmdFactionsTitle extends FCommand
 {
-	public CmdTitle()
+	public CmdFactionsTitle()
 	{
 		this.aliases.add("title");
 		

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

@@ -13,9 +13,9 @@ import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.Perm;
 
-public class CmdUnclaim extends FCommand
+public class CmdFactionsUnclaim extends FCommand
 {
-	public CmdUnclaim()
+	public CmdFactionsUnclaim()
 	{
 		this.aliases.add("unclaim");
 		this.aliases.add("declaim");

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

@@ -10,9 +10,9 @@ import com.massivecraft.factions.event.LandUnclaimAllEvent;
 import com.massivecraft.factions.integration.Econ;
 import com.massivecraft.factions.integration.SpoutFeatures;
 
-public class CmdUnclaimall extends FCommand
+public class CmdFactionsUnclaimall extends FCommand
 {	
-	public CmdUnclaimall()
+	public CmdFactionsUnclaimall()
 	{
 		this.aliases.add("unclaimall");
 		this.aliases.add("declaimall");

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

@@ -4,9 +4,9 @@ import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.Perm;
 
 
-public class CmdVersion extends FCommand
+public class CmdFactionsVersion extends FCommand
 {
-	public CmdVersion()
+	public CmdFactionsVersion()
 	{
 		this.aliases.add("version");
 		

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

@@ -1,123 +0,0 @@
-package com.massivecraft.factions.cmd;
-
-import java.util.Collections;
-
-import com.massivecraft.factions.ConfServer;
-import com.massivecraft.factions.Factions;
-import com.massivecraft.mcore.util.Txt;
-
-public class FCmdRoot extends FCommand
-{
-	public CmdAccess cmdAccess = new CmdAccess();
-	public CmdLeader cmdLeader = new CmdLeader();
-	public CmdAutoClaim cmdAutoClaim = new CmdAutoClaim();
-	public CmdAdmin cmdBypass = new CmdAdmin();
-	public CmdCape cmdCape = new CmdCape();
-	public CmdClaim cmdClaim = new CmdClaim();
-	public CmdCreate cmdCreate = new CmdCreate();
-	public CmdDeinvite cmdDeinvite = new CmdDeinvite();
-	public CmdDemote cmdDemote = new CmdDemote();
-	public CmdDescription cmdDescription = new CmdDescription();
-	public CmdDisband cmdDisband = new CmdDisband();
-	public CmdFlag cmdFlag = new CmdFlag();
-	public CmdHome cmdHome = new CmdHome();
-	public CmdInvite cmdInvite = new CmdInvite();
-	public CmdJoin cmdJoin = new CmdJoin();
-	public CmdKick cmdKick = new CmdKick();
-	public CmdLeave cmdLeave = new CmdLeave();
-	public CmdList cmdList = new CmdList();
-	public CmdLock cmdLock = new CmdLock();
-	public CmdMap cmdMap = new CmdMap();
-	public CmdOfficer cmdOfficer = new CmdOfficer();
-	public CmdMoney cmdMoney = new CmdMoney();
-	public CmdOpen cmdOpen = new CmdOpen();
-	public CmdPerm cmdPerm = new CmdPerm();
-	public CmdPower cmdPower = new CmdPower();
-	public CmdPowerBoost cmdPowerBoost = new CmdPowerBoost();
-	public CmdPromote cmdPromote = new CmdPromote();
-	public CmdRelationAlly cmdRelationAlly = new CmdRelationAlly();
-	public CmdRelationEnemy cmdRelationEnemy = new CmdRelationEnemy();
-	public CmdRelationNeutral cmdRelationNeutral = new CmdRelationNeutral();
-	public CmdRelationTruce cmdRelationTruce = new CmdRelationTruce();
-	public CmdReload cmdReload = new CmdReload();
-	public CmdSaveAll cmdSaveAll = new CmdSaveAll();
-	public CmdSeeChunk cmdSeeChunks = new CmdSeeChunk();
-	public CmdSethome cmdSethome = new CmdSethome();
-	public CmdShow cmdShow = new CmdShow();
-	public CmdTag cmdTag = new CmdTag();
-	public CmdTitle cmdTitle = new CmdTitle();
-	public CmdUnclaim cmdUnclaim = new CmdUnclaim();
-	public CmdUnclaimall cmdUnclaimall = new CmdUnclaimall();
-	public CmdVersion cmdVersion = new CmdVersion();
-	
-	public FCmdRoot()
-	{
-		super();
-		this.aliases.addAll(ConfServer.baseCommandAliases);
-		this.aliases.removeAll(Collections.singletonList(null));  // remove any nulls from extra commas
-		
-		//this.requiredArgs.add("");
-		//this.optionalArgs.put("","")
-		
-		senderMustBePlayer = false;
-		senderMustBeMember = false;
-		senderMustBeOfficer = false;
-		senderMustBeLeader = false;
-		
-		this.disableOnLock = 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(this.cmdList);
-		this.addSubCommand(this.cmdShow);
-		this.addSubCommand(this.cmdPower);
-		this.addSubCommand(this.cmdJoin);
-		this.addSubCommand(this.cmdLeave);
-		this.addSubCommand(this.cmdHome);
-		this.addSubCommand(this.cmdCreate);
-		this.addSubCommand(this.cmdSethome);
-		this.addSubCommand(this.cmdTag);
-		this.addSubCommand(this.cmdDemote);
-		this.addSubCommand(this.cmdDescription);
-		this.addSubCommand(this.cmdCape);
-		this.addSubCommand(this.cmdPerm);
-		this.addSubCommand(this.cmdFlag);
-		this.addSubCommand(this.cmdInvite);
-		this.addSubCommand(this.cmdDeinvite);
-		this.addSubCommand(this.cmdOpen);
-		this.addSubCommand(this.cmdMoney);
-		this.addSubCommand(this.cmdClaim);
-		this.addSubCommand(this.cmdAutoClaim);
-		this.addSubCommand(this.cmdUnclaim);
-		this.addSubCommand(this.cmdUnclaimall);
-		this.addSubCommand(this.cmdAccess);
-		this.addSubCommand(this.cmdKick);
-		this.addSubCommand(this.cmdOfficer);
-		this.addSubCommand(this.cmdLeader);
-		this.addSubCommand(this.cmdTitle);
-		this.addSubCommand(this.cmdMap);
-		this.addSubCommand(this.cmdSeeChunks);
-		this.addSubCommand(this.cmdDisband);
-		this.addSubCommand(this.cmdRelationAlly);
-		this.addSubCommand(this.cmdRelationEnemy);
-		this.addSubCommand(this.cmdRelationNeutral);
-		this.addSubCommand(this.cmdRelationTruce);
-		this.addSubCommand(this.cmdBypass);
-		this.addSubCommand(this.cmdPowerBoost);
-		this.addSubCommand(this.cmdPromote);
-		this.addSubCommand(this.cmdLock);
-		this.addSubCommand(this.cmdReload);
-		this.addSubCommand(this.cmdSaveAll);
-		this.addSubCommand(this.cmdVersion);
-	}
-	
-	@Override
-	public void perform()
-	{
-		this.commandChain.add(this);
-		Factions.get().cmdAutoHelp.execute(this.sender, this.args, this.commandChain);
-	}
-
-}