Remove dead code and add add todos

build.gradle.kts

@@ -13,7 +13,6 @@ buildscript {
 
 plugins {
     id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.17.0"
-//    id("io.freefair.aspectj.post-compile-weaving") version "8.13.1"
     java
 }
 
@@ -30,17 +29,11 @@ allprojects {
     }
 
     apply(plugin = "java")
-//    apply(plugin = "io.freefair.aspectj.post-compile-weaving")
 
     dependencies {
-//        implementation(platform("org.springframework.boot:spring-boot-dependencies:3.4.4"))
-//        implementation(platform("io.ktor:ktor-bom:3.0.3"))
-//        implementation(platform("org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:2025.4.10"))
-
         implementation(platform(project(":surf-cloud-bom")))
 
         compileOnly("org.springframework.boot:spring-boot-configuration-processor:3.5.3")
-        //    "kapt"("org.springframework.boot:spring-boot-configuration-processor:3.4.3")
 
         testImplementation(kotlin("test"))
     }

buildSrc/build.gradle.kts

@@ -8,15 +8,5 @@ repositories {
 }
 
 dependencies {
-//    val kotlinVersion = "2.1.0"
-//    val dokkaVersion = "2.0.0-Beta"
-
     implementation("org.springframework.boot:org.springframework.boot.gradle.plugin:3.5.3")
-//    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
-//    implementation("org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion")
-//    implementation("org.jetbrains.kotlin:kotlin-lombok:$kotlinVersion")
-//    implementation("org.jetbrains.kotlin:kotlin-noarg:$kotlinVersion")
-//    implementation("org.jetbrains.dokka:dokka-gradle-plugin:$dokkaVersion")
-//    implementation("org.hibernate.build:gradle-maven-publish-auth:3.0.4")
-//    compileOnly("com.gradleup.shadow:shadow-gradle-plugin:8.3.5")
 }

buildSrc/src/main/kotlin/core-convention.gradle.kts

@@ -1,12 +1,9 @@
 @file:Suppress("UnstableApiUsage")
 
-
 plugins {
     java
 }
 
-
-
 repositories {
     mavenCentral()
 }
@@ -16,7 +13,5 @@ dependencies {
     implementation(platform("io.ktor:ktor-bom:3.2.1"))
     implementation(platform("org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:2025.7.8"))
 
-
     compileOnly("org.springframework.boot:spring-boot-configuration-processor:3.5.3")
-//    "kapt"("org.springframework.boot:spring-boot-configuration-processor:3.4.3")
 }

gradle/libs.versions.toml

@@ -4,24 +4,18 @@ aide-reflection = "1.3"
 netty = "4.2.2.Final"
 netty-tcnative = "2.0.72.Final"
 datafixerupper = "8.0.16"
-#byte-buddy = "1.15.10"
 exposed = "0.61.0"
 maven-impl = "4.0.0-rc-2"
 maven-resolver = "2.0.5"
 jline = "3.30.4"
 brigadier = "1.3.10"
 terminalconsoleappender = "1.3.0"
 bson-kotlinx = "5.4.0"
-aspectjweaver = "1.9.22.1"
 zstd-jni = "1.5.7-4"
 luckperms-api = "5.4"
 reactive-streams = "1.0.4"
-ehcache = "3.10.8"
 kotlin-byte-buf-serializer = "1.0.0"
 voicechat-api = "2.5.27"
-discord-webhooks = "1.0"
-konf = "1.1.2"
-
 
 [libraries]
 velocity-native = { module = "com.velocitypowered:velocity-native", version.ref = "velocity-version" }
@@ -71,7 +65,6 @@ flyway-mysql = { module = "org.flywaydb:flyway-mysql" }
 spring-instrument = { module = "org.springframework:spring-instrument" }
 kotlin-byte-buf-serializer = { module = "dev.slne.surf:kotlin-byte-buf-serializer", version.ref = "kotlin-byte-buf-serializer" }
 voicechat-api = { module = "de.maxhenkel.voicechat:voicechat-api", version.ref = "voicechat-api" }
-discord-webhooks = { module = "com.github.BinaryWriter:discord-webhooks", version.ref = "discord-webhooks" }
 
 [plugins]
 spring-boot = { id = "org.springframework.boot" }

surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/SurfCloudApplication.kt

@@ -22,8 +22,7 @@ import java.lang.annotation.Inherited
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
 @EnableScheduling
-@EnableAsync
-//@EnableAspectJAutoProxy(proxyTargetClass = true, exposeProxy = true)
+@EnableAsync(mode = AdviceMode.ASPECTJ)
 @EntityScan
 @EnableCaching
 @AutoConfigurationPackage

surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/codec/StringIdDispatchCodec.kt

@@ -4,9 +4,9 @@ package dev.slne.surf.cloud.api.common.netty.network.codec
 
 import dev.slne.surf.cloud.api.common.netty.protocol.buffer.readUtf
 import dev.slne.surf.cloud.api.common.netty.protocol.buffer.writeUtf
-import dev.slne.surf.cloud.api.common.util.freeze
-import dev.slne.surf.cloud.api.common.util.mutableObject2ObjectMapOf
-import dev.slne.surf.cloud.api.common.util.mutableObjectListOf
+import dev.slne.surf.surfapi.core.api.util.freeze
+import dev.slne.surf.surfapi.core.api.util.mutableObject2ObjectMapOf
+import dev.slne.surf.surfapi.core.api.util.mutableObjectListOf
 import io.netty.buffer.ByteBuf
 import io.netty.handler.codec.DecoderException
 import io.netty.handler.codec.EncoderException

surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/packet/packet-extension.kt

@@ -6,7 +6,7 @@ import dev.slne.surf.cloud.api.common.netty.network.codec.StreamCodec
 import dev.slne.surf.cloud.api.common.netty.network.codec.StreamDecoder
 import dev.slne.surf.cloud.api.common.netty.network.codec.StreamMemberEncoder
 import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
-import dev.slne.surf.cloud.api.common.util.mutableObject2ObjectMapOf
+import dev.slne.surf.surfapi.core.api.util.mutableObject2ObjectMapOf
 import io.netty.buffer.ByteBuf
 import kotlinx.serialization.InternalSerializationApi
 import kotlinx.serialization.serializer

surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/playtime/Playtime.kt

@@ -176,7 +176,11 @@ interface Playtime {
      * @param since Optional start time to filter playtime.
      * @return An [ObjectList] of pairs, each containing a category name and its corresponding playtime duration.
      */
-    fun topCategories(limit: Int = 5, since: ZonedDateTime? = null): ObjectList<Pair<String, Duration>>
+    fun topCategories(
+        limit: Int = 5,
+        since: ZonedDateTime? = null
+    ): ObjectList<Pair<String, Duration>>
 
     fun writeToByteBuf(buf: ByteBuf)
+    fun mutableObjectSetOf(): ObjectSet<String>
 }

surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/server/UserListImpl.kt

@@ -5,9 +5,9 @@ import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
 import dev.slne.surf.cloud.api.common.player.CloudPlayer
 import dev.slne.surf.cloud.api.common.player.CloudPlayerManager
 import dev.slne.surf.cloud.api.common.util.annotation.InternalApi
-import dev.slne.surf.cloud.api.common.util.mutableObjectSetOf
-import dev.slne.surf.cloud.api.common.util.synchronize
-import dev.slne.surf.cloud.api.common.util.toObjectSet
+import dev.slne.surf.surfapi.core.api.util.mutableObjectSetOf
+import dev.slne.surf.surfapi.core.api.util.synchronize
+import dev.slne.surf.surfapi.core.api.util.toObjectSet
 import it.unimi.dsi.fastutil.objects.ObjectSet
 import java.util.*
 

surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/codec/codec-util.kt

@@ -9,9 +9,9 @@ import com.mojang.serialization.codecs.RecordCodecBuilder
 import dev.slne.surf.cloud.api.common.netty.network.codec.streamCodec
 import dev.slne.surf.cloud.api.common.netty.network.codec.streamCodecUnitSimple
 import dev.slne.surf.cloud.api.common.netty.protocol.buffer.*
-import dev.slne.surf.cloud.api.common.util.objectListOf
 import dev.slne.surf.cloud.api.common.util.toIntArray
 import dev.slne.surf.cloud.api.common.util.toUuid
+import dev.slne.surf.surfapi.core.api.util.objectListOf
 import io.netty.buffer.ByteBuf
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet
 import net.kyori.adventure.bossbar.BossBar
@@ -382,7 +382,7 @@ object ExtraCodecs {
     // endregion
     // region nbt
     val COMPOUND_TAG_CODEC = streamCodec<ByteBuf, CompoundBinaryTag>({ buf, tag ->
-        ByteArrayOutputStream().use {out ->
+        ByteArrayOutputStream().use { out ->
             BinaryTagIO.writer().write(tag, out, BinaryTagIO.Compression.GZIP)
             buf.writeByteArray(out.toByteArray())
         }