refactor: Tidy up feature refactor

Author: 0ffz

CHANGELOG.md

@@ -12,10 +12,12 @@ try to keep MAJOR changes in sync with Minecraft updates.
 - New `idofront-services` module for interfaces implemented by this plugin using Bukkit's ServiceManager API
 - Start a changelog based on Keep a Changelog
 - `Services.register` helper function
+- New **command argument** helpers like offline player, options, etc...
 
 ### Changed
 
-- SerializableItemStack uses a new service for letting other plugins register custom item types instead of manually
+- **Feature system** has been reworked as a DSL built around Koin for dependency injection
+- **SerializableItemStack** uses a new service for letting other plugins register custom item types instead of manually
   adding support for them
 
 ## [1.0.0] - 2025-08-12

idofront-commands/src/main/kotlin/com/mineinabyss/idofront/commands/brigadier/IdoRootCommand.kt

@@ -8,6 +8,11 @@ import org.bukkit.plugin.Plugin
 class IdoRootCommand(
     initial: LiteralArgumentBuilder<CommandSourceStack>,
     name: String,
+    description: String?,
     val aliases: List<String>,
     plugin: Plugin,
-) : IdoCommand(initial, name, plugin, parentPermission = null)
+) : IdoCommand(initial, name, plugin, parentPermission = null) {
+    init {
+        this.description = description
+    }
+}

idofront-commands/src/main/kotlin/com/mineinabyss/idofront/commands/brigadier/RootIdoCommands.kt

@@ -15,11 +15,10 @@ class RootIdoCommands(
         rootCommands += IdoRootCommand(
             Commands.literal(this),
             this,
+            description,
             aliases,
             plugin,
-        ).apply {
-            this.description = description
-        }.apply(init)
+        ).apply(init)
     }
 
     /** Creates a new subcommand with aliases via a [Commands.literal] argument. */

idofront-features/build.gradle.kts

@@ -11,6 +11,7 @@ plugins {
 dependencies {
     api(libs.koin.core)
     compileOnly(libs.kotlinx.serialization.json)
+    compileOnly(libs.minecraft.mccoroutine)
     implementation(projects.idofrontUtil)
     implementation(projects.idofrontCommands)
     implementation(projects.idofrontLogging)

idofront-features/src/main/kotlin/com/mineinabyss/idofront/features/CommandHelpers.kt

@@ -1,18 +1,15 @@
 package com.mineinabyss.idofront.features
 
+import org.koin.core.Koin
 import org.koin.core.module.Module
 import org.koin.dsl.ScopeDSL
 
-data class FeatureDependencies(
-    val features: List<Feature>,
-    val plugins: List<String>,
-)
-
 data class Feature(
     val name: String,
     val dependencies: FeatureDependencies,
     val globalModule: Module.() -> Unit,
     val scopedModule: ScopeDSL.() -> Unit,
+    val onLoad: Koin.() -> Unit,
     val onEnable: FeatureCreate.() -> Unit,
     val onDisable: FeatureCreate.() -> Unit,
 )

idofront-features/src/main/kotlin/com/mineinabyss/idofront/features/Configurable.kt

@@ -1,10 +1,12 @@
 package com.mineinabyss.idofront.features
 
 import com.mineinabyss.idofront.commands.brigadier.IdoRootCommand
+import com.mineinabyss.idofront.commands.brigadier.RootIdoCommands
+import com.mineinabyss.idofront.commands.brigadier.commands
 import com.mineinabyss.idofront.commands.brigadier.context.IdoCommandContext
+import org.bukkit.plugin.Plugin
 import org.koin.core.Koin
 import org.koin.core.module.Module
-import org.koin.core.scope.Scope
 import org.koin.dsl.ScopeDSL
 
 class FeatureBuilder(
@@ -15,6 +17,7 @@ class FeatureBuilder(
     private var scopedModule: ScopeDSL.() -> Unit = {}
     private var onEnable: FeatureCreate.() -> Unit = {}
     private var onDisable: FeatureCreate.() -> Unit = {}
+    private val onLoad: MutableList<Koin.() -> Unit> = mutableListOf()
 
     class FeatureDependenciesBuilder() {
         private val features = mutableListOf<Feature>()
@@ -30,15 +33,6 @@ class FeatureBuilder(
         fun build() = FeatureDependencies(features.toList(), plugins.toList())
     }
 
-    fun build(): Feature = Feature(
-        name = name,
-        dependencies = dependencies,
-        globalModule = globalModule,
-        scopedModule = scopedModule,
-        onEnable = onEnable,
-        onDisable = onDisable,
-    )
-
     fun dependsOn(block: FeatureDependenciesBuilder.() -> Unit) {
         dependencies = FeatureDependenciesBuilder().apply(block).build()
     }
@@ -56,15 +50,25 @@ class FeatureBuilder(
 //
 //    }
 
-    fun commands(block: context(Scope) IdoRootCommand.() -> Unit) {
+    fun commands(block: context(Koin) RootIdoCommands.() -> Unit) {
+        onLoad {
+            get<Plugin>().commands {
+                block(this@onLoad, this)
+            }
+        }
+    }
 
+    fun mainCommand(block: context(Koin) IdoRootCommand.() -> Unit) {
+        onLoad {
+            get<MainCommand>().subcommand(block)
+        }
     }
 
-    fun mainCommand(block: context(Scope) IdoRootCommand.() -> Unit) {
-//        global.get<MainCommand>().root.block()
-        TODO()
+    fun onLoad(block: Koin.() -> Unit) {
+        onLoad += block
     }
 
+
     fun onEnable(block: FeatureCreate.() -> Unit) {
         onEnable = block
     }
@@ -73,13 +77,27 @@ class FeatureBuilder(
         onDisable = block
     }
 
-    context(command: IdoCommandContext, scope: Scope)
-    inline fun <reified T: Any> get(): T {
-        return scope.get<T>()
+    context(command: IdoCommandContext, koin: Koin)
+    inline fun <reified T : Any> get(): T {
+        val manager = featureManager
+        return manager.getScope(manager.getFeature(name)!!).get<T>()
     }
 
-    context(command: IdoCommandContext, scope: Scope)
-    val featureManager: FeatureManager get() {
-        return scope.get<FeatureManager>()
-    }
+    context(command: IdoCommandContext, koin: Koin)
+    val featureManager: FeatureManager
+        get() {
+            return koin.get<FeatureManager>()
+        }
+
+    fun build(): Feature = Feature(
+        name = name,
+        dependencies = dependencies,
+        globalModule = globalModule,
+        scopedModule = scopedModule,
+        onLoad = {
+            onLoad.forEach { it() }
+        },
+        onEnable = onEnable,
+        onDisable = onDisable,
+    )
 }

idofront-features/src/main/kotlin/com/mineinabyss/idofront/features/Feature.kt

@@ -1,16 +1,17 @@
 package com.mineinabyss.idofront.features
 
+import com.github.shynixn.mccoroutine.bukkit.registerSuspendingEvents
 import com.mineinabyss.idofront.commands.brigadier.IdoRootCommand
 import com.mineinabyss.idofront.plugin.listeners
 import com.mineinabyss.idofront.plugin.unregisterListeners
 import org.bukkit.event.Listener
 import org.bukkit.plugin.Plugin
+import org.koin.core.Koin
 import org.koin.core.scope.Scope
 
 @DslMarker
 annotation class FeatureDSLMarker
 
-
 @FeatureDSLMarker
 interface FeatureDSL
 
@@ -19,8 +20,15 @@ fun feature(name: String, block: FeatureBuilder.() -> Unit): Feature {
 }
 
 data class MainCommand(
-    val root: IdoRootCommand,
-)
+    val names: List<String>,
+    val description: String?,
+    val permission: String?,
+) {
+    internal val subcommands = mutableListOf<context(Koin) IdoRootCommand.() -> Unit>()
+    fun subcommand(block: context(Koin) IdoRootCommand.() -> Unit) {
+        subcommands += block
+    }
+}
 
 class FeatureCreate(val scope: Scope) : FeatureDSL {
     private val plugin = scope.get<Plugin>()
@@ -29,7 +37,9 @@ class FeatureCreate(val scope: Scope) : FeatureDSL {
 
     fun listeners(vararg listeners: Listener) {
         this.listeners += listeners
-        plugin.listeners(*listeners)
+        for (listener in listeners) {
+            plugin.server.pluginManager.registerSuspendingEvents(listener, plugin)
+        }
     }
 
     inline fun <reified T : Any> get(): T {

idofront-features/src/main/kotlin/com/mineinabyss/idofront/features/FeatureBuilder.kt

@@ -0,0 +1,6 @@
+package com.mineinabyss.idofront.features
+
+data class FeatureDependencies(
+    val features: List<Feature>,
+    val plugins: List<String>,
+)