Upstream
/
Waterfall
mirror of https://github.com/PaperMC/Waterfall.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updated Upstream (BungeeCord) 

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

BungeeCord Changes:
bee99bea Downgrade to Checkstyle 8.x as 9.x series has much larger memory usage
8b363d3d Minecraft 1.18-pre5 support
This commit is contained in:
Shane Freeder 2021-11-22 11:39:20 +00:00
parent e35e947aa2
commit 0e3d1caa37
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
4 changed files with 71 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BungeeCord

@ -1 +1 @@
Subproject commit c7b0c3cd48c9929c6ba41ff333727adba89b4e07
Subproject commit bee99beab17e40e5ce5b14936c4eb0d8e46f91c7

127
BungeeCord-Patches/0001-POM-Changes.patch
View File

@ -1,4 +1,4 @@
From e8bf85ea2fbfb671dc47172aed8188dece807038 Mon Sep 17 00:00:00 2001
From faa6ff1b3610328f224270cdc6db17d4505328eb Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 19:33:31 +0200
Subject: [PATCH] POM Changes
@ -7,7 +7,7 @@ Subject: [PATCH] POM Changes
- Deploy to papermc mvn repo
diff --git a/api/pom.xml b/api/pom.xml
index e64231f5..338864f8 100644
index a8ed49ed..adc91449 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -4,42 +4,42 @@
@ -18,7 +18,7 @@ index e64231f5..338864f8 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -26,7 +26,7 @@ index e64231f5..338864f8 100644
- <artifactId>bungeecord-api</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-api</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-API</name>
@ -67,7 +67,7 @@ index e64231f5..338864f8 100644
<scope>compile</scope>
</dependency>
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index f9dc01f4..bd5df16e 100644
index c7eabe73..b3a70840 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -4,39 +4,40 @@
@ -78,7 +78,7 @@ index f9dc01f4..bd5df16e 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -86,7 +86,7 @@ index f9dc01f4..bd5df16e 100644
- <artifactId>bungeecord-bootstrap</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-bootstrap</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Bootstrap</name>
@ -145,10 +145,10 @@ index 6be22739..a4516ed9 100644
return;
}
diff --git a/chat/pom.xml b/chat/pom.xml
index fb797b1e..cfa0e16e 100644
index 0c244852..0ad5dd16 100644
--- a/chat/pom.xml
+++ b/chat/pom.xml
@@ -4,25 +4,25 @@
@@ -4,19 +4,19 @@
<modelVersion>4.0.0</modelVersion>
<parent>
@ -156,7 +156,7 @@ index fb797b1e..cfa0e16e 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -164,7 +164,7 @@ index fb797b1e..cfa0e16e 100644
- <artifactId>bungeecord-chat</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-chat</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Chat</name>
@ -174,15 +174,8 @@ index fb797b1e..cfa0e16e 100644
<dependencies>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.8.0</version>
+ <version>2.8.7</version> <!-- Waterfall - bump gson version -->
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/config/pom.xml b/config/pom.xml
index 88c71b99..67e2500f 100644
index a6f34c99..011d3ce7 100644
--- a/config/pom.xml
+++ b/config/pom.xml
@@ -4,19 +4,19 @@
@ -193,7 +186,7 @@ index 88c71b99..67e2500f 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -201,7 +194,7 @@ index 88c71b99..67e2500f 100644
- <artifactId>bungeecord-config</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-config</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Config</name>
@ -212,7 +205,7 @@ index 88c71b99..67e2500f 100644
<dependencies>
<dependency>
diff --git a/event/pom.xml b/event/pom.xml
index 3a9c7634..563783e9 100644
index 37320a3b..e2432463 100644
--- a/event/pom.xml
+++ b/event/pom.xml
@@ -4,17 +4,17 @@
@ -223,7 +216,7 @@ index 3a9c7634..563783e9 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -231,7 +224,7 @@ index 3a9c7634..563783e9 100644
- <artifactId>bungeecord-event</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-event</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Event</name>
@ -240,7 +233,7 @@ index 3a9c7634..563783e9 100644
+ <description>Generic java event dispatching API intended for use with Waterfall.</description>
</project>
diff --git a/log/pom.xml b/log/pom.xml
index 6d6242e1..3663d6d9 100644
index 28545b92..465ebbf2 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -4,19 +4,19 @@
@ -251,7 +244,7 @@ index 6d6242e1..3663d6d9 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -259,7 +252,7 @@ index 6d6242e1..3663d6d9 100644
- <artifactId>bungeecord-log</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-log</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Log</name>
@ -281,7 +274,7 @@ index 6d6242e1..3663d6d9 100644
<scope>compile</scope>
</dependency>
diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
index 4b3a82ea..11e990d9 100644
index dcf93888..b41791f1 100644
--- a/module/cmd-alert/pom.xml
+++ b/module/cmd-alert/pom.xml
@@ -4,14 +4,14 @@
@ -292,7 +285,7 @@ index 4b3a82ea..11e990d9 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -300,11 +293,11 @@ index 4b3a82ea..11e990d9 100644
- <artifactId>bungeecord-module-cmd-alert</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-alert</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
index 1c7f2515..b732d67f 100644
index 59163873..a17080ab 100644
--- a/module/cmd-find/pom.xml
+++ b/module/cmd-find/pom.xml
@@ -4,14 +4,14 @@
@ -315,7 +308,7 @@ index 1c7f2515..b732d67f 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -323,11 +316,11 @@ index 1c7f2515..b732d67f 100644
- <artifactId>bungeecord-module-cmd-find</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-find</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
index 91fadc2b..d17cb787 100644
index 23f69747..16003086 100644
--- a/module/cmd-list/pom.xml
+++ b/module/cmd-list/pom.xml
@@ -4,14 +4,14 @@
@ -338,7 +331,7 @@ index 91fadc2b..d17cb787 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -346,11 +339,11 @@ index 91fadc2b..d17cb787 100644
- <artifactId>bungeecord-module-cmd-list</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-list</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
index 30097fc3..d1972708 100644
index db9e4762..ba084281 100644
--- a/module/cmd-send/pom.xml
+++ b/module/cmd-send/pom.xml
@@ -4,14 +4,14 @@
@ -361,7 +354,7 @@ index 30097fc3..d1972708 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -369,11 +362,11 @@ index 30097fc3..d1972708 100644
- <artifactId>bungeecord-module-cmd-send</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-send</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
index d69f1e61..3b2c4952 100644
index 06f55aa8..cb4d2932 100644
--- a/module/cmd-server/pom.xml
+++ b/module/cmd-server/pom.xml
@@ -4,14 +4,14 @@
@ -384,7 +377,7 @@ index d69f1e61..3b2c4952 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -392,11 +385,11 @@ index d69f1e61..3b2c4952 100644
- <artifactId>bungeecord-module-cmd-server</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-cmd-server</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/module/pom.xml b/module/pom.xml
index dbc316dd..0ef98d58 100644
index 32d966a0..350a49b8 100644
--- a/module/pom.xml
+++ b/module/pom.xml
@@ -4,19 +4,19 @@
@ -407,7 +400,7 @@ index dbc316dd..0ef98d58 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -415,7 +408,7 @@ index dbc316dd..0ef98d58 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>BungeeCord Modules</name>
@ -445,10 +438,10 @@ index dbc316dd..0ef98d58 100644
<scope>compile</scope>
</dependency>
diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml
index 8d1df1fd..b88398cf 100644
index 4bb408fe..d3476fc5 100644
--- a/module/reconnect-yaml/pom.xml
+++ b/module/reconnect-yaml/pom.xml
@@ -4,14 +4,14 @@
@@ -4,8 +4,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
@ -456,19 +449,11 @@ index 8d1df1fd..b88398cf 100644
- <artifactId>bungeecord-module</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-module-reconnect-yaml</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-module-reconnect-yaml</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
diff --git a/native/pom.xml b/native/pom.xml
index f8bacabd..652a869d 100644
index aa62ce2a..1eff2c93 100644
--- a/native/pom.xml
+++ b/native/pom.xml
@@ -4,19 +4,19 @@
@ -479,7 +464,7 @@ index f8bacabd..652a869d 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -487,7 +472,7 @@ index f8bacabd..652a869d 100644
- <artifactId>bungeecord-native</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-native</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Native</name>
@ -498,7 +483,7 @@ index f8bacabd..652a869d 100644
<dependencies>
<dependency>
diff --git a/pom.xml b/pom.xml
index 3a793641..85e74737 100644
index 311db811..d90a79fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,25 @@
@ -516,7 +501,7 @@ index 3a793641..85e74737 100644
+
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>BungeeCord-Parent</name>
@ -723,7 +708,7 @@ index 3a793641..85e74737 100644
</profiles>
</project>
diff --git a/protocol/pom.xml b/protocol/pom.xml
index f66ca6ca..dbc0a3ab 100644
index e7a492f6..a783d9b0 100644
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -4,19 +4,19 @@
@ -734,7 +719,7 @@ index f66ca6ca..dbc0a3ab 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -742,7 +727,7 @@ index f66ca6ca..dbc0a3ab 100644
- <artifactId>bungeecord-protocol</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-protocol</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Protocol</name>
@ -764,7 +749,7 @@ index f66ca6ca..dbc0a3ab 100644
<scope>compile</scope>
</dependency>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 0f0af3dc..46b12fc1 100644
index 84ace403..0ab796b1 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -4,18 +4,18 @@
@ -775,7 +760,7 @@ index 0f0af3dc..46b12fc1 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -783,7 +768,7 @@ index 0f0af3dc..46b12fc1 100644
- <artifactId>bungeecord-proxy</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-proxy</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Proxy</name>
@ -835,7 +820,7 @@ index 0f0af3dc..46b12fc1 100644
<scope>compile</scope>
</dependency>
diff --git a/query/pom.xml b/query/pom.xml
index 4212899e..dea7d85f 100644
index 9e0c4539..081bff62 100644
--- a/query/pom.xml
+++ b/query/pom.xml
@@ -4,19 +4,19 @@
@ -846,7 +831,7 @@ index 4212899e..dea7d85f 100644
- <artifactId>bungeecord-parent</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-parent</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@ -854,7 +839,7 @@ index 4212899e..dea7d85f 100644
- <artifactId>bungeecord-query</artifactId>
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-query</artifactId>
<version>1.17-R0.1-SNAPSHOT</version>
<version>1.18-R0.1-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>BungeeCord-Query</name>
@ -876,5 +861,5 @@ index 4212899e..dea7d85f 100644
<scope>compile</scope>
</dependency>
--
2.32.0
2.34.0

8
BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch
View File

@ -1,14 +1,14 @@
From f980f4a08f5573e1b46a288710ecea8c29f01e7e Mon Sep 17 00:00:00 2001
From 89b27bcbab1c8ae157e8025c39ecb50aadf4da07 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Tue, 15 Nov 2016 09:07:51 -0500
Subject: [PATCH] Fixup ProtocolConstants
diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
index b040b1d4..bb37ba04 100644
index cd4965df..1069399e 100644
--- a/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
+++ b/protocol/src/main/java/net/md_5/bungee/protocol/ProtocolConstants.java
@@ -96,6 +96,16 @@ public class ProtocolConstants
@@ -98,6 +98,16 @@ public class ProtocolConstants
SUPPORTED_VERSION_IDS = supportedVersionIds.build();
}
@ -26,5 +26,5 @@ index b040b1d4..bb37ba04 100644
{
--
2.30.1 (Apple Git-130)
2.34.0

20
BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
View File

@ -1,4 +1,4 @@
From da87484b20ad60b476c39f1364f169872b9f6d3e Mon Sep 17 00:00:00 2001
From e3eed9c5a14fee7d77e7c09be190cbc83cd4fbc3 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 12:46:47 +0200
Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
@ -6,7 +6,7 @@ Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index bd5df16e..7a9e8258 100644
index b3a70840..00ce099c 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -49,6 +49,9 @@
@ -39,7 +39,7 @@ index bd5df16e..7a9e8258 100644
</build>
diff --git a/log4j/pom.xml b/log4j/pom.xml
new file mode 100644
index 00000000..d5ad0f87
index 00000000..f12968bc
--- /dev/null
+++ b/log4j/pom.xml
@@ -0,0 +1,48 @@
@ -56,7 +56,7 @@ index 00000000..d5ad0f87
+
+ <groupId>io.github.waterfallmc</groupId>
+ <artifactId>waterfall-log4j</artifactId>
+ <version>1.17-R0.1-SNAPSHOT</version>
+ <version>1.18-R0.1-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>Waterfall-Log</name>
@ -233,7 +233,7 @@ index 00000000..93ce3b14
+ </Loggers>
+</Configuration>
diff --git a/pom.xml b/pom.xml
index 85e74737..8d86e36c 100644
index d90a79fb..cffe54fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,11 +56,12 @@
@ -251,7 +251,7 @@ index 85e74737..8d86e36c 100644
</modules>
diff --git a/proxy/pom.xml b/proxy/pom.xml
index 526617e0..c3a2eeb6 100644
index 7a14b969..22c4f71b 100644
--- a/proxy/pom.xml
+++ b/proxy/pom.xml
@@ -71,7 +71,7 @@
@ -523,7 +523,7 @@ index 7e465924..00000000
-</project-shared-configuration>
diff --git a/slf4j/pom.xml b/slf4j/pom.xml
deleted file mode 100644
index fd365ed0..00000000
index d9495ea7..00000000
--- a/slf4j/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
@ -535,13 +535,13 @@ index fd365ed0..00000000
- <parent>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-parent</artifactId>
- <version>1.17-R0.1-SNAPSHOT</version>
- <version>1.18-R0.1-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-slf4j</artifactId>
- <version>1.17-R0.1-SNAPSHOT</version>
- <version>1.18-R0.1-SNAPSHOT</version>
- <packaging>jar</packaging>
-
- <name>BungeeCord-SLF4J</name>
@ -1585,5 +1585,5 @@ index 21a48df6..00000000
-
-}
--
2.30.1 (Apple Git-130)
2.34.0