diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch
index 993a62ed7..6d0de9bba 100644
--- a/patches/api/0001-Convert-project-to-Gradle.patch
+++ b/patches/api/0001-Convert-project-to-Gradle.patch
@@ -19,7 +19,7 @@ index e431e3435737e28394d81b56568a08b3c3148b9b..c484aff2c192bf42059b5689327909e4
  /.project
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..e74ac6187426c9468e551e9d068d05534e2ad6fe
+index 0000000000000000000000000000000000000000..db581a25928b3d60906fef0dc8df1bf976e1635e
 --- /dev/null
 +++ b/build.gradle.kts
 @@ -0,0 +1,67 @@
@@ -87,7 +87,7 @@ index 0000000000000000000000000000000000000000..e74ac6187426c9468e551e9d068d0553
 +        "https://guava.dev/releases/21.0/api/docs/",
 +        "https://javadoc.io/doc/org.yaml/snakeyaml/1.27/",
 +        "https://javadoc.io/doc/org.jetbrains/annotations-java5/20.1.0/",
-+        "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/"
++        "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/",
 +    )
 +}
 diff --git a/pom.xml b/pom.xml
diff --git a/patches/api/0002-Build-system-changes.patch b/patches/api/0002-Build-system-changes.patch
index da7010d15..ed26eab09 100644
--- a/patches/api/0002-Build-system-changes.patch
+++ b/patches/api/0002-Build-system-changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Build system changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index e74ac6187426c9468e551e9d068d05534e2ad6fe..b1a33fdfd6495e5243315312aca97c2512a64dcc 100644
+index db581a25928b3d60906fef0dc8df1bf976e1635e..5a328158622346deee6c83215fa56f64e2ba55e2 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -17,12 +17,14 @@ dependencies {
@@ -24,3 +24,12 @@ index e74ac6187426c9468e551e9d068d05534e2ad6fe..b1a33fdfd6495e5243315312aca97c25
      compileOnly(annotations)
      testCompileOnly(annotations)
  
+@@ -61,7 +63,7 @@ tasks.withType<Javadoc>().configureEach {
+     (options as StandardJavadocDocletOptions).links(
+         "https://guava.dev/releases/21.0/api/docs/",
+         "https://javadoc.io/doc/org.yaml/snakeyaml/1.27/",
+-        "https://javadoc.io/doc/org.jetbrains/annotations-java5/20.1.0/",
++        "https://javadoc.io/doc/org.jetbrains/annotations/21.0.1/", // Paper - we don't want Java 5 annotations
+         "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/",
+     )
+ }
diff --git a/patches/api/0007-Adventure.patch b/patches/api/0007-Adventure.patch
index 9e2509eb5..5ff84f2d9 100644
--- a/patches/api/0007-Adventure.patch
+++ b/patches/api/0007-Adventure.patch
@@ -7,14 +7,23 @@ Co-authored-by: zml <zml@stellardrift.ca>
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 2feb94aeb1eef2241963f6b541247d923913e560..19b55f2c25db81fc352a7ab973b2ca7fefbcb432 100644
+index f0b501b9a6b2d1d516d644c960bb3be785a1415b..ea3a12608a851b25afa01ee127c6ef91a3d64fff 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -19,6 +19,11 @@ dependencies {
+@@ -10,6 +10,8 @@ java {
+     withJavadocJar()
+ }
+ 
++val adventureVersion = "4.8.1"
++
+ dependencies {
+     // api dependencies are listed transitively to API consumers
+     api("commons-lang:commons-lang:2.6")
+@@ -19,6 +21,11 @@ dependencies {
      api("org.yaml:snakeyaml:1.28")
      api("com.googlecode.json-simple:json-simple:1.1.1") // Paper
      api("it.unimi.dsi:fastutil:8.2.2")
-+    api(platform("net.kyori:adventure-bom:4.8.1"))
++    api(platform("net.kyori:adventure-bom:$adventureVersion"))
 +    api("net.kyori:adventure-api")
 +    api("net.kyori:adventure-text-serializer-gson")
 +    api("net.kyori:adventure-text-serializer-legacy")
@@ -22,6 +31,18 @@ index 2feb94aeb1eef2241963f6b541247d923913e560..19b55f2c25db81fc352a7ab973b2ca7f
  
      compileOnly("org.apache.maven:maven-resolver-provider:3.8.1")
      compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
+@@ -66,5 +73,11 @@ tasks.withType<Javadoc>().configureEach {
+         "https://javadoc.io/doc/org.yaml/snakeyaml/1.27/",
+         "https://javadoc.io/doc/org.jetbrains/annotations/21.0.1/", // Paper - we don't want Java 5 annotations
+         "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/",
++        // Paper start
++        "https://jd.adventure.kyori.net/api/$adventureVersion/",
++        "https://jd.adventure.kyori.net/text-serializer-gson/$adventureVersion/",
++        "https://jd.adventure.kyori.net/text-serializer-legacy/$adventureVersion/",
++        "https://jd.adventure.kyori.net/text-serializer-plain/$adventureVersion/",
++        // Paper end
+     )
+ }
 diff --git a/src/main/java/co/aikar/timings/TimingsReportListener.java b/src/main/java/co/aikar/timings/TimingsReportListener.java
 index ef58a6c00f444bd498a2d8fc4e457236f393954f..ecd149157d4fb80444f34bf5633d74bcdb63dec5 100644
 --- a/src/main/java/co/aikar/timings/TimingsReportListener.java
diff --git a/patches/api/0025-Use-ASM-for-event-executors.patch b/patches/api/0025-Use-ASM-for-event-executors.patch
index 0d912355a..73b56cfcb 100644
--- a/patches/api/0025-Use-ASM-for-event-executors.patch
+++ b/patches/api/0025-Use-ASM-for-event-executors.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 19b55f2c25db81fc352a7ab973b2ca7fefbcb432..d1a3e38012873109709cc6fffdce9d9c5614ec73 100644
+index ea3a12608a851b25afa01ee127c6ef91a3d64fff..97aa9d31d4366aefb05f6f703cc3c6b303c76c42 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -24,6 +24,8 @@ dependencies {
+@@ -26,6 +26,8 @@ dependencies {
      api("net.kyori:adventure-text-serializer-gson")
      api("net.kyori:adventure-text-serializer-legacy")
      api("net.kyori:adventure-text-serializer-plain")
diff --git a/patches/api/0068-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/0068-Allow-plugins-to-use-SLF4J-for-logging.patch
index bf10b2b79..9b1d888be 100644
--- a/patches/api/0068-Allow-plugins-to-use-SLF4J-for-logging.patch
+++ b/patches/api/0068-Allow-plugins-to-use-SLF4J-for-logging.patch
@@ -14,10 +14,10 @@ it without having to shade it in the plugin and going through
 several layers of logging abstraction.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index d1a3e38012873109709cc6fffdce9d9c5614ec73..e142072f31a41b25ac637970f79e71ab70c2f28c 100644
+index 97aa9d31d4366aefb05f6f703cc3c6b303c76c42..8c7a32c85aee1a0e1d727a52481bd5ec928f60df 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -26,6 +26,7 @@ dependencies {
+@@ -28,6 +28,7 @@ dependencies {
      api("net.kyori:adventure-text-serializer-plain")
      api("org.ow2.asm:asm:9.0")
      api("org.ow2.asm:asm-commons:9.0")