[Update](*) 更新适配新版CommandApi

way-zer · way-zer · commit ae9b39a6066f · 2020-09-01T12:29:45.000+08:00
diff --git a/src/coreLibrary/controlCommand.content.kts b/src/coreLibrary/controlCommand.content.kts
@@ -54,14 +54,14 @@ onEnable {
         addSub(CommandInfo(thisRef, "reload", "重载一个脚本或者模块") {
             usage = "<module[/script]>"
             permission = "scriptAgent.control.reload"
-            onComplete = {
+            onComplete {
                 onComplete(0) {
                     (arg[0].split('/')[0].let(ScriptManager::getScript)?.let { it as IInitScript }?.children
                             ?: ScriptManager.loadedInitScripts.values).map { it.id }
                 }
             }
-            body = body@{
-                if (arg.isEmpty()) return@body replyUsage()
+            body {
+                if (arg.isEmpty()) replyUsage()
                 GlobalScope.launch {
                     reply("[yellow]异步处理中".with())
                     val success: Boolean = when (val script = arg.getOrNull(0)?.let(ScriptManager::getScript)) {
@@ -80,7 +80,7 @@ onEnable {
             usage = "<filePath>"
             aliases = listOf("load")
             permission = "scriptAgent.control.load"
-            body = body@{
+            body {
                 val file = arg.getOrNull(0)?.let(Config.rootDir::resolve)
                         ?: return@body reply("[red]未找到对应文件".with())
                 GlobalScope.launch {
diff --git a/src/coreMindustry/lib/ContentExt.kt b/src/coreMindustry/lib/ContentExt.kt
@@ -56,7 +56,7 @@ fun IContentScript.command(
 }
 
 @Deprecated("use new command api", ReplaceWith("command(name,description){init();body(handler)}"))
-fun IContentScript.command(name: String, description: String, init: CommandInfo.() -> Unit = {}, handler: CommandHandler) {
+fun IContentScript.command(name: String, description: String, init: CommandInfo.() -> Unit, handler: CommandHandler) {
     RootCommands += CommandInfo(this, name, description) {
         init()
         body(handler)
diff --git a/src/main/helpfulCommand.content.kts b/src/main/helpfulCommand.content.kts
@@ -2,6 +2,6 @@ package main
 
 import arc.graphics.Colors
 
-command("showColor", "显示所有颜色") {
+command("showColor", "显示所有颜色", {}) {
     reply(Colors.getColors().joinToString("[],") { "[#${it.value}]${it.key}" }.with())
 }
diff --git a/src/mirai.init.kts b/src/mirai.init.kts
@@ -62,10 +62,11 @@ onEnable {
 }
 
 Commands.controlCommand.let {
-    it += CommandInfo(this, "mirai", "重定向输入到mirai", {
+    it += CommandInfo(this, "mirai", "重定向输入到mirai") {
         usage = "[args...]"
         permission = "mirai.input"
-    }) {
-        channel.sendBlocking(this.arg.joinToString(" "))
+        body {
+            channel.sendBlocking(arg.joinToString(" "))
+        }
     }
 }
diff --git a/src/wayzer/admin.content.kts b/src/wayzer/admin.content.kts
@@ -18,7 +18,7 @@ val Admin = Admin()
 
 inner class Admin : SharedData.IAdmin {
     override fun isAdmin(player: Player): Boolean {
-        return player.isAdmin||admins.contains(player.uuid)
+        return player.isAdmin || admins.contains(player.uuid)
     }
 
     override fun ban(player: Player, uuid: String) {
@@ -41,7 +41,7 @@ listen<EventType.PlayerBanEvent> {
     it.player?.con?.kick(Packets.KickReason.banned)
 }
 
-command("list", "列出当前玩家") {
+command("list", "列出当前玩家", {}) {
     val list = playerGroup.all().map {
         "{player.name}[white]([red]{player.shortID}[white]) ".with("player" to it)
     }
diff --git a/src/wayzer/ext/vote.content.kts b/src/wayzer/ext/vote.content.kts
@@ -51,16 +51,18 @@ command("vote", "发起投票", {
 }, voteCommands)
 command("votekick", "(弃用)投票踢人", { this.usage = "<player...>";this.type = CommandType.Client }) {
     //Redirect
-    voteCommands.invoke(new { arg = listOf("kick", *arg.toTypedArray()) })
+    arg = listOf("kick", *arg.toTypedArray())
+    voteCommands.invoke(this)
 }
 
 export(::voteCommands)
 
 fun subVote(desc: String, usage: String, vararg aliases: String, body: CommandContext.() -> Unit) {
-    voteCommands += CommandInfo(null, aliases.first(), desc, {
+    voteCommands += CommandInfo(null, aliases.first(), desc) {
         this.usage = usage
         this.aliases = aliases.toList()
-    }, body)
+        body(body)
+    }
 }
 
 class NetFi(private val url: URL, file: String) : Fi(file) {
diff --git a/src/wayzer/user/skills.content.kts b/src/wayzer/user/skills.content.kts
@@ -14,46 +14,38 @@ listen<EventType.ResetEvent> {
     used.clear()
 }
 
-fun skill(name: String, desc: String, vararg aliases: String, body: CommandContext.() -> Unit) {
-    command(name, desc, {
-        permission = "wayzer.user.skills.$name"
-        this.aliases = aliases.toList()
-        type = CommandType.Client
-    }, body)
-}
-
 /**
  * @param coolDown in ms; <0 ->一局冷却
  */
-fun CommandContext.checkBefore(allowPvp: Boolean, coolDown: Int?) {
-    if (state.rules.mode() !in arrayOf(Gamemode.survival, Gamemode.attack) && (!allowPvp || state.rules.pvp)) {
-        reply("[red]当前模式禁用".with())
-        CommandInfo.Return()
-    }
-    if (player!!.dead) {
-        reply("[red]你已死亡".with())
-        CommandInfo.Return()
-    }
-    if (coolDown != null) {
-        val id = PlayerData[player!!.uuid].profile?.id?.value ?: 0
-        val key = "${thisCommand.name}@$id"
-        if (key in used) {
-            if (coolDown < 0) {
-                reply("[red]该技能每局限用一次".with())
-                CommandInfo.Return()
-            } else if (used[key]!! >= System.currentTimeMillis()) {
-                reply("[red]技能冷却，还剩{time:秒}".with("time" to Duration.ofMillis(used[key]!! - System.currentTimeMillis())))
-                CommandInfo.Return()
+fun skill(name: String, desc: String, allowPvp: Boolean, coolDown: Int?, vararg aliases: String, body: CommandContext.() -> Unit) {
+    command(name, desc) {
+        permission = "wayzer.user.skills.$name"
+        this.aliases = aliases.toList()
+        type = CommandType.Client
+        body {
+            if (state.rules.mode() !in arrayOf(Gamemode.survival, Gamemode.attack) && (!allowPvp || state.rules.pvp))
+                returnReply("[red]当前模式禁用".with())
+            if (player!!.dead)
+                returnReply("[red]你已死亡".with())
+            if (coolDown != null) {
+                val id = PlayerData[player!!.uuid].profile?.id?.value ?: 0
+                val key = "${name}@$id"
+                if (key in used) {
+                    if (coolDown < 0)
+                        returnReply("[red]该技能每局限用一次".with())
+                    else if (used[key]!! >= System.currentTimeMillis())
+                        returnReply("[red]技能冷却，还剩{time:秒}".with("time" to Duration.ofMillis(used[key]!! - System.currentTimeMillis())))
+                }
+                used[key] = System.currentTimeMillis() + coolDown
             }
+            body(body)
         }
-        used[key] = System.currentTimeMillis() + coolDown
     }
 }
 
 fun Player.broadcastSkill(skill: String) = broadcast("[yellow][技能][green]{player.name}[white]使用了[green]{skill}[white]技能.".with("player" to this, "skill" to skill), quite = true)
 
-skill("draug", "技能: 召唤采矿机,一局限一次,PVP禁用", "矿机") {
-    checkBefore(false, -1)
+skill("draug", "技能: 召唤采矿机,一局限一次,PVP禁用", false, -1, "矿机") {
     if (state.rules.bannedBlocks.contains(Blocks.draugFactory))
         return@skill reply("[red]该地图采矿机已禁封,禁止召唤".with())
     UnitTypes.draug.create(player!!.team).apply {
@@ -63,8 +55,7 @@ skill("draug", "技能: 召唤采矿机,一局限一次,PVP禁用", "矿机") {
     player!!.broadcastSkill("召唤采矿机")
 }
 
-skill("noFire", "技能: 灭火,半径10格,冷却120s", "灭火") {
-    checkBefore(false, 120_000)
+skill("noFire", "技能: 灭火,半径10格,冷却120s", false, 120_000, "灭火") {
     fireGroup.forEach {
         if (it.dst(player!!) <= 80)
             it.remove()

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ fun IContentScript.command(`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`@Deprecated("use new command api", ReplaceWith("command(name,description){init();body(handler)}"))`
`59`		`-fun IContentScript.command(name: String, description: String, init: CommandInfo.() -> Unit = {}, handler: CommandHandler) {`
	`59`	`+fun IContentScript.command(name: String, description: String, init: CommandInfo.() -> Unit, handler: CommandHandler) {`
`60`	`60`	`RootCommands += CommandInfo(this, name, description) {`
`61`	`61`	`init()`
`62`	`62`	`body(handler)`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@ package main`
`2`	`2`
`3`	`3`	`import arc.graphics.Colors`
`4`	`4`
`5`		`-command("showColor", "显示所有颜色") {`
	`5`	`+command("showColor", "显示所有颜色", {}) {`
`6`	`6`	`reply(Colors.getColors().joinToString("[],") { "[#${it.value}]${it.key}" }.with())`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,10 +62,11 @@ onEnable {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`Commands.controlCommand.let {`
`65`		`- it += CommandInfo(this, "mirai", "重定向输入到mirai", {`
	`65`	`+ it += CommandInfo(this, "mirai", "重定向输入到mirai") {`
`66`	`66`	`usage = "[args...]"`
`67`	`67`	`permission = "mirai.input"`
`68`		`- }) {`
`69`		`- channel.sendBlocking(this.arg.joinToString(" "))`
	`68`	`+ body {`
	`69`	`+ channel.sendBlocking(arg.joinToString(" "))`
	`70`	`+ }`
`70`	`71`	`}`
`71`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ val Admin = Admin()`
`18`	`18`
`19`	`19`	`inner class Admin : SharedData.IAdmin {`
`20`	`20`	`override fun isAdmin(player: Player): Boolean {`
`21`		`- return player.isAdmin\|\|admins.contains(player.uuid)`
	`21`	`+ return player.isAdmin \|\| admins.contains(player.uuid)`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`override fun ban(player: Player, uuid: String) {`
`@@ -41,7 +41,7 @@ listen<EventType.PlayerBanEvent> {`
`41`	`41`	`it.player?.con?.kick(Packets.KickReason.banned)`
`42`	`42`	`}`
`43`	`43`
`44`		`-command("list", "列出当前玩家") {`
	`44`	`+command("list", "列出当前玩家", {}) {`
`45`	`45`	`val list = playerGroup.all().map {`
`46`	`46`	`"{player.name}[white]([red]{player.shortID}[white]) ".with("player" to it)`
`47`	`47`	`}`