Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump the versions group with 18 updates #64

Merged
merged 3 commits into from
Jan 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ makeevrserg.java.ktarget=21
# Project
makeevrserg.project.name=AstraMarket
makeevrserg.project.group=ru.astrainteractive.astramarket
makeevrserg.project.version.string=1.17.3
makeevrserg.project.version.string=1.17.4
makeevrserg.project.description=Market plugin for EmpireSMP
makeevrserg.project.developers=makeevrserg|Makeev Roman|[email protected]
makeevrserg.project.url=https://empireprojekt.ru
20 changes: 10 additions & 10 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
[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

# klibs
klibs-gradleplugin = "1.5.0-alpha02" # https://github.com/makeevrserg/gradle-plugin
klibs-mikro = "1.8.11" # https://github.com/makeevrserg/klibs.mikro
klibs-mikro = "1.8.13" # https://github.com/makeevrserg/klibs.mikro
klibs-kdi = "1.4.8" # https://github.com/makeevrserg/klibs.kdi
klibs-kstorage = "3.2.1" # https://github.com/makeevrserg/klibs.kstorage
klibs-kstorage = "3.2.3" # https://github.com/makeevrserg/klibs.kstorage

# Minecraft
minecraft-velocity = "4.0.0-SNAPSHOT" # https://github.com/PaperMC/Velocity
minecraft-spigot = "1.21-R0.1-SNAPSHOT" # https://github.com/PaperMC/Paper
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" # https://github.com/dmulloy2/ProtocolLib
minecraft-vault = "1.7.1" # https://github.com/MilkBowl/VaultAPI
minecraft-astralibs = "3.17.1" # https://github.com/Astra-Interactive/AstraLibs
minecraft-astralibs = "3.19.2" # https://github.com/Astra-Interactive/AstraLibs
minecraft-bstats = "3.1.0" # https://github.com/Bastian/bStats
minecraft-mockbukkit = "4.12.0" #https://github.com/MockBukkit/MockBukkit
minecraft-mockbukkit = "4.27.0" #https://github.com/MockBukkit/MockBukkit

# Exposed
ktor = "2.3.12"
Expand All @@ -35,7 +35,7 @@ gradle-shadow = "7.1.2" # https://github.com/johnrengelman/shadow
gradle-buildconfig = "5.5.1" # https://github.com/gmazzo/gradle-buildconfig-plugin

# Exposed
exposed = "0.57.0" # https://github.com/JetBrains/Exposed
exposed = "0.58.0" # https://github.com/JetBrains/Exposed

[libraries]
# Kotlin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,35 @@ package ru.astrainteractive.astramarket.command.auction
import ru.astrainteractive.astralibs.command.api.context.BukkitCommandContext
import ru.astrainteractive.astralibs.command.api.error.ErrorHandler
import ru.astrainteractive.astralibs.command.api.exception.DefaultCommandException
import ru.astrainteractive.astralibs.command.api.exception.NoPermissionException
import ru.astrainteractive.astramarket.command.auction.di.AuctionCommandDependencies

internal class AuctionCommandErrorHandler(
private val dependencies: AuctionCommandDependencies
) : ErrorHandler<BukkitCommandContext>,
AuctionCommandDependencies by dependencies {
override fun handle(commandContext: BukkitCommandContext, throwable: Throwable) {
override fun handle(ctx: BukkitCommandContext, throwable: Throwable) {
when (throwable) {
is DefaultCommandException -> with(kyoriComponentSerializer) {
when (throwable) {
is DefaultCommandException.NoPermissionException -> {
commandContext.sender.sendMessage(translation.general.noPermissions.component)
is NoPermissionException -> {
ctx.sender.sendMessage(translation.general.noPermissions.component)
}

else -> error("BadArgumentException not handled")
}
}

AuctionCommand.Error.NotPlayer -> with(kyoriComponentSerializer) {
commandContext.sender.sendMessage(translation.general.onlyForPlayers.component)
ctx.sender.sendMessage(translation.general.onlyForPlayers.component)
}

AuctionCommand.Error.WrongPrice -> with(kyoriComponentSerializer) {
commandContext.sender.sendMessage(translation.auction.wrongPrice.component)
ctx.sender.sendMessage(translation.auction.wrongPrice.component)
}

AuctionCommand.Error.WrongUsage -> with(kyoriComponentSerializer) {
commandContext.sender.sendMessage(translation.general.wrongArgs.component)
ctx.sender.sendMessage(translation.general.wrongArgs.component)
}

else -> error("${throwable::class} not handled")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package ru.astrainteractive.astramarket.command.auction

import ru.astrainteractive.astralibs.command.api.util.PluginExt.registerCommand
import ru.astrainteractive.astralibs.command.api.util.PluginExt.setCommandExecutor
import ru.astrainteractive.astramarket.command.auction.di.AuctionCommandDependencies

internal class AuctionCommandRegistry(
private val dependencies: AuctionCommandDependencies
) {
fun register() {
dependencies.plugin.registerCommand(
dependencies.plugin.setCommandExecutor(
alias = "amarket",
commandParser = AuctionCommandParser(),
commandExecutor = AuctionCommandExecutor(dependencies),
Expand Down
Loading