fix pom to allow travisci to compile without spigot server since we only used one other library besides the spigot api, add support for plotsquared, redprotect, and bentobox(askyblock successor)

2024-11-01 01:42:18 +00:00 · 2019-01-01 07:40:05 -05:00 · 2019-01-01 07:40:05 -05:00 · 0f90fb3df2
parent 821a54ec92
commit 0f90fb3df2
4 changed files with 163 additions and 24 deletions
--- a/lib/PlotSquared-Bukkit-4.18.12.31-38a382f-2131.jar
+++ b/lib/PlotSquared-Bukkit-4.18.12.31-38a382f-2131.jar
--- a/lib/RedProtect-7.5.5-b129-Universal.jar
+++ b/lib/RedProtect-7.5.5-b129-Universal.jar
--- a/pom.xml
+++ b/pom.xml
@ -1,12 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
  <modelVersion>4.0.0</modelVersion>
-
  <groupId>com.projectkorra</groupId>
  <artifactId>projectkorra</artifactId>
  <version>1.8.7</version>
  <name>ProjectKorra</name>
-
  <repositories>
    <!-- WorldGuard and WorldEdit Repo -->
    <repository>
@ -23,16 +21,31 @@
      <id>md_5-snapshots</id>
      <url>https://repo.md-5.net/content/repositories/snapshots/</url>
    </repository>
+    <!-- Spigot Repo -->
+    <repository>
+      <id>spigot-repo</id>
+      <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+    </repository>
+    <!-- Bentobox Repo -->
+    <repository>
+      <id>codemc-repo</id>
+      <url>https://repo.codemc.org/repository/maven-public/</url>
+    </repository>
  </repositories>
-
  <dependencies>
-  	<!-- Spigot Server (run BuildTools locally) -->
+    <!-- Spigot API -->
    <dependency>
      <groupId>org.spigotmc</groupId>
-      <artifactId>spigot</artifactId>
+      <artifactId>spigot-api</artifactId>
      <version>1.13.2-R0.1-SNAPSHOT</version>
      <scope>provided</scope>
    </dependency>
+    <!-- lang3 -->
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>3.8.1</version>
+    </dependency>
    <!-- Factions -->
    <dependency>
      <groupId>me.markeh</groupId>
@ -64,14 +77,14 @@
      <scope>provided</scope>
    </dependency>
    <!-- PreciousStones -->
-<!-- outdated
-    <dependency>
-      <groupId>net.sacredlabyrinth.Phaed</groupId>
-      <artifactId>PreciousStones</artifactId>
-      <version>LATEST</version>
-      <scope>system</scope>
-      <systemPath>${project.basedir}/lib/PreciousStones 10.6.1.jar</systemPath>
-    </dependency>
+    <!-- outdated
+<dependency>
+  <groupId>net.sacredlabyrinth.Phaed</groupId>
+  <artifactId>PreciousStones</artifactId>
+  <version>LATEST</version>
+  <scope>system</scope>
+  <systemPath>${project.basedir}/lib/PreciousStones 10.6.1.jar</systemPath>
+</dependency>
 -->
    <!-- Residence -->
    <dependency>
@ -89,6 +102,7 @@
      <scope>system</scope>
      <systemPath>${project.basedir}/lib/Towny.jar</systemPath>
    </dependency>
+    <!-- WorldEdit / WorldGuard -->
    <dependency>
      <groupId>com.sk89q.worldedit</groupId>
      <artifactId>worldedit-core</artifactId>
@ -113,6 +127,29 @@
      <version>7.0.0-beta-02</version>
      <scope>provided</scope>
    </dependency>
+    <!-- SkyBlock / AcidIsland -->
+    <dependency>
+      <groupId>world.bentobox</groupId>
+      <artifactId>bentobox</artifactId>
+      <version>LATEST</version>
+      <scope>provided</scope>
+    </dependency>
+    <!-- RedProtect -->
+    <dependency>
+      <groupId>br.net.fabiozumbi12</groupId>
+      <artifactId>RedProtect</artifactId>
+      <version>LATEST</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/RedProtect-7.5.5-b129-Universal.jar</systemPath>
+    </dependency>
+    <!-- PlotSquared -->
+    <dependency>
+      <groupId>com.github.intelletualsites</groupId>
+      <artifactId>plotsquared</artifactId>
+      <version>LATEST</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/lib/PlotSquared-Bukkit-4.18.12.31-38a382f-2131.jar</systemPath>
+    </dependency>
    <!-- Kingdoms -->
    <dependency>
      <groupId>org.kingdoms</groupId>
@ -122,7 +159,6 @@
      <systemPath>${project.basedir}/lib/Kingdoms.jar</systemPath>
    </dependency>
  </dependencies>
-
  <build>
    <defaultGoal>clean package install</defaultGoal>
    <finalName>${project.name}-${project.version}</finalName>
@ -149,8 +185,7 @@
      </plugin>
    </plugins>
  </build>
-
  <properties>
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  </properties>
-</project>
+</project>
--- a/src/com/projectkorra/projectkorra/GeneralMethods.java
+++ b/src/com/projectkorra/projectkorra/GeneralMethods.java
@ -1,9 +1,19 @@
 package com.projectkorra.projectkorra;

+import br.net.fabiozumbi12.RedProtect.Bukkit.API.RedProtectAPI;
+import br.net.fabiozumbi12.RedProtect.Bukkit.RedProtect;
+import br.net.fabiozumbi12.RedProtect.Bukkit.Region;
 import com.bekvon.bukkit.residence.Residence;
 import com.bekvon.bukkit.residence.api.ResidenceInterface;
 import com.bekvon.bukkit.residence.protection.ClaimedResidence;
 import com.bekvon.bukkit.residence.protection.ResidencePermissions;
+import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil;
+import com.github.intellectualsites.plotsquared.plot.config.C;
+import com.github.intellectualsites.plotsquared.plot.config.Settings;
+import com.github.intellectualsites.plotsquared.plot.object.Plot;
+import com.github.intellectualsites.plotsquared.plot.object.PlotArea;
+import com.github.intellectualsites.plotsquared.plot.object.PlotPlayer;
+import com.github.intellectualsites.plotsquared.plot.util.Permissions;
 import com.google.common.reflect.ClassPath;
 import com.griefcraft.lwc.LWC;
 import com.griefcraft.lwc.LWCPlugin;
@ -72,6 +82,9 @@ import org.kingdoms.constants.land.SimpleChunkLocation;
 import org.kingdoms.constants.land.SimpleLocation;
 import org.kingdoms.constants.player.KingdomPlayer;
 import org.kingdoms.manager.game.GameManagement;
+import world.bentobox.bentobox.BentoBox;
+import world.bentobox.bentobox.api.user.User;
+import world.bentobox.bentobox.database.objects.Island;

 import java.io.*;
 import java.lang.reflect.Field;
@ -1338,6 +1351,9 @@ public class GeneralMethods {
 		final boolean respectLWC = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.RespectLWC");
 		final boolean respectResidence = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.Residence.Respect");
 		final boolean respectKingdoms = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.Kingdoms");
+		final boolean respectPlotSquared = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.PlotSquared");
+		final boolean respectRedProtect = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.RedProtect");
+		final boolean respectBentoBox = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.BentoBox");

 		boolean isIgnite = false;
 		boolean isExplosive = false;
@ -1366,6 +1382,9 @@ public class GeneralMethods {
 		final Plugin lwc = pm.getPlugin("LWC");
 		final Plugin residence = pm.getPlugin("Residence");
 		final Plugin kingdoms = pm.getPlugin("Kingdoms");
+		final Plugin plotsquared = pm.getPlugin("PlotSquared");
+		final Plugin redprotect = pm.getPlugin("RedProtect");
+		final Plugin bentobox = pm.getPlugin("BentoBox");

 		for (final Location location : new Location[] { loc, player.getLocation() }) {
 			final World world = location.getWorld();
@ -1532,6 +1551,70 @@ public class GeneralMethods {
 					}
 				}
 			}
+
+			if (plotsquared != null && respectPlotSquared) {
+				com.github.intellectualsites.plotsquared.plot.object.Location plotLocation = BukkitUtil.getLocation(location);
+				PlotArea plotArea = plotLocation.getPlotArea();
+				if (plotArea != null) {
+					Plot plot = plotArea.getPlot(plotLocation);
+					PlotPlayer plotPlayer = BukkitUtil.getPlayer(player);
+					if (plot != null) {
+						if (location.getBlock().getY() == 0) {
+							if (!Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_GROUNDLEVEL)) {
+								return true;
+							}
+						} else if ((location.getY() > plotArea.MAX_BUILD_HEIGHT || location.getY() < plotArea.MIN_BUILD_HEIGHT) && !Permissions
+								.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_HEIGHTLIMIT)) {
+							return true;
+						}
+						if (!plot.hasOwner()) {
+							if (!Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_UNOWNED)) {
+								return true;
+							}
+						}
+						if (!plot.isAdded(plotPlayer.getUUID())) {
+							if (!Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_OTHER)) {
+								return true;
+							}
+						} else if (Settings.Done.RESTRICT_BUILDING && plot.getFlags().containsKey(com.github.intellectualsites.plotsquared.plot.flag.Flags.DONE)) {
+							if (!Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_BUILD_OTHER)) {
+								return true;
+							}
+						}
+					}
+					if (!Permissions.hasPermission(plotPlayer, C.PERMISSION_ADMIN_DESTROY_ROAD)) {
+						return true;
+					}
+				}
+			}
+
+			if (redprotect != null && respectRedProtect) {
+				RedProtectAPI api = RedProtect.get().getAPI();
+				Region region = api.getRegion(location);
+				if (!(region != null && region.canBuild(player))) {
+					return true;
+				}
+			}
+
+			if (bentobox != null && respectBentoBox) {
+				BentoBox bentoBoxPlugin = BentoBox.getInstance();
+				if (bentoBoxPlugin.getIWM().inWorld(loc)) {
+					Optional<Island> island = bentoBoxPlugin.getIslands().getProtectedIslandAt(loc);
+					if (!(player.isOp() || player.hasPermission(bentoBoxPlugin.getIWM().getPermissionPrefix(loc.getWorld()) + ".mod.bypass.BREAK_BLOCKS.everywhere"))){
+						if (island.isPresent()) {
+							if (!island.get().isAllowed(User.getInstance(player), bentoBoxPlugin.getFlagsManager().getFlagByID("BREAK_BLOCKS"))) {
+								return true;
+							}
+							if (!(player.hasPermission(bentoBoxPlugin.getIWM().getPermissionPrefix(loc.getWorld()) + ".mod.bypass.BREAK_BLOCKS.island"))) {
+								return true;
+							}
+						}
+						if (!bentoBoxPlugin.getFlagsManager().getFlagByID("BREAK_BLOCKS").isSetForWorld(loc.getWorld())) {
+							return true;
+						}
+					}
+				}
+			}
 		}
 		return false;
 	}
@ -1786,15 +1869,24 @@ public class GeneralMethods {
 		final boolean respectTowny = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.RespectTowny");
 		final boolean respectGriefPrevention = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.RespectGriefPrevention");
 		final boolean respectLWC = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.RespectLWC");
+		final boolean respectResidence = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.Residence.Respect");
+		final boolean respectKingdoms = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.Kingdoms");
+		final boolean respectPlotSquared = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.PlotSquared");
+		final boolean respectRedProtect = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.RedProtect");
+		final boolean respectBentoBox = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.BentoBox");
 		final PluginManager pm = Bukkit.getPluginManager();

 		final Plugin wgp = pm.getPlugin("WorldGuard");
 		final Plugin psp = pm.getPlugin("PreciousStones");
-		final Plugin fcp = pm.getPlugin("Factions");
+		final Plugin fcp = pm.getPlugin("FactionsFramework");
 		final Plugin twnp = pm.getPlugin("Towny");
 		final Plugin gpp = pm.getPlugin("GriefPrevention");
-		final Plugin massivecore = pm.getPlugin("MassiveCore");
 		final Plugin lwc = pm.getPlugin("LWC");
+		final Plugin residence = pm.getPlugin("Residence");
+		final Plugin kingdoms = pm.getPlugin("Kingdoms");
+		final Plugin plotsquared = pm.getPlugin("PlotSquared");
+		final Plugin redprotect = pm.getPlugin("RedProtect");
+		final Plugin bentobox = pm.getPlugin("BentoBox");

 		if (wgp != null && respectWorldGuard) {
 			writeToDebug("WorldGuard v" + wgp.getDescription().getVersion());
@ -1803,10 +1895,7 @@ public class GeneralMethods {
 			writeToDebug("PreciousStones v" + psp.getDescription().getVersion());
 		}
 		if (fcp != null && respectFactions) {
-			writeToDebug("Factions v" + fcp.getDescription().getVersion());
-		}
-		if (massivecore != null && respectFactions) {
-			writeToDebug("MassiveCore v" + massivecore.getDescription().getVersion());
+			writeToDebug("FactionsFramework v" + fcp.getDescription().getVersion());
 		}
 		if (twnp != null && respectTowny) {
 			writeToDebug("Towny v" + twnp.getDescription().getVersion());
@ -1817,6 +1906,21 @@ public class GeneralMethods {
 		if (lwc != null && respectLWC) {
 			writeToDebug("LWC v" + lwc.getDescription().getVersion());
 		}
+		if (residence != null && respectResidence) {
+			writeToDebug("Residence v" + residence.getDescription().getVersion());
+		}
+		if (kingdoms != null && respectKingdoms) {
+			writeToDebug("Kingdoms v" + kingdoms.getDescription().getVersion());
+		}
+		if (plotsquared != null && respectPlotSquared) {
+			writeToDebug("PlotSquared v" + plotsquared.getDescription().getVersion());
+		}
+		if (redprotect != null && respectRedProtect) {
+			writeToDebug("RedProtect v" + redprotect.getDescription().getVersion());
+		}
+		if (bentobox != null && respectBentoBox) {
+			writeToDebug("BentoBox v" + bentobox.getDescription().getVersion());
+		}

 		writeToDebug("");
 		writeToDebug("Plugins Hooking Into ProjectKorra (Core)");