From da5e1de456ec0d8ee3bd31814d0e2756ee8909ac Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Thu, 12 Feb 2015 12:00:55 +0100 Subject: [PATCH] MassiveCommandException --> Exception --- .../factions/cmd/CmdFactionsAccessAbstract.java | 6 +++--- .../factions/cmd/CmdFactionsAccessFaction.java | 4 ++-- .../factions/cmd/CmdFactionsAccessPlayer.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdFactionsAdmin.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdFactionsDisband.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdFactionsFaction.java | 4 ++-- .../massivecraft/factions/cmd/CmdFactionsFlagList.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdFactionsFlagSet.java | 4 ++-- .../massivecraft/factions/cmd/CmdFactionsFlagShow.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdFactionsHome.java | 4 ++-- .../massivecraft/factions/cmd/CmdFactionsInviteAdd.java | 4 ++-- .../massivecraft/factions/cmd/CmdFactionsInviteList.java | 4 ++-- .../factions/cmd/CmdFactionsInviteRemove.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdFactionsJoin.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdFactionsKick.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdFactionsList.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdFactionsMap.java | 4 ++-- .../factions/cmd/CmdFactionsMoneyBalance.java | 4 ++-- .../factions/cmd/CmdFactionsMoneyDeposit.java | 4 ++-- .../factions/cmd/CmdFactionsMoneyTransferFf.java | 4 ++-- .../factions/cmd/CmdFactionsMoneyTransferFp.java | 4 ++-- .../factions/cmd/CmdFactionsMoneyTransferPf.java | 4 ++-- .../factions/cmd/CmdFactionsMoneyWithdraw.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdFactionsName.java | 4 ++-- .../massivecraft/factions/cmd/CmdFactionsPermList.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdFactionsPermSet.java | 4 ++-- .../massivecraft/factions/cmd/CmdFactionsPermShow.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdFactionsPlayer.java | 4 ++-- .../massivecraft/factions/cmd/CmdFactionsPowerBoost.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdFactionsRank.java | 6 +++--- .../factions/cmd/CmdFactionsRelationAbstract.java | 4 ++-- .../massivecraft/factions/cmd/CmdFactionsSeeChunk.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdFactionsSetAll.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdFactionsSetAuto.java | 4 ++-- .../massivecraft/factions/cmd/CmdFactionsSetCircle.java | 4 ++-- .../massivecraft/factions/cmd/CmdFactionsSetSquare.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdFactionsSetX.java | 8 ++++---- src/com/massivecraft/factions/cmd/CmdFactionsSetXAll.java | 4 ++-- .../massivecraft/factions/cmd/CmdFactionsSetXRadius.java | 6 +++--- src/com/massivecraft/factions/cmd/CmdFactionsSethome.java | 4 ++-- .../massivecraft/factions/cmd/CmdFactionsSetpower.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdFactionsStatus.java | 4 ++-- src/com/massivecraft/factions/cmd/CmdFactionsTitle.java | 4 ++-- .../massivecraft/factions/cmd/CmdFactionsUnsethome.java | 4 ++-- src/com/massivecraft/factions/cmd/arg/ARFaction.java | 6 +++--- src/com/massivecraft/factions/entity/MFlag.java | 2 +- 46 files changed, 97 insertions(+), 97 deletions(-) diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java b/src/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java index d24182f8..6ddfa411 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsAccessAbstract.java @@ -8,7 +8,7 @@ import com.massivecraft.factions.RelationParticipator; import com.massivecraft.factions.TerritoryAccess; import com.massivecraft.factions.entity.BoardColl; import com.massivecraft.factions.entity.Faction; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.req.ReqIsPlayer; import com.massivecraft.massivecore.ps.PS; import com.massivecraft.massivecore.ps.PSFormatHumanSpace; @@ -40,7 +40,7 @@ public abstract class CmdFactionsAccessAbstract extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { chunk = PS.valueOf(me.getLocation()).getChunk(true); ta = BoardColl.get().getTerritoryAccessAt(chunk); @@ -49,7 +49,7 @@ public abstract class CmdFactionsAccessAbstract extends FactionsCommand this.innerPerform(); } - public abstract void innerPerform() throws MassiveCommandException; + public abstract void innerPerform() throws MassiveException; public void sendAccessInfo() { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAccessFaction.java b/src/com/massivecraft/factions/cmd/CmdFactionsAccessFaction.java index e7642d47..33691fe4 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsAccessFaction.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsAccessFaction.java @@ -5,7 +5,7 @@ import com.massivecraft.factions.cmd.arg.ARFaction; import com.massivecraft.factions.entity.BoardColl; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ARBoolean; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; @@ -33,7 +33,7 @@ public class CmdFactionsAccessFaction extends CmdFactionsAccessAbstract // -------------------------------------------- // @Override - public void innerPerform() throws MassiveCommandException + public void innerPerform() throws MassiveException { // Args Faction faction = this.arg(0, ARFaction.get()); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java b/src/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java index b9ff1352..67547ff0 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsAccessPlayer.java @@ -5,7 +5,7 @@ import com.massivecraft.factions.cmd.arg.ARMPlayer; import com.massivecraft.factions.entity.BoardColl; import com.massivecraft.factions.entity.MPerm; import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ARBoolean; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; @@ -33,7 +33,7 @@ public class CmdFactionsAccessPlayer extends CmdFactionsAccessAbstract // -------------------------------------------- // @Override - public void innerPerform() throws MassiveCommandException + public void innerPerform() throws MassiveException { // Args MPlayer mplayer = this.arg(0, ARMPlayer.getAny()); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsAdmin.java b/src/com/massivecraft/factions/cmd/CmdFactionsAdmin.java index 38fd131a..bbf0a397 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsAdmin.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsAdmin.java @@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ARBoolean; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.util.IdUtil; @@ -31,7 +31,7 @@ public class CmdFactionsAdmin extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { // Args Boolean target = this.arg(0, ARBoolean.get(), !msender.isUsingAdminMode()); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsDisband.java b/src/com/massivecraft/factions/cmd/CmdFactionsDisband.java index d70c6c49..44b59dbb 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsDisband.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsDisband.java @@ -12,7 +12,7 @@ import com.massivecraft.factions.event.EventFactionsMembershipChange; import com.massivecraft.factions.event.EventFactionsMembershipChange.MembershipChangeReason; import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.util.IdUtil; import com.massivecraft.massivecore.util.Txt; @@ -40,7 +40,7 @@ public class CmdFactionsDisband extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { // Args Faction faction = this.arg(0, ARFaction.get(), msenderFaction); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsFaction.java b/src/com/massivecraft/factions/cmd/CmdFactionsFaction.java index e7aa6025..c2a9b155 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsFaction.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsFaction.java @@ -10,8 +10,8 @@ import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.event.EventFactionsFactionShowAsync; import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.PriorityLines; -import com.massivecraft.massivecore.cmd.MassiveCommandException; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.mixin.Mixin; import com.massivecraft.massivecore.util.Txt; @@ -39,7 +39,7 @@ public class CmdFactionsFaction extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { // Args final Faction faction = this.arg(0, ARFaction.get(), msenderFaction); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsFlagList.java b/src/com/massivecraft/factions/cmd/CmdFactionsFlagList.java index c3287f4e..bb84e9fd 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsFlagList.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsFlagList.java @@ -5,7 +5,7 @@ import java.util.List; import com.massivecraft.factions.Perm; import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ARInteger; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.util.Txt; @@ -33,7 +33,7 @@ public class CmdFactionsFlagList extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { // Args Integer pageHumanBased = this.arg(0, ARInteger.get(), 1); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsFlagSet.java b/src/com/massivecraft/factions/cmd/CmdFactionsFlagSet.java index b09d344f..dbbe66b1 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsFlagSet.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsFlagSet.java @@ -7,7 +7,7 @@ import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MFlag; import com.massivecraft.factions.entity.MPerm; import com.massivecraft.factions.event.EventFactionsFlagChange; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ARBoolean; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; @@ -36,7 +36,7 @@ public class CmdFactionsFlagSet extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { // Args MFlag flag = this.arg(0, ARMFlag.get()); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsFlagShow.java b/src/com/massivecraft/factions/cmd/CmdFactionsFlagShow.java index d5203666..9e139b00 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsFlagShow.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsFlagShow.java @@ -8,7 +8,7 @@ import com.massivecraft.factions.cmd.arg.ARFaction; import com.massivecraft.factions.cmd.arg.ARMFlag; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MFlag; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ARList; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.util.Txt; @@ -38,7 +38,7 @@ public class CmdFactionsFlagShow extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { // Arg: Faction Faction faction = this.arg(0, ARFaction.get(), msenderFaction); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsHome.java b/src/com/massivecraft/factions/cmd/CmdFactionsHome.java index d0e0a0c0..927268e7 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsHome.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsHome.java @@ -15,7 +15,7 @@ import com.massivecraft.factions.entity.MPerm; import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.event.EventFactionsHomeTeleport; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.cmd.req.ReqIsPlayer; import com.massivecraft.massivecore.mixin.Mixin; @@ -47,7 +47,7 @@ public class CmdFactionsHome extends FactionsCommandHome // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { if ( ! MConf.get().homesTeleportCommandEnabled) { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsInviteAdd.java b/src/com/massivecraft/factions/cmd/CmdFactionsInviteAdd.java index 58920628..a835f0b5 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsInviteAdd.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsInviteAdd.java @@ -8,7 +8,7 @@ import com.massivecraft.factions.cmd.arg.ARMPlayer; import com.massivecraft.factions.entity.MPerm; import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.factions.event.EventFactionsInvitedChange; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ARSet; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; @@ -35,7 +35,7 @@ public class CmdFactionsInviteAdd extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { // Args Set mplayers = this.argConcatFrom(0, ARSet.get(ARMPlayer.getAny(), true)); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsInviteList.java b/src/com/massivecraft/factions/cmd/CmdFactionsInviteList.java index f8b51e08..a75d6e66 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsInviteList.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsInviteList.java @@ -8,7 +8,7 @@ import com.massivecraft.factions.cmd.arg.ARFaction; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MPerm; import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ARInteger; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.pager.PagerSimple; @@ -39,7 +39,7 @@ public class CmdFactionsInviteList extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { // Args Integer pageHumanBased = this.arg(0, ARInteger.get(), 1); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java b/src/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java index 4dd1a237..c9074d34 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsInviteRemove.java @@ -10,7 +10,7 @@ import com.massivecraft.factions.cmd.arg.ARMPlayer; import com.massivecraft.factions.entity.MPerm; import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.factions.event.EventFactionsInvitedChange; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ARSet; import com.massivecraft.massivecore.cmd.arg.ARString; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; @@ -38,7 +38,7 @@ public class CmdFactionsInviteRemove extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { Set mplayers = new HashSet(); boolean all = false; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java b/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java index 938985fb..3690e00c 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsJoin.java @@ -10,7 +10,7 @@ import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.event.EventFactionsMembershipChange; import com.massivecraft.factions.event.EventFactionsMembershipChange.MembershipChangeReason; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.util.Txt; @@ -38,7 +38,7 @@ public class CmdFactionsJoin extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { // Args Faction faction = this.arg(0, ARFaction.get()); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsKick.java b/src/com/massivecraft/factions/cmd/CmdFactionsKick.java index c69a4bf9..fbd27ddc 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsKick.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsKick.java @@ -11,7 +11,7 @@ import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.event.EventFactionsMembershipChange; import com.massivecraft.factions.event.EventFactionsMembershipChange.MembershipChangeReason; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.util.IdUtil; @@ -38,7 +38,7 @@ public class CmdFactionsKick extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { // Arg MPlayer mplayer = this.arg(0, ARMPlayer.getAny()); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsList.java b/src/com/massivecraft/factions/cmd/CmdFactionsList.java index 738dd728..66e7c66a 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsList.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsList.java @@ -10,7 +10,7 @@ import com.massivecraft.factions.Factions; import com.massivecraft.factions.Perm; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.FactionColl; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ARInteger; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.mixin.Mixin; @@ -41,7 +41,7 @@ public class CmdFactionsList extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { // Args final Integer pageHumanBased = this.arg(0, ARInteger.get(), 1); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMap.java b/src/com/massivecraft/factions/cmd/CmdFactionsMap.java index a93c74d3..699b4fd5 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMap.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMap.java @@ -7,7 +7,7 @@ import org.bukkit.Location; import com.massivecraft.factions.Const; import com.massivecraft.factions.Perm; import com.massivecraft.factions.entity.BoardColl; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ARBoolean; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.cmd.req.ReqIsPlayer; @@ -37,7 +37,7 @@ public class CmdFactionsMap extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { if ( ! this.argIsSet(0)) { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java index d4f057c5..44331e33 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java @@ -5,7 +5,7 @@ import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.Perm; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; public class CmdFactionsMoneyBalance extends FactionsCommand @@ -32,7 +32,7 @@ public class CmdFactionsMoneyBalance extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { Faction faction = this.arg(0, ARFaction.get(), msenderFaction); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java index 8488d744..a1ff6954 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java @@ -7,7 +7,7 @@ import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.integration.Econ; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ARDouble; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.money.Money; @@ -40,7 +40,7 @@ public class CmdFactionsMoneyDeposit extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { Double amount = this.arg(0, ARDouble.get()); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java index 60e0d234..a2695af7 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFf.java @@ -7,7 +7,7 @@ import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.Factions; import com.massivecraft.factions.integration.Econ; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ARDouble; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.money.Money; @@ -42,7 +42,7 @@ public class CmdFactionsMoneyTransferFf extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { Double amount = this.arg(0, ARDouble.get()); Faction from = this.arg(1, ARFaction.get()); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java index 6bd8f4d1..0a3a293a 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferFp.java @@ -9,7 +9,7 @@ import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.Factions; import com.massivecraft.factions.integration.Econ; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ARDouble; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.money.Money; @@ -44,7 +44,7 @@ public class CmdFactionsMoneyTransferFp extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { Double amount = this.arg(0, ARDouble.get()); Faction from = this.arg(1, ARFaction.get()); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java index 08c1ee26..127bb35d 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferPf.java @@ -9,7 +9,7 @@ import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.Factions; import com.massivecraft.factions.integration.Econ; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ARDouble; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.money.Money; @@ -44,7 +44,7 @@ public class CmdFactionsMoneyTransferPf extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { Double amount = this.arg(0, ARDouble.get()); MPlayer from = this.arg(1, ARMPlayer.getAny()); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java index 083f0764..c7dd2c77 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java @@ -8,7 +8,7 @@ import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.Factions; import com.massivecraft.factions.integration.Econ; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ARDouble; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.money.Money; @@ -42,7 +42,7 @@ public class CmdFactionsMoneyWithdraw extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { Double amount = this.arg(0, ARDouble.get()); Faction from = this.arg(1, ARFaction.get(), msenderFaction); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsName.java b/src/com/massivecraft/factions/cmd/CmdFactionsName.java index 9d8f804f..8b4bbe4b 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsName.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsName.java @@ -9,7 +9,7 @@ import com.massivecraft.factions.entity.FactionColl; import com.massivecraft.factions.entity.MPerm; import com.massivecraft.factions.event.EventFactionsNameChange; import com.massivecraft.factions.util.MiscUtil; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; public class CmdFactionsName extends FactionsCommand @@ -36,7 +36,7 @@ public class CmdFactionsName extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { // Args String newName = this.arg(0); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPermList.java b/src/com/massivecraft/factions/cmd/CmdFactionsPermList.java index 16067b90..05a6daea 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsPermList.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsPermList.java @@ -5,7 +5,7 @@ import java.util.List; import com.massivecraft.factions.Perm; import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ARInteger; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.util.Txt; @@ -33,7 +33,7 @@ public class CmdFactionsPermList extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { // Args Integer pageHumanBased = this.arg(0, ARInteger.get(), 1); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPermSet.java b/src/com/massivecraft/factions/cmd/CmdFactionsPermSet.java index 44c2ea8f..38c53789 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsPermSet.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsPermSet.java @@ -11,7 +11,7 @@ import com.massivecraft.factions.cmd.arg.ARRel; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MPerm; import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ARBoolean; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.util.Txt; @@ -42,7 +42,7 @@ public class CmdFactionsPermSet extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { // Args MPerm perm = this.arg(0, ARMPerm.get()); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPermShow.java b/src/com/massivecraft/factions/cmd/CmdFactionsPermShow.java index c7dd8361..cb478287 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsPermShow.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsPermShow.java @@ -8,7 +8,7 @@ import com.massivecraft.factions.cmd.arg.ARFaction; import com.massivecraft.factions.cmd.arg.ARMPerm; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ARList; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.util.Txt; @@ -38,7 +38,7 @@ public class CmdFactionsPermShow extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { // Arg: Faction Faction faction = this.arg(0, ARFaction.get(), msenderFaction); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPlayer.java b/src/com/massivecraft/factions/cmd/CmdFactionsPlayer.java index a03e5d0c..58d01905 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsPlayer.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsPlayer.java @@ -8,8 +8,8 @@ import com.massivecraft.factions.cmd.arg.ARMPlayer; import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.factions.event.EventFactionsRemovePlayerMillis; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.Progressbar; -import com.massivecraft.massivecore.cmd.MassiveCommandException; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.util.TimeDiffUtil; import com.massivecraft.massivecore.util.TimeUnit; @@ -38,7 +38,7 @@ public class CmdFactionsPlayer extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { // Args MPlayer mplayer = this.arg(0, ARMPlayer.getAny(), msender); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java b/src/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java index b473295d..ed6f0fdf 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsPowerBoost.java @@ -6,7 +6,7 @@ import com.massivecraft.factions.cmd.arg.ARMPlayer; import com.massivecraft.factions.cmd.arg.ARFaction; import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.factions.entity.Faction; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ARDouble; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; @@ -35,7 +35,7 @@ public class CmdFactionsPowerBoost extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { String type = this.arg(0).toLowerCase(); boolean doPlayer = true; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsRank.java b/src/com/massivecraft/factions/cmd/CmdFactionsRank.java index 88da0060..309d0686 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsRank.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsRank.java @@ -13,7 +13,7 @@ import com.massivecraft.factions.entity.MFlag; import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.factions.entity.MPlayerColl; import com.massivecraft.factions.event.EventFactionsRankChange; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.util.IdUtil; import com.massivecraft.massivecore.util.MUtil; @@ -64,7 +64,7 @@ public class CmdFactionsRank extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { // This sets target and much other. Returns false if not succeeded. if ( ! this.registerFields()) @@ -122,7 +122,7 @@ public class CmdFactionsRank extends FactionsCommand // PRIVATE // -------------------------------------------- // - private boolean registerFields() throws MassiveCommandException + private boolean registerFields() throws MassiveException { // Getting the target and faction. target = this.arg(0, ARMPlayer.getAny(), msender); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsRelationAbstract.java b/src/com/massivecraft/factions/cmd/CmdFactionsRelationAbstract.java index 2ff3a7cd..f5c3fb33 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsRelationAbstract.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsRelationAbstract.java @@ -9,7 +9,7 @@ import com.massivecraft.factions.entity.MConf; import com.massivecraft.factions.entity.MFlag; import com.massivecraft.factions.entity.MPerm; import com.massivecraft.factions.event.EventFactionsRelationChange; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; public abstract class CmdFactionsRelationAbstract extends FactionsCommand @@ -35,7 +35,7 @@ public abstract class CmdFactionsRelationAbstract extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { // Args Faction otherFaction = this.arg(0, ARFaction.get()); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java b/src/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java index f0b333b5..c15d4ad0 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsSeeChunk.java @@ -1,7 +1,7 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.Perm; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ARBoolean; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.cmd.req.ReqIsPlayer; @@ -31,7 +31,7 @@ public class CmdFactionsSeeChunk extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { // Args boolean old = msender.isSeeingChunk(); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsSetAll.java b/src/com/massivecraft/factions/cmd/CmdFactionsSetAll.java index 04c9d4e5..c0a16c1c 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsSetAll.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsSetAll.java @@ -6,7 +6,7 @@ import com.massivecraft.factions.Perm; import com.massivecraft.factions.entity.Board; import com.massivecraft.factions.entity.BoardColl; import com.massivecraft.factions.entity.Faction; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ARWorldId; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.cmd.req.ReqIsPlayer; @@ -40,7 +40,7 @@ public class CmdFactionsSetAll extends CmdFactionsSetXAll // -------------------------------------------- // @Override - public Set getChunks() throws MassiveCommandException + public Set getChunks() throws MassiveException { // World String word = (this.isClaim() ? "claim" : "unclaim"); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsSetAuto.java b/src/com/massivecraft/factions/cmd/CmdFactionsSetAuto.java index 64099fb5..7e01f6a4 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsSetAuto.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsSetAuto.java @@ -8,7 +8,7 @@ import com.massivecraft.factions.cmd.arg.ARFaction; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.FactionColl; import com.massivecraft.factions.entity.MPerm; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.cmd.req.ReqIsPlayer; import com.massivecraft.massivecore.ps.PS; @@ -53,7 +53,7 @@ public class CmdFactionsSetAuto extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { // Args final Faction newFaction; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsSetCircle.java b/src/com/massivecraft/factions/cmd/CmdFactionsSetCircle.java index 3bf1c887..fff7ef85 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsSetCircle.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsSetCircle.java @@ -4,7 +4,7 @@ import java.util.LinkedHashSet; import java.util.Set; import com.massivecraft.factions.Perm; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.cmd.req.ReqIsPlayer; import com.massivecraft.massivecore.ps.PS; @@ -39,7 +39,7 @@ public class CmdFactionsSetCircle extends CmdFactionsSetXRadius // -------------------------------------------- // @Override - public Set getChunks() throws MassiveCommandException + public Set getChunks() throws MassiveException { // Common Startup final PS chunk = PS.valueOf(me.getLocation()).getChunk(true); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsSetSquare.java b/src/com/massivecraft/factions/cmd/CmdFactionsSetSquare.java index 45b8624e..54f01b50 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsSetSquare.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsSetSquare.java @@ -4,7 +4,7 @@ import java.util.LinkedHashSet; import java.util.Set; import com.massivecraft.factions.Perm; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.cmd.req.ReqIsPlayer; import com.massivecraft.massivecore.ps.PS; @@ -39,7 +39,7 @@ public class CmdFactionsSetSquare extends CmdFactionsSetXRadius // -------------------------------------------- // @Override - public Set getChunks() throws MassiveCommandException + public Set getChunks() throws MassiveException { // Common Startup final PS chunk = PS.valueOf(me.getLocation()).getChunk(true); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsSetX.java b/src/com/massivecraft/factions/cmd/CmdFactionsSetX.java index 440ef9b2..053f9f7a 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsSetX.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsSetX.java @@ -5,7 +5,7 @@ import java.util.Set; import com.massivecraft.factions.cmd.arg.ARFaction; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.FactionColl; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.ps.PS; @@ -45,7 +45,7 @@ public abstract class CmdFactionsSetX extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { // Args final Faction newFaction = this.getNewFaction(); @@ -59,13 +59,13 @@ public abstract class CmdFactionsSetX extends FactionsCommand // ABSTRACT // -------------------------------------------- // - public abstract Set getChunks() throws MassiveCommandException; + public abstract Set getChunks() throws MassiveException; // -------------------------------------------- // // EXTRAS // -------------------------------------------- // - public Faction getNewFaction() throws MassiveCommandException + public Faction getNewFaction() throws MassiveException { if (this.isClaim()) { diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsSetXAll.java b/src/com/massivecraft/factions/cmd/CmdFactionsSetXAll.java index 00e4428c..ccda3f91 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsSetXAll.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsSetXAll.java @@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.cmd.arg.ARFaction; import com.massivecraft.factions.entity.Faction; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; public abstract class CmdFactionsSetXAll extends CmdFactionsSetX { @@ -29,7 +29,7 @@ public abstract class CmdFactionsSetXAll extends CmdFactionsSetX // EXTRAS // -------------------------------------------- // - public Faction getOldFaction() throws MassiveCommandException + public Faction getOldFaction() throws MassiveException { return this.arg(1, ARFaction.get()); } diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsSetXRadius.java b/src/com/massivecraft/factions/cmd/CmdFactionsSetXRadius.java index 704fda8c..164df1f7 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsSetXRadius.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsSetXRadius.java @@ -1,7 +1,7 @@ package com.massivecraft.factions.cmd; import com.massivecraft.factions.entity.MConf; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ARInteger; @@ -29,7 +29,7 @@ public abstract class CmdFactionsSetXRadius extends CmdFactionsSetX // EXTRAS // -------------------------------------------- // - public Integer getRadius() throws MassiveCommandException + public Integer getRadius() throws MassiveException { Integer radius = this.arg(0, ARInteger.get(), 1); if (radius == null) return radius; @@ -51,7 +51,7 @@ public abstract class CmdFactionsSetXRadius extends CmdFactionsSetX return radius; } - public Integer getRadiusZero() throws MassiveCommandException + public Integer getRadiusZero() throws MassiveException { Integer ret = this.getRadius(); if (ret == null) return ret; diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsSethome.java b/src/com/massivecraft/factions/cmd/CmdFactionsSethome.java index 84aa9489..5cd280c7 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsSethome.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsSethome.java @@ -6,7 +6,7 @@ import com.massivecraft.factions.cmd.arg.ARFaction; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MPerm; import com.massivecraft.factions.event.EventFactionsHomeChange; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.cmd.req.ReqIsPlayer; import com.massivecraft.massivecore.ps.PS; @@ -35,7 +35,7 @@ public class CmdFactionsSethome extends FactionsCommandHome // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { // Args Faction faction = this.arg(0, ARFaction.get(), msenderFaction); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsSetpower.java b/src/com/massivecraft/factions/cmd/CmdFactionsSetpower.java index d29e404b..1f1fa44f 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsSetpower.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsSetpower.java @@ -5,7 +5,7 @@ import com.massivecraft.factions.cmd.arg.ARMPlayer; import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.factions.event.EventFactionsPowerChange; import com.massivecraft.factions.event.EventFactionsPowerChange.PowerChangeReason; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ARDouble; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; @@ -33,7 +33,7 @@ public class CmdFactionsSetpower extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { // Args MPlayer mplayer = this.arg(0, ARMPlayer.getAny()); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsStatus.java b/src/com/massivecraft/factions/cmd/CmdFactionsStatus.java index 83f4c01e..83f37d34 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsStatus.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsStatus.java @@ -12,7 +12,7 @@ import com.massivecraft.factions.cmd.arg.ARSortMPlayer; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MPerm; import com.massivecraft.factions.entity.MPlayer; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ARInteger; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.pager.PagerSimple; @@ -47,7 +47,7 @@ public class CmdFactionsStatus extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { // Args Integer pageHumanBased = this.arg(0, ARInteger.get(), 1); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsTitle.java b/src/com/massivecraft/factions/cmd/CmdFactionsTitle.java index d7450dbb..90ebe1c8 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsTitle.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsTitle.java @@ -7,7 +7,7 @@ import com.massivecraft.factions.cmd.arg.ARMPlayer; import com.massivecraft.factions.entity.MPerm; import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.factions.event.EventFactionsTitleChange; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ARString; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; import com.massivecraft.massivecore.util.Txt; @@ -36,7 +36,7 @@ public class CmdFactionsTitle extends FactionsCommand // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { // Args MPlayer you = this.arg(0, ARMPlayer.getAny()); diff --git a/src/com/massivecraft/factions/cmd/CmdFactionsUnsethome.java b/src/com/massivecraft/factions/cmd/CmdFactionsUnsethome.java index e673a816..51e36a51 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactionsUnsethome.java +++ b/src/com/massivecraft/factions/cmd/CmdFactionsUnsethome.java @@ -5,7 +5,7 @@ import com.massivecraft.factions.cmd.arg.ARFaction; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.MPerm; import com.massivecraft.factions.event.EventFactionsHomeChange; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.req.ReqHasPerm; public class CmdFactionsUnsethome extends FactionsCommandHome @@ -31,7 +31,7 @@ public class CmdFactionsUnsethome extends FactionsCommandHome // -------------------------------------------- // @Override - public void perform() throws MassiveCommandException + public void perform() throws MassiveException { // Args Faction faction = this.arg(0, ARFaction.get(), msenderFaction); diff --git a/src/com/massivecraft/factions/cmd/arg/ARFaction.java b/src/com/massivecraft/factions/cmd/arg/ARFaction.java index 2437a72a..9cacfb6d 100644 --- a/src/com/massivecraft/factions/cmd/arg/ARFaction.java +++ b/src/com/massivecraft/factions/cmd/arg/ARFaction.java @@ -6,7 +6,7 @@ import com.massivecraft.factions.entity.MPlayer; import com.massivecraft.factions.entity.Faction; import com.massivecraft.factions.entity.FactionColl; import com.massivecraft.massivecore.MassiveCore; -import com.massivecraft.massivecore.cmd.MassiveCommandException; +import com.massivecraft.massivecore.MassiveException; import com.massivecraft.massivecore.cmd.arg.ArgReaderAbstract; import com.massivecraft.massivecore.util.IdUtil; @@ -24,7 +24,7 @@ public class ARFaction extends ArgReaderAbstract // -------------------------------------------- // @Override - public Faction read(String str, CommandSender sender) throws MassiveCommandException + public Faction read(String str, CommandSender sender) throws MassiveException { Faction ret; @@ -53,7 +53,7 @@ public class ARFaction extends ArgReaderAbstract return mplayer.getFaction(); } - throw new MassiveCommandException().addMsg("No faction or player matching \"

%s\".", str); + throw new MassiveException().addMsg("No faction or player matching \"

%s\".", str); } } diff --git a/src/com/massivecraft/factions/entity/MFlag.java b/src/com/massivecraft/factions/entity/MFlag.java index 59cc1bf4..9763ce00 100644 --- a/src/com/massivecraft/factions/entity/MFlag.java +++ b/src/com/massivecraft/factions/entity/MFlag.java @@ -87,7 +87,7 @@ public class MFlag extends Entity implements Prioritized, Registerable public static MFlag getFlagExplosions() { return getCreative(PRIORITY_EXPLOSIONS, ID_EXPLOSIONS, ID_EXPLOSIONS, "Can explosions occur in this territory?", "Explosions can occur in this territory.", "Explosions can NOT occur in this territory.", true, false, true); } public static MFlag getFlagOfflineexplosions() { return getCreative(PRIORITY_OFFLINEEXPLOSIONS, ID_OFFLINEEXPLOSIONS, ID_OFFLINEEXPLOSIONS, "Can explosions occur if faction is offline?", "Explosions if faction is offline.", "No explosions if faction is offline.", false, false, true); } public static MFlag getFlagFirespread() { return getCreative(PRIORITY_FIRESPREAD, ID_FIRESPREAD, ID_FIRESPREAD, "Can fire spread in territory?", "Fire can spread in this territory.", "Fire can NOT spread in this territory.", true, false, true); } - public static MFlag getFlagEndergrief() { return getCreative(PRIORITY_ENDERGRIEF, ID_ENDERGRIEF, ID_ENDERGRIEF, "Can endermen grief in this territory?", "Endermen can grief in this territory", "Endermen can NOT grief in this territory.", false, false, true); } + public static MFlag getFlagEndergrief() { return getCreative(PRIORITY_ENDERGRIEF, ID_ENDERGRIEF, ID_ENDERGRIEF, "Can endermen grief in this territory?", "Endermen can grief in this territory.", "Endermen can NOT grief in this territory.", false, false, true); } public static MFlag getFlagPermanent() { return getCreative(PRIORITY_PERMANENT, ID_PERMANENT, ID_PERMANENT, "Is the faction immune to deletion?", "The faction can NOT be deleted.", "The faction can be deleted.", false, false, true); } public static MFlag getFlagPeaceful() { return getCreative(PRIORITY_PEACEFUL, ID_PEACEFUL, ID_PEACEFUL, "Is the faction in truce with everyone?", "The faction is in truce with everyone.", "The faction relations work as usual.", false, false, true); } public static MFlag getFlagInfpower() { return getCreative(PRIORITY_INFPOWER, ID_INFPOWER, ID_INFPOWER, "Does the faction have infinite power?", "The faction has infinite power.", "The faction power works as usual.", false, false, true); }