Update Adventure to 4.17.0 Release

heysaeed · May 8, 2024 · 5729b29 · 5729b29
1 parent eee55d0
commit 5729b29
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 19 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -49,7 +49,6 @@ subprojects {
     repositories {
         mavenCentral()
         maven(paperMavenPublicUrl)
-        maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") // TODO - Adventure snapshot
     }
 }
 

diff --git a/patches/api/0006-Adventure.patch b/patches/api/0006-Adventure.patch
@@ -8,14 +8,14 @@ Co-authored-by: Jake Potrebic <[email protected]>
 Co-authored-by: Yannick Lamprecht <[email protected]>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 2f266350a787a4cfdfda1b0e760bfb7604cac43c..106d4d5756dc579c446699106f52462085ea9a52 100644
+index 2f266350a787a4cfdfda1b0e760bfb7604cac43c..bae542d05c059d53199b9171bee505de818df349 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -11,12 +11,28 @@ java {
 
  val annotationsVersion = "24.1.0"
  val bungeeCordChatVersion = "1.20-R0.2"
-+val adventureVersion = "4.17.0-SNAPSHOT"
++val adventureVersion = "4.17.0"
 +val apiAndDocs: Configuration by configurations.creating {
 +    attributes {
 +        attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
@@ -66,12 +66,12 @@ index 2f266350a787a4cfdfda1b0e760bfb7604cac43c..106d4d5756dc579c446699106f524620
          "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1",
          // Paper end
 +        // Paper start
-+        //"https://jd.advntr.dev/api/$adventureVersion/",
-+        //"https://jd.advntr.dev/text-minimessage/$adventureVersion/",
-+        //"https://jd.advntr.dev/text-serializer-gson/$adventureVersion/",
-+        //"https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/",
-+        //"https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
-+        //"https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
++        "https://jd.advntr.dev/api/$adventureVersion/",
++        "https://jd.advntr.dev/text-minimessage/$adventureVersion/",
++        "https://jd.advntr.dev/text-serializer-gson/$adventureVersion/",
++        "https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/",
++        "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
++        "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
 +        // Paper end
      )
      options.tags("apiNote:a:API Note:")

diff --git a/patches/api/0009-Paper-Plugins.patch b/patches/api/0009-Paper-Plugins.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Paper Plugins
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index d6252c1ff21c92bf0d232d5bfdf828d1d2ce38c0..5ccdd695948d1d36173b0a4516cfe8494dd01b06 100644
+index a0c6f2c36fa4c16787616a79b5d996523c274fe0..effad8017bff46e2651af01f1789cb8dd08a49d5 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -52,7 +52,7 @@ dependencies {
@@ -18,8 +18,8 @@ index d6252c1ff21c92bf0d232d5bfdf828d1d2ce38c0..5ccdd695948d1d36173b0a4516cfe849
      compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
 
 @@ -138,6 +138,7 @@ tasks.withType<Javadoc> {
-         //"https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
-         //"https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
+         "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
+         "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
          // Paper end
 +        "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3", // Paper
      )

diff --git a/patches/api/0070-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/0070-Allow-plugins-to-use-SLF4J-for-logging.patch
@@ -14,13 +14,13 @@ 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 5ccdd695948d1d36173b0a4516cfe8494dd01b06..65e67b8726f1e19a6bcb1fe2f448e4ab68df11d1 100644
+index effad8017bff46e2651af01f1789cb8dd08a49d5..eecf458e1250ee9968630cf5c3c3287a1693e52e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -12,6 +12,8 @@ java {
  val annotationsVersion = "24.1.0"
  val bungeeCordChatVersion = "1.20-R0.2"
- val adventureVersion = "4.17.0-SNAPSHOT"
+ val adventureVersion = "4.17.0"
 +val slf4jVersion = "2.0.9"
 +val log4jVersion = "2.17.1"
  val apiAndDocs: Configuration by configurations.creating {
@@ -36,9 +36,9 @@ index 5ccdd695948d1d36173b0a4516cfe8494dd01b06..65e67b8726f1e19a6bcb1fe2f448e4ab
      implementation("org.ow2.asm:asm:9.7")
      implementation("org.ow2.asm:asm-commons:9.7")
 @@ -137,6 +141,8 @@ tasks.withType<Javadoc> {
-         //"https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/",
-         //"https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
-         //"https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
+         "https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/",
+         "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
+         "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
 +        "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
 +        "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/$log4jVersion/",
          // Paper end

diff --git a/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/0011-Use-TerminalConsoleAppender-for-console-improvements.patch
@@ -25,7 +25,7 @@ Other changes:
 Co-Authored-By: Emilia Kond <[email protected]>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 18221614060ec945cb8b197acd276e45450f7394..f7a1c358b0caf524707dcf1346d1d5a22500ce59 100644
+index 18221614060ec945cb8b197acd276e45450f7394..90ca693814a82c30de238b0228750b769a9a9c80 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -5,9 +5,29 @@ plugins {
@@ -44,7 +44,7 @@ index 18221614060ec945cb8b197acd276e45450f7394..f7a1c358b0caf524707dcf1346d1d5a2
 +    // Paper start
 +    implementation("org.jline:jline-terminal-jansi:3.21.0")
 +    implementation("net.minecrell:terminalconsoleappender:1.3.0")
-+    implementation("net.kyori:adventure-text-serializer-ansi:4.16.0") // Keep in sync with adventureVersion from Paper-API build file
++    implementation("net.kyori:adventure-text-serializer-ansi:4.17.0") // Keep in sync with adventureVersion from Paper-API build file
 +    /*
 +          Required to add the missing Log4j2Plugins.dat file from log4j-core
 +          which has been removed by Mojang. Without it, log4j has to classload