Revert "Moves some classes, amd changes how the massive core is included"

This reverts commit 50f3ed6dee.

pom.xml

@@ -58,7 +58,8 @@
             <groupId>com.massivecraft.massivecore</groupId>
             <artifactId>MassiveCore</artifactId>
             <version>3.3.3</version>
-            <scope>compile</scope>
+            <scope>system</scope>
+            <systemPath>${project.basedir}\lib\MassiveCore.jar</systemPath>
         </dependency>
         <!-- WorldEdit -->
         <dependency>

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

@@ -1,7 +1,7 @@
 package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.Factions;
-import com.massivecraft.factions.cmd.relations.req.ReqHasntFaction;
+import com.massivecraft.factions.cmd.req.ReqHasntFaction;
 import com.massivecraft.factions.cmd.type.TypeFactionNameStrict;
 import com.massivecraft.factions.entity.Faction;
 import com.massivecraft.factions.entity.FactionColl;

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

@@ -1,6 +1,6 @@
 package com.massivecraft.factions.cmd;
 
-import com.massivecraft.factions.cmd.relations.req.ReqHasFaction;
+import com.massivecraft.factions.cmd.req.ReqHasFaction;
 import com.massivecraft.factions.entity.MPerm;
 import com.massivecraft.factions.entity.MPlayer;
 import com.massivecraft.factions.event.EventFactionsDescriptionChange;

src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationTax.java

@@ -1,6 +1,6 @@
 package com.massivecraft.factions.cmd;
 
-import com.massivecraft.factions.cmd.relations.req.ReqTaxEnabled;
+import com.massivecraft.factions.cmd.req.ReqTaxEnabled;
 import com.massivecraft.factions.entity.MConf;
 import com.massivecraft.massivecore.money.Money;
 import com.massivecraft.massivecore.util.TimeDiffUtil;

src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationWarps.java

@@ -1,6 +1,6 @@
 package com.massivecraft.factions.cmd;
 
-import com.massivecraft.factions.cmd.relations.req.ReqFactionWarpsEnabled;
+import com.massivecraft.factions.cmd.req.ReqFactionWarpsEnabled;
 import com.massivecraft.factions.entity.MConf;
 import com.massivecraft.factions.entity.MPerm;
 import com.massivecraft.factions.entity.MPerm.MPermable;

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

@@ -1,6 +1,6 @@
 package com.massivecraft.factions.cmd;
 
-import com.massivecraft.factions.cmd.relations.req.ReqHasFaction;
+import com.massivecraft.factions.cmd.req.ReqHasFaction;
 
 public class CmdFactionsLeave extends FactionsCommand {
     // -------------------------------------------- //

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

@@ -1,6 +1,6 @@
 package com.massivecraft.factions.cmd;
 
-import com.massivecraft.factions.cmd.relations.req.ReqBankCommandsEnabled;
+import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled;
 
 public class CmdFactionsMoney extends FactionsCommand {
     // -------------------------------------------- //

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

@@ -1,7 +1,7 @@
 package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.Perm;
-import com.massivecraft.factions.cmd.relations.req.ReqBankCommandsEnabled;
+import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled;
 import com.massivecraft.factions.cmd.type.TypeFaction;
 import com.massivecraft.factions.entity.Faction;
 import com.massivecraft.factions.integration.Econ;

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

@@ -1,7 +1,7 @@
 package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.Factions;
-import com.massivecraft.factions.cmd.relations.req.ReqBankCommandsEnabled;
+import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled;
 import com.massivecraft.factions.cmd.type.TypeFaction;
 import com.massivecraft.factions.entity.Faction;
 import com.massivecraft.factions.entity.MConf;

src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferF2f.java

@@ -1,7 +1,7 @@
 package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.Factions;
-import com.massivecraft.factions.cmd.relations.req.ReqBankCommandsEnabled;
+import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled;
 import com.massivecraft.factions.cmd.type.TypeFaction;
 import com.massivecraft.factions.entity.Faction;
 import com.massivecraft.factions.entity.MConf;

src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferF2p.java

@@ -1,7 +1,7 @@
 package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.Factions;
-import com.massivecraft.factions.cmd.relations.req.ReqBankCommandsEnabled;
+import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled;
 import com.massivecraft.factions.cmd.type.TypeFaction;
 import com.massivecraft.factions.cmd.type.TypeMPlayer;
 import com.massivecraft.factions.entity.Faction;

src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferP2f.java

@@ -1,7 +1,7 @@
 package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.Factions;
-import com.massivecraft.factions.cmd.relations.req.ReqBankCommandsEnabled;
+import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled;
 import com.massivecraft.factions.cmd.type.TypeFaction;
 import com.massivecraft.factions.cmd.type.TypeMPlayer;
 import com.massivecraft.factions.entity.Faction;

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

@@ -1,7 +1,7 @@
 package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.Factions;
-import com.massivecraft.factions.cmd.relations.req.ReqBankCommandsEnabled;
+import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled;
 import com.massivecraft.factions.cmd.type.TypeFaction;
 import com.massivecraft.factions.entity.Faction;
 import com.massivecraft.factions.entity.MConf;

src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetOneLocation.java

@@ -7,7 +7,6 @@ import com.massivecraft.factions.entity.MPlayer;
 import com.massivecraft.massivecore.MassiveException;
 import com.massivecraft.massivecore.command.requirement.RequirementIsntPlayer;
 import com.massivecraft.massivecore.ps.PS;
-import org.bukkit.command.CommandException;
 
 import java.util.Collections;
 import java.util.Set;
@@ -50,7 +49,7 @@ public class CmdFactionsSetOneLocation extends FactionsCommand {
         // Apply / Inform
         if (this.claim) {
             if (!BoardColl.get().getFactionAt(chunk).isNone()) {
-                throw new CommandException("<b>Only <h>wilderness<b> can be claimed using this method.");
+                throw new MassiveException().setMsg("<b>Only <h>wilderness<b> can be claimed using this method.");
             }
             msender.tryClaim(player.getFaction(), chunks);
         } else {

src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxFaction.java

@@ -1,6 +1,6 @@
 package com.massivecraft.factions.cmd;
 
-import com.massivecraft.factions.cmd.relations.req.ReqTaxEnabled;
+import com.massivecraft.factions.cmd.req.ReqTaxEnabled;
 import com.massivecraft.factions.cmd.type.TypeFaction;
 import com.massivecraft.factions.entity.Faction;
 import com.massivecraft.factions.entity.MFlag;

src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxPlayer.java

@@ -1,6 +1,6 @@
 package com.massivecraft.factions.cmd;
 
-import com.massivecraft.factions.cmd.relations.req.ReqTaxEnabled;
+import com.massivecraft.factions.cmd.req.ReqTaxEnabled;
 import com.massivecraft.factions.cmd.type.TypeMPlayer;
 import com.massivecraft.factions.entity.MPlayer;
 import com.massivecraft.massivecore.MassiveException;

src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxRun.java

@@ -1,6 +1,6 @@
 package com.massivecraft.factions.cmd;
 
-import com.massivecraft.factions.cmd.relations.req.ReqTaxEnabled;
+import com.massivecraft.factions.cmd.req.ReqTaxEnabled;
 import com.massivecraft.factions.task.TaskTax;
 
 public class CmdFactionsTaxRun extends FactionsCommand {

src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxSet.java

@@ -1,6 +1,6 @@
 package com.massivecraft.factions.cmd;
 
-import com.massivecraft.factions.cmd.relations.req.ReqTaxEnabled;
+import com.massivecraft.factions.cmd.req.ReqTaxEnabled;
 import com.massivecraft.factions.cmd.type.TypeFaction;
 import com.massivecraft.factions.cmd.type.TypeTaxable;
 import com.massivecraft.factions.entity.Faction;

src/main/java/com/massivecraft/factions/cmd/CmdFactionsWarpGo.java

@@ -72,9 +72,22 @@ public class CmdFactionsWarpGo extends FactionsCommandWarp {
         Location locationHere = me.getLocation().clone();
 
         // if player is not in a safe zone or their own faction territory, only allow teleport if no enemies are nearby
-        if (MConf.get().warpsTeleportAllowedEnemyDistance > 0 && factionHere.getFlag(MFlag.getFlagPvp()) &&
+        if
-                (!msender.isInOwnTerritory() || (msender.isInOwnTerritory() &&
+        (
-                        !MConf.get().warpsTeleportIgnoreEnemiesIfInOwnTerritory))) {
+                MConf.get().warpsTeleportAllowedEnemyDistance > 0
+                        &&
+                        factionHere.getFlag(MFlag.getFlagPvp())
+                        &&
+                        (
+                                !msender.isInOwnTerritory()
+                                        ||
+                                        (
+                                                msender.isInOwnTerritory()
+                                                        &&
+                                                        !MConf.get().warpsTeleportIgnoreEnemiesIfInOwnTerritory
+                                        )
+                        )
+        ) {
             World w = locationHere.getWorld();
             double x = locationHere.getX();
             double y = locationHere.getY();

src/main/java/com/massivecraft/factions/cmd/FactionsCommandDocumentation.java

@@ -1,6 +1,6 @@
 package com.massivecraft.factions.cmd;
 
-import com.massivecraft.factions.cmd.relations.req.ReqFactionWarpsEnabled;
+import com.massivecraft.factions.cmd.req.ReqFactionWarpsEnabled;
 import com.massivecraft.massivecore.mson.Mson;
 
 public class FactionsCommandDocumentation extends FactionsCommand {

src/main/java/com/massivecraft/factions/cmd/FactionsCommandWarp.java

@@ -1,6 +1,6 @@
 package com.massivecraft.factions.cmd;
 
-import com.massivecraft.factions.cmd.relations.req.ReqFactionWarpsEnabled;
+import com.massivecraft.factions.cmd.req.ReqFactionWarpsEnabled;
 import com.massivecraft.factions.entity.MConf;
 import com.massivecraft.massivecore.command.Visibility;
 

src/main/java/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java

@@ -1,4 +1,4 @@
-package com.massivecraft.factions.cmd.relations.req;
+package com.massivecraft.factions.cmd.req;
 
 import com.massivecraft.factions.entity.MConf;
 import com.massivecraft.factions.integration.Econ;

src/main/java/com/massivecraft/factions/cmd/req/ReqFactionWarpsEnabled.java

@@ -1,4 +1,4 @@
-package com.massivecraft.factions.cmd.relations.req;
+package com.massivecraft.factions.cmd.req;
 
 import com.massivecraft.factions.entity.MConf;
 import com.massivecraft.massivecore.command.MassiveCommand;

src/main/java/com/massivecraft/factions/cmd/req/ReqHasFaction.java

@@ -1,4 +1,4 @@
-package com.massivecraft.factions.cmd.relations.req;
+package com.massivecraft.factions.cmd.req;
 
 import com.massivecraft.factions.entity.MPlayer;
 import com.massivecraft.massivecore.command.MassiveCommand;

src/main/java/com/massivecraft/factions/cmd/req/ReqHasntFaction.java

@@ -1,4 +1,4 @@
-package com.massivecraft.factions.cmd.relations.req;
+package com.massivecraft.factions.cmd.req;
 
 import com.massivecraft.factions.entity.MPlayer;
 import com.massivecraft.massivecore.command.MassiveCommand;

src/main/java/com/massivecraft/factions/cmd/req/ReqRankIsAtLeast.java

@@ -1,4 +1,4 @@
-package com.massivecraft.factions.cmd.relations.req;
+package com.massivecraft.factions.cmd.req;
 
 import com.massivecraft.factions.entity.MPlayer;
 import com.massivecraft.factions.entity.Rank;

src/main/java/com/massivecraft/factions/cmd/req/ReqTaxEnabled.java

@@ -1,4 +1,4 @@
-package com.massivecraft.factions.cmd.relations.req;
+package com.massivecraft.factions.cmd.req;
 
 import com.massivecraft.factions.task.TaskTax;
 import com.massivecraft.massivecore.command.MassiveCommand;