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:
8e99a4c5 Cleanup some formatting
df530536 #3866: Make use of new ByteBuf#readString
4cd9a17a #3865: Bump Netty to 4.2.3-Final
e9558ab3 Add some plugin remapping to assist compatibility
3a5c7318 #3855: Create protocol sub-packages data & util
c13e6df6 #3862: Add perms permission to admin group by default
704e8664 #3849: Add permission to perms command
aea5870a #3861: Add shadowColor to ComponentBuilder
f1a4a42d Update Maven central config
a485d9f3 #3856: Do not decode Chat (TO_CLIENT)
131125c7 #3859: Do not add control characters to the ClickEvent with OPEN_URL action
7fcc6206 #3858: Replace pre-Java 8 functional interface instantiation in CommandServer
7c7cb3de Minecraft 1.21.7 support
88436c44 #3854: Fix CustomClickAction read and write implementation
bdd32d5a #3808: Do not decode packets that we don't handle
5e59b6dc #3851: Remove output from tests and "base" from dialog json
bccce74c #3799, #3800: Do not parse the collision and visibility strings of the Team packet
0e9e0b58 #3850: Prevent some jdk24+ memory/native access warnings

Author: linsaftw

BungeeCord

@@ -1,4 +1,4 @@
-From f2af2b8bab3ef918c1fc4664c5f921a77351770c Mon Sep 17 00:00:00 2001
+From b29aea357755a5b66b45473e944dfa1df783559f 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 bc3de477..74a835d1 100644
+index 11bdc806..fe3d2bc9 100644
 --- a/api/pom.xml
 +++ b/api/pom.xml
 @@ -4,48 +4,48 @@
@@ -75,7 +75,7 @@ index bc3de477..74a835d1 100644
              <scope>compile</scope>
          </dependency>
 diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
-index b54ca5bf..061f7765 100644
+index 5a8b37b0..3d5f497f 100644
 --- a/bootstrap/pom.xml
 +++ b/bootstrap/pom.xml
 @@ -4,39 +4,40 @@
@@ -138,7 +138,7 @@ index b54ca5bf..061f7765 100644
 +                            <Main-Class>net.md_5.bungee.Bootstrap</Main-Class>
                              <Implementation-Version>${describe}</Implementation-Version>
                              <Specification-Version>${maven.build.timestamp}</Specification-Version>
-                         </manifestEntries>
+                             <Enable-Native-Access>ALL-UNNAMED</Enable-Native-Access>
 diff --git a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java b/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
 index 6be22739..a4516ed9 100644
 --- a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
@@ -593,7 +593,7 @@ index 8beec32c..023ce639 100644
          <license>
              <name>BSD-3-Clause</name>
 diff --git a/pom.xml b/pom.xml
-index 6f938954..8c35ed93 100644
+index 548700d2..5b9b8c1f 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,18 @@
@@ -670,12 +670,12 @@ index 6f938954..8c35ed93 100644
 
      <distributionManagement>
 -        <snapshotRepository>
--            <id>sonatype-nexus-snapshots</id>
--            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+-            <id>central-portal-snapshots</id>
+-            <url>https://central.sonatype.com/repository/maven-snapshots/</url>
 -        </snapshotRepository>
          <repository>
--            <id>sonatype-nexus-staging</id>
--            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+-            <id>ossrh-staging-api</id>
+-            <url>https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/</url>
 +            <id>papermc-releases</id>
 +            <url>https://repo.papermc.io/repository/maven-releases/</url>
          </repository>
@@ -987,5 +987,5 @@ index a583c5f6..de36c7fd 100644
      <properties>
          <checkstyle.skip>true</checkstyle.skip>
 -- 
-2.49.0
+2.43.0
 

BungeeCord-Patches/0001-POM-Changes.patch

@@ -1,14 +1,14 @@
-From 03e73e997dc06271e1afffa8b989125b275ee45f Mon Sep 17 00:00:00 2001
+From fa41fe7f868308dbd3c192f2fd30be744dfbaaab 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 4e40c699..1c1a09bc 100644
+index eae98554..f8be48b9 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
-@@ -129,6 +129,16 @@ public class ProtocolConstants
+@@ -131,6 +131,16 @@ public class ProtocolConstants
          SUPPORTED_VERSION_IDS = supportedVersionIds.build();
      }
 
@@ -26,5 +26,5 @@ index 4e40c699..1c1a09bc 100644
      {
 
 -- 
-2.50.0
+2.43.0
 

BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch

@@ -1,14 +1,14 @@
-From 602900eac3d6806b3ddc68b645c1160ecc4be10c Mon Sep 17 00:00:00 2001
+From e1f6a03c3ee7d19e696624af23af0081649e0dbe 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 47e84cd6..f330a625 100644
+index 8f95ae49..b7acaf57 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
-@@ -682,6 +682,26 @@ public class ComponentsTest
+@@ -689,6 +689,26 @@ public class ComponentsTest
          assertEquals( testClickEvent, extraGetter.apply( eventRetention, 1 ).getClickEvent() );
      }
 
@@ -52,5 +52,5 @@ index 995c70f2..dd9f040d 100644
 +    }
  }
 -- 
-2.49.0
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 955f3fb382d507d2e5113d8da1a38fe496f6ca77 Mon Sep 17 00:00:00 2001
+From 7e267c79c3513ff812bea5c22f2c8b223009cf6a 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 6c4e6735..d6c76a5b 100644
+index dea027b0..ee354aeb 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
-@@ -993,14 +993,23 @@ public enum Protocol
+@@ -1036,14 +1036,23 @@ public enum Protocol
              return protocol;
          }
 
@@ -72,7 +72,7 @@ index 6c4e6735..d6c76a5b 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 22af16c7..931cb4fa 100644
+index 6ed9e8b3..509f07c3 100644
 --- a/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 +++ b/proxy/src/main/java/net/md_5/bungee/ServerConnector.java
 @@ -246,6 +246,12 @@ public class ServerConnector extends PacketHandler
@@ -106,5 +106,5 @@ index 77b27c6f..26c1e1be 100644
          {
              rewriteInt( packet, oldId, newId, readerIndex + packetIdLength );
 -- 
-2.49.0
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From 74fa2f256598a8dc5ed044c63ed059d0ddea88d6 Mon Sep 17 00:00:00 2001
+From ef8bb7464b0aeae8a1ac53c264dd5894cd9cc9bd 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,18 +157,18 @@ index 262b29c8..d7ed3e11 100644
      {
          int index = path.indexOf( SEPARATOR );
 diff --git a/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java b/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java
-index 59c104d3..698b420f 100644
+index f479a888..7d114541 100644
 --- a/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java
 +++ b/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java
-@@ -83,7 +83,7 @@ public class CommandServer extends Command implements TabExecutor
-     @Override
+@@ -80,7 +80,7 @@ public class CommandServer extends Command implements TabExecutor
      public Iterable<String> onTabComplete(final CommandSender sender, final String[] args)
      {
--        return ( args.length > 1 ) ? Collections.EMPTY_LIST : Iterables.transform( Iterables.filter( ProxyServer.getInstance().getServers().values(), new Predicate<ServerInfo>()
-+        return ( args.length > 1 ) ? Collections.EMPTY_LIST : Iterables.transform( Iterables.filter( ProxyServer.getInstance().getServersCopy().values(), new Predicate<ServerInfo>() // Waterfall: use #getServersCopy()
-         {
-             private final String lower = ( args.length == 0 ) ? "" : args[0].toLowerCase( Locale.ROOT );
- 
+         final String serverFilter = ( args.length == 0 ) ? "" : args[0].toLowerCase( Locale.ROOT );
+-        return () -> ProxyServer.getInstance().getServers().values().stream()
++        return () -> ProxyServer.getInstance().getServersCopy().values().stream() // Waterfall: use #getServersCopy()
+                 .filter( serverInfo -> serverInfo.getName().toLowerCase( Locale.ROOT ).startsWith( serverFilter ) && serverInfo.canAccess( sender ) )
+                 .map( ServerInfo::getName )
+                 .iterator();
 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 e69da6c5..a8041258 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -311,5 +311,5 @@ index eb651a14..7a4da21f 100644
 +    // Waterfall end
  }
 -- 
-2.49.0
+2.43.0
 

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

@@ -1,14 +1,14 @@
-From 786d670574b0fa2264e313cb849362d425b9b554 Mon Sep 17 00:00:00 2001
+From 7036066472edc17bbbba073f2e0cd7d141ac8264 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 86088656..aaf70d03 100644
+index 93e3aaed..46f568b3 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
-@@ -303,4 +303,14 @@ public abstract class AbstractPacketHandler
+@@ -298,4 +298,14 @@ public abstract class AbstractPacketHandler
      public void handle(BundleDelimiter bundleDelimiter) throws Exception
      {
      }
@@ -117,7 +117,7 @@ index 00000000..7ed2dc3a
 +    }
 +}
 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 a5ab08e3..e062987f 100644
+index 5b18a450..32f7cae2 100644
 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java
 @@ -1,7 +1,9 @@
@@ -142,7 +142,7 @@ index a5ab08e3..e062987f 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 f794c0b2..2984b988 100644
+index 6b611fc3..a6d49bb7 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
 @@ -754,6 +754,32 @@ public class DownstreamBridge extends PacketHandler
@@ -217,5 +217,5 @@ index d15044f4..087cb4b0 100644
      /**
       * Sends the server mod list to the client, or stores it for sending later.
 -- 
-2.49.0
+2.43.0
 

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

@@ -1,25 +1,25 @@
-From 359e00558c32f0c6eae1e97955e6951c82f558c1 Mon Sep 17 00:00:00 2001
+From 83a06fcf265c9c84b293d40cbc3a59e5ecfd1186 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
  console
 
 
 diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
-index 061f7765..14a154aa 100644
+index 3d5f497f..366bee40 100644
 --- a/bootstrap/pom.xml
 +++ b/bootstrap/pom.xml
-@@ -49,6 +49,9 @@
-                             <Main-Class>net.md_5.bungee.Bootstrap</Main-Class>
+@@ -50,6 +50,9 @@
                              <Implementation-Version>${describe}</Implementation-Version>
                              <Specification-Version>${maven.build.timestamp}</Specification-Version>
+                             <Enable-Native-Access>ALL-UNNAMED</Enable-Native-Access>
 +
 +                            <!-- Log4j includes custom classes for Java 9+ (#293) -->
 +                            <Multi-Release>true</Multi-Release>
                          </manifestEntries>
                      </archive>
                  </configuration>
-@@ -76,7 +79,17 @@
+@@ -77,7 +80,17 @@
                              </excludes>
                          </filter>
                      </filters>
@@ -233,7 +233,7 @@ index 00000000..cfd039cd
 +    </Loggers>
 +</Configuration>
 diff --git a/pom.xml b/pom.xml
-index 8c35ed93..70bdee0c 100644
+index 5b9b8c1f..2b860eee 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -52,13 +52,14 @@
@@ -634,5 +634,5 @@ index 6788fbe7..00000000
 -    }
 -}
 -- 
-2.49.0
+2.43.0
 

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

@@ -1,4 +1,4 @@
-From bcf08b07a7659d42df94a4160ee76b0af80e93dc Mon Sep 17 00:00:00 2001
+From b039059688ff3f84912f122561af8046dcc34ec5 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 25 Nov 2019 19:54:06 +0000
 Subject: [PATCH] Speed up some common exceptions
@@ -59,10 +59,10 @@ index 6c0ef4df..076ddd70 100644
 +    // Waterfall end
  }
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
-index 0ee7b0de..267ebc40 100644
+index 122197e1..afad2ce2 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
-@@ -48,6 +48,9 @@ public abstract class DefinedPacket
+@@ -85,6 +85,9 @@ public abstract class DefinedPacket
          }
      }
 
@@ -72,7 +72,7 @@ index 0ee7b0de..267ebc40 100644
      public static void writeString(String s, ByteBuf buf)
      {
          writeString( s, buf, Short.MAX_VALUE );
-@@ -250,13 +253,18 @@ public abstract class DefinedPacket
+@@ -286,13 +289,18 @@ public abstract class DefinedPacket
          byte in;
          while ( true )
          {
@@ -172,7 +172,7 @@ index 237955ab..d0bd4d75 100644
 +    // Waterfall end
  }
 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 31cdbe48..b8f1010e 100644
+index 5116128f..32199eec 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
 @@ -24,6 +24,8 @@ import javax.crypto.SecretKey;
@@ -221,5 +221,5 @@ index ac99d02c..0c1ecfb8 100644
 
              // Waterfall start
 -- 
-2.49.0
+2.43.0
 

BungeeCord-Patches/0047-Speed-up-some-common-exceptions.patch

@@ -1,4 +1,4 @@
-From 368c75dee528a0babbd8036944a9b3dea1914ce7 Mon Sep 17 00:00:00 2001
+From 82e21345043975c4ef0bc86ccd1a57e376a885a1 Mon Sep 17 00:00:00 2001
 From: "Five (Xer)" <admin@fivepb.me>
 Date: Sat, 30 Jan 2021 18:04:14 +0100
 Subject: [PATCH] Additional DoS mitigations
@@ -8,26 +8,26 @@ Courtesy of Tux and the Velocity Contributors. See:
 https://github.com/VelocityPowered/Velocity/commit/5ceac16a821ea35572ff11412ace8929fd06e278
 
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
-index 267ebc40..adfcc189 100644
+index afad2ce2..0480c8f1 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/DefinedPacket.java
-@@ -92,6 +92,7 @@ public abstract class DefinedPacket
+@@ -129,6 +129,7 @@ public abstract class DefinedPacket
          int len = readVarInt( buf );
          if ( len > maxLen * 3 )
          {
 +            if(!MinecraftDecoder.DEBUG) throw STRING_TOO_MANY_BYTES_EXCEPTION; // Waterfall start: Additional DoS mitigations
              throw new OverflowPacketException( "Cannot receive string longer than " + maxLen * 3 + " (got " + len + " bytes)" );
          }
 
-@@ -100,6 +101,7 @@ public abstract class DefinedPacket
+@@ -136,6 +137,7 @@ public abstract class DefinedPacket
 
          if ( s.length() > maxLen )
          {
 +            if(!MinecraftDecoder.DEBUG) throw STRING_TOO_LONG_EXCEPTION; // Waterfall start: Additional DoS mitigations
              throw new OverflowPacketException( "Cannot receive string longer than " + maxLen + " (got " + s.length() + " characters)" );
          }
 
-@@ -602,4 +604,21 @@ public abstract class DefinedPacket
+@@ -638,4 +640,21 @@ public abstract class DefinedPacket
 
      @Override
      public abstract String toString();
@@ -189,7 +189,7 @@ index 1b911699..8244154d 100644
 +    // Waterfall end
  }
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginRequest.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginRequest.java
-index e62a3a03..9789215c 100644
+index d9cadc25..5d32ede3 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginRequest.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/LoginRequest.java
 @@ -71,4 +71,13 @@ public class LoginRequest extends DefinedPacket
@@ -257,5 +257,5 @@ index 738f0c92..ec33d337 100644
 +    // Waterfall end
  }
 -- 
-2.49.0
+2.43.0