added multiplatform commands and make commands module shared (#81)

Author: makeevrserg

gradle.properties

@@ -13,7 +13,7 @@ makeevrserg.java.ktarget=21
 # Project
 makeevrserg.project.name=SoulKeeper
 makeevrserg.project.group=ru.astrainteractive.soulkeeper
-makeevrserg.project.version.string=1.5.0
+makeevrserg.project.version.string=1.6.0
 makeevrserg.project.description=Keep your items after death
 makeevrserg.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com
 makeevrserg.project.url=https://github.com/Astra-Interactive/SoulKeeper

gradle/libs.versions.toml

@@ -26,7 +26,7 @@ kotlin-serialization = "1.10.0"
 kotlin-serialization-kaml = "0.104.0"
 kotlin-version = "2.2.0"
 ktor = "3.4.0"
-minecraft-astralibs = "3.32.0"
+minecraft-astralibs = "3.33.0"
 minecraft-bstats = "3.2.1"
 minecraft-bungee = "1.21-R0.5-SNAPSHOT"
 minecraft-essentialsx = "2.21.2"

instances/bukkit/build.gradle.kts

@@ -34,7 +34,7 @@ dependencies {
     implementation(projects.modules.dao)
     implementation(projects.modules.service)
     implementation(projects.modules.serviceBukkit)
-    implementation(projects.modules.commandBukkit)
+    implementation(projects.modules.command)
 }
 
 minecraftProcessResource {

instances/bukkit/src/main/kotlin/ru/astrainteractive/soulkeeper/di/RootModule.kt

@@ -1,6 +1,9 @@
 package ru.astrainteractive.soulkeeper.di
 
 import org.bukkit.event.HandlerList
+import ru.astrainteractive.astralibs.command.api.brigadier.command.MultiplatformCommand
+import ru.astrainteractive.astralibs.command.api.brigadier.command.PaperMultiplatformCommands
+import ru.astrainteractive.astralibs.command.api.registrar.PaperCommandRegistrarContext
 import ru.astrainteractive.astralibs.coroutines.DefaultBukkitDispatchers
 import ru.astrainteractive.astralibs.lifecycle.Lifecycle
 import ru.astrainteractive.astralibs.lifecycle.LifecyclePlugin
@@ -44,8 +47,14 @@ class RootModule(plugin: LifecyclePlugin) {
 
     private val commandModule = CommandModule(
         coreModule = coreModule,
-        bukkitCoreModule = bukkitCoreModule,
-        soulsDaoModule = soulsDaoModule
+        commandRegistrarContext = PaperCommandRegistrarContext(
+            mainScope = coreModule.mainScope,
+            plugin = plugin
+        ),
+        soulsDaoModule = soulsDaoModule,
+        serviceModule = serviceModule,
+        multiplatformCommand = MultiplatformCommand(PaperMultiplatformCommands()),
+        lifecyclePlugin = plugin,
     )
 
     private val lifecycles: List<Lifecycle>

instances/neoforge/build.gradle.kts

@@ -33,7 +33,7 @@ dependencies {
     shadow(libs.minecraft.kyori.gson)
     // Local
     shadow(projects.modules.core)
-    shadow(projects.modules.commandNeoforge)
+    shadow(projects.modules.command)
     shadow(projects.modules.dao)
     shadow(projects.modules.service)
     shadow(projects.modules.serviceNeoforge)

instances/neoforge/src/main/kotlin/ru/astrainteractive/soulkeeper/di/RootModule.kt

@@ -4,6 +4,9 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainCoroutineDispatcher
 import net.neoforged.fml.loading.FMLPaths
+import ru.astrainteractive.astralibs.command.api.brigadier.command.MultiplatformCommand
+import ru.astrainteractive.astralibs.command.brigadier.command.NeoForgeMultiplatformCommands
+import ru.astrainteractive.astralibs.command.registrar.NeoForgeCommandRegistrarContext
 import ru.astrainteractive.astralibs.coroutines.NeoForgeMainDispatcher
 import ru.astrainteractive.astralibs.lifecycle.Lifecycle
 import ru.astrainteractive.klibs.mikro.core.dispatchers.KotlinDispatchers
@@ -67,11 +70,18 @@ class RootModule(private val plugin: Lifecycle) {
             effectEmitter = forgePlatformServiceModule.effectEmitter
         )
     }
-    private val commandModule = CommandModule(
-        coreModule = coreModule,
-        soulsDaoModule = soulsDaoModule,
-        plugin = plugin,
-    )
+    private val commandModule by lazy {
+        CommandModule(
+            coreModule = coreModule,
+            soulsDaoModule = soulsDaoModule,
+            commandRegistrarContext = NeoForgeCommandRegistrarContext(
+                mainScope = coreModule.mainScope
+            ),
+            serviceModule = serviceModule,
+            multiplatformCommand = MultiplatformCommand(NeoForgeMultiplatformCommands()),
+            lifecyclePlugin = plugin,
+        )
+    }
 
     private val lifecycles: List<Lifecycle>
         get() = listOfNotNull(