Update chunk ticket API

.checkstyle/checkstyle-suppressions.xml

@@ -17,4 +17,5 @@
     <suppress checks="MethodTypeParameterName"/>
     <suppress checks="CommentsIndentation"/>
     <suppress checks="InterfaceTypeParameterName"/>
+    <suppress files="[\\/]generated[\\/]" checks="[a-zA-Z0-9]*"/>
 </suppressions>

.gitignore

@@ -4,6 +4,10 @@ MANIFEST.MF
 dependency-reduced-pom.xml
 .checkstyle
 !.checkstyle/
+# We exclude the generated events from git to avoid
+# temptation to edit said generated files.
+src/generated/
+src/main/generated/
 
 # Compiled #
 ############

build.gradle.kts

@@ -1,13 +1,7 @@
 import net.ltgt.gradle.errorprone.errorprone
 import org.jetbrains.gradle.ext.delegateActions
 import org.jetbrains.gradle.ext.settings
-import org.jetbrains.gradle.ext.taskTriggers
 
-buildscript {
-    dependencies {
-        classpath(libs.spoon) // bump for EIG
-    }
-}
 
 plugins {
     eclipse
@@ -16,12 +10,14 @@ plugins {
     alias(libs.plugins.indra.crossdoc)
     alias(libs.plugins.indra.publishing)
     alias(libs.plugins.indra.publishing.sonatype)
-    alias(libs.plugins.eventImplGen)
     alias(libs.plugins.ideaExt)
     alias(libs.plugins.errorprone)
     alias(libs.plugins.nexusPublish)
 }
 
+// Enable event generation to be considered part of
+// the main source set
+val generatedEventSourcesDir = project.file("src/main/generated")
 val javaTarget: String by project
 val ap by sourceSets.registering {
     compileClasspath += sourceSets.main.get().compileClasspath + sourceSets.main.get().output
@@ -44,11 +40,32 @@ nexusPublishing {
     }
 }
 
+tasks {
+    register("printSourceDirs") {
+        doLast {
+            sourceSets.forEach { set ->
+                println("SourceSet: ${set.name}")
+                println("Java Source Dirs: ${set.java.srcDirs}" )
+            }
+        }
+    }
+}
+
+sourceSets {
+    main {
+        java {
+            srcDirs(generatedEventSourcesDir)
+        }
+    }
+}
+
 // Project dependencies
 dependencies {
     // Directly tied to what's available from Minecraft
     api(libs.log4j.api)
     api(libs.gson)
+    api(libs.eventImplGen.annotations)
+    annotationProcessor(libs.eventImplGen.processor)
 
     // Adventure
     api(platform(libs.adventure.bom))
@@ -139,28 +156,23 @@ dependencies {
     testImplementation(libs.mockito)
 }
 
+spotless {
+    java {
+        target("src/main/java/**/*.java")
+        targetExclude("src/main/generated/**/*.java")
+    }
+}
+
 tasks {
-    genEventImpl {
-        sourceCompatibility = "17" // TODO use javaTarget here
-        destinationDirectory = project.layout.buildDirectory.dir("generated/event-factory")
-
-        outputFactory = "org.spongepowered.api.event.SpongeEventFactory"
-        include("org/spongepowered/api/event/*/**/*")
-        exclude("org/spongepowered/api/event/action/InteractEvent.java")
-        exclude("org/spongepowered/api/event/cause/")
-        exclude("org/spongepowered/api/event/entity/AffectEntityEvent.java")
-        exclude("org/spongepowered/api/event/filter/")
-        exclude("org/spongepowered/api/event/impl/")
-        exclude("org/spongepowered/api/event/lifecycle/ProvideServiceEvent.java")
-        exclude("org/spongepowered/api/event/lifecycle/RegisterBuilderEvent.java")
-        exclude("org/spongepowered/api/event/lifecycle/RegisterRegistryEvent.java")
-        exclude("org/spongepowered/api/event/lifecycle/RegisterRegistryValueEvent.java")
-        exclude("org/spongepowered/api/event/lifecycle/RegisterTagEvent.java")
-        exclude("org/spongepowered/api/event/lifecycle/RegisterCommandEvent.java")
-        exclude("org/spongepowered/api/event/lifecycle/RegisterFactoryEvent.java")
-        exclude("org/spongepowered/api/event/lifecycle/RegisterWorldEvent.java")
-        inclusiveAnnotations = setOf("org.spongepowered.api.util.annotation.eventgen.GenerateFactoryMethod")
-        exclusiveAnnotations = setOf("org.spongepowered.api.util.annotation.eventgen.NoFactoryMethod")
+
+    compileJava {
+        options.generatedSourceOutputDirectory = generatedEventSourcesDir
+        options.compilerArgs.addAll(listOf(
+            "-AeventGenInclusiveFolders=org/spongepowered/api/event",
+            "-AeventGenExclusiveFolders=org/spongepowered/api/event/cause,org/spongepowered/api/event/filter,org/spongepowered/api/event/impl,org/spongepowered/api/event/lifecycle",
+            "-AeventGenFactory=org.spongepowered.api.event.SpongeEventFactory",
+            "-AeventGenDebug=true",
+        ))
     }
 
     jar {
@@ -176,6 +188,15 @@ tasks {
             indraGit.applyVcsInformationToManifest(this)
         }
     }
+    checkstyleMain {
+        dependsOn(compileJava)
+    }
+    spotlessJava {
+        dependsOn(compileJava)
+    }
+    sourcesJar {
+        dependsOn(compileJava)
+    }
 
     withType(JavaCompile::class).configureEach {
         options.apply {
@@ -225,15 +246,12 @@ idea {
                 delegateBuildRunToGradle = false
                 testRunner = org.jetbrains.gradle.ext.ActionDelegationConfig.TestRunner.PLATFORM
             }
-            taskTriggers {
-                beforeBuild(tasks.genEventImpl)
-            }
         }
     }
 }
 
 eclipse {
-    synchronizationTasks(tasks.genEventImpl)
+//    synchronizationTasks(tasks.genEventImpl)
 }
 
 val organization: String by project

gradle.properties

@@ -1,5 +1,5 @@
 group=org.spongepowered
-version=12.1.0-SNAPSHOT
+version=18.0.0-SNAPSHOT
 organization=SpongePowered
 projectUrl=https://www.spongepowered.org
 projectDescription=A plugin API for Minecraft: Java Edition

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 format = { version = "1.1" }
 
 [versions]
-adventure = "4.17.0"
+adventure = "4.26.1"
 caffeine = "3.1.8"
 checker = "3.42.0"
 checkstyle = "10.12.7"
@@ -13,10 +13,10 @@ guice = "5.0.1"
 ideaExt = "1.1.8"
 indra = "3.1.3"
 junit = "5.10.2"
-log4j = "2.22.1"
+log4j = "2.25.2"
 math = "2.0.1"
 mockito = "5.11.0"
-pluginSpi = "0.4.0"
+pluginSpi = "0.5.2"
 
 [libraries]
 adventure-bom = { module = "net.kyori:adventure-bom", version.ref = "adventure" }
@@ -37,13 +37,14 @@ guice = { module = "com.google.inject:guice", version.ref = "guice" }
 log4j-api = { module = "org.apache.logging.log4j:log4j-api", version.ref = "log4j" }
 math = { module = "org.spongepowered:math", version.ref = "math" }
 pluginSpi = { module = "org.spongepowered:plugin-spi", version.ref = "pluginSpi" }
+eventImplGen-processor = {module = "org.spongepowered:event-impl-gen", version = "8.0.0"}
+eventImplGen-annotations = { module = "org.spongepowered:event-impl-gen-annotations", version = "8.0.0"}
 
 # build-time/annotations
 
 checkerQual = { module = "org.checkerframework:checker-qual", version.ref = "checker" }
 errorprone = { module = "com.google.errorprone:error_prone_core", version.ref = "errorprone" }
 errorprone-annotations = { module = "com.google.errorprone:error_prone_annotations", version.ref = "errorprone" }
-spoon = { module = "fr.inria.gforge.spoon:spoon-core", version = "10.4.2" } # bump for EIG
 
 # testing
 
@@ -55,7 +56,7 @@ junit-launcher = { module = "org.junit.platform:junit-platform-launcher" }
 mockito = { module = "org.mockito:mockito-core", version.ref = "mockito" }
 
 [plugins]
-errorprone = { id = "net.ltgt.errorprone", version = "3.1.0" }
+errorprone = { id = "net.ltgt.errorprone", version = "4.3.0" }
 eventImplGen = { id = "org.spongepowered.gradle.event-impl-gen", version = "7.1.0" }
 ideaExt = { id = "org.jetbrains.gradle.plugin.idea-ext", version.ref = "ideaExt" }
 indra-checkstyle = { id = "net.kyori.indra.checkstyle", version.ref = "indra" }