diff --git a/patches/api/Adventure.patch b/patches/api/Adventure.patch
index 74222d7c8b..5792bd6088 100644
--- a/patches/api/Adventure.patch
+++ b/patches/api/Adventure.patch
@@ -15,7 +15,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  }
  
 +val adventureVersion = "4.9.2"
-+val apiAndDocs by configurations.creating {
++val apiAndDocs: Configuration by configurations.creating {
 +    attributes {
 +        attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
 +        attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.EXTERNAL))
@@ -45,8 +45,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ tasks.jar {
  }
  
- tasks.withType<Javadoc>().configureEach {
-+    (options as CoreJavadocOptions).addStringOption("sourcepath", apiAndDocs.resolvedConfiguration.files.joinToString(separator = File.pathSeparator, transform = File::getPath))
+ tasks.withType<Javadoc> {
++    inputs.files(apiAndDocs)
++        .ignoreEmptyDirectories()
++        .withPropertyName(apiAndDocs.name + "-configuration")
++    doFirst {
++        (options as CoreJavadocOptions).addStringOption(
++            "sourcepath",
++            apiAndDocs.resolvedConfiguration.files.joinToString(separator = File.pathSeparator, transform = File::getPath)
++        )
++    }
      (options as StandardJavadocDocletOptions).links(
          "https://guava.dev/releases/21.0/api/docs/",
          "https://javadoc.io/doc/org.yaml/snakeyaml/1.28/",
diff --git a/patches/api/Build-system-changes.patch b/patches/api/Build-system-changes.patch
index b3977fd577..2f8f0e748e 100644
--- a/patches/api/Build-system-changes.patch
+++ b/patches/api/Build-system-changes.patch
@@ -37,7 +37,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      testImplementation("junit:junit:4.13.1")
      testImplementation("org.hamcrest:hamcrest-library:1.3")
      testImplementation("org.ow2.asm:asm-tree:9.2")
-@@ -0,0 +0,0 @@ tasks.withType<Javadoc>().configureEach {
+@@ -0,0 +0,0 @@ tasks.withType<Javadoc> {
      (options as StandardJavadocDocletOptions).links(
          "https://guava.dev/releases/21.0/api/docs/",
          "https://javadoc.io/doc/org.yaml/snakeyaml/1.28/",
diff --git a/patches/api/Convert-project-to-Gradle.patch b/patches/api/Convert-project-to-Gradle.patch
index a249b6d84e..70fa1cc004 100644
--- a/patches/api/Convert-project-to-Gradle.patch
+++ b/patches/api/Convert-project-to-Gradle.patch
@@ -72,6 +72,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +}
 +
 +val generateApiVersioningFile by tasks.registering {
++    inputs.property("version", project.version)
 +    val pomProps = layout.buildDirectory.file("pom.properties")
 +    outputs.file(pomProps)
 +    doLast {
@@ -84,13 +85,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        into("META-INF/maven/${project.group}/${project.name.toLowerCase(Locale.ENGLISH)}")
 +    }
 +    manifest {
-+        attributes += mapOf(
++        attributes(
 +            "Automatic-Module-Name" to "org.bukkit"
 +        )
 +    }
 +}
 +
-+tasks.withType<Javadoc>().configureEach {
++tasks.withType<Javadoc> {
 +    (options as StandardJavadocDocletOptions).links(
 +        "https://guava.dev/releases/21.0/api/docs/",
 +        "https://javadoc.io/doc/org.yaml/snakeyaml/1.28/",