Fix info/remove commands

MineInAbyss · Jul 16, 2023 · 74086ee · 74086ee
1 parent fee5250
commit 74086ee
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
 group=com.mineinabyss
 version=0.21
-idofrontVersion=0.18.13
+idofrontVersion=0.18.15
diff --git a/gradle/myLibs.versions.toml b/gradle/myLibs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-gearyPaper = "0.24-SNAPSHOT"
+gearyPaper = "0.25-SNAPSHOT"
 
 [libraries]
 geary-papermc = { module = "com.mineinabyss:geary-papermc", version.ref = "gearyPaper" }
diff --git a/mobzy-spawning/src/main/kotlin/com/mineinabyss/mobzy/spawning/vertical/SpawnInfo.kt b/mobzy-spawning/src/main/kotlin/com/mineinabyss/mobzy/spawning/vertical/SpawnInfo.kt
@@ -2,6 +2,7 @@ package com.mineinabyss.mobzy.spawning.vertical
 
 import com.mineinabyss.geary.papermc.tracking.entities.toGeary
 import com.mineinabyss.geary.prefabs.PrefabKey
+import com.mineinabyss.geary.prefabs.helpers.prefabs
 import com.mineinabyss.geary.systems.accessors.TargetScope
 import com.mineinabyss.geary.systems.query.GearyQuery
 import com.mineinabyss.idofront.location.down
@@ -89,7 +90,7 @@ class SpawnInfo(
     companion object {
         //TODO perhaps give normal mobs prefab keys too to make this more type safe
         fun categorizeByType(mobs: Collection<Entity>): Map<PrefabKey?, Int> =
-            mobs.groupingBy { it.toGeary().get<PrefabKey>() }.eachCount()
+            mobs.groupingBy { it.toGeary().prefabs.first().get<PrefabKey>() }.eachCount()
     }
 }
 
diff --git a/src/main/kotlin/com/mineinabyss/mobzy/MobzyCommands.kt b/src/main/kotlin/com/mineinabyss/mobzy/MobzyCommands.kt
@@ -1,5 +1,8 @@
 package com.mineinabyss.mobzy
 
+import com.mineinabyss.geary.components.relations.InstanceOf
+import com.mineinabyss.geary.datatypes.GearyEntity
+import com.mineinabyss.geary.helpers.toGeary
 import com.mineinabyss.geary.papermc.tracking.entities.components.SetEntityType
 import com.mineinabyss.geary.papermc.tracking.entities.gearyMobs
 import com.mineinabyss.geary.papermc.tracking.entities.toGeary
@@ -72,7 +75,7 @@ class MobzyCommands : IdofrontCommandExecutor(), TabCompleter {
                                     else -> {
                                         val prefab = runCatching { PrefabKey.of(type).toEntityOrNull() }.getOrNull()
                                             ?: this@commandGroup.stopCommand("No such prefab or selector $type")
-                                        geary.instanceOf(prefab)
+                                        geary.deepInstanceOf(prefab)
                                     }
                                 }
                             }) {
@@ -114,7 +117,7 @@ class MobzyCommands : IdofrontCommandExecutor(), TabCompleter {
             }
 
             "locate" {
-                val mobKey by optionArg(options = gearyMobs.mobPrefabs.run { map { it.key.toString() } }) {
+                val mobKey by optionArg(options = gearyMobs.prefabs.run { map { it.key.toString() } }) {
                     parseErrorMessage = { "No such entity: $passed" }
                 }
                 val radius by intArg {
@@ -125,14 +128,14 @@ class MobzyCommands : IdofrontCommandExecutor(), TabCompleter {
                     val key = PrefabKey.of(mobKey)
                     if (radius <= 0) {
                         Bukkit.getWorlds().forEach { world ->
-                            world.entities.filter { it.toGeary().instanceOf(key.toEntity()) }.forEach { entity ->
+                            world.entities.filter { it.toGeary().deepInstanceOf(key.toEntity()) }.forEach { entity ->
                                 val loc = entity.location
                                 player.info("Found ${key.key} at <click:run_command:/teleport ${loc.blockX} ${loc.blockY} ${loc.blockZ}>${entity.location}>${entity.location} in ${entity.world.name}")
                             }
                         }
                     } else {
                         player.location.getNearbyEntities(radius.toDouble(), radius.toDouble(), radius.toDouble())
-                            .filter { it.toGeary().instanceOf(key.toEntity()) }.forEach { entity ->
+                            .filter { it.toGeary().deepInstanceOf(key.toEntity()) }.forEach { entity ->
                                 val loc = entity.location
                                 player.info("Found ${key.key} at <click:run_command:/teleport ${loc.blockX} ${loc.blockY} ${loc.blockZ}>${entity.location}")
 
@@ -142,15 +145,15 @@ class MobzyCommands : IdofrontCommandExecutor(), TabCompleter {
             }
 
             ("list" / "l")(desc = "Lists all custom mob types")?.action {
-                sender.success("All registered types:\n${gearyMobs.mobPrefabs.getKeys()}")
+                sender.success("All registered types:\n${gearyMobs.prefabs.getKeys()}")
             }
         }
     }
 
     private val mobs: List<String> by lazy {
         buildList {
             addAll(listOf("custom", "important", "mob", "renamed", "passive", "hostile", "flying"))
-            addAll(gearyMobs.mobPrefabs.getKeys().map { it.toString() })
+            addAll(gearyMobs.prefabs.getKeys().map { it.toString() })
         }
     }
 
@@ -175,7 +178,7 @@ class MobzyCommands : IdofrontCommandExecutor(), TabCompleter {
             ).filter { it.startsWith(args[0]) }
 
             else -> {
-                val subCommand = args[1]
+                val subCommand = args[0]
 
                 when (subCommand) {
                     "remove", "rm", "info", "i" -> if (args.size == 2) {
@@ -195,3 +198,8 @@ class MobzyCommands : IdofrontCommandExecutor(), TabCompleter {
         }
     }
 }
+
+fun GearyEntity.deepInstanceOf(entity: GearyEntity): Boolean =
+    instanceOf(entity) || getRelations<InstanceOf?, Any?>().any {
+        it.target.toGeary().deepInstanceOf(entity)
+    }