From 01585801b95c14c064b47bbaf02f8576f4432dfe Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Wed, 10 Apr 2013 13:12:22 +0200 Subject: [PATCH] Rename command files --- src/com/massivecraft/factions/ConfServer.java | 2 +- src/com/massivecraft/factions/FPerm.java | 2 +- src/com/massivecraft/factions/Factions.java | 8 +- .../factions/cmd/CmdFactions.java | 126 ++++++++++++++++++ ...{CmdAccess.java => CmdFactionsAccess.java} | 4 +- .../{CmdAdmin.java => CmdFactionsAdmin.java} | 4 +- ...toClaim.java => CmdFactionsAutoClaim.java} | 4 +- ...AutoHelp.java => CmdFactionsAutoHelp.java} | 4 +- .../{CmdCape.java => CmdFactionsCape.java} | 10 +- ...ract.java => CmdFactionsCapeAbstract.java} | 4 +- ...mdCapeGet.java => CmdFactionsCapeGet.java} | 4 +- ...Remove.java => CmdFactionsCapeRemove.java} | 4 +- ...mdCapeSet.java => CmdFactionsCapeSet.java} | 4 +- .../{CmdClaim.java => CmdFactionsClaim.java} | 4 +- ...{CmdCreate.java => CmdFactionsCreate.java} | 6 +- ...Deinvite.java => CmdFactionsDeinvite.java} | 6 +- ...{CmdDemote.java => CmdFactionsDemote.java} | 4 +- ...ption.java => CmdFactionsDescription.java} | 4 +- ...mdDisband.java => CmdFactionsDisband.java} | 4 +- .../{CmdFlag.java => CmdFactionsFlag.java} | 4 +- .../{CmdHome.java => CmdFactionsHome.java} | 6 +- ...{CmdInvite.java => CmdFactionsInvite.java} | 6 +- .../{CmdJoin.java => CmdFactionsJoin.java} | 4 +- .../{CmdKick.java => CmdFactionsKick.java} | 6 +- ...{CmdLeader.java => CmdFactionsLeader.java} | 4 +- .../{CmdLeave.java => CmdFactionsLeave.java} | 4 +- .../{CmdList.java => CmdFactionsList.java} | 4 +- .../{CmdLock.java => CmdFactionsLock.java} | 4 +- .../cmd/{CmdMap.java => CmdFactionsMap.java} | 4 +- .../{CmdMoney.java => CmdFactionsMoney.java} | 16 +-- ...ance.java => CmdFactionsMoneyBalance.java} | 4 +- ...osit.java => CmdFactionsMoneyDeposit.java} | 4 +- ...f.java => CmdFactionsMoneyTransferFf.java} | 4 +- ...p.java => CmdFactionsMoneyTransferFp.java} | 4 +- ...f.java => CmdFactionsMoneyTransferPf.java} | 4 +- ...raw.java => CmdFactionsMoneyWithdraw.java} | 4 +- ...mdOfficer.java => CmdFactionsOfficer.java} | 4 +- .../{CmdOpen.java => CmdFactionsOpen.java} | 4 +- .../{CmdPerm.java => CmdFactionsPerm.java} | 4 +- .../{CmdPower.java => CmdFactionsPower.java} | 4 +- ...rBoost.java => CmdFactionsPowerBoost.java} | 4 +- ...mdPromote.java => CmdFactionsPromote.java} | 4 +- ....java => CmdFactionsRelationAbstract.java} | 4 +- ...Ally.java => CmdFactionsRelationAlly.java} | 4 +- ...emy.java => CmdFactionsRelationEnemy.java} | 4 +- ...l.java => CmdFactionsRelationNeutral.java} | 4 +- ...uce.java => CmdFactionsRelationTruce.java} | 4 +- ...{CmdReload.java => CmdFactionsReload.java} | 4 +- ...mdSaveAll.java => CmdFactionsSaveAll.java} | 4 +- ...SeeChunk.java => CmdFactionsSeeChunk.java} | 4 +- ...mdSethome.java => CmdFactionsSethome.java} | 6 +- .../{CmdShow.java => CmdFactionsShow.java} | 4 +- .../cmd/{CmdTag.java => CmdFactionsTag.java} | 4 +- .../{CmdTitle.java => CmdFactionsTitle.java} | 4 +- ...mdUnclaim.java => CmdFactionsUnclaim.java} | 4 +- ...aimall.java => CmdFactionsUnclaimall.java} | 4 +- ...mdVersion.java => CmdFactionsVersion.java} | 4 +- .../massivecraft/factions/cmd/FCmdRoot.java | 123 ----------------- 58 files changed, 253 insertions(+), 250 deletions(-) create mode 100644 src/com/massivecraft/factions/cmd/CmdFactions.java rename src/com/massivecraft/factions/cmd/{CmdAccess.java => CmdFactionsAccess.java} (97%) rename src/com/massivecraft/factions/cmd/{CmdAdmin.java => CmdFactionsAdmin.java} (92%) rename src/com/massivecraft/factions/cmd/{CmdAutoClaim.java => CmdFactionsAutoClaim.java} (92%) rename src/com/massivecraft/factions/cmd/{CmdAutoHelp.java => CmdFactionsAutoHelp.java} (88%) rename src/com/massivecraft/factions/cmd/{CmdCape.java => CmdFactionsCape.java} (68%) rename src/com/massivecraft/factions/cmd/{CmdCapeAbstract.java => CmdFactionsCapeAbstract.java} (92%) rename src/com/massivecraft/factions/cmd/{CmdCapeGet.java => CmdFactionsCapeGet.java} (81%) rename src/com/massivecraft/factions/cmd/{CmdCapeRemove.java => CmdFactionsCapeRemove.java} (90%) rename src/com/massivecraft/factions/cmd/{CmdCapeSet.java => CmdFactionsCapeSet.java} (92%) rename src/com/massivecraft/factions/cmd/{CmdClaim.java => CmdFactionsClaim.java} (95%) rename src/com/massivecraft/factions/cmd/{CmdCreate.java => CmdFactionsCreate.java} (94%) rename src/com/massivecraft/factions/cmd/{CmdDeinvite.java => CmdFactionsDeinvite.java} (85%) rename src/com/massivecraft/factions/cmd/{CmdDemote.java => CmdFactionsDemote.java} (95%) rename src/com/massivecraft/factions/cmd/{CmdDescription.java => CmdFactionsDescription.java} (95%) rename src/com/massivecraft/factions/cmd/{CmdDisband.java => CmdFactionsDisband.java} (97%) rename src/com/massivecraft/factions/cmd/{CmdFlag.java => CmdFactionsFlag.java} (91%) rename src/com/massivecraft/factions/cmd/{CmdHome.java => CmdFactionsHome.java} (96%) rename src/com/massivecraft/factions/cmd/{CmdInvite.java => CmdFactionsInvite.java} (88%) rename src/com/massivecraft/factions/cmd/{CmdJoin.java => CmdFactionsJoin.java} (98%) rename src/com/massivecraft/factions/cmd/{CmdKick.java => CmdFactionsKick.java} (94%) rename src/com/massivecraft/factions/cmd/{CmdLeader.java => CmdFactionsLeader.java} (97%) rename src/com/massivecraft/factions/cmd/{CmdLeave.java => CmdFactionsLeave.java} (85%) rename src/com/massivecraft/factions/cmd/{CmdList.java => CmdFactionsList.java} (98%) rename src/com/massivecraft/factions/cmd/{CmdLock.java => CmdFactionsLock.java} (87%) rename src/com/massivecraft/factions/cmd/{CmdMap.java => CmdFactionsMap.java} (95%) rename src/com/massivecraft/factions/cmd/{CmdMoney.java => CmdFactionsMoney.java} (61%) rename src/com/massivecraft/factions/cmd/{CmdMoneyBalance.java => CmdFactionsMoneyBalance.java} (90%) rename src/com/massivecraft/factions/cmd/{CmdMoneyDeposit.java => CmdFactionsMoneyDeposit.java} (93%) rename src/com/massivecraft/factions/cmd/{CmdMoneyTransferFf.java => CmdFactionsMoneyTransferFf.java} (93%) rename src/com/massivecraft/factions/cmd/{CmdMoneyTransferFp.java => CmdFactionsMoneyTransferFp.java} (93%) rename src/com/massivecraft/factions/cmd/{CmdMoneyTransferPf.java => CmdFactionsMoneyTransferPf.java} (93%) rename src/com/massivecraft/factions/cmd/{CmdMoneyWithdraw.java => CmdFactionsMoneyWithdraw.java} (92%) rename src/com/massivecraft/factions/cmd/{CmdOfficer.java => CmdFactionsOfficer.java} (95%) rename src/com/massivecraft/factions/cmd/{CmdOpen.java => CmdFactionsOpen.java} (94%) rename src/com/massivecraft/factions/cmd/{CmdPerm.java => CmdFactionsPerm.java} (93%) rename src/com/massivecraft/factions/cmd/{CmdPower.java => CmdFactionsPower.java} (94%) rename src/com/massivecraft/factions/cmd/{CmdPowerBoost.java => CmdFactionsPowerBoost.java} (95%) rename src/com/massivecraft/factions/cmd/{CmdPromote.java => CmdFactionsPromote.java} (95%) rename src/com/massivecraft/factions/cmd/{FRelationCommand.java => CmdFactionsRelationAbstract.java} (96%) rename src/com/massivecraft/factions/cmd/{CmdRelationAlly.java => CmdFactionsRelationAlly.java} (56%) rename src/com/massivecraft/factions/cmd/{CmdRelationEnemy.java => CmdFactionsRelationEnemy.java} (56%) rename src/com/massivecraft/factions/cmd/{CmdRelationNeutral.java => CmdFactionsRelationNeutral.java} (56%) rename src/com/massivecraft/factions/cmd/{CmdRelationTruce.java => CmdFactionsRelationTruce.java} (56%) rename src/com/massivecraft/factions/cmd/{CmdReload.java => CmdFactionsReload.java} (91%) rename src/com/massivecraft/factions/cmd/{CmdSaveAll.java => CmdFactionsSaveAll.java} (85%) rename src/com/massivecraft/factions/cmd/{CmdSeeChunk.java => CmdFactionsSeeChunk.java} (95%) rename src/com/massivecraft/factions/cmd/{CmdSethome.java => CmdFactionsSethome.java} (92%) rename src/com/massivecraft/factions/cmd/{CmdShow.java => CmdFactionsShow.java} (98%) rename src/com/massivecraft/factions/cmd/{CmdTag.java => CmdFactionsTag.java} (97%) rename src/com/massivecraft/factions/cmd/{CmdTitle.java => CmdFactionsTitle.java} (94%) rename src/com/massivecraft/factions/cmd/{CmdUnclaim.java => CmdFactionsUnclaim.java} (96%) rename src/com/massivecraft/factions/cmd/{CmdUnclaimall.java => CmdFactionsUnclaimall.java} (95%) rename src/com/massivecraft/factions/cmd/{CmdVersion.java => CmdFactionsVersion.java} (87%) delete mode 100644 src/com/massivecraft/factions/cmd/FCmdRoot.java diff --git a/src/com/massivecraft/factions/ConfServer.java b/src/com/massivecraft/factions/ConfServer.java index c5aab9df..72a3d262 100644 --- a/src/com/massivecraft/factions/ConfServer.java +++ b/src/com/massivecraft/factions/ConfServer.java @@ -21,7 +21,7 @@ public class ConfServer extends SimpleConfig // FIELDS // -------------------------------------------- // - public final static transient List baseCommandAliases = MUtil.list("f"); + public final static List baseCommandAliases = MUtil.list("f"); // Colors public static ChatColor colorMember = ChatColor.GREEN; diff --git a/src/com/massivecraft/factions/FPerm.java b/src/com/massivecraft/factions/FPerm.java index c238f288..a90cc76e 100644 --- a/src/com/massivecraft/factions/FPerm.java +++ b/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("You can bypass by using " + Factions.get().cmdBase.cmdBypass.getUseageTemplate(false)); + fplayer.msg("You can bypass by using " + Factions.get().cmdBase.cmdFactionsAdmin.getUseageTemplate(false)); } } return ret; diff --git a/src/com/massivecraft/factions/Factions.java b/src/com/massivecraft/factions/Factions.java index d47227ee..8ae87fb1 100644 --- a/src/com/massivecraft/factions/Factions.java +++ b/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(); diff --git a/src/com/massivecraft/factions/cmd/CmdFactions.java b/src/com/massivecraft/factions/cmd/CmdFactions.java new file mode 100644 index 00000000..51fcac1c --- /dev/null +++ b/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("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); + } + +} diff --git a/src/com/massivecraft/factions/cmd/CmdAccess.java b/src/com/massivecraft/factions/cmd/CmdFactionsAccess.java similarity index 97% rename from src/com/massivecraft/factions/cmd/CmdAccess.java rename to src/com/massivecraft/factions/cmd/CmdFactionsAccess.java index 0bf9d49c..ce3d29ab 100644 --- a/src/com/massivecraft/factions/cmd/CmdAccess.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdAdmin.java b/src/com/massivecraft/factions/cmd/CmdFactionsAdmin.java similarity index 92% rename from src/com/massivecraft/factions/cmd/CmdAdmin.java rename to src/com/massivecraft/factions/cmd/CmdFactionsAdmin.java index 435a39f2..27f9ad47 100644 --- a/src/com/massivecraft/factions/cmd/CmdAdmin.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdAutoClaim.java b/src/com/massivecraft/factions/cmd/CmdFactionsAutoClaim.java similarity index 92% rename from src/com/massivecraft/factions/cmd/CmdAutoClaim.java rename to src/com/massivecraft/factions/cmd/CmdFactionsAutoClaim.java index 11cd70bd..03ce5f9a 100644 --- a/src/com/massivecraft/factions/cmd/CmdAutoClaim.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdAutoHelp.java b/src/com/massivecraft/factions/cmd/CmdFactionsAutoHelp.java similarity index 88% rename from src/com/massivecraft/factions/cmd/CmdAutoHelp.java rename to src/com/massivecraft/factions/cmd/CmdFactionsAutoHelp.java index a0f7b1fc..fddcdb99 100644 --- a/src/com/massivecraft/factions/cmd/CmdAutoHelp.java +++ b/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 +public class CmdFactionsAutoHelp extends MCommand { - public CmdAutoHelp() + public CmdFactionsAutoHelp() { super(Factions.get()); this.aliases.add("?"); diff --git a/src/com/massivecraft/factions/cmd/CmdCape.java b/src/com/massivecraft/factions/cmd/CmdFactionsCape.java similarity index 68% rename from src/com/massivecraft/factions/cmd/CmdCape.java rename to src/com/massivecraft/factions/cmd/CmdFactionsCape.java index fd4a3bd3..320a0448 100644 --- a/src/com/massivecraft/factions/cmd/CmdCape.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdCapeAbstract.java b/src/com/massivecraft/factions/cmd/CmdFactionsCapeAbstract.java similarity index 92% rename from src/com/massivecraft/factions/cmd/CmdCapeAbstract.java rename to src/com/massivecraft/factions/cmd/CmdFactionsCapeAbstract.java index 2135bcf9..48ecbeb1 100644 --- a/src/com/massivecraft/factions/cmd/CmdCapeAbstract.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdCapeGet.java b/src/com/massivecraft/factions/cmd/CmdFactionsCapeGet.java similarity index 81% rename from src/com/massivecraft/factions/cmd/CmdCapeGet.java rename to src/com/massivecraft/factions/cmd/CmdFactionsCapeGet.java index 1bf2f650..9aa315d9 100644 --- a/src/com/massivecraft/factions/cmd/CmdCapeGet.java +++ b/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; diff --git a/src/com/massivecraft/factions/cmd/CmdCapeRemove.java b/src/com/massivecraft/factions/cmd/CmdFactionsCapeRemove.java similarity index 90% rename from src/com/massivecraft/factions/cmd/CmdCapeRemove.java rename to src/com/massivecraft/factions/cmd/CmdFactionsCapeRemove.java index 2c87fb3c..b3dea181 100644 --- a/src/com/massivecraft/factions/cmd/CmdCapeRemove.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdCapeSet.java b/src/com/massivecraft/factions/cmd/CmdFactionsCapeSet.java similarity index 92% rename from src/com/massivecraft/factions/cmd/CmdCapeSet.java rename to src/com/massivecraft/factions/cmd/CmdFactionsCapeSet.java index 5c6ed66a..074d610b 100644 --- a/src/com/massivecraft/factions/cmd/CmdCapeSet.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdClaim.java b/src/com/massivecraft/factions/cmd/CmdFactionsClaim.java similarity index 95% rename from src/com/massivecraft/factions/cmd/CmdClaim.java rename to src/com/massivecraft/factions/cmd/CmdFactionsClaim.java index c191b46c..e9faba4b 100644 --- a/src/com/massivecraft/factions/cmd/CmdClaim.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdCreate.java b/src/com/massivecraft/factions/cmd/CmdFactionsCreate.java similarity index 94% rename from src/com/massivecraft/factions/cmd/CmdCreate.java rename to src/com/massivecraft/factions/cmd/CmdFactionsCreate.java index bda4dff6..0217e29b 100644 --- a/src/com/massivecraft/factions/cmd/CmdCreate.java +++ b/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 created a new faction %s", fme.describeTo(follower, true), faction.getTag(follower)); } - msg("You should now: %s", p.cmdBase.cmdDescription.getUseageTemplate()); + msg("You should now: %s", p.cmdBase.cmdFactionsDescription.getUseageTemplate()); if (ConfServer.logFactionCreate) Factions.get().log(fme.getName()+" created a new faction: "+tag); diff --git a/src/com/massivecraft/factions/cmd/CmdDeinvite.java b/src/com/massivecraft/factions/cmd/CmdFactionsDeinvite.java similarity index 85% rename from src/com/massivecraft/factions/cmd/CmdDeinvite.java rename to src/com/massivecraft/factions/cmd/CmdFactionsDeinvite.java index a6279b75..d0929b2f 100644 --- a/src/com/massivecraft/factions/cmd/CmdDeinvite.java +++ b/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 is already a member of %s", you.getName(), myFaction.getTag()); - msg("You might want to: %s", p.cmdBase.cmdKick.getUseageTemplate(false)); + msg("You might want to: %s", p.cmdBase.cmdFactionsKick.getUseageTemplate(false)); return; } diff --git a/src/com/massivecraft/factions/cmd/CmdDemote.java b/src/com/massivecraft/factions/cmd/CmdFactionsDemote.java similarity index 95% rename from src/com/massivecraft/factions/cmd/CmdDemote.java rename to src/com/massivecraft/factions/cmd/CmdFactionsDemote.java index 942c4cb0..a5c8e00c 100644 --- a/src/com/massivecraft/factions/cmd/CmdDemote.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdDescription.java b/src/com/massivecraft/factions/cmd/CmdFactionsDescription.java similarity index 95% rename from src/com/massivecraft/factions/cmd/CmdDescription.java rename to src/com/massivecraft/factions/cmd/CmdFactionsDescription.java index 7cd1566d..e32704cd 100644 --- a/src/com/massivecraft/factions/cmd/CmdDescription.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdDisband.java b/src/com/massivecraft/factions/cmd/CmdFactionsDisband.java similarity index 97% rename from src/com/massivecraft/factions/cmd/CmdDisband.java rename to src/com/massivecraft/factions/cmd/CmdFactionsDisband.java index 5739f529..c60ff1cf 100644 --- a/src/com/massivecraft/factions/cmd/CmdDisband.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdFlag.java b/src/com/massivecraft/factions/cmd/CmdFactionsFlag.java similarity index 91% rename from src/com/massivecraft/factions/cmd/CmdFlag.java rename to src/com/massivecraft/factions/cmd/CmdFactionsFlag.java index 01eb37ec..15208d50 100644 --- a/src/com/massivecraft/factions/cmd/CmdFlag.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdHome.java b/src/com/massivecraft/factions/cmd/CmdFactionsHome.java similarity index 96% rename from src/com/massivecraft/factions/cmd/CmdHome.java rename to src/com/massivecraft/factions/cmd/CmdFactionsHome.java index c26414c9..efa8de34 100644 --- a/src/com/massivecraft/factions/cmd/CmdHome.java +++ b/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("Your faction does not have a home. " + (fme.getRole().isLessThan(Rel.OFFICER) ? " Ask your leader to:" : "You should:")); - fme.sendMessage(p.cmdBase.cmdSethome.getUseageTemplate()); + fme.sendMessage(p.cmdBase.cmdFactionsSethome.getUseageTemplate()); return; } diff --git a/src/com/massivecraft/factions/cmd/CmdInvite.java b/src/com/massivecraft/factions/cmd/CmdFactionsInvite.java similarity index 88% rename from src/com/massivecraft/factions/cmd/CmdInvite.java rename to src/com/massivecraft/factions/cmd/CmdFactionsInvite.java index 582ab8b9..0504e204 100644 --- a/src/com/massivecraft/factions/cmd/CmdInvite.java +++ b/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 is already a member of %s", you.getName(), myFaction.getTag()); - msg("You might want to: " + p.cmdBase.cmdKick.getUseageTemplate(false)); + msg("You might want to: " + p.cmdBase.cmdFactionsKick.getUseageTemplate(false)); return; } diff --git a/src/com/massivecraft/factions/cmd/CmdJoin.java b/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java similarity index 98% rename from src/com/massivecraft/factions/cmd/CmdJoin.java rename to src/com/massivecraft/factions/cmd/CmdFactionsJoin.java index 392df9e4..bb5d4814 100644 --- a/src/com/massivecraft/factions/cmd/CmdJoin.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdKick.java b/src/com/massivecraft/factions/cmd/CmdFactionsKick.java similarity index 94% rename from src/com/massivecraft/factions/cmd/CmdKick.java rename to src/com/massivecraft/factions/cmd/CmdFactionsKick.java index 7233e201..96f819b9 100644 --- a/src/com/massivecraft/factions/cmd/CmdKick.java +++ b/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("You cannot kick yourself."); - msg("You might want to: %s", p.cmdBase.cmdLeave.getUseageTemplate(false)); + msg("You might want to: %s", p.cmdBase.cmdFactionsLeave.getUseageTemplate(false)); return; } diff --git a/src/com/massivecraft/factions/cmd/CmdLeader.java b/src/com/massivecraft/factions/cmd/CmdFactionsLeader.java similarity index 97% rename from src/com/massivecraft/factions/cmd/CmdLeader.java rename to src/com/massivecraft/factions/cmd/CmdFactionsLeader.java index c2ef7b5f..2e3bfbf6 100644 --- a/src/com/massivecraft/factions/cmd/CmdLeader.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdLeave.java b/src/com/massivecraft/factions/cmd/CmdFactionsLeave.java similarity index 85% rename from src/com/massivecraft/factions/cmd/CmdLeave.java rename to src/com/massivecraft/factions/cmd/CmdFactionsLeave.java index 51937f43..f2bae021 100644 --- a/src/com/massivecraft/factions/cmd/CmdLeave.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdList.java b/src/com/massivecraft/factions/cmd/CmdFactionsList.java similarity index 98% rename from src/com/massivecraft/factions/cmd/CmdList.java rename to src/com/massivecraft/factions/cmd/CmdFactionsList.java index 26b1b561..3cd6311e 100644 --- a/src/com/massivecraft/factions/cmd/CmdList.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdLock.java b/src/com/massivecraft/factions/cmd/CmdFactionsLock.java similarity index 87% rename from src/com/massivecraft/factions/cmd/CmdLock.java rename to src/com/massivecraft/factions/cmd/CmdFactionsLock.java index 53db6fc8..42e15efe 100644 --- a/src/com/massivecraft/factions/cmd/CmdLock.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdMap.java b/src/com/massivecraft/factions/cmd/CmdFactionsMap.java similarity index 95% rename from src/com/massivecraft/factions/cmd/CmdMap.java rename to src/com/massivecraft/factions/cmd/CmdFactionsMap.java index 698624b9..1113523d 100644 --- a/src/com/massivecraft/factions/cmd/CmdMap.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdMoney.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoney.java similarity index 61% rename from src/com/massivecraft/factions/cmd/CmdMoney.java rename to src/com/massivecraft/factions/cmd/CmdFactionsMoney.java index 588edfec..f45c596f 100644 --- a/src/com/massivecraft/factions/cmd/CmdMoney.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdMoneyBalance.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java similarity index 90% rename from src/com/massivecraft/factions/cmd/CmdMoneyBalance.java rename to src/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java index 0dfbbaad..6d69dc51 100644 --- a/src/com/massivecraft/factions/cmd/CmdMoneyBalance.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdMoneyDeposit.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java similarity index 93% rename from src/com/massivecraft/factions/cmd/CmdMoneyDeposit.java rename to src/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java index 6f2906ad..406e9d4e 100644 --- a/src/com/massivecraft/factions/cmd/CmdMoneyDeposit.java +++ 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"); diff --git a/src/com/massivecraft/factions/cmd/CmdMoneyTransferFf.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java similarity index 93% rename from src/com/massivecraft/factions/cmd/CmdMoneyTransferFf.java rename to src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java index 52a55c41..9d5540c5 100644 --- a/src/com/massivecraft/factions/cmd/CmdMoneyTransferFf.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdMoneyTransferFp.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java similarity index 93% rename from src/com/massivecraft/factions/cmd/CmdMoneyTransferFp.java rename to src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java index 2ee5d9e0..13459f3e 100644 --- a/src/com/massivecraft/factions/cmd/CmdMoneyTransferFp.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdMoneyTransferPf.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java similarity index 93% rename from src/com/massivecraft/factions/cmd/CmdMoneyTransferPf.java rename to src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java index 82372465..a75d0b76 100644 --- a/src/com/massivecraft/factions/cmd/CmdMoneyTransferPf.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java similarity index 92% rename from src/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java rename to src/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java index 12d53332..8e279b00 100644 --- a/src/com/massivecraft/factions/cmd/CmdMoneyWithdraw.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdOfficer.java b/src/com/massivecraft/factions/cmd/CmdFactionsOfficer.java similarity index 95% rename from src/com/massivecraft/factions/cmd/CmdOfficer.java rename to src/com/massivecraft/factions/cmd/CmdFactionsOfficer.java index 7866b5ed..04f3ab0f 100644 --- a/src/com/massivecraft/factions/cmd/CmdOfficer.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdOpen.java b/src/com/massivecraft/factions/cmd/CmdFactionsOpen.java similarity index 94% rename from src/com/massivecraft/factions/cmd/CmdOpen.java rename to src/com/massivecraft/factions/cmd/CmdFactionsOpen.java index 458301b5..5a74f5bf 100644 --- a/src/com/massivecraft/factions/cmd/CmdOpen.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdPerm.java b/src/com/massivecraft/factions/cmd/CmdFactionsPerm.java similarity index 93% rename from src/com/massivecraft/factions/cmd/CmdPerm.java rename to src/com/massivecraft/factions/cmd/CmdFactionsPerm.java index 4263f7bb..279cffcf 100644 --- a/src/com/massivecraft/factions/cmd/CmdPerm.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdPower.java b/src/com/massivecraft/factions/cmd/CmdFactionsPower.java similarity index 94% rename from src/com/massivecraft/factions/cmd/CmdPower.java rename to src/com/massivecraft/factions/cmd/CmdFactionsPower.java index cadfd5fe..d9111b01 100644 --- a/src/com/massivecraft/factions/cmd/CmdPower.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdPowerBoost.java b/src/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java similarity index 95% rename from src/com/massivecraft/factions/cmd/CmdPowerBoost.java rename to src/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java index be8c4133..29562d08 100644 --- a/src/com/massivecraft/factions/cmd/CmdPowerBoost.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdPromote.java b/src/com/massivecraft/factions/cmd/CmdFactionsPromote.java similarity index 95% rename from src/com/massivecraft/factions/cmd/CmdPromote.java rename to src/com/massivecraft/factions/cmd/CmdFactionsPromote.java index 36332be3..c6a26220 100644 --- a/src/com/massivecraft/factions/cmd/CmdPromote.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/FRelationCommand.java b/src/com/massivecraft/factions/cmd/CmdFactionsRelationAbstract.java similarity index 96% rename from src/com/massivecraft/factions/cmd/FRelationCommand.java rename to src/com/massivecraft/factions/cmd/CmdFactionsRelationAbstract.java index cc88d46c..d38b9356 100644 --- a/src/com/massivecraft/factions/cmd/FRelationCommand.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdRelationAlly.java b/src/com/massivecraft/factions/cmd/CmdFactionsRelationAlly.java similarity index 56% rename from src/com/massivecraft/factions/cmd/CmdRelationAlly.java rename to src/com/massivecraft/factions/cmd/CmdFactionsRelationAlly.java index c7b999aa..6e8f47fd 100644 --- a/src/com/massivecraft/factions/cmd/CmdRelationAlly.java +++ b/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; diff --git a/src/com/massivecraft/factions/cmd/CmdRelationEnemy.java b/src/com/massivecraft/factions/cmd/CmdFactionsRelationEnemy.java similarity index 56% rename from src/com/massivecraft/factions/cmd/CmdRelationEnemy.java rename to src/com/massivecraft/factions/cmd/CmdFactionsRelationEnemy.java index 2d36f9f6..0e210b58 100644 --- a/src/com/massivecraft/factions/cmd/CmdRelationEnemy.java +++ b/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; diff --git a/src/com/massivecraft/factions/cmd/CmdRelationNeutral.java b/src/com/massivecraft/factions/cmd/CmdFactionsRelationNeutral.java similarity index 56% rename from src/com/massivecraft/factions/cmd/CmdRelationNeutral.java rename to src/com/massivecraft/factions/cmd/CmdFactionsRelationNeutral.java index 833d5e3d..92f9ccc9 100644 --- a/src/com/massivecraft/factions/cmd/CmdRelationNeutral.java +++ b/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; diff --git a/src/com/massivecraft/factions/cmd/CmdRelationTruce.java b/src/com/massivecraft/factions/cmd/CmdFactionsRelationTruce.java similarity index 56% rename from src/com/massivecraft/factions/cmd/CmdRelationTruce.java rename to src/com/massivecraft/factions/cmd/CmdFactionsRelationTruce.java index 6f366cb7..918399b5 100644 --- a/src/com/massivecraft/factions/cmd/CmdRelationTruce.java +++ b/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; diff --git a/src/com/massivecraft/factions/cmd/CmdReload.java b/src/com/massivecraft/factions/cmd/CmdFactionsReload.java similarity index 91% rename from src/com/massivecraft/factions/cmd/CmdReload.java rename to src/com/massivecraft/factions/cmd/CmdFactionsReload.java index 4fb50b2e..bf499d2b 100644 --- a/src/com/massivecraft/factions/cmd/CmdReload.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdSaveAll.java b/src/com/massivecraft/factions/cmd/CmdFactionsSaveAll.java similarity index 85% rename from src/com/massivecraft/factions/cmd/CmdSaveAll.java rename to src/com/massivecraft/factions/cmd/CmdFactionsSaveAll.java index f0f42783..0225c5cc 100644 --- a/src/com/massivecraft/factions/cmd/CmdSaveAll.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdSeeChunk.java b/src/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java similarity index 95% rename from src/com/massivecraft/factions/cmd/CmdSeeChunk.java rename to src/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java index c7f60600..0139bac6 100644 --- a/src/com/massivecraft/factions/cmd/CmdSeeChunk.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdSethome.java b/src/com/massivecraft/factions/cmd/CmdFactionsSethome.java similarity index 92% rename from src/com/massivecraft/factions/cmd/CmdSethome.java rename to src/com/massivecraft/factions/cmd/CmdFactionsSethome.java index 4ff05133..5ffef154 100644 --- a/src/com/massivecraft/factions/cmd/CmdSethome.java +++ b/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 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("You have set the home for the "+faction.getTag(fme)+" faction."); diff --git a/src/com/massivecraft/factions/cmd/CmdShow.java b/src/com/massivecraft/factions/cmd/CmdFactionsShow.java similarity index 98% rename from src/com/massivecraft/factions/cmd/CmdShow.java rename to src/com/massivecraft/factions/cmd/CmdFactionsShow.java index 85f7b731..b3741366 100644 --- a/src/com/massivecraft/factions/cmd/CmdShow.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdTag.java b/src/com/massivecraft/factions/cmd/CmdFactionsTag.java similarity index 97% rename from src/com/massivecraft/factions/cmd/CmdTag.java rename to src/com/massivecraft/factions/cmd/CmdFactionsTag.java index ba453c3b..8c0e136e 100644 --- a/src/com/massivecraft/factions/cmd/CmdTag.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdTitle.java b/src/com/massivecraft/factions/cmd/CmdFactionsTitle.java similarity index 94% rename from src/com/massivecraft/factions/cmd/CmdTitle.java rename to src/com/massivecraft/factions/cmd/CmdFactionsTitle.java index 73178cb4..6ba68209 100644 --- a/src/com/massivecraft/factions/cmd/CmdTitle.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdUnclaim.java b/src/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java similarity index 96% rename from src/com/massivecraft/factions/cmd/CmdUnclaim.java rename to src/com/massivecraft/factions/cmd/CmdFactionsUnclaim.java index f83405a9..06e41824 100644 --- a/src/com/massivecraft/factions/cmd/CmdUnclaim.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdUnclaimall.java b/src/com/massivecraft/factions/cmd/CmdFactionsUnclaimall.java similarity index 95% rename from src/com/massivecraft/factions/cmd/CmdUnclaimall.java rename to src/com/massivecraft/factions/cmd/CmdFactionsUnclaimall.java index 4ada4db0..7a97c251 100644 --- a/src/com/massivecraft/factions/cmd/CmdUnclaimall.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/CmdVersion.java b/src/com/massivecraft/factions/cmd/CmdFactionsVersion.java similarity index 87% rename from src/com/massivecraft/factions/cmd/CmdVersion.java rename to src/com/massivecraft/factions/cmd/CmdFactionsVersion.java index 8dade371..1a6951fc 100644 --- a/src/com/massivecraft/factions/cmd/CmdVersion.java +++ b/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"); diff --git a/src/com/massivecraft/factions/cmd/FCmdRoot.java b/src/com/massivecraft/factions/cmd/FCmdRoot.java deleted file mode 100644 index 0afc2a54..00000000 --- a/src/com/massivecraft/factions/cmd/FCmdRoot.java +++ /dev/null @@ -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("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); - } - -}