Astra-Interactive · makeevrserg · Oct 23, 2025 · Oct 12, 2025 · Oct 12, 2025 · Oct 23, 2025
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -9,11 +9,19 @@ services:
     ports:
       - "25565:25565"
     environment:
-      MEMORY: 4G
       EULA: true
-      ONLINE_MODE: FALSE
+      ONLINE_MODE: false
+      # Forge --------------------
+      #      TYPE: FORGE
+      #      VERSION: "1.20.1"
+      #      FORGE_VERSION: "47.2.20"
       # Paper --------------------
       TYPE: PAPER
-      VERSION: 1.21.4
+      VERSION: 1.21.8
+      # Custom -------------------
+    #      CUSTOM_SERVER: https://api.papermc.io/v2/projects/paper/versions/1.21.1/builds/121/downloads/paper-1.21.1-121.jar
     volumes:
+      #      - ./build/forge:/data # Forge
       - ./build/bukkit:/data # Bukkit/Paper/Spigot
+#      - ./build/velocity:/data # Velocity
+#      - ./build/fabric:/data # Fabric
diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ makeevrserg.java.ktarget=21
 # Project
 makeevrserg.project.name=AstraRating
 makeevrserg.project.group=ru.astrainteractive.astrarating
-makeevrserg.project.version.string=1.24.0
+makeevrserg.project.version.string=1.25.0
 makeevrserg.project.description=Rating plugin for EmpireProjekt
 makeevrserg.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com
 makeevrserg.project.url=https://empireprojekt.ru

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
diff --git a/instances/bukkit/build.gradle.kts b/instances/bukkit/build.gradle.kts
@@ -12,7 +12,8 @@ plugins {
 
 dependencies {
     // Kotlin
-    implementation(libs.bundles.kotlin)
+    implementation(libs.kotlin.serialization.json)
+
     // AstraLibs
     implementation(libs.minecraft.astralibs.core)
     implementation(libs.minecraft.astralibs.menu.bukkit)
@@ -25,7 +26,6 @@ dependencies {
     // Exposed
     implementation(libs.exposed.core)
     // Test
-    testImplementation(libs.bundles.testing.kotlin)
     testImplementation(libs.tests.kotlin.test)
     // Spigot dependencies
     compileOnly(libs.minecraft.paper.api)
@@ -62,44 +62,50 @@ minecraftProcessResource {
 
 val shadowJar = tasks.named<ShadowJar>("shadowJar")
 shadowJar.configure {
-    mergeServiceFiles()
-    dependsOn(tasks.named<ProcessResources>("processResources"))
+
+    val projectInfo = requireProjectInfo
     isReproducibleFileOrder = true
-    archiveClassifier = null as String?
-    archiveVersion.set(requireProjectInfo.versionString)
-    archiveBaseName.set("${requireProjectInfo.name}-bukkit")
-    destinationDirectory = rootProject
-        .layout.buildDirectory.asFile.get()
+    mergeServiceFiles()
+    dependsOn(configurations)
+    archiveClassifier.set(null as String?)
+
+    minimize {
+        exclude(dependency(libs.exposed.jdbc.get()))
+        exclude(dependency(libs.exposed.dao.get()))
+    }
+    archiveVersion.set(projectInfo.versionString)
+    archiveBaseName.set("${projectInfo.name}-bukkit")
+    destinationDirectory = rootDir.resolve("build")
         .resolve("bukkit")
         .resolve("plugins")
         .takeIf(File::exists)
-        ?: rootDir.resolve("jars").also(File::mkdirs)
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    configurations = listOf(project.configurations.runtimeClasspath.get())
+        ?: File(rootDir, "jars").also(File::mkdirs)
+
+    relocate("org.bstats", projectInfo.group)
     listOf(
         "co.touchlab",
-        "com.charleskorn",
         "com.mysql",
         "google.protobuf",
-        "io.github",
-        "it.krzeminski",
-        "net.thauvin",
+        "io.github.reactivecircus",
+        "ch.qos.logback",
+        "com.charleskorn.kaml",
+        "com.ibm.icu",
+        "it.krzeminski.snakeyaml",
+        "net.thauvin.erik",
         "okio",
-        "org.jetbrains",
+        "org.apache",
         "org.intellij",
-        "org.bstats",
         "org.slf4j",
+        "org.jetbrains.annotations",
         "ru.astrainteractive.klibs",
-        "ru.astrainteractive.astralibs",
-        "ch.qos.logback",
-        "com.ibm.icu",
-        "org.apache",
+        "ru.astrainteractive.astralibs"
+    ).forEach { pattern -> relocate(pattern, "${projectInfo.group}.$pattern") }
+    listOf(
+        "org.jetbrains.exposed",
+        "kotlinx",
     ).forEach { pattern ->
-        relocate(pattern, "${requireProjectInfo.group}.libs.$pattern")
-    }
-    minimize {
-        exclude(dependency(libs.exposed.jdbc.get()))
-        exclude(dependency(libs.exposed.dao.get()))
-        exclude(dependency(libs.exposed.core.get()))
+        relocate(pattern, "${projectInfo.group}.$pattern") {
+            exclude("kotlin/kotlin.kotlin_builtins")
+        }
     }
 }
diff --git a/modules/command-bukkit/build.gradle.kts b/modules/command-bukkit/build.gradle.kts
@@ -6,7 +6,8 @@ plugins {
 
 dependencies {
     // Kotlin
-    implementation(libs.bundles.kotlin)
+    implementation(libs.kotlin.coroutines.core)
+
     // Spigot dependencies
     compileOnly(libs.minecraft.paper.api)
     // AstraLibs

diff --git a/modules/core/api/build.gradle.kts b/modules/core/api/build.gradle.kts
@@ -6,12 +6,14 @@ plugins {
 
 dependencies {
     // Kotlin
-    implementation(libs.bundles.kotlin)
+    implementation(libs.kotlin.coroutines.core)
+    implementation(libs.kotlin.serialization.json)
+    implementation(libs.kotlin.serialization.kaml)
+
     implementation(libs.minecraft.astralibs.core)
     implementation(libs.klibs.mikro.core)
     implementation(libs.klibs.kstorage)
     implementation("io.github.reactivecircus.cache4k:cache4k-jvm:0.14.0")
     // Test
-    testImplementation(libs.bundles.testing.kotlin)
     testImplementation(libs.tests.kotlin.test)
 }
diff --git a/modules/core/bukkit/build.gradle.kts b/modules/core/bukkit/build.gradle.kts
@@ -6,7 +6,10 @@ plugins {
 
 dependencies {
     // Kotlin
-    implementation(libs.bundles.kotlin)
+    implementation(libs.kotlin.coroutines.core)
+    implementation(libs.kotlin.serialization.json)
+    implementation(libs.kotlin.serialization.kaml)
+
     implementation(libs.minecraft.astralibs.core)
     implementation(libs.minecraft.astralibs.menu.bukkit)
     implementation(libs.minecraft.astralibs.core.bukkit)

diff --git a/modules/core/gui-bukkit/build.gradle.kts b/modules/core/gui-bukkit/build.gradle.kts
@@ -6,7 +6,8 @@ plugins {
 
 dependencies {
     // Kotlin
-    implementation(libs.bundles.kotlin)
+    implementation(libs.kotlin.coroutines.core)
+
     // Spigot dependencies
     compileOnly(libs.minecraft.paper.api)
     implementation(libs.klibs.kstorage)

diff --git a/modules/data/dao/build.gradle.kts b/modules/data/dao/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 
 dependencies {
     // Kotlin
-    implementation(libs.bundles.kotlin)
+    implementation(libs.kotlin.serialization.json)
     // klibs
     implementation(libs.klibs.mikro.core)
     implementation(libs.klibs.mikro.extensions)
@@ -16,8 +16,8 @@ dependencies {
     implementation(libs.exposed.core)
     implementation(libs.exposed.dao)
     // Test
-    testImplementation(libs.bundles.testing.kotlin)
     testImplementation(libs.tests.kotlin.test)
+    testImplementation(libs.driver.jdbc)
     // Local
     implementation(projects.modules.data.exposed)
     implementation(projects.modules.core.api)

diff --git a/modules/data/dao/src/test/java/ru/astrainteractive/astrarating/data/dao/RatingDaoTest.kt b/modules/data/dao/src/test/java/ru/astrainteractive/astrarating/data/dao/RatingDaoTest.kt
@@ -11,7 +11,7 @@ import ru.astrainteractive.astrarating.data.exposed.db.rating.model.DbRatingConf
 import ru.astrainteractive.astrarating.data.exposed.dto.RatingType
 import ru.astrainteractive.astrarating.data.exposed.model.UserModel
 import ru.astrainteractive.klibs.mikro.exposed.model.DatabaseConfiguration
-import java.io.File
+import java.nio.file.Files
 import java.util.UUID
 import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
@@ -38,23 +38,26 @@ class RatingDaoTest {
             minecraftName = UUID.randomUUID().toString(),
         )
 
+    private fun getTempFolder() = Files.createTempDirectory("dir").toFile()
+
     @AfterTest
     fun destroy(): Unit = runBlocking {
         TransactionManager.Companion.closeAndUnregister(requireModule.databaseFlow.first())
-        File("./test").deleteRecursively()
     }
 
     @BeforeTest
     fun setup(): Unit = runBlocking {
+        val folder = getTempFolder()
         module = DBRatingModule(
             stringFormat = YamlStringFormat(),
             defaultConfig = {
-                DbRatingConfiguration(databaseConfiguration = DatabaseConfiguration.SQLite("./test"))
+                val configuration = folder
+                    .resolve("dbfile")
+                    .absolutePath
+                    .let(DatabaseConfiguration::SQLite)
+                DbRatingConfiguration(databaseConfiguration = configuration)
             },
-            dataFolder = File("./test").also {
-                it.mkdirs()
-                it.deleteOnExit()
-            }
+            dataFolder = folder
         )
     }
 

diff --git a/modules/data/exposed/build.gradle.kts b/modules/data/exposed/build.gradle.kts
@@ -6,7 +6,8 @@ plugins {
 
 dependencies {
     // Kotlin
-    implementation(libs.bundles.kotlin)
+    implementation(libs.kotlin.serialization.json)
+
     // klibs
     implementation(libs.klibs.mikro.core)
     implementation(libs.klibs.mikro.extensions)

diff --git a/modules/event-bukkit/build.gradle.kts b/modules/event-bukkit/build.gradle.kts
@@ -6,7 +6,8 @@ plugins {
 
 dependencies {
     // Kotlin
-    implementation(libs.bundles.kotlin)
+    implementation(libs.kotlin.coroutines.core)
+
     // Spigot dependencies
     compileOnly(libs.minecraft.paper.api)
     implementation(libs.klibs.kstorage)

diff --git a/modules/integration-papi/build.gradle.kts b/modules/integration-papi/build.gradle.kts
@@ -6,15 +6,16 @@ plugins {
 
 dependencies {
     // Kotlin
-    implementation(libs.bundles.kotlin)
+    implementation(libs.kotlin.coroutines.core)
+    implementation(libs.kotlin.serialization.json)
+
     // AstraLibs
     implementation(libs.minecraft.astralibs.core)
     implementation(libs.minecraft.astralibs.core.bukkit)
     // klibs
     implementation(libs.klibs.mikro.core)
     implementation(libs.klibs.kstorage)
     // Test
-    testImplementation(libs.bundles.testing.kotlin)
     testImplementation(libs.tests.kotlin.test)
     // Spigot dependencies
     compileOnly(libs.minecraft.paper.api)

diff --git a/modules/rating-change/api/build.gradle.kts b/modules/rating-change/api/build.gradle.kts
@@ -6,7 +6,8 @@ plugins {
 
 dependencies {
     // Kotlin
-    implementation(libs.bundles.kotlin)
+    implementation(libs.kotlin.coroutines.core)
+
     // AstraLibs
     implementation(libs.minecraft.astralibs.core)
     // klibs

diff --git a/modules/rating-player/api/build.gradle.kts b/modules/rating-player/api/build.gradle.kts
@@ -6,7 +6,8 @@ plugins {
 
 dependencies {
     // Kotlin
-    implementation(libs.bundles.kotlin)
+    implementation(libs.kotlin.coroutines.core)
+
     // AstraLibs
     implementation(libs.minecraft.astralibs.core)
     // klibs

diff --git a/modules/rating-players/api/build.gradle.kts b/modules/rating-players/api/build.gradle.kts
@@ -6,7 +6,8 @@ plugins {
 
 dependencies {
     // Kotlin
-    implementation(libs.bundles.kotlin)
+    implementation(libs.kotlin.coroutines.core)
+
     // AstraLibs
     implementation(libs.minecraft.astralibs.core)
     // klibs