Fix debug session still being started when circle fails on startup

Author: object-Object

Common/src/main/java/gay/object/hexdebug/mixin/MixinBlockEntityAbstractImpetus.java

@@ -47,14 +47,16 @@ public MixinBlockEntityAbstractImpetus(BlockEntityType<?> pType, BlockPos pWorld
     public InteractionResult startDebugging(@NotNull ServerPlayer caster, int threadId) {
         if (executionState != null) return InteractionResult.PASS;
 
+        startExecution(caster);
+        if (executionState == null) return InteractionResult.FAIL;
+
         var debugEnv = new CircleDebugEnv(caster, getBlockPos());
         try {
             HexDebugCoreAPI.INSTANCE.createDebugThread(debugEnv, threadId);
         } catch (DebugException ignored) {
             return InteractionResult.PASS;
         }
 
-        startExecution(caster);
         ((IMixinCircleExecutionState) executionState).setDebugEnv$hexdebug(debugEnv);
 
         return InteractionResult.CONSUME;

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

@@ -113,9 +113,11 @@ class DebugAdapter(val player: ServerPlayer) : IDebugProtocolServer {
         closeEvaluator(threadId)
     }
 
+    fun getFreeThreadId(): Int? = (0 until maxThreads).firstOrNull { !isDebugging(it) }
+
     private fun resolveThreadId(threadId: Int?): Int {
         if (threadId == null) {
-            return (0 until maxThreads).firstOrNull { !isDebugging(it) }
+            return getFreeThreadId()
                 ?: throw IllegalDebugThreadException("All debug threads are already in use")
         }
 

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

@@ -27,6 +27,10 @@ class HexDebugCoreAPIImpl : HexDebugCoreAPI {
         return DebugAdapterManager[casterId]?.debugger(threadId)?.debugEnv
     }
 
+    override fun getFreeDebugThreadId(casterId: UUID): Int? {
+        return DebugAdapterManager[casterId]?.getFreeThreadId()
+    }
+
     override fun createDebugThread(debugEnv: DebugEnvironment, threadId: Int?) {
         getAdapterOrThrow(debugEnv).createDebugThread(debugEnv, threadId)
     }

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

@@ -44,6 +44,16 @@ default DebugEnvironment getDebugEnv(@NotNull UUID casterId, int threadId) {
         return null;
     }
 
+    /**
+     * Returns an arbitrary debug thread ID that is not currently in use by the given player, or
+     * {@code null} if no threads are currently available.
+     */
+    @Contract(pure = true)
+    @Nullable
+    default Integer getFreeDebugThreadId(@NotNull UUID casterId) {
+        return null;
+    }
+
     /**
      * @throws IllegalDebugSessionException if {@code debugEnv} is currently associated with an
      *     active debug session
@@ -101,6 +111,16 @@ default DebugEnvironment getDebugEnv(@NotNull ServerPlayer caster, int threadId)
         return getDebugEnv(caster.getUUID(), threadId);
     }
 
+    /**
+     * Returns an arbitrary debug thread ID that is not currently in use by the given player, or
+     * {@code null} if no threads are available.
+     */
+    @Contract(pure = true)
+    @Nullable
+    default Integer getFreeDebugThreadId(@NotNull ServerPlayer caster) {
+        return getFreeDebugThreadId(caster.getUUID());
+    }
+
     @Contract(pure = true)
     default boolean isSessionDebugging(@NotNull DebugEnvironment debugEnv) {
         return getDebugEnv(debugEnv.getCaster(), debugEnv.getSessionId()) != null;