2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Minecrell <minecrell@minecrell.net>
|
|
|
|
Date: Thu, 21 Sep 2017 16:33:12 +0200
|
|
|
|
Subject: [PATCH] Allow plugins to use SLF4J for logging
|
|
|
|
|
|
|
|
SLF4J is a commonly used abstraction for various logging frameworks
|
|
|
|
such as java.util.logging (JUL) or Log4j. Currently, plugins are
|
|
|
|
required to do all their logging using the provided JUL logger.
|
|
|
|
This is annoying for plugins that target multiple platforms or when
|
|
|
|
using libraries that log messages using SLF4J.
|
|
|
|
|
|
|
|
Expose SLF4J as optional logging API for plugins, so they can use
|
|
|
|
it without having to shade it in the plugin and going through
|
|
|
|
several layers of logging abstraction.
|
|
|
|
|
2021-06-12 13:18:01 +02:00
|
|
|
diff --git a/build.gradle.kts b/build.gradle.kts
|
2024-10-21 00:06:54 +02:00
|
|
|
index c55223e0d0c30b7575bc5322e993d0205cbda85f..33e4635dbe6afabecfaaaeff57495e5b3ca5f891 100644
|
2021-06-12 13:18:01 +02:00
|
|
|
--- a/build.gradle.kts
|
|
|
|
+++ b/build.gradle.kts
|
2023-11-23 05:56:28 +01:00
|
|
|
@@ -12,6 +12,8 @@ java {
|
2024-04-25 23:21:18 +02:00
|
|
|
val annotationsVersion = "24.1.0"
|
2024-01-26 20:17:06 +01:00
|
|
|
val bungeeCordChatVersion = "1.20-R0.2"
|
2024-05-08 16:48:45 +02:00
|
|
|
val adventureVersion = "4.17.0"
|
2023-12-10 19:04:19 +01:00
|
|
|
+val slf4jVersion = "2.0.9"
|
2023-06-16 17:34:49 +02:00
|
|
|
+val log4jVersion = "2.17.1"
|
|
|
|
val apiAndDocs: Configuration by configurations.creating {
|
|
|
|
attributes {
|
|
|
|
attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
|
2023-12-10 19:04:19 +01:00
|
|
|
@@ -47,6 +49,8 @@ dependencies {
|
2021-08-14 06:11:12 +02:00
|
|
|
apiAndDocs("net.kyori:adventure-text-serializer-legacy")
|
|
|
|
apiAndDocs("net.kyori:adventure-text-serializer-plain")
|
2022-06-12 23:07:40 +02:00
|
|
|
apiAndDocs("net.kyori:adventure-text-logger-slf4j")
|
2023-06-16 17:34:49 +02:00
|
|
|
+ api("org.apache.logging.log4j:log4j-api:$log4jVersion")
|
|
|
|
+ api("org.slf4j:slf4j-api:$slf4jVersion")
|
2021-06-12 13:18:01 +02:00
|
|
|
|
2024-10-21 00:06:54 +02:00
|
|
|
implementation("org.ow2.asm:asm:9.7.1")
|
|
|
|
implementation("org.ow2.asm:asm-commons:9.7.1")
|
2024-09-30 01:48:34 +02:00
|
|
|
@@ -140,6 +144,8 @@ tasks.withType<Javadoc> {
|
2024-05-08 16:48:45 +02:00
|
|
|
"https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/",
|
|
|
|
"https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
|
|
|
|
"https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
|
2023-06-16 17:34:49 +02:00
|
|
|
+ "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
|
2023-08-14 01:32:51 +02:00
|
|
|
+ "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/$log4jVersion/",
|
2023-06-16 17:34:49 +02:00
|
|
|
// Paper end
|
2023-09-17 01:35:39 +02:00
|
|
|
"https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3", // Paper
|
2023-06-16 17:34:49 +02:00
|
|
|
)
|
2021-06-11 14:02:28 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java
|
2024-09-29 21:52:13 +02:00
|
|
|
index 68a0ed5f0ed25e98f4ab4d1e482ec2ccfda9cd3a..46fc37a36403c8fbc4c0c9f863d4d57eb3896bd4 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/plugin/Plugin.java
|
|
|
|
+++ b/src/main/java/org/bukkit/plugin/Plugin.java
|
2023-02-19 15:57:10 +01:00
|
|
|
@@ -198,6 +198,22 @@ public interface Plugin extends TabExecutor {
|
2022-06-12 23:07:40 +02:00
|
|
|
}
|
|
|
|
// Paper end
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2021-08-02 09:57:31 +02:00
|
|
|
+ // Paper start - Add SLF4J/Log4J loggers
|
2021-06-11 14:02:28 +02:00
|
|
|
+ @NotNull
|
|
|
|
+ default org.slf4j.Logger getSLF4JLogger() {
|
|
|
|
+ return org.slf4j.LoggerFactory.getLogger(getLogger().getName());
|
|
|
|
+ }
|
2021-08-02 09:57:31 +02:00
|
|
|
+
|
2022-01-20 03:39:08 +01:00
|
|
|
+ /**
|
|
|
|
+ * @deprecated use {@link #getSLF4JLogger()}
|
|
|
|
+ */
|
|
|
|
+ @Deprecated
|
2021-08-02 09:57:31 +02:00
|
|
|
+ @NotNull
|
|
|
|
+ default org.apache.logging.log4j.Logger getLog4JLogger() {
|
|
|
|
+ return org.apache.logging.log4j.LogManager.getLogger(getLogger().getName());
|
|
|
|
+ }
|
2021-06-11 14:02:28 +02:00
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
/**
|
|
|
|
* Returns the name of the plugin.
|
|
|
|
* <p>
|