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:
a37ed100 #3952: Fix PlayerConfigurationEvent timeout
262e60a2 Enforcer still needs an exception when building outside of reactor due to dependency-reduced-pom
8e52acec Manage maven-resolver versions centrally
709ad723 #3931: In place native cipher
53a4ed95 Use zlib-ng API and custom symbol prefix to avoid conflicts
d269b56f Update mbedtls/zlib
c3eb57d7 Minecraft 26.1-pre-2 support
47dbf645 Bump org.projectlombok:lombok from 1.18.42 to 1.18.44 (#3954)
14c6a790 #3953: Bump org.jline:jline from 3.30.7 to 3.30.8

Author: electronicboy

BungeeCord

@@ -1,4 +1,4 @@
-From 8ad3338a21818d6de4340cd65cdda86674500557 Mon Sep 17 00:00:00 2001
+From bd53eb6849711b415bbb399538f48078ee50b6d8 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 4924e04e..481afaaf 100644
+index 96d71a6c..f91db7db 100644
 --- a/api/pom.xml
 +++ b/api/pom.xml
 @@ -4,48 +4,48 @@
@@ -74,6 +74,17 @@ index 4924e04e..481afaaf 100644
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
+@@ -55,8 +55,8 @@
+             <scope>compile</scope>
+         </dependency>
+         <dependency>
+-            <groupId>net.md-5</groupId>
+-            <artifactId>bungeecord-maven-resolver</artifactId>
++            <groupId>io.github.waterfallmc</groupId>
++            <artifactId>waterfall-maven-resolver</artifactId>
+             <version>${project.version}</version>
+             <!-- not part of the API proper -->
+             <scope>provided</scope>
 diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
 index 9700de8f..1e076b4b 100644
 --- a/bootstrap/pom.xml
@@ -283,7 +294,7 @@ index 463149f2..1fdbea07 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 d15110c1..83f8ee8d 100644
+index 3a0eecb2..def1111f 100644
 --- a/log/pom.xml
 +++ b/log/pom.xml
 @@ -4,19 +4,19 @@
@@ -323,6 +334,29 @@ index d15110c1..83f8ee8d 100644
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
+diff --git a/maven-resolver/pom.xml b/maven-resolver/pom.xml
+index 65bfeaa0..290e1b20 100644
+--- a/maven-resolver/pom.xml
++++ b/maven-resolver/pom.xml
+@@ -4,14 +4,14 @@
+     <modelVersion>4.0.0</modelVersion>
+ 
+     <parent>
+-        <groupId>net.md-5</groupId>
+-        <artifactId>bungeecord-parent</artifactId>
++        <groupId>io.github.waterfallmc</groupId>
++        <artifactId>waterfall-parent</artifactId>
+         <version>1.21-R0.5-SNAPSHOT</version>
+         <relativePath>../pom.xml</relativePath>
+     </parent>
+ 
+-    <groupId>net.md-5</groupId>
+-    <artifactId>bungeecord-maven-resolver</artifactId>
++    <groupId>io.github.waterfallmc</groupId>
++    <artifactId>waterfall-maven-resolver</artifactId>
+     <version>1.21-R0.5-SNAPSHOT</version>
+     <packaging>jar</packaging>
+ 
 diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
 index 992dc637..1d4f36a5 100644
 --- a/module/cmd-alert/pom.xml
@@ -595,7 +629,7 @@ index d7ff234f..ecfaeb7e 100644
          <license>
              <name>BSD-3-Clause</name>
 diff --git a/pom.xml b/pom.xml
-index 2bb39c8a..e60e9ee1 100644
+index 050d7d9e..11b85a9d 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,18 @@
@@ -649,7 +683,7 @@ index 2bb39c8a..e60e9ee1 100644
          </developer>
      </developers>
 
-@@ -49,28 +64,24 @@
+@@ -50,28 +65,24 @@
      </modules>
 
      <scm>
@@ -688,7 +722,7 @@ index 2bb39c8a..e60e9ee1 100644
      </distributionManagement>
 
      <properties>
-@@ -146,12 +157,21 @@
+@@ -147,12 +158,21 @@
                      </execution>
                  </executions>
              </plugin>
@@ -710,15 +744,15 @@ index 2bb39c8a..e60e9ee1 100644
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-checkstyle-plugin</artifactId>
                  <version>3.6.0</version>
-@@ -176,6 +196,7 @@
+@@ -177,6 +197,7 @@
                      </dependency>
                  </dependencies>
              </plugin>
 +            -->
              <plugin>
                  <groupId>org.codehaus.mojo</groupId>
                  <artifactId>animal-sniffer-maven-plugin</artifactId>
-@@ -295,6 +316,15 @@
+@@ -298,6 +319,15 @@
                                  </goals>
                              </execution>
                          </executions>
@@ -784,7 +818,7 @@ index c8aa2932..02736b2a 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index bc363b07..5e583a77 100644
+index d967d6aa..a5a23725 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -4,18 +4,18 @@
@@ -862,6 +896,17 @@ index bc363b07..5e583a77 100644
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
+@@ -114,8 +114,8 @@
+         </dependency>
+         <!-- add back in as not exposed by the API -->
+         <dependency>
+-            <groupId>net.md-5</groupId>
+-            <artifactId>bungeecord-maven-resolver</artifactId>
++            <groupId>io.github.waterfallmc</groupId>
++            <artifactId>waterfall-maven-resolver</artifactId>
+             <version>${project.version}</version>
+             <scope>runtime</scope>
+         </dependency>
 diff --git a/query/pom.xml b/query/pom.xml
 index 98c88cad..c57c6b13 100644
 --- a/query/pom.xml

BungeeCord-Patches/0001-POM-Changes.patch

@@ -1,14 +1,14 @@
-From 3255be1e7e42d4d814fe0d7b8524c8ec79c926f4 Mon Sep 17 00:00:00 2001
+From 21ef554afb37a2c0bf43a36f2f42ac6fd462d427 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 18 Jul 2018 20:23:03 +0300
 Subject: [PATCH] Copy license files into jar
 
 
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index f1fadd9d..315f5f91 100644
+index a5a23725..1cd10603 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
-@@ -132,4 +132,26 @@
+@@ -120,4 +120,26 @@
              <scope>runtime</scope>
          </dependency>
      </dependencies>
@@ -36,5 +36,5 @@ index f1fadd9d..315f5f91 100644
 +    <!-- Waterfall end -->
  </project>
 -- 
-2.51.0
+2.53.0
 

BungeeCord-Patches/0002-Copy-license-files-into-jar.patch

@@ -1,4 +1,4 @@
-From d6fb13fbfbebe46ceffa295d3992ec6c7accca1c Mon Sep 17 00:00:00 2001
+From e364a51b4fc1dbad7112b6c1abe43264384b9933 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Tue, 3 May 2016 20:31:52 -0700
 Subject: [PATCH] Don't access a ByteBuf's underlying array
@@ -58,10 +58,10 @@ index 96b86e5e..b77d21ad 100644
              }
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index 9f87d606..6cbd6088 100644
+index c71a7de4..e66b39ea 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-@@ -339,7 +339,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -340,7 +340,7 @@ public class DownstreamBridge extends PacketHandler
 
              brand = ByteBufAllocator.DEFAULT.heapBuffer();
              DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );

BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch

@@ -1,4 +1,4 @@
-From 0d7d283ad0671e13883debc69e18bb5505c19bbb Mon Sep 17 00:00:00 2001
+From faa130e899a75c2f37b070436d1ecd98b28b26f9 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Tue, 19 Jan 2016 15:13:29 -0700
 Subject: [PATCH] Micro-optimizations
@@ -8,18 +8,18 @@ Subject: [PATCH] Micro-optimizations
 - Don't create a data input stream for every plugin message we get from servers
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index 6cbd6088..91e2bca1 100644
+index e66b39ea..e0edbb7b 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-@@ -321,7 +321,6 @@ public class DownstreamBridge extends PacketHandler
+@@ -322,7 +322,6 @@ public class DownstreamBridge extends PacketHandler
      @SuppressWarnings("checkstyle:avoidnestedblocks")
      public void handle(PluginMessage pluginMessage) throws Exception
      {
 -        DataInput in = pluginMessage.getStream();
          PluginMessageEvent event = new PluginMessageEvent( server, con, pluginMessage.getTag(), pluginMessage.getData().clone() );
 
          if ( bungee.getPluginManager().callEvent( event ).isCancelled() )
-@@ -348,6 +347,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -349,6 +348,7 @@ public class DownstreamBridge extends PacketHandler
 
          if ( pluginMessage.getTag().equals( PluginMessage.BUNGEE_CHANNEL_LEGACY ) )
          {

BungeeCord-Patches/0015-Micro-optimizations.patch

@@ -1,4 +1,4 @@
-From f03b3ad3c625250f9a7c5c2e18b41e7202522b77 Mon Sep 17 00:00:00 2001
+From 49dccefcb0cf4b9b3a92d02e49515eb0c0eadedb Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Thu, 19 May 2016 17:09:22 -0600
 Subject: [PATCH] Allow invalid packet ids for forge servers
@@ -43,10 +43,10 @@ index abcb53bb..0dd0fe31 100644
              {
                  packet.read( in, protocol, prot.getDirection(), protocolVersion );
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
-index 85634e11..f7b0d6a7 100644
+index 626965d6..bdefc8f1 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/Protocol.java
-@@ -1097,14 +1097,23 @@ public enum Protocol
+@@ -1103,14 +1103,23 @@ public enum Protocol
              return protocol;
          }
 

BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch

@@ -1,4 +1,4 @@
-From 0ef26a5d0a72a225fe010c3c5f594ce8ad5d595a Mon Sep 17 00:00:00 2001
+From c48c32e9ec1544da7778a083eb8aaf2de0870310 Mon Sep 17 00:00:00 2001
 From: Nathan Poirier <nathan@poirier.io>
 Date: Tue, 28 Jun 2016 23:00:49 -0500
 Subject: [PATCH] Improve ServerKickEvent
@@ -81,10 +81,10 @@ index 2a92388f..0c4f067c 100644
          {
              // Pre cancel the event if we are going to try another server
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index 91e2bca1..189b1277 100644
+index e0edbb7b..99c6b422 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-@@ -659,10 +659,14 @@ public class DownstreamBridge extends PacketHandler
+@@ -660,10 +660,14 @@ public class DownstreamBridge extends PacketHandler
      public void handle(Kick kick) throws Exception
      {
          ServerInfo def = con.updateAndGetNextServer( server.getInfo() );

BungeeCord-Patches/0024-Improve-ServerKickEvent.patch

@@ -1,15 +1,15 @@
-From 210e4665fc53d440f8260431d5d27ef7b059fdb3 Mon Sep 17 00:00:00 2001
+From 8fcc8a121c7b51ecba77073dade52c7c9aba7a18 Mon Sep 17 00:00:00 2001
 From: Aaron Hill <aa1ronham@gmail.com>
 Date: Thu, 15 Sep 2016 22:38:37 +0200
 Subject: [PATCH] Fix potion race condition on Forge 1.8.9
 
 
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
-index 93e3aaed..46f568b3 100644
+index 4930843c..6209292e 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/AbstractPacketHandler.java
-@@ -298,4 +298,14 @@ public abstract class AbstractPacketHandler
-     public void handle(BundleDelimiter bundleDelimiter) throws Exception
+@@ -303,4 +303,14 @@ public abstract class AbstractPacketHandler
+     public void handle(KnownPacks knownPacks) throws Exception
      {
      }
 +
@@ -142,10 +142,10 @@ index 1d0553f8..617edba6 100644
      @Setter
      private String lastCommandTabbed;
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index 189b1277..8b94efff 100644
+index 99c6b422..58b98e0c 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-@@ -764,6 +764,32 @@ public class DownstreamBridge extends PacketHandler
+@@ -765,6 +765,32 @@ public class DownstreamBridge extends PacketHandler
          }
      }
 

BungeeCord-Patches/0029-Fix-potion-race-condition-on-Forge-1.8.9.patch

@@ -1,4 +1,4 @@
-From bfe64b172f67e0f3f97d9ef7f64b5926f8582bde Mon Sep 17 00:00:00 2001
+From 9188487f4e06cbfa1fe04ec030111ef0209343b1 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
@@ -232,16 +232,17 @@ index 00000000..cfd039cd
 +    </Loggers>
 +</Configuration>
 diff --git a/pom.xml b/pom.xml
-index e60e9ee1..79a3ccb9 100644
+index 11b85a9d..c112ffca 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -52,13 +52,14 @@
+@@ -52,14 +52,15 @@
          <module>config</module>
          <module>dialog</module>
          <module>event</module>
 -        <module>log</module>
 +        <!--<module>log</module>-->
 +        <module>log4j</module>
+         <module>maven-resolver</module>
          <module>module</module>
          <module>protocol</module>
          <module>proxy</module>
@@ -253,7 +254,7 @@ index e60e9ee1..79a3ccb9 100644
          <module>nbt</module>
      </modules>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 8460c51a..eaa67da8 100644
+index 2a2ed401..91e12a71 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -84,7 +84,7 @@
@@ -280,8 +281,8 @@ index 8460c51a..eaa67da8 100644
          <dependency>
              <groupId>net.sf.jopt-simple</groupId>
              <artifactId>jopt-simple</artifactId>
-@@ -143,6 +144,35 @@
-             <version>1.9.27</version>
+@@ -131,6 +132,35 @@
+             <version>${project.version}</version>
              <scope>runtime</scope>
          </dependency>
 +        <!-- Waterfall start - Console improvements - bring back slf4j-->

BungeeCord-Patches/0033-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch

@@ -1,4 +1,4 @@
-From 4c2e4827bef9eff9e8666662d04da71fc0b7426a Mon Sep 17 00:00:00 2001
+From ab8aafb9fef9aaf34000faa327d75b72156a376e Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 14 Jan 2019 03:35:21 +0000
 Subject: [PATCH] Provide an option to disable entity metadata rewriting
@@ -128,18 +128,18 @@ index 617edba6..27e2d27a 100644
 +    // Waterfall end
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-index 8b94efff..dacfe5de 100644
+index 58b98e0c..80dd6a31 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/DownstreamBridge.java
-@@ -768,6 +768,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -769,6 +769,7 @@ public class DownstreamBridge extends PacketHandler
      @Override
      public void handle(net.md_5.bungee.protocol.packet.EntityEffect entityEffect) throws Exception
      {
 +        if (con.isDisableEntityMetadataRewrite()) return; // Waterfall
          // Don't send any potions when switching between servers (which involves a handshake), which can trigger a race
          // condition on the client.
          if (this.con.getForgeClientHandler().isForgeUser() && !this.con.getForgeClientHandler().isHandshakeComplete()) {
-@@ -779,6 +780,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -780,6 +781,7 @@ public class DownstreamBridge extends PacketHandler
      @Override
      public void handle(net.md_5.bungee.protocol.packet.EntityRemoveEffect removeEffect) throws Exception
      {