Show env name in thread tooltip

Author: object-Object

Common/src/main/kotlin/gay/object/hexdebug/impl/HexDebugCoreAPIImpl.kt

@@ -23,6 +23,10 @@ class HexDebugCoreAPIImpl : HexDebugCoreAPI {
         return DebugAdapterManager[caster]?.debugger(sessionId)?.debugEnv
     }
 
+    override fun getDebugEnv(caster: ServerPlayer, threadId: Int): DebugEnvironment? {
+        return DebugAdapterManager[caster]?.debugger(threadId)?.debugEnv
+    }
+
     override fun isSessionDebugging(debugEnv: DebugEnvironment): Boolean {
         return DebugAdapterManager[debugEnv.caster]?.debugger(debugEnv.sessionId) != null
     }

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

@@ -192,7 +192,7 @@ class DebuggerItem(
     override fun handleShiftScroll(sender: ServerPlayer, stack: ItemStack, delta: Double, isCtrl: Boolean) {
         val increase = delta < 0
         val component = if (isCtrl) {
-            rotateThreadId(stack, increase)
+            rotateThreadId(sender, stack, increase)
         } else {
             rotateStepMode(stack, increase)
         }

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

@@ -87,7 +87,7 @@ class EvaluatorItem(
     override fun canShiftScroll(isCtrl: Boolean) = isCtrl && isQuenched
 
     override fun handleShiftScroll(sender: ServerPlayer, stack: ItemStack, delta: Double, isCtrl: Boolean) {
-        val component = rotateThreadId(stack, delta < 0)
+        val component = rotateThreadId(sender, stack, delta < 0)
         sender.displayClientMessage(component, true)
     }
 

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

@@ -3,6 +3,7 @@ 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 gay.`object`.hexdebug.adapter.DebugAdapterManager
 import gay.`object`.hexdebug.config.HexDebugServerConfig
 import net.minecraft.network.chat.Component
 import net.minecraft.server.level.ServerPlayer
@@ -20,9 +21,16 @@ private const val THREAD_ID_TAG = "thread_id"
 
 fun getThreadId(stack: ItemStack) = stack.getInt(THREAD_ID_TAG)
 
-fun rotateThreadId(stack: ItemStack, increase: Boolean): Component {
+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 "hexdebug.tooltip.thread_id".asTranslatedComponent(threadId)
+
+    val envName = DebugAdapterManager[caster]?.debugger(threadId)?.envName
+    return if (envName != null) {
+        "hexdebug.tooltip.thread.active".asTranslatedComponent(threadId, envName)
+    } else {
+        "hexdebug.tooltip.thread.inactive".asTranslatedComponent(threadId)
+    }
 }

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

@@ -257,7 +257,10 @@
 
   hexdebug: {
     tooltip: {
-      thread_id: "Thread: %d",
+      thread: {
+        inactive: "Thread %d",
+        active: "Thread %d (%s)",
+      },
       debugger: {
         step_mode: {
           continue: "Mode: Continue",

Core/src/main/java/gay/object/hexdebug/core/api/HexDebugCoreAPI.java

@@ -38,6 +38,12 @@ default DebugEnvironment getDebugEnv(@NotNull ServerPlayer caster, @NotNull UUID
         return null;
     }
 
+    @Contract(pure = true)
+    @Nullable
+    default DebugEnvironment getDebugEnv(@NotNull ServerPlayer caster, int threadId) {
+        return null;
+    }
+
     @Contract(pure = true)
     default boolean isSessionDebugging(@NotNull DebugEnvironment debugEnv) {
         return false;