chore: spotlessApply

.github/workflows/build.yml

@@ -29,18 +29,18 @@ jobs:
           fi
       - name: Publish Release
         if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
-        run: ./gradlew publishAndReleaseToMavenCentral --no-configuration-cache
+        run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
         env:
-          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.CENTRAL_USERNAME }}
-          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.CENTRAL_PASSWORD }}
+          ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
+          ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }}
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}
       - name: Publish Snapshot
         if: ${{ runner.os == 'Linux' && env.STATUS != 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main' }}
-        run: ./gradlew publishAllPublicationsToMavenCentralRepository
+        run: ./gradlew publishToSonatype
         env:
-          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.CENTRAL_USERNAME }}
-          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.CENTRAL_PASSWORD }}
+          ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
+          ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
       - name: Publish core javadoc
         if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
         uses: cpina/github-action-push-to-another-repository@main

Bukkit/build.gradle.kts

@@ -3,7 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 repositories {
     maven {
         name = "PlaceholderAPI"
-        url = uri("https://repo.extendedclip.com/releases/")
+        url = uri("https://repo.extendedclip.com/content/repositories/placeholderapi/")
     }
 
     maven {

Bukkit/src/main/java/com/plotsquared/bukkit/BukkitPlatform.java

@@ -252,11 +252,6 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
         return Bukkit.getVersion();
     }
 
-    @Override
-    public @NonNull String serverBrand() {
-        return Bukkit.getName();
-    }
-
     @Override
     @SuppressWarnings("deprecation") // Paper deprecation
     public void onEnable() {

Bukkit/src/main/java/com/plotsquared/bukkit/inject/PermissionModule.java

@@ -22,20 +22,12 @@ import com.google.inject.AbstractModule;
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
 import com.plotsquared.bukkit.permissions.BukkitPermissionHandler;
-import com.plotsquared.bukkit.permissions.BukkitRangedPermissionResolver;
-import com.plotsquared.bukkit.permissions.LuckPermsRangedPermissionResolver;
 import com.plotsquared.bukkit.permissions.VaultPermissionHandler;
-import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.permissions.PermissionHandler;
-import com.plotsquared.core.permissions.RangedPermissionResolver;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.bukkit.Bukkit;
 
 public class PermissionModule extends AbstractModule {
 
-    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + PermissionModule.class.getSimpleName());
-
     @Provides
     @Singleton
     PermissionHandler providePermissionHandler() {
@@ -48,18 +40,4 @@ public class PermissionModule extends AbstractModule {
         return new BukkitPermissionHandler();
     }
 
-    @Provides
-    @Singleton
-    RangedPermissionResolver provideRangedPermissionResolver() {
-        if (Settings.Permissions.USE_LUCKPERMS_RANGE_RESOLVER) {
-            if (Bukkit.getPluginManager().isPluginEnabled("LuckPerms")) {
-                LOGGER.info("Using experimental LuckPerms ranged permission resolver");
-                return new LuckPermsRangedPermissionResolver();
-            }
-            LOGGER.warn("Enabled LuckPerms ranged permission resolver, but LuckPerms is not installed. " +
-                    "Falling back to default Bukkit ranged permission resolver");
-        }
-        return new BukkitRangedPermissionResolver();
-    }
-
 }

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

@@ -28,6 +28,7 @@ import com.plotsquared.core.plot.flag.implementations.CopperOxideFlag;
 import com.plotsquared.core.plot.flag.implementations.MiscInteractFlag;
 import com.plotsquared.core.plot.flag.implementations.SculkSensorInteractFlag;
 import com.plotsquared.core.util.PlotFlagUtil;
+import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Item;
@@ -41,11 +42,31 @@ import org.bukkit.event.block.BlockReceiveGameEvent;
 
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.UUID;
 
 @SuppressWarnings("unused")
 public class BlockEventListener117 implements Listener {
 
+    private static final Set<Material> COPPER_OXIDIZING = Set.of(
+            Material.COPPER_BLOCK,
+            Material.EXPOSED_COPPER,
+            Material.WEATHERED_COPPER,
+            Material.OXIDIZED_COPPER,
+            Material.CUT_COPPER,
+            Material.EXPOSED_CUT_COPPER,
+            Material.WEATHERED_CUT_COPPER,
+            Material.OXIDIZED_CUT_COPPER,
+            Material.CUT_COPPER_STAIRS,
+            Material.EXPOSED_CUT_COPPER_STAIRS,
+            Material.WEATHERED_CUT_COPPER_STAIRS,
+            Material.OXIDIZED_CUT_COPPER_STAIRS,
+            Material.CUT_COPPER_SLAB,
+            Material.EXPOSED_CUT_COPPER_SLAB,
+            Material.WEATHERED_CUT_COPPER_SLAB,
+            Material.OXIDIZED_CUT_COPPER_SLAB
+    );
+
     @Inject
     public BlockEventListener117() {
     }
@@ -113,7 +134,7 @@ public class BlockEventListener117 implements Listener {
     public void onBlockFertilize(BlockFertilizeEvent event) {
         Block block = event.getBlock();
         List<org.bukkit.block.BlockState> blocks = event.getBlocks();
-        Location location = BukkitUtil.adapt(block.getLocation());
+        Location location = BukkitUtil.adapt(blocks.get(0).getLocation());
 
         PlotArea area = location.getPlotArea();
         if (area == null) {
@@ -163,7 +184,7 @@ public class BlockEventListener117 implements Listener {
         if (plot == null) {
             return;
         }
-        if (event.getNewState().getType().name().contains("COPPER")) {
+        if (COPPER_OXIDIZING.contains(event.getNewState().getType())) {
             if (!plot.getFlag(CopperOxideFlag.class)) {
                 plot.debug("Copper could not oxide because copper-oxide = false");
                 event.setCancelled(true);

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

@@ -29,7 +29,6 @@ import com.destroystokyo.paper.event.player.PlayerLaunchProjectileEvent;
 import com.destroystokyo.paper.event.server.AsyncTabCompleteEvent;
 import com.google.inject.Inject;
 import com.plotsquared.bukkit.util.BukkitUtil;
-import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.command.Command;
 import com.plotsquared.core.command.MainCommand;
 import com.plotsquared.core.configuration.Settings;
@@ -39,7 +38,6 @@ import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
-import com.plotsquared.core.plot.PlotAreaType;
 import com.plotsquared.core.plot.flag.FlagContainer;
 import com.plotsquared.core.plot.flag.implementations.BeaconEffectsFlag;
 import com.plotsquared.core.plot.flag.implementations.DoneFlag;
@@ -50,7 +48,6 @@ 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 io.papermc.paper.event.world.StructuresLocateEvent;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
@@ -461,21 +458,6 @@ public class PaperListener implements Listener {
         }
     }
 
-    /**
-     * Don't let the server die when populating cartographers (villager offering maps) in classic plot worlds
-     * (as those don't generate POIs)
-     */
-    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
-    public void onStructuresLocate(StructuresLocateEvent event) {
-        if (!PlotSquared.get().getPlotAreaManager().hasPlotArea(event.getWorld().getName())) {
-            return;
-        }
-        final PlotArea area = PlotSquared.get().getPlotAreaManager().getPlotAreaByString(event.getWorld().getName());
-        if (area != null && area.getType() == PlotAreaType.NORMAL) {
-            event.setCancelled(true);
-        }
-    }
-
     private boolean getBooleanFlagValue(
             @NonNull FlagContainer container,
             @NonNull Class<? extends BooleanFlag<?>> flagClass,

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

@@ -88,8 +88,10 @@ import org.bukkit.Bukkit;
 import org.bukkit.FluidCollisionMode;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.Sign;
+import org.bukkit.block.data.Waterlogged;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Boat;
@@ -591,18 +593,14 @@ public class PlayerEventListener implements Listener {
                     return;
                 }
                 Plot plot = area.getPlot(location);
-                if (plot != null && !plot.equals(lastPlot)) {
+                if (plot != null) {
                     final boolean result = DenyTeleportFlag.allowsTeleport(pp, plot);
                     // there is one possibility to still allow teleportation:
                     // to is identical to the plot's home location, and untrusted-visit is true
                     // i.e. untrusted-visit can override deny-teleport
                     // this is acceptable, because otherwise it wouldn't make sense to have both flags set
                     if (result || (plot.getFlag(UntrustedVisitFlag.class) && plot.getHomeSynchronous().equals(BukkitUtil.adaptComplete(to)))) {
-                        // returns false if the player is not allowed to enter the plot (if they are denied, for example)
-                        // don't let the move event cancel the entry after teleport, but rather catch and cancel early (#4647)
-                        if (!plotListener.plotEntry(pp, plot)) {
-                            event.setCancelled(true);
-                        }
+                        plotListener.plotEntry(pp, plot);
                     } else {
                         pp.sendMessage(
                                 TranslatableCaption.of("deny.no_enter"),
@@ -1372,7 +1370,22 @@ public class PlayerEventListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onBucketEmpty(PlayerBucketEmptyEvent event) {
-        final Block block = event.getBlock();
+        BlockFace bf = event.getBlockFace();
+        // Note: a month after Bukkit 1.14.4 released, they added the API method
+        // PlayerBucketEmptyEvent#getBlock(), which returns the block the
+        // bucket contents is going to be placed at. Currently we determine this
+        // block ourselves to retain compatibility with 1.13.
+        final Block block;
+        // if the block can be waterlogged, the event might waterlog the block
+        // sometimes
+        if (event.getBlockClicked().getBlockData() instanceof Waterlogged waterlogged
+                && !waterlogged.isWaterlogged() && event.getBucket() != Material.LAVA_BUCKET) {
+            block = event.getBlockClicked();
+        } else {
+            block = event.getBlockClicked().getLocation()
+                    .add(bf.getModX(), bf.getModY(), bf.getModZ())
+                    .getBlock();
+        }
         Location location = BukkitUtil.adapt(block.getLocation());
         PlotArea area = location.getPlotArea();
         if (area == null) {

Bukkit/src/main/java/com/plotsquared/bukkit/permissions/BukkitRangedPermissionResolver.java

@@ -1,107 +0,0 @@
-/*
- * PlotSquared, a land and world management plugin for Minecraft.
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
- * Copyright (C) IntellectualSites team and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.plotsquared.bukkit.permissions;
-
-import com.plotsquared.bukkit.player.BukkitPlayer;
-import com.plotsquared.core.permissions.RangedPermissionResolver;
-import com.plotsquared.core.player.PlotPlayer;
-import com.plotsquared.core.util.MathMan;
-import org.bukkit.permissions.PermissionAttachmentInfo;
-import org.checkerframework.checker.index.qual.NonNegative;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
-import java.util.Set;
-import java.util.stream.IntStream;
-
-public class BukkitRangedPermissionResolver implements RangedPermissionResolver {
-
-    private static boolean CHECK_EFFECTIVE = true;
-
-    @Override
-    public @NonNegative int getPermissionRange(
-            final @NonNull PlotPlayer<?> generic,
-            final @NonNull String stub,
-            final @Nullable String worldContext,
-            @NonNegative final int range
-    ) {
-        if (!(generic instanceof BukkitPlayer player)) {
-            throw new IllegalArgumentException("PlotPlayer is not a BukkitPlayer");
-        }
-        if (hasWildcardRange(player, stub, worldContext)) {
-            return INFINITE_RANGE_VALUE;
-        }
-        int max = 0;
-        if (CHECK_EFFECTIVE) {
-            boolean hasAny = false;
-            String stubPlus = stub + ".";
-            final Set<PermissionAttachmentInfo> effective = player.getPlatformPlayer().getEffectivePermissions();
-            if (!effective.isEmpty()) {
-                for (PermissionAttachmentInfo attach : effective) {
-                    // Ignore all "false" permissions
-                    if (!attach.getValue()) {
-                        continue;
-                    }
-                    String permStr = attach.getPermission();
-                    if (permStr.startsWith(stubPlus)) {
-                        hasAny = true;
-                        String end = permStr.substring(stubPlus.length());
-                        if (MathMan.isInteger(end)) {
-                            int val = Integer.parseInt(end);
-                            if (val > range) {
-                                return val;
-                            }
-                            if (val > max) {
-                                max = val;
-                            }
-                        }
-                    }
-                }
-                if (hasAny) {
-                    return max;
-                }
-                // Workaround
-                for (PermissionAttachmentInfo attach : effective) {
-                    String permStr = attach.getPermission();
-                    if (permStr.startsWith("plots.") && !permStr.equals("plots.use")) {
-                        return max;
-                    }
-                }
-                CHECK_EFFECTIVE = false;
-            }
-        }
-        for (int i = range; i > 0; i--) {
-            if (player.hasPermission(worldContext, stub + "." + i)) {
-                return i;
-            }
-        }
-        return max;
-    }
-
-    @Override
-    public @NonNull IntStream streamFullPermissionRange(
-            final @NonNull PlotPlayer<?> player,
-            final @NonNull String stub,
-            final @Nullable String worldContext,
-            @NonNegative final int range
-    ) {
-        return IntStream.of(getPermissionRange(player, stub, worldContext, range));
-    }
-
-}

Bukkit/src/main/java/com/plotsquared/bukkit/permissions/LuckPermsRangedPermissionResolver.java

@@ -1,95 +0,0 @@
-/*
- * PlotSquared, a land and world management plugin for Minecraft.
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
- * Copyright (C) IntellectualSites team and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.plotsquared.bukkit.permissions;
-
-import com.plotsquared.core.permissions.RangedPermissionResolver;
-import com.plotsquared.core.player.PlotPlayer;
-import com.plotsquared.core.util.MathMan;
-import net.luckperms.api.LuckPerms;
-import net.luckperms.api.context.ImmutableContextSet;
-import net.luckperms.api.model.user.User;
-import net.luckperms.api.node.NodeType;
-import net.luckperms.api.node.types.PermissionNode;
-import net.luckperms.api.query.QueryOptions;
-import org.bukkit.Bukkit;
-import org.checkerframework.checker.index.qual.NonNegative;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
-import java.util.Objects;
-import java.util.stream.IntStream;
-
-public class LuckPermsRangedPermissionResolver implements RangedPermissionResolver {
-
-    private final LuckPerms luckPerms;
-
-    public LuckPermsRangedPermissionResolver() {
-        this.luckPerms = Objects.requireNonNull(
-                Bukkit.getServicesManager().getRegistration(LuckPerms.class),
-                "LuckPerms is not available"
-        ).getProvider();
-    }
-
-    @Override
-    public @NonNegative int getPermissionRange(
-            final @NonNull PlotPlayer<?> player,
-            final @NonNull String stub,
-            final @Nullable String worldContext,
-            final @NonNegative int range
-    ) {
-        // no need to use LuckPerms for basic checks
-        if (this.hasWildcardRange(player, stub, worldContext)) {
-            return INFINITE_RANGE_VALUE;
-        }
-        return this.streamFullPermissionRange(player, stub, worldContext, range)
-                .sorted()
-                .reduce((first, second) -> second)
-                .orElse(0);
-    }
-
-    @NonNull
-    public IntStream streamFullPermissionRange(
-            final @NonNull PlotPlayer<?> player,
-            final @NonNull String stub,
-            final @Nullable String worldContext,
-            @NonNegative final int range
-    ) {
-        final User user = this.luckPerms.getUserManager().getUser(player.getUUID());
-        if (user == null) {
-            throw new IllegalStateException("Luckperms User is null - is the Player online? (UUID: %s)".formatted(player.getUUID()));
-        }
-        final QueryOptions queryOptions = worldContext == null ?
-                QueryOptions.nonContextual() :
-                QueryOptions.contextual(ImmutableContextSet.of("world", worldContext));
-        return user.resolveInheritedNodes(queryOptions).stream()
-                // only support normal permission nodes (regex permission nodes would be a pita to support)
-                .filter(NodeType.PERMISSION::matches)
-                .map(node -> ((PermissionNode) node).getPermission())
-                // check that the node actually has additional data after the stub
-                .filter(permission -> permission.startsWith(stub + "."))
-                // extract the raw data after the stub
-                .map(permission -> permission.substring(stub.length() + 1))
-                // check if data is integer and parse
-                .filter(MathMan::isInteger)
-                .mapToInt(Integer::parseInt)
-                // only use values that are positive
-                .filter(value -> value > -1);
-    }
-
-}

Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java

@@ -24,12 +24,14 @@ import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.events.TeleportCause;
 import com.plotsquared.core.location.Location;
+import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.permissions.PermissionHandler;
 import com.plotsquared.core.player.ConsolePlayer;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.PlotWeather;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.util.EventDispatcher;
+import com.plotsquared.core.util.MathMan;
 import com.plotsquared.core.util.WorldUtil;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.extension.platform.Actor;
@@ -45,11 +47,13 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.EventException;
 import org.bukkit.event.player.PlayerTeleportEvent;
+import org.bukkit.permissions.PermissionAttachmentInfo;
 import org.bukkit.plugin.RegisteredListener;
 import org.bukkit.potion.PotionEffectType;
 import org.checkerframework.checker.index.qual.NonNegative;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
+import java.util.Set;
 import java.util.UUID;
 
 import static com.sk89q.worldedit.world.gamemode.GameModes.ADVENTURE;
@@ -146,13 +150,77 @@ public class BukkitPlayer extends PlotPlayer<Player> {
         }
     }
 
+    @SuppressWarnings("StringSplitter")
     @Override
     @NonNegative
     public int hasPermissionRange(
             final @NonNull String stub,
             @NonNegative final int range
     ) {
-        return PlotSquared.platform().rangedPermissionResolver().getPermissionRange(this, stub, null, range);
+        if (hasPermission(Permission.PERMISSION_ADMIN.toString())) {
+            return Integer.MAX_VALUE;
+        }
+        final String[] nodes = stub.split("\\.");
+        final StringBuilder n = new StringBuilder();
+        // Wildcard check from less specific permission to more specific permission
+        for (int i = 0; i < (nodes.length - 1); i++) {
+            n.append(nodes[i]).append(".");
+            if (!stub.equals(n + Permission.PERMISSION_STAR.toString())) {
+                if (hasPermission(n + Permission.PERMISSION_STAR.toString())) {
+                    return Integer.MAX_VALUE;
+                }
+            }
+        }
+        // Wildcard check for the full permission
+        if (hasPermission(stub + ".*")) {
+            return Integer.MAX_VALUE;
+        }
+        // Permission value cache for iterative check
+        int max = 0;
+        if (CHECK_EFFECTIVE) {
+            boolean hasAny = false;
+            String stubPlus = stub + ".";
+            final Set<PermissionAttachmentInfo> effective = player.getEffectivePermissions();
+            if (!effective.isEmpty()) {
+                for (PermissionAttachmentInfo attach : effective) {
+                    // Ignore all "false" permissions
+                    if (!attach.getValue()) {
+                        continue;
+                    }
+                    String permStr = attach.getPermission();
+                    if (permStr.startsWith(stubPlus)) {
+                        hasAny = true;
+                        String end = permStr.substring(stubPlus.length());
+                        if (MathMan.isInteger(end)) {
+                            int val = Integer.parseInt(end);
+                            if (val > range) {
+                                return val;
+                            }
+                            if (val > max) {
+                                max = val;
+                            }
+                        }
+                    }
+                }
+                if (hasAny) {
+                    return max;
+                }
+                // Workaround
+                for (PermissionAttachmentInfo attach : effective) {
+                    String permStr = attach.getPermission();
+                    if (permStr.startsWith("plots.") && !permStr.equals("plots.use")) {
+                        return max;
+                    }
+                }
+                CHECK_EFFECTIVE = false;
+            }
+        }
+        for (int i = range; i > 0; i--) {
+            if (hasPermission(stub + "." + i)) {
+                return i;
+            }
+        }
+        return max;
     }
 
     @Override

Bukkit/src/main/java/com/plotsquared/bukkit/queue/BukkitChunkCoordinator.java

@@ -44,7 +44,6 @@ import java.util.List;
 import java.util.Queue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 
@@ -227,22 +226,16 @@ public final class BukkitChunkCoordinator extends ChunkCoordinator {
             loadingChunks.incrementAndGet();
             PaperLib
                     .getChunkAtAsync(this.bukkitWorld, chunk.getX(), chunk.getZ(), shouldGen, true)
-                    .orTimeout(10L, TimeUnit.SECONDS)
+                    .completeOnTimeout(null, 10L, TimeUnit.SECONDS)
                     .whenComplete((chunkObject, throwable) -> {
                         loadingChunks.decrementAndGet();
                         if (throwable != null) {
-                            if (throwable instanceof TimeoutException) {
-                                LOGGER.warn("Timed out awaiting chunk load {}", chunk);
-                                this.requestedChunks.offer(chunk);
-                            } else {
-                                LOGGER.error("Failed to load chunk {}", chunk, throwable);
-                                // We want one less because this couldn't be processed
-                                this.expectedSize.decrementAndGet();
-                            }
+                            LOGGER.error("Failed to load chunk {}", chunk, throwable);
+                            // We want one less because this couldn't be processed
+                            this.expectedSize.decrementAndGet();
                         } else if (chunkObject == null) {
-                            if (shouldGen) {
-                                LOGGER.error("Null chunk returned for chunk at {}", chunk);
-                            }
+                            LOGGER.warn("Timed out awaiting chunk load {}", chunk);
+                            this.requestedChunks.offer(chunk);
                         } else if (PlotSquared.get().isMainThread(Thread.currentThread())) {
                             this.processChunk(chunkObject);
                         } else {

Core/src/main/java/com/plotsquared/core/PlotPlatform.java

@@ -31,7 +31,6 @@ import com.plotsquared.core.generator.IndependentPlotGenerator;
 import com.plotsquared.core.inject.annotations.DefaultGenerator;
 import com.plotsquared.core.location.World;
 import com.plotsquared.core.permissions.PermissionHandler;
-import com.plotsquared.core.permissions.RangedPermissionResolver;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.expiration.ExpireManager;
 import com.plotsquared.core.plot.world.PlotAreaManager;
@@ -121,14 +120,6 @@ public interface PlotPlatform<P> extends LocaleHolder {
      */
     @NonNull String serverImplementation();
 
-    /**
-     * Gets the server brand name
-     *
-     * @return server brand
-     * @since 7.5.3
-     */
-    @NonNull String serverBrand();
-
     /**
      * Gets the native server code package prefix.
      *
@@ -350,10 +341,6 @@ public interface PlotPlatform<P> extends LocaleHolder {
         return injector().getInstance(PermissionHandler.class);
     }
 
-    default @NonNull RangedPermissionResolver rangedPermissionResolver() {
-        return injector().getInstance(RangedPermissionResolver.class);
-    }
-
     /**
      * Get the {@link ServicePipeline} implementation
      *

Core/src/main/java/com/plotsquared/core/PlotSquared.java

@@ -713,8 +713,6 @@ public class PlotSquared {
                 case CREATION_DATE_TIMESTAMP -> toReturn.addAll(sortPlotsByTimestamp(map.get(area)));
                 case DISTANCE_FROM_ORIGIN -> toReturn.addAll(sortPlotsByHash(map.get(area)));
                 case LAST_MODIFIED -> toReturn.addAll(sortPlotsByModified(map.get(area)));
-                default -> {
-                }
             }
         }
         return toReturn;

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

@@ -144,7 +144,6 @@ public class Buy extends Command {
             plot.getPlotModificationManager().setSign(player.getName());
             player.sendMessage(
                     TranslatableCaption.of("working.claimed"),
-                    TagResolver.resolver("world", Tag.inserting(Component.text(plot.getArea().getWorldName()))),
                     TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
             );
             this.eventDispatcher.callPostPlayerBuyPlot(player, previousOwner, plot, price);

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

@@ -131,7 +131,6 @@ public class Clear extends Command {
                     player.sendMessage(
                             TranslatableCaption.of("working.clearing_done"),
                             TagResolver.builder()
-                                    .tag("world", Tag.inserting(Component.text(plot.getArea().getWorldName())))
                                     .tag("amount", Tag.inserting(Component.text(System.currentTimeMillis() - start)))
                                     .tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
                                     .build()

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

@@ -24,7 +24,6 @@ import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.player.PlotPlayer;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.NotNull;
 
@@ -99,14 +98,6 @@ public enum CommandCategory implements Caption {
         return MiniMessage.miniMessage().deserialize(getComponent(localeHolder));
     }
 
-    @Override
-    public @NonNull Component toComponent(
-            @NonNull final LocaleHolder localeHolder,
-            final @NonNull TagResolver @NonNull ... tagResolvers
-    ) {
-        return MiniMessage.miniMessage().deserialize(getComponent(localeHolder));
-    }
-
     /**
      * Checks if a player has access to this command category
      *

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

@@ -86,8 +86,7 @@ public class DebugPaste extends SubCommand {
                 b.append("# WorldEdit implementation:\n");
                 b.append(PlotSquared.platform().worldEditImplementations()).append("\n\n");
                 b.append("# Server Information\n");
-                b.append("Server Version: ").append(PlotSquared.platform().serverBrand()).append(": ")
-                        .append(PlotSquared.platform().serverImplementation()).append("\n")
+                b.append("Server Version: ").append(PlotSquared.platform().serverImplementation())
                         .append("\n");
                 b.append("online_mode: ").append(!Settings.UUID.OFFLINE).append(';')
                         .append(!Settings.UUID.OFFLINE).append('\n');

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

@@ -124,7 +124,6 @@ public class Delete extends SubCommand {
                                 "amount",
                                 Tag.inserting(Component.text(String.valueOf(System.currentTimeMillis() - start)))
                         ),
-                        TagResolver.resolver("world", Tag.inserting(Component.text(plotArea.getWorldName()))),
                         TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
                 );
                 eventDispatcher.callPostDelete(plot);

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

@@ -113,34 +113,38 @@ public class Help extends Command {
             }
             if (cat == null && page == 0) {
                 TextComponent.Builder builder = Component.text();
-                builder.append(TranslatableCaption.of("help.help_header").toComponent(player));
+                builder.append(MINI_MESSAGE.deserialize(TranslatableCaption.of("help.help_header").getComponent(player)));
                 for (CommandCategory c : CommandCategory.values()) {
                     if (!c.canAccess(player)) {
                         continue;
                     }
-                    builder.append(Component.newline());
-                    builder.append(TranslatableCaption.of("help.help_info_item").toComponent(
-                            player, TagResolver.builder()
-                                    .tag("command", Tag.inserting(Component.text("/plot help")))
-                                    .tag("category", Tag.inserting(Component.text(c.name().toLowerCase())))
-                                    .tag("category_desc", Tag.inserting(c.toComponent(player)))
-                                    .build()
-                    ));
+                    builder.append(Component.newline()).append(MINI_MESSAGE
+                            .deserialize(
+                                    TranslatableCaption.of("help.help_info_item").getComponent(player),
+                                    TagResolver.builder()
+                                            .tag("command", Tag.inserting(Component.text("/plot help")))
+                                            .tag("category", Tag.inserting(Component.text(c.name().toLowerCase())))
+                                            .tag("category_desc", Tag.inserting(c.toComponent(player)))
+                                            .build()
+                            ));
                 }
-                builder.append(Component.newline());
-                builder.append(TranslatableCaption.of("help.help_info_item").toComponent(
-                        player, TagResolver.builder()
-                                .tag("command", Tag.inserting(Component.text("/plot help")))
-                                .tag("category", Tag.inserting(Component.text("all")))
-                                .tag(
-                                        "category_desc", Tag.inserting(TranslatableCaption
-                                                .of("help.help_display_all_commands")
-                                                .toComponent(player))
-                                )
-                                .build()
-                ));
-                builder.append(Component.newline());
-                builder.append(TranslatableCaption.of("help.help_footer").toComponent(player));
+                builder.append(Component.newline()).append(MINI_MESSAGE
+                        .deserialize(
+                                TranslatableCaption.of("help.help_info_item").getComponent(player),
+                                TagResolver.builder()
+                                        .tag("command", Tag.inserting(Component.text("/plot help")))
+                                        .tag("category", Tag.inserting(Component.text("all")))
+                                        .tag(
+                                                "category_desc",
+                                                Tag.inserting(TranslatableCaption
+                                                        .of("help.help_display_all_commands")
+                                                        .toComponent(player))
+                                        )
+                                        .build()
+                        ));
+                builder.append(Component.newline()).append(MINI_MESSAGE.deserialize(TranslatableCaption
+                        .of("help.help_footer")
+                        .getComponent(player)));
                 player.sendMessage(StaticCaption.of(MINI_MESSAGE.serialize(builder.asComponent())));
                 return true;
             }

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

@@ -44,13 +44,8 @@ import org.apache.logging.log4j.Logger;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 /**
  * PlotSquared command class.
  */
@@ -152,7 +147,8 @@ public class MainCommand extends Command {
                 try {
                     injector.getInstance(command);
                 } catch (final Exception e) {
-                    LOGGER.error("Failed to register command {}", command.getCanonicalName(), e);
+                    LOGGER.error("Failed to register command {}", command.getCanonicalName());
+                    e.printStackTrace();
                 }
             }
 
@@ -240,171 +236,111 @@ public class MainCommand extends Command {
             RunnableVal3<Command, Runnable, Runnable> confirm,
             RunnableVal2<Command, CommandResult> whenDone
     ) {
-        prepareArguments(new CommandExecutionData(player, args, confirm, whenDone, null))
-                .thenCompose(executionData -> {
-                    if (executionData.isEmpty()) {
-                        return CompletableFuture.completedFuture(false);
+        // Optional command scope //
+        Location location = null;
+        Plot plot = null;
+        boolean tp = false;
+        if (args.length >= 2) {
+            PlotArea area = player.getApplicablePlotArea();
+            Plot newPlot = Plot.fromString(area, args[0]);
+            if (newPlot != null && (player instanceof ConsolePlayer || newPlot.getArea()
+                    .equals(area) || player.hasPermission(Permission.PERMISSION_ADMIN)
+                    || player.hasPermission(Permission.PERMISSION_ADMIN_AREA_SUDO))
+                    && !newPlot.isDenied(player.getUUID())) {
+                final Location newLoc;
+                if (newPlot.getArea() instanceof SinglePlotArea) {
+                    newLoc = newPlot.isLoaded() ? newPlot.getCenterSynchronous() : Location.at("", 0, 0, 0);
+                } else {
+                    newLoc = newPlot.getCenterSynchronous();
+                }
+                if (player.canTeleport(newLoc)) {
+                    // Save meta
+                    try (final MetaDataAccess<Location> locationMetaDataAccess
+                                 = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LOCATION)) {
+                        location = locationMetaDataAccess.get().orElse(null);
+                        locationMetaDataAccess.set(newLoc);
                     }
-                    var data = executionData.get();
-                    try {
-                        return super.execute(data.player(), data.args(), data.confirm(), data.whenDone());
-                    } catch (CommandException e) {
-                        throw e;
-                    } catch (Throwable e) {
-                        LOGGER.error("A error occurred while executing plot command", e);
-                        String message = e.getMessage();
-                        if (message != null) {
-                            data.player().sendMessage(
-                                    TranslatableCaption.of("errors.error"),
-                                    TagResolver.resolver("value", Tag.inserting(Component.text(message)))
-                            );
-                        } else {
-                            data.player().sendMessage(
-                                    TranslatableCaption.of("errors.error_console"));
-                        }
-                    } finally {
-                        if (data.postCommandData() != null) {
-                            resetCommandScope(data.player(), data.postCommandData());
-                        }
+                    try (final MetaDataAccess<Plot> plotMetaDataAccess
+                                 = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
+                        plot = plotMetaDataAccess.get().orElse(null);
+                        plotMetaDataAccess.set(newPlot);
                     }
-                    return CompletableFuture.completedFuture(true);
-                });
+                    tp = true;
+                } else {
+                    player.sendMessage(TranslatableCaption.of("border.denied"));
+                    return CompletableFuture.completedFuture(false);
+                }
+                // Trim command
+                args = Arrays.copyOfRange(args, 1, args.length);
+            }
+            if (args.length >= 2 && !args[0].isEmpty() && args[0].charAt(0) == '-') {
+                if ("f".equals(args[0].substring(1))) {
+                    confirm = new RunnableVal3<>() {
+                        @Override
+                        public void run(Command cmd, Runnable success, Runnable failure) {
+                            if (area != null && PlotSquared.platform().econHandler().isEnabled(area)) {
+                                PlotExpression priceEval =
+                                        area.getPrices().get(cmd.getFullId());
+                                double price = priceEval != null ? priceEval.evaluate(0d) : 0d;
+                                if (price != 0d
+                                        && PlotSquared.platform().econHandler().getMoney(player) < price) {
+                                    if (failure != null) {
+                                        failure.run();
+                                    }
+                                    return;
+                                }
+                            }
+                            if (success != null) {
+                                success.run();
+                            }
+                        }
+                    };
+                    args = Arrays.copyOfRange(args, 1, args.length);
+                } else {
+                    player.sendMessage(TranslatableCaption.of("errors.invalid_command_flag"));
+                    return CompletableFuture.completedFuture(false);
+                }
+            }
+        }
+        try {
+            super.execute(player, args, confirm, whenDone);
+        } catch (CommandException e) {
+            throw e;
+        } catch (Throwable e) {
+            e.printStackTrace();
+            String message = e.getMessage();
+            if (message != null) {
+                player.sendMessage(
+                        TranslatableCaption.of("errors.error"),
+                        TagResolver.resolver("value", Tag.inserting(Component.text(message)))
+                );
+            } else {
+                player.sendMessage(
+                        TranslatableCaption.of("errors.error_console"));
+            }
+        }
+        // Reset command scope //
+        if (tp && !(player instanceof ConsolePlayer)) {
+            try (final MetaDataAccess<Location> locationMetaDataAccess
+                         = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LOCATION)) {
+                if (location == null) {
+                    locationMetaDataAccess.remove();
+                } else {
+                    locationMetaDataAccess.set(location);
+                }
+            }
+            try (final MetaDataAccess<Plot> plotMetaDataAccess
+                         = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
+                if (plot == null) {
+                    plotMetaDataAccess.remove();
+                } else {
+                    plotMetaDataAccess.set(plot);
+                }
+            }
+        }
         return CompletableFuture.completedFuture(true);
     }
 
-    private CompletableFuture<Optional<CommandExecutionData>> prepareArguments(CommandExecutionData data) {
-        if (data.args().length >= 2) {
-            PlotArea area = data.player().getApplicablePlotArea();
-            Plot newPlot = Plot.fromString(area, data.args()[0]);
-            return preparePlotArgument(newPlot, data, area)
-                    .thenApply(d -> d.flatMap(x -> prepareFlagArgument(x, area)));
-        } else {
-            return CompletableFuture.completedFuture(Optional.of(data));
-        }
-    }
-
-    private CompletableFuture<Optional<CommandExecutionData>> preparePlotArgument(@Nullable Plot newPlot,
-                                                                        @Nonnull CommandExecutionData data,
-                                                                                  @Nullable PlotArea area) {
-        if (newPlot != null && (data.player() instanceof ConsolePlayer
-                || (area != null && area.equals(newPlot.getArea()))
-                || data.player().hasPermission(Permission.PERMISSION_ADMIN)
-                || data.player().hasPermission(Permission.PERMISSION_ADMIN_AREA_SUDO))
-                && !newPlot.isDenied(data.player().getUUID())) {
-            return fetchPlotCenterLocation(newPlot)
-                    .thenApply(newLoc -> {
-                        if (!data.player().canTeleport(newLoc)) {
-                            data.player().sendMessage(TranslatableCaption.of("border.denied"));
-                            return Optional.empty();
-                        }
-                        // Save meta
-                        var originalCommandMeta = setCommandScope(data.player(), new TemporaryCommandMeta(newLoc, newPlot));
-                        return Optional.of(new CommandExecutionData(
-                                data.player(),
-                                Arrays.copyOfRange(data.args(), 1, data.args().length), // Trimmed command
-                                data.confirm(),
-                                data.whenDone(),
-                                originalCommandMeta
-                        ));
-                    });
-        }
-        return CompletableFuture.completedFuture(Optional.of(data));
-    }
-
-    private Optional<CommandExecutionData> prepareFlagArgument(@Nonnull CommandExecutionData data, @Nonnull PlotArea area) {
-        if (data.args().length >= 2 && !data.args()[0].isEmpty() && data.args()[0].charAt(0) == '-') {
-            if ("f".equals(data.args()[0].substring(1))) {
-                return Optional.of(new CommandExecutionData(
-                        data.player(),
-                        Arrays.copyOfRange(data.args(), 1, data.args().length), // Trimmed command
-                        createForcedConfirmation(data.player(), area),
-                        data.whenDone(),
-                        data.postCommandData()
-                ));
-            } else {
-                data.player().sendMessage(TranslatableCaption.of("errors.invalid_command_flag"));
-                return Optional.empty();
-            }
-        }
-        return Optional.of(data);
-    }
-
-    private CompletableFuture<Location> fetchPlotCenterLocation(Plot plot) {
-        if (plot.getArea() instanceof SinglePlotArea && !plot.isLoaded()) {
-            return CompletableFuture.completedFuture(Location.at("", 0, 0, 0));
-        }
-        CompletableFuture<Location> future = new CompletableFuture<>();
-        plot.getCenter(future::complete);
-        return future;
-    }
-
-    private @Nonnull RunnableVal3<Command, Runnable, Runnable> createForcedConfirmation(@Nonnull PlotPlayer<?> player,
-                                                                                        @Nullable PlotArea area) {
-        return new RunnableVal3<>() {
-            @Override
-            public void run(Command cmd, Runnable success, Runnable failure) {
-                if (area != null && PlotSquared.platform().econHandler().isEnabled(area)
-                        && Optional.of(area.getPrices().get(cmd.getFullId()))
-                        .map(priceEval -> priceEval.evaluate(0d))
-                        .filter(price -> price != 0d)
-                        .filter(price -> PlotSquared.platform().econHandler().getMoney(player) < price)
-                        .isPresent()) {
-                    if (failure != null) {
-                        failure.run();
-                    }
-                    return;
-                }
-                if (success != null) {
-                    success.run();
-                }
-            }
-        };
-    }
-
-    private @Nonnull TemporaryCommandMeta setCommandScope(@Nonnull PlotPlayer<?> player, @Nonnull TemporaryCommandMeta commandMeta) {
-        Objects.requireNonNull(commandMeta.location());
-        Objects.requireNonNull(commandMeta.plot());
-        Location location;
-        Plot plot;
-        try (final MetaDataAccess<Location> locationMetaDataAccess
-                     = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LOCATION)) {
-            location = locationMetaDataAccess.get().orElse(null);
-            locationMetaDataAccess.set(commandMeta.location());
-        }
-        try (final MetaDataAccess<Plot> plotMetaDataAccess
-                     = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
-            plot = plotMetaDataAccess.get().orElse(null);
-            plotMetaDataAccess.set(commandMeta.plot());
-        }
-        return new TemporaryCommandMeta(location, plot);
-    }
-
-    private void resetCommandScope(@Nonnull PlotPlayer<?> player, @Nonnull TemporaryCommandMeta commandMeta) {
-        try (final MetaDataAccess<Location> locationMetaDataAccess
-                     = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LOCATION)) {
-            if (commandMeta.location() == null) {
-                locationMetaDataAccess.remove();
-            } else {
-                locationMetaDataAccess.set(commandMeta.location());
-            }
-        }
-        try (final MetaDataAccess<Plot> plotMetaDataAccess
-                     = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
-            if (commandMeta.plot() == null) {
-                plotMetaDataAccess.remove();
-            } else {
-                plotMetaDataAccess.set(commandMeta.plot());
-            }
-        }
-    }
-
-    private record CommandExecutionData(@Nonnull PlotPlayer<?> player, @Nonnull String[] args,
-                    @Nonnull RunnableVal3<Command, Runnable, Runnable> confirm,
-                    @Nonnull RunnableVal2<Command, CommandResult> whenDone,
-                    @Nullable TemporaryCommandMeta postCommandData) {}
-
-    private record TemporaryCommandMeta(@Nullable Location location, @Nullable Plot plot) {}
-
     @Override
     public boolean canExecute(PlotPlayer<?> player, boolean message) {
         return true;

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

@@ -67,13 +67,10 @@ public class Visit extends Command {
 
     private void visit(
             final @NonNull PlotPlayer<?> player, final @NonNull PlotQuery query, final PlotArea sortByArea,
-            final RunnableVal3<Command, Runnable, Runnable> confirm, final RunnableVal2<Command, CommandResult> whenDone, int page
+            final RunnableVal3<Command, Runnable, Runnable> confirm, final RunnableVal2<Command, CommandResult> whenDone,
+            int page, final boolean isQueryingBasePlot
     ) {
-        // We get the query once,
-        // then we get it another time further on
-        final List<Plot> unsorted = query.asList();
-
-        if (unsorted.size() > 1) {
+        if (!isQueryingBasePlot && query.hasMinimumMatches(2)) {
             query.whereBasePlot();
         }
 
@@ -237,7 +234,8 @@ public class Visit extends Command {
                                     finalSortByArea,
                                     confirm,
                                     whenDone,
-                                    finalPage1
+                                    finalPage1,
+                                    true
                             );
                         }
                     });
@@ -261,12 +259,9 @@ public class Visit extends Command {
                         if (throwable instanceof TimeoutException) {
                             // The request timed out
                             player.sendMessage(TranslatableCaption.of("players.fetching_players_timeout"));
-                        } else if (uuid != null && (Settings.Teleport.VISIT_MERGED_OWNERS
-                                ? !PlotQuery.newQuery().ownersInclude(uuid).anyMatch()
-                                : !PlotQuery.newQuery().ownedBy(uuid).anyMatch())) {
-                            // It was a valid UUID but the player has no plots
-                            player.sendMessage(TranslatableCaption.of("errors.player_no_plots"));
-                        } else if (uuid == null) {
+                            return;
+                        }
+                        if (uuid == null){
                             // player not found, so we assume it's an alias if no page was provided
                             if (finalPage == Integer.MIN_VALUE) {
                                 this.visit(
@@ -275,7 +270,8 @@ public class Visit extends Command {
                                         player.getApplicablePlotArea(),
                                         confirm,
                                         whenDone,
-                                        1
+                                        1,
+                                        false
                                 );
                             } else {
                                 player.sendMessage(
@@ -283,24 +279,23 @@ public class Visit extends Command {
                                         TagResolver.resolver("value", Tag.inserting(Component.text(finalArgs[0])))
                                 );
                             }
-                        } else {
-                            this.visit(
-                                    player,
-                                    Settings.Teleport.VISIT_MERGED_OWNERS
-                                            ? PlotQuery.newQuery().ownersInclude(uuid).whereBasePlot()
-                                            : PlotQuery.newQuery().ownedBy(uuid).whereBasePlot(),
-                                    null,
-                                    confirm,
-                                    whenDone,
-                                    finalPage
-                            );
+                            return;
                         }
+                        final PlotQuery query = Settings.Teleport.VISIT_MERGED_OWNERS
+                                ? PlotQuery.newQuery().ownersInclude(uuid)
+                                : PlotQuery.newQuery().ownedBy(uuid);
+                        if (!query.anyMatch()) {
+                            // It was a valid UUID but the player has no plots
+                            player.sendMessage(TranslatableCaption.of("errors.player_no_plots"));
+                            return;
+                        }
+                        this.visit(player, query.whereBasePlot(), null, confirm, whenDone, finalPage, true);
                     });
                 } else {
                     // Try to parse a plot
                     final Plot plot = Plot.getPlotFromString(player, finalArgs[0], true);
                     if (plot != null) {
-                        this.visit(player, PlotQuery.newQuery().withPlot(plot), null, confirm, whenDone, 1);
+                        this.visit(player, PlotQuery.newQuery().withPlot(plot), null, confirm, whenDone, 1, false);
                     }
                 }
                 break;

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

@@ -525,8 +525,8 @@ public class Settings extends Config {
     public static final class Limit {
 
         @Comment("Should the limit be global (over multiple worlds)")
-        public static boolean GLOBAL = false;
-
+        public static boolean GLOBAL =
+                false;
         @Comment({"The max range of integer permissions to check for, e.g. 'plots.plot.127' or 'plots.set.flag.mob-cap.127'",
                 "The value covers the permission range to check, you need to assign the permission to players/groups still",
                 "Modifying the value does NOT change the amount of plots players can claim"})
@@ -737,7 +737,6 @@ public class Settings extends Config {
 
         @Comment("If \"instabreak\" should consider the used tool.")
         public static boolean INSTABREAK_CONSIDER_TOOL = false;
-
     }
 
     @Comment({"Enable or disable parts of the plugin",
@@ -831,17 +830,4 @@ public class Settings extends Config {
 
     }
 
-    @Comment({"Permission-Resolver specific settings"})
-    public static final class Permissions {
-
-        @Comment({
-                "use the new LuckPerms resolver for ranged permissions (e.g., plots.plot.<number>).",
-                "in contrary to the default resolver, this resolver can handle inheritance of permissions.",
-                "e.g. if the player has multiple matching permissions, for example, due to multiple group memberships " +
-                        "(plots.plot.5 & plots.plot.15), this resolver would use 15 as the limit as opposed to the previous 5."
-        })
-        public static boolean USE_LUCKPERMS_RANGE_RESOLVER = false;
-
-    }
-
 }

Core/src/main/java/com/plotsquared/core/configuration/caption/Caption.java

@@ -20,7 +20,6 @@ package com.plotsquared.core.configuration.caption;
 
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentLike;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 /**
@@ -45,16 +44,6 @@ public interface Caption {
      */
     @NonNull Component toComponent(@NonNull LocaleHolder localeHolder);
 
-    /**
-     * Get the Adventure {@link ComponentLike} for this caption while applying custom {@link TagResolver}
-     * (apart from the default {@code core.prefix})
-     * @param localeHolder Local holder
-     * @param tagResolvers custom tag resolvers to replace placeholders / parameters
-     * @return {@link ComponentLike}
-     * @since TODO
-     */
-    @NonNull Component toComponent(@NonNull LocaleHolder localeHolder, @NonNull TagResolver @NonNull... tagResolvers);
-
     @NonNull String toString();
 
 }

Core/src/main/java/com/plotsquared/core/configuration/caption/StaticCaption.java

@@ -21,7 +21,6 @@ package com.plotsquared.core.configuration.caption;
 import com.google.common.base.Preconditions;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
-import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 public final class StaticCaption implements Caption {
@@ -52,14 +51,6 @@ public final class StaticCaption implements Caption {
         return MiniMessage.miniMessage().deserialize(this.value);
     }
 
-    @Override
-    public @NonNull Component toComponent(
-            @NonNull final LocaleHolder localeHolder,
-            final @NonNull TagResolver @NonNull ... tagResolvers
-    ) {
-        return MiniMessage.miniMessage().deserialize(this.value, tagResolvers);
-    }
-
     @Override
     public @NonNull String toString() {
         return "StaticCaption(" + value + ")";

Core/src/main/java/com/plotsquared/core/configuration/caption/TranslatableCaption.java

@@ -27,7 +27,6 @@ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Arrays;
 import java.util.Locale;
 import java.util.regex.Pattern;
 
@@ -97,23 +96,13 @@ public final class TranslatableCaption implements NamespacedCaption {
 
     @Override
     public @NonNull Component toComponent(@NonNull final LocaleHolder localeHolder) {
-        return this.toComponent(localeHolder, new TagResolver[0]);
-    }
-
-    @Override
-    public @NonNull Component toComponent(
-            @NonNull final LocaleHolder localeHolder,
-            final @NonNull TagResolver @NonNull ... tagResolvers
-    ) {
         if (getKey().equals("core.prefix")) {
             return MiniMessage.miniMessage().deserialize(getComponent(localeHolder));
         }
-        TagResolver[] finalResolvers = Arrays.copyOf(tagResolvers, tagResolvers.length + 1);
-        finalResolvers[finalResolvers.length - 1] = TagResolver.resolver(
+        return MiniMessage.miniMessage().deserialize(getComponent(localeHolder), TagResolver.resolver(
                 "prefix",
                 Tag.inserting(TranslatableCaption.of("core.prefix").toComponent(localeHolder))
-        );
-        return MiniMessage.miniMessage().deserialize(getComponent(localeHolder), finalResolvers);
+        ));
     }
 
     @Override

Core/src/main/java/com/plotsquared/core/permissions/RangedPermissionResolver.java

@@ -1,126 +0,0 @@
-/*
- * PlotSquared, a land and world management plugin for Minecraft.
- * Copyright (C) IntellectualSites <https://intellectualsites.com>
- * Copyright (C) IntellectualSites team and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.plotsquared.core.permissions;
-
-import com.plotsquared.core.player.PlotPlayer;
-import org.checkerframework.checker.index.qual.NonNegative;
-import org.checkerframework.checker.nullness.qual.NonNull;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
-import java.util.stream.IntStream;
-
-/**
- * Represents a resolver for ranged permissions. Return values depend on the actual implementation (see Bukkit module).
- * <br>
- * Even though this interface is not linked to platform implementations by design, implementation-specific details are added to
- * the Javadocs.
- *
- * @since TODO
- */
-public interface RangedPermissionResolver {
-
-    int INFINITE_RANGE_VALUE = Integer.MAX_VALUE;
-
-    /**
-     * Gets the applicable range value of a player for a specific permission stub
-     * ({@code plots.plot} would check for {@code plots.plot.<numeric>}).
-     * <br>
-     * The standard bukkit implementation would return the lowest numeric value, while the LuckPerms specific resolver would
-     * try returning the highest possible value.
-     *
-     * @param player       the permission holder
-     * @param stub         the permission stub to check against
-     * @param worldContext the optional world context of the action requiring the range
-     * @param range        the maximum permission range to check against (for the default bukkit resolver)
-     * @return the applicable range value of the player for the given permission stub
-     * @since TODO
-     */
-    @NonNegative
-    int getPermissionRange(
-            final @NonNull PlotPlayer<?> player,
-            final @NonNull String stub,
-            final @Nullable String worldContext,
-            final @NonNegative int range
-    );
-
-    /**
-     * Gets a stream of all applicable permission range values for the given stub. The stream is unordered by default. If a
-     * specific order is needed, use the stateful {@link IntStream#sorted()} operation.
-     * <br>
-     * The standard bukkit implementation will only return a stream containing a single value equal to
-     * {@link #getPermissionRange(PlotPlayer, String, String, int)}. For LuckPerms, all applicable node values will be in the
-     * stream.
-     *
-     * @param player       the permission holder
-     * @param stub         the permission stub to check against
-     * @param worldContext the optional world context of the action requiring the range
-     * @param range        the maximum permission range to check against (for the default bukkit resolver)
-     * @return a stream of all applicable permission range values for the given stub
-     * @since TODO
-     */
-    @NonNull
-    IntStream streamFullPermissionRange(
-            final @NonNull PlotPlayer<?> player,
-            final @NonNull String stub,
-            final @Nullable String worldContext,
-            final @NonNegative int range
-    );
-
-    /**
-     * Checks if the given player has a wildcard range for the given permission stub.
-     * <br>
-     * For example, if checking for the stub {@code plots.plot}, this method would check for:
-     * <ul>
-     *     <li>{@code *}</li>
-     *     <li>{@code plots.admin}</li>
-     *     <li>{@code plots.plot.*}</li>
-     *     <li>{@code plots.*}</li>
-     * </ul>
-     *
-     * @param player       the permission holder
-     * @param stub         the permission stub to check against
-     * @param worldContext the optional world context of the action requiring the range
-     * @return {@code true} if the player has a wildcard range for the given permission stub, else {@code false}
-     * @since TODO
-     */
-    default boolean hasWildcardRange(
-            final @NonNull PlotPlayer<?> player,
-            final @NonNull String stub,
-            final @Nullable String worldContext
-    ) {
-        if (player.hasPermission(Permission.PERMISSION_STAR) ||
-                player.hasPermission(Permission.PERMISSION_ADMIN) ||
-                player.hasPermission(worldContext, stub + ".*")) {
-            return true;
-        }
-        String node = stub;
-        while (true) {
-            int lastIndex = node.lastIndexOf('.');
-            if (lastIndex == -1) {
-                break;
-            }
-            node = node.substring(0, lastIndex);
-            if (player.hasPermission(worldContext, node + ".*")) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-}

Core/src/main/java/com/plotsquared/core/player/PlotPlayer.java

@@ -444,7 +444,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
 
     /**
      * Get this player's UUID.
-     * <p>=== !IMPORTANT ===</p>
+     * === !IMPORTANT ===<br>
      * The UUID is dependent on the mode chosen in the settings.yml and may not be the same as Bukkit has
      * (especially if using an old version of Bukkit that does not support UUIDs)
      *

Core/src/main/java/com/plotsquared/core/plot/Plot.java

@@ -1717,7 +1717,6 @@ public class Plot {
         }
         player.sendMessage(
                 TranslatableCaption.of("working.claimed"),
-                TagResolver.resolver("world", Tag.inserting(Component.text(this.getWorldName()))),
                 TagResolver.resolver("plot", Tag.inserting(Component.text(this.getId().toString())))
         );
         if (teleport) {

Core/src/main/java/com/plotsquared/core/util/comparator/PlotByCreationDateComparator.java

@@ -0,0 +1,50 @@
+/*
+ * PlotSquared, a land and world management plugin for Minecraft.
+ * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ * Copyright (C) IntellectualSites team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.plotsquared.core.util.comparator;
+
+import com.plotsquared.core.plot.Plot;
+
+import java.util.Comparator;
+
+/**
+ * Sort plots by {@link Plot#temp} (being the auto increment id in database) in natural order for {@code temp > 0}.
+ * For {@code temp < 1} sort by {@link Plot#hashCode()}
+ */
+public class PlotByCreationDateComparator implements Comparator<Plot> {
+
+    public static final Comparator<Plot> INSTANCE = new PlotByCreationDateComparator();
+
+    private PlotByCreationDateComparator() {
+    }
+
+    @Override
+    @SuppressWarnings("deprecation") // Plot#temp
+    public int compare(final Plot first, final Plot second) {
+        if (first.temp > 0 && second.temp > 0) {
+            return Integer.compare(first.temp, second.temp);
+        }
+        // second is implicitly `< 1` (due to previous condition)
+        if (first.temp > 0) {
+            return 1;
+        }
+        // sort dangling plots (temp < 1) by their hashcode
+        return Integer.compare(first.hashCode(), second.hashCode());
+    }
+
+}

Core/src/main/java/com/plotsquared/core/util/comparator/PlotByDoneComparator.java

@@ -0,0 +1,52 @@
+/*
+ * PlotSquared, a land and world management plugin for Minecraft.
+ * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ * Copyright (C) IntellectualSites team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.plotsquared.core.util.comparator;
+
+import com.plotsquared.core.plot.Plot;
+import com.plotsquared.core.plot.flag.implementations.DoneFlag;
+import com.plotsquared.core.util.MathMan;
+
+import java.util.Comparator;
+
+/**
+ * Sort plots by their {@link DoneFlag} in reverse numeric natural order. (more recent "finished plots" first)
+ * <br>
+ * Non-finished plots last, unsorted.
+ */
+public class PlotByDoneComparator implements Comparator<Plot> {
+
+    public static final PlotByDoneComparator INSTANCE = new PlotByDoneComparator();
+
+    private PlotByDoneComparator() {
+    }
+
+    @Override
+    public int compare(final Plot first, final Plot second) {
+        String firstDone = first.getFlag(DoneFlag.class);
+        String lastDone = second.getFlag(DoneFlag.class);
+        if (MathMan.isInteger(firstDone)) {
+            if (MathMan.isInteger(lastDone)) {
+                return Integer.parseInt(lastDone) - Integer.parseInt(firstDone);
+            }
+            return -1; // only "first" is finished, so sort "second" after "first"
+        }
+        return 0; // neither is finished
+    }
+
+}

Core/src/main/java/com/plotsquared/core/util/comparator/PlotByRatingComparator.java

@@ -0,0 +1,61 @@
+/*
+ * PlotSquared, a land and world management plugin for Minecraft.
+ * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ * Copyright (C) IntellectualSites team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.plotsquared.core.util.comparator;
+
+import com.plotsquared.core.plot.Plot;
+import com.plotsquared.core.plot.Rating;
+
+import java.util.Comparator;
+import java.util.Map;
+import java.util.UUID;
+
+public class PlotByRatingComparator implements Comparator<Plot> {
+
+    public static final PlotByRatingComparator INSTANCE = new PlotByRatingComparator();
+
+    PlotByRatingComparator() {
+    }
+
+    @Override
+    public int compare(final Plot p1, final Plot p2) {
+        double v1 = 0;
+        int p1s = p1.getSettings().getRatings().size();
+        int p2s = p2.getRatings().size();
+        if (!p1.getSettings().getRatings().isEmpty()) {
+            v1 = p1.getRatings().values().stream().mapToDouble(Rating::getAverageRating)
+                    .map(av -> av * av).sum();
+            v1 /= p1s;
+            v1 += p1s;
+        }
+        double v2 = 0;
+        if (!p2.getSettings().getRatings().isEmpty()) {
+            for (Map.Entry<UUID, Rating> entry : p2.getRatings().entrySet()) {
+                double av = entry.getValue().getAverageRating();
+                v2 += av * av;
+            }
+            v2 /= p2s;
+            v2 += p2s;
+        }
+        if (v2 == v1 && v2 != 0) {
+            return p2s - p1s;
+        }
+        return (int) Math.signum(v2 - v1);
+    }
+
+}

Core/src/main/java/com/plotsquared/core/util/comparator/PlotInPrioritizedAreaComparator.java

@@ -0,0 +1,49 @@
+/*
+ * PlotSquared, a land and world management plugin for Minecraft.
+ * Copyright (C) IntellectualSites <https://intellectualsites.com>
+ * Copyright (C) IntellectualSites team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.plotsquared.core.util.comparator;
+
+import com.plotsquared.core.plot.Plot;
+import com.plotsquared.core.plot.PlotArea;
+
+import javax.annotation.Nullable;
+import java.util.Comparator;
+
+public class PlotInPrioritizedAreaComparator implements Comparator<Plot> {
+
+    private final PlotArea priorityArea;
+
+    public PlotInPrioritizedAreaComparator(@Nullable final PlotArea area) {
+        this.priorityArea = area;
+    }
+
+    @Override
+    public int compare(final Plot first, final Plot second) {
+        if (this.priorityArea == null) {
+            return 0; // no defined priority? don't sort
+        }
+        if (this.priorityArea.equals(first.getArea())) {
+            return -1;
+        }
+        if (this.priorityArea.equals(second.getArea())) {
+            return 1;
+        }
+        return 0; // same area, don't sort
+    }
+
+}

Core/src/main/java/com/plotsquared/core/util/helpmenu/HelpObject.java

@@ -25,24 +25,30 @@ import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.util.StringMan;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentLike;
+import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.jetbrains.annotations.NotNull;
 
 public class HelpObject implements ComponentLike {
 
+    static final MiniMessage MINI_MESSAGE = MiniMessage.miniMessage();
+
     private final Component rendered;
 
     public HelpObject(final Command command, final String label, final PlotPlayer<?> audience) {
-        this.rendered = TranslatableCaption.of("help.help_item").toComponent(audience, TagResolver.builder()
-                .tag("usage", Tag.inserting(Component.text(command.getUsage().replace("{label}", label))))
-                .tag("alias", Tag.inserting(Component.text(
-                        command.getAliases().isEmpty() ? "" : StringMan.join(command.getAliases(), " | ")
-                )))
-                .tag("desc", Tag.inserting(command.getDescription().toComponent(audience)))
-                .tag("arguments", Tag.inserting(Component.text(buildArgumentList(command.getRequiredArguments()))))
-                .tag("label", Tag.inserting(Component.text(label)))
-                .build());
+        rendered = MINI_MESSAGE.deserialize(
+                TranslatableCaption.of("help.help_item").getComponent(audience),
+                TagResolver.builder()
+                        .tag("usage", Tag.inserting(Component.text(command.getUsage().replace("{label}", label))))
+                        .tag("alias", Tag.inserting(Component.text(
+                                command.getAliases().isEmpty() ? "" : StringMan.join(command.getAliases(), " | ")
+                        )))
+                        .tag("desc", Tag.inserting(command.getDescription().toComponent(audience)))
+                        .tag("arguments", Tag.inserting(Component.text(buildArgumentList(command.getRequiredArguments()))))
+                        .tag("label", Tag.inserting(Component.text(label)))
+                        .build()
+        );
     }
 
     private String buildArgumentList(final Argument<?>[] arguments) {

Core/src/main/java/com/plotsquared/core/util/query/AreaLimitedPlotProvider.java

@@ -24,6 +24,7 @@ import com.plotsquared.core.plot.PlotArea;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.stream.Stream;
 
 class AreaLimitedPlotProvider implements PlotProvider {
 
@@ -42,4 +43,9 @@ class AreaLimitedPlotProvider implements PlotProvider {
         return plots;
     }
 
+    @Override
+    public Stream<Plot> streamPlots() {
+        return streamPlotsInPlotAreas(this.areas.toArray(PlotArea[]::new));
+    }
+
 }

Core/src/main/java/com/plotsquared/core/util/query/ExpiredPlotProvider.java

@@ -22,6 +22,7 @@ import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.plot.Plot;
 
 import java.util.Collection;
+import java.util.stream.Stream;
 
 class ExpiredPlotProvider implements PlotProvider {
 
@@ -30,4 +31,9 @@ class ExpiredPlotProvider implements PlotProvider {
         return PlotSquared.platform().expireManager().getPendingExpired();
     }
 
+    @Override
+    public Stream<Plot> streamPlots() {
+        return getPlots().stream();
+    }
+
 }

Core/src/main/java/com/plotsquared/core/util/query/FixedPlotProvider.java

@@ -23,6 +23,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.stream.Stream;
 
 class FixedPlotProvider implements PlotProvider {
 
@@ -37,4 +38,9 @@ class FixedPlotProvider implements PlotProvider {
         return Collections.singleton(plot);
     }
 
+    @Override
+    public Stream<Plot> streamPlots() {
+        return Stream.of(plot);
+    }
+
 }

Core/src/main/java/com/plotsquared/core/util/query/GlobalPlotProvider.java

@@ -26,6 +26,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.stream.Stream;
 
 class GlobalPlotProvider implements PlotProvider {
 
@@ -44,4 +45,9 @@ class GlobalPlotProvider implements PlotProvider {
         return plots;
     }
 
+    @Override
+    public Stream<Plot> streamPlots() {
+        return streamPlotsInPlotAreas(this.plotAreaManager.getAllPlotAreas());
+    }
+
 }

Core/src/main/java/com/plotsquared/core/util/query/NullProvider.java

@@ -22,6 +22,7 @@ import com.plotsquared.core.plot.Plot;
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.stream.Stream;
 
 class NullProvider implements PlotProvider {
 
@@ -30,4 +31,9 @@ class NullProvider implements PlotProvider {
         return Collections.emptyList();
     }
 
+    @Override
+    public Stream<Plot> streamPlots() {
+        return Stream.empty();
+    }
+
 }

Core/src/main/java/com/plotsquared/core/util/query/OwnersIncludeFilter.java

@@ -23,17 +23,11 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.UUID;
 
-class OwnersIncludeFilter implements PlotFilter {
-
-    private final UUID owner;
-
-    OwnersIncludeFilter(final @NonNull UUID owner) {
-        this.owner = owner;
-    }
+record OwnersIncludeFilter(UUID owner) implements PlotFilter {
 
     @Override
     public boolean accepts(final @NonNull Plot plot) {
-        return plot.isBasePlot() && plot.getOwners().size() > 0 && plot.getOwners().contains(owner);
+        return plot.isBasePlot() && plot.isOwner(owner);
     }
 
 }

Core/src/main/java/com/plotsquared/core/util/query/PlotProvider.java

@@ -19,12 +19,44 @@
 package com.plotsquared.core.util.query;
 
 import com.plotsquared.core.plot.Plot;
+import com.plotsquared.core.plot.PlotArea;
 
 import java.util.Collection;
+import java.util.Iterator;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
 
-@FunctionalInterface
 interface PlotProvider {
 
     Collection<Plot> getPlots();
 
+    Stream<Plot> streamPlots();
+
+    default Stream<Plot> streamPlotsInPlotAreas(PlotArea[] areas) {
+        if (areas == null || areas.length == 0) {
+            return Stream.of();
+        }
+        return StreamSupport.stream(Spliterators.spliteratorUnknownSize(new Iterator<>() {
+            private int areaIndex = -1;
+            private Iterator<Plot> currentAreaPlots;
+            @Override
+            public boolean hasNext() {
+                if (currentAreaPlots == null || !currentAreaPlots.hasNext()) {
+                    if (areaIndex >= areas.length - 1) {
+                        return false;
+                    }
+                    currentAreaPlots = areas[++areaIndex].getPlots().iterator();
+                }
+                return true;
+            }
+
+            @Override
+            public Plot next() {
+                return currentAreaPlots.next();
+            }
+        }, Spliterator.IMMUTABLE), false);
+    }
+
 }

Core/src/main/java/com/plotsquared/core/util/query/PlotQuery.java

@@ -23,10 +23,11 @@ import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
-import com.plotsquared.core.plot.Rating;
-import com.plotsquared.core.plot.flag.implementations.DoneFlag;
 import com.plotsquared.core.plot.world.PlotAreaManager;
-import com.plotsquared.core.util.MathMan;
+import com.plotsquared.core.util.comparator.PlotByDoneComparator;
+import com.plotsquared.core.util.comparator.PlotByRatingComparator;
+import com.plotsquared.core.util.comparator.PlotByCreationDateComparator;
+import com.plotsquared.core.util.comparator.PlotInPrioritizedAreaComparator;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.util.ArrayList;
@@ -37,7 +38,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import java.util.function.Predicate;
@@ -229,6 +229,7 @@ public final class PlotQuery implements Iterable<Plot> {
     public @NonNull PlotQuery hasOwner() {
         return this.addFilter(new HasOwnerFilter());
     }
+
     /**
      * Query for plots with a specific alias
      *
@@ -307,7 +308,15 @@ public final class PlotQuery implements Iterable<Plot> {
      * @return Matching plots
      */
     public @NonNull Stream<Plot> asStream() {
-        return this.asList().stream();
+        Stream<Plot> stream = this.plotProvider.streamPlots().filter(testPlotAgainstFilters());
+        if (this.sortingStrategy == SortingStrategy.NO_SORTING) {
+            return stream;
+        }
+        stream = stream.sorted(getConfiguredComparator());
+        if (this.priorityArea != null) {
+            stream = stream.sorted(new PlotInPrioritizedAreaComparator(this.priorityArea));
+        }
+        return stream;
     }
 
     /**
@@ -334,49 +343,10 @@ public final class PlotQuery implements Iterable<Plot> {
         }
         if (this.sortingStrategy == SortingStrategy.NO_SORTING) {
             return result;
-        } else if (this.sortingStrategy == SortingStrategy.SORT_BY_TEMP) {
-            return PlotSquared.get().sortPlotsByTemp(result);
-        } else if (this.sortingStrategy == SortingStrategy.SORT_BY_DONE) {
-            result.sort((a, b) -> {
-                String va = a.getFlag(DoneFlag.class);
-                String vb = b.getFlag(DoneFlag.class);
-                if (MathMan.isInteger(va)) {
-                    if (MathMan.isInteger(vb)) {
-                        return Integer.parseInt(vb) - Integer.parseInt(va);
-                    }
-                    return -1;
-                }
-                return 1;
-            });
-        } else if (this.sortingStrategy == SortingStrategy.SORT_BY_RATING) {
-            result.sort((p1, p2) -> {
-                double v1 = 0;
-                int p1s = p1.getSettings().getRatings().size();
-                int p2s = p2.getRatings().size();
-                if (!p1.getSettings().getRatings().isEmpty()) {
-                    v1 = p1.getRatings().values().stream().mapToDouble(Rating::getAverageRating)
-                            .map(av -> av * av).sum();
-                    v1 /= p1s;
-                    v1 += p1s;
-                }
-                double v2 = 0;
-                if (!p2.getSettings().getRatings().isEmpty()) {
-                    for (Map.Entry<UUID, Rating> entry : p2.getRatings().entrySet()) {
-                        double av = entry.getValue().getAverageRating();
-                        v2 += av * av;
-                    }
-                    v2 /= p2s;
-                    v2 += p2s;
-                }
-                if (v2 == v1 && v2 != 0) {
-                    return p2s - p1s;
-                }
-                return (int) Math.signum(v2 - v1);
-            });
-        } else if (this.sortingStrategy == SortingStrategy.SORT_BY_CREATION) {
-            return PlotSquared.get().sortPlots(result, PlotSquared.SortType.CREATION_DATE, this.priorityArea);
-        } else if (this.sortingStrategy == SortingStrategy.COMPARATOR) {
-            result.sort(this.plotComparator);
+        }
+        result.sort(getConfiguredComparator());
+        if (this.priorityArea != null) {
+            result.sort(new PlotInPrioritizedAreaComparator(this.priorityArea));
         }
         return result;
     }
@@ -427,28 +397,22 @@ public final class PlotQuery implements Iterable<Plot> {
      * @return {@code true} if any provided plot matches the filters.
      */
     public boolean anyMatch() {
-        if (this.filters.isEmpty()) {
-            return !this.plotProvider.getPlots().isEmpty();
-        } else {
-            final Collection<Plot> plots = this.plotProvider.getPlots();
-            outer:
-            for (final Plot plot : plots) {
-                // a plot must pass all filters to match the criteria
-                for (final PlotFilter filter : this.filters) {
-                    if (!filter.accepts(plot)) {
-                        continue outer;
-                    }
-                }
-                return true; // a plot passed all filters, so we have a match
-            }
-            return false;
-        }
+        return hasMinimumMatches(1);
     }
 
-    @NonNull
-    private PlotQuery addFilter(final @NonNull PlotFilter filter) {
-        this.filters.add(filter);
-        return this;
+    /**
+     * Get whether this query matches at least {@code minimum} plots.
+     * <br />
+     * Should be prioritized over {@link #count()}, if possible.
+     * This method only queries as many plots and areas as required without applying sorting. (short-circuiting on the stream)
+     *
+     * @param minimum the minimum amount of matches plots expected (inclusive)
+     * @return {@code true} if this query's result contains at least {@code minimum} plots (after optional filters).
+     *
+     * @since TODO
+     */
+    public boolean hasMinimumMatches(int minimum) {
+        return this.plotProvider.streamPlots().filter(testPlotAgainstFilters()).limit(minimum).count() == minimum;
     }
 
     @NonNull
@@ -457,4 +421,34 @@ public final class PlotQuery implements Iterable<Plot> {
         return this.asCollection().iterator();
     }
 
+    @NonNull
+    private PlotQuery addFilter(final @NonNull PlotFilter filter) {
+        this.filters.add(filter);
+        return this;
+    }
+
+    private Comparator<Plot> getConfiguredComparator() {
+        return switch (sortingStrategy) {
+            case NO_SORTING -> (p1, p2) -> 0;
+            case SORT_BY_TEMP, SORT_BY_CREATION -> PlotByCreationDateComparator.INSTANCE;
+            case SORT_BY_DONE -> PlotByDoneComparator.INSTANCE;
+            case SORT_BY_RATING -> PlotByRatingComparator.INSTANCE;
+            case COMPARATOR -> plotComparator;
+        };
+    }
+
+    private Predicate<Plot> testPlotAgainstFilters() {
+        if (this.filters.isEmpty()) {
+            return plot -> true;
+        }
+        return plot -> {
+            for (final PlotFilter filter : filters) {
+                if (!filter.accepts(plot)) {
+                    return false;
+                }
+            }
+            return true;
+        };
+    }
+
 }

Core/src/main/java/com/plotsquared/core/util/query/SearchPlotProvider.java

@@ -31,6 +31,7 @@ import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
+import java.util.stream.Stream;
 
 class SearchPlotProvider implements PlotProvider {
 
@@ -115,4 +116,9 @@ class SearchPlotProvider implements PlotProvider {
         return getPlotsBySearch(this.searchTerm);
     }
 
+    @Override
+    public Stream<Plot> streamPlots() {
+        return getPlots().stream(); // TODO: look into potentially optimizations here?
+    }
+
 }

Core/src/main/resources/lang/messages_en.json

@@ -390,11 +390,11 @@
   "info.area_list_tooltip": "<gold>Claimed=</gold><gray><claimed></gray>\n<gold>Usage=</gold><gray><usage></gray>\n<gold>Clusters=</gold><gray><clusters></gray>\n<gold>Region=</gold><gray><region></gray>\n<gold>Generator=</gold><gray><generator></gray>",
   "info.area_list_item": "<click:run_command:'<command_tp>'><hover:show_text:'<command_tp>'><dark_gray>[</dark_gray><gold><number></gold><dark_gray>]</dark_gray></hover></click> <click:run_command:'<command_info>'><hover:show_text:'<hover_info>'><gold><area_name></gold></hover></click><gray> - </gray><gray><area_type>:<area_terrain></gray>",
   "working.generating_component": "<prefix><gold>Started generating component from your settings.</gold>",
-  "working.clearing_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><world>;<plot></gold><dark_aqua> has been cleared! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
-  "working.deleting_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><world>;<plot></gold><dark_aqua> has been deleted! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
+  "working.clearing_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><plot></gold><dark_aqua> has been cleared! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
+  "working.deleting_done": "<prefix><dark_aqua>Plot </dark_aqua><gold><plot></gold><dark_aqua> has been deleted! Took </dark_aqua><gold><amount>ms</gold><dark_aqua>.</dark_aqua>",
   "working.plot_not_claimed": "<prefix><gray>Plot not claimed.</gray>",
   "working.plot_is_claimed": "<prefix><gray>This plot is already claimed.</gray>",
-  "working.claimed": "<prefix><dark_aqua>You successfully claimed the plot </dark_aqua><gold><world>;<plot></gold><dark_aqua>.</dark_aqua>",
+  "working.claimed": "<prefix><dark_aqua>You successfully claimed the plot </dark_aqua><gold><plot></gold><dark_aqua>.</dark_aqua>",
   "working.progress": "<prefix><gray>Current progress: </gray><gold><progress></gold><gray>%</gray>",
   "working.component_complete": "<prefix><gold>Component generation has finished for plot <plot>.</gold>",
   "list.comment_list_header_paged": "<gray>(Page </gray><gold><cur></gold><gray>/</gray><gold><max></gold><gray>) </gray><gold>List of <amount> comment(s):</gold>",

build.gradle.kts

@@ -1,6 +1,5 @@
 import com.diffplug.gradle.spotless.SpotlessPlugin
 import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
-import com.vanniktech.maven.publish.SonatypeHost
 import groovy.json.JsonSlurper
 import xyz.jpenilla.runpaper.task.RunServer
 import java.net.URI
@@ -8,12 +7,13 @@ import java.net.URI
 plugins {
     java
     `java-library`
+    `maven-publish`
     signing
 
     alias(libs.plugins.shadow)
     alias(libs.plugins.spotless)
     alias(libs.plugins.grgit)
-    alias(libs.plugins.publish)
+    alias(libs.plugins.nexus)
 
     eclipse
     idea
@@ -22,7 +22,7 @@ plugins {
 }
 
 group = "com.intellectualsites.plotsquared"
-version = "7.5.4-SNAPSHOT"
+version = "7.5.1-SNAPSHOT"
 
 if (!File("$rootDir/.git").exists()) {
     logger.lifecycle("""
@@ -41,6 +41,16 @@ subprojects {
     repositories {
         mavenCentral()
 
+        maven {
+            name = "Sonatype OSS"
+            url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
+        }
+
+        maven {
+            name = "Sonatype OSS (S01)"
+            url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+        }
+
         maven {
             name = "Jitpack"
             url = uri("https://jitpack.io")
@@ -58,7 +68,7 @@ subprojects {
     apply {
         plugin<JavaPlugin>()
         plugin<JavaLibraryPlugin>()
-        plugin<com.vanniktech.maven.publish.MavenPublishPlugin>()
+        plugin<MavenPublishPlugin>()
         plugin<ShadowPlugin>()
         plugin<SpotlessPlugin>()
         plugin<SigningPlugin>()
@@ -69,8 +79,8 @@ subprojects {
 
     dependencies {
         // Tests
-        testImplementation("org.junit.jupiter:junit-jupiter:5.13.0")
-        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.13.0")
+        testImplementation("org.junit.jupiter:junit-jupiter:5.12.0")
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.12.0")
     }
 
     plugins.withId("java") {
@@ -97,6 +107,11 @@ subprojects {
         }
     }
 
+    java {
+        withSourcesJar()
+        withJavadocJar()
+    }
+
     val javaComponent = components["java"] as AdhocComponentWithVariants
     javaComponent.withVariantsFromConfiguration(configurations["shadowRuntimeElements"]) {
         skip()
@@ -112,67 +127,66 @@ subprojects {
         }
     }
 
-    mavenPublishing {
-        coordinates(
-            groupId = "$group",
-            artifactId = project.name,
-            version = "${project.version}",
-        )
+    publishing {
+        publications {
+            create<MavenPublication>("maven") {
+                from(components["java"])
 
-        pom {
-            name.set(project.name)
-            description.set("PlotSquared, a land and world management plugin for Minecraft.")
-            url.set("https://github.com/IntellectualSites/PlotSquared")
+                pom {
 
-            licenses {
-                license {
-                    name.set("GNU General Public License, Version 3.0")
-                    url.set("https://www.gnu.org/licenses/gpl-3.0.html")
-                    distribution.set("repo")
+                    name.set(project.name + " " + project.version)
+                    description.set("PlotSquared, a land and world management plugin for Minecraft.")
+                    url.set("https://github.com/IntellectualSites/PlotSquared")
+
+                    licenses {
+                        license {
+                            name.set("GNU General Public License, Version 3.0")
+                            url.set("https://www.gnu.org/licenses/gpl-3.0.html")
+                            distribution.set("repo")
+                        }
+                    }
+
+                    developers {
+                        developer {
+                            id.set("Sauilitired")
+                            name.set("Alexander Söderberg")
+                            organization.set("IntellectualSites")
+                            organizationUrl.set("https://github.com/IntellectualSites")
+                        }
+                        developer {
+                            id.set("NotMyFault")
+                            name.set("Alexander Brandes")
+                            organization.set("IntellectualSites")
+                            organizationUrl.set("https://github.com/IntellectualSites")
+                            email.set("contact(at)notmyfault.dev")
+                        }
+                        developer {
+                            id.set("SirYwell")
+                            name.set("Hannes Greule")
+                            organization.set("IntellectualSites")
+                            organizationUrl.set("https://github.com/IntellectualSites")
+                        }
+                        developer {
+                            id.set("dordsor21")
+                            name.set("dordsor21")
+                            organization.set("IntellectualSites")
+                            organizationUrl.set("https://github.com/IntellectualSites")
+                        }
+                    }
+
+                    scm {
+                        url.set("https://github.com/IntellectualSites/PlotSquared")
+                        connection.set("scm:git:https://github.com/IntellectualSites/PlotSquared.git")
+                        developerConnection.set("scm:git:git@github.com:IntellectualSites/PlotSquared.git")
+                        tag.set("${project.version}")
+                    }
+
+                    issueManagement {
+                        system.set("GitHub")
+                        url.set("https://github.com/IntellectualSites/PlotSquared/issues")
+                    }
                 }
             }
-
-            developers {
-                developer {
-                    id.set("Sauilitired")
-                    name.set("Alexander Söderberg")
-                    organization.set("IntellectualSites")
-                    organizationUrl.set("https://github.com/IntellectualSites")
-                }
-                developer {
-                    id.set("NotMyFault")
-                    name.set("Alexander Brandes")
-                    organization.set("IntellectualSites")
-                    organizationUrl.set("https://github.com/IntellectualSites")
-                    email.set("contact(at)notmyfault.dev")
-                }
-                developer {
-                    id.set("SirYwell")
-                    name.set("Hannes Greule")
-                    organization.set("IntellectualSites")
-                    organizationUrl.set("https://github.com/IntellectualSites")
-                }
-                developer {
-                    id.set("dordsor21")
-                    name.set("dordsor21")
-                    organization.set("IntellectualSites")
-                    organizationUrl.set("https://github.com/IntellectualSites")
-                }
-            }
-
-            scm {
-                url.set("https://github.com/IntellectualSites/PlotSquared")
-                connection.set("scm:git:https://github.com/IntellectualSites/PlotSquared.git")
-                developerConnection.set("scm:git:git@github.com:IntellectualSites/PlotSquared.git")
-                tag.set("${project.version}")
-            }
-
-            issueManagement {
-                system.set("GitHub")
-                url.set("https://github.com/IntellectualSites/PlotSquared/issues")
-            }
-
-            publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
         }
     }
 
@@ -180,6 +194,7 @@ subprojects {
 
         compileJava {
             options.compilerArgs.add("-parameters")
+            options.isDeprecation = true
             options.encoding = "UTF-8"
         }
 
@@ -202,18 +217,27 @@ subprojects {
     }
 }
 
+nexusPublishing {
+    this.repositories {
+        sonatype {
+            nexusUrl.set(URI.create("https://s01.oss.sonatype.org/service/local/"))
+            snapshotRepositoryUrl.set(URI.create("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
+        }
+    }
+}
+
 tasks.getByName<Jar>("jar") {
     enabled = false
 }
 
-val supportedVersions = listOf("1.19.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4", "1.21.5")
+val supportedVersions = listOf("1.19.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4")
 tasks {
     register("cacheLatestFaweArtifact") {
         val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL()
         val artifact = ((JsonSlurper().parse(lastSuccessfulBuildUrl) as Map<*, *>)["artifacts"] as List<*>)
                 .map { it as Map<*, *> }
                 .map { it["fileName"] as String }
-                .first { it -> it.contains("Paper") }
+                .first { it -> it.contains("Bukkit") }
         project.ext["faweArtifact"] = artifact
     }
 

gradle/libs.versions.toml

@@ -2,41 +2,41 @@
 # Platform expectations
 paper = "1.20.4-R0.1-SNAPSHOT"
 guice = "7.0.0"
-spotbugs = "4.9.3"
-checkerqual = "3.49.3"
+spotbugs = "4.9.1"
+checkerqual = "3.49.0"
 gson = "2.10"
 guava = "31.1-jre"
 snakeyaml = "2.0"
-adventure = "4.21.0"
-adventure-bukkit = "4.4.0"
+adventure = "4.19.0"
+adventure-bukkit = "4.3.4"
 log4j = "2.19.0"
 
 # Plugins
 worldedit = "7.2.20"
 fawe = "2.13.0"
 placeholderapi = "2.11.6"
-luckperms = "5.5"
-essentialsx = "2.21.1"
+luckperms = "5.4"
+essentialsx = "2.20.1"
 mvdwapi = "3.1.1"
 
 # Third party
 prtree = "2.0.1"
 aopalliance = "1.0"
 cloud-services = "1.8.4"
-arkitektonika = "2.1.4"
+arkitektonika = "2.1.3"
 squirrelid = "0.3.2"
-paster = "1.1.7"
+paster = "1.1.6"
 bstats = "3.1.0"
 paperlib = "1.0.8"
-informative-annotations = "1.6"
+informative-annotations = "1.5"
 vault = "1.7.1"
-serverlib = "2.3.7"
+serverlib = "2.3.6"
 
 # Gradle plugins
 shadow = "8.3.6"
 grgit = "4.1.1"
-spotless = "7.0.4"
-publish = "0.32.0"
+spotless = "7.0.2"
+nexus = "2.0.0"
 runPaper = "2.3.1"
 
 [libraries]
@@ -81,5 +81,5 @@ serverlib = { group = "dev.notmyfault.serverlib", name = "ServerLib", version.re
 shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
 grgit = { id = "org.ajoberstar.grgit", version.ref = "grgit" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
-publish = { id = "com.vanniktech.maven.publish", version.ref = "publish" }
+nexus = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexus" }
 runPaper = { id = "xyz.jpenilla.run-paper", version.ref = "runPaper" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH="\\\"\\\""
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -205,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell