From 2eda9e764aba4ba9ca2ec69b806b00b5050fd076 Mon Sep 17 00:00:00 2001
From: "jiahua.liu" <n@mamoe.net>
Date: Fri, 6 Mar 2020 16:49:36 +0800
Subject: [PATCH] fix some console

---
 .../net/mamoe/mirai/console/wrapper/WrapperMain.kt    | 11 +++++++++--
 mirai-console/build.gradle.kts                        | 10 ----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/mirai-console-wrapper/src/main/kotlin/net/mamoe/mirai/console/wrapper/WrapperMain.kt b/mirai-console-wrapper/src/main/kotlin/net/mamoe/mirai/console/wrapper/WrapperMain.kt
index 1d1e58c38..1ee66cd04 100644
--- a/mirai-console-wrapper/src/main/kotlin/net/mamoe/mirai/console/wrapper/WrapperMain.kt
+++ b/mirai-console-wrapper/src/main/kotlin/net/mamoe/mirai/console/wrapper/WrapperMain.kt
@@ -48,12 +48,19 @@ object WrapperMain {
             }
         }
         println("Version check complete, starting Mirai")
-        MiraiClassLoader(
+        println("Core    :" + CoreUpdator.getCore()!!)
+        println("Protocol:" + CoreUpdator.getProtocolLib()!!)
+        println("Console :" + ConsoleUpdator.getFile()!! )
+        println("Root    :" + System.getProperty("user.dir") + "/")
+
+        val loader = MiraiClassLoader(
             CoreUpdator.getCore()!!,
             CoreUpdator.getProtocolLib()!!,
             ConsoleUpdator.getFile()!!,
             this.javaClass.classLoader
-        ).loadClass(
+        )
+        loader.loadClass("net.mamoe.mirai.BotFactoryJvm")
+        loader.loadClass(
             "net.mamoe.mirai.console.pure.MiraiConsolePureLoader"
         ).getMethod("main",  Array<String>(0) {"null"}.javaClass)
             .invoke(null,args)
diff --git a/mirai-console/build.gradle.kts b/mirai-console/build.gradle.kts
index 0e49d4233..021e958f2 100644
--- a/mirai-console/build.gradle.kts
+++ b/mirai-console/build.gradle.kts
@@ -8,9 +8,6 @@ plugins {
     id("com.jfrog.bintray")
 }
 
-
-apply(plugin = "com.github.johnrengelman.shadow")
-
 val kotlinVersion: String by rootProject.ext
 val atomicFuVersion: String by rootProject.ext
 val coroutinesVersion: String by rootProject.ext
@@ -26,13 +23,6 @@ fun kotlinx(id: String, version: String) = "org.jetbrains.kotlinx:kotlinx-$id:$v
 
 fun ktor(id: String, version: String) = "io.ktor:ktor-$id:$version"
 
-tasks.withType<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar> {
-    manifest {
-        attributes["Main-Class"] = "net.mamoe.mirai.console.pure.MiraiConsolePureLoader"
-    }
-}
-
-
 val miraiVersion: String by rootProject.ext
 
 kotlin {