fix: don't allow teleport to denied plots

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.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 publishToSonatype closeAndReleaseSonatypeStagingRepository
+        run: ./gradlew publishAndReleaseToMavenCentral --no-configuration-cache
         env:
-          ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
-          ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.CENTRAL_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.CENTRAL_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 publishToSonatype
+        run: ./gradlew publishAllPublicationsToMavenCentralRepository
         env:
-          ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
-          ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.CENTRAL_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.CENTRAL_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/content/repositories/placeholderapi/")
+        url = uri("https://repo.extendedclip.com/releases/")
     }
 
     maven {

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

@@ -134,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(blocks.get(0).getLocation());
+        Location location = BukkitUtil.adapt(block.getLocation());
 
         PlotArea area = location.getPlotArea();
         if (area == null) {

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

@@ -593,14 +593,18 @@ public class PlayerEventListener implements Listener {
                     return;
                 }
                 Plot plot = area.getPlot(location);
-                if (plot != null) {
+                if (plot != null && !plot.equals(lastPlot)) {
                     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)))) {
-                        plotListener.plotEntry(pp, plot);
+                        // 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);
+                        }
                     } else {
                         pp.sendMessage(
                                 TranslatableCaption.of("deny.no_enter"),

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

@@ -44,8 +44,13 @@ 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.
  */
@@ -147,8 +152,7 @@ public class MainCommand extends Command {
                 try {
                     injector.getInstance(command);
                 } catch (final Exception e) {
-                    LOGGER.error("Failed to register command {}", command.getCanonicalName());
-                    e.printStackTrace();
+                    LOGGER.error("Failed to register command {}", command.getCanonicalName(), e);
                 }
             }
 
@@ -236,111 +240,171 @@ public class MainCommand extends Command {
             RunnableVal3<Command, Runnable, Runnable> confirm,
             RunnableVal2<Command, CommandResult> whenDone
     ) {
-        // 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);
+        prepareArguments(new CommandExecutionData(player, args, confirm, whenDone, null))
+                .thenCompose(executionData -> {
+                    if (executionData.isEmpty()) {
+                        return CompletableFuture.completedFuture(false);
                     }
-                    try (final MetaDataAccess<Plot> plotMetaDataAccess
-                                 = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
-                        plot = plotMetaDataAccess.get().orElse(null);
-                        plotMetaDataAccess.set(newPlot);
-                    }
-                    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();
-                            }
+                    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"));
                         }
-                    };
-                    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);
-                }
-            }
-        }
+                    } finally {
+                        if (data.postCommandData() != null) {
+                            resetCommandScope(data.player(), data.postCommandData());
+                        }
+                    }
+                    return CompletableFuture.completedFuture(true);
+                });
         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/player/PlotPlayer.java

@@ -444,7 +444,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
 
     /**
      * Get this player's UUID.
-     * === !IMPORTANT ===<br>
+     * <p>=== !IMPORTANT ===</p>
      * 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)
      *

build.gradle.kts

@@ -1,5 +1,6 @@
 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
@@ -7,13 +8,12 @@ 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.nexus)
+    alias(libs.plugins.publish)
 
     eclipse
     idea
@@ -22,7 +22,7 @@ plugins {
 }
 
 group = "com.intellectualsites.plotsquared"
-version = "7.5.2-SNAPSHOT"
+version = "7.5.3-SNAPSHOT"
 
 if (!File("$rootDir/.git").exists()) {
     logger.lifecycle("""
@@ -41,16 +41,6 @@ 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")
@@ -68,7 +58,7 @@ subprojects {
     apply {
         plugin<JavaPlugin>()
         plugin<JavaLibraryPlugin>()
-        plugin<MavenPublishPlugin>()
+        plugin<com.vanniktech.maven.publish.MavenPublishPlugin>()
         plugin<ShadowPlugin>()
         plugin<SpotlessPlugin>()
         plugin<SigningPlugin>()
@@ -79,8 +69,8 @@ subprojects {
 
     dependencies {
         // Tests
-        testImplementation("org.junit.jupiter:junit-jupiter:5.12.0")
-        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.12.0")
+        testImplementation("org.junit.jupiter:junit-jupiter:5.12.2")
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.12.2")
     }
 
     plugins.withId("java") {
@@ -107,11 +97,6 @@ subprojects {
         }
     }
 
-    java {
-        withSourcesJar()
-        withJavadocJar()
-    }
-
     val javaComponent = components["java"] as AdhocComponentWithVariants
     javaComponent.withVariantsFromConfiguration(configurations["shadowRuntimeElements"]) {
         skip()
@@ -127,66 +112,67 @@ subprojects {
         }
     }
 
-    publishing {
-        publications {
-            create<MavenPublication>("maven") {
-                from(components["java"])
+    mavenPublishing {
+        coordinates(
+            groupId = "$group",
+            artifactId = project.name,
+            version = "${project.version}",
+        )
 
-                pom {
+        pom {
+            name.set(project.name)
+            description.set("PlotSquared, a land and world management plugin for Minecraft.")
+            url.set("https://github.com/IntellectualSites/PlotSquared")
 
-                    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")
-                    }
+            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")
+            }
+
+            publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
         }
     }
 
@@ -194,7 +180,6 @@ subprojects {
 
         compileJava {
             options.compilerArgs.add("-parameters")
-            options.isDeprecation = true
             options.encoding = "UTF-8"
         }
 
@@ -217,27 +202,18 @@ 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")
+val supportedVersions = listOf("1.19.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4", "1.21.5")
 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("Bukkit") }
+                .first { it -> it.contains("Paper") }
         project.ext["faweArtifact"] = artifact
     }
 

gradle/libs.versions.toml

@@ -2,13 +2,13 @@
 # Platform expectations
 paper = "1.20.4-R0.1-SNAPSHOT"
 guice = "7.0.0"
-spotbugs = "4.9.1"
-checkerqual = "3.49.0"
+spotbugs = "4.9.3"
+checkerqual = "3.49.3"
 gson = "2.10"
 guava = "31.1-jre"
 snakeyaml = "2.0"
-adventure = "4.19.0"
-adventure-bukkit = "4.3.4"
+adventure = "4.21.0"
+adventure-bukkit = "4.4.0"
 log4j = "2.19.0"
 
 # Plugins
@@ -16,27 +16,27 @@ worldedit = "7.2.20"
 fawe = "2.13.0"
 placeholderapi = "2.11.6"
 luckperms = "5.4"
-essentialsx = "2.20.1"
+essentialsx = "2.21.0"
 mvdwapi = "3.1.1"
 
 # Third party
 prtree = "2.0.1"
 aopalliance = "1.0"
 cloud-services = "1.8.4"
-arkitektonika = "2.1.3"
+arkitektonika = "2.1.4"
 squirrelid = "0.3.2"
-paster = "1.1.6"
+paster = "1.1.7"
 bstats = "3.1.0"
 paperlib = "1.0.8"
-informative-annotations = "1.5"
+informative-annotations = "1.6"
 vault = "1.7.1"
-serverlib = "2.3.6"
+serverlib = "2.3.7"
 
 # Gradle plugins
 shadow = "8.3.6"
 grgit = "4.1.1"
-spotless = "7.0.2"
-nexus = "2.0.0"
+spotless = "7.0.3"
+publish = "0.32.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" }
-nexus = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexus" }
+publish = { id = "com.vanniktech.maven.publish", version.ref = "publish" }
 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.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # 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, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_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" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

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