diff --git a/patches/api/Adventure.patch b/patches/api/Adventure.patch index e4534947e1..36b18fb140 100644 --- a/patches/api/Adventure.patch +++ b/patches/api/Adventure.patch @@ -64,6 +64,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + "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 b5d69a3308..af98be515b 100644 --- a/patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch @@ -17,15 +17,35 @@ diff --git a/build.gradle.kts b/build.gradle.kts index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/build.gradle.kts +++ b/build.gradle.kts +@@ -0,0 +0,0 @@ java { + } + + val adventureVersion = "4.14.0" ++val slf4jVersion = "1.8.0-beta4" ++val log4jVersion = "2.17.1" + val apiAndDocs: Configuration by configurations.creating { + attributes { + attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION)) @@ -0,0 +0,0 @@ dependencies { apiAndDocs("net.kyori:adventure-text-serializer-legacy") apiAndDocs("net.kyori:adventure-text-serializer-plain") apiAndDocs("net.kyori:adventure-text-logger-slf4j") -+ api("org.apache.logging.log4j:log4j-api:2.17.1") -+ api("org.slf4j:slf4j-api:1.8.0-beta4") ++ 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") +@@ -0,0 +0,0 @@ tasks.withType { + "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/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 + ) + options.tags("apiNote:a:API Note:") diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/plugin/Plugin.java