From 2e94ba6e7c9113ea09c401939135d9c6fbd75256 Mon Sep 17 00:00:00 2001 From: Techcable Date: Mon, 6 Jun 2016 13:47:46 -0600 Subject: [PATCH] Rename references from Waterfall to Travertine diff --git a/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java b/bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java index a4516ed..1f63a2c 100644 --- 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!" ); + System.err.println( "*** ERROR *** Travertine 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; } diff --git a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java index 5e1773c..4a5df13 100644 --- a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java +++ b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java @@ -42,7 +42,7 @@ public class BungeeCordLauncher if ( buildDate.before( deadline.getTime() ) ) { System.err.println( "*** Warning, this build is outdated ***" ); - System.err.println( "*** Please download a new build from https://ci.aquifermc.org/job/Waterfall/ ***" ); + System.err.println( "*** Please download a new build from https://ci.aquifermc.org/job/Travertine/ ***" ); System.err.println( "*** You will get NO support regarding this build ***" ); System.err.println( "*** Server will start in 10 seconds ***" ); Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) ); @@ -51,7 +51,7 @@ public class BungeeCordLauncher BungeeCord bungee = new BungeeCord(); ProxyServer.setInstance( bungee ); - bungee.getLogger().info( "Enabled Waterfall version " + bungee.getVersion() ); + bungee.getLogger().info( "Enabled Travertine version " + bungee.getVersion() ); bungee.start(); if ( !options.has( "noconsole" ) ) 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 index d703d6d..d8dcdc1 100644 --- 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" ); + super( "Travertine Logger Thread" ); this.logger = logger; } diff --git a/proxy/src/main/java/Test.java b/proxy/src/main/java/Test.java index 446dfe2..f068a38 100644 --- a/proxy/src/main/java/Test.java +++ b/proxy/src/main/java/Test.java @@ -19,7 +19,7 @@ public class Test { BungeeCord bungee = new BungeeCord(); ProxyServer.setInstance( bungee ); - bungee.getLogger().info( "Enabled Waterfall version " + bungee.getVersion() ); + bungee.getLogger().info( "Enabled Travertine version " + bungee.getVersion() ); bungee.start(); while ( bungee.isRunning ) 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 4a33b9d..014ea5f 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java @@ -178,7 +178,7 @@ public class BungeeCord extends ProxyServer 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." ); + Preconditions.checkState( new File( "." ).getAbsolutePath().indexOf( '!' ) == -1, "Cannot use Travertine in directory with ! in path." ); try { @@ -469,7 +469,7 @@ public class BungeeCord extends ProxyServer @Override public String getName() { - return "Waterfall"; + return "Travertine"; } @Override 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 index b26035c..4e2c612 100644 --- 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" ); + sender.sendMessage( ChatColor.BLUE + "This server is running Travertine 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 index 4a49241..55267f4 100644 --- a/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java +++ b/proxy/src/main/java/net/md_5/bungee/command/CommandReload.java @@ -22,7 +22,7 @@ public class CommandReload extends Command 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." ); + sender.sendMessage( ChatColor.BOLD.toString() + ChatColor.RED.toString() + "Travertine has been reloaded." + + " This is NOT advisable and you will not be supported with any issues that arise! Please restart Travertine 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 index 4ec9782..25e9781 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 @@ -211,7 +211,7 @@ public class YamlConfig implements ConfigurationAdapter Map 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 ) ); + String motd = ChatColor.translateAlternateColorCodes( '&', get( "motd", "&1Just another Travertine - Forced Host", val ) ); boolean restricted = get( "restricted", false, val ); InetSocketAddress address = Util.getAddr( addr ); ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted ); -- 2.7.4 (Apple Git-66)