Class Cleanup for easier navigation

2019-07-01 21:26:13 -04:00
parent 6292b9dd0a
commit 87179d262a
49 changed files with 81 additions and 58 deletions
--- a/src/main/java/com/massivecraft/factions/cmd/claim/CmdClaimLine.java
+++ b/src/main/java/com/massivecraft/factions/cmd/claim/CmdClaimLine.java
@@ -0,0 +1,79 @@
+package com.massivecraft.factions.cmd.claim;
+
+import com.massivecraft.factions.Conf;
+import com.massivecraft.factions.Faction;
+import com.massivecraft.factions.cmd.FCommand;
+import com.massivecraft.factions.struct.Permission;
+import com.massivecraft.factions.zcore.util.TL;
+import org.bukkit.Location;
+import org.bukkit.block.BlockFace;
+
+public class CmdClaimLine extends FCommand {
+
+	public static final BlockFace[] axis = {BlockFace.SOUTH, BlockFace.WEST, BlockFace.NORTH, BlockFace.EAST};
+
+	public CmdClaimLine() {
+
+		// Aliases
+		this.aliases.add("claimline");
+		this.aliases.add("cl");
+
+		// Args
+		this.optionalArgs.put("amount", "1");
+		this.optionalArgs.put("direction", "facing");
+		this.optionalArgs.put("faction", "you");
+
+		this.permission = Permission.CLAIM_LINE.node;
+		this.disableOnLock = true;
+
+
+		senderMustBePlayer = true;
+		senderMustBeMember = false;
+		senderMustBeModerator = false;
+		senderMustBeColeader = false;
+		senderMustBeAdmin = false;
+	}
+
+	@Override
+	public void perform() {
+		// Args
+		Integer amount = this.argAsInt(0, 1); // Default to 1
+
+		if (amount > Conf.lineClaimLimit) {
+			fme.msg(TL.COMMAND_CLAIMLINE_ABOVEMAX, Conf.lineClaimLimit);
+			return;
+		}
+
+		String direction = this.argAsString(1);
+		BlockFace blockFace;
+
+		if (direction == null) {
+			blockFace = axis[Math.round(me.getLocation().getYaw() / 90f) & 0x3];
+		} else if (direction.equalsIgnoreCase("north")) {
+			blockFace = BlockFace.NORTH;
+		} else if (direction.equalsIgnoreCase("east")) {
+			blockFace = BlockFace.EAST;
+		} else if (direction.equalsIgnoreCase("south")) {
+			blockFace = BlockFace.SOUTH;
+		} else if (direction.equalsIgnoreCase("west")) {
+			blockFace = BlockFace.WEST;
+		} else {
+			fme.msg(TL.COMMAND_CLAIMLINE_NOTVALID, direction);
+			return;
+		}
+
+		final Faction forFaction = this.argAsFaction(2, myFaction);
+		Location location = me.getLocation();
+
+		// TODO: make this a task like claiming a radius?
+		for (int i = 0; i < amount; i++) {
+			fme.attemptClaim(forFaction, location, true);
+			location = location.add(blockFace.getModX() * 16, 0, blockFace.getModZ() * 16);
+		}
+	}
+
+	@Override
+	public TL getUsageTranslation() {
+		return TL.COMMAND_CLAIMLINE_DESCRIPTION;
+	}
+}
--- a/src/main/java/com/massivecraft/factions/cmd/claim/CmdCorner.java
+++ b/src/main/java/com/massivecraft/factions/cmd/claim/CmdCorner.java
@@ -0,0 +1,64 @@
+package com.massivecraft.factions.cmd.claim;
+
+
+import com.massivecraft.factions.*;
+import com.massivecraft.factions.cmd.FCommand;
+import com.massivecraft.factions.struct.Permission;
+import com.massivecraft.factions.util.CornerTask;
+import com.massivecraft.factions.zcore.util.TL;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+public class CmdCorner extends FCommand {
+
+    public CmdCorner() {
+        this.aliases.add("corner");
+
+        this.permission = Permission.CLAIM_RADIUS.node;
+
+        this.senderMustBePlayer = true;
+        this.senderMustBeMember = true;
+        this.senderMustBeModerator = false;
+        this.senderMustBeAdmin = false;
+    }
+
+    @Override
+    public void perform() {
+        FLocation to = new FLocation(me.getLocation());
+        if (SaberFactions.plugin.getFactionsPlayerListener().getCorners().contains(to)) {
+            Faction cornerAt = Board.getInstance().getFactionAt(to);
+            if (cornerAt != null && cornerAt.isNormal() && !cornerAt.equals(fme.getFaction())) {
+                msg(TL.COMMAND_CORNER_CANT_CLAIM);
+            } else {
+                msg(TL.COMMAND_CORNER_ATTEMPTING_CLAIM);
+                List<FLocation> surrounding = new ArrayList<>(400);
+                for (int x = 0; x < Conf.factionBufferSize; ++x) {
+                    for (int z = 0; z < Conf.factionBufferSize; ++z) {
+                        int newX = (int) ((to.getX() > 0L) ? (to.getX() - x) : (to.getX() + x));
+                        int newZ = (int) ((to.getZ() > 0L) ? (to.getZ() - z) : (to.getZ() + z));
+                        FLocation location = new FLocation(me.getWorld().getName(), newX, newZ);
+                        Faction at = Board.getInstance().getFactionAt(location);
+                        if (at == null || !at.isNormal()) {
+                            surrounding.add(location);
+                        }
+                    }
+                }
+                surrounding.sort(Comparator.comparingInt(fLocation -> (int) fLocation.getDistanceTo(to)));
+                if (surrounding.isEmpty()) {
+                    msg(TL.COMMAND_CORNER_CANT_CLAIM);
+                } else {
+                    new CornerTask(fme, surrounding).runTaskTimer(SaberFactions.plugin, 1L, 1L);
+                }
+            }
+        } else {
+            msg(TL.COMMAND_CORNER_NOT_CORNER);
+        }
+    }
+
+    @Override
+    public TL getUsageTranslation() {
+        return TL.COMMAND_CORNER_DESCRIPTION;
+    }
+}
--- a/src/main/java/com/massivecraft/factions/cmd/claim/CmdSafeunclaimall.java
+++ b/src/main/java/com/massivecraft/factions/cmd/claim/CmdSafeunclaimall.java
@@ -0,0 +1,63 @@
+package com.massivecraft.factions.cmd.claim;
+
+import com.massivecraft.factions.Board;
+import com.massivecraft.factions.Conf;
+import com.massivecraft.factions.Factions;
+import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.cmd.FCommand;
+import com.massivecraft.factions.struct.Permission;
+import com.massivecraft.factions.zcore.util.TL;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+
+public class CmdSafeunclaimall extends FCommand {
+
+	public CmdSafeunclaimall() {
+		this.aliases.add("safeunclaimall");
+		this.aliases.add("safedeclaimall");
+
+		//this.requiredArgs.add("");
+		this.optionalArgs.put("world", "all");
+
+		this.permission = Permission.MANAGE_SAFE_ZONE.node;
+		this.disableOnLock = true;
+
+		senderMustBePlayer = false;
+		senderMustBeMember = false;
+		senderMustBeModerator = false;
+		senderMustBeColeader = false;
+		senderMustBeAdmin = false;
+
+
+	}
+
+	@Override
+	public void perform() {
+		String worldName = argAsString(0);
+		World world = null;
+
+		if (worldName != null) {
+			world = Bukkit.getWorld(worldName);
+		}
+
+		String id = Factions.getInstance().getSafeZone().getId();
+
+		if (world == null) {
+			Board.getInstance().unclaimAll(id);
+		} else {
+			Board.getInstance().unclaimAllInWorld(id, world);
+		}
+
+		msg(TL.COMMAND_SAFEUNCLAIMALL_UNCLAIMED);
+
+		if (Conf.logLandUnclaims) {
+			SaberFactions.plugin.log(TL.COMMAND_SAFEUNCLAIMALL_UNCLAIMEDLOG.format(sender.getName()));
+		}
+	}
+
+	@Override
+	public TL getUsageTranslation() {
+		return TL.COMMAND_SAFEUNCLAIMALL_DESCRIPTION;
+	}
+
+}
--- a/src/main/java/com/massivecraft/factions/cmd/claim/CmdUnclaim.java
+++ b/src/main/java/com/massivecraft/factions/cmd/claim/CmdUnclaim.java
@@ -0,0 +1,185 @@
+package com.massivecraft.factions.cmd.claim;
+
+import com.massivecraft.factions.*;
+import com.massivecraft.factions.cmd.FCommand;
+import com.massivecraft.factions.event.LandUnclaimEvent;
+import com.massivecraft.factions.integration.Econ;
+import com.massivecraft.factions.struct.Permission;
+import com.massivecraft.factions.struct.Role;
+import com.massivecraft.factions.util.SpiralTask;
+import com.massivecraft.factions.zcore.fperms.Access;
+import com.massivecraft.factions.zcore.fperms.PermissableAction;
+import com.massivecraft.factions.zcore.util.TL;
+import org.bukkit.Bukkit;
+
+public class CmdUnclaim extends FCommand {
+
+	public CmdUnclaim() {
+		this.aliases.add("unclaim");
+		this.aliases.add("declaim");
+
+		this.optionalArgs.put("radius", "1");
+
+		this.permission = Permission.UNCLAIM.node;
+		this.disableOnLock = true;
+
+		senderMustBePlayer = true;
+		senderMustBeMember = false;
+		senderMustBeModerator = false;
+		senderMustBeAdmin = false;
+	}
+
+	@Override
+	public void perform() {
+		// Read and validate input
+		int radius = this.argAsInt(0, 1); // Default to 1
+
+		if (!fme.isAdminBypassing()) {
+			Access access = myFaction.getAccess(fme, PermissableAction.TERRITORY);
+			if (access != Access.ALLOW && fme.getRole() != Role.LEADER) {
+				fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "manage faction territory");
+				return;
+			}
+		}
+
+		if (radius < 1) {
+			msg(TL.COMMAND_CLAIM_INVALIDRADIUS);
+			return;
+		}
+
+		if (radius < 2) {
+			// single chunk
+			unClaim(new FLocation(me));
+		} else {
+			// radius claim
+			if (!Permission.CLAIM_RADIUS.has(sender, false)) {
+				msg(TL.COMMAND_CLAIM_DENIED);
+				return;
+			}
+
+			new SpiralTask(new FLocation(me), radius) {
+				private final int limit = Conf.radiusClaimFailureLimit - 1;
+				private int failCount = 0;
+
+				@Override
+				public boolean work() {
+					boolean success = unClaim(this.currentFLocation());
+					if (success) {
+						failCount = 0;
+					} else if (failCount++ >= limit) {
+						this.stop();
+						return false;
+					}
+
+					return true;
+				}
+			};
+		}
+	}
+
+	private boolean unClaim(FLocation target) {
+		Faction targetFaction = Board.getInstance().getFactionAt(target);
+		if (targetFaction.isSafeZone()) {
+			if (Permission.MANAGE_SAFE_ZONE.has(sender)) {
+				Board.getInstance().removeAt(target);
+				msg(TL.COMMAND_UNCLAIM_SAFEZONE_SUCCESS);
+
+				if (Conf.logLandUnclaims) {
+					SaberFactions.plugin.log(TL.COMMAND_UNCLAIM_LOG.format(fme.getName(), target.getCoordString(), targetFaction.getTag()));
+				}
+				return true;
+			} else {
+				msg(TL.COMMAND_UNCLAIM_SAFEZONE_NOPERM);
+				return false;
+			}
+		} else if (targetFaction.isWarZone()) {
+			if (Permission.MANAGE_WAR_ZONE.has(sender)) {
+				Board.getInstance().removeAt(target);
+				msg(TL.COMMAND_UNCLAIM_WARZONE_SUCCESS);
+
+				if (Conf.logLandUnclaims) {
+					SaberFactions.plugin.log(TL.COMMAND_UNCLAIM_LOG.format(fme.getName(), target.getCoordString(), targetFaction.getTag()));
+				}
+				return true;
+			} else {
+				msg(TL.COMMAND_UNCLAIM_WARZONE_NOPERM);
+				return false;
+			}
+		}
+
+		if (fme.isAdminBypassing()) {
+			LandUnclaimEvent unclaimEvent = new LandUnclaimEvent(target, targetFaction, fme);
+			Bukkit.getServer().getPluginManager().callEvent(unclaimEvent);
+			if (unclaimEvent.isCancelled()) {
+				return false;
+			}
+
+			Board.getInstance().removeAt(target);
+
+			targetFaction.msg(TL.COMMAND_UNCLAIM_UNCLAIMED, fme.describeTo(targetFaction, true));
+			msg(TL.COMMAND_UNCLAIM_UNCLAIMS);
+
+			if (Conf.logLandUnclaims) {
+				SaberFactions.plugin.log(TL.COMMAND_UNCLAIM_LOG.format(fme.getName(), target.getCoordString(), targetFaction.getTag()));
+			}
+
+			return true;
+		}
+
+
+		if (targetFaction.getAccess(fme, PermissableAction.TERRITORY) == Access.DENY) {
+			return false;
+		}
+
+
+		if (!assertHasFaction()) {
+			return false;
+		}
+
+		if (targetFaction.getAccess(fme, PermissableAction.TERRITORY) != Access.ALLOW && !assertMinRole(Role.MODERATOR)) {
+			return false;
+		}
+
+
+		if (myFaction != targetFaction) {
+			msg(TL.COMMAND_UNCLAIM_WRONGFACTION);
+			return false;
+		}
+
+
+		LandUnclaimEvent unclaimEvent = new LandUnclaimEvent(target, targetFaction, fme);
+		Bukkit.getServer().getPluginManager().callEvent(unclaimEvent);
+		if (unclaimEvent.isCancelled()) {
+			return false;
+		}
+
+		if (Econ.shouldBeUsed()) {
+			double refund = Econ.calculateClaimRefund(myFaction.getLandRounded());
+
+			if (Conf.bankEnabled && Conf.bankFactionPaysLandCosts) {
+				if (!Econ.modifyMoney(myFaction, refund, TL.COMMAND_UNCLAIM_TOUNCLAIM.toString(), TL.COMMAND_UNCLAIM_FORUNCLAIM.toString())) {
+					return false;
+				}
+			} else {
+				if (!Econ.modifyMoney(fme, refund, TL.COMMAND_UNCLAIM_TOUNCLAIM.toString(), TL.COMMAND_UNCLAIM_FORUNCLAIM.toString())) {
+					return false;
+				}
+			}
+		}
+
+		Board.getInstance().removeAt(target);
+		myFaction.msg(TL.COMMAND_UNCLAIM_FACTIONUNCLAIMED, fme.describeTo(myFaction, true));
+
+		if (Conf.logLandUnclaims) {
+			SaberFactions.plugin.log(TL.COMMAND_UNCLAIM_LOG.format(fme.getName(), target.getCoordString(), targetFaction.getTag()));
+		}
+
+		return true;
+	}
+
+	@Override
+	public TL getUsageTranslation() {
+		return TL.COMMAND_UNCLAIM_DESCRIPTION;
+	}
+
+}
--- a/src/main/java/com/massivecraft/factions/cmd/claim/CmdUnclaimall.java
+++ b/src/main/java/com/massivecraft/factions/cmd/claim/CmdUnclaimall.java
@@ -0,0 +1,66 @@
+package com.massivecraft.factions.cmd.claim;
+
+import com.massivecraft.factions.Board;
+import com.massivecraft.factions.Conf;
+import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.cmd.FCommand;
+import com.massivecraft.factions.event.LandUnclaimAllEvent;
+import com.massivecraft.factions.integration.Econ;
+import com.massivecraft.factions.struct.Permission;
+import com.massivecraft.factions.zcore.util.TL;
+import org.bukkit.Bukkit;
+
+public class CmdUnclaimall extends FCommand {
+
+	public CmdUnclaimall() {
+		this.aliases.add("unclaimall");
+		this.aliases.add("declaimall");
+
+		//this.requiredArgs.add("");
+		//this.optionalArgs.put("", "");
+
+		this.permission = Permission.UNCLAIM_ALL.node;
+		this.disableOnLock = true;
+
+		senderMustBePlayer = true;
+		senderMustBeMember = false;
+		senderMustBeModerator = true;
+		senderMustBeAdmin = false;
+
+	}
+
+	@Override
+	public void perform() {
+		if (Econ.shouldBeUsed()) {
+			double refund = Econ.calculateTotalLandRefund(myFaction.getLandRounded());
+			if (Conf.bankEnabled && Conf.bankFactionPaysLandCosts) {
+				if (!Econ.modifyMoney(myFaction, refund, TL.COMMAND_UNCLAIMALL_TOUNCLAIM.toString(), TL.COMMAND_UNCLAIMALL_FORUNCLAIM.toString())) {
+					return;
+				}
+			} else {
+				if (!Econ.modifyMoney(fme, refund, TL.COMMAND_UNCLAIMALL_TOUNCLAIM.toString(), TL.COMMAND_UNCLAIMALL_FORUNCLAIM.toString())) {
+					return;
+				}
+			}
+		}
+
+		LandUnclaimAllEvent unclaimAllEvent = new LandUnclaimAllEvent(myFaction, fme);
+		Bukkit.getServer().getPluginManager().callEvent(unclaimAllEvent);
+		if (unclaimAllEvent.isCancelled()) {
+			return;
+		}
+
+		Board.getInstance().unclaimAll(myFaction.getId());
+		myFaction.msg(TL.COMMAND_UNCLAIMALL_UNCLAIMED, fme.describeTo(myFaction, true));
+
+		if (Conf.logLandUnclaims) {
+			SaberFactions.plugin.log(TL.COMMAND_UNCLAIMALL_LOG.format(fme.getName(), myFaction.getTag()));
+		}
+	}
+
+	@Override
+	public TL getUsageTranslation() {
+		return TL.COMMAND_UNCLAIMALL_DESCRIPTION;
+	}
+
+}
--- a/src/main/java/com/massivecraft/factions/cmd/claim/CmdWarunclaimall.java
+++ b/src/main/java/com/massivecraft/factions/cmd/claim/CmdWarunclaimall.java
@@ -0,0 +1,62 @@
+package com.massivecraft.factions.cmd.claim;
+
+import com.massivecraft.factions.Board;
+import com.massivecraft.factions.Conf;
+import com.massivecraft.factions.Factions;
+import com.massivecraft.factions.SaberFactions;
+import com.massivecraft.factions.cmd.FCommand;
+import com.massivecraft.factions.struct.Permission;
+import com.massivecraft.factions.zcore.util.TL;
+import org.bukkit.Bukkit;
+import org.bukkit.World;
+
+public class CmdWarunclaimall extends FCommand {
+
+	public CmdWarunclaimall() {
+		this.aliases.add("warunclaimall");
+		this.aliases.add("wardeclaimall");
+
+		//this.requiredArgs.add("");
+		this.optionalArgs.put("world", "all");
+
+		this.permission = Permission.MANAGE_WAR_ZONE.node;
+		this.disableOnLock = true;
+
+		senderMustBePlayer = false;
+		senderMustBeMember = false;
+		senderMustBeModerator = false;
+		senderMustBeAdmin = false;
+
+	}
+
+	@Override
+	public void perform() {
+		String worldName = argAsString(0);
+		World world = null;
+
+		if (worldName != null) {
+			world = Bukkit.getWorld(worldName);
+		}
+
+		String id = Factions.getInstance().getWarZone().getId();
+
+		if (world == null) {
+			Board.getInstance().unclaimAll(id);
+		} else {
+			Board.getInstance().unclaimAllInWorld(id, world);
+		}
+
+		fme.msg(TL.COMMAND_WARUNCLAIMALL_SUCCESS);
+
+
+		if (Conf.logLandUnclaims) {
+			SaberFactions.plugin.log(TL.COMMAND_WARUNCLAIMALL_LOG.format(fme.getName()));
+		}
+	}
+
+	@Override
+	public TL getUsageTranslation() {
+		return TL.COMMAND_WARUNCLAIMALL_DESCRIPTION;
+	}
+
+}