[Compatibility] PlotSquaredV5

Xiao-MoMi · Apr 21, 2024 · 731669f · 731669f
1 parent 36cf483
commit 731669f
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 6 deletions.
diff --git a/conflict-packages/build.gradle.kts b/conflict-packages/build.gradle.kts
@@ -10,4 +10,5 @@ dependencies {
     implementation(project(":common"))
     compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT")                // Paper
     compileOnly("com.github.SaberLLC:Saber-Factions:4.1.2-STABLE")                // SaberFactions
+    compileOnly(files("libs/PlotSquared-pruned.jar"))                      // PlotSquaredV5
 }
diff --git a/conflict-packages/libs/PlotSquared-pruned.jar b/conflict-packages/libs/PlotSquared-pruned.jar
diff --git a/...ms/antigrieflib/comp/PlotSquaredComp.java → .../antigrieflib/comp/PlotSquaredV5Comp.java b/...ms/antigrieflib/comp/PlotSquaredComp.java → .../antigrieflib/comp/PlotSquaredV5Comp.java
@@ -1,5 +1,6 @@
 package net.momirealms.antigrieflib.comp;
 
+import com.plotsquared.bukkit.util.BukkitUtil;
 import net.momirealms.antigrieflib.AbstractComp;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
@@ -8,9 +9,9 @@
 
 import java.util.Optional;
 
-public class PlotSquaredComp extends AbstractComp {
+public class PlotSquaredV5Comp extends AbstractComp {
 
-    public PlotSquaredComp(JavaPlugin plugin) {
+    public PlotSquaredV5Comp(JavaPlugin plugin) {
         super(plugin, "PlotSquared");
     }
 
@@ -44,9 +45,9 @@ public boolean canDamage(Player player, Entity entity) {
     }
 
     private boolean isPlotMember(Player player, Location location) {
-        var psLocation = com.plotsquared.core.location.Location.at(location.getWorld().getName(), location.getBlockX(), location.getBlockY(), location.getBlockZ());
+        var psLocation = BukkitUtil.getLocation(location);
         if (psLocation.isPlotRoad()) return false;
         if (!psLocation.isPlotArea()) return true;
-        return Optional.ofNullable(psLocation.getPlotArea().getPlot(psLocation)).map(plot -> plot.isAdded(player.getUniqueId())).orElse(false);
+        return Optional.ofNullable(psLocation.getPlotArea().getPlot(psLocation)).map(plot -> plot.isAdded(player.getUniqueId()) || plot.isOwner(player.getUniqueId())).orElse(false);
     }
 }
diff --git a/project/build.gradle.kts b/project/build.gradle.kts
@@ -38,7 +38,7 @@ dependencies {
     compileOnly("com.massivecraft:Factions:1.6.9.5-U0.6.33")                      // FactionsUUID
     compileOnly("dev.espi:protectionstones:2.10.2")                               // ProtectionStones
     compileOnly("biz.princeps:landlord-core:4.364")                               // Landlord
-//    compileOnly("ovh.uskyblock:uSkyBlock-Core:3.0.0")                             // uSkyBlock (Removed because it's repo is down)
+//    compileOnly("ovh.uskyblock:uSkyBlock-Core:3.0.0")                             // uSkyBlock (Removed because its repo is down)
     compileOnly("com.github.UlrichBR:UClansV7-API:7.4.0-r1")                      // UltimateClans
 
     compileOnly(files("libs/Residence-pruned.jar"))                        // Residence

diff --git a/project/src/main/java/net/momirealms/antigrieflib/AntiGriefLib.java b/project/src/main/java/net/momirealms/antigrieflib/AntiGriefLib.java
@@ -198,7 +198,10 @@ private void detectSupportedPlugins() {
             registerNewCompatibility(new HuskTownsComp(plugin));
         }
         if (manager.getPlugin("PlotSquared") != null) {
-            registerNewCompatibility(new PlotSquaredComp(plugin));
+            switch (manager.getPlugin("PlotSquared").getDescription().getVersion().charAt(0)) {
+                case '5' -> registerNewCompatibility(new PlotSquaredV5Comp(plugin));
+                case '6', '7' -> registerNewCompatibility(new PlotSquaredV6V7Comp(plugin));
+            }
         }
         if (manager.getPlugin("Residence") != null) {
             registerNewCompatibility(new ResidenceComp(plugin));

diff --git a/project/src/main/java/net/momirealms/antigrieflib/comp/PlotSquaredV6V7Comp.java b/project/src/main/java/net/momirealms/antigrieflib/comp/PlotSquaredV6V7Comp.java
@@ -0,0 +1,53 @@
+package net.momirealms.antigrieflib.comp;
+
+import com.plotsquared.bukkit.util.BukkitUtil;
+import net.momirealms.antigrieflib.AbstractComp;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.util.Optional;
+
+public class PlotSquaredV6V7Comp extends AbstractComp {
+
+    public PlotSquaredV6V7Comp(JavaPlugin plugin) {
+        super(plugin, "PlotSquared");
+    }
+
+    @Override
+    public void init() {
+    }
+
+    @Override
+    public boolean canPlace(Player player, Location location) {
+        return isPlotMember(player, location);
+    }
+
+    @Override
+    public boolean canBreak(Player player, Location location) {
+        return isPlotMember(player, location);
+    }
+
+    @Override
+    public boolean canInteract(Player player, Location location) {
+        return isPlotMember(player, location);
+    }
+
+    @Override
+    public boolean canInteractEntity(Player player, Entity entity) {
+        return isPlotMember(player, entity.getLocation());
+    }
+
+    @Override
+    public boolean canDamage(Player player, Entity entity) {
+        return isPlotMember(player, entity.getLocation());
+    }
+
+    private boolean isPlotMember(Player player, Location location) {
+        var psLocation = BukkitUtil.adapt(location);
+        if (psLocation.isPlotRoad()) return false;
+        if (!psLocation.isPlotArea()) return true;
+        return Optional.ofNullable(psLocation.getPlotArea().getPlot(psLocation)).map(plot -> plot.isAdded(player.getUniqueId()) || plot.isOwner(player.getUniqueId())).orElse(false);
+    }
+}