diff --git a/README.md b/README.md index 50254f38..69db95cd 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,7 @@ See the patches list below. [PandaSpigot-0107] Fix GH-276: Item durability desync when some events are cancelled [PandaSpigot-0031] Add missing InventoryView.getSlotType API [PandaSpigot-0104] Backport modern tick loop system +[PandaSpigot-0089] Add SLF4J implementation [Spigot-0097] Remove DataWatcher Locking by spottedleaf [Spigot-0138] Branchless NibbleArray by md5 diff --git a/WindSpigot-API/pom.xml b/WindSpigot-API/pom.xml index a1bbf62b..7dea6dd9 100644 --- a/WindSpigot-API/pom.xml +++ b/WindSpigot-API/pom.xml @@ -71,6 +71,12 @@ gson 2.8.9 + + + org.slf4j + slf4j-api + 2.0.20 + org.avaje ebean diff --git a/WindSpigot-API/src/main/java/org/bukkit/plugin/Plugin.java b/WindSpigot-API/src/main/java/org/bukkit/plugin/Plugin.java index 1eb3247c..ee5592bd 100644 --- a/WindSpigot-API/src/main/java/org/bukkit/plugin/Plugin.java +++ b/WindSpigot-API/src/main/java/org/bukkit/plugin/Plugin.java @@ -173,6 +173,12 @@ public interface Plugin extends TabExecutor { */ public Logger getLogger(); + // PandaSpigot start - Add SLF4J logger + default org.slf4j.Logger getSLF4JLogger() { + return org.slf4j.LoggerFactory.getLogger(getLogger().getName()); + } + // PandaSpigot end + /** * Returns the name of the plugin. *

diff --git a/WindSpigot-Server/pom.xml b/WindSpigot-Server/pom.xml index ac7f1c6b..41e1ca48 100644 --- a/WindSpigot-Server/pom.xml +++ b/WindSpigot-Server/pom.xml @@ -11,6 +11,8 @@ UTF-8 unknown 4.13.2 + 2.17.2 + 4.1.132.Final git-Bukkit- 1.8 @@ -35,8 +37,64 @@ io.netty - netty-all - 4.1.132.Final + netty-handler + ${netty.version} + + + io.netty + netty-transport + ${netty.version} + + + io.netty + netty-codec-haproxy + ${netty.version} + + + io.netty + netty-transport-classes-epoll + ${netty.version} + + + io.netty + netty-transport-classes-kqueue + ${netty.version} + + + + io.netty + netty-transport-native-epoll + ${netty.version} + linux-x86_64 + runtime + + + io.netty + netty-transport-native-epoll + ${netty.version} + linux-aarch_64 + runtime + + + io.netty + netty-transport-native-epoll + ${netty.version} + linux-riscv64 + runtime + + + io.netty + netty-transport-native-kqueue + ${netty.version} + osx-x86_64 + runtime + + + io.netty + netty-transport-native-kqueue + ${netty.version} + osx-aarch_64 + runtime @@ -94,14 +152,15 @@ org.apache.logging.log4j log4j-core - 2.17.2 + ${log4j.version} compile + - org.slf4j - slf4j-simple - 1.7.36 + org.apache.logging.log4j + log4j-slf4j2-impl + ${log4j.version} @@ -135,6 +194,12 @@ com.velocitypowered velocity-native 3.1.1 + + + io.netty + * + + @@ -148,12 +213,6 @@ javafixes 1.3.6.1 - - - org.checkerframework - checker-qual - 3.21.0 - @@ -244,11 +303,39 @@ org.spigotmc:minecraft-server:** + META-INF/MANIFEST.MF + com/google/common/** + com/google/gson/** + com/google/thirdparty/** + io/netty/** + org/apache/commons/lang3/** org/apache/logging/log4j/** + + + *:* + + org/sqlite/native/FreeBSD/x86/** + org/sqlite/native/Linux/arm/** + org/sqlite/native/Linux/armv6/** + org/sqlite/native/Linux/armv7/** + org/sqlite/native/Linux/x86/** + org/sqlite/native/Linux/ppc64/** + org/sqlite/native/Linux-Android/** + org/sqlite/native/Linux-Musl/x86/** + org/sqlite/native/Windows/armv7/** + org/sqlite/native/Windows/x86/** + org/jline/nativ/FreeBSD/** + org/jline/nativ/Linux/arm/** + org/jline/nativ/Linux/armv6/** + org/jline/nativ/Linux/armv7/** + org/jline/nativ/Linux/ppc64/** + org/jline/nativ/Linux/x86/** + org/jline/nativ/Windows/x86/** + + - joptsimple