add transalation key

- closes #4156

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -7,7 +7,7 @@ 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/).
+        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

.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

@@ -9,5 +9,11 @@
     "dependencies"
   ],
   "rebaseWhen": "conflicted",
-  "schedule": ["on the first day of the month"]
+  "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/build.yml

@@ -42,7 +42,7 @@ jobs:
           ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
           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'}}
+        if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
         uses: cpina/github-action-push-to-another-repository@main
         env:
           SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}
@@ -54,7 +54,7 @@ jobs:
           target-branch: main
           target-directory: v7/core
       - name: Publish bukkit javadoc
-      #  if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
+        if: ${{ runner.os == 'Linux' && env.STATUS == 'release' && github.event_name == 'push' && github.ref == 'refs/heads/main'}}
         uses: cpina/github-action-push-to-another-repository@main
         env:
           SSH_DEPLOY_KEY: ${{ secrets.SSH_DEPLOY_KEY }}

.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

@@ -21,20 +21,20 @@ dependencies {
     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 {

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

@@ -50,6 +50,7 @@ import com.plotsquared.bukkit.util.BukkitUtil;
 import com.plotsquared.bukkit.util.BukkitWorld;
 import com.plotsquared.bukkit.util.SetGenCB;
 import com.plotsquared.bukkit.util.TranslationUpdateManager;
+import com.plotsquared.bukkit.util.UpdateUtility;
 import com.plotsquared.bukkit.util.task.BukkitTaskManager;
 import com.plotsquared.bukkit.util.task.PaperTimeConverter;
 import com.plotsquared.bukkit.util.task.SpigotTimeConverter;
@@ -251,6 +252,7 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
     }
 
     @Override
+    @SuppressWarnings("deprecation") // Paper deprecation
     public void onEnable() {
         this.pluginName = getDescription().getName();
 
@@ -302,11 +304,9 @@ public final class BukkitPlatform extends JavaPlugin implements Listener, PlotPl
 
         this.serverLocale = Locale.forLanguageTag(Settings.Enabled_Components.DEFAULT_LOCALE);
 
-        /* TODO Enable update checker before v7 is released to GA
         if (PremiumVerification.isPremium() && Settings.Enabled_Components.UPDATE_NOTIFICATIONS) {
             injector.getInstance(UpdateUtility.class).updateChecker();
         }
-         */
 
         if (PremiumVerification.isPremium()) {
             LOGGER.info("PlotSquared version licensed to Spigot user {}", getUserID());
@@ -551,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);
@@ -1161,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();
@@ -1182,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/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/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();

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/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

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

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,7 +294,7 @@ 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;

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/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/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/generator/HybridPlotWorld.java

@@ -265,7 +265,6 @@ public class HybridPlotWorld extends ClassicPlotWorld {
 
         int worldGenHeight = getMaxGenHeight() - getMinGenHeight() + 1;
 
-        int maxSchematicHeight = 0;
         int plotSchemHeight = 0;
 
         // SCHEM_Y should be normalised to the plot "start" height
@@ -275,49 +274,41 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                 SCHEM_Y = getMinGenHeight();
                 plotY = 0;
             } else if (!Settings.Schematics.PASTE_ON_TOP) {
-                SCHEM_Y = getMinBuildHeight();
+                SCHEM_Y = getMinGenHeight();
                 plotY = 0;
             }
-            maxSchematicHeight = plotY + plotSchemHeight;
         }
 
-        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;
@@ -562,7 +553,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
      * Get the y value where the plot schematic should be pasted from.
      *
      * @return plot schematic y start value
-     * @since TODO
+     * @since 7.0.0
      */
     public int getPlotYStart() {
         return SCHEM_Y + plotY;
@@ -572,7 +563,7 @@ public class HybridPlotWorld extends ClassicPlotWorld {
      * Get the y value where the road schematic should be pasted from.
      *
      * @return road schematic y start value
-     * @since TODO
+     * @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);

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

@@ -66,7 +66,7 @@ public final class UncheckedWorldLocation extends Location {
      * @param world World
      * @param loc   Coordinates
      * @return New location
-     * @since 6.9.0
+     * @since 7.0.0
      */
     @DoNotUse
     public static @NonNull UncheckedWorldLocation at(final @NonNull String world, BlockVector3 loc) {

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

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

@@ -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/resources/lang/messages_en.json

@@ -124,7 +124,7 @@
   "economy.cannot_afford_merge": "<prefix><red>You cannot afford to merge the plots. It costs <gold><money></gold>.</red>",
   "economy.added_balance": "<prefix><gold><money> </gold><gray>has been added to your balance.</gray>",
   "economy.removed_balance": "<prefix><gold><money> </gold><gray>has been taken from your balance.</gray>",
-  "economy.removed_granted_plot": "<prefix><gray>You used <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>",
@@ -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>",

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.1.0"
+    alias(libs.plugins.runPaper)
 }
 
 group = "com.intellectualsites.plotsquared"
-version = "7.0.0-SNAPSHOT"
+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.31"))
-    }
-
     dependencies {
         // Tests
-        testImplementation("org.junit.jupiter:junit-jupiter:5.9.3")
+        testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
     }
 
     plugins.withId("java") {
@@ -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", "1.20")
+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 }
                     .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,33 +1,58 @@
 [versions]
 # Platform expectations
+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.15"
-placeholderapi = "2.11.3"
+fawe = "2.7.1"
+placeholderapi = "2.11.4"
 luckperms = "5.4"
-essentialsx = "2.20.0"
+essentialsx = "2.20.1"
 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"
+vault = "1.7.1"
+serverlib = "2.3.4"
 
 # Gradle plugins
 shadow = "8.1.1"
 grgit = "4.1.1"
-spotless = "6.19.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,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# 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

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> :)