mirror of
https://github.com/PaperMC/Waterfall.git
synced 2025-02-11 09:21:36 +01:00
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Waterfall Changes:8f8bdf5
Updated Upstream (BungeeCord)c803d54
Manually specify deploy plugin version897f9d6
Aggregate API and Chat Javadocs6a98009
Apply delombok to sources, generate javadocs from delombok sourcesaec375c
fix critical formatting error
119 lines
6.7 KiB
Diff
119 lines
6.7 KiB
Diff
From 6dbb0986bc03acc3b25aea3ebbe97a7bf84b9b8b 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 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/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/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
|
|
index 4ff03488..79a3a145 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
|
|
{
|
|
@@ -496,7 +496,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/BungeeCordLauncher.java b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
|
|
index 624eb5f0..bc3d875e 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
|
|
@@ -49,7 +49,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://papermc.io/ci/job/Waterfall/ ***" );
|
|
+ System.err.println( "*** Please check for a new build from https://papermc.io/ci/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 ) );
|
|
@@ -58,7 +58,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/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 44011a96..8cceac2d 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
|
|
@@ -224,7 +224,7 @@ public class YamlConfig implements ConfigurationAdapter
|
|
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 ) );
|
|
+ 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.21.0
|
|
|