mirai: migrate to console 1.0-M4

Author: PeratX

build.gradle.kts

@@ -24,8 +24,8 @@ repositories {
 dependencies {
     api("org.jetbrains.kotlinx:atomicfu:0.14.4")
 
-    implementation("net.mamoe:mirai-core:1.2.2")
-    implementation("net.mamoe:mirai-console:1.0-M4-dev-3")
+    implementation("net.mamoe:mirai-core:1.2.3")
+    implementation("net.mamoe:mirai-console:1.0-M4")
 }
 
 tasks.named<Jar>("jar") {

src/main/kotlin/org/itxtech/mirainative/MiraiNative.kt

@@ -27,8 +27,9 @@ package org.itxtech.mirainative
 import io.ktor.util.*
 import kotlinx.coroutines.*
 import net.mamoe.mirai.Bot
+import net.mamoe.mirai.console.extension.PluginComponentStorage
+import net.mamoe.mirai.console.plugin.jvm.JvmPluginDescriptionBuilder
 import net.mamoe.mirai.console.plugin.jvm.KotlinPlugin
-import net.mamoe.mirai.console.plugin.jvm.SimpleJvmPluginDescription
 import org.itxtech.mirainative.manager.CacheManager
 import org.itxtech.mirainative.manager.EventManager
 import org.itxtech.mirainative.manager.LibraryManager
@@ -45,12 +46,10 @@ import java.security.MessageDigest
 import java.util.jar.Manifest
 
 object MiraiNative : KotlinPlugin(
-    SimpleJvmPluginDescription(
-        name = "MiraiNative",
-        version = "1.9.1",
-        author = "iTX Technologies",
-        info = "强大的 mirai 原生插件加载器。"
-    )
+    JvmPluginDescriptionBuilder("MiraiNative", "1.9.1")
+        .author("iTX Technologies")
+        .info("强大的 mirai 原生插件加载器。")
+        .build()
 ) {
     private val lib: File by lazy { File(dataFolder.absolutePath + File.separatorChar + "libraries").also { it.mkdirs() } }
     private val dll: File by lazy { File(dataFolder.absolutePath + File.separatorChar + "CQP.dll") }
@@ -95,7 +94,7 @@ object MiraiNative : KotlinPlugin(
         }
     }
 
-    override fun onLoad() {
+    override fun PluginComponentStorage.onLoad() {
         //暂时只支持 x86 平台运行，不兼容 amd64
         val mode = System.getProperty("sun.arch.data.model")
         if (mode != "32") {

src/main/kotlin/org/itxtech/mirainative/manager/PluginManager.kt

@@ -31,7 +31,6 @@ import kotlinx.serialization.json.Json
 import net.mamoe.mirai.console.command.CommandManager.INSTANCE.register
 import net.mamoe.mirai.console.command.CommandSender
 import net.mamoe.mirai.console.command.CompositeCommand
-import net.mamoe.mirai.console.util.ConsoleExperimentalAPI
 import org.itxtech.mirainative.Bridge
 import org.itxtech.mirainative.MiraiNative
 import org.itxtech.mirainative.bridge.NativeBridge
@@ -206,7 +205,6 @@ object PluginManager {
         }
     }
 
-    @OptIn(ConsoleExperimentalAPI::class)
     object NpmCommand : CompositeCommand(
         MiraiNative, "npm",
         description = "Mirai Native 插件管理器"