diff --git a/patches/api/Adventure.patch b/patches/api/Adventure.patch index 8258f3e50d..4d9c04b117 100644 --- a/patches/api/Adventure.patch +++ b/patches/api/Adventure.patch @@ -32,7 +32,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 api("com.google.guava:guava:32.1.2-jre") api("com.google.code.gson:gson:2.10.1") - api("net.md-5:bungeecord-chat:$bungeeCordChatVersion") -+ api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.14") // Paper ++ // Paper start - adventure ++ api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.14") { ++ exclude("com.google.guava", "guava") ++ } ++ // Paper - adventure api("org.yaml:snakeyaml:2.2") api("org.joml:joml:1.10.5") // Paper start 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 44861fa9f8..de2a6f756d 100644 --- a/patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch @@ -21,7 +21,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 val annotationsVersion = "24.0.1" val bungeeCordChatVersion = "1.20-R0.1" val adventureVersion = "4.14.0" -+val slf4jVersion = "1.8.0-beta4" ++val slf4jVersion = "2.0.9" +val log4jVersion = "2.17.1" val apiAndDocs: Configuration by configurations.creating { attributes { @@ -33,8 +33,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + api("org.apache.logging.log4j:log4j-api:$log4jVersion") + api("org.slf4j:slf4j-api:$slf4jVersion") - implementation("org.ow2.asm:asm:9.4") - implementation("org.ow2.asm:asm-commons:9.4") + implementation("org.ow2.asm:asm:9.5") + implementation("org.ow2.asm:asm-commons:9.5") @@ -0,0 +0,0 @@ tasks.withType { "https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/", "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/", diff --git a/patches/api/Build-system-changes.patch b/patches/api/Build-system-changes.patch index 35b6fa6d1e..6211257dcc 100644 --- a/patches/api/Build-system-changes.patch +++ b/patches/api/Build-system-changes.patch @@ -21,7 +21,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") -+ compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper - val annotations = "org.jetbrains:annotations-java5:$annotationsVersion" + val annotations = "org.jetbrains:annotations:$annotationsVersion" // Paper - we don't want Java 5 annotations... @@ -29,7 +28,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 testCompileOnly(annotations) + // Paper start - add checker -+ val checkerQual = "org.checkerframework:checker-qual:3.21.0" ++ val checkerQual = "org.checkerframework:checker-qual:3.33.0" + compileOnlyApi(checkerQual) + testCompileOnly(checkerQual) + // Paper end diff --git a/patches/api/Paper-Plugins.patch b/patches/api/Paper-Plugins.patch index c7092eed0c..b73a55beaf 100644 --- a/patches/api/Paper-Plugins.patch +++ b/patches/api/Paper-Plugins.patch @@ -9,14 +9,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -0,0 +0,0 @@ dependencies { - implementation("org.ow2.asm:asm-commons:9.4") + implementation("org.ow2.asm:asm-commons:9.5") // Paper end - compileOnly("org.apache.maven:maven-resolver-provider:3.8.5") + api("org.apache.maven:maven-resolver-provider:3.8.5") compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3") compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.3") - compileOnly("com.google.code.findbugs:jsr305:1.3.9") // Paper + @@ -0,0 +0,0 @@ tasks.withType { "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/", "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/", diff --git a/patches/api/Use-ASM-for-event-executors.patch b/patches/api/Use-ASM-for-event-executors.patch index 888ff399f8..f38294dbf4 100644 --- a/patches/api/Use-ASM-for-event-executors.patch +++ b/patches/api/Use-ASM-for-event-executors.patch @@ -14,8 +14,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 apiAndDocs("net.kyori:adventure-text-serializer-plain") apiAndDocs("net.kyori:adventure-text-logger-slf4j") + -+ implementation("org.ow2.asm:asm:9.4") -+ implementation("org.ow2.asm:asm-commons:9.4") ++ implementation("org.ow2.asm:asm:9.5") ++ implementation("org.ow2.asm:asm-commons:9.5") // Paper end compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")