5.0.0

.github/ISSUE_TEMPLATE/1-bug-report.yml

@@ -16,7 +16,7 @@ body:
     attributes:
       label: "Plugin Version"
       description: "Which version of the plugin are you using?"
-      placeholder: "e.g. 4.3.12"
+      placeholder: "e.g. 5.0.0"
   - type: textarea
     id: expected-behavior
     attributes:

.gitignore

@@ -7,3 +7,9 @@ dependency-reduced-pom.xml
 
 .gradle
 build
+
+DESIGN.md
+
+run
+
+old

README.md

@@ -15,4 +15,10 @@ This plugin is especially useful for large servers or resource-constrained envir
 * Spawner Limits: Enforce per-chunk spawner limits.
 * Customizable: Adjust limits via configuration files.
 * Lightweight: Minimal performance impact on your server.
-* Support for Multiple Versions: Works with Minecraft 1.13-1.18+.
+* Support for Multiple Versions: Works with Minecraft 1.8.8-1.21.10.
+
+## Release Notes (5.0.0)
+
+### Known Limitations
+
+- **Async chunk scanning**: chunk block scans currently run asynchronously for performance. Some server implementations may treat Bukkit world access off the main thread as unsafe. If you encounter instability, consider disabling async scans or switching to synchronous scanning until a thread-safe scan path is introduced.

build.gradle.kts

@@ -4,58 +4,199 @@ plugins {
     java
     alias(libs.plugins.shadow)
     alias(libs.plugins.plugin.yml)
+    alias(libs.plugins.run.paper)
 }
-version = "4.4.4"
-description = "Limit entities in chunks."
+
+group = "com.github.sarhatabaot"
+version = "5.0.0"
+description = "Limit blocks & entities in chunks."
 
 dependencies {
     compileOnly(libs.spigot.api)
+    compileOnly(libs.nbt.api)
 
     implementation(libs.bstats)
-    implementation(libs.acf)
     implementation(libs.annotations)
+    implementation(libs.jcip)
+
+    implementation(libs.commands)
+
+    testImplementation(libs.mockbukkit)
+    testImplementation(libs.assertj.core)
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+        vendor.set(JvmVendorSpec.ADOPTIUM)
+    }
+}
 bukkit {
-    name = "ChunkSpawnerLimiter"
-    main = "com.cyprias.chunkspawnerlimiter.ChunkSpawnerLimiter"
+    name = rootProject.name
+    main = "com.github.sarhatabaot.chunkspawnerlimiter.ChunkSpawnerLimiter"
     version = project.version.toString()
-    apiVersion = "1.14"
+    website = "https://github.com/sarhatabaot/ChunkSpawnerLimiter"
     authors = listOf("Cyprias", "sarhatabaot")
-    website = "https://github.com/Cyprias/ChunkSpawnerLimiter"
-    description = "Limit entities in chunks."
     load = BukkitPluginDescription.PluginLoadOrder.POSTWORLD
     prefix = "CSL"
+    apiVersion = "1.13"
+    softDepend = listOf("NBTAPI") //todo, this way we keep it small
 }
 
 tasks {
+    runServer {
+        //use this to manually test various version load, probably should use docker with ci/cd for the automated version
+        //todo amazing 1.13-1.16 breaks with jvm 21, the rest works, lmao, mention this on the website
+        minecraftVersion("1.20.1")
+        jvmArgs("-Dcom.mojang.eula.agree=true")
+    }
+
+
+    // Define your versions
+    val minecraftVersions = listOf("1.8.8", "1.9.4", "1.12.2", "1.16.5", "1.20.1", "1.21.10")
+
+    // Create tasks for each version
+    minecraftVersions.forEach { version ->
+        // Convert version to valid task name (replace dots with underscores)
+        val taskName = "runServer${version.replace(".", "_")}"
+
+        register(taskName) {
+            group = "minecraft"
+            description = "Run Minecraft server version $version"
+            dependsOn(runServer)
+            doFirst {
+                // Set the minecraft version on the base task
+                (runServer.get() as Task).extensions.extraProperties.set("minecraftVersion", version)
+                (runServer.get() as Task).extensions.extraProperties.set("jvmArgs", "-Dcom.mojang.eula.agree=true")
+                // Or if runServer has a property/method for setting version:
+                // runServer.get().setMinecraftVersion(version)
+            }
+        }
+    }
+
     build {
         dependsOn(shadowJar)
     }
 
     shadowJar {
         minimize()
 
-        exclude("META-INF/**")
-
         archiveFileName.set("chunkspawnerlimiter-${project.version}.jar")
         archiveClassifier.set("shadow")
 
-        relocate("org.bstats", "com.cyprias.chunkspawnerlimiter.libs.bstats")
-        relocate("co.aikar.commands", "com.cyprias.chunkspawnerlimiter.libs.acf")
-        relocate("co.aikar.locales", "com.cyprias.chunkspawnerlimiter.libs.locales")
+        exclude("META-INF/**")
+
+        relocate("me.despical.commandframework","com.github.sarhatabaot.chunkspawnerlimiter.libs")
+        relocate("org.bstats", "com.github.sarhatabaot.chunkspawnerlimiter.libs")
     }
 
     compileJava {
-        options.compilerArgs.add("-parameters")
-        options.isFork = true
         options.encoding = "UTF-8"
     }
 }
 
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(8))
-        vendor.set(JvmVendorSpec.ADOPTIUM)
+testing {
+    suites {
+        // Unit tests - version agnostic
+        val test by getting(JvmTestSuite::class) {
+            useJUnitJupiter()
+
+            dependencies {
+                implementation(libs.spigot.api)
+                implementation(libs.adventure.api)
+                implementation(libs.junit.api)
+                runtimeOnly(libs.junit.engine)
+                implementation(libs.mockito.core)
+                implementation(libs.mockito.junit.jupiter)
+                implementation(libs.assertj.core)
+                implementation(libs.commands)
+            }
+
+            targets {
+                all {
+                    testTask.configure {
+                        useJUnitPlatform()
+                    }
+                }
+            }
+        }
+
+        // Legacy integration tests (1.8-1.12)
+        val testLegacy by creating(JvmTestSuite::class) {
+            useJUnitJupiter()
+
+            sources {
+                java {
+                    srcDir("src/testLegacy/java")
+                    compileClasspath += project.sourceSets.main.get().output
+                    runtimeClasspath += project.sourceSets.main.get().output
+                }
+            }
+
+            dependencies {
+                implementation(libs.spigot.api)
+                implementation(libs.adventure.api)
+                implementation(libs.bstats)
+                implementation(libs.junit.api)
+                runtimeOnly(libs.junit.engine)
+                implementation(libs.mockito.core)
+                implementation(libs.mockito.junit.jupiter)
+                implementation(libs.assertj.core)
+                implementation(libs.mockbukkit.legacy)
+                implementation(libs.commands)
+            }
+
+            targets {
+                all {
+                    testTask.configure {
+                        useJUnitPlatform()
+                        group = "verification"
+                        description = "Runs legacy integration tests for Minecraft 1.8-1.12"
+                    }
+                }
+            }
+        }
+
+        // Modern integration tests (1.17+)
+        val testModern by creating(JvmTestSuite::class) {
+            useJUnitJupiter()
+
+            sources {
+                java {
+                    srcDir("src/testModern/java")
+                    compileClasspath += project.sourceSets.main.get().output
+                    runtimeClasspath += project.sourceSets.main.get().output
+                }
+            }
+
+            dependencies {
+                implementation(libs.paper.api)
+                implementation(libs.adventure.api)
+                implementation(libs.junit.api)
+                runtimeOnly(libs.junit.engine)
+                implementation(libs.mockito.core)
+                implementation(libs.mockito.junit.jupiter)
+                implementation(libs.assertj.core)
+                implementation(libs.mockbukkit)
+                implementation(libs.commands)
+            }
+
+            targets {
+                all {
+                    testTask.configure {
+                        useJUnitPlatform()
+                        group = "verification"
+                        description = "Runs modern integration tests for Minecraft 1.17+"
+                    }
+                }
+            }
+        }
     }
-}
+}
+
+tasks.named("check") {
+    dependsOn(
+        testing.suites.named("testLegacy"),
+//        testing.suites.named("testModern") for now TODO
+    )
+}

gradle/wrapper/gradle-wrapper.properties

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

settings.gradle.kts

@@ -2,21 +2,39 @@ rootProject.name = "ChunkSpawnerLimiter"
 
 dependencyResolutionManagement {
     repositories {
+        repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
         mavenCentral()
+        maven("https://jitpack.io")
         maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
-        maven("https://repo.codemc.org/repository/maven-public")
-        maven("https://repo.aikar.co/content/groups/aikar/")
+        maven("https://repo.loohpjames.com/repository/")
+        maven("https://repo.codemc.io/repository/maven-public/")
+        maven("https://repo.papermc.io/repository/maven-public/")
     }
 
     versionCatalogs {
         create("libs") {
-            library("spigot-api", "org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT")
+            library("spigot-api", "org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT")
+            library("paper-api", "io.papermc.paper:paper-api:1.21.11-R0.1-SNAPSHOT")
             library("bstats", "org.bstats:bstats-bukkit:3.1.0")
-            library("acf", "co.aikar:acf-paper:0.5.1-SNAPSHOT")
-            library("annotations", "org.jetbrains:annotations:26.0.2")
+            library("annotations", "org.jetbrains:annotations:26.0.2-1")
+            library("commands", "com.github.despical:command-framework:1.5.3")
+            library("nbt-api", "de.tr7zw:item-nbt-api-plugin:2.15.3")
+            library("jcip", "com.google.code.findbugs:jsr305:3.0.2")
 
-            plugin("plugin-yml","net.minecrell.plugin-yml.bukkit").version("0.6.0")
-            plugin("shadow","com.gradleup.shadow").version("8.3.1")
+            library("junit-api", "org.junit.jupiter:junit-jupiter-api:5.14.0")
+            library("junit-engine", "org.junit.jupiter:junit-jupiter-engine:5.14.0")
+            library("mockito-core", "org.mockito:mockito-core:5.14.0")
+            library("mockito-junit-jupiter", "org.mockito:mockito-junit-jupiter:5.14.0")
+            library("assertj-core", "org.assertj:assertj-core:3.26.3")
+
+            library("adventure-api", "net.kyori:adventure-api:4.14.0")
+            library("mockbukkit", "org.mockbukkit.mockbukkit:mockbukkit-v1.21:4.98.4")
+            library("mockbukkit-legacy", "com.github.MockBukkit:MockBukkit:v1.8-SNAPSHOT")
+
+            plugin("run-paper", "xyz.jpenilla.run-paper").version("2.3.1")
+            plugin("shadow", "com.gradleup.shadow").version("9.2.2")
+            plugin("plugin-yml", "de.eldoria.plugin-yml.bukkit").version("0.8.0")
         }
     }
-}
+
+}