fix: ij coroutines not working as paper library, refactor: move axi modules to dependency handler

Author: radstevee

core/src/main/kotlin/net/radstevee/axi/command/CloudCommandExecutionContext.kt

@@ -4,18 +4,18 @@ import kotlinx.coroutines.CoroutineScope
 import org.bukkit.entity.Player
 import org.incendo.cloud.context.CommandContext
 import org.incendo.cloud.paper.util.sender.Source
-import kotlin.coroutines.AbstractCoroutineContextElement
 import kotlin.coroutines.CoroutineContext
 
 internal class CloudCommandExecutionContext(
   override val ctx: CommandContext<Source>,
   override var coroutineContext: CoroutineContext,
   scope: CoroutineScope,
-) : AbstractCoroutineContextElement(CloudCommandExecutionContext),
-  CommandExecutionContext,
+) : CommandExecutionContext,
   CoroutineScope by scope {
   override val player: Player by lazy { ctx.player }
   override val source: Source by lazy { ctx.sender() }
 
-  companion object : CoroutineContext.Key<CloudCommandExecutionContext>
+  companion object {
+    val Holder: ThreadLocal<CloudCommandExecutionContext> = ThreadLocal()
+  }
 }

core/src/main/kotlin/net/radstevee/axi/command/Command.kt

@@ -2,6 +2,7 @@ package net.radstevee.axi.command
 
 import net.radstevee.axi.plugin.AxiPlugin
 import net.radstevee.axi.plugin.AxiPluginHolder
+import org.jetbrains.annotations.ApiStatus
 
 /** Represents a wrapped cloud command. */
 public interface Command {
@@ -12,7 +13,8 @@ public interface Command {
   public val aliases: Set<String>
 
   /** The permission required to use this command, defaults to `pluginName.command.commandName`. */
-  public val permission: String
+  @set:ApiStatus.Internal
+  public var permission: String
 
   /** The children of this command. */
   public val children: Set<Command>

core/src/main/kotlin/net/radstevee/axi/command/CommandArguments.kt

@@ -16,14 +16,14 @@ public open class CommandArgument<T : Any>(
   public open val descriptor: ParserDescriptor<Source, T>,
 ) {
   public open operator fun getValue(thisRef: Any?, property: KProperty<*>): T? {
-    val coroutineContext = IntellijCoroutines.currentThreadCoroutineContext() ?: error("not in a coroutine")
-    val ctx = coroutineContext[CloudCommandExecutionContext] ?: error("no execution context found")
+    val ctx = CloudCommandExecutionContext.Holder.get() ?: error("thread local unset")
     return ctx.ctx.get<T>(id)
   }
 }
 
 /**
  * An instance of a command argument that cannot be null, by either providing
+ *
  * a) providing a default
  * b) using a required argument
  */
@@ -40,8 +40,7 @@ public class NonNullableCommandArgument<T : Any>(
       return super.getValue(thisRef, property)!!
     }
 
-    val coroutineContext = IntellijCoroutines.currentThreadCoroutineContext() ?: error("not in a coroutine")
-    val ctx = coroutineContext[CloudCommandExecutionContext] ?: error("no execution context found")
+    val ctx = CloudCommandExecutionContext.Holder.get() ?: error("thread local unset")
     return ctx.ctx.getOrDefault<T>(id, default)
   }
 }

core/src/main/kotlin/net/radstevee/axi/command/CommandBuilder.kt

@@ -71,11 +71,21 @@ public class CommandBuilder(
   /** Adds a sub command. */
   public fun sub(name: String, aliases: Set<String> = setOf(), block: (@CommandBuilderDsl CommandBuilder).() -> Unit = {}) {
     val builder = CommandBuilder(name, plugin)
+    builder.aliases(*aliases.toTypedArray())
     builder.permission("$permission.$name")
 
     children.add(builder.apply(block).build())
   }
 
+  /** Adds a command with its permission as long as [useSubPermission] is set to true. */
+  public fun sub(command: Command, useSubPermission: Boolean = true) {
+    if (!useSubPermission) {
+      command.permission = "$permission.${command.name}"
+    }
+
+    children.add(command)
+  }
+
   /** Adds the given [aliases]. */
   public fun aliases(vararg aliases: String) {
     this.aliases += aliases

core/src/main/kotlin/net/radstevee/axi/command/CommandImpl.kt

@@ -4,7 +4,7 @@ package net.radstevee.axi.command
 public class CommandImpl(
   override val name: String,
   override val aliases: Set<String>,
-  override val permission: String,
+  override var permission: String,
   override val children: Set<Command>,
   override val args: Set<CommandArgument<*>>,
   override val asyncHandler: Boolean,

core/src/main/kotlin/net/radstevee/axi/command/CommandRegistration.kt

@@ -1,8 +1,6 @@
 package net.radstevee.axi.command
 
-import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.launch
 import net.radstevee.axi.coroutines.AxiCoroutines.asyncContext
 import net.radstevee.axi.coroutines.AxiCoroutines.coroutineScope
 import net.radstevee.axi.coroutines.AxiCoroutines.syncContext
@@ -40,16 +38,18 @@ public fun Command.register(manager: CommandManager = AxiPluginHolder.plugin().c
       asyncContext
     } else {
       syncContext
-    } + SupervisorJob()
+    }
 
     suspendingHandler(scope = coroutineScope, context = coroutineContext) { ctx ->
       coroutineScope {
         val executionContext = CloudCommandExecutionContext(ctx, coroutineContext, this)
-        executionContext.coroutineContext += executionContext
-        executionContext.launch(executionContext.coroutineContext) {
+        CloudCommandExecutionContext.Holder.set(executionContext)
+        try {
           with(command) {
             executionContext.execute()
           }
+        } finally {
+          CloudCommandExecutionContext.Holder.remove()
         }
       }
     }

docs/src/getting-started/quickstart.md

@@ -44,8 +44,8 @@ plugins {
   id("xyz.jpenilla.run-task") version "2.3.1"
 }
 
-axi {
-  modules("core")
+dependencies {
+  axi.modules("core")
 }
 ```
 :::
@@ -94,11 +94,11 @@ Now you're good to go!
 
 If you need a dependency in your plugin, you can use paper's
 library loading feature by adding the dependency using the
-`axiDependency` function:
+`axi.runtime` function:
 
 ```kt
 dependencies {
-  axiDependency("...")
+  axi.runtime("...")
 }
 ```
 
@@ -114,8 +114,8 @@ plugins {
   id("xyz.jpenilla.run-task") version "2.3.1"
 }
 
-axi {
-  modules("core")
+dependencies {
+  axi.modules("core")
 }
 
 tasks.runServer {

example/build.gradle.kts

@@ -1,17 +1,19 @@
-// Doing this here since the plugin is already
-// on the classpath
-apply(plugin = "org.jetbrains.kotlin.jvm")
-
 plugins {
   id("net.radstevee.axi")
   id("xyz.jpenilla.run-paper") version "2.3.1"
+  kotlin("jvm")
 }
 
 group = "net.radstevee.axi.example"
 version = "0.0.0"
 
-axi {
-  modules("core", "ui")
+dependencies {
+  axi.modules("core", "ui")
+}
+
+kotlin {
+  jvmToolchain(21)
+  explicitApi()
 }
 
 tasks {

example/src/main/kotlin/net/radstevee/axi/example/Commands.kt

@@ -10,6 +10,20 @@ import net.radstevee.axi.ui.text.mm
 import org.incendo.cloud.parser.standard.IntegerParser.integerParser
 import org.incendo.cloud.parser.standard.StringParser.stringParser
 
+private val TestTwoCommand = Command("two") {
+  val num by arg("number", integerParser())
+
+  executor {
+    ctx.sendMessage(text("number: $num"))
+  }
+
+  sub("three") {
+    executor {
+      ctx.sendMessage(text("omg: $num"))
+    }
+  }
+}
+
 @AutoRegistered
 val TestCommand: Command = Command("test") {
   executor {
@@ -24,19 +38,7 @@ val TestCommand: Command = Command("test") {
     }
   }
 
-  sub("two") {
-    val num by arg("number", integerParser())
-
-    executor {
-      ctx.sendMessage(text("number: $num"))
-    }
-
-    sub("three") {
-      executor {
-        ctx.sendMessage(text("omg: $num"))
-      }
-    }
-  }
+  sub(TestTwoCommand)
 }
 
 @AutoRegistered

example/src/main/kotlin/net/radstevee/axi/example/ConnectionListener.kt

@@ -19,7 +19,7 @@ import org.bukkit.event.EventHandler
 import org.bukkit.event.player.PlayerJoinEvent
 import kotlin.time.Duration.Companion.seconds
 
-object ConnectionListener : SuspendingListener {
+public object ConnectionListener : SuspendingListener {
   @EventHandler
   private suspend fun on(event: PlayerJoinEvent) {
     val player = event.player