PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Fix fancy terminal on Windows.

Browse Source 
This is a workaround for quite possibly the weirdest bug I have ever encountered in my life! When jansi attempts to extract its natives, by default it tries to extract a specific version, using the loading class's implementation version. Normally this works completely fine, however when on Windows certain characters such as - and : can trigger special behaviour. Furthermore this behaviour only occurs in specific combinations due to the parsing done by jansi. For example test-test works fine, but test-test-test does not! In order to avoid this all together but still keep our versions the same as they were, we set the override property to the essentially garbage version BungeeCord. This version is only used when extracting the libraries to their temp folder.
This commit is contained in:
md_5 2014-12-14 13:07:13 +11:00
parent 37e37e9a55
commit 02d3660f32
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bootstrap/src/main/java/net/md_5/bungee/Bootstrap.java
View File

@ -1,7 +1,5 @@
package net.md_5.bungee; package net.md_5.bungee;
import org.fusesource.jansi.AnsiConsole;
public class Bootstrap public class Bootstrap
{ {
@ -14,8 +12,6 @@ public class Bootstrap
return; return;
} }
AnsiConsole.systemInstall();
BungeeCordLauncher.main( args ); BungeeCordLauncher.main( args );
} }
} }

6
proxy/pom.xml
View File

@ -74,12 +74,6 @@
<version>3.18.2-GA</version> <version>3.18.2-GA</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
<version>1.11</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>

17
proxy/src/main/java/net/md_5/bungee/BungeeCord.java
View File

@ -180,8 +180,17 @@ public class BungeeCord extends ProxyServer
bundle = ResourceBundle.getBundle( "messages", Locale.ENGLISH ); bundle = ResourceBundle.getBundle( "messages", Locale.ENGLISH );
} }
Log.setOutput( new PrintStream( ByteStreams.nullOutputStream() ) ); // TODO: Bug JLine // This is a workaround for quite possibly the weirdest bug I have ever encountered in my life!
// When jansi attempts to extract its natives, by default it tries to extract a specific version,
// using the loading class's implementation version. Normally this works completely fine,
// however when on Windows certain characters such as - and : can trigger special behaviour.
// Furthermore this behaviour only occurs in specific combinations due to the parsing done by jansi.
// For example test-test works fine, but test-test-test does not! In order to avoid this all together but
// still keep our versions the same as they were, we set the override property to the essentially garbage version
// BungeeCord. This version is only used when extracting the libraries to their temp folder.
System.setProperty( "library.jansi.version", "BungeeCord" );
AnsiConsole.systemInstall();
consoleReader = new ConsoleReader(); consoleReader = new ConsoleReader();
consoleReader.setExpandEvents( false ); consoleReader.setExpandEvents( false );
@ -189,12 +198,6 @@ public class BungeeCord extends ProxyServer
System.setErr( new PrintStream( new LoggingOutputStream( logger, Level.SEVERE ), true ) ); System.setErr( new PrintStream( new LoggingOutputStream( logger, Level.SEVERE ), true ) );
System.setOut( new PrintStream( new LoggingOutputStream( logger, Level.INFO ), true ) ); System.setOut( new PrintStream( new LoggingOutputStream( logger, Level.INFO ), true ) );
if ( consoleReader.getTerminal() instanceof UnsupportedTerminal )
{
logger.info( "Unable to initialize fancy terminal. To fix this on Windows, install the correct Microsoft Visual C++ 2008 Runtime" );
logger.info( "NOTE: This error is non crucial, and BungeeCord will still function correctly! Do not bug the author about it unless you are still unable to get it working" );
}
if ( NativeCipher.load() ) if ( NativeCipher.load() )
{ {
logger.info( "Using OpenSSL based native cipher." ); logger.info( "Using OpenSSL based native cipher." );