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:
3cd530f0 #3843: Improve NBT javadocs
2b9808cd #3846, #3847: Handle packet bundles
70fa02f3 #3845: Register CustomClickAction in Configuration state
4ebc3c96 #3845: Apply vanilla limits to nbt read operation
dd1531e2 #3845: Add method to read tag with custom limiter
5709a657 Minecraft 1.21.6-pre3 support
5348aad0 #3844: Fix parsing nested array chat components
b60c1bdb Limit length of chat string conversions
93508d50 #3841, #3842: Speed up TagUtil#fromJson()
1f159f8e Fix copy-pasted URL
31f7ef8c #3834: Update to SLF4J 2
24441240 #3840: Add separate permission for "/alertraw"
9cd0d328 #3838, #3839: Check CaseInsensitiveHashingStrategy equals for null strings
7cde213e #3837: Update to JLine 3
aa44ebe7 Remove obsolete/unused findbugs-annotations
5dad4103 Migrate from trove to fastutil
cd1ceb4c Refactor dialog actions
23ba5141 Remove CustomClickEvent.ACTION_KEY
415ac8c8 Move dialog serializer package
41e49dad #3803: Add NBT module
bec32935 Update dialog javadoc and example
89e66ed6 Minecraft 1.21.6-pre1 support
d8f9d81b #3835: Check for dialog loops
363003d8 #3833: Small fixes/improvements to dialog api
a696bb0e Fix extra whitespace in pom.xml
68f4f6bd Add Java 25-ea to GitHub Actions
442ff808 #3832: Fix width setter in PlainMessageBody and make all API fluent
fbbcc454 #3831: Respect vanilla limits in dialogs
f8de3054 Expand CustomClickEvent to have raw and parsed data
f1f5be18 Add further documentation to dialog API

Author: electronicboy

BungeeCord

@@ -1,4 +1,4 @@
-From 72d633293c09b127438728348973c189cf595b75 Mon Sep 17 00:00:00 2001
+From d1c5a19baa41f77f7447d3c0b851c7056b35e446 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
@@ -282,7 +282,7 @@ index 61ee9b45..eab7e89d 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 37679ec1..e694ea92 100644
+index 8fa24a92..857e4f36 100644
 --- a/log/pom.xml
 +++ b/log/pom.xml
 @@ -4,19 +4,19 @@
@@ -562,8 +562,23 @@ index f87a1bea..cee9d672 100644
 
      <dependencies>
          <dependency>
+diff --git a/nbt/pom.xml b/nbt/pom.xml
+index 5c0a147a..9406625f 100644
+--- a/nbt/pom.xml
++++ b/nbt/pom.xml
+@@ -4,8 +4,8 @@
+     <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.3-SNAPSHOT</version>
+         <relativePath>../pom.xml</relativePath>
+     </parent>
 diff --git a/pom.xml b/pom.xml
-index cb567025..2e93d585 100644
+index 57bac7e4..133066bd 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,18 @@
@@ -617,7 +632,7 @@ index cb567025..2e93d585 100644
          </developer>
      </developers>
 
-@@ -48,28 +63,24 @@
+@@ -49,28 +64,24 @@
      </modules>
 
      <scm>
@@ -656,7 +671,7 @@ index cb567025..2e93d585 100644
      </distributionManagement>
 
      <properties>
-@@ -130,7 +141,7 @@
+@@ -125,7 +136,7 @@
                  <plugin>
                      <groupId>org.apache.maven.plugins</groupId>
                      <artifactId>maven-javadoc-plugin</artifactId>
@@ -665,7 +680,7 @@ index cb567025..2e93d585 100644
                  </plugin>
              </plugins>
          </pluginManagement>
-@@ -151,12 +162,21 @@
+@@ -146,12 +157,21 @@
                      </execution>
                  </executions>
              </plugin>
@@ -687,15 +702,15 @@ index cb567025..2e93d585 100644
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-checkstyle-plugin</artifactId>
                  <version>3.6.0</version>
-@@ -181,6 +201,7 @@
+@@ -176,6 +196,7 @@
                      </dependency>
                  </dependencies>
              </plugin>
 +            -->
              <plugin>
                  <groupId>org.codehaus.mojo</groupId>
                  <artifactId>animal-sniffer-maven-plugin</artifactId>
-@@ -302,6 +323,15 @@
+@@ -297,6 +318,15 @@
                                  </goals>
                              </execution>
                          </executions>
@@ -712,7 +727,7 @@ index cb567025..2e93d585 100644
                      <plugin>
                          <groupId>org.projectlombok</groupId>
 diff --git a/protocol/pom.xml b/protocol/pom.xml
-index 77e11507..5c032ca0 100644
+index 9d68f817..1c2192ff 100644
 --- a/protocol/pom.xml
 +++ b/protocol/pom.xml
 @@ -4,19 +4,19 @@
@@ -919,7 +934,7 @@ index 670eb6bc..ec3bb3bd 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/slf4j/pom.xml b/slf4j/pom.xml
-index 68ba54d4..214ec769 100644
+index c3015e2e..be31f62e 100644
 --- a/slf4j/pom.xml
 +++ b/slf4j/pom.xml
 @@ -4,19 +4,19 @@

BungeeCord-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From 611335839905b9500cc91f17dcea19626699764a Mon Sep 17 00:00:00 2001
+From 7f4cf9d71a59d41af45ac58137c0f9b7874a9b0f Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 11:28:45 -0700
 Subject: [PATCH] Rename references from BungeeCord to Waterfall
@@ -18,10 +18,10 @@ index f1ccd4f6..d703d6d2 100644
      }
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-index fb92e1d4..0b9e43de 100644
+index 3576d6ae..3158dbfa 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -184,7 +184,7 @@ public class BungeeCord extends ProxyServer
+@@ -183,7 +183,7 @@ public class BungeeCord extends ProxyServer
      public BungeeCord() throws IOException
      {
          // Java uses ! to indicate a resource inside of a jar/zip/other container. Running Bungee from within a directory that has a ! will cause this to muck up.
@@ -30,7 +30,7 @@ index fb92e1d4..0b9e43de 100644
 
          reloadMessages();
 
-@@ -559,7 +559,7 @@ public class BungeeCord extends ProxyServer
+@@ -543,7 +543,7 @@ public class BungeeCord extends ProxyServer
      @Override
      public String getName()
      {
@@ -40,10 +40,10 @@ index fb92e1d4..0b9e43de 100644
 
      @Override
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-index 7281d6b2..39fc55f9 100644
+index cec7fadb..4cc58a5d 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-@@ -54,7 +54,7 @@ public class BungeeCordLauncher
+@@ -56,7 +56,7 @@ public class BungeeCordLauncher
              if ( buildDate.before( deadline.getTime() ) )
              {
                  System.err.println( "*** Warning, this build is outdated ***" );
@@ -52,7 +52,7 @@ index 7281d6b2..39fc55f9 100644
                  System.err.println( "*** You will get NO support regarding this build ***" );
                  System.err.println( "*** Server will start in 10 seconds ***" );
                  Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) );
-@@ -63,7 +63,7 @@ public class BungeeCordLauncher
+@@ -65,7 +65,7 @@ public class BungeeCordLauncher
 
          BungeeCord bungee = new BungeeCord();
          ProxyServer.setInstance( bungee );
@@ -88,10 +88,10 @@ index efe048c9..720d0c3b 100644
      }
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
-index 95781e33..18ecdee1 100644
+index 25ef7ff5..a08d4772 100644
 --- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
 +++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
-@@ -218,7 +218,7 @@ public class YamlConfig implements ConfigurationAdapter
+@@ -217,7 +217,7 @@ public class YamlConfig implements ConfigurationAdapter
              Map<String, Object> val = entry.getValue();
              String name = entry.getKey();
              String addr = get( "address", "localhost:25565", val );

BungeeCord-Patches/0003-Rename-references-from-BungeeCord-to-Waterfall.patch

@@ -1,4 +1,4 @@
-From 0835f7cb8b75f74ff6665f3d7c778c54fa397cdf Mon Sep 17 00:00:00 2001
+From 39d85d3f521e27dd286fb96b6af66c301bc051dc Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Tue, 25 Oct 2016 11:58:37 -0400
 Subject: [PATCH] Add Waterfall configuration files
@@ -42,17 +42,17 @@ index 00000000..741ebfde
 +
 +}
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-index 0b9e43de..82fd3787 100644
+index 3158dbfa..d4d2866f 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -7,6 +7,7 @@ import com.google.common.collect.Lists;
+@@ -6,6 +6,7 @@ import com.google.common.collect.Iterables;
+ import com.google.common.collect.Lists;
  import com.google.common.collect.Sets;
  import com.google.common.util.concurrent.ThreadFactoryBuilder;
- import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 +import io.github.waterfallmc.waterfall.conf.WaterfallConfiguration;
  import io.netty.bootstrap.ServerBootstrap;
- import io.netty.buffer.ByteBuf;
- import io.netty.buffer.Unpooled;
+ import io.netty.channel.Channel;
+ import io.netty.channel.ChannelException;
 @@ -103,7 +104,7 @@ public class BungeeCord extends ProxyServer
       * Configuration.
       */
@@ -63,10 +63,10 @@ index 0b9e43de..82fd3787 100644
       * Localization formats.
       */
 diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
-index 95320050..2c819684 100644
+index b16d24e1..4e974d17 100644
 --- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
 +++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
-@@ -24,7 +24,7 @@ import net.md_5.bungee.util.CaseInsensitiveSet;
+@@ -23,7 +23,7 @@ import net.md_5.bungee.util.CaseInsensitiveSet;
   * Core configuration for the proxy.
   */
  @Getter
@@ -76,10 +76,10 @@ index 95320050..2c819684 100644
 
      /**
 diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
-index 18ecdee1..915cfeda 100644
+index a08d4772..3d97d674 100644
 --- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
 +++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
-@@ -47,10 +47,15 @@ public class YamlConfig implements ConfigurationAdapter
+@@ -46,10 +46,15 @@ public class YamlConfig implements ConfigurationAdapter
      }
      private final Yaml yaml;
      private Map<String, Object> config;
@@ -97,7 +97,7 @@ index 18ecdee1..915cfeda 100644
          DumperOptions options = new DumperOptions();
          options.setDefaultFlowStyle( DumperOptions.FlowStyle.BLOCK );
          yaml = new Yaml( options );
-@@ -58,6 +63,11 @@ public class YamlConfig implements ConfigurationAdapter
+@@ -57,6 +62,11 @@ public class YamlConfig implements ConfigurationAdapter
 
      @Override
      public void load()
@@ -109,7 +109,7 @@ index 18ecdee1..915cfeda 100644
      {
          try
          {
-@@ -86,6 +96,7 @@ public class YamlConfig implements ConfigurationAdapter
+@@ -85,6 +95,7 @@ public class YamlConfig implements ConfigurationAdapter
              throw new RuntimeException( "Could not load configuration!", ex );
          }
 

BungeeCord-Patches/0004-Add-Waterfall-configuration-files.patch

@@ -1,12 +1,12 @@
-From 05d50ddeced66d52c584f24f13506c71863e17ad Mon Sep 17 00:00:00 2001
+From 11e76cd77090962082a021e69881c1cbe7194653 Mon Sep 17 00:00:00 2001
 From: Jamie Mansfield <dev@jamierocks.uk>
 Date: Thu, 19 May 2016 10:55:20 -0700
 Subject: [PATCH] Disable Metrics
 
 MCStats has not been stable for a long while now, and in our opinion it is not worth migrating to an alternative service. Waterfall has been maintained for the past two years without any or much consideration to statistics, we have users and that's enough for us ;)
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-index 82fd3787..d7d15286 100644
+index d4d2866f..139426bb 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -114,7 +114,7 @@ public class BungeeCord extends ProxyServer
@@ -18,7 +18,7 @@ index 82fd3787..d7d15286 100644
      /**
       * Server socket listener.
       */
-@@ -333,7 +333,7 @@ public class BungeeCord extends ProxyServer
+@@ -319,7 +319,7 @@ public class BungeeCord extends ProxyServer
                  }
              }
          }, 0, TimeUnit.MINUTES.toMillis( 5 ) );
@@ -27,7 +27,7 @@ index 82fd3787..d7d15286 100644
 
          Runtime.getRuntime().addShutdownHook( new Thread()
          {
-@@ -491,7 +491,7 @@ public class BungeeCord extends ProxyServer
+@@ -475,7 +475,7 @@ public class BungeeCord extends ProxyServer
              reconnectHandler.close();
          }
          saveThread.cancel();

BungeeCord-Patches/0005-Disable-Metrics.patch

@@ -1,4 +1,4 @@
-From 9b4411fb749b8d86c943a31dd0a40c9a983e862b Mon Sep 17 00:00:00 2001
+From f06187bcb2c621da8ca40e94412ced60bc37290a 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
@@ -45,10 +45,10 @@ index 1a7d8512..ad1704dd 100644
       * Allow this packet to be sent as an "extended" packet.
       */
 diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-index 5583a1b3..3cd625b9 100644
+index d47f5ef9..ef348679 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -286,7 +286,7 @@ public class ServerConnector extends PacketHandler
+@@ -287,7 +287,7 @@ public class ServerConnector extends PacketHandler
 
                  ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();
                  DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand );
@@ -58,10 +58,10 @@ index 5583a1b3..3cd625b9 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 71470345..32cd0219 100644
+index aa5b5bc6..e6993044 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
-@@ -328,7 +328,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -329,7 +329,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 d2df34d0e55d66423a8e2def0c57431ca9cde60d Mon Sep 17 00:00:00 2001
+From d5144d8b0b090608aa42e472fe165ac35edf3205 Mon Sep 17 00:00:00 2001
 From: Daniel Naylor <git@drnaylor.co.uk>
 Date: Tue, 25 Oct 2016 12:23:07 -0400
 Subject: [PATCH] Add support for FML with IP Forwarding enabled
@@ -12,7 +12,7 @@ However, there is now at least one Forge coremod that intends to support IP forw
 No breaking changes occur due to this patch.
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-index 3cd625b9..6e64f62e 100644
+index ef348679..22af16c7 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -7,6 +7,7 @@ import io.netty.buffer.ByteBufAllocator;
@@ -23,7 +23,7 @@ index 3cd625b9..6e64f62e 100644
  import java.util.Queue;
  import java.util.Set;
  import java.util.UUID;
-@@ -115,15 +116,41 @@ public class ServerConnector extends PacketHandler
+@@ -116,15 +117,41 @@ public class ServerConnector extends PacketHandler
              String newHost = copiedHandshake.getHost() + "\00" + AddressUtil.sanitizeAddress( user.getAddress() ) + "\00" + user.getUUID();
 
              LoginResult profile = user.getPendingConnection().getLoginProfile();
@@ -69,10 +69,10 @@ index 3cd625b9..6e64f62e 100644
          }
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-index d5df3c27..cb5a1ec9 100644
+index 50c16388..118fef35 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -189,9 +189,12 @@ public final class UserConnection implements ProxiedPlayer
+@@ -197,9 +197,12 @@ public final class UserConnection implements ProxiedPlayer
 
          forgeClientHandler = new ForgeClientHandler( this );
 

BungeeCord-Patches/0011-Add-support-for-FML-with-IP-Forwarding-enabled.patch

@@ -1,14 +1,14 @@
-From aa3aa65e98ed3e0d1cde0d586f3977dad98310ac Mon Sep 17 00:00:00 2001
+From 602900eac3d6806b3ddc68b645c1160ecc4be10c Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Thu, 19 May 2016 17:36:31 -0600
 Subject: [PATCH] Better unit tests for Chat API
 
 
 diff --git a/serializer/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java b/serializer/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
-index 2d8233e6..276322a8 100644
+index 47e84cd6..f330a625 100644
 --- a/serializer/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
 +++ b/serializer/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
-@@ -673,6 +673,26 @@ public class ComponentsTest
+@@ -682,6 +682,26 @@ public class ComponentsTest
          assertEquals( testClickEvent, extraGetter.apply( eventRetention, 1 ).getClickEvent() );
      }
 

BungeeCord-Patches/0012-Better-unit-tests-for-Chat-API.patch

@@ -1,4 +1,4 @@
-From ed93d72047d289437c5cd469d31f84a096da6e11 Mon Sep 17 00:00:00 2001
+From f2e02c04b60dd16166b32fc25895c01de51434a1 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 28 Jan 2016 15:13:29 -0700
 Subject: [PATCH] Allow removing servers or changing addresses on reload
@@ -10,10 +10,10 @@ Kicks players on failure to move.
 Original Issue: https://github.com/WaterfallMC/Waterfall-Old/issues/17
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
-index 2c819684..9e81fc6b 100644
+index 4e974d17..eb651a14 100644
 --- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
 +++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
-@@ -11,12 +11,15 @@ import java.util.UUID;
+@@ -10,12 +10,15 @@ import java.util.UUID;
  import java.util.logging.Level;
  import javax.imageio.ImageIO;
  import lombok.Getter;
@@ -29,7 +29,7 @@ index 2c819684..9e81fc6b 100644
  import net.md_5.bungee.util.CaseInsensitiveMap;
  import net.md_5.bungee.util.CaseInsensitiveSet;
 
-@@ -122,20 +125,38 @@ public abstract class Configuration implements ProxyConfig
+@@ -121,20 +124,38 @@ public abstract class Configuration implements ProxyConfig
              servers = new CaseInsensitiveMap<>( newServers );
          } else
          {
@@ -79,5 +79,5 @@ index 2c819684..9e81fc6b 100644
 
          for ( ListenerInfo listener : listeners )
 -- 
-2.47.1.windows.2
+2.49.0