Get debug thread name from debug env instead of casting env class

Author: object-Object

Common/src/main/kotlin/gay/object/hexdebug/adapter/DebugAdapter.kt

@@ -524,8 +524,7 @@ class DebugAdapter(val player: ServerPlayer) : IDebugProtocolServer {
                 .map { (threadId, debugger) ->
                     Thread().apply {
                         id = threadId
-                        name = "Thread $threadId"
-                        debugger.envName?.let { name += " ($it)" }
+                        name = "Thread $threadId (${debugger.debugEnv.name.string})"
                     }
                 }
                 .sortedBy { it.id }

Common/src/main/kotlin/gay/object/hexdebug/debugger/circles/CircleDebugEnv.kt

@@ -8,6 +8,7 @@ import at.petrak.hexcasting.api.casting.eval.env.PlayerBasedCastEnv.AMBIT_RADIUS
 import at.petrak.hexcasting.api.casting.eval.vm.CastingImage
 import gay.`object`.hexdebug.core.api.debugging.BaseCircleDebugEnv
 import net.minecraft.core.BlockPos
+import net.minecraft.network.chat.Component
 import net.minecraft.server.level.ServerPlayer
 
 class CircleDebugEnv(caster: ServerPlayer, val pos: BlockPos) : BaseCircleDebugEnv(caster) {
@@ -47,4 +48,8 @@ class CircleDebugEnv(caster: ServerPlayer, val pos: BlockPos) : BaseCircleDebugE
     override fun isCasterInRange(): Boolean {
         return caster.distanceToSqr(pos.center) <= AMBIT_RADIUS * AMBIT_RADIUS
     }
+
+    override fun getName(): Component {
+        return caster.serverLevel().getBlockState(pos).block.name
+    }
 }

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

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

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

@@ -15,6 +15,7 @@ import gay.`object`.hexdebug.items.base.*
 import gay.`object`.hexdebug.utils.asItemPredicate
 import gay.`object`.hexdebug.utils.getWrapping
 import gay.`object`.hexdebug.utils.otherHand
+import gay.`object`.hexdebug.utils.styledHoverName
 import net.minecraft.client.player.LocalPlayer
 import net.minecraft.network.chat.Component
 import net.minecraft.server.level.ServerLevel
@@ -158,11 +159,7 @@ class DebuggerItem(
             } ?: return InteractionResultHolder.fail(stack)
 
             val env = DebuggerCastEnv(serverPlayer, usedHand)
-            val debugEnv = SimplePlayerBasedDebugEnv(
-                serverPlayer,
-                env,
-                instrs
-            )
+            val debugEnv = SimplePlayerBasedDebugEnv(serverPlayer, env, instrs, stack.styledHoverName)
 
             try {
                 debugEnv.start(threadId)

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

@@ -3,8 +3,8 @@ 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 gay.`object`.hexdebug.core.api.HexDebugCoreAPI
 import net.minecraft.network.chat.Component
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.world.item.ItemStack
@@ -27,7 +27,7 @@ fun rotateThreadId(caster: ServerPlayer, stack: ItemStack, increase: Boolean): C
 
     stack.putInt(THREAD_ID_TAG, threadId)
 
-    val envName = DebugAdapterManager[caster]?.debugger(threadId)?.envName
+    val envName = HexDebugCoreAPI.INSTANCE.getDebugEnv(caster, threadId)?.name
     return if (envName != null) {
         "hexdebug.tooltip.thread.active".asTranslatedComponent(threadId, envName)
     } else {

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

@@ -44,11 +44,6 @@ default DebugEnvironment getDebugEnv(@NotNull ServerPlayer caster, int threadId)
         return null;
     }
 
-    @Contract(pure = true)
-    default boolean isSessionDebugging(@NotNull DebugEnvironment debugEnv) {
-        return false;
-    }
-
     /**
      * @throws IllegalDebugSessionException if {@code debugEnv} is currently associated with an
      *     active debug session
@@ -92,6 +87,13 @@ default void printDebugMessage(
         boolean withSource
     ) {}
 
+    // implemented methods
+
+    @Contract(pure = true)
+    default boolean isSessionDebugging(@NotNull DebugEnvironment debugEnv) {
+        return getDebugEnv(debugEnv.getCaster(), debugEnv.getSessionId()) != null;
+    }
+
     // singleton service loading
 
     HexDebugCoreAPI INSTANCE = findInstance();

Core/src/main/java/gay/object/hexdebug/core/api/debugging/DebugEnvironment.java

@@ -9,6 +9,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
 import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -64,8 +65,19 @@ public abstract boolean resume(
      * For in-world debugees, returns whether the caster is close enough to the debuggee to allow
      * debug-related actions to be performed (eg. pause, step, restart).
      */
+    @Contract(pure = true)
     public abstract boolean isCasterInRange();
 
+    /**
+     * Returns a display name for this debug session.
+     * <br>
+     * For example, debugger items return the name of the item, and spell circles return the name of
+     * the impetus.
+     */
+    @Contract(pure = true)
+    @NotNull
+    public abstract Component getName();
+
     public void printDebugMessage(@NotNull Component message) {
         printDebugMessage(message, DebugOutputCategory.STDOUT, true);
     }
@@ -95,6 +107,7 @@ public void printDebugMishap(
         }
     }
 
+    @Contract(pure = true)
     public boolean isDebugging() {
         return HexDebugCoreAPI.INSTANCE.isSessionDebugging(this);
     }

Core/src/main/java/gay/object/hexdebug/core/api/debugging/SimplePlayerBasedDebugEnv.java

@@ -8,6 +8,7 @@
 import gay.object.hexdebug.core.api.exceptions.DebugException;
 import gay.object.hexdebug.core.api.exceptions.IllegalDebugSessionException;
 import gay.object.hexdebug.core.api.exceptions.IllegalDebugThreadException;
+import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerPlayer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -19,15 +20,19 @@ public class SimplePlayerBasedDebugEnv extends DebugEnvironment {
     private final CastingEnvironment env;
     @NotNull
     private final List<Iota> iotas;
+    @NotNull
+    private final Component name;
 
     public SimplePlayerBasedDebugEnv(
         @NotNull ServerPlayer caster,
         @NotNull CastingEnvironment env,
-        @NotNull List<Iota> iotas
-    ) {
+        @NotNull List<Iota> iotas,
+        @NotNull Component name
+        ) {
         super(caster);
         this.env = env;
         this.iotas = iotas;
+        this.name = name;
     }
 
     @Override
@@ -54,6 +59,12 @@ public boolean isCasterInRange() {
         return true;
     }
 
+    @Override
+    @NotNull
+    public Component getName() {
+        return name;
+    }
+
     public void start(@Nullable Integer threadId)
         throws IllegalDebugSessionException, IllegalDebugThreadException
     {