mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-07-05 19:04:43 +02:00
106 lines
6.0 KiB
Diff
106 lines
6.0 KiB
Diff
From a3d08e67c922ca102c733d7f6f26530d9b2dbb03 Mon Sep 17 00:00:00 2001
|
|
From: Tux <write@imaginarycode.com>
|
|
Date: Thu, 19 May 2016 11:28:45 -0700
|
|
Subject: [PATCH] Rename references from BungeeCord to Waterfall
|
|
|
|
|
|
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 f1ccd4f6..d703d6d2 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( "BungeeCord Logger Thread" );
|
|
+ super( "Waterfall 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 20e14557..7fe5bbea 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 BungeeCord in directory with ! in path." );
|
|
+ Preconditions.checkState( new File( "." ).getAbsolutePath().indexOf( '!' ) == -1, "Cannot use Waterfall in directory with ! in path." );
|
|
|
|
System.setSecurityManager( new BungeeSecurityManager() );
|
|
|
|
@@ -486,7 +486,7 @@ public class BungeeCord extends ProxyServer
|
|
@Override
|
|
public String getName()
|
|
{
|
|
- return "BungeeCord";
|
|
+ return "Waterfall";
|
|
}
|
|
|
|
@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 c38b8fc2..20681838 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeCordLauncher.java
|
|
@@ -43,7 +43,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 http://ci.md-5.net/job/BungeeCord ***" );
|
|
+ System.err.println( "*** Please download a new build from https://ci.destroystokyo.com/job/Waterfall/ ***" );
|
|
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 ) );
|
|
@@ -52,7 +52,7 @@ public class BungeeCordLauncher
|
|
|
|
BungeeCord bungee = new BungeeCord();
|
|
ProxyServer.setInstance( bungee );
|
|
- bungee.getLogger().info( "Enabled BungeeCord version " + bungee.getVersion() );
|
|
+ bungee.getLogger().info( "Enabled Waterfall 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 b0798791..b26035cf 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 BungeeCord version " + ProxyServer.getInstance().getVersion() + " by md_5" );
|
|
+ sender.sendMessage( ChatColor.BLUE + "This server is running Waterfall 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 771ef5dc..f5c028dd 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() + "BungeeCord has been reloaded."
|
|
- + " This is NOT advisable and you will not be supported with any issues that arise! Please restart BungeeCord ASAP." );
|
|
+ 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." );
|
|
}
|
|
}
|
|
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 4cfb13c0..0ec6dabb 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
|
|
@@ -213,7 +213,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 BungeeCord - Forced Host", val ) );
|
|
+ String motd = ChatColor.translateAlternateColorCodes( '&', get( "motd", "&1Just another Waterfall - Forced Host", val ) );
|
|
boolean restricted = get( "restricted", false, val );
|
|
InetSocketAddress address = Util.getAddr( addr );
|
|
ServerInfo info = ProxyServer.getInstance().constructServerInfo( name, address, motd, restricted );
|
|
--
|
|
2.20.1
|
|
|