Move event to versioned class

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

@@ -37,6 +37,7 @@ import com.plotsquared.bukkit.listener.EntityEventListener;
 import com.plotsquared.bukkit.listener.EntitySpawnListener;
 import com.plotsquared.bukkit.listener.PaperListener;
 import com.plotsquared.bukkit.listener.PlayerEventListener;
+import com.plotsquared.bukkit.listener.PlayerEventListener120;
 import com.plotsquared.bukkit.listener.ProjectileEventListener;
 import com.plotsquared.bukkit.listener.ServerListener;
 import com.plotsquared.bukkit.listener.SingleWorldListener;
@@ -50,7 +51,6 @@ import com.plotsquared.bukkit.util.BukkitUtil;
 import com.plotsquared.bukkit.util.BukkitWorld;
 import com.plotsquared.bukkit.util.SetGenCB;
 import com.plotsquared.bukkit.util.TranslationUpdateManager;
-import com.plotsquared.bukkit.util.UpdateUtility;
 import com.plotsquared.bukkit.util.task.BukkitTaskManager;
 import com.plotsquared.bukkit.util.task.PaperTimeConverter;
 import com.plotsquared.bukkit.util.task.SpigotTimeConverter;
@@ -303,9 +303,11 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
 
         this.serverLocale = Locale.forLanguageTag(Settings.Enabled_Components.DEFAULT_LOCALE);
 
+        /* TODO Enable update checker before v7 is released to GA
         if (PremiumVerification.isPremium() && Settings.Enabled_Components.UPDATE_NOTIFICATIONS) {
             injector.getInstance(UpdateUtility.class).updateChecker();
         }
+         */
 
         if (PremiumVerification.isPremium()) {
             LOGGER.info("PlotSquared version licensed to Spigot user {}", getUserID());
@@ -357,6 +359,9 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
 
         if (Settings.Enabled_Components.EVENTS) {
             getServer().getPluginManager().registerEvents(injector().getInstance(PlayerEventListener.class), this);
+            if ((serverVersion()[1] == 20 && serverVersion()[2] >= 1) || serverVersion()[1] > 20) {
+                getServer().getPluginManager().registerEvents(injector().getInstance(PlayerEventListener120.class), this);
+            }
             getServer().getPluginManager().registerEvents(injector().getInstance(BlockEventListener.class), this);
             if (serverVersion()[1] >= 17) {
                 getServer().getPluginManager().registerEvents(injector().getInstance(BlockEventListener117.class), this);

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

@@ -1872,5 +1872,4 @@ public class PlayerEventListener implements Listener {
             event.setCancelled(true);
         }
     }
-
 }

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

@@ -0,0 +1,62 @@
+/*
+ * 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.listener;
+
+import org.bukkit.block.Sign;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerSignOpenEvent;
+import com.plotsquared.bukkit.util.BukkitUtil;
+import com.plotsquared.core.location.Location;
+import com.plotsquared.core.plot.Plot;
+import com.plotsquared.core.plot.PlotArea;
+import com.plotsquared.core.plot.flag.implementations.EditSignFlag;
+import com.plotsquared.core.util.PlotFlagUtil;
+
+/**
+ * For events since 1.20.1
+ */
+public class PlayerEventListener120 implements Listener {
+
+    @EventHandler(ignoreCancelled = true)
+    @SuppressWarnings({"removal", "UnstableApiUsage"}) // thanks Paper, thanks Spigot
+    public void onPlayerSignOpenEvent(PlayerSignOpenEvent event) {
+        Sign sign = event.getSign();
+        Location location = BukkitUtil.adapt(sign.getLocation());
+        PlotArea area = location.getPlotArea();
+        if (area == null) {
+            return;
+        }
+        Plot plot = location.getOwnedPlot();
+        if (plot == null) {
+            if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, EditSignFlag.class, false)) {
+                event.setCancelled(true);
+            }
+            return;
+        }
+        if (plot.isAdded(event.getPlayer().getUniqueId())) {
+            return; // allow for added players
+        }
+        if (!plot.getFlag(EditSignFlag.class)) {
+            plot.debug(event.getPlayer().getName() + " could not edit the sign because of edit-sign = false");
+            event.setCancelled(true);
+        }
+    }
+
+}

Bukkit/src/main/java/com/plotsquared/bukkit/util/TranslationUpdateManager.java

@@ -44,10 +44,6 @@ public class TranslationUpdateManager {
         String minheightReplacement = "minheight";
         String maxHeight = "maxHeight";
         String maxheightReplacement = "maxheight";
-        String usedGrants = "usedGrants";
-        String usedGrantsReplacement = "used_grants";
-        String remainingGrants = "remainingGrants";
-        String rremainingGrantsReplacement = "remaining_grants";
 
         try (Stream<Path> paths = Files.walk(Paths.get(PlotSquared.platform().getDirectory().toPath().resolve("lang").toUri()))) {
             paths
@@ -57,8 +53,6 @@ public class TranslationUpdateManager {
                         replaceInFile(p, suggestCommand, suggestCommandReplacement);
                         replaceInFile(p, minHeight, minheightReplacement);
                         replaceInFile(p, maxHeight, maxheightReplacement);
-                        replaceInFile(p, usedGrants, usedGrantsReplacement);
-                        replaceInFile(p, remainingGrants, rremainingGrantsReplacement);
                     });
         }
     }

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

@@ -1281,7 +1281,7 @@ public class PlotSquared {
     }
 
     /**
-     * Set up the database connection.
+     * Setup the database connection.
      */
     public void setupDatabase() {
         try {

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

@@ -131,8 +131,8 @@ public class Auto extends SubCommand {
                         player.sendMessage(
                                 TranslatableCaption.of("economy.removed_granted_plot"),
                                 TagResolver.builder()
-                                        .tag("used_grants", Tag.inserting(Component.text(grantedPlots - left)))
-                                        .tag("remaining_grants", Tag.inserting(Component.text(left)))
+                                        .tag("usedGrants", Tag.inserting(Component.text(grantedPlots - left)))
+                                        .tag("remainingGrants", Tag.inserting(Component.text(left)))
                                         .build()
                         );
                     }

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

@@ -186,8 +186,8 @@ public class Claim extends SubCommand {
                 player.sendMessage(
                         TranslatableCaption.of("economy.removed_granted_plot"),
                         TagResolver.builder()
-                                .tag("used_grants", Tag.inserting(Component.text(grants - 1)))
-                                .tag("remaining_grants", Tag.inserting(Component.text(grants)))
+                                .tag("usedGrants", Tag.inserting(Component.text(grants - 1)))
+                                .tag("remainingGrants", Tag.inserting(Component.text(grants)))
                                 .build()
                 );
             }

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

@@ -96,7 +96,6 @@ public class DebugRoadRegen extends SubCommand {
         PlotArea area = location.getPlotArea();
         if (area == null) {
             player.sendMessage(TranslatableCaption.of("errors.not_in_plot_world"));
-            return false;
         }
         Plot plot = player.getCurrentPlot();
         if (plot == null) {

Core/src/main/java/com/plotsquared/core/generator/HybridUtils.java

@@ -77,10 +77,6 @@ public class HybridUtils {
     private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + HybridUtils.class.getSimpleName());
     private static final BlockState AIR = BlockTypes.AIR.getDefaultState();
 
-    /**
-     * Deprecated and likely to be removed in a future release.
-     */
-    @Deprecated(forRemoval = true, since = "7.0.0")
     public static HybridUtils manager;
     public static Set<BlockVector2> regions;
     public static int height;

Core/src/main/java/com/plotsquared/core/plot/flag/GlobalFlagContainer.java

@@ -41,6 +41,7 @@ import com.plotsquared.core.plot.flag.implementations.DeviceInteractFlag;
 import com.plotsquared.core.plot.flag.implementations.DisablePhysicsFlag;
 import com.plotsquared.core.plot.flag.implementations.DoneFlag;
 import com.plotsquared.core.plot.flag.implementations.DropProtectionFlag;
+import com.plotsquared.core.plot.flag.implementations.EditSignFlag;
 import com.plotsquared.core.plot.flag.implementations.EntityCapFlag;
 import com.plotsquared.core.plot.flag.implementations.EntityChangeBlockFlag;
 import com.plotsquared.core.plot.flag.implementations.ExplosionFlag;
@@ -151,6 +152,7 @@ public final class GlobalFlagContainer extends FlagContainer {
         this.addFlag(DeviceInteractFlag.DEVICE_INTERACT_FALSE);
         this.addFlag(DisablePhysicsFlag.DISABLE_PHYSICS_FALSE);
         this.addFlag(DropProtectionFlag.DROP_PROTECTION_FALSE);
+        this.addFlag(EditSignFlag.EDIT_SIGN_FALSE);
         this.addFlag(EntityChangeBlockFlag.ENTITY_CHANGE_BLOCK_FALSE);
         this.addFlag(ExplosionFlag.EXPLOSION_FALSE);
         this.addFlag(ForcefieldFlag.FORCEFIELD_FALSE);

Core/src/main/java/com/plotsquared/core/plot/flag/implementations/EditSignFlag.java

@@ -0,0 +1,38 @@
+/*
+ * 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.plot.flag.implementations;
+
+import com.plotsquared.core.configuration.caption.TranslatableCaption;
+import com.plotsquared.core.plot.flag.types.BooleanFlag;
+import org.checkerframework.checker.nullness.qual.NonNull;
+
+public class EditSignFlag extends BooleanFlag<EditSignFlag> {
+    public static final EditSignFlag EDIT_SIGN_TRUE = new EditSignFlag(true);
+    public static final EditSignFlag EDIT_SIGN_FALSE = new EditSignFlag(false);
+
+    private EditSignFlag(final boolean value) {
+        super(value, TranslatableCaption.of("flags.flag_description_edit_sign"));
+    }
+
+    @Override
+    protected EditSignFlag flagOf(@NonNull final Boolean value) {
+        return value ? EDIT_SIGN_TRUE : EDIT_SIGN_FALSE;
+    }
+
+}

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

@@ -124,7 +124,7 @@
   "economy.cannot_afford_merge": "<prefix><red>You cannot afford to merge the plots. It costs <gold><money></gold>.</red>",
   "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.removed_granted_plot": "<prefix><gray>You used <usedGrants> plot grant(s), you've got </gray><gold><remainingGrants></gold> <gray>left.</gray>",
   "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>",
@@ -554,6 +554,7 @@
   "flags.flag_description_device_interact": "<gray>Set to `true` to allow devices to be interacted with in the plot.</gray>",
   "flags.flag_description_disable_physics": "<gray>Set to `true` to disable block physics in the plot.</gray>",
   "flags.flag_description_drop_protection": "<gray>Set to `true` to prevent dropped items from being picked up by non-members of the plot.</gray>",
+  "flags.flag_description_edit_sign": "<gray>Set to `true` to allow editing signs in the plot.</gray>",
   "flags.flag_description_feed": "<gray>Specify an interval in seconds and an optional amount by which the players will be fed (amount is 1 by default).</gray>",
   "flags.flag_description_forcefield": "<gray>Set to `true` to enable member forcefield in the plot.</gray>",
   "flags.flag_description_grass_grow": "<gray>Set to `false` to prevent grass from growing within the plot.</gray>",

build.gradle.kts

@@ -1,7 +1,7 @@
 import com.diffplug.gradle.spotless.SpotlessPlugin
 import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
-import java.net.URI
 import xyz.jpenilla.runpaper.task.RunServer
+import java.net.URI
 
 plugins {
     java
@@ -21,7 +21,7 @@ plugins {
 }
 
 group = "com.intellectualsites.plotsquared"
-version = "7.0.0"
+version = "7.0.0-SNAPSHOT"
 
 if (!File("$rootDir/.git").exists()) {
     logger.lifecycle("""
@@ -218,16 +218,18 @@ tasks.getByName<Jar>("jar") {
     enabled = false
 }
 
-val supportedVersions = listOf("1.16.5", "1.17", "1.17.1", "1.18.2", "1.19", "1.19.1", "1.19.2", "1.19.3", "1.19.4", "1.20")
+val supportedVersions = listOf("1.16.5", "1.17.1", "1.18.2", "1.19.4", "1.20.1")
 tasks {
-    supportedVersions.forEach {
-        register<RunServer>("runServer-$it") {
-            minecraftVersion(it)
-            pluginJars(*project(":plotsquared-bukkit").getTasksByName("shadowJar", false).map { (it as Jar).archiveFile }
+    supportedVersions.forEach { version ->
+        register<RunServer>("runServer-$version") {
+            minecraftVersion(version)
+            pluginJars(*project(":plotsquared-bukkit")
+                    .getTasksByName("shadowJar", false)
+                    .map { (it as Jar).archiveFile }
                     .toTypedArray())
             jvmArgs("-DPaper.IgnoreJavaVersion=true", "-Dcom.mojang.eula.agree=true")
             group = "run paper"
-            runDirectory.set(file("run-$it"))
+            runDirectory.set(file("run-$version"))
         }
     }
 }

gradle/libs.versions.toml

@@ -16,7 +16,7 @@ worldedit = "7.2.15"
 fawe = "2.7.0"
 placeholderapi = "2.11.3"
 luckperms = "5.4"
-essentialsx = "2.20.1"
+essentialsx = "2.20.0"
 mvdwapi = "3.1.1"
 
 # Third party

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -83,8 +83,7 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum