Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions WindSpigot-API/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@
<artifactId>gson</artifactId>
<version>2.8.9</version>
</dependency>
<!-- PandaSpigot - SLF4J -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.20</version>
</dependency>
<dependency>
<groupId>org.avaje</groupId>
<artifactId>ebean</artifactId>
Expand Down
6 changes: 6 additions & 0 deletions WindSpigot-API/src/main/java/org/bukkit/plugin/Plugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
* <p>
Expand Down
113 changes: 100 additions & 13 deletions WindSpigot-Server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<api.version>unknown</api.version>
<junit.version>4.13.2</junit.version>
<log4j.version>2.17.2</log4j.version>
<netty.version>4.1.132.Final</netty.version>
<buildtag.prefix>git-Bukkit-</buildtag.prefix>
<buildtag.suffix />
<maven.compiler.source>1.8</maven.compiler.source>
Expand All @@ -35,8 +37,64 @@

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>4.1.132.Final</version>
<artifactId>netty-handler</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-haproxy</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-classes-epoll</artifactId>
<version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-classes-kqueue</artifactId>
<version>${netty.version}</version>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>${netty.version}</version>
<classifier>linux-x86_64</classifier>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>${netty.version}</version>
<classifier>linux-aarch_64</classifier>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>${netty.version}</version>
<classifier>linux-riscv64</classifier>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<version>${netty.version}</version>
<classifier>osx-x86_64</classifier>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<version>${netty.version}</version>
<classifier>osx-aarch_64</classifier>
<scope>runtime</scope>
</dependency>

<dependency>
Expand Down Expand Up @@ -94,14 +152,15 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.17.2</version> <!-- Paper - Update Log4j -->
<version>${log4j.version}</version> <!-- Paper - Update Log4j -->
<scope>compile</scope>
</dependency>

<!-- PandaSpigot - SLF4J -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.36</version>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
<version>${log4j.version}</version>
</dependency>

<!-- testing -->
Expand Down Expand Up @@ -135,6 +194,12 @@
<groupId>com.velocitypowered</groupId>
<artifactId>velocity-native</artifactId>
<version>3.1.1</version>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -148,12 +213,6 @@
<artifactId>javafixes</artifactId>
<version>1.3.6.1</version>
</dependency>

<dependency>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
<version>3.21.0</version>
</dependency>

<!-- Kyori api -->
<!-- https://mvnrepository.com/artifact/net.kyori/adventure-api -->
Expand Down Expand Up @@ -244,11 +303,39 @@
<filter>
<artifact>org.spigotmc:minecraft-server:**</artifact>
<excludes>
<exclude>META-INF/MANIFEST.MF</exclude>
<exclude>com/google/common/**</exclude>
<exclude>com/google/gson/**</exclude>
<exclude>com/google/thirdparty/**</exclude>
<exclude>io/netty/**</exclude>
<exclude>org/apache/commons/lang3/**</exclude>
<exclude>org/apache/logging/log4j/**</exclude>
</excludes>
</filter>
<!-- Paper end - Update Log4j -->
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>org/sqlite/native/FreeBSD/x86/**</exclude>
<exclude>org/sqlite/native/Linux/arm/**</exclude>
<exclude>org/sqlite/native/Linux/armv6/**</exclude>
<exclude>org/sqlite/native/Linux/armv7/**</exclude>
<exclude>org/sqlite/native/Linux/x86/**</exclude>
<exclude>org/sqlite/native/Linux/ppc64/**</exclude>
<exclude>org/sqlite/native/Linux-Android/**</exclude>
<exclude>org/sqlite/native/Linux-Musl/x86/**</exclude>
<exclude>org/sqlite/native/Windows/armv7/**</exclude>
<exclude>org/sqlite/native/Windows/x86/**</exclude>
<exclude>org/jline/nativ/FreeBSD/**</exclude>
<exclude>org/jline/nativ/Linux/arm/**</exclude>
<exclude>org/jline/nativ/Linux/armv6/**</exclude>
<exclude>org/jline/nativ/Linux/armv7/**</exclude>
<exclude>org/jline/nativ/Linux/ppc64/**</exclude>
<exclude>org/jline/nativ/Linux/x86/**</exclude>
<exclude>org/jline/nativ/Windows/x86/**</exclude>
</excludes>
</filter>
</filters>
<!-- Paper end - Update Log4j -->
<relocations>
<relocation>
<pattern>joptsimple</pattern>
Expand Down
Loading