Fix patch conflicts

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

@@ -1,14 +1,14 @@
-From 455892a5aa7454f2c3e2fe8b8f6e6d0c6ad71c5d Mon Sep 17 00:00:00 2001
+From 2c998e93267e2369904e02751cd5b5a2b0c77bc6 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/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
-index 7e14484b..3698762c 100644
+index 2d8233e6..276322a8 100644
 --- a/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
 +++ b/chat/src/test/java/net/md_5/bungee/api/chat/ComponentsTest.java
-@@ -696,6 +696,26 @@ public class ComponentsTest
+@@ -673,6 +673,26 @@ public class ComponentsTest
          assertEquals( testClickEvent, extraGetter.apply( eventRetention, 1 ).getClickEvent() );
      }
  
@@ -36,14 +36,13 @@ index 7e14484b..3698762c 100644
      public void testLoopSimple()
      {
 diff --git a/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java b/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java
-index 47c06baa..2552a34f 100644
+index 995c70f2..d91d1d5c 100644
 --- a/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java
 +++ b/chat/src/test/java/net/md_5/bungee/api/chat/TranslatableComponentTest.java
-@@ -25,4 +25,12 @@ public class TranslatableComponentTest
-         assertEquals( "Test string with a placeholder", BaseComponent.toPlainText( baseComponents ) );
-         assertEquals( "§fTest string with §fa§f placeholder", BaseComponent.toLegacyText( baseComponents ) );
+@@ -27,6 +27,14 @@ public class TranslatableComponentTest
+         assertEquals( WHITE + "Test string with " + WHITE + "a" + WHITE + " placeholder", BaseComponent.toLegacyText( baseComponents ) );
      }
-+
+ 
 +    @Test
 +    public void testEscapedPercentInPlainText()
 +    {
@@ -51,7 +50,10 @@ index 47c06baa..2552a34f 100644
 +        assertEquals( "Test string with % sign", testComponent.toPlainText() );
 +        assertEquals( "§fTest string with §f%§f sign", testComponent.toLegacyText() );
 +    }
- }
++
+     @Test
+     public void testTranslateComponent()
+     {
 -- 
 2.44.0
 

BungeeCord-Patches/0066-Use-libdeflate-instead-of-zlib-for-better-compressio.patch

@@ -1,4 +1,4 @@
-From 4c6e15811036ed758813863856cceba6e1339ec2 Mon Sep 17 00:00:00 2001
+From f71008b8853fce807378880117b246c65c7eed59 Mon Sep 17 00:00:00 2001
 From: Lixfel <agga-games@gmx.de>
 Date: Wed, 6 Dec 2023 15:47:12 +0100
 Subject: [PATCH] Use libdeflate instead of zlib for better compression
@@ -6,7 +6,7 @@ Subject: [PATCH] Use libdeflate instead of zlib for better compression
 
 
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index d3de9e34..18d02b09 100644
+index 1786d303..498047d1 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
 @@ -23,6 +23,13 @@
@@ -37,7 +37,7 @@ index d3de9e34..18d02b09 100644
          <dependency>
              <groupId>io.netty</groupId>
 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 01c8a172..896844ad 100644
+index 9b93d2c3..84ddd379 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -53,6 +53,7 @@ import java.util.logging.Logger;
@@ -48,7 +48,7 @@ index 01c8a172..896844ad 100644
  import net.md_5.bungee.api.CommandSender;
  import net.md_5.bungee.api.Favicon;
  import net.md_5.bungee.api.ProxyServer;
-@@ -249,7 +250,11 @@ public class BungeeCord extends ProxyServer
+@@ -252,7 +253,11 @@ public class BungeeCord extends ProxyServer
              {
                  logger.info( "Using standard Java JCE cipher." );
              }
@@ -127,5 +127,5 @@ index d07cf462..6d94cd63 100644
      private int threshold = 256;
  
 -- 
-2.43.0
+2.44.0
 

BungeeCord-Patches/0066-eol-message.patch

@@ -1,21 +0,0 @@
-From 168aca2c4cae1c77efbbd156345ead5234c113ab Mon Sep 17 00:00:00 2001
-From: MiniDigger <admin@benndorf.dev>
-Date: Fri, 22 Mar 2024 09:20:53 +0100
-Subject: [PATCH] eol message
-
-
-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 96a9998d..72d6a15d 100644
---- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
-@@ -64,6 +64,7 @@ public class BungeeCordLauncher
-         BungeeCord bungee = new BungeeCord();
-         ProxyServer.setInstance( bungee );
-         bungee.getLogger().info( "Enabled Waterfall version " + bungee.getVersion() );
-+        bungee.getLogger().warning("Waterfall has reached end of life and is no longer maintained. We recommend you transition to Velocity (https://papermc.io/software/velocity). For more information, see the announcement (https://forums.papermc.io/threads/1088/)."); // Waterfall - eol message
-         bungee.start();
- 
-         if ( !options.has( "noconsole" ) )
--- 
-2.44.0
-

BungeeCord-Patches/0067-Enable-io_uring-by-default.patch

@@ -0,0 +1,22 @@
+From 9b421253c33c4e19de6465cfce021d3ca8642f2d Mon Sep 17 00:00:00 2001
+From: Lixfel <agga-games@gmx.de>
+Date: Sun, 12 May 2024 09:44:22 +0200
+Subject: [PATCH] Enable io_uring by default
+
+
+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 52c308f7..ede80c77 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
+@@ -138,7 +138,7 @@ public class PipelineUtils
+         if ( !PlatformDependent.isWindows() )
+         {
+             // disable by default (experimental)
+-            if ( Boolean.parseBoolean( System.getProperty( "bungee.io_uring", "false" ) ) )
++            if ( Boolean.parseBoolean( System.getProperty( "bungee.io_uring", "true" ) ) )
+             {
+                 ProxyServer.getInstance().getLogger().info( "Not on Windows, attempting to use enhanced IOUringEventLoopGroup" );
+                 if ( io_uring = IOUring.isAvailable() )
+-- 
+2.44.0
+