mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 09:23:42 +01:00
899bc53b79
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: f47abd88 SPIGOT-6242: Fix some file line endings de96535b SPIGOT-6234: enum classes don't serialize properly when implementing ConfigurationSerializable CraftBukkit Changes: 4475707d SPIGOT-6244: /spawnpoint ignores angle 8b3b096d SPIGOT-6242: Fix some file line endings 4b33c749 SPIGOT-6186: Canceling a CreatureSpawnEvent results in a "Unable to summon entity due to duplicate UUIDs" error 2b3ca726 SPIGOT-6236: Vehicle passenger portal cooldown does not change
51 lines
1.9 KiB
Diff
51 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 01263d58c48324131b8feb20404174e1d40754a5..1c33b1f4d2366116dd45478b8ad9cdb51fd6bb57 100644
|
|
--- a/pom.xml
|
|
+++ b/pom.xml
|
|
@@ -109,6 +109,13 @@
|
|
<version>19.0.0</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>
|