EpicKnarvik97/Factions3
EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 50f3ed6dee.
This commit is contained in:
Kristian Knarvik 2023-12-17 18:24:54 +01:00
parent 50f3ed6dee
commit 897b95be09
27 changed files with 43 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pom.xml
View File

@ -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>

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsCreate.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsDescription.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationTax.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsDocumentationWarps.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsLeave.java
View File

@ -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 {
// -------------------------------------------- //

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoney.java
View File

@ -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 {
// -------------------------------------------- //

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyBalance.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyDeposit.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferF2f.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferF2p.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyTransferP2f.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsMoneyWithdraw.java
View File

@ -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;

3
src/main/java/com/massivecraft/factions/cmd/CmdFactionsSetOneLocation.java
View File

@ -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 {

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxFaction.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxPlayer.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxRun.java
View File

@ -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 {

2
src/main/java/com/massivecraft/factions/cmd/CmdFactionsTaxSet.java
View File

@ -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;

19
src/main/java/com/massivecraft/factions/cmd/CmdFactionsWarpGo.java
View File

@ -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()) &&
(!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();

2
src/main/java/com/massivecraft/factions/cmd/FactionsCommandDocumentation.java
View File

@ -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 {

2
src/main/java/com/massivecraft/factions/cmd/FactionsCommandWarp.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/cmd/relations/req/ReqBankCommandsEnabled.java → src/main/java/com/massivecraft/factions/cmd/req/ReqBankCommandsEnabled.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/cmd/relations/req/ReqFactionWarpsEnabled.java → src/main/java/com/massivecraft/factions/cmd/req/ReqFactionWarpsEnabled.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/cmd/relations/req/ReqHasFaction.java → src/main/java/com/massivecraft/factions/cmd/req/ReqHasFaction.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/cmd/relations/req/ReqHasntFaction.java → src/main/java/com/massivecraft/factions/cmd/req/ReqHasntFaction.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/cmd/relations/req/ReqRankIsAtLeast.java → src/main/java/com/massivecraft/factions/cmd/req/ReqRankIsAtLeast.java
View File

@ -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;

2
src/main/java/com/massivecraft/factions/cmd/relations/req/ReqTaxEnabled.java → src/main/java/com/massivecraft/factions/cmd/req/ReqTaxEnabled.java
View File

@ -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;