From 6e33ddf296c39c3b5f2b3e6d9ec524df35b2787c Mon Sep 17 00:00:00 2001
From: "jiahua.liu" <n@mamoe.net>
Date: Sat, 18 Jan 2020 18:44:03 +0800
Subject: [PATCH] plugin supporting
---
mirai-console/build.gradle | 1 +
mirai-console/src/main/kotlin/MiraiConsole.kt | 46 +++++++++++++++++++
.../kotlin/net/mamoe/mirai/MiraiConsole.java | 20 --------
.../kotlin/net/mamoe/mirai/MiraiMain.java | 10 ----
4 files changed, 47 insertions(+), 30 deletions(-)
create mode 100644 mirai-console/src/main/kotlin/MiraiConsole.kt
delete mode 100644 mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsole.java
delete mode 100644 mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiMain.java
diff --git a/mirai-console/build.gradle b/mirai-console/build.gradle
index 9f5447a8b..89b140481 100644
--- a/mirai-console/build.gradle
+++ b/mirai-console/build.gradle
@@ -3,6 +3,7 @@ apply plugin: "java"
dependencies {
api project(':mirai-core')
+ api project(':mirai-core-timpc')
runtimeOnly files('../mirai-core/build/classes/kotlin/jvm/main')
// classpath is not set correctly by IDE
}
diff --git a/mirai-console/src/main/kotlin/MiraiConsole.kt b/mirai-console/src/main/kotlin/MiraiConsole.kt
new file mode 100644
index 000000000..8a6f0b8e7
--- /dev/null
+++ b/mirai-console/src/main/kotlin/MiraiConsole.kt
@@ -0,0 +1,46 @@
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import net.mamoe.mirai.Bot
+import kotlin.concurrent.thread
+
+fun main() {
+
+ println("loading Mirai in console environments")
+ println("正在控制台环境中启动Mirai ")
+ println()
+ println("Mirai-console is still in testing stage, some feature is not available")
+ println("Mirai-console 还处于测试阶段, 部分功能不可用")
+ println()
+ println("Mirai-console now running on " + System.getProperty("user.dir"))
+ println("Mirai-console 正在 " + System.getProperty("user.dir") + " 运行")
+ println()
+ println("\"login qqnumber qqpassword \" to login a bot")
+ println("\"login qq号 qq密码 \" 来登陆一个BOT")
+
+ thread {
+ loop@ while (true) {
+ var command = readLine()
+ if (command != null) {
+ var commandArgs = command.split(" ")
+ when (commandArgs[0]) {
+ "login" -> {
+ if (commandArgs.size < 3) {
+ println("\"login qqnumber qqpassword \" to login a bot")
+ println("\"login qq号 qq密码 \" 来登陆一个BOT")
+ continue@loop
+ }
+ val qqNumber = commandArgs[1].toLong()
+ val qqPassword = commandArgs[2]
+ println("login...")
+ GlobalScope.launch {
+ Bot(qqNumber, qqPassword)
+ }
+ }
+ }
+ }
+ }
+ }
+
+}
+
+
diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsole.java b/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsole.java
deleted file mode 100644
index e2d0b7ed6..000000000
--- a/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiConsole.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package net.mamoe.mirai;
-
-public class MiraiConsole {
-
-
- public static void main(String[] args){
- System.out.println(">>> starting Mirai");
- // MiraiAPI.startMirai(args);
- }
-
- public static void processCommand(String command){
-
- }
-
-
- public void log(Object o){
- System.out.println(o);
- }
-
-}
diff --git a/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiMain.java b/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiMain.java
deleted file mode 100644
index a2bc5301a..000000000
--- a/mirai-console/src/main/kotlin/net/mamoe/mirai/MiraiMain.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package net.mamoe.mirai;
-
-
-/**
- * @author NaturalHG
- */
-public final class MiraiMain {
- public static void main(String[] args) {
- }
-}
\ No newline at end of file