Update - Gettin ready for 8.0.0 (#76)

Author: makeevrserg

gradle.properties

@@ -9,7 +9,7 @@ makeevrserg.java.ktarget=21
 # Project
 makeevrserg.project.name=AstraTemplate
 makeevrserg.project.group=ru.astrainteractive.astratemplate
-makeevrserg.project.version.string=7.7.9
+makeevrserg.project.version.string=7.8.0
 makeevrserg.project.description=Template plugin for EmpireProjekt
 makeevrserg.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com
 makeevrserg.project.url=https://github.com/Astra-Interactive/AstraTemplate

gradle/libs.versions.toml

@@ -1,12 +1,12 @@
 [versions]
 # Kotlin
-kotlin-version = "2.0.0" # https://github.com/JetBrains/kotlin
-kotlin-coroutines = "1.10.1" # https://github.com/Kotlin/kotlinx.coroutines
-kotlin-json = "1.8.0" # https://github.com/Kotlin/kotlinx.serialization
-kotlin-kaml = "0.72.0" # https://github.com/charleskorn/kaml
+kotlin-version = "2.2.0" # https://github.com/JetBrains/kotlin
+kotlin-coroutines = "1.10.2" # https://github.com/Kotlin/kotlinx.coroutines
+kotlin-json = "1.9.0" # https://github.com/Kotlin/kotlinx.serialization
+kotlin-kaml = "0.92.0" # https://github.com/charleskorn/kaml
 
 # Drivers
-driver-jdbc = "3.49.0.0" # https://github.com/xerial/sqlite-jdbc
+driver-jdbc = "3.50.3.0" # https://github.com/xerial/sqlite-jdbc
 driver-mysql = "8.0.33" # https://github.com/mysql/mysql-connector-j
 
 # Minecraft
@@ -18,16 +18,16 @@ minecraft-protocollib = "5.3.0"
 minecraft-wg = "7.0.7"
 minecraft-vault = "1.7.1" # https://github.com/MilkBowl/VaultAPI
 minecraft-coreprotect = "21.2"
-minecraft-astralibs = "3.19.3" # https://github.com/Astra-Interactive/AstraLibs
+minecraft-astralibs = "3.25.1" # https://github.com/Astra-Interactive/AstraLibs
 minecraft-bstats = "3.1.0"
 minecraft-mockbukkit = "4.33.2"
 
 # Testing
 tests-org-testing = "7.11.0"
 tests-junit = "4.12"
 tests-mockito = "4.0.0"
-tests-junit-jupiter-api = "5.11.4"
-tests-junit-bom = "5.11.4"
+tests-junit-jupiter-api = "5.13.4"
+tests-junit-bom = "5.13.4"
 
 # Fabric
 minecraft-fabric-loom = "1.10.1"
@@ -37,18 +37,18 @@ minecraft-fabric-api = "0.116.0+"
 minecraft-fabric-yarn = "1.21+build.2"
 
 # Shadow
-gradle-shadow = "8.1.1"
+gradle-shadow = "9.0.0-beta12" # https://github.com/johnrengelman/shadow
 
 # BuildConfig
-gradle-buildconfig = "5.5.1"
+gradle-buildconfig = "5.6.7"
 
 # Exposed
-exposed = "0.59.0"
+exposed = "0.61.0"
 
 # klibs
-klibs-gradleplugin = "1.5.0-alpha02" # https://github.com/makeevrserg/gradle-plugin
-klibs-kstorage = "3.2.6" # https://github.com/makeevrserg/klibs.kstorage
-klibs-mikro = "1.8.15" # https://github.com/makeevrserg/klibs.mikro
+klibs-gradleplugin = "1.10.0" # https://github.com/makeevrserg/gradle-plugin
+klibs-kstorage = "4.2.2" # https://github.com/makeevrserg/klibs.kstorage
+klibs-mikro = "1.12.0" # https://github.com/makeevrserg/klibs.mikro
 
 [bundles]
 exposed = ["exposed-java-time", "exposed-jdbc", "exposed-dao", "exposed-core"]
@@ -129,7 +129,7 @@ kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", versi
 minecraft-fabric-loom = { id = "fabric-loom", version.ref = "minecraft-fabric-loom" }
 
 # Gradle
-gradle-shadow = { id = "com.github.johnrengelman.shadow", version.ref = "gradle-shadow" }
+gradle-shadow = { id = "com.gradleup.shadow", version.ref = "gradle-shadow" }
 gradle-buildconfig = { id = "com.github.gmazzo.buildconfig", version.ref = "gradle-buildconfig" }
 
 # klibs - core

instances/bukkit/src/main/kotlin/ru/astrainteractive/astratemplate/AstraTemplate.kt

@@ -14,7 +14,7 @@ class AstraTemplate :
     JavaPlugin(),
     Logger by JUtiltLogger("AstraTemplate"),
     Lifecycle {
-    private val rootModule = RootModule.Default(this)
+    private val rootModule = RootModule(this)
 
     /**
      * This method called when server starts or PlugMan load plugin.

instances/bukkit/src/main/kotlin/ru/astrainteractive/astratemplate/command/DefaultErrorHandler.kt

@@ -8,62 +8,61 @@ import ru.astrainteractive.astralibs.command.api.exception.NoPermissionException
 import ru.astrainteractive.astralibs.command.api.exception.NoPlayerException
 import ru.astrainteractive.astralibs.command.api.exception.NoPotionEffectTypeException
 import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer
+import ru.astrainteractive.astralibs.kyori.unwrap
 import ru.astrainteractive.astralibs.logging.JUtiltLogger
 import ru.astrainteractive.astralibs.logging.Logger
 import ru.astrainteractive.astratemplate.command.additem.AddItemCommand
 import ru.astrainteractive.astratemplate.command.gui.GuiCommand
-import ru.astrainteractive.astratemplate.core.PluginTranslation
-import ru.astrainteractive.astratemplate.core.util.getValue
-import ru.astrainteractive.klibs.kstorage.api.Krate
+import ru.astrainteractive.astratemplate.core.plugin.PluginTranslation
+import ru.astrainteractive.klibs.kstorage.api.CachedKrate
+import ru.astrainteractive.klibs.kstorage.util.getValue
 
 internal class DefaultErrorHandler(
-    translationKrate: Krate<PluginTranslation>,
-    kyoriKrate: Krate<KyoriComponentSerializer>
+    translationKrate: CachedKrate<PluginTranslation>,
+    kyoriKrate: CachedKrate<KyoriComponentSerializer>
 ) : ErrorHandler<BukkitCommandContext>,
-    Logger by JUtiltLogger("AstraTemplate-DefaultErrorHandler") {
+    Logger by JUtiltLogger("AstraTemplate-DefaultErrorHandler"),
+    KyoriComponentSerializer by kyoriKrate.unwrap() {
     private val translation by translationKrate
-    private val kyori by kyoriKrate
 
     override fun handle(ctx: BukkitCommandContext, throwable: Throwable) {
-        with(kyori) {
-            when (throwable) {
-                is AddItemCommand.Error -> {
-                    when (throwable) {
-                        AddItemCommand.Error.ItemNotfound -> {
-                            ctx.sender.sendMessage(translation.fault.itemNotFound.component)
-                        }
+        when (throwable) {
+            is AddItemCommand.Error -> {
+                when (throwable) {
+                    AddItemCommand.Error.ItemNotfound -> {
+                        ctx.sender.sendMessage(translation.fault.itemNotFound.component)
+                    }
 
-                        AddItemCommand.Error.SenderNotPlayer -> {
-                            ctx.sender.sendMessage(translation.fault.notPlayer.component)
-                        }
+                    AddItemCommand.Error.SenderNotPlayer -> {
+                        ctx.sender.sendMessage(translation.fault.notPlayer.component)
                     }
                 }
+            }
 
-                is GuiCommand.Error -> {
-                    when (throwable) {
-                        GuiCommand.Error.NotPlayer -> {
-                            ctx.sender.sendMessage(translation.fault.notPlayer.component)
-                        }
+            is GuiCommand.Error -> {
+                when (throwable) {
+                    GuiCommand.Error.NotPlayer -> {
+                        ctx.sender.sendMessage(translation.fault.notPlayer.component)
                     }
                 }
+            }
 
-                is NoPlayerException -> {
-                    ctx.sender.sendMessage(translation.fault.playerNotExists.component)
-                }
+            is NoPlayerException -> {
+                ctx.sender.sendMessage(translation.fault.playerNotExists.component)
+            }
 
-                is NoPermissionException -> {
-                    ctx.sender.sendMessage(translation.fault.noPermission.component)
-                }
+            is NoPermissionException -> {
+                ctx.sender.sendMessage(translation.fault.noPermission.component)
+            }
 
-                is NoPotionEffectTypeException,
-                is BadArgumentException,
-                is ArgumentTypeException -> {
-                    error { "#handle intentionally unhandled error: $throwable" }
-                }
+            is NoPotionEffectTypeException,
+            is BadArgumentException,
+            is ArgumentTypeException -> {
+                error { "#handle intentionally unhandled error: $throwable" }
+            }
 
-                else -> {
-                    error { "#handle unhandled error: $throwable" }
-                }
+            else -> {
+                error { "#handle unhandled error: $throwable" }
             }
         }
     }

instances/bukkit/src/main/kotlin/ru/astrainteractive/astratemplate/command/additem/AddItemCommandRegistry.kt

@@ -3,14 +3,19 @@ package ru.astrainteractive.astratemplate.command.additem
 import org.bukkit.Bukkit
 import org.bukkit.Material
 import org.bukkit.plugin.java.JavaPlugin
+import ru.astrainteractive.astralibs.command.api.context.BukkitCommandContext
+import ru.astrainteractive.astralibs.command.api.error.ErrorHandler
 import ru.astrainteractive.astralibs.command.api.util.PluginExt.setCommandExecutor
-import ru.astrainteractive.astralibs.util.StringListExt.withEntry
-import ru.astrainteractive.astratemplate.command.DefaultErrorHandler
-import ru.astrainteractive.astratemplate.command.additem.di.AddItemCommandDependencies
+import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer
+import ru.astrainteractive.astralibs.kyori.unwrap
+import ru.astrainteractive.astralibs.util.withEntry
+import ru.astrainteractive.klibs.kstorage.api.CachedKrate
 
 internal class AddItemCommandRegistry(
-    dependencies: AddItemCommandDependencies
-) : AddItemCommandDependencies by dependencies {
+    private val plugin: JavaPlugin,
+    private val errorHandler: ErrorHandler<BukkitCommandContext>,
+    kyoriKrate: CachedKrate<KyoriComponentSerializer>
+) : KyoriComponentSerializer by kyoriKrate.unwrap() {
     private val alias = "add"
 
     private fun tabCompleter(plugin: JavaPlugin) {
@@ -29,10 +34,7 @@ internal class AddItemCommandRegistry(
             alias = alias,
             commandParser = AddItemCommandParser(),
             commandExecutor = AddItemExecutor(),
-            errorHandler = DefaultErrorHandler(
-                translationKrate = translationKrate,
-                kyoriKrate = kyoriKrate
-            )
+            errorHandler = errorHandler
         )
     }
 }

instances/bukkit/src/main/kotlin/ru/astrainteractive/astratemplate/command/additem/di/AddItemCommandDependencies.kt

@@ -1,11 +1,19 @@
 package ru.astrainteractive.astratemplate.command.common
 
-import ru.astrainteractive.astralibs.util.StringListExt.withEntry
-import ru.astrainteractive.astratemplate.command.common.di.CommonCommandsDependencies
+import org.bukkit.plugin.java.JavaPlugin
+import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer
+import ru.astrainteractive.astralibs.kyori.unwrap
+import ru.astrainteractive.astralibs.util.withEntry
+import ru.astrainteractive.astratemplate.core.plugin.PluginTranslation
+import ru.astrainteractive.klibs.kstorage.api.CachedKrate
+import ru.astrainteractive.klibs.kstorage.util.getValue
 
 internal class CommonCommandsRegistry(
-    dependencies: CommonCommandsDependencies
-) : CommonCommandsDependencies by dependencies {
+    private val plugin: JavaPlugin,
+    translationKrate: CachedKrate<PluginTranslation>,
+    kyoriKrate: CachedKrate<KyoriComponentSerializer>
+) : KyoriComponentSerializer by kyoriKrate.unwrap() {
+    private val translation by translationKrate
 
     fun register() {
         plugin.getCommand("atemp")?.setTabCompleter { sender, command, label, args ->
@@ -16,7 +24,7 @@ internal class CommonCommandsRegistry(
             }
         }
         plugin.getCommand("translation")?.setExecutor { sender, command, label, args ->
-            sender.sendMessage(translation.general.getByByCheck.let(kyori::toComponent))
+            sender.sendMessage(translation.general.getByByCheck.component)
             true
         }
     }

instances/bukkit/src/main/kotlin/ru/astrainteractive/astratemplate/command/common/CommonCommandsRegistry.kt

@@ -1,20 +1,29 @@
 package ru.astrainteractive.astratemplate.command.damage
 
 import org.bukkit.Bukkit
+import org.bukkit.plugin.java.JavaPlugin
 import ru.astrainteractive.astralibs.command.api.context.BukkitCommandContext
+import ru.astrainteractive.astralibs.command.api.error.ErrorHandler
 import ru.astrainteractive.astralibs.command.api.exception.NoPermissionException
 import ru.astrainteractive.astralibs.command.api.exception.NoPlayerException
 import ru.astrainteractive.astralibs.command.api.executor.CommandExecutor
 import ru.astrainteractive.astralibs.command.api.parser.CommandParser
 import ru.astrainteractive.astralibs.command.api.util.PluginExt.setCommandExecutor
+import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer
+import ru.astrainteractive.astralibs.kyori.unwrap
 import ru.astrainteractive.astralibs.permission.BukkitPermissibleExt.toPermissible
-import ru.astrainteractive.astratemplate.command.DefaultErrorHandler
-import ru.astrainteractive.astratemplate.command.damage.di.DamageCommandDependencies
-import ru.astrainteractive.astratemplate.core.PluginPermission
+import ru.astrainteractive.astratemplate.core.plugin.PluginPermission
+import ru.astrainteractive.astratemplate.core.plugin.PluginTranslation
+import ru.astrainteractive.klibs.kstorage.api.CachedKrate
+import ru.astrainteractive.klibs.kstorage.util.getValue
 
 internal class DamageCommandRegistry(
-    dependencies: DamageCommandDependencies
-) : DamageCommandDependencies by dependencies {
+    private val plugin: JavaPlugin,
+    private val errorHandler: ErrorHandler<BukkitCommandContext>,
+    translationKrate: CachedKrate<PluginTranslation>,
+    kyoriKrate: CachedKrate<KyoriComponentSerializer>
+) : KyoriComponentSerializer by kyoriKrate.unwrap() {
+    private val translation by translationKrate
     private val alias = "adamage"
 
     private inner class CommandParserImpl : CommandParser<DamageCommand.Result, BukkitCommandContext> {
@@ -41,9 +50,7 @@ internal class DamageCommandRegistry(
 
     private inner class CommandExecutorImpl : CommandExecutor<DamageCommand.Result> {
         override fun execute(input: DamageCommand.Result) {
-            with(kyori) {
-                input.player.sendMessage(translation.custom.damaged(input.damagerName).let(::toComponent))
-            }
+            input.player.sendMessage(translation.custom.damaged(input.damagerName).let(::toComponent))
             input.player.damage(input.damage)
         }
     }
@@ -63,10 +70,7 @@ internal class DamageCommandRegistry(
             alias = alias,
             commandParser = CommandParserImpl(),
             commandExecutor = CommandExecutorImpl(),
-            errorHandler = DefaultErrorHandler(
-                translationKrate = translationKrate,
-                kyoriKrate = kyoriKrate
-            )
+            errorHandler = errorHandler
         )
     }
 }