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

2023-12-17 18:22:51 +01:00
parent 747e38c60d
commit 50f3ed6dee
27 changed files with 30 additions and 43 deletions
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsCreate.java
+++ b/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.req.ReqHasntFaction;
+import com.massivecraft.factions.cmd.relations.req.ReqHasntFaction;
 import com.massivecraft.factions.cmd.type.TypeFactionNameStrict;
 import com.massivecraft.factions.entity.Faction;
 import com.massivecraft.factions.entity.FactionColl;
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDescription.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDescription.java
@@ -1,6 +1,6 @@
 package com.massivecraft.factions.cmd;

-import com.massivecraft.factions.cmd.req.ReqHasFaction;
+import com.massivecraft.factions.cmd.relations.req.ReqHasFaction;
 import com.massivecraft.factions.entity.MPerm;
 import com.massivecraft.factions.entity.MPlayer;
 import com.massivecraft.factions.event.EventFactionsDescriptionChange;
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationTax.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationTax.java
@@ -1,6 +1,6 @@
 package com.massivecraft.factions.cmd;

-import com.massivecraft.factions.cmd.req.ReqTaxEnabled;
+import com.massivecraft.factions.cmd.relations.req.ReqTaxEnabled;
 import com.massivecraft.factions.entity.MConf;
 import com.massivecraft.massivecore.money.Money;
 import com.massivecraft.massivecore.util.TimeDiffUtil;
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationWarps.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationWarps.java
@@ -1,6 +1,6 @@
 package com.massivecraft.factions.cmd;

-import com.massivecraft.factions.cmd.req.ReqFactionWarpsEnabled;
+import com.massivecraft.factions.cmd.relations.req.ReqFactionWarpsEnabled;
 import com.massivecraft.factions.entity.MConf;
 import com.massivecraft.factions.entity.MPerm;
 import com.massivecraft.factions.entity.MPerm.MPermable;
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsLeave.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsLeave.java
@@ -1,6 +1,6 @@
 package com.massivecraft.factions.cmd;

-import com.massivecraft.factions.cmd.req.ReqHasFaction;
+import com.massivecraft.factions.cmd.relations.req.ReqHasFaction;

 public class CmdFactionsLeave extends FactionsCommand {
    // -------------------------------------------- //
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoney.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoney.java
@@ -1,6 +1,6 @@
 package com.massivecraft.factions.cmd;

-import com.massivecraft.factions.cmd.req.ReqBankCommandsEnabled;
+import com.massivecraft.factions.cmd.relations.req.ReqBankCommandsEnabled;

 public class CmdFactionsMoney extends FactionsCommand {
    // -------------------------------------------- //
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java
+++ b/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.req.ReqBankCommandsEnabled;
+import com.massivecraft.factions.cmd.relations.req.ReqBankCommandsEnabled;
 import com.massivecraft.factions.cmd.type.TypeFaction;
 import com.massivecraft.factions.entity.Faction;
 import com.massivecraft.factions.integration.Econ;
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java
+++ b/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.req.ReqBankCommandsEnabled;
+import com.massivecraft.factions.cmd.relations.req.ReqBankCommandsEnabled;
 import com.massivecraft.factions.cmd.type.TypeFaction;
 import com.massivecraft.factions.entity.Faction;
 import com.massivecraft.factions.entity.MConf;
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferF2f.java
+++ b/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.req.ReqBankCommandsEnabled;
+import com.massivecraft.factions.cmd.relations.req.ReqBankCommandsEnabled;
 import com.massivecraft.factions.cmd.type.TypeFaction;
 import com.massivecraft.factions.entity.Faction;
 import com.massivecraft.factions.entity.MConf;
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferF2p.java
+++ b/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.req.ReqBankCommandsEnabled;
+import com.massivecraft.factions.cmd.relations.req.ReqBankCommandsEnabled;
 import com.massivecraft.factions.cmd.type.TypeFaction;
 import com.massivecraft.factions.cmd.type.TypeMPlayer;
 import com.massivecraft.factions.entity.Faction;
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferP2f.java
+++ b/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.req.ReqBankCommandsEnabled;
+import com.massivecraft.factions.cmd.relations.req.ReqBankCommandsEnabled;
 import com.massivecraft.factions.cmd.type.TypeFaction;
 import com.massivecraft.factions.cmd.type.TypeMPlayer;
 import com.massivecraft.factions.entity.Faction;
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java
+++ b/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.req.ReqBankCommandsEnabled;
+import com.massivecraft.factions.cmd.relations.req.ReqBankCommandsEnabled;
 import com.massivecraft.factions.cmd.type.TypeFaction;
 import com.massivecraft.factions.entity.Faction;
 import com.massivecraft.factions.entity.MConf;
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetOneLocation.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetOneLocation.java
@@ -7,6 +7,7 @@ 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;
@@ -49,7 +50,7 @@ public class CmdFactionsSetOneLocation extends FactionsCommand {
        // Apply / Inform
        if (this.claim) {
            if (!BoardColl.get().getFactionAt(chunk).isNone()) {
-                throw new MassiveException().setMsg("<b>Only <h>wilderness<b> can be claimed using this method.");
+                throw new CommandException("<b>Only <h>wilderness<b> can be claimed using this method.");
            }
            msender.tryClaim(player.getFaction(), chunks);
        } else {
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxFaction.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxFaction.java
@@ -1,6 +1,6 @@
 package com.massivecraft.factions.cmd;

-import com.massivecraft.factions.cmd.req.ReqTaxEnabled;
+import com.massivecraft.factions.cmd.relations.req.ReqTaxEnabled;
 import com.massivecraft.factions.cmd.type.TypeFaction;
 import com.massivecraft.factions.entity.Faction;
 import com.massivecraft.factions.entity.MFlag;
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxPlayer.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxPlayer.java
@@ -1,6 +1,6 @@
 package com.massivecraft.factions.cmd;

-import com.massivecraft.factions.cmd.req.ReqTaxEnabled;
+import com.massivecraft.factions.cmd.relations.req.ReqTaxEnabled;
 import com.massivecraft.factions.cmd.type.TypeMPlayer;
 import com.massivecraft.factions.entity.MPlayer;
 import com.massivecraft.massivecore.MassiveException;
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxRun.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxRun.java
@@ -1,6 +1,6 @@
 package com.massivecraft.factions.cmd;

-import com.massivecraft.factions.cmd.req.ReqTaxEnabled;
+import com.massivecraft.factions.cmd.relations.req.ReqTaxEnabled;
 import com.massivecraft.factions.task.TaskTax;

 public class CmdFactionsTaxRun extends FactionsCommand {
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxSet.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxSet.java
@@ -1,6 +1,6 @@
 package com.massivecraft.factions.cmd;

-import com.massivecraft.factions.cmd.req.ReqTaxEnabled;
+import com.massivecraft.factions.cmd.relations.req.ReqTaxEnabled;
 import com.massivecraft.factions.cmd.type.TypeFaction;
 import com.massivecraft.factions.cmd.type.TypeTaxable;
 import com.massivecraft.factions.entity.Faction;
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsWarpGo.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsWarpGo.java
@@ -72,22 +72,9 @@ 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())
-                        &&
-                        (
-                                !msender.isInOwnTerritory()
-                                        ||
-                                        (
-                                                msender.isInOwnTerritory()
-                                                        &&
-                                                        !MConf.get().warpsTeleportIgnoreEnemiesIfInOwnTerritory
-                                        )
-                        )
-        ) {
+        if (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();
--- a/src/main/java/com/massivecraft/factions/cmd/FactionsCommandDocumentation.java
+++ b/src/main/java/com/massivecraft/factions/cmd/FactionsCommandDocumentation.java
@@ -1,6 +1,6 @@
 package com.massivecraft.factions.cmd;

-import com.massivecraft.factions.cmd.req.ReqFactionWarpsEnabled;
+import com.massivecraft.factions.cmd.relations.req.ReqFactionWarpsEnabled;
 import com.massivecraft.massivecore.mson.Mson;

 public class FactionsCommandDocumentation extends FactionsCommand {
--- a/src/main/java/com/massivecraft/factions/cmd/FactionsCommandWarp.java
+++ b/src/main/java/com/massivecraft/factions/cmd/FactionsCommandWarp.java
@@ -1,6 +1,6 @@
 package com.massivecraft.factions.cmd;

-import com.massivecraft.factions.cmd.req.ReqFactionWarpsEnabled;
+import com.massivecraft.factions.cmd.relations.req.ReqFactionWarpsEnabled;
 import com.massivecraft.factions.entity.MConf;
 import com.massivecraft.massivecore.command.Visibility;

--- a/src/main/java/com/massivecraft/factions/cmd/relations/req/ReqBankCommandsEnabled.java
+++ b/src/main/java/com/massivecraft/factions/cmd/relations/req/ReqBankCommandsEnabled.java
@@ -1,4 +1,4 @@
-package com.massivecraft.factions.cmd.req;
+package com.massivecraft.factions.cmd.relations.req;

 import com.massivecraft.factions.entity.MConf;
 import com.massivecraft.factions.integration.Econ;
--- a/src/main/java/com/massivecraft/factions/cmd/relations/req/ReqFactionWarpsEnabled.java
+++ b/src/main/java/com/massivecraft/factions/cmd/relations/req/ReqFactionWarpsEnabled.java
@@ -1,4 +1,4 @@
-package com.massivecraft.factions.cmd.req;
+package com.massivecraft.factions.cmd.relations.req;

 import com.massivecraft.factions.entity.MConf;
 import com.massivecraft.massivecore.command.MassiveCommand;
--- a/src/main/java/com/massivecraft/factions/cmd/relations/req/ReqHasFaction.java
+++ b/src/main/java/com/massivecraft/factions/cmd/relations/req/ReqHasFaction.java
@@ -1,4 +1,4 @@
-package com.massivecraft.factions.cmd.req;
+package com.massivecraft.factions.cmd.relations.req;

 import com.massivecraft.factions.entity.MPlayer;
 import com.massivecraft.massivecore.command.MassiveCommand;
--- a/src/main/java/com/massivecraft/factions/cmd/relations/req/ReqHasntFaction.java
+++ b/src/main/java/com/massivecraft/factions/cmd/relations/req/ReqHasntFaction.java
@@ -1,4 +1,4 @@
-package com.massivecraft.factions.cmd.req;
+package com.massivecraft.factions.cmd.relations.req;

 import com.massivecraft.factions.entity.MPlayer;
 import com.massivecraft.massivecore.command.MassiveCommand;
--- a/src/main/java/com/massivecraft/factions/cmd/relations/req/ReqRankIsAtLeast.java
+++ b/src/main/java/com/massivecraft/factions/cmd/relations/req/ReqRankIsAtLeast.java
@@ -1,4 +1,4 @@
-package com.massivecraft.factions.cmd.req;
+package com.massivecraft.factions.cmd.relations.req;

 import com.massivecraft.factions.entity.MPlayer;
 import com.massivecraft.factions.entity.Rank;
--- a/src/main/java/com/massivecraft/factions/cmd/relations/req/ReqTaxEnabled.java
+++ b/src/main/java/com/massivecraft/factions/cmd/relations/req/ReqTaxEnabled.java
@@ -1,4 +1,4 @@
-package com.massivecraft.factions.cmd.req;
+package com.massivecraft.factions.cmd.relations.req;

 import com.massivecraft.factions.task.TaskTax;
 import com.massivecraft.massivecore.command.MassiveCommand;