From 04729d2b5c8d03b8b6844ad3ea61f69b06e2bd21 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 a4516ed9..1f63a2c2 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 f5270655..87ed8b88 100644 --- a/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java +++ b/bootstrap/src/main/java/net/md_5/bungee/BungeeCordLauncher.java @@ -43,7 +43,7 @@ public class BungeeCordLauncher if ( buildDate.before( deadline.getTime() ) ) { System.err.println( "*** Hey! This build is potentially outdated :( ***" ); - System.err.println( "*** Please check for a new build from https://ci.destroystokyo.com/job/Waterfall/ ***" ); + System.err.println( "*** Please check for a new build from https://ci.destroystokyo.com/job/Travertine/ ***" ); System.err.println( "*** Should this build be outdated, you will get NO support for it. ***" ); System.err.println( "*** Server will start in 10 seconds ***" ); Thread.sleep( TimeUnit.SECONDS.toMillis( 10 ) ); @@ -52,7 +52,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 d703d6d2..d8dcdc1e 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 f036efcd..c93c313a 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(); // Waterfall start - Use TerminalConsoleAppender 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 c1c04995..670bcede 100644 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java @@ -181,7 +181,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 { @@ -490,7 +490,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 b26035cf..4e2c6129 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 f5c028dd..c50a05f7 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 @@ -23,7 +23,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 5237182a..631eabcf 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 @@ -219,7 +219,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.19.1