bump version

Don't waste time if not in an enabled world.
Fixes test for protection that would always return true.
Fixes block use test to use more proper method.

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.youhavetrouble</groupId>
     <artifactId>YardWatch</artifactId>
-    <version>1.2.0</version>
+    <version>1.4.1</version>
     <packaging>jar</packaging>
 
     <name>YardWatch</name>
@@ -15,6 +15,7 @@
     <properties>
         <java.version>17</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <yardwatch.api.version>2.0.0</yardwatch.api.version>
     </properties>
     <url>https://youhavetrouble.me</url>
 
@@ -95,6 +96,18 @@
         </repository>
     </repositories>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.intellectualsites.bom</groupId>
+                <artifactId>bom-newest</artifactId>
+                <version>1.48</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>com.destroystokyo.paper</groupId>
@@ -105,7 +118,7 @@
         <dependency>
             <groupId>com.sk89q.worldguard</groupId>
             <artifactId>worldguard-bukkit</artifactId>
-            <version>7.0.4-SNAPSHOT</version>
+            <version>7.0.9-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.bstats</groupId>
@@ -117,7 +130,7 @@
         <dependency>
             <groupId>com.github.YouHaveTrouble</groupId>
             <artifactId>YardWatchAPI</artifactId>
-            <version>2.0.0</version>
+            <version>${yardwatch.api.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -150,5 +163,11 @@
             <version>0.100.1.0</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.intellectualsites.plotsquared</groupId>
+            <artifactId>plotsquared-core</artifactId>
+            <version>7.3.8</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>

readme.md

@@ -20,6 +20,7 @@ You can download YardWatch plugin on [Modrinth](https://modrinth.com/plugin/yard
 - [FactionsUUID](https://www.spigotmc.org/resources/factionsuuid.1035/)
 - [SuperiorSkyBlock](https://bg-software.com/superiorskyblock/)
 - [Towny](https://github.com/TownyAdvanced/Towny)
+- [PlotSquared (6.0.0+)](https://www.spigotmc.org/resources/plotsquared.1177/)
 
 ## Plugin you're using is not implementing YardWatchAPI?
 Contact the plugin developer and send them [here](https://github.com/YouHaveTrouble/YardWatchAPI/blob/master/readme.md)!

src/main/java/me/youhavetrouble/yardwatch/YardWatch.java

@@ -1,9 +1,11 @@
 package me.youhavetrouble.yardwatch;
 
+import com.google.common.io.Resources;
 import me.youhavetrouble.yardwatch.commands.YardWatchCommand;
 import me.youhavetrouble.yardwatch.hooks.FactionsUUIDProtection;
 import me.youhavetrouble.yardwatch.hooks.GriefPreventionProtection;
 import me.youhavetrouble.yardwatch.hooks.LWCXProtection;
+import me.youhavetrouble.yardwatch.hooks.PlotSquaredProtection;
 import me.youhavetrouble.yardwatch.hooks.SuperiorSkyBlockProtection;
 import me.youhavetrouble.yardwatch.hooks.TownyProtection;
 import me.youhavetrouble.yardwatch.hooks.WorldGuardProtection;
@@ -13,13 +15,28 @@ import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.plugin.ServicePriority;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.io.IOException;
+import java.net.URL;
 import java.util.List;
 
+@SuppressWarnings("UnstableApiUsage")
 public final class YardWatch extends JavaPlugin {
 
+    private static String yardWatchApiVersion = "Unknown";
+
     @Override
     public void onEnable() {
 
+        try {
+            final URL url = getClassLoader().getResource("apiversion.txt");
+
+            if (url != null) {
+                yardWatchApiVersion = Resources.toString(url, com.google.common.base.Charsets.UTF_8);
+            }
+        } catch (IOException e) {
+            getLogger().warning("Failed to read YardWatch API version.");
+        }
+
         PluginCommand command = getCommand("yardwatch");
         if (command != null) {
             command.setExecutor(new YardWatchCommand(this));
@@ -67,6 +84,13 @@ public final class YardWatch extends JavaPlugin {
             );
         }
 
+        if (shouldRegisterService("PlotSquared")) {
+            getLogger().info("Registering PlotSquared service.");
+            getServer().getServicesManager().register(
+                    Protection.class, new PlotSquaredProtection(this), this, ServicePriority.Normal
+            );
+        }
+
         List<RegisteredServiceProvider<?>> registrations = getServer().getServicesManager().getRegistrations(this);
         if (registrations.isEmpty()) {
             getLogger().info("Registered 0 services. This plugin can be safely removed.");
@@ -96,4 +120,8 @@ public final class YardWatch extends JavaPlugin {
     public void onDisable() {
         getServer().getServicesManager().unregisterAll(this);
     }
+
+    public static String getYardWatchApiVersion() {
+        return yardWatchApiVersion;
+    }
 }

src/main/java/me/youhavetrouble/yardwatch/commands/YardWatchCommand.java

@@ -2,9 +2,13 @@ package me.youhavetrouble.yardwatch.commands;
 
 import me.youhavetrouble.yardwatch.Protection;
 import me.youhavetrouble.yardwatch.YardWatch;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.event.HoverEvent;
+import org.bukkit.Location;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
 import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.util.StringUtil;
 import org.jetbrains.annotations.NotNull;
@@ -34,6 +38,9 @@ public class YardWatchCommand implements TabExecutor {
         if (args[0].equalsIgnoreCase("hooks")) {
             sendHooks(sender);
             return true;
+        } else if (args[0].equalsIgnoreCase("query")) {
+            queryProtection(sender);
+            return true;
         }
 
         return false;
@@ -45,6 +52,7 @@ public class YardWatchCommand implements TabExecutor {
 
         if (args.length == 1) {
             completions.add("hooks");
+            completions.add("query");
             return StringUtil.copyPartialMatches(args[0], completions, new ArrayList<>());
         }
 
@@ -52,7 +60,7 @@ public class YardWatchCommand implements TabExecutor {
     }
 
     private void sendDefault(CommandSender sender) {
-        sender.sendMessage("YardWatch " + version);
+        sender.sendMessage(String.format("YardWatch %s (Implementing YardWatch API %s)", version, YardWatch.getYardWatchApiVersion()));
     }
 
     private void sendHooks(CommandSender sender) {
@@ -72,4 +80,31 @@ public class YardWatchCommand implements TabExecutor {
         }
 
     }
+
+    private void queryProtection(CommandSender sender) {
+        if (!(sender instanceof Player player)) {
+            sender.sendMessage(("You must be a player to use this command!"));
+            return;
+        }
+        Location location = player.getLocation();
+        sender.sendMessage("Protections at " + location.getBlockX() + ", " + location.getBlockY() + ", " + location.getBlockZ());
+        Collection<RegisteredServiceProvider<Protection>> protections = plugin.getServer().getServicesManager().getRegistrations(Protection.class);
+        if (protections.isEmpty()) {
+            sender.sendMessage("No protections registered at " + location.getBlockX() + ", " + location.getBlockY() + ", " + location.getBlockZ());
+            return;
+        }
+        for (RegisteredServiceProvider<Protection> protection : protections) {
+            Component component = Component.text(protection.getPlugin().getName()).append(Component.text(" isProtected " + protection.getProvider().isProtected(location)))
+                    .hoverEvent(HoverEvent.showText(
+                            Component.text(protection.getProvider().toString())
+                                    .append(Component.newline())
+                                    .append(Component.text("canPlaceBlock " + protection.getProvider().canPlaceBlock(player, location))
+                                            .append(Component.newline())
+                                            .append(Component.text("canBreakBlock " + protection.getProvider().canBreakBlock(player, location.getBlock().getState())))
+                                            .append(Component.newline())
+                                            .append(Component.text("canInteract " + protection.getProvider().canInteract(player, location.getBlock().getState())))
+                                    )));
+            sender.sendMessage(component);
+        }
+    }
 }

src/main/java/me/youhavetrouble/yardwatch/hooks/FactionsUUIDProtection.java

@@ -35,12 +35,13 @@ public class FactionsUUIDProtection implements Protection {
         if (!FactionsPlugin.getInstance().worldUtil().isEnabled(location.getWorld())) return false;
         FLocation fLocation = new FLocation(location);
         Faction faction = Board.getInstance().getFactionAt(fLocation);
-        return faction != null;
+        return !faction.isWilderness();
     }
 
     @Override
     public boolean canBreakBlock(Player player, BlockState blockState) {
         if (!isEnabled()) return true;
+        if (!FactionsPlugin.getInstance().worldUtil().isEnabled(blockState.getWorld())) return true;
         return FactionsBlockListener.playerCanBuildDestroyBlock(
                 player,
                 blockState.getLocation(),
@@ -52,6 +53,7 @@ public class FactionsUUIDProtection implements Protection {
     @Override
     public boolean canPlaceBlock(Player player, Location location) {
         if (!isEnabled()) return true;
+        if (!FactionsPlugin.getInstance().worldUtil().isEnabled(location.getWorld())) return true;
         return FactionsBlockListener.playerCanBuildDestroyBlock(
                 player,
                 location,
@@ -63,18 +65,26 @@ public class FactionsUUIDProtection implements Protection {
     @Override
     public boolean canInteract(Player player, BlockState blockState) {
         if (!isEnabled()) return true;
-        return FactionsPlayerListener.canInteractHere(player, blockState.getLocation());
+        if (!FactionsPlugin.getInstance().worldUtil().isEnabled(blockState.getWorld())) return true;
+        return FactionsPlayerListener.canUseBlock(
+                player,
+                blockState.getType(),
+                blockState.getLocation(),
+                true
+        );
     }
 
     @Override
     public boolean canInteract(Player player, Entity target) {
         if (!isEnabled()) return true;
+        if (!FactionsPlugin.getInstance().worldUtil().isEnabled(target)) return true;
         return FactionsEntityListener.canInteractHere(player, target.getLocation());
     }
 
     @Override
     public boolean canDamage(Entity damager, Entity target) {
         if (!isEnabled()) return true;
+        if (!FactionsPlugin.getInstance().worldUtil().isEnabled(target)) return true;
         return FactionsEntityListener.canDamage(damager, target, false);
     }
 }

src/main/java/me/youhavetrouble/yardwatch/hooks/PlotSquaredProtection.java

@@ -0,0 +1,97 @@
+package me.youhavetrouble.yardwatch.hooks;
+
+import com.plotsquared.core.plot.Plot;
+import com.plotsquared.core.plot.flag.implementations.PvpFlag;
+import me.youhavetrouble.yardwatch.Protection;
+import me.youhavetrouble.yardwatch.YardWatch;
+import org.bukkit.Location;
+import org.bukkit.block.BlockState;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+public class PlotSquaredProtection implements Protection {
+
+    private final YardWatch plugin;
+
+    public PlotSquaredProtection(YardWatch plugin) {
+        this.plugin = plugin;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return this.plugin.getServer().getPluginManager().isPluginEnabled("PlotSquared");
+    }
+
+    @Override
+    public boolean isProtected(final Location location) {
+        if (!isEnabled()) return false;
+
+        final com.plotsquared.core.location.Location arg1 = getLocation(location);
+
+        return arg1.isPlotArea() || arg1.isPlotRoad() || arg1.isUnownedPlotArea() || arg1.getOwnedPlot() != null;
+    }
+
+    @Override
+    public boolean canBreakBlock(final Player player, final BlockState blockState) {
+        if (!isEnabled()) return true;
+
+        final Location blockLocation = blockState.getLocation();
+        final com.plotsquared.core.location.@NonNull Location location = getLocation(blockLocation);
+
+        final Plot plot = location.getOwnedPlot();
+
+        if (plot == null) return isProtected(blockLocation);
+
+        return plot.isAdded(player.getUniqueId());
+    }
+
+    @Override
+    public boolean canPlaceBlock(final Player player, final Location location) {
+        return canBreakBlock(player, location.getBlock().getState());
+    }
+
+    @Override
+    public boolean canInteract(final Player player, final BlockState blockState) {
+        if (!isEnabled()) return true;
+
+        final Location location = blockState.getLocation();
+
+        com.plotsquared.core.location.@NonNull Location plotLocation = getLocation(location);
+
+        final Plot plot = plotLocation.getOwnedPlot();
+
+        if (plot == null) return isProtected(location);
+
+        return plot.isAdded(player.getUniqueId());
+    }
+
+    @Override
+    public boolean canInteract(final Player player, final Entity target) {
+        return canInteract(player, target.getLocation().getBlock().getState());
+    }
+
+    @Override
+    public boolean canDamage(final Entity damager, final Entity target) {
+        if (!isEnabled() || !(damager instanceof Player)) return true;
+
+        final Location location = target.getLocation();
+
+        com.plotsquared.core.location.@NonNull Location plotLocation = getLocation(location);
+
+        final Plot plot = plotLocation.getOwnedPlot();
+
+        if (plot == null) return isProtected(location);
+
+        return plot.getFlag(PvpFlag.class);
+    }
+
+    private com.plotsquared.core.location.@NonNull Location getLocation(final Location location) {
+        final String world = location.getWorld().getName();
+        final int x = (int) location.getX();
+        final int y = (int) location.getY();
+        final int z = (int) location.getZ();
+
+        return com.plotsquared.core.location.Location.at(world, x, y, z);
+    }
+}

src/main/java/me/youhavetrouble/yardwatch/hooks/TownyProtection.java

@@ -3,7 +3,6 @@ package me.youhavetrouble.yardwatch.hooks;
 import com.palmergames.bukkit.towny.TownyAPI;
 import com.palmergames.bukkit.towny.object.Resident;
 import com.palmergames.bukkit.towny.object.TownBlock;
-import com.palmergames.bukkit.towny.object.TownyPermission;
 import com.palmergames.bukkit.towny.utils.CombatUtil;
 import me.youhavetrouble.yardwatch.Protection;
 import me.youhavetrouble.yardwatch.YardWatch;
@@ -45,7 +44,7 @@ public class TownyProtection implements Protection {
 
     @Override
     public boolean canPlaceBlock(Player player, Location location) {
-        return canInteract(player, location.getBlock().getState(true));
+        return canInteract(player, location.getBlock().getState());
     }
 
     @Override
@@ -63,7 +62,7 @@ public class TownyProtection implements Protection {
 
     @Override
     public boolean canInteract(Player player, Entity target) {
-        return canInteract(player, target.getLocation().getBlock().getState(true));
+        return canInteract(player, target.getLocation().getBlock().getState());
     }
 
     @Override

src/main/java/me/youhavetrouble/yardwatch/hooks/WorldGuardProtection.java

@@ -4,6 +4,8 @@ import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.WorldGuard;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import com.sk89q.worldguard.domains.Association;
+import com.sk89q.worldguard.protection.association.Associables;
 import com.sk89q.worldguard.protection.flags.Flags;
 import com.sk89q.worldguard.protection.regions.RegionContainer;
 import com.sk89q.worldguard.protection.regions.RegionQuery;
@@ -34,7 +36,7 @@ public class WorldGuardProtection implements Protection {
         com.sk89q.worldedit.util.Location wgLocation = BukkitAdapter.adapt(location);
         RegionContainer container = WorldGuard.getInstance().getPlatform().getRegionContainer();
         RegionQuery query = container.createQuery();
-        return query.testBuild(wgLocation, null);
+        return query.testBuild(wgLocation, Associables.constant(Association.NON_MEMBER));
     }
 
     @Override

src/main/resources/apiversion.txt

@@ -0,0 +1 @@
+${yardwatch.api.version}