fix: update to changes in 1.21 class paths

.github/renovate.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:recommended",
+    "config:base",
     ":semanticCommitsDisabled"
   ],
   "automerge": true,

Bukkit/src/main/java/com/plotsquared/bukkit/listener/PaperListener.java

@@ -47,7 +47,6 @@ import com.plotsquared.core.plot.flag.implementations.TileDropFlag;
 import com.plotsquared.core.plot.flag.types.BooleanFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.PlotFlagUtil;
-import io.papermc.paper.event.entity.EntityMoveEvent;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
@@ -59,7 +58,6 @@ import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.entity.Slime;
-import org.bukkit.event.Cancellable;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -106,38 +104,8 @@ public class PaperListener implements Listener {
         if (!Settings.Paper_Components.ENTITY_PATHING) {
             return;
         }
-        handleEntityMovement(event, event.getEntity().getLocation(), event.getLoc());
+        Location toLoc = BukkitUtil.adapt(event.getLoc());
-    }
+        Location fromLoc = BukkitUtil.adapt(event.getEntity().getLocation());
-
-    @EventHandler
-    public void onEntityPathfind(SlimePathfindEvent event) {
-        if (!Settings.Paper_Components.ENTITY_PATHING) {
-            return;
-        }
-        Slime slime = event.getEntity();
-
-        Block b = slime.getTargetBlockExact(4);
-        if (b == null) {
-            return;
-        }
-
-        handleEntityMovement(event, event.getEntity().getLocation(),  b.getLocation());
-    }
-
-    @EventHandler
-    public void onEntityMove(EntityMoveEvent event) {
-        if (!Settings.Paper_Components.ENTITY_MOVEMENT) {
-            return;
-        }
-        if (!event.hasExplicitlyChangedBlock()) {
-            return;
-        }
-        handleEntityMovement(event, event.getFrom(), event.getTo());
-    }
-
-    private static void handleEntityMovement(Cancellable event, org.bukkit.Location from, org.bukkit.Location target) {
-        Location toLoc = BukkitUtil.adapt(target);
-        Location fromLoc = BukkitUtil.adapt(from);
         PlotArea tarea = toLoc.getPlotArea();
         if (tarea == null) {
             return;
@@ -156,10 +124,52 @@ public class PaperListener implements Listener {
             event.setCancelled(true);
             return;
         }
-        if (tplot == null || tplot.getId().equals(fplot.getId())) {
+        if (tplot == null || tplot.getId().hashCode() == fplot.getId().hashCode()) {
             return;
         }
-        if (fplot.isMerged() && fplot.getConnectedPlots().contains(tplot)) {
+        if (fplot.isMerged() && fplot.getConnectedPlots().contains(fplot)) {
+            return;
+        }
+        event.setCancelled(true);
+    }
+
+    @EventHandler
+    public void onEntityPathfind(SlimePathfindEvent event) {
+        if (!Settings.Paper_Components.ENTITY_PATHING) {
+            return;
+        }
+        Slime slime = event.getEntity();
+
+        Block b = slime.getTargetBlockExact(4);
+        if (b == null) {
+            return;
+        }
+
+        Location toLoc = BukkitUtil.adapt(b.getLocation());
+        Location fromLoc = BukkitUtil.adapt(event.getEntity().getLocation());
+        PlotArea tarea = toLoc.getPlotArea();
+        if (tarea == null) {
+            return;
+        }
+        PlotArea farea = fromLoc.getPlotArea();
+        if (farea == null) {
+            return;
+        }
+
+        if (tarea != farea) {
+            event.setCancelled(true);
+            return;
+        }
+        Plot tplot = toLoc.getPlot();
+        Plot fplot = fromLoc.getPlot();
+        if (tplot == null ^ fplot == null) {
+            event.setCancelled(true);
+            return;
+        }
+        if (tplot == null || tplot.getId().hashCode() == fplot.getId().hashCode()) {
+            return;
+        }
+        if (fplot.isMerged() && fplot.getConnectedPlots().contains(fplot)) {
             return;
         }
         event.setCancelled(true);

Core/src/main/java/com/plotsquared/core/command/Music.java

@@ -56,8 +56,7 @@ public class Music extends SubCommand {
             .asList("music_disc_13", "music_disc_cat", "music_disc_blocks", "music_disc_chirp",
                     "music_disc_far", "music_disc_mall", "music_disc_mellohi", "music_disc_stal",
                     "music_disc_strad", "music_disc_ward", "music_disc_11", "music_disc_wait", "music_disc_otherside",
-                    "music_disc_pigstep", "music_disc_5", "music_disc_relic", "music_disc_creator",
+                    "music_disc_pigstep", "music_disc_5", "music_disc_relic"
-                    "music_disc_creator_music_box", "music_disc_precipice"
             );
 
     private final InventoryUtil inventoryUtil;

Core/src/main/java/com/plotsquared/core/configuration/Config.java

@@ -26,7 +26,6 @@ import org.apache.logging.log4j.Logger;
 
 import java.io.File;
 import java.io.PrintWriter;
-import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -373,7 +372,6 @@ public class Config {
      */
     @Retention(RetentionPolicy.RUNTIME)
     @Target({ElementType.FIELD, ElementType.TYPE})
-    @Documented
     public @interface Comment {
 
         String[] value();

Core/src/main/java/com/plotsquared/core/configuration/Settings.java

@@ -651,8 +651,6 @@ public class Settings extends Config {
         public static boolean PAPER_LISTENERS = true;
         @Comment("Prevent entities from leaving plots")
         public static boolean ENTITY_PATHING = true;
-        @Comment("Prevent entities from leaving plots, even by pushing or pulling")
-        public static boolean ENTITY_MOVEMENT = false;
         @Comment(
                 "Cancel entity spawns when the chunk is loaded if the PlotArea's mob spawning is off")
         public static boolean CANCEL_CHUNK_SPAWN = true;

gradle/libs.versions.toml

@@ -3,7 +3,7 @@
 paper = "1.20.4-R0.1-SNAPSHOT"
 guice = "7.0.0"
 spotbugs = "4.8.6"
-checkerqual = "3.48.3"
+checkerqual = "3.48.2"
 gson = "2.10"
 guava = "31.1-jre"
 snakeyaml = "2.0"
@@ -13,7 +13,7 @@ log4j = "2.19.0"
 
 # Plugins
 worldedit = "7.2.20"
-fawe = "2.12.2"
+fawe = "2.12.1"
 placeholderapi = "2.11.6"
 luckperms = "5.4"
 essentialsx = "2.20.1"