2022-02-14 22:03:15 +01:00
From 73739a822f6730c871a88ade6d7fe7d5efbc117c Mon Sep 17 00:00:00 2001
2016-06-06 21:50:15 +02:00
From: Techcable <Techcable@techcable.net>
Date: Mon, 6 Jun 2016 13:47:46 -0600
2021-06-09 00:17:03 +02:00
Subject: [PATCH] Rename references from Waterfall to FlameCord
2016-06-06 21:50:15 +02:00
2022-02-14 22:03:15 +01:00
diff --git a/bootstrap/pom.xml b/bootstrap/pom.xml
index 00ce099c..cbd16c34 100644
--- a/bootstrap/pom.xml
+++ b/bootstrap/pom.xml
@@ -37,7 +37,7 @@
</dependencies>
<build>
- <finalName>Waterfall</finalName>
+ <finalName>FlameCord</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
2016-06-06 21:50:15 +02:00
diff --git a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java b/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
2021-07-16 04:16:11 +02:00
index a4516ed9..9838f5c5 100644
2016-06-06 21:50:15 +02:00
--- a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
+++ b/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
@@ -7,7 +7,7 @@ public class Bootstrap
{
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!" );
2021-06-09 00:17:03 +02:00
+ System.err.println( "*** ERROR *** FlameCord requires Java 8 or above to function! Please download and install it!" );
2016-06-06 21:50:15 +02:00
System.out.println( "You can check your Java version with the command: java -version" );
return;
}
2016-07-17 04:41:50 +02:00
diff --git a/log/src/main/java/net/md_5/bungee/log/LogDispatcher.java b/log/src/main/java/net/md_5/bungee/log/LogDispatcher.java
2021-07-16 04:16:11 +02:00
index d703d6d2..49dce84b 100644
2016-07-17 04:41:50 +02:00
--- a/log/src/main/java/net/md_5/bungee/log/LogDispatcher.java
+++ b/log/src/main/java/net/md_5/bungee/log/LogDispatcher.java
@@ -12,7 +12,7 @@ public class LogDispatcher extends Thread
public LogDispatcher(BungeeLogger logger)
{
- super( "Waterfall Logger Thread" );
2021-06-09 00:17:03 +02:00
+ super( "FlameCord Logger Thread" );
2016-07-17 04:41:50 +02:00
this.logger = logger;
}
2016-06-06 21:50:15 +02:00
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
2021-07-16 04:16:11 +02:00
index 07d74c67..a4b58d9c 100644
2016-06-06 21:50:15 +02:00
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
2020-07-01 11:44:36 +02:00
@@ -188,7 +188,7 @@ public class BungeeCord extends ProxyServer
2016-06-06 21:50:15 +02:00
public BungeeCord() throws IOException
{
// 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." );
2021-06-09 00:17:03 +02:00
+ Preconditions.checkState( new File( "." ).getAbsolutePath().indexOf( '!' ) == -1, "Cannot use FlameCord in directory with ! in path." );
2016-06-06 21:50:15 +02:00
try
{
2021-05-15 03:51:16 +02:00
@@ -539,7 +539,7 @@ public class BungeeCord extends ProxyServer
2016-06-06 21:50:15 +02:00
@Override
public String getName()
{
- return "Waterfall";
2021-06-09 00:17:03 +02:00
+ return "FlameCord";
2016-06-06 21:50:15 +02:00
}
@Override
2018-12-21 16:48:19 +01:00
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
2021-07-16 04:16:11 +02:00
index 0db3d76a..25da0a65 100644
2018-12-21 16:48:19 +01:00
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
2021-07-16 04:16:11 +02:00
@@ -63,7 +63,7 @@ public class BungeeCordLauncher
2018-12-21 16:48:19 +01:00
BungeeCord bungee = new BungeeCord();
ProxyServer.setInstance( bungee );
- bungee.getLogger().info( "Enabled Waterfall version " + bungee.getVersion() );
2021-06-09 00:17:03 +02:00
+ bungee.getLogger().info( "Enabled FlameCord version " + bungee.getVersion() );
2018-12-21 16:48:19 +01:00
bungee.start();
if ( !options.has( "noconsole" ) )
2016-06-06 21:50:15 +02:00
diff --git a/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java b/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java
2021-07-16 04:16:11 +02:00
index b26035cf..820f7b03 100644
2016-06-06 21:50:15 +02:00
--- a/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java
+++ b/proxy/src/main/java/net/md_5/bungee/command/CommandBungee.java
@@ -16,6 +16,6 @@ public class CommandBungee extends Command
@Override
public void execute(CommandSender sender, String[] args)
{
- sender.sendMessage( ChatColor.BLUE + "This server is running Waterfall version " + ProxyServer.getInstance().getVersion() + " by md_5" );
2021-06-09 00:17:03 +02:00
+ sender.sendMessage( ChatColor.BLUE + "This server is running FlameCord version " + ProxyServer.getInstance().getVersion() + " by md_5" );
2016-06-06 21:50:15 +02:00
}
}
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
2021-07-16 04:16:11 +02:00
index 720d0c3b..5ab4db18 100644
2016-06-06 21:50:15 +02:00
--- a/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java
+++ b/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java
2017-11-19 09:47:57 +01:00
@@ -23,7 +23,7 @@ public class CommandReload extends Command
2016-06-06 21:50:15 +02:00
BungeeCord.getInstance().startListeners();
BungeeCord.getInstance().getPluginManager().callEvent( new ProxyReloadEvent( sender ) );
- 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." );
2021-06-09 00:17:03 +02:00
+ 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." );
2016-06-06 21:50:15 +02:00
}
}
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
2021-07-16 04:16:11 +02:00
index 0644b8cd..9c11ac57 100644
2016-06-06 21:50:15 +02:00
--- a/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
+++ b/proxy/src/main/java/net/md_5/bungee/conf/YamlConfig.java
2020-03-07 23:52:15 +01:00
@@ -227,7 +227,7 @@ public class YamlConfig implements ConfigurationAdapter
2016-06-06 21:50:15 +02:00
Map<String, Object> val = entry.getValue();
String name = entry.getKey();
String addr = get( "address", "localhost:25565", val );
- String motd = ChatColor.translateAlternateColorCodes( '&', get( "motd", "&1Just another Waterfall - Forced Host", val ) );
2021-06-09 00:17:03 +02:00
+ String motd = ChatColor.translateAlternateColorCodes( '&', get( "motd", "&1Just another FlameCord - Forced Host", val ) );
2016-06-06 21:50:15 +02:00
boolean restricted = get( "restricted", false, val );
2020-01-21 18:41:57 +01:00
SocketAddress address = Util.getAddr( addr );
2016-06-06 21:50:15 +02:00
ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
--
2021-12-30 03:02:28 +01:00
2.32.0
2016-06-06 21:50:15 +02:00