give the project some TLC

- Respect bungeecords new "log ping" configuration along side our own
  Waterfalls patch will likely be dropped by the end of the year, migrate!
- Drop 'Don't allow channel buffers to grow beyond a reasonable limit'
  This is already included upstream and is configurable using system properties
- Drop 'Security enhancements for EncryptionUtil'
  This patch is somewhat misguided given how mojangs auth service works and offers
  no real improvements to security
- cleanup some patches
  updated headers for changes which have been removed/extracted into other patches
  cleaned up some code formatting changes in misc sections
- touch up the contributing guide to reflect the recent script changes

BungeeCord-Patches/0014-Allow-removing-servers-or-changing-addresses-on-relo.patch

@@ -1,4 +1,4 @@
-From 42de5a32c4a4f71e135bfc973a2474b1e2581aed Mon Sep 17 00:00:00 2001
+From 4a77a0c6b9df61ce8c95f244051853f4310c81b0 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
@@ -72,5 +72,5 @@ index 1c585e60..bdb012c3 100644
              }
          }
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0014-Don-t-allow-channel-buffers-to-grow-beyond-a-reasona.patch

@@ -1,22 +0,0 @@
-From fe70e9d094374aec9039f82b7cbb4871473b121f Mon Sep 17 00:00:00 2001
-From: Iceee <andrew@optic.tv>
-Date: Mon, 6 Jul 2015 18:59:29 -0500
-Subject: [PATCH] Don't allow channel buffers to grow beyond a reasonable limit
-
-
-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 4a13910e..9f11f0a2 100644
---- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -326,6 +326,8 @@ public class BungeeCord extends ProxyServer
-             new ServerBootstrap()
-                     .channel( PipelineUtils.getServerChannel() )
-                     .option( ChannelOption.SO_REUSEADDR, true ) // TODO: Move this elsewhere!
-+                    .childOption( ChannelOption.WRITE_BUFFER_HIGH_WATER_MARK, 1024 * 1024 * 10 )
-+                    .childOption( ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, 1024 * 1024 * 1 )
-                     .childAttr( PipelineUtils.LISTENER, info )
-                     .childHandler( PipelineUtils.SERVER_CHILD )
-                     .group( eventLoops )
--- 
-2.18.0
-

BungeeCord-Patches/0015-Enable-TCP_NODELAY.patch

@@ -1,4 +1,4 @@
-From a63302940f9d49a8c25197e2fe9dc27f2f6d025e Mon Sep 17 00:00:00 2001
+From fbed7db1bba999269cd489496076d862a0513cba Mon Sep 17 00:00:00 2001
 From: Harry <me@harry5573.uk>
 Date: Sun, 24 Jan 2016 15:13:29 -0700
 Subject: [PATCH] Enable TCP_NODELAY.
@@ -18,5 +18,5 @@ index be9685b9..b0bbc1d7 100644
              ch.config().setWriteBufferWaterMark( MARK );
  
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0016-Micro-optimizations.patch

@@ -1,13 +1,11 @@
-From 977c4a0f8cddfad7fd46b2c08c0f82bc6d442cb1 Mon Sep 17 00:00:00 2001
+From 85e2919d0c335b504c6aad7fd3710293d825b13b 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
 
 - PluginManager.dispatchCommand() avoids regex while splitting commands. Java 7 introduced an optimized String.split() that should be used instead (affects command dispatch).
-- Avoid regex in getLocale() by changing from replaceAll(String, String) to replaceAll(char, char)
 - Don't attempt to format arguments when there are none provided
 - Don't create a data input stream for every plugin message we get from servers
-- Optimise replacing dashes in UUID's
 
 diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
 index 096538a7..54a65155 100644
@@ -31,10 +29,10 @@ index 096538a7..54a65155 100644
          if ( split.length == 0 )
          {
 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 9f11f0a2..c8d1d225 100644
+index 4a13910e..4fbc307c 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -518,7 +518,9 @@ public class BungeeCord extends ProxyServer
+@@ -516,7 +516,9 @@ public class BungeeCord extends ProxyServer
          String translation = "<translation '" + name + "' missing>";
          try
          {
@@ -66,5 +64,5 @@ index d4c58098..30f8a7df 100644
              String subChannel = in.readUTF();
  
 -- 
-2.18.0
+2.19.0
 

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

@@ -1,4 +1,4 @@
-From 4376131d2acf771b016130d36a21103e9e9a31c9 Mon Sep 17 00:00:00 2001
+From 66d704b15011f245e02fce6aade947314d313861 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
@@ -122,5 +122,5 @@ index d1eebbf0..2843b94e 100644
          {
              rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0018-Resolve-sendData-deadlocks.patch

@@ -1,4 +1,4 @@
-From d7627ca9aaad7b3625fc6b32d5a7208f7aca7889 Mon Sep 17 00:00:00 2001
+From 896b13140d424a1ec5d7aa882c9f3c479716e3d5 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Fri, 12 Feb 2016 23:55:53 -0500
 Subject: [PATCH] Resolve sendData() deadlocks
@@ -43,5 +43,5 @@ index 89c8f48f..9756c09c 100644
  
      @Override
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0019-Add-basic-support-for-configurable-tab-complete-thro.patch

@@ -1,4 +1,4 @@
-From 1b9854df997c47a99ce7dd05f5023f132629d0d2 Mon Sep 17 00:00:00 2001
+From 87e8a20022494a50d02a3306da2f2f5882984b68 Mon Sep 17 00:00:00 2001
 From: Johannes Donath <johannesd@torchmind.com>
 Date: Sat, 4 Jul 2015 06:31:33 +0200
 Subject: [PATCH] Add basic support for configurable tab-complete throttling
@@ -58,7 +58,7 @@ index 741ebfde..0abb4075 100644
  
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-index 99933dc8..af1c7deb 100644
+index 9666e7a2..f08f464a 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
 @@ -33,6 +33,8 @@ public class UpstreamBridge extends PacketHandler
@@ -88,5 +88,5 @@ index 99933dc8..af1c7deb 100644
  
          if ( tabComplete.getCursor().startsWith( "/" ) )
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0020-Don-t-create-a-new-KickStringWriter-for-each-new-con.patch

@@ -1,4 +1,4 @@
-From b4ce6bdcc8f8aa1bad704c38ea5f9a6ac35690c4 Mon Sep 17 00:00:00 2001
+From 42bf77d8efdb2be88cad1ad291a2eb0337f0c414 Mon Sep 17 00:00:00 2001
 From: Harry <me@harry5573.uk>
 Date: Tue, 26 Jan 2016 01:01:57 +0000
 Subject: [PATCH] Don't create a new KickStringWriter for each new connection.
@@ -42,5 +42,5 @@ index b0bbc1d7..0cad5c89 100644
      private static boolean epoll;
  
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0021-Optional-server-list-ping-logging.patch

@@ -1,4 +1,4 @@
-From 9053bea57b15c9f581d3e89cf4b877ae0e30e585 Mon Sep 17 00:00:00 2001
+From ef45f40dff0368b1ceb9cacb3b77330e9111e0e3 Mon Sep 17 00:00:00 2001
 From: Janmm14 <computerjanimaus@yahoo.de>
 Date: Sat, 12 Dec 2015 23:43:30 +0100
 Subject: [PATCH] Optional server list ping logging.
@@ -84,7 +84,7 @@ index 30f8a7df..ce8da75d 100644
      }
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-index 0e8041f8..52811180 100644
+index 0e8041f8..cd240460 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 @@ -293,16 +293,15 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -101,7 +101,7 @@ index 0e8041f8..52811180 100644
          switch ( handshake.getRequestedProtocol() )
          {
              case 1:
-+                if (BungeeCord.getInstance().getConfig().isLogServerListPing()) {
++                if (bungee.getConfig().isLogPings() || BungeeCord.getInstance().getConfig().isLogServerListPing()) {
 +                    bungee.getLogger().log( Level.INFO, "{0} is pinging", this );
 +                }
                  // Ping
@@ -129,5 +129,5 @@ index f08f464a..20b3975a 100644
      }
  }
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0022-Add-a-property-to-accept-invalid-ping-packets.patch

@@ -1,4 +1,4 @@
-From 64744af8486cf0ded4b02dbe5ce9e6aafda0e64a Mon Sep 17 00:00:00 2001
+From 3ec7385e988c8680d15111097fa208045e6b3232 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Sun, 7 Feb 2016 00:01:19 -0700
 Subject: [PATCH] Add a property to accept invalid ping packets
@@ -9,7 +9,7 @@ You can enable it by setting '-Dwaterfall.acceptInvalidPackets=true' at the comm
 Fixes #23
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-index 59053de2..933a8388 100644
+index cd240460..aa2d465e 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 @@ -259,10 +259,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -29,5 +29,5 @@ index 59053de2..933a8388 100644
          disconnect( "" );
      }
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0023-Use-a-worker-and-a-boss-event-loop-group.patch

@@ -1,4 +1,4 @@
-From e8793807bf47e8438d586770d5f4316450da1fa7 Mon Sep 17 00:00:00 2001
+From 04a02d91bae08cef3e601d2ab867e46481b00d2d Mon Sep 17 00:00:00 2001
 From: kamcio96 <k.nadworski@icloud.com>
 Date: Mon, 14 Mar 2016 16:07:20 -0700
 Subject: [PATCH] Use a worker and a boss event loop group.
@@ -8,7 +8,7 @@ Merges the rest of https://github.com/SpigotMC/BungeeCord/pull/1706 by @kamcio96
 This is proper practice for netty.
 
 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 c8d1d225..2d967df3 100644
+index 4fbc307c..43abe22e 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -117,7 +117,7 @@ public class BungeeCord extends ProxyServer
@@ -30,8 +30,8 @@ index c8d1d225..2d967df3 100644
  
          File moduleDirectory = new File( "modules" );
          moduleManager.load( this, moduleDirectory );
-@@ -330,7 +331,7 @@ public class BungeeCord extends ProxyServer
-                     .childOption( ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, 1024 * 1024 * 1 )
+@@ -328,7 +329,7 @@ public class BungeeCord extends ProxyServer
+                     .option( ChannelOption.SO_REUSEADDR, true ) // TODO: Move this elsewhere!
                      .childAttr( PipelineUtils.LISTENER, info )
                      .childHandler( PipelineUtils.SERVER_CHILD )
 -                    .group( eventLoops )
@@ -39,7 +39,7 @@ index c8d1d225..2d967df3 100644
                      .localAddress( info.getHost() )
                      .bind().addListener( listener );
  
-@@ -351,7 +352,7 @@ public class BungeeCord extends ProxyServer
+@@ -349,7 +350,7 @@ public class BungeeCord extends ProxyServer
                          }
                      }
                  };
@@ -48,7 +48,7 @@ index c8d1d225..2d967df3 100644
              }
          }
      }
-@@ -446,12 +447,14 @@ public class BungeeCord extends ProxyServer
+@@ -444,12 +445,14 @@ public class BungeeCord extends ProxyServer
                  }
  
                  getLogger().info( "Closing IO threads" );
@@ -83,5 +83,5 @@ index 9756c09c..648cd273 100644
                  .option( ChannelOption.CONNECT_TIMEOUT_MILLIS, 5000 ) // TODO: Configurable
                  .remoteAddress( getAddress() )
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0024-Better-Decompression-Sanity.patch

@@ -1,4 +1,4 @@
-From 361a59c9bc239fb4f6bc0049767e5fa6e9aee7ae Mon Sep 17 00:00:00 2001
+From 062ac4f24d2a0a13f957fbb6d62ed3a0b968a894 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Fri, 18 Mar 2016 10:53:24 -0700
 Subject: [PATCH] Better Decompression Sanity
@@ -58,5 +58,5 @@ index 71df1fd5..4882b8ed 100644
          if ( compressionThreshold == -1 )
          {
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0025-Validate-that-chat-messages-are-non-blank.patch

@@ -1,4 +1,4 @@
-From da86dc3492cbc2c845b35fe9eaa3a73cf99d4ea3 Mon Sep 17 00:00:00 2001
+From 7ff4b1f6cc370a7201062cc00fe9884c19acf2df Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Tue, 25 Oct 2016 12:34:41 -0400
 Subject: [PATCH] Validate that chat messages are non-blank
@@ -33,7 +33,7 @@ index 00000000..940ad806
 +    }
 +}
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
-index 81f09a80..719ad409 100644
+index 20b3975a..7129f5e7 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/UpstreamBridge.java
 @@ -1,6 +1,7 @@
@@ -53,5 +53,5 @@ index 81f09a80..719ad409 100644
          ChatEvent chatEvent = new ChatEvent( con, con.getServer(), chat.getMessage() );
          if ( !bungee.getPluginManager().callEvent( chatEvent ).isCancelled() )
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0026-Reduce-the-overhead-of-lots-and-lots-of-teams-with-t.patch

@@ -1,4 +1,4 @@
-From 9881b437b021152393b4bff9ada36454d6f23b1d Mon Sep 17 00:00:00 2001
+From 65fe87a6fdae029e01fd2c96635aa3192e5c1825 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Mon, 25 Apr 2016 23:46:00 -0700
 Subject: [PATCH] Reduce the overhead of lots and lots of teams with the same
@@ -267,5 +267,5 @@ index 00000000..5aa306a1
 +
 +}
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0027-Add-dynamic-server-addition-removal-api.patch

@@ -1,4 +1,4 @@
-From 8f2841d0dd8cd7e61031cdab88cd49fc3e84408a Mon Sep 17 00:00:00 2001
+From cecbf55e268ea36c72c850c4f6c086e8996264dc Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Wed, 29 Jun 2016 04:29:25 +0200
 Subject: [PATCH] Add dynamic server addition/removal api.
@@ -157,10 +157,10 @@ index 416c54e3..920b9b36 100644
              private final String lower = ( args.length == 0 ) ? "" : args[0].toLowerCase();
  
 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 2d967df3..628b5b48 100644
+index 43abe22e..07eeea16 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -594,10 +594,18 @@ public class BungeeCord extends ProxyServer
+@@ -592,10 +592,18 @@ public class BungeeCord extends ProxyServer
          return config.getServers();
      }
  
@@ -298,5 +298,5 @@ index bdb012c3..cbbd8d34 100644
 +    // Waterfall end
  }
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0028-Don-t-send-KICK-packets-while-in-HANDSHAKE-state.patch

@@ -1,22 +1,13 @@
-From 702d71d9703ab3075982346a7aff2e083e9149dd Mon Sep 17 00:00:00 2001
+From c168478bfee6c8b99ebef5eb0dd56ebce8ed6407 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Mon, 6 Jun 2016 13:36:10 -0600
 Subject: [PATCH] Don't send KICK packets while in HANDSHAKE state
 
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-index 6a570025..d35391ff 100644
+index aa2d465e..45cd5237 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-@@ -278,7 +278,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
-         this.handshake = handshake;
-         ch.setVersion( handshake.getProtocolVersion() );
- 
--        // Starting with FML 1.8, a "\0FML\0" token is appended to the handshake. This interferes 
-+        // Starting with FML 1.8, a "\0FML\0" token is appended to the handshake. This interferes
-         // with Bungee's IP forwarding, so we detect it, and remove it from the host string, for now.
-         // We know FML appends \00FML\00. However, we need to also consider that other systems might
-         // add their own data to the end of the string. So, we just take everything from the \0 character
 @@ -568,7 +568,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public void disconnect(final BaseComponent... reason)
@@ -27,5 +18,5 @@ index 6a570025..d35391ff 100644
              ch.delayedClose( new Kick( ComponentSerializer.toString( reason ) ) );
          } else
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0029-Improve-ServerKickEvent.patch

@@ -1,4 +1,4 @@
-From 9659a1dbc694174a96732c6a3e46ff7507f7e343 Mon Sep 17 00:00:00 2001
+From 4872b219496840e8052ab036c0742c4e10daa793 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
@@ -75,7 +75,7 @@ index 47904de1..0937c39d 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 34ca5554..53c2a5cd 100644
+index ce8da75d..4743af1d 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
 @@ -4,6 +4,7 @@ import com.google.common.base.Preconditions;
@@ -146,5 +146,5 @@ index 34ca5554..53c2a5cd 100644
          {
              con.connectNow( event.getCancelServer(), ServerConnectEvent.Reason.KICK_REDIRECT );
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0030-Configurable-server-version-in-ping-response.patch

@@ -1,4 +1,4 @@
-From eb68d4ca73a83126a121f75f3fb9ae946c75c3b6 Mon Sep 17 00:00:00 2001
+From 8e7821954fb8a610f11eaf9c80f67d318ab4081e Mon Sep 17 00:00:00 2001
 From: Troy Frew <fuzzy_bot@arenaga.me>
 Date: Wed, 29 Jun 2016 13:56:57 -0500
 Subject: [PATCH] Configurable server version in ping response
@@ -68,10 +68,10 @@ index 93f47511..15274156 100644
      public int getTabThrottle() {
          return tabThrottle;
 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 628b5b48..84c7903b 100644
+index 07eeea16..595b7375 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
-@@ -648,7 +648,7 @@ public class BungeeCord extends ProxyServer
+@@ -646,7 +646,7 @@ public class BungeeCord extends ProxyServer
      @Override
      public String getGameVersion()
      {
@@ -81,5 +81,5 @@ index 628b5b48..84c7903b 100644
  
      @Override
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0031-Add-timeout-variant-to-connect-methods.patch

@@ -1,4 +1,4 @@
-From e14ce3444e616e79875282865164065680a5e13c Mon Sep 17 00:00:00 2001
+From 042244f3cc15ebaf7b3263fcf1f525a75ec771cb Mon Sep 17 00:00:00 2001
 From: Ichbinjoe <joe@ibj.io>
 Date: Sat, 16 Jul 2016 20:44:01 -0400
 Subject: [PATCH] Add timeout variant to connect methods
@@ -109,5 +109,5 @@ index 6146cb44..d1d3142e 100644
                      {
                          disconnect( bungee.getTranslation( "fallback_kick", future.cause().getClass().getName() ) );
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0032-Proxy-query-event.patch

@@ -1,4 +1,4 @@
-From 885489eeb7891db0a9c086c36f5e6802a75947f9 Mon Sep 17 00:00:00 2001
+From 35665bf8f0fcb188652f8f18fffe379b380d7271 Mon Sep 17 00:00:00 2001
 From: minecrafter <unknown@unknown>
 Date: Sun, 3 Jul 2016 04:03:21 -0400
 Subject: [PATCH] Proxy query event
@@ -214,5 +214,5 @@ index 79d6886a..a72cfd92 100644
              } else
              {
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0033-Dump-the-raw-hex-of-a-packet-on-a-decoding-error.patch

@@ -1,4 +1,4 @@
-From 6cd0ed18bbe56ce567fdef62381e01486c4feb9d Mon Sep 17 00:00:00 2001
+From d4a158e924a73ada77ee3a779e940d006ec14bce Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Thu, 4 Aug 2016 19:30:49 -0700
 Subject: [PATCH] Dump the raw hex of a packet on a decoding error
@@ -53,5 +53,5 @@ index 5b32effe..9e9ea49c 100644
          {
              if ( slice != null )
 -- 
-2.18.0
+2.19.0
 

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

@@ -1,4 +1,4 @@
-From cad7dfdf4773c337177db00ab88db0812e57ad8f Mon Sep 17 00:00:00 2001
+From 36cab3b3d3e8573e4137eaff507441f905b898bc 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
@@ -32,7 +32,7 @@ index 93f324e2..0e81b43c 100644
 +    // Waterfall end
  }
 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 60de276e..8e40682c 100644
+index 93e81266..c3c46399 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
 @@ -16,6 +16,8 @@ import net.md_5.bungee.protocol.packet.Chat;
@@ -273,5 +273,5 @@ index 0d683856..c1272da3 100644
       * Sends the server mod list to the client, or stores it for sending later.
       *
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0035-Optionally-use-async-Netty-DNS-resolver.patch

@@ -1,4 +1,4 @@
-From d36da51f0de2a4f34dce13c5a57731c66ab1b40f Mon Sep 17 00:00:00 2001
+From 7192a6be45748b3d605fb31d913d6846c63d2d48 Mon Sep 17 00:00:00 2001
 From: Tux <write@imaginarycode.com>
 Date: Wed, 21 Dec 2016 03:13:03 -0500
 Subject: [PATCH] Optionally use async Netty DNS resolver
@@ -181,5 +181,5 @@ index 0cad5c89..3af6a1db 100644
          return epoll ? EpollDatagramChannel.class : NioDatagramChannel.class;
      }
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0036-Improve-outdated-build-message.patch

@@ -1,4 +1,4 @@
-From 6939e7804f00071bd96bb546975ae6e56b63a0e9 Mon Sep 17 00:00:00 2001
+From aec1919f2bf9b904e6bf4b23129fec4b593015f5 Mon Sep 17 00:00:00 2001
 From: Jamie Mansfield <dev@jamierocks.uk>
 Date: Sat, 10 Jun 2017 20:56:02 +0100
 Subject: [PATCH] Improve outdated build message
@@ -22,5 +22,5 @@ index 11526c9c..2efe7211 100644
                  Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) );
              }
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0037-Fix-some-forge-plugin-message-packets-not-being-forw.patch

@@ -1,4 +1,4 @@
-From 34a11c848c6c9f8007b6fb0bb022a2615e6797ff Mon Sep 17 00:00:00 2001
+From 5136e117d684d982b898c42a6584b09dd07f7227 Mon Sep 17 00:00:00 2001
 From: Daniel Naylor <git@drnaylor.co.uk>
 Date: Mon, 17 Jul 2017 20:24:17 +0100
 Subject: [PATCH] Fix some forge plugin message packets not being forwarded
@@ -55,5 +55,5 @@ index 3fe5ec5f..a0c07874 100644
              synchronized ( packetQueue )
              {
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0037-Security-enhancements-for-EncryptionUtil.patch

@@ -1,32 +0,0 @@
-From 4c43c251127a974d64a86192d81c32c30f63f01c Mon Sep 17 00:00:00 2001
-From: Tux <write@imaginarycode.com>
-Date: Wed, 21 Dec 2016 04:07:26 -0500
-Subject: [PATCH] Security enhancements for EncryptionUtil
-
-Use a constant-time comparison in getSecret() and use SecureRandom for EncryptionRequest.
-
-diff --git a/proxy/src/main/java/net/md_5/bungee/EncryptionUtil.java b/proxy/src/main/java/net/md_5/bungee/EncryptionUtil.java
-index 0b4732cd..e1ff4afb 100644
---- a/proxy/src/main/java/net/md_5/bungee/EncryptionUtil.java
-+++ b/proxy/src/main/java/net/md_5/bungee/EncryptionUtil.java
-@@ -27,7 +27,7 @@ import net.md_5.bungee.protocol.packet.EncryptionRequest;
- public class EncryptionUtil
- {
- 
--    private static final Random random = new Random();
-+    private static final Random random = new java.security.SecureRandom(); // Waterfall - use SecureRandom
-     public static final KeyPair keys;
-     @Getter
-     private static final SecretKey secret = new SecretKeySpec( new byte[ 16 ], "AES" );
-@@ -61,7 +61,7 @@ public class EncryptionUtil
-         cipher.init( Cipher.DECRYPT_MODE, keys.getPrivate() );
-         byte[] decrypted = cipher.doFinal( resp.getVerifyToken() );
- 
--        if ( !Arrays.equals( request.getVerifyToken(), decrypted ) )
-+        if ( !java.security.MessageDigest.isEqual( request.getVerifyToken(), decrypted ) ) // Waterfall - use constant-time comparison
-         {
-             throw new IllegalStateException( "Key pairs do not match!" );
-         }
--- 
-2.18.0
-

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

@@ -1,4 +1,4 @@
-From 175e2662ba072e6437a8056498668c4cbb4f964c Mon Sep 17 00:00:00 2001
+From f016de7e4a334cdf630bb1142ce0ad92c8615702 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
@@ -358,7 +358,7 @@ index 00000000..765d24bc
 +
 +}
 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 84c7903b..ada8325a 100644
+index 595b7375..cba6f0b2 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -45,7 +45,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -469,5 +469,5 @@ index 10366c88..8c5cc949 100644
          }
  
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0039-Handle-plugin-prefixes-using-Log4J.patch

@@ -1,4 +1,4 @@
-From 1bcb0f08d55c92290e2443b4e88d7d7b19ac6f6d Mon Sep 17 00:00:00 2001
+From 60576cb3636b8db873ad3152f2e1a74132087da0 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 22 Sep 2017 13:07:31 +0200
 Subject: [PATCH] Handle plugin prefixes using Log4J
@@ -45,5 +45,5 @@ index 93ce3b14..3b3525f0 100644
                  <TimeBasedTriggeringPolicy />
                  <OnStartupTriggeringPolicy />
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0040-Allow-plugins-to-use-SLF4J-for-logging.patch

@@ -1,4 +1,4 @@
-From 5c3e187b7e797dd0d8b20dac1f1007af795ecf03 Mon Sep 17 00:00:00 2001
+From c14a76642e045b3e6ae52d27e7120dcfae258e78 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 22 Sep 2017 13:15:09 +0200
 Subject: [PATCH] Allow plugins to use SLF4J for logging
@@ -56,5 +56,5 @@ index 36fceb93..a085a39c 100644
              <groupId>com.lmax</groupId>
              <artifactId>disruptor</artifactId>
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0041-Add-Log4j-configuration-that-replicates-the-old-Bung.patch

@@ -1,4 +1,4 @@
-From 06b01e2a187dff5b9241cc7a411c9d7f9cf2d3cd Mon Sep 17 00:00:00 2001
+From 8f3f74d7384b3cc99e0928330c6f75355f848700 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Sun, 24 Sep 2017 12:06:49 +0200
 Subject: [PATCH] Add Log4j configuration that replicates the old BungeeCord
@@ -47,5 +47,5 @@ index 00000000..6e9c09c5
 +    </Loggers>
 +</Configuration>
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0042-Add-console-command-completion.patch

@@ -1,4 +1,4 @@
-From 3430d27d1d5f87cb7696819dbf267df76d1698a5 Mon Sep 17 00:00:00 2001
+From 963a8e38d4818b2571125c9d038523a35ae62461 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 26 Sep 2017 18:59:37 +0200
 Subject: [PATCH] Add console command completion
@@ -102,5 +102,5 @@ index 765d24bc..6cec0b5a 100644
      }
  
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0043-Providing-access-to-the-player-s-LoginResult-on-Logi.patch

@@ -1,4 +1,4 @@
-From 0b0560615a94434dda6518f47a44afd187583bdd Mon Sep 17 00:00:00 2001
+From 82bc39ae984e65a50e3fc72959d0f15bc825f1b9 Mon Sep 17 00:00:00 2001
 From: phenomax <phenomax@revayd.net>
 Date: Thu, 10 Aug 2017 18:41:17 +0200
 Subject: [PATCH] Providing access to the player's LoginResult on LoginEvent
@@ -52,7 +52,7 @@ similarity index 100%
 rename from proxy/src/main/java/net/md_5/bungee/connection/LoginResult.java
 rename to api/src/main/java/net/md_5/bungee/connection/LoginResult.java
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-index d35391ff..52d97ec6 100644
+index ee05f957..62642683 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 @@ -550,7 +550,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -65,5 +65,5 @@ index d35391ff..52d97ec6 100644
  
      @Override
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0044-Optionally-log-InitialHandler-connections.patch

@@ -1,4 +1,4 @@
-From 284e166e11ab0cea910311f98042c8a32c3f6705 Mon Sep 17 00:00:00 2001
+From 9d0c7407255137963ff13d1ec464be6a1566bcca Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Thu, 8 Feb 2018 19:10:52 +0100
 Subject: [PATCH] Optionally log InitialHandler connections
@@ -59,7 +59,7 @@ index 5c92768a..090c550b 100644
      public String getGameVersion() {
          return gameVersion;
 diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
-index 52d97ec6..cdd1c919 100644
+index 62642683..21844f0c 100644
 --- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 +++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
 @@ -312,7 +312,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
@@ -72,5 +72,5 @@ index 52d97ec6..cdd1c919 100644
                      bungee.getLogger().log( Level.INFO, "{0} has connected", this );
                  }
 -- 
-2.18.0
+2.19.0
 

BungeeCord-Patches/0045-Forge-is-a-first-class-citizen.patch

@@ -1,11 +1,11 @@
-From b46ce4d1692e3eea856eaf163afe783ccc777311 Mon Sep 17 00:00:00 2001
+From bc5ac28691983c67b821868df9a8b24046fe3e8f Mon Sep 17 00:00:00 2001
 From: Jamie Mansfield <dev@jamierocks.uk>
 Date: Mon, 28 May 2018 21:43:55 +0100
 Subject: [PATCH] Forge is a first class citizen
 
 
 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 ada8325a..90e7d4f1 100644
+index cba6f0b2..1e86728f 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -276,8 +276,6 @@ public class BungeeCord extends ProxyServer
@@ -31,5 +31,5 @@ index cbbd8d34..2599b579 100644
      @Synchronized("serversLock") // Waterfall
      public void load()
 -- 
-2.18.0
+2.19.0
 

CONTRIBUTING.md

@@ -8,7 +8,7 @@ Patches to Waterfall are very simple, but center around the directory 'Waterfall
 Assuming you already have forked the repository:
 
 1. Pull the latest changes from the main repository
-2. Type `git submodule update --init && ./applyPatches.sh` in git bash to apply the changes from upstream
+2. Type `./waterfall p` in git bash to apply the changes from upstream
 3. cd into `Waterfall-Proxy` for proxy changes
 
 This directory is not a git repository in the traditional sense:
@@ -24,7 +24,7 @@ Adding patches to Waterfall is very simple:
 1. Modify `Waterfall-Proxy` with the appropriate changes
 2. Type `git add .` to add your changes
 3. Run `git commit` with the desired patch message
-4. Run `./rebuildPatches.sh` in the main directory to convert your commit into a new patch
+4. Run `./waterfall rb` in the main directory to convert your commit into a new patch
 5. PR your patches back to this repository
 
 Your commit will be converted into a patch that you can then PR into Waterfall
@@ -38,7 +38,7 @@ This method works by temporarily resetting HEAD to the desired commit to edit us
 1. If you have changes you are working on type `git stash` to store them for later.
   - Later you can type `git stash pop` to get them back.
 2. Type `git rebase -i upstream/upstream`
-  - It should show something like [this](https://gist.github.com/Zbob750/e6bb220d3b734933c320).
+  - It should show something like [this](https://gist.github.com/electronicboy/6241e511c4a1f5d3e0217be1d742ff6a).
 3. Replace `pick` with `edit` for the commit/patch you want to modify, and "save" the changes.
   - Only do this for one commit at a time.
 4. Make the changes you want to make to the patch.
@@ -47,7 +47,7 @@ This method works by temporarily resetting HEAD to the desired commit to edit us
   - **MAKE SURE TO ADD `--amend`** or else a new patch will be created.
   - You can also modify the commit message here.
 7. Type `git rebase --continue` to finish rebasing.
-8. Type `./rebuildPatches.sh` in the main directory.
+8. Type `./waterfall rb` in the main directory.
   - This will modify the appropriate patches based on your commits.
 9. PR your modifications back to this project.
 
@@ -58,7 +58,7 @@ If you are simply editing a more recent commit or your change is small, simply m
 2. Make a temporary commit. You don't need to make a message for this.
 3. Type `git rebase -i upstream/upstream`, move (cut) your temporary commit and move it under the line of the patch you wish to modify.
 4. Change the `pick` with `f` (fixup) or `s` (squash) if you need to edit the commit message 
-5. Type `./rebuildPatches.sh` in the main directory
+5. Type `./waterfall rb` in the main directory
   - This will modify the appropriate patches based on your commits
 6. PR your modifications to github