Skip to content

Commit 8731191

Browse files
DrexHDDrexHD
committed
Update dependencies
1 parent 294c6bb commit 8731191

File tree

14 files changed

+73
-61
lines changed

14 files changed

+73
-61
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [2.0.2] - 2025-02-25
10+
### Changed
11+
- Update dependencies
12+
913
## [2.0.1] - 2024-10-29
1014
### Fixed
1115
- Messages with translations

‎build.gradle.kts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import org.jetbrains.changelog.Changelog
33
plugins {
44
java
55
id("maven-publish")
6-
id("fabric-loom") version "1.7.+"
7-
kotlin("jvm") version "2.0.20"
6+
id("fabric-loom") version "1.9.+"
7+
kotlin("jvm") version "2.1.10"
88
id("io.github.goooler.shadow") version "8.1.7"
9-
kotlin("plugin.serialization") version "2.0.20"
10-
id("me.modmuss50.mod-publish-plugin") version "0.7.4"
9+
kotlin("plugin.serialization") version "2.1.10"
10+
id("me.modmuss50.mod-publish-plugin") version "0.8.4"
1111
id("org.jetbrains.changelog") version "2.+"
1212
}
1313

@@ -93,6 +93,7 @@ repositories {
9393
mavenCentral()
9494
maven("https://maven.nucleoid.xyz/")
9595
maven("https://s01.oss.sonatype.org/content/repositories/snapshots/")
96+
maven("https://snapshots-repo.kordex.dev")
9697
}
9798

9899
dependencies {

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎libs.versions.toml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
[versions]
2-
minecraft = "1.21.3"
3-
curseforge-minecraft="1.21.3"
4-
fabric-loader = "0.16.7"
5-
yarn-mappings = "1.21.3+build.2"
2+
minecraft = "1.21.4"
3+
curseforge-minecraft="1.21.4"
4+
fabric-loader = "0.16.10"
5+
yarn-mappings = "1.21.4+build.8"
66

7-
fabric-api = "0.107.0+1.21.3"
7+
fabric-api = "0.118.0+1.21.4"
88

99
# Kotlin
10-
fabric-kotlin = "1.12.1+kotlin.2.0.20"
10+
fabric-kotlin = "1.13.1+kotlin.2.1.10"
1111

1212
# Discord
13-
kord-extensions = "1.9.0-SNAPSHOT"
13+
kord-extensions = "2.3.1-SNAPSHOT"
1414
mc-discord-reserializer = "4.3.0"
1515
emoji-java = "5.1.1"
16-
adventure-gson = "4.17.0"
16+
adventure-gson = "4.19.0"
1717

18-
placeholder-api = "2.5.0+1.21.2"
19-
permission-api = "0.3.1"
20-
vanish-api = "1.5.7+1.21.2-rc2"
18+
placeholder-api = "2.5.2+1.21.3"
19+
permission-api = "0.3.3"
20+
vanish-api = "1.5.11+1.21.4"
2121
konf = "1.1.2"
2222

2323
[libraries]
@@ -28,7 +28,7 @@ fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabric-l
2828
fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabric-api" }
2929
fabric-kotlin = { module = "net.fabricmc:fabric-language-kotlin", version.ref = "fabric-kotlin" }
3030

31-
kord-extensions = { module = "com.kotlindiscord.kord.extensions:kord-extensions", version.ref = "kord-extensions" }
31+
kord-extensions = { module = "dev.kordex:kord-extensions", version.ref = "kord-extensions" }
3232
emoji = { module = "com.vdurmont:emoji-java", version.ref = "emoji-java"}
3333
mcDiscordReserializer = { module = "dev.vankka:mcdiscordreserializer", version.ref = "mc-discord-reserializer"}
3434
adventure-gson = { module = "net.kyori:adventure-text-serializer-gson", version.ref = "adventure-gson"}

‎src/main/kotlin/io/github/quiltservertools/blockbotdiscord/BlockBotDiscord.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package io.github.quiltservertools.blockbotdiscord
22

3-
import com.kotlindiscord.kord.extensions.ExtensibleBot
4-
import com.kotlindiscord.kord.extensions.utils.loadModule
53
import dev.kord.gateway.Intent
64
import dev.kord.gateway.Intents
75
import dev.kord.gateway.NON_PRIVILEGED
86
import dev.kord.gateway.PrivilegedIntent
7+
import dev.kordex.core.ExtensibleBot
8+
import dev.kordex.core.utils.loadModule
9+
import dev.kordex.data.api.DataCollection
910
import io.github.quiltservertools.blockbotapi.BlockBotApi
1011
import io.github.quiltservertools.blockbotdiscord.config.*
1112
import io.github.quiltservertools.blockbotdiscord.extensions.BlockBotApiExtension
@@ -69,6 +70,9 @@ object BlockBotDiscord : ModInitializer, CoroutineScope {
6970
enabled = true
7071
}
7172

73+
// data collection caused 404's during testing
74+
dataCollectionMode = DataCollection.None
75+
7276
extensions {
7377
add(::BlockBotApiExtension)
7478
if (config.getChannelsBi().containsKey("console")) add(::ConsoleExtension)

‎src/main/kotlin/io/github/quiltservertools/blockbotdiscord/MentionToMinecraftRenderer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.quiltservertools.blockbotdiscord
22

3-
import com.kotlindiscord.kord.extensions.ExtensibleBot
3+
import dev.kordex.core.ExtensibleBot
44
import dev.kord.common.entity.Snowflake
55
import dev.kord.core.Kord
66
import dev.kord.core.supplier.EntitySupplyStrategy

‎src/main/kotlin/io/github/quiltservertools/blockbotdiscord/config/BotSpec.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package io.github.quiltservertools.blockbotdiscord.config
22

33
import com.google.common.collect.BiMap
44
import com.google.common.collect.HashBiMap
5-
import com.kotlindiscord.kord.extensions.ExtensibleBot
5+
import dev.kordex.core.ExtensibleBot
66
import com.uchuhimo.konf.Config
77
import com.uchuhimo.konf.ConfigSpec
88
import dev.kord.common.entity.Snowflake

‎src/main/kotlin/io/github/quiltservertools/blockbotdiscord/extensions/BlockBotApiExtension.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package io.github.quiltservertools.blockbotdiscord.extensions
22

3-
import com.kotlindiscord.kord.extensions.checks.inGuild
4-
import com.kotlindiscord.kord.extensions.checks.isNotBot
5-
import com.kotlindiscord.kord.extensions.extensions.Extension
6-
import com.kotlindiscord.kord.extensions.extensions.event
7-
import com.kotlindiscord.kord.extensions.utils.ensureWebhook
8-
import com.kotlindiscord.kord.extensions.utils.getTopRole
9-
import com.kotlindiscord.kord.extensions.utils.hasPermission
3+
import dev.kordex.core.checks.inGuild
4+
import dev.kordex.core.checks.isNotBot
5+
import dev.kordex.core.extensions.Extension
6+
import dev.kordex.core.extensions.event
7+
import dev.kordex.core.utils.ensureWebhook
8+
import dev.kordex.core.utils.getTopRole
9+
import dev.kordex.core.utils.hasPermission
1010
import com.vdurmont.emoji.EmojiParser
1111
import dev.kord.common.entity.AllowedMentionType
1212
import dev.kord.common.entity.Permission

‎src/main/kotlin/io/github/quiltservertools/blockbotdiscord/extensions/ConsoleExtension.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.quiltservertools.blockbotdiscord.extensions
22

3-
import com.kotlindiscord.kord.extensions.extensions.Extension
3+
import dev.kordex.core.extensions.Extension
44
import dev.kord.core.behavior.channel.createMessage
55
import dev.kord.rest.builder.message.AllowedMentionsBuilder
66
import io.github.quiltservertools.blockbotapi.Channels

‎src/main/kotlin/io/github/quiltservertools/blockbotdiscord/extensions/EmojiPackGenExtension.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.quiltservertools.blockbotdiscord.extensions
22

3-
import com.kotlindiscord.kord.extensions.extensions.Extension
3+
import dev.kordex.core.extensions.Extension
44

55
class EmojiPackGenExtension : Extension() {
66
override val name = "emojipack-gen"

‎src/main/kotlin/io/github/quiltservertools/blockbotdiscord/extensions/MemberCommandsExtension.kt

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package io.github.quiltservertools.blockbotdiscord.extensions
22

3-
import com.kotlindiscord.kord.extensions.commands.Arguments
4-
import com.kotlindiscord.kord.extensions.commands.converters.impl.string
5-
import com.kotlindiscord.kord.extensions.extensions.Extension
6-
import com.kotlindiscord.kord.extensions.extensions.ephemeralSlashCommand
7-
import com.kotlindiscord.kord.extensions.extensions.publicSlashCommand
3+
import dev.kordex.core.commands.Arguments
4+
import dev.kordex.core.commands.converters.impl.string
5+
import dev.kordex.core.extensions.Extension
6+
import dev.kordex.core.extensions.ephemeralSlashCommand
7+
import dev.kordex.core.extensions.publicSlashCommand
88
import dev.kord.rest.builder.message.embed
9+
import dev.kordex.core.i18n.types.Key
910
import io.github.quiltservertools.blockbotdiscord.config.*
1011
import net.minecraft.server.MinecraftServer
1112
import net.minecraft.server.WhitelistEntry
@@ -20,8 +21,8 @@ class MemberCommandsExtension : Extension() {
2021
override suspend fun setup() {
2122
if (config[MemberCommandsSpec.PlayerListSpec.enabled]) {
2223
ephemeralSlashCommand {
23-
name = config[MemberCommandsSpec.PlayerListSpec.name]
24-
description = config[MemberCommandsSpec.PlayerListSpec.description]
24+
name = Key(config[MemberCommandsSpec.PlayerListSpec.name])
25+
description = Key(config[MemberCommandsSpec.PlayerListSpec.description])
2526

2627
guild(config.guildId)
2728

@@ -38,8 +39,8 @@ class MemberCommandsExtension : Extension() {
3839

3940
if (config[MemberCommandsSpec.WhiteListSpec.enabled]) {
4041
publicSlashCommand(::WhitelistArgs) {
41-
name = config[MemberCommandsSpec.WhiteListSpec.name]
42-
description = config[MemberCommandsSpec.WhiteListSpec.description]
42+
name = Key(config[MemberCommandsSpec.WhiteListSpec.name])
43+
description = Key(config[MemberCommandsSpec.WhiteListSpec.description])
4344

4445
guild(config.guildId)
4546

@@ -75,8 +76,8 @@ class MemberCommandsExtension : Extension() {
7576

7677
inner class WhitelistArgs : Arguments() {
7778
val player by string {
78-
name = config[MemberCommandsSpec.WhiteListSpec.PlayerArgumentSpec.name]
79-
description = config[MemberCommandsSpec.WhiteListSpec.PlayerArgumentSpec.description]
79+
name = Key(config[MemberCommandsSpec.WhiteListSpec.PlayerArgumentSpec.name])
80+
description = Key(config[MemberCommandsSpec.WhiteListSpec.PlayerArgumentSpec.description])
8081
}
8182
}
8283
}

‎src/main/kotlin/io/github/quiltservertools/blockbotdiscord/extensions/inline/DiscordCommandOutput.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.quiltservertools.blockbotdiscord.extensions.inline
22

3-
import com.kotlindiscord.kord.extensions.commands.application.slash.EphemeralSlashCommandContext
3+
import dev.kordex.core.commands.application.slash.EphemeralSlashCommandContext
44
import kotlinx.coroutines.runBlocking
55
import net.minecraft.server.command.CommandOutput
66
import net.minecraft.text.Text

‎src/main/kotlin/io/github/quiltservertools/blockbotdiscord/extensions/inline/InlineCommandsExtension.kt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package io.github.quiltservertools.blockbotdiscord.extensions.inline
22

3-
import com.kotlindiscord.kord.extensions.commands.Arguments
4-
import com.kotlindiscord.kord.extensions.commands.converters.impl.string
5-
import com.kotlindiscord.kord.extensions.extensions.Extension
6-
import com.kotlindiscord.kord.extensions.extensions.ephemeralSlashCommand
3+
import dev.kordex.core.commands.Arguments
4+
import dev.kordex.core.commands.converters.impl.string
5+
import dev.kordex.core.extensions.Extension
6+
import dev.kordex.core.extensions.ephemeralSlashCommand
7+
import dev.kordex.core.i18n.types.Key
78
import io.github.quiltservertools.blockbotdiscord.config.InlineCommandsSpec
89
import io.github.quiltservertools.blockbotdiscord.config.config
9-
import io.github.quiltservertools.blockbotdiscord.config.getGuild
1010
import io.github.quiltservertools.blockbotdiscord.config.guildId
1111
import net.minecraft.server.MinecraftServer
1212
import net.minecraft.server.command.ServerCommandSource
@@ -24,8 +24,8 @@ class InlineCommandsExtension : Extension() {
2424

2525
override suspend fun setup() {
2626
ephemeralSlashCommand(::InlineCommandsArgs) {
27-
name = "mc"
28-
description = "Run a command in game"
27+
name = Key("mc")
28+
description = Key("Run a command in game")
2929

3030
guild(config.guildId)
3131
allowByDefault = false
@@ -53,7 +53,8 @@ class InlineCommandsExtension : Extension() {
5353

5454
inner class InlineCommandsArgs : Arguments() {
5555
val command by string {
56-
name = "command"
57-
description = "The command to run"}
56+
name = Key("command")
57+
description = Key("The command to run")
58+
}
5859
}
5960
}

‎src/main/kotlin/io/github/quiltservertools/blockbotdiscord/extensions/linking/LinkingExtension.kt

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
package io.github.quiltservertools.blockbotdiscord.extensions.linking
22

33
import com.google.common.collect.HashBiMap
4-
import com.kotlindiscord.kord.extensions.checks.memberFor
5-
import com.kotlindiscord.kord.extensions.commands.Arguments
6-
import com.kotlindiscord.kord.extensions.commands.converters.impl.string
7-
import com.kotlindiscord.kord.extensions.extensions.Extension
8-
import com.kotlindiscord.kord.extensions.extensions.ephemeralSlashCommand
9-
import com.kotlindiscord.kord.extensions.utils.getTopRole
4+
import dev.kordex.core.checks.memberFor
5+
import dev.kordex.core.commands.Arguments
6+
import dev.kordex.core.commands.converters.impl.string
7+
import dev.kordex.core.extensions.Extension
8+
import dev.kordex.core.extensions.ephemeralSlashCommand
9+
import dev.kordex.core.utils.getTopRole
1010
import com.mojang.authlib.GameProfile
1111
import dev.kord.common.entity.Snowflake
1212
import dev.kord.core.behavior.edit
1313
import dev.kord.rest.request.RestRequestException
14+
import dev.kordex.core.i18n.types.Key
1415
import eu.pb4.placeholders.api.PlaceholderResult
1516
import eu.pb4.placeholders.api.Placeholders
1617
import eu.pb4.placeholders.api.TextParserUtils
@@ -42,8 +43,8 @@ class LinkingExtension : Extension() {
4243

4344
override suspend fun setup() {
4445
ephemeralSlashCommand(::LinkingArgs) {
45-
name = "link"
46-
description = "links your discord account to a minecraft account"
46+
name = Key("link")
47+
description = Key("links your discord account to a minecraft account")
4748

4849
guild(config.guildId)
4950

@@ -85,8 +86,8 @@ class LinkingExtension : Extension() {
8586

8687
inner class LinkingArgs : Arguments() {
8788
val code by string {
88-
name = "code"
89-
description = "The linking code received in-game"
89+
name = Key("code")
90+
description = Key("The linking code received in-game")
9091
}
9192
}
9293

0 commit comments

Comments
 (0)