PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

#3837: Update to JLine 3

Browse Source
This commit is contained in:
md_5
2025-06-01 12:09:40 +10:00
parent aa44ebe770
commit 7cde213e63
7 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
log/pom.xml
View File

@@ -20,9 +20,9 @@
<dependencies>
<dependency>
<groupId>jline</groupId>
<groupId>org.jline</groupId>
<artifactId>jline</artifactId>
<version>2.12.1</version>
<version>3.30.4</version>
<scope>compile</scope>
</dependency>
<dependency>

4
log/src/main/java/net/md_5/bungee/log/BungeeLogger.java
View File

@@ -5,14 +5,14 @@ import java.util.logging.FileHandler;
import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
import jline.console.ConsoleReader;
import org.jline.reader.LineReader;
public class BungeeLogger extends Logger
{
private final LogDispatcher dispatcher = new LogDispatcher( this );
public BungeeLogger(String loggerName, String filePattern, ConsoleReader reader)
public BungeeLogger(String loggerName, String filePattern, LineReader reader)
{
super( loggerName, null );
setLevel( Level.ALL );

24
log/src/main/java/net/md_5/bungee/log/ColouredWriter.java
View File

@@ -1,15 +1,15 @@
package net.md_5.bungee.log;
import java.io.IOException;
import java.util.logging.Handler;
import java.util.logging.LogRecord;
import java.util.regex.Pattern;
import jline.console.ConsoleReader;
import lombok.Data;
import lombok.RequiredArgsConstructor;
import net.md_5.bungee.api.ChatColor;
import org.fusesource.jansi.Ansi;
import org.fusesource.jansi.Ansi.Erase;
import org.jline.jansi.Ansi;
import org.jline.reader.LineReader;
@RequiredArgsConstructor
public class ColouredWriter extends Handler
{
@@ -52,12 +52,7 @@ public class ColouredWriter extends Handler
compile( ChatColor.RESET, Ansi.ansi().a( Ansi.Attribute.RESET ).toString() ),
};
//
private final ConsoleReader console;
public ColouredWriter(ConsoleReader console)
{
this.console = console;
}
private final LineReader console;
public void print(String s)
{
@@ -65,14 +60,7 @@ public class ColouredWriter extends Handler
{
s = replacement.pattern.matcher( s ).replaceAll( replacement.replacement );
}
try
{
console.print( Ansi.ansi().eraseLine( Erase.ALL ).toString() + ConsoleReader.RESET_LINE + s + Ansi.ansi().reset().toString() );
console.drawLine();
console.flush();
} catch ( IOException ex )
{
}
console.printAbove( s + Ansi.ansi().reset().toString() );
}
@Override