diff --git a/buildSrc/src/main/kotlin/cc-tweaked.java-convention.gradle.kts b/buildSrc/src/main/kotlin/cc-tweaked.java-convention.gradle.kts
index 213aeabf2..25fa69168 100644
--- a/buildSrc/src/main/kotlin/cc-tweaked.java-convention.gradle.kts
+++ b/buildSrc/src/main/kotlin/cc-tweaked.java-convention.gradle.kts
@@ -161,7 +161,7 @@ tasks.javadoc {
     options {
         val stdOptions = this as StandardJavadocDocletOptions
         stdOptions.addBooleanOption("Xdoclint:all,-missing", true)
-        stdOptions.links("https://docs.oracle.com/en/java/javase/21/docs/api/")
+        stdOptions.links("https://docs.oracle.com/en/java/javase/${CCTweakedPlugin.JAVA_TARGET.asInt()}/docs/api/")
     }
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0b386ad99..9e9b29868 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -23,7 +23,7 @@ netty = "4.1.82.Final"
 slf4j = "2.0.1"
 
 # Core dependencies (independent of Minecraft)
-asm = "9.9"
+asm = "9.9.1"
 autoService = "1.1.1"
 checkerFramework = "3.51.1"
 cobalt = { strictly = "0.9.7" }
@@ -57,7 +57,7 @@ junitPlatform = "6.0.1"
 jmh = "1.37"
 
 # Build tools
-cctJavadoc = "1.8.5"
+cctJavadoc = "1.9.0"
 checkstyle = "12.1.1"
 errorProne-core = "2.45.0"
 errorProne-plugin = "4.3.0"
diff --git a/projects/forge/build.gradle.kts b/projects/forge/build.gradle.kts
index 1142fc52a..a2a710d42 100644
--- a/projects/forge/build.gradle.kts
+++ b/projects/forge/build.gradle.kts
@@ -124,6 +124,9 @@ legacyForge {
 }
 
 configurations {
+    // Force a more recent version of ASM, so we're compatible with Java 25.
+    configureEach { resolutionStrategy.force(libs.asm) }
+
     additionalRuntimeClasspath { extendsFrom(jarJar.get()) }
 
     val testAdditionalRuntimeClasspath by registering {