From f321a45a051d78a3aa86ce3507b18ce2d6251c71 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Sat, 15 Jun 2024 13:05:34 +0200
Subject: [PATCH] Updated Upstream (BungeeCord)

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

BungeeCord Changes:
8a88ce46 Minecraft 1.21 support
006a14a7 #3689, #3690: Don't immediately close HAProxy health check
07df657f Minecraft 1.21-rc1 support
b8b373a5 Minecraft 1.21-pre4 support
e7e0b97c Minecraft 1.21-pre2 support

Co-authored-by: FlorianMichael <florian.michael07@gmail.com>
---
 BungeeCord                                    |   2 +-
 BungeeCord-Patches/0001-POM-Changes.patch     | 122 +++++++++---------
 .../0007-Fixup-ProtocolConstants.patch        |   8 +-
 ...ogging-and-TerminalConsoleAppender-f.patch |  57 ++------
 ...1-Expand-packet-decode-logging-usage.patch |   8 +-
 5 files changed, 78 insertions(+), 119 deletions(-)

diff --git a/BungeeCord b/BungeeCord
index 52ab21b..8a88ce4 160000
--- a/BungeeCord
+++ b/BungeeCord
@@ -1 +1 @@
-Subproject commit 52ab21b1ffcde905bad2a65e98d82424b72826c4
+Subproject commit 8a88ce464e0b107b15523109afd7810096e635ca
diff --git a/BungeeCord-Patches/0001-POM-Changes.patch b/BungeeCord-Patches/0001-POM-Changes.patch
index 6cfb5d7..de7bf12 100644
--- a/BungeeCord-Patches/0001-POM-Changes.patch
+++ b/BungeeCord-Patches/0001-POM-Changes.patch
@@ -1,4 +1,4 @@
-From 089ceef7ec58a1d92d51e215efff4dd22c296b4e Mon Sep 17 00:00:00 2001
+From 058ce1cb0fc175ecb9e9ac294d2146683a7036b1 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 4f520c31..a4ccb90c 100644
+index 57c96a42..00537b66 100644
 --- a/api/pom.xml
 +++ b/api/pom.xml
 @@ -4,42 +4,42 @@
@@ -18,7 +18,7 @@ index 4f520c31..a4ccb90c 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -26,7 +26,7 @@ index 4f520c31..a4ccb90c 100644
 -    <artifactId>bungeecord-api</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-api</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-API</name>
@@ -67,7 +67,7 @@ index 4f520c31..a4ccb90c 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
-index 4dbf5e29..15546f07 100644
+index ff27b54e..22ce6779 100644
 --- a/bootstrap/pom.xml
 +++ b/bootstrap/pom.xml
 @@ -4,39 +4,40 @@
@@ -78,7 +78,7 @@ index 4dbf5e29..15546f07 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -86,7 +86,7 @@ index 4dbf5e29..15546f07 100644
 -    <artifactId>bungeecord-bootstrap</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-bootstrap</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Bootstrap</name>
@@ -145,7 +145,7 @@ index 6be22739..a4516ed9 100644
              return;
          }
 diff --git a/chat/pom.xml b/chat/pom.xml
-index 4239d5a1..3cfa8ac3 100644
+index 71c4ce27..7db6020f 100644
 --- a/chat/pom.xml
 +++ b/chat/pom.xml
 @@ -4,19 +4,19 @@
@@ -156,7 +156,7 @@ index 4239d5a1..3cfa8ac3 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -164,7 +164,7 @@ index 4239d5a1..3cfa8ac3 100644
 -    <artifactId>bungeecord-chat</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-chat</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Chat</name>
@@ -175,7 +175,7 @@ index 4239d5a1..3cfa8ac3 100644
      <dependencies>
          <dependency>
 diff --git a/config/pom.xml b/config/pom.xml
-index e7a474c6..13b2481d 100644
+index 4b94f112..d245a60b 100644
 --- a/config/pom.xml
 +++ b/config/pom.xml
 @@ -4,19 +4,19 @@
@@ -186,7 +186,7 @@ index e7a474c6..13b2481d 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -194,7 +194,7 @@ index e7a474c6..13b2481d 100644
 -    <artifactId>bungeecord-config</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-config</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Config</name>
@@ -205,7 +205,7 @@ index e7a474c6..13b2481d 100644
      <dependencies>
          <dependency>
 diff --git a/event/pom.xml b/event/pom.xml
-index 1f36ab90..120d21b2 100644
+index 84711f0f..2ac455cc 100644
 --- a/event/pom.xml
 +++ b/event/pom.xml
 @@ -4,17 +4,17 @@
@@ -216,7 +216,7 @@ index 1f36ab90..120d21b2 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -224,7 +224,7 @@ index 1f36ab90..120d21b2 100644
 -    <artifactId>bungeecord-event</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-event</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Event</name>
@@ -233,7 +233,7 @@ index 1f36ab90..120d21b2 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 1e2f2e96..09b75466 100644
+index 0091af13..3851e6ce 100644
 --- a/log/pom.xml
 +++ b/log/pom.xml
 @@ -4,19 +4,19 @@
@@ -244,7 +244,7 @@ index 1e2f2e96..09b75466 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -252,7 +252,7 @@ index 1e2f2e96..09b75466 100644
 -    <artifactId>bungeecord-log</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-log</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Log</name>
@@ -274,7 +274,7 @@ index 1e2f2e96..09b75466 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
-index 62e1f137..095368b4 100644
+index fd6bb27e..07b901a3 100644
 --- a/module/cmd-alert/pom.xml
 +++ b/module/cmd-alert/pom.xml
 @@ -4,14 +4,14 @@
@@ -285,7 +285,7 @@ index 62e1f137..095368b4 100644
 -        <artifactId>bungeecord-module</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-module</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -293,11 +293,11 @@ index 62e1f137..095368b4 100644
 -    <artifactId>bungeecord-module-cmd-alert</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module-cmd-alert</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
-index 5ca1b4c3..6bf9bdcf 100644
+index a679a54a..e3a8a06d 100644
 --- a/module/cmd-find/pom.xml
 +++ b/module/cmd-find/pom.xml
 @@ -4,14 +4,14 @@
@@ -308,7 +308,7 @@ index 5ca1b4c3..6bf9bdcf 100644
 -        <artifactId>bungeecord-module</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-module</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -316,11 +316,11 @@ index 5ca1b4c3..6bf9bdcf 100644
 -    <artifactId>bungeecord-module-cmd-find</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module-cmd-find</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 diff --git a/module/cmd-kick/pom.xml b/module/cmd-kick/pom.xml
-index 2a498c05..5e5cab83 100644
+index 8f79be48..3a45cb54 100644
 --- a/module/cmd-kick/pom.xml
 +++ b/module/cmd-kick/pom.xml
 @@ -4,14 +4,14 @@
@@ -331,7 +331,7 @@ index 2a498c05..5e5cab83 100644
 -        <artifactId>bungeecord-module</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-module</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -339,11 +339,11 @@ index 2a498c05..5e5cab83 100644
 -    <artifactId>bungeecord-module-cmd-kick</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module-cmd-kick</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
-index 99090af7..670a55f4 100644
+index 39e7b998..933fc3ed 100644
 --- a/module/cmd-list/pom.xml
 +++ b/module/cmd-list/pom.xml
 @@ -4,14 +4,14 @@
@@ -354,7 +354,7 @@ index 99090af7..670a55f4 100644
 -        <artifactId>bungeecord-module</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-module</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -362,11 +362,11 @@ index 99090af7..670a55f4 100644
 -    <artifactId>bungeecord-module-cmd-list</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module-cmd-list</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
-index 5aee8173..6c65d8f4 100644
+index fe51d004..6b3e2e87 100644
 --- a/module/cmd-send/pom.xml
 +++ b/module/cmd-send/pom.xml
 @@ -4,14 +4,14 @@
@@ -377,7 +377,7 @@ index 5aee8173..6c65d8f4 100644
 -        <artifactId>bungeecord-module</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-module</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -385,11 +385,11 @@ index 5aee8173..6c65d8f4 100644
 -    <artifactId>bungeecord-module-cmd-send</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module-cmd-send</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
-index d33200e2..dc3af35e 100644
+index bc1409aa..45cca078 100644
 --- a/module/cmd-server/pom.xml
 +++ b/module/cmd-server/pom.xml
 @@ -4,14 +4,14 @@
@@ -400,7 +400,7 @@ index d33200e2..dc3af35e 100644
 -        <artifactId>bungeecord-module</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-module</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -408,11 +408,11 @@ index d33200e2..dc3af35e 100644
 -    <artifactId>bungeecord-module-cmd-server</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module-cmd-server</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 diff --git a/module/pom.xml b/module/pom.xml
-index 21ba8f2b..baa24b7d 100644
+index cea355bd..b946e1bd 100644
 --- a/module/pom.xml
 +++ b/module/pom.xml
 @@ -4,19 +4,19 @@
@@ -423,7 +423,7 @@ index 21ba8f2b..baa24b7d 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -431,7 +431,7 @@ index 21ba8f2b..baa24b7d 100644
 -    <artifactId>bungeecord-module</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>pom</packaging>
  
 -    <name>BungeeCord Modules</name>
@@ -461,7 +461,7 @@ index 21ba8f2b..baa24b7d 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml
-index e3a077f3..7d8cf5c4 100644
+index f1fb430a..66e8e0b4 100644
 --- a/module/reconnect-yaml/pom.xml
 +++ b/module/reconnect-yaml/pom.xml
 @@ -4,14 +4,14 @@
@@ -472,7 +472,7 @@ index e3a077f3..7d8cf5c4 100644
 -        <artifactId>bungeecord-module</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-module</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -480,11 +480,11 @@ index e3a077f3..7d8cf5c4 100644
 -    <artifactId>bungeecord-module-reconnect-yaml</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-module-reconnect-yaml</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 diff --git a/native/pom.xml b/native/pom.xml
-index 56d505ab..f7bae2fe 100644
+index bd3a8ab8..49347e1d 100644
 --- a/native/pom.xml
 +++ b/native/pom.xml
 @@ -4,19 +4,19 @@
@@ -495,7 +495,7 @@ index 56d505ab..f7bae2fe 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -503,7 +503,7 @@ index 56d505ab..f7bae2fe 100644
 -    <artifactId>bungeecord-native</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-native</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Native</name>
@@ -514,7 +514,7 @@ index 56d505ab..f7bae2fe 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index 5ceacdd8..a19d10da 100644
+index 7335e8b7..b882440f 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,18 @@
@@ -525,7 +525,7 @@ index 5ceacdd8..a19d10da 100644
 -    <artifactId>bungeecord-parent</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-parent</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>pom</packaging>
  
 -    <name>BungeeCord-Parent</name>
@@ -659,7 +659,7 @@ index 5ceacdd8..a19d10da 100644
                              </execution>
                          </executions>
 diff --git a/protocol/pom.xml b/protocol/pom.xml
-index 6f5acbc2..db62c340 100644
+index d697cea8..b85d2755 100644
 --- a/protocol/pom.xml
 +++ b/protocol/pom.xml
 @@ -4,19 +4,19 @@
@@ -670,7 +670,7 @@ index 6f5acbc2..db62c340 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -678,7 +678,7 @@ index 6f5acbc2..db62c340 100644
 -    <artifactId>bungeecord-protocol</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-protocol</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Protocol</name>
@@ -700,7 +700,7 @@ index 6f5acbc2..db62c340 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 574e36c9..63bc0b32 100644
+index 764ae27d..f84bee26 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -4,18 +4,18 @@
@@ -711,7 +711,7 @@ index 574e36c9..63bc0b32 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -719,7 +719,7 @@ index 574e36c9..63bc0b32 100644
 -    <artifactId>bungeecord-proxy</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-proxy</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Proxy</name>
@@ -779,7 +779,7 @@ index 574e36c9..63bc0b32 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/query/pom.xml b/query/pom.xml
-index e07828dd..4b6fdfc2 100644
+index 84c5f207..5e1b0ac7 100644
 --- a/query/pom.xml
 +++ b/query/pom.xml
 @@ -4,19 +4,19 @@
@@ -790,7 +790,7 @@ index e07828dd..4b6fdfc2 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -798,7 +798,7 @@ index e07828dd..4b6fdfc2 100644
 -    <artifactId>bungeecord-query</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-query</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-Query</name>
@@ -820,7 +820,7 @@ index e07828dd..4b6fdfc2 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/slf4j/pom.xml b/slf4j/pom.xml
-index 3b944b85..1b61e3ad 100644
+index 5c611d8c..8860998c 100644
 --- a/slf4j/pom.xml
 +++ b/slf4j/pom.xml
 @@ -4,18 +4,18 @@
@@ -831,7 +831,7 @@ index 3b944b85..1b61e3ad 100644
 -        <artifactId>bungeecord-parent</artifactId>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-         <version>1.20-R0.3-SNAPSHOT</version>
+         <version>1.21-R0.1-SNAPSHOT</version>
          <relativePath>../pom.xml</relativePath>
      </parent>
  
@@ -839,7 +839,7 @@ index 3b944b85..1b61e3ad 100644
 -    <artifactId>bungeecord-slf4j</artifactId>
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-slf4j</artifactId>
-     <version>1.20-R0.3-SNAPSHOT</version>
+     <version>1.21-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>BungeeCord-SLF4J</name>
@@ -848,5 +848,5 @@ index 3b944b85..1b61e3ad 100644
  
      <properties>
 -- 
-2.44.0
+2.39.3 (Apple Git-146)
 
diff --git a/BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch b/BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch
index d0e5e62..4753fb4 100644
--- a/BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch
+++ b/BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch
@@ -1,14 +1,14 @@
-From d5c02b4a1a18cfdfe29e3149b11f5e9855d52e29 Mon Sep 17 00:00:00 2001
+From 33836af35fea51d5c0c09c5b355f557b6caa8e95 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 2b1487e0..79b298e3 100644
+index 82ef4c5d..ef45ea31 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
-@@ -119,6 +119,16 @@ public class ProtocolConstants
+@@ -121,6 +121,16 @@ public class ProtocolConstants
          SUPPORTED_VERSION_IDS = supportedVersionIds.build();
      }
  
@@ -26,5 +26,5 @@ index 2b1487e0..79b298e3 100644
      {
  
 -- 
-2.45.1
+2.39.3 (Apple Git-146)
 
diff --git a/BungeeCord-Patches/0033-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch b/BungeeCord-Patches/0033-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
index e44861d..87dbbd5 100644
--- a/BungeeCord-Patches/0033-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
+++ b/BungeeCord-Patches/0033-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
@@ -1,4 +1,4 @@
-From f8b0691ca00ae4968acfacbc9d4a86ec2e078d88 Mon Sep 17 00:00:00 2001
+From 044b8172b414f1fb8a4f696402d12adc5720518f 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 15546f07..5182b664 100644
+index 22ce6779..a108e308 100644
 --- a/bootstrap/pom.xml
 +++ b/bootstrap/pom.xml
 @@ -49,6 +49,9 @@
@@ -39,7 +39,7 @@ index 15546f07..5182b664 100644
      </build>
 diff --git a/log4j/pom.xml b/log4j/pom.xml
 new file mode 100644
-index 00000000..4bb98d5a
+index 00000000..96702972
 --- /dev/null
 +++ b/log4j/pom.xml
 @@ -0,0 +1,48 @@
@@ -50,13 +50,13 @@ index 00000000..4bb98d5a
 +    <parent>
 +        <groupId>io.github.waterfallmc</groupId>
 +        <artifactId>waterfall-parent</artifactId>
-+        <version>1.20-R0.3-SNAPSHOT</version>
++        <version>1.21-R0.1-SNAPSHOT</version>
 +        <relativePath>../pom.xml</relativePath>
 +    </parent>
 +
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-log4j</artifactId>
-+    <version>1.20-R0.3-SNAPSHOT</version>
++    <version>1.21-R0.1-SNAPSHOT</version>
 +    <packaging>jar</packaging>
 +
 +    <name>Waterfall-Log4J</name>
@@ -233,7 +233,7 @@ index 00000000..cfd039cd
 +    </Loggers>
 +</Configuration>
 diff --git a/pom.xml b/pom.xml
-index a19d10da..715d3e11 100644
+index b882440f..be640f9e 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -48,12 +48,13 @@
@@ -253,7 +253,7 @@ index a19d10da..715d3e11 100644
      </modules>
  
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 216e894e..95703fee 100644
+index 0886fda2..c3b1ff9f 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -83,7 +83,7 @@
@@ -559,47 +559,6 @@ index 7e465924..00000000
 -        <org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinForParens>true</org-netbeans-modules-editor-indent.text.x-java.CodeStyle.project.spaceWithinForParens>
 -    </properties>
 -</project-shared-configuration>
-diff --git a/slf4j/pom.xml b/slf4j/pom.xml
-deleted file mode 100644
-index 1b61e3ad..00000000
---- a/slf4j/pom.xml
-+++ /dev/null
-@@ -1,35 +0,0 @@
--
--<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
--         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
--    <modelVersion>4.0.0</modelVersion>
--
--    <parent>
--        <groupId>io.github.waterfallmc</groupId>
--        <artifactId>waterfall-parent</artifactId>
--        <version>1.20-R0.3-SNAPSHOT</version>
--        <relativePath>../pom.xml</relativePath>
--    </parent>
--
--    <groupId>io.github.waterfallmc</groupId>
--    <artifactId>waterfall-slf4j</artifactId>
--    <version>1.20-R0.3-SNAPSHOT</version>
--    <packaging>jar</packaging>
--
--    <name>Waterfall-SLF4J</name>
--    <description>Wrapper over SLF4J for BungeeCord purposes.</description>
--
--    <properties>
--        <checkstyle.skip>true</checkstyle.skip>
--        <maven.deploy.skip>true</maven.deploy.skip>
--        <maven.javadoc.skip>true</maven.javadoc.skip>
--    </properties>
--
--    <dependencies>
--        <dependency>
--            <groupId>org.slf4j</groupId>
--            <artifactId>slf4j-api</artifactId>
--            <version>1.7.36</version>
--            <scope>compile</scope>
--        </dependency>
--    </dependencies>
--</project>
 diff --git a/slf4j/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java b/slf4j/src/main/java/org/slf4j/impl/JDK14LoggerAdapter.java
 deleted file mode 100644
 index 49589454..00000000
@@ -1629,5 +1588,5 @@ index 21a48df6..00000000
 -
 -}
 -- 
-2.44.0
+2.39.3 (Apple Git-146)
 
diff --git a/BungeeCord-Patches/0061-Expand-packet-decode-logging-usage.patch b/BungeeCord-Patches/0061-Expand-packet-decode-logging-usage.patch
index 9ccfe2c..47a77f3 100644
--- a/BungeeCord-Patches/0061-Expand-packet-decode-logging-usage.patch
+++ b/BungeeCord-Patches/0061-Expand-packet-decode-logging-usage.patch
@@ -1,14 +1,14 @@
-From 46bb2e2fc11e4133b45c1c6af6e1e5d20043f9f1 Mon Sep 17 00:00:00 2001
+From 980d706d994c43ce5973b1dd44c676af7a6e1274 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 19 Jun 2022 10:31:51 +0100
 Subject: [PATCH] Expand packet-decode-logging usage
 
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
-index 6caf30cd..75e802d2 100644
+index d82173b1..a96fb58e 100644
 --- a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
 +++ b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
-@@ -155,6 +155,14 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
+@@ -156,6 +156,14 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
                      ProxyServer.getInstance().getLogger().log( Level.WARNING, "{0} - read timed out", handler );
                  } else if ( cause instanceof DecoderException )
                  {
@@ -24,5 +24,5 @@ index 6caf30cd..75e802d2 100644
                      {
                          ProxyServer.getInstance().getLogger().log( Level.WARNING, "{0} - corrupted frame: {1}", new Object[]
 -- 
-2.44.0
+2.39.3 (Apple Git-146)