Custom highlight color

src/main/kotlin/me/odinmain/commands/impl/HighlightCommand.kt

@@ -3,22 +3,29 @@ package me.odinmain.commands.impl
 import com.github.stivais.commodore.utils.GreedyString
 import me.odinmain.commands.commodore
 import me.odinmain.config.Config
+import me.odinmain.features.impl.render.CustomHighlight.currentEntities
 import me.odinmain.features.impl.render.CustomHighlight.highlightList
 import me.odinmain.utils.skyblock.modMessage
 
 val highlightCommand = commodore("highlight") {
-    literal("add").runs { mob: GreedyString ->
-        val lowercase = mob.string.lowercase()
-        if (lowercase in highlightList) return@runs modMessage("$mob is already in the highlight list.")
+    literal("add").runs { mob: GreedyString, hex: String? ->
+        val colorRegex = Regex("^#?([0-9a-fA-F]{6}|[0-9a-fA-F]{8})$")
+
+        val parts = mob.string.trim().split(" ")
+        val color = parts.lastOrNull()?.takeIf { it.matches(colorRegex) }?.removePrefix("#")
+        val mobName = if (color != null) parts.dropLast(1).joinToString(" ") else mob.string
+        val lowercase = mobName.lowercase()
+
+        if (highlightList.any { it.key == lowercase }) return@runs modMessage("$mobName is already in the highlight list.")
 
-        modMessage("Added $mob to the highlight list.")
-        highlightList.add(lowercase)
+        modMessage("Added $mobName to the highlight list${color?.let { " with color #$it" } ?: ""}.")
+        highlightList[lowercase] = color ?: ""
         Config.save()
     }
 
     literal("remove").runs { mob: GreedyString ->
         val lowercase = mob.string.lowercase()
-        if (lowercase !in highlightList) return@runs modMessage("$mob isn't in the highlight list.")
+        if (highlightList.none { it.key == lowercase }) return@runs modMessage("$mob isn't in the highlight list.")
 
         modMessage("Removed $mob from the highlight list.")
         highlightList.remove(lowercase)
@@ -28,11 +35,12 @@ val highlightCommand = commodore("highlight") {
     literal("clear").runs {
         modMessage("Highlight list cleared.")
         highlightList.clear()
+        currentEntities.clear()
         Config.save()
     }
 
     literal("list").runs {
         if (highlightList.isEmpty()) return@runs modMessage("Highlight list is empty")
-        modMessage("Highlight list:\n${highlightList.joinToString("\n")}")
+        modMessage("Highlight list:\n${highlightList.entries.joinToString("\n")}")
     }
 }

src/main/kotlin/me/odinmain/features/impl/render/CustomHighlight.kt

@@ -32,9 +32,9 @@ object CustomHighlight : Module(
     private val xray by BooleanSetting("Depth Check", false, description = "Highlights entities through walls.").withDependency { !isLegitVersion }
     private val showInvisible by BooleanSetting("Show Invisible", false, description = "Highlights invisible entities.").withDependency { !isLegitVersion }
 
-    val highlightList: MutableList<String> by ListSetting("List", mutableListOf())
+    val highlightList: MutableMap<String, String> by MapSetting("Map", mutableMapOf(), "")
     private val depthCheck get() = if (isLegitVersion) true else xray
-    private var currentEntities = mutableSetOf<Entity>()
+    val currentEntities = mutableSetOf<HighlightEntity>()
 
     init {
         execute({ scanDelay }) {
@@ -47,7 +47,9 @@ object CustomHighlight : Module(
 
         HighlightRenderer.addEntityGetter({ HighlightRenderer.HighlightType.entries[mode]}) {
             if (!enabled) emptyList()
-            else currentEntities.map { HighlightRenderer.HighlightEntity(it, color, thickness, depthCheck, style) }
+            else currentEntities.map {
+                HighlightRenderer.HighlightEntity(it.entity, it.color, thickness, depthCheck, style)
+            }
         }
     }
 
@@ -56,28 +58,41 @@ object CustomHighlight : Module(
             checkEntity(entity)
             if (starredMobESP) checkStarred(entity)
             if (shadowAssassin && !isLegitVersion) checkAssassin(entity)
-            if (showInvisible && entity.isInvisible && !isLegitVersion && entity in currentEntities) entity.isInvisible = false
+            if (showInvisible && entity.isInvisible && !isLegitVersion && currentEntities.any { it.entity == entity }) entity.isInvisible = false
         }
     }
 
     private fun checkEntity(entity: Entity) {
-        if (entity !is EntityArmorStand || highlightList.none { entity.name.contains(it, true) } || entity in currentEntities || !entity.alwaysRenderNameTag && !depthCheck) return
-        currentEntities.add(getMobEntity(entity) ?: return)
+        if (entity !is EntityArmorStand || highlightList.none { entity.name.contains(it.key, true) } || currentEntities.any { it.entity == entity}  || !entity.alwaysRenderNameTag && !depthCheck) return
+        val highlightColor = getColorFromList(entity.name)
+        currentEntities.add(HighlightEntity(getMobEntity(entity) ?: return, highlightColor))
     }
 
     private fun checkStarred(entity: Entity) {
-        if (entity !is EntityArmorStand || !entity.name.startsWith("§6✯ ") || !entity.name.endsWith("§c❤") || entity in currentEntities || (!entity.alwaysRenderNameTag && depthCheck)) return
-        currentEntities.add(getMobEntity(entity) ?: return)
+        if (entity !is EntityArmorStand || !entity.name.startsWith("§6✯ ") || !entity.name.endsWith("§c❤") || currentEntities.any { it.entity == entity} || (!entity.alwaysRenderNameTag && depthCheck)) return
+        currentEntities.add(HighlightEntity(getMobEntity(entity) ?: return, color))
     }
 
     private fun checkAssassin(entity: Entity) {
         if (entity !is EntityOtherPlayerMP || entity.name != "Shadow Assassin") return
-        currentEntities.add(entity)
+        currentEntities.add(HighlightEntity(entity, color))
     }
 
     private fun getMobEntity(entity: Entity): Entity? {
         return mc.theWorld?.getEntitiesWithinAABBExcludingEntity(entity, entity.entityBoundingBox.offset(0.0, -1.0, 0.0))
             ?.filter { it !is EntityArmorStand && mc.thePlayer != it && !(it is EntityWither && it.isInvisible) && !(it is EntityOtherPlayerMP && it.isOtherPlayer()) }
             ?.minByOrNull { entity.getDistanceToEntity(it) }
     }
+
+    private fun getColorFromList(name: String): Color {
+        val colorString = highlightList.entries.firstOrNull { name.contains(it.key, true) }?.value
+        return colorString?.let { parseColor(it) } ?: color
+    }
+
+    private fun parseColor(color: String): Color? = kotlin.runCatching {
+        if (color.isEmpty()) return null
+        Color(color.padEnd(8, 'f'))
+    }.getOrNull()
+
+    data class HighlightEntity(val entity: Entity, val color: Color)
 }