Remove needless since javadoc tags

- Should fix #3504

Bukkit/build.gradle.kts

@@ -100,7 +100,7 @@ tasks {
         opt.links("https://jd.papermc.io/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())
+        opt.links("https://jd.adventure.kyori.net/api/4.9.3/")
         opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
         opt.links("https://checkerframework.org/api/")
     }

Core/build.gradle.kts

@@ -59,7 +59,7 @@ tasks {
     withType<Javadoc> {
         val opt = options as StandardJavadocDocletOptions
         opt.links("https://docs.enginehub.org/javadoc/com.sk89q.worldedit/worldedit-core/" + libs.worldeditCore.get().versionConstraint.toString())
-        opt.links("https://jd.adventure.kyori.net/api/" + libs.adventure.get().versionConstraint.toString())
+        opt.links("https://jd.adventure.kyori.net/api/4.9.3/")
         opt.links("https://google.github.io/guice/api-docs/" + libs.guice.get().versionConstraint.toString() + "/javadoc/")
         opt.links("https://checkerframework.org/api/")
     }

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

@@ -81,6 +81,9 @@ public class HybridPlotWorld extends ClassicPlotWorld {
     public short PATH_WIDTH_UPPER;
     public HashMap<Integer, BaseBlock[]> G_SCH;
     public HashMap<Integer, BiomeType> G_SCH_B;
+    /**
+     * The Y level at which schematic generation will start, lowest of either road or plot schematic generation.
+     */
     public int SCHEM_Y;
     private Location SIGN_LOCATION;
     private File root = null;
@@ -273,33 +276,57 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         int oddshift = (this.ROAD_WIDTH & 1);
 
         SCHEM_Y = schematicStartHeight();
+
+        // plotY and roadY are important to allow plot and/or road schematic "overflow" into each other without causing AIOOB
+        //  exceptions when attempting either to set blocks to, or get block from G_SCH
+        // Default plot schematic start height, normalized to the minimum height schematics are pasted from.
         int plotY = PLOT_HEIGHT - SCHEM_Y;
         int minRoadWall = Settings.Schematics.USE_WALL_IN_ROAD_SCHEM_HEIGHT ? Math.min(ROAD_HEIGHT, WALL_HEIGHT) : ROAD_HEIGHT;
+        // Default road schematic start height, normalized to the minimum height schematics are pasted from.
         int roadY = minRoadWall - SCHEM_Y;
 
-        int worldHeight = getMaxGenHeight() - getMinGenHeight() + 1;
+        int worldGenHeight = getMaxGenHeight() - getMinGenHeight() + 1;
+
+        int maxSchematicHeight = 0;
 
         // SCHEM_Y should be normalised to the plot "start" height
         if (schematic3 != null) {
-            if (schematic3.getClipboard().getDimensions().getY() == worldHeight) {
-                SCHEM_Y = plotY = 0;
+            if ((maxSchematicHeight = schematic3.getClipboard().getDimensions().getY()) == worldGenHeight) {
+                SCHEM_Y = getMinGenHeight();
+                plotY = 0;
             } else if (!Settings.Schematics.PASTE_ON_TOP) {
-                SCHEM_Y = plotY = getMinBuildHeight() - getMinGenHeight();
+                SCHEM_Y = getMinBuildHeight();
+                plotY = 0;
             }
         }
 
         if (schematic1 != null) {
-            if (schematic1.getClipboard().getDimensions().getY() == worldHeight) {
-                SCHEM_Y = roadY = getMinGenHeight();
-                if (schematic3 != null && schematic3.getClipboard().getDimensions().getY() != worldHeight
-                        && !Settings.Schematics.PASTE_ON_TOP) {
-                    plotY = PLOT_HEIGHT;
+            if ((maxSchematicHeight = Math.max(
+                    schematic1.getClipboard().getDimensions().getY(),
+                    maxSchematicHeight
+            )) == 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) {
-                SCHEM_Y = roadY = getMinBuildHeight();
-                if (schematic3 != null && schematic3.getClipboard().getDimensions().getY() != worldHeight
-                        && !Settings.Schematics.PASTE_ON_TOP) {
-                    plotY = PLOT_HEIGHT;
+                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
+                    if (Settings.Schematics.PASTE_ON_TOP) {
+                        // Road is the lowest schematic. Normalize plotY to it.
+                        plotY = PLOT_HEIGHT - getMinBuildHeight();
+                    }
+                    // If plot schematic is not paste-on-top, it will be from min build height thus plotY = 0 as well already.
                 }
             }
         }
@@ -337,17 +364,15 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                                 y + min.getBlockY(),
                                 z + min.getBlockZ()
                         ));
-                        if (!id.getBlockType().getMaterial().isAir()) {
-                            schem3PopulationNeeded |= id.hasNbtData();
-                            addOverlayBlock(
-                                    (short) (x + shift + oddshift + centerShiftX),
-                                    (short) (y + plotY),
-                                    (short) (z + shift + oddshift + centerShiftZ),
-                                    id,
-                                    false,
-                                    h3
-                            );
-                        }
+                        schem3PopulationNeeded |= id.hasNbtData();
+                        addOverlayBlock(
+                                (short) (x + shift + oddshift + centerShiftX),
+                                (short) (y + plotY),
+                                (short) (z + shift + oddshift + centerShiftZ),
+                                id,
+                                false,
+                                maxSchematicHeight
+                        );
                     }
                     if (blockArrayClipboard3.hasBiomes()) {
                         BiomeType biome = blockArrayClipboard3.getBiome(BlockVector2.at(
@@ -397,18 +422,23 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                             y + min.getBlockY(),
                             z + min.getBlockZ()
                     ));
-                    if (!id.getBlockType().getMaterial().isAir()) {
-                        schem1PopulationNeeded |= id.hasNbtData();
-                        addOverlayBlock((short) (x - shift), (short) (y + roadY), (short) (z + shift + oddshift), id, false, h1);
-                        addOverlayBlock(
-                                (short) (z + shift + oddshift),
-                                (short) (y + roadY),
-                                (short) (shift - x + (oddshift - 1)),
-                                id,
-                                true,
-                                h1
-                        );
-                    }
+                    schem1PopulationNeeded |= id.hasNbtData();
+                    addOverlayBlock(
+                            (short) (x - shift),
+                            (short) (y + roadY),
+                            (short) (z + shift + oddshift),
+                            id,
+                            false,
+                            maxSchematicHeight
+                    );
+                    addOverlayBlock(
+                            (short) (z + shift + oddshift),
+                            (short) (y + roadY),
+                            (short) (shift - x + (oddshift - 1)),
+                            id,
+                            true,
+                            maxSchematicHeight
+                    );
                 }
                 if (blockArrayClipboard1.hasBiomes()) {
                     BiomeType biome = blockArrayClipboard1.getBiome(BlockVector2.at(x + min.getBlockX(), z + min.getBlockZ()));
@@ -436,10 +466,15 @@ public class HybridPlotWorld extends ClassicPlotWorld {
                             y + min.getBlockY(),
                             z + min.getBlockZ()
                     ));
-                    if (!id.getBlockType().getMaterial().isAir()) {
-                        schem2PopulationNeeded |= id.hasNbtData();
-                        addOverlayBlock((short) (x - shift), (short) (y + roadY), (short) (z - shift), id, false, h2);
-                    }
+                    schem2PopulationNeeded |= id.hasNbtData();
+                    addOverlayBlock(
+                            (short) (x - shift),
+                            (short) (y + roadY),
+                            (short) (z - shift),
+                            id,
+                            false,
+                            maxSchematicHeight
+                    );
                 }
                 if (blockArrayClipboard2.hasBiomes()) {
                     BiomeType biome = blockArrayClipboard2.getBiome(BlockVector2.at(x + min.getBlockX(), z + min.getBlockZ()));
@@ -449,6 +484,10 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         }
     }
 
+    /**
+     * @deprecated This method should not be available for public API usage and will be made private.
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     public void addOverlayBlock(short x, short y, short z, BaseBlock id, boolean rotate, int height) {
         if (z < 0) {
             z += this.SIZE;
@@ -475,6 +514,10 @@ public class HybridPlotWorld extends ClassicPlotWorld {
         existing[y] = id;
     }
 
+    /**
+     * @deprecated This method should not be available for public API usage and will be made private.
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     public void addOverlayBiome(short x, short z, BiomeType id) {
         if (z < 0) {
             z += this.SIZE;

build.gradle.kts

@@ -18,10 +18,11 @@ plugins {
     idea
 }
 
-version = "6.9.0"
+group = "com.plotsquared"
+version = "6.9.1-SNAPSHOT"
 
-allprojects {
-    group = "com.plotsquared"
+subprojects {
+    group = rootProject.group
     version = rootProject.version
 
     repositories {
@@ -50,9 +51,7 @@ allprojects {
             url = uri("https://maven.enginehub.org/repo/")
         }
     }
-}
 
-subprojects {
     apply {
         plugin<JavaPlugin>()
         plugin<JavaLibraryPlugin>()
@@ -66,11 +65,9 @@ subprojects {
     }
 
     dependencies {
-        implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.2"))
+        implementation(platform("com.intellectualsites.bom:bom-1.18.x:1.5"))
     }
-}
 
-allprojects {
     dependencies {
         // Tests
         testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
@@ -165,7 +162,7 @@ allprojects {
                         developerConnection.set("scm:git://github.com/IntellectualSites/PlotSquared.git")
                     }
 
-                    issueManagement{
+                    issueManagement {
                         system.set("GitHub")
                         url.set("https://github.com/IntellectualSites/PlotSquared/issues")
                     }
@@ -188,7 +185,6 @@ allprojects {
         shadowJar {
             this.archiveClassifier.set(null as String?)
             this.archiveFileName.set("${project.name}-${project.version}.${this.archiveExtension.getOrElse("jar")}")
-            this.destinationDirectory.set(rootProject.tasks.shadowJar.get().destinationDirectory.get())
         }
 
         named("build") {
@@ -198,7 +194,6 @@ allprojects {
             useJUnitPlatform()
         }
     }
-
 }
 
 nexusPublishing {
@@ -209,3 +204,7 @@ nexusPublishing {
         }
     }
 }
+
+tasks.getByName<Jar>("jar") {
+    enabled = false
+}

gradle/libs.versions.toml

@@ -5,11 +5,6 @@ checker-qual = "3.22.0"
 guice = "5.1.0"
 spotbugs = "4.7.0"
 
-# Adventure & MiniMessage
-adventure-api = "4.9.3"
-adventure-text-minimessage = "4.1.0-SNAPSHOT"
-adventure-platform-bukkit = "4.0.1"
-
 # Plugins
 worldedit = "7.2.10"
 placeholderapi = "2.11.1"
@@ -41,11 +36,6 @@ 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" }
 
-# Adventure & MiniMessage
-adventure = { group = "net.kyori", name = "adventure-api", version.ref = "adventure-api" }
-minimessage = { group = "net.kyori", name = "adventure-text-minimessage", version.ref = "adventure-text-minimessage" }
-adventurePlatformBukkit = { group = "net.kyori", name = "adventure-platform-bukkit", version.ref = "adventure-platform-bukkit" }
-
 # Plugins
 worldeditCore = { group = "com.sk89q.worldedit", name = "worldedit-core", version.ref = "worldedit" }
 worldeditBukkit = { group = "com.sk89q.worldedit", name = "worldedit-bukkit", version.ref = "worldedit" }

renovate.json

@@ -3,14 +3,6 @@
     "config:base",
     ":disableDependencyDashboard"
   ],
-  "ignoreDeps": [
-    "guava",
-    "com.google.guava:guava",
-    "com.google.code.gson:gson",
-    "gson",
-    "snakeyaml",
-    "net.kyori"
-  ],
   "timezone": "Europe/Berlin",
   "schedule": [
     "every monday"