52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
|
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.
|
||
|
|
|
||
|
|
diff --git a/pom.xml b/pom.xml
|
||
|
|
index 2c757ffb2253748c6a81f9b373290108209b6ff2..8cf6e1f78d4c1ae388bb478700d5dceaab65c4e7 100644
|
||
|
|
--- a/pom.xml
|
||
|
|
+++ b/pom.xml
|
||
|
|
@@ -144,6 +144,13 @@
|
||
|
|
<version>21.0.1</version>
|
||
|
|
<scope>provided</scope>
|
||
|
|
</dependency>
|
||
|
|
+ <!-- Paper - Add SLF4J -->
|
||
|
|
+ <dependency>
|
||
|
|
+ <groupId>org.slf4j</groupId>
|
||
|
|
+ <artifactId>slf4j-api</artifactId>
|
||
|
|
+ <version>1.7.25</version>
|
||
|
|
+ <scope>compile</scope>
|
||
|
|
+ </dependency>
|
||
|
|
<!-- testing -->
|
||
|
|
<dependency>
|
||
|
|
<groupId>junit</groupId>
|
||
|
|
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>
|