v1.21.6

.github/workflows/build.yml

@@ -9,9 +9,9 @@ jobs:
       - name: Checkout Git Repository
         uses: actions/checkout@v2
       - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/actions/wrapper-validation@v4
       - name: Cache Gradle
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches

build.gradle.kts

@@ -2,7 +2,7 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
-    id("io.papermc.paperweight.patcher") version "2.0.0-beta.14"
+    id("io.papermc.paperweight.patcher") version "2.0.0-beta.17"
 }
 
 paperweight {
@@ -53,6 +53,7 @@ subprojects {
         options.encoding = Charsets.UTF_8.name()
         options.release = 21
         options.isFork = true
+        options.compilerArgs.addAll(listOf("-Xlint:-deprecation", "-Xlint:-removal"))
     }
     tasks.withType<Javadoc> {
         options.encoding = Charsets.UTF_8.name()
@@ -78,4 +79,4 @@ subprojects {
              */
         }
     }
-}
+}

gradle.properties

@@ -1,8 +1,8 @@
 group=com.froobworld.nabulus
-version=1.21.4-R0.1-SNAPSHOT
+version=1.21.6-R0.1-SNAPSHOT
 
-mcVersion=1.21.4
-paperRef=76753219c42b58611b5855c14a50661bcfc47026
+mcVersion=1.21.6
+paperRef=4e1a2555be7ff1e6960714ee7fbabc13fa25d4c2
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true

gradle/wrapper/gradle-wrapper.properties

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

nabulus-api/build.gradle.kts.patch

@@ -1,24 +1,23 @@
 --- a/paper-api/build.gradle.kts
 +++ b/paper-api/build.gradle.kts
-@@ -93,7 +_,7 @@
+@@ -90,7 +_,7 @@
      testRuntimeOnly("org.junit.platform:junit-platform-launcher")
  }
 
--val generatedApiPath: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
-+val generatedApiPath: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-api/src/generated/java").asFile.toPath()
+-val generatedDir: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
++val generatedDir: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-api/src/generated/java").asFile.toPath()
  idea {
      module {
-         generatedSourceDirs.add(generatedApiPath.toFile())
-@@ -103,6 +_,19 @@
+         generatedSourceDirs.add(generatedDir.toFile())
+@@ -100,6 +_,18 @@
      main {
          java {
-             srcDir(generatedApiPath)
+             srcDir(generatedDir)
 +            srcDir(file("../paper-api/src/main/java"))
 +        }
 +        resources {
 +            srcDir(file("../paper-api/src/main/resources"))
 +        }
-+
 +    }
 +    test {
 +        java {
@@ -29,7 +28,7 @@
          }
      }
  }
-@@ -169,7 +_,7 @@
+@@ -166,7 +_,7 @@
 
  tasks.withType<Javadoc> {
      val options = options as StandardJavadocDocletOptions
@@ -38,7 +37,7 @@
      options.use()
      options.isDocFilesSubDirs = true
      options.links(
-@@ -202,11 +_,11 @@
+@@ -199,11 +_,11 @@
      }
 
      // workaround for https://github.com/gradle/gradle/issues/4046

nabulus-server/build.gradle.kts.patch

@@ -1,24 +1,23 @@
 --- a/paper-server/build.gradle.kts
 +++ b/paper-server/build.gradle.kts
-@@ -21,6 +_,17 @@
-     // macheOldPath = file("F:\\Projects\\PaperTooling\\mache\\versions\\1.21.4\\src\\main\\java")
-     // gitFilePatches = true
-
+@@ -43,6 +_,16 @@
+         "org.bukkit.craftbukkit",
+         "org.spigotmc",
+     )
++
 +    val fork = forks.register("nabulus") {
 +        upstream.patchDir("paperServer") {
 +            upstreamPath = "paper-server"
 +            excludes = setOf("src/minecraft", "patches", "build.gradle.kts")
 +            patchesDir = rootDirectory.dir("nabulus-server/paper-patches")
 +            outputDir = rootDirectory.dir("paper-server")
 +        }
-+    }
-+
-+    activeFork = fork
-+
-     spigot {
-         buildDataRef = "3edaf46ec1eed4115ce1b18d2846cded42577e42"
-         packageVersion = "v1_21_R3" // also needs to be updated in MappingEnvironment
-@@ -101,7 +_,20 @@
++     }
++     activeFork = fork
+ }
+
+ tasks.generateDevelopmentBundle {
+@@ -107,7 +_,20 @@
      }
  }
 
@@ -40,7 +39,7 @@
  configurations.named(log4jPlugins.compileClasspathConfigurationName) {
      extendsFrom(configurations.compileClasspath.get())
  }
-@@ -119,7 +_,7 @@
+@@ -129,7 +_,7 @@
  }
 
  dependencies {
@@ -49,7 +48,7 @@
      implementation("ca.spottedleaf:concurrentutil:0.0.3")
      implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
      implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
-@@ -189,14 +_,14 @@
+@@ -205,14 +_,14 @@
          val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
@@ -66,3 +65,12 @@
              "Build-Number" to (build ?: ""),
              "Build-Time" to buildTime.toString(),
              "Git-Branch" to gitBranch,
+@@ -271,7 +_,7 @@
+     jvmArgumentProviders.add(provider)
+ }
+
+-val generatedDir: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
++val generatedDir: java.nio.file.Path = layout.projectDirectory.dir("../paper-server/src/generated/java").asFile.toPath()
+ idea {
+     module {
+         generatedSourceDirs.add(generatedDir.toFile())