2021-06-11 12:02:28 +00: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 11:18:01 +00:00
|
|
|
diff --git a/build.gradle.kts b/build.gradle.kts
|
2021-07-18 07:41:53 +00:00
|
|
|
index 58b7df30d050156998aa88fb7e2b1973492294db..7ad3e5153718f6d4ce8293a9790bc3c1158aeb8e 100644
|
2021-06-12 11:18:01 +00:00
|
|
|
--- a/build.gradle.kts
|
|
|
|
+++ b/build.gradle.kts
|
2021-07-06 03:25:23 +00:00
|
|
|
@@ -28,6 +28,7 @@ dependencies {
|
2021-06-12 11:18:01 +00:00
|
|
|
api("net.kyori:adventure-text-serializer-plain")
|
|
|
|
api("org.ow2.asm:asm:9.0")
|
|
|
|
api("org.ow2.asm:asm-commons:9.0")
|
|
|
|
+ api("org.apache.logging.log4j:log4j-api:2.14.1") // Paper
|
|
|
|
|
|
|
|
compileOnly("org.apache.maven:maven-resolver-provider:3.8.1")
|
|
|
|
compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
|
2021-06-11 12:02:28 +00:00
|
|
|
diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java
|
|
|
|
index febfec6efafd76bb59b4b43aa223af16f73339b4..79890c68f1ad31f951dfdbd9a16dac500ec58c40 100644
|
|
|
|
--- a/src/main/java/org/bukkit/plugin/Plugin.java
|
|
|
|
+++ b/src/main/java/org/bukkit/plugin/Plugin.java
|
|
|
|
@@ -166,6 +166,13 @@ public interface Plugin extends TabExecutor {
|
|
|
|
@NotNull
|
|
|
|
public Logger getLogger();
|
|
|
|
|
|
|
|
+ // Paper start - Add SLF4J logger
|
|
|
|
+ @NotNull
|
|
|
|
+ default org.slf4j.Logger getSLF4JLogger() {
|
|
|
|
+ return org.slf4j.LoggerFactory.getLogger(getLogger().getName());
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
/**
|
|
|
|
* Returns the name of the plugin.
|
|
|
|
* <p>
|