From a44f486694d82c26c11d21e06ddd61159850ec35 Mon Sep 17 00:00:00 2001 From: Underscore11 Date: Mon, 2 Aug 2021 00:57:31 -0700 Subject: [PATCH] Allow plugins to use Log4J to log (#6288) --- .../0068-Allow-plugins-to-use-SLF4J-for-logging.patch | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/patches/api/0068-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/0068-Allow-plugins-to-use-SLF4J-for-logging.patch index ea45530b60..3d7625a269 100644 --- a/patches/api/0068-Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/patches/api/0068-Allow-plugins-to-use-SLF4J-for-logging.patch @@ -26,18 +26,23 @@ index c12636f01b233c2436b7d5cdd4c04ac91389247b..15b8f4708887535383bb74bd922f8932 implementation("org.ow2.asm:asm:9.1") implementation("org.ow2.asm:asm-commons:9.1") diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java -index febfec6efafd76bb59b4b43aa223af16f73339b4..79890c68f1ad31f951dfdbd9a16dac500ec58c40 100644 +index febfec6efafd76bb59b4b43aa223af16f73339b4..e1174ed0b0f9b77068117712a867aa28bfaa64b5 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 { +@@ -166,6 +166,18 @@ public interface Plugin extends TabExecutor { @NotNull public Logger getLogger(); -+ // Paper start - Add SLF4J logger ++ // Paper start - Add SLF4J/Log4J loggers + @NotNull + default org.slf4j.Logger getSLF4JLogger() { + return org.slf4j.LoggerFactory.getLogger(getLogger().getName()); + } ++ ++ @NotNull ++ default org.apache.logging.log4j.Logger getLog4JLogger() { ++ return org.apache.logging.log4j.LogManager.getLogger(getLogger().getName()); ++ } + // Paper end + /**