From ab10032dc8797bcbe6fe3857547c05a802cdd0af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=A8=E8=91=89=20Scarlet?=
 <93977077+mukjepscarlet@users.noreply.github.com>
Date: Tue, 25 Nov 2025 01:04:16 +0800
Subject: [PATCH 01/16] start

---
 src-theme/src/integration/types.ts            |  1 +
 .../config/types/MultiChooseListValue.kt      | 15 +++++-
 .../config/types/nesting/Configurable.kt      | 35 ++++++++++----
 .../utils/combat/TargetTracker.kt             | 46 +++++++++++--------
 4 files changed, 69 insertions(+), 28 deletions(-)

diff --git a/src-theme/src/integration/types.ts b/src-theme/src/integration/types.ts
index 4d34c3e84af..c13c6f9e890 100644
--- a/src-theme/src/integration/types.ts
+++ b/src-theme/src/integration/types.ts
@@ -144,6 +144,7 @@ export interface ChooseSetting extends Setting<string> {
 export interface MultiChooseSetting extends Setting<string[]> {
     choices: string[];
     canBeNone: boolean;
+    isOrderSensitive: boolean;
 }
 
 export interface ListSetting extends Setting<string[]> {
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/config/types/MultiChooseListValue.kt b/src/main/kotlin/net/ccbluex/liquidbounce/config/types/MultiChooseListValue.kt
index 01640c46880..712a58f1466 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/config/types/MultiChooseListValue.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/config/types/MultiChooseListValue.kt
@@ -23,12 +23,14 @@ import com.google.gson.JsonArray
 import com.google.gson.JsonElement
 import com.google.gson.JsonPrimitive
 import net.ccbluex.liquidbounce.config.gson.stategies.Exclude
+import java.util.SequencedSet
 import java.util.TreeMap
 
 class MultiChooseListValue<T : NamedChoice>(
     name: String,
     /**
-     * Enabled values. A mutable and unordered [Set].
+     * Enabled values in [MutableSet].
+     * Its order is determined by the implementation of [MutableSet].
      */
     value: MutableSet<T>,
     /**
@@ -40,6 +42,11 @@ class MultiChooseListValue<T : NamedChoice>(
      * Can deselect all values or enable at least one
      */
     @Exclude val canBeNone: Boolean = true,
+
+    /**
+     * Determines whether the order of enabled values matters.
+     */
+    @Exclude val isOrderSensitive: Boolean = false,
 ) : Value<MutableSet<T>>(
     name,
     defaultValue = value,
@@ -58,6 +65,12 @@ class MultiChooseListValue<T : NamedChoice>(
             }
         }
 
+        if (isOrderSensitive) {
+            require(value is SequencedSet) {
+                "The value must be a SequencedSet (e.g. TreeSet or LinkedHashSet) when isOrderSensitive is true."
+            }
+        }
+
         value.retainAll(choices)
     }
 
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/config/types/nesting/Configurable.kt b/src/main/kotlin/net/ccbluex/liquidbounce/config/types/nesting/Configurable.kt
index c617403541d..b4d36de7bbb 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/config/types/nesting/Configurable.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/config/types/nesting/Configurable.kt
@@ -153,7 +153,7 @@ open class Configurable(
         return output.toTypedArray()
     }
 
-    fun getContainedValuesRecursivelyInternal(output: MutableList<Value<*>>) {
+    protected fun getContainedValuesRecursivelyInternal(output: MutableList<Value<*>>) {
         for (currentValue in this.inner) {
             if (currentValue is ToggleableConfigurable) {
                 output.add(currentValue)
@@ -392,14 +392,25 @@ open class Configurable(
         choices: EnumSet<T> = EnumSet.allOf(T::class.java),
         canBeNone: Boolean = true,
     ) where T : Enum<T>, T : NamedChoice =
-        multiEnumChoice(name, default, choices as Set<T>, canBeNone)
+        multiEnumChoice(name, default, choices, canBeNone, isOrderSensitive = false)
+
+    inline fun <reified T> multiEnumChoice(
+        name: String,
+        default: SequencedSet<T>,
+        choices: EnumSet<T> = EnumSet.allOf(T::class.java),
+        canBeNone: Boolean = true,
+    ) where T : Enum<T>, T : NamedChoice =
+        multiEnumChoice(name, default, choices, canBeNone, isOrderSensitive = true)
 
     fun <T : NamedChoice> multiEnumChoice(
         name: String,
         default: MutableSet<T>,
         choices: Set<T>,
         canBeNone: Boolean,
-    ) = MultiChooseListValue(name, default, choices, canBeNone).apply { this@Configurable.inner.add(this) }
+        isOrderSensitive: Boolean,
+    ) = MultiChooseListValue(name, default, choices, canBeNone, isOrderSensitive).apply {
+        this@Configurable.inner.add(this)
+    }
 
     inline fun <reified T> enumChoice(name: String, default: T): ChooseListValue<T>
         where T : Enum<T>, T : NamedChoice = enumChoice(name, default, EnumSet.allOf(T::class.java))
@@ -550,15 +561,21 @@ open class Configurable(
             }
 
             ValueType.MULTI_CHOOSE -> {
-                val value = valueObject["value"].asJsonArray.mapTo(sortedSetOf()) { it.asString.asNamedChoice() }
-                val choices = valueObject["choices"].asJsonArray.mapTo(linkedSetOf()) { it.asString.asNamedChoice() }
-                val canBeNone = when (val json = valueObject["canBeNone"]) {
-                    null, is JsonNull -> true // default = true
+                fun parseBoolean(key: String, default: Boolean) = when (val json = valueObject[key]) {
+                    null, is JsonNull -> default
                     is JsonPrimitive, is JsonArray -> json.asBoolean
-                    else -> error("Unexpected JSON (${json.javaClass}): $json, should be boolean")
+                    else -> error("Unexpected JSON value (${json.javaClass}): $json, should be boolean")
                 }
 
-                multiEnumChoice(name, value, choices, canBeNone)
+                val canBeNone = parseBoolean(key = "canBeNone", default = true)
+                val isOrderSensitive = parseBoolean(key = "isOrderSensitive", default = false)
+
+                val value = valueObject["value"].asJsonArray.mapTo(
+                    if (isOrderSensitive) sortedSetOf() else linkedSetOf()
+                ) { it.asString.asNamedChoice() }
+                val choices = valueObject["choices"].asJsonArray.mapTo(linkedSetOf()) { it.asString.asNamedChoice() }
+
+                multiEnumChoice(name, default = value, choices, canBeNone, isOrderSensitive)
             }
 
             else -> error("Unsupported type: $type")
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/utils/combat/TargetTracker.kt b/src/main/kotlin/net/ccbluex/liquidbounce/utils/combat/TargetTracker.kt
index 6c457891dd8..2200b742a69 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/utils/combat/TargetTracker.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/utils/combat/TargetTracker.kt
@@ -19,6 +19,8 @@
 package net.ccbluex.liquidbounce.utils.combat
 
 import it.unimi.dsi.fastutil.objects.ObjectArrayList
+import net.ccbluex.fastutil.mapToArray
+import net.ccbluex.fastutil.objectLinkedSetOf
 import net.ccbluex.liquidbounce.config.types.nesting.Configurable
 import net.ccbluex.liquidbounce.config.types.NamedChoice
 import net.ccbluex.liquidbounce.config.types.RangedValue
@@ -28,6 +30,7 @@ import net.ccbluex.liquidbounce.utils.client.*
 import net.ccbluex.liquidbounce.utils.entity.getActualHealth
 import net.ccbluex.liquidbounce.utils.entity.squaredBoxedDistanceTo
 import net.ccbluex.liquidbounce.utils.math.sq
+import net.ccbluex.liquidbounce.utils.sorting.ComparatorChain
 import net.minecraft.entity.LivingEntity
 import net.minecraft.entity.mob.Angerable
 import net.minecraft.entity.mob.HostileEntity
@@ -93,7 +96,17 @@ open class TargetSelector(
     private val range = rangeValue.register(this)
     private val fov by float("FOV", 180f, 0f..180f)
     private val hurtTime by int("HurtTime", 10, 0..10)
-    private val priority by enumChoice("Priority", defaultPriority)
+
+    @Suppress("unused", "UnusedPrivateProperty")
+    private val priority by multiEnumChoice(
+        name = "Priority",
+        default = objectLinkedSetOf(TargetPriority.TYPE, defaultPriority),
+        canBeNone = false,
+    ).onChanged { set ->
+        comparator = ComparatorChain(comparisonFunctions = set.mapToArray { it.comparator })
+    }
+
+    private var comparator: Comparator<in LivingEntity> = TargetPriority.TYPE.comparator
 
     /**
      * Counts available targets.
@@ -118,13 +131,7 @@ open class TargetSelector(
             return entities
         }
 
-        entities.sortWith(
-            if (priority == TargetPriority.DISTANCE) {
-                COMPARATOR_BY_TYPE.thenComparing(TargetPriority.DISTANCE.comparator)
-            } else {
-                COMPARATOR_BY_TYPE.thenComparing(priority.comparator).thenComparing(TargetPriority.DISTANCE.comparator)
-            }
-        )
+        entities.sortWith(this.comparator)
 
         // Update max distance squared
         closestSquaredEnemyDistance = entities.minOf { it.squaredBoxedDistanceTo(player) }
@@ -176,15 +183,6 @@ open class TargetSelector(
 
 }
 
-private val COMPARATOR_BY_TYPE: Comparator<LivingEntity> = Comparator.comparingInt { entity ->
-    when (entity) {
-        is PlayerEntity -> 0
-        is HostileEntity -> 1
-        is Angerable if entity.angryAt == player.uuid -> 2
-        else -> Int.MAX_VALUE
-    }
-}
-
 enum class TargetPriority(override val choiceName: String, val comparator: Comparator<in LivingEntity>) : NamedChoice {
     /**
      * Lowest health first
@@ -194,7 +192,7 @@ enum class TargetPriority(override val choiceName: String, val comparator: Compa
     /**
      * Closest to you first
      */
-    DISTANCE("Distance", Comparator.comparingDouble { it.squaredBoxedDistanceTo(player) }),
+    DISTANCE("Distance", Comparator.comparingDouble(player::squaredBoxedDistanceTo)),
 
     /**
      * Closest to your crosshair first
@@ -210,4 +208,16 @@ enum class TargetPriority(override val choiceName: String, val comparator: Compa
      * Oldest entity first
      */
     AGE("Age", Comparator.comparingInt { -it.age }),
+
+    /**
+     * Player first
+     */
+    TYPE("Type", Comparator.comparingInt { entity ->
+        when (entity) {
+            is PlayerEntity -> 0
+            is HostileEntity -> 1
+            is Angerable if entity.angryAt == player.uuid -> 2
+            else -> Int.MAX_VALUE
+        }
+    })
 }

From ee1957499bf47e729655ab106528cb9dd9bf12cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=A8=E8=91=89=20Scarlet?=
 <93977077+mukjepscarlet@users.noreply.github.com>
Date: Tue, 25 Nov 2025 01:15:42 +0800
Subject: [PATCH 02/16] OOP

---
 .../utils/combat/TargetTracker.kt             | 52 +++++++++++++------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/utils/combat/TargetTracker.kt b/src/main/kotlin/net/ccbluex/liquidbounce/utils/combat/TargetTracker.kt
index 2200b742a69..50339c9da2a 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/utils/combat/TargetTracker.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/utils/combat/TargetTracker.kt
@@ -19,7 +19,6 @@
 package net.ccbluex.liquidbounce.utils.combat
 
 import it.unimi.dsi.fastutil.objects.ObjectArrayList
-import net.ccbluex.fastutil.mapToArray
 import net.ccbluex.fastutil.objectLinkedSetOf
 import net.ccbluex.liquidbounce.config.types.nesting.Configurable
 import net.ccbluex.liquidbounce.config.types.NamedChoice
@@ -103,10 +102,10 @@ open class TargetSelector(
         default = objectLinkedSetOf(TargetPriority.TYPE, defaultPriority),
         canBeNone = false,
     ).onChanged { set ->
-        comparator = ComparatorChain(comparisonFunctions = set.mapToArray { it.comparator })
+        comparator = ComparatorChain(comparisonFunctions = set.toTypedArray())
     }
 
-    private var comparator: Comparator<in LivingEntity> = TargetPriority.TYPE.comparator
+    private var comparator: Comparator<in LivingEntity> = TargetPriority.TYPE
 
     /**
      * Counts available targets.
@@ -183,41 +182,60 @@ open class TargetSelector(
 
 }
 
-enum class TargetPriority(override val choiceName: String, val comparator: Comparator<in LivingEntity>) : NamedChoice {
+enum class TargetPriority(override val choiceName: String) : NamedChoice, Comparator<LivingEntity> {
     /**
      * Lowest health first
      */
-    HEALTH("Health", Comparator.comparingDouble { it.getActualHealth().toDouble() }),
+    HEALTH("Health") {
+        override fun compare(o1: LivingEntity, o2: LivingEntity): Int =
+            o1.getActualHealth() compareTo o2.getActualHealth()
+    },
 
     /**
      * Closest to you first
      */
-    DISTANCE("Distance", Comparator.comparingDouble(player::squaredBoxedDistanceTo)),
+    DISTANCE("Distance") {
+        override fun compare(o1: LivingEntity, o2: LivingEntity): Int =
+            o1.squaredBoxedDistanceTo(player) compareTo o2.squaredBoxedDistanceTo(player)
+    },
 
     /**
      * Closest to your crosshair first
      */
-    DIRECTION("Direction", Comparator.comparingDouble { RotationUtil.crosshairAngleToEntity(it).toDouble() }),
+    DIRECTION("Direction") {
+        override fun compare(o1: LivingEntity, o2: LivingEntity): Int =
+            RotationUtil.crosshairAngleToEntity(o1) compareTo RotationUtil.crosshairAngleToEntity(o2)
+    },
 
     /**
      * With the lowest hurt time first
      */
-    HURT_TIME("HurtTime", Comparator.comparingInt { it.hurtTime }),
+    HURT_TIME("HurtTime") {
+        override fun compare(o1: LivingEntity, o2: LivingEntity): Int =
+            o1.hurtTime compareTo o2.hurtTime
+    },
 
     /**
      * Oldest entity first
      */
-    AGE("Age", Comparator.comparingInt { -it.age }),
+    AGE("Age") {
+        override fun compare(o1: LivingEntity, o2: LivingEntity): Int =
+            o2.age compareTo o1.age
+    },
 
     /**
      * Player first
      */
-    TYPE("Type", Comparator.comparingInt { entity ->
-        when (entity) {
-            is PlayerEntity -> 0
-            is HostileEntity -> 1
-            is Angerable if entity.angryAt == player.uuid -> 2
-            else -> Int.MAX_VALUE
-        }
-    })
+    TYPE("Type") {
+        private fun weight(entity: LivingEntity): Int =
+            when (entity) {
+                is PlayerEntity -> 0
+                is HostileEntity -> 1
+                is Angerable if entity.angryAt == player.uuid -> 2
+                else -> Int.MAX_VALUE
+            }
+
+        override fun compare(o1: LivingEntity, o2: LivingEntity): Int =
+            weight(o1) compareTo weight(o2)
+    },
 }

From 19f51db8d228a8c77e7a88fd80c0a5da64e54bf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=A8=E8=91=89=20Scarlet?=
 <93977077+mukjepscarlet@users.noreply.github.com>
Date: Tue, 25 Nov 2025 01:22:31 +0800
Subject: [PATCH 03/16] fix some issue in theme code

---
 .../clickgui/setting/MultiChooseSetting.svelte       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src-theme/src/routes/clickgui/setting/MultiChooseSetting.svelte b/src-theme/src/routes/clickgui/setting/MultiChooseSetting.svelte
index b3de5d28f18..3955f997ee1 100644
--- a/src-theme/src/routes/clickgui/setting/MultiChooseSetting.svelte
+++ b/src-theme/src/routes/clickgui/setting/MultiChooseSetting.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import {createEventDispatcher} from "svelte";
+    import {createEventDispatcher, onDestroy} from "svelte";
     import type {ModuleSetting, MultiChooseSetting,} from "../../../integration/types";
     import {slide} from "svelte/transition";
     import {convertToSpacedString, spaceSeperatedNames} from "../../../theme/theme_config";
@@ -24,7 +24,7 @@
             if (filtered.length === 0 && !cSetting.canBeNone) {
                 // Doesn't remove the element because in this case the value will be empty
                 // And indicate the value
-                errorValue = v
+                errorValue = v;
                 clearTimeout(timeoutId);
                 timeoutId = setTimeout(() => errorValue = null, 300);
 
@@ -33,7 +33,7 @@
 
             cSetting.value = filtered;
         } else {
-            cSetting.value = [...cSetting.value, v]
+            cSetting.value = [...cSetting.value, v];
         }
 
         setting = {...cSetting};
@@ -47,6 +47,8 @@
     function toggleExpanded() {
         expanded = !expanded;
     }
+
+    onDestroy(() => clearTimeout(timeoutId));
 </script>
 
 <!-- svelte-ignore a11y-click-events-have-key-events -->
@@ -65,9 +67,7 @@
                         class="choice"
                         class:active={cSetting.value.includes(choice)}
                         class:error={errorValue === choice}
-                        on:click={() => {
-                            handleChange(choice)
-                        }}
+                        on:click={() => handleChange(choice)}
                 >
                     {$spaceSeperatedNames ? convertToSpacedString(choice) : choice}
                 </div>

From 7b003368cfa1f79aa56e858c8903988bbee8d8b0 Mon Sep 17 00:00:00 2001
From: MukjepScarlet <93977077+mukjepscarlet@users.noreply.github.com>
Date: Tue, 25 Nov 2025 10:53:05 +0800
Subject: [PATCH 04/16] Nametag equipment support

---
 .../modules/render/nametags/ModuleNametags.kt |  5 ++
 .../module/modules/render/nametags/Nametag.kt | 30 ++----------
 .../render/nametags/NametagShowOptions.kt     | 48 +++++++++++++++++++
 3 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/ModuleNametags.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/ModuleNametags.kt
index 46e2023eec5..e0e418bed77 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/ModuleNametags.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/ModuleNametags.kt
@@ -38,6 +38,11 @@ import org.joml.Vector2fc
  */
 object ModuleNametags : ClientModule("Nametags", Category.RENDER) {
     internal val show by multiEnumChoice("Show", NametagShowOptions.entries)
+
+    init {
+        tree(NametagEquipment)
+    }
+
     val scale by float("Scale", 2F, 0.25F..4F)
     private val maximumDistance by float("MaximumDistance", 128F, 1F..512F)
 
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/Nametag.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/Nametag.kt
index 8d21dd3edc5..872db2f045e 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/Nametag.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/Nametag.kt
@@ -19,11 +19,9 @@
 package net.ccbluex.liquidbounce.features.module.modules.render.nametags
 
 import net.ccbluex.liquidbounce.render.engine.type.Vec3
-import net.ccbluex.liquidbounce.utils.client.isOlderThanOrEqual1_8
 import net.ccbluex.liquidbounce.utils.entity.interpolateCurrentPosition
 import net.ccbluex.liquidbounce.utils.render.WorldToScreen
 import net.minecraft.entity.Entity
-import net.minecraft.entity.EquipmentSlot
 import net.minecraft.entity.LivingEntity
 import net.minecraft.item.ItemStack
 import net.minecraft.text.Text
@@ -43,7 +41,11 @@ class Nametag private constructor(
     var screenPos: Vec3? = null
         private set
 
-    constructor(entity: LivingEntity) : this(entity, NametagTextFormatter(entity).format(), createItemList(entity))
+    constructor(entity: LivingEntity) : this(
+        entity,
+        NametagTextFormatter(entity).format(),
+        NametagEquipment.createItemList(entity),
+    )
 
     fun calculateScreenPos(tickDelta: Float) {
         val nametagPos = entity.interpolateCurrentPosition(tickDelta)
@@ -52,27 +54,5 @@ class Nametag private constructor(
         screenPos = WorldToScreen.calculateScreenPos(nametagPos)
     }
 
-    companion object {
-
-        /**
-         * Creates a list of items that should be rendered above the name tag. Currently, it is the item in main hand,
-         * the item in off-hand (as long as it exists) and the armor items.
-         */
-        private fun createItemList(entity: LivingEntity): List<ItemStack> {
-            return buildList(6) {
-                this += entity.getEquippedStack(EquipmentSlot.MAINHAND)
-                this += entity.getEquippedStack(EquipmentSlot.HEAD)
-                this += entity.getEquippedStack(EquipmentSlot.CHEST)
-                this += entity.getEquippedStack(EquipmentSlot.LEGS)
-                this += entity.getEquippedStack(EquipmentSlot.FEET)
-
-                if (!isOlderThanOrEqual1_8) {
-                    this += entity.getEquippedStack(EquipmentSlot.OFFHAND)
-                }
-            }
-        }
-
-    }
-
 }
 
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagShowOptions.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagShowOptions.kt
index bcb6354b7e3..5336a653043 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagShowOptions.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagShowOptions.kt
@@ -1,7 +1,14 @@
 package net.ccbluex.liquidbounce.features.module.modules.render.nametags
 
+import net.ccbluex.fastutil.mapToArray
+import net.ccbluex.fastutil.objectLinkedSetOf
 import net.ccbluex.liquidbounce.config.types.NamedChoice
+import net.ccbluex.liquidbounce.config.types.nesting.ToggleableConfigurable
+import net.minecraft.entity.EquipmentSlot
+import net.minecraft.entity.LivingEntity
+import net.minecraft.item.ItemStack
 
+// TODO: Split this into detailed configuration
 internal enum class NametagShowOptions(
     override val choiceName: String
 ) : NamedChoice {
@@ -15,3 +22,44 @@ internal enum class NametagShowOptions(
 
     fun isShowing() = this in ModuleNametags.show
 }
+
+internal object NametagEquipment : ToggleableConfigurable(ModuleNametags, "Equipment", true) {
+
+    private val slots by multiEnumChoice(
+        "Slots",
+        objectLinkedSetOf(
+            NEquipmentSlot.MAINHAND, NEquipmentSlot.HEAD, NEquipmentSlot.CHEST,
+            NEquipmentSlot.LEGS, NEquipmentSlot.FEET, NEquipmentSlot.OFFHAND,
+        ),
+    )
+    private val skipEmptySlot by boolean("SkipEmptySlot", true)
+
+    /**
+     * Creates a list of items that should be rendered above the name tag.
+     */
+    fun createItemList(entity: LivingEntity): List<ItemStack> {
+        val stacks = slots.mapToArray {
+            entity.getEquippedStack(it.slot)
+        }
+
+        return if (skipEmptySlot) {
+            stacks.filterNot { it.isEmpty }
+        } else {
+            stacks.asList()
+        }
+    }
+
+    private enum class NEquipmentSlot(
+        override val choiceName: String,
+        val slot: EquipmentSlot,
+    ) : NamedChoice {
+        MAINHAND("Mainhand", EquipmentSlot.MAINHAND),
+        OFFHAND("Offhand", EquipmentSlot.OFFHAND),
+        FEET("Feet", EquipmentSlot.FEET),
+        LEGS("Legs", EquipmentSlot.LEGS),
+        CHEST("Chest", EquipmentSlot.CHEST),
+        HEAD("Head", EquipmentSlot.HEAD),
+        BODY("Body", EquipmentSlot.BODY),
+        SADDLE("Saddle", EquipmentSlot.SADDLE),
+    }
+}

From 8743a959fc284ae23af685ffed428d5627a4da5a Mon Sep 17 00:00:00 2001
From: MukjepScarlet <93977077+mukjepscarlet@users.noreply.github.com>
Date: Tue, 25 Nov 2025 12:25:01 +0800
Subject: [PATCH 05/16] frontend

---
 src-theme/src/integration/util.ts             |  8 ++
 .../setting/MultiChooseSetting.svelte         | 78 ++++++++++++++++---
 .../render/nametags/NametagRenderer.kt        |  2 +-
 3 files changed, 77 insertions(+), 11 deletions(-)

diff --git a/src-theme/src/integration/util.ts b/src-theme/src/integration/util.ts
index 055d4805e0d..3b59c49e876 100644
--- a/src-theme/src/integration/util.ts
+++ b/src-theme/src/integration/util.ts
@@ -37,6 +37,14 @@ export function intToRgba(value: number): number[] {
     return [red, green, blue, alpha];
 }
 
+export const swap = (array: any[], i: number, j: number) => {
+    if (i < 0 || i >= array.length || j < 0 || j >= array.length) return;
+
+    const it = array[i];
+    array[i] = array[j];
+    array[j] = it;
+}
+
 export const getHashParams = (): URLSearchParams => {
     const hash = window.location.hash.split('?')[1] || '';
     return new URLSearchParams(hash);
diff --git a/src-theme/src/routes/clickgui/setting/MultiChooseSetting.svelte b/src-theme/src/routes/clickgui/setting/MultiChooseSetting.svelte
index 3955f997ee1..efa58045a9a 100644
--- a/src-theme/src/routes/clickgui/setting/MultiChooseSetting.svelte
+++ b/src-theme/src/routes/clickgui/setting/MultiChooseSetting.svelte
@@ -5,6 +5,8 @@
     import {convertToSpacedString, spaceSeperatedNames} from "../../../theme/theme_config";
     import ExpandArrow from "./common/ExpandArrow.svelte";
     import {setItem} from "../../../integration/persistent_storage";
+    import {flip} from "svelte/animate";
+    import {swap} from "../../../integration/util";
 
     export let setting: ModuleSetting;
     export let path: string;
@@ -17,8 +19,31 @@
 
     const dispatch = createEventDispatcher();
 
-    function handleChange(v: string) {
-        if (cSetting.value.includes(v)) {
+    const isEnabled = (choice: string) => cSetting.value.includes(choice);
+
+    $: choices = (() => {
+        if (cSetting.isOrderSensitive) {
+            return [...cSetting.value, ...cSetting.choices.filter(it => !isEnabled(it))];
+        } else {
+            return cSetting.value;
+        }
+    })();
+
+    let hoveringChoice = -1;
+
+    const moveEnabledChoice = (i: number, j: number) => {
+        swap(cSetting.value, i, j);
+        cSetting.value = cSetting.value;
+        fireChange();
+    }
+
+    const fireChange = () => {
+        setting = {...cSetting};
+        dispatch("change");
+    };
+
+    const handleChange = (v: string) => {
+        if (isEnabled(v)) {
             const filtered = cSetting.value.filter(item => item !== v);
 
             if (filtered.length === 0 && !cSetting.canBeNone) {
@@ -36,9 +61,8 @@
             cSetting.value = [...cSetting.value, v];
         }
 
-        setting = {...cSetting};
-        dispatch("change");
-    }
+        fireChange();
+    };
 
     let expanded = localStorage.getItem(thisPath) === "true";
 
@@ -62,14 +86,33 @@
 
     {#if expanded}
         <div class="choices" transition:slide|global={{duration: 200, axis: "y"}}>
-            {#each cSetting.choices as choice}
+            {#each choices as choice, i (choice)}
                 <div
                         class="choice"
-                        class:active={cSetting.value.includes(choice)}
+                        class:active={isEnabled(choice)}
                         class:error={errorValue === choice}
-                        on:click={() => handleChange(choice)}
+                        animate:flip={{duration: 200}}
+                        on:mouseenter={() => hoveringChoice = i}
+                        on:mouseleave={() => hoveringChoice = -1}
                 >
-                    {$spaceSeperatedNames ? convertToSpacedString(choice) : choice}
+                    <!-- Move left -->
+                    {#if cSetting.isOrderSensitive && i !== 0 && isEnabled(choice)}
+                        <span class="choice-action" class:hidden={hoveringChoice !== i} on:click={() => moveEnabledChoice(i, i - 1)}>
+                            &lt;
+                        </span>
+                    {/if}
+
+                    <!-- Toggle -->
+                    <span class="choice-name" on:click={() => handleChange(choice)}>
+                        {$spaceSeperatedNames ? convertToSpacedString(choice) : choice}
+                    </span>
+
+                    <!-- Move right -->
+                    {#if cSetting.isOrderSensitive&& i !== choices.length - 1 && isEnabled(choice) && isEnabled(choices[i + 1])}
+                        <span class="choice-action" class:hidden={hoveringChoice !== i} on:click={() => moveEnabledChoice(i, i + 1)}>
+                            &gt;
+                        </span>
+                    {/if}
                 </div>
             {/each}
         </div>
@@ -111,7 +154,22 @@
 
     &.active {
       background-color: rgba($accent-color, 0.1);
-      color: $accent-color;
+      .choice-name {
+        color: $accent-color;
+      }
+    }
+
+    .choice-action {
+      color: $clickgui-text-dimmed-color;
+      transition: width 200ms ease-in-out;
+
+      &:hover {
+        color: $accent-color;
+      }
+
+      &.hidden {
+        width: 0;
+      }
     }
   }
 
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagRenderer.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagRenderer.kt
index d039b9443f5..5b133aa9f62 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagRenderer.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagRenderer.kt
@@ -30,7 +30,7 @@ import org.joml.Vector2f
 private const val NAMETAG_PADDING: Int = 15
 
 internal fun GUIRenderEnvironment.drawNametag(nametag: Nametag, pos: Vec3) {
-    if (NametagShowOptions.ITEMS.isShowing()) {
+    if (NametagShowOptions.ITEMS.isShowing() && nametag.items.isNotEmpty()) {
         val currentItemStackRenderer = if (NametagShowOptions.ITEM_INFO.isShowing()) {
             if (nametag.entity === player) {
                 ItemStackListRenderer.SingleItemStackRenderer.All

From 4c50b17a2c175bf265e3141409deea00bbf94d7c Mon Sep 17 00:00:00 2001
From: MukjepScarlet <93977077+mukjepscarlet@users.noreply.github.com>
Date: Tue, 25 Nov 2025 12:57:13 +0800
Subject: [PATCH 06/16] animation

---
 .../clickgui/setting/MultiChooseSetting.svelte    | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src-theme/src/routes/clickgui/setting/MultiChooseSetting.svelte b/src-theme/src/routes/clickgui/setting/MultiChooseSetting.svelte
index efa58045a9a..05eccc8a7c1 100644
--- a/src-theme/src/routes/clickgui/setting/MultiChooseSetting.svelte
+++ b/src-theme/src/routes/clickgui/setting/MultiChooseSetting.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import {createEventDispatcher, onDestroy} from "svelte";
     import type {ModuleSetting, MultiChooseSetting,} from "../../../integration/types";
-    import {slide} from "svelte/transition";
+    import {fade, slide} from "svelte/transition";
     import {convertToSpacedString, spaceSeperatedNames} from "../../../theme/theme_config";
     import ExpandArrow from "./common/ExpandArrow.svelte";
     import {setItem} from "../../../integration/persistent_storage";
@@ -96,8 +96,8 @@
                         on:mouseleave={() => hoveringChoice = -1}
                 >
                     <!-- Move left -->
-                    {#if cSetting.isOrderSensitive && i !== 0 && isEnabled(choice)}
-                        <span class="choice-action" class:hidden={hoveringChoice !== i} on:click={() => moveEnabledChoice(i, i - 1)}>
+                    {#if cSetting.isOrderSensitive && i !== 0 && isEnabled(choice) && hoveringChoice === i}
+                        <span class="choice-action" on:click={() => moveEnabledChoice(i, i - 1)} transition:fade={{duration: 200}}>
                             &lt;
                         </span>
                     {/if}
@@ -108,8 +108,8 @@
                     </span>
 
                     <!-- Move right -->
-                    {#if cSetting.isOrderSensitive&& i !== choices.length - 1 && isEnabled(choice) && isEnabled(choices[i + 1])}
-                        <span class="choice-action" class:hidden={hoveringChoice !== i} on:click={() => moveEnabledChoice(i, i + 1)}>
+                    {#if cSetting.isOrderSensitive && i !== choices.length - 1 && isEnabled(choice) && isEnabled(choices[i + 1]) && hoveringChoice === i}
+                        <span class="choice-action" on:click={() => moveEnabledChoice(i, i + 1)} transition:fade={{duration: 200}}>
                             &gt;
                         </span>
                     {/if}
@@ -161,15 +161,10 @@
 
     .choice-action {
       color: $clickgui-text-dimmed-color;
-      transition: width 200ms ease-in-out;
 
       &:hover {
         color: $accent-color;
       }
-
-      &.hidden {
-        width: 0;
-      }
     }
   }
 

From c561c5b5d3ff27054f6c0893f1c6584b705e88f4 Mon Sep 17 00:00:00 2001
From: MukjepScarlet <93977077+mukjepscarlet@users.noreply.github.com>
Date: Tue, 25 Nov 2025 12:59:14 +0800
Subject: [PATCH 07/16] migration

---
 .../module/modules/render/nametags/NametagRenderer.kt         | 4 ++--
 .../module/modules/render/nametags/NametagShowOptions.kt      | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagRenderer.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagRenderer.kt
index 5b133aa9f62..c83d3d9aa8b 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagRenderer.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagRenderer.kt
@@ -30,8 +30,8 @@ import org.joml.Vector2f
 private const val NAMETAG_PADDING: Int = 15
 
 internal fun GUIRenderEnvironment.drawNametag(nametag: Nametag, pos: Vec3) {
-    if (NametagShowOptions.ITEMS.isShowing() && nametag.items.isNotEmpty()) {
-        val currentItemStackRenderer = if (NametagShowOptions.ITEM_INFO.isShowing()) {
+    if (NametagEquipment.running && nametag.items.isNotEmpty()) {
+        val currentItemStackRenderer = if (NametagEquipment.showInfo) {
             if (nametag.entity === player) {
                 ItemStackListRenderer.SingleItemStackRenderer.All
             } else {
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagShowOptions.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagShowOptions.kt
index 5336a653043..365c138106a 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagShowOptions.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagShowOptions.kt
@@ -15,8 +15,6 @@ internal enum class NametagShowOptions(
     HEALTH("Health"),
     DISTANCE("Distance"),
     PING("Ping"),
-    ITEMS("Items"),
-    ITEM_INFO("ItemInfo"),
     ENCHANTMENTS("Enchantments"),
     BORDER("Border");
 
@@ -33,6 +31,7 @@ internal object NametagEquipment : ToggleableConfigurable(ModuleNametags, "Equip
         ),
     )
     private val skipEmptySlot by boolean("SkipEmptySlot", true)
+    val showInfo by boolean("ShowInfo", true)
 
     /**
      * Creates a list of items that should be rendered above the name tag.

From cfa2d8dcd996bf1062501db436842f1777f02775 Mon Sep 17 00:00:00 2001
From: MukjepScarlet <93977077+mukjepscarlet@users.noreply.github.com>
Date: Tue, 25 Nov 2025 14:48:10 +0800
Subject: [PATCH 08/16] better config

---
 .../module/modules/render/nametags/NametagRenderer.kt        | 2 +-
 .../module/modules/render/nametags/NametagShowOptions.kt     | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagRenderer.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagRenderer.kt
index c83d3d9aa8b..3f5e1c838c8 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagRenderer.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagRenderer.kt
@@ -30,7 +30,7 @@ import org.joml.Vector2f
 private const val NAMETAG_PADDING: Int = 15
 
 internal fun GUIRenderEnvironment.drawNametag(nametag: Nametag, pos: Vec3) {
-    if (NametagEquipment.running && nametag.items.isNotEmpty()) {
+    if (nametag.items.any { !it.isEmpty }) {
         val currentItemStackRenderer = if (NametagEquipment.showInfo) {
             if (nametag.entity === player) {
                 ItemStackListRenderer.SingleItemStackRenderer.All
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagShowOptions.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagShowOptions.kt
index 365c138106a..cdb0a350e0c 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagShowOptions.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagShowOptions.kt
@@ -3,7 +3,7 @@ package net.ccbluex.liquidbounce.features.module.modules.render.nametags
 import net.ccbluex.fastutil.mapToArray
 import net.ccbluex.fastutil.objectLinkedSetOf
 import net.ccbluex.liquidbounce.config.types.NamedChoice
-import net.ccbluex.liquidbounce.config.types.nesting.ToggleableConfigurable
+import net.ccbluex.liquidbounce.config.types.nesting.Configurable
 import net.minecraft.entity.EquipmentSlot
 import net.minecraft.entity.LivingEntity
 import net.minecraft.item.ItemStack
@@ -21,7 +21,7 @@ internal enum class NametagShowOptions(
     fun isShowing() = this in ModuleNametags.show
 }
 
-internal object NametagEquipment : ToggleableConfigurable(ModuleNametags, "Equipment", true) {
+internal object NametagEquipment : Configurable("Equipment") {
 
     private val slots by multiEnumChoice(
         "Slots",
@@ -29,6 +29,7 @@ internal object NametagEquipment : ToggleableConfigurable(ModuleNametags, "Equip
             NEquipmentSlot.MAINHAND, NEquipmentSlot.HEAD, NEquipmentSlot.CHEST,
             NEquipmentSlot.LEGS, NEquipmentSlot.FEET, NEquipmentSlot.OFFHAND,
         ),
+        canBeNone = true
     )
     private val skipEmptySlot by boolean("SkipEmptySlot", true)
     val showInfo by boolean("ShowInfo", true)

From afc29466e5686314cc45838bcca78cf7ab584f61 Mon Sep 17 00:00:00 2001
From: MukjepScarlet <93977077+mukjepscarlet@users.noreply.github.com>
Date: Tue, 25 Nov 2025 15:04:47 +0800
Subject: [PATCH 09/16] rewrite nametag text

---
 .../modules/render/nametags/ModuleNametags.kt |   1 +
 .../module/modules/render/nametags/Nametag.kt |   2 +-
 .../render/nametags/NametagEquipment.kt       |  71 +++++++
 .../render/nametags/NametagShowOptions.kt     |  51 -----
 .../render/nametags/NametagTextFormatter.kt   | 185 +++++++++---------
 5 files changed, 170 insertions(+), 140 deletions(-)
 create mode 100644 src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagEquipment.kt

diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/ModuleNametags.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/ModuleNametags.kt
index e0e418bed77..631372e483f 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/ModuleNametags.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/ModuleNametags.kt
@@ -40,6 +40,7 @@ object ModuleNametags : ClientModule("Nametags", Category.RENDER) {
     internal val show by multiEnumChoice("Show", NametagShowOptions.entries)
 
     init {
+        tree(NametagTextFormatter)
         tree(NametagEquipment)
     }
 
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/Nametag.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/Nametag.kt
index 872db2f045e..1622ca1c1e6 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/Nametag.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/Nametag.kt
@@ -43,7 +43,7 @@ class Nametag private constructor(
 
     constructor(entity: LivingEntity) : this(
         entity,
-        NametagTextFormatter(entity).format(),
+        NametagTextFormatter.format(entity),
         NametagEquipment.createItemList(entity),
     )
 
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagEquipment.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagEquipment.kt
new file mode 100644
index 00000000000..4bf035b0f07
--- /dev/null
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagEquipment.kt
@@ -0,0 +1,71 @@
+/*
+ * This file is part of LiquidBounce (https://github.com/CCBlueX/LiquidBounce)
+ *
+ * Copyright (c) 2015 - 2025 CCBlueX
+ *
+ * LiquidBounce is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LiquidBounce is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LiquidBounce. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package net.ccbluex.liquidbounce.features.module.modules.render.nametags
+
+import net.ccbluex.fastutil.mapToArray
+import net.ccbluex.fastutil.objectLinkedSetOf
+import net.ccbluex.liquidbounce.config.types.NamedChoice
+import net.ccbluex.liquidbounce.config.types.nesting.Configurable
+import net.minecraft.entity.EquipmentSlot
+import net.minecraft.entity.LivingEntity
+import net.minecraft.item.ItemStack
+
+internal object NametagEquipment : Configurable("Equipment") {
+
+    private val slots by multiEnumChoice(
+        "Slots",
+        objectLinkedSetOf(
+            NEquipmentSlot.MAINHAND, NEquipmentSlot.HEAD, NEquipmentSlot.CHEST,
+            NEquipmentSlot.LEGS, NEquipmentSlot.FEET, NEquipmentSlot.OFFHAND,
+        ),
+        canBeNone = true
+    )
+    private val skipEmptySlot by boolean("SkipEmptySlot", true)
+    val showInfo by boolean("ShowInfo", true)
+
+    /**
+     * Creates a list of items that should be rendered above the name tag.
+     */
+    fun createItemList(entity: LivingEntity): List<ItemStack> {
+        val stacks = slots.mapToArray {
+            entity.getEquippedStack(it.slot)
+        }
+
+        return if (skipEmptySlot) {
+            stacks.filterNot { it.isEmpty }
+        } else {
+            stacks.asList()
+        }
+    }
+
+    private enum class NEquipmentSlot(
+        override val choiceName: String,
+        val slot: EquipmentSlot,
+    ) : NamedChoice {
+        MAINHAND("Mainhand", EquipmentSlot.MAINHAND),
+        OFFHAND("Offhand", EquipmentSlot.OFFHAND),
+        FEET("Feet", EquipmentSlot.FEET),
+        LEGS("Legs", EquipmentSlot.LEGS),
+        CHEST("Chest", EquipmentSlot.CHEST),
+        HEAD("Head", EquipmentSlot.HEAD),
+        BODY("Body", EquipmentSlot.BODY),
+        SADDLE("Saddle", EquipmentSlot.SADDLE),
+    }
+}
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagShowOptions.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagShowOptions.kt
index cdb0a350e0c..ae90030d634 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagShowOptions.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagShowOptions.kt
@@ -1,65 +1,14 @@
 package net.ccbluex.liquidbounce.features.module.modules.render.nametags
 
-import net.ccbluex.fastutil.mapToArray
-import net.ccbluex.fastutil.objectLinkedSetOf
 import net.ccbluex.liquidbounce.config.types.NamedChoice
-import net.ccbluex.liquidbounce.config.types.nesting.Configurable
-import net.minecraft.entity.EquipmentSlot
-import net.minecraft.entity.LivingEntity
-import net.minecraft.item.ItemStack
 
 // TODO: Split this into detailed configuration
 internal enum class NametagShowOptions(
     override val choiceName: String
 ) : NamedChoice {
-    HEALTH("Health"),
-    DISTANCE("Distance"),
-    PING("Ping"),
     ENCHANTMENTS("Enchantments"),
     BORDER("Border");
 
     fun isShowing() = this in ModuleNametags.show
 }
 
-internal object NametagEquipment : Configurable("Equipment") {
-
-    private val slots by multiEnumChoice(
-        "Slots",
-        objectLinkedSetOf(
-            NEquipmentSlot.MAINHAND, NEquipmentSlot.HEAD, NEquipmentSlot.CHEST,
-            NEquipmentSlot.LEGS, NEquipmentSlot.FEET, NEquipmentSlot.OFFHAND,
-        ),
-        canBeNone = true
-    )
-    private val skipEmptySlot by boolean("SkipEmptySlot", true)
-    val showInfo by boolean("ShowInfo", true)
-
-    /**
-     * Creates a list of items that should be rendered above the name tag.
-     */
-    fun createItemList(entity: LivingEntity): List<ItemStack> {
-        val stacks = slots.mapToArray {
-            entity.getEquippedStack(it.slot)
-        }
-
-        return if (skipEmptySlot) {
-            stacks.filterNot { it.isEmpty }
-        } else {
-            stacks.asList()
-        }
-    }
-
-    private enum class NEquipmentSlot(
-        override val choiceName: String,
-        val slot: EquipmentSlot,
-    ) : NamedChoice {
-        MAINHAND("Mainhand", EquipmentSlot.MAINHAND),
-        OFFHAND("Offhand", EquipmentSlot.OFFHAND),
-        FEET("Feet", EquipmentSlot.FEET),
-        LEGS("Legs", EquipmentSlot.LEGS),
-        CHEST("Chest", EquipmentSlot.CHEST),
-        HEAD("Head", EquipmentSlot.HEAD),
-        BODY("Body", EquipmentSlot.BODY),
-        SADDLE("Saddle", EquipmentSlot.SADDLE),
-    }
-}
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagTextFormatter.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagTextFormatter.kt
index bae6e6892ed..266538cbf6a 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagTextFormatter.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagTextFormatter.kt
@@ -18,11 +18,15 @@
  */
 package net.ccbluex.liquidbounce.features.module.modules.render.nametags
 
+import it.unimi.dsi.fastutil.objects.ObjectLinkedOpenHashSet
+import net.ccbluex.liquidbounce.config.types.NamedChoice
+import net.ccbluex.liquidbounce.config.types.nesting.Configurable
 import net.ccbluex.liquidbounce.features.module.modules.misc.antibot.ModuleAntiBot
 import net.ccbluex.liquidbounce.features.module.modules.render.ModuleCombineMobs
 import net.ccbluex.liquidbounce.utils.client.PlainText
 import net.ccbluex.liquidbounce.utils.client.asPlainText
 import net.ccbluex.liquidbounce.utils.client.asText
+import net.ccbluex.liquidbounce.utils.client.joinToText
 import net.ccbluex.liquidbounce.utils.client.player
 import net.ccbluex.liquidbounce.utils.client.regular
 import net.ccbluex.liquidbounce.utils.client.withColor
@@ -38,118 +42,123 @@ import net.minecraft.text.Style
 import net.minecraft.text.Text
 import net.minecraft.text.TextColor
 import net.minecraft.util.Formatting
+import java.util.function.Function
 import kotlin.math.roundToInt
 
 private val COUNT_STYLE = Style.EMPTY.withFormatting(Formatting.AQUA, Formatting.BOLD)
 
 private val BOT_STYLE = Style.EMPTY.withFormatting(Formatting.RED, Formatting.BOLD)
 
-class NametagTextFormatter(private val entity: Entity) {
-    fun format(): Text {
-        val outputText = "".asText()
+private val BABY_TEXT = "Baby ".asPlainText()
 
-        if (NametagShowOptions.DISTANCE.isShowing()) {
-            outputText.append(this.distanceText).append(" ")
-        }
-        if (NametagShowOptions.PING.isShowing()) {
-            outputText.append(this.pingText).append(" ")
-        }
+private val BOT_TEXT = "Bot".asPlainText(BOT_STYLE)
 
-        val name = entity.displayName!!
-        val nameColor = this.nameColor
+internal object NametagTextFormatter : Configurable("Text") {
 
-        val isBaby = (entity as? MobEntity)?.isBaby == true
-        val baseNameString = (if (isBaby) "Baby " else "") + name.string
-
-        val nameText: Text = if (nameColor != null) {
-            baseNameString.asText().withColor(nameColor)
-        } else {
-            baseNameString.asPlainText()
-        }
+    private val parts by multiEnumChoice(
+        "Parts",
+        ObjectLinkedOpenHashSet(Part.entries),
+        canBeNone = false
+    )
 
-        outputText.append(nameText)
-
-        if (ModuleCombineMobs.running) {
-            val count = ModuleCombineMobs.getCombinedCount(entity)
-            if (count > 1) {
-                val countText = ("x $count").asPlainText(COUNT_STYLE)
-                outputText.append(" ").append(countText)
+    private enum class Part(override val choiceName: String) : NamedChoice, Function<Entity, Text?> {
+        DISTANCE("Distance") {
+            override fun apply(t: Entity): Text {
+                val playerDistanceRounded = player.distanceTo(t).roundToInt()
+                return "${playerDistanceRounded}m".asPlainText(Formatting.GRAY)
             }
-        }
-
-        if (NametagShowOptions.HEALTH.isShowing()) {
-            outputText.append(" ").append(this.healthText)
-        }
-
-        if (this.isBot) {
-            outputText.append(" ").append("Bot".asPlainText(BOT_STYLE))
-        }
+        },
 
-        return outputText
-    }
+        PING("Ping") {
+            override fun apply(t: Entity): Text? {
+                val entity = t as? PlayerEntity ?: return null
 
-    private val isBot = ModuleAntiBot.isBot(entity)
+                val playerPing = entity.ping
 
-    private val nameColor: TextColor?
-        get() {
-            val tagColor = EntityTaggingManager.getTag(this.entity).color
+                val coloringBasedOnPing = when {
+                    playerPing > 200 -> Formatting.RED
+                    playerPing > 100 -> Formatting.YELLOW
+                    else -> Formatting.GREEN
+                }
 
-            return when {
-                isBot -> Formatting.DARK_AQUA.toTextColor()
-                entity.isInvisible -> Formatting.GOLD.toTextColor()
-                entity.isSneaking -> Formatting.DARK_RED.toTextColor()
-                tagColor != null -> tagColor.toTextColor()
-                else -> null
+                return regular(" [")
+                    .append(
+                        (playerPing.toString() + "ms").asPlainText(coloringBasedOnPing)
+                    )
+                    .append(regular("]"))
             }
-        }
-
-    private val distanceText: Text
-        get() {
-            val playerDistanceRounded = player.distanceTo(entity).roundToInt()
-
-            return "${playerDistanceRounded}m".asPlainText(Formatting.GRAY)
-        }
-
-    private fun getPing(entity: Entity): Int? {
-        return (entity as? PlayerEntity)?.ping
-    }
-
-    private val pingText: Text
-        get() {
-            val playerPing = getPing(entity) ?: return PlainText.EMPTY
-
-            val coloringBasedOnPing = when {
-                playerPing > 200 -> Formatting.RED
-                playerPing > 100 -> Formatting.YELLOW
-                else -> Formatting.GREEN
+        },
+
+        NAME("Name") {
+            override fun apply(entity: Entity): Text = buildList(4) {
+                val name = entity.displayName!!
+                val nameColor = entity.nameColor
+
+                if ((entity as? MobEntity)?.isBaby == true) {
+                    this += BABY_TEXT
+                }
+
+                this += if (nameColor != null) {
+                    name.copy().withColor(nameColor)
+                } else {
+                    name
+                }
+
+                if (ModuleCombineMobs.running) {
+                    val count = ModuleCombineMobs.getCombinedCount(entity)
+                    if (count > 1) {
+                        val countText = ("x $count").asPlainText(COUNT_STYLE)
+                        this += PlainText.SPACE
+                        this += countText
+                    }
+                }
+            }.asText()
+        },
+
+        HEALTH("Health") {
+            override fun apply(t: Entity): Text? {
+                val entity = t as? LivingEntity ?: return null
+
+                val actualHealth = (entity.getActualHealth() +
+                    if (entity.hasHealthScoreboard()) 0f else entity.absorptionAmount).toInt()
+
+                val healthColor = when {
+                    actualHealth >= 14 -> Formatting.GREEN
+                    actualHealth >= 8 -> Formatting.YELLOW
+                    else -> Formatting.RED
+                }
+
+                return "$actualHealth HP".asPlainText(healthColor)
             }
+        },
 
-            return regular(" [")
-                .append(
-                    (playerPing.toString() + "ms").asPlainText(coloringBasedOnPing)
-                )
-                .append(regular("]"))
-        }
-
-    private val healthText: Text
-        get() {
-            if (entity !is LivingEntity) {
-                return PlainText.EMPTY
+        BOT_MARK("BotMark") {
+            override fun apply(t: Entity): Text? {
+                return if (t.isBot) BOT_TEXT else null
             }
+        },
+    }
 
-            val actualHealth = (entity.getActualHealth() +
-                if (entity.hasHealthScoreboard()) 0f else entity.absorptionAmount).toInt()
+    fun format(entity: Entity): Text {
+        return parts.mapNotNull { it.apply(entity) }.joinToText(PlainText.SPACE)
+    }
 
-            val healthColor = when {
-                actualHealth >= 14 -> Formatting.GREEN
-                actualHealth >= 8 -> Formatting.YELLOW
-                else -> Formatting.RED
-            }
+}
 
-            return "$actualHealth HP".asPlainText(healthColor)
+private val Entity.isBot get() = ModuleAntiBot.isBot(this)
 
+private val Entity.nameColor: TextColor?
+    get() {
+        val tagColor = EntityTaggingManager.getTag(this).color
+
+        return when {
+            isBot -> Formatting.DARK_AQUA.toTextColor()
+            isInvisible -> Formatting.GOLD.toTextColor()
+            isSneaking -> Formatting.DARK_RED.toTextColor()
+            tagColor != null -> tagColor.toTextColor()
+            else -> null
         }
-}
+    }
 
 private fun Formatting.toTextColor(): TextColor {
     return TextColor.fromFormatting(this)!!

From 7285644f41fd2fca933fba38748abbde92a9fdac Mon Sep 17 00:00:00 2001
From: MukjepScarlet <93977077+mukjepscarlet@users.noreply.github.com>
Date: Tue, 25 Nov 2025 15:10:05 +0800
Subject: [PATCH 10/16] remove NametagShowOptions

---
 .../modules/render/nametags/ModuleNametags.kt      |  5 +++--
 .../render/nametags/NametagEnchantmentRenderer.kt  |  6 ++----
 .../modules/render/nametags/NametagRenderer.kt     |  4 ++--
 .../modules/render/nametags/NametagShowOptions.kt  | 14 --------------
 4 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagShowOptions.kt

diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/ModuleNametags.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/ModuleNametags.kt
index 631372e483f..01749d92308 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/ModuleNametags.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/ModuleNametags.kt
@@ -37,14 +37,15 @@ import org.joml.Vector2fc
  * Makes player name tags more visible and adds useful information.
  */
 object ModuleNametags : ClientModule("Nametags", Category.RENDER) {
-    internal val show by multiEnumChoice("Show", NametagShowOptions.entries)
 
     init {
         tree(NametagTextFormatter)
         tree(NametagEquipment)
+        tree(NametagEnchantmentRenderer)
     }
 
-    val scale by float("Scale", 2F, 0.25F..4F)
+    internal val scale by float("Scale", 2F, 0.25F..4F)
+    internal val border by boolean("Border", true)
     private val maximumDistance by float("MaximumDistance", 128F, 1F..512F)
 
     internal val batchRenderMode by enumChoice("BatchRenderMode", BatchRenderMode.EACH)
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagEnchantmentRenderer.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagEnchantmentRenderer.kt
index e086ec29a6f..9cabb0e67dd 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagEnchantmentRenderer.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagEnchantmentRenderer.kt
@@ -20,6 +20,7 @@ package net.ccbluex.liquidbounce.features.module.modules.render.nametags
 
 import it.unimi.dsi.fastutil.objects.ReferenceSet
 import net.ccbluex.fastutil.mapToArray
+import net.ccbluex.liquidbounce.config.types.nesting.ToggleableConfigurable
 import net.ccbluex.liquidbounce.render.GUIRenderEnvironment
 import net.ccbluex.liquidbounce.render.drawQuad
 import net.ccbluex.liquidbounce.render.engine.font.processor.MinecraftTextProcessor
@@ -37,7 +38,6 @@ import net.minecraft.util.Formatting
 import net.minecraft.client.resource.language.I18n
 import net.minecraft.registry.RegistryKey
 import net.minecraft.registry.RegistryKeys
-import net.ccbluex.liquidbounce.utils.client.mc
 import org.joml.Vector2f
 import org.joml.component1
 import org.joml.component2
@@ -119,7 +119,7 @@ private data class EnchantmentInfo(
     val isCurse: Boolean = false
 )
 
-object NametagEnchantmentRenderer {
+internal object NametagEnchantmentRenderer : ToggleableConfigurable(ModuleNametags, "Enchantment", true) {
     private const val MAX_ENCHANTMENTS_PER_ITEM = 10
     private const val FIXED_SCALE = 0.6f
     private const val LINE_HEIGHT = 14f
@@ -154,8 +154,6 @@ object NametagEnchantmentRenderer {
         worldX: Float,
         worldY: Float,
     ) {
-        if (!NametagShowOptions.ENCHANTMENTS.isShowing()) return
-
         val itemsWithEnchantments = getEntityItemsWithEnchantments(entity)
         if (itemsWithEnchantments.isEmpty()) return
 
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagRenderer.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagRenderer.kt
index 3f5e1c838c8..163396eb4a0 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagRenderer.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagRenderer.kt
@@ -73,7 +73,7 @@ internal fun GUIRenderEnvironment.drawNametag(nametag: Nametag, pos: Vec3) {
     drawQuad(
         q1, q2, z = 0f,
         fillColor = Color4b(Int.MIN_VALUE, hasAlpha = true),
-        outlineColor = Color4b.BLACK.takeIf { NametagShowOptions.BORDER.isShowing() },
+        outlineColor = Color4b.BLACK.takeIf { ModuleNametags.border },
     )
 
     // Text
@@ -85,7 +85,7 @@ internal fun GUIRenderEnvironment.drawNametag(nametag: Nametag, pos: Vec3) {
     )
 
     // Draw enchantments directly for the entity (regardless of whether items are shown)
-    if (NametagShowOptions.ENCHANTMENTS.isShowing() && nametag.entity is LivingEntity) {
+    if (NametagEnchantmentRenderer.running && nametag.entity is LivingEntity) {
         val entityPos = nametag.entity.pos
         val worldX = entityPos.x.toFloat()
         val worldY = (entityPos.y + nametag.entity.height + 0.5f).toFloat()
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagShowOptions.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagShowOptions.kt
deleted file mode 100644
index ae90030d634..00000000000
--- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagShowOptions.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package net.ccbluex.liquidbounce.features.module.modules.render.nametags
-
-import net.ccbluex.liquidbounce.config.types.NamedChoice
-
-// TODO: Split this into detailed configuration
-internal enum class NametagShowOptions(
-    override val choiceName: String
-) : NamedChoice {
-    ENCHANTMENTS("Enchantments"),
-    BORDER("Border");
-
-    fun isShowing() = this in ModuleNametags.show
-}
-

From b66809c2b4e27fcc9c66251bbfcf31da9eadb1cb Mon Sep 17 00:00:00 2001
From: MukjepScarlet <93977077+mukjepscarlet@users.noreply.github.com>
Date: Tue, 25 Nov 2025 15:19:18 +0800
Subject: [PATCH 11/16] optimize joinToText

---
 .../liquidbounce/features/command/Command.kt  |  3 ++-
 .../render/nametags/NametagTextFormatter.kt   |  4 +++-
 .../liquidbounce/utils/client/ClientChat.kt   | 19 +++++++++----------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/command/Command.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/command/Command.kt
index e2ba618f678..b22809760e7 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/features/command/Command.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/command/Command.kt
@@ -27,6 +27,7 @@ import net.ccbluex.liquidbounce.utils.client.*
 import net.minecraft.text.ClickEvent
 import net.minecraft.text.HoverEvent
 import net.minecraft.text.MutableText
+import net.minecraft.text.Text
 import java.util.*
 
 @Suppress("LongParameterList")
@@ -125,7 +126,7 @@ class Command(
      */
     fun printStyledComponent(
         key: String,
-        textComponent: MutableText? = null,
+        textComponent: Text? = null,
         copyContent: String? = null,
         formatting: (MutableText) -> MutableText = ::regular,
         hover: HoverEvent? = HoverEvent.ShowText(translation("liquidbounce.tooltip.clickToCopy"))
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagTextFormatter.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagTextFormatter.kt
index 266538cbf6a..2b28af00ffd 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagTextFormatter.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagTextFormatter.kt
@@ -63,7 +63,9 @@ internal object NametagTextFormatter : Configurable("Text") {
 
     private enum class Part(override val choiceName: String) : NamedChoice, Function<Entity, Text?> {
         DISTANCE("Distance") {
-            override fun apply(t: Entity): Text {
+            override fun apply(t: Entity): Text? {
+                if (t === player) return null
+
                 val playerDistanceRounded = player.distanceTo(t).roundToInt()
                 return "${playerDistanceRounded}m".asPlainText(Formatting.GRAY)
             }
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/utils/client/ClientChat.kt b/src/main/kotlin/net/ccbluex/liquidbounce/utils/client/ClientChat.kt
index 8c8d0ab1da2..9cdf677fea4 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/utils/client/ClientChat.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/utils/client/ClientChat.kt
@@ -232,20 +232,19 @@ fun notification(title: String, message: String, severity: NotificationEvent.Sev
 /**
  * Joins a list of [Text] into a single [Text] with the given [separator].
  */
-fun List<Text>.joinToText(separator: Text): MutableText {
-    val result = "".asText()
+fun Collection<Text>.joinToText(separator: Text): Text {
     if (isEmpty()) {
-        return result
+        return PlainText.EMPTY
     }
 
-    with(iterator()) {
-        result += next()
-        while (hasNext()) {
-            result += separator
-            result += next()
+    val iterator = iterator()
+    return Array(this.size * 2 - 1) { i ->
+        if (i % 2 == 0) {
+            iterator.next()
+        } else {
+            separator
         }
-    }
-    return result
+    }.asText()
 }
 
 val TextColor.bypassesNameProtection: Boolean

From ada1f3690bcc1872f4b977ac601fbc27b4eecad8 Mon Sep 17 00:00:00 2001
From: MukjepScarlet <93977077+mukjepscarlet@users.noreply.github.com>
Date: Tue, 25 Nov 2025 19:15:22 +0800
Subject: [PATCH 12/16] fix

---
 .../setting/MultiChooseSetting.svelte         |  2 +-
 .../utils/combat/TargetTracker.kt             | 32 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src-theme/src/routes/clickgui/setting/MultiChooseSetting.svelte b/src-theme/src/routes/clickgui/setting/MultiChooseSetting.svelte
index 05eccc8a7c1..78024d1d6b1 100644
--- a/src-theme/src/routes/clickgui/setting/MultiChooseSetting.svelte
+++ b/src-theme/src/routes/clickgui/setting/MultiChooseSetting.svelte
@@ -25,7 +25,7 @@
         if (cSetting.isOrderSensitive) {
             return [...cSetting.value, ...cSetting.choices.filter(it => !isEnabled(it))];
         } else {
-            return cSetting.value;
+            return cSetting.choices;
         }
     })();
 
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/utils/combat/TargetTracker.kt b/src/main/kotlin/net/ccbluex/liquidbounce/utils/combat/TargetTracker.kt
index 50339c9da2a..cd9117d88ed 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/utils/combat/TargetTracker.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/utils/combat/TargetTracker.kt
@@ -183,6 +183,22 @@ open class TargetSelector(
 }
 
 enum class TargetPriority(override val choiceName: String) : NamedChoice, Comparator<LivingEntity> {
+    /**
+     * Player first
+     */
+    TYPE("Type") {
+        private fun weight(entity: LivingEntity): Int =
+            when (entity) {
+                is PlayerEntity -> 0
+                is HostileEntity -> 1
+                is Angerable if entity.angryAt == player.uuid -> 2
+                else -> Int.MAX_VALUE
+            }
+
+        override fun compare(o1: LivingEntity, o2: LivingEntity): Int =
+            weight(o1) compareTo weight(o2)
+    },
+
     /**
      * Lowest health first
      */
@@ -222,20 +238,4 @@ enum class TargetPriority(override val choiceName: String) : NamedChoice, Compar
         override fun compare(o1: LivingEntity, o2: LivingEntity): Int =
             o2.age compareTo o1.age
     },
-
-    /**
-     * Player first
-     */
-    TYPE("Type") {
-        private fun weight(entity: LivingEntity): Int =
-            when (entity) {
-                is PlayerEntity -> 0
-                is HostileEntity -> 1
-                is Angerable if entity.angryAt == player.uuid -> 2
-                else -> Int.MAX_VALUE
-            }
-
-        override fun compare(o1: LivingEntity, o2: LivingEntity): Int =
-            weight(o1) compareTo weight(o2)
-    },
 }

From 1934deeb0fb8c799380f686ff4134d5927e479a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=A8=E8=91=89=20Scarlet?=
 <93977077+mukjepscarlet@users.noreply.github.com>
Date: Wed, 26 Nov 2025 00:29:15 +0800
Subject: [PATCH 13/16] add EquipmentSlotChoice to NametagEnchantmentRenderer
 too

---
 .../render/nametags/EquipmentSlotChoice.kt    | 37 +++++++++++++++++++
 .../nametags/NametagEnchantmentRenderer.kt    | 29 +++++++++------
 .../render/nametags/NametagEquipment.kt       | 20 +---------
 3 files changed, 57 insertions(+), 29 deletions(-)
 create mode 100644 src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/EquipmentSlotChoice.kt

diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/EquipmentSlotChoice.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/EquipmentSlotChoice.kt
new file mode 100644
index 00000000000..c3a02bb214a
--- /dev/null
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/EquipmentSlotChoice.kt
@@ -0,0 +1,37 @@
+/*
+ * This file is part of LiquidBounce (https://github.com/CCBlueX/LiquidBounce)
+ *
+ * Copyright (c) 2015 - 2025 CCBlueX
+ *
+ * LiquidBounce is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * LiquidBounce is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with LiquidBounce. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package net.ccbluex.liquidbounce.features.module.modules.render.nametags
+
+import net.ccbluex.liquidbounce.config.types.NamedChoice
+import net.minecraft.entity.EquipmentSlot
+
+enum class EquipmentSlotChoice(
+    override val choiceName: String,
+    val slot: EquipmentSlot,
+) : NamedChoice {
+    MAINHAND("Mainhand", EquipmentSlot.MAINHAND),
+    OFFHAND("Offhand", EquipmentSlot.OFFHAND),
+    FEET("Feet", EquipmentSlot.FEET),
+    LEGS("Legs", EquipmentSlot.LEGS),
+    CHEST("Chest", EquipmentSlot.CHEST),
+    HEAD("Head", EquipmentSlot.HEAD),
+    BODY("Body", EquipmentSlot.BODY),
+    SADDLE("Saddle", EquipmentSlot.SADDLE),
+}
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagEnchantmentRenderer.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagEnchantmentRenderer.kt
index 9cabb0e67dd..d56b1e5c955 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagEnchantmentRenderer.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagEnchantmentRenderer.kt
@@ -20,6 +20,7 @@ package net.ccbluex.liquidbounce.features.module.modules.render.nametags
 
 import it.unimi.dsi.fastutil.objects.ReferenceSet
 import net.ccbluex.fastutil.mapToArray
+import net.ccbluex.fastutil.objectLinkedSetOf
 import net.ccbluex.liquidbounce.config.types.nesting.ToggleableConfigurable
 import net.ccbluex.liquidbounce.render.GUIRenderEnvironment
 import net.ccbluex.liquidbounce.render.drawQuad
@@ -31,7 +32,6 @@ import net.ccbluex.liquidbounce.utils.item.getEnchantmentCount
 import net.ccbluex.liquidbounce.utils.kotlin.LruCache
 import net.minecraft.enchantment.Enchantment
 import net.minecraft.enchantment.Enchantments
-import net.minecraft.entity.EquipmentSlot
 import net.minecraft.entity.LivingEntity
 import net.minecraft.item.ItemStack
 import net.minecraft.util.Formatting
@@ -120,6 +120,17 @@ private data class EnchantmentInfo(
 )
 
 internal object NametagEnchantmentRenderer : ToggleableConfigurable(ModuleNametags, "Enchantment", true) {
+
+    private val slots by multiEnumChoice(
+        "Slots",
+        objectLinkedSetOf(
+            EquipmentSlotChoice.MAINHAND, EquipmentSlotChoice.OFFHAND,
+            EquipmentSlotChoice.HEAD, EquipmentSlotChoice.CHEST,
+            EquipmentSlotChoice.LEGS, EquipmentSlotChoice.FEET,
+        ),
+        canBeNone = true
+    )
+
     private const val MAX_ENCHANTMENTS_PER_ITEM = 10
     private const val FIXED_SCALE = 0.6f
     private const val LINE_HEIGHT = 14f
@@ -128,8 +139,8 @@ internal object NametagEnchantmentRenderer : ToggleableConfigurable(ModuleNameta
     private const val CELL_HEIGHT = LINE_HEIGHT + PADDING * 2
     private const val VERTICAL_SPACING = 4f
     private const val FRAME_MARGIN = 6f
-    private val BG_COLOR_NORMAL = Color4b.BLACK.with(a = 200)
-    private val BG_COLOR_CURSE = Color4b.RED.darker().with(a = 200)
+    private val BG_COLOR_NORMAL = Color4b.BLACK.alpha(200)
+    private val BG_COLOR_CURSE = Color4b.RED.darker().alpha(200)
 
     private val supportedEnchantments by lazy {
         mc.world?.registryManager?.getOrThrow(RegistryKeys.ENCHANTMENT)?.keys?.toList() ?: emptyList()
@@ -212,14 +223,10 @@ internal object NametagEnchantmentRenderer : ToggleableConfigurable(ModuleNameta
         return cells.asList()
     }
 
-    private fun getEntityItemsWithEnchantments(entity: LivingEntity): List<ItemStack> = listOf(
-        entity.mainHandStack,
-        entity.offHandStack,
-        entity.getEquippedStack(EquipmentSlot.HEAD),
-        entity.getEquippedStack(EquipmentSlot.CHEST),
-        entity.getEquippedStack(EquipmentSlot.LEGS),
-        entity.getEquippedStack(EquipmentSlot.FEET)
-    ).filter { !it.isEmpty && it.getEnchantmentCount() > 0 }
+    private fun getEntityItemsWithEnchantments(entity: LivingEntity): List<ItemStack> =
+        slots.mapToArray {
+            entity.getEquippedStack(it.slot)
+        }.filter { !it.isEmpty && it.getEnchantmentCount() > 0 }
 
     private fun createCell(
         info: EnchantmentInfo? = null,
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagEquipment.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagEquipment.kt
index 4bf035b0f07..b0e78c0fb11 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagEquipment.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagEquipment.kt
@@ -21,9 +21,7 @@ package net.ccbluex.liquidbounce.features.module.modules.render.nametags
 
 import net.ccbluex.fastutil.mapToArray
 import net.ccbluex.fastutil.objectLinkedSetOf
-import net.ccbluex.liquidbounce.config.types.NamedChoice
 import net.ccbluex.liquidbounce.config.types.nesting.Configurable
-import net.minecraft.entity.EquipmentSlot
 import net.minecraft.entity.LivingEntity
 import net.minecraft.item.ItemStack
 
@@ -32,8 +30,8 @@ internal object NametagEquipment : Configurable("Equipment") {
     private val slots by multiEnumChoice(
         "Slots",
         objectLinkedSetOf(
-            NEquipmentSlot.MAINHAND, NEquipmentSlot.HEAD, NEquipmentSlot.CHEST,
-            NEquipmentSlot.LEGS, NEquipmentSlot.FEET, NEquipmentSlot.OFFHAND,
+            EquipmentSlotChoice.MAINHAND, EquipmentSlotChoice.HEAD, EquipmentSlotChoice.CHEST,
+            EquipmentSlotChoice.LEGS, EquipmentSlotChoice.FEET, EquipmentSlotChoice.OFFHAND,
         ),
         canBeNone = true
     )
@@ -54,18 +52,4 @@ internal object NametagEquipment : Configurable("Equipment") {
             stacks.asList()
         }
     }
-
-    private enum class NEquipmentSlot(
-        override val choiceName: String,
-        val slot: EquipmentSlot,
-    ) : NamedChoice {
-        MAINHAND("Mainhand", EquipmentSlot.MAINHAND),
-        OFFHAND("Offhand", EquipmentSlot.OFFHAND),
-        FEET("Feet", EquipmentSlot.FEET),
-        LEGS("Legs", EquipmentSlot.LEGS),
-        CHEST("Chest", EquipmentSlot.CHEST),
-        HEAD("Head", EquipmentSlot.HEAD),
-        BODY("Body", EquipmentSlot.BODY),
-        SADDLE("Saddle", EquipmentSlot.SADDLE),
-    }
 }

From 6683842e782125329bed8a07e96f05efa329f416 Mon Sep 17 00:00:00 2001
From: MukjepScarlet <93977077+mukjepscarlet@users.noreply.github.com>
Date: Wed, 26 Nov 2025 16:20:44 +0800
Subject: [PATCH 14/16] style edit

---
 .../setting/MultiChooseSetting.svelte         | 80 +++++++++++++++----
 1 file changed, 66 insertions(+), 14 deletions(-)

diff --git a/src-theme/src/routes/clickgui/setting/MultiChooseSetting.svelte b/src-theme/src/routes/clickgui/setting/MultiChooseSetting.svelte
index 78024d1d6b1..768107dc59d 100644
--- a/src-theme/src/routes/clickgui/setting/MultiChooseSetting.svelte
+++ b/src-theme/src/routes/clickgui/setting/MultiChooseSetting.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import {createEventDispatcher, onDestroy} from "svelte";
     import type {ModuleSetting, MultiChooseSetting,} from "../../../integration/types";
-    import {fade, slide} from "svelte/transition";
+    import {slide} from "svelte/transition";
     import {convertToSpacedString, spaceSeperatedNames} from "../../../theme/theme_config";
     import ExpandArrow from "./common/ExpandArrow.svelte";
     import {setItem} from "../../../integration/persistent_storage";
@@ -21,6 +21,11 @@
 
     const isEnabled = (choice: string) => cSetting.value.includes(choice);
 
+    const getEnabledIndex = (choice: string) => {
+        if (!cSetting.isOrderSensitive || !isEnabled(choice)) return -1;
+        return cSetting.value.indexOf(choice);
+    }
+
     $: choices = (() => {
         if (cSetting.isOrderSensitive) {
             return [...cSetting.value, ...cSetting.choices.filter(it => !isEnabled(it))];
@@ -31,8 +36,16 @@
 
     let hoveringChoice = -1;
 
-    const moveEnabledChoice = (i: number, j: number) => {
-        swap(cSetting.value, i, j);
+    const moveEnabledChoice = (index: number, direction: number) => {
+        if (!cSetting.isOrderSensitive) return;
+
+        const enabledCount = cSetting.value.length;
+        if (index < 0 || index >= enabledCount) return;
+
+        const newIndex = index + direction;
+        if (newIndex < 0 || newIndex >= enabledCount) return;
+
+        swap(cSetting.value, index, newIndex);
         cSetting.value = cSetting.value;
         fireChange();
     }
@@ -58,6 +71,7 @@
 
             cSetting.value = filtered;
         } else {
+            // Append enabled value to tail
             cSetting.value = [...cSetting.value, v];
         }
 
@@ -87,20 +101,26 @@
     {#if expanded}
         <div class="choices" transition:slide|global={{duration: 200, axis: "y"}}>
             {#each choices as choice, i (choice)}
+                {@const enabledIndex = getEnabledIndex(choice)}
+                {@const showLeftArrow = cSetting.isOrderSensitive && enabledIndex > 0 && hoveringChoice === i}
+                {@const showRightArrow = cSetting.isOrderSensitive && enabledIndex >= 0 && enabledIndex < cSetting.value.length - 1 && hoveringChoice === i}
                 <div
                         class="choice"
                         class:active={isEnabled(choice)}
                         class:error={errorValue === choice}
+                        class:order-sensitive={cSetting.isOrderSensitive}
                         animate:flip={{duration: 200}}
                         on:mouseenter={() => hoveringChoice = i}
                         on:mouseleave={() => hoveringChoice = -1}
                 >
                     <!-- Move left -->
-                    {#if cSetting.isOrderSensitive && i !== 0 && isEnabled(choice) && hoveringChoice === i}
-                        <span class="choice-action" on:click={() => moveEnabledChoice(i, i - 1)} transition:fade={{duration: 200}}>
-                            &lt;
-                        </span>
-                    {/if}
+                    <span 
+                        class="choice-action move-left" 
+                        class:visible={showLeftArrow}
+                        on:click|stopPropagation={() => moveEnabledChoice(enabledIndex, -1)} 
+                    >
+                        ◀
+                    </span>
 
                     <!-- Toggle -->
                     <span class="choice-name" on:click={() => handleChange(choice)}>
@@ -108,11 +128,13 @@
                     </span>
 
                     <!-- Move right -->
-                    {#if cSetting.isOrderSensitive && i !== choices.length - 1 && isEnabled(choice) && isEnabled(choices[i + 1]) && hoveringChoice === i}
-                        <span class="choice-action" on:click={() => moveEnabledChoice(i, i + 1)} transition:fade={{duration: 200}}>
-                            &gt;
-                        </span>
-                    {/if}
+                    <span 
+                        class="choice-action move-right" 
+                        class:visible={showRightArrow}
+                        on:click|stopPropagation={() => moveEnabledChoice(enabledIndex, 1)} 
+                    >
+                        ▶
+                    </span>
                 </div>
             {/each}
         </div>
@@ -140,8 +162,12 @@
     padding: 3px 6px;
     cursor: pointer;
     font-weight: 500;
-    transition: ease color 0.2s;
+    transition: ease color 0.2s, ease background-color 0.2s;
     overflow-wrap: anywhere;
+    position: relative;
+    display: inline-flex;
+    align-items: center;
+    gap: 3px;
 
     &:hover {
       color: $clickgui-text-color;
@@ -159,11 +185,37 @@
       }
     }
 
+    &:not(.order-sensitive) {
+      gap: 0;
+
+      .choice-action {
+        display: none;
+      }
+    }
+
     .choice-action {
       color: $clickgui-text-dimmed-color;
+      font-size: 10px;
+      cursor: pointer;
+      padding: 1px 2px;
+      border-radius: 2px;
+      transition: ease color 0.2s, ease background-color 0.2s, ease width 0.2s, ease opacity 0.2s;
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      width: 0;
+      height: 14px;
+      opacity: 0;
+      overflow: hidden;
+
+      &.visible {
+        width: 14px;
+        opacity: 1;
+      }
 
       &:hover {
         color: $accent-color;
+        background-color: rgba($accent-color, 0.1);
       }
     }
   }

From 944470cdc5784d707d17ef75c824cfd1fedf1521 Mon Sep 17 00:00:00 2001
From: MukjepScarlet <93977077+mukjepscarlet@users.noreply.github.com>
Date: Fri, 28 Nov 2025 18:59:32 +0800
Subject: [PATCH 15/16] small improvement

---
 .../render/nametags/NametagTextFormatter.kt       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagTextFormatter.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagTextFormatter.kt
index 2b28af00ffd..8ace0bcd5f9 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagTextFormatter.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagTextFormatter.kt
@@ -28,7 +28,7 @@ import net.ccbluex.liquidbounce.utils.client.asPlainText
 import net.ccbluex.liquidbounce.utils.client.asText
 import net.ccbluex.liquidbounce.utils.client.joinToText
 import net.ccbluex.liquidbounce.utils.client.player
-import net.ccbluex.liquidbounce.utils.client.regular
+import net.ccbluex.liquidbounce.utils.client.textOf
 import net.ccbluex.liquidbounce.utils.client.withColor
 import net.ccbluex.liquidbounce.utils.combat.EntityTaggingManager
 import net.ccbluex.liquidbounce.utils.entity.getActualHealth
@@ -72,6 +72,9 @@ internal object NametagTextFormatter : Configurable("Text") {
         },
 
         PING("Ping") {
+            private val leftBracket = "[".asPlainText(Formatting.GRAY)
+            private val rightBracket = "]".asPlainText(Formatting.GRAY)
+
             override fun apply(t: Entity): Text? {
                 val entity = t as? PlayerEntity ?: return null
 
@@ -83,11 +86,11 @@ internal object NametagTextFormatter : Configurable("Text") {
                     else -> Formatting.GREEN
                 }
 
-                return regular(" [")
-                    .append(
-                        (playerPing.toString() + "ms").asPlainText(coloringBasedOnPing)
-                    )
-                    .append(regular("]"))
+                return textOf(
+                    leftBracket,
+                    "${playerPing}ms".asPlainText(coloringBasedOnPing),
+                    rightBracket,
+                )
             }
         },
 

From db81ae0cd61677bdb44aa75ff8e7460dc2f81621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=A8=E8=91=89=20Scarlet?=
 <93977077+mukjepscarlet@users.noreply.github.com>
Date: Sat, 29 Nov 2025 23:38:09 +0800
Subject: [PATCH 16/16] fix merging

---
 .../modules/render/nametags/NametagEnchantmentRenderer.kt      | 3 ++-
 .../features/module/modules/render/nametags/NametagRenderer.kt | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagEnchantmentRenderer.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagEnchantmentRenderer.kt
index c320d4b13db..facbd73d145 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagEnchantmentRenderer.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagEnchantmentRenderer.kt
@@ -36,7 +36,7 @@ import net.minecraft.util.Formatting
 import net.minecraft.client.resource.language.I18n
 import net.minecraft.registry.RegistryKey
 import net.minecraft.registry.RegistryKeys
-import net.ccbluex.liquidbounce.utils.client.mc
+import net.ccbluex.liquidbounce.utils.item.getEnchantmentCount
 import net.minecraft.client.gui.DrawContext
 import org.joml.Vector2f
 import org.joml.component1
@@ -114,6 +114,7 @@ private object EnchantmentDisplayHelper {
     private fun isCurse(enchantment: RegistryKey<Enchantment>): Boolean = enchantment in knownCurses
 }
 
+@JvmRecord
 private data class EnchantmentInfo(
     val displayName: String,
     val isCurse: Boolean = false
diff --git a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagRenderer.kt b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagRenderer.kt
index 5c3fe477330..571f93f6f35 100644
--- a/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagRenderer.kt
+++ b/src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/nametags/NametagRenderer.kt
@@ -31,7 +31,7 @@ private const val NAMETAG_PADDING: Int = 15
 
 internal fun DrawContext.drawNametag(nametag: Nametag, posX: Float, posY: Float) {
     if (nametag.items.any { !it.isEmpty }) {
-        val currentItemStackRenderer = if (NametagShowOptions.showInfo) {
+        val currentItemStackRenderer = if (NametagEquipment.showInfo) {
             if (nametag.entity === player) {
                 ItemStackListRenderer.SingleItemStackRenderer.All
             } else {