Merge branch 'main' into chore/sqlite3.43-mitigate

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -27,7 +27,7 @@ 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.2'
         - '1.20'
         - '1.19.4'
         - '1.19.3'

.github/workflows/build-pr.yml

@@ -9,7 +9,7 @@ jobs:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
       - name: Setup Java

.github/workflows/build.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v1
       - name: Setup Java

.github/workflows/codeql.yml

@@ -20,7 +20,7 @@ jobs:
         language: [ 'java' ]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup Java
         uses: actions/setup-java@v3
         with:

.gitignore

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

Bukkit/build.gradle.kts

@@ -100,7 +100,7 @@ tasks {
     withType<Javadoc> {
         val isRelease = if (rootProject.version.toString().endsWith("-SNAPSHOT")) "TODO" else rootProject.version.toString()
         val opt = options as StandardJavadocDocletOptions
-        opt.links("https://jd.papermc.io/paper/1.19/")
+        opt.links("https://jd.papermc.io/paper/1.20/")
         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.14.0/")

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();
 
@@ -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

@@ -33,6 +33,7 @@ import org.bukkit.entity.Ageable;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Bat;
 import org.bukkit.entity.Boat;
+import org.bukkit.entity.Breedable;
 import org.bukkit.entity.ChestedHorse;
 import org.bukkit.entity.EnderDragon;
 import org.bukkit.entity.Entity;
@@ -74,6 +75,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);
 
@@ -164,7 +166,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 //this.horse.style = horse.getStyle();
                 //this.horse.color = horse.getColor();
                 storeTameable(horse);
-                storeAgeable(horse);
+                storeBreedable(horse);
                 storeLiving(horse);
                 storeInventory(horse);
                 return;
@@ -172,7 +174,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             // END INVENTORY HOLDER //
             case "WOLF", "OCELOT" -> {
                 storeTameable((Tameable) entity);
-                storeAgeable((Ageable) entity);
+                storeBreedable((Breedable) entity);
                 storeLiving((LivingEntity) entity);
                 return;
             }
@@ -186,18 +188,18 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                     this.dataByte = (byte) 0;
                 }
                 this.dataByte2 = sheep.getColor().getDyeData();
-                storeAgeable(sheep);
+                storeBreedable(sheep);
                 storeLiving(sheep);
                 return;
             }
             case "VILLAGER", "CHICKEN", "COW", "MUSHROOM_COW", "PIG", "TURTLE", "POLAR_BEAR" -> {
-                storeAgeable((Ageable) entity);
+                storeBreedable((Breedable) entity);
                 storeLiving((LivingEntity) entity);
                 return;
             }
             case "RABBIT" -> {
                 this.dataByte = getOrdinal(Rabbit.Type.values(), ((Rabbit) entity).getRabbitType());
-                storeAgeable((Ageable) entity);
+                storeBreedable((Breedable) entity);
                 storeLiving((LivingEntity) entity);
                 return;
             }
@@ -381,6 +383,11 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
         }
     }
 
+    /**
+     * @deprecated Use {@link #restoreBreedable(Breedable)} instead
+     * @since TODO
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     private void restoreAgeable(Ageable entity) {
         if (!this.aged.adult) {
             entity.setBaby();
@@ -391,6 +398,11 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
         }
     }
 
+    /**
+     * @deprecated Use {@link #storeBreedable(Breedable)} instead
+     * @since TODO
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     public void storeAgeable(Ageable aged) {
         this.aged = new AgeableStats();
         this.aged.age = aged.getAge();
@@ -398,6 +410,29 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
         this.aged.adult = aged.isAdult();
     }
 
+    /**
+     * @since TODO
+     */
+    private void restoreBreedable(Breedable entity) {
+        if (!this.aged.adult) {
+            entity.setBaby();
+        }
+        entity.setAgeLock(this.aged.locked);
+        if (this.aged.age > 0) {
+            entity.setAge(this.aged.age);
+        }
+    }
+
+    /**
+     * @since TODO
+     */
+    private void storeBreedable(Breedable breedable) {
+        this.aged = new AgeableStats();
+        this.aged.age = breedable.getAge();
+        this.aged.locked = breedable.getAgeLock();
+        this.aged.adult = breedable.isAdult();
+    }
+
     public void storeTameable(Tameable tamed) {
         this.tamed = new TameableStats();
         this.tamed.owner = tamed.getOwner();
@@ -501,7 +536,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 //horse.setStyle(this.horse.style);
                 //horse.setColor(this.horse.color);
                 restoreTameable(horse);
-                restoreAgeable(horse);
+                restoreBreedable(horse);
                 restoreLiving(horse);
                 restoreInventory(horse);
                 return entity;
@@ -509,7 +544,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
             // END INVENTORY HOLDER //
             case "WOLF", "OCELOT" -> {
                 restoreTameable((Tameable) entity);
-                restoreAgeable((Ageable) entity);
+                restoreBreedable((Breedable) entity);
                 restoreLiving((LivingEntity) entity);
                 return entity;
             }
@@ -522,12 +557,12 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 if (this.dataByte2 != 0) {
                     sheep.setColor(DyeColor.getByDyeData(this.dataByte2));
                 }
-                restoreAgeable(sheep);
+                restoreBreedable(sheep);
                 restoreLiving(sheep);
                 return sheep;
             }
             case "VILLAGER", "CHICKEN", "COW", "TURTLE", "POLAR_BEAR", "MUSHROOM_COW", "PIG" -> {
-                restoreAgeable((Ageable) entity);
+                restoreBreedable((Breedable) entity);
                 restoreLiving((LivingEntity) entity);
                 return entity;
             }
@@ -536,7 +571,7 @@ public final class ReplicatingEntityWrapper extends EntityWrapper {
                 if (this.dataByte != 0) {
                     ((Rabbit) entity).setRabbitType(Rabbit.Type.values()[this.dataByte]);
                 }
-                restoreAgeable((Ageable) entity);
+                restoreBreedable((Breedable) entity);
                 restoreLiving((LivingEntity) entity);
                 return entity;
             }

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

@@ -33,6 +33,7 @@ import com.plotsquared.core.plot.PlotArea;
 import com.plotsquared.core.plot.flag.implementations.BlockBurnFlag;
 import com.plotsquared.core.plot.flag.implementations.BlockIgnitionFlag;
 import com.plotsquared.core.plot.flag.implementations.BreakFlag;
+import com.plotsquared.core.plot.flag.implementations.ConcreteHardenFlag;
 import com.plotsquared.core.plot.flag.implementations.CoralDryFlag;
 import com.plotsquared.core.plot.flag.implementations.CropGrowFlag;
 import com.plotsquared.core.plot.flag.implementations.DisablePhysicsFlag;
@@ -586,6 +587,12 @@ public class BlockEventListener implements Listener {
                 event.setCancelled(true);
             }
         }
+        if (event.getNewState().getType().toString().endsWith("CONCRETE")) {
+            if (!plot.getFlag(ConcreteHardenFlag.class)) {
+                plot.debug("Concrete powder could not harden because concrete-harden = false");
+                event.setCancelled(true);
+            }
+        }
     }
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)

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();

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/UpdateUtility.java

@@ -35,7 +35,7 @@ import org.bukkit.scheduler.BukkitTask;
 import javax.net.ssl.HttpsURLConnection;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.net.URL;
+import java.net.URI;
 
 public class UpdateUtility implements Listener {
 
@@ -59,8 +59,9 @@ public class UpdateUtility implements Listener {
     public void updateChecker() {
         task = Bukkit.getScheduler().runTaskTimerAsynchronously(this.javaPlugin, () -> {
             try {
-                HttpsURLConnection connection = (HttpsURLConnection) new URL(
+                HttpsURLConnection connection = (HttpsURLConnection) URI.create(
-                        "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")
+                        .toURL()
                         .openConnection();
                 connection.setRequestMethod("GET");
                 JsonObject result = new JsonParser()

Core/build.gradle.kts

@@ -57,8 +57,8 @@ tasks.processResources {
 
     doLast {
         copy {
-            from(File("$rootDir/LICENSE"))
+            from(layout.buildDirectory.file("$rootDir/LICENSE"))
-            into("$buildDir/resources/main/")
+            into(layout.buildDirectory.dir("resources/main"))
         }
     }
 }
@@ -72,7 +72,8 @@ tasks {
         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/")
+        opt.links("https://javadocs.dev/com.intellectualsites.informative-annotations/informative-annotations/"
+                + libs.informativeAnnotations.get().versionConstraint.toString())
         opt.isLinkSource = true
         opt.bottom(File("$rootDir/javadocfooter.html").readText())
         opt.isUse = true

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

@@ -84,7 +84,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Files;
@@ -210,9 +210,10 @@ public class PlotSquared {
             try {
                 URL logurl = PlotSquared.class.getProtectionDomain().getCodeSource().getLocation();
                 this.jarFile = new File(
-                        new URL(logurl.toURI().toString().split("\\!")[0].replaceAll("jar:file", "file"))
+                        URI.create(
-                                .toURI().getPath());
+                                logurl.toURI().toString().split("\\!")[0].replaceAll("jar:file", "file"))
-            } catch (MalformedURLException | URISyntaxException | SecurityException e) {
+                                .getPath());
+            } catch (URISyntaxException | SecurityException e) {
                 e.printStackTrace();
                 this.jarFile = new File(this.platform.getDirectory().getParentFile(), "PlotSquared.jar");
                 if (!this.jarFile.exists()) {

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

@@ -19,6 +19,7 @@
 package com.plotsquared.core.command;
 
 import com.google.inject.Inject;
+import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.database.DBFunc;
@@ -101,8 +102,13 @@ public class Add extends Command {
                                 Permission.PERMISSION_ADMIN_COMMAND_TRUST))) {
                             player.sendMessage(
                                     TranslatableCaption.of("errors.invalid_player"),
-                                    TagResolver.resolver("value", Tag.inserting(
+                                    PlotSquared
-                                            PlayerManager.resolveName(uuid).toComponent(player)
+                                            .platform()
+                                            .playerManager()
+                                            .getUsernameCaption(uuid)
+                                            .thenApply(caption -> TagResolver.resolver(
+                                                    "value",
+                                                    Tag.inserting(caption.toComponent(player))
                                             ))
                             );
                             iterator.remove();
@@ -111,8 +117,10 @@ public class Add extends Command {
                         if (plot.isOwner(uuid)) {
                             player.sendMessage(
                                     TranslatableCaption.of("member.already_added"),
-                                    TagResolver.resolver("player", Tag.inserting(
+                                    PlotSquared.platform().playerManager().getUsernameCaption(uuid)
-                                            PlayerManager.resolveName(uuid).toComponent(player)
+                                            .thenApply(caption -> TagResolver.resolver(
+                                                    "player",
+                                                    Tag.inserting(caption.toComponent(player))
                                             ))
                             );
                             iterator.remove();
@@ -121,8 +129,10 @@ public class Add extends Command {
                         if (plot.getMembers().contains(uuid)) {
                             player.sendMessage(
                                     TranslatableCaption.of("member.already_added"),
-                                    TagResolver.resolver("player", Tag.inserting(
+                                    PlotSquared.platform().playerManager().getUsernameCaption(uuid)
-                                            PlayerManager.resolveName(uuid).toComponent(player)
+                                            .thenApply(caption -> TagResolver.resolver(
+                                                    "player",
+                                                    Tag.inserting(caption.toComponent(player))
                                             ))
                             );
                             iterator.remove();

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

@@ -25,6 +25,7 @@ import com.plotsquared.core.player.PlotPlayer;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * CommandCategory.
@@ -82,7 +83,7 @@ public enum CommandCategory implements Caption {
     // TODO this method shouldn't be invoked
     @Deprecated
     @Override
-    public String toString() {
+    public @NotNull String toString() {
         return this.caption.getComponent(LocaleHolder.console());
     }
 
@@ -108,4 +109,5 @@ public enum CommandCategory implements Caption {
         return !MainCommand.getInstance().getCommands(this, player).isEmpty();
     }
 
+
 }

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

@@ -117,10 +117,11 @@ public class Deny extends SubCommand {
                     } else if (plot.getDenied().contains(uuid)) {
                         player.sendMessage(
                                 TranslatableCaption.of("member.already_added"),
-                                TagResolver.resolver(
+                                PlotSquared.platform().playerManager().getUsernameCaption(uuid)
+                                        .thenApply(caption -> TagResolver.resolver(
                                         "player",
-                                        Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
+                                        Tag.inserting(caption.toComponent(player))
-                                )
+                                ))
                         );
                         return;
                     } else {

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/Load.java

@@ -41,6 +41,7 @@ import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 import java.util.Collections;
 import java.util.List;
@@ -116,7 +117,7 @@ public class Load extends SubCommand {
                     }
                     final URL url;
                     try {
-                        url = new URL(Settings.Web.URL + "saves/" + player.getUUID() + '/' + schematic);
+                        url = URI.create(Settings.Web.URL + "saves/" + player.getUUID() + '/' + schematic).toURL();
                     } catch (MalformedURLException e) {
                         e.printStackTrace();
                         player.sendMessage(TranslatableCaption.of("web.load_failed"));

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

@@ -31,7 +31,6 @@ import com.plotsquared.core.player.PlayerMetaDataKeys;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.util.EventDispatcher;
-import com.plotsquared.core.util.PlayerManager;
 import com.plotsquared.core.util.TabCompletions;
 import com.plotsquared.core.util.task.TaskManager;
 import net.kyori.adventure.text.Component;
@@ -136,10 +135,11 @@ public class Owner extends SetCommand {
             if (plot.isOwner(uuid)) {
                 player.sendMessage(
                         TranslatableCaption.of("member.already_owner"),
-                        TagResolver.resolver(
+                        PlotSquared.platform().playerManager().getUsernameCaption(uuid)
+                                .thenApply(caption -> TagResolver.resolver(
                                 "player",
-                                Tag.inserting(PlayerManager.resolveName(uuid, false).toComponent(player))
+                                Tag.inserting(caption.toComponent(player))
-                        )
+                        ))
                 );
                 return;
             }
@@ -147,10 +147,11 @@ public class Owner extends SetCommand {
                 if (other == null) {
                     player.sendMessage(
                             TranslatableCaption.of("errors.invalid_player_offline"),
-                            TagResolver.resolver(
+                            PlotSquared.platform().playerManager().getUsernameCaption(uuid)
+                                    .thenApply(caption -> TagResolver.resolver(
                                     "player",
-                                    Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
+                                    Tag.inserting(caption.toComponent(player))
-                            )
+                            ))
                     );
                     return;
                 }

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

@@ -40,6 +40,7 @@ import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 
+import java.net.URI;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -130,8 +131,7 @@ public class SchematicCmd extends SubCommand {
                     if (location.startsWith("url:")) {
                         try {
                             UUID uuid = UUID.fromString(location.substring(4));
-                            URL base = new URL(Settings.Web.URL);
+                            URL url = URI.create(Settings.Web.URL + "uploads/" + uuid + ".schematic").toURL();
-                            URL url = new URL(base, "uploads/" + uuid + ".schematic");
                             schematic = this.schematicHandler.getSchematic(url);
                         } catch (Exception e) {
                             e.printStackTrace();

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

@@ -19,6 +19,7 @@
 package com.plotsquared.core.command;
 
 import com.google.inject.Inject;
+import com.plotsquared.core.PlotSquared;
 import com.plotsquared.core.configuration.Settings;
 import com.plotsquared.core.configuration.caption.TranslatableCaption;
 import com.plotsquared.core.database.DBFunc;
@@ -103,10 +104,11 @@ public class Trust extends Command {
                             player.hasPermission(Permission.PERMISSION_TRUST_EVERYONE) || player.hasPermission(Permission.PERMISSION_ADMIN_COMMAND_TRUST))) {
                         player.sendMessage(
                                 TranslatableCaption.of("errors.invalid_player"),
-                                TagResolver.resolver(
+                                PlotSquared.platform().playerManager().getUsernameCaption(uuid)
+                                        .thenApply(caption -> TagResolver.resolver(
                                         "value",
-                                        Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
+                                        Tag.inserting(caption.toComponent(player))
-                                )
+                                ))
                         );
                         iterator.remove();
                         continue;
@@ -114,10 +116,11 @@ public class Trust extends Command {
                     if (currentPlot.isOwner(uuid)) {
                         player.sendMessage(
                                 TranslatableCaption.of("member.already_added"),
-                                TagResolver.resolver(
+                                PlotSquared.platform().playerManager().getUsernameCaption(uuid)
-                                        "value",
+                                        .thenApply(caption -> TagResolver.resolver(
-                                        Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
+                                        "player",
-                                )
+                                        Tag.inserting(caption.toComponent(player))
+                                ))
                         );
                         iterator.remove();
                         continue;
@@ -125,10 +128,11 @@ public class Trust extends Command {
                     if (currentPlot.getTrusted().contains(uuid)) {
                         player.sendMessage(
                                 TranslatableCaption.of("member.already_added"),
-                                TagResolver.resolver(
+                                PlotSquared.platform().playerManager().getUsernameCaption(uuid)
-                                        "value",
+                                        .thenApply(caption -> TagResolver.resolver(
-                                        Tag.inserting(PlayerManager.resolveName(uuid).toComponent(player))
+                                        "player",
-                                )
+                                        Tag.inserting(caption.toComponent(player))
+                                ))
                         );
                         iterator.remove();
                         continue;

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

@@ -44,4 +44,6 @@ public interface Caption {
      */
     @NonNull Component toComponent(@NonNull LocaleHolder localeHolder);
 
+    @NonNull String toString();
+
 }

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

@@ -51,4 +51,9 @@ public final class StaticCaption implements Caption {
         return MiniMessage.miniMessage().deserialize(this.value);
     }
 
+    @Override
+    public @NonNull String toString() {
+        return "StaticCaption(" + value + ")";
+    }
+
 }

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

@@ -25,6 +25,7 @@ import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Locale;
 import java.util.regex.Pattern;
@@ -132,4 +133,9 @@ public final class TranslatableCaption implements NamespacedCaption {
         return Objects.hashCode(this.getNamespace(), this.getKey());
     }
 
+    @Override
+    public @NotNull String toString() {
+        return "TranslatableCaption(" + getNamespace() + ":" + getKey() + ")";
+    }
+
 }

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

@@ -130,6 +130,7 @@ public class SQLManager implements AbstractDB {
     public volatile ConcurrentHashMap<PlotCluster, Queue<UniqueStatement>> clusterTasks;
     // Private
     private Connection connection;
+    private boolean supportsGetGeneratedKeys;
     private boolean closed = false;
 
     /**
@@ -154,6 +155,8 @@ public class SQLManager implements AbstractDB {
         this.worldConfiguration = worldConfiguration;
         this.database = database;
         this.connection = database.openConnection();
+        final DatabaseMetaData databaseMetaData = this.connection.getMetaData();
+        this.supportsGetGeneratedKeys = databaseMetaData.supportsGetGeneratedKeys();
         this.mySQL = database instanceof MySQL;
         this.globalTasks = new ConcurrentLinkedQueue<>();
         this.notifyTasks = new ConcurrentLinkedQueue<>();
@@ -161,6 +164,14 @@ public class SQLManager implements AbstractDB {
         this.playerTasks = new ConcurrentHashMap<>();
         this.clusterTasks = new ConcurrentHashMap<>();
         this.prefix = prefix;
+
+        if (mySQL && !supportsGetGeneratedKeys) {
+            String driver = databaseMetaData.getDriverName();
+            String driverVersion = databaseMetaData.getDriverVersion();
+            throw new SQLException("Database Driver for MySQL does not support Statement#getGeneratedKeys - which breaks " +
+                    "PlotSquared functionality (Using " + driver + ":" + driverVersion + ")");
+        }
+
         this.SET_OWNER = "UPDATE `" + this.prefix
                 + "plot` SET `owner` = ? WHERE `plot_id_x` = ? AND `plot_id_z` = ? AND `world` = ?";
         this.GET_ALL_PLOTS =
@@ -171,20 +182,32 @@ public class SQLManager implements AbstractDB {
                 "INSERT INTO `" + this.prefix + "plot_settings` (`plot_plot_id`) values ";
         this.CREATE_TIERS =
                 "INSERT INTO `" + this.prefix + "plot_%tier%` (`plot_plot_id`, `user_uuid`) values ";
-        this.CREATE_PLOT = "INSERT INTO `" + this.prefix
+        String tempCreatePlot = "INSERT INTO `" + this.prefix
                 + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) VALUES(?, ?, ?, ?, ?)";
-
+        if (!supportsGetGeneratedKeys) {
+            tempCreatePlot += " RETURNING `id`";
+        }
+        this.CREATE_PLOT = tempCreatePlot;
         if (mySQL) {
             this.CREATE_PLOT_SAFE = "INSERT IGNORE INTO `" + this.prefix
                     + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) SELECT ?, ?, ?, ?, ? FROM DUAL WHERE NOT EXISTS (SELECT null FROM `"
                     + this.prefix + "plot` WHERE `world` = ? AND `plot_id_x` = ? AND `plot_id_z` = ?)";
         } else {
-            this.CREATE_PLOT_SAFE = "INSERT INTO `" + this.prefix
+            String tempCreatePlotSafe = "INSERT INTO `" + this.prefix
                     + "plot`(`plot_id_x`, `plot_id_z`, `owner`, `world`, `timestamp`) SELECT ?, ?, ?, ?, ? WHERE NOT EXISTS (SELECT null FROM `"
                     + this.prefix + "plot` WHERE `world` = ? AND `plot_id_x` = ? AND `plot_id_z` = ?)";
+            if (!supportsGetGeneratedKeys) {
+                tempCreatePlotSafe += " RETURNING `id`";
             }
-        this.CREATE_CLUSTER = "INSERT INTO `" + this.prefix
+            this.CREATE_PLOT_SAFE = tempCreatePlotSafe;
+        }
+        String tempCreateCluster = "INSERT INTO `" + this.prefix
                 + "cluster`(`pos1_x`, `pos1_z`, `pos2_x`, `pos2_z`, `owner`, `world`) VALUES(?, ?, ?, ?, ?, ?)";
+        if (!supportsGetGeneratedKeys) {
+            tempCreateCluster += " RETURNING `id`";
+        }
+        this.CREATE_CLUSTER = tempCreateCluster;
+
         try {
             createTables();
         } catch (SQLException e) {
@@ -1073,9 +1096,8 @@ public class SQLManager implements AbstractDB {
 
             @Override
             public void addBatch(PreparedStatement statement) throws SQLException {
-                int inserted = statement.executeUpdate();
+                if (statement.execute() || statement.getUpdateCount() > 0) {
-                if (inserted > 0) {
+                    try (ResultSet keys = supportsGetGeneratedKeys ? statement.getGeneratedKeys() : statement.getResultSet()) {
-                    try (ResultSet keys = statement.getGeneratedKeys()) {
                         if (keys.next()) {
                             plot.temp = keys.getInt(1);
                             addPlotTask(plot, new UniqueStatement(
@@ -1145,8 +1167,8 @@ public class SQLManager implements AbstractDB {
 
             @Override
             public void addBatch(PreparedStatement statement) throws SQLException {
-                statement.executeUpdate();
+                statement.execute();
-                try (ResultSet keys = statement.getGeneratedKeys()) {
+                try (ResultSet keys = supportsGetGeneratedKeys ? statement.getGeneratedKeys() : statement.getResultSet()) {
                     if (keys.next()) {
                         plot.temp = keys.getInt(1);
                     }
@@ -3058,8 +3080,8 @@ public class SQLManager implements AbstractDB {
 
             @Override
             public void addBatch(PreparedStatement statement) throws SQLException {
-                statement.executeUpdate();
+                statement.execute();
-                try (ResultSet keys = statement.getGeneratedKeys()) {
+                try (ResultSet keys = supportsGetGeneratedKeys ? statement.getGeneratedKeys() : statement.getResultSet()) {
                     if (keys.next()) {
                         cluster.temp = keys.getInt(1);
                     }

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

@@ -189,7 +189,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                 }
                 Object value;
                 try {
-                    final boolean accessible = field.isAccessible();
+                    final boolean accessible = field.canAccess(this);
                     field.setAccessible(true);
                     value = field.get(this);
                     field.setAccessible(accessible);

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

@@ -55,7 +55,6 @@ import com.plotsquared.core.plot.flag.implementations.TitlesFlag;
 import com.plotsquared.core.plot.flag.implementations.WeatherFlag;
 import com.plotsquared.core.plot.flag.types.TimedFlag;
 import com.plotsquared.core.util.EventDispatcher;
-import com.plotsquared.core.util.PlayerManager;
 import com.plotsquared.core.util.task.TaskManager;
 import com.plotsquared.core.util.task.TaskTime;
 import com.sk89q.worldedit.world.gamemode.GameMode;
@@ -63,7 +62,6 @@ import com.sk89q.worldedit.world.gamemode.GameModes;
 import com.sk89q.worldedit.world.item.ItemType;
 import com.sk89q.worldedit.world.item.ItemTypes;
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.ComponentLike;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
@@ -77,6 +75,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
 
 public class PlotListener {
 
@@ -321,22 +320,27 @@ public class PlotListener {
                         }
                         if ((lastPlot != null) && plot.getId().equals(lastPlot.getId()) && plot.hasOwner()) {
                             final UUID plotOwner = plot.getOwnerAbs();
-                            ComponentLike owner = PlayerManager.resolveName(plotOwner, true).toComponent(player);
                             Caption header = fromFlag ? StaticCaption.of(title) : TranslatableCaption.of("titles" +
                                     ".title_entered_plot");
                             Caption subHeader = fromFlag ? StaticCaption.of(subtitle) : TranslatableCaption.of("titles" +
                                     ".title_entered_plot_sub");
-                            TagResolver resolver = TagResolver.builder()
+
+                            CompletableFuture<TagResolver> future = PlotSquared.platform().playerManager()
+                                    .getUsernameCaption(plotOwner).thenApply(caption -> TagResolver.builder()
+                                            .tag("owner", Tag.inserting(caption.toComponent(player)))
                                             .tag("plot", Tag.inserting(Component.text(lastPlot.getId().toString())))
                                             .tag("world", Tag.inserting(Component.text(player.getLocation().getWorldName())))
-                                    .tag("owner", Tag.inserting(owner))
                                             .tag("alias", Tag.inserting(Component.text(plot.getAlias())))
-                                    .build();
+                                            .build()
+                                    );
+
+                            future.whenComplete((tagResolver, throwable) -> {
                                 if (Settings.Titles.TITLES_AS_ACTIONBAR) {
-                                player.sendActionBar(header, resolver);
+                                    player.sendActionBar(header, tagResolver);
                                 } else {
-                                player.sendTitle(header, subHeader, resolver);
+                                    player.sendTitle(header, subHeader, tagResolver);
                                 }
+                            });
                         }
                     }, TaskTime.seconds(1L));
                 }

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

@@ -80,6 +80,7 @@ import java.util.Map;
 import java.util.Queue;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -953,6 +954,54 @@ public abstract class PlotPlayer<P> implements CommandCaller, OfflinePlotPlayer,
         }
     }
 
+    /**
+     * Sends a message to the command caller, when the future is resolved
+     *
+     * @param caption          Caption to send
+     * @param asyncReplacement Async variable replacement
+     * @return A Future to be resolved, after the message was sent
+     * @since TODO
+     */
+    public final CompletableFuture<Void> sendMessage(
+            @NonNull Caption caption,
+            CompletableFuture<@NonNull TagResolver> asyncReplacement
+    ) {
+        return sendMessage(caption, new CompletableFuture[]{asyncReplacement});
+    }
+
+    /**
+     * Sends a message to the command caller, when all futures are resolved
+     *
+     * @param caption           Caption to send
+     * @param asyncReplacements Async variable replacements
+     * @param replacements      Sync variable replacements
+     * @return A Future to be resolved, after the message was sent
+     * @since TODO
+     */
+    public final CompletableFuture<Void> sendMessage(
+            @NonNull Caption caption,
+            CompletableFuture<@NonNull TagResolver>[] asyncReplacements,
+            @NonNull TagResolver... replacements
+    ) {
+        return CompletableFuture.allOf(asyncReplacements).whenComplete((unused, throwable) -> {
+            Set<TagResolver> resolvers = new HashSet<>(Arrays.asList(replacements));
+            if (throwable != null) {
+                sendMessage(
+                        TranslatableCaption.of("errors.error"),
+                        TagResolver.resolver("value", Tag.inserting(
+                                Component.text("Failed to resolve asynchronous caption replacements")
+                        ))
+                );
+                LOGGER.error("Failed to resolve asynchronous tagresolver(s) for " + caption, throwable);
+            } else {
+                for (final CompletableFuture<TagResolver> asyncReplacement : asyncReplacements) {
+                    resolvers.add(asyncReplacement.join());
+                }
+            }
+            sendMessage(caption, resolvers.toArray(TagResolver[]::new));
+        });
+    }
+
     // Redefine from PermissionHolder as it's required from CommandCaller
     @Override
     public boolean hasPermission(@NonNull String permission) {

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

@@ -51,6 +51,8 @@ import com.plotsquared.core.util.MathMan;
 import com.plotsquared.core.util.PlotExpression;
 import com.plotsquared.core.util.RegionUtil;
 import com.plotsquared.core.util.StringMan;
+import com.plotsquared.core.util.task.TaskManager;
+import com.plotsquared.core.util.task.TaskTime;
 import com.sk89q.worldedit.math.BlockVector2;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.regions.CuboidRegion;
@@ -391,6 +393,28 @@ public abstract class PlotArea implements ComponentLike {
             }
         }
 
+        this.spawnEggs = config.getBoolean("event.spawn.egg");
+        this.spawnCustom = config.getBoolean("event.spawn.custom");
+        this.spawnBreeding = config.getBoolean("event.spawn.breeding");
+
+        if (PlotSquared.get().isWeInitialised()) {
+            loadFlags(config);
+        } else {
+            ConsolePlayer.getConsole().sendMessage(
+                    TranslatableCaption.of("flags.delaying_loading_area_flags"),
+                    TagResolver.resolver("area", Tag.inserting(Component.text(this.id == null ? this.worldName : this.id)))
+            );
+            TaskManager.runTaskLater(() -> loadFlags(config), TaskTime.ticks(1));
+        }
+
+        loadConfiguration(config);
+    }
+
+    private void loadFlags(ConfigurationSection config) {
+        ConsolePlayer.getConsole().sendMessage(
+                TranslatableCaption.of("flags.loading_area_flags"),
+                TagResolver.resolver("area", Tag.inserting(Component.text(this.id == null ? this.worldName : this.id)))
+        );
         List<String> flags = config.getStringList("flags.default");
         if (flags.isEmpty()) {
             flags = config.getStringList("flags");
@@ -411,10 +435,6 @@ public abstract class PlotArea implements ComponentLike {
                 TagResolver.resolver("flags", Tag.inserting(Component.text(flags.toString())))
         );
 
-        this.spawnEggs = config.getBoolean("event.spawn.egg");
-        this.spawnCustom = config.getBoolean("event.spawn.custom");
-        this.spawnBreeding = config.getBoolean("event.spawn.breeding");
-
         List<String> roadflags = config.getStringList("road.flags");
         if (roadflags.isEmpty()) {
             roadflags = new ArrayList<>();
@@ -426,14 +446,12 @@ public abstract class PlotArea implements ComponentLike {
                 }
             }
         }
-        this.roadFlags = roadflags.size() > 0;
+        this.roadFlags = !roadflags.isEmpty();
         parseFlags(this.getRoadFlagContainer(), roadflags);
         ConsolePlayer.getConsole().sendMessage(
                 TranslatableCaption.of("flags.road_flags"),
                 TagResolver.resolver("flags", Tag.inserting(Component.text(roadflags.toString())))
         );
-
-        loadConfiguration(config);
     }
 
     public abstract void loadConfiguration(ConfigurationSection config);

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
+ * 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.
- * within a plot area
+ * 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 x the x-coordinate of the plot
-     * @param y The plot y coordinate
+     * @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 x the x-coordinate of the plot
-     * @param y The plot y coordinate
+     * @param y the y-coordinate of the plot
-     * @return a new PlotId at x,y
+     * @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
+     * @param string the string to parse
-     * @return Plot ID, or {@code null} if none could be parsed
+     * @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>
+     * Returns a new PlotId instance from the given hash.
-     * Note: Only accurate for small x,z values (short)
      *
-     * @param hash ID hash
+     * @param hash the hash to unpair
-     * @return Plot ID
+     * @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
+     * @param direction the direction in which to get the relative Plot ID
-     * @return 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
+     * Returns a string representation of this Plot ID in the format "x;y".
-     * components are separated by ";"
      *
-     * @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
+     * Returns a string representation of this Plot ID with the specified separator.
-     * components are separated by a specified string
+     * <p>
+     * The format is {@code x + separator + y}
      *
-     * @param separator Separator
+     * @param separator the separator to use between the X and Y coordinates
-     * @return {@code x + separator + y}
+     * @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
+     * Returns a string representation of this Plot ID in the format "x,y".
-     * components are separated by ","
      *
-     * @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
+     * Returns a string representation of this Plot ID in the format "x_y".
-     * components are separated by "_"
      *
-     * @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
+     * Returns a string representation of this Plot ID in the format "x-y".
-     * components are separated by "-"
      *
-     * @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/PlotModificationManager.java

@@ -38,7 +38,6 @@ import com.plotsquared.core.location.Location;
 import com.plotsquared.core.player.PlotPlayer;
 import com.plotsquared.core.plot.flag.PlotFlag;
 import com.plotsquared.core.queue.QueueCoordinator;
-import com.plotsquared.core.util.PlayerManager;
 import com.plotsquared.core.util.task.TaskManager;
 import com.plotsquared.core.util.task.TaskTime;
 import com.sk89q.worldedit.function.pattern.Pattern;
@@ -59,6 +58,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
@@ -383,13 +383,17 @@ public final class PlotModificationManager {
         }
         if (createSign) {
             queue.setCompleteTask(() -> TaskManager.runTaskAsync(() -> {
-                for (Plot current : plots) {
+                List<CompletableFuture<Void>> tasks = plots.stream().map(current -> PlotSquared.platform().playerManager()
-                    current.getPlotModificationManager().setSign(PlayerManager.resolveName(current.getOwnerAbs()).getComponent(
+                                .getUsernameCaption(current.getOwnerAbs())
-                            LocaleHolder.console()));
+                                .thenAccept(caption -> current
-                }
+                                        .getPlotModificationManager()
+                                        .setSign(caption.getComponent(LocaleHolder.console()))))
+                        .toList();
+                CompletableFuture.allOf(tasks.toArray(CompletableFuture[]::new)).whenComplete((unused, throwable) -> {
                     if (whenDone != null) {
                         TaskManager.runTask(whenDone);
                     }
+                });
             }));
         } else if (whenDone != null) {
             queue.setCompleteTask(whenDone);

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

@@ -29,6 +29,7 @@ import com.plotsquared.core.plot.flag.implementations.BlockIgnitionFlag;
 import com.plotsquared.core.plot.flag.implementations.BlockedCmdsFlag;
 import com.plotsquared.core.plot.flag.implementations.BreakFlag;
 import com.plotsquared.core.plot.flag.implementations.ChatFlag;
+import com.plotsquared.core.plot.flag.implementations.ConcreteHardenFlag;
 import com.plotsquared.core.plot.flag.implementations.CopperOxideFlag;
 import com.plotsquared.core.plot.flag.implementations.CoralDryFlag;
 import com.plotsquared.core.plot.flag.implementations.CropGrowFlag;
@@ -142,6 +143,7 @@ public final class GlobalFlagContainer extends FlagContainer {
         this.addFlag(BeaconEffectsFlag.BEACON_EFFECT_TRUE);
         this.addFlag(BlockIgnitionFlag.BLOCK_IGNITION_TRUE);
         this.addFlag(ChatFlag.CHAT_FLAG_TRUE);
+        this.addFlag(ConcreteHardenFlag.CONCRETE_HARDEN_TRUE);
         this.addFlag(CopperOxideFlag.COPPER_OXIDE_FALSE);
         this.addFlag(CoralDryFlag.CORAL_DRY_FALSE);
         this.addFlag(CropGrowFlag.CROP_GROW_TRUE);

Core/src/main/java/com/plotsquared/core/plot/flag/implementations/ConcreteHardenFlag.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 ConcreteHardenFlag extends BooleanFlag<ConcreteHardenFlag> {
+
+    public static final ConcreteHardenFlag CONCRETE_HARDEN_TRUE = new ConcreteHardenFlag(true);
+    public static final ConcreteHardenFlag CONCRETE_HARDEN_FALSE = new ConcreteHardenFlag(false);
+
+    private ConcreteHardenFlag(boolean value) {
+        super(value, TranslatableCaption.of("flags.flag_description_concrete_harden"));
+    }
+
+    @Override
+    protected ConcreteHardenFlag flagOf(@NonNull Boolean value) {
+        return value ? CONCRETE_HARDEN_TRUE : CONCRETE_HARDEN_FALSE;
+    }
+
+}

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

@@ -183,7 +183,7 @@ public class ChunkCoordinatorBuilder {
      * Set whether the chunks should be allow to unload after being accessed. This should only be used where the chunks are read from
      * and then written to from a separate queue where they're consequently unloaded.
      *
-     * @param unloadAfter if to unload chuns afterwards
+     * @param unloadAfter if to unload chunks afterwards
      * @return this ChunkCoordinatorBuilder instance
      */
     public @NonNull ChunkCoordinatorBuilder unloadAfter(final boolean unloadAfter) {

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

@@ -42,28 +42,14 @@ public class EntityUtil {
     }
 
     private static int capNumeral(final @NonNull String flagName) {
-        int i;
+        return switch (flagName) {
-        switch (flagName) {
+            case "mob-cap" -> CAP_MOB;
-            case "mob-cap":
+            case "hostile-cap" -> CAP_MONSTER;
-                i = CAP_MOB;
+            case "animal-cap" -> CAP_ANIMAL;
-                break;
+            case "vehicle-cap" -> CAP_VEHICLE;
-            case "hostile-cap":
+            case "misc-cap" -> CAP_MISC;
-                i = CAP_MONSTER;
+            default -> CAP_ENTITY;
-                break;
+        };
-            case "animal-cap":
-                i = CAP_ANIMAL;
-                break;
-            case "vehicle-cap":
-                i = CAP_VEHICLE;
-                break;
-            case "misc-cap":
-                i = CAP_MISC;
-                break;
-            case "entity-cap":
-            default:
-                i = CAP_ENTITY;
-        }
-        return i;
     }
 
     @SuppressWarnings("unchecked")

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

@@ -28,6 +28,7 @@ import com.plotsquared.core.database.DBFunc;
 import com.plotsquared.core.player.ConsolePlayer;
 import com.plotsquared.core.player.OfflinePlotPlayer;
 import com.plotsquared.core.player.PlotPlayer;
+import com.plotsquared.core.plot.Plot;
 import com.plotsquared.core.uuid.UUIDMapping;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.ComponentLike;
@@ -37,6 +38,7 @@ import net.kyori.adventure.text.minimessage.tag.Tag;
 import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.jetbrains.annotations.Contract;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -48,6 +50,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
 
@@ -169,7 +172,9 @@ public abstract class PlayerManager<P extends PlotPlayer<? extends T>, T> {
      * @return A caption containing either the name, {@code None}, {@code Everyone} or {@code Unknown}
      * @see #resolveName(UUID, boolean)
      * @since 6.4.0
+     * @deprecated Don't unnecessarily block threads and utilize playerMap - see {@link #getUsernameCaption(UUID)}
      */
+    @Deprecated(since = "TODO")
     public static @NonNull Caption resolveName(final @Nullable UUID owner) {
         return resolveName(owner, true);
     }
@@ -181,7 +186,9 @@ public abstract class PlayerManager<P extends PlotPlayer<? extends T>, T> {
      * @param blocking If the operation should block the current thread for {@link Settings.UUID#BLOCKING_TIMEOUT} milliseconds
      * @return A caption containing either the name, {@code None}, {@code Everyone} or {@code Unknown}
      * @since 6.4.0
+     * @deprecated Don't unnecessarily block threads and utilize playerMap - see {@link #getUsernameCaption(UUID)}
      */
+    @Deprecated(since = "TODO")
     public static @NonNull Caption resolveName(final @Nullable UUID owner, final boolean blocking) {
         if (owner == null) {
             return TranslatableCaption.of("info.none");
@@ -211,6 +218,50 @@ public abstract class PlayerManager<P extends PlotPlayer<? extends T>, T> {
         return StaticCaption.of(name);
     }
 
+    /**
+     * Resolves a UUID to a formatted {@link Caption} representing the player behind the UUID.
+     * Returns a {@link CompletableFuture} instead of a plain {@link UUID} as this method may query the
+     * {@link com.plotsquared.core.uuid.UUIDPipeline ImpromptuUUIDPipeline}.
+     * <br>
+     * Special Cases:
+     * <ul>
+     *     <li>{@code null}: Resolves to a {@link TranslatableCaption} with the key {@code info.none}</li>
+     *     <li>{@link DBFunc#EVERYONE}: Resolves to a {@link TranslatableCaption} with the key {@code info.everyone}</li>
+     *     <li>{@link DBFunc#SERVER}: Resolves to a {@link TranslatableCaption} with the key {@code info.server}</li>
+     * </ul>
+     * <br>
+     * Otherwise, if the UUID is a valid UUID and not reserved by PlotSquared itself, this method first attempts to query the
+     * online players ({@link #getPlayerIfExists(UUID)}) for the specific UUID.
+     * If no online player was found for that UUID, the {@link com.plotsquared.core.uuid.UUIDPipeline ImpromptuUUIDPipeline} is
+     * queried to retrieve the known username
+     *
+     * @param uuid The UUID of the player (for example provided by {@link Plot#getOwner()}
+     * @return A CompletableFuture resolving to a Caption representing the players name of the uuid
+     * @since TODO
+     */
+    @Contract("_->!null")
+    public @NonNull CompletableFuture<Caption> getUsernameCaption(@Nullable UUID uuid) {
+        if (uuid == null) {
+            return CompletableFuture.completedFuture(TranslatableCaption.of("info.none"));
+        }
+        if (uuid.equals(DBFunc.EVERYONE)) {
+            return CompletableFuture.completedFuture(TranslatableCaption.of("info.everyone"));
+        }
+        if (uuid.equals(DBFunc.SERVER)) {
+            return CompletableFuture.completedFuture(TranslatableCaption.of("info.server"));
+        }
+        P player = getPlayerIfExists(uuid);
+        if (player != null) {
+            return CompletableFuture.completedFuture(StaticCaption.of(player.getName()));
+        }
+        return PlotSquared.get().getImpromptuUUIDPipeline().getNames(Collections.singleton(uuid)).thenApply(mapping -> {
+            if (mapping.isEmpty()) {
+                return TranslatableCaption.of("info.unknown");
+            }
+            return StaticCaption.of(mapping.get(0).username());
+        });
+    }
+
     /**
      * Remove a player from the player map
      *

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

@@ -83,6 +83,7 @@ import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.channels.Channels;
@@ -144,7 +145,7 @@ public abstract class SchematicHandler {
         }
         final URL url;
         try {
-            url = new URL(Settings.Web.URL + "?key=" + uuid + "&type=" + extension);
+            url = URI.create(Settings.Web.URL + "?key=" + uuid + "&type=" + extension).toURL();
         } catch (MalformedURLException e) {
             e.printStackTrace();
             whenDone.run();
@@ -153,7 +154,7 @@ public abstract class SchematicHandler {
         TaskManager.runTaskAsync(() -> {
             try {
                 String boundary = Long.toHexString(System.currentTimeMillis());
-                URLConnection con = new URL(website).openConnection();
+                URLConnection con = URI.create(website).toURL().openConnection();
                 con.setDoOutput(true);
                 con.setRequestProperty("Content-Type", "multipart/form-data; boundary=" + boundary);
                 try (OutputStream output = con.getOutputStream();
@@ -498,9 +499,10 @@ public abstract class SchematicHandler {
     public List<String> getSaves(UUID uuid) {
         String rawJSON;
         try {
-            String website = Settings.Web.URL + "list.php?" + uuid.toString();
+            URLConnection connection = URI.create(
-            URL url = new URL(website);
+                    Settings.Web.URL + "list.php?" + uuid.toString())
-            URLConnection connection = new URL(url.toString()).openConnection();
+                    .toURL()
+                    .openConnection();
             connection.setRequestProperty("User-Agent", "Mozilla/5.0");
             try (BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
                 rawJSON = reader.lines().collect(Collectors.joining());

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

@@ -47,6 +47,7 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 import java.util.function.BiFunction;
 
 /**
@@ -109,9 +110,9 @@ public final class PlaceholderRegistry {
             if (plotOwner == null) {
                 return legacyComponent(TranslatableCaption.of("generic.generic_unowned"), player);
             }
-
             try {
-                return PlayerManager.resolveName(plotOwner, false).getComponent(player);
+                return PlotSquared.platform().playerManager().getUsernameCaption(plotOwner)
+                        .get(Settings.UUID.BLOCKING_TIMEOUT, TimeUnit.MILLISECONDS).getComponent(player);
             } catch (final Exception ignored) {
             }
             return legacyComponent(TranslatableCaption.of("info.unknown"), player);
@@ -187,6 +188,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

@@ -551,6 +551,7 @@
   "flags.flag_description_block_burn": "<gray>Set to `true` to allow blocks to burn within the plot.</gray>",
   "flags.flag_description_block_ignition": "<gray>Set to `false` to prevent blocks from igniting within the plot.</gray>",
   "flags.flag_description_break": "<gray>Define a list of materials players should be able to break even when they aren't added to the plot.</gray>",
+  "flags.flag_description_concrete_harden": "<gray>Set to `false` to disable concrete powder forming to concrete with water.</gray>",
   "flags.flag_description_device_interact": "<gray>Set to `true` to allow devices to be interacted with in the plot.</gray>",
   "flags.flag_description_disable_physics": "<gray>Set to `true` to disable block physics in the plot.</gray>",
   "flags.flag_description_drop_protection": "<gray>Set to `true` to prevent dropped items from being picked up by non-members of the plot.</gray>",
@@ -631,6 +632,8 @@
   "flags.flag_error_double": "Flag value must be a decimal number.",
   "flags.flag_error_music": "Flag value must be a valid music disc ID.",
   "flags.flag_error_title": "Flag value must be in the format </red><grey>\"A title\" \"The subtitle\"</grey><red>.",
+  "flags.delaying_loading_area_flags": "<prefix><gray>Delaying loading flags for area `</gray><dark_aqua><area></dark_aqua><gray>` as WorldEdit is not initialised yet.</gray>",
+  "flags.loading_area_flags": "<prefix><gray>Loading flags for area: </gray><dark_aqua><area></dark_aqua>",
   "flags.area_flags": "<prefix><gray>Area flags: </gray><dark_aqua><flags></dark_aqua>",
   "flags.road_flags": "<prefix><gray>Road flags: </gray><dark_aqua><flags></dark_aqua>",
   "commands.description.add": "<gray>Allow a user to build in a plot while the plot owner is online.</gray>",

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
 
@@ -149,29 +150,34 @@ subprojects {
                             id.set("Sauilitired")
                             name.set("Alexander Söderberg")
                             organization.set("IntellectualSites")
+                            organizationUrl.set("https://github.com/IntellectualSites")
                         }
                         developer {
                             id.set("NotMyFault")
                             name.set("Alexander Brandes")
                             organization.set("IntellectualSites")
+                            organizationUrl.set("https://github.com/IntellectualSites")
                             email.set("contact(at)notmyfault.dev")
                         }
                         developer {
                             id.set("SirYwell")
                             name.set("Hannes Greule")
                             organization.set("IntellectualSites")
+                            organizationUrl.set("https://github.com/IntellectualSites")
                         }
                         developer {
                             id.set("dordsor21")
                             name.set("dordsor21")
                             organization.set("IntellectualSites")
+                            organizationUrl.set("https://github.com/IntellectualSites")
                         }
                     }
 
                     scm {
                         url.set("https://github.com/IntellectualSites/PlotSquared")
-                        connection.set("scm:https://IntellectualSites@github.com/IntellectualSites/PlotSquared.git")
+                        connection.set("scm:git:https://github.com/IntellectualSites/PlotSquared.git")
-                        developerConnection.set("scm:git://github.com/IntellectualSites/PlotSquared.git")
+                        developerConnection.set("scm:git:git@github.com:IntellectualSites/PlotSquared.git")
+                        tag.set("${project.version}")
                     }
 
                     issueManagement {
@@ -218,14 +224,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", "1.20")
+val supportedVersions = listOf("1.16.5", "1.17.1", "1.18.2", "1.19.4", "1.20.1", "1.20.2")
 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 }
                     .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,20 +1,20 @@
 [versions]
 # Platform expectations
-paper = "1.20.1-R0.1-SNAPSHOT"
+paper = "1.20.2-R0.1-SNAPSHOT"
 guice = "7.0.0"
 spotbugs = "4.7.3"
-checkerqual = "3.37.0"
+checkerqual = "3.39.0"
 gson = "2.10"
 guava = "31.1-jre"
 snakeyaml = "2.0"
 adventure = "4.14.0"
-adventure-bukkit = "4.3.0"
+adventure-bukkit = "4.3.1"
 log4j = "2.19.0"
 
 # Plugins
-worldedit = "7.2.15"
+worldedit = "7.2.16"
-fawe = "2.7.1"
+fawe = "2.8.0"
-placeholderapi = "2.11.3"
+placeholderapi = "2.11.4"
 luckperms = "5.4"
 essentialsx = "2.20.1"
 mvdwapi = "3.1.1"
@@ -22,22 +22,22 @@ mvdwapi = "3.1.1"
 # Third party
 prtree = "2.0.1"
 aopalliance = "1.0"
-cloud-services = "1.8.3"
+cloud-services = "1.8.4"
 arkitektonika = "2.1.2"
 squirrelid = "0.3.2"
 paster = "1.1.5"
 bstats = "3.0.2"
 paperlib = "1.0.8"
-informative-annotations = "1.3"
+informative-annotations = "1.4"
 vault = "1.7.1"
 serverlib = "2.3.4"
 
 # Gradle plugins
 shadow = "8.1.1"
 grgit = "4.1.1"
-spotless = "6.21.0"
+spotless = "6.22.0"
 nexus = "1.3.0"
-runPaper = "2.1.0"
+runPaper = "2.2.0"
 
 [libraries]
 # Platform expectations

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -145,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=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -153,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=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ 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;
+# Collect all arguments for the java command:
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     shell script including quotes and variable substitutions, so put them in
+#     and any embedded shellness will be escaped.
-#     double quotes to make sure that they get re-expanded; and
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#   * put everything else in single quotes, so that it's not re-expanded.
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \