Waterfall/BungeeCord-Patches/0038-Allow-plugins-to-use-SLF4J-for-logging.patch
Shane Freeder 2cab85cbef
Don't intern scoreboard player names
This patch was heavily intented to fix a server side issue which
is generally no longer relevant, not to mention the cost of interning
only cements this patch into it's grave
2020-05-08 19:40:43 +01:00

61 lines
2.0 KiB
Diff

From 928c66c38d8e49f7d7f94d88c75a52a8e0282057 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 13:15:09 +0200
Subject: [PATCH] Allow plugins to use SLF4J for logging
diff --git a/api/pom.xml b/api/pom.xml
index 15228459..705b7279 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -55,5 +55,11 @@
<version>1.25</version>
<scope>compile</scope>
</dependency>
+ <!-- Waterfall - Add SLF4J -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.25</version>
+ </dependency>
</dependencies>
</project>
diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/Plugin.java b/api/src/main/java/net/md_5/bungee/api/plugin/Plugin.java
index 9660234d..3d1e9a3a 100644
--- a/api/src/main/java/net/md_5/bungee/api/plugin/Plugin.java
+++ b/api/src/main/java/net/md_5/bungee/api/plugin/Plugin.java
@@ -44,6 +44,13 @@ public class Plugin
// init( proxy, description );
}
+ // Waterfall start - Allow plugins to use SLF4J for logging
+ public org.slf4j.Logger getSLF4JLogger() {
+ return org.slf4j.LoggerFactory.getLogger(logger.getName());
+ }
+ // Waterfall end
+
+
/**
* Called when the plugin has just been loaded. Most of the proxy will not
* be initialized, so only use it for registering
diff --git a/log4j/pom.xml b/log4j/pom.xml
index a044119e..f5267567 100644
--- a/log4j/pom.xml
+++ b/log4j/pom.xml
@@ -38,6 +38,12 @@
<artifactId>log4j-jul</artifactId>
<version>${log4j2.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j2.version}</version>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
--
2.26.1