github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-03-13 14:50:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix some console

Browse Source
This commit is contained in:
jiahua.liu 2020-03-06 16:49:36 +08:00
parent 46216e5ab6
commit 2eda9e764a
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mirai-console-wrapper/src/main/kotlin/net/mamoe/mirai/console/wrapper/WrapperMain.kt
View File

@ -48,12 +48,19 @@ object WrapperMain {
} }
} }
println("Version check complete, starting Mirai") 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.getCore()!!,
CoreUpdator.getProtocolLib()!!, CoreUpdator.getProtocolLib()!!,
ConsoleUpdator.getFile()!!, ConsoleUpdator.getFile()!!,
this.javaClass.classLoader this.javaClass.classLoader
).loadClass( )
loader.loadClass("net.mamoe.mirai.BotFactoryJvm")
loader.loadClass(
"net.mamoe.mirai.console.pure.MiraiConsolePureLoader" "net.mamoe.mirai.console.pure.MiraiConsolePureLoader"
).getMethod("main", Array<String>(0) {"null"}.javaClass) ).getMethod("main", Array<String>(0) {"null"}.javaClass)
.invoke(null,args) .invoke(null,args)

10
mirai-console/build.gradle.kts
View File

@ -8,9 +8,6 @@ plugins {
id("com.jfrog.bintray") id("com.jfrog.bintray")
} }
apply(plugin = "com.github.johnrengelman.shadow")
val kotlinVersion: String by rootProject.ext val kotlinVersion: String by rootProject.ext
val atomicFuVersion: String by rootProject.ext val atomicFuVersion: String by rootProject.ext
val coroutinesVersion: 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" 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 val miraiVersion: String by rootProject.ext
kotlin { kotlin {