docs: Update Readme SVG

Bukkit/build.gradle.kts

@@ -21,20 +21,20 @@ dependencies {
     api(projects.plotSquaredCore)
 
     // Metrics
-    implementation("org.bstats:bstats-bukkit")
+    implementation(libs.bstats)
 
     // Paper
     compileOnly(libs.paper)
-    implementation("io.papermc:paperlib")
+    implementation(libs.paperlib)
 
     // Plugins
     compileOnly(libs.worldeditBukkit) {
         exclude(group = "org.bukkit")
         exclude(group = "org.spigotmc")
     }
-    compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit") { isTransitive = false }
+    compileOnly(libs.fastasyncworldeditBukkit) { isTransitive = false }
-    testImplementation("com.fastasyncworldedit:FastAsyncWorldEdit-Bukkit") { isTransitive = false }
+    testImplementation(libs.fastasyncworldeditBukkit) { isTransitive = false }
-    compileOnly("com.github.MilkBowl:VaultAPI") {
+    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(libs.http4j)
-    implementation("com.intellectualsites.paster:Paster")
+    implementation(libs.paster)
 
     // Adventure
-    implementation("net.kyori:adventure-platform-bukkit")
+    implementation(libs.adventurePlatformBukkit)
 }
 
 tasks.processResources {
@@ -97,7 +97,7 @@ tasks.named<ShadowJar>("shadowJar") {
 tasks {
     withType<Javadoc> {
         val opt = options as StandardJavadocDocletOptions
-        opt.links("https://jd.papermc.io/paper/1.18/")
+        opt.links("https://papermc.io/javadocs/paper/1.18/")
         opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-bukkit/" + libs.worldeditBukkit.get().versionConstraint.toString())
         opt.links("https://javadoc.io/doc/com.plotsquared/PlotSquared-Core/latest/")
         opt.links("https://jd.adventure.kyori.net/api/" + libs.adventure.get().versionConstraint.toString())

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

@@ -551,10 +551,6 @@ public class BlockEventListener implements Listener {
         if (plot == null) {
             return;
         }
-        if (location.getY() >= area.getMaxBuildHeight() || location.getY() < area.getMinBuildHeight()) {
-            event.setCancelled(true);
-            return;
-        }
         switch (event.getNewState().getType()) {
             case SNOW:
             case SNOW_BLOCK:
@@ -754,66 +750,62 @@ public class BlockEventListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onChange(BlockFromToEvent event) {
-        Block fromBlock = event.getBlock();
+        Block from = event.getBlock();
 
         // Check liquid flow flag inside of origin plot too
-        final Location fromLocation = BukkitUtil.adapt(fromBlock.getLocation());
+        final Location fLocation = BukkitUtil.adapt(from.getLocation());
-        final PlotArea fromArea = fromLocation.getPlotArea();
+        final PlotArea fromArea = fLocation.getPlotArea();
         if (fromArea != null) {
-            final Plot fromPlot = fromArea.getOwnedPlot(fromLocation);
+            final Plot plot = fromArea.getOwnedPlot(fLocation);
-            if (fromPlot != null && fromPlot.getFlag(LiquidFlowFlag.class) == LiquidFlowFlag.FlowStatus.DISABLED && event
+            if (plot != null && plot.getFlag(LiquidFlowFlag.class) == LiquidFlowFlag.FlowStatus.DISABLED && event
                     .getBlock()
                     .isLiquid()) {
-                fromPlot.debug("Liquid could not flow because liquid-flow = disabled");
+                plot.debug("Liquid could not flow because liquid-flow = disabled");
                 event.setCancelled(true);
                 return;
             }
         }
 
-        Block toBlock = event.getToBlock();
+        Block to = event.getToBlock();
-        Location toLocation = BukkitUtil.adapt(toBlock.getLocation());
+        Location tLocation = BukkitUtil.adapt(to.getLocation());
-        PlotArea toArea = toLocation.getPlotArea();
+        PlotArea area = tLocation.getPlotArea();
-        if (toArea == null) {
+        if (area == null) {
-            if (fromBlock.getType() == Material.DRAGON_EGG && fromArea != null) {
+            if (from.getType() == Material.DRAGON_EGG && fromArea != null) {
                 event.setCancelled(true);
             }
             return;
         }
-        if (toLocation.getY() >= toArea.getMaxBuildHeight() || toLocation.getY() < toArea.getMinBuildHeight()) {
+        Plot plot = area.getOwnedPlot(tLocation);
-            event.setCancelled(true);
-            return;
-        }
-        Plot toPlot = toArea.getOwnedPlot(toLocation);
 
-        if (fromBlock.getType() == Material.DRAGON_EGG && fromArea != null) {
+        if (from.getType() == Material.DRAGON_EGG && fromArea != null) {
-            final Plot fromPlot = fromArea.getOwnedPlot(fromLocation);
+            final Plot fromPlot = fromArea.getOwnedPlot(fLocation);
 
-            if (fromPlot != null || toPlot != null) {
+            if (fromPlot != null || plot != null) {
-                if ((fromPlot == null || !fromPlot.equals(toPlot)) && (toPlot == null || !toPlot.equals(fromPlot))) {
+                if ((fromPlot == null || !fromPlot.equals(plot)) && (plot == null || !plot.equals(fromPlot))) {
                     event.setCancelled(true);
                     return;
                 }
             }
         }
 
-        if (toPlot != null) {
+        if (plot != null) {
-            if (!toArea.contains(fromLocation.getX(), fromLocation.getZ()) || !Objects.equals(toPlot, toArea.getOwnedPlot(fromLocation))) {
+            if (!area.contains(fLocation.getX(), fLocation.getZ()) || !Objects.equals(plot, area.getOwnedPlot(fLocation))) {
                 event.setCancelled(true);
                 return;
             }
-            if (toPlot.getFlag(LiquidFlowFlag.class) == LiquidFlowFlag.FlowStatus.ENABLED && event.getBlock().isLiquid()) {
+            if (plot.getFlag(LiquidFlowFlag.class) == LiquidFlowFlag.FlowStatus.ENABLED && event.getBlock().isLiquid()) {
                 return;
             }
-            if (toPlot.getFlag(DisablePhysicsFlag.class)) {
+            if (plot.getFlag(DisablePhysicsFlag.class)) {
-                toPlot.debug(event.getBlock().getType() + " could not update because disable-physics = true");
+                plot.debug(event.getBlock().getType() + " could not update because disable-physics = true");
                 event.setCancelled(true);
                 return;
             }
-            if (toPlot.getFlag(LiquidFlowFlag.class) == LiquidFlowFlag.FlowStatus.DISABLED && event.getBlock().isLiquid()) {
+            if (plot.getFlag(LiquidFlowFlag.class) == LiquidFlowFlag.FlowStatus.DISABLED && event.getBlock().isLiquid()) {
-                toPlot.debug("Liquid could not flow because liquid-flow = disabled");
+                plot.debug("Liquid could not flow because liquid-flow = disabled");
                 event.setCancelled(true);
             }
-        } else if (!toArea.contains(fromLocation.getX(), fromLocation.getZ()) || !Objects.equals(null, toArea.getOwnedPlot(fromLocation))) {
+        } else if (!area.contains(fLocation.getX(), fLocation.getZ()) || !Objects.equals(null, area.getOwnedPlot(fLocation))) {
             event.setCancelled(true);
         } else if (event.getBlock().isLiquid()) {
             final org.bukkit.Location location = event.getBlock().getLocation();

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")
+    compileOnlyApi(libs.gson)
-    compileOnly("com.google.guava:guava")
+    compileOnly(libs.guava)
 
     // Platform expectations
-    compileOnlyApi("org.yaml:snakeyaml")
+    compileOnlyApi(libs.snakeyaml)
 
     // Adventure
-    api("net.kyori:adventure-api")
+    api(libs.adventure)
-    api("net.kyori:adventure-text-minimessage")
+    api(libs.minimessage)
 
     // Guice
     api(libs.guice) {
@@ -31,18 +31,18 @@ dependencies {
         exclude(group = "dummypermscompat")
     }
     testImplementation(libs.worldeditCore)
-    compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core") { isTransitive = false }
+    compileOnly(libs.fastasyncworldeditCore) { isTransitive = false }
-    testImplementation("com.fastasyncworldedit:FastAsyncWorldEdit-Core") { isTransitive = false }
+    testImplementation(libs.fastasyncworldeditCore) { 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(libs.paster)
 }
 
 tasks.processResources {

build.gradle.kts

@@ -18,7 +18,7 @@ plugins {
     idea
 }
 
-version = "6.8.2-SNAPSHOT"
+version = "6.8.1-SNAPSHOT"
 
 allprojects {
     group = "com.plotsquared"
@@ -34,7 +34,7 @@ allprojects {
 
         maven {
             name = "Sonatype OSS (S01)"
-            url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+            url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots")
         }
 
         maven {
@@ -64,12 +64,9 @@ subprojects {
         plugin<EclipsePlugin>()
         plugin<IdeaPlugin>()
     }
-
-    dependencies {
-        implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.2"))
-    }
 }
 
+val javadocDir = rootDir.resolve("docs").resolve("javadoc").resolve(project.name)
 allprojects {
     dependencies {
         // Tests
@@ -175,6 +172,11 @@ allprojects {
     }
 
     tasks {
+        named<Delete>("clean") {
+            doFirst {
+                javadocDir.deleteRecursively()
+            }
+        }
 
         compileJava {
             options.compilerArgs.addAll(arrayOf("-Xmaxerrs", "1000"))
@@ -185,6 +187,16 @@ allprojects {
             options.encoding = "UTF-8"
         }
 
+        javadoc {
+            val opt = options as StandardJavadocDocletOptions
+            opt.addStringOption("Xdoclint:none", "-quiet")
+            opt.tags(
+                    "apiNote:a:API Note:",
+                    "implSpec:a:Implementation Requirements:",
+                    "implNote:a:Implementation Note:"
+            )
+        }
+
         shadowJar {
             this.archiveClassifier.set(null as String?)
             this.archiveFileName.set("${project.name}-${project.version}.${this.archiveExtension.getOrElse("jar")}")
@@ -209,3 +221,37 @@ nexusPublishing {
         }
     }
 }
+
+tasks {
+    val aggregatedJavadocs = create<Javadoc>("aggregatedJavadocs") {
+        title = "${project.name} ${project.version} API"
+        setDestinationDir(javadocDir)
+        options.destinationDirectory = javadocDir
+
+        doFirst {
+            javadocDir.deleteRecursively()
+        }
+    }.also {
+        it.group = "Documentation"
+        it.description = "Generate javadocs from all child projects as if it was a single project"
+    }
+
+    subprojects.forEach { subProject ->
+        subProject.afterEvaluate {
+            subProject.tasks.withType<Javadoc>().forEach { task ->
+                aggregatedJavadocs.source += task.source
+                aggregatedJavadocs.classpath += task.classpath
+                aggregatedJavadocs.excludes += task.excludes
+                aggregatedJavadocs.includes += task.includes
+
+                val rootOptions = aggregatedJavadocs.options as StandardJavadocDocletOptions
+                val subOptions = task.options as StandardJavadocDocletOptions
+                rootOptions.links(*subOptions.links.orEmpty().minus(rootOptions.links.orEmpty().toSet()).toTypedArray())
+            }
+        }
+    }
+
+    build {
+        dependsOn(aggregatedJavadocs)
+    }
+}

gradle/libs.versions.toml

@@ -1,9 +1,15 @@
 [versions]
+# Minecraft expectations
+gson = "2.8.8" # Version set by Minecraft
+log4j-api = "2.17.1" # Version set by Minecraft
+guava = "31.0.1-jre" # Version set by Minecraft
+
 # Platform expectations
 paper = "1.18.1-R0.1-SNAPSHOT"
 checker-qual = "3.22.0"
 guice = "5.1.0"
 spotbugs = "4.7.0"
+snakeyaml = "1.30" # Version set by Bukkit
 
 # Adventure & MiniMessage
 adventure-api = "4.9.3"
@@ -12,6 +18,8 @@ adventure-platform-bukkit = "4.0.1"
 
 # Plugins
 worldedit = "7.2.10"
+fawe = "2.2.0"
+vault = "1.7.1"
 placeholderapi = "2.11.1"
 luckperms = "5.4"
 essentialsx = "2.19.4"
@@ -22,7 +30,11 @@ prtree = "2.0.0"
 aopalliance = "1.0"
 cloud-services = "1.6.2"
 arkitektonika = "2.1.1"
+paster = "1.1.4"
+bstats = "3.0.0"
+paperlib = "1.0.7"
 squirrelid = "0.3.1"
+serverlib = "2.3.1"
 http4j = "1.3"
 
 # Gradle plugins
@@ -36,7 +48,12 @@ nexus = "1.1.0"
 paper = { group = "io.papermc.paper", name = "paper-api", version.ref = "paper" }
 checkerqual = { group = "org.checkerframework", name = "checker-qual", version.ref = "checker-qual" }
 
+# Minecraft expectations
+gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
+log4j = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = "log4j-api" }
+
 # Platform expectations
+snakeyaml = { group = "org.yaml", name = "snakeyaml", version.ref = "snakeyaml" }
 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" }
@@ -49,6 +66,9 @@ adventurePlatformBukkit = { group = "net.kyori", name = "adventure-platform-bukk
 # Plugins
 worldeditCore = { group = "com.sk89q.worldedit", name = "worldedit-core", version.ref = "worldedit" }
 worldeditBukkit = { group = "com.sk89q.worldedit", name = "worldedit-bukkit", version.ref = "worldedit" }
+fastasyncworldeditBukkit = { group = "com.fastasyncworldedit", name = "FastAsyncWorldEdit-Bukkit", version.ref = "fawe" }
+fastasyncworldeditCore = { group = "com.fastasyncworldedit", name = "FastAsyncWorldEdit-Core", version.ref = "fawe" }
+vault = { group = "com.github.MilkBowl", name = "VaultAPI", version.ref = "vault" }
 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" }
@@ -59,8 +79,13 @@ aopalliance = { group = "aopalliance", name = "aopalliance", version.ref = "aopa
 cloudServices = { group = "cloud.commandframework", name = "cloud-services", version.ref = "cloud-services" }
 mvdwapi = { group = "com.intellectualsites.mvdwplaceholderapi", name = "MVdWPlaceholderAPI", version.ref = "mvdwapi" }
 squirrelid = { group = "org.enginehub", name = "squirrelid", version.ref = "squirrelid" }
+serverlib = { group = "dev.notmyfault.serverlib", name = "ServerLib", version.ref = "serverlib" }
+bstats = { group = "org.bstats", name = "bstats-bukkit", version.ref = "bstats" }
+paperlib = { group = "io.papermc", name = "paperlib", version.ref = "paperlib" }
 arkitektonika = { group = "com.intellectualsites.arkitektonika", name = "Arkitektonika-Client", version.ref = "arkitektonika" }
 http4j = { group = "com.intellectualsites.http", name = "HTTP4J", version.ref = "http4j" }
+paster = { group = "com.intellectualsites.paster", name = "Paster", version.ref = "paster" }
+guava = { group = "com.google.guava", name = "guava", version.ref = "guava" }
 
 [plugins]
 shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }