From 0c3f9bd6b41d5b8f587d63e603dfa52ca124aa6e Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Wed, 7 Jun 2023 20:35:05 +0100
Subject: [PATCH] Fix some build issues

---
 BungeeCord-Patches/0001-POM-Changes.patch        | 10 +++++-----
 ...r-logging-and-TerminalConsoleAppender-f.patch | 16 +++++++++-------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/BungeeCord-Patches/0001-POM-Changes.patch b/BungeeCord-Patches/0001-POM-Changes.patch
index 53f6b22..5e46553 100644
--- a/BungeeCord-Patches/0001-POM-Changes.patch
+++ b/BungeeCord-Patches/0001-POM-Changes.patch
@@ -1,4 +1,4 @@
-From 0bab19d41f1f1062e6d8232d05255e0e16ce355a Mon Sep 17 00:00:00 2001
+From 715a97765977742a004bad83b5eaf8105fc48b14 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
@@ -506,7 +506,7 @@ index c7478c96..e137dfcc 100644
      <dependencies>
          <dependency>
 diff --git a/pom.xml b/pom.xml
-index c118aa69..432fd5c5 100644
+index c118aa69..5fff5a09 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,18 +3,25 @@
@@ -615,7 +615,7 @@ index c118aa69..432fd5c5 100644
              </plugin>
              <plugin>
 +                <artifactId>maven-javadoc-plugin</artifactId>
-+                <version>3.2.0</version>
++                <version>3.5.0</version>
 +                <configuration>
 +                    <doclint>none</doclint>
 +                </configuration>
@@ -671,7 +671,7 @@ index c118aa69..432fd5c5 100644
 +                    <plugin>
 +                        <groupId>org.apache.maven.plugins</groupId>
 +                        <artifactId>maven-javadoc-plugin</artifactId>
-+                        <version>3.1.0</version>
++                        <version>3.5.0</version>
 +                        <configuration>
 +                            <doclint>none</doclint>
 +                        </configuration>
@@ -884,5 +884,5 @@ index 90a4c8d5..81af5457 100644
              <scope>compile</scope>
          </dependency>
 -- 
-2.40.1.windows.1
+2.40.1
 
diff --git a/BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch b/BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
index 20ff0d6..b93f1d2 100644
--- a/BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
+++ b/BungeeCord-Patches/0035-Use-Log4j2-for-logging-and-TerminalConsoleAppender-f.patch
@@ -1,4 +1,4 @@
-From 43de49256f52a8990a41b6194163023d1e169f3d Mon Sep 17 00:00:00 2001
+From ae6d9010ecdfd204ce171afea813452392a5c647 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
@@ -39,7 +39,7 @@ index 5ec5faf7..f9ec2c1c 100644
      </build>
 diff --git a/log4j/pom.xml b/log4j/pom.xml
 new file mode 100644
-index 00000000..9c561bcc
+index 00000000..1ef8c1f9
 --- /dev/null
 +++ b/log4j/pom.xml
 @@ -0,0 +1,48 @@
@@ -59,7 +59,7 @@ index 00000000..9c561bcc
 +    <version>1.19-R0.1-SNAPSHOT</version>
 +    <packaging>jar</packaging>
 +
-+    <name>Waterfall-Log</name>
++    <name>Waterfall-Log4J</name>
 +    <description>Simplistic and performant Log4j2 based logger and console API designed for use with Waterfall and Minecraft related applications.</description>
 +
 +    <properties>
@@ -233,13 +233,15 @@ index 00000000..cfd039cd
 +    </Loggers>
 +</Configuration>
 diff --git a/pom.xml b/pom.xml
-index 432fd5c5..77991d81 100644
+index 5fff5a09..6d3fedae 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -56,11 +56,12 @@
+@@ -55,12 +55,13 @@
+         <module>chat</module>
          <module>config</module>
          <module>event</module>
-         <module>log</module>
+-        <module>log</module>
++        <!--<module>log</module>-->
 +        <module>log4j</module>
          <module>module</module>
          <module>protocol</module>
@@ -1627,5 +1629,5 @@ index 21a48df6..00000000
 -
 -}
 -- 
-2.40.1.windows.1
+2.40.1