Actually rebuild patches

PaperMC · Nov 18, 2024 · 9171ef7 · 9171ef7 · JH3Y50N · Nov 28, 2024
1 parent 55fa6fa
commit 9171ef7
Show file tree

Hide file tree

Showing 32 changed files with 1,037 additions and 1,057 deletions.
diff --git a/BungeeCord-Patches/0006-Fetch-modules-from-the-Waterfall-API-endpoint.patch b/BungeeCord-Patches/0006-Fetch-modules-from-the-Waterfall-API-endpoint.patch
@@ -1,29 +1,16 @@
-From f2f55cb7743a44bc8d0db757315cbfab4d43f22f Mon Sep 17 00:00:00 2001
+From e8b830735afa54b82ac3ebbc9a64601a4dbfb360 Mon Sep 17 00:00:00 2001
 From: Tux <[email protected]>
 Date: Thu, 19 May 2016 11:34:52 -0700
 Subject: [PATCH] Fetch modules from the Waterfall API endpoint
 
 Don't fetch from the BungeeCord CI, as that only has their modules
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
-index 2536435c..5bb86152 100644
+index 064639f3..6a6661a5 100644
 --- a/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
 +++ b/proxy/src/main/java/net/md_5/bungee/module/JenkinsModuleSource.java
-@@ -1,10 +1,10 @@
- package net.md_5.bungee.module;
-
--import com.google.common.io.ByteStreams;
--import com.google.common.io.Files;
- import java.io.IOException;
- import java.net.URL;
- import java.net.URLConnection;
-+import java.nio.file.Files;
-+import java.nio.file.StandardCopyOption;
- import lombok.Data;
- import net.md_5.bungee.Util;
-
-@@ -18,13 +18,21 @@ public class JenkinsModuleSource implements ModuleSource
-         System.out.println( "Attempting to Jenkins download module " + module.getName() + " v" + version.getBuild() );
+@@ -19,11 +19,19 @@ public class JenkinsModuleSource implements ModuleSource
+         ProxyServer.getInstance().getLogger().info( "Attempting to Jenkins download module " + module.getName() + " v" + version.getBuild() );
          try
          {
 -            URL website = new URL( "https://ci.md-5.net/job/BungeeCord/" + version.getBuild() + "/artifact/module/" + module.getName().replace( '_', '-' ) + "/target/" + module.getName() + ".jar" );
@@ -41,11 +28,8 @@ index 2536435c..5bb86152 100644
              con.setReadTimeout( 15000 );
 +            con.setRequestProperty( "User-Agent", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36" );
 
--            Files.write( ByteStreams.toByteArray( con.getInputStream() ), module.getFile() );
-+            Files.copy( con.getInputStream(), module.getFile().toPath(), StandardCopyOption.REPLACE_EXISTING );
-             System.out.println( "Download complete" );
-         } catch ( IOException ex )
-         {
+             Files.write( ByteStreams.toByteArray( con.getInputStream() ), module.getFile() );
+             ProxyServer.getInstance().getLogger().info( "Download complete" );
 -- 
-2.43.0
+2.47.0
 
diff --git a/BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch b/BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch
@@ -1,14 +1,14 @@
-From 33836af35fea51d5c0c09c5b355f557b6caa8e95 Mon Sep 17 00:00:00 2001
+From 1f600472dc962c517bdd8dd1f7f5572808263a88 Mon Sep 17 00:00:00 2001
 From: Troy Frew <[email protected]>
 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 82ef4c5d..ef45ea31 100644
+index 86412d48..66609085 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
-@@ -121,6 +121,16 @@ public class ProtocolConstants
+@@ -123,6 +123,16 @@ public class ProtocolConstants
          SUPPORTED_VERSION_IDS = supportedVersionIds.build();
      }
 
@@ -26,5 +26,5 @@ index 82ef4c5d..ef45ea31 100644
      {
 
 -- 
-2.39.3 (Apple Git-146)
+2.47.0
 
diff --git a/BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch b/BungeeCord-Patches/0009-Don-t-access-a-ByteBuf-s-underlying-array.patch
@@ -1,4 +1,4 @@
-From 399142c001df2d50e1cba9eee822388bc39b12ab Mon Sep 17 00:00:00 2001
+From b212fd1b0a9b781f13e21b4c1e9c0432640baaf1 Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 Date: Tue, 3 May 2016 20:31:52 -0700
 Subject: [PATCH] Don't access a ByteBuf's underlying array
@@ -43,10 +43,10 @@ index 70b292f0..91f71c09 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 abdbfd1d..04bd6778 100644
+index b58a01c6..c7637608 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -277,7 +277,7 @@ public class ServerConnector extends PacketHandler
+@@ -286,7 +286,7 @@ public class ServerConnector extends PacketHandler
 
                  ByteBuf brand = ByteBufAllocator.DEFAULT.heapBuffer();
                  DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")", brand );
@@ -56,10 +56,10 @@ index abdbfd1d..04bd6778 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 4684bfd8..63be43eb 100644
+index d518d05f..21019091 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
-@@ -313,7 +313,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -325,7 +325,7 @@ public class DownstreamBridge extends PacketHandler
 
              brand = ByteBufAllocator.DEFAULT.heapBuffer();
              DefinedPacket.writeString( bungee.getName() + " (" + bungee.getVersion() + ")" + " <- " + serverBrand, brand );
@@ -69,7 +69,7 @@ index 4684bfd8..63be43eb 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 25f045be..544d34ed 100644
+index 2446f489..380b6012 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
 @@ -55,7 +55,7 @@ import net.md_5.bungee.protocol.Varint21LengthFieldPrepender;
@@ -82,5 +82,5 @@ index 25f045be..544d34ed 100644
      {
          @Override
 -- 
-2.44.0
+2.47.0
 
diff --git a/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch b/BungeeCord-Patches/0010-Optimize-uuid-conversions.patch
@@ -1,4 +1,4 @@
-From 064c9dfefd11db8d743f61ab3a4003dca63f3f7b Mon Sep 17 00:00:00 2001
+From 4ef93b430b7240ea845535477c4d3ac49f906088 Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 Date: Mon, 14 Mar 2016 15:40:44 -0700
 Subject: [PATCH] Optimize uuid conversions
@@ -250,10 +250,10 @@ index e582808f..29cd91dd 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 1d9a9ee5..616adcf1 100644
+index 224f231b..b7d7e71a 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
-@@ -806,7 +806,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -823,7 +823,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public String getUUID()
      {
@@ -263,5 +263,5 @@ index 1d9a9ee5..616adcf1 100644
 
      @Override
 -- 
-2.44.0
+2.47.0
 
diff --git a/BungeeCord-Patches/0014-Enable-TCP_NODELAY.patch b/BungeeCord-Patches/0014-Enable-TCP_NODELAY.patch
@@ -1,15 +1,15 @@
-From 8b98ff8d43ae4244bb9700d76f6d8b02270bc6fd Mon Sep 17 00:00:00 2001
+From 2cc77d1ddf7c29c825de970bd7cefcdfab496674 Mon Sep 17 00:00:00 2001
 From: Harry <[email protected]>
 Date: Sun, 24 Jan 2016 15:13:29 -0700
 Subject: [PATCH] Enable TCP_NODELAY.
 
 This is enabled by default on CraftBukkit/Spigot >= 1.8 and may help with network performance.
 
 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 544d34ed..6a0d3351 100644
+index 380b6012..f1fce77b 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
-@@ -195,6 +195,7 @@ public class PipelineUtils
+@@ -194,6 +194,7 @@ public class PipelineUtils
              {
                  // IP_TOS is not supported (Windows XP / Windows Server 2003)
              }
@@ -18,5 +18,5 @@ index 544d34ed..6a0d3351 100644
              ch.config().setWriteBufferWaterMark( MARK );
 
 -- 
-2.44.0
+2.47.0
 
diff --git a/BungeeCord-Patches/0015-Micro-optimizations.patch b/BungeeCord-Patches/0015-Micro-optimizations.patch
@@ -1,4 +1,4 @@
-From 87cb9413787e84d11886b19ed594167c8138e688 Mon Sep 17 00:00:00 2001
+From 1aa3fbcfe8aaf58084220dfc5142cff546a0b6c2 Mon Sep 17 00:00:00 2001
 From: Tux <[email protected]>
 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 b7856d92..61ce9ed6 100644
+index 21019091..b501f7bd 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
-@@ -295,7 +295,6 @@ public class DownstreamBridge extends PacketHandler
+@@ -307,7 +307,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() )
-@@ -322,6 +321,7 @@ public class DownstreamBridge extends PacketHandler
+@@ -334,6 +333,7 @@ public class DownstreamBridge extends PacketHandler
 
          if ( pluginMessage.getTag().equals( "BungeeCord" ) )
          {
@@ -28,5 +28,5 @@ index b7856d92..61ce9ed6 100644
              String subChannel = in.readUTF();
 
 -- 
-2.43.0
+2.47.0
 
diff --git a/BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch b/BungeeCord-Patches/0016-Allow-invalid-packet-ids-for-forge-servers.patch
@@ -1,4 +1,4 @@
-From 729077c39ea8d44f92ec3941204a153369368729 Mon Sep 17 00:00:00 2001
+From 093baa399deb298b579af81ebc95cc560bd188d4 Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 Date: Thu, 19 May 2016 17:09:22 -0600
 Subject: [PATCH] Allow invalid packet ids for forge servers
@@ -37,10 +37,10 @@ index d79d5e5c..250e7620 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 317fb2d4..db50f379 100644
+index 8aa57ed4..7a26c419 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
-@@ -884,14 +884,23 @@ public enum Protocol
+@@ -917,14 +917,23 @@ public enum Protocol
              return protocol;
          }
 
@@ -66,10 +66,10 @@ index 317fb2d4..db50f379 100644
                  throw new BadPacketException( "Packet with id " + id + " outside of range" );
              }
 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 7a211f1b..a25a493e 100644
+index 824166e5..b02121af 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -234,6 +234,12 @@ public class ServerConnector extends PacketHandler
+@@ -243,6 +243,12 @@ public class ServerConnector extends PacketHandler
      public static void handleLogin(ProxyServer bungee, ChannelWrapper ch, UserConnection user, BungeeServerInfo target, ForgeServerHandler handshakeHandler, ServerConnection server, Login login) throws Exception
      {
          ServerConnectedEvent event = new ServerConnectedEvent( user, server );
@@ -83,10 +83,10 @@ index 7a211f1b..a25a493e 100644
 
          ch.write( BungeeCord.getInstance().registerChannels( user.getPendingConnection().getVersion() ) );
 diff --git a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
-index 70b58fab..0045a449 100644
+index 755b8fd6..699bbe3a 100644
 --- a/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
 +++ b/proxy/src/main/java/net/md_5/bungee/entitymap/EntityMap.java
-@@ -343,6 +343,12 @@ public abstract class EntityMap
+@@ -345,6 +345,12 @@ public abstract class EntityMap
          int packetId = DefinedPacket.readVarInt( packet );
          int packetIdLength = packet.readerIndex() - readerIndex;
 
@@ -100,5 +100,5 @@ index 70b58fab..0045a449 100644
          {
              rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
 -- 
-2.45.1
+2.47.0
 
diff --git a/BungeeCord-Patches/0017-Add-basic-support-for-configurable-tab-complete-thro.patch b/BungeeCord-Patches/0017-Add-basic-support-for-configurable-tab-complete-thro.patch
@@ -1,4 +1,4 @@
-From 5343292903efcc962a2a510267018bb5872c3995 Mon Sep 17 00:00:00 2001
+From bd268bfef42ab87a581edb79d2fd4f47d665378b Mon Sep 17 00:00:00 2001
 From: Johannes Donath <[email protected]>
 Date: Sat, 4 Jul 2015 06:31:33 +0200
 Subject: [PATCH] Add basic support for configurable tab-complete throttling
@@ -73,7 +73,7 @@ index 741ebfde..91743f01 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 f80515d4..050cc29b 100644
+index c9e3697e..7ac9e6de 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
 @@ -51,6 +51,8 @@ public class UpstreamBridge extends PacketHandler
@@ -85,7 +85,7 @@ index f80515d4..050cc29b 100644
      public UpstreamBridge(ProxyServer bungee, UserConnection con)
      {
          this.bungee = bungee;
-@@ -230,6 +232,20 @@ public class UpstreamBridge extends PacketHandler
+@@ -231,6 +233,20 @@ public class UpstreamBridge extends PacketHandler
      @Override
      public void handle(TabCompleteRequest tabComplete) throws Exception
      {
@@ -107,5 +107,5 @@ index f80515d4..050cc29b 100644
          boolean isRegisteredCommand = false;
          boolean isCommand = tabComplete.getCursor().startsWith( "/" );
 -- 
-2.44.0
+2.47.0
 
diff --git a/BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch b/BungeeCord-Patches/0018-Improve-server-list-ping-logging.patch
@@ -1,4 +1,4 @@
-From d5eaa35359d90f611f6450fb6ee12014e0a13921 Mon Sep 17 00:00:00 2001
+From 6a3372622d017776aec8f1ddca2987fbf4435cd8 Mon Sep 17 00:00:00 2001
 From: Janmm14 <[email protected]>
 Date: Sat, 12 Dec 2015 23:43:30 +0100
 Subject: [PATCH] Improve server list ping logging
@@ -7,10 +7,10 @@ This functionality of this patch was adopted upstream, however, this
 patch remains for a few misc improvements around here
 
 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 a25a493e..63920e7e 100644
+index b02121af..6f49765f 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
-@@ -522,6 +522,6 @@ public class ServerConnector extends PacketHandler
+@@ -533,6 +533,6 @@ public class ServerConnector extends PacketHandler
      @Override
      public String toString()
      {
@@ -19,10 +19,10 @@ index a25a493e..63920e7e 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 d408840d..cd3ed518 100644
+index b501f7bd..1c075a9f 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
-@@ -790,6 +790,6 @@ public class DownstreamBridge extends PacketHandler
+@@ -802,6 +802,6 @@ public class DownstreamBridge extends PacketHandler
      @Override
      public String toString()
      {
@@ -31,10 +31,10 @@ index d408840d..cd3ed518 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 616adcf1..0fbe8b0d 100644
+index b7d7e71a..72f6111e 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
-@@ -812,20 +812,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -829,20 +829,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
      @Override
      public String toString()
      {
@@ -57,10 +57,10 @@ index 616adcf1..0fbe8b0d 100644
 
      @Override
 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 bfd5cb5f..2dafa4d9 100644
+index 7ac9e6de..0a020ffc 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
-@@ -396,6 +396,6 @@ public class UpstreamBridge extends PacketHandler
+@@ -397,6 +397,6 @@ public class UpstreamBridge extends PacketHandler
      @Override
      public String toString()
      {
@@ -69,5 +69,5 @@ index bfd5cb5f..2dafa4d9 100644
      }
  }
 -- 
-2.44.0
+2.47.0
 
diff --git a/BungeeCord-Patches/0019-Add-a-property-to-accept-invalid-ping-packets.patch b/BungeeCord-Patches/0019-Add-a-property-to-accept-invalid-ping-packets.patch
@@ -1,4 +1,4 @@
-From 34c7d23c344f60184778406b573dfaa6209be1a9 Mon Sep 17 00:00:00 2001
+From 6b92feb2426c2bd0866b6ee3aa7fc175ecea40ca Mon Sep 17 00:00:00 2001
 From: Techcable <[email protected]>
 Date: Sun, 7 Feb 2016 00:01:19 -0700
 Subject: [PATCH] Add a property to accept invalid ping packets
@@ -9,10 +9,10 @@ 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 0fbe8b0d..deb9fef3 100644
+index 72f6111e..fd577788 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
-@@ -325,10 +325,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
+@@ -333,10 +333,14 @@ public class InitialHandler extends PacketHandler implements PendingConnection
          thisState = State.PING;
      }
 
@@ -29,5 +29,5 @@ index 0fbe8b0d..deb9fef3 100644
          disconnect( "" );
      }
 -- 
-2.44.0
+2.47.0