Show thread id in tooltip

Author: object-Object

Common/src/main/kotlin/gay/object/hexdebug/items/DebuggerItem.kt

@@ -28,6 +28,7 @@ import net.minecraft.world.entity.LivingEntity
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.item.Rarity
+import net.minecraft.world.item.TooltipFlag
 import net.minecraft.world.item.context.UseOnContext
 import net.minecraft.world.item.enchantment.EnchantmentHelper
 import net.minecraft.world.item.enchantment.Enchantments
@@ -183,6 +184,16 @@ class DebuggerItem(
         return super.hurtEnemy(stack, target, attacker)
     }
 
+    override fun appendHoverText(
+        stack: ItemStack,
+        level: Level?,
+        tooltipComponents: MutableList<Component>,
+        isAdvanced: TooltipFlag,
+    ) {
+        tooltipComponents.add(displayThread(null, getThreadId(stack)))
+        super.appendHoverText(stack, level, tooltipComponents, isAdvanced)
+    }
+
     // always allow shift, only allow ctrl if quenched
     override fun canShiftScroll(isCtrl: Boolean) = !isCtrl || isQuenched
 

Common/src/main/kotlin/gay/object/hexdebug/items/EvaluatorItem.kt

@@ -13,12 +13,14 @@ import gay.`object`.hexdebug.debugger.DebuggerState
 import gay.`object`.hexdebug.items.base.*
 import gay.`object`.hexdebug.utils.asItemPredicate
 import net.minecraft.client.player.LocalPlayer
+import net.minecraft.network.chat.Component
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.stats.Stats
 import net.minecraft.world.InteractionHand
 import net.minecraft.world.InteractionResultHolder
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.item.ItemStack
+import net.minecraft.world.item.TooltipFlag
 import net.minecraft.world.level.Level
 import net.minecraft.world.phys.Vec3
 
@@ -83,6 +85,16 @@ class EvaluatorItem(
         }
     )
 
+    override fun appendHoverText(
+        stack: ItemStack,
+        level: Level?,
+        tooltipComponents: MutableList<Component>,
+        isAdvanced: TooltipFlag,
+    ) {
+        tooltipComponents.add(displayThread(null, getThreadId(stack)))
+        super.appendHoverText(stack, level, tooltipComponents, isAdvanced)
+    }
+
     // only allow shift+ctrl scrolling, and only if it's quenched
     override fun canShiftScroll(isCtrl: Boolean) = isCtrl && isQuenched
 

Common/src/main/kotlin/gay/object/hexdebug/items/base/ShiftScrollable.kt

@@ -1,8 +1,6 @@
 package gay.`object`.hexdebug.items.base
 
-import at.petrak.hexcasting.api.utils.asTranslatedComponent
-import at.petrak.hexcasting.api.utils.getInt
-import at.petrak.hexcasting.api.utils.putInt
+import at.petrak.hexcasting.api.utils.*
 import gay.`object`.hexdebug.config.HexDebugServerConfig
 import gay.`object`.hexdebug.core.api.HexDebugCoreAPI
 import net.minecraft.network.chat.Component
@@ -24,13 +22,17 @@ fun getThreadId(stack: ItemStack) = stack.getInt(THREAD_ID_TAG)
 fun rotateThreadId(caster: ServerPlayer, stack: ItemStack, increase: Boolean): Component {
     val threadId = (getThreadId(stack) + (if (increase) 1 else -1))
         .coerceIn(0 until HexDebugServerConfig.config.maxDebugThreads)
-
     stack.putInt(THREAD_ID_TAG, threadId)
+    return displayThread(caster, threadId)
+}
 
-    val envName = HexDebugCoreAPI.INSTANCE.getDebugEnv(caster, threadId)?.name
-    return if (envName != null) {
-        "hexdebug.tooltip.thread.active".asTranslatedComponent(threadId, envName)
+fun displayThread(caster: ServerPlayer?, threadId: Int): Component {
+    val threadText = threadId.toString().asTextComponent.white
+    val envName = caster?.let { HexDebugCoreAPI.INSTANCE.getDebugEnv(it, threadId) }?.name
+    val component = if (envName != null) {
+        "hexdebug.tooltip.thread.active".asTranslatedComponent(threadText, envName)
     } else {
-        "hexdebug.tooltip.thread.inactive".asTranslatedComponent(threadId)
+        "hexdebug.tooltip.thread.inactive".asTranslatedComponent(threadText)
     }
+    return component.gray
 }

Common/src/main/resources/assets/hexdebug/lang/en_us.flatten.json5

@@ -258,8 +258,8 @@
   hexdebug: {
     tooltip: {
       thread: {
-        inactive: "Thread %d",
-        active: "Thread %d (%s)",
+        inactive: "Thread %s",
+        active: "Thread %s (%s)",
       },
       debugger: {
         step_mode: {