From 50f3ed6dee9c1f679730d531d83dfe63f272f1d2 Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Sun, 17 Dec 2023 18:22:51 +0100 Subject: [PATCH] Moves some classes, amd changes how the massive core is included --- pom.xml | 3 +-- .../factions/cmd/CmdFactionsCreate.java | 2 +- .../factions/cmd/CmdFactionsDescription.java | 2 +- .../cmd/CmdFactionsDocumentationTax.java | 2 +- .../cmd/CmdFactionsDocumentationWarps.java | 2 +- .../factions/cmd/CmdFactionsLeave.java | 2 +- .../factions/cmd/CmdFactionsMoney.java | 2 +- .../factions/cmd/CmdFactionsMoneyBalance.java | 2 +- .../factions/cmd/CmdFactionsMoneyDeposit.java | 2 +- .../cmd/CmdFactionsMoneyTransferF2f.java | 2 +- .../cmd/CmdFactionsMoneyTransferF2p.java | 2 +- .../cmd/CmdFactionsMoneyTransferP2f.java | 2 +- .../cmd/CmdFactionsMoneyWithdraw.java | 2 +- .../cmd/CmdFactionsSetOneLocation.java | 3 ++- .../factions/cmd/CmdFactionsTaxFaction.java | 2 +- .../factions/cmd/CmdFactionsTaxPlayer.java | 2 +- .../factions/cmd/CmdFactionsTaxRun.java | 2 +- .../factions/cmd/CmdFactionsTaxSet.java | 2 +- .../factions/cmd/CmdFactionsWarpGo.java | 19 +++---------------- .../cmd/FactionsCommandDocumentation.java | 2 +- .../factions/cmd/FactionsCommandWarp.java | 2 +- .../req/ReqBankCommandsEnabled.java | 2 +- .../req/ReqFactionWarpsEnabled.java | 2 +- .../{ => relations}/req/ReqHasFaction.java | 2 +- .../{ => relations}/req/ReqHasntFaction.java | 2 +- .../{ => relations}/req/ReqRankIsAtLeast.java | 2 +- .../{ => relations}/req/ReqTaxEnabled.java | 2 +- 27 files changed, 30 insertions(+), 43 deletions(-) rename src/main/java/com/massivecraft/factions/cmd/{ => relations}/req/ReqBankCommandsEnabled.java (96%) rename src/main/java/com/massivecraft/factions/cmd/{ => relations}/req/ReqFactionWarpsEnabled.java (96%) rename src/main/java/com/massivecraft/factions/cmd/{ => relations}/req/ReqHasFaction.java (96%) rename src/main/java/com/massivecraft/factions/cmd/{ => relations}/req/ReqHasntFaction.java (96%) rename src/main/java/com/massivecraft/factions/cmd/{ => relations}/req/ReqRankIsAtLeast.java (97%) rename src/main/java/com/massivecraft/factions/cmd/{ => relations}/req/ReqTaxEnabled.java (95%) diff --git a/pom.xml b/pom.xml index 989c2015..126d73a7 100644 --- a/pom.xml +++ b/pom.xml @@ -58,8 +58,7 @@ com.massivecraft.massivecore MassiveCore 3.3.3 - system - ${project.basedir}\lib\MassiveCore.jar + compile diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsCreate.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsCreate.java index 6fdc04d0..185944c3 100644 --- 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; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDescription.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDescription.java index e70fa5f6..fa57a1a6 100644 --- 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; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationTax.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationTax.java index 47607c9d..2137e3fe 100644 --- 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; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationWarps.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationWarps.java index 92ce2cdc..9987ec4d 100644 --- 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; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsLeave.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsLeave.java index dd775b10..c8648a50 100644 --- 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 { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoney.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoney.java index f62bc9ea..3b275f32 100644 --- 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 { // -------------------------------------------- // diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java index 30e966cb..ed473c4b 100644 --- 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; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java index 4eff9095..f4ebace5 100644 --- 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; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferF2f.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferF2f.java index a4f67f59..2d4b4f3b 100644 --- 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; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferF2p.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferF2p.java index f11d9fb0..f2d81f39 100644 --- 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; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferP2f.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferP2f.java index 240f0456..e23bbda4 100644 --- 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; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java index 1525866a..66fd8e8e 100644 --- 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; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetOneLocation.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetOneLocation.java index 0c4839cc..b95dafcf 100644 --- 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("Only wilderness can be claimed using this method."); + throw new CommandException("Only wilderness can be claimed using this method."); } msender.tryClaim(player.getFaction(), chunks); } else { diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxFaction.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxFaction.java index bf4fd3af..5d0ba205 100644 --- 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; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxPlayer.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxPlayer.java index a2d132af..11e8b3ed 100644 --- 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; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxRun.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxRun.java index 9347b685..78db8ef5 100644 --- 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 { diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxSet.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxSet.java index 771d10b4..b6a25ef4 100644 --- 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; diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdFactionsWarpGo.java b/src/main/java/com/massivecraft/factions/cmd/CmdFactionsWarpGo.java index bbda40ee..0576b590 100644 --- 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(); diff --git a/src/main/java/com/massivecraft/factions/cmd/FactionsCommandDocumentation.java b/src/main/java/com/massivecraft/factions/cmd/FactionsCommandDocumentation.java index b2ba5b99..5484d9ee 100644 --- 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 { diff --git a/src/main/java/com/massivecraft/factions/cmd/FactionsCommandWarp.java b/src/main/java/com/massivecraft/factions/cmd/FactionsCommandWarp.java index 81a4e808..90093bff 100644 --- 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; diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java b/src/main/java/com/massivecraft/factions/cmd/relations/req/ReqBankCommandsEnabled.java similarity index 96% rename from src/main/java/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java rename to src/main/java/com/massivecraft/factions/cmd/relations/req/ReqBankCommandsEnabled.java index 937c2ad7..32dd6772 100644 --- a/src/main/java/com/massivecraft/factions/cmd/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; diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqFactionWarpsEnabled.java b/src/main/java/com/massivecraft/factions/cmd/relations/req/ReqFactionWarpsEnabled.java similarity index 96% rename from src/main/java/com/massivecraft/factions/cmd/req/ReqFactionWarpsEnabled.java rename to src/main/java/com/massivecraft/factions/cmd/relations/req/ReqFactionWarpsEnabled.java index cf6a31e2..deb8aeaa 100644 --- a/src/main/java/com/massivecraft/factions/cmd/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; diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqHasFaction.java b/src/main/java/com/massivecraft/factions/cmd/relations/req/ReqHasFaction.java similarity index 96% rename from src/main/java/com/massivecraft/factions/cmd/req/ReqHasFaction.java rename to src/main/java/com/massivecraft/factions/cmd/relations/req/ReqHasFaction.java index 9716fc7f..5631f8cc 100644 --- a/src/main/java/com/massivecraft/factions/cmd/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; diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqHasntFaction.java b/src/main/java/com/massivecraft/factions/cmd/relations/req/ReqHasntFaction.java similarity index 96% rename from src/main/java/com/massivecraft/factions/cmd/req/ReqHasntFaction.java rename to src/main/java/com/massivecraft/factions/cmd/relations/req/ReqHasntFaction.java index e9dbb81f..08703a5e 100644 --- a/src/main/java/com/massivecraft/factions/cmd/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; diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqRankIsAtLeast.java b/src/main/java/com/massivecraft/factions/cmd/relations/req/ReqRankIsAtLeast.java similarity index 97% rename from src/main/java/com/massivecraft/factions/cmd/req/ReqRankIsAtLeast.java rename to src/main/java/com/massivecraft/factions/cmd/relations/req/ReqRankIsAtLeast.java index 5611bf55..b51c4896 100644 --- a/src/main/java/com/massivecraft/factions/cmd/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; diff --git a/src/main/java/com/massivecraft/factions/cmd/req/ReqTaxEnabled.java b/src/main/java/com/massivecraft/factions/cmd/relations/req/ReqTaxEnabled.java similarity index 95% rename from src/main/java/com/massivecraft/factions/cmd/req/ReqTaxEnabled.java rename to src/main/java/com/massivecraft/factions/cmd/relations/req/ReqTaxEnabled.java index 34edd94a..7b2afa31 100644 --- a/src/main/java/com/massivecraft/factions/cmd/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;