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:
f8de3054 Expand CustomClickEvent to have raw and parsed data
f1f5be18 Add further documentation to dialog API
e0556097 Bump Netty to 4.2.1.Final
8bff00f1 #3830: Dialog & 25w21a changes
4d37c248 Document packages net.md_5.bungee.api.dialog.action and net.md_5.bungee.api.dialog.body.
75456b2c Document package net.md_5.bungee.api.dialog
53365e4b Fix java 8 javadoc
69e4872f Minecraft 25w20a protocol support
a336efb8 #3825, #3826: Check memory address availability before using natives
ae2fc30b #3828: Set allocator using Netty system property to apply pooled allocator default globally
2bafb705 Minecraft 25w19a protocol support
617c2728 Minecraft 25w18a protocol support

Author: linsaftw

BungeeCord

@@ -1,4 +1,4 @@
-From ceb03602d7da765f9580ea9be7f06a1bb556c2c9 Mon Sep 17 00:00:00 2001
+From 6a5dd5c5dd1afa5e53727f5abe81f1558fdc970a 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,10 +7,10 @@ Subject: [PATCH] POM Changes
 - Deploy to papermc mvn repo
 
 diff --git a/api/pom.xml b/api/pom.xml
-index b050e847..26ad9ac8 100644
+index fdf519e1..82616946 100644
 --- a/api/pom.xml
 +++ b/api/pom.xml
-@@ -4,42 +4,42 @@
+@@ -4,48 +4,48 @@
      <modelVersion>4.0.0</modelVersion>
 
      <parent>
@@ -52,6 +52,14 @@ index b050e847..26ad9ac8 100644
          </dependency>
          <dependency>
 -            <groupId>net.md-5</groupId>
+-            <artifactId>bungeecord-dialog</artifactId>
++            <groupId>io.github.waterfallmc</groupId>
++            <artifactId>waterfall-dialog</artifactId>
+             <version>${project.version}</version>
+             <scope>compile</scope>
+         </dependency>
+         <dependency>
+-            <groupId>net.md-5</groupId>
 -            <artifactId>bungeecord-event</artifactId>
 +            <groupId>io.github.waterfallmc</groupId>
 +            <artifactId>waterfall-event</artifactId>
@@ -204,6 +212,55 @@ index b24fb9d3..7041e584 100644
 
      <dependencies>
          <dependency>
+diff --git a/dialog/README.md b/dialog/README.md
+index 0bf858d5..4bd8f958 100644
+--- a/dialog/README.md
++++ b/dialog/README.md
+@@ -1,4 +1,4 @@
+-BungeeCord-Dialog
++Waterfall-Dialog
+ =================
+ 
+ Highly experimental API, subject to breakage. All contributions welcome, including major refactors/design changes.
+diff --git a/dialog/pom.xml b/dialog/pom.xml
+index 0a3d929c..2166b6dd 100644
+--- a/dialog/pom.xml
++++ b/dialog/pom.xml
+@@ -4,18 +4,18 @@
+     <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>
+ 
+-    <groupId>net.md-5</groupId>
+-    <artifactId>bungeecord-dialog</artifactId>
++    <groupId>io.github.waterfallmc</groupId>
++    <artifactId>waterfall-dialog</artifactId>
+     <version>1.21-R0.3-SNAPSHOT</version>
+     <packaging>jar</packaging>
+ 
+-    <name>BungeeCord-Dialog</name>
++    <name>Waterfall-Dialog</name>
+     <description>Minecraft dialog API intended for use with BungeeCord</description>
+     <licenses>
+         <license>
+@@ -27,8 +27,8 @@
+ 
+     <dependencies>
+         <dependency>
+-            <groupId>net.md-5</groupId>
+-            <artifactId>bungeecord-chat</artifactId>
++            <groupId>io.github.waterfallmc</groupId>
++            <artifactId>waterfall-chat</artifactId>
+             <version>${project.version}</version>
+             <scope>compile</scope>
+         </dependency>
 diff --git a/event/pom.xml b/event/pom.xml
 index 61ee9b45..eab7e89d 100644
 --- a/event/pom.xml
@@ -514,7 +571,7 @@ index f87a1bea..cee9d672 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index 0af145e1..e1da472e 100644
+index cb567025..b18bf53b 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,18 @@
@@ -565,7 +622,7 @@ index 0af145e1..e1da472e 100644
          </developer>
      </developers>
 
-@@ -46,28 +58,24 @@
+@@ -48,28 +60,24 @@
      </modules>
 
      <scm>
@@ -604,7 +661,7 @@ index 0af145e1..e1da472e 100644
      </distributionManagement>
 
      <properties>
-@@ -149,12 +157,21 @@
+@@ -151,12 +159,21 @@
                      </execution>
                  </executions>
              </plugin>
@@ -626,15 +683,15 @@ index 0af145e1..e1da472e 100644
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-checkstyle-plugin</artifactId>
                  <version>3.6.0</version>
-@@ -179,6 +196,7 @@
+@@ -181,6 +198,7 @@
                      </dependency>
                  </dependencies>
              </plugin>
 +            -->
              <plugin>
                  <groupId>org.codehaus.mojo</groupId>
                  <artifactId>animal-sniffer-maven-plugin</artifactId>
-@@ -300,6 +318,15 @@
+@@ -302,6 +320,15 @@
                                  </goals>
                              </execution>
                          </executions>
@@ -650,7 +707,7 @@ index 0af145e1..e1da472e 100644
                      </plugin>
                      <plugin>
                          <groupId>org.projectlombok</groupId>
-@@ -348,6 +375,7 @@
+@@ -350,6 +377,7 @@
                                      <!-- lombok does not add @return or @param which causes warnings, so ignore -->
                                      <doclint>none</doclint>
                                      <sourcepath>${project.build.directory}/delombok</sourcepath>
@@ -659,7 +716,7 @@ index 0af145e1..e1da472e 100644
                              </execution>
                          </executions>
 diff --git a/protocol/pom.xml b/protocol/pom.xml
-index 10278395..85e66f0c 100644
+index 77e11507..5c032ca0 100644
 --- a/protocol/pom.xml
 +++ b/protocol/pom.xml
 @@ -4,19 +4,19 @@
@@ -693,9 +750,9 @@ index 10278395..85e66f0c 100644
          </dependency>
          <dependency>
 -            <groupId>net.md-5</groupId>
--            <artifactId>bungeecord-chat</artifactId>
+-            <artifactId>bungeecord-serializer</artifactId>
 +            <groupId>io.github.waterfallmc</groupId>
-+            <artifactId>waterfall-chat</artifactId>
++            <artifactId>waterfall-serializer</artifactId>
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
@@ -819,6 +876,50 @@ index f86003fb..dd4b2460 100644
              <version>${project.version}</version>
              <scope>compile</scope>
          </dependency>
+diff --git a/serializer/pom.xml b/serializer/pom.xml
+index 670eb6bc..37b401ce 100644
+--- a/serializer/pom.xml
++++ b/serializer/pom.xml
+@@ -4,18 +4,18 @@
+     <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>
+ 
+-    <groupId>net.md-5</groupId>
+-    <artifactId>bungeecord-serializer</artifactId>
++    <groupId>io.github.waterfallmc</groupId>
++    <artifactId>waterfall-serializer</artifactId>
+     <version>1.21-R0.3-SNAPSHOT</version>
+     <packaging>jar</packaging>
+ 
+-    <name>BungeeCord-Serializer</name>
++    <name>Waterfall-Serializer</name>
+     <description>Minecraft JSON serializer intended for use with BungeeCord</description>
+ 
+     <dependencies>
+@@ -27,13 +27,13 @@
+         </dependency>
+         <dependency>
+             <groupId>${project.groupId}</groupId>
+-            <artifactId>bungeecord-chat</artifactId>
++            <artifactId>waterfall-chat</artifactId>
+             <version>${project.version}</version>
+             <scope>compile</scope>
+         </dependency>
+         <dependency>
+             <groupId>${project.groupId}</groupId>
+-            <artifactId>bungeecord-dialog</artifactId>
++            <artifactId>waterfall-dialog</artifactId>
+             <version>${project.version}</version>
+             <scope>compile</scope>
+         </dependency>
 diff --git a/slf4j/pom.xml b/slf4j/pom.xml
 index 68ba54d4..c6112807 100644
 --- a/slf4j/pom.xml

BungeeCord-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From 8f814574c1555cad66d18481113949259ff7cf9f Mon Sep 17 00:00:00 2001
+From 798f8d69d4ca839a7f4431f1cb524faea0142f01 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 849662a7..8f03f72f 100644
+index fb92e1d4..0b9e43de 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -182,7 +182,7 @@ public class BungeeCord extends ProxyServer
+@@ -184,7 +184,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 849662a7..8f03f72f 100644
 
          reloadMessages();
 
-@@ -531,7 +531,7 @@ public class BungeeCord extends ProxyServer
+@@ -559,7 +559,7 @@ public class BungeeCord extends ProxyServer
      @Override
      public String getName()
      {

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

@@ -1,4 +1,4 @@
-From 30a378c7bfb8a741f14309a4777219d89152d1f9 Mon Sep 17 00:00:00 2001
+From c9003d9c296fbcff74e26990c3bcce78bd002cf8 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,7 +42,7 @@ 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 8f03f72f..6a337941 100644
+index 0b9e43de..82fd3787 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;
@@ -51,9 +51,9 @@ index 8f03f72f..6a337941 100644
  import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 +import io.github.waterfallmc.waterfall.conf.WaterfallConfiguration;
  import io.netty.bootstrap.ServerBootstrap;
- import io.netty.channel.Channel;
- import io.netty.channel.ChannelException;
-@@ -101,7 +102,7 @@ public class BungeeCord extends ProxyServer
+ import io.netty.buffer.ByteBuf;
+ import io.netty.buffer.Unpooled;
+@@ -103,7 +104,7 @@ public class BungeeCord extends ProxyServer
       * Configuration.
       */
      @Getter

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

@@ -1,15 +1,15 @@
-From a28b575469ed47df19de1e4e794360475aa70c5e Mon Sep 17 00:00:00 2001
+From 853d385c72121b831e45cc032a46b448e552b958 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 6a337941..62febfd1 100644
+index 82fd3787..d7d15286 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -112,7 +112,7 @@ public class BungeeCord extends ProxyServer
+@@ -114,7 +114,7 @@ public class BungeeCord extends ProxyServer
       * locations.yml save thread.
       */
      private final Timer saveThread = new Timer( "Reconnect Saver" );
@@ -18,7 +18,7 @@ index 6a337941..62febfd1 100644
      /**
       * Server socket listener.
       */
-@@ -305,7 +305,7 @@ public class BungeeCord extends ProxyServer
+@@ -333,7 +333,7 @@ public class BungeeCord extends ProxyServer
                  }
              }
          }, 0, TimeUnit.MINUTES.toMillis( 5 ) );
@@ -27,7 +27,7 @@ index 6a337941..62febfd1 100644
 
          Runtime.getRuntime().addShutdownHook( new Thread()
          {
-@@ -463,7 +463,7 @@ public class BungeeCord extends ProxyServer
+@@ -491,7 +491,7 @@ public class BungeeCord extends ProxyServer
              reconnectHandler.close();
          }
          saveThread.cancel();

BungeeCord-Patches/0005-Disable-Metrics.patch

@@ -1,14 +1,14 @@
-From bb8791c235c971029b373ac44225e3afc500f5d2 Mon Sep 17 00:00:00 2001
+From e2550c82fb7951f64edd051b425db676f0475328 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 976ee797..05e75c02 100644
+index b1b532c9..8d65ca52 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
-@@ -127,6 +127,16 @@ public class ProtocolConstants
+@@ -128,6 +128,16 @@ public class ProtocolConstants
          SUPPORTED_VERSION_IDS = supportedVersionIds.build();
      }
 
@@ -26,5 +26,5 @@ index 976ee797..05e75c02 100644
      {
 
 -- 
-2.49.0
+2.43.0
 

BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch

@@ -1,4 +1,4 @@
-From 2e82da30be2b841a49b88611772048d9b3bdb351 Mon Sep 17 00:00:00 2001
+From 59f1956731a8d406c3bcf6a3761bd155c55051b0 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
@@ -71,10 +71,10 @@ index 71470345..32cd0219 100644
              // changes in the packet are ignored so we need to send it manually
              con.unsafe().sendPacket( pluginMessage );
 diff --git a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
-index 21664e76..4b41d61f 100644
+index 0a916c04..cfbab43a 100644
 --- a/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
 +++ b/proxy/src/main/java/net/md_5/bungee/netty/PipelineUtils.java
-@@ -57,7 +57,7 @@ import net.md_5.bungee.util.PacketLimiter;
+@@ -56,7 +56,7 @@ import net.md_5.bungee.util.PacketLimiter;
  public class PipelineUtils
  {
 

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

@@ -1,4 +1,4 @@
-From b26d92d12ecd1b8bf2692e93d4e665d2c6256647 Mon Sep 17 00:00:00 2001
+From 8377d5482d49e0e6c7bd3b1cad3f7de809c0a5ff 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
@@ -67,10 +67,10 @@ index 3cd625b9..c0487684 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 84ca1eae..6287c3fc 100644
+index d5df3c27..cb5a1ec9 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
-@@ -185,9 +185,12 @@ public final class UserConnection implements ProxiedPlayer
+@@ -189,9 +189,12 @@ public final class UserConnection implements ProxiedPlayer
 
          forgeClientHandler = new ForgeClientHandler( this );