⬆️(loader) v2.2.0.4

Author: way-zer

build.gradle.kts

@@ -61,6 +61,7 @@ fun RepositoryHandler.saRepository() {
 
 allprojects {
     repositories {
+        mavenLocal()
         mavenCentral()
         saRepository()
         maven(url = "https://www.jitpack.io") {
@@ -79,7 +80,7 @@ dependencies.constraints {
     api("dev.folia:folia-api:$bukkitVersion")
 }
 dependencies {
-    val libraryVersion = "2.1.8.5"
+    val libraryVersion = "2.2.0.4"
     api("cf.wayzer:ScriptAgent:${libraryVersion}")
     implementation("cf.wayzer:LibraryManager:1.6")
 

loader/mindustry/src/Main.kt

@@ -59,7 +59,7 @@ class Main(private val loader: Plugin) : Plugin(), CommonMain {
         Log.info("&bQQ交流群: 1033116078")
         val all = ScriptRegistry.allScripts { true }
         Log.info(
-            "&b共找到${all.size}脚本,加载成功${all.count { it.scriptState.loaded }},启用成功${all.count { it.scriptState.enabled }},出错${all.count { !it.transaction.ready() }}"
+            "&b共找到${all.size}脚本,加载成功${all.count { it.scriptState.loaded }},启用成功${all.count { it.scriptState.enabled }},出错${all.count { !it.ready() }}"
         )
         if (!foundMain)
             Log.warn("&c未找到启动脚本(${Config.mainScript}),请下载安装脚本包,以发挥本插件功能")

scripts/coreLibrary/commands/control.kts

@@ -4,6 +4,8 @@ import cf.wayzer.placehold.PlaceHoldApi.with
 import cf.wayzer.scriptAgent.state.ConditionState
 
 suspend inline fun runIgnoreCancel(sync: Boolean, crossinline body: suspend () -> Unit) {
+    //Need new Job, as it may restart this script.
+    @Suppress("CoroutineContextWithJob")
     val job = launch(Job()) { body() }
     if (sync) job.join()
 }
@@ -36,12 +38,12 @@ command("listFailed", "列出所有故障脚本".with(), commands = Commands.con
     body {
         val prefix = arg.firstOrNull().orEmpty()
         val scripts = ScriptRegistry.allScripts {
-            it.id.startsWith(prefix) && !it.transaction.ready()
+            it.id.startsWith(prefix) && !it.ready()
         }
         for (info in scripts) {
             reply(buildString {
                 appendLine("[${info.scriptState}] ${info.id}")
-                info.conditions.filter { it.status != ConditionState.Status.Success }.forEach { c ->
+                info.lastConditions.filter { it.status != ConditionState.Status.Success }.forEach { c ->
                     c.display().forEach {
                         append("  ")
                         appendLine(it)
@@ -74,8 +76,8 @@ command("list", "列出所有模块或模块内所有脚本".with(), commands =
         val list = ScriptRegistry.allScripts {
             it.id.startsWith(module + Config.idSeparator)
         }.map { script ->
-            val color = if (script.transaction.ready()) "green" else "red"
-            val conditions = script.conditions.filter { it.status != ConditionState.Status.Success }
+            val color = if (script.ready()) "green" else "red"
+            val conditions = script.lastConditions.filter { it.status != ConditionState.Status.Success }
                 .joinToString("") { "${it.type}${it.status}" }
             "[$color]${script.id.padEnd(30)}[reset] [${script.scriptState}] $conditions"
         }
@@ -94,23 +96,21 @@ command("load", "(重新)加载一个脚本或者模块".with(), commands = Comm
         onComplete(0) { ScriptRegistry.allScripts { true }.map { it.id } }
     }
     body {
-        val noCache = checkArg("--noCache")
         var noEnable = checkArg("--noEnable")
         val async = checkArg("--async")
 
         if (arg.isEmpty()) replyUsage()
         val script = ScriptRegistry.getScriptInfo(arg[0])
             ?: returnReply("[red]找不到模块或者脚本".with())
-        if (noCache) {
-            val file = Config.cacheFile(script.id)
-            reply("[yellow]清理cache文件{name}".with("name" to file.name))
-            file.delete()
-        }
         runIgnoreCancel(!async) {
             ScriptManager.transactionV2 {
-                unload(script)
-                execute()
-                (if (noEnable) load else enable)(script)
+                if (script.scriptState.loaded) {
+                    reload(script)
+                } else if (!noEnable) {
+                    enable(script)
+                } else {
+                    load(script)
+                }
             }.printResult()
         }
     }
@@ -129,12 +129,9 @@ command("compile", "(实验性)编译单个脚本(不影响运行中实例)".wit
         val script = ScriptRegistry.getScriptInfo(arg[0])
             ?: returnReply("[red]找不到模块或者脚本".with())
         runIgnoreCancel(!async) {
-            ConditionState("Compile", script.id).apply {
-                run {
-                    script.transaction.compileScript()
-                }
-                reply(display().joinToString("\n").asPlaceHoldString())
-            }
+            ScriptManager.transactionV2 {
+                compile(script)
+            }.printResult()
         }
     }
 }
@@ -146,15 +143,8 @@ command("retry", "(实验性)重试事务".with(), commands = Commands.controlCo
         val async = checkArg("--async")
         runIgnoreCancel(!async) {
             ScriptManager.transactionV2 {
-                ScriptRegistry.allScripts { !it.transaction.ready() }.forEach {
-                    put(it, it.userDemand)
-                }
-                //Clear conditions, and retry
-                onEach {
-                    it.key.transaction.queueRun {
-                        setUserDemand(UserDemandState.CompileOnly);
-                        setUserDemand(it.value)
-                    }
+                ScriptRegistry.allScripts { !it.ready() }.forEach {
+                    compile(it)
                 }
             }.printResult()
         }

scripts/coreLibrary/commands/hotReload.kts

@@ -30,10 +30,7 @@ fun enableWatch() {
                         logger.info("脚本文件更新: ${event.kind().name()} ${script.id}")
                         delay(1000)
                         ScriptManager.transactionV2 {
-                            val old = script.userDemand
-                            unload(script)
-                            execute()
-                            old(script)
+                            reload(script)
                         }.printResult()
                     }
 

scripts/coreLibrary/lib/CommandApi.kt

@@ -407,7 +407,7 @@ open class Commands : CommandHandler, TabCompleter {
                 if (it.script != null) append(" | ${it.script.id}")
                 it.attr<Permission>().firstOrNull()?.let { append(" | ${it.permission}") }
             }
-            return "[light_gray]{prefix}[light_yellow]{name}[gray]{aliases} [light_gray]{usage}  [light_cyan]{desc}[gray]{detail}".with(
+            return "[white]{prefix}[light_yellow]{name}[gray]{aliases} [white]{usage}  [light_cyan]{desc}[gray]{detail}".with(
                 "prefix" to prefix, "name" to it.name, "aliases" to alias,
                 "usage" to it.usage, "desc" to it.description, "detail" to detail
             )