mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-23 02:55:47 +01:00
a73ed9572e
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: b76ceb4f5 PR-1235: Move EntityType return to base Entity class e795d7490 SPIGOT-7458: Exception when Entity CommandSender executes Vanilla command 46c7fc3b1 SPIGOT-7452: Player#openSign cannot edit d91e5aa0b SPIGOT-7447: Rewrite --forceUpgrade to minimise diff and properly handle CraftBukkit world layout 921ae06d6 Revert "SPIGOT-7447: Fix --forceUpgrade" Spigot Changes: 94e187b5 Rebuild patches 3bce7935 SPIGOT-7091: Update bungeecord-chat
74 lines
3.0 KiB
Diff
74 lines
3.0 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/build.gradle.kts b/build.gradle.kts
|
|
index 8c93ff28273ef9ddce2fb7a62ac50701fa3cd9a2..8045f92ffdfb4164bcbef99c41359590c45f9006 100644
|
|
--- a/build.gradle.kts
|
|
+++ b/build.gradle.kts
|
|
@@ -11,6 +11,8 @@ java {
|
|
val annotationsVersion = "24.0.1"
|
|
val bungeeCordChatVersion = "1.20-R0.1"
|
|
val adventureVersion = "4.14.0"
|
|
+val slf4jVersion = "1.8.0-beta4"
|
|
+val log4jVersion = "2.17.1"
|
|
val apiAndDocs: Configuration by configurations.creating {
|
|
attributes {
|
|
attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.DOCUMENTATION))
|
|
@@ -42,6 +44,8 @@ dependencies {
|
|
apiAndDocs("net.kyori:adventure-text-serializer-legacy")
|
|
apiAndDocs("net.kyori:adventure-text-serializer-plain")
|
|
apiAndDocs("net.kyori:adventure-text-logger-slf4j")
|
|
+ api("org.apache.logging.log4j:log4j-api:$log4jVersion")
|
|
+ api("org.slf4j:slf4j-api:$slf4jVersion")
|
|
|
|
implementation("org.ow2.asm:asm:9.4")
|
|
implementation("org.ow2.asm:asm-commons:9.4")
|
|
@@ -113,6 +117,8 @@ tasks.withType<Javadoc> {
|
|
"https://jd.advntr.dev/text-serializer-legacy/$adventureVersion/",
|
|
"https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
|
|
"https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
|
|
+ "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
|
|
+ "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/$log4jVersion/",
|
|
// Paper end
|
|
)
|
|
options.tags("apiNote:a:API Note:")
|
|
diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java
|
|
index 8c76716249e44ed8bf6be94c1f5c7b6d9bb35be2..4eb639fbb46a0848be207149ea433455550fae1c 100644
|
|
--- a/src/main/java/org/bukkit/plugin/Plugin.java
|
|
+++ b/src/main/java/org/bukkit/plugin/Plugin.java
|
|
@@ -198,6 +198,22 @@ public interface Plugin extends TabExecutor {
|
|
}
|
|
// Paper end
|
|
|
|
+ // Paper start - Add SLF4J/Log4J loggers
|
|
+ @NotNull
|
|
+ default org.slf4j.Logger getSLF4JLogger() {
|
|
+ return org.slf4j.LoggerFactory.getLogger(getLogger().getName());
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * @deprecated use {@link #getSLF4JLogger()}
|
|
+ */
|
|
+ @Deprecated
|
|
+ @NotNull
|
|
+ default org.apache.logging.log4j.Logger getLog4JLogger() {
|
|
+ return org.apache.logging.log4j.LogManager.getLogger(getLogger().getName());
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Returns the name of the plugin.
|
|
* <p>
|