diff --git a/build.gradle.kts b/build.gradle.kts index 095ae68f33..6ff60215b6 100644 --- 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/Adventure.patch b/patches/api/Adventure.patch index da4e6dbf0d..587b686919 100644 --- a/patches/api/Adventure.patch +++ b/patches/api/Adventure.patch @@ -15,7 +15,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 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 0000000000000000000000000000000000000000..00000000000000000000000000000000 "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/Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch index bdd9452b7a..a544343d4b 100644 --- a/patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch @@ -20,7 +20,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..00000000000000000000000000000000 implementation("org.ow2.asm:asm:9.7") implementation("org.ow2.asm:asm-commons:9.7") @@ -0,0 +0,0 @@ tasks.withType { - //"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/api/Paper-Plugins.patch b/patches/api/Paper-Plugins.patch index 8f91d5a198..973e380fb9 100644 --- a/patches/api/Paper-Plugins.patch +++ b/patches/api/Paper-Plugins.patch @@ -18,8 +18,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18") @@ -0,0 +0,0 @@ tasks.withType { - //"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/server/Use-TerminalConsoleAppender-for-console-improvements.patch b/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch index 610977f1c6..520144345d 100644 --- a/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch +++ b/patches/server/Use-TerminalConsoleAppender-for-console-improvements.patch @@ -44,7 +44,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // 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