feat: add placeholder for plot size

- PlaceholderRegistry and for /plot list entries
 - fixes #4149

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -7,8 +7,8 @@ body:
     attributes:
       value: |
         Thanks for taking the time to fill out this bug report for PlotSquared! Fill out the following form to your best ability to help us fix the problem.
-        Only use this if you're absolutely sure that you found a bug and can reproduce it. For anything else, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://intellectualsites.github.io/plotsquared-documentation/).
-        Do NOT use the public issue tracker to report security vulnerabilities! They are disclosed using [this](https://forms.gle/btgdRn9yhGtzEiGW8) form!
+        Only use this if you're absolutely sure that you found a bug and can reproduce it. For anything else, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://intellectualsites.gitbook.io/plotsquared/).
+        Do NOT use the public issue tracker to report security vulnerabilities! They are disclosed using [this](https://github.com/IntellectualSites/PlotSquared/security/policy) GitHub form!
 
   - type: dropdown
     attributes:
@@ -27,6 +27,9 @@ body:
       description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first.
       multiple: false
       options:
+        - '1.20.1'
+        - '1.20'
+        - '1.19.4'
         - '1.19.3'
         - '1.19.2'
         - '1.19.1'

.github/ISSUE_TEMPLATE/config.yml

@@ -4,5 +4,5 @@ contact_links:
     url: https://discord.gg/intellectualsites
     about: Our support Discord, please ask questions and seek support here.
   - name: PlotSquared Wiki
-    url: https://intellectualsites.github.io/plotsquared-documentation/
+    url: https://intellectualsites.gitbook.io/plotsquared/
     about: Take a look at the wiki page for instructions how to setup PlotSquared and use its commands.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -7,7 +7,7 @@ body:
     attributes:
       value: |
         Thanks for taking the time to fill out this feature request for PlotSquared! Fill out the following form to your best ability to help us understand your feature request and greately improve the change of it getting added.
-        For anything else than a feature request, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://intellectualsites.github.io/plotsquared-documentation/).
+        For anything else than a feature request, use: [our Discord server](https://discord.gg/intellectualsites) or [the wiki](https://intellectualsites.gitbook.io/plotsquared/).
 
   - type: textarea
     attributes:

.github/renovate.json

@@ -0,0 +1,19 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base",
+    ":semanticCommitsDisabled"
+  ],
+  "automerge": true,
+  "labels": [
+    "dependencies"
+  ],
+  "rebaseWhen": "conflicted",
+  "schedule": ["on the first day of the month"],
+  "ignoreDeps": [
+    "com.google.code.gson:gson",
+    "com.google.guava:guava",
+    "org.yaml:snakeyaml",
+    "org.apache.logging.log4j:log4j-api",
+  ]
+}

.github/workflows/announce-release-on-discord.yml

@@ -11,7 +11,7 @@ jobs:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
           DISCORD_USERNAME: PlotSquared Release
           DISCORD_AVATAR: https://raw.githubusercontent.com/IntellectualSites/Assets/main/plugins/PlotSquared/PlotSquared.png
-        uses: Ilshidur/action-discord@08d9328877d6954120eef2b07abbc79249bb6210 # ratchet:Ilshidur/action-discord@0.3.2
+        uses: Ilshidur/action-discord@0.3.2
         with:
           args: |
             "<@&525015541815967744> <@&679322738552471574> <@&699293353862496266>"

.github/workflows/build-pr.yml

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

.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v3
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@55e685c48d84285a5b0418cd094606e199cca3b6 # v1
+        uses: gradle/wrapper-validation-action@v1
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
@@ -43,7 +43,7 @@ jobs:
           ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_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@0a14457bb28b04dfa1652e0ffdfda866d2845c73
+        uses: cpina/github-action-push-to-another-repository@main
         env:
           SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
         with:
@@ -55,7 +55,7 @@ jobs:
           target-directory: v7/core
       - name: Publish bukkit 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@0a14457bb28b04dfa1652e0ffdfda866d2845c73 # main
+        uses: cpina/github-action-push-to-another-repository@main
         env:
           SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
         with:

.github/workflows/codeql.yml

@@ -21,11 +21,16 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 17
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@f3feb00acb00f31a6f60280e6ace9ca31d91c76a # v2
+        uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
       - name: Autobuild
-        uses: github/codeql-action/autobuild@f3feb00acb00f31a6f60280e6ace9ca31d91c76a # v2
+        uses: github/codeql-action/autobuild@v2
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@f3feb00acb00f31a6f60280e6ace9ca31d91c76a # v2
+        uses: github/codeql-action/analyze@v2

.gitignore

@@ -138,6 +138,5 @@ build/
 
 .DS_Store
 # Ignore run folders
-run-[0-0].[0-9]/
-run-[0-0].[0-9].[0-9]/
-
+run-[0-9].[0-9][0-9]/
+run-[0-9].[0-9][0-9].[0-9]/

Bukkit/build.gradle.kts

@@ -18,23 +18,23 @@ repositories {
 }
 
 dependencies {
-    api(projects.plotSquaredCore)
+    api(projects.plotsquaredCore)
 
     // Metrics
-    implementation("org.bstats:bstats-bukkit")
+    implementation(libs.bstatsBukkit)
 
     // Paper
-    compileOnly("io.papermc.paper:paper-api")
-    implementation("io.papermc:paperlib")
+    compileOnly(libs.paper)
+    implementation(libs.paperlib)
 
     // Plugins
     compileOnly(libs.worldeditBukkit) {
         exclude(group = "org.bukkit")
         exclude(group = "org.spigotmc")
     }
-    compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit") { isTransitive = false }
-    testImplementation("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit") { isTransitive = false }
-    compileOnly("com.github.MilkBowl:VaultAPI") {
+    compileOnly(libs.faweBukkit) { isTransitive = false }
+    testImplementation(libs.faweBukkit) { isTransitive = false }
+    compileOnly(libs.vault) {
         exclude(group = "org.bukkit")
     }
     compileOnly(libs.placeholderapi)
@@ -44,15 +44,15 @@ dependencies {
 
     // Other libraries
     implementation(libs.squirrelid) { isTransitive = false }
-    implementation("dev.notmyfault.serverlib:ServerLib")
+    implementation(libs.serverlib)
 
     // Our libraries
     implementation(libs.arkitektonika)
-    implementation("com.intellectualsites.paster:Paster")
-    implementation("com.intellectualsites.informative-annotations:informative-annotations")
+    implementation(libs.paster)
+    implementation(libs.informativeAnnotations)
 
     // Adventure
-    implementation("net.kyori:adventure-platform-bukkit")
+    implementation(libs.adventureBukkit)
 }
 
 tasks.processResources {
@@ -62,6 +62,7 @@ tasks.processResources {
 }
 
 tasks.named<ShadowJar>("shadowJar") {
+    dependsOn(":plotsquared-core:shadowJar")
     dependencies {
         exclude(dependency("org.checkerframework:"))
     }
@@ -102,7 +103,7 @@ tasks {
         opt.links("https://jd.papermc.io/paper/1.19/")
         opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/" + libs.worldeditBukkit.get().versionConstraint.toString())
         opt.links("https://intellectualsites.github.io/plotsquared-javadocs/core/")
-        opt.links("https://jd.advntr.dev/api/4.12.0/")
+        opt.links("https://jd.advntr.dev/api/4.14.0/")
         opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
         opt.links("https://checkerframework.org/api/")
         opt.isLinkSource = true

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

@@ -252,6 +252,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
     }
 
     @Override
+    @SuppressWarnings("deprecation") // Paper deprecation
     public void onEnable() {
         this.pluginName = getDescription().getName();
 
@@ -550,7 +551,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
         this.startMetrics();
 
         if (Settings.Enabled_Components.WORLDS) {
-            TaskManager.getPlatformImplementation().taskRepeat(this::unload, TaskTime.seconds(1L));
+            TaskManager.getPlatformImplementation().taskRepeat(this::unload, TaskTime.seconds(10L));
             try {
                 singleWorldListener = injector().getInstance(SingleWorldListener.class);
                 Bukkit.getPluginManager().registerEvents(singleWorldListener, this);
@@ -1160,6 +1161,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
         return new BukkitPlotGenerator(world, generator, this.plotAreaManager);
     }
 
+    @SuppressWarnings("deprecation") // Paper deprecation
     @Override
     public @NonNull String pluginsFormatted() {
         StringBuilder msg = new StringBuilder();
@@ -1181,7 +1183,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
     }
 
     @Override
-    @SuppressWarnings("ConstantConditions")
+    @SuppressWarnings({"ConstantConditions", "deprecation"}) // Paper deprecation
     public @NonNull String worldEditImplementations() {
         StringBuilder msg = new StringBuilder();
         if (Bukkit.getPluginManager().getPlugin("FastAsyncWorldEdit") != null) {

Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java

@@ -74,6 +74,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
     private HorseStats horse;
     private boolean noGravity;
 
+    @SuppressWarnings("deprecation") // Deprecation exists since 1.20, while we support 1.16 onwards
     public ReplicatingEntityWrapper(Entity entity, short depth) {
         super(entity);
 

Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java

@@ -34,9 +34,12 @@ import com.plotsquared.core.queue.ZeroedDelegateScopedQueueCoordinator;
 import com.plotsquared.core.util.ChunkManager;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.math.BlockVector2;
+import com.sk89q.worldedit.math.BlockVector3;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.bukkit.HeightMap;
+import org.bukkit.NamespacedKey;
+import org.bukkit.Registry;
 import org.bukkit.World;
 import org.bukkit.block.Biome;
 import org.bukkit.generator.BiomeProvider;
@@ -48,10 +51,14 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.Random;
 import java.util.Set;
 
+import static java.util.function.Predicate.not;
+
 public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrapper<ChunkGenerator> {
 
     private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + BukkitPlotGenerator.class.getSimpleName());
@@ -284,7 +291,7 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
      */
     @SuppressWarnings("deprecation") // The entire method is deprecated, but kept for compatibility with <=1.16.2
     @Override
-    @Deprecated(since = "TODO")
+    @Deprecated(since = "7.0.0")
     public @NonNull ChunkData generateChunkData(
             @NonNull World world, @NonNull Random random, int x, int z, @NonNull BiomeGrid biome
     ) {
@@ -414,7 +421,11 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
         if (lastPlotArea != null && name.equals(this.levelName) && chunkX == lastChunkX && chunkZ == lastChunkZ) {
             return lastPlotArea;
         }
-        PlotArea area = UncheckedWorldLocation.at(name, chunkX << 4, 0, chunkZ << 4).getPlotArea();
+        BlockVector3 loc = BlockVector3.at(chunkX << 4, 0, chunkZ << 4);
+        if (lastPlotArea != null && lastPlotArea.getRegion().contains(loc) && lastPlotArea.getRegion().contains(loc)) {
+            return lastPlotArea;
+        }
+        PlotArea area = UncheckedWorldLocation.at(name, loc).getPlotArea();
         if (area == null) {
             throw new IllegalStateException(String.format(
                     "Cannot generate chunk that does not belong to a plot area. World: %s",
@@ -434,9 +445,16 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap
         private static final List<Biome> BIOMES;
 
         static {
-            ArrayList<Biome> biomes = new ArrayList<>(List.of(Biome.values()));
-            biomes.remove(Biome.CUSTOM);
-            BIOMES = List.copyOf(biomes);
+            Set<Biome> disabledBiomes = EnumSet.of(Biome.CUSTOM);
+            if (PlotSquared.platform().serverVersion()[1] <= 19) {
+                final Biome cherryGrove = Registry.BIOME.get(NamespacedKey.minecraft("cherry_grove"));
+                if (cherryGrove != null) {
+                    disabledBiomes.add(cherryGrove);
+                }
+            }
+            BIOMES = Arrays.stream(Biome.values())
+                    .filter(not(disabledBiomes::contains))
+                    .toList();
         }
 
         @Override

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

@@ -1116,6 +1116,7 @@ public class BlockEventListener implements Listener {
             if (plot != null) {
                 plot.debug("Explosion was cancelled because explosion = false");
             }
+            return;
         }
         event.blockList().removeIf(blox -> !plot.equals(area.getOwnedPlot(BukkitUtil.adapt(blox.getLocation()))));
     }

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

@@ -26,6 +26,7 @@ import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.flag.implementations.CopperOxideFlag;
 import com.plotsquared.core.plot.flag.implementations.MiscInteractFlag;
+import com.plotsquared.core.plot.flag.implementations.SculkSensorInteractFlag;
 import com.plotsquared.core.util.PlotFlagUtil;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -96,12 +97,12 @@ public class BlockEventListener117 implements Listener {
                 area,
                 MiscInteractFlag.class,
                 true
-        ) || plot != null && !plot.getFlag(
-                MiscInteractFlag.class)) {
+        ) || plot != null && (!plot.getFlag(MiscInteractFlag.class) || !plot.getFlag(SculkSensorInteractFlag.class))) {
             if (plotPlayer != null) {
                 if (plot != null) {
                     if (!plot.isAdded(plotPlayer.getUUID())) {
-                        plot.debug(plotPlayer.getName() + " couldn't trigger sculk sensors because misc-interact = false");
+                        plot.debug(plotPlayer.getName() + " couldn't trigger sculk sensors because both " +
+                                "sculk-sensor-interact and misc-interact = false");
                         event.setCancelled(true);
                     }
                 }
@@ -112,13 +113,15 @@ public class BlockEventListener117 implements Listener {
                 if (plot != null) {
                     if (itemThrower == null && (itemThrower = item.getOwner()) == null) {
                         plot.debug(
-                                "A thrown item couldn't trigger sculk sensors because misc-interact = false and the item's owner could not be resolved.");
+                                "A thrown item couldn't trigger sculk sensors because both sculk-sensor-interact and " +
+                                        "misc-interact = false and the item's owner could not be resolved.");
                         event.setCancelled(true);
                         return;
                     }
                     if (!plot.isAdded(itemThrower)) {
                         if (!plot.isAdded(itemThrower)) {
-                            plot.debug("A thrown item couldn't trigger sculk sensors because misc-interact = false");
+                            plot.debug("A thrown item couldn't trigger sculk sensors because both sculk-sensor-interact and " +
+                                    "misc-interact = false");
                             event.setCancelled(true);
                         }
                     }
@@ -137,7 +140,6 @@ public class BlockEventListener117 implements Listener {
         if (area == null) {
             for (int i = blocks.size() - 1; i >= 0; i--) {
                 Location blockLocation = BukkitUtil.adapt(blocks.get(i).getLocation());
-                blockLocation = BukkitUtil.adapt(blocks.get(i).getLocation());
                 if (blockLocation.isPlotArea()) {
                     blocks.remove(i);
                 }

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

@@ -26,6 +26,7 @@ import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.world.PlotAreaManager;
 import com.plotsquared.core.plot.world.SinglePlotArea;
+import com.plotsquared.core.util.ReflectionUtils;
 import com.plotsquared.core.util.ReflectionUtils.RefClass;
 import com.plotsquared.core.util.ReflectionUtils.RefField;
 import com.plotsquared.core.util.ReflectionUtils.RefMethod;
@@ -64,9 +65,11 @@ public class ChunkListener implements Listener {
     private final PlotAreaManager plotAreaManager;
     private final int version;
 
+    private RefMethod methodSetUnsaved;
     private RefMethod methodGetHandleChunk;
     private RefMethod methodGetHandleWorld;
-    private RefField mustSave;
+    private RefField mustNotSave;
+    private Object objChunkStatusFull = null;
     /*
     private RefMethod methodGetFullChunk;
     private RefMethod methodGetBukkitChunk;
@@ -79,7 +82,6 @@ public class ChunkListener implements Listener {
     */
     private Chunk lastChunk;
     private boolean ignoreUnload = false;
-    private boolean isTrueForNotSave = true;
 
     @Inject
     public ChunkListener(final @NonNull PlotAreaManager plotAreaManager) {
@@ -90,22 +92,27 @@ public class ChunkListener implements Listener {
         }
         try {
             RefClass classCraftWorld = getRefClass("{cb}.CraftWorld");
-            this.methodGetHandleWorld = classCraftWorld.getMethod("getHandle");
             RefClass classCraftChunk = getRefClass("{cb}.CraftChunk");
-            this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle");
+            ReflectionUtils.RefClass classChunkAccess = getRefClass("net.minecraft.world.level.chunk.IChunkAccess");
+            this.methodSetUnsaved = classChunkAccess.getMethod("a", boolean.class);
+            try {
+                this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle");
+            } catch (NoSuchMethodException ignored) {
+                try {
+                    RefClass classChunkStatus = getRefClass("net.minecraft.world.level.chunk.ChunkStatus");
+                    this.objChunkStatusFull = classChunkStatus.getRealClass().getField("n").get(null);
+                    this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle", classChunkStatus.getRealClass());
+                } catch (NoSuchMethodException ex) {
+                    throw new RuntimeException(ex);
+                }
+            }
             try {
                 if (version < 17) {
                     RefClass classChunk = getRefClass("{nms}.Chunk");
-                    if (version == 13) {
-                        this.mustSave = classChunk.getField("mustSave");
-                        this.isTrueForNotSave = false;
-                    } else {
-                        this.mustSave = classChunk.getField("mustNotSave");
-                    }
+                    this.mustNotSave = classChunk.getField("mustNotSave");
                 } else {
                     RefClass classChunk = getRefClass("net.minecraft.world.level.chunk.Chunk");
-                    this.mustSave = classChunk.getField("mustNotSave");
-
+                    this.mustNotSave = classChunk.getField("mustNotSave");
                 }
             } catch (NoSuchFieldException e) {
                 e.printStackTrace();
@@ -167,10 +174,13 @@ public class ChunkListener implements Listener {
         if (safe && shouldSave(world, chunk.getX(), chunk.getZ())) {
             return false;
         }
-        Object c = this.methodGetHandleChunk.of(chunk).call();
-        RefField.RefExecutor field = this.mustSave.of(c);
-        if ((Boolean) field.get() != isTrueForNotSave) {
-            field.set(isTrueForNotSave);
+        Object c = objChunkStatusFull != null
+                ? this.methodGetHandleChunk.of(chunk).call(objChunkStatusFull)
+                : this.methodGetHandleChunk.of(chunk).call();
+        RefField.RefExecutor field = this.mustNotSave.of(c);
+        methodSetUnsaved.of(c).call(false);
+        if (!((Boolean) field.get())) {
+            field.set(true);
             if (chunk.isLoaded()) {
                 ignoreUnload = true;
                 chunk.unload(false);

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

@@ -152,7 +152,8 @@ public class EntityEventListener implements Listener {
                 }
             }
             case "REINFORCEMENTS", "NATURAL", "MOUNT", "PATROL", "RAID", "SHEARED", "SILVERFISH_BLOCK", "ENDER_PEARL",
-                    "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN" -> {
+                    "TRAP", "VILLAGE_DEFENSE", "VILLAGE_INVASION", "BEEHIVE", "CHUNK_GEN", "NETHER_PORTAL",
+                    "DUPLICATION", "FROZEN", "SPELL" -> {
                 if (!area.isMobSpawning()) {
                     event.setCancelled(true);
                     return;

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

@@ -369,6 +369,7 @@ public class PlayerEventListener implements Listener {
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    @SuppressWarnings("deprecation") // Paper deprecation
     public void onConnect(PlayerJoinEvent event) {
         final Player player = event.getPlayer();
         PlotSquared.platform().playerManager().removePlayer(player.getUniqueId());
@@ -733,6 +734,7 @@ public class PlayerEventListener implements Listener {
     }
 
     @EventHandler(priority = EventPriority.LOW)
+    @SuppressWarnings("deprecation") // Paper deprecation
     public void onChat(AsyncPlayerChatEvent event) {
         if (event.isCancelled()) {
             return;
@@ -1063,6 +1065,7 @@ public class PlayerEventListener implements Listener {
     }
 
     @EventHandler(priority = EventPriority.LOW)
+    @SuppressWarnings("deprecation") // Paper deprecation
     public void onCancelledInteract(PlayerInteractEvent event) {
         if (event.isCancelled() && event.getAction() == Action.RIGHT_CLICK_AIR) {
             Player player = event.getPlayer();
@@ -1167,7 +1170,7 @@ public class PlayerEventListener implements Listener {
                     }
                 }
                 if (type.isEdible()) {
-                    //Allow all players to eat while also allowing the block place event ot be fired
+                    //Allow all players to eat while also allowing the block place event to be fired
                     return;
                 }
                 if (type == Material.ARMOR_STAND) {

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

@@ -31,45 +31,39 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.world.ChunkEvent;
 import org.bukkit.event.world.ChunkLoadEvent;
 
-import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
 import static com.plotsquared.core.util.ReflectionUtils.getRefClass;
 
 public class SingleWorldListener implements Listener {
 
-    private final Method methodGetHandleChunk;
-    private Field shouldSave = null;
+    private final Method methodSetUnsaved;
+    private Method methodGetHandleChunk;
+    private Object objChunkStatusFull = null;
 
     public SingleWorldListener() throws Exception {
         ReflectionUtils.RefClass classCraftChunk = getRefClass("{cb}.CraftChunk");
-        this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle").getRealMethod();
+        ReflectionUtils.RefClass classChunkAccess = getRefClass("net.minecraft.world.level.chunk.IChunkAccess");
+        this.methodSetUnsaved = classChunkAccess.getMethod("a", boolean.class).getRealMethod();
         try {
-            if (PlotSquared.platform().serverVersion()[1] < 17) {
-                ReflectionUtils.RefClass classChunk = getRefClass("{nms}.Chunk");
-                if (PlotSquared.platform().serverVersion()[1] == 13) {
-                    this.shouldSave = classChunk.getField("mustSave").getRealField();
-                } else {
-                    this.shouldSave = classChunk.getField("s").getRealField();
-                }
-            } else if (PlotSquared.platform().serverVersion()[1] == 17) {
-                ReflectionUtils.RefClass classChunk = getRefClass("net.minecraft.world.level.chunk.Chunk");
-                this.shouldSave = classChunk.getField("r").getRealField();
-            } else if (PlotSquared.platform().serverVersion()[1] == 18) {
-                ReflectionUtils.RefClass classChunk = getRefClass("net.minecraft.world.level.chunk.IChunkAccess");
-                this.shouldSave = classChunk.getField("b").getRealField();
+            this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle").getRealMethod();
+        } catch (NoSuchMethodException ignored) {
+            try {
+                ReflectionUtils.RefClass classChunkStatus = getRefClass("net.minecraft.world.level.chunk.ChunkStatus");
+                this.objChunkStatusFull = classChunkStatus.getRealClass().getField("n").get(null);
+                this.methodGetHandleChunk = classCraftChunk.getMethod("getHandle", classChunkStatus.getRealClass()).getRealMethod();
+            } catch (NoSuchMethodException ex) {
+                throw new RuntimeException(ex);
             }
-        } catch (NoSuchFieldException e) {
-            e.printStackTrace();
         }
     }
 
     public void markChunkAsClean(Chunk chunk) {
         try {
-            Object nmsChunk = methodGetHandleChunk.invoke(chunk);
-            if (shouldSave != null) {
-                this.shouldSave.set(nmsChunk, false);
-            }
+            Object nmsChunk = objChunkStatusFull != null
+                    ? this.methodGetHandleChunk.invoke(chunk, objChunkStatusFull)
+                    : this.methodGetHandleChunk.invoke(chunk);
+            methodSetUnsaved.invoke(nmsChunk, false);
         } catch (Throwable e) {
             e.printStackTrace();
         }
@@ -85,7 +79,12 @@ public class SingleWorldListener implements Listener {
         if (!SinglePlotArea.isSinglePlotWorld(name)) {
             return;
         }
-
+        int x = event.getChunk().getX();
+        int z = event.getChunk().getZ();
+        if (x < 16 && x > -16 && z < 16 && z > -16) {
+            // Allow spawn to generate
+            return;
+        }
         markChunkAsClean(event.getChunk());
     }
 

Bukkit/src/main/java/com/plotsquared/bukkit/schematic/StateWrapper.java

@@ -18,6 +18,8 @@
  */
 package com.plotsquared.bukkit.schematic;
 
+import com.destroystokyo.paper.profile.PlayerProfile;
+import com.destroystokyo.paper.profile.ProfileProperty;
 import com.plotsquared.bukkit.util.BukkitUtil;
 import com.sk89q.jnbt.ByteTag;
 import com.sk89q.jnbt.CompoundTag;
@@ -28,13 +30,20 @@ import com.sk89q.jnbt.Tag;
 import com.sk89q.worldedit.blocks.BaseItemStack;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.world.item.ItemType;
+import io.papermc.lib.PaperLib;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
+import org.bukkit.DyeColor;
 import org.bukkit.World;
+import org.bukkit.block.Banner;
 import org.bukkit.block.Block;
 import org.bukkit.block.Container;
 import org.bukkit.block.Sign;
 import org.bukkit.block.Skull;
+import org.bukkit.block.banner.Pattern;
+import org.bukkit.block.banner.PatternType;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
@@ -45,11 +54,15 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.UUID;
 
 public class StateWrapper {
 
-    public org.bukkit.block.BlockState state = null;
-    public CompoundTag tag = null;
+    public CompoundTag tag;
+
+    private boolean paperErrorTextureSent = false;
+    private static final Logger LOGGER = LogManager.getLogger("PlotSquared/" + StateWrapper.class.getSimpleName());
 
     public StateWrapper(CompoundTag tag) {
         this.tag = tag;
@@ -227,15 +240,64 @@ public class StateWrapper {
                         return true;
                     }
                     String player = skullOwner.getString("Name");
-                    if (player == null || player.isEmpty()) {
+
+                    if (player != null && !player.isEmpty()) {
+                        try {
+                            skull.setOwningPlayer(Bukkit.getOfflinePlayer(player));
+                            skull.update(true);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                        return true;
+                    }
+
+                    final CompoundTag properties = (CompoundTag) skullOwner.getValue().get("Properties");
+                    if (properties == null) {
                         return false;
                     }
-                    try {
-                        skull.setOwningPlayer(Bukkit.getOfflinePlayer(player));
-                        skull.update(true);
-                    } catch (Exception e) {
-                        e.printStackTrace();
+                    final ListTag textures = properties.getListTag("textures");
+                    if (textures.getValue().isEmpty()) {
+                        return false;
                     }
+                    final CompoundTag textureCompound = (CompoundTag) textures.getValue().get(0);
+                    if (textureCompound == null) {
+                        return false;
+                    }
+                    String textureValue = textureCompound.getString("Value");
+                    if (textureValue == null) {
+                        return false;
+                    }
+                    if (!PaperLib.isPaper()) {
+                        if (!paperErrorTextureSent) {
+                            paperErrorTextureSent = true;
+                            LOGGER.error("Failed to populate skull data in your road schematic - This is a Spigot limitation.");
+                        }
+                        return false;
+                    }
+                    final PlayerProfile profile = Bukkit.createProfile(UUID.randomUUID());
+                    profile.setProperty(new ProfileProperty("textures", textureValue));
+                    skull.setPlayerProfile(profile);
+                    skull.update(true);
+                    return true;
+
+                }
+                return false;
+            }
+            case "banner" -> {
+                if (state instanceof Banner banner) {
+                    List<Tag> patterns = this.tag.getListTag("Patterns").getValue();
+                    if (patterns == null || patterns.isEmpty()) {
+                        return false;
+                    }
+                    banner.setPatterns(patterns.stream().map(t -> (CompoundTag) t).map(compoundTag -> {
+                        DyeColor color = DyeColor.getByWoolData((byte) compoundTag.getInt("Color"));
+                        PatternType patternType = PatternType.getByIdentifier(compoundTag.getString("Pattern"));
+                        if (color == null || patternType == null) {
+                            return null;
+                        }
+                        return new Pattern(color, patternType);
+                    }).filter(Objects::nonNull).toList());
+                    banner.update(true);
                     return true;
                 }
                 return false;

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

@@ -44,6 +44,7 @@ import java.util.stream.IntStream;
 @Singleton
 public class BukkitInventoryUtil extends InventoryUtil {
 
+    @SuppressWarnings("deprecation") // Paper deprecation
     private static @Nullable ItemStack getItem(PlotItemStack item) {
         if (item == null) {
             return null;

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

@@ -67,6 +67,7 @@ public class BukkitSetupUtils extends SetupUtils {
         this.worldFile = worldFile;
     }
 
+    @SuppressWarnings("deprecation") // Paper deprecation
     @Override
     public void updateGenerators(final boolean force) {
         if (loaded && !SetupUtils.generators.isEmpty() && !force) {

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

@@ -28,24 +28,38 @@ import java.nio.file.Paths;
 import java.util.stream.Stream;
 
 /**
- * This is a helper class which replaces occurrences of 'suggest_command' with 'run_command' in messages_%.json.
+ * This is a helper class which replaces older syntax no longer supported by MiniMessage with replacements in messages_%.json.
  * MiniMessage changed the syntax between major releases. To warrant a smooth upgrade, we attempt to replace any occurrences
  * while loading PlotSquared.
  *
- * @since TODO
+ * @since 7.0.0
  */
 @NotPublic
 public class TranslationUpdateManager {
 
     public static void upgradeTranslationFile() throws IOException {
-        String searchText = "suggest_command";
-        String replacementText = "run_command";
+        String suggestCommand = "suggest_command";
+        String suggestCommandReplacement = "run_command";
+        String minHeight = "minHeight";
+        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
                     .filter(Files::isRegularFile)
                     .filter(p -> p.getFileName().toString().matches("messages_[a-z]{2}\\.json"))
-                    .forEach(p -> replaceInFile(p, searchText, replacementText));
+                    .forEach(p -> {
+                        replaceInFile(p, suggestCommand, suggestCommandReplacement);
+                        replaceInFile(p, minHeight, minheightReplacement);
+                        replaceInFile(p, maxHeight, maxheightReplacement);
+                        replaceInFile(p, usedGrants, usedGrantsReplacement);
+                        replaceInFile(p, remainingGrants, rremainingGrantsReplacement);
+                    });
         }
     }
 

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

@@ -60,7 +60,7 @@ public class UpdateUtility implements Listener {
         task = Bukkit.getScheduler().runTaskTimerAsynchronously(this.javaPlugin, () -> {
             try {
                 HttpsURLConnection connection = (HttpsURLConnection) new URL(
-                        "https://api.spigotmc.org/simple/0.1/index.php?action=getResource&id=77506")
+                        "https://api.spigotmc.org/simple/0.2/index.php?action=getResource&id=77506")
                         .openConnection();
                 connection.setRequestMethod("GET");
                 JsonObject result = new JsonParser()

CODE_OF_CONDUCT.md

@@ -1,76 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at contact<at>intellectualsites.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq

Core/build.gradle.kts

@@ -2,18 +2,18 @@ import java.time.format.DateTimeFormatter
 
 dependencies {
     // Expected everywhere.
-    compileOnlyApi("org.checkerframework:checker-qual")
+    compileOnlyApi(libs.checkerqual)
 
     // Minecraft expectations
-    compileOnlyApi("com.google.code.gson:gson")
-    compileOnly("com.google.guava:guava")
+    compileOnlyApi(libs.gson)
+    compileOnly(libs.guava)
 
     // Platform expectations
-    compileOnlyApi("org.yaml:snakeyaml")
+    compileOnlyApi(libs.snakeyaml)
 
     // Adventure
-    api("net.kyori:adventure-api")
-    api("net.kyori:adventure-text-minimessage")
+    api(libs.adventureApi)
+    api(libs.adventureMiniMessage)
 
     // Guice
     api(libs.guice) {
@@ -31,19 +31,19 @@ dependencies {
         exclude(group = "dummypermscompat")
     }
     testImplementation(libs.worldeditCore)
-    compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core") { isTransitive = false }
-    testImplementation("com.fastasyncworldedit:FastAsyncWorldEdit-Core") { isTransitive = false }
+    compileOnly(libs.faweBukkit) { isTransitive = false }
+    testImplementation(libs.faweCore) { isTransitive = false }
 
     // Logging
-    compileOnlyApi("org.apache.logging.log4j:log4j-api")
+    compileOnlyApi(libs.log4j)
 
     // Other libraries
     api(libs.prtree)
     api(libs.aopalliance)
     api(libs.cloudServices)
     api(libs.arkitektonika)
-    api("com.intellectualsites.paster:Paster")
-    api("com.intellectualsites.informative-annotations:informative-annotations")
+    api(libs.paster)
+    api(libs.informativeAnnotations)
 }
 
 tasks.processResources {
@@ -68,8 +68,8 @@ tasks {
         val isRelease = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "TODO" else rootProject.version.toString()
         val opt = options as StandardJavadocDocletOptions
         opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/" + libs.worldeditCore.get().versionConstraint.toString())
-        opt.links("https://jd.advntr.dev/api/4.12.0/")
-        opt.links("https://jd.advntr.dev/text-minimessage/4.12.0/")
+        opt.links("https://jd.advntr.dev/api/4.14.0/")
+        opt.links("https://jd.advntr.dev/text-minimessage/4.14.0/")
         opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
         opt.links("https://checkerframework.org/api/")
         opt.links("https://javadoc.io/doc/com.intellectualsites.informative-annotations/informative-annotations/latest/")

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

@@ -1281,7 +1281,7 @@ public class PlotSquared {
     }
 
     /**
-     * Setup the database connection.
+     * Set up 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("usedGrants", Tag.inserting(Component.text(grantedPlots - left)))
-                                        .tag("remainingGrants", Tag.inserting(Component.text(left)))
+                                        .tag("used_grants", Tag.inserting(Component.text(grantedPlots - left)))
+                                        .tag("remaining_grants", Tag.inserting(Component.text(left)))
                                         .build()
                         );
                     }
@@ -294,12 +294,15 @@ public class Auto extends SubCommand {
                 return true;
             }
         }
-        if (this.econHandler != null && plotarea.useEconomy()) {
+        if (this.econHandler != null && plotarea.useEconomy() && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON)) {
             PlotExpression costExp = plotarea.getPrices().get("claim");
+            PlotExpression mergeCostExp = plotarea.getPrices().get("merge");
+            int size = sizeX * sizeZ;
+            double mergeCost = size <= 1 || mergeCostExp == null ? 0d : mergeCostExp.evaluate(size);
             double cost = costExp.evaluate(Settings.Limit.GLOBAL ?
                     player.getPlotCount() :
                     player.getPlotCount(plotarea.getWorldName()));
-            cost = (sizeX * sizeZ) * cost;
+            cost = size * cost + mergeCost;
             if (cost > 0d) {
                 if (!this.econHandler.isSupported()) {
                     player.sendMessage(TranslatableCaption.of("economy.vault_or_consumer_null"));

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

@@ -141,7 +141,7 @@ public class Claim extends SubCommand {
                     }
                 }
             }
-            if (this.econHandler.isEnabled(area) && !force) {
+            if (this.econHandler.isEnabled(area) && !force && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON)) {
                 PlotExpression costExr = area.getPrices().get("claim");
                 double cost = costExr.evaluate(currentPlots);
                 if (cost > 0d) {
@@ -186,8 +186,8 @@ public class Claim extends SubCommand {
                 player.sendMessage(
                         TranslatableCaption.of("economy.removed_granted_plot"),
                         TagResolver.builder()
-                                .tag("usedGrants", Tag.inserting(Component.text(grants - 1)))
-                                .tag("remainingGrants", Tag.inserting(Component.text(grants)))
+                                .tag("used_grants", Tag.inserting(Component.text(grants - 1)))
+                                .tag("remaining_grants", Tag.inserting(Component.text(grants)))
                                 .build()
                 );
             }

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

@@ -96,6 +96,7 @@ 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/command/Done.java

@@ -103,7 +103,7 @@ public class Done extends SubCommand {
                 public void run(PlotAnalysis value) {
                     plot.removeRunning();
                     boolean result =
-                            value.getComplexity(doneRequirements) <= doneRequirements.THRESHOLD;
+                            value.getComplexity(doneRequirements) >= doneRequirements.THRESHOLD;
                     finish(plot, player, result);
                 }
             });

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

@@ -112,15 +112,15 @@ public class Kick extends SubCommand {
                 for (PlotPlayer<?> player2 : players) {
                     if (!plot.equals(player2.getCurrentPlot())) {
                         player.sendMessage(
-                                TranslatableCaption.of("errors.invalid_player"),
-                                TagResolver.resolver("value", Tag.inserting(Component.text(args[0])))
+                                TranslatableCaption.of("kick.player_not_in_plot"),
+                                TagResolver.resolver("player", Tag.inserting(Component.text(player2.getName())))
                         );
                         return;
                     }
                     if (player2.hasPermission(Permission.PERMISSION_ADMIN_ENTRY_DENIED)) {
                         player.sendMessage(
-                                TranslatableCaption.of("cluster.cannot_kick_player"),
-                                TagResolver.resolver("name", Tag.inserting(Component.text(player2.getName())))
+                                TranslatableCaption.of("kick.cannot_kick_player"),
+                                TagResolver.resolver("player", Tag.inserting(Component.text(player2.getName())))
                         );
                         return;
                     }

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

@@ -517,6 +517,7 @@ public class ListCmd extends SubCommand {
                     }
                 }
                 finalResolver.tag("players", Tag.inserting(builder.asComponent()));
+                finalResolver.tag("size", Tag.inserting(Component.text(plot.getConnectedPlots().size())));
                 caption.set(TranslatableCaption.of("info.plot_list_item"));
                 caption.setTagResolvers(finalResolver.build());
             }

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

@@ -183,7 +183,7 @@ public class MainCommand extends Command {
                     if (cmd.hasConfirmation(player)) {
                         CmdConfirm.addPending(player, cmd.getUsage(), () -> {
                             PlotArea area = player.getApplicablePlotArea();
-                            if (area != null && econHandler.isEnabled(area)) {
+                            if (area != null && econHandler.isEnabled(area) && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON)) {
                                 PlotExpression priceEval =
                                         area.getPrices().get(cmd.getFullId());
                                 double price = priceEval != null ? priceEval.evaluate(0d) : 0d;
@@ -201,7 +201,7 @@ public class MainCommand extends Command {
                         return;
                     }
                     PlotArea area = player.getApplicablePlotArea();
-                    if (area != null && econHandler.isEnabled(area)) {
+                    if (area != null && econHandler.isEnabled(area) && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON)) {
                         PlotExpression priceEval = area.getPrices().get(cmd.getFullId());
                         double price = priceEval != null ? priceEval.evaluate(0d) : 0d;
                         if (price != 0d && econHandler.getMoney(player) < price) {

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

@@ -109,7 +109,7 @@ public class Merge extends SubCommand {
                 }
             }
             if (direction == null && (args[0].equalsIgnoreCase("all") || args[0]
-                    .equalsIgnoreCase("auto"))) {
+                    .equalsIgnoreCase("auto")) && player.hasPermission(Permission.PERMISSION_MERGE_ALL)) {
                 direction = Direction.ALL;
             }
         }
@@ -178,7 +178,7 @@ public class Merge extends SubCommand {
                 return true;
             }
             if (plot.getPlotModificationManager().autoMerge(Direction.ALL, maxSize, uuid, player, terrain)) {
-                if (this.econHandler.isEnabled(plotArea) && price > 0d) {
+                if (this.econHandler.isEnabled(plotArea) && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON) && price > 0d) {
                     this.econHandler.withdrawMoney(player, price);
                     player.sendMessage(
                             TranslatableCaption.of("economy.removed_balance"),
@@ -196,8 +196,8 @@ public class Merge extends SubCommand {
             player.sendMessage(TranslatableCaption.of("merge.no_available_automerge"));
             return false;
         }
-        if (!force && this.econHandler.isEnabled(plotArea) && price > 0d
-                && this.econHandler.getMoney(player) < price) {
+        if (!force && this.econHandler.isEnabled(plotArea) && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON) && price > 0d && this.econHandler.getMoney(
+                player) < price) {
             player.sendMessage(
                     TranslatableCaption.of("economy.cannot_afford_merge"),
                     TagResolver.resolver("money", Tag.inserting(Component.text(this.econHandler.format(price))))
@@ -218,7 +218,7 @@ public class Merge extends SubCommand {
             return true;
         }
         if (plot.getPlotModificationManager().autoMerge(direction, maxSize - size, uuid, player, terrain)) {
-            if (this.econHandler.isEnabled(plotArea) && price > 0d) {
+            if (this.econHandler.isEnabled(plotArea) && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON) && price > 0d) {
                 this.econHandler.withdrawMoney(player, price);
                 player.sendMessage(
                         TranslatableCaption.of("economy.removed_balance"),
@@ -259,7 +259,7 @@ public class Merge extends SubCommand {
                     accepter.sendMessage(TranslatableCaption.of("merge.merge_not_valid"));
                     return;
                 }
-                if (this.econHandler.isEnabled(plotArea) && price > 0d) {
+                if (this.econHandler.isEnabled(plotArea) && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON) && price > 0d) {
                     if (!force && this.econHandler.getMoney(player) < price) {
                         player.sendMessage(
                                 TranslatableCaption.of("economy.cannot_afford_merge"),
@@ -303,7 +303,7 @@ public class Merge extends SubCommand {
                         player,
                         terrain
                 )) {
-                    if (this.econHandler.isEnabled(plotArea) && price > 0d) {
+                    if (this.econHandler.isEnabled(plotArea) && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON) && price > 0d) {
                         if (!force && this.econHandler.getMoney(player) < price) {
                             player.sendMessage(
                                     TranslatableCaption.of("economy.cannot_afford_merge"),

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

@@ -56,7 +56,7 @@ public class Music extends SubCommand {
             .asList("music_disc_13", "music_disc_cat", "music_disc_blocks", "music_disc_chirp",
                     "music_disc_far", "music_disc_mall", "music_disc_mellohi", "music_disc_stal",
                     "music_disc_strad", "music_disc_ward", "music_disc_11", "music_disc_wait", "music_disc_otherside",
-                    "music_disc_pigstep", "music_disc_5"
+                    "music_disc_pigstep", "music_disc_5", "music_disc_relic"
             );
 
     private final InventoryUtil inventoryUtil;

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

@@ -46,7 +46,7 @@ public class PluginCmd extends SubCommand {
             player.sendMessage(StaticCaption.of(
                     "<gray>>> </gray><gold><bold>Authors<reset><gray>: </gray><gold>Citymonstret </gold><gray>& </gray><gold>Empire92 </gold><gray>& </gray><gold>MattBDev </gold><gray>& </gray><gold>dordsor21 </gold><gray>& </gray><gold>NotMyFault </gold><gray>& </gray><gold>SirYwell</gold>"));
             player.sendMessage(StaticCaption.of(
-                    "<gray>>> </gray><gold><bold>Wiki<reset><gray>: </gray><gold><click:open_url:https://intellectualsites.github.io/plotsquared-documentation/>https://intellectualsites.github.io/plotsquared-documentation/</gold>"));
+                    "<gray>>> </gray><gold><bold>Wiki<reset><gray>: </gray><gold><click:open_url:https://intellectualsites.gitbook.io/plotsquared/>https://intellectualsites.gitbook.io/plotsquared/</gold>"));
             player.sendMessage(StaticCaption.of(
                     "<gray>>> </gray><gold><bold>Discord<reset><gray>: </gray><gold><click:open_url:https://discord.gg/intellectualsites>https://discord.gg/intellectualsites</gold>"));
             player.sendMessage(

Core/src/main/java/com/plotsquared/core/components/ComponentPresetManager.java

@@ -206,7 +206,7 @@ public class ComponentPresetManager {
                     return false;
                 }
 
-                if (componentPreset.cost() > 0.0D) {
+                if (componentPreset.cost() > 0.0D && !player.hasPermission(Permission.PERMISSION_ADMIN_BYPASS_ECON)) {
                     if (!econHandler.isEnabled(plot.getArea())) {
                         getPlayer().sendMessage(
                                 TranslatableCaption.of("preset.economy_disabled"),

Core/src/main/java/com/plotsquared/core/configuration/Settings.java

@@ -194,7 +194,7 @@ public class Settings extends Config {
         public List<String> WORLDS = new ArrayList<>(Collections.singletonList("*"));
 
 
-        @Comment("See: https://intellectualsites.github.io/plotsquared-documentation/optimization/plot-analysis for a description of each value.")
+        @Comment("See: https://intellectualsites.gitbook.io/plotsquared/optimization/plot-analysis for a description of each value.")
         public static final class CALIBRATION {
 
             public int VARIETY = 0;
@@ -214,7 +214,7 @@ public class Settings extends Config {
 
 
     @Comment({"Chunk processor related settings",
-            "See https://intellectualsites.github.io/plotsquared-documentation/optimization/chunk-processor for more information."})
+            "See https://intellectualsites.gitbook.io/plotsquared/optimization/chunk-processor for more information."})
     public static class Chunk_Processor {
 
         @Comment("Auto trim will not save chunks which aren't claimed")
@@ -280,7 +280,7 @@ public class Settings extends Config {
         @Comment("Always show explosion Particles, even if explosion flag is set to false")
         public static boolean ALWAYS_SHOW_EXPLOSIONS = false;
         @Comment({"Blocks that may not be used in plot components",
-                "Checkout the wiki article regarding plot components before modifying: https://intellectualsites.github.io/plotsquared-documentation/customization/plot-components"})
+                "Checkout the wiki article regarding plot components before modifying: https://intellectualsites.gitbook.io/plotsquared/customization/plot-components"})
         public static List<String>
                 INVALID_BLOCKS = Arrays.asList(
                 // Acacia Stuff
@@ -402,7 +402,7 @@ public class Settings extends Config {
 
 
     @Comment({"Schematic Settings",
-            "See https://intellectualsites.github.io/plotsquared-documentation/schematics/schematic-on-claim for more information."})
+            "See https://intellectualsites.gitbook.io/plotsquared/schematics/schematic-on-claim for more information."})
     public static final class Schematics {
 
         @Comment(
@@ -531,7 +531,7 @@ public class Settings extends Config {
 
 
     @Comment({"Backup related settings",
-            "See https://intellectualsites.github.io/plotsquared-documentation/plot-backups for more information."})
+            "See https://intellectualsites.gitbook.io/plotsquared/plot-backups for more information."})
     public static final class Backup {
 
         @Comment("Automatically backup plots when destructive commands are performed, e.g. /plot clear")
@@ -783,7 +783,7 @@ public class Settings extends Config {
         public static boolean
                 PERSISTENT_ROAD_REGEN = true;
         @Comment({"Enable the `/plot component` preset GUI",
-                "Read more about components here: https://intellectualsites.github.io/plotsquared-documentation/customization/plot-components"})
+                "Read more about components here: https://intellectualsites.gitbook.io/plotsquared/customization/plot-components"})
         public static boolean COMPONENT_PRESETS = true;
         @Comment("Enable per user locale")
         public static boolean PER_USER_LOCALE = false;

Core/src/main/java/com/plotsquared/core/configuration/caption/Caption.java

@@ -40,7 +40,7 @@ public interface Caption {
      *
      * @param localeHolder Locale holder
      * @return {@link ComponentLike}
-     * @since TODO
+     * @since 7.0.0
      */
     @NonNull Component toComponent(@NonNull LocaleHolder localeHolder);
 

Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionHolder.java

@@ -51,7 +51,7 @@ public class CaptionHolder {
      * Get the {@link TagResolver}s to use when resolving tags in the {@link Caption}.
      *
      * @return The tag resolvers to use.
-     * @since TODO
+     * @since 7.0.0
      */
     public TagResolver[] getTagResolvers() {
         return this.tagResolvers;
@@ -61,7 +61,7 @@ public class CaptionHolder {
      * Set the {@link TagResolver}s to use when resolving tags in the {@link Caption}.
      *
      * @param tagResolvers The tag resolvers to use.
-     * @since TODO
+     * @since 7.0.0
      */
     public void setTagResolvers(TagResolver... tagResolvers) {
         this.tagResolvers = tagResolvers;

Core/src/main/java/com/plotsquared/core/configuration/caption/CaptionUtility.java

@@ -28,16 +28,20 @@ import com.plotsquared.core.plot.flag.implementations.PlotTitleFlag;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.event.ClickEvent;
 import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.kyori.adventure.text.minimessage.ParsingException;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.Set;
+import java.util.regex.Pattern;
 
 import static com.plotsquared.core.configuration.caption.ComponentTransform.nested;
 import static com.plotsquared.core.configuration.caption.ComponentTransform.stripClicks;
 
 public class CaptionUtility {
 
+    private static final Pattern LEGACY_FORMATTING = Pattern.compile("§[a-gklmnor0-9]");
+
     // flags which values are parsed by minimessage
     private static final Set<Class<? extends PlotFlag<?, ?>>> MINI_MESSAGE_FLAGS = Set.of(
             GreetingFlag.class,
@@ -100,7 +104,14 @@ public class CaptionUtility {
      */
     public static String stripClickEvents(final @NonNull String miniMessageString) {
         // parse, transform and serialize again
-        Component component = MiniMessage.miniMessage().deserialize(miniMessageString);
+        Component component;
+        try {
+            component = MiniMessage.miniMessage().deserialize(miniMessageString);
+        } catch (ParsingException e) {
+            // if the String cannot be parsed, we try stripping legacy colors
+            String legacyStripped = LEGACY_FORMATTING.matcher(miniMessageString).replaceAll("");
+            component = MiniMessage.miniMessage().deserialize(legacyStripped);
+        }
         component = CLICK_STRIP_TRANSFORM.transform(component);
         return MiniMessage.miniMessage().serialize(component);
     }

Core/src/main/java/com/plotsquared/core/configuration/file/YamlConstructor.java

@@ -19,6 +19,7 @@
 package com.plotsquared.core.configuration.file;
 
 import com.plotsquared.core.configuration.serialization.ConfigurationSerialization;
+import org.yaml.snakeyaml.LoaderOptions;
 import org.yaml.snakeyaml.constructor.SafeConstructor;
 import org.yaml.snakeyaml.error.YAMLException;
 import org.yaml.snakeyaml.nodes.Node;
@@ -30,6 +31,7 @@ import java.util.Map;
 public class YamlConstructor extends SafeConstructor {
 
     YamlConstructor() {
+        super(new LoaderOptions());
         yamlConstructors.put(Tag.MAP, new ConstructCustomObject());
     }
 

Core/src/main/java/com/plotsquared/core/configuration/file/YamlRepresenter.java

@@ -21,6 +21,7 @@ package com.plotsquared.core.configuration.file;
 import com.plotsquared.core.configuration.ConfigurationSection;
 import com.plotsquared.core.configuration.serialization.ConfigurationSerializable;
 import com.plotsquared.core.configuration.serialization.ConfigurationSerialization;
+import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.nodes.Node;
 import org.yaml.snakeyaml.representer.Representer;
 
@@ -30,6 +31,7 @@ import java.util.Map;
 class YamlRepresenter extends Representer {
 
     YamlRepresenter() {
+        super(new DumperOptions());
         this.multiRepresenters.put(ConfigurationSection.class, new RepresentConfigurationSection());
         this.multiRepresenters
                 .put(ConfigurationSerializable.class, new RepresentConfigurationSerializable());

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

@@ -379,10 +379,11 @@ public class ClassicPlotManager extends SquarePlotManager {
             }
         }
 
+        int yStart = classicPlotWorld.getMinBuildHeight() + (classicPlotWorld.PLOT_BEDROCK ? 1 : 0);
         if (!plot.isMerged(Direction.NORTH)) {
             int z = bot.getZ();
             for (int x = bot.getX(); x < top.getX(); x++) {
-                for (int y = classicPlotWorld.getMinBuildHeight(); y <= classicPlotWorld.WALL_HEIGHT; y++) {
+                for (int y = yStart; y <= classicPlotWorld.WALL_HEIGHT; y++) {
                     queue.setBlock(x, y, z, blocks);
                 }
             }
@@ -390,7 +391,7 @@ public class ClassicPlotManager extends SquarePlotManager {
         if (!plot.isMerged(Direction.WEST)) {
             int x = bot.getX();
             for (int z = bot.getZ(); z < top.getZ(); z++) {
-                for (int y = classicPlotWorld.getMinBuildHeight(); y <= classicPlotWorld.WALL_HEIGHT; y++) {
+                for (int y = yStart; y <= classicPlotWorld.WALL_HEIGHT; y++) {
                     queue.setBlock(x, y, z, blocks);
                 }
             }
@@ -398,7 +399,7 @@ public class ClassicPlotManager extends SquarePlotManager {
         if (!plot.isMerged(Direction.SOUTH)) {
             int z = top.getZ();
             for (int x = bot.getX(); x < top.getX() + (plot.isMerged(Direction.EAST) ? 0 : 1); x++) {
-                for (int y = classicPlotWorld.getMinBuildHeight(); y <= classicPlotWorld.WALL_HEIGHT; y++) {
+                for (int y = yStart; y <= classicPlotWorld.WALL_HEIGHT; y++) {
                     queue.setBlock(x, y, z, blocks);
                 }
             }
@@ -406,7 +407,7 @@ public class ClassicPlotManager extends SquarePlotManager {
         if (!plot.isMerged(Direction.EAST)) {
             int x = top.getX();
             for (int z = bot.getZ(); z < top.getZ() + (plot.isMerged(Direction.SOUTH) ? 0 : 1); z++) {
-                for (int y = classicPlotWorld.getMinBuildHeight(); y <= classicPlotWorld.WALL_HEIGHT; y++) {
+                for (int y = yStart; y <= classicPlotWorld.WALL_HEIGHT; y++) {
                     queue.setBlock(x, y, z, blocks);
                 }
             }

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

@@ -69,8 +69,8 @@ public class HybridGen extends IndependentPlotGenerator {
             EnumSet<SchematicFeature> features
     ) {
         int minY; // Math.min(world.PLOT_HEIGHT, world.ROAD_HEIGHT);
-        if ((features.contains(SchematicFeature.ROAD) && Settings.Schematics.PASTE_ROAD_ON_TOP)
-                || (!features.contains(SchematicFeature.ROAD) && Settings.Schematics.PASTE_ON_TOP)) {
+        boolean isRoad = features.contains(SchematicFeature.ROAD);
+        if ((isRoad && Settings.Schematics.PASTE_ROAD_ON_TOP) || (!isRoad && Settings.Schematics.PASTE_ON_TOP)) {
             minY = world.SCHEM_Y;
         } else {
             minY = world.getMinBuildHeight();

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

@@ -162,6 +162,7 @@ public class HybridPlotManager extends ClassicPlotManager {
         } else {
             minY = hybridPlotWorld.getMinBuildHeight();
         }
+        int schemYDiff = (isRoad ? hybridPlotWorld.getRoadYStart() : hybridPlotWorld.getPlotYStart()) - minY;
         BaseBlock airBlock = BlockTypes.AIR.getDefaultState().toBaseBlock();
         for (int x = pos1.getX(); x <= pos2.getX(); x++) {
             short absX = (short) ((x - hybridPlotWorld.ROAD_OFFSET_X) % size);
@@ -178,10 +179,14 @@ public class HybridPlotManager extends ClassicPlotManager {
                     for (int y = 0; y < blocks.length; y++) {
                         if (blocks[y] != null) {
                             queue.setBlock(x, minY + y, z, blocks[y]);
-                        } else if (!isRoad) {
-                            // This is necessary, otherwise any blocks not specified in the schematic will remain after a clear
-                            //  Do not set air for road as this may cause cavernous roads when debugroadregen is used
+                        } else if (y > schemYDiff) {
+                            // This is necessary, otherwise any blocks not specified in the schematic will remain after a clear.
+                            // This should only be done where the schematic has actually "started"
                             queue.setBlock(x, minY + y, z, airBlock);
+                        } else if (isRoad) {
+                            queue.setBlock(x, minY + y, z, hybridPlotWorld.ROAD_BLOCK.toPattern());
+                        } else {
+                            queue.setBlock(x, minY + y, z, hybridPlotWorld.MAIN_BLOCK.toPattern());
                         }
                     }
                 }

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

@@ -76,6 +76,9 @@ public class HybridPlotWorld extends ClassicPlotWorld {
      * The Y level at which schematic generation will start, lowest of either road or plot schematic generation.
      */
     public int SCHEM_Y;
+
+    private int plotY;
+    private int roadY;
     private Location SIGN_LOCATION;
     private File root = null;
     private int lastOverlayHeightError = Integer.MIN_VALUE;
@@ -252,68 +255,60 @@ public class HybridPlotWorld extends ClassicPlotWorld {
 
         SCHEM_Y = schematicStartHeight();
 
-        // plotY and roadY are important to allow plot and/or road schematic "overflow" into each other without causing AIOOB
-        //  exceptions when attempting either to set blocks to, or get block from G_SCH
+        // plotY and roadY are important to allow plot and/or road schematic "overflow" into each other
+        // without causing AIOOB exceptions when attempting either to set blocks to, or get block from G_SCH
         // Default plot schematic start height, normalized to the minimum height schematics are pasted from.
-        int plotY = PLOT_HEIGHT - SCHEM_Y;
+        plotY = PLOT_HEIGHT - SCHEM_Y;
         int minRoadWall = Settings.Schematics.USE_WALL_IN_ROAD_SCHEM_HEIGHT ? Math.min(ROAD_HEIGHT, WALL_HEIGHT) : ROAD_HEIGHT;
         // Default road schematic start height, normalized to the minimum height schematics are pasted from.
-        int roadY = minRoadWall - SCHEM_Y;
+        roadY = minRoadWall - SCHEM_Y;
 
         int worldGenHeight = getMaxGenHeight() - getMinGenHeight() + 1;
 
-        int maxSchematicHeight = 0;
         int plotSchemHeight = 0;
 
         // SCHEM_Y should be normalised to the plot "start" height
         if (schematic3 != null) {
-            plotSchemHeight = maxSchematicHeight = schematic3.getClipboard().getDimensions().getY();
-            if (maxSchematicHeight == worldGenHeight) {
+            plotSchemHeight = schematic3.getClipboard().getDimensions().getY();
+            if (plotSchemHeight == worldGenHeight) {
                 SCHEM_Y = getMinGenHeight();
                 plotY = 0;
             } else if (!Settings.Schematics.PASTE_ON_TOP) {
-                SCHEM_Y = getMinBuildHeight();
+                SCHEM_Y = getMinGenHeight();
                 plotY = 0;
             }
         }
 
-        int roadSchemHeight;
+        int roadSchemHeight = 0;
 
         if (schematic1 != null) {
             roadSchemHeight = Math.max(
                     schematic1.getClipboard().getDimensions().getY(),
                     schematic2.getClipboard().getDimensions().getY()
             );
-            maxSchematicHeight = Math.max(roadSchemHeight, maxSchematicHeight);
-            if (maxSchematicHeight == worldGenHeight) {
+            if (roadSchemHeight == worldGenHeight) {
                 SCHEM_Y = getMinGenHeight();
                 roadY = 0; // Road is the lowest schematic
                 if (schematic3 != null && schematic3.getClipboard().getDimensions().getY() != worldGenHeight) {
                     // Road is the lowest schematic. Normalize plotY to it.
                     if (Settings.Schematics.PASTE_ON_TOP) {
                         plotY = PLOT_HEIGHT - getMinGenHeight();
-                    } else {
-                        plotY = getMinBuildHeight() - getMinGenHeight();
                     }
                 }
             } else if (!Settings.Schematics.PASTE_ROAD_ON_TOP) {
-                if (SCHEM_Y == getMinGenHeight()) { // Only possible if plot schematic is enabled
-                    // Plot is still the lowest schematic, normalize roadY to it
-                    roadY = getMinBuildHeight() - getMinGenHeight();
-                } else if (schematic3 != null) {
-                    SCHEM_Y = getMinBuildHeight();
-                    roadY = 0;// Road is the lowest schematic
+                roadY = 0;
+                SCHEM_Y = getMinGenHeight();
+                if (schematic3 != null) {
                     if (Settings.Schematics.PASTE_ON_TOP) {
                         // Road is the lowest schematic. Normalize plotY to it.
-                        plotY = PLOT_HEIGHT - getMinBuildHeight();
+                        plotY = PLOT_HEIGHT - SCHEM_Y;
                     }
-                    maxSchematicHeight = Math.max(maxSchematicHeight, plotY + plotSchemHeight);
                 }
             } else {
                 roadY = minRoadWall - SCHEM_Y;
-                maxSchematicHeight = Math.max(maxSchematicHeight, roadY + roadSchemHeight);
             }
         }
+        int maxSchematicHeight = Math.max(plotY + plotSchemHeight, roadY + roadSchemHeight);
 
         if (schematic3 != null) {
             this.PLOT_SCHEMATIC = true;
@@ -554,4 +549,24 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         return this.root;
     }
 
+    /**
+     * Get the y value where the plot schematic should be pasted from.
+     *
+     * @return plot schematic y start value
+     * @since 7.0.0
+     */
+    public int getPlotYStart() {
+        return SCHEM_Y + plotY;
+    }
+
+    /**
+     * Get the y value where the road schematic should be pasted from.
+     *
+     * @return road schematic y start value
+     * @since 7.0.0
+     */
+    public int getRoadYStart() {
+        return SCHEM_Y + roadY;
+    }
+
 }

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

@@ -77,6 +77,10 @@ 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;
@@ -529,7 +533,7 @@ public class HybridUtils {
                 Math.min(plotworld.PLOT_HEIGHT, Math.min(plotworld.WALL_HEIGHT, plotworld.ROAD_HEIGHT)) : plotworld.ROAD_HEIGHT;
         int sx = bot.getX() - plotworld.ROAD_WIDTH + 1;
         int sz = bot.getZ() + 1;
-        int sy = Settings.Schematics.PASTE_ROAD_ON_TOP ? schemY : plot.getArea().getMinBuildHeight();
+        int sy = Settings.Schematics.PASTE_ROAD_ON_TOP ? schemY : plot.getArea().getMinGenHeight();
         int ex = bot.getX();
         int ez = top.getZ();
         int ey = get_ey(plotworld, queue, sx, ex, sz, ez, sy);
@@ -668,7 +672,7 @@ public class HybridUtils {
                     }
                     if (condition) {
                         BaseBlock[] blocks = plotWorld.G_SCH.get(MathMan.pair(absX, absZ));
-                        int minY = Settings.Schematics.PASTE_ROAD_ON_TOP ? plotWorld.SCHEM_Y : area.getMinGenHeight() + 1;
+                        int minY = plotWorld.getRoadYStart();
                         int maxDy = Math.max(extend, blocks.length);
                         for (int dy = 0; dy < maxDy; dy++) {
                             if (dy > blocks.length - 1) {

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

@@ -46,7 +46,7 @@ public abstract class IndependentPlotGenerator {
      * @param result   Queue to write to
      * @param settings PlotArea (settings)
      * @param biomes   If biomes should be generated
-     * @since TODO
+     * @since 7.0.0
      */
     public abstract void generateChunk(ZeroedDelegateScopedQueueCoordinator result, PlotArea settings, boolean biomes);
 
@@ -55,7 +55,7 @@ public abstract class IndependentPlotGenerator {
      *
      * @param result  Queue to write to
      * @param setting PlotArea (settings)
-     * @since TODO
+     * @since 7.0.0
      */
     public void populateChunk(ZeroedDelegateScopedQueueCoordinator result, PlotArea setting) {
     }
@@ -108,7 +108,7 @@ public abstract class IndependentPlotGenerator {
      * @param y        World y position
      * @param z        World z position
      * @return Biome type to be generated
-     * @since TODO
+     * @since 7.0.0
      */
     public abstract BiomeType getBiome(PlotArea settings, int x, int y, int z);
 

Core/src/main/java/com/plotsquared/core/location/UncheckedWorldLocation.java

@@ -60,6 +60,19 @@ public final class UncheckedWorldLocation extends Location {
         return new UncheckedWorldLocation(world, x, y, z);
     }
 
+    /**
+     * Construct a new location with yaw and pitch equal to 0
+     *
+     * @param world World
+     * @param loc   Coordinates
+     * @return New location
+     * @since 7.0.0
+     */
+    @DoNotUse
+    public static @NonNull UncheckedWorldLocation at(final @NonNull String world, BlockVector3 loc) {
+        return new UncheckedWorldLocation(world, loc.getX(), loc.getY(), loc.getZ());
+    }
+
     @Override
     @DoNotUse
     public @NonNull String getWorldName() {

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

@@ -45,6 +45,7 @@ public enum Permission implements ComponentLike {
     PERMISSION_ADMIN_ENTRY_FORCEFIELD("plots.admin.entry.forcefield"),
     PERMISSION_ADMIN_COMMANDS_CHATSPY("plots.admin.command.chatspy"),
     PERMISSION_MERGE("plots.merge"),
+    PERMISSION_MERGE_ALL("plots.merge.all"),
     PERMISSION_MERGE_OTHER("plots.merge.other"),
     PERMISSION_MERGE_KEEP_ROAD("plots.merge.keeproad"),
     PERMISSION_ADMIN_CAPS_OTHER("plots.admin.caps.other"),
@@ -200,7 +201,8 @@ public enum Permission implements ComponentLike {
     PERMISSION_RATE("plots.rate"),
     PERMISSION_ADMIN_FLIGHT("plots.admin.flight"),
     PERMISSION_ADMIN_COMPONENTS_OTHER("plots.admin.component.other"),
-    PERMISSION_ADMIN_BYPASS_BORDER("plots.admin.border.bypass");
+    PERMISSION_ADMIN_BYPASS_BORDER("plots.admin.border.bypass"),
+    PERMISSION_ADMIN_BYPASS_ECON("plots.admin.econ.bypass");
     //</editor-fold>
 
     private final String text;

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

@@ -25,9 +25,9 @@ import java.util.UUID;
 public interface OfflinePlotPlayer extends PermissionHolder {
 
     /**
-     * Gets the {@code UUID} of this player
+     * Returns the UUID of the player.
      *
-     * @return the player {@link UUID}
+     * @return the UUID of the player
      */
     UUID getUUID();
 
@@ -39,9 +39,9 @@ public interface OfflinePlotPlayer extends PermissionHolder {
     long getLastPlayed();
 
     /**
-     * Gets the name of this player.
+     * Returns the name of the player.
      *
-     * @return the player name
+     * @return the name of the player
      */
     String getName();
 

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

@@ -273,8 +273,9 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
         return this.meta == null ? null : this.meta.remove(key);
     }
 
+
     /**
-     * This player's name.
+     * Returns the name of the player.
      *
      * @return the name of the player
      */

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

@@ -20,7 +20,6 @@ package com.plotsquared.core.plot;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
 import com.google.inject.Inject;
 import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.command.Like;
@@ -2418,7 +2417,6 @@ public class Plot {
         if (!this.isMerged()) {
             Location pos1 = this.getBottomAbs().withY(getArea().getMinBuildHeight());
             Location pos2 = this.getTopAbs().withY(getArea().getMaxBuildHeight());
-            this.connectedCache = Sets.newHashSet(this);
             CuboidRegion rg = new CuboidRegion(pos1.getBlockVector3(), pos2.getBlockVector3());
             return Collections.singleton(rg);
         }

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

@@ -180,8 +180,7 @@ public abstract class PlotArea implements ComponentLike {
         this.worldConfiguration = worldConfiguration;
     }
 
-    private static Collection<PlotFlag<?, ?>> parseFlags(List<String> flagStrings) {
-        final Collection<PlotFlag<?, ?>> flags = new ArrayList<>();
+    private static void parseFlags(FlagContainer flagContainer, List<String> flagStrings) {
         for (final String key : flagStrings) {
             final String[] split;
             if (key.contains(";")) {
@@ -193,7 +192,7 @@ public abstract class PlotArea implements ComponentLike {
                     GlobalFlagContainer.getInstance().getFlagFromString(split[0]);
             if (flagInstance != null) {
                 try {
-                    flags.add(flagInstance.parse(split[1]));
+                    flagContainer.addFlag(flagInstance.parse(split[1]));
                 } catch (final FlagParseException e) {
                     LOGGER.warn(
                             "Failed to parse default flag with key '{}' and value '{}'. "
@@ -204,9 +203,10 @@ public abstract class PlotArea implements ComponentLike {
                     );
                     e.printStackTrace();
                 }
+            } else {
+                flagContainer.addUnknownFlag(split[0], split[1]);
             }
         }
-        return flags;
     }
 
     @NonNull
@@ -405,7 +405,7 @@ public abstract class PlotArea implements ComponentLike {
                 }
             }
         }
-        this.getFlagContainer().addAll(parseFlags(flags));
+        parseFlags(this.getFlagContainer(), flags);
         ConsolePlayer.getConsole().sendMessage(
                 TranslatableCaption.of("flags.area_flags"),
                 TagResolver.resolver("flags", Tag.inserting(Component.text(flags.toString())))
@@ -427,7 +427,7 @@ public abstract class PlotArea implements ComponentLike {
             }
         }
         this.roadFlags = roadflags.size() > 0;
-        this.getRoadFlagContainer().addAll(parseFlags(roadflags));
+        parseFlags(this.getRoadFlagContainer(), roadflags);
         ConsolePlayer.getConsole().sendMessage(
                 TranslatableCaption.of("flags.road_flags"),
                 TagResolver.resolver("flags", Tag.inserting(Component.text(roadflags.toString())))
@@ -657,9 +657,9 @@ public abstract class PlotArea implements ComponentLike {
             player.sendMessage(
                     TranslatableCaption.of("height.height_limit"),
                     TagResolver.builder()
-                            .tag("minHeight", Tag.inserting(Component.text(minBuildHeight)))
+                            .tag("minheight", Tag.inserting(Component.text(minBuildHeight)))
                             .tag(
-                                    "maxHeight",
+                                    "maxheight",
                                     Tag.inserting(Component.text(maxBuildHeight))
                             ).build()
             );

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

@@ -26,8 +26,8 @@ import java.util.Iterator;
 import java.util.NoSuchElementException;
 
 /**
- * Plot (X,Y) tuples for plot locations
- * within a plot area
+ * The PlotId class represents a Plot's x and y coordinates within a {@link PlotArea}. PlotId x,y values do not correspond to Block locations.
+ * A PlotId instance can be created using the {@link #of(int, int)} method or parsed from a string using the {@link #fromString(String)} method.
  */
 public final class PlotId {
 
@@ -36,10 +36,10 @@ public final class PlotId {
     private final int hash;
 
     /**
-     * PlotId class (PlotId x,y values do not correspond to Block locations)
+     * Constructs a new PlotId with the given x and y coordinates.
      *
-     * @param x The plot x coordinate
-     * @param y The plot y coordinate
+     * @param x the x-coordinate of the plot
+     * @param y the y-coordinate of the plot
      */
     private PlotId(final int x, final int y) {
         this.x = x;
@@ -48,11 +48,11 @@ public final class PlotId {
     }
 
     /**
-     * Create a new plot ID instance
+     * Returns a new PlotId instance with the specified x and y coordinates.
      *
-     * @param x The plot x coordinate
-     * @param y The plot y coordinate
-     * @return a new PlotId at x,y
+     * @param x the x-coordinate of the plot
+     * @param y the y-coordinate of the plot
+     * @return a new PlotId instance with the specified x and y coordinates
      */
     public static @NonNull PlotId of(final int x, final int y) {
         return new PlotId(x, y);
@@ -74,10 +74,13 @@ public final class PlotId {
     }
 
     /**
-     * Attempt to parse a plot ID from a string
+     * Returns a PlotId object from the given string, or null if the string is invalid.
+     * The string should be in the format "x;y" where x and y are integers.
+     * The string can also contain any combination of the characters ";_,."
+     * as delimiters.
      *
-     * @param string ID string
-     * @return Plot ID, or {@code null} if none could be parsed
+     * @param string the string to parse
+     * @return a PlotId object parsed from the given string, or null if the string is invalid
      */
     public static @Nullable PlotId fromStringOrNull(final @NonNull String string) {
         final String[] parts = string.split("[;_,.]");
@@ -95,39 +98,39 @@ public final class PlotId {
         return of(x, y);
     }
 
+
     /**
-     * Gets the PlotId from the HashCode<br>
-     * Note: Only accurate for small x,z values (short)
+     * Returns a new PlotId instance from the given hash.
      *
-     * @param hash ID hash
-     * @return Plot ID
+     * @param hash the hash to unpair
+     * @return a new PlotId instance
      */
     public static @NonNull PlotId unpair(final int hash) {
         return PlotId.of(hash >> 16, hash & 0xFFFF);
     }
 
     /**
-     * Get the ID X component
+     * Returns the x-coordinate of this Plot ID.
      *
-     * @return X component
+     * @return the x-coordinate of this Plot ID
      */
     public int getX() {
         return this.x;
     }
 
     /**
-     * Get the ID Y component
+     * Returns the y-coordinate of this Plot ID.
      *
-     * @return Y component
+     * @return the y-coordinate of this Plot ID
      */
     public int getY() {
         return this.y;
     }
 
     /**
-     * Get the next plot ID for claiming purposes
+     * Returns the next Plot ID for claiming purposes based on the current Plot ID.
      *
-     * @return Next plot ID
+     * @return the next Plot ID
      */
     public @NonNull PlotId getNextId() {
         final int absX = Math.abs(x);
@@ -159,10 +162,11 @@ public final class PlotId {
     }
 
     /**
-     * Get the PlotId in a relative direction
+     * Returns a new Plot ID in the specified relative direction based on the
+     * current Plot ID.
      *
-     * @param direction Direction
-     * @return Relative plot ID
+     * @param direction the direction in which to get the relative Plot ID
+     * @return the relative Plot ID
      */
     public @NonNull PlotId getRelative(final @NonNull Direction direction) {
         return switch (direction) {
@@ -193,10 +197,11 @@ public final class PlotId {
     }
 
     /**
-     * Get a String representation of the plot ID where the
-     * components are separated by ";"
+     * Returns a string representation of this Plot ID in the format "x;y".
      *
-     * @return {@code x + ";" + y}
+     * <p> The format is {@code x + ";" + y}
+     *
+     * @return a string representation of this Plot ID
      */
     @Override
     public @NonNull String toString() {
@@ -204,41 +209,40 @@ public final class PlotId {
     }
 
     /**
-     * Get a String representation of the plot ID where the
-     * components are separated by a specified string
+     * Returns a string representation of this Plot ID with the specified separator.
+     * <p>
+     * The format is {@code x + separator + y}
      *
-     * @param separator Separator
-     * @return {@code x + separator + y}
+     * @param separator the separator to use between the X and Y coordinates
+     * @return a string representation of this Plot ID with the specified separator
      */
     public @NonNull String toSeparatedString(String separator) {
         return this.getX() + separator + this.getY();
     }
 
     /**
-     * Get a String representation of the plot ID where the
-     * components are separated by ","
+     * Returns a string representation of this Plot ID in the format "x,y".
      *
-     * @return {@code x + "," + y}
+     * @return a string representation of this Plot ID
      */
     public @NonNull String toCommaSeparatedString() {
         return this.getX() + "," + this.getY();
     }
 
     /**
-     * Get a String representation of the plot ID where the
-     * components are separated by "_"
+     * Returns a string representation of this Plot ID in the format "x_y".
      *
-     * @return {@code x + "_" + y}
+     * @return a string representation of this Plot ID
      */
+
     public @NonNull String toUnderscoreSeparatedString() {
         return this.getX() + "_" + this.getY();
     }
 
     /**
-     * Get a String representation of the plot ID where the
-     * components are separated by "-"
+     * Returns a string representation of this Plot ID in the format "x-y".
      *
-     * @return {@code x + "-" + y}
+     * @return a string representation of this Plot ID
      */
     public @NonNull String toDashSeparatedString() {
         return this.getX() + "-" + this.getY();
@@ -250,6 +254,10 @@ public final class PlotId {
     }
 
 
+    /**
+     * An iterator that iterates over a range of {@link PlotId}s.
+     * The range is defined by a start and end {@link PlotId}.
+     */
     public static final class PlotRangeIterator implements Iterator<PlotId>, Iterable<PlotId> {
 
         private final PlotId start;
@@ -265,6 +273,13 @@ public final class PlotId {
             this.y = this.start.getY();
         }
 
+        /**
+         * Returns a new {@link PlotRangeIterator} that iterates over the range of Plots between the specified start and end Plots (inclusive).
+         *
+         * @param start the starting Plot of the range
+         * @param end the ending Plot of the range
+         * @return a new {@link PlotRangeIterator} that iterates over the range of Plots between the specified start and end Plots (inclusive)
+         */
         public static PlotRangeIterator range(final @NonNull PlotId start, final @NonNull PlotId end) {
             return new PlotRangeIterator(start, end);
         }

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

@@ -67,14 +67,25 @@ public class PlotItemStack {
         return this.type;
     }
 
+    /**
+     * Returns the number of items in this stack.
+     * Valid values range from 1-255.
+     *
+     * @return the amount of items in this stack
+     */
     public int getAmount() {
         return amount;
     }
 
+    /**
+     * Returns the given name of this stack of items. The name is displayed when
+     * hovering over the item.
+     *
+     * @return the given name of this stack of items
+     */
     public String getName() {
         return name;
     }
-
     public String[] getLore() {
         return lore;
     }

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

@@ -891,7 +891,6 @@ public final class PlotModificationManager {
     }
 
     /**
-     * /**
      * Sets components such as border, wall, floor.
      * (components are generator specific)
      *

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

@@ -18,9 +18,25 @@
  */
 package com.plotsquared.core.plot;
 
+/**
+ * The different types of weather that can be set for a Plot.
+ */
 public enum PlotWeather {
+
+    /**
+     * Rainy weather conditions
+     */
     RAIN,
+    /**
+     * Clear weather conditions
+     */
     CLEAR,
+    /**
+     * Use the weather of the world the plot is in
+     */
     WORLD,
+    /**
+     * Turn off weather for the plot
+     */
     OFF
 }

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

@@ -91,6 +91,7 @@ import com.plotsquared.core.plot.flag.implementations.ProjectilesFlag;
 import com.plotsquared.core.plot.flag.implementations.PveFlag;
 import com.plotsquared.core.plot.flag.implementations.PvpFlag;
 import com.plotsquared.core.plot.flag.implementations.RedstoneFlag;
+import com.plotsquared.core.plot.flag.implementations.SculkSensorInteractFlag;
 import com.plotsquared.core.plot.flag.implementations.ServerPlotFlag;
 import com.plotsquared.core.plot.flag.implementations.SnowFormFlag;
 import com.plotsquared.core.plot.flag.implementations.SnowMeltFlag;
@@ -172,6 +173,7 @@ public final class GlobalFlagContainer extends FlagContainer {
         this.addFlag(MobBreakFlag.MOB_BREAK_FALSE);
         this.addFlag(MobPlaceFlag.MOB_PLACE_FALSE);
         this.addFlag(MiscInteractFlag.MISC_INTERACT_FALSE);
+        this.addFlag(SculkSensorInteractFlag.SCULK_SENSOR_INTERACT_FALSE);
         this.addFlag(MiscPlaceFlag.MISC_PLACE_FALSE);
         this.addFlag(MycelGrowFlag.MYCEL_GROW_TRUE);
         this.addFlag(NotifyEnterFlag.NOTIFY_ENTER_FALSE);

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

@@ -88,7 +88,7 @@ public abstract class PlotFlag<T, F extends PlotFlag<T, F>> {
      * Gets the flag name as a Kyori {@link Component}
      *
      * @see #getFlagName(Class)
-     * @since TODO
+     * @since 7.0.0
      */
     public static <T, F extends PlotFlag<T, F>> Component getFlagNameComponent(Class<F> flagClass) {
         return Component.text(getFlagName(flagClass));

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

@@ -0,0 +1,39 @@
+/*
+ * 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 SculkSensorInteractFlag extends BooleanFlag<SculkSensorInteractFlag> {
+
+    public static final SculkSensorInteractFlag SCULK_SENSOR_INTERACT_TRUE = new SculkSensorInteractFlag(true);
+    public static final SculkSensorInteractFlag SCULK_SENSOR_INTERACT_FALSE = new SculkSensorInteractFlag(false);
+
+    private SculkSensorInteractFlag(boolean value) {
+        super(value, TranslatableCaption.of("flags.flag_description_sculk_sensor_interact"));
+    }
+
+    @Override
+    protected SculkSensorInteractFlag flagOf(@NonNull Boolean value) {
+        return value ? SCULK_SENSOR_INTERACT_TRUE : SCULK_SENSOR_INTERACT_FALSE;
+    }
+
+}

Core/src/main/java/com/plotsquared/core/plot/world/DefaultPlotAreaManager.java

@@ -29,17 +29,17 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 @Singleton
 public class DefaultPlotAreaManager implements PlotAreaManager {
 
     final PlotArea[] noPlotAreas = new PlotArea[0];
-    private final Map<String, PlotWorld> plotWorlds = new HashMap<>();
+    private final Map<String, PlotWorld> plotWorlds = new ConcurrentHashMap<>();
 
     @Override
     public @NonNull PlotArea[] getAllPlotAreas() {

Core/src/main/java/com/plotsquared/core/plot/world/PlotAreaManager.java

@@ -111,7 +111,7 @@ public interface PlotAreaManager {
      *
      * @param worldName Name of the world to add
      * @return {@code true} if successful, {@code false} if world already existed
-     * @since TODO
+     * @since 7.0.0
      */
     boolean addWorld(@NonNull String worldName);
 

Core/src/main/java/com/plotsquared/core/queue/QueueCoordinator.java

@@ -66,7 +66,7 @@ public abstract class QueueCoordinator {
      * @param x chunk x coordinate
      * @param z chunk z coordinate
      * @return a new {@link ZeroedDelegateScopedQueueCoordinator}
-     * @since TODO
+     * @since 7.0.0
      */
     public ZeroedDelegateScopedQueueCoordinator getForChunk(int x, int z, int minY, int maxY) {
         int bx = x << 4;

Core/src/main/java/com/plotsquared/core/queue/ZeroedDelegateScopedQueueCoordinator.java

@@ -32,7 +32,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
  * zero in the x and z directions, i.e. starting from 0,0. An offset of the minimum point of the region will then be applied to
  * x and z.
  *
- * @since TODO
+ * @since 7.0.0
  */
 public class ZeroedDelegateScopedQueueCoordinator extends DelegateQueueCoordinator {
 
@@ -50,7 +50,7 @@ public class ZeroedDelegateScopedQueueCoordinator extends DelegateQueueCoordinat
     /**
      * Create a new ScopedQueueCoordinator instance that delegates to a given QueueCoordinator. Locations are inclusive.
      *
-     * @since TODO
+     * @since 7.0.0
      */
     public ZeroedDelegateScopedQueueCoordinator(@Nullable QueueCoordinator parent, @NonNull Location min, @NonNull Location max) {
         super(parent);

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

@@ -36,7 +36,7 @@ public abstract class ChunkManager {
     private static final Map<BlockVector2, RunnableVal<ZeroedDelegateScopedQueueCoordinator>> addChunks = new ConcurrentHashMap<>();
 
     /**
-     * @since TODO
+     * @since 7.0.0
      */
     public static void setChunkInPlotArea(
             RunnableVal<ZeroedDelegateScopedQueueCoordinator> force,
@@ -76,7 +76,7 @@ public abstract class ChunkManager {
     }
 
     /**
-     * @since TODO
+     * @since 7.0.0
      */
     public static boolean preProcessChunk(BlockVector2 loc, ZeroedDelegateScopedQueueCoordinator queue) {
         final RunnableVal<ZeroedDelegateScopedQueueCoordinator> forceChunk = forceChunks.get(loc);
@@ -89,7 +89,7 @@ public abstract class ChunkManager {
     }
 
     /**
-     * @since TODO
+     * @since 7.0.0
      */
     public static boolean postProcessChunk(BlockVector2 loc, ZeroedDelegateScopedQueueCoordinator queue) {
         final RunnableVal<ZeroedDelegateScopedQueueCoordinator> addChunk = forceChunks.get(loc);

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

@@ -27,7 +27,7 @@ import java.util.Collection;
 /**
  * A utility class for modifying components.
  *
- * @since TODO
+ * @since 7.0.0
  */
 public class ComponentHelper {
 
@@ -37,7 +37,7 @@ public class ComponentHelper {
      * @param components The components to join
      * @param delimiter  The delimiter to use between the components
      * @return The joined components
-     * @since TODO
+     * @since 7.0.0
      */
     public static ComponentLike join(Collection<? extends ComponentLike> components, Component delimiter) {
         return join(components.toArray(ComponentLike[]::new), delimiter);
@@ -49,7 +49,7 @@ public class ComponentHelper {
      * @param components The components to join
      * @param delimiter  The delimiter to use between the components
      * @return The joined components
-     * @since TODO
+     * @since 7.0.0
      */
     public static Component join(ComponentLike[] components, Component delimiter) {
         TextComponent.Builder builder = Component.text();

Core/src/main/java/com/plotsquared/core/util/placeholders/PlaceholderRegistry.java

@@ -187,6 +187,7 @@ public final class PlaceholderRegistry {
             }
         });
         this.createPlaceholder("currentplot_biome", (player, plot) -> plot.getBiomeSynchronous().toString());
+        this.createPlaceholder("currentplot_size", (player, plot) -> String.valueOf(plot.getConnectedPlots().size()));
     }
 
     /**

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

@@ -41,7 +41,7 @@
   "cluster.cluster_deleted": "<prefix><dark_aqua>Successfully deleted the cluster </dark_aqua><gold><cluster></gold><dark_aqua>.</dark_aqua>",
   "cluster.cluster_resized": "<prefix><dark_aqua>Successfully resized the cluster.</dark_aqua>",
   "cluster.cluster_added_user": "<prefix><dark_aqua>Successfully added user to the cluster.</dark_aqua>",
-  "cluster.cannot_kick_player": "<prefix><red>You cannot kick that player: </red><gray><name></gray>",
+  "cluster.cannot_kick_player": "<prefix><red>You cannot kick the player <gray><name></gray>.</red>",
   "cluster.cluster_invited": "<prefix><gold>You have been invited to the following cluster: </gold><gray><cluster>.</gray>",
   "cluster.cluster_removed": "<prefix><gold>You have been removed from cluster: </gold><gray><cluster>.</gray>",
   "cluster.cluster_kicked_user": "<prefix><dark_aqua>Successfully kicked the user from the cluster.</dark_aqua>",
@@ -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 <usedGrants> plot grant(s), you've got </gray><gold><remainingGrants></gold> <gray>left.</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>",
   "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>",
@@ -411,6 +411,8 @@
   "deny.no_enter": "<prefix><red>You are denied from the plot <red><gold><plot></gold><red> and therefore not allowed to enter.</red>",
   "deny.you_got_denied": "<prefix><red>You are denied from the plot you were previously on, and got teleported to spawn.</red>",
   "deny.cant_remove_owner": "<prefix><red>You can't remove the plot owner.</red>",
+  "kick.player_not_in_plot": "<prefix><red>The player <gray><player></gray> is not on this plot.</red>",
+  "kick.cannot_kick_player": "<prefix><red>You cannot kick the player <gray><player></gray>.</red>",
   "kick.you_got_kicked": "<prefix><dark_aqua>You got kicked from the plot!</dark_aqua>",
   "trusted.trusted_added": "<prefix><dark_aqua>You successfully trusted a user to the plot.</dark_aqua>",
   "trusted.plot_removed_user": "<prefix><red>Plot <plot> of which you were added to has been deleted due to owner inactivity.</red>",
@@ -486,7 +488,7 @@
   "single.get_position": "<prefix><gold>Go to the first corner and use: <gray><command> to create position 1.</gold>",
   "single.delete_world_region": "<prefix><red>Stop the server and delete: <world>/region.</red>",
   "single.regeneration_complete": "<prefix><gold>Regeneration complete.</gold>",
-  "single.worldcreation_location": "<prefix><gold>World creation settings may be stored in multiple locations:</gold>\n<dark_gray> - </dark_gray><gray>bukkit.yml in your server's root folder.</gray>\n<dark_gray> - </dark_gray><gray>PlotSquared's settings.yml</gray>\n<dark_gray> - </dark_gray><gray>Hyperverse's worlds.yml (or any world management plugin)</gray>\n<dark_gray> - </dark_gray><red>Stop the server and delete it from these locations.</red>",
+  "single.worldcreation_location": "<prefix><gold>World creation settings may be stored in multiple locations:</gold>\n<dark_gray> - </dark_gray><gray>bukkit.yml in your server's root folder.</gray>\n<dark_gray> - </dark_gray><gray>PlotSquared's worlds.yml</gray>\n<dark_gray> - </dark_gray><gray>Hyperverse's worlds.yml (or any world management plugin)</gray>\n<dark_gray> - </dark_gray><red>Stop the server and delete it from these locations.</red>",
   "legacyconfig.legacy_config_found": "<prefix><green>A legacy configuration file was detected. Conversion will be attempted.</green>",
   "legacyconfig.legacy_config_backup": "<prefix><gold>A copy of worlds.yml has been saved in the file worlds.yml.old</gold>.",
   "legacyconfig.legacy_config_replaced": "<prefix><gray><value1> has been replaced with <value2></gray>",
@@ -572,6 +574,7 @@
   "flags.flag_description_misc_break": "<gray>Set to `true` to allow guests to break miscellaneous items.</gray>",
   "flags.flag_description_misc_cap": "<gray>Set to an integer value to limit the amount of miscellaneous entities on the plot.</gray>",
   "flags.flag_description_misc_interact": "<gray>Set to `true` to allow guests to interact with miscellaneous items.</gray>",
+  "flags.flag_description_sculk_sensor_interact": "<gray>Set to `true` to allow guests to interact with sculk sensors.</gray>",
   "flags.flag_description_misc_place": "<gray>Set to `true` to allow guests to place miscellaneous items.</gray>",
   "flags.flag_description_mob_break": "<gray>Set to `true` to allow mobs to break blocks within the plot.</gray>",
   "flags.flag_description_mob_cap": "<gray>Set to an integer value to limit the amount of mobs on the plot.</gray>",

README.md

@@ -27,16 +27,16 @@ is to provide a lag-free and smooth experience.
 
 * [Download](https://www.spigotmc.org/resources/77506/)
 * [Discord](https://discord.gg/intellectualsites)
-* [Wiki](https://intellectualsites.github.io/plotsquared-documentation/)
+* [Wiki](https://intellectualsites.gitbook.io/plotsquared/)
 * [Issues](https://github.com/IntellectualSites/PlotSquared/issues)
 * [Translations](https://intellectualsites.crowdin.com/plotsquared/)
 * [Contributing](https://github.com/IntellectualSites/.github/blob/main/CONTRIBUTING.md)
 
 ### Developer Resources
 
-* [API Documentation](https://intellectualsites.github.io/plotsquared-documentation/api/api-documentation)
-* [Event API](https://intellectualsites.github.io/plotsquared-documentation/api/event-api)
-* [Flag API](https://intellectualsites.github.io/plotsquared-documentation/api/flag-api)
+* [API Documentation](https://intellectualsites.gitbook.io/plotsquared/api/api-documentation)
+* [Event API](https://intellectualsites.gitbook.io/plotsquared/api/event-api)
+* [Flag API](https://intellectualsites.gitbook.io/plotsquared/api/flag-api)
 
 # Official Addons
 

build.gradle.kts

@@ -1,5 +1,6 @@
 import com.diffplug.gradle.spotless.SpotlessPlugin
 import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
+import groovy.json.JsonSlurper
 import java.net.URI
 import xyz.jpenilla.runpaper.task.RunServer
 
@@ -17,11 +18,11 @@ plugins {
     eclipse
     idea
 
-    id("xyz.jpenilla.run-paper") version "2.0.1"
+    alias(libs.plugins.runPaper)
 }
 
-group = "com.plotsquared"
-version = "7.0.0-SNAPSHOT"
+group = "com.intellectualsites.plotsquared"
+version = "7.0.1-SNAPSHOT"
 
 if (!File("$rootDir/.git").exists()) {
     logger.lifecycle("""
@@ -76,13 +77,9 @@ subprojects {
         plugin<IdeaPlugin>()
     }
 
-    dependencies {
-        implementation(platform("com.intellectualsites.bom:bom-newest:1.25"))
-    }
-
     dependencies {
         // Tests
-        testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
+        testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
     }
 
     plugins.withId("java") {
@@ -210,7 +207,7 @@ subprojects {
 }
 
 nexusPublishing {
-    repositories {
+    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/"))
@@ -222,14 +219,23 @@ 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")
+val supportedVersions = listOf("1.16.5", "1.17.1", "1.18.2", "1.19.4", "1.20.1")
 tasks {
+    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.contains("Bukkit") }
+
     supportedVersions.forEach {
         register<RunServer>("runServer-$it") {
             minecraftVersion(it)
-            pluginJars(*project(":PlotSquared-Bukkit").getTasksByName("shadowJar", false).map { (it as Jar).archiveFile }
+            pluginJars(*project(":plotsquared-bukkit").getTasksByName("shadowJar", false).map { (it as Jar).archiveFile }
                     .toTypedArray())
             jvmArgs("-DPaper.IgnoreJavaVersion=true", "-Dcom.mojang.eula.agree=true")
+            downloadPlugins {
+                url("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/artifact/artifacts/$artifact")
+            }
             group = "run paper"
             runDirectory.set(file("run-$it"))
         }

gradle/libs.versions.toml

@@ -1,13 +1,22 @@
 [versions]
 # Platform expectations
-guice = "5.1.0"
+paper = "1.20.1-R0.1-SNAPSHOT"
+guice = "7.0.0"
 spotbugs = "4.7.3"
+checkerqual = "3.37.0"
+gson = "2.10"
+guava = "31.1-jre"
+snakeyaml = "2.0"
+adventure = "4.14.0"
+adventure-bukkit = "4.3.0"
+log4j = "2.19.0"
 
 # Plugins
-worldedit = "7.2.14"
+worldedit = "7.2.15"
+fawe = "2.7.1"
 placeholderapi = "2.11.3"
 luckperms = "5.4"
-essentialsx = "2.19.7"
+essentialsx = "2.20.1"
 mvdwapi = "3.1.1"
 
 # Third party
@@ -16,18 +25,34 @@ aopalliance = "1.0"
 cloud-services = "1.8.3"
 arkitektonika = "2.1.2"
 squirrelid = "0.3.2"
+paster = "1.1.5"
+bstats = "3.0.2"
+paperlib = "1.0.8"
+informative-annotations = "1.3"
+vault = "1.7.1"
+serverlib = "2.3.4"
 
 # Gradle plugins
-shadow = "7.1.2"
+shadow = "8.1.1"
 grgit = "4.1.1"
-spotless = "6.18.0"
+spotless = "6.21.0"
 nexus = "1.3.0"
+runPaper = "2.2.0"
 
 [libraries]
 # Platform expectations
+paper = { group = "io.papermc.paper", name = "paper-api", version.ref = "paper" }
 guice = { group = "com.google.inject", name = "guice", version.ref = "guice" }
 guiceassistedinject = { group = "com.google.inject.extensions", name = "guice-assistedinject", version.ref = "guice" }
 spotbugs = { group = "com.github.spotbugs", name = "spotbugs-annotations", version.ref = "spotbugs" }
+checkerqual = { group = "org.checkerframework", name = "checker-qual", version.ref = "checkerqual" }
+gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
+guava = { group = "com.google.guava", name = "guava", version.ref = "guava" }
+snakeyaml = { group = "org.yaml", name = "snakeyaml", version.ref = "snakeyaml" }
+adventureApi = { group = "net.kyori", name = "adventure-api", version.ref = "adventure" }
+adventureMiniMessage = { group = "net.kyori", name = "adventure-text-minimessage", version.ref = "adventure" }
+adventureBukkit = { group = "net.kyori", name = "adventure-platform-bukkit", version.ref = "adventure-bukkit" }
+log4j = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = "log4j" }
 
 # Plugins
 worldeditCore = { group = "com.sk89q.worldedit", name = "worldedit-core", version.ref = "worldedit" }
@@ -35,6 +60,8 @@ worldeditBukkit = { group = "com.sk89q.worldedit", name = "worldedit-bukkit", ve
 placeholderapi = { group = "me.clip", name = "placeholderapi", version.ref = "placeholderapi" }
 luckperms = { group = "net.luckperms", name = "api", version.ref = "luckperms" }
 essentialsx = { group = "net.essentialsx", name = "EssentialsX", version.ref = "essentialsx" }
+faweCore = { group = "com.fastasyncworldedit", name = "FastAsyncWorldEdit-Core", version.ref = "fawe" }
+faweBukkit = { group = "com.fastasyncworldedit", name = "FastAsyncWorldEdit-Bukkit", version.ref = "fawe" }
 
 # Third party
 prtree = { group = "com.intellectualsites.prtree", name = "PRTree", version.ref = "prtree" }
@@ -43,9 +70,17 @@ cloudServices = { group = "cloud.commandframework", name = "cloud-services", ver
 mvdwapi = { group = "com.intellectualsites.mvdwplaceholderapi", name = "MVdWPlaceholderAPI", version.ref = "mvdwapi" }
 squirrelid = { group = "org.enginehub", name = "squirrelid", version.ref = "squirrelid" }
 arkitektonika = { group = "com.intellectualsites.arkitektonika", name = "Arkitektonika-Client", version.ref = "arkitektonika" }
+paster = { group = "com.intellectualsites.paster", name = "Paster", version.ref = "paster" }
+bstatsBase = { group = "org.bstats", name = "bstats-base", version.ref = "bstats" }
+bstatsBukkit = { group = "org.bstats", name = "bstats-bukkit", version.ref = "bstats" }
+informativeAnnotations = { group = "com.intellectualsites.informative-annotations", name = "informative-annotations", version.ref = "informative-annotations" }
+paperlib = { group = "io.papermc", name = "paperlib", version.ref = "paperlib" }
+vault = { group = "com.github.MilkBowl", name = "VaultAPI", version.ref = "vault" }
+serverlib = { group = "dev.notmyfault.serverlib", name = "ServerLib", version.ref = "serverlib" }
 
 [plugins]
 shadow = { id = "com.github.johnrengelman.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" }
+runPaper = { id = "xyz.jpenilla.run-paper", version.ref = "runPaper" }

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# 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
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,6 +198,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

javadocfooter.html

@@ -1,4 +1,4 @@
 Javadocs generated for
 <a href="https://github.com/IntellectualSites/PlotSquared/" rel="noopener nofollow noreferrer" target="_blank"> PlotSquared</a> |
-<a href="https://intellectualsites.github.io/plotsquared-documentation/" rel="noopener nofollow noreferrer"> Documentation </a> |
+<a href="https://intellectualsites.gitbook.io/plotsquared/" rel="noopener nofollow noreferrer"> Documentation </a> |
 Visit us on our <a href="https://discord.gg/intellectualsites" rel="noopener nofollow noreferrer"> Discord server</a> :)

renovate.json

@@ -1,12 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base",
-    ":semanticCommitsDisabled"
-  ],
-  "labels": [
-    "dependencies"
-  ],
-  "rebaseWhen": "conflicted",
-  "schedule": ["on the first day of the month"]
-}

settings.gradle.kts

@@ -2,7 +2,7 @@ rootProject.name = "PlotSquared"
 
 include("Core", "Bukkit")
 
-project(":Core").name = "PlotSquared-Core"
-project(":Bukkit").name = "PlotSquared-Bukkit"
+project(":Core").name = "plotsquared-core"
+project(":Bukkit").name = "plotsquared-bukkit"
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")