New features were added, correcting many errors. There was also a nam…

…e change in the configuration file, now it is called mangocord.yml.

.gitignore

@@ -1,10 +1,12 @@
-FlameCord-Proxy
+MangoCord-Proxy/
+
 
 # intellij
 *.iml
 *.ipr
 *.iws
 .idea/
+.vscode/
 out/
 
 .project

README.md

@@ -28,8 +28,17 @@ https://discord.gg/PeS8h8eJZJ
 
 * **Exploit Fixes**: MangoCord specializes in providing better server security by fixing major exploits, performance flaws and bugs that Bungeecord already has, and that have not yet been fixed in WaterfallMC.
 
+## Commands
+- /mangocord firewall <add/remove> <ip> > Firewall certain ips!
+- /bplugins > Show the plugin list!
+- /bip <player> > Show the ip and info of a player!
+- /mangocord stats > Displays flamecord stats!
+- /mangocord help > Shows this message!
 
-MangoCord is a FlameCord and Waterfall fork that protects your server from bot attacks and exploits done to your Minecraft Server by minimizing the impact received by those with our advanced set of antibot filtering features. MangoCord improves your server performance and reduces your CPU usage by cutting the amount of processes required to process packets. MangoCord has free official and community support on our Discord server. https://discord.gg/PeS8h8eJZJ . Visit our detailed guide to MangoCord configuration to know more about it's features and how to configure them.
+
+## MangoCord
+
+MangoCord is a Waterfall fork that protects your server from bot attacks and exploits done to your Minecraft Server by minimizing the impact received by those with our advanced set of antibot filtering features. MangoCord improves your server performance and reduces your CPU usage by cutting the amount of processes required to process packets. MangoCord has free official and community support on our Discord server. https://discord.gg/PeS8h8eJZJ . Visit our detailed guide to MangoCord configuration to know more about it's features and how to configure them.
 
 
 ## Why fork Waterfall?
@@ -42,13 +51,13 @@ MangoCord  will track upstream Waterfall and merge changes as needed.
 
 Just drag an drop MangoCord .jar into your server folder and run it.
 
-You can customize many MangoCord  features in the flamecord.yml file.
+You can customize many MangoCord  features in the mangocord.yml file.
 
 ## How To (Compiling from source)
 
 To compile MangoCord, you need JDK8 or above, git, bash, maven, and an internet connection.
 
-Clone this repo, run `./mangocord b` from *bash*, get jar from `FlameCord-Proxy/bootstrap/target`
+Clone this repo, run `./mangocord b` from *bash*, get jar from `MangoCord-Proxy/bootstrap/target`
 
 Mangocord is compiled like Waterfall does; Please follow the [CONTRIBUTING.md](https://github.com/LuciaNishimiya/MangoCord/blob/main/CONTRIBUTING.md) file. If you need help you can always contact us on Discord.
 

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

@@ -27,7 +27,7 @@ index 00000000..20edd900
 +    <packaging>jar</packaging>
 +
 +    <name>Waterfall-FlameCord</name>
-+    <description>FlameCord adds security essentials and new configuration options</description>
++    <description>Mangocord adds security essentials and new configuration options</description>
 +
 +    <dependencies>
 +        <dependency>

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

@@ -39,7 +39,7 @@ index d703d6d24..49dce84ba 100644
      public LogDispatcher(BungeeLogger logger)
      {
 -        super( "Waterfall Logger Thread" );
-+        super( "FlameCord Logger Thread" );
++        super( "Mangocord Logger Thread" );
          this.logger = logger;
      }
 

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

@@ -27,7 +27,7 @@ index d6bda021..77ababc1 100644
      public String getVersion()
      {
 -        return ( BungeeCord.class.getPackage().getImplementationVersion() == null ) ? "unknown" : BungeeCord.class.getPackage().getImplementationVersion();
-+        return "1.5.5";
++        return "1.5.6";
      }
 
      public final void reloadMessages()

Waterfall-Proxy-Patches/0018-FlameCord-General-Patch.patch

@@ -162,7 +162,7 @@ index 00000000..241e8ed9
 +
 +public class FlameCordConfiguration extends FlameConfig {
 +    public FlameCordConfiguration(final ConfigurationProvider configurationProvider, final Collection<String> whitelistedAddresses) {
-+        final File configurationFile = new File("./flamecord.yml");
++        final File configurationFile = new File("./mangocord.yml");
 +        final Configuration configuration = load(configurationFile);
 +
 +        save(configuration, configurationFile);
@@ -201,7 +201,7 @@ index 00000000..021b38d4
 +private final BungeeCord bungeeCord;
 +
 +    public FlameCordCommand(final BungeeCord bungeeCord) {
-+        super("flamecord");
++        super("mangocord");
 +
 +        this.bungeeCord = bungeeCord;
 +    }
@@ -210,7 +210,7 @@ index 00000000..021b38d4
 +    public void execute(final CommandSender sender, final String[] args) {
 +        final FlameCord flameCord = FlameCord.getInstance();
 +
-+        if (sender.hasPermission("flamecord.usage")) {
++        if (sender.hasPermission("mangocord.usage")) {
 +            if (args.length > 0) {
 +                final String arg0 = args[0];
 +

Waterfall-Proxy-Patches/0020-FlameCord-message-configuration.patch

@@ -64,7 +64,7 @@ index 00000000..ae179438
 +		// FlameCord
 +		setIfUnexistant("flamecord_reload", "&aAll files had been successfully reloaded!", configuration);
 +		setIfUnexistant("flamecord_help",
-+				"&aMangocord&b {0}&a by&b LuciaNishimiya\n&e /flamecord&7 >&b Reloads Mangocord files!\n&e /flamecord firewall <add/remove> <ip>&7 >&b Firewall certain ips!\n&e /bplugins&7 >&b Show the plugin list!\n&e /bip <player>&7 >&b Show the ip and info of a player!\n&e /flamecord stats&7 >&b Displays flamecord stats!\n&e /flamecord help&7 >&b Shows this message!\n&c join our discord >&b https://discord.gg/VmcKYCmQPn ",
++				"&aMangocord&b {0}&a by&b LuciaNishimiya\n&e /mangocord reload&7 >&b Reloads Mangocord files!\n&e /mangocord firewall <add/remove> <ip>&7 >&b Firewall certain ips!\n&e /bplugins&7 >&b Show the plugin list!\n&e /bip <player>&7 >&b Show the ip and info of a player!\n&e /mangocord stats&7 >&b Displays flamecord stats!\n&e /mangocord help&7 >&b Shows this message!\n&c join our discord >&b https://discord.gg/VmcKYCmQPn ",
 +				configuration);
 +		setIfUnexistant("flamecord_nopermission", "&cYou don't have permission to do this!", configuration);
 +
@@ -175,7 +175,7 @@ index 021b38d4..fb81adee 100644
          final FlameCord flameCord = FlameCord.getInstance();
 +        final MessagesConfiguration messagesConfiguration = flameCord.getMessagesConfiguration();
 
-         if (sender.hasPermission("flamecord.usage")) {
+         if (sender.hasPermission("mangocord.usage")) {
              if (args.length > 0) {
 @@ -38,21 +40,22 @@ private final BungeeCord bungeeCord;
 

Waterfall-Proxy-Patches/0023-FlameCord-logger-options.patch

@@ -24,7 +24,7 @@ index 241e8ed9..b563cbce 100644
 +    private boolean loggerDetailedConnection = true;
 +
      public FlameCordConfiguration(final ConfigurationProvider configurationProvider, final Collection<String> whitelistedAddresses) {
-         final File configurationFile = new File("./flamecord.yml");
+         final File configurationFile = new File("./mangocord.yml");
          final Configuration configuration = load(configurationFile);
 
 +        this.loggerInitialhandler = setIfUnexistant("logger.initialhandler", this.loggerInitialhandler, configuration);

Waterfall-Proxy-Patches/0026-Custom-motd-system.patch

@@ -72,12 +72,12 @@ index b563cbce..b41ee92c 100644
 +
 +    @Getter
 +    private boolean motdEnabled = false;
-+    private List<String> motds = Collections.singletonList("&eDefault &cMangoCord&e server &7(%onlineplayers%/%maxplayers%)\n&eEdit on &cflamecord.yml&7 (IridiumColorAPI HEX)");
++    private List<String> motds = Collections.singletonList("&eDefault &cMangoCord&e server &7(%onlineplayers%/%maxplayers%)\n&eEdit on &cmangocord.yml&7 (IridiumColorAPI HEX)");
 +    private List<String> hexMotds;
 +
 +    @Getter
 +    private boolean sampleEnabled = false;
-+    private List<String> samples = Collections.singletonList("&eDefault &cMangoCord&e server &7(%onlineplayers%/%maxplayers%)\n&eEdit on &cflamecord.yml&7 (IridiumColorAPI HEX)");
++    private List<String> samples = Collections.singletonList("&eDefault &cMangoCord&e server &7(%onlineplayers%/%maxplayers%)\n&eEdit on &cmangocord.yml&7 (IridiumColorAPI HEX)");
 +    private List<String> hexSamples;
 +
 +    @Getter

Waterfall-Proxy-Patches/0028-Antibot-System.patch

@@ -1730,7 +1730,7 @@ index ae179438..820b012b 100644
 +		setIfUnexistant("antibot_proxy", "&c&lMangoCord\n\n&cYou are using a Proxy/VPN! ({0})\n\n&cError? Contact us on discord.gg/VmcKYCmQPn", configuration);
 +		setIfUnexistant("antibot_stats", "&c&lMangoCord Antibot Stats\n &7■ Total Pings: &a{0}\n &7■ Total Connections: &b{1}\n\n &7■ Current Pings: &a{2}\n &7■ Current Connections: &b{3}", configuration);
 +		
-+		setIfUnexistant("flamecord_firewall_help", "&c/flamecord firewall <add/remove> <ip>", configuration);
++		setIfUnexistant("flamecord_firewall_help", "&c/mangocord firewall <add/remove> <ip>", configuration);
 +		setIfUnexistant("flamecord_firewall_add", "&cThe ip {0} was added to the firewall!", configuration);
 +		setIfUnexistant("flamecord_firewall_remove", "&cThe ip {0} was removed from the firewall!", configuration);
 +		// FlameCord end - Antibot System
@@ -1880,7 +1880,7 @@ index fb81adee..56bc46eb 100644
  import net.md_5.bungee.api.CommandSender;
 @@ -27,9 +28,7 @@ private final BungeeCord bungeeCord;
 
-         if (sender.hasPermission("flamecord.usage")) {
+         if (sender.hasPermission("mangocord.usage")) {
              if (args.length > 0) {
 -                final String arg0 = args[0];
 -

Waterfall-Proxy-Patches/0036-Bungee-Plugins-Command.patch

@@ -48,7 +48,7 @@ index 00000000..2e20e9dc
 +        final FlameCord flameCord = FlameCord.getInstance();
 +        final MessagesConfiguration messagesConfiguration = flameCord.getMessagesConfiguration();
 +
-+        if (sender.hasPermission("flamecord.usage")) {
++        if (sender.hasPermission("mangocord.usage")) {
 +            Collection<Plugin> plugins = BungeeCord.getInstance().getPluginManager().getPlugins();
 +            int amount = plugins.size();
 +            String header = FlameCord.getInstance().getMessagesConfiguration().getTranslation("flamecord_bplugins_header", amount);

scripts/applyPatches.sh

@@ -68,6 +68,6 @@ popd
 basedir=$(dirname "$basedir")
 
 # Apply flamecord patches
-applyPatch Waterfall/Waterfall-Proxy FlameCord-Proxy HEAD
+applyPatch Waterfall/Waterfall-Proxy MangoCord-Proxy HEAD
 
 enableCommitSigningIfNeeded

scripts/build.sh

@@ -2,6 +2,6 @@
 
 git submodule update --recursive --init && ./scripts/applyPatches.sh
 if [ "$1" == "--jar" ]; then
-    pushd FlameCord-Proxy
+    pushd MangoCord-Proxy
     mvn clean package
 fi

scripts/rebuildPatches.sh

@@ -57,5 +57,5 @@ function savePatches {
     echo "  Patches saved for $what to $what_name-Patches/"
 }
 
-savePatches "Waterfall/Waterfall-Proxy" "FlameCord-Proxy"
+savePatches "Waterfall/Waterfall-Proxy" "MangoCord-Proxy"
 )