Add since tags

Co-authored-by: Hannes Greule <SirYwell@users.noreply.github.com>

.github/workflows/codeql.yml

@@ -27,10 +27,10 @@ jobs:
           distribution: temurin
           java-version: 17
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v3
+        uses: github/codeql-action/autobuild@v2
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v2

Bukkit/build.gradle.kts

@@ -67,7 +67,6 @@ tasks.named<ShadowJar>("shadowJar") {
         exclude(dependency("org.checkerframework:"))
     }
 
-    relocate("net.kyori.option", "com.plotsquared.core.configuration.option")
     relocate("net.kyori.adventure", "com.plotsquared.core.configuration.adventure")
     relocate("net.kyori.examination", "com.plotsquared.core.configuration.examination")
     relocate("io.papermc.lib", "com.plotsquared.bukkit.paperlib")

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

@@ -261,10 +261,7 @@ public class BlockEventListener implements Listener {
                 final BlockFace facing = piston.getFacing();
                 location = location.add(facing.getModX(), facing.getModY(), facing.getModZ());
                 Plot newPlot = area.getOwnedPlotAbs(location);
-                if (plot.equals(newPlot)) {
+                if (!plot.equals(newPlot)) {
-                    return;
-                }
-                if (!plot.isMerged() || !plot.getConnectedPlots().contains(newPlot)) {
                     event.setCancelled(true);
                     plot.debug("Prevented piston update because of invalid edge piston detection");
                 }

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

@@ -252,8 +252,7 @@ public class PlayerEventListener implements Listener {
                 }
                 Plot plot = location.getOwnedPlot();
                 if (plot == null) {
-                    if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, EditSignFlag.class, false)
+                    if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, EditSignFlag.class, false)) {
-                            && !event.getPlayer().hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString())) {
                         event.setCancelled(true);
                     }
                     return;
@@ -261,8 +260,7 @@ public class PlayerEventListener implements Listener {
                 if (plot.isAdded(event.getPlayer().getUniqueId())) {
                     return; // allow for added players
                 }
-                if (!plot.getFlag(EditSignFlag.class)
+                if (!plot.getFlag(EditSignFlag.class)) {
-                        && !event.getPlayer().hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString())) {
                     plot.debug(event.getPlayer().getName() + " could not color the sign because of edit-sign = false");
                     event.setCancelled(true);
                 }

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

@@ -20,7 +20,6 @@ package com.plotsquared.bukkit.listener;
 
 import com.plotsquared.bukkit.util.BukkitUtil;
 import com.plotsquared.core.location.Location;
-import com.plotsquared.core.permissions.Permission;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.flag.implementations.EditSignFlag;
@@ -47,8 +46,7 @@ public class PlayerEventListener1201 implements Listener {
         }
         Plot plot = location.getOwnedPlot();
         if (plot == null) {
-            if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, EditSignFlag.class, false)
+            if (PlotFlagUtil.isAreaRoadFlagsAndFlagEquals(area, EditSignFlag.class, false)) {
-                    && !event.getPlayer().hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString())) {
                 event.setCancelled(true);
             }
             return;
@@ -56,8 +54,7 @@ public class PlayerEventListener1201 implements Listener {
         if (plot.isAdded(event.getPlayer().getUniqueId())) {
             return; // allow for added players
         }
-        if (!plot.getFlag(EditSignFlag.class)
+        if (!plot.getFlag(EditSignFlag.class)) {
-                && !event.getPlayer().hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString())) {
             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/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,22 +309,19 @@ 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
     @Override

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

@@ -47,21 +47,7 @@ public class TranslationUpdateManager {
         String usedGrants = "usedGrants";
         String usedGrantsReplacement = "used_grants";
         String remainingGrants = "remainingGrants";
-        String remainingGrantsReplacement = "remaining_grants";
+        String rremainingGrantsReplacement = "remaining_grants";
-        String minimumRadius = "minimumRadius";
-        String minimumRadiusReplacement = "minimum_radius";
-        String maximumMoves = "maximumMoves";
-        String maximumMovesReplacement = "maximum_moves";
-        String userMove = "userMove";
-        String userMoveReplacement = "user_move";
-
-        // tag opening / closing characters are important, as the locale keys exist as well, which should not be replaced
-        String listInfoUnknown = "<info.unknown>";
-        String listInfoUnknownReplacement = "<unknown>";
-        String listInfoServer = "<info.server>";
-        String listInfoServerReplacement = "<server>";
-        String listInfoEveryone = "<info.everyone>";
-        String listInfoEveryoneReplacement = "<everyone>";
 
         try (Stream<Path> paths = Files.walk(Paths.get(PlotSquared.platform().getDirectory().toPath().resolve("lang").toUri()))) {
             paths
@@ -72,13 +58,7 @@ public class TranslationUpdateManager {
                         replaceInFile(p, minHeight, minheightReplacement);
                         replaceInFile(p, maxHeight, maxheightReplacement);
                         replaceInFile(p, usedGrants, usedGrantsReplacement);
-                        replaceInFile(p, remainingGrants, remainingGrantsReplacement);
+                        replaceInFile(p, remainingGrants, rremainingGrantsReplacement);
-                        replaceInFile(p, minimumRadius, minimumRadiusReplacement);
-                        replaceInFile(p, maximumMoves, maximumMovesReplacement);
-                        replaceInFile(p, userMove, userMoveReplacement);
-                        replaceInFile(p, listInfoUnknown, listInfoUnknownReplacement);
-                        replaceInFile(p, listInfoServer, listInfoServerReplacement);
-                        replaceInFile(p, listInfoEveryone, listInfoEveryoneReplacement);
                     });
         }
     }

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

@@ -256,11 +256,11 @@ public class Condense extends SubCommand {
                 player.sendMessage(TranslatableCaption.of("condense.default_eval"));
                 player.sendMessage(
                         TranslatableCaption.of("condense.minimum_radius"),
-                        TagResolver.resolver("minimum_radius", Tag.inserting(Component.text(minimumRadius)))
+                        TagResolver.resolver("minimumRadius", Tag.inserting(Component.text(minimumRadius)))
                 );
                 player.sendMessage(
                         TranslatableCaption.of("condense.maximum_moved"),
-                        TagResolver.resolver("maximum_moves", Tag.inserting(Component.text(maxMove)))
+                        TagResolver.resolver("maxMove", Tag.inserting(Component.text(maxMove)))
                 );
                 player.sendMessage(TranslatableCaption.of("condense.input_eval"));
                 player.sendMessage(
@@ -269,7 +269,7 @@ public class Condense extends SubCommand {
                 );
                 player.sendMessage(
                         TranslatableCaption.of("condense.estimated_moves"),
-                        TagResolver.resolver("user_move", Tag.inserting(Component.text(userMove)))
+                        TagResolver.resolver("userMove", Tag.inserting(Component.text(userMove)))
                 );
                 player.sendMessage(TranslatableCaption.of("condense.eta"));
                 player.sendMessage(TranslatableCaption.of("condense.radius_measured"));

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

@@ -94,7 +94,7 @@ public class Done extends SubCommand {
                 TagResolver.resolver("plot", Tag.inserting(Component.text(plot.getId().toString())))
         );
         final Settings.Auto_Clear doneRequirements = Settings.AUTO_CLEAR.get("done");
-        if (PlotSquared.platform().expireManager() == null || doneRequirements == null || player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_DONE)) {
+        if (PlotSquared.platform().expireManager() == null || doneRequirements == null) {
             finish(plot, player, true);
             plot.removeRunning();
         } else {

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

@@ -465,7 +465,7 @@ public class ListCmd extends SubCommand {
                 TextComponent.Builder builder = Component.text();
                 if (plot.getFlag(ServerPlotFlag.class)) {
                     TagResolver serverResolver = TagResolver.resolver(
-                            "server",
+                            "info.server",
                             Tag.inserting(TranslatableCaption.of("info.server").toComponent(player))
                     );
                     builder.append(MINI_MESSAGE.deserialize(server, serverResolver));
@@ -483,13 +483,13 @@ public class ListCmd extends SubCommand {
                                 builder.append(MINI_MESSAGE.deserialize(online, resolver));
                             } else if (uuidMapping.username().equalsIgnoreCase("unknown")) {
                                 TagResolver unknownResolver = TagResolver.resolver(
-                                        "unknown",
+                                        "info.unknown",
                                         Tag.inserting(TranslatableCaption.of("info.unknown").toComponent(player))
                                 );
                                 builder.append(MINI_MESSAGE.deserialize(unknown, unknownResolver));
                             } else if (uuidMapping.uuid().equals(DBFunc.EVERYONE)) {
                                 TagResolver everyoneResolver = TagResolver.resolver(
-                                        "everyone",
+                                        "info.everyone",
                                         Tag.inserting(TranslatableCaption.of("info.everyone").toComponent(player))
                                 );
                                 builder.append(MINI_MESSAGE.deserialize(everyone, everyoneResolver));

Core/src/main/java/com/plotsquared/core/database/SQLManager.java

@@ -2401,8 +2401,7 @@ public class SQLManager implements AbstractDB {
         addPlotTask(plot, new UniqueStatement("setPosition") {
             @Override
             public void set(PreparedStatement statement) throws SQLException {
-                // Please see the table creation statement. There is the default value of "default"
+                statement.setString(1, position == null ? "" : position);
-                statement.setString(1, position == null ? "DEFAULT" : position);
                 statement.setInt(2, getId(plot));
             }
 

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

@@ -1,77 +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 org.checkerframework.checker.index.qual.NonNegative;
-import org.checkerframework.checker.nullness.qual.NonNull;
-
-/**
- * Called every time after PlotSquared calculated a players plot limit based on their permission.
- * <p>
- * May be used to grant a player more plots based on another rank or bought feature.
- *
- * @since 7.3.0
- */
-public class PlayerPlotLimitEvent {
-
-    private final PlotPlayer<?> player;
-
-    private int limit;
-
-    public PlayerPlotLimitEvent(@NonNull final PlotPlayer<?> player, @NonNegative final int limit) {
-        this.player = player;
-        this.limit = limit;
-    }
-
-    /**
-     * Overrides the previously calculated or set plot limit for {@link #player()}.
-     *
-     * @param limit The amount of plots a player may claim. Must be {@code 0} or greater.
-     * @since 7.3.0
-     */
-    public void limit(@NonNegative final int limit) {
-        if (limit < 0) {
-            throw new IllegalArgumentException("Player plot limit must be greater or equal 0");
-        }
-        this.limit = limit;
-    }
-
-    /**
-     * Returns the previous set limit, if none was overridden before this event handler the default limit based on the players
-     * permissions node is returned.
-     *
-     * @return The currently defined plot limit of this player.
-     * @since 7.3.0
-     */
-    public @NonNegative int limit() {
-        return limit;
-    }
-
-    /**
-     * The player for which the limit is queried.
-     *
-     * @return the player.
-     * @since 7.3.0
-     */
-    public @NonNull PlotPlayer<?> player() {
-        return player;
-    }
-
-}

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

@@ -143,7 +143,7 @@ public class ClassicPlotManager extends SquarePlotManager {
                     classicPlotWorld,
                     plot.getRegions(),
                     blocks,
-                    classicPlotWorld.getMinBuildHeight(),
+                    classicPlotWorld.getMinComponentHeight(),
                     classicPlotWorld.getMaxBuildHeight() - 1,
                     actor,
                     queue
@@ -204,7 +204,7 @@ public class ClassicPlotManager extends SquarePlotManager {
                     classicPlotWorld,
                     plot.getRegions(),
                     blocks,
-                    classicPlotWorld.getMinBuildHeight(),
+                    classicPlotWorld.getMinComponentHeight(),
                     classicPlotWorld.PLOT_HEIGHT - 1,
                     actor,
                     queue
@@ -379,7 +379,7 @@ public class ClassicPlotManager extends SquarePlotManager {
             }
         }
 
-        int yStart = classicPlotWorld.getMinBuildHeight() + (classicPlotWorld.PLOT_BEDROCK ? 1 : 0);
+        int yStart = classicPlotWorld.getMinComponentHeight();
         if (!plot.isMerged(Direction.NORTH)) {
             int z = bot.getZ();
             for (int x = bot.getX(); x < top.getX(); x++) {

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

@@ -52,6 +52,7 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld {
     public BlockBucket ROAD_BLOCK = new BlockBucket(BlockTypes.QUARTZ_BLOCK);
     public boolean PLOT_BEDROCK = true;
     public boolean PLACE_TOP_BLOCK = true;
+    public boolean COMPONENT_BELOW_BEDROCK = false;
 
     public ClassicPlotWorld(
             final @NonNull String worldName,
@@ -129,6 +130,9 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld {
                 ),
                 new ConfigurationNode("plot.bedrock", this.PLOT_BEDROCK, TranslatableCaption.of("setup.bedrock_boolean"),
                         ConfigurationUtil.BOOLEAN
+                ),
+                new ConfigurationNode("world.component_below_bedrock", this.COMPONENT_BELOW_BEDROCK, TranslatableCaption.of(
+                        "setup.component_below_bedrock_boolean"), ConfigurationUtil.BOOLEAN
                 )};
     }
 
@@ -150,6 +154,14 @@ public abstract class ClassicPlotWorld extends SquarePlotWorld {
         this.PLACE_TOP_BLOCK = config.getBoolean("wall.place_top_block");
         this.WALL_HEIGHT = Math.min(getMaxGenHeight() - (PLACE_TOP_BLOCK ? 1 : 0), config.getInt("wall.height"));
         this.CLAIMED_WALL_BLOCK = createCheckedBlockBucket(config.getString("wall.block_claimed"), CLAIMED_WALL_BLOCK);
+        this.COMPONENT_BELOW_BEDROCK = config.getBoolean("world.component_below_bedrock");
+    }
+
+    @Override
+    public int getMinComponentHeight() {
+        return COMPONENT_BELOW_BEDROCK && getMinGenHeight() >= getMinBuildHeight()
+                ? getMinGenHeight() + (PLOT_BEDROCK ? 1 : 0)
+                : getMinBuildHeight();
     }
 
     int schematicStartHeight() {

Core/src/main/java/com/plotsquared/core/listener/PlotListener.java

@@ -364,6 +364,7 @@ public class PlotListener {
     public boolean plotExit(final PlotPlayer<?> player, Plot plot) {
         try (final MetaDataAccess<Plot> lastPlot = player.accessTemporaryMetaData(PlayerMetaDataKeys.TEMPORARY_LAST_PLOT)) {
             final Plot previous = lastPlot.remove();
+            this.eventDispatcher.callLeave(player, plot);
 
             List<StatusEffect> effects = playerEffects.remove(player.getUUID());
             if (effects != null) {
@@ -466,8 +467,6 @@ public class PlotListener {
                 feedRunnable.remove(player.getUUID());
                 healRunnable.remove(player.getUUID());
             }
-        } finally {
-            this.eventDispatcher.callLeave(player, plot);
         }
         return true;
     }

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

@@ -59,9 +59,6 @@ public enum Permission implements ComponentLike {
     PERMISSION_ADMIN_DESTROY_VEHICLE_UNOWNED("plots.admin.vehicle.break.unowned"),
     PERMISSION_ADMIN_DESTROY_VEHICLE_OTHER("plots.admin.vehicle.break.other"),
     PERMISSION_ADMIN_PVE("plots.admin.pve"),
-    PERMISSION_ADMIN_PLACE_VEHICLE_ROAD("plots.admin.vehicle.place.road"),
-    PERMISSION_ADMIN_PLACE_VEHICLE_UNOWNED("plots.admin.vehicle.place.unowned"),
-    PERMISSION_ADMIN_PLACE_VEHICLE_OTHER("plots.admin.vehicle.place.other"),
     PERMISSION_ADMIN_PVP("plots.admin.pvp"),
     PERMISSION_ADMIN_BUILD_ROAD("plots.admin.build.road"),
     PERMISSION_ADMIN_PROJECTILE_ROAD("plots.admin.projectile.road"),

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

@@ -306,8 +306,7 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
      * @return number of allowed plots within the scope (globally, or in the player's current world as defined in the settings.yml)
      */
     public int getAllowedPlots() {
-        final int calculatedLimit = hasPermissionRange("plots.plot", Settings.Limit.MAX_PLOTS);
+        return hasPermissionRange("plots.plot", Settings.Limit.MAX_PLOTS);
-        return this.eventDispatcher.callPlayerPlotLimit(this, calculatedLimit).limit();
     }
 
     /**

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

@@ -1483,7 +1483,7 @@ public class Plot {
      */
     public void setHome(BlockLoc location) {
         Plot plot = this.getBasePlot(false);
-        if (location != null && (BlockLoc.ZERO.equals(location) || BlockLoc.MINY.equals(location))) {
+        if (BlockLoc.ZERO.equals(location) || BlockLoc.MINY.equals(location)) {
             return;
         }
         plot.getSettings().setPosition(location);

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

@@ -1452,6 +1452,24 @@ public abstract class PlotArea implements ComponentLike {
         this.defaultHome = defaultHome;
     }
 
+    /**
+     * Get the maximum height that changes to plot components (wall filling, air, all etc.) may operate to
+     *
+     * @since TODO
+     */
+    public int getMaxComponentHeight() {
+        return this.maxBuildHeight;
+    }
+
+    /**
+     * Get the minimum height that changes to plot components (wall filling, air, all etc.) may operate to
+     *
+     * @since TODO
+     */
+    public int getMinComponentHeight() {
+        return this.minBuildHeight;
+    }
+
     /**
      * Get the maximum height players may build in. Exclusive.
      */

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

@@ -30,7 +30,6 @@ import com.plotsquared.core.events.PlayerEnterPlotEvent;
 import com.plotsquared.core.events.PlayerLeavePlotEvent;
 import com.plotsquared.core.events.PlayerPlotDeniedEvent;
 import com.plotsquared.core.events.PlayerPlotHelperEvent;
-import com.plotsquared.core.events.PlayerPlotLimitEvent;
 import com.plotsquared.core.events.PlayerPlotTrustedEvent;
 import com.plotsquared.core.events.PlayerTeleportToPlotEvent;
 import com.plotsquared.core.events.PlotAutoMergeEvent;
@@ -309,12 +308,6 @@ public class EventDispatcher {
         return event;
     }
 
-    public PlayerPlotLimitEvent callPlayerPlotLimit(PlotPlayer<?> player, int calculatedLimit) {
-        PlayerPlotLimitEvent event = new PlayerPlotLimitEvent(player, calculatedLimit);
-        eventBus.post(event);
-        return event;
-    }
-
     public void doJoinTask(final PlotPlayer<?> player) {
         if (player == null) {
             return; //possible future warning message to figure out where we are retrieving null
@@ -382,10 +375,14 @@ public class EventDispatcher {
                             return true;
                         }
                     }
-                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD, notifyPerms);
+                    return player.hasPermission(
+                            Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms
+                    );
                 }
                 if (!plot.hasOwner()) {
-                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED, notifyPerms);
+                    return player.hasPermission(
+                            Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), notifyPerms
+                    );
                 }
                 final List<BlockTypeWrapper> use = plot.getFlag(UseFlag.class);
                 for (final BlockTypeWrapper blockTypeWrapper : use) {
@@ -394,7 +391,7 @@ public class EventDispatcher {
                         return true;
                     }
                 }
-                if (player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER, false)) {
+                if (player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(), false)) {
                     return true;
                 }
                 // we check for the EditSignFlag in the PlayerSignOpenEvent again, but we must not cancel the interact event
@@ -419,10 +416,14 @@ public class EventDispatcher {
                             return true;
                         }
                     }
-                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD, false);
+                    return player.hasPermission(
+                            Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), false
+                    );
                 }
                 if (!plot.hasOwner()) {
-                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED, false);
+                    return player.hasPermission(
+                            Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), false
+                    );
                 }
                 if (plot.getFlag(DeviceInteractFlag.class)) {
                     return true;
@@ -434,14 +435,21 @@ public class EventDispatcher {
                         return true;
                     }
                 }
-                return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER, false);
+                return player.hasPermission(
+                        Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(),
+                        false
+                );
             }
             case SPAWN_MOB -> {
                 if (plot == null) {
-                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD, notifyPerms);
+                    return player.hasPermission(
+                            Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms
+                    );
                 }
                 if (!plot.hasOwner()) {
-                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED, notifyPerms);
+                    return player.hasPermission(
+                            Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), notifyPerms
+                    );
                 }
                 if (plot.getFlag(MobPlaceFlag.class)) {
                     return true;
@@ -453,7 +461,10 @@ public class EventDispatcher {
                         return true;
                     }
                 }
-                if (player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER, false)) {
+                if (player.hasPermission(
+                        Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(),
+                        false
+                )) {
                     return true;
                 }
                 if (notifyPerms) {
@@ -473,10 +484,14 @@ public class EventDispatcher {
             }
             case PLACE_MISC -> {
                 if (plot == null) {
-                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_ROAD, notifyPerms);
+                    return player.hasPermission(
+                            Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms
+                    );
                 }
                 if (!plot.hasOwner()) {
-                    return player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_UNOWNED, notifyPerms);
+                    return player.hasPermission(
+                            Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), notifyPerms
+                    );
                 }
                 if (plot.getFlag(MiscPlaceFlag.class)) {
                     return true;
@@ -488,7 +503,10 @@ public class EventDispatcher {
                         return true;
                     }
                 }
-                if (player.hasPermission(Permission.PERMISSION_ADMIN_INTERACT_OTHER, false)) {
+                if (player.hasPermission(
+                        Permission.PERMISSION_ADMIN_INTERACT_OTHER.toString(),
+                        false
+                )) {
                     return true;
                 }
                 if (notifyPerms) {
@@ -508,28 +526,16 @@ public class EventDispatcher {
             }
             case PLACE_VEHICLE -> {
                 if (plot == null) {
-                    return player.hasPermission(Permission.PERMISSION_ADMIN_PLACE_VEHICLE_ROAD, notifyPerms);
+                    return player.hasPermission(
-                }
+                            Permission.PERMISSION_ADMIN_INTERACT_ROAD.toString(), notifyPerms
-                if (!plot.hasOwner()) {
-                    return player.hasPermission(Permission.PERMISSION_ADMIN_PLACE_VEHICLE_UNOWNED, notifyPerms);
-                }
-                if (plot.getFlag(VehiclePlaceFlag.class)) {
-                    return true;
-                }
-                if (player.hasPermission(Permission.PERMISSION_ADMIN_PLACE_VEHICLE_OTHER, false)) {
-                    return true;
-                }
-                if (notifyPerms) {
-                    player.sendMessage(
-                            TranslatableCaption.of("commandconfig.flag_tutorial_usage"),
-                            TagResolver.resolver(
-                                    "flag",
-                                    Tag.inserting(
-                                            PlotFlag.getFlagNameComponent(VehiclePlaceFlag.class)
-                                    )
-                            )
                     );
                 }
+                if (!plot.hasOwner()) {
+                    return player.hasPermission(
+                            Permission.PERMISSION_ADMIN_INTERACT_UNOWNED.toString(), notifyPerms
+                    );
+                }
+                return plot.getFlag(VehiclePlaceFlag.class);
             }
             default -> {
             }

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

@@ -165,6 +165,7 @@
   "setup.wall_height": "<gold>Wall height</gold>",
   "setup.min_gen_height": "<gold>Minimum height from which to generate (for 1.18+ can be negative).</gold>",
   "setup.bedrock_boolean": "<gold>Whether a bedrock layer under the plot should be generated or not</gold>",
+  "setup.component_below_bedrock_boolean": "<gold>Whether a component change e.g. /plot set walls should edit the bedrock layer or below</gold>",
   "setup.singleplotarea_void_world": "<gold>Void world</gold>",
   "plotareatype.plot_area_type_normal": "<gray>Standard plot generation</gray>",
   "plotareatype.plot_area_type_augmented": "<gray>Plot generation with vanilla terrain</gray>",
@@ -248,11 +249,11 @@
   "condense.skipping": "<prefix><red>Skipping complex plot: </red><gold><plot></gold><red>.</red>",
   "condense.task_stopped": "<prefix><gold>Task already stopped.</gold>",
   "condense.default_eval": "<dark_gray><strikethrough>=== <reset> <gold>DEFAULT EVAL </gold><dark_gray><strikethrough>===</dark_gray>",
-  "condense.minimum_radius": "<gold>Minimum radius: </gold><gray><minimum_radius></gray>",
+  "condense.minimum_radius": "<gold>Minimum radius: </gold><gray><minimumRadius></gray>",
-  "condense.maximum_moved": "<gold>Maximum moved: </gold><gray><maximum_moves></gray>",
+  "condense.maximum_moved": "<gold>Maximum moved: </gold><gray><maximumMoves></gray>",
   "condense.input_eval": "<dark_gray><strikethrough>=== <reset> <gold>INPUT EVAL </gold><dark_gray><strikethrough>===</dark_gray>",
   "condense.input_radius": "<gold>Input radius: </gold><gray><radius></gray>",
-  "condense.estimated_moves": "<gold>Estimated moves: </gold><gray><user_move></gray>",
+  "condense.estimated_moves": "<gold>Estimated moves: </gold><gray><userMove></gray>",
   "condense.eta": "<prefix><gold>Estimated time: No idea, times will drastically change based on the system performance and load.</gold>",
   "condense.radius_measured": "<yellow> - Radius is measured in plot width.</yellow>",
   "database.starting_conversion": "<prefix><gold>Starting...</gold>",
@@ -381,9 +382,9 @@
   "info.plot_list_default": "<gold><plot></gold>",
   "info.plot_list_player_online": "<dark_aqua><prefix></dark_aqua><hover:show_text:'<dark_aqua>Online</dark_aqua>'><gold><player></gold></hover>",
   "info.plot_list_player_offline": "<dark_aqua><prefix></dark_aqua><hover:show_text:'<dark_gray>Offline</dark_gray>'><gold><player></gold></hover>",
-  "info.plot_list_player_unknown": "<hover:show_text:'<red>The owner of this plot is unknown</red>'><white><unknown></white></hover>",
+  "info.plot_list_player_unknown": "<hover:show_text:'<red>The owner of this plot is unknown</red>'><white><info.unknown></white></hover>",
-  "info.plot_list_player_server": "<hover:show_text:'<red>The plot is owned by the server</red>'><white><server></white></hover>",
+  "info.plot_list_player_server": "<hover:show_text:'<red>The plot is owned by the server</red>'><white><info.server></white></hover>",
-  "info.plot_list_player_everyone": "<hover:show_text:'<blue>The plot is owned by everyone</blue>'><white><everyone></white></hover>",
+  "info.plot_list_player_everyone": "<hover:show_text:'<blue>The plot is owned by everyone</blue>'><white><info.everyone></white></hover>",
   "info.area_info_format": "<header>\n<reset><gold>Name: </gold><gray><name></gray>\n<gold>Type: </gold><gray><type></gray>\n<gold>Terrain: </gold><gray><terrain></gray>\n<gold>Usage: </gold><gray><usage>%</gray>\n<gold>Claimed: </gold><gray><claimed></gray>\n<gold>Clusters: </gold><gray><clusters></gray>\n<gold>Region: </gold><gray><region></gray>\n<gold>Generator: </gold><gray><generator></gray>\n<footer>",
   "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>",

build.gradle.kts

@@ -22,7 +22,7 @@ plugins {
 }
 
 group = "com.intellectualsites.plotsquared"
-version = "7.3.2-SNAPSHOT"
+version = "7.2.2-SNAPSHOT"
 
 if (!File("$rootDir/.git").exists()) {
     logger.lifecycle("""

gradle/libs.versions.toml

@@ -2,18 +2,18 @@
 # Platform expectations
 paper = "1.20.2-R0.1-SNAPSHOT"
 guice = "7.0.0"
-spotbugs = "4.8.3"
+spotbugs = "4.8.2"
-checkerqual = "3.42.0"
+checkerqual = "3.41.0"
 gson = "2.10"
 guava = "31.1-jre"
 snakeyaml = "2.0"
-adventure = "4.15.0"
+adventure = "4.14.0"
-adventure-bukkit = "4.3.2"
+adventure-bukkit = "4.3.1"
 log4j = "2.19.0"
 
 # Plugins
-worldedit = "7.2.18"
+worldedit = "7.2.17"
-fawe = "2.8.4"
+fawe = "2.8.3"
 placeholderapi = "2.11.5"
 luckperms = "5.4"
 essentialsx = "2.20.1"