diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsole.kt b/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsole.kt index a708e464a..ed9ceb855 100644 --- a/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsole.kt +++ b/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsole.kt @@ -288,6 +288,7 @@ class MiraiConsoleLoader { fun main(args: Array<String>) { Security.removeProvider("BC") Security.addProvider(BouncyCastleProvider()) + Security.addProvider(org.bouncycastle.jce.provider.BouncyCastleProvider()) //Security.addProvider(BouncyCastle) MiraiConsoleUI.start() MiraiConsole.start() diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsoleUI.kt b/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsoleUI.kt index fee1660d7..ab398e73a 100644 --- a/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsoleUI.kt +++ b/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsoleUI.kt @@ -10,18 +10,21 @@ import com.googlecode.lanterna.terminal.DefaultTerminalFactory import com.googlecode.lanterna.terminal.Terminal import com.googlecode.lanterna.terminal.TerminalResizeListener import com.googlecode.lanterna.terminal.swing.SwingTerminal +import com.googlecode.lanterna.terminal.swing.SwingTerminalFontConfiguration import com.googlecode.lanterna.terminal.swing.SwingTerminalFrame -import kotlinx.coroutines.* +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.Job +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch import net.mamoe.mirai.MiraiConsoleUI.LoggerDrawer.cleanPage import net.mamoe.mirai.MiraiConsoleUI.LoggerDrawer.drawLog import net.mamoe.mirai.MiraiConsoleUI.LoggerDrawer.redrawLogs -import net.mamoe.mirai.utils.currentTimeSeconds +import java.awt.Font import java.io.OutputStream import java.io.PrintStream import java.nio.charset.Charset import java.util.* import kotlin.concurrent.thread -import kotlin.math.ceil /** * 此文件不推荐任何人看 @@ -40,6 +43,7 @@ object MiraiConsoleUI { val log = mutableMapOf<Long, LimitLinkedQueue<String>>().also { it[0L] = LimitLinkedQueue(cacheLogSize) + it[2821869985L] = LimitLinkedQueue(cacheLogSize) } val botAdminCount = mutableMapOf<Long, Long>() @@ -70,11 +74,19 @@ object MiraiConsoleUI { hasStart = true val defaultTerminalFactory = DefaultTerminalFactory(internalPrinter, System.`in`, Charset.defaultCharset()) - defaultTerminalFactory.setInitialTerminalSize( - TerminalSize( - 90, 120 + + val fontSize = 12 + defaultTerminalFactory + .setInitialTerminalSize( + TerminalSize( + 101, 60 + ) + ) + .setTerminalEmulatorFontConfiguration( + SwingTerminalFontConfiguration.newInstance( + Font("Monospaced", Font.PLAIN, fontSize) + ) ) - ) try { terminal = defaultTerminalFactory.createTerminal() terminal.enterPrivateMode() @@ -371,11 +383,13 @@ object MiraiConsoleUI { textGraphics.foregroundColor = TextColor.ANSI.DEFAULT textGraphics.putString(2, height - 3, "|>>>") textGraphics.putString(width - 3, height - 3, "|") - textGraphics.foregroundColor = TextColor.ANSI.BLUE + textGraphics.foregroundColor = TextColor.ANSI.WHITE + textGraphics.backgroundColor = TextColor.ANSI.BLACK textGraphics.putString(7, height - 3, commandBuilder.toString()) if (terminal is SwingTerminalFrame) { terminal.flush() } + textGraphics.backgroundColor = TextColor.ANSI.DEFAULT } private fun addCommandChar(