refactor some stuff, fix(gradle-plugin): only run on the jvm

radstevee · radstevee · commit 954a300043d0 · 2025-03-28T16:54:45.000+01:00
diff --git a/bom/build.gradle.kts b/bom/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
+  id("axi.publishing-repo-conventions")
   `java-platform`
-  `maven-publish`
 }
 
 group = "net.radstevee.axi"
@@ -24,16 +24,4 @@ publishing {
       from(components["javaPlatform"])
     }
   }
-
-  repositories {
-    maven {
-      name = "radPublic"
-      url = uri("https://maven.radsteve.net/public")
-
-      credentials {
-        username = System.getenv("RAD_MAVEN_USER")
-        password = System.getenv("RAD_MAVEN_TOKEN")
-      }
-    }
-  }
 }
diff --git a/buildSrc/src/main/kotlin/axi.kotlin-conventions.gradle.kts b/buildSrc/src/main/kotlin/axi.kotlin-conventions.gradle.kts
@@ -8,6 +8,7 @@ plugins {
   kotlin("plugin.serialization")
   id("org.jetbrains.dokka")
   id("com.diffplug.spotless")
+  id("axi.publishing-repo-conventions")
 
   `maven-publish`
   `java-library`
@@ -81,18 +82,6 @@ publishing {
       }
     }
   }
-
-  repositories {
-    maven {
-      name = "radPublic"
-      url = uri("https://maven.radsteve.net/public")
-
-      credentials {
-        username = System.getenv("RAD_MAVEN_USER")
-        password = System.getenv("RAD_MAVEN_TOKEN")
-      }
-    }
-  }
 }
 
 java {
diff --git a/buildSrc/src/main/kotlin/axi.publishing-repo-conventions.gradle.kts b/buildSrc/src/main/kotlin/axi.publishing-repo-conventions.gradle.kts
@@ -0,0 +1,17 @@
+plugins {
+  `maven-publish`
+}
+
+publishing {
+  repositories {
+    maven {
+      name = "radPublic"
+      url = uri("https://maven.radsteve.net/public")
+
+      credentials {
+        username = System.getenv("RAD_MAVEN_USER")
+        password = System.getenv("RAD_MAVEN_TOKEN")
+      }
+    }
+  }
+}
diff --git a/core/src/main/kotlin/net/radstevee/axi/command/CommandArguments.kt b/core/src/main/kotlin/net/radstevee/axi/command/CommandArguments.kt
@@ -3,7 +3,7 @@
 package net.radstevee.axi.command
 
 import kotlinx.coroutines.InternalCoroutinesApi
-import kotlinx.coroutines.internal.intellij.IntellijCoroutines
+import net.radstevee.axi.command.internal.CloudCommandExecutionContext
 import org.incendo.cloud.paper.util.sender.Source
 import org.incendo.cloud.parser.ParserDescriptor
 import kotlin.reflect.KProperty
diff --git a/core/src/main/kotlin/net/radstevee/axi/command/CommandBuilder.kt b/core/src/main/kotlin/net/radstevee/axi/command/CommandBuilder.kt
@@ -1,5 +1,6 @@
 package net.radstevee.axi.command
 
+import net.radstevee.axi.command.internal.CommandImpl
 import net.radstevee.axi.plugin.AxiPlugin
 import org.bukkit.entity.Player
 import org.incendo.cloud.paper.util.sender.Source
@@ -51,6 +52,12 @@ public class CommandBuilder(
     return arg
   }
 
+  /** Adds the given [arg] to this command. */
+  public fun <T : Any> arg(arg: CommandArgument<T>): CommandArgument<T> {
+    args.add(arg)
+    return arg
+  }
+
   /** Sets the executor of this command. */
   public fun executor(block: suspend CommandExecutionContext.() -> Unit) {
     executor = block
@@ -94,4 +101,4 @@ public class CommandBuilder(
 
 @DslMarker
 @Target(AnnotationTarget.TYPE, AnnotationTarget.CLASS)
-public annotation class CommandBuilderDsl
+internal annotation class CommandBuilderDsl
diff --git a/core/src/main/kotlin/net/radstevee/axi/command/CommandRegistration.kt b/core/src/main/kotlin/net/radstevee/axi/command/CommandRegistration.kt
@@ -1,6 +1,7 @@
 package net.radstevee.axi.command
 
 import kotlinx.coroutines.coroutineScope
+import net.radstevee.axi.command.internal.CloudCommandExecutionContext
 import net.radstevee.axi.coroutines.AxiCoroutines.asyncContext
 import net.radstevee.axi.coroutines.AxiCoroutines.coroutineScope
 import net.radstevee.axi.coroutines.AxiCoroutines.syncContext
@@ -43,13 +44,13 @@ public fun Command.register(manager: CommandManager = AxiPluginHolder.plugin().c
     suspendingHandler(scope = coroutineScope, context = coroutineContext) { ctx ->
       coroutineScope {
         val executionContext = CloudCommandExecutionContext(ctx, coroutineContext, this)
-        CloudCommandExecutionContext.Holder.set(executionContext)
+        CloudCommandExecutionContext.Companion.Holder.set(executionContext)
         try {
           with(command) {
             executionContext.execute()
           }
         } finally {
-          CloudCommandExecutionContext.Holder.remove()
+          CloudCommandExecutionContext.Companion.Holder.remove()
         }
       }
     }
diff --git a/core/src/main/kotlin/net/radstevee/axi/command/internal/CloudCommandExecutionContext.kt b/core/src/main/kotlin/net/radstevee/axi/command/internal/CloudCommandExecutionContext.kt
@@ -1,6 +1,8 @@
-package net.radstevee.axi.command
+package net.radstevee.axi.command.internal
 
 import kotlinx.coroutines.CoroutineScope
+import net.radstevee.axi.command.CommandExecutionContext
+import net.radstevee.axi.command.player
 import org.bukkit.entity.Player
 import org.incendo.cloud.context.CommandContext
 import org.incendo.cloud.paper.util.sender.Source
diff --git a/core/src/main/kotlin/net/radstevee/axi/command/internal/CommandImpl.kt b/core/src/main/kotlin/net/radstevee/axi/command/internal/CommandImpl.kt
@@ -1,6 +1,10 @@
-package net.radstevee.axi.command
+package net.radstevee.axi.command.internal
 
-/** A basic implementation of a [Command]. */
+import net.radstevee.axi.command.Command
+import net.radstevee.axi.command.CommandArgument
+import net.radstevee.axi.command.CommandExecutionContext
+
+/** A basic implementation of a [net.radstevee.axi.command.Command]. */
 public class CommandImpl(
   override val name: String,
   override val aliases: Set<String>,
diff --git a/core/src/main/kotlin/net/radstevee/axi/ecs/ECS.kt b/core/src/main/kotlin/net/radstevee/axi/ecs/ECS.kt
@@ -29,6 +29,9 @@ public interface ECS : KoinComponent {
   /** Gets all entities in the ECS. */
   public fun entities(): Set<Attachable>
 
+  /** Retrieves the id of the given [componentKlass], or assigns one. */
+  public fun id(componentKlass: KClass<out Any>): Int
+
   /** The ECS implementation. */
   public companion object : ECS by AxiPluginHolder.plugin().get()
 }
diff --git a/core/src/main/kotlin/net/radstevee/axi/ecs/Ext.kt b/core/src/main/kotlin/net/radstevee/axi/ecs/Ext.kt
@@ -1,8 +1,12 @@
+@file:JvmName("ECSExtensions")
+@file:JvmMultifileClass
+
 package net.radstevee.axi.ecs
 
 import net.radstevee.axi.ecs.component.DebounceComponent
 import net.radstevee.axi.ecs.component.EntityClickedComponent
 import net.radstevee.axi.ecs.component.identity
+import net.radstevee.axi.ecs.internal.PlayerTracker
 import org.bukkit.Bukkit
 import org.bukkit.entity.Player
 import kotlin.properties.ReadWriteProperty
diff --git a/core/src/main/kotlin/net/radstevee/axi/ecs/component/DebounceComponent.kt b/core/src/main/kotlin/net/radstevee/axi/ecs/component/DebounceComponent.kt
@@ -7,7 +7,7 @@ import org.bukkit.Bukkit
 import kotlin.reflect.KClass
 import kotlin.time.Duration
 
-/** Holds debounce information for players. */
+/** Holds debounce information for attachables. */
 public data class DebounceComponent(
   /** The debounce entries. */
   public val entries: MutableMap<KClass<out Any>, DebounceEntry> = mutableMapOf(),
diff --git a/core/src/main/kotlin/net/radstevee/axi/ecs/component/EntityClickedComponent.kt b/core/src/main/kotlin/net/radstevee/axi/ecs/component/EntityClickedComponent.kt
@@ -59,7 +59,7 @@ public data class EntityClickedComponent(
   }
 
   /** Sets [block] as the [filter]. */
-  public fun filtering(block: suspend (ClickContext) -> Boolean) {
+  public fun withFilter(block: suspend (ClickContext) -> Boolean) {
     filter = block
   }
 }
diff --git a/core/src/main/kotlin/net/radstevee/axi/ecs/component/IdentityComponent.kt b/core/src/main/kotlin/net/radstevee/axi/ecs/component/IdentityComponent.kt
@@ -7,7 +7,7 @@ import java.util.UUID
 /** Represents the identity of something, as UUID. */
 public data class IdentityComponent(
   /** The identity. */
-  public val identity: UUID
+  public val identity: UUID,
 )
 
 /** The identity of this attachable. */
diff --git a/core/src/main/kotlin/net/radstevee/axi/ecs/component/WrappedComponent.kt b/core/src/main/kotlin/net/radstevee/axi/ecs/component/WrappedComponent.kt
@@ -1,4 +1,4 @@
-package net.radstevee.axi.ecs
+package net.radstevee.axi.ecs.component
 
 import kotlin.reflect.KClass
 
diff --git a/core/src/main/kotlin/net/radstevee/axi/ecs/internal/ECSConnectionListener.kt b/core/src/main/kotlin/net/radstevee/axi/ecs/internal/ECSConnectionListener.kt
@@ -1,5 +1,7 @@
-package net.radstevee.axi.ecs
+package net.radstevee.axi.ecs.internal
 
+import net.radstevee.axi.ecs.ECS
+import net.radstevee.axi.ecs.attachable
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
 import org.bukkit.event.player.PlayerQuitEvent
@@ -9,7 +11,7 @@ internal object ECSConnectionListener : Listener {
   private fun on(event: PlayerQuitEvent) {
     val player = event.player
 
-    ECS.remove(player.attachable)
+    ECS.Companion.remove(player.attachable)
     PlayerTracker.unset(player.uniqueId)
   }
 }
diff --git a/core/src/main/kotlin/net/radstevee/axi/ecs/internal/ECSImpl.kt b/core/src/main/kotlin/net/radstevee/axi/ecs/internal/ECSImpl.kt
@@ -2,13 +2,16 @@ package net.radstevee.axi.ecs.internal
 
 import net.radstevee.axi.ecs.Attachable
 import net.radstevee.axi.ecs.ECS
-import net.radstevee.axi.ecs.WrappedComponent
+import net.radstevee.axi.ecs.component.WrappedComponent
 import kotlin.reflect.KClass
 
 @Suppress("UNCHECKED_CAST")
 @PublishedApi
 internal class ECSImpl : ECS {
   internal val data: MutableMap<Attachable, MutableSet<WrappedComponent<*>>> = mutableMapOf()
+  private val ids: MutableMap<KClass<out Any>, Int> = mutableMapOf()
+
+  private fun assignId(): Int = ids.size
 
   override fun remove(attachable: Attachable) {
     data.remove(attachable)
@@ -40,4 +43,8 @@ internal class ECSImpl : ECS {
   override fun entities(): Set<Attachable> {
     return data.keys
   }
+
+  override fun id(componentKlass: KClass<out Any>): Int {
+    return ids.getOrPut(componentKlass) { assignId() }
+  }
 }
diff --git a/core/src/main/kotlin/net/radstevee/axi/ecs/internal/PlayerTracker.kt b/core/src/main/kotlin/net/radstevee/axi/ecs/internal/PlayerTracker.kt
@@ -1,6 +1,8 @@
-package net.radstevee.axi.ecs
+package net.radstevee.axi.ecs.internal
 
+import net.radstevee.axi.ecs.WrappedAttachable
 import net.radstevee.axi.ecs.component.IdentityComponent
+import net.radstevee.axi.ecs.set
 import java.util.UUID
 
 /** Tracks an online player's attachable. */
diff --git a/core/src/main/kotlin/net/radstevee/axi/ecs/internal/SystemsComponent.kt b/core/src/main/kotlin/net/radstevee/axi/ecs/internal/SystemsComponent.kt
@@ -3,5 +3,5 @@ package net.radstevee.axi.ecs.internal
 import net.radstevee.axi.ecs.system.System
 
 internal data class SystemsComponent(
-  val systems: MutableList<System> = mutableListOf()
+  val systems: MutableList<System> = mutableListOf(),
 )
diff --git a/core/src/main/kotlin/net/radstevee/axi/ecs/system/System.kt b/core/src/main/kotlin/net/radstevee/axi/ecs/system/System.kt
@@ -8,19 +8,24 @@ import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import kotlin.reflect.KClass
 
+/** An ECS system. */
 public interface System : KoinComponent {
+  /** The archetypes this system filters entities for. */
   public val archetypes: Sequence<KClass<out Any>>
     get() = emptySequence()
 
+  /** Adds this system to the tick loop. */
   public fun start() {
     val plugin by inject<AxiPlugin>()
     plugin.getOrPut(::SystemsComponent).systems.add(this)
   }
 
+  /** Removes this system from the tick loop. */
   public fun stop() {
     val plugin by inject<AxiPlugin>()
     plugin.getOrPut(::SystemsComponent).systems.remove(this)
   }
 
+  /** Ticks this system for an attachable matching the [archetypes]. */
   public suspend fun tick(tick: Int, attachable: Attachable) {}
 }
diff --git a/core/src/main/kotlin/net/radstevee/axi/mod/AxiModuleLoader.kt b/core/src/main/kotlin/net/radstevee/axi/mod/AxiModuleLoader.kt
@@ -6,7 +6,9 @@ import java.util.ServiceLoader
 
 /** Loads axi modules. */
 public object AxiModuleLoader {
-  private fun collectServices(plugin: AxiPlugin): Set<AxiModule> = ServiceLoader.load(AxiModule::class.java, plugin.javaClass.classLoader).toSet()
+  internal fun collectServices(plugin: AxiPlugin): Set<AxiModule> {
+    return ServiceLoader.load(AxiModule::class.java, plugin.javaClass.classLoader).toSet()
+  }
 
   /** Sets up the koin module for all axi modules. */
   public suspend fun Module.module(plugin: AxiPlugin) {
diff --git a/core/src/main/kotlin/net/radstevee/axi/plugin/AxiInitializer.kt b/core/src/main/kotlin/net/radstevee/axi/plugin/AxiInitializer.kt
@@ -3,9 +3,9 @@ package net.radstevee.axi.plugin
 import kotlinx.coroutines.runBlocking
 import net.radstevee.axi.command.CommandManager
 import net.radstevee.axi.coroutines.registerEventListeners
-import net.radstevee.axi.ecs.ECSConnectionListener
 import net.radstevee.axi.ecs.ECS
 import net.radstevee.axi.ecs.component.EntityClickedComponent
+import net.radstevee.axi.ecs.internal.ECSConnectionListener
 import net.radstevee.axi.ecs.internal.ECSImpl
 import net.radstevee.axi.ecs.internal.SystemTicker
 import net.radstevee.axi.mod.AxiModuleLoader
@@ -24,15 +24,9 @@ internal object AxiInitializer {
       single<AxiPlugin> { plugin }
       singleOf(::ECSImpl) { bind<ECS>() }
 
-      with(plugin) {
-        // We're still in the initializer so this is fine.
-        runBlocking {
-          with(AxiModuleLoader) {
-            module(plugin)
-          }
-
-          module()
-        }
+      runBlocking {
+        with(plugin) { module() }
+        with(AxiModuleLoader) { module(plugin) }
       }
     }
 
@@ -47,6 +41,6 @@ internal object AxiInitializer {
     plugin.registerEventListeners(EntityClickedComponent.Handler)
     plugin.registerEventListeners(SystemTicker)
 
-    plugin.server.pluginManager.callEvent(AxiInitializeEvent(plugin))
+    plugin.server.pluginManager.callEvent(AxiInitializeEvent(plugin, AxiModuleLoader.collectServices(plugin)))
   }
 }
diff --git a/core/src/main/kotlin/net/radstevee/axi/plugin/event/AxiInitializeEvent.kt b/core/src/main/kotlin/net/radstevee/axi/plugin/event/AxiInitializeEvent.kt
@@ -1,5 +1,6 @@
 package net.radstevee.axi.plugin.event
 
+import net.radstevee.axi.mod.AxiModule
 import net.radstevee.axi.plugin.AxiPlugin
 import org.bukkit.event.Event
 import org.bukkit.event.HandlerList
@@ -8,6 +9,8 @@ import org.bukkit.event.HandlerList
 public class AxiInitializeEvent(
   /** The plugin. */
   public val plugin: AxiPlugin,
+  /** The modules that were loaded. */
+  public val loadedModules: Set<AxiModule>,
 ) : Event() {
   override fun getHandlers(): HandlerList = HANDLER_LIST
 
diff --git a/example/build.gradle.kts b/example/build.gradle.kts
@@ -1,14 +1,19 @@
 plugins {
   id("net.radstevee.axi")
   id("xyz.jpenilla.run-paper") version "2.3.1"
+  id("com.gradleup.shadow") version "9.0.0-beta6"
   kotlin("jvm")
 }
 
 group = "net.radstevee.axi.example"
 version = "0.0.0"
 
 dependencies {
-  axi.modules("core", "ui")
+  // We're not using the axi plugin here because
+  // we need this to be local so I don't have to spam
+  // my maven repository
+  implementation(project(":axi-core"))
+  implementation(project(":axi-ui"))
 }
 
 kotlin {
diff --git a/example/src/main/kotlin/net/radstevee/axi/example/Commands.kt b/example/src/main/kotlin/net/radstevee/axi/example/Commands.kt
@@ -25,7 +25,7 @@ private val TestTwoCommand = Command("two") {
 }
 
 @AutoRegistered
-val TestCommand: Command = Command("test") {
+public val TestCommand: Command = Command("test") {
   executor {
     ctx.sendMessage(text("Hi!!!"))
   }
@@ -42,7 +42,7 @@ val TestCommand: Command = Command("test") {
 }
 
 @AutoRegistered
-val OtherTestCommand: Command = Command("other_test") {
+public val OtherTestCommand: Command = Command("other_test") {
   val name by arg("name", stringParser())
 
   executor {
diff --git a/example/src/main/kotlin/net/radstevee/axi/example/ConnectionListener.kt b/example/src/main/kotlin/net/radstevee/axi/example/ConnectionListener.kt
diff --git a/gradle-plugin/src/main/kotlin/net/radstevee/axi/gradle/AxiSubplugin.kt b/gradle-plugin/src/main/kotlin/net/radstevee/axi/gradle/AxiSubplugin.kt

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
	`2`	`+ id("axi.publishing-repo-conventions")`
`2`	`3`	`java-platform`
`3`		- `maven-publish`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`group = "net.radstevee.axi"`
`@@ -24,16 +24,4 @@ publishing {`
`24`	`24`	`from(components["javaPlatform"])`
`25`	`25`	`}`
`26`	`26`	`}`
`27`		`-`
`28`		`- repositories {`
`29`		`- maven {`
`30`		`- name = "radPublic"`
`31`		`- url = uri("https://maven.radsteve.net/public")`
`32`		`-`
`33`		`- credentials {`
`34`		`- username = System.getenv("RAD_MAVEN_USER")`
`35`		`- password = System.getenv("RAD_MAVEN_TOKEN")`
`36`		`- }`
`37`		`- }`
`38`		`- }`
`39`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ plugins {`
`8`	`8`	`kotlin("plugin.serialization")`
`9`	`9`	`id("org.jetbrains.dokka")`
`10`	`10`	`id("com.diffplug.spotless")`
	`11`	`+ id("axi.publishing-repo-conventions")`
`11`	`12`
`12`	`13`	`maven-publish`
`13`	`14`	`java-library`
`@@ -81,18 +82,6 @@ publishing {`
`81`	`82`	`}`
`82`	`83`	`}`
`83`	`84`	`}`
`84`		`-`
`85`		`- repositories {`
`86`		`- maven {`
`87`		`- name = "radPublic"`
`88`		`- url = uri("https://maven.radsteve.net/public")`
`89`		`-`
`90`		`- credentials {`
`91`		`- username = System.getenv("RAD_MAVEN_USER")`
`92`		`- password = System.getenv("RAD_MAVEN_TOKEN")`
`93`		`- }`
`94`		`- }`
`95`		`- }`
`96`	`85`	`}`
`97`	`86`
`98`	`87`	`java {`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package net.radstevee.axi.command`
`2`	`2`
`3`	`3`	`import kotlinx.coroutines.coroutineScope`
	`4`	`+import net.radstevee.axi.command.internal.CloudCommandExecutionContext`
`4`	`5`	`import net.radstevee.axi.coroutines.AxiCoroutines.asyncContext`
`5`	`6`	`import net.radstevee.axi.coroutines.AxiCoroutines.coroutineScope`
`6`	`7`	`import net.radstevee.axi.coroutines.AxiCoroutines.syncContext`
`@@ -43,13 +44,13 @@ public fun Command.register(manager: CommandManager = AxiPluginHolder.plugin().c`
`43`	`44`	`suspendingHandler(scope = coroutineScope, context = coroutineContext) { ctx ->`
`44`	`45`	`coroutineScope {`
`45`	`46`	`val executionContext = CloudCommandExecutionContext(ctx, coroutineContext, this)`
`46`		`- CloudCommandExecutionContext.Holder.set(executionContext)`
	`47`	`+ CloudCommandExecutionContext.Companion.Holder.set(executionContext)`
`47`	`48`	`try {`
`48`	`49`	`with(command) {`
`49`	`50`	`executionContext.execute()`
`50`	`51`	`}`
`51`	`52`	`} finally {`
`52`		`- CloudCommandExecutionContext.Holder.remove()`
	`53`	`+ CloudCommandExecutionContext.Companion.Holder.remove()`
`53`	`54`	`}`
`54`	`55`	`}`
`55`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,9 @@ public interface ECS : KoinComponent {`
`29`	`29`	`/** Gets all entities in the ECS. */`
`30`	`30`	`public fun entities(): Set<Attachable>`
`31`	`31`
	`32`	`+ /** Retrieves the id of the given [componentKlass], or assigns one. */`
	`33`	`+ public fun id(componentKlass: KClass<out Any>): Int`
	`34`	`+`
`32`	`35`	`/** The ECS implementation. */`
`33`	`36`	`public companion object : ECS by AxiPluginHolder.plugin().get()`
`34`	`37`	`}`