chore: add annotations to suppress IDE warnings

.github/workflows/build-pr.yml

@@ -11,7 +11,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v2
+        uses: gradle/wrapper-validation-action@v1
       - name: Setup Java
         uses: actions/setup-java@v4
         with:

.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v2
+        uses: gradle/wrapper-validation-action@v1
       - name: Setup Java
         uses: actions/setup-java@v4
         with:

.github/workflows/release-drafter.yml

@@ -12,6 +12,6 @@ jobs:
     if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@v6
+      - uses: release-drafter/release-drafter@v5
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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

@@ -779,13 +779,6 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                 Iterator<Entity> iterator = entities.iterator();
                 while (iterator.hasNext()) {
                     Entity entity = iterator.next();
-                    if (PaperLib.isPaper() && "CUSTOM".equals(entity.getEntitySpawnReason().name())) {
-                        continue;
-                    }
-                    // Fallback for Spigot not having Entity#getEntitySpawnReason
-                    if (entity.getMetadata("ps_custom_spawned").stream().anyMatch(MetadataValue::asBoolean)) {
-                        continue;
-                    }
                     switch (entity.getType().toString()) {
                         case "EGG":
                         case "FISHING_HOOK":
@@ -874,7 +867,8 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
                                     if (livingEntity.isLeashed() && !Settings.Enabled_Components.KILL_OWNED_ROAD_MOBS) {
                                         continue;
                                     }
-                                    if (entity.hasMetadata("keep")) {
+                                    List<MetadataValue> keep = entity.getMetadata("keep");
+                                    if (!keep.isEmpty()) {
                                         continue;
                                     }
 

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

@@ -19,7 +19,6 @@
 package com.plotsquared.bukkit.listener;
 
 import com.google.inject.Inject;
-import com.plotsquared.bukkit.BukkitPlatform;
 import com.plotsquared.bukkit.player.BukkitPlayer;
 import com.plotsquared.bukkit.util.BukkitEntityUtil;
 import com.plotsquared.bukkit.util.BukkitUtil;
@@ -42,7 +41,6 @@ import com.plotsquared.core.util.EventDispatcher;
 import com.plotsquared.core.util.PlotFlagUtil;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.world.block.BlockType;
-import io.papermc.lib.PaperLib;
 import org.bukkit.Material;
 import org.bukkit.Particle;
 import org.bukkit.World;
@@ -80,18 +78,15 @@ import java.util.List;
 @SuppressWarnings("unused")
 public class EntityEventListener implements Listener {
 
-    private final BukkitPlatform platform;
     private final PlotAreaManager plotAreaManager;
     private final EventDispatcher eventDispatcher;
     private float lastRadius;
 
     @Inject
     public EntityEventListener(
-            final @NonNull BukkitPlatform platform,
             final @NonNull PlotAreaManager plotAreaManager,
             final @NonNull EventDispatcher eventDispatcher
     ) {
-        this.platform = platform;
         this.plotAreaManager = plotAreaManager;
         this.eventDispatcher = eventDispatcher;
     }
@@ -175,18 +170,7 @@ public class EntityEventListener implements Listener {
                     return;
                 }
             }
-            case "CUSTOM" -> {
+            case "BUILD_IRONGOLEM", "BUILD_SNOWMAN", "BUILD_WITHER", "CUSTOM" -> {
-                if (!area.isSpawnCustom()) {
-                    event.setCancelled(true);
-                    return;
-                }
-                // No need to clutter metadata if running paper
-                if (!PaperLib.isPaper()) {
-                    entity.setMetadata("ps_custom_spawned", new FixedMetadataValue(this.platform, true));
-                }
-                return; // Don't cancel if mob spawning is disabled
-            }
-            case "BUILD_IRONGOLEM", "BUILD_SNOWMAN", "BUILD_WITHER" -> {
                 if (!area.isSpawnCustom()) {
                     event.setCancelled(true);
                     return;

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

@@ -120,14 +120,9 @@ public class EntitySpawnListener implements Listener {
         Entity entity = event.getEntity();
         Location location = BukkitUtil.adapt(entity.getLocation());
         PlotArea area = location.getPlotArea();
-        if (!location.isPlotArea() || area == null) {
+        if (!location.isPlotArea()) {
             return;
         }
-        if (PaperLib.isPaper()) {
-            if (area.isSpawnCustom() && "CUSTOM".equals(entity.getEntitySpawnReason().name())) {
-                return;
-            }
-        }
         Plot plot = location.getOwnedPlotAbs();
         EntityType type = entity.getType();
         if (plot == null) {

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

@@ -40,7 +40,6 @@ import io.papermc.lib.PaperLib;
 import net.kyori.adventure.audience.Audience;
 import org.bukkit.GameMode;
 import org.bukkit.Sound;
-import org.bukkit.SoundCategory;
 import org.bukkit.WeatherType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
@@ -52,6 +51,7 @@ import org.bukkit.potion.PotionEffectType;
 import org.checkerframework.checker.index.qual.NonNegative;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
+import java.util.Arrays;
 import java.util.Set;
 import java.util.UUID;
 
@@ -309,21 +309,18 @@ public class BukkitPlayer extends PlotPlayer<Player> {
     @Override
     public void playMusic(final @NonNull Location location, final @NonNull ItemType id) {
         if (id == ItemTypes.AIR) {
-            if (PlotSquared.platform().serverVersion()[1] >= 19) {
+            // Let's just stop all the discs because why not?
-                player.stopSound(SoundCategory.MUSIC);
+            for (final Sound sound : Arrays.stream(Sound.values())
-                return;
+                    .filter(sound -> sound.name().contains("DISC")).toList()) {
+                player.stopSound(sound);
             }
-            // 1.18 and downwards require a specific Sound to stop (even tho the packet does not??)
+            // this.player.playEffect(BukkitUtil.getLocation(location), Effect.RECORD_PLAY, Material.AIR);
-            for (final Sound sound : Sound.values()) {
+        } else {
-                if (sound.name().startsWith("MUSIC_DISC")) {
+            // this.player.playEffect(BukkitUtil.getLocation(location), Effect.RECORD_PLAY, id.to(Material.class));
-                    this.player.stopSound(sound, SoundCategory.MUSIC);
+            this.player.playSound(BukkitUtil.adapt(location),
-                }
+                    Sound.valueOf(BukkitAdapter.adapt(id).name()), Float.MAX_VALUE, 1f
-            }
+            );
-            return;
         }
-        this.player.playSound(BukkitUtil.adapt(location), Sound.valueOf(BukkitAdapter.adapt(id).name()),
-                SoundCategory.MUSIC, 1f, 1f
-        );
     }
 
     @SuppressWarnings("deprecation") // Needed for Spigot compatibility

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

@@ -21,9 +21,8 @@ package com.plotsquared.core.command;
 import com.google.inject.Inject;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
-import com.plotsquared.core.events.PlayerBuyPlotEvent;
+import com.plotsquared.core.events.PlotFlagRemoveEvent;
 import com.plotsquared.core.events.Result;
-import com.plotsquared.core.player.OfflinePlotPlayer;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
@@ -89,30 +88,22 @@ public class Buy extends Command {
                 TranslatableCaption.of("permission.cant_claim_more_plots"),
                 TagResolver.resolver("amount", Tag.inserting(Component.text(player.getAllowedPlots())))
         );
-        double priceFlag = plot.getFlag(PriceFlag.class);
+        double price = plot.getFlag(PriceFlag.class);
-        if (priceFlag <= 0) {
+        if (price <= 0) {
             throw new CommandException(TranslatableCaption.of("economy.not_for_sale"));
         }
         checkTrue(
                 this.econHandler.isSupported(),
                 TranslatableCaption.of("economy.vault_or_consumer_null")
         );
-
+        checkTrue(
-        PlayerBuyPlotEvent event = this.eventDispatcher.callPlayerBuyPlot(player, plot, priceFlag);
+                this.econHandler.getMoney(player) >= price,
-        if (event.getEventResult() == Result.DENY) {
+                TranslatableCaption.of("economy.cannot_afford_plot"),
-            throw new CommandException(TranslatableCaption.of("economy.cannot_buy_blocked"));
+                TagResolver.builder()
-        }
+                        .tag("money", Tag.inserting(Component.text(this.econHandler.format(price))))
-
+                        .tag("balance", Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(player)))))
-        double price = event.getEventResult() == Result.FORCE ? 0 : event.price();
+                        .build()
-        if (this.econHandler.getMoney(player) < price) {
+        );
-            throw new CommandException(
-                    TranslatableCaption.of("economy.cannot_afford_plot"),
-                    TagResolver.builder()
-                            .tag("money", Tag.inserting(Component.text(this.econHandler.format(price))))
-                            .tag("balance", Tag.inserting(Component.text(this.econHandler.format(this.econHandler.getMoney(player)))))
-                            .build()
-            );
-        }
         this.econHandler.withdrawMoney(player, price);
         // Failure
         // Success
@@ -122,8 +113,7 @@ public class Buy extends Command {
                     TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
             );
 
-            OfflinePlotPlayer previousOwner = PlotSquared.platform().playerManager().getOfflinePlayer(plot.getOwnerAbs());
+            this.econHandler.depositMoney(PlotSquared.platform().playerManager().getOfflinePlayer(plot.getOwnerAbs()), price);
-            this.econHandler.depositMoney(previousOwner, price);
 
             PlotPlayer<?> owner = PlotSquared.platform().playerManager().getPlayerIfExists(plot.getOwnerAbs());
             if (owner != null) {
@@ -137,8 +127,9 @@ public class Buy extends Command {
                 );
             }
             PlotFlag<?, ?> plotFlag = plot.getFlagContainer().getFlag(PriceFlag.class);
-            if (this.eventDispatcher.callFlagRemove(plotFlag, plot).getEventResult() != Result.DENY) {
+            PlotFlagRemoveEvent event = this.eventDispatcher.callFlagRemove(plotFlag, plot);
-                plot.removeFlag(plotFlag);
+            if (event.getEventResult() != Result.DENY) {
+                plot.removeFlag(event.getFlag());
             }
             plot.setOwner(player.getUUID());
             plot.getPlotModificationManager().setSign(player.getName());
@@ -146,7 +137,6 @@ public class Buy extends Command {
                     TranslatableCaption.of("working.claimed"),
                     TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
             );
-            this.eventDispatcher.callPostPlayerBuyPlot(player, previousOwner, plot, price);
             whenDone.run(Buy.this, CommandResult.SUCCESS);
         }, () -> {
             this.econHandler.depositMoney(player, price);

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

@@ -135,7 +135,6 @@ public class Clear extends Command {
                                     .tag("plot", Tag.inserting(Component.text(plot.getId().toString())))
                                     .build()
                     );
-                    this.eventDispatcher.callPostPlotClear(player, plot);
                 }));
                 if (!result) {
                     player.sendMessage(TranslatableCaption.of("errors.wait_for_timer"));

Core/src/main/java/com/plotsquared/core/events/CancellablePlotEvent.java

@@ -18,34 +18,17 @@
  */
 package com.plotsquared.core.events;
 
-
-import org.checkerframework.checker.nullness.qual.Nullable;
-
 /**
  * PlotSquared event with {@link Result} to cancel, force, or allow.
  */
 public interface CancellablePlotEvent {
 
-    /**
+    Result getEventResult();
-     * The currently set {@link Result} for this event (as set by potential previous event listeners).
-     *
-     * @return the current result.
-     */
-    @Nullable Result getEventResult();
 
-    /**
+    void setEventResult(Result eventResult);
-     * Set the {@link Result} for this event.
-     *
-     * @param eventResult the new result.
-     */
-    void setEventResult(@Nullable Result eventResult);
 
-    /**
-     * @deprecated No usage and not null-safe
-     */
-    @Deprecated(since = "7.3.2")
     default int getEventResultRaw() {
-        return getEventResult() != null ? getEventResult().getValue() : -1;
+        return getEventResult().getValue();
     }
 
 }

Core/src/main/java/com/plotsquared/core/events/PlayerBuyPlotEvent.java

@@ -1,88 +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.events;
-
-import com.plotsquared.core.player.PlotPlayer;
-import com.plotsquared.core.plot.Plot;
-import org.checkerframework.checker.index.qual.NonNegative;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
-/**
- * Called when a user attempts to buy a plot.
- * <p>
- * Setting the {@link #setEventResult(Result) Result} to {@link Result#FORCE} ignores the price and players account balance and does not charge the
- * player anything. {@link Result#DENY} blocks the purchase completely, {@link Result#ACCEPT} and {@code null} do not modify
- * the behaviour.
- * <p>
- * Setting the {@link #setPrice(double) price} to {@code 0} makes the plot practically free.
- *
- * @since 7.3.2
- */
-public class PlayerBuyPlotEvent extends PlotPlayerEvent implements CancellablePlotEvent {
-
-    private Result result;
-    private double price;
-
-    public PlayerBuyPlotEvent(final PlotPlayer<?> plotPlayer, final Plot plot, @NonNegative final double price) {
-        super(plotPlayer, plot);
-        this.price = price;
-    }
-
-
-    /**
-     * Sets the price required to buy the plot.
-     *
-     * @param price the new price.
-     * @since 7.3.2
-     */
-    public void setPrice(@NonNegative final double price) {
-        //noinspection ConstantValue - the annotation does not ensure a non-negative runtime value
-        if (price < 0) {
-            throw new IllegalArgumentException("price must be non-negative");
-        }
-        this.price = price;
-    }
-
-    /**
-     * Returns the currently set price required to buy the plot.
-     *
-     * @return the price.
-     * @since 7.3.2
-     */
-    public @NonNegative double price() {
-        return price;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setEventResult(@Nullable final Result eventResult) {
-        this.result = eventResult;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public @Nullable Result getEventResult() {
-        return this.result;
-    }
-
-}

Core/src/main/java/com/plotsquared/core/events/post/PostPlayerBuyPlotEvent.java

@@ -1,64 +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.events.post;
-
-import com.plotsquared.core.events.PlotPlayerEvent;
-import com.plotsquared.core.player.OfflinePlotPlayer;
-import com.plotsquared.core.player.PlotPlayer;
-import com.plotsquared.core.plot.Plot;
-import org.checkerframework.checker.index.qual.NonNegative;
-
-/**
- * Called after a player has successfully bought a plot.
- *
- * @since 7.3.2
- */
-public class PostPlayerBuyPlotEvent extends PlotPlayerEvent {
-
-    private final OfflinePlotPlayer previousOwner;
-    private final double price;
-
-    public PostPlayerBuyPlotEvent(
-            final PlotPlayer<?> plotPlayer, final OfflinePlotPlayer previousOwner, final Plot plot,
-            @NonNegative final double price
-    ) {
-        super(plotPlayer, plot);
-        this.previousOwner = previousOwner;
-        this.price = price;
-    }
-
-    /**
-     * The previous owner of the bought plot.
-     *
-     * @return the previous owner.
-     */
-    public OfflinePlotPlayer previousOwner() {
-        return previousOwner;
-    }
-
-    /**
-     * Returns the price after potential modifications by {@link com.plotsquared.core.events.PlayerBuyPlotEvent}.
-     *
-     * @return the price the player had to pay to buy the plot.
-     */
-    public double price() {
-        return price;
-    }
-
-}

Core/src/main/java/com/plotsquared/core/events/post/PostPlotClearEvent.java

@@ -1,43 +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.events.post;
-
-import com.plotsquared.core.events.PlotPlayerEvent;
-import com.plotsquared.core.player.PlotPlayer;
-import com.plotsquared.core.plot.Plot;
-
-/**
- * Called after a {@link Plot} was cleared.
- *
- * @since 7.3.2
- */
-public class PostPlotClearEvent extends PlotPlayerEvent {
-
-
-    /**
-     * Instantiate a new PostPlotClearEvent.
-     *
-     * @param plotPlayer The {@link PlotPlayer} that initiated the clear.
-     * @param plot       The clearing plot.
-     */
-    public PostPlotClearEvent(final PlotPlayer<?> plotPlayer, final Plot plot) {
-        super(plotPlayer, plot);
-    }
-
-}

Core/src/main/java/com/plotsquared/core/util/EventDispatcher.java

@@ -25,7 +25,6 @@ import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.events.PlayerAutoPlotEvent;
 import com.plotsquared.core.events.PlayerAutoPlotsChosenEvent;
-import com.plotsquared.core.events.PlayerBuyPlotEvent;
 import com.plotsquared.core.events.PlayerClaimPlotEvent;
 import com.plotsquared.core.events.PlayerEnterPlotEvent;
 import com.plotsquared.core.events.PlayerLeavePlotEvent;
@@ -50,9 +49,7 @@ import com.plotsquared.core.events.PlotUnlinkEvent;
 import com.plotsquared.core.events.RemoveRoadEntityEvent;
 import com.plotsquared.core.events.TeleportCause;
 import com.plotsquared.core.events.post.PostPlayerAutoPlotEvent;
-import com.plotsquared.core.events.post.PostPlayerBuyPlotEvent;
 import com.plotsquared.core.events.post.PostPlotChangeOwnerEvent;
-import com.plotsquared.core.events.post.PostPlotClearEvent;
 import com.plotsquared.core.events.post.PostPlotDeleteEvent;
 import com.plotsquared.core.events.post.PostPlotMergeEvent;
 import com.plotsquared.core.events.post.PostPlotUnlinkEvent;
@@ -60,7 +57,6 @@ import com.plotsquared.core.listener.PlayerBlockEventType;
 import com.plotsquared.core.location.Direction;
 import com.plotsquared.core.location.Location;
 import com.plotsquared.core.permissions.Permission;
-import com.plotsquared.core.player.OfflinePlotPlayer;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
@@ -183,12 +179,6 @@ public class EventDispatcher {
         return event;
     }
 
-    public PostPlotClearEvent callPostPlotClear(PlotPlayer<?> player, Plot plot) {
-        PostPlotClearEvent event = new PostPlotClearEvent(player, plot);
-        callEvent(event);
-        return event;
-    }
-
     public PlotDeleteEvent callDelete(Plot plot) {
         PlotDeleteEvent event = new PlotDeleteEvent(plot);
         callEvent(event);
@@ -325,17 +315,6 @@ public class EventDispatcher {
         return event;
     }
 
-    public PlayerBuyPlotEvent callPlayerBuyPlot(PlotPlayer<?> player, Plot plot, double price) {
-        PlayerBuyPlotEvent event = new PlayerBuyPlotEvent(player, plot, price);
-        eventBus.post(event);
-        return event;
-    }
-
-    public void callPostPlayerBuyPlot(PlotPlayer<?> player, OfflinePlotPlayer previousOwner, Plot plot,
-                                      double price) {
-        eventBus.post(new PostPlayerBuyPlotEvent(player, previousOwner, plot, price));
-    }
-
     public void doJoinTask(final PlotPlayer<?> player) {
         if (player == null) {
             return; //possible future warning message to figure out where we are retrieving null

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

@@ -125,7 +125,6 @@
   "economy.added_balance": "<prefix><gold><money> </gold><gray>has been added to your balance.</gray>",
   "economy.removed_balance": "<prefix><gold><money> </gold><gray>has been taken from your balance.</gray>",
   "economy.removed_granted_plot": "<prefix><gray>You used <used_grants> plot grant(s), you've got </gray><gold><remaining_grants></gold> <gray>left.</gray>",
-  "economy.cannot_buy_blocked":  "<prefix><red>You are not allowed to buy this plot.</red>",
   "setup.choose_generator": "<gold>What generator do you want?</gold>",
   "setup.setup_not_started": "<prefix><gold>No setup started.</gold>",
   "setup.setup_init": "<prefix><gold>Usage: </gold><gray>/plot setup <value></gray>",

build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 }
 
 group = "com.intellectualsites.plotsquared"
-version = "7.3.3"
+version = "7.3.2-SNAPSHOT"
 
 if (!File("$rootDir/.git").exists()) {
     logger.lifecycle("""
@@ -79,8 +79,8 @@ subprojects {
 
     dependencies {
         // Tests
-        testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
+        testImplementation("org.junit.jupiter:junit-jupiter:5.10.1")
-        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.10.2")
+        testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.10.1")
     }
 
     plugins.withId("java") {

gradle/libs.versions.toml

@@ -35,9 +35,9 @@ serverlib = "2.3.4"
 # Gradle plugins
 shadow = "8.1.1"
 grgit = "4.1.1"
-spotless = "6.25.0"
+spotless = "6.23.3"
 nexus = "1.3.0"
-runPaper = "2.2.3"
+runPaper = "2.2.2"
 
 [libraries]
 # Platform expectations

gradle/wrapper/gradle-wrapper.properties

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

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo. 1>&2
+echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo. 1>&2
+echo.
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation. 1>&2
+echo location of your Java installation.
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo. 1>&2
+echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo. 1>&2
+echo.
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation. 1>&2
+echo location of your Java installation.
 
 goto fail