BLOCKFANTASY
/
LOOHP-Limbo
Template
mirror of https://github.com/LOOHP/Limbo.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Fixed terminal integration

This commit is contained in:
LOOHP 2025-12-24 12:13:58 +00:00
parent bde2c04127
commit ad284544e5
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pom.xml
View File

@ -303,12 +303,5 @@
<version>3.30.5</version> <version>3.30.5</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
<version>2.14.6</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>

21
src/main/java/com/loohp/limbo/Console.java
View File

@ -22,7 +22,6 @@ package com.loohp.limbo;
import com.loohp.limbo.commands.CommandSender; import com.loohp.limbo.commands.CommandSender;
import com.loohp.limbo.consolegui.ConsoleTextOutput; import com.loohp.limbo.consolegui.ConsoleTextOutput;
import com.loohp.limbo.utils.CustomStringUtils; import com.loohp.limbo.utils.CustomStringUtils;
import jline.console.ConsoleReader;
import net.kyori.adventure.audience.MessageType; import net.kyori.adventure.audience.MessageType;
import net.kyori.adventure.bossbar.BossBar; import net.kyori.adventure.bossbar.BossBar;
import net.kyori.adventure.identity.Identity; import net.kyori.adventure.identity.Identity;
@ -45,6 +44,7 @@ import org.jline.reader.LineReader.SuggestionType;
import org.jline.reader.LineReaderBuilder; import org.jline.reader.LineReaderBuilder;
import org.jline.reader.ParsedLine; import org.jline.reader.ParsedLine;
import org.jline.reader.UserInterruptException; import org.jline.reader.UserInterruptException;
import org.jline.terminal.Size;
import org.jline.terminal.Terminal; import org.jline.terminal.Terminal;
import org.jline.terminal.TerminalBuilder; import org.jline.terminal.TerminalBuilder;
@ -76,7 +76,6 @@ public class Console implements CommandSender {
private final Terminal terminal; private final Terminal terminal;
private final LineReader tabReader; private final LineReader tabReader;
private final ConsoleReader reader;
private final InputStream in; private final InputStream in;
@SuppressWarnings("unused") @SuppressWarnings("unused")
@ -114,10 +113,6 @@ public class Console implements CommandSender {
}) : err, this.logs)); }) : err, this.logs));
this.err = System.err; this.err = System.err;
reader = new ConsoleReader(in, out);
reader.setExpandEvents(false);
reader.setHandleUserInterrupt(false);
terminal = TerminalBuilder.builder().streams(in, out).jansi(true).build(); terminal = TerminalBuilder.builder().streams(in, out).jansi(true).build();
tabReader = LineReaderBuilder.builder().terminal(terminal).completer(new Completer() { tabReader = LineReaderBuilder.builder().terminal(terminal).completer(new Completer() {
@Override @Override
@ -129,7 +124,13 @@ public class Console implements CommandSender {
} }
} }
}).build(); }).build();
tabReader.unsetOpt(LineReader.Option.INSERT_TAB);
tabReader.setVariable(LineReader.SECONDARY_PROMPT_PATTERN, "");
tabReader.setAutosuggestion(SuggestionType.NONE); tabReader.setAutosuggestion(SuggestionType.NONE);
if (terminal.getWidth() <= 0 || terminal.getHeight() <= 0) {
terminal.setSize(new Size(80, 24));
}
} }
@Override @Override
@ -242,12 +243,8 @@ public class Console implements CommandSender {
String date = new SimpleDateFormat("HH':'mm':'ss").format(new Date()); String date = new SimpleDateFormat("HH':'mm':'ss").format(new Date());
ConsoleTextOutput.appendText(ChatColor.stripColor("[" + date + " Info] " + message), true); ConsoleTextOutput.appendText(ChatColor.stripColor("[" + date + " Info] " + message), true);
logs.println(ChatColor.stripColor("[" + date + " Info] " + message)); logs.println(ChatColor.stripColor("[" + date + " Info] " + message));
try { terminal.writer().append("[").append(date).append(" Info] ").append(translateToConsole(message)).append("\n");
reader.getOutput().append("[" + date + " Info] " + translateToConsole(message) + "\n"); terminal.writer().flush();
reader.getOutput().flush();
} catch (IOException e) {
e.printStackTrace();
}
unstashLine(); unstashLine();
} }