Update most if not all of the branding to MangoCord

Waterfall-Proxy-Patches/0001-FlameCord-POM-Changes.patch → Waterfall-Proxy-Patches/0001-MangoCord-POM-Changes.patch

@@ -1,14 +1,14 @@
 From 26e96485a5f9ae0a87a69dbf7754f9920aec7aa0 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
+Subject: [PATCH] MangoCord POM Changes
 
 
-diff --git a/flamecord/pom.xml b/flamecord/pom.xml
+diff --git a/mangocord/pom.xml b/mangocord/pom.xml
 new file mode 100644
 index 00000000..20edd900
 --- /dev/null
-+++ b/flamecord/pom.xml
++++ b/mangocord/pom.xml
 @@ -0,0 +1,44 @@
 +<project xmlns="http://maven.apache.org/POM/4.0.0"
 +    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -21,12 +21,12 @@ index 00000000..20edd900
 +        <relativePath>../pom.xml</relativePath>
 +    </parent>
 +
-+    <groupId>dev._2lstudios</groupId>
-+    <artifactId>waterfall-flamecord</artifactId>
++    <groupId>dev.lucianishimiya</groupId>
++    <artifactId>waterfall-mangocord</artifactId>
 +    <version>1.19-R0.1-SNAPSHOT</version>
 +    <packaging>jar</packaging>
 +
-+    <name>Waterfall-FlameCord</name>
++    <name>Waterfall-MangoCord</name>
 +    <description>Mangocord adds security essentials and new configuration options</description>
 +
 +    <dependencies>
@@ -62,7 +62,7 @@ index d333a528..88d0f3fa 100644
          <module>query</module>
          <!--<module>slf4j</module>-->
          <module>native</module>
-+        <module>flamecord</module> <!-- FlameCord - POM Changes -->
++        <module>mangocord</module> <!-- MangoCord - POM Changes -->
      </modules>
 
      <scm>
@@ -75,14 +75,14 @@ index c6105b87..ae7cf9f7 100644
              <scope>compile</scope>
          </dependency>
 +
-+        <!-- FlameCord start - Add our dependencies -->
++        <!-- MangoCord start - Add our dependencies -->
 +        <dependency>
-+            <groupId>dev._2lstudios</groupId>
-+            <artifactId>waterfall-flamecord</artifactId>
++            <groupId>dev.lucianishimiya</groupId>
++            <artifactId>waterfall-mangocord</artifactId>
 +            <version>${project.version}</version>
 +            <scope>compile</scope>
 +        </dependency>
-+        <!-- FlameCord end -->
++        <!-- MangoCord end -->
      </dependencies>
  </project>
 diff --git a/proxy/pom.xml b/proxy/pom.xml
@@ -94,10 +94,10 @@ index 83d8719b..896770ae 100644
          </dependency>
          <!-- Waterfall end -->
 +        
-+        <!-- FlameCord start - Add our dependencies -->
++        <!-- MangoCord start - Add our dependencies -->
 +        <dependency>
-+            <groupId>dev._2lstudios</groupId>
-+            <artifactId>waterfall-flamecord</artifactId>
++            <groupId>dev.lucianishimiya</groupId>
++            <artifactId>waterfall-mangocord</artifactId>
 +            <version>${project.version}</version>
 +            <scope>compile</scope>
 +        </dependency>
@@ -137,7 +137,7 @@ index 83d8719b..896770ae 100644
 +            <version>${project.version}</version>
 +            <scope>compile</scope>
 +        </dependency>
-+        <!-- FlameCord end -->
++        <!-- MangoCord end -->
      </dependencies>
 
      <!-- Waterfall start - copy license files into jar -->

Waterfall-Proxy-Patches/0002-Rename-references-from-Waterfall-to-FlameCord.patch

@@ -1,7 +1,7 @@
 From 5b40e2e22fb37fb5aa2b34d3a6b14bd91e7e72fa 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
+Subject: [PATCH] Rename references from Waterfall to MangoCord
 
 
 diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
@@ -13,7 +13,7 @@ index 688f1b995..b0b0d33eb 100644
 
      <build>
 -        <finalName>Waterfall</finalName>
-+        <finalName>Mangocord</finalName>
++        <finalName>MangoCord</finalName>
          <plugins>
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
@@ -26,7 +26,7 @@ index a4516ed96..9838f5c55 100644
          if ( Float.parseFloat( System.getProperty( "java.class.version" ) ) < 52.0 )
          {
 -            System.err.println( "*** ERROR *** Waterfall requires Java 8 or above to function! Please download and install it!" );
-+            System.err.println( "*** ERROR *** FlameCord requires Java 8 or above to function! Please download and install it!" );
++            System.err.println( "*** ERROR *** MangoCord requires Java 8 or above to function! Please download and install it!" );
              System.out.println( "You can check your Java version with the command: java -version" );
              return;
          }
@@ -52,7 +52,7 @@ index e0fcd8fbe..8617cdc7a 100644
      {
          // Java uses ! to indicate a resource inside of a jar/zip/other container. Running Bungee from within a directory that has a ! will cause this to muck up.
 -        Preconditions.checkState( new File( "." ).getAbsolutePath().indexOf( '!' ) == -1, "Cannot use Waterfall in directory with ! in path." );
-+        Preconditions.checkState( new File( "." ).getAbsolutePath().indexOf( '!' ) == -1, "Cannot use FlameCord in directory with ! in path." );
++        Preconditions.checkState( new File( "." ).getAbsolutePath().indexOf( '!' ) == -1, "Cannot use MangoCord in directory with ! in path." );
 
          reloadMessages();
 
@@ -74,7 +74,7 @@ index 96a9998d1..463bc3d53 100644
          BungeeCord bungee = new BungeeCord();
          ProxyServer.setInstance( bungee );
 -        bungee.getLogger().info( "Enabled Waterfall version " + bungee.getVersion() );
-+        bungee.getLogger().info( "Enabled FlameCord version " + bungee.getVersion() );
++        bungee.getLogger().info( "Enabled MangoCord version " + bungee.getVersion() );
          bungee.start();
 
          if ( !options.has( "noconsole" ) )
@@ -87,7 +87,7 @@ index b26035cf9..820f7b03c 100644
      public void execute(CommandSender sender, String[] args)
      {
 -        sender.sendMessage( ChatColor.BLUE + "This server is running Waterfall version " + ProxyServer.getInstance().getVersion() + " by md_5" );
-+        sender.sendMessage( ChatColor.BLUE + "This server is running FlameCord version " + ProxyServer.getInstance().getVersion() + " by md_5" );
++        sender.sendMessage( ChatColor.BLUE + "This server is running MangoCord version " + ProxyServer.getInstance().getVersion() + " by md_5" );
      }
  }
 diff --git a/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java b/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java
@@ -100,8 +100,8 @@ index 720d0c3b5..5ab4db189 100644
 
 -        sender.sendMessage( ChatColor.BOLD.toString() + ChatColor.RED.toString() + "Waterfall has been reloaded."
 -                + " This is NOT advisable and you will not be supported with any issues that arise! Please restart Waterfall ASAP." );
-+        sender.sendMessage( ChatColor.BOLD.toString() + ChatColor.RED.toString() + "FlameCord has been reloaded."
-+                + " This is NOT advisable and you will not be supported with any issues that arise! Please restart FlameCord ASAP." );
++        sender.sendMessage( ChatColor.BOLD.toString() + ChatColor.RED.toString() + "MangoCord has been reloaded."
++                + " This is NOT advisable and you will not be supported with any issues that arise! Please restart MangoCord ASAP." );
      }
  }
 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
@@ -113,7 +113,7 @@ index 0dd69778b..9abae0b61 100644
              String name = entry.getKey();
              String addr = get( "address", "localhost:25565", val );
 -            String motd = ChatColor.translateAlternateColorCodes( '&', get( "motd", "&1Just another Waterfall - Forced Host", val ) );
-+            String motd = ChatColor.translateAlternateColorCodes( '&', get( "motd", "&1Just another FlameCord - Forced Host", val ) );
++            String motd = ChatColor.translateAlternateColorCodes( '&', get( "motd", "&1Just another MangoCord - Forced Host", val ) );
              boolean restricted = get( "restricted", false, val );
              SocketAddress address = Util.getAddr( addr );
              ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );

Waterfall-Proxy-Patches/0003-FlameCord-rebrand.patch → Waterfall-Proxy-Patches/0003-MangoCord-rebrand.patch

@@ -1,7 +1,7 @@
 From 557632e0bdbbc0ddd6d9de6ed48773f00718f4b7 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
+Subject: [PATCH] MangoCord rebrand
 
 
 diff --git a/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java b/proxy/src/main/java/io/github/waterfallmc/waterfall/conf/WaterfallConfiguration.java
@@ -13,7 +13,7 @@ index da0efa36..966d2442 100644
          config.load(false); // Load, but no permissions
          logInitialHandlerConnections = config.getBoolean( "log_initial_handler_connections", logInitialHandlerConnections );
 -        gameVersion = config.getString("game_version", "").isEmpty() ? Joiner.on(", ").join(ProtocolConstants.SUPPORTED_VERSIONS) : config.getString("game_version", "");
-+        // FlameCord - Make the version look better
++        // MangoCord - Make the version look better
 +        gameVersion = config.getString("game_version", "").isEmpty() ? ProtocolConstants.SUPPORTED_VERSIONS.get(0) + "-" + ProtocolConstants.SUPPORTED_VERSIONS.get(ProtocolConstants.SUPPORTED_VERSIONS.size() - 1) : config.getString("game_version", "");
          useNettyDnsResolver = config.getBoolean("use_netty_dns_resolver", useNettyDnsResolver);
          // Throttling options
@@ -39,9 +39,9 @@ index 820f7b03..76f5fed7 100644
      @Override
      public void execute(CommandSender sender, String[] args)
      {
--        sender.sendMessage( ChatColor.BLUE + "This server is running FlameCord version " + ProxyServer.getInstance().getVersion() + " by md_5" );
-+        // FlameCord - Use custom version message
-+        sender.sendMessage( net.md_5.bungee.api.chat.TextComponent.fromLegacyText( ChatColor.translateAlternateColorCodes( '&', "&eThis server is running &c" + ProxyServer.getInstance().getName() + "&e version &a" + ProxyServer.getInstance().getVersion() + "&e by &bArkFlame Development&e." ) ) );
+-        sender.sendMessage( ChatColor.BLUE + "This server is running MangoCord version " + ProxyServer.getInstance().getVersion() + " by md_5" );
++        // MangoCord - Use custom version message
++        sender.sendMessage( net.md_5.bungee.api.chat.TextComponent.fromLegacyText( ChatColor.translateAlternateColorCodes( '&', "&eThis server is running &c" + ProxyServer.getInstance().getName() + "&e version &a" + ProxyServer.getInstance().getVersion() + "&e by &bLuciaNishimiya Development&e." ) ) );
      }
  }
 diff --git a/query/src/main/java/net/md_5/bungee/query/QueryHandler.java b/query/src/main/java/net/md_5/bungee/query/QueryHandler.java
@@ -53,8 +53,8 @@ index 0c1ecfb8..b2b19996 100644
              List<String> players = bungee.getPlayers().stream().map(ProxiedPlayer::getName).collect(Collectors.toList());
 
 -            ProxyQueryEvent event = new ProxyQueryEvent(listener, new QueryResult(listener.getMotd(), "SMP", "Waterfall_Proxy",
-+            // FlameCord - Rebrand 
-+            ProxyQueryEvent event = new ProxyQueryEvent(listener, new QueryResult(listener.getMotd(), "SMP", "FlameCord_Proxy",
++            // MangoCord - Rebrand 
++            ProxyQueryEvent event = new ProxyQueryEvent(listener, new QueryResult(listener.getMotd(), "SMP", "MangoCord_Proxy",
                      bungee.getOnlineCount(), listener.getMaxPlayers(), listener.getHost().getPort(),
                      listener.getHost().getHostString(), "MINECRAFT",  players, bungee.getGameVersion()));
              QueryResult result = bungee.getPluginManager().callEvent(event).getResult();