Fix breaking changes and dependencies

Author: alexstaeding

api/src/main/kotlin/org/anvilpowered/catalyst/api/user/MinecraftUser.kt

@@ -29,7 +29,7 @@ import java.util.UUID
  * Represents a single user of a game.
  */
 data class MinecraftUser(
-    override val id: UUID,
+    override val uuid: UUID,
     val username: String,
     val ipAddress: String,
     val nickname: String? = null,

api/src/main/kotlin/org/anvilpowered/catalyst/api/user/MinecraftUserRepository.kt

@@ -20,7 +20,7 @@ package org.anvilpowered.catalyst.api.user
 
 import com.velocitypowered.api.proxy.Player
 import org.anvilpowered.anvil.core.db.MutableRepository
-import org.jetbrains.exposed.sql.SizedIterable
+import org.anvilpowered.anvil.core.db.SizedIterable
 import java.util.UUID
 
 interface MinecraftUserRepository : MutableRepository<MinecraftUser, MinecraftUser.CreateDto> {

api/src/main/kotlin/org/anvilpowered/catalyst/api/user/User.kt

@@ -30,7 +30,7 @@ import java.util.UUID
  * Represents a single universal user across all games and platforms.
  */
 data class User(
-    override val id: UUID,
+    override val uuid: UUID,
     val username: String,
     val email: String? = null,
     val discordUserId: Long? = null,

build.gradle.kts

@@ -45,14 +45,18 @@ allprojects {
         }
     }
 
+    java {
+        toolchain.languageVersion.set(JavaLanguageVersion.of(21))
+    }
+
     tasks {
         withType<KotlinCompile> {
-            kotlinOptions.jvmTarget = "17"
+            kotlinOptions.jvmTarget = "21"
         }
         withType<JavaCompile> {
             options.encoding = "UTF-8"
-            sourceCompatibility = "17"
-            targetCompatibility = "17"
+            sourceCompatibility = "21"
+            targetCompatibility = "21"
         }
     }
 }

core/build.gradle.kts

@@ -1,5 +1,7 @@
 dependencies {
     api(project(":catalyst-api"))
-    runtimeOnly(libs.driver.mariadb)
+    runtimeOnly(libs.driver.mariadb) {
+        exclude(group = "org.slf4j")
+    }
     runtimeOnly(libs.driver.postgresql)
 }

gradle/libs.versions.toml

@@ -1,25 +1,34 @@
 [versions]
 anvil = "0.4.0-SNAPSHOT"
 kotlin = "1.9.22"
+log4j = "2.23.1"
 
 [libraries]
 adventure-bom = "net.kyori:adventure-bom:4.16.0"
 anvil-core = { module = "org.anvilpowered:anvil-core", version.ref = "anvil" }
 anvil-velocity = { module = "org.anvilpowered:anvil-velocity", version.ref = "anvil" }
-brigadier = "com.mojang:brigadier:1.0.18"
 discord-jda = "net.dv8tion:JDA:5.0.0-beta.20"
 discord-webhooks = "club.minnced:discord-webhooks:0.8.4"
 driver-mariadb = "org.mariadb.jdbc:mariadb-java-client:3.3.2"
 driver-postgresql = "org.postgresql:postgresql:42.7.2"
+exposed-bom = "org.jetbrains.exposed:exposed-bom:0.50.1"
+exposed-core = { module = "org.jetbrains.exposed:exposed-core" }
+exposed-dao = { module = "org.jetbrains.exposed:exposed-dao" }
+exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc" }
+exposed-java-time = { module = "org.jetbrains.exposed:exposed-java-time" }
 kotest = "io.kotest:kotest-runner-junit5-jvm:5.8.0"
 kotlinx-serialization = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3"
+logging-api = { module = "org.apache.logging.log4j:log4j-api", version.ref = "log4j" }
+logging-core = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 luckperms = "net.luckperms:api:5.4"
-velocity = "com.velocitypowered:velocity-api:3.1.1"
+velocity = "com.velocitypowered:velocity-api:3.3.0-SNAPSHOT"
+
+[bundles]
+exposed = ["exposed-core", "exposed-dao", "exposed-jdbc", "exposed-java-time"]
 
 [plugins]
 kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 ktlint = "org.jlleitschuh.gradle.ktlint:11.6.1"
-shadow = "com.github.johnrengelman.shadow:8.1.1"
-sponge = "org.spongepowered.gradle.plugin:2.2.0"
+shadow = "io.github.goooler.shadow:8.1.7"

proxy/build.gradle.kts

@@ -4,7 +4,13 @@ plugins {
 }
 dependencies {
     api(libs.anvil.core)
-    api(platform("net.kyori:adventure-bom:4.16.0"))
+
+    api(platform(libs.exposed.bom))
+    api(libs.bundles.exposed) {
+        exclude(group = "org.slf4j")
+    }
+
+    api(platform(libs.adventure.bom))
     api("net.kyori:adventure-text-serializer-legacy")
     api("net.kyori:adventure-text-serializer-plain")
 

proxy/src/main/kotlin/org/anvilpowered/catalyst/proxy/chat/builder/ChannelMessageBuilderImpl.kt

@@ -48,8 +48,8 @@ internal class ChannelMessageBuilderImpl(
     private var rawContent: Component? = null
 
     override fun user(user: MinecraftUser): ChannelMessage.Builder {
-        player = proxyServer.getPlayer(user.id)
-            .orElseThrow { IllegalStateException("User ${user.username} with id ${user.id} is not on the server!") }
+        player = proxyServer.getPlayer(user.uuid)
+            .orElseThrow { IllegalStateException("User ${user.username} with id ${user.uuid} is not on the server!") }
         this.user = user
         return this
     }

proxy/src/main/kotlin/org/anvilpowered/catalyst/proxy/command/nickname/Delete.kt

@@ -73,7 +73,7 @@ fun NicknameCommandFactory.createDelete(): LiteralCommandNode<CommandSource> =
                             .append(Component.text("You don't have permission to delete other players' nicknames!", NamedTextColor.RED)),
                     )
                     yieldError()
-                } else if (minecraftUserRepository.deleteNickname(minecraftUser.id)) {
+                } else if (minecraftUserRepository.deleteNickname(minecraftUser.uuid)) {
                     context.source.sendMessage(
                         PluginMessages.pluginPrefix
                             .append(Component.text("The nickname of ", NamedTextColor.RED))

proxy/src/main/kotlin/org/anvilpowered/catalyst/proxy/command/nickname/Set.kt

@@ -77,7 +77,7 @@ fun NicknameCommandFactory.createSet(): LiteralCommandNode<CommandSource> =
                             .append(Component.text("You don't have permission to set other players' nicknames!", NamedTextColor.RED)),
                     )
                     yieldError()
-                } else if (minecraftUserRepository.updateNickname(minecraftUser.id, context["nickname"])) {
+                } else if (minecraftUserRepository.updateNickname(minecraftUser.uuid, context["nickname"])) {
                     context.source.sendMessage(
                         PluginMessages.pluginPrefix
                             .append(Component.text("The nickname of '", NamedTextColor.GRAY))

proxy/src/main/kotlin/org/anvilpowered/catalyst/proxy/db/SizedIterableWrapper.kt

@@ -0,0 +1,35 @@
+/*
+ *   OnTime - AnvilPowered.org
+ *   Copyright (C) 2019-2024 Contributors
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Affero General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU Affero General Public License for more details.
+ *
+ *     You should have received a copy of the GNU Affero General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package org.anvilpowered.catalyst.proxy.db
+
+import org.anvilpowered.anvil.core.db.SizedIterable
+import org.anvilpowered.anvil.core.db.SizedIterable as AnvilSizedIterable
+import org.jetbrains.exposed.sql.SizedIterable as ExposedSizedIterable
+
+fun <T> ExposedSizedIterable<T>.wrap(): SizedIterable<T> = SizedIterableWrapper(this)
+
+private class SizedIterableWrapper<out T>(
+    private val delegate: ExposedSizedIterable<T>,
+) : AnvilSizedIterable<T> {
+    override fun copy(): SizedIterable<T> = SizedIterableWrapper(delegate.copy())
+    override fun count(): Long = delegate.count()
+    override fun empty(): Boolean = delegate.empty()
+    override fun iterator(): Iterator<T> = delegate.iterator()
+    override fun limit(n: Int, offset: Long): SizedIterable<T> = SizedIterableWrapper(delegate.limit(n, offset))
+}

proxy/src/main/kotlin/org/anvilpowered/catalyst/proxy/db/user/MinecraftUserRepositoryImpl.kt

@@ -19,15 +19,17 @@
 package org.anvilpowered.catalyst.proxy.db.user
 
 import org.anvilpowered.anvil.core.db.MutableRepository
+import org.anvilpowered.anvil.core.db.SizedIterable
 import org.anvilpowered.catalyst.api.user.MinecraftUser
 import org.anvilpowered.catalyst.api.user.MinecraftUserRepository
 import org.anvilpowered.catalyst.api.user.User
+import org.anvilpowered.catalyst.proxy.db.wrap
 import org.apache.logging.log4j.Logger
-import org.jetbrains.exposed.sql.SizedIterable
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 import org.jetbrains.exposed.sql.deleteWhere
 import org.jetbrains.exposed.sql.mapLazy
 import org.jetbrains.exposed.sql.select
+import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction
 import org.jetbrains.exposed.sql.update
 import java.util.UUID
@@ -63,7 +65,7 @@ class MinecraftUserRepositoryImpl(
                 minecraftUser = newUser
             }.let { User(it.id.value, item.username, minecraftUserId = item.id) }
 
-            logger.info("Created new MinecraftUser ${item.id} with data $item and accompanying User ${user.id}")
+            logger.info("Created new MinecraftUser ${item.id} with data $item and accompanying User ${user.uuid}")
 
             MutableRepository.PutResult(MinecraftUser(newUser.id.value, item.username, item.ipAddress), created = true)
         } else {
@@ -107,10 +109,10 @@ class MinecraftUserRepositoryImpl(
 
     override suspend fun getAllUsernames(startWith: String): SizedIterable<String> = newSuspendedTransaction {
         MinecraftUserEntity.find { MinecraftUserTable.username like "$startWith%" }.mapLazy { it.username }
-    }
+    }.wrap()
 
     override suspend fun getByUsername(username: String): MinecraftUser? = newSuspendedTransaction {
-        MinecraftUserTable.select { MinecraftUserTable.username eq username }
+        MinecraftUserTable.selectAll().where { MinecraftUserTable.username eq username }
             .firstOrNull()
             ?.toMinecraftUser()
     }

proxy/src/main/kotlin/org/anvilpowered/catalyst/proxy/db/user/MinecraftUserTable.kt

@@ -41,7 +41,7 @@ internal class MinecraftUserEntity(id: EntityID<UUID>) : UUIDEntity(id) {
 }
 
 internal fun ResultRow.toMinecraftUser() = MinecraftUser(
-    id = this[MinecraftUserTable.id].value,
+    uuid = this[MinecraftUserTable.id].value,
     username = this[MinecraftUserTable.username],
     ipAddress = this[MinecraftUserTable.ipAddress],
     nickname = this[MinecraftUserTable.nickname],

proxy/src/main/kotlin/org/anvilpowered/catalyst/proxy/db/user/UserRepositoryImpl.kt

@@ -51,7 +51,7 @@ class UserRepositoryImpl(
         val user = checkNotNull(result) { "Failed to create User ${item.username}" }
             .single().toUser()
 
-        logger.info("Created new User ${user.id} with data $item")
+        logger.info("Created new User ${user.uuid} with data $item")
 
         user
     }
@@ -62,25 +62,25 @@ class UserRepositoryImpl(
             MutableRepository.PutResult(create(item), created = true)
         } else {
             // update the existing User
-            logger.info("Found existing User ${existingUser.id} with username ${existingUser.username}")
+            logger.info("Found existing User ${existingUser.uuid} with username ${existingUser.username}")
 
             if (existingUser.email != item.email) {
-                UserTable.update({ UserTable.id eq existingUser.id }) {
-                    logger.info("Updating email for User ${existingUser.id} from ${existingUser.email} to ${item.email}")
+                UserTable.update({ UserTable.id eq existingUser.uuid }) {
+                    logger.info("Updating email for User ${existingUser.uuid} from ${existingUser.email} to ${item.email}")
                     it[email] = item.email
                 }
             }
 
             if (existingUser.discordUserId != item.discordUserId) {
-                UserTable.update({ UserTable.id eq existingUser.id }) {
-                    logger.info("Updating discordUserId for User ${existingUser.id} from ${existingUser.discordUserId} to ${item.discordUserId}")
+                UserTable.update({ UserTable.id eq existingUser.uuid }) {
+                    logger.info("Updating discordUserId for User ${existingUser.uuid} from ${existingUser.discordUserId} to ${item.discordUserId}")
                     it[discordUserId] = item.discordUserId
                 }
             }
 
             if (existingUser.minecraftUserId != item.minecraftUserId) {
-                UserTable.update({ UserTable.id eq existingUser.id }) {
-                    logger.info("Updating minecraftUserId for User ${existingUser.id} from ${existingUser.minecraftUserId} to ${item.minecraftUserId}")
+                UserTable.update({ UserTable.id eq existingUser.uuid }) {
+                    logger.info("Updating minecraftUserId for User ${existingUser.uuid} from ${existingUser.minecraftUserId} to ${item.minecraftUserId}")
                     it[minecraftUserId] = item.minecraftUserId
                 }
             }

proxy/src/main/kotlin/org/anvilpowered/catalyst/proxy/db/user/UserTable.kt

@@ -43,7 +43,7 @@ internal class UserEntity(id: EntityID<UUID>) : UUIDEntity(id) {
 }
 
 internal fun ResultRow.toUser() = User(
-    id = this[UserTable.id].value,
+    uuid = this[UserTable.id].value,
     username = this[UserTable.username],
     email = this[UserTable.email],
 )