add world-specific variant

- Add configuration option to force plot components to be set only above bedrock level
 - Account for build height < gen height where it is not wanted for components to be set at/below bedrock

Bukkit/src/main/java/com/plotsquared/bukkit/placeholder/PAPIPlaceholders.java

@@ -20,6 +20,8 @@ package com.plotsquared.bukkit.placeholder;
 
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.player.PlotPlayer;
+import com.plotsquared.core.plot.flag.implementations.DoneFlag;
+import com.plotsquared.core.util.query.PlotQuery;
 import me.clip.placeholderapi.PlaceholderAPIPlugin;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import org.bukkit.entity.Player;
@@ -83,6 +85,20 @@ public class PAPIPlaceholders extends PlaceholderExpansion {
             return String.valueOf(pl.getPlotCount(identifier));
         }
 
+        if (identifier.startsWith("base_plot_count_")) {
+            identifier = identifier.substring("base_plot_count_".length());
+            if (identifier.isEmpty()) {
+                return "";
+            }
+
+            return String.valueOf(PlotQuery.newQuery()
+                    .ownedBy(pl)
+                    .inWorld(identifier)
+                    .whereBasePlot()
+                    .thatPasses(plot -> !DoneFlag.isDone(plot))
+                    .count());
+        }
+
         // PlotSquared placeholders
         return PlotSquared.platform().placeholderRegistry().getPlaceholderValue(identifier, pl);
     }

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/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/placeholders/PlaceholderRegistry.java

@@ -31,9 +31,11 @@ import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.flag.GlobalFlagContainer;
 import com.plotsquared.core.plot.flag.PlotFlag;
+import com.plotsquared.core.plot.flag.implementations.DoneFlag;
 import com.plotsquared.core.plot.flag.implementations.ServerPlotFlag;
 import com.plotsquared.core.util.EventDispatcher;
 import com.plotsquared.core.util.PlayerManager;
+import com.plotsquared.core.util.query.PlotQuery;
 import net.kyori.adventure.text.Component;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -95,6 +97,12 @@ public final class PlaceholderRegistry {
             }
             return Integer.toString(player.getAllowedPlots());
         });
+        this.createPlaceholder("base_plot_count", player -> Integer.toString(PlotQuery.newQuery()
+                .ownedBy(player)
+                .whereBasePlot()
+                .thatPasses(plot -> !DoneFlag.isDone(plot))
+                .count())
+        );
         this.createPlaceholder("plot_count", player -> Integer.toString(player.getPlotCount()));
         this.createPlaceholder("currentplot_alias", (player, plot) -> {
             if (plot.getAlias().isEmpty()) {

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

@@ -166,6 +166,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>",

build.gradle.kts

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