Good upstream merge

BungeeCord-Patches/0001-POM-Changes.patch

@@ -1,4 +1,4 @@
-From 86a75ef5a2d727172ec13f240723e6b9e45cd4e0 Mon Sep 17 00:00:00 2001
+From 4a0459e8bca64f4bdedc21e3a8ae62d2a56ad9b7 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
@@ -286,7 +286,7 @@ index 11ca800f..f15f7406 100644
 +    <description>Generic java event dispatching API intended for use with Waterfall.</description>
  </project>
 diff --git a/log/pom.xml b/log/pom.xml
-index cd62b78d..b538b00f 100644
+index b498b42b..b31d7176 100644
 --- a/log/pom.xml
 +++ b/log/pom.xml
 @@ -4,19 +4,19 @@
@@ -621,15 +621,22 @@ index afb805d1..be74fd49 100644
          <license>
              <name>BSD-3-Clause</name>
 diff --git a/pom.xml b/pom.xml
-index 18bbe6f9..e0b8b453 100644
+index 18bbe6f9..939806eb 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -3,18 +3,18 @@
+@@ -3,18 +3,25 @@
           xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
      <modelVersion>4.0.0</modelVersion>
 
 -    <groupId>net.md-5</groupId>
 -    <artifactId>bungeecord-parent</artifactId>
++    <parent>
++        <groupId>io.github.waterfallmc</groupId>
++        <artifactId>waterfall-super</artifactId>
++        <version>26.1-R0.1-SNAPSHOT</version>
++        <relativePath>../pom.xml</relativePath>
++    </parent>
++
 +    <groupId>io.github.waterfallmc</groupId>
 +    <artifactId>waterfall-parent</artifactId>
      <version>26.1-R0.1-SNAPSHOT</version>
@@ -651,7 +658,7 @@ index 18bbe6f9..e0b8b453 100644
      </organization>
      <licenses>
          <license>
-@@ -26,7 +26,22 @@
+@@ -26,7 +33,22 @@
 
      <developers>
          <developer>
@@ -675,7 +682,7 @@ index 18bbe6f9..e0b8b453 100644
          </developer>
      </developers>
 
-@@ -50,28 +65,24 @@
+@@ -50,28 +72,24 @@
      </modules>
 
      <scm>
@@ -714,15 +721,15 @@ index 18bbe6f9..e0b8b453 100644
      </distributionManagement>
 
      <properties>
-@@ -155,6 +166,7 @@
+@@ -155,6 +173,7 @@
                      </execution>
                  </executions>
              </plugin>
 +            <!-- Use latest version of the javadoc plugin, fixes some issues with the javadoc tool on recent JDK builds on macOS at least -->
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-compiler-plugin</artifactId>
-@@ -170,6 +182,14 @@
+@@ -170,6 +189,14 @@
                  </configuration>
              </plugin>
              <plugin>
@@ -737,15 +744,15 @@ index 18bbe6f9..e0b8b453 100644
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-checkstyle-plugin</artifactId>
                  <version>3.6.0</version>
-@@ -194,6 +214,7 @@
+@@ -194,6 +221,7 @@
                      </dependency>
                  </dependencies>
              </plugin>
 +            -->
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-enforcer-plugin</artifactId>
-@@ -257,6 +278,15 @@
+@@ -257,6 +285,15 @@
                                  </goals>
                              </execution>
                          </executions>
@@ -1018,5 +1025,5 @@ index 3020e103..4181e784 100644
      <properties>
          <checkstyle.skip>true</checkstyle.skip>
 -- 
-2.53.0
+2.51.0
 

BungeeCord-Patches/0007-Fixup-ProtocolConstants.patch

@@ -1,14 +1,14 @@
-From f509d7ff2c8eb5ae14763074719276c7193a1797 Mon Sep 17 00:00:00 2001
+From 82c05bb2baf1f6220cc5e320ad0b9b6aec83b217 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 220345fc..e922b912 100644
+index fd0cfd3a..80da91a8 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
-@@ -136,6 +136,16 @@ public class ProtocolConstants
+@@ -138,6 +138,16 @@ public class ProtocolConstants
          SUPPORTED_VERSION_IDS = supportedVersionIds.build();
      }
 
@@ -26,5 +26,5 @@ index 220345fc..e922b912 100644
      {
 
 -- 
-2.53.0
+2.51.0
 

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

@@ -1,4 +1,4 @@
-From 067dfc16c47dc4d8fef5ddf6294ed98a90a18f4a Mon Sep 17 00:00:00 2001
+From 6ee3ffc0ee3d67db526a32eba69ccfe33ca34b75 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
@@ -235,10 +235,10 @@ index 00000000..cfd039cd
 +    </Loggers>
 +</Configuration>
 diff --git a/pom.xml b/pom.xml
-index e0b8b453..b4371768 100644
+index 939806eb..be3f6bef 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -52,14 +52,15 @@
+@@ -59,14 +59,15 @@
          <module>config</module>
          <module>dialog</module>
          <module>event</module>
@@ -646,5 +646,5 @@ index 6788fbe7..00000000
 -    }
 -}
 -- 
-2.53.0
+2.51.0
 

BungeeCord-Patches/0055-Add-support-for-hex-color-codes-in-console.patch

@@ -1,69 +1,44 @@
-From d748b38a6bfbafd428342cac2a8cdff6fe1be782 Mon Sep 17 00:00:00 2001
+From 21622197aa9f591003f472a1d66ac2dc9e29d9f9 Mon Sep 17 00:00:00 2001
 From: Josh Roy <10731363+JRoy@users.noreply.github.com>
 Date: Sun, 21 Feb 2021 23:52:11 -0500
 Subject: [PATCH] Add support for hex color codes in console
 
 Ports my Paper patch which converts upstream's hex color code legacy format into actual hex color codes in the console.
 
-diff --git a/log4j/src/main/resources/log4j2-bungee.xml b/log4j/src/main/resources/log4j2-bungee.xml
-index 6e9c09c5..1c3265ed 100644
---- a/log4j/src/main/resources/log4j2-bungee.xml
-+++ b/log4j/src/main/resources/log4j2-bungee.xml
-@@ -4,17 +4,17 @@
-     <Appenders>
-         <TerminalConsole name="TerminalConsole">
-             <PatternLayout>
--                <LoggerNamePatternSelector defaultPattern="%highlightError{%d{HH:mm:ss} [%level] [%logger] %minecraftFormatting{%msg}%n%ex}">
-+                <LoggerNamePatternSelector defaultPattern="%highlightError{%d{HH:mm:ss} [%level] [%logger] %paperMinecraftFormatting{%msg}%n%ex}">
-                     <!-- Log root and BungeeCord loggers without prefix -->
--                    <PatternMatch key=",BungeeCord" pattern="%highlightError{%d{HH:mm:ss} [%level] %minecraftFormatting{%msg}%n%ex}" />
-+                    <PatternMatch key=",BungeeCord" pattern="%highlightError{%d{HH:mm:ss} [%level] %paperMinecraftFormatting{%msg}%n%ex}" />
-                 </LoggerNamePatternSelector>
-             </PatternLayout>
-         </TerminalConsole>
-         <RollingRandomAccessFile name="File" fileName="proxy.log.0" filePattern="proxy.log.%i" immediateFlush="false">
-             <PatternLayout>
--                <LoggerNamePatternSelector defaultPattern="%d{HH:mm:ss} [%level] [%logger] %minecraftFormatting{%msg}{strip}%n%ex">
-+                <LoggerNamePatternSelector defaultPattern="%d{HH:mm:ss} [%level] [%logger] %paperMinecraftFormatting{%msg}{strip}%n%ex">
-                     <!-- Log root and BungeeCord loggers without prefix -->
--                    <PatternMatch key=",BungeeCord" pattern="%d{HH:mm:ss} [%level] %minecraftFormatting{%msg}{strip}%n%ex" />
-+                    <PatternMatch key=",BungeeCord" pattern="%d{HH:mm:ss} [%level] %paperMinecraftFormatting{%msg}{strip}%n%ex" />
-                 </LoggerNamePatternSelector>
-             </PatternLayout>
-             <Policies>
-diff --git a/log4j/src/main/resources/log4j2.xml b/log4j/src/main/resources/log4j2.xml
-index 8e49e002..663bddec 100644
---- a/log4j/src/main/resources/log4j2.xml
-+++ b/log4j/src/main/resources/log4j2.xml
-@@ -3,17 +3,17 @@
-     <Appenders>
-         <TerminalConsole name="TerminalConsole">
-             <PatternLayout>
--                <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level] [%logger]: %minecraftFormatting{%msg}%n%xEx}">
-+                <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level] [%logger]: %paperMinecraftFormatting{%msg}%n%xEx}">
-                     <!-- Log root and BungeeCord loggers without prefix -->
--                    <PatternMatch key=",BungeeCord" pattern="%highlightError{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%xEx}" />
-+                    <PatternMatch key=",BungeeCord" pattern="%highlightError{[%d{HH:mm:ss} %level]: %paperMinecraftFormatting{%msg}%n%xEx}" />
-                 </LoggerNamePatternSelector>
-             </PatternLayout>
-         </TerminalConsole>
-         <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz" immediateFlush="false">
-             <PatternLayout>
--                <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level] [%logger]: %minecraftFormatting{%msg}{strip}%n">
-+                <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level] [%logger]: %paperMinecraftFormatting{%msg}{strip}%n">
-                     <!-- Log root and BungeeCord loggers without prefix -->
--                    <PatternMatch key=",BungeeCord" pattern="[%d{HH:mm:ss}] [%t/%level]: %minecraftFormatting{%msg}{strip}%n" />
-+                    <PatternMatch key=",BungeeCord" pattern="[%d{HH:mm:ss}] [%t/%level]: %paperMinecraftFormatting{%msg}{strip}%n" />
-                 </LoggerNamePatternSelector>
-             </PatternLayout>
-             <Policies>
-diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/console/HexFormattingConverter.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/console/HexFormattingConverter.java
+diff --git a/log4j/pom.xml b/log4j/pom.xml
+index f9af0d5b..2a75f406 100644
+--- a/log4j/pom.xml
++++ b/log4j/pom.xml
+@@ -41,6 +41,22 @@
+             <version>${log4j2.version}</version>
+             <scope>compile</scope>
+         </dependency>
++        <dependency>
++            <groupId>net.minecrell</groupId>
++            <artifactId>terminalconsoleappender</artifactId>
++            <version>1.3.0</version>
++            <scope>compile</scope>
++            <exclusions>
++                <exclusion>
++                    <groupId>org.apache.logging.log4j</groupId>
++                    <artifactId>log4j-core</artifactId>
++                </exclusion>
++                <exclusion>
++                    <groupId>org.jline</groupId>
++                    <artifactId>jline-terminal</artifactId>
++                </exclusion>
++            </exclusions>
++        </dependency>
+         <dependency>
+             <groupId>org.apache.logging.log4j</groupId>
+             <artifactId>log4j-slf4j-impl</artifactId>
+diff --git a/log4j/src/main/java/io/github/waterfallmc/waterfall/log4j/HexFormattingConverter.java b/log4j/src/main/java/io/github/waterfallmc/waterfall/log4j/HexFormattingConverter.java
 new file mode 100644
-index 00000000..5d1a6126
+index 00000000..7ab56d25
 --- /dev/null
-+++ b/proxy/src/main/java/io/github/waterfallmc/waterfall/console/HexFormattingConverter.java
-@@ -0,0 +1,178 @@
-+package io.github.waterfallmc.waterfall.console;
++++ b/log4j/src/main/java/io/github/waterfallmc/waterfall/log4j/HexFormattingConverter.java
+@@ -0,0 +1,179 @@
++package io.github.waterfallmc.waterfall.log4j;
 +
 +import net.minecrell.terminalconsole.TerminalConsoleAppender;
 +import org.apache.logging.log4j.core.LogEvent;
@@ -80,6 +55,7 @@ index 00000000..5d1a6126
 +
 +import static net.minecrell.terminalconsole.MinecraftFormattingConverter.KEEP_FORMATTING_PROPERTY;
 +
++// waterfall start
 +/**
 + * Modified version of <a href="https://github.com/Minecrell/TerminalConsoleAppender/blob/master/src/main/java/net/minecrell/terminalconsole/MinecraftFormattingConverter.java">
 + *     TerminalConsoleAppender's MinecraftFormattingConverter</a> to support hex color codes using the md_5 &x&r&r&g&g&b&b format.
@@ -240,7 +216,74 @@ index 00000000..5d1a6126
 +  }
 +
 +}
-+
++// waterfall end
+diff --git a/log4j/src/main/resources/log4j2-bungee.xml b/log4j/src/main/resources/log4j2-bungee.xml
+index 6e9c09c5..ecf51977 100644
+--- a/log4j/src/main/resources/log4j2-bungee.xml
++++ b/log4j/src/main/resources/log4j2-bungee.xml
+@@ -1,20 +1,20 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!-- Log4j configuration that replicates the old BungeeCord logging setup -->
+-<Configuration status="warn">
++<Configuration status="warn" packages="io.github.waterfallmc.waterfall.log4j">
+     <Appenders>
+         <TerminalConsole name="TerminalConsole">
+             <PatternLayout>
+-                <LoggerNamePatternSelector defaultPattern="%highlightError{%d{HH:mm:ss} [%level] [%logger] %minecraftFormatting{%msg}%n%ex}">
++                <LoggerNamePatternSelector defaultPattern="%highlightError{%d{HH:mm:ss} [%level] [%logger] %paperMinecraftFormatting{%msg}%n%ex}">
+                     <!-- Log root and BungeeCord loggers without prefix -->
+-                    <PatternMatch key=",BungeeCord" pattern="%highlightError{%d{HH:mm:ss} [%level] %minecraftFormatting{%msg}%n%ex}" />
++                    <PatternMatch key=",BungeeCord" pattern="%highlightError{%d{HH:mm:ss} [%level] %paperMinecraftFormatting{%msg}%n%ex}" />
+                 </LoggerNamePatternSelector>
+             </PatternLayout>
+         </TerminalConsole>
+         <RollingRandomAccessFile name="File" fileName="proxy.log.0" filePattern="proxy.log.%i" immediateFlush="false">
+             <PatternLayout>
+-                <LoggerNamePatternSelector defaultPattern="%d{HH:mm:ss} [%level] [%logger] %minecraftFormatting{%msg}{strip}%n%ex">
++                <LoggerNamePatternSelector defaultPattern="%d{HH:mm:ss} [%level] [%logger] %paperMinecraftFormatting{%msg}{strip}%n%ex">
+                     <!-- Log root and BungeeCord loggers without prefix -->
+-                    <PatternMatch key=",BungeeCord" pattern="%d{HH:mm:ss} [%level] %minecraftFormatting{%msg}{strip}%n%ex" />
++                    <PatternMatch key=",BungeeCord" pattern="%d{HH:mm:ss} [%level] %paperMinecraftFormatting{%msg}{strip}%n%ex" />
+                 </LoggerNamePatternSelector>
+             </PatternLayout>
+             <Policies>
+diff --git a/log4j/src/main/resources/log4j2.component.properties b/log4j/src/main/resources/log4j2.component.properties
+index e43f5dac..60578a2e 100644
+--- a/log4j/src/main/resources/log4j2.component.properties
++++ b/log4j/src/main/resources/log4j2.component.properties
+@@ -1,2 +1,3 @@
+ log4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector
+ log4j.skipJansi=true
++log4j2.pluginPackages=io.github.waterfallmc.waterfall.log4j
+diff --git a/log4j/src/main/resources/log4j2.xml b/log4j/src/main/resources/log4j2.xml
+index 8e49e002..564a3c7f 100644
+--- a/log4j/src/main/resources/log4j2.xml
++++ b/log4j/src/main/resources/log4j2.xml
+@@ -1,19 +1,19 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<Configuration status="warn" shutdownHook="disable">
++<Configuration status="warn" shutdownHook="disable" packages="io.github.waterfallmc.waterfall.log4j">
+     <Appenders>
+         <TerminalConsole name="TerminalConsole">
+             <PatternLayout>
+-                <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level] [%logger]: %minecraftFormatting{%msg}%n%xEx}">
++                <LoggerNamePatternSelector defaultPattern="%highlightError{[%d{HH:mm:ss} %level] [%logger]: %paperMinecraftFormatting{%msg}%n%xEx}">
+                     <!-- Log root and BungeeCord loggers without prefix -->
+-                    <PatternMatch key=",BungeeCord" pattern="%highlightError{[%d{HH:mm:ss} %level]: %minecraftFormatting{%msg}%n%xEx}" />
++                    <PatternMatch key=",BungeeCord" pattern="%highlightError{[%d{HH:mm:ss} %level]: %paperMinecraftFormatting{%msg}%n%xEx}" />
+                 </LoggerNamePatternSelector>
+             </PatternLayout>
+         </TerminalConsole>
+         <RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz" immediateFlush="false">
+             <PatternLayout>
+-                <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level] [%logger]: %minecraftFormatting{%msg}{strip}%n">
++                <LoggerNamePatternSelector defaultPattern="[%d{HH:mm:ss}] [%t/%level] [%logger]: %paperMinecraftFormatting{%msg}{strip}%n">
+                     <!-- Log root and BungeeCord loggers without prefix -->
+-                    <PatternMatch key=",BungeeCord" pattern="[%d{HH:mm:ss}] [%t/%level]: %minecraftFormatting{%msg}{strip}%n" />
++                    <PatternMatch key=",BungeeCord" pattern="[%d{HH:mm:ss}] [%t/%level]: %paperMinecraftFormatting{%msg}{strip}%n" />
+                 </LoggerNamePatternSelector>
+             </PatternLayout>
+             <Policies>
 -- 
-2.44.0
+2.51.0
 

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>io.github.waterfallmc</groupId>
     <artifactId>waterfall-super</artifactId>
-    <version>dev-SNAPSHOT</version>
+    <version>26.1-R0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Waterfall-Super</name>