feat: integrate paperweight.userdev for modern bukkit-helpers

.github/workflows/release.yml

@@ -19,16 +19,6 @@ jobs:
           distribution: 'temurin'
           cache: gradle
 
-      - name: Build Spigot with BuildTools
-        run: |
-          mkdir -p buildtools
-          cd buildtools
-          wget https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
-          java -jar BuildTools.jar --rev 1.21.10 --remapped
-          java -jar BuildTools.jar --rev 1.21.11 --remapped
-          cd ..
-        timeout-minutes: 45
-
       - name: Build with Gradle
         env:
           USERNAME: ${{ secrets.USERNAME }}

.gitignore

@@ -34,6 +34,7 @@
 
 *.log
 /.gradle
+**/.gradle/
 /fabric-1.16.1_client.launch
 /fabric-1.16.1_server.launch
 /fabric-1.16.2_client.launch

CLAUDE.md

@@ -109,24 +109,6 @@ Build specific module (faster for development, but NOT suitable for PR submissio
 ./gradlew :spigot:build
 ```
 
-### Spigot BuildTools (for missing versions)
-
-If a bukkit-helper module fails because a Spigot version is not available in public Maven repositories, use BuildTools to build and install it locally:
-
-```bash
-mkdir -p buildtools && cd buildtools
-wget https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
-java -jar BuildTools.jar --rev <VERSION> --remapped
-cd ..
-```
-
-Example for Minecraft 1.21.10:
-```bash
-java -jar BuildTools.jar --rev 1.21.10 --remapped
-```
-
-This installs `org.spigotmc:spigot:<VERSION>-R0.1-SNAPSHOT:remapped-mojang` to your local Maven repository (`~/.m2/repository`).
-
 ### Building in Claude.ai Sandbox Environment
 
 The Claude.ai sandbox uses an authenticated HTTP proxy that Java/Gradle cannot handle natively. Use the provided setup script:
@@ -135,23 +117,7 @@ The Claude.ai sandbox uses an authenticated HTTP proxy that Java/Gradle cannot h
 # 1. Run the setup script (creates local auth proxy, configures Gradle)
 ./setup-sandbox-build.sh
 
-# 2. Configure Maven proxy (required for BuildTools)
-mkdir -p ~/.m2
-cat > ~/.m2/settings.xml << 'EOF'
-<settings>
-  <proxies>
-    <proxy><active>true</active><protocol>http</protocol><host>127.0.0.1</host><port>3128</port></proxy>
-    <proxy><active>true</active><protocol>https</protocol><host>127.0.0.1</host><port>3128</port></proxy>
-  </proxies>
-</settings>
-EOF
-
-# 3. If BuildTools is needed, run with proxy parameters:
-java -Dhttp.proxyHost=127.0.0.1 -Dhttp.proxyPort=3128 \
-     -Dhttps.proxyHost=127.0.0.1 -Dhttps.proxyPort=3128 \
-     -jar BuildTools.jar --rev <VERSION> --remapped
-
-# 4. Build Dynmap
+# 2. Build Dynmap
 ./gradlew setup build
 ```
 

DynmapCore/build.gradle

@@ -8,7 +8,10 @@ eclipse {
     }
 }
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 dependencies {
     implementation project(':DynmapCoreAPI')
@@ -53,20 +56,26 @@ jar {
 
 shadowJar {
     dependencies {
-        include(dependency('com.googlecode.json-simple:json-simple:'))
-        include(dependency('org.yaml:snakeyaml:'))
-        include(dependency('com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:'))
-        include(dependency('javax.servlet::'))
-        include(dependency('org.eclipse.jetty::'))
-        include(dependency('org.eclipse.jetty.orbit:javax.servlet:'))
-        include(dependency('org.postgresql:postgresql:'))
-        include(dependency('io.github.linktosriram.s3lite:core:'))
-        include(dependency('io.github.linktosriram.s3lite:api:'))
-        include(dependency('io.github.linktosriram.s3lite:http-client-url-connection:'))
-        include(dependency('io.github.linktosriram.s3lite:http-client-spi:'))
-        include(dependency('io.github.linktosriram.s3lite:util:'))
-        include(dependency('jakarta.xml.bind::'))
-        include(dependency('com.sun.xml.bind::'))
+        include(dependency('com.googlecode.json-simple:json-simple:.*'))
+        include(dependency('org.yaml:snakeyaml:.*'))
+        include(dependency('com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer:.*'))
+        include(dependency('javax.servlet:javax.servlet-api:.*'))
+        include(dependency('org.eclipse.jetty:jetty-server:.*'))
+        include(dependency('org.eclipse.jetty:jetty-servlet:.*'))
+        include(dependency('org.eclipse.jetty:jetty-util:.*'))
+        include(dependency('org.eclipse.jetty:jetty-util-ajax:.*'))
+        include(dependency('org.eclipse.jetty:jetty-http:.*'))
+        include(dependency('org.eclipse.jetty:jetty-io:.*'))
+        include(dependency('org.eclipse.jetty:jetty-security:.*'))
+        include(dependency('org.eclipse.jetty.orbit:javax.servlet:.*'))
+        include(dependency('org.postgresql:postgresql:.*'))
+        include(dependency('io.github.linktosriram.s3lite:core:.*'))
+        include(dependency('io.github.linktosriram.s3lite:api:.*'))
+        include(dependency('io.github.linktosriram.s3lite:http-client-url-connection:.*'))
+        include(dependency('io.github.linktosriram.s3lite:http-client-spi:.*'))
+        include(dependency('io.github.linktosriram.s3lite:util:.*'))
+        include(dependency('jakarta.xml.bind:jakarta.xml.bind-api:.*'))
+        include(dependency('com.sun.xml.bind:jaxb-impl:.*'))
         include(dependency(':DynmapCoreAPI'))
         exclude("META-INF/maven/**")
         exclude("META-INF/services/**")

DynmapCoreAPI/build.gradle

@@ -6,7 +6,10 @@ eclipse {
         name = "Dynmap(DynmapCoreAPI)"
     }
 }
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 description = "DynmapCoreAPI"
 

build.gradle

@@ -1,19 +1,6 @@
-// Workaround for Shadow not supporting Java 19 classes.
-// Remove this once Shadow updates.
-// See: https://github.com/johnrengelman/shadow/pull/770
-// See: https://discord.com/channels/722722769950998560/793019909055578113/978939925061857315
-buildscript {
-    configurations.all {
-        resolutionStrategy {
-            force("org.ow2.asm:asm:9.5")
-            force("org.ow2.asm:asm-commons:9.5")
-        }
-    }
-}
-
 plugins {
-    //id  "com.github.johnrengelman.shadow" version "7.1.0"
-    id  "io.github.goooler.shadow" version "8.1.7"
+    // Shadow 9.x for Gradle 9 compatibility
+    id  "com.gradleup.shadow" version "9.0.0-beta4"
     id  'java'
     id  'maven-publish'
 }
@@ -40,6 +27,8 @@ allprojects  {
               includeGroup "io.github.linktosriram.s3lite"
           }
      }
+     // PaperMC repository for paperweight dev-bundle (must be before other repos)
+     maven { url "https://repo.papermc.io/repository/maven-public/" }
      maven { url "https://oss.sonatype.org/content/repositories/releases" }
      maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
      maven { url "https://repo.mikeprimm.com" }
@@ -62,13 +51,18 @@ ext {
   globals = new Globals()
 }
 
-subprojects {  
-  apply plugin: "io.github.goooler.shadow"
+subprojects {
+  apply plugin: "com.gradleup.shadow"
   apply plugin: 'java'
   apply plugin: 'maven-publish'
 
-  sourceCompatibility = 1.8
-  targetCompatibility = 1.8
+  // Set Java version - paperweight modules define their own Java version
+  if (project.name != 'bukkit-helper-121-11' && project.name != 'bukkit-helper-121-10') {
+    java {
+      sourceCompatibility = JavaVersion.VERSION_1_8
+      targetCompatibility = JavaVersion.VERSION_1_8
+    }
+  }
   tasks.withType(JavaCompile) {
   	options.encoding = 'UTF-8'
   }

bukkit-helper-113-2/build.gradle

@@ -8,7 +8,10 @@ eclipse {
 
 description = 'bukkit-helper-1.13.2'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-114-1/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.14.1'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-115/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.15'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-116-2/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.16.2'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-116-3/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.16.3'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-116-4/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.16.4'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-116/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.16'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-117/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.17'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(16) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_16
+    targetCompatibility = JavaVersion.VERSION_16
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-118-2/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.18.2'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-118/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.18'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-119-3/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.19.3'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-119-4/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.19.4'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-119/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.19'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-120-2/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.20.2'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-120-4/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.20.4'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-120-5/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.20.5'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 dependencies {
   implementation project(':bukkit-helper')

bukkit-helper-120/build.gradle

@@ -6,7 +6,10 @@ eclipse {
 
 description = 'bukkit-helper-1.20'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaLanguageVersion.of(17) // Need this here so eclipse task generates correctly.
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 dependencies {
   implementation project(':bukkit-helper')