Merge pull request #52 from Astra-Interactive/dependabot/gradle/versions-6ca88bba75

build(deps): bump the versions group with 23 updates

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.3
+makeevrserg.project.version.string=7.7.4
 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,39 +1,39 @@
 [versions]
 # Kotlin
 kotlin-version = "2.0.0" # https://github.com/JetBrains/kotlin
-kotlin-coroutines = "1.9.0" # https://github.com/Kotlin/kotlinx.coroutines
-kotlin-json = "1.7.3" # https://github.com/Kotlin/kotlinx.serialization
-kotlin-kaml = "0.66.0" # https://github.com/charleskorn/kaml
+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.67.0" # https://github.com/charleskorn/kaml
 
 # Drivers
-driver-jdbc = "3.47.1.0" # https://github.com/xerial/sqlite-jdbc
+driver-jdbc = "3.48.0.0" # https://github.com/xerial/sqlite-jdbc
 driver-mysql = "8.0.33" # https://github.com/mysql/mysql-connector-j
 
 # Minecraft
 minecraft-version = "1.21"
-minecraft-velocity = "3.3.0-SNAPSHOT" # https://github.com/PaperMC/Velocity
-minecraft-spigot = "1.21-R0.1-SNAPSHOT" # https://github.com/PaperMC/Paper
+minecraft-velocity = "3.4.0-SNAPSHOT" # https://github.com/PaperMC/Velocity
+minecraft-spigot = "1.21.3-R0.1-SNAPSHOT" # https://github.com/PaperMC/Paper
 minecraft-papi = "2.11.6" # https://github.com/PlaceholderAPI/PlaceholderAPI
 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.17.0" # https://github.com/Astra-Interactive/AstraLibs
+minecraft-astralibs = "3.19.2" # https://github.com/Astra-Interactive/AstraLibs
 minecraft-bstats = "3.1.0"
-minecraft-mockbukkit = "4.12.0"
+minecraft-mockbukkit = "4.27.0"
 
 # Testing
 tests-org-testing = "7.10.2"
 tests-junit = "4.12"
 tests-mockito = "4.0.0"
-tests-junit-jupiter-api = "5.11.3"
-tests-junit-bom = "5.11.3"
+tests-junit-jupiter-api = "5.11.4"
+tests-junit-bom = "5.11.4"
 
 # Fabric
 minecraft-fabric-loom = "1.9.2"
 minecraft-fabric-kotlin = "1.13.0+"
-minecraft-fabric-loader = "0.16.9"
-minecraft-fabric-api = "0.111.0+"
+minecraft-fabric-loader = "0.16.10"
+minecraft-fabric-api = "0.114.4+"
 minecraft-fabric-yarn = "1.21+build.2"
 
 # Shadow
@@ -43,12 +43,12 @@ gradle-shadow = "8.1.1"
 gradle-buildconfig = "5.5.1"
 
 # Exposed
-exposed = "0.57.0"
+exposed = "0.58.0"
 
 # klibs
 klibs-gradleplugin = "1.5.0-alpha02" # https://github.com/makeevrserg/gradle-plugin
-klibs-kstorage = "3.2.1" # https://github.com/makeevrserg/klibs.kstorage
-klibs-mikro = "1.8.11" # https://github.com/makeevrserg/klibs.mikro
+klibs-kstorage = "3.2.3" # https://github.com/makeevrserg/klibs.kstorage
+klibs-mikro = "1.8.13" # https://github.com/makeevrserg/klibs.mikro
 
 [bundles]
 exposed = ["exposed-java-time", "exposed-jdbc", "exposed-dao", "exposed-core"]

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

@@ -2,8 +2,11 @@ package ru.astrainteractive.astratemplate.command
 
 import ru.astrainteractive.astralibs.command.api.context.BukkitCommandContext
 import ru.astrainteractive.astralibs.command.api.error.ErrorHandler
-import ru.astrainteractive.astralibs.command.api.exception.BukkitCommandException
-import ru.astrainteractive.astralibs.command.api.exception.DefaultCommandException
+import ru.astrainteractive.astralibs.command.api.exception.ArgumentTypeException
+import ru.astrainteractive.astralibs.command.api.exception.BadArgumentException
+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.logging.JUtiltLogger
 import ru.astrainteractive.astralibs.logging.Logger
@@ -21,40 +24,40 @@ internal class DefaultErrorHandler(
     private val translation by translationKrate
     private val kyori by kyoriKrate
 
-    override fun handle(commandContext: BukkitCommandContext, throwable: Throwable) {
+    override fun handle(ctx: BukkitCommandContext, throwable: Throwable) {
         with(kyori) {
             when (throwable) {
                 is AddItemCommand.Error -> {
                     when (throwable) {
                         AddItemCommand.Error.ItemNotfound -> {
-                            commandContext.sender.sendMessage(translation.fault.itemNotFound.component)
+                            ctx.sender.sendMessage(translation.fault.itemNotFound.component)
                         }
 
                         AddItemCommand.Error.SenderNotPlayer -> {
-                            commandContext.sender.sendMessage(translation.fault.notPlayer.component)
+                            ctx.sender.sendMessage(translation.fault.notPlayer.component)
                         }
                     }
                 }
 
                 is GuiCommand.Error -> {
                     when (throwable) {
                         GuiCommand.Error.NotPlayer -> {
-                            commandContext.sender.sendMessage(translation.fault.notPlayer.component)
+                            ctx.sender.sendMessage(translation.fault.notPlayer.component)
                         }
                     }
                 }
 
-                is BukkitCommandException.NoPlayerException -> {
-                    commandContext.sender.sendMessage(translation.fault.playerNotExists.component)
+                is NoPlayerException -> {
+                    ctx.sender.sendMessage(translation.fault.playerNotExists.component)
                 }
 
-                is DefaultCommandException.NoPermissionException -> {
-                    commandContext.sender.sendMessage(translation.fault.noPermission.component)
+                is NoPermissionException -> {
+                    ctx.sender.sendMessage(translation.fault.noPermission.component)
                 }
 
-                is BukkitCommandException.NoPotionEffectTypeException,
-                is DefaultCommandException.BadArgumentException,
-                is DefaultCommandException.ArgumentTypeException -> {
+                is NoPotionEffectTypeException,
+                is BadArgumentException,
+                is ArgumentTypeException -> {
                     error { "#handle intentionally unhandled error: $throwable" }
                 }
 

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

@@ -4,22 +4,22 @@ import org.bukkit.Bukkit
 import org.bukkit.Material
 import org.bukkit.entity.Player
 import ru.astrainteractive.astralibs.command.api.context.BukkitCommandContext
-import ru.astrainteractive.astralibs.command.api.exception.BukkitCommandException
+import ru.astrainteractive.astralibs.command.api.exception.NoPlayerException
 import ru.astrainteractive.astralibs.command.api.parser.CommandParser
 
 internal class AddItemCommandParser : CommandParser<AddItemCommand.Result, BukkitCommandContext> {
-    override fun parse(commandContext: BukkitCommandContext): AddItemCommand.Result {
-        if (commandContext.sender !is Player) throw AddItemCommand.Error.SenderNotPlayer
+    override fun parse(ctx: BukkitCommandContext): AddItemCommand.Result {
+        if (ctx.sender !is Player) throw AddItemCommand.Error.SenderNotPlayer
 
-        val playerString = commandContext.args.getOrNull(0)
+        val playerString = ctx.args.getOrNull(0)
         val player = playerString
             ?.let { value -> Bukkit.getOnlinePlayers().firstOrNull { it.name == value } }
-            ?: throw BukkitCommandException.NoPlayerException(playerString.orEmpty())
+            ?: throw NoPlayerException(playerString.orEmpty())
 
-        val amount = commandContext.args.getOrNull(2)
+        val amount = ctx.args.getOrNull(2)
             ?.toIntOrNull() ?: 1
 
-        val item = commandContext.args.getOrNull(1)
+        val item = ctx.args.getOrNull(1)
             ?.let(Material::getMaterial)
             ?: throw AddItemCommand.Error.ItemNotfound
 

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

@@ -3,7 +3,7 @@ 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.util.PluginExt.registerCommand
+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
@@ -25,7 +25,7 @@ internal class AddItemCommandRegistry(
 
     fun register() {
         tabCompleter(plugin)
-        plugin.registerCommand(
+        plugin.setCommandExecutor(
             alias = alias,
             commandParser = AddItemCommandParser(),
             commandExecutor = AddItemExecutor(),

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

@@ -2,11 +2,11 @@ package ru.astrainteractive.astratemplate.command.damage
 
 import org.bukkit.Bukkit
 import ru.astrainteractive.astralibs.command.api.context.BukkitCommandContext
-import ru.astrainteractive.astralibs.command.api.exception.BukkitCommandException
-import ru.astrainteractive.astralibs.command.api.exception.DefaultCommandException
+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.registerCommand
+import ru.astrainteractive.astralibs.command.api.util.PluginExt.setCommandExecutor
 import ru.astrainteractive.astralibs.permission.BukkitPermissibleExt.toPermissible
 import ru.astrainteractive.astratemplate.command.DefaultErrorHandler
 import ru.astrainteractive.astratemplate.command.damage.di.DamageCommandDependencies
@@ -20,12 +20,12 @@ internal class DamageCommandRegistry(
     private inner class CommandParserImpl : CommandParser<DamageCommand.Result, BukkitCommandContext> {
         override fun parse(commandContext: BukkitCommandContext): DamageCommand.Result {
             val hasPermission = commandContext.sender.toPermissible().hasPermission(PluginPermission.Damage)
-            if (!hasPermission) throw DefaultCommandException.NoPermissionException(PluginPermission.Damage)
+            if (!hasPermission) throw NoPermissionException(PluginPermission.Damage)
 
             val playerString = commandContext.args.getOrNull(0)
             val player = playerString
                 ?.let(Bukkit::getPlayerExact)
-                ?: throw BukkitCommandException.NoPlayerException(playerString.orEmpty())
+                ?: throw NoPlayerException(playerString.orEmpty())
 
             val damage = commandContext.args.getOrNull(1)
                 ?.toDoubleOrNull()
@@ -59,7 +59,7 @@ internal class DamageCommandRegistry(
 
     fun register() {
         tabCompleter()
-        plugin.registerCommand(
+        plugin.setCommandExecutor(
             alias = alias,
             commandParser = CommandParserImpl(),
             commandExecutor = CommandExecutorImpl(),

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

@@ -1,7 +1,7 @@
 package ru.astrainteractive.astratemplate.command.gui
 
 import org.bukkit.entity.Player
-import ru.astrainteractive.astralibs.command.api.util.PluginExt.registerCommand
+import ru.astrainteractive.astralibs.command.api.util.PluginExt.setCommandExecutor
 import ru.astrainteractive.astratemplate.command.DefaultErrorHandler
 import ru.astrainteractive.astratemplate.command.gui.di.GuiCommandDependencies
 import ru.astrainteractive.astratemplate.gui.router.Router
@@ -11,7 +11,7 @@ internal class GuiCommandRegistry(
 ) : GuiCommandDependencies by dependencies {
 
     fun register() {
-        plugin.registerCommand(
+        plugin.setCommandExecutor(
             alias = "atempgui",
             commandParser = commandParser@{ commandContext ->
                 val player = commandContext.sender as? Player ?: throw GuiCommand.Error.NotPlayer

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

@@ -2,10 +2,10 @@ package ru.astrainteractive.astratemplate.command.reload
 
 import org.bukkit.command.CommandSender
 import ru.astrainteractive.astralibs.command.api.context.BukkitCommandContext
-import ru.astrainteractive.astralibs.command.api.exception.DefaultCommandException
+import ru.astrainteractive.astralibs.command.api.exception.NoPermissionException
 import ru.astrainteractive.astralibs.command.api.executor.CommandExecutor
 import ru.astrainteractive.astralibs.command.api.parser.CommandParser
-import ru.astrainteractive.astralibs.command.api.util.PluginExt.registerCommand
+import ru.astrainteractive.astralibs.command.api.util.PluginExt.setCommandExecutor
 import ru.astrainteractive.astralibs.permission.BukkitPermissibleExt.toPermissible
 import ru.astrainteractive.astratemplate.AstraTemplate
 import ru.astrainteractive.astratemplate.command.DefaultErrorHandler
@@ -21,10 +21,10 @@ internal class ReloadCommandRegistry(
     }
 
     private inner class CommandParserImpl : CommandParser<ReloadCommand.Result, BukkitCommandContext> {
-        override fun parse(commandContext: BukkitCommandContext): ReloadCommand.Result {
-            val hasPermission = commandContext.sender.toPermissible().hasPermission(PluginPermission.Damage)
-            if (!hasPermission) throw DefaultCommandException.NoPermissionException(PluginPermission.Damage)
-            return ReloadCommand.Result(commandContext.sender)
+        override fun parse(ctx: BukkitCommandContext): ReloadCommand.Result {
+            val hasPermission = ctx.sender.toPermissible().hasPermission(PluginPermission.Damage)
+            if (!hasPermission) throw NoPermissionException(PluginPermission.Damage)
+            return ReloadCommand.Result(ctx.sender)
         }
     }
 
@@ -39,7 +39,7 @@ internal class ReloadCommandRegistry(
     }
 
     fun register() {
-        plugin.registerCommand(
+        plugin.setCommandExecutor(
             alias = "reload",
             commandParser = CommandParserImpl(),
             commandExecutor = CommandExecutorImpl(),

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

@@ -1,7 +1,7 @@
 package ru.astrainteractive.astratemplate.command.rickmorty
 
 import kotlinx.coroutines.launch
-import ru.astrainteractive.astralibs.command.api.util.PluginExt.registerCommand
+import ru.astrainteractive.astralibs.command.api.util.PluginExt.setCommandExecutor
 import ru.astrainteractive.astratemplate.command.DefaultErrorHandler
 import ru.astrainteractive.astratemplate.command.rickmorty.di.RickMortyCommandDependencies
 
@@ -10,7 +10,7 @@ internal class RandomRickAndMortyCommandRegistry(
 ) : RickMortyCommandDependencies by dependencies {
 
     fun register() {
-        plugin.registerCommand(
+        plugin.setCommandExecutor(
             alias = "rickandmorty",
             commandParser = { commandContext ->
                 RandomRickAndMortyCommand.Result(commandContext.sender)

instances/forge/build.gradle.kts

@@ -18,7 +18,7 @@ val implementation by configurations.getting {
 }
 
 dependencies {
-    minecraft("net.minecraftforge:forge:1.21.3-53.0.25")
+    minecraft("net.minecraftforge:forge:1.21.4-54.0.17")
     // AstraLibs
     shade(libs.minecraft.astralibs.core)
     shade(libs.minecraft.astralibs.command)