👽️ (mapScript/*) 适配新版本

Author: way-zer

scripts/coreMindustry/util/nextChat.api.kt

@@ -0,0 +1,18 @@
+package coreMindustry.util
+
+import cf.wayzer.scriptAgent.Event
+import cf.wayzer.scriptAgent.thisContextScript
+import coreLibrary.lib.util.ReceivedEvent
+import coreLibrary.lib.util.nextEvent
+import kotlinx.coroutines.withTimeoutOrNull
+import mindustry.gen.Player
+
+data class OnChat(val player: Player, val text: String) : Event, ReceivedEvent {
+    override var received: Boolean = false
+
+    companion object : Event.Handler()
+}
+
+suspend fun nextChat(player: Player, timeoutMillis: Int): String? = withTimeoutOrNull(timeoutMillis.toLong()) {
+    thisContextScript().nextEvent<OnChat> { it.player == player }.text
+}

scripts/coreMindustry/util/nextChat.kts

@@ -0,0 +1,8 @@
+package coreMindustry.util
+
+import mindustry.gen.SendChatMessageCallPacket
+
+listenPacket2ServerAsync<SendChatMessageCallPacket> { con, p ->
+    con.player?.let { OnChat(it, p.message).emitAsync().received.not() } ?: true
+}
+export(::nextChat)

scripts/coreMindustry/utilNextChat.kts

@@ -0,0 +1,22 @@
+package mapScript.lib
+
+import mindustry.game.Team
+import mindustry.gen.Call
+import mindustry.world.Tile
+
+//定义一种标记格式
+//放置世界信息版，每行可设置一个标记，形如
+// @zone w=5 h=5
+//地图加载后，将存储在@zone类型信息中
+
+data class PosMark(val type: String, val tile: Tile, val team: Team, val arg: Map<String, String>) {
+    fun error(msg: String, duration: Float = 10f) {
+        Call.labelReliable(msg, duration, tile.worldx(), tile.worldy())
+    }
+
+    //@file:Depends("mapScript/shared/PosMark")
+    interface Service {
+        fun getPoses(type: String): List<PosMark>
+        fun registerCommand(type: String, handler: (PosMark) -> Unit)
+    }
+}

scripts/mapScript/lib/PosMark.kt

@@ -1,27 +1,18 @@
+@file:Implement(PosMark.Service::class)
+
 package mapScript.shared
 
-import mindustry.game.Team
 import mindustry.world.Tile
 
-//定义一种标记格式
-//放置世界信息版，每行可设置一个标记，形如
-// @zone w=5 h=5
-//地图加载后，将存储在@zone类型信息中
-
-data class Pos(val type: String, val tile: Tile, val team: Team, val arg: Map<String, String>) {
-    fun error(msg: String, duration: Float = 10f) {
-        Call.labelReliable(msg, duration, tile.worldx(), tile.worldy())
-    }
-}
-
-fun parse(tile: Tile): List<Pos>? {
+fun parse(tile: Tile): List<PosMark>? {
     if (tile.block() != Blocks.worldMessage) return null
     val lines = tile.build.config().toString().lines()
     if (lines.any { it.firstOrNull() != '@' }) return null
     val team = tile.team()
     return lines.map { line ->
         val sp = line.split(" ").filter { it.isNotBlank() }
-        Pos(sp[0], tile, team,
+        PosMark(
+            sp[0], tile, team,
             sp.drop(1).associate { it.substringBefore('=') to it.substringAfter('=', "") })
     }
 }
@@ -39,7 +30,7 @@ val posMap by autoInit {
     all.groupBy { it.type }
 }
 
-fun getPoses(type: String) = posMap[type].orEmpty()
+/*override*/ fun getPoses(type: String) = posMap[type].orEmpty()
 
 //动态地图标记
 listen<EventType.TileChangeEvent> { event ->
@@ -53,8 +44,8 @@ listen<EventType.TileChangeEvent> { event ->
         }
     }
 }
-val commands = mutableMapOf<String, (pos: Pos) -> Unit>()
+val commands = mutableMapOf<String, (pos: PosMark) -> Unit>()
 onDisable { commands.clear() }
-fun registerCommand(type: String, handler: (pos: Pos) -> Unit) {
+/*override*/ fun registerCommand(type: String, handler: (pos: PosMark) -> Unit) {
     commands[type] = handler
 }

scripts/mapScript/shared/posMark.kts

@@ -28,6 +28,14 @@ ID coreMindustry/scoreboard
 FQ_NAME coreMindustry.Scoreboard
 +DEPENDS coreMindustry module
 
+ID coreMindustry/util/newContent
+FQ_NAME coreMindustry.util.NewContent
++DEPENDS coreMindustry module
+
+ID coreMindustry/util/nextChat
+FQ_NAME coreMindustry.util.NextChat
++DEPENDS coreMindustry module
+
 ID coreMindustry/util/packetHelper
 FQ_NAME coreMindustry.util.PacketHelper
 +DEPENDS coreMindustry module
@@ -44,10 +52,6 @@ ID coreMindustry/util/trackBuilding
 FQ_NAME coreMindustry.util.TrackBuilding
 +DEPENDS coreMindustry module
 
-ID coreMindustry/utilMapRule
-FQ_NAME coreMindustry.UtilMapRule
-+DEPENDS coreMindustry module
-
 ID coreMindustry/utilNextChat
 FQ_NAME coreMindustry.UtilNextChat
 +DEPENDS coreMindustry module

scripts/metadata/coreMindustry.metadata

@@ -2,7 +2,7 @@ include("scripts")
 
 file("scripts").listFiles()?.forEach {
     if (it.isDirectory && it.name.startsWith("@")) {
-        include("scripts:${it.name.substring(1)}")
-        project(":scripts:${it.name.substring(1)}").projectDir = it
+        include("scripts:@${it.name.substring(1)}")
+        project(":scripts:@${it.name.substring(1)}").projectDir = it
     }
 }