[FIX] Fix multiplatform bugs

Author: makeevrserg

build.gradle.kts

@@ -14,7 +14,6 @@ plugins {
 
     // klibs - core
     alias(libs.plugins.klibs.gradle.detekt) apply false
-    alias(libs.plugins.klibs.gradle.detekt.compose) apply false
     alias(libs.plugins.klibs.gradle.dokka.root) apply false
     alias(libs.plugins.klibs.gradle.dokka.module) apply false
     alias(libs.plugins.klibs.gradle.java.version) apply false

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.6.0
+makeevrserg.project.version.string=1.6.1
 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

@@ -14,7 +14,7 @@ gson = "2.13.2"
 guava = "33.5.0-jre"
 jda = "6.3.1"
 jda-webhook = "0.8.4"
-klibs-gradleplugin = "1.13.2"
+klibs-gradleplugin = "1.15.0"
 klibs-kdi = "1.4.8"
 klibs-kstorage = "4.5.0"
 klibs-mikro = "1.22.0"
@@ -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.33.0"
+minecraft-astralibs = "3.35.0"
 minecraft-bstats = "3.2.1"
 minecraft-bungee = "1.21-R0.5-SNAPSHOT"
 minecraft-essentialsx = "2.21.2"
@@ -40,6 +40,7 @@ minecraft-mcprotocollib = "1.21.7-SNAPSHOT"
 minecraft-mockbukkit = "4.33.2"
 minecraft-mojang-version = "1.20.1"
 minecraft-neoforgeversion = "21.1.129"
+minecraft-neoforged-bus = "8.0.2"
 minecraft-packetevents = "2.11.2"
 minecraft-papi = "2.12.2"
 minecraft-protocollib = "5.3.0"
@@ -49,7 +50,9 @@ minecraft-vault = "1.7.1"
 minecraft-velocity = "4.0.0-SNAPSHOT"
 minecraft-neoforgegradle = "7.1.20"
 minecraft-forgeversion = "47.2.20"
-minecraft-brigadier = "1.0.500"
+minecraft-brigadier = "1.3.10"
+minecraft-datafixerupper = "8.0.16"
+joml = "1.10.8"
 telegrambots = "9.4.0"
 tests-junit-bom = "6.0.3"
 tests-junit-jupiter-api = "6.0.3"
@@ -119,6 +122,7 @@ minecraft-luckperms = { module = "net.luckperms:api", version.ref = "minecraft-l
 minecraft-mcprotocollib = { module = "org.geysermc.mcprotocollib:protocol", version.ref = "minecraft-mcprotocollib" }
 minecraft-mockbukkit = { module = "com.github.MockBukkit:MockBukkit", version.ref = "minecraft-mockbukkit" }
 minecraft-neoforgeversion = { module = "net.neoforged:neoforge", version.ref = "minecraft-neoforgeversion" }
+minecraft-neoforged-bus = { module = "net.neoforged:bus", version.ref = "minecraft-neoforged-bus" }
 minecraft-packetevents = { module = "com.github.retrooper:packetevents-spigot", version.ref = "minecraft-packetevents" }
 minecraft-paper-api = { module = "io.papermc.paper:paper-api", version.ref = "minecraft-spigot" }
 minecraft-papi = { module = "me.clip:placeholderapi", version.ref = "minecraft-papi" }
@@ -129,6 +133,7 @@ minecraft-towny = { module = "com.palmergames.bukkit.towny:towny", version.ref =
 minecraft-vaultapi = { module = "com.github.MilkBowl:VaultAPI", version.ref = "minecraft-vault" }
 minecraft-velocity-api = { module = "com.velocitypowered:velocity-api", version.ref = "minecraft-velocity" }
 minecraft-brigadier = { module = "com.mojang:brigadier", version.ref = "minecraft-brigadier" }
+minecraft-datafixerupper = { module = "com.mojang:datafixerupper", version.ref = "minecraft-datafixerupper" }
 telegrambots-client = { module = "org.telegram:telegrambots-client", version.ref = "telegrambots" }
 telegrambots-extensions = { module = "org.telegram:telegrambots-extensions", version.ref = "telegrambots" }
 telegrambots-longpolling = { module = "org.telegram:telegrambots-longpolling", version.ref = "telegrambots" }
@@ -141,6 +146,7 @@ tests-mockito = { module = "org.mockito:mockito-core", version.ref = "tests-mock
 tests-org-testing = { module = "org.testng:testng", version.ref = "tests-org-testing" }
 tests-turbine = { module = "app.cash.turbine:turbine", version.ref = "tests-turbine" }
 jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh-core" }
+joml = { module = "org.joml:joml", version.ref = "joml" }
 [plugins]
 gradle-buildconfig = { id = "com.github.gmazzo.buildconfig", version.ref = "gradle-buildconfig" }
 gradle-fabric-loom = { id = "fabric-loom", version.ref = "minecraft-fabric-loom" }

instances/bukkit/build.gradle.kts

@@ -100,6 +100,11 @@ shadowJar.configure {
         exclude("META-INF/rewrite/**")
         exclude("META-INF/services/kotlin.reflect.**")
         exclude("META-INF/versions/**")
+        exclude(dependency("mysql:mysql-connector-java"))
+        exclude(dependency("com.mysql:mysql-connector-j"))
+        exclude(dependency("org.xerial:sqlite-jdbc"))
+        exclude(dependency("com.mojang:brigadier"))
+        exclude(dependency("net.kyori:.*"))
     }
     relocate("org.bstats", projectInfo.group)
     listOf(
@@ -113,7 +118,10 @@ shadowJar.configure {
         "org.intellij",
         "org.jetbrains.annotations",
         "ru.astrainteractive.klibs",
-        "ru.astrainteractive.astralibs"
+        "ru.astrainteractive.astralibs",
+        "io.github.reactivecircus",
+        "co.touchlab.stately",
+        "google.protobuf",
     ).forEach { pattern -> relocate(pattern, "${projectInfo.group}.$pattern") }
     listOf(
         "kotlinx",

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

@@ -51,9 +51,9 @@ class RootModule(plugin: LifecyclePlugin) {
             mainScope = coreModule.mainScope,
             plugin = plugin
         ),
+        multiplatformCommand = MultiplatformCommand(PaperMultiplatformCommands()),
         soulsDaoModule = soulsDaoModule,
         serviceModule = serviceModule,
-        multiplatformCommand = MultiplatformCommand(PaperMultiplatformCommands()),
         lifecyclePlugin = plugin,
     )
 

modules/command/build.gradle.kts

@@ -19,7 +19,7 @@ dependencies {
 }
 
 dependencies {
-    compileOnly("org.joml:joml:1.10.8")
-    compileOnly("com.mojang:datafixerupper:8.0.16")
-    compileOnly("com.mojang:brigadier:1.3.10")
+    compileOnly(libs.joml)
+    compileOnly(libs.minecraft.datafixerupper)
+    compileOnly(libs.minecraft.brigadier)
 }

modules/command/src/main/kotlin/ru/astrainteractive/soulkeeper/command/di/CommandModule.kt

@@ -13,10 +13,10 @@ import ru.astrainteractive.soulkeeper.module.souls.di.SoulsDaoModule
 
 class CommandModule(
     private val coreModule: CoreModule,
-    private val commandRegistrarContext: CommandRegistrarContext,
     private val soulsDaoModule: SoulsDaoModule,
     private val serviceModule: ServiceModule,
-    private val multiplatformCommand: MultiplatformCommand<*>,
+    private val commandRegistrarContext: CommandRegistrarContext,
+    private val multiplatformCommand: MultiplatformCommand,
     private val lifecyclePlugin: Lifecycle
 ) {
     val lifecycle = Lifecycle.Lambda(

modules/command/src/main/kotlin/ru/astrainteractive/soulkeeper/command/reload/SoulsReloadCommandRegistrar.kt

@@ -6,7 +6,6 @@ import ru.astrainteractive.astralibs.command.api.registrar.CommandRegistrarConte
 import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer
 import ru.astrainteractive.astralibs.kyori.unwrap
 import ru.astrainteractive.astralibs.lifecycle.Lifecycle
-import ru.astrainteractive.astralibs.server.KAudience
 import ru.astrainteractive.klibs.kstorage.api.CachedKrate
 import ru.astrainteractive.klibs.kstorage.util.getValue
 import ru.astrainteractive.soulkeeper.core.plugin.PluginPermission
@@ -15,7 +14,7 @@ import ru.astrainteractive.soulkeeper.core.plugin.PluginTranslation
 internal class SoulsReloadCommandRegistrar(
     private val lifecyclePlugin: Lifecycle,
     private val registrarContext: CommandRegistrarContext,
-    private val multiplatformCommand: MultiplatformCommand<*>,
+    private val multiplatformCommand: MultiplatformCommand,
     translationKrate: CachedKrate<PluginTranslation>,
     kyoriKrate: CachedKrate<KyoriComponentSerializer>
 ) : KyoriComponentSerializer by kyoriKrate.unwrap() {
@@ -26,10 +25,10 @@ internal class SoulsReloadCommandRegistrar(
             command("skreload") {
                 runs { ctx ->
                     ctx.requirePermission(PluginPermission.Reload)
-                    val audience = commands.getSender(ctx) as? KAudience
-                    audience?.sendMessage(translation.general.reload.component)
+                    val audience = ctx.getSender()
+                    audience.sendMessage(translation.general.reload.component)
                     lifecyclePlugin.onReload()
-                    audience?.sendMessage(translation.general.reloadComplete.component)
+                    audience.sendMessage(translation.general.reloadComplete.component)
                 }
             }
         }

modules/command/src/main/kotlin/ru/astrainteractive/soulkeeper/command/soulkrate/SoulKrateCommandRegistrar.kt

@@ -26,7 +26,7 @@ import java.util.*
 @Suppress("LongParameterList")
 internal class SoulKrateCommandRegistrar(
     private val registrarContext: CommandRegistrarContext,
-    private val multiplatformCommand: MultiplatformCommand<*>,
+    private val multiplatformCommand: MultiplatformCommand,
     private val stringFormat: StringFormat,
     private val dataFolder: File,
     private val ioScope: CoroutineScope,

modules/command/src/main/kotlin/ru/astrainteractive/soulkeeper/command/souls/SoulsCommandExecutor.kt

@@ -4,15 +4,14 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import net.kyori.adventure.text.Component
+import ru.astrainteractive.astralibs.command.api.brigadier.sender.ConsoleKCommandSender
 import ru.astrainteractive.astralibs.command.api.brigadier.sender.KCommandSender
+import ru.astrainteractive.astralibs.command.api.brigadier.sender.KPlayerKCommandSender
 import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer
 import ru.astrainteractive.astralibs.kyori.unwrap
-import ru.astrainteractive.astralibs.server.KAudience
-import ru.astrainteractive.astralibs.server.Locatable
 import ru.astrainteractive.astralibs.server.location.KLocation
 import ru.astrainteractive.astralibs.server.location.dist
 import ru.astrainteractive.astralibs.server.permission.KPermissible
-import ru.astrainteractive.astralibs.server.player.KPlayer
 import ru.astrainteractive.astralibs.server.player.OnlineKPlayer
 import ru.astrainteractive.astralibs.util.clickable
 import ru.astrainteractive.astralibs.util.isEmpty
@@ -52,27 +51,34 @@ internal class SoulsCommandExecutor(
     }
 
     private suspend fun getFilteredSouls(sender: KCommandSender): List<DatabaseSoul> {
-        return soulsDao.getSouls()
+        val souls = soulsDao.getSouls()
             .getOrNull()
             .orEmpty()
-            .filter { soul ->
-                sender.tryCast<Locatable>()
-                    ?.getLocation()
-                    ?.worldName == soul.location.worldName
-            }
-            .filter { soul ->
-                soul.isFree
-                    .or(sender.tryCast<KPermissible>()?.hasPermission(PluginPermission.ViewAllSouls) == true)
-                    .or(sender.tryCast<KPlayer>()?.uuid == soul.ownerUUID)
+        return when (sender) {
+            is KPlayerKCommandSender -> {
+                souls
+                    .filter { soul ->
+                        sender
+                            .instance
+                            .getLocation()
+                            .worldName == soul.location.worldName
+                    }
+                    .filter { soul ->
+                        soul.isFree
+                            .or(sender.instance.hasPermission(PluginPermission.ViewAllSouls))
+                            .or(sender.instance.uuid == soul.ownerUUID)
+                    }
             }
+
+            is ConsoleKCommandSender -> souls
+        }
     }
 
     private fun getPageSouls(souls: List<DatabaseSoul>, page: Int): List<DatabaseSoul> {
         val start = page.times(SoulsCommand.PAGE_SIZE).coerceIn(0, souls.size)
-        val end =
-            (page * SoulsCommand.PAGE_SIZE + SoulsCommand.PAGE_SIZE).coerceAtMost(
-                souls.size
-            )
+        val end = page.times(SoulsCommand.PAGE_SIZE)
+            .plus(SoulsCommand.PAGE_SIZE)
+            .coerceAtMost(souls.size)
         return if (start == end) {
             emptyList()
         } else if (end == 0) {
@@ -109,7 +115,7 @@ internal class SoulsCommandExecutor(
     private fun KCommandSender.canFreeSouls(soul: DatabaseSoul): Boolean {
         val sender = this
         val hasPermission = sender.tryCast<KPermissible>()?.hasPermission(PluginPermission.FreeAllSouls) == true
-        val isOwner = sender.tryCast<KPlayer>()?.uuid == soul.ownerUUID
+        val isOwner = sender.tryCast<KPlayerKCommandSender>()?.instance?.uuid == soul.ownerUUID
         if (soul.isFree) return false
         if (!hasPermission) return false
         if (!isOwner) return false
@@ -162,23 +168,25 @@ internal class SoulsCommandExecutor(
             is SoulsCommand.Intent.List -> {
                 ioScope.launch {
                     val filteredSouls = getFilteredSouls(input.sender)
+                        .also { println() }
                     val maxPages = filteredSouls.size.div(SoulsCommand.PAGE_SIZE)
                     val pageSouls = getPageSouls(filteredSouls, input.page)
                     if (pageSouls.isEmpty()) {
                         val title = translation.souls.noSoulsOnPage(input.page.plus(1)).component
-                        input.sender.tryCast<KAudience>()?.sendMessage(title)
+                        input.sender.sendMessage(title)
                         return@launch
                     }
 
-                    input.sender.tryCast<KAudience>()?.sendMessage(translation.souls.listSoulsTitle.component)
+                    input.sender.sendMessage(translation.souls.listSoulsTitle.component)
 
                     pageSouls.forEachIndexed { i, soul ->
                         val component = createListingItemComponent(
                             soul = soul,
                             page = input.page,
                             i = i,
                             location = input.sender
-                                .tryCast<Locatable>()
+                                .tryCast<KPlayerKCommandSender>()
+                                ?.instance
                                 ?.getLocation()
                         ).append(
                             addSpace = true,
@@ -193,9 +201,9 @@ internal class SoulsCommandExecutor(
                                 soul = soul
                             )
                         )
-                        input.sender.tryCast<KAudience>()?.sendMessage(component)
+                        input.sender.sendMessage(component)
                     }
-                    input.sender.tryCast<KAudience>()?.sendMessage(createPagingMessage(input, maxPages))
+                    input.sender.sendMessage(createPagingMessage(input, maxPages))
                 }
             }
 
@@ -205,22 +213,24 @@ internal class SoulsCommandExecutor(
                         .getOrNull()
                         ?.copy(isFree = true)
                     if (newSoul == null) {
-                        input.sender.tryCast<KAudience>()?.sendMessage(translation.souls.soulNotFound.component)
+                        input.sender.sendMessage(translation.souls.soulNotFound.component)
                         return@launch
                     }
                     soulsDao.updateSoul(newSoul)
                         .onSuccess {
-                            input.sender.tryCast<KAudience>()?.sendMessage(translation.souls.soulFreed.component)
+                            input.sender.sendMessage(translation.souls.soulFreed.component)
                         }
                         .onFailure {
-                            input.sender.tryCast<KAudience>()?.sendMessage(translation.souls.couldNotFreeSoul.component)
+                            input.sender.sendMessage(translation.souls.couldNotFreeSoul.component)
                         }
                 }
             }
 
             is SoulsCommand.Intent.TeleportToSoul -> {
                 ioScope.launch {
-                    val player = input.sender.tryCast<OnlineKPlayer>() ?: return@launch
+                    val player = input.sender.tryCast<KPlayerKCommandSender>()
+                        ?.instance
+                        ?: return@launch
                     val location = soulsDao.getSoul(input.soulId)
                         .getOrNull()
                         ?.location