修复 lifetime 不生效的 bug。修复指令补全内容错误的问题。

gradle.properties

@@ -1,5 +1,5 @@
 group=io.github.beradq.adybubbles
-version=2.5.1
+version=2.5.2
 kotlin.incremental=true
 kotlin.incremental.java=true
 kotlin.caching.enabled=true

src/main/kotlin/io/github/beradq/adybubbles/AdyBubbles.kt

@@ -16,7 +16,7 @@ import taboolib.common.platform.function.submit
 
 
 object AdyBubbles : Plugin() {
-    const val versionName = "2.5.1"
+    const val versionName = "2.5.2"
     val adyApi: AdyeshachAPI = Adyeshach.api()
 
     val hologramHandler = adyApi.getHologramHandler()

src/main/kotlin/io/github/beradq/adybubbles/BubblesChatCommand.kt

@@ -105,9 +105,7 @@ object BubblesChatCommand {
     @Suppress("unused")
     val play = subCommand {
         dynamic("UUID") {
-            suggestion<CommandSender>(uncheck = true) { _, _ ->
+            suggestEntityListUnique()
-                entityFinder.getEntities().map { it.uniqueId }
-            }
             execute<CommandSender> { _, context, _ ->
                 val uuid = context["UUID"]
                 TraitBubblesChat.startOnce(uuid)
@@ -120,9 +118,7 @@ object BubblesChatCommand {
     val editdata = subCommand {
         bool("RECALL") {
             dynamic("UUID") {
-                suggestion<CommandSender>(uncheck = true) { _, _ ->
+                suggestEntityListUnique()
-                    entityFinder.getEntities().map { it.uniqueId }
-                }
                 dynamic("FIELD") {
                     suggestion<CommandSender>(uncheck = false) { _, _ ->
                         listOf("items", "mode", "period", "rest-delay")
@@ -212,12 +208,10 @@ object BubblesChatCommand {
     @CommandBody
     @Suppress("unused")
     val edit = subCommand {
-        dynamic("NPCID") {
+        dynamic("NPC_ID") {
-            suggestion<CommandSender>(uncheck = true) { _, _ ->
+            suggestEntityList()
-                entityFinder.getEntities().map { it.id }
-            }
             execute<CommandSender> { sender, context, _ ->
-                val npcs = entityFinder.getEntitiesFromId(context["NPCID"])
+                val npcs = entityFinder.getEntitiesFromId(context["NPC_ID"])
                 if (npcs.size == 1) {
                     val uuid = npcs[0].uniqueId
                     sendEditMessage(adaptPlayer(sender as Player), uuid, npcs[0].id)
@@ -237,9 +231,7 @@ object BubblesChatCommand {
     @Suppress("unused")
     val edit2 = subCommand {
         dynamic("UUID") {
-            suggestion<CommandSender>(uncheck = true) { _, _ ->
+            suggestEntityListUnique()
-                entityFinder.getEntities().map { it.uniqueId }
-            }
             execute<CommandSender> { sender, context, _ ->
                 val uuid = context["UUID"]
                 val npc = entityFinder.getEntityFromUniqueId(uuid)!!

src/main/kotlin/io/github/beradq/adybubbles/BubblesCommand.kt

@@ -4,6 +4,7 @@ import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player
 import taboolib.common.platform.command.*
 import taboolib.platform.util.*
+import io.github.beradq.adybubbles.AdyBubbles.entityFinder
 
 @CommandHeader("bubbles")
 @Suppress("unused")
@@ -12,9 +13,7 @@ object BubblesCommand {
     @Suppress("unused")
     val popup = subCommand {
         dynamic("NPC_ID") {
-            suggestion<CommandSender>(uncheck = true) { _, _ ->
+            suggestEntityList()
-                AdyBubbles.adyApi.getEntityFinder().getEntities().map { it.id }
-            }
             dynamic("TEXT") {
                 execute<CommandSender> { sender, context, _ ->
                     val npcId = context["NPC_ID"]
@@ -67,8 +66,9 @@ object BubblesCommand {
     @Suppress("unused")
     val clear = subCommand {
         dynamic("NPC_ID") {
-            suggestion<CommandSender>(uncheck = true) { _, _ ->
+            suggestEntityList()
-                AdyBubbles.adyApi.getEntityFinder().getEntities().map { it.id }
+            suggestion<CommandSender>(uncheck = true) { sender, _ ->
+                entityFinder.getEntities(sender as? Player) { it.isDerived() }.map { it.id }
             }
             execute<CommandSender> { sender, context, _ ->
                 val npcId = context["NPC_ID"]

src/main/kotlin/io/github/beradq/adybubbles/Config.kt

@@ -26,13 +26,13 @@ object Config {
     @Awake(LifeCycle.ENABLE)
     fun reload() {
         configFile.reload()
-        val offset = configFile["offset"] as? Double ?: 0.5
+        val offset = configFile.getDouble("offset", .5)
-        val lineHeight = configFile["line-height"] as? Double ?: 0.5
+        val lineHeight = configFile.getDouble("line-height", 0.5)
         val chat = configFile.getConfigurationSection("chat")
         val period = chat?.getString("period")?.toLongRange() ?: (20L * 3)..(20 * 3)
-        val limit = chat?.get("limit") as? Int ?: 3
+        val limit = chat?.getInt("limit", 3) ?: 3
         val restDelayRange = chat?.getString("rest-delay")?.toLongRange() ?: 0L..0
-        val lifetime = chat?.get("lifetime") as? Long
+        val lifetime = chat?.getLong("lifetime")
         bubblesConfig = BubblesConfig(offset, lineHeight, BubblesChatConfig(period, restDelayRange, limit, lifetime))
     }
 }

src/main/kotlin/io/github/beradq/adybubbles/Utils.kt

@@ -1,10 +1,28 @@
 package io.github.beradq.adybubbles
 
-inline infix fun <T, R> T.pipe(func: (T) -> R): R {
+import ink.ptms.adyeshach.module.command.Command
+import io.github.beradq.adybubbles.AdyBubbles.entityFinder
+import org.bukkit.command.CommandSender
+import org.bukkit.entity.Player
+import taboolib.common.platform.command.component.CommandComponentDynamic
+
+fun CommandComponentDynamic.suggestEntityList() {
+    suggestion<CommandSender>(uncheck = true) { sender, _ ->
+        Command.finder.getEntities(sender as? Player) { !it.isDerived() }.map { it.id }
+    }
+}
+
+fun CommandComponentDynamic.suggestEntityListUnique() {
+    suggestion<CommandSender>(uncheck = true) { sender, _ ->
+        entityFinder.getEntities(sender as? Player) { !it.isDerived() }.map { it.uniqueId }
+    }
+}
+
+inline infix fun <reified T, reified R> T.pipe(func: (T) -> R): R {
     return func(this)
 }
 
-inline infix fun <T, R> T.also(func: (T) -> R): T {
+inline infix fun <reified T, reified R> T.also(func: (T) -> R): T {
     func(this)
     return this
 }