Merge pull request #78 from Astra-Interactive/fix/fixes

## Changes
- Add database migration
- Add files migrations for krates
- Up dependencies
- Fix shadow dependencies
- Add logging for player death

Author: makeevrserg

.gitignore

@@ -1,25 +1,8 @@
-# root
+**/build
+**/runs
+.DS_Store
 .gradle
 .idea
 .kotlin
-astra.properties
 local.properties
-build
-jars
-# build-logic
-build-logic/.gradle
-build-logic/plugins/convention/build
-# fabric
-fabric/build
-# forge
-forge/build
-# modules
-modules/api-local/build
-modules/api-remote/build
-modules/dto/build
-# plugin
-plugin/build
-# velocity
-velocity/build
-**/junit_jvm_args.txt
-**/junit_test_args.txt
+*.jar

gradle/libs.versions.toml

@@ -1,59 +1,62 @@
 [versions]
 cache4k = "0.14.0"
-discordsrv = "1.30.3"
+discordsrv = "1.30.4"
 driver-h2 = "2.4.240"
-driver-jdbc = "3.51.1.0"
-driver-mariadb = "3.5.6"
+driver-jdbc = "3.51.2.0"
+driver-mariadb = "3.5.7"
 driver-mysql = "8.0.33"
 exposed = "0.61.0"
 forgegradle = "[6.0,6.2)"
-gradle-buildconfig = "6.0.6"
-gradle-ftp = "0.1.2"
-gradle-shadow = "9.3.0"
+gradle-buildconfig = "6.0.7"
+gradle-ftp = "0.1.3"
+gradle-shadow = "9.2.2"
 gson = "2.13.2"
 guava = "33.5.0-jre"
-jda = "6.1.3"
+jda = "6.3.1"
 jda-webhook = "0.8.4"
 klibs-gradleplugin = "1.13.2"
 klibs-kdi = "1.4.8"
-klibs-kstorage = "4.4.1"
-klibs-mikro = "1.16.1"
-kotlin-benchmark = "0.4.15"
+klibs-kstorage = "4.5.0"
+klibs-mikro = "1.20.0"
+kotlin-benchmark = "0.4.16"
 kotlin-coroutines = "1.10.2"
 kotlin-datetime = "0.7.1-0.6.x-compat"
-kotlin-json = "1.9.0"
-kotlin-serialization = "1.9.0"
+kotlin-json = "1.10.0"
+kotlin-serialization = "1.10.0"
 kotlin-serialization-kaml = "0.104.0"
 kotlin-version = "2.2.0"
-ktor = "3.3.3"
+ktor = "3.4.0"
 minecraft-astralibs = "3.31.2"
-minecraft-bstats = "3.1.0"
+minecraft-bstats = "3.2.1"
 minecraft-bungee = "1.21-R0.5-SNAPSHOT"
 minecraft-essentialsx = "2.21.2"
 minecraft-fabric-api = "0.139.5+"
 minecraft-fabric-kotlin = "1.13.7+"
 minecraft-fabric-loader = "0.18.2"
 minecraft-fabric-loom = "1.14.6"
-minecraft-kyori = "4.25.0"
+minecraft-kyori = "4.26.1"
 minecraft-luckperms = "5.5"
 minecraft-mcprotocollib = "1.21.7-SNAPSHOT"
 minecraft-mockbukkit = "4.33.2"
-minecraft-mojang-version = "1.21.1"
+minecraft-mojang-version = "1.20.1"
 minecraft-neoforgeversion = "21.1.129"
-minecraft-packetevents = "2.11.0"
-minecraft-papi = "2.11.7"
+minecraft-packetevents = "2.11.2"
+minecraft-papi = "2.12.2"
 minecraft-protocollib = "5.3.0"
 minecraft-spigot = "1.21.9-R0.1-SNAPSHOT"
 minecraft-towny = "0.102.0.0"
 minecraft-vault = "1.7.1"
 minecraft-velocity = "4.0.0-SNAPSHOT"
-minecraft-neoforgegradle = "7.1.11"
-telegrambots = "9.2.0"
-tests-junit-bom = "6.0.1"
-tests-junit-jupiter-api = "6.0.1"
-tests-mockito = "5.21.0"
-tests-org-testing = "7.11.0"
+minecraft-neoforgegradle = "7.1.20"
+minecraft-forgeversion = "47.2.20"
+minecraft-brigadier = "1.0.500"
+telegrambots = "9.4.0"
+tests-junit-bom = "6.0.3"
+tests-junit-jupiter-api = "6.0.3"
+tests-mockito = "5.22.0"
+tests-org-testing = "7.12.0"
 tests-turbine = "1.2.1"
+jmh-core = "1.37"
 
 [libraries]
 cache4k = { module = "io.github.reactivecircus.cache4k:cache4k-jvm", version.ref = "cache4k" }
@@ -66,7 +69,6 @@ exposed-core = { module = "org.jetbrains.exposed:exposed-core", version.ref = "e
 exposed-dao = { module = "org.jetbrains.exposed:exposed-dao", version.ref = "exposed" }
 exposed-java-time = { module = "org.jetbrains.exposed:exposed-java-time", version.ref = "exposed" }
 exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "exposed" }
-gradle-shadow = { module = "gradle.plugin.com.github.johnrengelman:shadow", version.ref = "gradle-shadow" }
 gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 guava = { module = "com.google.guava:guava", version.ref = "guava" }
 jda = { module = "net.dv8tion:JDA", version.ref = "jda" }
@@ -126,6 +128,7 @@ minecraft-spigot-core = { module = "org.spigotmc:spigot", version.ref = "minecra
 minecraft-towny = { module = "com.palmergames.bukkit.towny:towny", version.ref = "minecraft-towny" }
 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" }
 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" }
@@ -137,7 +140,7 @@ tests-kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test" }
 tests-mockito = { module = "org.mockito:mockito-core", version.ref = "tests-mockito" }
 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" }
 [plugins]
 gradle-buildconfig = { id = "com.github.gmazzo.buildconfig", version.ref = "gradle-buildconfig" }
 gradle-fabric-loom = { id = "fabric-loom", version.ref = "minecraft-fabric-loom" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

instances/bukkit/build.gradle.kts

@@ -62,6 +62,45 @@ shadowJar.configure {
         .takeIf(File::exists)
         ?: File(rootDir, "jars").also(File::mkdirs)
 
+    dependencies {
+        // Dependencies
+        exclude("mozilla/**")
+        exclude("javax/**")
+        exclude("it/unimi/dsi/**")
+        exclude("ch/qos/logback/**")
+        exclude("org/intellij/lang/annotations/**")
+        exclude("org/jetbrains/annotations/**")
+        exclude("org/slf4j/**")
+        exclude("org/apache/xmlgraphics/**")
+        exclude("org/apache/batik/**")
+        exclude("org/apache/commons/logging/**")
+        exclude("com/ibm/icu/**")
+        // Root
+        exclude("_COROUTINE/**")
+        exclude("DebugProbesKt.bin")
+        exclude("jetty-dir.css")
+        exclude("license/**")
+        exclude("licenses/**")
+        exclude("**LICENCE**")
+        exclude("**LICENSE**")
+        // META
+        exclude("META-INF/**.md")
+        exclude("META-INF/**.MD")
+        exclude("META-INF/**.txt**")
+        exclude("META-INF/**LICENCE**")
+        exclude("META-INF/com.android.tools/**")
+        exclude("META-INF/gradle-plugins/**")
+        exclude("META-INF/imports/**")
+        exclude("META-INF/kotlin-reflection.kotlin_module")
+        exclude("META-INF/license/**")
+        exclude("META-INF/maven/**")
+        exclude("META-INF/native-image/**")
+        exclude("META-INF/native/**")
+        exclude("META-INF/proguard/**")
+        exclude("META-INF/rewrite/**")
+        exclude("META-INF/services/kotlin.reflect.**")
+        exclude("META-INF/versions/**")
+    }
     relocate("org.bstats", projectInfo.group)
     listOf(
         "ch.qos.logback",
@@ -72,13 +111,11 @@ shadowJar.configure {
         "okio",
         "org.apache",
         "org.intellij",
-        "org.slf4j",
         "org.jetbrains.annotations",
         "ru.astrainteractive.klibs",
         "ru.astrainteractive.astralibs"
     ).forEach { pattern -> relocate(pattern, "${projectInfo.group}.$pattern") }
     listOf(
-        "org.jetbrains.exposed",
         "kotlinx",
     ).forEach { pattern ->
         relocate(pattern, "${projectInfo.group}.$pattern") {

instances/neoforge/build.gradle.kts

@@ -11,6 +11,10 @@ plugins {
     alias(libs.plugins.gradle.shadow)
 }
 
+repositories {
+    mavenLocal()
+}
+
 dependencies {
     // Kotlin
     shadow(libs.kotlin.coroutines.core)

modules/command-bukkit/build.gradle.kts

@@ -12,7 +12,7 @@ dependencies {
     implementation(libs.minecraft.astralibs.command)
     implementation(libs.minecraft.astralibs.command.bukkit)
 
-    implementation(libs.minecraft.paper.api)
+    compileOnly(libs.minecraft.paper.api)
 
     implementation(libs.klibs.mikro.core)
     implementation(projects.modules.core)

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

@@ -19,7 +19,6 @@ import ru.astrainteractive.klibs.mikro.core.logging.JUtiltLogger
 import ru.astrainteractive.klibs.mikro.core.logging.Logger
 import ru.astrainteractive.soulkeeper.core.plugin.PluginPermission
 import ru.astrainteractive.soulkeeper.core.serialization.ItemStackSerializer
-import ru.astrainteractive.soulkeeper.core.serialization.ItemStackSerializer.decodeFromString
 import ru.astrainteractive.soulkeeper.module.souls.database.model.StringFormatObject
 import ru.astrainteractive.soulkeeper.module.souls.krate.PlayerSoulKrate
 import java.io.File

modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/dao/SoulsDaoImpl.kt

@@ -1,6 +1,5 @@
 package ru.astrainteractive.soulkeeper.module.souls.dao
 
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
@@ -21,6 +20,7 @@ import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.update
 import ru.astrainteractive.astralibs.server.location.Location
 import ru.astrainteractive.astralibs.server.location.dist
+import ru.astrainteractive.klibs.mikro.core.dispatchers.KotlinDispatchers
 import ru.astrainteractive.klibs.mikro.core.logging.JUtiltLogger
 import ru.astrainteractive.klibs.mikro.core.logging.Logger
 import ru.astrainteractive.soulkeeper.module.souls.database.model.DatabaseSoul
@@ -33,18 +33,19 @@ import java.util.*
 @Suppress("TooManyFunctions")
 internal class SoulsDaoImpl(
     private val databaseFlow: Flow<Database>,
+    private val dispatchers: KotlinDispatchers
 ) : SoulsDao, Logger by JUtiltLogger("SoulKeeper-SoulsDaoImpl") {
     private val mutex = Mutex()
     private suspend fun <T> safeRun(
         tag: String,
         block: suspend () -> T
     ): Result<T> = runCatching {
-        withContext(Dispatchers.IO) {
+        withContext(dispatchers.IO) {
             mutex.withLock {
                 block.invoke()
             }
         }
-    }.onFailure { error { "#$tag error: ${it.message}. ${it.cause}" } }
+    }.onFailure { t -> error { "#$tag error: ${t.message}. ${t.cause}" } }
 
     private val soulsChangedSharedFlow = MutableSharedFlow<Unit>()
 
@@ -57,7 +58,7 @@ internal class SoulsDaoImpl(
             id = it[SoulTable.id].value,
             ownerUUID = UUID.fromString(it[SoulTable.ownerUUID]),
             ownerLastName = it[SoulTable.ownerLastName],
-            createdAt = it[SoulTable.created_at] ?: it[SoulTable.broken_created_at],
+            createdAt = it[SoulTable.created_at],
             isFree = it[SoulTable.isFree],
             exp = it[SoulTable.exp],
             hasItems = true, // todo
@@ -73,7 +74,6 @@ internal class SoulsDaoImpl(
     override suspend fun getSouls(): Result<List<DatabaseSoul>> = safeRun("getSouls") {
         transaction(databaseFlow.first()) {
             SoulTable.selectAll()
-                .orderBy(SoulTable.broken_created_at to SortOrder.DESC)
                 .orderBy(SoulTable.created_at to SortOrder.DESC)
                 .map(::toDatabaseSoul)
         }
@@ -84,7 +84,6 @@ internal class SoulsDaoImpl(
             SoulTable
                 .selectAll()
                 .limit(1)
-                .orderBy(SoulTable.broken_created_at to SortOrder.DESC)
                 .orderBy(SoulTable.created_at to SortOrder.DESC)
                 .map(::toDatabaseSoul)
                 .first()
@@ -108,7 +107,6 @@ internal class SoulsDaoImpl(
             val soulId = SoulTable.insertAndGetId {
                 it[SoulTable.ownerUUID] = soul.ownerUUID.toString()
                 it[SoulTable.ownerLastName] = soul.ownerLastName
-                it[SoulTable.broken_created_at] = soul.createdAt
                 it[SoulTable.created_at] = soul.createdAt
                 it[SoulTable.isFree] = soul.isFree
                 it[SoulTable.locationWorld] = soul.location.worldName

modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/database/table/SoulTable.kt

@@ -1,17 +1,13 @@
 package ru.astrainteractive.soulkeeper.module.souls.database.table
 
 import org.jetbrains.exposed.dao.id.LongIdTable
-import org.jetbrains.exposed.sql.javatime.timestamp
 import ru.astrainteractive.soulkeeper.module.souls.database.coulmn.KJavaInstantColumnType
 
 internal object SoulTable : LongIdTable(name = "SOUL") {
     val ownerUUID = text("owner_uuid")
     val ownerLastName = text("owner_last_name")
 
-    @Deprecated("Timestamp is broken")
-    val broken_created_at = timestamp("created_at")
-
-    val created_at = registerColumn("created_at_millis", KJavaInstantColumnType()).nullable()
+    val created_at = registerColumn("created_at_millis", KJavaInstantColumnType())
 
     val isFree = bool("is_free")
     val exp = integer("exp")

modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/di/SoulsDaoModule.kt

@@ -24,7 +24,12 @@ import ru.astrainteractive.soulkeeper.module.souls.dao.SoulsDao
 import ru.astrainteractive.soulkeeper.module.souls.dao.SoulsDaoImpl
 import ru.astrainteractive.soulkeeper.module.souls.database.table.SoulItemsTable
 import ru.astrainteractive.soulkeeper.module.souls.database.table.SoulTable
-import ru.astrainteractive.soulkeeper.module.souls.migration.H2ToSqliteMigration
+import ru.astrainteractive.soulkeeper.module.souls.migration.core.DatabaseMigrator
+import ru.astrainteractive.soulkeeper.module.souls.migration.core.FileMigration
+import ru.astrainteractive.soulkeeper.module.souls.migration.database.DropBrokenCreatedAtMigration
+import ru.astrainteractive.soulkeeper.module.souls.migration.database.MakeCreatedAtNonNullMigration
+import ru.astrainteractive.soulkeeper.module.souls.migration.file.H2ToSqliteMigration
+import ru.astrainteractive.soulkeeper.module.souls.migration.file.KrateFolderMigration
 import java.io.File
 
 interface SoulsDaoModule {
@@ -35,18 +40,37 @@ interface SoulsDaoModule {
     val soulsDao: SoulsDao
 
     class Default(
-        dataFolder: File,
-        ioScope: CoroutineScope,
-        dispatchers: KotlinDispatchers
+        private val dataFolder: File,
+        private val ioScope: CoroutineScope,
+        private val dispatchers: KotlinDispatchers
     ) : SoulsDaoModule, Logger by JUtiltLogger("SoulsDaoModule") {
+        private val fileMigrations: List<FileMigration>
+            get() = listOf(
+                H2ToSqliteMigration(dataFolder, dispatchers),
+                KrateFolderMigration(
+                    dataFolder = dataFolder,
+                    kratesFolder = dataFolder.resolve(".deaths")
+                )
+            )
+        private val databaseMigrator: DatabaseMigrator
+            get() = DatabaseMigrator(
+                migrations = listOf(
+                    DropBrokenCreatedAtMigration(),
+                    MakeCreatedAtNonNullMigration(),
+                ),
+                latestDbVersion = 2
+            )
+
         override val databaseFlow: Flow<Database> = flow {
-            H2ToSqliteMigration(dataFolder).migrate()
+            fileMigrations.forEach { migration -> migration.migrate() }
             if (!dataFolder.exists()) dataFolder.mkdirs()
             val database = dataFolder.resolve("souls_v3")
                 .absolutePath
                 .let(DatabaseConfiguration::SQLite)
                 .connect()
             TransactionManager.manager.defaultIsolationLevel = java.sql.Connection.TRANSACTION_SERIALIZABLE
+            databaseMigrator.migrate(database)
+
             transaction(database) {
                 SchemaUtils.create(SoulTable)
                 SchemaUtils.create(SoulItemsTable)
@@ -62,6 +86,7 @@ interface SoulsDaoModule {
 
         override val soulsDao: SoulsDao = SoulsDaoImpl(
             databaseFlow = databaseFlow,
+            dispatchers = dispatchers
         )
 
         override val lifecycle: Lifecycle = Lifecycle.Lambda(