Fix compilation issues

2024-11-18 08:15:13 +01:00 · 2021-12-29 23:02:28 -03:00 · 2021-12-29 23:02:28 -03:00 · b0e53adc57
commit b0e53adc57
parent e8f9518b73
31 changed files with 100 additions and 710 deletions
--- a/Waterfall-Proxy-Patches/0001-FlameCord-POM-Changes.patch
+++ b/Waterfall-Proxy-Patches/0001-FlameCord-POM-Changes.patch
@ -1,4 +1,4 @@
-From b3bb0138f7cd3923259af7c6d484ce0c3d783bf8 Mon Sep 17 00:00:00 2001
+From 9702193b1b27ffbe2fd79236b44d689d58ebafc1 Mon Sep 17 00:00:00 2001
 From: foss-mc <69294560+foss-mc@users.noreply.github.com>
 Date: Wed, 16 Dec 2020 17:59:15 +0800
 Subject: [PATCH] FlameCord POM Changes
@ -6,7 +6,7 @@ Subject: [PATCH] FlameCord POM Changes

 diff --git a/flamecord/pom.xml b/flamecord/pom.xml
 new file mode 100644
-index 00000000..fc24d714
+index 00000000..f4bf5ec6
 --- /dev/null
 +++ b/flamecord/pom.xml
@@ -0,0 +1,44 @@
@ -16,29 +16,29 @@ index 00000000..fc24d714
 +
 +    <parent>
 +        <groupId>io.github.waterfallmc</groupId>
-+        <artifactId>flamecord-parent</artifactId>
+        <artifactId>waterfall-parent</artifactId>
 +        <version>1.18-R0.1-SNAPSHOT</version>
 +        <relativePath>../pom.xml</relativePath>
 +    </parent>
 +
 +    <groupId>dev._2lstudios</groupId>
-+    <artifactId>flamecord-flamecord</artifactId>
+    <artifactId>waterfall-flamecord</artifactId>
 +    <version>1.18-R0.1-SNAPSHOT</version>
 +    <packaging>jar</packaging>
 +
-+    <name>FlameCord-FlameCord</name>
+    <name>Waterfall-FlameCord</name>
 +    <description>FlameCord adds security essentials and new configuration options</description>
 +
 +    <dependencies>
 +        <dependency>
 +            <groupId>io.github.waterfallmc</groupId>
-+            <artifactId>flamecord-config</artifactId>
+            <artifactId>waterfall-config</artifactId>
 +            <version>${project.version}</version>
 +            <scope>compile</scope>
 +        </dependency>
 +        <dependency>
 +            <groupId>io.github.waterfallmc</groupId>
-+            <artifactId>flamecord-chat</artifactId>
+            <artifactId>waterfall-chat</artifactId>
 +            <version>${project.version}</version>
 +            <scope>compile</scope>
 +        </dependency>
@ -55,24 +55,22 @@ index 00000000..fc24d714
 +    </build>
 +</project>
 diff --git a/pom.xml b/pom.xml
-index db494b4c..0c856cc2 100644
+index 505d1d14..45f14084 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -66,6 +66,9 @@
+@@ -63,6 +63,7 @@
         <module>query</module>
         <!--<module>slf4j</module>-->
         <module>native</module>
-+        <!-- FlameCord start - Add modules -->
-+        <module>flamecord</module>
-+        <!-- FlameCord end -->
+        <module>flamecord</module> <!-- FlameCord - POM Changes -->
     </modules>
 
     <scm>
 diff --git a/protocol/pom.xml b/protocol/pom.xml
-index 27e4096d..cfaa38c2 100644
+index a783d9b0..f45d4f7a 100644
 --- a/protocol/pom.xml
 +++ b/protocol/pom.xml
-@@ -49,5 +49,14 @@
+@@ -64,5 +64,14 @@
             <version>1.3.0</version>
             <scope>compile</scope>
         </dependency>
@ -80,7 +78,7 @@ index 27e4096d..cfaa38c2 100644
 +        <!-- FlameCord start - Add our dependencies -->
 +        <dependency>
 +            <groupId>dev._2lstudios</groupId>
-+            <artifactId>flamecord-flamecord</artifactId>
+            <artifactId>waterfall-flamecord</artifactId>
 +            <version>${project.version}</version>
 +            <scope>compile</scope>
 +        </dependency>
@ -88,7 +86,7 @@ index 27e4096d..cfaa38c2 100644
     </dependencies>
 </project>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 171171c2..77fda7a9 100644
+index cca0ef95..3df0498a 100644
 --- a/proxy/pom.xml
 +++ b/proxy/pom.xml
@@ -150,6 +150,51 @@
@ -99,37 +97,37 @@ index 171171c2..77fda7a9 100644
 +        <!-- FlameCord start - Add our dependencies -->
 +        <dependency>
 +            <groupId>dev._2lstudios</groupId>
-+            <artifactId>flamecord-flamecord</artifactId>
+            <artifactId>waterfall-flamecord</artifactId>
 +            <version>${project.version}</version>
 +            <scope>compile</scope>
 +        </dependency>
 +        <dependency>
 +            <groupId>io.github.waterfallmc</groupId>
-+            <artifactId>flamecord-module-cmd-alert</artifactId>
+            <artifactId>waterfall-module-cmd-alert</artifactId>
 +            <version>${project.version}</version>
 +            <scope>compile</scope>
 +        </dependency>
 +        <dependency>
 +            <groupId>io.github.waterfallmc</groupId>
-+            <artifactId>flamecord-module-cmd-find</artifactId>
+            <artifactId>waterfall-module-cmd-find</artifactId>
 +            <version>${project.version}</version>
 +            <scope>compile</scope>
 +        </dependency>
 +        <dependency>
 +            <groupId>io.github.waterfallmc</groupId>
-+            <artifactId>flamecord-module-cmd-list</artifactId>
+            <artifactId>waterfall-module-cmd-list</artifactId>
 +            <version>${project.version}</version>
 +            <scope>compile</scope>
 +        </dependency>
 +        <dependency>
 +            <groupId>io.github.waterfallmc</groupId>
-+            <artifactId>flamecord-module-cmd-send</artifactId>
+            <artifactId>waterfall-module-cmd-send</artifactId>
 +            <version>${project.version}</version>
 +            <scope>compile</scope>
 +        </dependency>
 +        <dependency>
 +            <groupId>io.github.waterfallmc</groupId>
-+            <artifactId>flamecord-module-cmd-server</artifactId>
+            <artifactId>waterfall-module-cmd-server</artifactId>
 +            <version>${project.version}</version>
 +            <scope>compile</scope>
 +        </dependency>
@ -144,5 +142,5 @@ index 171171c2..77fda7a9 100644
 
     <build>
 -- 
-2.32.0.windows.1
+2.32.0

--- a/Waterfall-Proxy-Patches/0001-POM-Changes.patch
+++ b/Waterfall-Proxy-Patches/0001-POM-Changes.patch
@ -1,608 +0,0 @@
-From 2cd59f6fa8b5dbfadf0dfce47a6d5d0c79f40fd5 Mon Sep 17 00:00:00 2001
-From: Troy Frew <fuzzy_bot@arenaga.me>
-Date: Tue, 15 Nov 2016 08:56:43 -0500
-Subject: [PATCH] POM Changes
-
-
-diff --git a/api/pom.xml b/api/pom.xml
-index 9b29dfca..bfb96040 100644
--- a/api/pom.xml
-+++ b/api/pom.xml
-@@ -5,41 +5,41 @@
- 
-     <parent>
-         <groupId>io.github.waterfallmc</groupId>
-        <artifactId>waterfall-parent</artifactId>
-+        <artifactId>flamecord-parent</artifactId>
-         <version>1.18-R0.1-SNAPSHOT</version>
-         <relativePath>../pom.xml</relativePath>
-     </parent>
- 
-     <groupId>io.github.waterfallmc</groupId>
-    <artifactId>waterfall-api</artifactId>
-+    <artifactId>flamecord-api</artifactId>
-     <version>1.18-R0.1-SNAPSHOT</version>
-     <packaging>jar</packaging>
- 
-    <name>Waterfall-API</name>
-+    <name>FlameCord-API</name>
-     <description>API implemented by the Elastic Portal Suite</description>
- 
-     <dependencies>
-         <dependency>
-             <groupId>io.github.waterfallmc</groupId>
-            <artifactId>waterfall-chat</artifactId>
-+            <artifactId>flamecord-chat</artifactId>
-             <version>${project.version}</version>
-             <scope>compile</scope>
-         </dependency>
-         <dependency>
-             <groupId>io.github.waterfallmc</groupId>
-            <artifactId>waterfall-config</artifactId>
-+            <artifactId>flamecord-config</artifactId>
-             <version>${project.version}</version>
-             <scope>compile</scope>
-         </dependency>
-         <dependency>
-             <groupId>io.github.waterfallmc</groupId>
-            <artifactId>waterfall-event</artifactId>
-+            <artifactId>flamecord-event</artifactId>
-             <version>${project.version}</version>
-             <scope>compile</scope>
-         </dependency>
-         <dependency>
-             <groupId>io.github.waterfallmc</groupId>
-            <artifactId>waterfall-protocol</artifactId>
-+            <artifactId>flamecord-protocol</artifactId>
-             <version>${project.version}</version>
-             <scope>compile</scope>
-         </dependency>
-diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
-index 00ce099c..e797d892 100644
--- a/bootstrap/pom.xml
-+++ b/bootstrap/pom.xml
-@@ -5,17 +5,17 @@
- 
-     <parent>
-         <groupId>io.github.waterfallmc</groupId>
-        <artifactId>waterfall-parent</artifactId>
-+        <artifactId>flamecord-parent</artifactId>
-         <version>1.18-R0.1-SNAPSHOT</version>
-         <relativePath>../pom.xml</relativePath>
-     </parent>
- 
-     <groupId>io.github.waterfallmc</groupId>
-    <artifactId>waterfall-bootstrap</artifactId>
-+    <artifactId>flamecord-bootstrap</artifactId>
-     <version>1.18-R0.1-SNAPSHOT</version>
-     <packaging>jar</packaging>
- 
-    <name>Waterfall-Bootstrap</name>
-+    <name>FlameCord-Bootstrap</name>
-     <description>Java 1.6 loader for Waterfall</description>
- 
-     <properties>
-@@ -30,14 +30,14 @@
-     <dependencies>
-         <dependency>
-             <groupId>io.github.waterfallmc</groupId>
-            <artifactId>waterfall-proxy</artifactId>
-+            <artifactId>flamecord-proxy</artifactId>
-             <version>${project.version}</version>
-             <scope>compile</scope>
-         </dependency>
-     </dependencies>
- 
-     <build>
-        <finalName>Waterfall</finalName>
-+        <finalName>FlameCord</finalName>
-         <plugins>
-             <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
-diff --git a/chat/pom.xml b/chat/pom.xml
-index 0ad5dd16..48c0029f 100644
--- a/chat/pom.xml
-+++ b/chat/pom.xml
-@@ -5,17 +5,17 @@
- 
-     <parent>
-         <groupId>io.github.waterfallmc</groupId>
-        <artifactId>waterfall-parent</artifactId>
-+        <artifactId>flamecord-parent</artifactId>
-         <version>1.18-R0.1-SNAPSHOT</version>
-         <relativePath>../pom.xml</relativePath>
-     </parent>
- 
-     <groupId>io.github.waterfallmc</groupId>
-    <artifactId>waterfall-chat</artifactId>
-+    <artifactId>flamecord-chat</artifactId>
-     <version>1.18-R0.1-SNAPSHOT</version>
-     <packaging>jar</packaging>
- 
-    <name>Waterfall-Chat</name>
-+    <name>FlameCord-Chat</name>
-     <description>Minecraft JSON chat API intended for use with Waterfall</description>
- 
-     <dependencies>
-diff --git a/config/pom.xml b/config/pom.xml
-index 2caffc27..5a7c9993 100644
--- a/config/pom.xml
-+++ b/config/pom.xml
-@@ -5,17 +5,17 @@
- 
-     <parent>
-         <groupId>io.github.waterfallmc</groupId>
-        <artifactId>waterfall-parent</artifactId>
-+        <artifactId>flamecord-parent</artifactId>
-         <version>1.18-R0.1-SNAPSHOT</version>
-         <relativePath>../pom.xml</relativePath>
-     </parent>
- 
-     <groupId>io.github.waterfallmc</groupId>
-    <artifactId>waterfall-config</artifactId>
-+    <artifactId>flamecord-config</artifactId>
-     <version>1.18-R0.1-SNAPSHOT</version>
-     <packaging>jar</packaging>
- 
-    <name>Waterfall-Config</name>
-+    <name>FlameCord-Config</name>
-     <description>Generic java configuration API intended for use with Waterfall</description>
- 
-     <dependencies>
-diff --git a/event/pom.xml b/event/pom.xml
-index e2432463..ade69b60 100644
--- a/event/pom.xml
-+++ b/event/pom.xml
-@@ -5,16 +5,16 @@
- 
-     <parent>
-         <groupId>io.github.waterfallmc</groupId>
-        <artifactId>waterfall-parent</artifactId>
-+        <artifactId>flamecord-parent</artifactId>
-         <version>1.18-R0.1-SNAPSHOT</version>
-         <relativePath>../pom.xml</relativePath>
-     </parent>
- 
-     <groupId>io.github.waterfallmc</groupId>
-    <artifactId>waterfall-event</artifactId>
-+    <artifactId>flamecord-event</artifactId>
-     <version>1.18-R0.1-SNAPSHOT</version>
-     <packaging>jar</packaging>
- 
-    <name>Waterfall-Event</name>
-+    <name>FlameCord-Event</name>
-     <description>Generic java event dispatching API intended for use with Waterfall.</description>
- </project>
-diff --git a/log/pom.xml b/log/pom.xml
-index 465ebbf2..acf53b43 100644
--- a/log/pom.xml
-+++ b/log/pom.xml
-@@ -5,17 +5,17 @@
- 
-     <parent>
-         <groupId>io.github.waterfallmc</groupId>
-        <artifactId>waterfall-parent</artifactId>
-+        <artifactId>flamecord-parent</artifactId>
-         <version>1.18-R0.1-SNAPSHOT</version>
-         <relativePath>../pom.xml</relativePath>
-     </parent>
- 
-     <groupId>io.github.waterfallmc</groupId>
-    <artifactId>waterfall-log</artifactId>
-+    <artifactId>flamecord-log</artifactId>
-     <version>1.18-R0.1-SNAPSHOT</version>
-     <packaging>jar</packaging>
- 
-    <name>Waterfall-Log</name>
-+    <name>FlameCord-Log</name>
-     <description>Simplistic and performant java.util.Logger based logger and console API designed for use with Waterfall and Minecraft related applications.</description>
- 
-     <dependencies>
-@@ -27,7 +27,7 @@
-         </dependency>
-         <dependency>
-             <groupId>io.github.waterfallmc</groupId>
-            <artifactId>waterfall-chat</artifactId>
-+            <artifactId>flamecord-chat</artifactId>
-             <version>${project.version}</version>
-             <scope>compile</scope>
-         </dependency>
-diff --git a/log4j/pom.xml b/log4j/pom.xml
-index 39e2fa42..3645c6b2 100644
--- a/log4j/pom.xml
-+++ b/log4j/pom.xml
-@@ -4,17 +4,17 @@
- 
-     <parent>
-         <groupId>io.github.waterfallmc</groupId>
-        <artifactId>waterfall-parent</artifactId>
-+        <artifactId>flamecord-parent</artifactId>
-         <version>1.18-R0.1-SNAPSHOT</version>
-         <relativePath>../pom.xml</relativePath>
-     </parent>
- 
-     <groupId>io.github.waterfallmc</groupId>
-    <artifactId>waterfall-log4j</artifactId>
-+    <artifactId>flamecord-log4j</artifactId>
-     <version>1.18-R0.1-SNAPSHOT</version>
-     <packaging>jar</packaging>
- 
-    <name>Waterfall-Log</name>
-+    <name>FlameCord-Log</name>
-     <description>Simplistic and performant Log4j2 based logger and console API designed for use with Waterfall and Minecraft related applications.</description>
- 
-     <properties>
-diff --git a/module/cmd-alert/pom.xml b/module/cmd-alert/pom.xml
-index b41791f1..6b53066f 100644
--- a/module/cmd-alert/pom.xml
-+++ b/module/cmd-alert/pom.xml
-@@ -5,13 +5,13 @@
- 
-     <parent>
-         <groupId>io.github.waterfallmc</groupId>
-        <artifactId>waterfall-module</artifactId>
-+        <artifactId>flamecord-module</artifactId>
-         <version>1.18-R0.1-SNAPSHOT</version>
-         <relativePath>../pom.xml</relativePath>
-     </parent>
- 
-     <groupId>io.github.waterfallmc</groupId>
-    <artifactId>waterfall-module-cmd-alert</artifactId>
-+    <artifactId>flamecord-module-cmd-alert</artifactId>
-     <version>1.18-R0.1-SNAPSHOT</version>
-     <packaging>jar</packaging>
- 
-diff --git a/module/cmd-find/pom.xml b/module/cmd-find/pom.xml
-index a17080ab..b8d562cf 100644
--- a/module/cmd-find/pom.xml
-+++ b/module/cmd-find/pom.xml
-@@ -5,13 +5,13 @@
- 
-     <parent>
-         <groupId>io.github.waterfallmc</groupId>
-        <artifactId>waterfall-module</artifactId>
-+        <artifactId>flamecord-module</artifactId>
-         <version>1.18-R0.1-SNAPSHOT</version>
-         <relativePath>../pom.xml</relativePath>
-     </parent>
- 
-     <groupId>io.github.waterfallmc</groupId>
-    <artifactId>waterfall-module-cmd-find</artifactId>
-+    <artifactId>flamecord-module-cmd-find</artifactId>
-     <version>1.18-R0.1-SNAPSHOT</version>
-     <packaging>jar</packaging>
- 
-diff --git a/module/cmd-list/pom.xml b/module/cmd-list/pom.xml
-index 16003086..f7cebd89 100644
--- a/module/cmd-list/pom.xml
-+++ b/module/cmd-list/pom.xml
-@@ -5,13 +5,13 @@
- 
-     <parent>
-         <groupId>io.github.waterfallmc</groupId>
-        <artifactId>waterfall-module</artifactId>
-+        <artifactId>flamecord-module</artifactId>
-         <version>1.18-R0.1-SNAPSHOT</version>
-         <relativePath>../pom.xml</relativePath>
-     </parent>
- 
-     <groupId>io.github.waterfallmc</groupId>
-    <artifactId>waterfall-module-cmd-list</artifactId>
-+    <artifactId>flamecord-module-cmd-list</artifactId>
-     <version>1.18-R0.1-SNAPSHOT</version>
-     <packaging>jar</packaging>
- 
-diff --git a/module/cmd-send/pom.xml b/module/cmd-send/pom.xml
-index ba084281..62e7d4f4 100644
--- a/module/cmd-send/pom.xml
-+++ b/module/cmd-send/pom.xml
-@@ -5,13 +5,13 @@
- 
-     <parent>
-         <groupId>io.github.waterfallmc</groupId>
-        <artifactId>waterfall-module</artifactId>
-+        <artifactId>flamecord-module</artifactId>
-         <version>1.18-R0.1-SNAPSHOT</version>
-         <relativePath>../pom.xml</relativePath>
-     </parent>
- 
-     <groupId>io.github.waterfallmc</groupId>
-    <artifactId>waterfall-module-cmd-send</artifactId>
-+    <artifactId>flamecord-module-cmd-send</artifactId>
-     <version>1.18-R0.1-SNAPSHOT</version>
-     <packaging>jar</packaging>
- 
-diff --git a/module/cmd-server/pom.xml b/module/cmd-server/pom.xml
-index cb4d2932..5c6253ac 100644
--- a/module/cmd-server/pom.xml
-+++ b/module/cmd-server/pom.xml
-@@ -5,13 +5,13 @@
- 
-     <parent>
-         <groupId>io.github.waterfallmc</groupId>
-        <artifactId>waterfall-module</artifactId>
-+        <artifactId>flamecord-module</artifactId>
-         <version>1.18-R0.1-SNAPSHOT</version>
-         <relativePath>../pom.xml</relativePath>
-     </parent>
- 
-     <groupId>io.github.waterfallmc</groupId>
-    <artifactId>waterfall-module-cmd-server</artifactId>
-+    <artifactId>flamecord-module-cmd-server</artifactId>
-     <version>1.18-R0.1-SNAPSHOT</version>
-     <packaging>jar</packaging>
- 
-diff --git a/module/pom.xml b/module/pom.xml
-index 350a49b8..415de113 100644
--- a/module/pom.xml
-+++ b/module/pom.xml
-@@ -5,13 +5,13 @@
- 
-     <parent>
-         <groupId>io.github.waterfallmc</groupId>
-        <artifactId>waterfall-parent</artifactId>
-+        <artifactId>flamecord-parent</artifactId>
-         <version>1.18-R0.1-SNAPSHOT</version>
-         <relativePath>../pom.xml</relativePath>
-     </parent>
- 
-     <groupId>io.github.waterfallmc</groupId>
-    <artifactId>waterfall-module</artifactId>
-+    <artifactId>flamecord-module</artifactId>
-     <version>1.18-R0.1-SNAPSHOT</version>
-     <packaging>pom</packaging>
- 
-@@ -36,7 +36,7 @@
-     <dependencies>
-         <dependency>
-             <groupId>io.github.waterfallmc</groupId>
-            <artifactId>waterfall-api</artifactId>
-+            <artifactId>flamecord-api</artifactId>
-             <version>${project.version}</version>
-             <scope>compile</scope>
-         </dependency>
-diff --git a/module/reconnect-yaml/pom.xml b/module/reconnect-yaml/pom.xml
-index d3476fc5..ee786715 100644
--- a/module/reconnect-yaml/pom.xml
-+++ b/module/reconnect-yaml/pom.xml
-@@ -5,7 +5,7 @@
- 
-     <parent>
-         <groupId>io.github.waterfallmc</groupId>
-        <artifactId>waterfall-module</artifactId>
-+        <artifactId>flamecord-module</artifactId>
-         <version>1.18-R0.1-SNAPSHOT</version>
-         <relativePath>../pom.xml</relativePath>
-     </parent>
-diff --git a/native/pom.xml b/native/pom.xml
-index 1eff2c93..58fc77b4 100644
--- a/native/pom.xml
-+++ b/native/pom.xml
-@@ -5,17 +5,17 @@
- 
-     <parent>
-         <groupId>io.github.waterfallmc</groupId>
-        <artifactId>waterfall-parent</artifactId>
-+        <artifactId>flamecord-parent</artifactId>
-         <version>1.18-R0.1-SNAPSHOT</version>
-         <relativePath>../pom.xml</relativePath>
-     </parent>
- 
-     <groupId>io.github.waterfallmc</groupId>
-    <artifactId>waterfall-native</artifactId>
-+    <artifactId>flamecord-native</artifactId>
-     <version>1.18-R0.1-SNAPSHOT</version>
-     <packaging>jar</packaging>
- 
-    <name>Waterfall-Native</name>
-+    <name>FlameCord-Native</name>
-     <description>Optional native code to speed up and enhance Waterfall functionality.</description>
- 
-     <dependencies>
-diff --git a/pom.xml b/pom.xml
-index 94fad2cc..db494b4c 100644
--- a/pom.xml
-+++ b/pom.xml
-@@ -5,23 +5,23 @@
- 
-     <parent>
-         <groupId>io.github.waterfallmc</groupId>
-        <artifactId>waterfall-super</artifactId>
-+        <artifactId>flamecord-super</artifactId>
-         <version>dev-SNAPSHOT</version>
-         <relativePath>../pom.xml</relativePath>
-     </parent>
- 
-     <groupId>io.github.waterfallmc</groupId>
-    <artifactId>waterfall-parent</artifactId>
-+    <artifactId>flamecord-parent</artifactId>
-     <version>1.18-R0.1-SNAPSHOT</version>
-     <packaging>pom</packaging>
- 
-    <name>Waterfall-Parent</name>
-    <description>Parent project for all Waterfall modules.</description>
-    <url>https://github.com/WaterfallMC/Waterfall</url>
-+    <name>FlameCord-Parent</name>
-+    <description>Parent project for all FlameCord modules.</description>
-+    <url>https://github.com/2LStudios-MC/FlameCord</url>
-     <inceptionYear>2015</inceptionYear>
-     <organization>
-        <name>WaterfallMC</name>
-        <url>https://github.com/WaterfallMC</url>
-+        <name>2LStudios</name>
-+        <url>https://github.com/2LStudios-MC</url>
-     </organization>
-     <licenses>
-         <license>
-@@ -47,6 +47,9 @@
-         <developer>
-             <id>fuzzybot</id>
-         </developer>
-+        <developer>
-+            <id>LinsaFTW</id>
-+        </developer>
-     </developers>
- 
-     <modules>
-@@ -66,13 +69,13 @@
-     </modules>
- 
-     <scm>
-        <connection>scm:git:git@github.com:com:WaterfallMC/Waterfall.git</connection>
-        <developerConnection>scm:git:git@github.com:WaterfallMC/Waterfall.git</developerConnection>
-        <url>git@github.com:WaterfallMC/Waterfall.git</url>
-+        <connection>scm:git:git@github.com:com:2LStudios-MC/FlameCord.git</connection>
-+        <developerConnection>scm:git:git@github.com:2LStudios-MC/FlameCord.git</developerConnection>
-+        <url>git@github.com:2LStudios-MC/FlameCord.git</url>
-     </scm>
-     <issueManagement>
-         <system>GitHub</system>
-        <url>https://github.com/PaperMC/Waterfall/issues</url>
-+        <url>https://github.com/2LStudios-MC/FlameCord/issues</url>
-     </issueManagement>
- 
-     <distributionManagement>
-@@ -412,8 +415,8 @@
-                                 </goals>
-                                 <inherited>false</inherited>
-                                 <configuration>
-                                    <doctitle>Waterfall ${project.version} API</doctitle>
-                                    <windowtitle>Waterfall ${project.version} API</windowtitle>
-+                                    <doctitle>FlameCord ${project.version} API</doctitle>
-+                                    <windowtitle>FlameCord ${project.version} API</windowtitle>
-                                     <sourcepath>
-                                         api/target/generated-sources/delombok;
-                                         chat/target/generated-sources/delombok
-diff --git a/protocol/pom.xml b/protocol/pom.xml
-index c62e0175..27e4096d 100644
--- a/protocol/pom.xml
-+++ b/protocol/pom.xml
-@@ -5,17 +5,17 @@
- 
-     <parent>
-         <groupId>io.github.waterfallmc</groupId>
-        <artifactId>waterfall-parent</artifactId>
-+        <artifactId>flamecord-parent</artifactId>
-         <version>1.18-R0.1-SNAPSHOT</version>
-         <relativePath>../pom.xml</relativePath>
-     </parent>
- 
-     <groupId>io.github.waterfallmc</groupId>
-    <artifactId>waterfall-protocol</artifactId>
-+    <artifactId>flamecord-protocol</artifactId>
-     <version>1.18-R0.1-SNAPSHOT</version>
-     <packaging>jar</packaging>
- 
-    <name>Waterfall-Protocol</name>
-+    <name>FlameCord-Protocol</name>
-     <description>Minimal implementation of the Minecraft protocol for use in Waterfall</description>
- 
-     <dependencies>
-@@ -27,7 +27,7 @@
-         </dependency>
-         <dependency>
-             <groupId>io.github.waterfallmc</groupId>
-            <artifactId>waterfall-chat</artifactId>
-+            <artifactId>flamecord-chat</artifactId>
-             <version>${project.version}</version>
-             <scope>compile</scope>
-         </dependency>
-diff --git a/proxy/pom.xml b/proxy/pom.xml
-index 22c4f71b..171171c2 100644
--- a/proxy/pom.xml
-+++ b/proxy/pom.xml
-@@ -5,17 +5,17 @@
- 
-     <parent>
-         <groupId>io.github.waterfallmc</groupId>
-        <artifactId>waterfall-parent</artifactId>
-+        <artifactId>flamecord-parent</artifactId>
-         <version>1.18-R0.1-SNAPSHOT</version>
-         <relativePath>../pom.xml</relativePath>
-     </parent>
- 
-     <groupId>io.github.waterfallmc</groupId>
-    <artifactId>waterfall-proxy</artifactId>
-+    <artifactId>flamecord-proxy</artifactId>
-     <version>1.18-R0.1-SNAPSHOT</version>
-     <packaging>jar</packaging>
- 
-    <name>Waterfall-Proxy</name>
-+    <name>FlameCord-Proxy</name>
-     <description>Proxy component of the Elastic Portal Suite</description>
- 
-     <properties>
-@@ -65,31 +65,31 @@
-         </dependency>
-         <dependency>
-             <groupId>io.github.waterfallmc</groupId>
-            <artifactId>waterfall-api</artifactId>
-+            <artifactId>flamecord-api</artifactId>
-             <version>${project.version}</version>
-             <scope>compile</scope>
-         </dependency>
-         <dependency>
-             <groupId>io.github.waterfallmc</groupId>
-            <artifactId>waterfall-log4j</artifactId>
-+            <artifactId>flamecord-log4j</artifactId>
-             <version>${project.version}</version>
-             <scope>compile</scope>
-         </dependency>
-         <dependency>
-             <groupId>io.github.waterfallmc</groupId>
-            <artifactId>waterfall-native</artifactId>
-+            <artifactId>flamecord-native</artifactId>
-             <version>${project.version}</version>
-             <scope>compile</scope>
-         </dependency>
-         <dependency>
-             <groupId>io.github.waterfallmc</groupId>
-            <artifactId>waterfall-protocol</artifactId>
-+            <artifactId>flamecord-protocol</artifactId>
-             <version>${project.version}</version>
-             <scope>compile</scope>
-         </dependency>
-         <dependency>
-             <groupId>io.github.waterfallmc</groupId>
-            <artifactId>waterfall-query</artifactId>
-+            <artifactId>flamecord-query</artifactId>
-             <version>${project.version}</version>
-             <scope>compile</scope>
-         </dependency>
-diff --git a/query/pom.xml b/query/pom.xml
-index 081bff62..550a463e 100644
--- a/query/pom.xml
-+++ b/query/pom.xml
-@@ -5,17 +5,17 @@
- 
-     <parent>
-         <groupId>io.github.waterfallmc</groupId>
-        <artifactId>waterfall-parent</artifactId>
-+        <artifactId>flamecord-parent</artifactId>
-         <version>1.18-R0.1-SNAPSHOT</version>
-         <relativePath>../pom.xml</relativePath>
-     </parent>
- 
-     <groupId>io.github.waterfallmc</groupId>
-    <artifactId>waterfall-query</artifactId>
-+    <artifactId>flamecord-query</artifactId>
-     <version>1.18-R0.1-SNAPSHOT</version>
-     <packaging>jar</packaging>
- 
-    <name>Waterfall-Query</name>
-+    <name>FlameCord-Query</name>
-     <description>Minecraft query implementation based on the Waterfall API.</description>
- 
-     <dependencies>
-@@ -27,7 +27,7 @@
-         </dependency>
-         <dependency>
-             <groupId>io.github.waterfallmc</groupId>
-            <artifactId>waterfall-api</artifactId>
-+            <artifactId>flamecord-api</artifactId>
-             <version>${project.version}</version>
-             <scope>compile</scope>
-         </dependency>
-- 
-2.32.0
-
--- a/Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-FlameCord.patch
+++ b/Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-FlameCord.patch
@ -1,4 +1,4 @@
-From 97946438e45cb5480c3924d5c340cecd1f1a354f Mon Sep 17 00:00:00 2001
+From add366ec45d3c5e193842db6e9851981cb8fe15c Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@techcable.net>
 Date: Mon, 6 Jun 2016 13:47:46 -0600
 Subject: [PATCH] Rename references from Waterfall to FlameCord
@ -105,5 +105,5 @@ index 0644b8cd..9c11ac57 100644
             SocketAddress address = Util.getAddr( addr );
             ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
 -- 
-2.32.0.windows.1
+2.32.0

--- a/Waterfall-Proxy-Patches/0003-FlameCord-rebrand.patch
+++ b/Waterfall-Proxy-Patches/0003-FlameCord-rebrand.patch
@ -1,4 +1,4 @@
-From 390e68cddccf09565d47e0f4ee9176942584f67f Mon Sep 17 00:00:00 2001
+From fc1fff4cbc31017a66ef2e1fc02ad66f344983b4 Mon Sep 17 00:00:00 2001
 From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
 Date: Tue, 8 Jun 2021 22:24:27 -0300
 Subject: [PATCH] FlameCord rebrand
@ -19,7 +19,7 @@ index e31fb00a..ff4bbf34 100644
         // Throttling options
         tabThrottle = config.getInt("throttling.tab_complete", tabThrottle);
 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 a4b58d9c..b884c40f 100644
+index a4b58d9c..53b78a2f 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -545,7 +545,7 @@ public class BungeeCord extends ProxyServer
@ -45,5 +45,5 @@ index 820f7b03..aeda7963 100644
     }
 }
 -- 
-2.32.0.windows.1
+2.32.0

--- a/Waterfall-Proxy-Patches/0004-1.7.x-support.patch
+++ b/Waterfall-Proxy-Patches/0004-1.7.x-support.patch
@ -1,4 +1,4 @@
-From 527c0c09b4b5a8f5b5928bec1003e0943a152b99 Mon Sep 17 00:00:00 2001
+From 19acf73dfa9f88a5671a04880a30b8ad206c702b Mon Sep 17 00:00:00 2001
 From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
 Date: Thu, 30 Sep 2021 19:54:33 -0300
 Subject: [PATCH] 1.7.x support
@ -324,7 +324,7 @@ index 7f0b71c9..04851233 100644
             TO_SERVER.registerPacket(
                     LoginPayloadResponse.class,
 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 f1276c09..1fd80ffe 100644
+index 0768e3b7..c001e4ca 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
@@ -7,6 +7,10 @@ public class ProtocolConstants
@ -915,7 +915,7 @@ index a5555f6a..09dc67f9 100644
         buf.writeByte( mode );
         if ( mode == 0 || mode == 2 )
 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 b884c40f..b914b5c2 100644
+index 53b78a2f..8ce69d2f 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -170,6 +170,14 @@ public class BungeeCord extends ProxyServer
@ -1623,5 +1623,5 @@ index daf12f74..7d053485 100644
 
     @Override
 -- 
-2.32.0.windows.1
+2.32.0

--- a/Waterfall-Proxy-Patches/0005-Make-PlayerHandshakeEvent-cancellable.patch
+++ b/Waterfall-Proxy-Patches/0005-Make-PlayerHandshakeEvent-cancellable.patch
@ -1,4 +1,4 @@
-From 8a5dda879ac3e69c9b1a31e1f5624270133a4b9a Mon Sep 17 00:00:00 2001
+From fe67e1b15da0cebd4aa08a848529845a194dff24 Mon Sep 17 00:00:00 2001
 From: foss-mc <69294560+foss-mc@users.noreply.github.com>
 Date: Wed, 16 Dec 2020 17:57:23 +0800
 Subject: [PATCH] Make PlayerHandshakeEvent cancellable
@ -52,5 +52,5 @@ index f6378e03..23571d40 100644
         switch ( handshake.getRequestedProtocol() )
         {
 -- 
-2.32.0.windows.1
+2.32.0

--- a/Waterfall-Proxy-Patches/0006-Make-a-getter-for-the-callback.patch
+++ b/Waterfall-Proxy-Patches/0006-Make-a-getter-for-the-callback.patch
@ -1,11 +1,11 @@
-From 397911abe1f38fc29509d1b54db5549ca5764cce Mon Sep 17 00:00:00 2001
+From c44b23dcab5a544424e6835060638e1bbf053ae2 Mon Sep 17 00:00:00 2001
 From: foss-mc <69294560+foss-mc@users.noreply.github.com>
 Date: Wed, 16 Dec 2020 17:58:18 +0800
 Subject: [PATCH] Make a getter for the callback


 diff --git a/api/src/main/java/net/md_5/bungee/api/event/AsyncEvent.java b/api/src/main/java/net/md_5/bungee/api/event/AsyncEvent.java
-index cf85ca06d..8a945a996 100644
+index cf85ca06..8a945a99 100644
 --- a/api/src/main/java/net/md_5/bungee/api/event/AsyncEvent.java
 +++ b/api/src/main/java/net/md_5/bungee/api/event/AsyncEvent.java
@@ -25,7 +25,8 @@ import net.md_5.bungee.api.plugin.Plugin;
@ -19,5 +19,5 @@ index cf85ca06d..8a945a996 100644
     private final Map<Plugin, AtomicInteger> intents = new ConcurrentHashMap<>();
     private final AtomicBoolean fired = new AtomicBoolean();
 -- 
-2.32.0.windows.1
+2.32.0

--- a/Waterfall-Proxy-Patches/0007-Disable-update-checker-Use-bungee-name.patch
+++ b/Waterfall-Proxy-Patches/0007-Disable-update-checker-Use-bungee-name.patch
@ -1,11 +1,11 @@
-From e546821e6a206365a2b569e803fe33e85a99a481 Mon Sep 17 00:00:00 2001
+From 11703076bee62715d944730066a85ed265510a55 Mon Sep 17 00:00:00 2001
 From: foss-mc <69294560+foss-mc@users.noreply.github.com>
 Date: Wed, 16 Dec 2020 18:00:49 +0800
 Subject: [PATCH] Disable update checker & Use bungee name


 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 25da0a65e..d4b612b36 100644
+index 25da0a65..d4b612b3 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
@@ -45,25 +45,12 @@ public class BungeeCordLauncher
@ -38,7 +38,7 @@ index 25da0a65e..d4b612b36 100644
 
         if ( !options.has( "noconsole" ) )
 diff --git a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
-index 9c11ac576..ae4c7ac25 100644
+index 9c11ac57..ae4c7ac2 100644
 --- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
 +++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
@@ -22,6 +22,7 @@ import java.util.Locale;
@ -70,5 +70,5 @@ index 9c11ac576..ae4c7ac25 100644
 
             int maxPlayers = get( "max_players", 1, val );
 -- 
-2.32.0.windows.1
+2.32.0

--- a/Waterfall-Proxy-Patches/0008-Change-replaceAll-to-replace.patch
+++ b/Waterfall-Proxy-Patches/0008-Change-replaceAll-to-replace.patch
@ -1,4 +1,4 @@
-From ea59533c1d800b45c6e2ccb905f29055e38b9452 Mon Sep 17 00:00:00 2001
+From 6d9ca4241f7afcfba08144a7e247bfc36a4d5990 Mon Sep 17 00:00:00 2001
 From: foss-mc <69294560+foss-mc@users.noreply.github.com>
 Date: Wed, 16 Dec 2020 18:01:37 +0800
 Subject: [PATCH] Change replaceAll() to replace()
@ -19,5 +19,5 @@ index 75028024..2ee16684 100644
                 // All done.
                 properties = newp;
 -- 
-2.32.0.windows.1
+2.32.0

--- a/Waterfall-Proxy-Patches/0009-Close-connections-Don-t-flush-if-not-necessary.patch
+++ b/Waterfall-Proxy-Patches/0009-Close-connections-Don-t-flush-if-not-necessary.patch
@ -1,4 +1,4 @@
-From 7c85f2aea606560d42e89e74c5f59feec583114c Mon Sep 17 00:00:00 2001
+From 4487e175bf2121239ffe3d12bb584c51fddb3e09 Mon Sep 17 00:00:00 2001
 From: foss-mc <69294560+foss-mc@users.noreply.github.com>
 Date: Wed, 16 Dec 2020 18:06:17 +0800
 Subject: [PATCH] Close connections & Don't flush if not necessary
@ -175,5 +175,5 @@ index 0c1ecfb8..b3bdfd05 100644
         }
 
 -- 
-2.32.0.windows.1
+2.32.0

--- a/Waterfall-Proxy-Patches/0010-Packet-Checks.patch
+++ b/Waterfall-Proxy-Patches/0010-Packet-Checks.patch
@ -1,11 +1,11 @@
-From 295841ad76a439554074bfde7813de1a487d20a5 Mon Sep 17 00:00:00 2001
+From 772e70bce0c9626cb3c724b7c30c4802f7311e63 Mon Sep 17 00:00:00 2001
 From: foss-mc <69294560+foss-mc@users.noreply.github.com>
 Date: Wed, 16 Dec 2020 18:10:30 +0800
 Subject: [PATCH] Packet Checks


 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
-index 01d35f41a..ec07ae6fd 100644
+index ac83e325..4b9b80b9 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
@@ -38,6 +38,19 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@ -29,7 +29,7 @@ index 01d35f41a..ec07ae6fd 100644
 
         Object packetTypeInfo = null;
 diff --git a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
-index f8d6becd6..336050075 100644
+index f8d6becd..33605007 100644
 --- a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
 +++ b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
@@ -78,6 +78,15 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
@ -49,5 +49,5 @@ index f8d6becd6..336050075 100644
         {
             HAProxyMessage proxy = (HAProxyMessage) msg;
 -- 
-2.32.0.windows.1
+2.32.0

--- a/Waterfall-Proxy-Patches/0011-Change-default-timeout.patch
+++ b/Waterfall-Proxy-Patches/0011-Change-default-timeout.patch
@ -1,11 +1,11 @@
-From 245d1262bdf112f20eba342196f07bd5036c62ea Mon Sep 17 00:00:00 2001
+From 36e054d017b32104a878faed79fb18b5d8b5c9df Mon Sep 17 00:00:00 2001
 From: foss-mc <69294560+foss-mc@users.noreply.github.com>
 Date: Wed, 16 Dec 2020 18:14:02 +0800
 Subject: [PATCH] Change default timeout


 diff --git a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
-index 85d2197ac..c41930ae7 100644
+index 85d2197a..3b5ce41e 100644
 --- a/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
 +++ b/proxy/src/main/java/net/md_5/bungee/conf/Configuration.java
@@ -35,7 +35,8 @@ public abstract class Configuration implements ProxyConfig
@ -19,5 +19,5 @@ index 85d2197ac..c41930ae7 100644
      * UUID used for metrics.
      */
 -- 
-2.32.0.windows.1
+2.32.0

--- a/Waterfall-Proxy-Patches/0012-Change-state-to-encrypt-only-if-onlineMode-is-true.patch
+++ b/Waterfall-Proxy-Patches/0012-Change-state-to-encrypt-only-if-onlineMode-is-true.patch
@ -1,4 +1,4 @@
-From d1b196832e3a6920299a047bfa7478254fab1182 Mon Sep 17 00:00:00 2001
+From f3f260439d3e290727bca84170308012220de21f Mon Sep 17 00:00:00 2001
 From: foss-mc <69294560+foss-mc@users.noreply.github.com>
 Date: Wed, 16 Dec 2020 18:25:03 +0800
 Subject: [PATCH] Change state to encrypt only if onlineMode is true
@ -18,5 +18,5 @@ index 1ec75614..5f583e6b 100644
                 {
                     thisState = State.FINISHING;
 -- 
-2.32.0.windows.1
+2.32.0

--- a/Waterfall-Proxy-Patches/0013-Don-t-allow-name-containing-dot.patch
+++ b/Waterfall-Proxy-Patches/0013-Don-t-allow-name-containing-dot.patch
@ -1,11 +1,11 @@
-From fd5189254c8261ce764428c1ab8ee302fc842ca3 Mon Sep 17 00:00:00 2001
+From 12dfe2f9bfb8251974d772be144a3d4cee6af772 Mon Sep 17 00:00:00 2001
 From: foss-mc <69294560+foss-mc@users.noreply.github.com>
 Date: Wed, 16 Dec 2020 18:25:51 +0800
 Subject: [PATCH] Don't allow name containing dot


 diff --git a/proxy/src/main/java/net/md_5/bungee/util/AllowedCharacters.java b/proxy/src/main/java/net/md_5/bungee/util/AllowedCharacters.java
-index d1cd10905..44cb1ce66 100644
+index d1cd1090..44cb1ce6 100644
 --- a/proxy/src/main/java/net/md_5/bungee/util/AllowedCharacters.java
 +++ b/proxy/src/main/java/net/md_5/bungee/util/AllowedCharacters.java
@@ -21,7 +21,8 @@ public final class AllowedCharacters
@ -19,5 +19,5 @@ index d1cd10905..44cb1ce66 100644
     }
 
 -- 
-2.32.0.windows.1
+2.32.0

--- a/Waterfall-Proxy-Patches/0014-Use-pipeline-to-reduce-redundancy.patch
+++ b/Waterfall-Proxy-Patches/0014-Use-pipeline-to-reduce-redundancy.patch
@ -1,11 +1,11 @@
-From 7182131a4230bc24a36f1f0fd7c155edb95e9361 Mon Sep 17 00:00:00 2001
+From 9bdca4aac70c33ec6cfdb26385dfd6644625edc7 Mon Sep 17 00:00:00 2001
 From: foss-mc <69294560+foss-mc@users.noreply.github.com>
 Date: Wed, 16 Dec 2020 18:30:07 +0800
 Subject: [PATCH] Use pipeline to reduce redundancy


 diff --git a/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java b/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
-index 5c05f2b94..606866a52 100644
+index 5c05f2b9..606866a5 100644
 --- a/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
 +++ b/proxy/src/main/java/net/md_5/bungee/netty/ChannelWrapper.java
@@ -5,6 +5,8 @@ import io.netty.channel.Channel;
@ -74,5 +74,5 @@ index 5c05f2b94..606866a52 100644
     }
 }
 -- 
-2.32.0.windows.1
+2.32.0

--- a/Waterfall-Proxy-Patches/0015-Allow-custom-uuids-even-if-onlineMode-is-true.patch
+++ b/Waterfall-Proxy-Patches/0015-Allow-custom-uuids-even-if-onlineMode-is-true.patch
@ -1,4 +1,4 @@
-From 2e9551451687de578103687f9c109fa0cb0941d9 Mon Sep 17 00:00:00 2001
+From 354740798d34dcf425060c6a078fbc3f8e2e4999 Mon Sep 17 00:00:00 2001
 From: foss-mc <69294560+foss-mc@users.noreply.github.com>
 Date: Wed, 16 Dec 2020 18:35:33 +0800
 Subject: [PATCH] Allow custom uuids even if onlineMode is true
@ -18,5 +18,5 @@ index 5f583e6b..ea4f37c5 100644
     }
 
 -- 
-2.32.0.windows.1
+2.32.0

--- a/Waterfall-Proxy-Patches/0016-Finish-early-to-avoid-multiple-incoming-packets.patch
+++ b/Waterfall-Proxy-Patches/0016-Finish-early-to-avoid-multiple-incoming-packets.patch
@ -1,4 +1,4 @@
-From 6515f2b44123bddf35ab541ed9a7489498e10099 Mon Sep 17 00:00:00 2001
+From 7580742f7c57391982e8d50f5ece95351d494560 Mon Sep 17 00:00:00 2001
 From: foss-mc <69294560+foss-mc@users.noreply.github.com>
 Date: Wed, 16 Dec 2020 18:36:08 +0800
 Subject: [PATCH] Finish early to avoid multiple incoming packets
@ -28,5 +28,5 @@ index ea4f37c5..6018dccf 100644
         {
             // Check for multiple connections
 -- 
-2.32.0.windows.1
+2.32.0

--- a/Waterfall-Proxy-Patches/0017-Change-IllegalStateException-to-QuietException-and-e.patch
+++ b/Waterfall-Proxy-Patches/0017-Change-IllegalStateException-to-QuietException-and-e.patch
@ -1,4 +1,4 @@
-From d3de5793409f78a1c29503afe900c04ce69f6b4d Mon Sep 17 00:00:00 2001
+From 9fd7c7d549ca2bffbf5121a98dbc425c197995e3 Mon Sep 17 00:00:00 2001
 From: foss-mc <69294560+foss-mc@users.noreply.github.com>
 Date: Wed, 16 Dec 2020 18:40:55 +0800
 Subject: [PATCH] Change IllegalStateException to QuietException and explain
@ -20,5 +20,5 @@ index 43042c6a..9b04f7ca 100644
             return;
         }
 -- 
-2.32.0.windows.1
+2.32.0

--- a/Waterfall-Proxy-Patches/0018-Don-t-declare-uuid-unless-it-s-null.patch
+++ b/Waterfall-Proxy-Patches/0018-Don-t-declare-uuid-unless-it-s-null.patch
@ -1,4 +1,4 @@
-From f62ce8fddd6ad50d94817ae022899a0ee529e47c Mon Sep 17 00:00:00 2001
+From 0334ea06032155229acf53b24afcc09275a295ec Mon Sep 17 00:00:00 2001
 From: foss-mc <69294560+foss-mc@users.noreply.github.com>
 Date: Wed, 16 Dec 2020 18:43:17 +0800
 Subject: [PATCH] Don't declare uuid unless it's null
@ -21,5 +21,5 @@ index 6018dccf..cec2fc00 100644
                         return;
                     }
 -- 
-2.32.0.windows.1
+2.32.0

--- a/Waterfall-Proxy-Patches/0019-FlameCord-General-Patch.patch
+++ b/Waterfall-Proxy-Patches/0019-FlameCord-General-Patch.patch
@ -1,4 +1,4 @@
-From adc72a242925985dee8270c4b7233a14f8d7938c Mon Sep 17 00:00:00 2001
+From 05455904f913721d646db1e34337e450d144e618 Mon Sep 17 00:00:00 2001
 From: Juan Cruz Linsalata <LinsaFTW@users.noreply.github.com>
 Date: Mon, 12 Oct 2020 15:40:53 -0300
 Subject: [PATCH] FlameCord General Patch
@ -116,7 +116,7 @@ index 00000000..81ded224
 +    }
 +}
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
-index ec07ae6f..91da8ab6 100644
+index 4b9b80b9..aa35f870 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
@@ -1,5 +1,6 @@
@ -191,7 +191,7 @@ index 00000000..a323598e
 +    }
 +}
 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 b914b5c2..719e73e4 100644
+index 8ce69d2f..727d0165 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -9,6 +9,8 @@ import com.google.common.collect.Sets;
@ -365,5 +365,5 @@ index 654203ab..a840bc70 100644
 import io.netty.buffer.PooledByteBufAllocator;
 import io.netty.channel.Channel;
 -- 
-2.32.0.windows.1
+2.32.0

--- a/Waterfall-Proxy-Patches/0020-FlameCord-module-system.patch
+++ b/Waterfall-Proxy-Patches/0020-FlameCord-module-system.patch
@ -1,4 +1,4 @@
-From b7dab4ca2f05f09e2e48856bdf5c402d00bd06ea Mon Sep 17 00:00:00 2001
+From d1ed6cb5cb2eb4a7a6e17455498d26cf2d8e2661 Mon Sep 17 00:00:00 2001
 From: linsaftw <25271111+linsaftw@users.noreply.github.com>
 Date: Sat, 1 May 2021 14:17:48 -0300
 Subject: [PATCH] FlameCord module system
@ -134,7 +134,7 @@ index 00000000..e82c4844
 +        }
 +}
 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 719e73e4..536c6052 100644
+index 727d0165..bb532698 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -11,6 +11,8 @@ import com.google.gson.Gson;
@ -236,5 +236,5 @@ index 719e73e4..536c6052 100644
 +    }
 }
 -- 
-2.33.0.windows.2
+2.32.0

--- a/Waterfall-Proxy-Patches/0021-FlameCord-message-configuration.patch
+++ b/Waterfall-Proxy-Patches/0021-FlameCord-message-configuration.patch
@ -1,4 +1,4 @@
-From 30cf3c288a1222d0bc674b91fb9c4aac98734dd6 Mon Sep 17 00:00:00 2001
+From 6f160c7e61e50eb5cca48f1881a4ab051a30c07f Mon Sep 17 00:00:00 2001
 From: linsaftw <25271111+linsaftw@users.noreply.github.com>
 Date: Sat, 1 May 2021 13:40:39 -0300
 Subject: [PATCH] FlameCord message configuration
@ -209,7 +209,7 @@ index a323598e..bf6f8538 100644
     }
 }
 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 536c6052..2327e5e3 100644
+index bb532698..2232b9d5 100644
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
@@ -597,14 +597,8 @@ public class BungeeCord extends ProxyServer
@ -230,5 +230,5 @@ index 536c6052..2327e5e3 100644
 
     @Override
 -- 
-2.33.0.windows.2
+2.32.0

--- a/Waterfall-Proxy-Patches/0022-Fix-ByteBuf-memory-leaks.patch
+++ b/Waterfall-Proxy-Patches/0022-Fix-ByteBuf-memory-leaks.patch
@ -1,4 +1,4 @@
-From 09a2ffeb9e770078c9b024016fc708c6a04a371e Mon Sep 17 00:00:00 2001
+From 02edb203875d8fc08fc20f529b7a401a8b797755 Mon Sep 17 00:00:00 2001
 From: linsaftw <linsaftw@users.noreply.github.com>
 Date: Sat, 20 Mar 2021 12:36:25 -0300
 Subject: [PATCH] Fix ByteBuf memory leaks
@ -64,5 +64,5 @@ index cefa0206..8d4439ab 100644
     }
 
 -- 
-2.33.0.windows.2
+2.32.0

--- a/Waterfall-Proxy-Patches/0023-Check-if-packetID-is-invalid.patch
+++ b/Waterfall-Proxy-Patches/0023-Check-if-packetID-is-invalid.patch
@ -1,11 +1,11 @@
-From bbcf8ceff1a4dc626dd39f2bc31f6bceae1ac913 Mon Sep 17 00:00:00 2001
+From 4b25defca624ad1857a7474ff85162f11befb2a6 Mon Sep 17 00:00:00 2001
 From: PermisosDev <55111245+PermisosDev@users.noreply.github.com>
 Date: Thu, 15 Apr 2021 08:34:57 -0300
 Subject: [PATCH] Check if packetID is invalid.


 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
-index 91da8ab65..c03e1b513 100644
+index aa35f870..3992f521 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
@@ -65,7 +65,12 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@ -23,5 +23,5 @@ index 91da8ab65..c03e1b513 100644
             if ( packet != null )
             {
 -- 
-2.32.0.windows.1
+2.32.0

--- a/Waterfall-Proxy-Patches/0024-Firewall-System.patch
+++ b/Waterfall-Proxy-Patches/0024-Firewall-System.patch
@ -1,4 +1,4 @@
-From 157518ad0bfc96a066af7348b3cf01fc3efd24bf Mon Sep 17 00:00:00 2001
+From 1fea7bc25b55797f2a9bc2f60f740dafa20ae23e Mon Sep 17 00:00:00 2001
 From: linsaftw <25271111+linsaftw@users.noreply.github.com>
 Date: Fri, 30 Apr 2021 22:54:44 -0300
 Subject: [PATCH] Firewall System
@ -246,7 +246,7 @@ index 00000000..dfb5c6d3
 +}
 \ No newline at end of file
 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
-index c03e1b51..7f4b5b45 100644
+index 3992f521..68d41a89 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/MinecraftDecoder.java
@@ -46,8 +46,14 @@ public class MinecraftDecoder extends MessageToMessageDecoder<ByteBuf>
@ -445,5 +445,5 @@ index b3bdfd05..49d53f17 100644
                 throw new IllegalStateException( "Invalid data request packet" );
             }
 -- 
-2.32.0.windows.1
+2.32.0

--- a/Waterfall-Proxy-Patches/0025-FlameCord-logger-options.patch
+++ b/Waterfall-Proxy-Patches/0025-FlameCord-logger-options.patch
@ -1,4 +1,4 @@
-From 5127c5564e60fe2e59d0ad210b46b0de2cc06711 Mon Sep 17 00:00:00 2001
+From 28b2466c5993962d31f07bcf0d7bb6e2d5a8f314 Mon Sep 17 00:00:00 2001
 From: linsaftw <25271111+linsaftw@users.noreply.github.com>
 Date: Fri, 30 Apr 2021 23:51:51 -0300
 Subject: [PATCH] FlameCord logger options
@ -113,5 +113,5 @@ index 22414686..fbc19f66 100644
             {
                 if ( cause instanceof ReadTimeoutException )
 -- 
-2.32.0.windows.1
+2.32.0

--- a/Waterfall-Proxy-Patches/0026-Always-release-packets.patch
+++ b/Waterfall-Proxy-Patches/0026-Always-release-packets.patch
@ -1,11 +1,11 @@
-From 5f8c739acdbcaf1e2e38fab2541c1d4e3a4c2638 Mon Sep 17 00:00:00 2001
+From cb73112031261bc3a8c654d8b111de99d225a84b Mon Sep 17 00:00:00 2001
 From: linsaftw <25271111+linsaftw@users.noreply.github.com>
 Date: Sat, 1 May 2021 23:28:19 -0300
 Subject: [PATCH] Always release packets


 diff --git a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
-index fbc19f66b..a2bd24107 100644
+index fbc19f66..a2bd2410 100644
 --- a/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
 +++ b/proxy/src/main/java/net/md_5/bungee/netty/HandlerBoss.java
@@ -117,12 +117,14 @@ public class HandlerBoss extends ChannelInboundHandlerAdapter
@ -42,5 +42,5 @@ index fbc19f66b..a2bd24107 100644
     }
 
 -- 
-2.32.0.windows.1
+2.32.0

--- a/Waterfall-Proxy-Patches/0027-Added-an-api-method-to-unload-Plugins.patch
+++ b/Waterfall-Proxy-Patches/0027-Added-an-api-method-to-unload-Plugins.patch
@ -1,4 +1,4 @@
-From f9314b3f2dce279120c4b7408b6afcc0eef1590d Mon Sep 17 00:00:00 2001
+From 07cb259b14e70333203abbdba71f808c30d42212 Mon Sep 17 00:00:00 2001
 From: abhiram <abhithegamer2019@gmail.com>
 Date: Thu, 13 May 2021 01:05:03 +0530
 Subject: [PATCH] Added an api method to unload Plugins
@ -6,7 +6,7 @@ Subject: [PATCH] Added an api method to unload Plugins
 Format Code to Bungee's code style

 diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
-index 90031156f..a190dfae8 100644
+index 90031156..a190dfae 100644
 --- a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
 +++ b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
@@ -25,6 +25,7 @@ import java.util.Set;
@ -82,5 +82,5 @@ index 90031156f..a190dfae8 100644
                 ProxyServer.getInstance().getLogger().log( Level.INFO, "Loaded plugin {0} version {1} by {2}", new Object[]
                 {
 -- 
-2.32.0.windows.1
+2.32.0

--- a/Waterfall-Proxy-Patches/0028-Apply-packet-limits.patch
+++ b/Waterfall-Proxy-Patches/0028-Apply-packet-limits.patch
@ -1,11 +1,11 @@
-From 872fdc668b2bd4ce164b15b24e9a15426f1e85e1 Mon Sep 17 00:00:00 2001
+From d85700309c2f2e6dcb87a572566072dfea72d82b Mon Sep 17 00:00:00 2001
 From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
 Date: Thu, 10 Jun 2021 11:30:19 -0300
 Subject: [PATCH] Apply packet limits


 diff --git a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Handshake.java b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Handshake.java
-index 7dbbfd3cd..e903313df 100644
+index 7dbbfd3c..e903313d 100644
 --- a/protocol/src/main/java/net/md_5/bungee/protocol/packet/Handshake.java
 +++ b/protocol/src/main/java/net/md_5/bungee/protocol/packet/Handshake.java
@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
@ -32,5 +32,5 @@ index 7dbbfd3cd..e903313df 100644
 +    }
 }
 -- 
-2.32.0.windows.1
+2.32.0

--- a/Waterfall-Proxy-Patches/0029-Custom-motd-system.patch
+++ b/Waterfall-Proxy-Patches/0029-Custom-motd-system.patch
@ -1,4 +1,4 @@
-From 5be0acb0644d94bb1a2e94ed6ec680e6166f16e7 Mon Sep 17 00:00:00 2001
+From 9e52562225da34ff7c905e2ed1ddaa5e7533686c Mon Sep 17 00:00:00 2001
 From: LinsaFTW <25271111+linsaftw@users.noreply.github.com>
 Date: Thu, 7 Oct 2021 21:37:24 -0300
 Subject: [PATCH] Custom motd system
@ -68,5 +68,5 @@ index d1f2ea13..51b5afc2 100644
 
         Callback<ServerPing> pingBack = new Callback<ServerPing>()
 -- 
-2.32.0.windows.1
+2.32.0

--- a/pom.xml
+++ b/pom.xml
@ -3,16 +3,16 @@
    <modelVersion>4.0.0</modelVersion>

    <groupId>io.github.waterfallmc</groupId>
-    <artifactId>flamecord-super</artifactId>
+    <artifactId>waterfall-super</artifactId>
    <version>dev-SNAPSHOT</version>
    <packaging>pom</packaging>

-    <name>FlameCord-Super</name>
+    <name>Waterfall-Super</name>
    <description>Super project for FlameCord.</description>
    <url>https://github.com/2lstudios-mc/FlameCord</url>

    <modules>
-        <module>FlameCord-Proxy</module>
+        <module>Waterfall-Proxy</module>
    </modules>

    <build>