v4.0.0-dev9

listen 和 process 也增加返回值
simple-robot · Jan 18, 2024 · da33ec6 · da33ec6
1 parent ccd3dae
commit da33ec6
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 28 deletions.
diff --git a/.changelog/v4.0.0-dev9.md b/.changelog/v4.0.0-dev9.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# v4.0.0-dev9
+> [!warning]
+> 这是一个尚在开发中的**预览版**，它可能不稳定，可能会频繁变更，且没有可用性保证。
+
+
+> Release & Pull Notes: [v4.0.0-dev9](https://github.com/simple-robot/simpler-robot/releases/tag/v4.0.0-dev9) 
+
+
 # v4.0.0-dev8
 > [!warning]
 > 这是一个尚在开发中的**预览版**，它可能不稳定，可能会频繁变更，且没有可用性保证。

diff --git a/buildSrc/src/main/kotlin/P.kt b/buildSrc/src/main/kotlin/P.kt
@@ -81,7 +81,7 @@ sealed class P(override val group: String) : ProjectDetail() {
     val versionWithoutSnapshot: Version
 
     init {
-        val mainVersion = version(4, 0, 0) - version("dev8")
+        val mainVersion = version(4, 0, 0) - version("dev9")
 
         fun initVersionWithoutSnapshot(status: Version?): Version = if (status == null) {
             mainVersion

diff --git a/simbot-api/src/commonMain/kotlin/love/forte/simbot/event/EventListenerRegistrar.kt b/simbot-api/src/commonMain/kotlin/love/forte/simbot/event/EventListenerRegistrar.kt
@@ -82,14 +82,12 @@ public inline fun <reified E : Event> EventListenerRegistrar.listen(
     propertiesConsumer: ConfigurerFunction<EventListenerRegistrationProperties>? = null,
     crossinline typeMismatchResult: EventListenerContext.() -> EventResult = { invalid() },
     crossinline listenerFunction: suspend EventListenerContext.(E) -> EventResult,
-) {
-    register(
-        propertiesConsumer = propertiesConsumer,
-        listener = {
-            val event = this.event
-            if (event is E) listenerFunction(this, event) else typeMismatchResult(this)
-        })
-}
+): EventListenerRegistrationHandle = register(
+    propertiesConsumer = propertiesConsumer,
+    listener = {
+        val event = this.event
+        if (event is E) listenerFunction(this, event) else typeMismatchResult(this)
+    })
 
 /**
  * 是 [listen] 或 [EventListenerRegistrar.register] 的进一步简写形式，
@@ -102,14 +100,12 @@ public inline fun EventListenerRegistrar.process(
     crossinline defaultResult: () -> EventResult = { EventResult.empty() },
     propertiesConsumer: ConfigurerFunction<EventListenerRegistrationProperties>? = null,
     crossinline listenerFunction: suspend EventListenerContext.() -> Unit,
-) {
-    register(
-        propertiesConsumer = propertiesConsumer,
-        listener = {
-            listenerFunction()
-            defaultResult()
-        })
-}
+): EventListenerRegistrationHandle = register(
+    propertiesConsumer = propertiesConsumer,
+    listener = {
+        listenerFunction()
+        defaultResult()
+    })
 
 /**
  * 是 [listen] 或 [EventListenerRegistrar.register] 的进一步简写形式，
@@ -125,17 +121,15 @@ public inline fun <reified E : Event> EventListenerRegistrar.process(
     propertiesConsumer: ConfigurerFunction<EventListenerRegistrationProperties>? = null,
     crossinline typeMismatchResult: EventListenerContext.() -> EventResult = { invalid() },
     crossinline listenerFunction: suspend EventListenerContext.(E) -> Unit,
-) {
-    register(
-        propertiesConsumer = propertiesConsumer,
-        listener = {
-            val event = this.event
-            if (event is E) {
-                listenerFunction(event)
-                defaultResult()
-            } else typeMismatchResult()
-        })
-}
+): EventListenerRegistrationHandle = register(
+    propertiesConsumer = propertiesConsumer,
+    listener = {
+        val event = this.event
+        if (event is E) {
+            listenerFunction(event)
+            defaultResult()
+        } else typeMismatchResult()
+    })
 
 /**
  * 注册事件监听器的额外属性。