diff --git a/.github/workflows/call-build-project.yml b/.github/workflows/call-build-project.yml index 44c45b79..a65fe64b 100644 --- a/.github/workflows/call-build-project.yml +++ b/.github/workflows/call-build-project.yml @@ -14,9 +14,9 @@ jobs: task: ":instances:neoforge:build --info --stacktrace" steps: - name: Checkout Git repo - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Set up JDK 21 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'adopt' java-version: 21 diff --git a/.github/workflows/call-detekt-validation.yml b/.github/workflows/call-detekt-validation.yml index a4c6a43e..56134ee4 100644 --- a/.github/workflows/call-detekt-validation.yml +++ b/.github/workflows/call-detekt-validation.yml @@ -6,9 +6,9 @@ jobs: name: "Check project by detekt" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK 21 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: '21' diff --git a/.github/workflows/call-gradle-wrapper-validation.yml b/.github/workflows/call-gradle-wrapper-validation.yml index 40b9686f..29cb46ae 100644 --- a/.github/workflows/call-gradle-wrapper-validation.yml +++ b/.github/workflows/call-gradle-wrapper-validation.yml @@ -7,6 +7,6 @@ jobs: name: "Gradle Wrapper Validation" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Validate Gradle Wrapper uses: gradle/wrapper-validation-action@v3 \ No newline at end of file diff --git a/.github/workflows/call-tests-validation.yml b/.github/workflows/call-tests-validation.yml index a96765ea..6334448d 100644 --- a/.github/workflows/call-tests-validation.yml +++ b/.github/workflows/call-tests-validation.yml @@ -7,9 +7,9 @@ jobs: name: "Run tests" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Set up JDK 21 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'adopt' java-version: '21' diff --git a/.github/workflows/call-upload-artifacts.yml b/.github/workflows/call-upload-artifacts.yml index dad935bd..bfb82abc 100644 --- a/.github/workflows/call-upload-artifacts.yml +++ b/.github/workflows/call-upload-artifacts.yml @@ -14,14 +14,14 @@ jobs: task: ":instances:neoforge:shadowJar" steps: - name: Checkout Git repo - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: christian-draeger/read-properties@1.1.1 id: properties with: path: './gradle.properties' - properties: 'makeevrserg.project.name' + properties: 'klibs.project.name' - name: Set up JDK 21 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'adopt' java-version: 21 @@ -35,4 +35,4 @@ jobs: name: "Upload ${{ matrix.id }}" with: name: ${{ matrix.id }} - path: ./jars/${{ steps.properties.outputs.makeevrserg-project-name }}-${{ matrix.id }}*.jar \ No newline at end of file + path: ./jars/${{ steps.properties.outputs.klibs-project-name }}-${{ matrix.id }}*.jar \ No newline at end of file diff --git a/.github/workflows/call-upload-github-release.yml b/.github/workflows/call-upload-github-release.yml index b4eb2bae..5ce3762d 100644 --- a/.github/workflows/call-upload-github-release.yml +++ b/.github/workflows/call-upload-github-release.yml @@ -10,13 +10,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Git repo - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: christian-draeger/read-properties@1.1.1 id: properties with: path: './gradle.properties' - properties: 'makeevrserg.project.name makeevrserg.project.version.string' + properties: 'klibs.project.name klibs.project.version.string' - uses: actions/download-artifact@d0ce8fd1167ed839810201de977912a090ab10a7 name: "Download bukkit" @@ -38,7 +38,7 @@ jobs: with: files: | ./jars/*.jar - tag_name: ${{ steps.properties.outputs.makeevrserg-project-version-string }} - name: ${{ steps.properties.outputs.makeevrserg-project-name }} - ${{ steps.properties.outputs.makeevrserg-project-version-string }} + tag_name: ${{ steps.properties.outputs.klibs-project-version-string }} + name: ${{ steps.properties.outputs.klibs-project-name }} - ${{ steps.properties.outputs.klibs-project-version-string }} draft: false prerelease: false diff --git a/.github/workflows/call-upload-modrinth-release.yml b/.github/workflows/call-upload-modrinth-release.yml index 378fe55a..870a44a1 100644 --- a/.github/workflows/call-upload-modrinth-release.yml +++ b/.github/workflows/call-upload-modrinth-release.yml @@ -17,13 +17,13 @@ jobs: task: ":instances:neoforge:shadowJar" steps: - name: Checkout Git repo - uses: actions/checkout@v4 + uses: actions/checkout@v6 - uses: christian-draeger/read-properties@1.1.1 id: properties with: path: './gradle.properties' - properties: 'makeevrserg.project.name makeevrserg.project.version.string' + properties: 'klibs.project.name klibs.project.version.string' - uses: actions/download-artifact@d0ce8fd1167ed839810201de977912a090ab10a7 name: "Download ${{ matrix.id }}" @@ -36,8 +36,8 @@ jobs: # your assets on Modrinth. modrinth-id: tnr41XhG modrinth-token: ${{ secrets.MODRINTH_TOKEN }} - name: ${{ steps.properties.outputs.makeevrserg-project-name }}-${{ matrix.id }} - version: ${{ steps.properties.outputs.makeevrserg-project-version-string }} + name: ${{ steps.properties.outputs.klibs-project-name }}-${{ matrix.id }} + version: ${{ steps.properties.outputs.klibs-project-version-string }} changelog: ${{ join(github.event.commits.*.message, '\n') }} version_type: beta java: | diff --git a/build.gradle.kts b/build.gradle.kts index 812ef048..3a3a0e17 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -25,7 +25,7 @@ plugins { apply(plugin = "ru.astrainteractive.gradleplugin.dokka.root") apply(plugin = "ru.astrainteractive.gradleplugin.detekt") -apply(plugin = "ru.astrainteractive.gradleplugin.root.info") +apply(plugin = "ru.astrainteractive.gradleplugin.rootinfo") subprojects.forEach { it.apply(plugin = "ru.astrainteractive.gradleplugin.dokka.module") diff --git a/gradle.properties b/gradle.properties index 1fcb2051..2055c133 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,14 +7,14 @@ org.gradle.jvmargs=-Xmx5g -XX:+UseParallelGC -Dkotlin.daemon.jvm.options\="-Xmx5 kotlin.code.style=official testTask.ignoreFailures=false # Java -makeevrserg.java.source=8 -makeevrserg.java.target=21 -makeevrserg.java.ktarget=21 +klibs.java.source=8 +klibs.java.target=21 +klibs.java.ktarget=21 # Project -makeevrserg.project.name=SoulKeeper -makeevrserg.project.group=ru.astrainteractive.soulkeeper -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 -makeevrserg.publish.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com +klibs.project.name=SoulKeeper +klibs.project.group=ru.astrainteractive.soulkeeper +klibs.project.version.string=1.7.0 +klibs.project.description=Keep your items after death +klibs.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com +klibs.project.url=https://github.com/Astra-Interactive/SoulKeeper +klibs.publish.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7471d333..2b684d68 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,65 +1,65 @@ [versions] cache4k = "0.14.0" -discordsrv = "1.30.4" +discordsrv = "1.30.5" driver-h2 = "2.4.240" -driver-jdbc = "3.51.2.0" -driver-mariadb = "3.5.7" +driver-jdbc = "3.53.0.0" +driver-mariadb = "3.5.8" driver-mysql = "8.0.33" -exposed = "0.61.0" +exposed = "1.2.0" forgegradle = "[6.0,6.2)" -gradle-buildconfig = "6.0.7" +gradle-buildconfig = "6.0.9" gradle-ftp = "0.1.3" -gradle-shadow = "9.2.2" -gson = "2.13.2" -guava = "33.5.0-jre" -jda = "6.3.1" +gradle-shadow = "9.4.1" +gson = "2.14.0" +guava = "33.6.0-jre" +jda = "6.4.1" jda-webhook = "0.8.4" -klibs-gradleplugin = "1.15.0" +jmh-core = "1.37" +joml = "1.10.8" +klibs-gradleplugin = "2.0.0" klibs-kdi = "1.4.8" -klibs-kstorage = "4.5.0" -klibs-mikro = "1.22.0" +klibs-kstorage = "5.0.4" +klibs-mikro = "1.23.0" kotlin-benchmark = "0.4.16" kotlin-coroutines = "1.10.2" kotlin-datetime = "0.7.1-0.6.x-compat" -kotlin-json = "1.10.0" -kotlin-serialization = "1.10.0" +kotlin-json = "1.11.0" +kotlin-serialization = "1.11.0" kotlin-serialization-kaml = "0.104.0" kotlin-version = "2.2.0" -ktor = "3.4.0" +ktor = "3.4.3" minecraft-astralibs = "3.35.0" +minecraft-brigadier = "1.3.10" minecraft-bstats = "3.2.1" -minecraft-bungee = "1.21-R0.5-SNAPSHOT" +minecraft-bungee = "26.1-R0.1-SNAPSHOT" +minecraft-datafixerupper = "8.0.16" minecraft-essentialsx = "2.21.2" minecraft-fabric-api = "0.139.5+" +minecraft-fabric-yarn = "1.20.1+build.10" minecraft-fabric-kotlin = "1.13.7+" -minecraft-fabric-loader = "0.18.2" -minecraft-fabric-loom = "1.14.6" -minecraft-kyori = "4.26.1" +minecraft-fabric-loader = "0.19.2" +minecraft-fabric-loom = "1.16.1" +minecraft-kyori = "5.0.1" minecraft-luckperms = "5.5" minecraft-mcprotocollib = "1.21.7-SNAPSHOT" -minecraft-mockbukkit = "4.33.2" -minecraft-mojang-version = "1.20.1" -minecraft-neoforgeversion = "21.1.129" +minecraft-mockbukkit = "4.108.0" +minecraft-mojang-version = "1.21.11" minecraft-neoforged-bus = "8.0.2" -minecraft-packetevents = "2.11.2" +minecraft-neoforgegradle = "7.1.20" +minecraft-neoforgeversion = "21.1.129" +minecraft-packetevents = "2.12.1" 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.20" -minecraft-forgeversion = "47.2.20" -minecraft-brigadier = "1.3.10" -minecraft-datafixerupper = "8.0.16" -joml = "1.10.8" -telegrambots = "9.4.0" +telegrambots = "9.5.0" tests-junit-bom = "6.0.3" tests-junit-jupiter-api = "6.0.3" -tests-mockito = "5.22.0" +tests-mockito = "5.23.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" } @@ -75,6 +75,8 @@ exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "e 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" } +jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh-core" } +joml = { module = "org.joml:joml", version.ref = "joml" } klibs-kdi = { module = "ru.astrainteractive.klibs:kdi-jvm", version.ref = "klibs-kdi" } klibs-kstorage = { module = "ru.astrainteractive.klibs:kstorage", version.ref = "klibs-kstorage" } klibs-mikro-core = { module = "ru.astrainteractive.klibs:mikro-core", version.ref = "klibs-mikro" } @@ -105,24 +107,26 @@ minecraft-astralibs-core-neoforge = { module = "ru.astrainteractive.astralibs:co minecraft-astralibs-exposed = { module = "ru.astrainteractive.astralibs:exposed", version.ref = "minecraft-astralibs" } minecraft-astralibs-menu-bukkit = { module = "ru.astrainteractive.astralibs:menu-bukkit", version.ref = "minecraft-astralibs" } minecraft-astralibs-orm = { module = "ru.astrainteractive.astralibs:orm", version.ref = "minecraft-astralibs" } +minecraft-brigadier = { module = "com.mojang:brigadier", version.ref = "minecraft-brigadier" } minecraft-bstats = { module = "org.bstats:bstats-bukkit", version.ref = "minecraft-bstats" } minecraft-bungee = { module = "net.md-5:bungeecord-api", version.ref = "minecraft-bungee" } +minecraft-datafixerupper = { module = "com.mojang:datafixerupper", version.ref = "minecraft-datafixerupper" } minecraft-discordsrv = { module = "com.discordsrv:discordsrv", version.ref = "discordsrv" } minecraft-essentialsx = { module = "net.essentialsx:EssentialsX", version.ref = "minecraft-essentialsx" } minecraft-fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "minecraft-fabric-api" } minecraft-fabric-kotlin = { module = "net.fabricmc:fabric-language-kotlin", version.ref = "minecraft-fabric-kotlin" } minecraft-fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "minecraft-fabric-loader" } minecraft-fabric-mojang = { module = "com.mojang:minecraft", version.ref = "minecraft-mojang-version" } -minecraft-kyori-plain = { module = "net.kyori:adventure-text-serializer-plain", version.ref = "minecraft-kyori" } minecraft-kyori-api = { module = "net.kyori:adventure-api", version.ref = "minecraft-kyori" } minecraft-kyori-gson = { module = "net.kyori:adventure-text-serializer-gson", version.ref = "minecraft-kyori" } minecraft-kyori-legacy = { module = "net.kyori:adventure-text-serializer-legacy", version.ref = "minecraft-kyori" } minecraft-kyori-minimessage = { module = "net.kyori:adventure-text-minimessage", version.ref = "minecraft-kyori" } +minecraft-kyori-plain = { module = "net.kyori:adventure-text-serializer-plain", version.ref = "minecraft-kyori" } minecraft-luckperms = { module = "net.luckperms:api", version.ref = "minecraft-luckperms" } 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-neoforgeversion = { module = "net.neoforged:neoforge", version.ref = "minecraft-neoforgeversion" } 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" } @@ -132,8 +136,6 @@ 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" } -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" } @@ -145,8 +147,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" } -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" } @@ -163,13 +164,13 @@ klibs-gradle-java-version = { id = "ru.astrainteractive.gradleplugin.java.versio klibs-gradle-minecraft-empty = { id = "ru.astrainteractive.gradleplugin.minecraft.empty", version.ref = "klibs-gradleplugin" } klibs-gradle-minecraft-multiplatform = { id = "ru.astrainteractive.gradleplugin.minecraft.multiplatform", version.ref = "klibs-gradleplugin" } klibs-gradle-publication = { id = "ru.astrainteractive.gradleplugin.publication", version.ref = "klibs-gradleplugin" } -klibs-gradle-rootinfo = { id = "ru.astrainteractive.gradleplugin.root.info", version.ref = "klibs-gradleplugin" } +klibs-gradle-rootinfo = { id = "ru.astrainteractive.gradleplugin.rootinfo", version.ref = "klibs-gradleplugin" } klibs-gradle-stub-javadoc = { id = "ru.astrainteractive.gradleplugin.stub.javadoc", version.ref = "klibs-gradleplugin" } -klibs-minecraft-resource-processor = { id = "ru.astrainteractive.gradleplugin.minecraft.resource-processor", version.ref = "klibs-gradleplugin" } +klibs-minecraft-resource-processor = { id = "ru.astrainteractive.gradleplugin.minecraft.resource.processor", version.ref = "klibs-gradleplugin" } klibs-minecraft-shadow = { id = "ru.astrainteractive.gradleplugin.minecraft.shadow", version.ref = "klibs-gradleplugin" } kotlin-allopen = { id = "org.jetbrains.kotlin.plugin.allopen", version.ref = "kotlin-version" } kotlin-benchmark = { id = "org.jetbrains.kotlinx.benchmark", version.ref = "kotlin-benchmark" } kotlin-gradle = { id = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin-version" } kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin-version" } kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin-version" } -kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-version" } +kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-version" } \ No newline at end of file diff --git a/instances/bukkit/build.gradle.kts b/instances/bukkit/build.gradle.kts index 2e641f6f..47cec200 100644 --- a/instances/bukkit/build.gradle.kts +++ b/instances/bukkit/build.gradle.kts @@ -1,5 +1,5 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar -import ru.astrainteractive.gradleplugin.property.extension.ModelPropertyValueExt.requireProjectInfo +import ru.astrainteractive.gradleplugin.property.util.requireProjectInfo plugins { kotlin("jvm") @@ -38,32 +38,41 @@ dependencies { } minecraftProcessResource { - bukkit() + bukkit( + customProperties = mapOf( + "libraries" to listOf( + libs.driver.h2.get(), + libs.driver.jdbc.get(), + libs.driver.mysql.get(), + libs.driver.mariadb.get() + ).joinToString("\",\"", "[\"", "\"]") + ) + ) } val shadowJar = tasks.named("shadowJar") shadowJar.configure { - val projectInfo = requireProjectInfo isReproducibleFileOrder = true 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 = "${requireProjectInfo.name}-${project.name}" - destinationDirectory = rootDir.resolve("build") + destinationDirectory = rootProject.layout + .buildDirectory + .asFile + .get() .resolve("bukkit") .resolve("plugins") .takeIf(File::exists) - ?: File(rootDir, "jars").also(File::mkdirs) - + ?: rootDir.resolve("jars").also(File::mkdirs) dependencies { - // Dependencies + // Path Dependencies exclude("mozilla/**") exclude("javax/**") exclude("it/unimi/dsi/**") @@ -100,10 +109,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")) + // Notation Dependencies + 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) diff --git a/instances/bukkit/src/main/resources/plugin.yml b/instances/bukkit/src/main/resources/plugin.yml index b465ae48..f59c5bb7 100644 --- a/instances/bukkit/src/main/resources/plugin.yml +++ b/instances/bukkit/src/main/resources/plugin.yml @@ -10,10 +10,7 @@ api-version: 1.18 softdepend: [ packetevents ] depend: [ ] loadbefore: [ Towny ] -libraries: - - "org.xerial:sqlite-jdbc:3.51.1.0" - - "mysql:mysql-connector-java:8.0.33" - - "com.h2database:h2:2.4.240" +libraries: ${libraries} commands: souls: skreload: diff --git a/instances/neoforge/build.gradle.kts b/instances/neoforge/build.gradle.kts index 6d79886a..d58e90ef 100644 --- a/instances/neoforge/build.gradle.kts +++ b/instances/neoforge/build.gradle.kts @@ -1,7 +1,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar -import ru.astrainteractive.gradleplugin.model.Developer -import ru.astrainteractive.gradleplugin.property.extension.ModelPropertyValueExt.requireJinfo -import ru.astrainteractive.gradleplugin.property.extension.ModelPropertyValueExt.requireProjectInfo +import ru.astrainteractive.gradleplugin.property.model.Developer +import ru.astrainteractive.gradleplugin.property.util.requireJinfo +import ru.astrainteractive.gradleplugin.property.util.requireProjectInfo plugins { kotlin("jvm") diff --git a/instances/neoforge/gradle.properties b/instances/neoforge/gradle.properties index d431dff9..4de3651a 100644 --- a/instances/neoforge/gradle.properties +++ b/instances/neoforge/gradle.properties @@ -1 +1 @@ -makeevrserg.java.source=21 +klibs.java.source=21 diff --git a/modules/command/src/main/kotlin/ru/astrainteractive/soulkeeper/command/reload/SoulsReloadCommandRegistrar.kt b/modules/command/src/main/kotlin/ru/astrainteractive/soulkeeper/command/reload/SoulsReloadCommandRegistrar.kt index a8bacbd1..97b3e0b3 100644 --- a/modules/command/src/main/kotlin/ru/astrainteractive/soulkeeper/command/reload/SoulsReloadCommandRegistrar.kt +++ b/modules/command/src/main/kotlin/ru/astrainteractive/soulkeeper/command/reload/SoulsReloadCommandRegistrar.kt @@ -7,7 +7,7 @@ import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer import ru.astrainteractive.astralibs.kyori.unwrap import ru.astrainteractive.astralibs.lifecycle.Lifecycle import ru.astrainteractive.klibs.kstorage.api.CachedKrate -import ru.astrainteractive.klibs.kstorage.util.getValue +import ru.astrainteractive.klibs.kstorage.api.getValue import ru.astrainteractive.soulkeeper.core.plugin.PluginPermission import ru.astrainteractive.soulkeeper.core.plugin.PluginTranslation diff --git a/modules/command/src/main/kotlin/ru/astrainteractive/soulkeeper/command/soulkrate/SoulKrateCommandRegistrar.kt b/modules/command/src/main/kotlin/ru/astrainteractive/soulkeeper/command/soulkrate/SoulKrateCommandRegistrar.kt index 740a5bb1..256c65ef 100644 --- a/modules/command/src/main/kotlin/ru/astrainteractive/soulkeeper/command/soulkrate/SoulKrateCommandRegistrar.kt +++ b/modules/command/src/main/kotlin/ru/astrainteractive/soulkeeper/command/soulkrate/SoulKrateCommandRegistrar.kt @@ -12,7 +12,7 @@ import ru.astrainteractive.astralibs.command.api.registrar.CommandRegistrarConte import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer import ru.astrainteractive.astralibs.kyori.unwrap import ru.astrainteractive.klibs.kstorage.api.CachedKrate -import ru.astrainteractive.klibs.kstorage.util.getValue +import ru.astrainteractive.klibs.kstorage.api.getValue import ru.astrainteractive.klibs.mikro.core.logging.JUtiltLogger import ru.astrainteractive.klibs.mikro.core.logging.Logger import ru.astrainteractive.soulkeeper.core.plugin.PluginPermission diff --git a/modules/command/src/main/kotlin/ru/astrainteractive/soulkeeper/command/souls/SoulsCommandExecutor.kt b/modules/command/src/main/kotlin/ru/astrainteractive/soulkeeper/command/souls/SoulsCommandExecutor.kt index d2e4c5fe..3ee68f3d 100644 --- a/modules/command/src/main/kotlin/ru/astrainteractive/soulkeeper/command/souls/SoulsCommandExecutor.kt +++ b/modules/command/src/main/kotlin/ru/astrainteractive/soulkeeper/command/souls/SoulsCommandExecutor.kt @@ -17,7 +17,7 @@ import ru.astrainteractive.astralibs.util.clickable import ru.astrainteractive.astralibs.util.isEmpty import ru.astrainteractive.astralibs.util.orEmpty import ru.astrainteractive.klibs.kstorage.api.CachedKrate -import ru.astrainteractive.klibs.kstorage.util.getValue +import ru.astrainteractive.klibs.kstorage.api.getValue import ru.astrainteractive.klibs.mikro.core.dispatchers.KotlinDispatchers import ru.astrainteractive.klibs.mikro.core.util.tryCast import ru.astrainteractive.soulkeeper.core.datetime.TimeAgoFormatter diff --git a/modules/core/src/main/kotlin/ru/astrainteractive/soulkeeper/core/di/CoreModule.kt b/modules/core/src/main/kotlin/ru/astrainteractive/soulkeeper/core/di/CoreModule.kt index b6274d50..ad5a82c0 100644 --- a/modules/core/src/main/kotlin/ru/astrainteractive/soulkeeper/core/di/CoreModule.kt +++ b/modules/core/src/main/kotlin/ru/astrainteractive/soulkeeper/core/di/CoreModule.kt @@ -10,8 +10,8 @@ import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer import ru.astrainteractive.astralibs.lifecycle.Lifecycle import ru.astrainteractive.astralibs.util.YamlStringFormat import ru.astrainteractive.astralibs.util.parseOrWriteIntoDefault +import ru.astrainteractive.klibs.kstorage.api.asCachedKrate import ru.astrainteractive.klibs.kstorage.api.impl.DefaultMutableKrate -import ru.astrainteractive.klibs.kstorage.util.asCachedKrate import ru.astrainteractive.klibs.mikro.core.coroutines.CoroutineFeature import ru.astrainteractive.klibs.mikro.core.dispatchers.KotlinDispatchers import ru.astrainteractive.klibs.mikro.core.logging.JUtiltLogger diff --git a/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/dao/SoulsDaoImpl.kt b/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/dao/SoulsDaoImpl.kt index 7cd38258..eb3570b5 100644 --- a/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/dao/SoulsDaoImpl.kt +++ b/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/dao/SoulsDaoImpl.kt @@ -7,17 +7,18 @@ import kotlinx.coroutines.flow.first import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.withContext -import org.jetbrains.exposed.sql.Database -import org.jetbrains.exposed.sql.ResultRow -import org.jetbrains.exposed.sql.SortOrder -import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq -import org.jetbrains.exposed.sql.andWhere -import org.jetbrains.exposed.sql.batchInsert -import org.jetbrains.exposed.sql.deleteWhere -import org.jetbrains.exposed.sql.insertAndGetId -import org.jetbrains.exposed.sql.selectAll -import org.jetbrains.exposed.sql.transactions.transaction -import org.jetbrains.exposed.sql.update +import org.jetbrains.exposed.v1.core.ResultRow +import org.jetbrains.exposed.v1.core.SortOrder +import org.jetbrains.exposed.v1.core.between +import org.jetbrains.exposed.v1.core.eq +import org.jetbrains.exposed.v1.jdbc.Database +import org.jetbrains.exposed.v1.jdbc.andWhere +import org.jetbrains.exposed.v1.jdbc.batchInsert +import org.jetbrains.exposed.v1.jdbc.deleteWhere +import org.jetbrains.exposed.v1.jdbc.insertAndGetId +import org.jetbrains.exposed.v1.jdbc.selectAll +import org.jetbrains.exposed.v1.jdbc.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.update import ru.astrainteractive.astralibs.server.location.KLocation import ru.astrainteractive.astralibs.server.location.dist import ru.astrainteractive.klibs.mikro.core.dispatchers.KotlinDispatchers diff --git a/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/database/coulmn/KJavaInstantColumnType.kt b/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/database/coulmn/KJavaInstantColumnType.kt index 9c0d0a2c..64f935fe 100644 --- a/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/database/coulmn/KJavaInstantColumnType.kt +++ b/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/database/coulmn/KJavaInstantColumnType.kt @@ -1,7 +1,7 @@ package ru.astrainteractive.soulkeeper.module.souls.database.coulmn -import org.jetbrains.exposed.sql.ColumnType -import org.jetbrains.exposed.sql.vendors.currentDialect +import org.jetbrains.exposed.v1.core.ColumnType +import org.jetbrains.exposed.v1.core.vendors.currentDialect import java.time.Instant internal class KJavaInstantColumnType : ColumnType() { diff --git a/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/database/coulmn/StringFormatObjectColumnType.kt b/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/database/coulmn/StringFormatObjectColumnType.kt index 1dc6a36c..0645a252 100644 --- a/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/database/coulmn/StringFormatObjectColumnType.kt +++ b/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/database/coulmn/StringFormatObjectColumnType.kt @@ -1,7 +1,7 @@ package ru.astrainteractive.soulkeeper.module.souls.database.coulmn -import org.jetbrains.exposed.sql.ColumnType -import org.jetbrains.exposed.sql.vendors.currentDialect +import org.jetbrains.exposed.v1.core.ColumnType +import org.jetbrains.exposed.v1.core.vendors.currentDialect import ru.astrainteractive.soulkeeper.module.souls.database.model.StringFormatObject internal class StringFormatObjectColumnType : ColumnType() { diff --git a/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/database/table/SoulItemsTable.kt b/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/database/table/SoulItemsTable.kt index 12fdb1ee..14acba90 100644 --- a/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/database/table/SoulItemsTable.kt +++ b/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/database/table/SoulItemsTable.kt @@ -1,7 +1,7 @@ package ru.astrainteractive.soulkeeper.module.souls.database.table -import org.jetbrains.exposed.dao.id.LongIdTable -import org.jetbrains.exposed.sql.ReferenceOption +import org.jetbrains.exposed.v1.core.ReferenceOption +import org.jetbrains.exposed.v1.core.dao.id.LongIdTable import ru.astrainteractive.soulkeeper.module.souls.database.coulmn.StringFormatObjectColumnType internal object SoulItemsTable : LongIdTable(name = "SOUL_ITEMS") { diff --git a/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/database/table/SoulTable.kt b/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/database/table/SoulTable.kt index dd2ef8aa..0c9d62b0 100644 --- a/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/database/table/SoulTable.kt +++ b/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/database/table/SoulTable.kt @@ -1,6 +1,6 @@ package ru.astrainteractive.soulkeeper.module.souls.database.table -import org.jetbrains.exposed.dao.id.LongIdTable +import org.jetbrains.exposed.v1.core.dao.id.LongIdTable import ru.astrainteractive.soulkeeper.module.souls.database.coulmn.KJavaInstantColumnType internal object SoulTable : LongIdTable(name = "SOUL") { diff --git a/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/di/SoulsDaoModule.kt b/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/di/SoulsDaoModule.kt index 979e8f84..354e7e1e 100644 --- a/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/di/SoulsDaoModule.kt +++ b/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/di/SoulsDaoModule.kt @@ -10,10 +10,10 @@ import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.flow.onStart import kotlinx.coroutines.flow.retry import kotlinx.coroutines.flow.shareIn -import org.jetbrains.exposed.sql.Database -import org.jetbrains.exposed.sql.SchemaUtils -import org.jetbrains.exposed.sql.transactions.TransactionManager -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.Database +import org.jetbrains.exposed.v1.jdbc.SchemaUtils +import org.jetbrains.exposed.v1.jdbc.transactions.TransactionManager +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import ru.astrainteractive.astralibs.lifecycle.Lifecycle import ru.astrainteractive.klibs.mikro.core.dispatchers.KotlinDispatchers import ru.astrainteractive.klibs.mikro.core.logging.JUtiltLogger diff --git a/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/krate/PlayerSoulKrate.kt b/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/krate/PlayerSoulKrate.kt index b8b892c6..69363b38 100644 --- a/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/krate/PlayerSoulKrate.kt +++ b/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/krate/PlayerSoulKrate.kt @@ -58,10 +58,22 @@ class PlayerSoulKrate( krate.save(value) } + override suspend fun save(block: suspend (DefaultSoul?) -> DefaultSoul?) { + krate.save(block) + } + + override suspend fun saveAndGet(block: suspend (DefaultSoul?) -> DefaultSoul?): DefaultSoul? { + return krate.saveAndGet(block) + } + override suspend fun reset() { krate.reset() } + override suspend fun resetAndGet(): DefaultSoul? { + return krate.resetAndGet() + } + override suspend fun getValue(): DefaultSoul? { return krate.getValue() } diff --git a/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/migration/core/DatabaseMigration.kt b/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/migration/core/DatabaseMigration.kt index 6c56fb09..ecd8c127 100644 --- a/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/migration/core/DatabaseMigration.kt +++ b/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/migration/core/DatabaseMigration.kt @@ -1,6 +1,6 @@ package ru.astrainteractive.soulkeeper.module.souls.migration.core -import org.jetbrains.exposed.sql.Database +import org.jetbrains.exposed.v1.jdbc.Database interface DatabaseMigration { val requiredDbVersion: Int diff --git a/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/migration/core/DatabaseMigrator.kt b/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/migration/core/DatabaseMigrator.kt index 62e5d576..cb04360b 100644 --- a/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/migration/core/DatabaseMigrator.kt +++ b/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/migration/core/DatabaseMigrator.kt @@ -1,7 +1,7 @@ package ru.astrainteractive.soulkeeper.module.souls.migration.core -import org.jetbrains.exposed.sql.Database -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.Database +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import ru.astrainteractive.klibs.mikro.core.logging.JUtiltLogger import ru.astrainteractive.klibs.mikro.core.logging.Logger diff --git a/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/migration/database/DropBrokenCreatedAtMigration.kt b/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/migration/database/DropBrokenCreatedAtMigration.kt index 5ed0c34e..73df004d 100644 --- a/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/migration/database/DropBrokenCreatedAtMigration.kt +++ b/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/migration/database/DropBrokenCreatedAtMigration.kt @@ -1,7 +1,7 @@ package ru.astrainteractive.soulkeeper.module.souls.migration.database -import org.jetbrains.exposed.sql.Database -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.Database +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import ru.astrainteractive.klibs.mikro.core.logging.JUtiltLogger import ru.astrainteractive.klibs.mikro.core.logging.Logger import ru.astrainteractive.soulkeeper.module.souls.migration.core.DatabaseMigration diff --git a/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/migration/database/MakeCreatedAtNonNullMigration.kt b/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/migration/database/MakeCreatedAtNonNullMigration.kt index 426c3add..35ffa36f 100644 --- a/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/migration/database/MakeCreatedAtNonNullMigration.kt +++ b/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/migration/database/MakeCreatedAtNonNullMigration.kt @@ -1,7 +1,7 @@ package ru.astrainteractive.soulkeeper.module.souls.migration.database -import org.jetbrains.exposed.sql.Database -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.Database +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import ru.astrainteractive.klibs.mikro.core.logging.JUtiltLogger import ru.astrainteractive.klibs.mikro.core.logging.Logger import ru.astrainteractive.soulkeeper.module.souls.migration.core.DatabaseMigration diff --git a/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/migration/file/H2ToSqliteMigration.kt b/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/migration/file/H2ToSqliteMigration.kt index d060c863..bfc58ae7 100644 --- a/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/migration/file/H2ToSqliteMigration.kt +++ b/modules/dao/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/migration/file/H2ToSqliteMigration.kt @@ -4,9 +4,9 @@ import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.flow.flowOf -import org.jetbrains.exposed.sql.SchemaUtils -import org.jetbrains.exposed.sql.transactions.TransactionManager -import org.jetbrains.exposed.sql.transactions.transaction +import org.jetbrains.exposed.v1.jdbc.SchemaUtils +import org.jetbrains.exposed.v1.jdbc.transactions.TransactionManager +import org.jetbrains.exposed.v1.jdbc.transactions.transaction import ru.astrainteractive.klibs.mikro.core.dispatchers.KotlinDispatchers import ru.astrainteractive.klibs.mikro.core.logging.JUtiltLogger import ru.astrainteractive.klibs.mikro.core.logging.Logger diff --git a/modules/event-bukkit/src/main/kotlin/ru/astrainteractive/soulkeeper/module/event/event/BukkitSoulEvents.kt b/modules/event-bukkit/src/main/kotlin/ru/astrainteractive/soulkeeper/module/event/event/BukkitSoulEvents.kt index 8807bffc..1ca0e388 100644 --- a/modules/event-bukkit/src/main/kotlin/ru/astrainteractive/soulkeeper/module/event/event/BukkitSoulEvents.kt +++ b/modules/event-bukkit/src/main/kotlin/ru/astrainteractive/soulkeeper/module/event/event/BukkitSoulEvents.kt @@ -13,7 +13,7 @@ import ru.astrainteractive.astralibs.server.location.KLocation import ru.astrainteractive.astralibs.server.util.asBukkitLocation import ru.astrainteractive.astralibs.server.util.asKLocation import ru.astrainteractive.klibs.kstorage.api.CachedKrate -import ru.astrainteractive.klibs.kstorage.util.getValue +import ru.astrainteractive.klibs.kstorage.api.getValue import ru.astrainteractive.klibs.mikro.core.logging.JUtiltLogger import ru.astrainteractive.klibs.mikro.core.logging.Logger import ru.astrainteractive.soulkeeper.core.plugin.SoulsConfig diff --git a/modules/event-neoforge/src/main/kotlin/ru/astrainteractive/soulkeeper/module/event/event/ForgeSoulEvents.kt b/modules/event-neoforge/src/main/kotlin/ru/astrainteractive/soulkeeper/module/event/event/ForgeSoulEvents.kt index c92a0338..2ba0a7ff 100644 --- a/modules/event-neoforge/src/main/kotlin/ru/astrainteractive/soulkeeper/module/event/event/ForgeSoulEvents.kt +++ b/modules/event-neoforge/src/main/kotlin/ru/astrainteractive/soulkeeper/module/event/event/ForgeSoulEvents.kt @@ -23,7 +23,7 @@ import ru.astrainteractive.astralibs.server.player.OnlineKPlayer import ru.astrainteractive.astralibs.server.util.asLocatable import ru.astrainteractive.astralibs.server.util.asOnlineMinecraftPlayer import ru.astrainteractive.klibs.kstorage.api.CachedKrate -import ru.astrainteractive.klibs.kstorage.util.getValue +import ru.astrainteractive.klibs.kstorage.api.getValue import ru.astrainteractive.klibs.mikro.core.dispatchers.KotlinDispatchers import ru.astrainteractive.klibs.mikro.core.logging.JUtiltLogger import ru.astrainteractive.klibs.mikro.core.logging.Logger diff --git a/modules/service-bukkit/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/domain/armorstand/PacketEventsShowArmorStandUseCase.kt b/modules/service-bukkit/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/domain/armorstand/PacketEventsShowArmorStandUseCase.kt index 10358b9d..4ff2b637 100644 --- a/modules/service-bukkit/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/domain/armorstand/PacketEventsShowArmorStandUseCase.kt +++ b/modules/service-bukkit/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/domain/armorstand/PacketEventsShowArmorStandUseCase.kt @@ -15,7 +15,7 @@ import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer import ru.astrainteractive.astralibs.server.player.OnlineKPlayer import ru.astrainteractive.astralibs.server.util.asBukkitLocation import ru.astrainteractive.klibs.kstorage.api.CachedKrate -import ru.astrainteractive.klibs.kstorage.util.getValue +import ru.astrainteractive.klibs.kstorage.api.getValue import ru.astrainteractive.soulkeeper.core.plugin.PluginTranslation import ru.astrainteractive.soulkeeper.module.souls.database.model.Soul import java.util.Optional diff --git a/modules/service/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/renderer/ArmorStandRenderer.kt b/modules/service/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/renderer/ArmorStandRenderer.kt index 002d8992..efb6bb93 100644 --- a/modules/service/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/renderer/ArmorStandRenderer.kt +++ b/modules/service/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/renderer/ArmorStandRenderer.kt @@ -3,7 +3,7 @@ package ru.astrainteractive.soulkeeper.module.souls.renderer import ru.astrainteractive.astralibs.server.bridge.PlatformServer import ru.astrainteractive.astralibs.server.player.OnlineKPlayer import ru.astrainteractive.klibs.kstorage.api.CachedKrate -import ru.astrainteractive.klibs.kstorage.util.getValue +import ru.astrainteractive.klibs.kstorage.api.getValue import ru.astrainteractive.soulkeeper.core.plugin.SoulsConfig import ru.astrainteractive.soulkeeper.module.souls.database.model.DatabaseSoul import ru.astrainteractive.soulkeeper.module.souls.domain.armorstand.ShowArmorStandUseCase diff --git a/modules/service/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/renderer/SoulParticleRenderer.kt b/modules/service/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/renderer/SoulParticleRenderer.kt index 276de538..75900586 100644 --- a/modules/service/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/renderer/SoulParticleRenderer.kt +++ b/modules/service/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/renderer/SoulParticleRenderer.kt @@ -3,7 +3,7 @@ package ru.astrainteractive.soulkeeper.module.souls.renderer import kotlinx.coroutines.withContext import ru.astrainteractive.astralibs.server.player.OnlineKPlayer import ru.astrainteractive.klibs.kstorage.api.CachedKrate -import ru.astrainteractive.klibs.kstorage.util.getValue +import ru.astrainteractive.klibs.kstorage.api.getValue import ru.astrainteractive.klibs.mikro.core.dispatchers.KotlinDispatchers import ru.astrainteractive.soulkeeper.core.plugin.SoulsConfig import ru.astrainteractive.soulkeeper.module.souls.database.model.DatabaseSoul diff --git a/modules/service/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/renderer/SoulSoundRenderer.kt b/modules/service/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/renderer/SoulSoundRenderer.kt index 22f700b2..00ae86bb 100644 --- a/modules/service/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/renderer/SoulSoundRenderer.kt +++ b/modules/service/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/renderer/SoulSoundRenderer.kt @@ -3,7 +3,7 @@ package ru.astrainteractive.soulkeeper.module.souls.renderer import kotlinx.coroutines.withContext import ru.astrainteractive.astralibs.server.player.OnlineKPlayer import ru.astrainteractive.klibs.kstorage.api.CachedKrate -import ru.astrainteractive.klibs.kstorage.util.getValue +import ru.astrainteractive.klibs.kstorage.api.getValue import ru.astrainteractive.klibs.mikro.core.dispatchers.KotlinDispatchers import ru.astrainteractive.soulkeeper.core.plugin.SoulsConfig import ru.astrainteractive.soulkeeper.module.souls.database.model.DatabaseSoul diff --git a/modules/service/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/service/DeleteSoulWorker.kt b/modules/service/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/service/DeleteSoulWorker.kt index 1148940a..a292f8d0 100644 --- a/modules/service/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/service/DeleteSoulWorker.kt +++ b/modules/service/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/service/DeleteSoulWorker.kt @@ -4,7 +4,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.supervisorScope import ru.astrainteractive.astralibs.service.ServiceExecutor import ru.astrainteractive.klibs.kstorage.api.CachedKrate -import ru.astrainteractive.klibs.kstorage.util.getValue +import ru.astrainteractive.klibs.kstorage.api.getValue import ru.astrainteractive.klibs.mikro.core.logging.JUtiltLogger import ru.astrainteractive.klibs.mikro.core.logging.Logger import ru.astrainteractive.soulkeeper.core.plugin.SoulsConfig diff --git a/modules/service/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/service/FreeSoulWorker.kt b/modules/service/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/service/FreeSoulWorker.kt index 7851cb4a..01a4c00c 100644 --- a/modules/service/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/service/FreeSoulWorker.kt +++ b/modules/service/src/main/kotlin/ru/astrainteractive/soulkeeper/module/souls/service/FreeSoulWorker.kt @@ -4,7 +4,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.supervisorScope import ru.astrainteractive.astralibs.service.ServiceExecutor import ru.astrainteractive.klibs.kstorage.api.CachedKrate -import ru.astrainteractive.klibs.kstorage.util.getValue +import ru.astrainteractive.klibs.kstorage.api.getValue import ru.astrainteractive.klibs.mikro.core.logging.JUtiltLogger import ru.astrainteractive.klibs.mikro.core.logging.Logger import ru.astrainteractive.soulkeeper.core.plugin.SoulsConfig