diff --git a/.github/workflows/qodana_code_quality.yml b/.github/workflows/qodana_code_quality.yml
new file mode 100644
index 00000000..8db88baa
--- /dev/null
+++ b/.github/workflows/qodana_code_quality.yml
@@ -0,0 +1,25 @@
+name: Qodana
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - master
+
+jobs:
+  qodana:
+    runs-on: ubuntu-latest
+    uses: production
+    permissions:
+      contents: write
+      pull-requests: write
+      checks: write
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 0
+      - name: 'Qodana Scan'
+        uses: JetBrains/qodana-action@v2024.3
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}
\ No newline at end of file
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
deleted file mode 100644
index 1dd7c4cc..00000000
--- a/.idea/dataSources.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="s23_surf_dev@51.195.3.239" uuid="3175cfb1-afbc-4dd0-9f32-8ee2d5dd9382">
-      <driver-ref>mariadb</driver-ref>
-      <synchronize>true</synchronize>
-      <jdbc-driver>org.mariadb.jdbc.Driver</jdbc-driver>
-      <jdbc-url>jdbc:mariadb://51.195.3.239:3306/s23_surf_dev</jdbc-url>
-      <jdbc-additional-properties>
-        <property name="com.intellij.clouds.kubernetes.db.host.port" />
-        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
-        <property name="com.intellij.clouds.kubernetes.db.resource.type" value="Deployment" />
-        <property name="com.intellij.clouds.kubernetes.db.container.port" />
-      </jdbc-additional-properties>
-      <working-dir>$ProjectFileDir$</working-dir>
-    </data-source>
-    <data-source source="LOCAL" name="s23_surf_admin@51.195.3.239" uuid="1f0d156f-cc12-4951-a402-9e252cdbfccc">
-      <driver-ref>mariadb</driver-ref>
-      <synchronize>true</synchronize>
-      <jdbc-driver>org.mariadb.jdbc.Driver</jdbc-driver>
-      <jdbc-url>jdbc:mariadb://51.195.3.239:3306/s23_surf_admin</jdbc-url>
-      <jdbc-additional-properties>
-        <property name="com.intellij.clouds.kubernetes.db.host.port" />
-        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
-        <property name="com.intellij.clouds.kubernetes.db.container.port" />
-      </jdbc-additional-properties>
-      <working-dir>$ProjectFileDir$</working-dir>
-    </data-source>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 9193f13d..bd76c0f8 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -5,6 +5,5 @@
       <option name="METHOD_MATCHER_CONFIG" value="java.util.Formatter,format,java.io.Writer,append,com.google.common.base.Preconditions,checkNotNull,org.hibernate.Session,close,java.io.PrintWriter,printf,java.io.PrintStream,printf,java.lang.foreign.Arena,ofAuto,java.lang.foreign.Arena,global,dev.slne.surf.cloud.core.netty.common.source.NettySourceImpl,base" />
     </inspection_tool>
     <inspection_tool class="SerializableHasSerialVersionUIDField" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="SurfNettyPacketHandler" enabled="true" level="WARNING" enabled_by_default="true" />
   </profile>
 </component>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index b10b3011..c75605a2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,29 +1,85 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
+import dev.slne.surf.surfapi.gradle.util.slnePublic
 
 buildscript {
     repositories {
         gradlePluginPortal()
-        maven("https://repo.slne.dev/repository/maven-unsafe/") { name = "maven-unsafe" }
+        maven("https://repo.slne.dev/repository/maven-public/") { name = "maven-public" }
     }
     dependencies {
         classpath("dev.slne.surf:surf-api-gradle-plugin:1.21.4+")
     }
 }
 
+plugins {
+    id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.17.0"
+    id("io.freefair.aspectj.post-compile-weaving") version "8.13.1"
+    java
+}
+
 allprojects {
+    apply(plugin = "java")
+    apply(plugin = "io.freefair.aspectj.post-compile-weaving")
+    group = "dev.slne.surf.cloud"
+    version = findProperty("version") as String
+
+    repositories {
+        slnePublic()
+    }
+
+    dependencies {
+        implementation(platform("org.springframework.boot:spring-boot-dependencies:3.4.3"))
+        implementation(platform("io.ktor:ktor-bom:3.0.3"))
+        implementation(platform("org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:2025.2.2"))
+
+        compileOnly("org.springframework.boot:spring-boot-configuration-processor:3.4.3")
+        //    "kapt"("org.springframework.boot:spring-boot-configuration-processor:3.4.3")
+    }
+
+
     tasks {
-        withType<ShadowJar> {
-            mergeServiceFiles {
-                setPath("META-INF")
-                exclude("META-INF/MANIFEST.MF")
-            }
+        configureShadowJar()
+        configureJar()
+    }
 
-            isZip64 = true
-        }
+    setupPublishing()
+}
+
+apiValidation {
+    ignoredProjects.addAll(
+        listOf(
+            "surf-cloud-core",
+            "surf-cloud-core-common",
+            "surf-cloud-core-client",
+            "surf-cloud-bukkit",
+            "surf-cloud-velocity",
+            "surf-cloud-standalone",
+            "surf-cloud-standalone-launcher",
+            "surf-cloud-test-standalone"
+        )
+    )
+    nonPublicMarkers.add("dev.slne.surf.cloud.api.common.util.annotation.InternalApi")
+}
+
+private fun TaskContainerScope.configureShadowJar() = withType<ShadowJar> {
+    mergeServiceFiles {
+        setPath("META-INF")
+        exclude("META-INF/MANIFEST.MF")
+    }
+
+    isZip64 = true
+}
 
-        withType<Jar> {
-            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+private fun TaskContainerScope.configureJar() = withType<Jar> {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+
+private fun setupPublishing() = afterEvaluate {
+    if (plugins.hasPlugin(PublishingPlugin::class)) {
+        configure<PublishingExtension> {
+            repositories {
+                slnePublic()
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/core-convention.gradle.kts b/buildSrc/src/main/kotlin/core-convention.gradle.kts
index 21e99cc8..663d9539 100644
--- a/buildSrc/src/main/kotlin/core-convention.gradle.kts
+++ b/buildSrc/src/main/kotlin/core-convention.gradle.kts
@@ -5,16 +5,18 @@ plugins {
     java
 }
 
-group = "dev.slne.surf.cloud"
-version = "1.21.1-1.0.0-SNAPSHOT"
+
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    implementation(platform("org.springframework.boot:spring-boot-dependencies:3.3.6"))
+    implementation(platform("org.springframework.boot:spring-boot-dependencies:3.4.3"))
+    implementation(platform("io.ktor:ktor-bom:3.0.3"))
+    implementation(platform("org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:2025.2.2"))
+
 
-    compileOnly("org.springframework.boot:spring-boot-configuration-processor:3.3.6")
-    "kapt"("org.springframework.boot:spring-boot-configuration-processor:3.3.6")
+    compileOnly("org.springframework.boot:spring-boot-configuration-processor:3.4.3")
+//    "kapt"("org.springframework.boot:spring-boot-configuration-processor:3.4.3")
 }
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/exclude-kotlin.gradle.kts b/buildSrc/src/main/kotlin/exclude-kotlin.gradle.kts
new file mode 100644
index 00000000..23622d98
--- /dev/null
+++ b/buildSrc/src/main/kotlin/exclude-kotlin.gradle.kts
@@ -0,0 +1,6 @@
+configurations {
+    "runtimeClasspath" {
+        exclude("org.jetbrains.kotlin", "kotlin-stdlib")
+        exclude("org.jetbrains.kotlin", "kotlin-reflect")
+    }
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/library-conventions.gradle.kts b/buildSrc/src/main/kotlin/library-conventions.gradle.kts
deleted file mode 100644
index fee3ad1b..00000000
--- a/buildSrc/src/main/kotlin/library-conventions.gradle.kts
+++ /dev/null
@@ -1,32 +0,0 @@
-//val springBootBom = "org.springframework.boot:spring-boot-dependencies:3.3.3"
-//project.dependencies.apply {
-//    add("implementation", platform(springBootBom))
-//}
-//
-//project.configurations.configureEach {
-//    if (isCanBeResolved && isCanBeConsumed) {
-//        dependencies.add(project.dependencies.platform(springBootBom))
-//    }
-//}
-//
-//val library: Configuration =
-//    configurations.maybeCreate("library").extendsFrom(configurations.getByName("compileOnly"))
-//val libraryApi: Configuration =
-//    configurations.maybeCreate("libraryApi").extendsFrom(configurations.getByName("compileOnlyApi"))
-//
-//tasks.register("generateAll") {
-//    group = "reporting"
-//    description = "Generates both dependencies and repos files."
-//
-//    val librariesRootComponent = libraryApi.incoming.resolutionResult.root
-//    val repos = project.repositories.withType(MavenArtifactRepository::class.java)
-//    val dependencies = librariesRootComponent.collectLibraries()
-//
-//    repos.forEach { repo ->
-//        println("Found Repo: ${repo.url}")
-//    }
-//
-//    dependencies.forEach { dependency ->
-//        println("Found Dependency: ${dependency}")
-//    }
-//}
\ No newline at end of file
diff --git a/docs/DocsModule.md b/docs/DocsModule.md
deleted file mode 100644
index 2d5da70c..00000000
--- a/docs/DocsModule.md
+++ /dev/null
@@ -1 +0,0 @@
-Welcome to the docs for my multimodule project!
\ No newline at end of file
diff --git a/docs/build.gradle.kts b/docs/build.gradle.kts
deleted file mode 100644
index 00d499f7..00000000
--- a/docs/build.gradle.kts
+++ /dev/null
@@ -1,17 +0,0 @@
-plugins {
-//    kotlin("jvm") apply false
-//    `dokka-convention`
-}
-
-dependencies {
-//    dokka(project(":childProjectA"))
-//    dokka(project(":childProjectB"))
-}
-
-//dokka {
-//    moduleName.set("Dokka Surf Cloud")
-//
-//    dokkaPublications.html {
-//        includes.from("DocsModule.md")
-//    }
-//}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 0f868755..889b6f0f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,9 +1,10 @@
-kapt.include.compile.classpath=false
 org.gradle.parallel=true
 org.gradle.daemon=true
+org.gradle.jvmargs=-Xmx4G
 
 kotlin.stdlib.default.dependency=false
 
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
-kapt.use.k2=true
\ No newline at end of file
+
+version=1.21.1-1.0.0-SNAPSHOT
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f322103b..122a2a67 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,8 +1,81 @@
 [versions]
 velocity-version = "3.4.0-SNAPSHOT"
-auto-service = "1.1.1"
+aide-reflection = "1.3"
+netty = "4.1.117.Final"
+nbt = "6.1"
+datafixerupper = "8.0.16"
+byte-buddy = "1.15.10"
+exposed = "0.60.0"
+maven-impl = "4.0.0-rc-2"
+maven-resolver = "2.0.5"
+jline = "3.26.3"
+brigadier = "1.3.10"
+terminalconsoleappender = "1.3.0"
+bson-kotlinx = "5.3.0"
+aspectjweaver = "1.9.22.1"
+zstd-jni = "1.5.6-9"
+luckperms-api = "5.4"
+reactive-streams = "1.0.4"
+ehcache = "3.10.8"
+
 
 [libraries]
 velocity-native = { module = "com.velocitypowered:velocity-native", version.ref = "velocity-version" }
-auto-service-annotations = { module = "com.google.auto.service:auto-service-annotations", version.ref = "auto-service" }
-auto-service = { module = "com.google.auto.service:auto-service", version.ref = "auto-service" }
\ No newline at end of file
+spring-boot-starter = { module = "org.springframework.boot:spring-boot-starter" }
+spring-boot-starter-cache = { module = "org.springframework.boot:spring-boot-starter-cache" }
+jackson-core = { module = "com.fasterxml.jackson.core:jackson-core" }
+jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind" }
+jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin" }
+aide-reflection = { module = "tech.hiddenproject:aide-reflection", version.ref = "aide-reflection" }
+netty-all = { module = "io.netty:netty-all", version.ref = "netty" }
+nbt = { module = "com.github.Querz:NBT", version.ref = "nbt" }
+spring-data-jpa = { module = "org.springframework.data:spring-data-jpa" }
+datafixerupper = { module = "com.mojang:datafixerupper", version.ref = "datafixerupper" }
+byte-buddy = { module = "net.bytebuddy:byte-buddy", version.ref = "byte-buddy" }
+jakarta-persistence-api = { module = "jakarta.persistence:jakarta.persistence-api" }
+exposed-spring-boot-starter = { module = "org.jetbrains.exposed:exposed-spring-boot-starter", version.ref = "exposed" }
+exposed-java-time = { module = "org.jetbrains.exposed:exposed-java-time", version.ref = "exposed" }
+maven-impl = { module = "org.apache.maven:maven-impl", version.ref = "maven-impl" }
+maven-resolver = { module = "org.apache.maven.resolver:maven-resolver-supplier-mvn4", version.ref = "maven-resolver" }
+jline = { module = "org.jline:jline", version.ref = "jline" }
+brigadier = { module = "com.mojang:brigadier", version.ref = "brigadier" }
+terminalconsoleappender = { module = "net.minecrell:terminalconsoleappender", version.ref = "terminalconsoleappender" }
+ktor-server-core-jvm = { module = "io.ktor:ktor-server-core-jvm" }
+ktor-server-netty = { module = "io.ktor:ktor-server-netty" }
+ktor-server-core = { module = "io.ktor:ktor-server-core" }
+ktor-server-html-builder = { module = "io.ktor:ktor-server-html-builder" }
+kotlin-css = { module = "org.jetbrains.kotlin-wrappers:kotlin-css" }
+ktor-server-websockets = { module = "io.ktor:ktor-server-websockets" }
+ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json" }
+bson-kotlinx = { module = "org.mongodb:bson-kotlinx", version.ref = "bson-kotlinx" }
+aspectjweaver = { module = "org.aspectj:aspectjweaver" }
+aspectjrt = { module = "org.aspectj:aspectjrt" }
+zstd-jni = { module = "com.github.luben:zstd-jni", version.ref = "zstd-jni" }
+luckperms-api = { module = "net.luckperms:api", version.ref = "luckperms-api" }
+mariadb-java-client = { module = "org.mariadb.jdbc:mariadb-java-client" }
+mysql-connector-j = { module = "com.mysql:mysql-connector-j" }
+spring-boot-starter-data-jpa = { module = "org.springframework.boot:spring-boot-starter-data-jpa" }
+reactive-streams = { module = "org.reactivestreams:reactive-streams", version.ref = "reactive-streams" }
+hibernate-jcache = { module = "org.hibernate.orm:hibernate-jcache" }
+ehcache = { module = "org.ehcache:ehcache", version.ref = "ehcache" }
+ktor-server-status-pages = { module = "io.ktor:ktor-server-status-pages" }
+spring-boot-starter-log4j2 = { module = "org.springframework.boot:spring-boot-starter-log4j2" }
+spring-aop = { module = "org.springframework:spring-aop" }
+spring-aspects = { module = "org.springframework:spring-aspects" }
+flyway-core = { module = "org.flywaydb:flyway-core" }
+flyway-mysql = { module = "org.flywaydb:flyway-mysql" }
+spring-instrument = { module = "org.springframework:spring-instrument" }
+
+
+[plugins]
+spring-boot = { id = "org.springframework.boot" }
+
+[bundles]
+spring-aop = ["spring-aop", "aspectjweaver", "aspectjrt", "spring-aspects"]
+spring-api-common = ["spring-boot-starter", "spring-boot-starter-cache"]
+jackson-api-common = ["jackson-core", "jackson-databind", "jackson-module-kotlin"]
+exposed-api-server = ["exposed-spring-boot-starter", "exposed-java-time"]
+maven-libraries = ["maven-impl", "maven-resolver"]
+console-api = ["jline", "brigadier", "terminalconsoleappender"]
+ktor-api-server = ["ktor-server-core-jvm", "ktor-server-netty", "ktor-server-core", "ktor-server-html-builder", "kotlin-css", "ktor-server-websockets", "ktor-serialization-kotlinx-json"]
+flyway = ["flyway-core", "flyway-mysql"]
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index cea7a793..37f853b1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/qodana.yaml b/qodana.yaml
new file mode 100644
index 00000000..962f7de5
--- /dev/null
+++ b/qodana.yaml
@@ -0,0 +1,31 @@
+#-------------------------------------------------------------------------------#
+#               Qodana analysis is configured by qodana.yaml file               #
+#             https://www.jetbrains.com/help/qodana/qodana-yaml.html            #
+#-------------------------------------------------------------------------------#
+version: "1.0"
+
+#Specify inspection profile for code analysis
+profile:
+  name: qodana.starter
+
+#Enable inspections
+#include:
+#  - name: <SomeEnabledInspectionId>
+
+#Disable inspections
+#exclude:
+#  - name: <SomeDisabledInspectionId>
+#    paths:
+#      - <path/where/not/run/inspection>
+
+projectJDK: "21" #(Applied in CI/CD pipeline)
+
+#Execute shell command before Qodana execution (Applied in CI/CD pipeline)
+#bootstrap: sh ./prepare-qodana.sh
+
+#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline)
+#plugins:
+#  - id: <plugin.id> #(plugin id can be found at https://plugins.jetbrains.com)
+
+#Specify Qodana linter for analysis (Applied in CI/CD pipeline)
+linter: jetbrains/qodana-jvm:2024.3
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 129749f1..c585a093 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,8 +5,6 @@ rootProject.name = "surf-cloud"
 
 val ci = System.getenv("CI")?.toBoolean() == true
 
-include(":docs")
-
 include("surf-cloud-core")
 include("surf-cloud-bukkit")
 include("surf-cloud-velocity")
@@ -28,6 +26,16 @@ findProject(":surf-cloud-core:surf-cloud-core-common")?.name = "surf-cloud-core-
 include("surf-cloud-core:surf-cloud-core-client")
 findProject(":surf-cloud-core:surf-cloud-core-client")?.name = "surf-cloud-core-client"
 
+include("surf-cloud-api:surf-cloud-api-client:surf-cloud-api-client-common")
+findProject(":surf-cloud-api:surf-cloud-api-client:surf-cloud-api-client-common")?.name = "surf-cloud-api-client-common"
+
+include("surf-cloud-api:surf-cloud-api-client:surf-cloud-api-client-paper")
+findProject(":surf-cloud-api:surf-cloud-api-client:surf-cloud-api-client-paper")?.name = "surf-cloud-api-client-paper"
+
+include("surf-cloud-api:surf-cloud-api-client:surf-cloud-api-client-velocity")
+findProject(":surf-cloud-api:surf-cloud-api-client:surf-cloud-api-client-velocity")?.name = "surf-cloud-api-client-velocity"
+
 if (!ci) {
     include(":surf-cloud-test-plugin:surf-cloud-test-standalone")
-}
\ No newline at end of file
+}
+
diff --git a/surf-cloud-api/surf-cloud-api-client/build.gradle.kts b/surf-cloud-api/surf-cloud-api-client/build.gradle.kts
index 6d3a9269..e69de29b 100644
--- a/surf-cloud-api/surf-cloud-api-client/build.gradle.kts
+++ b/surf-cloud-api/surf-cloud-api-client/build.gradle.kts
@@ -1,8 +0,0 @@
-plugins {
-    id("dev.slne.surf.surfapi.gradle.core")
-    `core-convention`
-}
-
-dependencies {
-    api(project(":surf-cloud-api:surf-cloud-api-common"))
-}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-client/src/main/kotlin/dev/slne/surf/cloud/api/client/netty/packet/NettyPacketClientExtension.kt b/surf-cloud-api/surf-cloud-api-client/src/main/kotlin/dev/slne/surf/cloud/api/client/netty/packet/NettyPacketClientExtension.kt
deleted file mode 100644
index 1bc19eee..00000000
--- a/surf-cloud-api/surf-cloud-api-client/src/main/kotlin/dev/slne/surf/cloud/api/client/netty/packet/NettyPacketClientExtension.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-package dev.slne.surf.cloud.api.client.netty.packet
-
-import dev.slne.surf.cloud.api.client.netty.nettyManager
-import dev.slne.surf.cloud.api.common.netty.packet.DEFAULT_TIMEOUT
-import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
-import kotlin.time.Duration
-
-suspend fun NettyPacket.fire(convertExceptions: Boolean = true) {
-    nettyManager.client.fire(this, convertExceptions)
-}
-
-fun NettyPacket.fireAndForget() {
-    nettyManager.client.fireAndForget(this)
-}
-
-suspend fun <P : ResponseNettyPacket> RespondingNettyPacket<P>.fireAndAwait(timeout: Duration = DEFAULT_TIMEOUT): P? =
-    fireAndAwait(nettyManager.client.connection, timeout)
-
-suspend fun <P : ResponseNettyPacket> RespondingNettyPacket<P>.fireAndAwaitUrgent(): P? =
-    fireAndAwaitUrgent(nettyManager.client.connection)
-
-suspend fun <P : ResponseNettyPacket> RespondingNettyPacket<P>.fireAndAwaitOrThrow(timeout: Duration = DEFAULT_TIMEOUT): P =
-    fireAndAwaitOrThrow(nettyManager.client.connection, timeout)
-
-suspend fun <P : ResponseNettyPacket> RespondingNettyPacket<P>.fireAndAwaitOrThrowUrgent(): P =
-    fireAndAwaitOrThrowUrgent(nettyManager.client.connection)
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-common/api/surf-cloud-api-client-common.api b/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-common/api/surf-cloud-api-client-common.api
new file mode 100644
index 00000000..6b166e92
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-common/api/surf-cloud-api-client-common.api
@@ -0,0 +1,21 @@
+public abstract interface class dev/slne/surf/cloud/api/client/netty/CloudClientNettyManager {
+	public static final field Companion Ldev/slne/surf/cloud/api/client/netty/CloudClientNettyManager$Companion;
+	public abstract fun getClient ()Ldev/slne/surf/cloud/api/common/netty/NettyClient;
+}
+
+public final class dev/slne/surf/cloud/api/client/netty/CloudClientNettyManager$Companion : dev/slne/surf/cloud/api/client/netty/CloudClientNettyManager {
+	public fun getClient ()Ldev/slne/surf/cloud/api/common/netty/NettyClient;
+}
+
+public final class dev/slne/surf/cloud/api/client/netty/packet/NettyPacketClientExtensionKt {
+	public static final fun fire (Ldev/slne/surf/cloud/api/common/netty/packet/NettyPacket;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun fire$default (Ldev/slne/surf/cloud/api/common/netty/packet/NettyPacket;ZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun fireAndAwait-8Mi8wO0 (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun fireAndAwait-8Mi8wO0$default (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;JLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun fireAndAwaitOrThrow-8Mi8wO0 (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun fireAndAwaitOrThrow-8Mi8wO0$default (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;JLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun fireAndAwaitOrThrowUrgent (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static final fun fireAndAwaitUrgent (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static final fun fireAndForget (Ldev/slne/surf/cloud/api/common/netty/packet/NettyPacket;)V
+}
+
diff --git a/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-common/build.gradle.kts b/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-common/build.gradle.kts
new file mode 100644
index 00000000..03725083
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-common/build.gradle.kts
@@ -0,0 +1,7 @@
+plugins {
+    id("dev.slne.surf.surfapi.gradle.core")
+}
+
+dependencies {
+    api(project(":surf-cloud-api:surf-cloud-api-common"))
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-client/src/main/kotlin/dev/slne/surf/cloud/api/client/netty/CloudClientNettyManager.kt b/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-common/src/main/kotlin/dev/slne/surf/cloud/api/client/netty/CloudClientNettyManager.kt
similarity index 52%
rename from surf-cloud-api/surf-cloud-api-client/src/main/kotlin/dev/slne/surf/cloud/api/client/netty/CloudClientNettyManager.kt
rename to surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-common/src/main/kotlin/dev/slne/surf/cloud/api/client/netty/CloudClientNettyManager.kt
index b1dbdb68..1956c886 100644
--- a/surf-cloud-api/surf-cloud-api-client/src/main/kotlin/dev/slne/surf/cloud/api/client/netty/CloudClientNettyManager.kt
+++ b/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-common/src/main/kotlin/dev/slne/surf/cloud/api/client/netty/CloudClientNettyManager.kt
@@ -1,16 +1,12 @@
 package dev.slne.surf.cloud.api.client.netty
 
 import dev.slne.surf.cloud.api.common.netty.NettyClient
-import dev.slne.surf.cloud.api.common.util.requiredService
+import dev.slne.surf.surfapi.core.api.util.requiredService
 import org.jetbrains.annotations.ApiStatus.NonExtendable
 
 @NonExtendable
 interface CloudClientNettyManager {
     val client: NettyClient
 
-    companion object {
-        val instance = requiredService<CloudClientNettyManager>()
-    }
-}
-
-val nettyManager get() = CloudClientNettyManager.instance
\ No newline at end of file
+    companion object : CloudClientNettyManager by requiredService<CloudClientNettyManager>()
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-common/src/main/kotlin/dev/slne/surf/cloud/api/client/netty/packet/NettyPacketClientExtension.kt b/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-common/src/main/kotlin/dev/slne/surf/cloud/api/client/netty/packet/NettyPacketClientExtension.kt
new file mode 100644
index 00000000..939c755f
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-common/src/main/kotlin/dev/slne/surf/cloud/api/client/netty/packet/NettyPacketClientExtension.kt
@@ -0,0 +1,49 @@
+@file:OptIn(InternalApi::class)
+
+package dev.slne.surf.cloud.api.client.netty.packet
+
+import dev.slne.surf.cloud.api.client.netty.CloudClientNettyManager
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.packet.DEFAULT_TIMEOUT
+import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.util.annotation.InternalApi
+import kotlin.time.Duration
+
+suspend fun NettyPacket.fire(convertExceptions: Boolean = true) {
+    CloudClientNettyManager.client.fire(this, convertExceptions)
+}
+
+fun NettyPacket.fireAndForget() {
+    CloudClientNettyManager.client.fireAndForget(this)
+}
+
+suspend fun <P : ResponseNettyPacket> RespondingNettyPacket<P>.fireAndAwait(timeout: Duration = DEFAULT_TIMEOUT): P? =
+    fireAndAwait(CloudClientNettyManager.client.connection, timeout)
+
+suspend fun <P : ResponseNettyPacket> RespondingNettyPacket<P>.fireAndAwaitUrgent(): P? =
+    fireAndAwaitUrgent(CloudClientNettyManager.client.connection)
+
+suspend fun <P : ResponseNettyPacket> RespondingNettyPacket<P>.fireAndAwaitOrThrow(timeout: Duration = DEFAULT_TIMEOUT): P =
+    fireAndAwaitOrThrow(CloudClientNettyManager.client.connection, timeout)
+
+suspend fun <P : ResponseNettyPacket> RespondingNettyPacket<P>.fireAndAwaitOrThrowUrgent(): P =
+    fireAndAwaitOrThrowUrgent(CloudClientNettyManager.client.connection)
+
+
+suspend inline fun <reified T, R> RespondingNettyPacket<T>.await(timeout: Duration = DEFAULT_TIMEOUT): R? where T : ResponseNettyPacket, T : CommonResponseType<R> {
+    return fireAndAwait(timeout)?.value
+}
+
+suspend inline fun <reified T, R> RespondingNettyPacket<T>.awaitUrgent(): R? where T : ResponseNettyPacket, T : CommonResponseType<R> {
+    return fireAndAwaitUrgent()?.value
+}
+
+suspend inline fun <reified T, R> RespondingNettyPacket<T>.awaitOrThrow(timeout: Duration = DEFAULT_TIMEOUT): R where T : ResponseNettyPacket, T : CommonResponseType<R> {
+    return fireAndAwaitOrThrow(timeout).value
+}
+
+suspend inline fun <reified T, R> RespondingNettyPacket<T>.awaitOrThrowUrgent(): R where T : ResponseNettyPacket, T : CommonResponseType<R> {
+    return fireAndAwaitOrThrowUrgent().value
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-paper/api/surf-cloud-api-client-paper.api b/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-paper/api/surf-cloud-api-client-paper.api
new file mode 100644
index 00000000..619d7e8c
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-paper/api/surf-cloud-api-client-paper.api
@@ -0,0 +1,15 @@
+public final class dev/slne/surf/cloud/api/client/paper/Paper_cloud_converterKt {
+	public static final fun toBukkitTpCause (Ldev/slne/surf/cloud/api/common/player/teleport/TeleportCause;)Lorg/bukkit/event/player/PlayerTeleportEvent$TeleportCause;
+	public static final fun toBukkitTpFlag (Ldev/slne/surf/cloud/api/common/player/teleport/TeleportFlag;)Lio/papermc/paper/entity/TeleportFlag;
+	public static final fun toCloudTpCause (Lorg/bukkit/event/player/PlayerTeleportEvent$TeleportCause;)Ldev/slne/surf/cloud/api/common/player/teleport/TeleportCause;
+	public static final fun toCloudTpFlag (Lio/papermc/paper/entity/TeleportFlag;)Ldev/slne/surf/cloud/api/common/player/teleport/TeleportFlag;
+	public static final fun toCloudTpLocation (Lorg/bukkit/Location;)Ldev/slne/surf/cloud/api/common/player/teleport/TeleportLocation;
+	public static final fun toLocation (Ldev/slne/surf/cloud/api/common/player/teleport/TeleportLocation;)Lorg/bukkit/Location;
+}
+
+public final class dev/slne/surf/cloud/api/client/paper/player/CloudPlayerBukkitExtensionsKt {
+	public static final fun teleport (Ldev/slne/surf/cloud/api/common/player/CloudPlayer;Lorg/bukkit/Location;Lorg/bukkit/event/player/PlayerTeleportEvent$TeleportCause;[Lio/papermc/paper/entity/TeleportFlag;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun teleport$default (Ldev/slne/surf/cloud/api/common/player/CloudPlayer;Lorg/bukkit/Location;Lorg/bukkit/event/player/PlayerTeleportEvent$TeleportCause;[Lio/papermc/paper/entity/TeleportFlag;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun toCloudOfflinePlayer (Lorg/bukkit/OfflinePlayer;)Ldev/slne/surf/cloud/api/common/player/OfflineCloudPlayer;
+}
+
diff --git a/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-paper/build.gradle.kts b/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-paper/build.gradle.kts
new file mode 100644
index 00000000..c6effa55
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-paper/build.gradle.kts
@@ -0,0 +1,7 @@
+plugins {
+    id("dev.slne.surf.surfapi.gradle.paper-raw")
+}
+
+dependencies {
+    api(project(":surf-cloud-api:surf-cloud-api-client:surf-cloud-api-client-common"))
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-paper/src/main/kotlin/dev/slne/surf/cloud/api/client/paper/paper-cloud-converter.kt b/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-paper/src/main/kotlin/dev/slne/surf/cloud/api/client/paper/paper-cloud-converter.kt
new file mode 100644
index 00000000..acb479d5
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-paper/src/main/kotlin/dev/slne/surf/cloud/api/client/paper/paper-cloud-converter.kt
@@ -0,0 +1,59 @@
+package dev.slne.surf.cloud.api.client.paper
+
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportCause
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportLocation
+import io.papermc.paper.entity.TeleportFlag
+import org.bukkit.Bukkit
+import org.bukkit.Location
+import org.bukkit.event.player.PlayerTeleportEvent
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportFlag as CloudTeleportFlag
+
+fun Location.toCloudTpLocation() = TeleportLocation(world.uid, x, y, z, yaw, pitch)
+fun TeleportLocation.toLocation() = Location(Bukkit.getWorld(world), x, y, z, yaw, pitch)
+fun PlayerTeleportEvent.TeleportCause.toCloudTpCause(): TeleportCause = when (this) {
+    PlayerTeleportEvent.TeleportCause.PLUGIN -> TeleportCause.PLUGIN
+    PlayerTeleportEvent.TeleportCause.COMMAND -> TeleportCause.COMMAND
+    PlayerTeleportEvent.TeleportCause.UNKNOWN -> TeleportCause.UNKNOWN
+    PlayerTeleportEvent.TeleportCause.DISMOUNT -> TeleportCause.DISMOUNT
+    PlayerTeleportEvent.TeleportCause.SPECTATE -> TeleportCause.SPECTATE
+    PlayerTeleportEvent.TeleportCause.EXIT_BED -> TeleportCause.EXIT_BED
+    PlayerTeleportEvent.TeleportCause.END_PORTAL -> TeleportCause.END_PORTAL
+    PlayerTeleportEvent.TeleportCause.CHORUS_FRUIT -> TeleportCause.CHORUS_FRUIT
+    PlayerTeleportEvent.TeleportCause.ENDER_PEARL -> TeleportCause.ENDER_PEARL
+    PlayerTeleportEvent.TeleportCause.END_GATEWAY -> TeleportCause.END_GATEWAY
+    PlayerTeleportEvent.TeleportCause.NETHER_PORTAL -> TeleportCause.NETHER_PORTAL
+}
+
+fun TeleportCause.toBukkitTpCause(): PlayerTeleportEvent.TeleportCause = when (this) {
+    TeleportCause.PLUGIN -> PlayerTeleportEvent.TeleportCause.PLUGIN
+    TeleportCause.COMMAND -> PlayerTeleportEvent.TeleportCause.COMMAND
+    TeleportCause.UNKNOWN -> PlayerTeleportEvent.TeleportCause.UNKNOWN
+    TeleportCause.DISMOUNT -> PlayerTeleportEvent.TeleportCause.DISMOUNT
+    TeleportCause.SPECTATE -> PlayerTeleportEvent.TeleportCause.SPECTATE
+    TeleportCause.EXIT_BED -> PlayerTeleportEvent.TeleportCause.EXIT_BED
+    TeleportCause.END_PORTAL -> PlayerTeleportEvent.TeleportCause.END_PORTAL
+    TeleportCause.CHORUS_FRUIT -> PlayerTeleportEvent.TeleportCause.CHORUS_FRUIT
+    TeleportCause.ENDER_PEARL -> PlayerTeleportEvent.TeleportCause.ENDER_PEARL
+    TeleportCause.END_GATEWAY -> PlayerTeleportEvent.TeleportCause.END_GATEWAY
+    TeleportCause.NETHER_PORTAL -> PlayerTeleportEvent.TeleportCause.NETHER_PORTAL
+}
+
+fun TeleportFlag.toCloudTpFlag(): CloudTeleportFlag = when (this) {
+    TeleportFlag.Relative.VELOCITY_X -> CloudTeleportFlag.VELOCITY_X
+    TeleportFlag.Relative.VELOCITY_Y -> CloudTeleportFlag.VELOCITY_Y
+    TeleportFlag.Relative.VELOCITY_Z -> CloudTeleportFlag.VELOCITY_Z
+    TeleportFlag.Relative.VELOCITY_ROTATION -> CloudTeleportFlag.VELOCITY_ROTATION
+    TeleportFlag.EntityState.RETAIN_VEHICLE -> CloudTeleportFlag.RETAIN_VEHICLE
+    TeleportFlag.EntityState.RETAIN_PASSENGERS -> CloudTeleportFlag.RETAIN_PASSENGERS
+    TeleportFlag.EntityState.RETAIN_OPEN_INVENTORY -> CloudTeleportFlag.RETAIN_OPEN_INVENTORY
+}
+
+fun CloudTeleportFlag.toBukkitTpFlag(): TeleportFlag = when (this) {
+    CloudTeleportFlag.VELOCITY_X -> TeleportFlag.Relative.VELOCITY_X
+    CloudTeleportFlag.VELOCITY_Y -> TeleportFlag.Relative.VELOCITY_Y
+    CloudTeleportFlag.VELOCITY_Z -> TeleportFlag.Relative.VELOCITY_Z
+    CloudTeleportFlag.VELOCITY_ROTATION -> TeleportFlag.Relative.VELOCITY_ROTATION
+    CloudTeleportFlag.RETAIN_VEHICLE -> TeleportFlag.EntityState.RETAIN_VEHICLE
+    CloudTeleportFlag.RETAIN_PASSENGERS -> TeleportFlag.EntityState.RETAIN_PASSENGERS
+    CloudTeleportFlag.RETAIN_OPEN_INVENTORY -> TeleportFlag.EntityState.RETAIN_OPEN_INVENTORY
+}
diff --git a/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-paper/src/main/kotlin/dev/slne/surf/cloud/api/client/paper/player/CloudPlayerBukkitExtensions.kt b/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-paper/src/main/kotlin/dev/slne/surf/cloud/api/client/paper/player/CloudPlayerBukkitExtensions.kt
new file mode 100644
index 00000000..8941a164
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-paper/src/main/kotlin/dev/slne/surf/cloud/api/client/paper/player/CloudPlayerBukkitExtensions.kt
@@ -0,0 +1,25 @@
+package dev.slne.surf.cloud.api.client.paper.player
+
+import dev.slne.surf.cloud.api.client.paper.toCloudTpCause
+import dev.slne.surf.cloud.api.client.paper.toCloudTpFlag
+import dev.slne.surf.cloud.api.client.paper.toCloudTpLocation
+import dev.slne.surf.cloud.api.common.player.CloudPlayer
+import dev.slne.surf.cloud.api.common.player.CloudPlayerManager
+import io.papermc.paper.entity.TeleportFlag
+import org.bukkit.Location
+import org.bukkit.OfflinePlayer
+import org.bukkit.event.player.PlayerTeleportEvent
+
+suspend fun CloudPlayer.teleport(
+    location: Location,
+    cause: PlayerTeleportEvent.TeleportCause = PlayerTeleportEvent.TeleportCause.PLUGIN,
+    vararg flags: TeleportFlag
+) {
+    teleport(
+        location.toCloudTpLocation(),
+        cause.toCloudTpCause(),
+        *flags.map { it.toCloudTpFlag() }.toTypedArray()
+    )
+}
+
+fun OfflinePlayer.toCloudOfflinePlayer() = CloudPlayerManager.getOfflinePlayer(uniqueId)
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-velocity/api/surf-cloud-api-client-velocity.api b/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-velocity/api/surf-cloud-api-client-velocity.api
new file mode 100644
index 00000000..e69de29b
diff --git a/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-velocity/build.gradle.kts b/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-velocity/build.gradle.kts
new file mode 100644
index 00000000..cdf830df
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-client/surf-cloud-api-client-velocity/build.gradle.kts
@@ -0,0 +1,7 @@
+plugins {
+    id("dev.slne.surf.surfapi.gradle.core")
+}
+
+dependencies {
+    api(project(":surf-cloud-api:surf-cloud-api-client:surf-cloud-api-client-common"))
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/api/surf-cloud-api-common.api b/surf-cloud-api/surf-cloud-api-common/api/surf-cloud-api-common.api
new file mode 100644
index 00000000..b27b141c
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/api/surf-cloud-api-common.api
@@ -0,0 +1,2641 @@
+public abstract interface class dev/slne/surf/cloud/api/common/CloudInstance {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/CloudInstance$Companion;
+	public abstract fun startSpringApplication (Ljava/lang/Class;Ljava/lang/ClassLoader;[Ljava/lang/ClassLoader;Lkotlin/jvm/functions/Function1;)Lorg/springframework/context/ConfigurableApplicationContext;
+}
+
+public final class dev/slne/surf/cloud/api/common/CloudInstance$Companion : dev/slne/surf/cloud/api/common/CloudInstance {
+	public fun startSpringApplication (Ljava/lang/Class;Ljava/lang/ClassLoader;[Ljava/lang/ClassLoader;Lkotlin/jvm/functions/Function1;)Lorg/springframework/context/ConfigurableApplicationContext;
+}
+
+public final class dev/slne/surf/cloud/api/common/CloudInstance$DefaultImpls {
+	public static synthetic fun startSpringApplication$default (Ldev/slne/surf/cloud/api/common/CloudInstance;Ljava/lang/Class;Ljava/lang/ClassLoader;[Ljava/lang/ClassLoader;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/springframework/context/ConfigurableApplicationContext;
+}
+
+public final class dev/slne/surf/cloud/api/common/CloudInstanceKt {
+	public static final fun startSpringApplication (Ldev/slne/surf/cloud/api/common/CloudInstance;Lkotlin/reflect/KClass;Ljava/lang/ClassLoader;[Ljava/lang/ClassLoader;Lkotlin/jvm/functions/Function1;)Lorg/springframework/context/ConfigurableApplicationContext;
+	public static synthetic fun startSpringApplication$default (Ldev/slne/surf/cloud/api/common/CloudInstance;Lkotlin/reflect/KClass;Ljava/lang/ClassLoader;[Ljava/lang/ClassLoader;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lorg/springframework/context/ConfigurableApplicationContext;
+}
+
+public abstract interface annotation class dev/slne/surf/cloud/api/common/SurfCloudApplication : java/lang/annotation/Annotation {
+}
+
+public class dev/slne/surf/cloud/api/common/config/auto/AdventureAutoConfiguration {
+	public fun <init> ()V
+	public fun miniMessage ()Lnet/kyori/adventure/text/minimessage/MiniMessage;
+}
+
+public final class dev/slne/surf/cloud/api/common/config/properties/CloudProperties {
+	public static final field INSTANCE Ldev/slne/surf/cloud/api/common/config/properties/CloudProperties;
+	public static final field SERVER_CATEGORY_NOT_SET Ljava/lang/String;
+	public static final fun getSERVER_CATEGORY ()Ljava/lang/String;
+	public static final fun getSERVER_NAME ()Ljava/lang/String;
+}
+
+public final class dev/slne/surf/cloud/api/common/config/properties/Modern_propertiesKt {
+	public static final fun systemProperty (Ljava/lang/String;)Ljava/lang/String;
+	public static final fun systemProperty (Ljava/lang/String;III)I
+	public static final fun systemProperty (Ljava/lang/String;JJJ)J
+	public static final fun systemProperty (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+	public static final fun systemProperty (Ljava/lang/String;Z)Z
+	public static synthetic fun systemProperty$default (Ljava/lang/String;IIIILjava/lang/Object;)I
+	public static synthetic fun systemProperty$default (Ljava/lang/String;JJJILjava/lang/Object;)J
+	public static final fun systemPropertyRequired (Ljava/lang/String;)Ljava/lang/String;
+	public static final fun systemPropertyRequired (Ljava/lang/String;II)I
+	public static final fun systemPropertyRequired (Ljava/lang/String;JJ)J
+	public static synthetic fun systemPropertyRequired$default (Ljava/lang/String;IIILjava/lang/Object;)I
+	public static synthetic fun systemPropertyRequired$default (Ljava/lang/String;JJILjava/lang/Object;)J
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/config/properties/RequiredSystemProperty : dev/slne/surf/cloud/api/common/config/properties/SystemProperty {
+	public abstract fun value ()Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/common/config/properties/RequiredSystemPropertyImpl : dev/slne/surf/cloud/api/common/config/properties/RequiredSystemProperty {
+	public fun <init> (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Ljava/lang/Object;Z)V
+	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Ljava/lang/Object;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun value ()Ljava/lang/Object;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/config/properties/SystemProperty {
+	public abstract fun value ()Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/common/config/properties/SystemPropertyImpl : dev/slne/surf/cloud/api/common/config/properties/SystemProperty {
+	public fun <init> (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Ljava/lang/Object;Ljava/lang/Object;Z)V
+	public synthetic fun <init> (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Ljava/lang/Object;Ljava/lang/Object;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun value ()Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/common/config/properties/SystemPropertyKt {
+	public static final fun requiredSystemProperty (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Ldev/slne/surf/cloud/api/common/config/properties/RequiredSystemProperty;
+	public static final fun requiredSystemProperty (Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Ldev/slne/surf/cloud/api/common/config/properties/RequiredSystemProperty;
+	public static final fun systemProperty (Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/config/properties/SystemProperty;
+	public static final fun systemProperty (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/config/properties/SystemProperty;
+}
+
+public abstract class dev/slne/surf/cloud/api/common/event/CloudEvent : org/springframework/context/ApplicationEvent {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/event/CloudEvent$Companion;
+	public fun <init> (Ljava/lang/Object;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/event/CloudEvent$Companion {
+}
+
+public abstract class dev/slne/surf/cloud/api/common/event/player/CloudPlayerEvent : dev/slne/surf/cloud/api/common/event/CloudEvent {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/event/player/CloudPlayerEvent$Companion;
+	public fun <init> (Ljava/lang/Object;Ldev/slne/surf/cloud/api/common/player/CloudPlayer;)V
+	public final fun getPlayer ()Ldev/slne/surf/cloud/api/common/player/CloudPlayer;
+}
+
+public final class dev/slne/surf/cloud/api/common/event/player/CloudPlayerEvent$Companion {
+}
+
+public final class dev/slne/surf/cloud/api/common/event/player/connection/CloudPlayerConnectToNetworkEvent : dev/slne/surf/cloud/api/common/event/player/CloudPlayerEvent {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/event/player/connection/CloudPlayerConnectToNetworkEvent$Companion;
+	public fun <init> (Ljava/lang/Object;Ldev/slne/surf/cloud/api/common/player/CloudPlayer;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/event/player/connection/CloudPlayerConnectToNetworkEvent$Companion {
+}
+
+public final class dev/slne/surf/cloud/api/common/exceptions/ExitCodes {
+	public static final field CLIENT_COULD_NOT_CONNECT_TO_SERVER I
+	public static final field CLIENT_COULD_NOT_FETCH_SERVER_ID I
+	public static final field CLIENT_DISCONNECTED_BEFORE_RUNNING I
+	public static final field CONNECTION_FAILURE I
+	public static final field INSTANCE Ldev/slne/surf/cloud/api/common/exceptions/ExitCodes;
+	public static final field NORMAL I
+	public static final field TIMEOUT I
+	public static final field UNABLE_TO_CONNECT_TO_DATABASE I
+	public static final field UNKNOWN_ERROR I
+}
+
+public final class dev/slne/surf/cloud/api/common/exceptions/FatalSurfError : java/lang/Error, org/springframework/boot/ExitCodeGenerator {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/exceptions/FatalSurfError$Companion;
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/List;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun buildMessage ()Ljava/lang/String;
+	public static final fun builder ()Ldev/slne/surf/cloud/api/common/exceptions/FatalSurfError$Builder;
+	public fun getCause ()Ljava/lang/Throwable;
+	public fun getExitCode ()I
+}
+
+public final class dev/slne/surf/cloud/api/common/exceptions/FatalSurfError$Builder {
+	public fun <init> ()V
+	public final fun additionalInformation (Ljava/lang/String;)Ldev/slne/surf/cloud/api/common/exceptions/FatalSurfError$Builder;
+	public final fun additionalInformation (Ljava/util/List;)Ldev/slne/surf/cloud/api/common/exceptions/FatalSurfError$Builder;
+	public final fun build ()Ldev/slne/surf/cloud/api/common/exceptions/FatalSurfError;
+	public final fun cause (Ljava/lang/Throwable;)Ldev/slne/surf/cloud/api/common/exceptions/FatalSurfError$Builder;
+	public final fun detailedErrorMessage (Ljava/lang/String;)Ldev/slne/surf/cloud/api/common/exceptions/FatalSurfError$Builder;
+	public final fun exitCode (I)Ldev/slne/surf/cloud/api/common/exceptions/FatalSurfError$Builder;
+	public final fun possibleSolution (Ljava/lang/String;)Ldev/slne/surf/cloud/api/common/exceptions/FatalSurfError$Builder;
+	public final fun possibleSolutions (Ljava/util/List;)Ldev/slne/surf/cloud/api/common/exceptions/FatalSurfError$Builder;
+	public final fun simpleErrorMessage (Ljava/lang/String;)Ldev/slne/surf/cloud/api/common/exceptions/FatalSurfError$Builder;
+}
+
+public final class dev/slne/surf/cloud/api/common/exceptions/FatalSurfError$Companion {
+	public final fun builder ()Ldev/slne/surf/cloud/api/common/exceptions/FatalSurfError$Builder;
+}
+
+public final class dev/slne/surf/cloud/api/common/exceptions/FatalSurfErrorKt {
+	public static final fun FatalSurfError (Lkotlin/jvm/functions/Function1;)Ldev/slne/surf/cloud/api/common/exceptions/FatalSurfError;
+}
+
+public final class dev/slne/surf/cloud/api/common/exceptions/SkipPacketException : io/netty/handler/codec/EncoderException {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/exceptions/SkipPacketException$Companion;
+	public fun <init> (Ljava/lang/Throwable;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/exceptions/SkipPacketException$Companion {
+}
+
+public final class dev/slne/surf/cloud/api/common/meta/DefaultIds {
+	public static final field BIDIRECTIONAL_DISCONNECT_PLAYER Ljava/lang/String;
+	public static final field BIDIRECTIONAL_TELEPORT_PLAYER Ljava/lang/String;
+	public static final field BIDIRECTIONAL_TELEPORT_PLAYER_RESULT Ljava/lang/String;
+	public static final field CLIENTBOUND_ACTION_BAR_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_ADD_PLAYER_TO_SERVER Ljava/lang/String;
+	public static final field CLIENTBOUND_BATCH_UPDATE_SERVER Ljava/lang/String;
+	public static final field CLIENTBOUND_BUNDLE_DELIMITER_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_BUNDLE_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_CLEAR_RESOURCE_PACKS_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_CLEAR_TITLE_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_CONNECT_PLAYER_TO_SERVER_RESPONSE Ljava/lang/String;
+	public static final field CLIENTBOUND_DISCONNECT_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_HIDE_BOSS_BAR_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_INITIALIZE_CLIENT_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_INITIALIZE_ID_RESPONSE Ljava/lang/String;
+	public static final field CLIENTBOUND_IS_SERVER_MANAGED_BY_THIS_PROXY_RESPONSE Ljava/lang/String;
+	public static final field CLIENTBOUND_KEEP_ALIVE_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_KEY_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_LOGIN_DISCONNECT_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_LOGIN_FINISHED_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_OPEN_BOOK_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_PING_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_PING_REQUEST_RESPONSE_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_PLAYER_LIST_HEADER_AND_FOOTER Ljava/lang/String;
+	public static final field CLIENTBOUND_PLAYER_PERSISTENT_DATA_CONTAINER_RESPONSE Ljava/lang/String;
+	public static final field CLIENTBOUND_PLAY_SOUND_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_PRE_RUNNING_FINISHED_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_READY_TO_RUN_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_REGISTER_CLOUD_SERVERS_TO_PROXY Ljava/lang/String;
+	public static final field CLIENTBOUND_REGISTER_SERVER_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_REMOVE_PLAYER_FROM_SERVER Ljava/lang/String;
+	public static final field CLIENTBOUND_REMOVE_RESOURCE_PACKS_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_REQUEST_DISPLAY_NAME_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_RESET_TITLE_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_SEND_MESSAGE_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_SEND_RESOURCE_PACKS_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_SHOW_BOSS_BAR_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_SHUTDOWN_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_STOP_SOUND_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_TITLE_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_TITLE_PART_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_TRANSFER_PLAYER_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_UNREGISTER_SERVER_PACKET Ljava/lang/String;
+	public static final field CLIENTBOUND_UPDATE_SERVER_INFORMATION_PACKET Ljava/lang/String;
+	public static final field INSTANCE Ldev/slne/surf/cloud/api/common/meta/DefaultIds;
+	public static final field LUCKPERMS_META_DATA_RESPONSE_PACKET Ljava/lang/String;
+	public static final field PLAYER_CONNECT_TO_SERVER_PACKET Ljava/lang/String;
+	public static final field PLAYER_DISCONNECT_FROM_SERVER_PACKET Ljava/lang/String;
+	public static final field REQUEST_LUCKPERMS_META_DATA_PACKET Ljava/lang/String;
+	public static final field REQUEST_OFFLINE_DISPLAY_NAME_PACKET Ljava/lang/String;
+	public static final field RESPONSE_DISPLAY_NAME_PACKET_REQUEST_PACKET Ljava/lang/String;
+	public static final field RESPONSE_REQUEST_OFFLINE_DISPLAY_NAME_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_BROADCAST_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_BUNDLE_DELIMITER_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_BUNDLE_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_CLEAR_RESOURCE_PACKS_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_CLEAR_TITLE_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_CLIENT_INFORMATION_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_CONNECT_PLAYER_TO_SERVER Ljava/lang/String;
+	public static final field SERVERBOUND_HANDSHAKE_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_HIDE_BOSS_BAR_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_INITIALIZE_REQUEST_ID_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_IS_SERVER_MANAGED_BY_THIS_PROXY_REQUEST Ljava/lang/String;
+	public static final field SERVERBOUND_KEEP_ALIVE_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_KEY_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_LOGIN_ACKNOWLEDGED_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_LOGIN_START_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_OPEN_BOOK_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_PING_REQUEST_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_PLAYER_PERSISTENT_DATA_CONTAINER_UPDATE Ljava/lang/String;
+	public static final field SERVERBOUND_PLAY_SOUND_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_PONG_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_PRE_RUNNING_ACKNOWLEDGED_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_READY_TO_RUN_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_REMOVE_RESOURCE_PACKS_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_REQUEST_CONTINUATION Ljava/lang/String;
+	public static final field SERVERBOUND_REQUEST_DISPLAY_NAME_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_REQUEST_PLAYER_PERSISTENT_DATA_CONTAINER Ljava/lang/String;
+	public static final field SERVERBOUND_RESET_TITLE_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_SEND_ACTION_BAR_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_SEND_MESSAGE_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_SEND_PLAYER_LIST_HEADER_AND_FOOTER Ljava/lang/String;
+	public static final field SERVERBOUND_SEND_RESOURCE_PACKS_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_SEND_TITLE_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_SEND_TITLE_PART_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_SHOW_BOSS_BAR_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_SHUTDOWN_SERVER_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_STOP_SOUND_PACKET Ljava/lang/String;
+	public static final field SERVERBOUND_TRANSFER_PLAYER_PACKET_RESPONSE_PACKET Ljava/lang/String;
+}
+
+public abstract interface annotation class dev/slne/surf/cloud/api/common/meta/PacketCodec : java/lang/annotation/Annotation {
+}
+
+public abstract interface annotation class dev/slne/surf/cloud/api/common/meta/Registry : java/lang/annotation/Annotation {
+	public abstract fun value ()Ljava/lang/String;
+}
+
+public abstract interface annotation class dev/slne/surf/cloud/api/common/meta/SurfNettyPacket : java/lang/annotation/Annotation {
+	public abstract fun flow ()Ldev/slne/surf/cloud/api/common/netty/network/protocol/PacketFlow;
+	public abstract fun id ()Ljava/lang/String;
+	public abstract fun protocols ()[Ldev/slne/surf/cloud/api/common/netty/network/ConnectionProtocol;
+}
+
+public abstract interface annotation class dev/slne/surf/cloud/api/common/meta/SurfNettyPacketHandler : java/lang/annotation/Annotation {
+	public abstract fun classes ()[Ljava/lang/Class;
+	public abstract fun condition ()Ljava/lang/String;
+	public abstract fun id ()Ljava/lang/String;
+	public abstract fun value ()[Ljava/lang/Class;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/netty/NettyClient {
+	public abstract fun fire (Ldev/slne/surf/cloud/api/common/netty/packet/NettyPacket;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun fireAndAwait-8Mi8wO0 (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun fireAndForget (Ldev/slne/surf/cloud/api/common/netty/packet/NettyPacket;)V
+	public abstract fun getConnection ()Ldev/slne/surf/cloud/api/common/netty/network/Connection;
+	public abstract fun getServerCategory ()Ljava/lang/String;
+	public abstract fun getServerId ()J
+	public abstract fun getServerName ()Ljava/lang/String;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/NettyClient$DefaultImpls {
+	public static synthetic fun fire$default (Ldev/slne/surf/cloud/api/common/netty/NettyClient;Ldev/slne/surf/cloud/api/common/netty/packet/NettyPacket;ZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static synthetic fun fireAndAwait-8Mi8wO0$default (Ldev/slne/surf/cloud/api/common/netty/NettyClient;Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;JLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+}
+
+public abstract class dev/slne/surf/cloud/api/common/netty/exception/SurfNettyException : java/lang/RuntimeException {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/exception/SurfNettyException$Companion;
+	public fun <init> ()V
+	public fun <init> (Ljava/lang/String;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
+	public fun <init> (Ljava/lang/Throwable;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/exception/SurfNettyException$Companion {
+}
+
+public abstract class dev/slne/surf/cloud/api/common/netty/exception/SurfNettyListenerException : dev/slne/surf/cloud/api/common/netty/exception/SurfNettyException {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/exception/SurfNettyListenerException$Companion;
+	public fun <init> ()V
+	public fun <init> (Ljava/lang/String;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
+	public fun <init> (Ljava/lang/Throwable;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/exception/SurfNettyListenerException$Companion {
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/exception/SurfNettyListenerRegistrationException : dev/slne/surf/cloud/api/common/netty/exception/SurfNettyListenerException {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/exception/SurfNettyListenerRegistrationException$Companion;
+	public fun <init> ()V
+	public fun <init> (Ljava/lang/String;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
+	public fun <init> (Ljava/lang/Throwable;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/exception/SurfNettyListenerRegistrationException$Companion {
+}
+
+public abstract class dev/slne/surf/cloud/api/common/netty/exception/SurfNettyPacketException : dev/slne/surf/cloud/api/common/netty/exception/SurfNettyException {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/exception/SurfNettyPacketException$Companion;
+	public fun <init> ()V
+	public fun <init> (Ljava/lang/String;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
+	public fun <init> (Ljava/lang/Throwable;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/exception/SurfNettyPacketException$Companion {
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/exception/SurfNettyPacketNotRegisteredException : dev/slne/surf/cloud/api/common/netty/exception/SurfNettyPacketException {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/exception/SurfNettyPacketNotRegisteredException$Companion;
+	public fun <init> ()V
+	public fun <init> (Ljava/lang/String;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
+	public fun <init> (Ljava/lang/Throwable;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/exception/SurfNettyPacketNotRegisteredException$Companion {
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/exception/SurfNettyRegisterPacketException : dev/slne/surf/cloud/api/common/netty/exception/SurfNettyPacketException {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/exception/SurfNettyRegisterPacketException$Companion;
+	public fun <init> (Ljava/lang/String;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/exception/SurfNettyRegisterPacketException$Companion {
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/netty/network/Connection {
+	public abstract fun getAverageReceivedPackets ()F
+	public abstract fun getAverageSentPackets ()F
+	public abstract fun getHostname ()Ljava/lang/String;
+	public abstract fun getLoggableAddress ()Ljava/lang/String;
+	public abstract fun getReceivedPackets ()I
+	public abstract fun getSentPackets ()I
+	public abstract fun getVirtualHost ()Ljava/net/InetSocketAddress;
+	public abstract fun send (Ldev/slne/surf/cloud/api/common/netty/packet/NettyPacket;Z)V
+	public abstract fun sendWithIndication (Ldev/slne/surf/cloud/api/common/netty/packet/NettyPacket;ZLkotlinx/coroutines/CompletableDeferred;)V
+	public abstract fun sendWithIndication (Ldev/slne/surf/cloud/api/common/netty/packet/NettyPacket;ZZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/Connection$DefaultImpls {
+	public static synthetic fun send$default (Ldev/slne/surf/cloud/api/common/netty/network/Connection;Ldev/slne/surf/cloud/api/common/netty/packet/NettyPacket;ZILjava/lang/Object;)V
+	public static synthetic fun sendWithIndication$default (Ldev/slne/surf/cloud/api/common/netty/network/Connection;Ldev/slne/surf/cloud/api/common/netty/packet/NettyPacket;ZLkotlinx/coroutines/CompletableDeferred;ILjava/lang/Object;)V
+	public static synthetic fun sendWithIndication$default (Ldev/slne/surf/cloud/api/common/netty/network/Connection;Ldev/slne/surf/cloud/api/common/netty/packet/NettyPacket;ZZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/ConnectionProtocol : java/lang/Enum {
+	public static final field HANDSHAKING Ldev/slne/surf/cloud/api/common/netty/network/ConnectionProtocol;
+	public static final field INITIALIZE Ldev/slne/surf/cloud/api/common/netty/network/ConnectionProtocol;
+	public static final field LOGIN Ldev/slne/surf/cloud/api/common/netty/network/ConnectionProtocol;
+	public static final field PRE_RUNNING Ldev/slne/surf/cloud/api/common/netty/network/ConnectionProtocol;
+	public static final field RUNNING Ldev/slne/surf/cloud/api/common/netty/network/ConnectionProtocol;
+	public static final field SHUTDOWN Ldev/slne/surf/cloud/api/common/netty/network/ConnectionProtocol;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
+	public static fun valueOf (Ljava/lang/String;)Ldev/slne/surf/cloud/api/common/netty/network/ConnectionProtocol;
+	public static fun values ()[Ldev/slne/surf/cloud/api/common/netty/network/ConnectionProtocol;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/netty/network/codec/CodecOperation {
+	public abstract fun apply (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec : dev/slne/surf/cloud/api/common/netty/network/codec/StreamDecoder, dev/slne/surf/cloud/api/common/netty/network/codec/StreamEncoder {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec$Companion;
+	public abstract fun apply (Ldev/slne/surf/cloud/api/common/netty/network/codec/CodecOperation;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public static fun composite (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Ljava/util/function/Function;Ljava/util/function/Function;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public abstract fun dispatch (Ljava/util/function/Function;Ljava/util/function/Function;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public abstract fun map (Ljava/util/function/Function;Ljava/util/function/Function;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public abstract fun mapStream (Ljava/util/function/Function;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public static fun of (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamEncoder;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamDecoder;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public static fun ofMember (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamMemberEncoder;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamDecoder;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public static fun unit (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec$Companion {
+	public final fun composite (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Ljava/util/function/Function;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Ljava/util/function/Function;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function3;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public final fun composite (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Ljava/util/function/Function;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Ljava/util/function/Function;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Ljava/util/function/Function;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function4;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public final fun composite (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Ljava/util/function/Function;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Ljava/util/function/Function;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Ljava/util/function/Function;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Ljava/util/function/Function;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function5;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public final fun composite (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Ljava/util/function/Function;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Ljava/util/function/Function;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Ljava/util/function/Function;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Ljava/util/function/Function;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Ljava/util/function/Function;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function6;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public final fun composite (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Ljava/util/function/Function;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Ljava/util/function/Function;Ljava/util/function/BiFunction;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public final fun composite (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Ljava/util/function/Function;Ljava/util/function/Function;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public final fun of (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamEncoder;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamDecoder;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public final fun ofMember (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamMemberEncoder;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamDecoder;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public final fun recursive (Ljava/util/function/UnaryOperator;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public final fun unit (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec$DefaultImpls {
+	public static fun apply (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Ldev/slne/surf/cloud/api/common/netty/network/codec/CodecOperation;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public static fun dispatch (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Ljava/util/function/Function;Ljava/util/function/Function;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public static fun map (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Ljava/util/function/Function;Ljava/util/function/Function;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public static fun mapStream (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Ljava/util/function/Function;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/codec/StreamCodecKt {
+	public static final fun apply (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Lkotlin/jvm/functions/Function1;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public static final fun map (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public static final fun mapStream (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Lkotlin/jvm/functions/Function1;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public static final fun streamCodec (Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public static final fun streamCodecComposite (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Lkotlin/jvm/functions/Function1;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Lkotlin/jvm/functions/Function1;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Lkotlin/jvm/functions/Function1;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Lkotlin/jvm/functions/Function1;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Lkotlin/jvm/functions/Function1;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function6;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public static final fun streamCodecComposite (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Lkotlin/jvm/functions/Function1;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Lkotlin/jvm/functions/Function1;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Lkotlin/jvm/functions/Function1;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Lkotlin/jvm/functions/Function1;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function5;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public static final fun streamCodecComposite (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Lkotlin/jvm/functions/Function1;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Lkotlin/jvm/functions/Function1;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Lkotlin/jvm/functions/Function1;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function4;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public static final fun streamCodecComposite (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Lkotlin/jvm/functions/Function1;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Lkotlin/jvm/functions/Function1;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public static final fun streamCodecComposite (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Lkotlin/jvm/functions/Function1;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public static final fun streamCodecComposite (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public static final fun streamCodecMember (Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public static final fun streamCodecRecursive (Lkotlin/jvm/functions/Function1;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public static final fun streamCodecUnit (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public static final fun streamCodecUnitSimple (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/netty/network/codec/StreamDecoder {
+	public abstract fun decode (Ljava/lang/Object;)Ljava/lang/Object;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/netty/network/codec/StreamEncoder {
+	public abstract fun encode (Ljava/lang/Object;Ljava/lang/Object;)V
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/netty/network/codec/StreamMemberEncoder {
+	public abstract fun encode (Ljava/lang/Object;Ljava/lang/Object;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/codec/StringIdDispatchCodec : dev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/codec/StringIdDispatchCodec$Companion;
+	public synthetic fun <init> (Ljava/util/function/Function;Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun apply (Ldev/slne/surf/cloud/api/common/netty/network/codec/CodecOperation;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public static final fun builder (Ljava/util/function/Function;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StringIdDispatchCodec$Builder;
+	public fun decode (Lio/netty/buffer/ByteBuf;)Ljava/lang/Object;
+	public synthetic fun decode (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun dispatch (Ljava/util/function/Function;Ljava/util/function/Function;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public fun encode (Lio/netty/buffer/ByteBuf;Ljava/lang/Object;)V
+	public synthetic fun encode (Ljava/lang/Object;Ljava/lang/Object;)V
+	public fun map (Ljava/util/function/Function;Ljava/util/function/Function;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public fun mapStream (Ljava/util/function/Function;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/codec/StringIdDispatchCodec$Builder {
+	public final fun add (Ljava/lang/Object;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StringIdDispatchCodec$Builder;
+	public final fun build (Lkotlin/jvm/functions/Function1;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StringIdDispatchCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/codec/StringIdDispatchCodec$Companion {
+	public final fun builder (Ljava/util/function/Function;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StringIdDispatchCodec$Builder;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/codec/StringIdDispatchCodecKt {
+	public static final fun buildStringIdDispatchCodec (Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StringIdDispatchCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/PacketFlow : java/lang/Enum {
+	public static final field BIDIRECTIONAL Ldev/slne/surf/cloud/api/common/netty/network/protocol/PacketFlow;
+	public static final field CLIENTBOUND Ldev/slne/surf/cloud/api/common/netty/network/protocol/PacketFlow;
+	public static final field SERVERBOUND Ldev/slne/surf/cloud/api/common/netty/network/protocol/PacketFlow;
+	public final fun displayName ()Ljava/lang/String;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
+	public final fun getOpposite ()Ldev/slne/surf/cloud/api/common/netty/network/protocol/PacketFlow;
+	public static fun valueOf (Ljava/lang/String;)Ldev/slne/surf/cloud/api/common/netty/network/protocol/PacketFlow;
+	public static fun values ()[Ldev/slne/surf/cloud/api/common/netty/network/protocol/PacketFlow;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/boolean/BooleanArrayResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/boolean/BooleanArrayResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> ([Z)V
+	public final fun component1 ()[Z
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()[Z
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/boolean/BooleanArrayResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create ([Z)Ldev/slne/surf/cloud/api/common/netty/network/protocol/boolean/BooleanArrayResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/boolean/BooleanArrayResponseKt {
+	public static final fun respond (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;Lit/unimi/dsi/fastutil/booleans/BooleanCollection;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/boolean/BooleanResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/boolean/BooleanResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Z)V
+	public final fun component1 ()Z
+	public fun getValue ()Ljava/lang/Boolean;
+	public synthetic fun getValue ()Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/boolean/BooleanResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create (Z)Ldev/slne/surf/cloud/api/common/netty/network/protocol/boolean/BooleanResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/boolean/OptionalBooleanArrayResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/boolean/OptionalBooleanArrayResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> ([Z)V
+	public final fun component1 ()[Z
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()[Z
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/boolean/OptionalBooleanArrayResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create ([Z)Ldev/slne/surf/cloud/api/common/netty/network/protocol/boolean/OptionalBooleanArrayResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/boolean/OptionalBooleanArrayResponseKt {
+	public static final fun respond (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;Lit/unimi/dsi/fastutil/booleans/BooleanCollection;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/boolean/OptionalBooleanResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/boolean/OptionalBooleanResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/Boolean;)V
+	public final fun component1 ()Ljava/lang/Boolean;
+	public fun getValue ()Ljava/lang/Boolean;
+	public synthetic fun getValue ()Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/boolean/OptionalBooleanResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public fun create (Ljava/lang/Boolean;)Ldev/slne/surf/cloud/api/common/netty/network/protocol/boolean/OptionalBooleanResponse;
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/byte/ByteArrayResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/byte/ByteArrayResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> ([B)V
+	public final fun component1 ()[B
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()[B
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/byte/ByteArrayResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create ([B)Ldev/slne/surf/cloud/api/common/netty/network/protocol/byte/ByteArrayResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/byte/ByteArrayResponseKt {
+	public static final fun respond (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;Lit/unimi/dsi/fastutil/bytes/ByteCollection;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/byte/ByteResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/byte/ByteResponse$Companion;
+	public fun <init> (B)V
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()B
+	public fun getValue ()Ljava/lang/Byte;
+	public synthetic fun getValue ()Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/byte/ByteResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public fun create (B)Ldev/slne/surf/cloud/api/common/netty/network/protocol/byte/ByteResponse;
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/byte/OptionalByteArrayResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/byte/OptionalByteArrayResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> ([B)V
+	public final fun component1 ()[B
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()[B
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/byte/OptionalByteArrayResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create ([B)Ldev/slne/surf/cloud/api/common/netty/network/protocol/byte/OptionalByteArrayResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/byte/OptionalByteArrayResponseKt {
+	public static final fun respond (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;Lit/unimi/dsi/fastutil/bytes/ByteCollection;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/byte/OptionalByteResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/byte/OptionalByteResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/Byte;)V
+	public final fun component1 ()Ljava/lang/Byte;
+	public fun getValue ()Ljava/lang/Byte;
+	public synthetic fun getValue ()Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/byte/OptionalByteResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public fun create (Ljava/lang/Byte;)Ldev/slne/surf/cloud/api/common/netty/network/protocol/byte/OptionalByteResponse;
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/char/CharArrayResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/char/CharArrayResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> ([C)V
+	public final fun component1 ()[C
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()[C
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/char/CharArrayResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create ([C)Ldev/slne/surf/cloud/api/common/netty/network/protocol/char/CharArrayResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/char/CharArrayResponseKt {
+	public static final fun respond (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;Lit/unimi/dsi/fastutil/chars/CharCollection;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/char/CharResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/char/CharResponse$Companion;
+	public fun <init> (C)V
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()C
+	public fun getValue ()Ljava/lang/Character;
+	public synthetic fun getValue ()Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/char/CharResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public fun create (C)Ldev/slne/surf/cloud/api/common/netty/network/protocol/char/CharResponse;
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/char/OptionalCharArrayResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/char/OptionalCharArrayResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> ([C)V
+	public final fun component1 ()[C
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()[C
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/char/OptionalCharArrayResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create ([C)Ldev/slne/surf/cloud/api/common/netty/network/protocol/char/OptionalCharArrayResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/char/OptionalCharArrayResponseKt {
+	public static final fun respond (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;Lit/unimi/dsi/fastutil/chars/CharCollection;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/char/OptionalCharResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/char/OptionalCharResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/Character;)V
+	public final fun component1 ()Ljava/lang/Character;
+	public fun getValue ()Ljava/lang/Character;
+	public synthetic fun getValue ()Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/char/OptionalCharResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public fun create (Ljava/lang/Character;)Ldev/slne/surf/cloud/api/common/netty/network/protocol/char/OptionalCharResponse;
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/component/ComponentArrayResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/component/ComponentArrayResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> ([Lnet/kyori/adventure/text/Component;)V
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()[Lnet/kyori/adventure/text/Component;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/component/ComponentArrayResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create ([Lnet/kyori/adventure/text/Component;)Ldev/slne/surf/cloud/api/common/netty/network/protocol/component/ComponentArrayResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/component/ComponentArrayResponseKt {
+	public static final fun respond (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;Ljava/util/Collection;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/component/ComponentResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/component/ComponentResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lnet/kyori/adventure/text/Component;)V
+	public final fun component1 ()Lnet/kyori/adventure/text/Component;
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()Lnet/kyori/adventure/text/Component;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/component/ComponentResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create (Lnet/kyori/adventure/text/Component;)Ldev/slne/surf/cloud/api/common/netty/network/protocol/component/ComponentResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/component/OptionalComponentArrayResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/component/OptionalComponentArrayResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> ([Lnet/kyori/adventure/text/Component;)V
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()[Lnet/kyori/adventure/text/Component;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/component/OptionalComponentArrayResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create ([Lnet/kyori/adventure/text/Component;)Ldev/slne/surf/cloud/api/common/netty/network/protocol/component/OptionalComponentArrayResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/component/OptionalComponentArrayResponseKt {
+	public static final fun respond (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;Ljava/util/Collection;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/component/OptionalComponentResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/component/OptionalComponentResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Lnet/kyori/adventure/text/Component;)V
+	public final fun component1 ()Lnet/kyori/adventure/text/Component;
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()Lnet/kyori/adventure/text/Component;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/component/OptionalComponentResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create (Lnet/kyori/adventure/text/Component;)Ldev/slne/surf/cloud/api/common/netty/network/protocol/component/OptionalComponentResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/double/DoubleArrayResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/double/DoubleArrayResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> ([D)V
+	public final fun component1 ()[D
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()[D
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/double/DoubleArrayResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create ([D)Ldev/slne/surf/cloud/api/common/netty/network/protocol/double/DoubleArrayResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/double/DoubleArrayResponseKt {
+	public static final fun respond (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;Lit/unimi/dsi/fastutil/doubles/DoubleCollection;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/double/DoubleResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/double/DoubleResponse$Companion;
+	public fun <init> (D)V
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()D
+	public fun getValue ()Ljava/lang/Double;
+	public synthetic fun getValue ()Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/double/DoubleResponse$Companion {
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/double/OptionalDoubleArrayResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/double/OptionalDoubleArrayResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> ([D)V
+	public final fun component1 ()[D
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()[D
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/double/OptionalDoubleArrayResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create ([D)Ldev/slne/surf/cloud/api/common/netty/network/protocol/double/OptionalDoubleArrayResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/double/OptionalDoubleArrayResponseKt {
+	public static final fun respond (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;Lit/unimi/dsi/fastutil/doubles/DoubleCollection;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/double/OptionalDoubleResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/double/OptionalDoubleResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/Double;)V
+	public final fun component1 ()Ljava/lang/Double;
+	public fun getValue ()Ljava/lang/Double;
+	public synthetic fun getValue ()Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/double/OptionalDoubleResponse$Companion {
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/float/FloatArrayResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/float/FloatArrayResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> ([F)V
+	public final fun component1 ()[F
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()[F
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/float/FloatArrayResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create ([F)Ldev/slne/surf/cloud/api/common/netty/network/protocol/float/FloatArrayResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/float/FloatArrayResponseKt {
+	public static final fun respond (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;Lit/unimi/dsi/fastutil/floats/FloatCollection;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/float/FloatResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/float/FloatResponse$Companion;
+	public fun <init> (F)V
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()F
+	public fun getValue ()Ljava/lang/Float;
+	public synthetic fun getValue ()Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/float/FloatResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public fun create (F)Ldev/slne/surf/cloud/api/common/netty/network/protocol/float/FloatResponse;
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/float/OptionalFloatArrayResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/float/OptionalFloatArrayResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> ([F)V
+	public final fun component1 ()[F
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()[F
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/float/OptionalFloatArrayResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create ([F)Ldev/slne/surf/cloud/api/common/netty/network/protocol/float/OptionalFloatArrayResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/float/OptionalFloatArrayResponseKt {
+	public static final fun respond (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;Lit/unimi/dsi/fastutil/floats/FloatCollection;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/float/OptionalFloatResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/float/OptionalFloatResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/Float;)V
+	public final fun component1 ()Ljava/lang/Float;
+	public fun getValue ()Ljava/lang/Float;
+	public synthetic fun getValue ()Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/float/OptionalFloatResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public fun create (Ljava/lang/Float;)Ldev/slne/surf/cloud/api/common/netty/network/protocol/float/OptionalFloatResponse;
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/int/IntArrayResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/int/IntArrayResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> ([I)V
+	public final fun component1 ()[I
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()[I
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/int/IntArrayResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create ([I)Ldev/slne/surf/cloud/api/common/netty/network/protocol/int/IntArrayResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/int/IntArrayResponseKt {
+	public static final fun respond (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;Lit/unimi/dsi/fastutil/ints/IntCollection;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/int/IntResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/int/IntResponse$Companion;
+	public fun <init> (I)V
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()I
+	public fun getValue ()Ljava/lang/Integer;
+	public synthetic fun getValue ()Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/int/IntResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public fun create (I)Ldev/slne/surf/cloud/api/common/netty/network/protocol/int/IntResponse;
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/int/OptionalIntArrayResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/int/OptionalIntArrayResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> ([I)V
+	public final fun component1 ()[I
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()[I
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/int/OptionalIntArrayResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create ([I)Ldev/slne/surf/cloud/api/common/netty/network/protocol/int/OptionalIntArrayResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/int/OptionalIntArrayResponseKt {
+	public static final fun respond (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;Lit/unimi/dsi/fastutil/ints/IntCollection;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/int/OptionalIntResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/int/OptionalIntResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/Integer;)V
+	public final fun component1 ()Ljava/lang/Integer;
+	public fun getValue ()Ljava/lang/Integer;
+	public synthetic fun getValue ()Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/int/OptionalIntResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public fun create (Ljava/lang/Integer;)Ldev/slne/surf/cloud/api/common/netty/network/protocol/int/OptionalIntResponse;
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/long/LongArrayResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/long/LongArrayResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> ([J)V
+	public final fun component1 ()[J
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()[J
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/long/LongArrayResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create ([J)Ldev/slne/surf/cloud/api/common/netty/network/protocol/long/LongArrayResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/long/LongArrayResponseKt {
+	public static final fun respond (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;Lit/unimi/dsi/fastutil/longs/LongCollection;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/long/LongResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/long/LongResponse$Companion;
+	public fun <init> (J)V
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()J
+	public fun getValue ()Ljava/lang/Long;
+	public synthetic fun getValue ()Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/long/LongResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public fun create (J)Ldev/slne/surf/cloud/api/common/netty/network/protocol/long/LongResponse;
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/long/OptionalLongArrayResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/long/OptionalLongArrayResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> ([J)V
+	public final fun component1 ()[J
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()[J
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/long/OptionalLongArrayResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create ([J)Ldev/slne/surf/cloud/api/common/netty/network/protocol/long/OptionalLongArrayResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/long/OptionalLongArrayResponseKt {
+	public static final fun respond (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;Lit/unimi/dsi/fastutil/longs/LongCollection;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/long/OptionalLongResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/long/OptionalLongResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/Long;)V
+	public final fun component1 ()Ljava/lang/Long;
+	public fun getValue ()Ljava/lang/Long;
+	public synthetic fun getValue ()Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/long/OptionalLongResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public fun create (Ljava/lang/Long;)Ldev/slne/surf/cloud/api/common/netty/network/protocol/long/OptionalLongResponse;
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/short/OptionalShortArrayResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/short/OptionalShortArrayResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> ([S)V
+	public final fun component1 ()[S
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()[S
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/short/OptionalShortArrayResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create ([S)Ldev/slne/surf/cloud/api/common/netty/network/protocol/short/OptionalShortArrayResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/short/OptionalShortArrayResponseKt {
+	public static final fun respond (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;Lit/unimi/dsi/fastutil/shorts/ShortCollection;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/short/OptionalShortResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/short/OptionalShortResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/Short;)V
+	public final fun component1 ()Ljava/lang/Short;
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()Ljava/lang/Short;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/short/OptionalShortResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create (Ljava/lang/Short;)Ldev/slne/surf/cloud/api/common/netty/network/protocol/short/OptionalShortResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/short/ShortArrayResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/short/ShortArrayResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> ([S)V
+	public final fun component1 ()[S
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()[S
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/short/ShortArrayResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create ([S)Ldev/slne/surf/cloud/api/common/netty/network/protocol/short/ShortArrayResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/short/ShortArrayResponseKt {
+	public static final fun respond (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;Lit/unimi/dsi/fastutil/shorts/ShortCollection;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/short/ShortResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/short/ShortResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (S)V
+	public final fun component1 ()S
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()Ljava/lang/Short;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/short/ShortResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create (S)Ldev/slne/surf/cloud/api/common/netty/network/protocol/short/ShortResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/string/OptionalStringArrayResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/string/OptionalStringArrayResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> ([Ljava/lang/String;)V
+	public final fun component1 ()[Ljava/lang/String;
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()[Ljava/lang/String;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/string/OptionalStringArrayResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create ([Ljava/lang/String;)Ldev/slne/surf/cloud/api/common/netty/network/protocol/string/OptionalStringArrayResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/string/OptionalStringArrayResponseKt {
+	public static final fun respond (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;Ljava/util/Collection;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/string/OptionalStringResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/string/OptionalStringResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;)V
+	public final fun component1 ()Ljava/lang/String;
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()Ljava/lang/String;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/string/OptionalStringResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create (Ljava/lang/String;)Ldev/slne/surf/cloud/api/common/netty/network/protocol/string/OptionalStringResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/string/StringArrayResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/string/StringArrayResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> ([Ljava/lang/String;)V
+	public final fun component1 ()[Ljava/lang/String;
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()[Ljava/lang/String;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/string/StringArrayResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create ([Ljava/lang/String;)Ldev/slne/surf/cloud/api/common/netty/network/protocol/string/StringArrayResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/string/StringArrayResponseKt {
+	public static final fun respond (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;Ljava/util/Collection;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/string/StringResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/string/StringResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;)V
+	public final fun component1 ()Ljava/lang/String;
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()Ljava/lang/String;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/string/StringResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create (Ljava/lang/String;)Ldev/slne/surf/cloud/api/common/netty/network/protocol/string/StringResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/uuid/OptionalUUIDArrayResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/uuid/OptionalUUIDArrayResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> ([Ljava/util/UUID;)V
+	public final fun component1 ()[Ljava/util/UUID;
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()[Ljava/util/UUID;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/uuid/OptionalUUIDArrayResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create ([Ljava/util/UUID;)Ldev/slne/surf/cloud/api/common/netty/network/protocol/uuid/OptionalUUIDArrayResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/uuid/OptionalUUIDArrayResponseKt {
+	public static final fun respond (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;Ljava/util/Collection;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/uuid/OptionalUUIDResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/uuid/OptionalUUIDResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/util/UUID;)V
+	public final fun component1 ()Ljava/util/UUID;
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()Ljava/util/UUID;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/uuid/OptionalUUIDResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create (Ljava/util/UUID;)Ldev/slne/surf/cloud/api/common/netty/network/protocol/uuid/OptionalUUIDResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/uuid/UUIDArrayResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/uuid/UUIDArrayResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> ([Ljava/util/UUID;)V
+	public final fun component1 ()[Ljava/util/UUID;
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()[Ljava/util/UUID;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/uuid/UUIDArrayResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create ([Ljava/util/UUID;)Ldev/slne/surf/cloud/api/common/netty/network/protocol/uuid/UUIDArrayResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/uuid/UUIDArrayResponseKt {
+	public static final fun respond (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;Ljava/util/Collection;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/uuid/UUIDResponse : dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket, dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/network/protocol/uuid/UUIDResponse$Companion;
+	public synthetic fun <init> (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/util/UUID;)V
+	public final fun component1 ()Ljava/util/UUID;
+	public synthetic fun getValue ()Ljava/lang/Object;
+	public fun getValue ()Ljava/util/UUID;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/network/protocol/uuid/UUIDResponse$Companion : dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseTypeFactory {
+	public synthetic fun create (Ljava/lang/Object;)Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;
+	public fun create (Ljava/util/UUID;)Ldev/slne/surf/cloud/api/common/netty/network/protocol/uuid/UUIDResponse;
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public abstract class dev/slne/surf/cloud/api/common/netty/packet/NettyPacket {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/packet/NettyPacket$Companion;
+	public fun <init> ()V
+	public static final fun codec (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamMemberEncoder;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamDecoder;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public fun equals (Ljava/lang/Object;)Z
+	public fun getExtraPackets ()Ljava/util/List;
+	public final fun getFlow ()Ldev/slne/surf/cloud/api/common/netty/network/protocol/PacketFlow;
+	public final fun getId ()Ljava/lang/String;
+	public final fun getProtocols ()[Ldev/slne/surf/cloud/api/common/netty/network/ConnectionProtocol;
+	public final fun getSessionId ()J
+	public fun getSkippable ()Z
+	public fun hashCode ()I
+	public fun isReady ()Z
+	public fun packetTooLarge (Ljava/lang/Object;)Z
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/packet/NettyPacket$Companion {
+	public final fun codec (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamMemberEncoder;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamDecoder;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/packet/NettyPacketInfo {
+	public static final synthetic fun box-impl (Ldev/slne/surf/cloud/api/common/netty/network/Connection;)Ldev/slne/surf/cloud/api/common/netty/packet/NettyPacketInfo;
+	public static fun constructor-impl (Ldev/slne/surf/cloud/api/common/netty/network/Connection;)Ldev/slne/surf/cloud/api/common/netty/network/Connection;
+	public fun equals (Ljava/lang/Object;)Z
+	public static fun equals-impl (Ldev/slne/surf/cloud/api/common/netty/network/Connection;Ljava/lang/Object;)Z
+	public static final fun equals-impl0 (Ldev/slne/surf/cloud/api/common/netty/network/Connection;Ldev/slne/surf/cloud/api/common/netty/network/Connection;)Z
+	public final fun getOrigin ()Ldev/slne/surf/cloud/api/common/netty/network/Connection;
+	public fun hashCode ()I
+	public static fun hashCode-impl (Ldev/slne/surf/cloud/api/common/netty/network/Connection;)I
+	public fun toString ()Ljava/lang/String;
+	public static fun toString-impl (Ldev/slne/surf/cloud/api/common/netty/network/Connection;)Ljava/lang/String;
+	public final synthetic fun unbox-impl ()Ldev/slne/surf/cloud/api/common/netty/network/Connection;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/packet/Packet_extensionKt {
+	public static final fun findPacketCodec (Lkotlin/reflect/KClass;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public static final fun getPacketMeta (Ljava/lang/Class;)Ldev/slne/surf/cloud/api/common/meta/SurfNettyPacket;
+	public static final fun getPacketMeta (Lkotlin/reflect/KClass;)Ldev/slne/surf/cloud/api/common/meta/SurfNettyPacket;
+	public static final fun getPacketMetaOrNull (Lkotlin/reflect/KClass;)Ldev/slne/surf/cloud/api/common/meta/SurfNettyPacket;
+	public static final fun packetCodec (Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamMemberEncoder;Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamDecoder;)Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public abstract class dev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket : dev/slne/surf/cloud/api/common/netty/packet/NettyPacket {
+	public fun <init> ()V
+	public final fun fireAndAwait-8Mi8wO0 (Ldev/slne/surf/cloud/api/common/netty/network/Connection;JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun fireAndAwait-8Mi8wO0$default (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;Ldev/slne/surf/cloud/api/common/netty/network/Connection;JLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public final fun fireAndAwaitOrThrow-8Mi8wO0 (Ldev/slne/surf/cloud/api/common/netty/network/Connection;JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun fireAndAwaitOrThrow-8Mi8wO0$default (Ldev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket;Ldev/slne/surf/cloud/api/common/netty/network/Connection;JLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public final fun fireAndAwaitOrThrowUrgent (Ldev/slne/surf/cloud/api/common/netty/network/Connection;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun fireAndAwaitUrgent (Ldev/slne/surf/cloud/api/common/netty/network/Connection;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun respond (Ldev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacketKt {
+	public static final fun getDEFAULT_TIMEOUT ()J
+	public static final fun getDEFAULT_URGENT_TIMEOUT ()J
+}
+
+public abstract class dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket : dev/slne/surf/cloud/api/common/netty/packet/NettyPacket {
+	public fun <init> ()V
+}
+
+public class dev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf : dev/slne/surf/cloud/api/common/netty/protocol/buffer/WrappedByteBuf {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf$Companion;
+	public fun <init> (Lio/netty/buffer/ByteBuf;)V
+	public final fun readArray (Lkotlin/jvm/functions/Function1;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;)[Ljava/lang/Object;
+	public final fun readBitSet ()Ljava/util/BitSet;
+	public final fun readBooleanArray ()[Z
+	public final fun readByteArray ()[B
+	public final fun readCharArray ()[C
+	public final fun readCodecJsonArray (Lcom/mojang/serialization/Codec;Lkotlin/jvm/functions/Function1;)[Ljava/lang/Object;
+	public final fun readCollection (Lkotlin/jvm/functions/Function1;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;)Ljava/util/Collection;
+	public final fun readCollectionJsonWithCodec (Lcom/mojang/serialization/Codec;Lkotlin/jvm/functions/Function1;)Ljava/util/Collection;
+	public final fun readComponent ()Lnet/kyori/adventure/text/Component;
+	public final fun readCompoundTag ()Lnet/querz/nbt/tag/CompoundTag;
+	public final fun readDoubleArray ()[D
+	public final fun readEnum (Ljava/lang/Class;)Ljava/lang/Enum;
+	public final fun readEnum (Lkotlin/reflect/KClass;)Ljava/lang/Enum;
+	public final fun readEnumSet (Ljava/lang/Class;)Ljava/util/EnumSet;
+	public final fun readEnumSet (Lkotlin/reflect/KClass;)Ljava/util/EnumSet;
+	public final fun readFixedBitSet (I)Ljava/util/BitSet;
+	public final fun readFloatArray ()[F
+	public final fun readInet4Address ()Ljava/net/Inet4Address;
+	public final fun readInetSocketAddress ()Ljava/net/InetSocketAddress;
+	public final fun readIntArray ()[I
+	public final fun readJsonWithCodec (Lcom/mojang/serialization/Codec;)Ljava/lang/Object;
+	public final fun readKey ()Lnet/kyori/adventure/key/Key;
+	public final fun readList (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;)Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
+	public final fun readListJsonWithCodec (Lcom/mojang/serialization/Codec;)Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
+	public final fun readLongArray ()[J
+	public final fun readMap (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;)Lit/unimi/dsi/fastutil/objects/Object2ObjectOpenHashMap;
+	public final fun readMap (Lkotlin/jvm/functions/Function1;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;)Ljava/util/Map;
+	public final fun readNullable (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;)Ljava/lang/Object;
+	public final fun readNullableBoolean ()Ljava/lang/Boolean;
+	public final fun readNullableByte ()Ljava/lang/Byte;
+	public final fun readNullableChar ()Ljava/lang/Character;
+	public final fun readNullableDouble ()Ljava/lang/Double;
+	public final fun readNullableFloat ()Ljava/lang/Float;
+	public final fun readNullableInt ()Ljava/lang/Integer;
+	public final fun readNullableLong ()Ljava/lang/Long;
+	public final fun readNullableShort ()Ljava/lang/Short;
+	public final fun readNullableString ()Ljava/lang/String;
+	public final fun readNullableUuid ()Ljava/util/UUID;
+	public final fun readNumber ()Ljava/lang/Object;
+	public final fun readOptional (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;)Ljava/util/Optional;
+	public final fun readOptionalLong ()Ljava/util/OptionalLong;
+	public final fun readSerializable (Ljava/lang/Class;)Ljava/io/Serializable;
+	public final fun readShortArray ()[S
+	public final fun readSingleton (Ljava/lang/ClassLoader;)Ljava/lang/Object;
+	public final fun readSound ()Lnet/kyori/adventure/sound/Sound;
+	public final fun readStringArray ()[Ljava/lang/String;
+	public final fun readURI ()Ljava/net/URI;
+	public final fun readUnsignedDouble ()D
+	public final fun readUnsignedFloat ()F
+	public final fun readUnsignedLong ()J
+	public final fun readUtf ()Ljava/lang/String;
+	public final fun readUtf (I)Ljava/lang/String;
+	public static synthetic fun readUtf$default (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;IILjava/lang/Object;)Ljava/lang/String;
+	public final fun readUuid ()Ljava/util/UUID;
+	public final fun readUuidArray ()[Ljava/util/UUID;
+	public final fun readVarInt ()I
+	public final fun readVarLong ()J
+	public final fun readWithCount (Ljava/util/function/Consumer;)V
+	public final fun readWithCount (Lkotlin/jvm/functions/Function1;)V
+	public final fun readZonedDateTime ()Ljava/time/ZonedDateTime;
+	public final fun writeArray ([Ljava/lang/Object;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/ecoder/EncodeFactory;)V
+	public final fun writeBitSet (Ljava/util/BitSet;)V
+	public final fun writeBooleanArray ([Z)V
+	public final fun writeByteArray ([B)V
+	public final fun writeCharArray ([C)V
+	public final fun writeCodecJsonArray (Lcom/mojang/serialization/Codec;[Ljava/lang/Object;)V
+	public final fun writeCollection (Ljava/util/Collection;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/ecoder/EncodeFactory;)V
+	public final fun writeCollectionJsonWithCodec (Lcom/mojang/serialization/Codec;Ljava/util/Collection;)V
+	public final fun writeComponent (Lnet/kyori/adventure/text/Component;)V
+	public final fun writeCompoundTag (Lnet/querz/nbt/tag/CompoundTag;)V
+	public final fun writeDoubleArray ([D)V
+	public final fun writeEnum (Ljava/lang/Enum;)Lio/netty/buffer/ByteBuf;
+	public final fun writeEnumSet (Ljava/util/EnumSet;Ljava/lang/Class;)V
+	public final fun writeEnumSet (Ljava/util/EnumSet;Lkotlin/reflect/KClass;)V
+	public final fun writeFixedBitSet (Ljava/util/BitSet;I)Lio/netty/buffer/ByteBuf;
+	public final fun writeFloatArray ([F)V
+	public final fun writeInet4Address (Ljava/net/Inet4Address;)V
+	public final fun writeInetSocketAddress (Ljava/net/InetSocketAddress;)V
+	public final fun writeIntArray ([I)V
+	public final fun writeJsonWithCodec (Lcom/mojang/serialization/Codec;Ljava/lang/Object;)V
+	public final fun writeJsonWithCodec (Lcom/mojang/serialization/Codec;Ljava/lang/Object;I)V
+	public static synthetic fun writeJsonWithCodec$default (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Lcom/mojang/serialization/Codec;Ljava/lang/Object;IILjava/lang/Object;)V
+	public final fun writeKey (Lnet/kyori/adventure/key/Key;)V
+	public final fun writeLongArray ([J)V
+	public final fun writeMap (Ljava/util/Map;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/ecoder/EncodeFactory;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/ecoder/EncodeFactory;)V
+	public final fun writeNullable (Ljava/lang/Boolean;)V
+	public final fun writeNullable (Ljava/lang/Byte;)V
+	public final fun writeNullable (Ljava/lang/Character;)V
+	public final fun writeNullable (Ljava/lang/Double;)V
+	public final fun writeNullable (Ljava/lang/Float;)V
+	public final fun writeNullable (Ljava/lang/Integer;)V
+	public final fun writeNullable (Ljava/lang/Long;)V
+	public final fun writeNullable (Ljava/lang/Object;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/ecoder/EncodeFactory;)V
+	public final fun writeNullable (Ljava/lang/Short;)V
+	public final fun writeNullable (Ljava/lang/String;)V
+	public final fun writeNullable (Ljava/util/UUID;)V
+	public final fun writeNumber (Ljava/lang/Number;)Ljava/lang/Object;
+	public final fun writeOptional (Ljava/util/Optional;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/ecoder/EncodeFactory;)V
+	public final fun writeOptionalLong (Ljava/util/OptionalLong;)V
+	public final fun writeSerializable (Ljava/io/Serializable;)Lio/netty/buffer/ByteBuf;
+	public final fun writeShortArray ([S)V
+	public final fun writeSingleton (Ljava/lang/Object;)V
+	public final fun writeSound (Lnet/kyori/adventure/sound/Sound;)V
+	public final fun writeStringArray ([Ljava/lang/String;)V
+	public final fun writeURI (Ljava/net/URI;)V
+	public final fun writeUnsigned (B)V
+	public final fun writeUnsigned (D)V
+	public final fun writeUnsigned (F)V
+	public final fun writeUnsigned (I)V
+	public final fun writeUnsigned (J)V
+	public final fun writeUnsigned (S)V
+	public final fun writeUtf (Ljava/lang/String;)V
+	public final fun writeUtf (Ljava/lang/String;I)V
+	public static synthetic fun writeUtf$default (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;Ljava/lang/String;IILjava/lang/Object;)V
+	public final fun writeUuid (Ljava/util/UUID;)V
+	public final fun writeUuidArray ([Ljava/util/UUID;)V
+	public final fun writeVarInt (I)Lio/netty/buffer/ByteBuf;
+	public final fun writeVarLong (J)Lio/netty/buffer/ByteBuf;
+	public final fun writeWithCount (ILjava/util/function/Consumer;)V
+	public final fun writeWithCount (ILkotlin/jvm/functions/Function1;)V
+	public final fun writeZonedDateTime (Ljava/time/ZonedDateTime;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf$Companion {
+	public final fun readArray (Lio/netty/buffer/ByteBuf;Lkotlin/jvm/functions/Function1;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;)[Ljava/lang/Object;
+	public final fun readBitSet (Lio/netty/buffer/ByteBuf;)Ljava/util/BitSet;
+	public final fun readBooleanArray (Lio/netty/buffer/ByteBuf;)[Z
+	public final fun readByteArray (Lio/netty/buffer/ByteBuf;)[B
+	public final fun readCharArray (Lio/netty/buffer/ByteBuf;)[C
+	public final fun readCollection (Lio/netty/buffer/ByteBuf;Lkotlin/jvm/functions/Function1;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;)Ljava/util/Collection;
+	public final fun readComponent (Lio/netty/buffer/ByteBuf;)Lnet/kyori/adventure/text/Component;
+	public final fun readCompoundTag (Lio/netty/buffer/ByteBuf;)Lnet/querz/nbt/tag/CompoundTag;
+	public final fun readDoubleArray (Lio/netty/buffer/ByteBuf;)[D
+	public final fun readEnum (Lio/netty/buffer/ByteBuf;Ljava/lang/Class;)Ljava/lang/Enum;
+	public final fun readEnumSet (Lio/netty/buffer/ByteBuf;Ljava/lang/Class;)Ljava/util/EnumSet;
+	public final fun readEnumSet (Lio/netty/buffer/ByteBuf;Lkotlin/reflect/KClass;)Ljava/util/EnumSet;
+	public final fun readFixedBitSet (Lio/netty/buffer/ByteBuf;I)Ljava/util/BitSet;
+	public final fun readFloatArray (Lio/netty/buffer/ByteBuf;)[F
+	public final fun readInet4Address (Lio/netty/buffer/ByteBuf;)Ljava/net/Inet4Address;
+	public final fun readInetSocketAddress (Lio/netty/buffer/ByteBuf;)Ljava/net/InetSocketAddress;
+	public final fun readIntArray (Lio/netty/buffer/ByteBuf;)[I
+	public final fun readKey (Lio/netty/buffer/ByteBuf;)Lnet/kyori/adventure/key/Key;
+	public final fun readList (Lio/netty/buffer/ByteBuf;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;)Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
+	public final fun readLongArray (Lio/netty/buffer/ByteBuf;)[J
+	public final fun readMap (Lio/netty/buffer/ByteBuf;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;)Lit/unimi/dsi/fastutil/objects/Object2ObjectOpenHashMap;
+	public final fun readMap (Lio/netty/buffer/ByteBuf;Lkotlin/jvm/functions/Function1;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;)Ljava/util/Map;
+	public final fun readNullable (Lio/netty/buffer/ByteBuf;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;)Ljava/lang/Object;
+	public final fun readNumber (Lio/netty/buffer/ByteBuf;)Ljava/lang/Object;
+	public final fun readOptional (Lio/netty/buffer/ByteBuf;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;)Ljava/util/Optional;
+	public final fun readOptionalLong (Lio/netty/buffer/ByteBuf;)Ljava/util/OptionalLong;
+	public final fun readOptionalLong (Lio/netty/buffer/ByteBuf;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory$DecodeLongFactory;)Ljava/util/OptionalLong;
+	public static synthetic fun readOptionalLong$default (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf$Companion;Lio/netty/buffer/ByteBuf;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory$DecodeLongFactory;ILjava/lang/Object;)Ljava/util/OptionalLong;
+	public final fun readSerializable (Lio/netty/buffer/ByteBuf;Ljava/lang/Class;)Ljava/io/Serializable;
+	public final fun readShortArray (Lio/netty/buffer/ByteBuf;)[S
+	public final fun readSingleton (Lio/netty/buffer/ByteBuf;Ljava/lang/ClassLoader;)Ljava/lang/Object;
+	public final fun readSound (Lio/netty/buffer/ByteBuf;)Lnet/kyori/adventure/sound/Sound;
+	public final fun readStringArray (Lio/netty/buffer/ByteBuf;)[Ljava/lang/String;
+	public final fun readURI (Lio/netty/buffer/ByteBuf;)Ljava/net/URI;
+	public final fun readUnsignedByte (Lio/netty/buffer/ByteBuf;)S
+	public final fun readUnsignedDouble (Lio/netty/buffer/ByteBuf;)D
+	public final fun readUnsignedFloat (Lio/netty/buffer/ByteBuf;)F
+	public final fun readUnsignedInt (Lio/netty/buffer/ByteBuf;)J
+	public final fun readUnsignedLong (Lio/netty/buffer/ByteBuf;)J
+	public final fun readUnsignedShort (Lio/netty/buffer/ByteBuf;)I
+	public final fun readUtf (Lio/netty/buffer/ByteBuf;)Ljava/lang/String;
+	public final fun readUtf (Lio/netty/buffer/ByteBuf;I)Ljava/lang/String;
+	public static synthetic fun readUtf$default (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf$Companion;Lio/netty/buffer/ByteBuf;IILjava/lang/Object;)Ljava/lang/String;
+	public final fun readUuid (Lio/netty/buffer/ByteBuf;)Ljava/util/UUID;
+	public final fun readUuidArray (Lio/netty/buffer/ByteBuf;)[Ljava/util/UUID;
+	public final fun readVarInt (Lio/netty/buffer/ByteBuf;)I
+	public final fun readVarLong (Lio/netty/buffer/ByteBuf;)J
+	public final fun readWithCount (Lio/netty/buffer/ByteBuf;Ljava/util/function/Consumer;)V
+	public final fun readWithCount (Lio/netty/buffer/ByteBuf;Lkotlin/jvm/functions/Function1;)V
+	public final fun readZonedDateTime (Lio/netty/buffer/ByteBuf;)Ljava/time/ZonedDateTime;
+	public final fun writeArray (Lio/netty/buffer/ByteBuf;[Ljava/lang/Object;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/ecoder/EncodeFactory;)V
+	public final fun writeBitSet (Lio/netty/buffer/ByteBuf;Ljava/util/BitSet;)V
+	public final fun writeBooleanArray (Lio/netty/buffer/ByteBuf;[Z)V
+	public final fun writeByteArray (Lio/netty/buffer/ByteBuf;[B)V
+	public final fun writeCharArray (Lio/netty/buffer/ByteBuf;[C)V
+	public final fun writeCollection (Lio/netty/buffer/ByteBuf;Ljava/util/Collection;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/ecoder/EncodeFactory;)V
+	public final fun writeComponent (Lio/netty/buffer/ByteBuf;Lnet/kyori/adventure/text/Component;)V
+	public final fun writeCompoundTag (Lio/netty/buffer/ByteBuf;Lnet/querz/nbt/tag/CompoundTag;)V
+	public final fun writeDoubleArray (Lio/netty/buffer/ByteBuf;[D)V
+	public final fun writeEnum (Lio/netty/buffer/ByteBuf;Ljava/lang/Enum;)Lio/netty/buffer/ByteBuf;
+	public final fun writeEnumSet (Lio/netty/buffer/ByteBuf;Ljava/util/EnumSet;Ljava/lang/Class;)V
+	public final fun writeEnumSet (Lio/netty/buffer/ByteBuf;Ljava/util/EnumSet;Lkotlin/reflect/KClass;)V
+	public final fun writeFixedBitSet (Lio/netty/buffer/ByteBuf;Ljava/util/BitSet;I)Lio/netty/buffer/ByteBuf;
+	public final fun writeFloatArray (Lio/netty/buffer/ByteBuf;[F)V
+	public final fun writeInet4Address (Lio/netty/buffer/ByteBuf;Ljava/net/Inet4Address;)V
+	public final fun writeInetSocketAddress (Lio/netty/buffer/ByteBuf;Ljava/net/InetSocketAddress;)V
+	public final fun writeIntArray (Lio/netty/buffer/ByteBuf;[I)V
+	public final fun writeKey (Lio/netty/buffer/ByteBuf;Lnet/kyori/adventure/key/Key;)V
+	public final fun writeLongArray (Lio/netty/buffer/ByteBuf;[J)V
+	public final fun writeMap (Lio/netty/buffer/ByteBuf;Ljava/util/Map;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/ecoder/EncodeFactory;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/ecoder/EncodeFactory;)V
+	public final fun writeNullable (Lio/netty/buffer/ByteBuf;Ljava/lang/Object;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/ecoder/EncodeFactory;)V
+	public final fun writeNumber (Lio/netty/buffer/ByteBuf;Ljava/lang/Number;)Ljava/lang/Object;
+	public final fun writeOptional (Lio/netty/buffer/ByteBuf;Ljava/util/Optional;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/ecoder/EncodeFactory;)V
+	public final fun writeOptionalLong (Lio/netty/buffer/ByteBuf;Ljava/util/OptionalLong;)V
+	public final fun writeOptionalLong (Lio/netty/buffer/ByteBuf;Ljava/util/OptionalLong;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/ecoder/EncodeFactory$EncodeLongFactory;)V
+	public static synthetic fun writeOptionalLong$default (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf$Companion;Lio/netty/buffer/ByteBuf;Ljava/util/OptionalLong;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/ecoder/EncodeFactory$EncodeLongFactory;ILjava/lang/Object;)V
+	public final fun writeSerializable (Lio/netty/buffer/ByteBuf;Ljava/io/Serializable;)Lio/netty/buffer/ByteBuf;
+	public final fun writeShortArray (Lio/netty/buffer/ByteBuf;[S)V
+	public final fun writeSingleton (Lio/netty/buffer/ByteBuf;Ljava/lang/Object;)V
+	public final fun writeSound (Lio/netty/buffer/ByteBuf;Lnet/kyori/adventure/sound/Sound;)V
+	public final fun writeStringArray (Lio/netty/buffer/ByteBuf;[Ljava/lang/String;)V
+	public final fun writeURI (Lio/netty/buffer/ByteBuf;Ljava/net/URI;)V
+	public final fun writeUnsigned (Lio/netty/buffer/ByteBuf;B)V
+	public final fun writeUnsigned (Lio/netty/buffer/ByteBuf;D)V
+	public final fun writeUnsigned (Lio/netty/buffer/ByteBuf;F)V
+	public final fun writeUnsigned (Lio/netty/buffer/ByteBuf;I)V
+	public final fun writeUnsigned (Lio/netty/buffer/ByteBuf;J)V
+	public final fun writeUnsigned (Lio/netty/buffer/ByteBuf;S)V
+	public final fun writeUtf (Lio/netty/buffer/ByteBuf;Ljava/lang/String;)V
+	public final fun writeUtf (Lio/netty/buffer/ByteBuf;Ljava/lang/String;I)V
+	public static synthetic fun writeUtf$default (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf$Companion;Lio/netty/buffer/ByteBuf;Ljava/lang/String;IILjava/lang/Object;)V
+	public final fun writeUuid (Lio/netty/buffer/ByteBuf;Ljava/util/UUID;)V
+	public final fun writeUuidArray (Lio/netty/buffer/ByteBuf;[Ljava/util/UUID;)V
+	public final fun writeVarInt (Lio/netty/buffer/ByteBuf;I)Lio/netty/buffer/ByteBuf;
+	public final fun writeVarLong (Lio/netty/buffer/ByteBuf;J)Lio/netty/buffer/ByteBuf;
+	public final fun writeWithCount (Lio/netty/buffer/ByteBuf;ILjava/util/function/Consumer;)V
+	public final fun writeWithCount (Lio/netty/buffer/ByteBuf;ILkotlin/jvm/functions/Function1;)V
+	public final fun writeZonedDateTime (Lio/netty/buffer/ByteBuf;Ljava/time/ZonedDateTime;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBufKt {
+	public static final fun checkDecoded (ZLkotlin/jvm/functions/Function0;)V
+	public static final fun checkEncoded (ZLkotlin/jvm/functions/Function0;)V
+	public static final fun readArray (Lio/netty/buffer/ByteBuf;Lkotlin/jvm/functions/Function1;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;)[Ljava/lang/Object;
+	public static final fun readBitSet (Lio/netty/buffer/ByteBuf;)Ljava/util/BitSet;
+	public static final fun readBooleanArray (Lio/netty/buffer/ByteBuf;)[Z
+	public static final fun readByteArray (Lio/netty/buffer/ByteBuf;)[B
+	public static final fun readCharArray (Lio/netty/buffer/ByteBuf;)[C
+	public static final fun readCollection (Lio/netty/buffer/ByteBuf;Lkotlin/jvm/functions/Function1;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;)Ljava/util/Collection;
+	public static final fun readComponent (Lio/netty/buffer/ByteBuf;)Lnet/kyori/adventure/text/Component;
+	public static final fun readCompoundTag (Lio/netty/buffer/ByteBuf;)Lnet/querz/nbt/tag/CompoundTag;
+	public static final fun readDoubleArray (Lio/netty/buffer/ByteBuf;)[D
+	public static final fun readEnum (Lio/netty/buffer/ByteBuf;Ljava/lang/Class;)Ljava/lang/Enum;
+	public static final fun readEnumSet (Lio/netty/buffer/ByteBuf;Ljava/lang/Class;)Ljava/util/EnumSet;
+	public static final fun readEnumSet (Lio/netty/buffer/ByteBuf;Lkotlin/reflect/KClass;)Ljava/util/EnumSet;
+	public static final fun readFixedBitSet (Lio/netty/buffer/ByteBuf;I)Ljava/util/BitSet;
+	public static final fun readFloatArray (Lio/netty/buffer/ByteBuf;)[F
+	public static final fun readInet4Address (Lio/netty/buffer/ByteBuf;)Ljava/net/Inet4Address;
+	public static final fun readInetSocketAddress (Lio/netty/buffer/ByteBuf;)Ljava/net/InetSocketAddress;
+	public static final fun readIntArray (Lio/netty/buffer/ByteBuf;)[I
+	public static final fun readKey (Lio/netty/buffer/ByteBuf;)Lnet/kyori/adventure/key/Key;
+	public static final fun readList (Lio/netty/buffer/ByteBuf;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;)Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
+	public static final fun readLongArray (Lio/netty/buffer/ByteBuf;)[J
+	public static final fun readMap (Lio/netty/buffer/ByteBuf;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;)Lit/unimi/dsi/fastutil/objects/Object2ObjectOpenHashMap;
+	public static final fun readMap (Lio/netty/buffer/ByteBuf;Lkotlin/jvm/functions/Function1;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;)Ljava/util/Map;
+	public static final fun readNullable (Lio/netty/buffer/ByteBuf;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;)Ljava/lang/Object;
+	public static final fun readNullableBoolean (Lio/netty/buffer/ByteBuf;)Ljava/lang/Boolean;
+	public static final fun readNullableByte (Lio/netty/buffer/ByteBuf;)Ljava/lang/Byte;
+	public static final fun readNullableChar (Lio/netty/buffer/ByteBuf;)Ljava/lang/Character;
+	public static final fun readNullableDouble (Lio/netty/buffer/ByteBuf;)Ljava/lang/Double;
+	public static final fun readNullableFloat (Lio/netty/buffer/ByteBuf;)Ljava/lang/Float;
+	public static final fun readNullableInt (Lio/netty/buffer/ByteBuf;)Ljava/lang/Integer;
+	public static final fun readNullableLong (Lio/netty/buffer/ByteBuf;)Ljava/lang/Long;
+	public static final fun readNullableShort (Lio/netty/buffer/ByteBuf;)Ljava/lang/Short;
+	public static final fun readNullableString (Lio/netty/buffer/ByteBuf;)Ljava/lang/String;
+	public static final fun readNullableUuid (Lio/netty/buffer/ByteBuf;)Ljava/util/UUID;
+	public static final fun readNullableVarInt (Lio/netty/buffer/ByteBuf;)Ljava/lang/Integer;
+	public static final fun readNumber (Lio/netty/buffer/ByteBuf;)Ljava/lang/Object;
+	public static final fun readOptional (Lio/netty/buffer/ByteBuf;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory;)Ljava/util/Optional;
+	public static final fun readOptionalLong (Lio/netty/buffer/ByteBuf;)Ljava/util/OptionalLong;
+	public static final fun readShortArray (Lio/netty/buffer/ByteBuf;)[S
+	public static final fun readSingleton (Lio/netty/buffer/ByteBuf;Ljava/lang/ClassLoader;)Ljava/lang/Object;
+	public static final fun readSound (Lio/netty/buffer/ByteBuf;)Lnet/kyori/adventure/sound/Sound;
+	public static final fun readStringArray (Lio/netty/buffer/ByteBuf;)[Ljava/lang/String;
+	public static final fun readURI (Lio/netty/buffer/ByteBuf;)Ljava/net/URI;
+	public static final fun readUnsignedDouble (Lio/netty/buffer/ByteBuf;)D
+	public static final fun readUnsignedFloat (Lio/netty/buffer/ByteBuf;)F
+	public static final fun readUnsignedLong (Lio/netty/buffer/ByteBuf;)J
+	public static final fun readUtf (Lio/netty/buffer/ByteBuf;I)Ljava/lang/String;
+	public static synthetic fun readUtf$default (Lio/netty/buffer/ByteBuf;IILjava/lang/Object;)Ljava/lang/String;
+	public static final fun readUuid (Lio/netty/buffer/ByteBuf;)Ljava/util/UUID;
+	public static final fun readUuidArray (Lio/netty/buffer/ByteBuf;)[Ljava/util/UUID;
+	public static final fun readVarInt (Lio/netty/buffer/ByteBuf;)I
+	public static final fun readVarLong (Lio/netty/buffer/ByteBuf;)J
+	public static final fun readWithCount (Lio/netty/buffer/ByteBuf;Ljava/util/function/Consumer;)V
+	public static final fun readWithCount (Lio/netty/buffer/ByteBuf;Lkotlin/jvm/functions/Function1;)V
+	public static final fun readZonedDateTime (Lio/netty/buffer/ByteBuf;)Ljava/time/ZonedDateTime;
+	public static final fun toByteArraySafe (Lio/netty/buffer/ByteBuf;)[B
+	public static final fun wrap (Lio/netty/buffer/ByteBuf;)Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;
+	public static final fun writeArray (Lio/netty/buffer/ByteBuf;[Ljava/lang/Object;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/ecoder/EncodeFactory;)V
+	public static final fun writeBitSet (Lio/netty/buffer/ByteBuf;Ljava/util/BitSet;)V
+	public static final fun writeBooleanArray (Lio/netty/buffer/ByteBuf;[Z)V
+	public static final fun writeByteArray (Lio/netty/buffer/ByteBuf;[B)V
+	public static final fun writeCharArray (Lio/netty/buffer/ByteBuf;[C)V
+	public static final fun writeCollection (Lio/netty/buffer/ByteBuf;Ljava/util/Collection;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/ecoder/EncodeFactory;)V
+	public static final fun writeComponent (Lio/netty/buffer/ByteBuf;Lnet/kyori/adventure/text/Component;)V
+	public static final fun writeCompoundTag (Lio/netty/buffer/ByteBuf;Lnet/querz/nbt/tag/CompoundTag;)V
+	public static final fun writeDoubleArray (Lio/netty/buffer/ByteBuf;[D)V
+	public static final fun writeEnum (Lio/netty/buffer/ByteBuf;Ljava/lang/Enum;)Lio/netty/buffer/ByteBuf;
+	public static final fun writeEnumSet (Lio/netty/buffer/ByteBuf;Ljava/util/EnumSet;Ljava/lang/Class;)V
+	public static final fun writeEnumSet (Lio/netty/buffer/ByteBuf;Ljava/util/EnumSet;Lkotlin/reflect/KClass;)V
+	public static final fun writeFixedBitSet (Lio/netty/buffer/ByteBuf;Ljava/util/BitSet;I)Lio/netty/buffer/ByteBuf;
+	public static final fun writeFloatArray (Lio/netty/buffer/ByteBuf;[F)V
+	public static final fun writeInet4Address (Lio/netty/buffer/ByteBuf;Ljava/net/Inet4Address;)V
+	public static final fun writeInetSocketAddress (Lio/netty/buffer/ByteBuf;Ljava/net/InetSocketAddress;)V
+	public static final fun writeIntArray (Lio/netty/buffer/ByteBuf;[I)V
+	public static final fun writeKey (Lio/netty/buffer/ByteBuf;Lnet/kyori/adventure/key/Key;)V
+	public static final fun writeLongArray (Lio/netty/buffer/ByteBuf;[J)V
+	public static final fun writeMap (Lio/netty/buffer/ByteBuf;Ljava/util/Map;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/ecoder/EncodeFactory;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/ecoder/EncodeFactory;)V
+	public static final fun writeNullable (Lio/netty/buffer/ByteBuf;Ljava/lang/Object;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/ecoder/EncodeFactory;)V
+	public static final fun writeNullableBoolean (Lio/netty/buffer/ByteBuf;Ljava/lang/Boolean;)V
+	public static final fun writeNullableByte (Lio/netty/buffer/ByteBuf;Ljava/lang/Byte;)V
+	public static final fun writeNullableChar (Lio/netty/buffer/ByteBuf;Ljava/lang/Character;)V
+	public static final fun writeNullableDouble (Lio/netty/buffer/ByteBuf;Ljava/lang/Double;)V
+	public static final fun writeNullableFloat (Lio/netty/buffer/ByteBuf;Ljava/lang/Float;)V
+	public static final fun writeNullableInt (Lio/netty/buffer/ByteBuf;Ljava/lang/Integer;)V
+	public static final fun writeNullableLong (Lio/netty/buffer/ByteBuf;Ljava/lang/Long;)V
+	public static final fun writeNullableShort (Lio/netty/buffer/ByteBuf;Ljava/lang/Short;)V
+	public static final fun writeNullableString (Lio/netty/buffer/ByteBuf;Ljava/lang/String;)V
+	public static final fun writeNullableUuid (Lio/netty/buffer/ByteBuf;Ljava/util/UUID;)V
+	public static final fun writeNullableVarInt (Lio/netty/buffer/ByteBuf;Ljava/lang/Integer;)V
+	public static final fun writeNumber (Lio/netty/buffer/ByteBuf;Ljava/lang/Number;)Ljava/lang/Object;
+	public static final fun writeOptional (Lio/netty/buffer/ByteBuf;Ljava/util/Optional;Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/ecoder/EncodeFactory;)V
+	public static final fun writeOptionalLong (Lio/netty/buffer/ByteBuf;Ljava/util/OptionalLong;)V
+	public static final fun writeShortArray (Lio/netty/buffer/ByteBuf;[S)V
+	public static final fun writeSingleton (Lio/netty/buffer/ByteBuf;Ljava/lang/Object;)V
+	public static final fun writeSound (Lio/netty/buffer/ByteBuf;Lnet/kyori/adventure/sound/Sound;)V
+	public static final fun writeStringArray (Lio/netty/buffer/ByteBuf;[Ljava/lang/String;)V
+	public static final fun writeURI (Lio/netty/buffer/ByteBuf;Ljava/net/URI;)V
+	public static final fun writeUnsigned (Lio/netty/buffer/ByteBuf;B)V
+	public static final fun writeUnsigned (Lio/netty/buffer/ByteBuf;D)V
+	public static final fun writeUnsigned (Lio/netty/buffer/ByteBuf;F)V
+	public static final fun writeUnsigned (Lio/netty/buffer/ByteBuf;I)V
+	public static final fun writeUnsigned (Lio/netty/buffer/ByteBuf;J)V
+	public static final fun writeUnsigned (Lio/netty/buffer/ByteBuf;S)V
+	public static final fun writeUtf (Lio/netty/buffer/ByteBuf;Ljava/lang/String;I)V
+	public static synthetic fun writeUtf$default (Lio/netty/buffer/ByteBuf;Ljava/lang/String;IILjava/lang/Object;)V
+	public static final fun writeUuid (Lio/netty/buffer/ByteBuf;Ljava/util/UUID;)V
+	public static final fun writeUuidArray (Lio/netty/buffer/ByteBuf;[Ljava/util/UUID;)V
+	public static final fun writeVarInt (Lio/netty/buffer/ByteBuf;I)Lio/netty/buffer/ByteBuf;
+	public static final fun writeVarLong (Lio/netty/buffer/ByteBuf;J)Lio/netty/buffer/ByteBuf;
+	public static final fun writeWithCount (Lio/netty/buffer/ByteBuf;ILjava/util/function/Consumer;)V
+	public static final fun writeWithCount (Lio/netty/buffer/ByteBuf;ILkotlin/jvm/functions/Function1;)V
+	public static final fun writeZonedDateTime (Lio/netty/buffer/ByteBuf;Ljava/time/ZonedDateTime;)V
+}
+
+public class dev/slne/surf/cloud/api/common/netty/protocol/buffer/WrappedByteBuf : io/netty/buffer/ByteBuf {
+	public fun <init> (Lio/netty/buffer/ByteBuf;)V
+	public fun alloc ()Lio/netty/buffer/ByteBufAllocator;
+	public fun array ()[B
+	public fun arrayOffset ()I
+	public fun asByteBuf ()Lio/netty/buffer/ByteBuf;
+	public fun asReadOnly ()Lio/netty/buffer/ByteBuf;
+	public fun bytesBefore (B)I
+	public fun bytesBefore (IB)I
+	public fun bytesBefore (IIB)I
+	public fun capacity ()I
+	public fun capacity (I)Lio/netty/buffer/ByteBuf;
+	public fun clear ()Lio/netty/buffer/ByteBuf;
+	public fun compareTo (Lio/netty/buffer/ByteBuf;)I
+	public synthetic fun compareTo (Ljava/lang/Object;)I
+	public fun copy ()Lio/netty/buffer/ByteBuf;
+	public fun copy (II)Lio/netty/buffer/ByteBuf;
+	public fun discardReadBytes ()Lio/netty/buffer/ByteBuf;
+	public fun discardSomeReadBytes ()Lio/netty/buffer/ByteBuf;
+	public fun duplicate ()Lio/netty/buffer/ByteBuf;
+	public fun ensureWritable (I)Lio/netty/buffer/ByteBuf;
+	public fun ensureWritable (IZ)I
+	public fun equals (Ljava/lang/Object;)Z
+	public fun forEachByte (IILio/netty/util/ByteProcessor;)I
+	public fun forEachByte (Lio/netty/util/ByteProcessor;)I
+	public fun forEachByteDesc (IILio/netty/util/ByteProcessor;)I
+	public fun forEachByteDesc (Lio/netty/util/ByteProcessor;)I
+	public fun getBoolean (I)Z
+	public fun getByte (I)B
+	public fun getBytes (ILio/netty/buffer/ByteBuf;)Lio/netty/buffer/ByteBuf;
+	public fun getBytes (ILio/netty/buffer/ByteBuf;I)Lio/netty/buffer/ByteBuf;
+	public fun getBytes (ILio/netty/buffer/ByteBuf;II)Lio/netty/buffer/ByteBuf;
+	public fun getBytes (ILjava/io/OutputStream;I)Lio/netty/buffer/ByteBuf;
+	public fun getBytes (ILjava/nio/ByteBuffer;)Lio/netty/buffer/ByteBuf;
+	public fun getBytes (ILjava/nio/channels/FileChannel;JI)I
+	public fun getBytes (ILjava/nio/channels/GatheringByteChannel;I)I
+	public fun getBytes (I[B)Lio/netty/buffer/ByteBuf;
+	public fun getBytes (I[BII)Lio/netty/buffer/ByteBuf;
+	public fun getChar (I)C
+	public fun getCharSequence (IILjava/nio/charset/Charset;)Ljava/lang/CharSequence;
+	public fun getDouble (I)D
+	public fun getDoubleLE (I)D
+	public fun getFloat (I)F
+	public fun getFloatLE (I)F
+	public fun getInt (I)I
+	public fun getIntLE (I)I
+	public fun getLong (I)J
+	public fun getLongLE (I)J
+	public fun getMedium (I)I
+	public fun getMediumLE (I)I
+	public fun getShort (I)S
+	public fun getShortLE (I)S
+	public fun getUnsignedByte (I)S
+	public fun getUnsignedInt (I)J
+	public fun getUnsignedIntLE (I)J
+	public fun getUnsignedMedium (I)I
+	public fun getUnsignedMediumLE (I)I
+	public fun getUnsignedShort (I)I
+	public fun getUnsignedShortLE (I)I
+	public fun hasArray ()Z
+	public fun hasMemoryAddress ()Z
+	public fun hashCode ()I
+	public fun indexOf (IIB)I
+	public fun internalNioBuffer (II)Ljava/nio/ByteBuffer;
+	public fun isContiguous ()Z
+	public fun isDirect ()Z
+	public fun isReadOnly ()Z
+	public fun isReadable ()Z
+	public fun isReadable (I)Z
+	public fun isWritable ()Z
+	public fun isWritable (I)Z
+	public fun markReaderIndex ()Lio/netty/buffer/ByteBuf;
+	public fun markWriterIndex ()Lio/netty/buffer/ByteBuf;
+	public fun maxCapacity ()I
+	public fun maxFastWritableBytes ()I
+	public fun maxWritableBytes ()I
+	public fun memoryAddress ()J
+	public fun nioBuffer ()Ljava/nio/ByteBuffer;
+	public fun nioBuffer (II)Ljava/nio/ByteBuffer;
+	public fun nioBufferCount ()I
+	public fun nioBuffers ()[Ljava/nio/ByteBuffer;
+	public fun nioBuffers (II)[Ljava/nio/ByteBuffer;
+	public fun order ()Ljava/nio/ByteOrder;
+	public fun order (Ljava/nio/ByteOrder;)Lio/netty/buffer/ByteBuf;
+	public fun readBoolean ()Z
+	public fun readByte ()B
+	public fun readBytes (I)Lio/netty/buffer/ByteBuf;
+	public fun readBytes (Lio/netty/buffer/ByteBuf;)Lio/netty/buffer/ByteBuf;
+	public fun readBytes (Lio/netty/buffer/ByteBuf;I)Lio/netty/buffer/ByteBuf;
+	public fun readBytes (Lio/netty/buffer/ByteBuf;II)Lio/netty/buffer/ByteBuf;
+	public fun readBytes (Ljava/io/OutputStream;I)Lio/netty/buffer/ByteBuf;
+	public fun readBytes (Ljava/nio/ByteBuffer;)Lio/netty/buffer/ByteBuf;
+	public fun readBytes (Ljava/nio/channels/FileChannel;JI)I
+	public fun readBytes (Ljava/nio/channels/GatheringByteChannel;I)I
+	public fun readBytes ([B)Lio/netty/buffer/ByteBuf;
+	public fun readBytes ([BII)Lio/netty/buffer/ByteBuf;
+	public fun readChar ()C
+	public fun readCharSequence (ILjava/nio/charset/Charset;)Ljava/lang/CharSequence;
+	public fun readDouble ()D
+	public fun readDoubleLE ()D
+	public fun readFloat ()F
+	public fun readFloatLE ()F
+	public fun readInt ()I
+	public fun readIntLE ()I
+	public fun readLong ()J
+	public fun readLongLE ()J
+	public fun readMedium ()I
+	public fun readMediumLE ()I
+	public fun readRetainedSlice (I)Lio/netty/buffer/ByteBuf;
+	public fun readShort ()S
+	public fun readShortLE ()S
+	public fun readSlice (I)Lio/netty/buffer/ByteBuf;
+	public fun readUnsignedByte ()S
+	public fun readUnsignedInt ()J
+	public fun readUnsignedIntLE ()J
+	public fun readUnsignedMedium ()I
+	public fun readUnsignedMediumLE ()I
+	public fun readUnsignedShort ()I
+	public fun readUnsignedShortLE ()I
+	public fun readableBytes ()I
+	public fun readerIndex ()I
+	public fun readerIndex (I)Lio/netty/buffer/ByteBuf;
+	public fun refCnt ()I
+	public fun release ()Z
+	public fun release (I)Z
+	public fun resetReaderIndex ()Lio/netty/buffer/ByteBuf;
+	public fun resetWriterIndex ()Lio/netty/buffer/ByteBuf;
+	public fun retain ()Lio/netty/buffer/ByteBuf;
+	public synthetic fun retain ()Lio/netty/util/ReferenceCounted;
+	public fun retain (I)Lio/netty/buffer/ByteBuf;
+	public synthetic fun retain (I)Lio/netty/util/ReferenceCounted;
+	public fun retainedDuplicate ()Lio/netty/buffer/ByteBuf;
+	public fun retainedSlice ()Lio/netty/buffer/ByteBuf;
+	public fun retainedSlice (II)Lio/netty/buffer/ByteBuf;
+	public fun setBoolean (IZ)Lio/netty/buffer/ByteBuf;
+	public fun setByte (II)Lio/netty/buffer/ByteBuf;
+	public fun setBytes (ILio/netty/buffer/ByteBuf;)Lio/netty/buffer/ByteBuf;
+	public fun setBytes (ILio/netty/buffer/ByteBuf;I)Lio/netty/buffer/ByteBuf;
+	public fun setBytes (ILio/netty/buffer/ByteBuf;II)Lio/netty/buffer/ByteBuf;
+	public fun setBytes (ILjava/io/InputStream;I)I
+	public fun setBytes (ILjava/nio/ByteBuffer;)Lio/netty/buffer/ByteBuf;
+	public fun setBytes (ILjava/nio/channels/FileChannel;JI)I
+	public fun setBytes (ILjava/nio/channels/ScatteringByteChannel;I)I
+	public fun setBytes (I[B)Lio/netty/buffer/ByteBuf;
+	public fun setBytes (I[BII)Lio/netty/buffer/ByteBuf;
+	public fun setChar (II)Lio/netty/buffer/ByteBuf;
+	public fun setCharSequence (ILjava/lang/CharSequence;Ljava/nio/charset/Charset;)I
+	public fun setDouble (ID)Lio/netty/buffer/ByteBuf;
+	public fun setDoubleLE (ID)Lio/netty/buffer/ByteBuf;
+	public fun setFloat (IF)Lio/netty/buffer/ByteBuf;
+	public fun setFloatLE (IF)Lio/netty/buffer/ByteBuf;
+	public fun setIndex (II)Lio/netty/buffer/ByteBuf;
+	public fun setInt (II)Lio/netty/buffer/ByteBuf;
+	public fun setIntLE (II)Lio/netty/buffer/ByteBuf;
+	public fun setLong (IJ)Lio/netty/buffer/ByteBuf;
+	public fun setLongLE (IJ)Lio/netty/buffer/ByteBuf;
+	public fun setMedium (II)Lio/netty/buffer/ByteBuf;
+	public fun setMediumLE (II)Lio/netty/buffer/ByteBuf;
+	public fun setShort (II)Lio/netty/buffer/ByteBuf;
+	public fun setShortLE (II)Lio/netty/buffer/ByteBuf;
+	public fun setZero (II)Lio/netty/buffer/ByteBuf;
+	public fun skipBytes (I)Lio/netty/buffer/ByteBuf;
+	public fun slice ()Lio/netty/buffer/ByteBuf;
+	public fun slice (II)Lio/netty/buffer/ByteBuf;
+	public fun toString ()Ljava/lang/String;
+	public fun toString (IILjava/nio/charset/Charset;)Ljava/lang/String;
+	public fun toString (Ljava/nio/charset/Charset;)Ljava/lang/String;
+	public fun touch ()Lio/netty/buffer/ByteBuf;
+	public synthetic fun touch ()Lio/netty/util/ReferenceCounted;
+	public fun touch (Ljava/lang/Object;)Lio/netty/buffer/ByteBuf;
+	public synthetic fun touch (Ljava/lang/Object;)Lio/netty/util/ReferenceCounted;
+	public fun unwrap ()Lio/netty/buffer/ByteBuf;
+	public fun writableBytes ()I
+	public fun writeBoolean (Z)Lio/netty/buffer/ByteBuf;
+	public fun writeByte (I)Lio/netty/buffer/ByteBuf;
+	public fun writeBytes (Lio/netty/buffer/ByteBuf;)Lio/netty/buffer/ByteBuf;
+	public fun writeBytes (Lio/netty/buffer/ByteBuf;I)Lio/netty/buffer/ByteBuf;
+	public fun writeBytes (Lio/netty/buffer/ByteBuf;II)Lio/netty/buffer/ByteBuf;
+	public fun writeBytes (Ljava/io/InputStream;I)I
+	public fun writeBytes (Ljava/nio/ByteBuffer;)Lio/netty/buffer/ByteBuf;
+	public fun writeBytes (Ljava/nio/channels/FileChannel;JI)I
+	public fun writeBytes (Ljava/nio/channels/ScatteringByteChannel;I)I
+	public fun writeBytes ([B)Lio/netty/buffer/ByteBuf;
+	public fun writeBytes ([BII)Lio/netty/buffer/ByteBuf;
+	public fun writeChar (I)Lio/netty/buffer/ByteBuf;
+	public fun writeCharSequence (Ljava/lang/CharSequence;Ljava/nio/charset/Charset;)I
+	public fun writeDouble (D)Lio/netty/buffer/ByteBuf;
+	public fun writeDoubleLE (D)Lio/netty/buffer/ByteBuf;
+	public fun writeFloat (F)Lio/netty/buffer/ByteBuf;
+	public fun writeFloatLE (F)Lio/netty/buffer/ByteBuf;
+	public fun writeInt (I)Lio/netty/buffer/ByteBuf;
+	public fun writeIntLE (I)Lio/netty/buffer/ByteBuf;
+	public fun writeLong (J)Lio/netty/buffer/ByteBuf;
+	public fun writeLongLE (J)Lio/netty/buffer/ByteBuf;
+	public fun writeMedium (I)Lio/netty/buffer/ByteBuf;
+	public fun writeMediumLE (I)Lio/netty/buffer/ByteBuf;
+	public fun writeShort (I)Lio/netty/buffer/ByteBuf;
+	public fun writeShortLE (I)Lio/netty/buffer/ByteBuf;
+	public fun writeZero (I)Lio/netty/buffer/ByteBuf;
+	public fun writerIndex ()I
+	public fun writerIndex (I)Lio/netty/buffer/ByteBuf;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory {
+	public abstract fun invoke (Lio/netty/buffer/ByteBuf;)Ljava/lang/Object;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory$DecodeLongFactory : dev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory {
+	public abstract fun decodeLong (Lio/netty/buffer/ByteBuf;)J
+	public abstract fun invoke (Lio/netty/buffer/ByteBuf;)Ljava/lang/Long;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory$DecodeLongFactory$DefaultImpls {
+	public static fun invoke (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/decoder/DecodeFactory$DecodeLongFactory;Lio/netty/buffer/ByteBuf;)Ljava/lang/Long;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/netty/protocol/buffer/ecoder/EncodeFactory {
+	public abstract fun invoke (Lio/netty/buffer/ByteBuf;Ljava/lang/Object;)V
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/netty/protocol/buffer/ecoder/EncodeFactory$EncodeLongFactory : dev/slne/surf/cloud/api/common/netty/protocol/buffer/ecoder/EncodeFactory {
+	public abstract fun encodeLong (Lio/netty/buffer/ByteBuf;J)V
+	public abstract fun invoke (Lio/netty/buffer/ByteBuf;J)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/protocol/buffer/ecoder/EncodeFactory$EncodeLongFactory$DefaultImpls {
+	public static fun invoke (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/ecoder/EncodeFactory$EncodeLongFactory;Lio/netty/buffer/ByteBuf;J)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/protocol/buffer/types/Utf8String {
+	public static final field INSTANCE Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/types/Utf8String;
+	public final fun read (Lio/netty/buffer/ByteBuf;I)Ljava/lang/String;
+	public final fun write (Lio/netty/buffer/ByteBuf;Ljava/lang/CharSequence;I)V
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/protocol/buffer/types/VarInt {
+	public static final field INSTANCE Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/types/VarInt;
+	public final fun getEncodedSize (I)I
+	public final fun hasContinuationBit (B)Z
+	public final fun readVarInt (Lio/netty/buffer/ByteBuf;)I
+	public final fun writeVarInt (Lio/netty/buffer/ByteBuf;I)Lio/netty/buffer/ByteBuf;
+}
+
+public final class dev/slne/surf/cloud/api/common/netty/protocol/buffer/types/VarLong {
+	public static final field INSTANCE Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/types/VarLong;
+	public final fun getEncodedSize (J)I
+	public final fun hasContinuationBit (B)Z
+	public final fun readVarLong (Lio/netty/buffer/ByteBuf;)J
+	public final fun writeVarLong (Lio/netty/buffer/ByteBuf;J)Lio/netty/buffer/ByteBuf;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/player/CloudPlayer : dev/slne/surf/cloud/api/common/player/OfflineCloudPlayer, net/kyori/adventure/audience/Audience {
+	public abstract fun connectToServer (Ldev/slne/surf/cloud/api/common/server/CloudServer;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun connectToServer (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun connectToServer (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun connectToServerOrQueue (Ldev/slne/surf/cloud/api/common/server/CloudServer;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun connectToServerOrQueue (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun connectToServerOrQueue (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun disconnect (Lnet/kyori/adventure/text/Component;)V
+	public abstract fun displayName (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun getConnected ()Z
+	public abstract fun getConnectedToProxy ()Z
+	public abstract fun getConnectedToServer ()Z
+	public abstract fun lastServerRaw (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun latestIpAddress (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun name (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun teleport (Ldev/slne/surf/cloud/api/common/player/teleport/TeleportLocation;Ldev/slne/surf/cloud/api/common/player/teleport/TeleportCause;[Ldev/slne/surf/cloud/api/common/player/teleport/TeleportFlag;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun teleport (Ljava/util/UUID;DDDFFLdev/slne/surf/cloud/api/common/player/teleport/TeleportCause;[Ldev/slne/surf/cloud/api/common/player/teleport/TeleportFlag;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun withPersistentData (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/common/player/CloudPlayer$DefaultImpls {
+	public static fun getConnected (Ldev/slne/surf/cloud/api/common/player/CloudPlayer;)Z
+	public static fun teleport (Ldev/slne/surf/cloud/api/common/player/CloudPlayer;Ljava/util/UUID;DDDFFLdev/slne/surf/cloud/api/common/player/teleport/TeleportCause;[Ldev/slne/surf/cloud/api/common/player/teleport/TeleportFlag;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun teleport$default (Ldev/slne/surf/cloud/api/common/player/CloudPlayer;Ldev/slne/surf/cloud/api/common/player/teleport/TeleportLocation;Ldev/slne/surf/cloud/api/common/player/teleport/TeleportCause;[Ldev/slne/surf/cloud/api/common/player/teleport/TeleportFlag;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static synthetic fun teleport$default (Ldev/slne/surf/cloud/api/common/player/CloudPlayer;Ljava/util/UUID;DDDFFLdev/slne/surf/cloud/api/common/player/teleport/TeleportCause;[Ldev/slne/surf/cloud/api/common/player/teleport/TeleportFlag;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/player/CloudPlayerManager {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/player/CloudPlayerManager$Companion;
+	public abstract fun getOfflinePlayer (Ljava/util/UUID;)Ldev/slne/surf/cloud/api/common/player/OfflineCloudPlayer;
+	public abstract fun getOnlinePlayers ()Ldev/slne/surf/cloud/api/common/server/UserList;
+	public abstract fun getPlayer (Ljava/util/UUID;)Ldev/slne/surf/cloud/api/common/player/CloudPlayer;
+}
+
+public final class dev/slne/surf/cloud/api/common/player/CloudPlayerManager$Companion : dev/slne/surf/cloud/api/common/player/CloudPlayerManager {
+	public fun getOfflinePlayer (Ljava/util/UUID;)Ldev/slne/surf/cloud/api/common/player/OfflineCloudPlayer;
+	public fun getOnlinePlayers ()Ldev/slne/surf/cloud/api/common/server/UserList;
+	public fun getPlayer (Ljava/util/UUID;)Ldev/slne/surf/cloud/api/common/player/CloudPlayer;
+}
+
+public final class dev/slne/surf/cloud/api/common/player/CloudPlayerManagerKt {
+	public static final fun toCloudPlayer (Lnet/kyori/adventure/audience/Audience;)Ldev/slne/surf/cloud/api/common/player/CloudPlayer;
+	public static final fun toOfflineCloudPlayer (Lnet/kyori/adventure/audience/Audience;)Ldev/slne/surf/cloud/api/common/player/OfflineCloudPlayer;
+}
+
+public final class dev/slne/surf/cloud/api/common/player/ConnectionResultEnum : java/lang/Enum {
+	public static final field ALREADY_CONNECTED Ldev/slne/surf/cloud/api/common/player/ConnectionResultEnum;
+	public static final field CANNOT_COMMUNICATE_WITH_PROXY Ldev/slne/surf/cloud/api/common/player/ConnectionResultEnum;
+	public static final field CANNOT_CONNECT_TO_PROXY Ldev/slne/surf/cloud/api/common/player/ConnectionResultEnum;
+	public static final field CANNOT_SWITCH_PROXY Ldev/slne/surf/cloud/api/common/player/ConnectionResultEnum;
+	public static final field CATEGORY_FULL Ldev/slne/surf/cloud/api/common/player/ConnectionResultEnum;
+	public static final field CONNECTION_CANCELLED Ldev/slne/surf/cloud/api/common/player/ConnectionResultEnum;
+	public static final field CONNECTION_IN_PROGRESS Ldev/slne/surf/cloud/api/common/player/ConnectionResultEnum;
+	public static final field OTHER_SERVER_CANNOT_ACCEPT_TRANSFER_PACKET Ldev/slne/surf/cloud/api/common/player/ConnectionResultEnum;
+	public static final field SERVER_DISCONNECTED Ldev/slne/surf/cloud/api/common/player/ConnectionResultEnum;
+	public static final field SERVER_FULL Ldev/slne/surf/cloud/api/common/player/ConnectionResultEnum;
+	public static final field SERVER_NOT_FOUND Ldev/slne/surf/cloud/api/common/player/ConnectionResultEnum;
+	public static final field SERVER_OFFLINE Ldev/slne/surf/cloud/api/common/player/ConnectionResultEnum;
+	public static final field SUCCESS Ldev/slne/surf/cloud/api/common/player/ConnectionResultEnum;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
+	public static fun valueOf (Ljava/lang/String;)Ldev/slne/surf/cloud/api/common/player/ConnectionResultEnum;
+	public static fun values ()[Ldev/slne/surf/cloud/api/common/player/ConnectionResultEnum;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/player/OfflineCloudPlayer {
+	public abstract fun displayName (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun getLuckpermsMetaData (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun getLuckpermsMetaData (Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun getPlayer ()Ldev/slne/surf/cloud/api/common/player/CloudPlayer;
+	public abstract fun getUuid ()Ljava/util/UUID;
+	public abstract fun lastSeen (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun lastServer (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun lastServerRaw (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun latestIpAddress (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun name (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun nameHistory (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun playedBefore (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/common/player/name/NameEntry {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/player/name/NameEntry$Companion;
+	public fun <init> (JLjava/lang/String;)V
+	public final fun component1 ()J
+	public final fun component2 ()Ljava/lang/String;
+	public final fun copy (JLjava/lang/String;)Ldev/slne/surf/cloud/api/common/player/name/NameEntry;
+	public static synthetic fun copy$default (Ldev/slne/surf/cloud/api/common/player/name/NameEntry;JLjava/lang/String;ILjava/lang/Object;)Ldev/slne/surf/cloud/api/common/player/name/NameEntry;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getName ()Ljava/lang/String;
+	public final fun getTimestamp ()J
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+	public final fun writeToByteBuf (Lio/netty/buffer/ByteBuf;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/player/name/NameEntry$Companion {
+	public final fun readFromByteBuf (Lio/netty/buffer/ByteBuf;)Ldev/slne/surf/cloud/api/common/player/name/NameEntry;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/player/name/NameHistory {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/player/name/NameHistory$Companion;
+	public abstract fun firstUsedName ()Ldev/slne/surf/cloud/api/common/player/name/NameEntry;
+	public abstract fun getNameAtTime (J)Ldev/slne/surf/cloud/api/common/player/name/NameEntry;
+	public abstract fun getNameChanges ()I
+	public abstract fun lastKnownName ()Ldev/slne/surf/cloud/api/common/player/name/NameEntry;
+	public abstract fun names ()Lit/unimi/dsi/fastutil/objects/ObjectList;
+	public abstract fun timeSinceLastChange ()J
+	public abstract fun wasNameUsed (Ljava/lang/String;)Z
+	public abstract fun writeToByteBuf (Lio/netty/buffer/ByteBuf;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/player/name/NameHistory$Companion {
+	public final fun readFromByteBuf (Lio/netty/buffer/ByteBuf;)Ldev/slne/surf/cloud/api/common/player/name/NameHistory;
+}
+
+public final class dev/slne/surf/cloud/api/common/player/name/NameHistoryFactory$Companion {
+	public final fun getInstance ()Ldev/slne/surf/cloud/api/common/player/name/NameHistoryFactory;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/player/ppdc/ListPersistentPlayerDataType : dev/slne/surf/cloud/api/common/player/ppdc/PersistentPlayerDataType {
+	public abstract fun getElementType ()Ldev/slne/surf/cloud/api/common/player/ppdc/PersistentPlayerDataType;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/player/ppdc/PersistentPlayerDataAdapterContext {
+	public abstract fun newPersistentDataContainer ()Ldev/slne/surf/cloud/api/common/player/ppdc/PersistentPlayerDataContainer;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/player/ppdc/PersistentPlayerDataContainer : dev/slne/surf/cloud/api/common/player/ppdc/PersistentPlayerDataContainerView {
+	public abstract fun getBoolean (Lnet/kyori/adventure/key/Key;)Ljava/lang/Boolean;
+	public abstract fun getByte (Lnet/kyori/adventure/key/Key;)Ljava/lang/Byte;
+	public abstract fun getByteArray (Lnet/kyori/adventure/key/Key;)[B
+	public abstract fun getDouble (Lnet/kyori/adventure/key/Key;)Ljava/lang/Double;
+	public abstract fun getFloat (Lnet/kyori/adventure/key/Key;)Ljava/lang/Float;
+	public abstract fun getInt (Lnet/kyori/adventure/key/Key;)Ljava/lang/Integer;
+	public abstract fun getIntArray (Lnet/kyori/adventure/key/Key;)[I
+	public abstract fun getLong (Lnet/kyori/adventure/key/Key;)Ljava/lang/Long;
+	public abstract fun getLongArray (Lnet/kyori/adventure/key/Key;)[J
+	public abstract fun getNumber (Lnet/kyori/adventure/key/Key;)Ljava/lang/Number;
+	public abstract fun getShort (Lnet/kyori/adventure/key/Key;)Ljava/lang/Short;
+	public abstract fun getString (Lnet/kyori/adventure/key/Key;)Ljava/lang/String;
+	public abstract fun readFromBuf (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;)V
+	public abstract fun remove (Lnet/kyori/adventure/key/Key;)V
+	public abstract fun set (Lnet/kyori/adventure/key/Key;Ldev/slne/surf/cloud/api/common/player/ppdc/PersistentPlayerDataType;Ljava/lang/Object;)V
+	public abstract fun setBoolean (Lnet/kyori/adventure/key/Key;Z)V
+	public abstract fun setByte (Lnet/kyori/adventure/key/Key;B)V
+	public abstract fun setByteArray (Lnet/kyori/adventure/key/Key;[B)V
+	public abstract fun setDouble (Lnet/kyori/adventure/key/Key;D)V
+	public abstract fun setFloat (Lnet/kyori/adventure/key/Key;F)V
+	public abstract fun setInt (Lnet/kyori/adventure/key/Key;I)V
+	public abstract fun setIntArray (Lnet/kyori/adventure/key/Key;[I)V
+	public abstract fun setLong (Lnet/kyori/adventure/key/Key;J)V
+	public abstract fun setLongArray (Lnet/kyori/adventure/key/Key;[J)V
+	public abstract fun setShort (Lnet/kyori/adventure/key/Key;S)V
+	public abstract fun setString (Lnet/kyori/adventure/key/Key;Ljava/lang/String;)V
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/player/ppdc/PersistentPlayerDataContainerView {
+	public abstract fun get (Lnet/kyori/adventure/key/Key;Ldev/slne/surf/cloud/api/common/player/ppdc/PersistentPlayerDataType;)Ljava/lang/Object;
+	public abstract fun getAdapterContext ()Ldev/slne/surf/cloud/api/common/player/ppdc/PersistentPlayerDataAdapterContext;
+	public abstract fun getEmpty ()Z
+	public abstract fun getKeys ()Lit/unimi/dsi/fastutil/objects/ObjectSet;
+	public abstract fun has (Lnet/kyori/adventure/key/Key;)Z
+	public abstract fun has (Lnet/kyori/adventure/key/Key;Ldev/slne/surf/cloud/api/common/player/ppdc/PersistentPlayerDataType;)Z
+	public abstract fun writeToBuf (Ldev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf;)V
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/player/ppdc/PersistentPlayerDataType {
+	public abstract fun fromPrimitive (Ljava/lang/Object;Ldev/slne/surf/cloud/api/common/player/ppdc/PersistentPlayerDataAdapterContext;)Ljava/lang/Object;
+	public abstract fun getPrimitiveType ()Lkotlin/reflect/KClass;
+	public abstract fun toPrimitive (Ljava/lang/Object;Ldev/slne/surf/cloud/api/common/player/ppdc/PersistentPlayerDataAdapterContext;)Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/common/player/teleport/TeleportCause : java/lang/Enum {
+	public static final field CHORUS_FRUIT Ldev/slne/surf/cloud/api/common/player/teleport/TeleportCause;
+	public static final field COMMAND Ldev/slne/surf/cloud/api/common/player/teleport/TeleportCause;
+	public static final field DISMOUNT Ldev/slne/surf/cloud/api/common/player/teleport/TeleportCause;
+	public static final field ENDER_PEARL Ldev/slne/surf/cloud/api/common/player/teleport/TeleportCause;
+	public static final field END_GATEWAY Ldev/slne/surf/cloud/api/common/player/teleport/TeleportCause;
+	public static final field END_PORTAL Ldev/slne/surf/cloud/api/common/player/teleport/TeleportCause;
+	public static final field EXIT_BED Ldev/slne/surf/cloud/api/common/player/teleport/TeleportCause;
+	public static final field NETHER_PORTAL Ldev/slne/surf/cloud/api/common/player/teleport/TeleportCause;
+	public static final field PLUGIN Ldev/slne/surf/cloud/api/common/player/teleport/TeleportCause;
+	public static final field SPECTATE Ldev/slne/surf/cloud/api/common/player/teleport/TeleportCause;
+	public static final field UNKNOWN Ldev/slne/surf/cloud/api/common/player/teleport/TeleportCause;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
+	public static fun valueOf (Ljava/lang/String;)Ldev/slne/surf/cloud/api/common/player/teleport/TeleportCause;
+	public static fun values ()[Ldev/slne/surf/cloud/api/common/player/teleport/TeleportCause;
+}
+
+public final class dev/slne/surf/cloud/api/common/player/teleport/TeleportFlag : java/lang/Enum {
+	public static final field RETAIN_OPEN_INVENTORY Ldev/slne/surf/cloud/api/common/player/teleport/TeleportFlag;
+	public static final field RETAIN_PASSENGERS Ldev/slne/surf/cloud/api/common/player/teleport/TeleportFlag;
+	public static final field RETAIN_VEHICLE Ldev/slne/surf/cloud/api/common/player/teleport/TeleportFlag;
+	public static final field VELOCITY_ROTATION Ldev/slne/surf/cloud/api/common/player/teleport/TeleportFlag;
+	public static final field VELOCITY_X Ldev/slne/surf/cloud/api/common/player/teleport/TeleportFlag;
+	public static final field VELOCITY_Y Ldev/slne/surf/cloud/api/common/player/teleport/TeleportFlag;
+	public static final field VELOCITY_Z Ldev/slne/surf/cloud/api/common/player/teleport/TeleportFlag;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
+	public static fun valueOf (Ljava/lang/String;)Ldev/slne/surf/cloud/api/common/player/teleport/TeleportFlag;
+	public static fun values ()[Ldev/slne/surf/cloud/api/common/player/teleport/TeleportFlag;
+}
+
+public final class dev/slne/surf/cloud/api/common/player/teleport/TeleportLocation {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/player/teleport/TeleportLocation$Companion;
+	public fun <init> (Ljava/util/UUID;DDDFF)V
+	public synthetic fun <init> (Ljava/util/UUID;DDDFFILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Ljava/util/UUID;
+	public final fun component2 ()D
+	public final fun component3 ()D
+	public final fun component4 ()D
+	public final fun component5 ()F
+	public final fun component6 ()F
+	public final fun copy (Ljava/util/UUID;DDDFF)Ldev/slne/surf/cloud/api/common/player/teleport/TeleportLocation;
+	public static synthetic fun copy$default (Ldev/slne/surf/cloud/api/common/player/teleport/TeleportLocation;Ljava/util/UUID;DDDFFILjava/lang/Object;)Ldev/slne/surf/cloud/api/common/player/teleport/TeleportLocation;
+	public final fun distance (Ldev/slne/surf/cloud/api/common/player/teleport/TeleportLocation;)D
+	public final fun distanceSquared (Ldev/slne/surf/cloud/api/common/player/teleport/TeleportLocation;)D
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getPitch ()F
+	public final fun getWorld ()Ljava/util/UUID;
+	public final fun getX ()D
+	public final fun getY ()D
+	public final fun getYaw ()F
+	public final fun getZ ()D
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class dev/slne/surf/cloud/api/common/player/teleport/TeleportLocation$Companion {
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/player/teleport/TeleportLocationKt {
+	public static final fun fineLocation (Ljava/util/UUID;DDDFF)Ldev/slne/surf/cloud/api/common/player/teleport/TeleportLocation;
+	public static synthetic fun fineLocation$default (Ljava/util/UUID;DDDFFILjava/lang/Object;)Ldev/slne/surf/cloud/api/common/player/teleport/TeleportLocation;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/server/CloudServer : dev/slne/surf/cloud/api/common/server/CommonCloudServer {
+	public abstract fun getAllowlist ()Z
+}
+
+public final class dev/slne/surf/cloud/api/common/server/CloudServer$DefaultImpls {
+	public static fun getEmptySlots (Ldev/slne/surf/cloud/api/common/server/CloudServer;)I
+	public static fun hasEmptySlots (Ldev/slne/surf/cloud/api/common/server/CloudServer;)Z
+}
+
+public final class dev/slne/surf/cloud/api/common/server/CloudServerConstants {
+	public static final field INSTANCE Ldev/slne/surf/cloud/api/common/server/CloudServerConstants;
+	public static final field LOBBY_CATEGORY Ljava/lang/String;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/server/CloudServerManager {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/server/CloudServerManager$Companion;
+	public abstract fun retrieveAllServers (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun retrieveServerByCategoryAndName (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun retrieveServerById (JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun retrieveServerByName (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun retrieveServersByCategory (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/common/server/CloudServerManager$Companion : dev/slne/surf/cloud/api/common/server/CloudServerManager {
+	public fun retrieveAllServers (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun retrieveServerByCategoryAndName (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun retrieveServerById (JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun retrieveServerByName (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun retrieveServersByCategory (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/server/CommonCloudServer : net/kyori/adventure/audience/ForwardingAudience {
+	public abstract fun audiences ()Ldev/slne/surf/cloud/api/common/server/UserList;
+	public abstract fun getCurrentPlayerCount ()I
+	public abstract fun getEmptySlots ()I
+	public abstract fun getGroup ()Ljava/lang/String;
+	public abstract fun getMaxPlayerCount ()I
+	public abstract fun getName ()Ljava/lang/String;
+	public abstract fun getState ()Ldev/slne/surf/cloud/api/common/server/state/ServerState;
+	public abstract fun getUid ()J
+	public abstract fun getUsers ()Ldev/slne/surf/cloud/api/common/server/UserList;
+	public abstract fun hasEmptySlots ()Z
+	public abstract fun sendAll (Ldev/slne/surf/cloud/api/common/server/CloudServer;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun sendAll (Ldev/slne/surf/cloud/api/common/server/CloudServer;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun sendAll (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun shutdown ()V
+}
+
+public final class dev/slne/surf/cloud/api/common/server/CommonCloudServer$DefaultImpls {
+	public static fun getEmptySlots (Ldev/slne/surf/cloud/api/common/server/CommonCloudServer;)I
+	public static fun hasEmptySlots (Ldev/slne/surf/cloud/api/common/server/CommonCloudServer;)Z
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/server/MutableUserList : dev/slne/surf/cloud/api/common/server/UserList, java/util/Collection, kotlin/jvm/internal/markers/KMutableCollection {
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/server/ProxyCloudServer : dev/slne/surf/cloud/api/common/server/CommonCloudServer {
+}
+
+public final class dev/slne/surf/cloud/api/common/server/ProxyCloudServer$DefaultImpls {
+	public static fun getEmptySlots (Ldev/slne/surf/cloud/api/common/server/ProxyCloudServer;)I
+	public static fun hasEmptySlots (Ldev/slne/surf/cloud/api/common/server/ProxyCloudServer;)Z
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/server/UserList : java/util/Collection, kotlin/jvm/internal/markers/KMappedMarker {
+	public abstract fun snapshot ()Ldev/slne/surf/cloud/api/common/server/MutableUserList;
+}
+
+public final class dev/slne/surf/cloud/api/common/server/UserListImpl$Companion {
+	public final fun getSTREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public final fun of (Ljava/lang/Iterable;)Ldev/slne/surf/cloud/api/common/server/UserListImpl;
+}
+
+public final class dev/slne/surf/cloud/api/common/server/state/ServerState : java/lang/Enum {
+	public static final field LOBBY Ldev/slne/surf/cloud/api/common/server/state/ServerState;
+	public static final field OFFLINE Ldev/slne/surf/cloud/api/common/server/state/ServerState;
+	public static final field ONLINE Ldev/slne/surf/cloud/api/common/server/state/ServerState;
+	public static final field RESTARTING Ldev/slne/surf/cloud/api/common/server/state/ServerState;
+	public final fun getAllowJoin ()Z
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
+	public static fun valueOf (Ljava/lang/String;)Ldev/slne/surf/cloud/api/common/server/state/ServerState;
+	public static fun values ()[Ldev/slne/surf/cloud/api/common/server/state/ServerState;
+}
+
+public final class dev/slne/surf/cloud/api/common/util/Address_utilsKt {
+	public static final fun createInetSocketAddress (Ljava/lang/String;IZ)Ljava/net/InetSocketAddress;
+	public static final fun createResolvedInetSocketAddress (Ljava/lang/String;I)Ljava/net/InetSocketAddress;
+	public static final fun createUnresolvedInetSocketAddress (Ljava/lang/String;I)Ljava/net/InetSocketAddress;
+	public static final fun parseInetSocketAddress (Ljava/lang/String;IZ)Ljava/net/InetSocketAddress;
+	public static synthetic fun parseInetSocketAddress$default (Ljava/lang/String;IZILjava/lang/Object;)Ljava/net/InetSocketAddress;
+	public static final fun replaceUnresolvedNumericIp (Ljava/net/InetSocketAddress;)Ljava/net/InetSocketAddress;
+	public static final fun replaceWithResolved (Ljava/net/InetSocketAddress;)Ljava/net/InetSocketAddress;
+	public static final fun updateInetSocketAddressHost (Lkotlin/jvm/functions/Function0;Ljava/lang/String;)Ljava/net/InetSocketAddress;
+	public static final fun updateInetSocketAddressPort (Lkotlin/jvm/functions/Function0;I)Ljava/net/InetSocketAddress;
+}
+
+public final class dev/slne/surf/cloud/api/common/util/Ansi_utilKt {
+	public static final fun buildAnsiString ([Ljava/lang/Object;)Ljava/lang/String;
+}
+
+public final class dev/slne/surf/cloud/api/common/util/Collection_utilsKt {
+	public static final fun singleOrNullOrThrow (Ljava/lang/Iterable;)Ljava/lang/Object;
+	public static final fun singleOrNullOrThrow (Ljava/lang/Iterable;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+	public static final fun singleOrNullOrThrow (Ljava/util/Collection;)Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/common/util/DefaultUncaughtExceptionHandlerWithName : java/lang/Thread$UncaughtExceptionHandler {
+	public fun <init> (Lcom/google/common/flogger/FluentLogger;)V
+	public fun uncaughtException (Ljava/lang/Thread;Ljava/lang/Throwable;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/util/FactoryBuilder {
+	public fun <init> ()V
+	public final fun daemon (Z)V
+	public final fun exceptionHandler (Lkotlin/jvm/functions/Function2;)V
+	public final fun factory (Ljava/util/concurrent/ThreadFactory;)V
+	public final fun nameFormat (Ljava/lang/String;)V
+	public final fun priority (I)V
+	public final fun uncaughtExceptionHandler (Ljava/lang/Thread$UncaughtExceptionHandler;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/util/Fast_util_utilKt {
+	public static final fun add (Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;Ljava/lang/Object;Ljava/lang/Object;)V
+	public static final fun emptyInt2ObjectMap ()Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
+	public static final fun emptyIntSet ()Lit/unimi/dsi/fastutil/ints/IntSet;
+	public static final fun emptyLong2LongMap ()Lit/unimi/dsi/fastutil/longs/Long2LongMap;
+	public static final fun emptyLong2ObjectMap ()Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;
+	public static final fun emptyLongSet ()Lit/unimi/dsi/fastutil/longs/LongSet;
+	public static final fun emptyObject2BooleanMap ()Lit/unimi/dsi/fastutil/objects/Object2BooleanMap;
+	public static final fun emptyObject2IntMap ()Lit/unimi/dsi/fastutil/objects/Object2IntMap;
+	public static final fun emptyObject2MultiObjectsMap ()Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;
+	public static final fun emptyObject2ObjectMap ()Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;
+	public static final fun emptyObjectList ()Lit/unimi/dsi/fastutil/objects/ObjectList;
+	public static final fun emptyObjectSet ()Lit/unimi/dsi/fastutil/objects/ObjectSet;
+	public static final fun freeze (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
+	public static final fun freeze (Lit/unimi/dsi/fastutil/ints/IntSet;)Lit/unimi/dsi/fastutil/ints/IntSet;
+	public static final fun freeze (Lit/unimi/dsi/fastutil/longs/Long2LongOpenHashMap;)Lit/unimi/dsi/fastutil/longs/Long2LongMap;
+	public static final fun freeze (Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap;)Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;
+	public static final fun freeze (Lit/unimi/dsi/fastutil/longs/LongSet;)Lit/unimi/dsi/fastutil/longs/LongSet;
+	public static final fun freeze (Lit/unimi/dsi/fastutil/objects/Object2BooleanOpenHashMap;)Lit/unimi/dsi/fastutil/objects/Object2BooleanMap;
+	public static final fun freeze (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)Lit/unimi/dsi/fastutil/objects/Object2IntMap;
+	public static final fun freeze (Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;)Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;
+	public static final fun freeze (Lit/unimi/dsi/fastutil/objects/ObjectArrayList;)Lit/unimi/dsi/fastutil/objects/ObjectList;
+	public static final fun freeze (Lit/unimi/dsi/fastutil/objects/ObjectSet;)Lit/unimi/dsi/fastutil/objects/ObjectSet;
+	public static final fun int2ObjectMapOf ()Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
+	public static final fun int2ObjectMapOf ([Lkotlin/Pair;)Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
+	public static final fun intSetOf ()Lit/unimi/dsi/fastutil/ints/IntSet;
+	public static final fun intSetOf ([I)Lit/unimi/dsi/fastutil/ints/IntSet;
+	public static final fun long2LongMapOf ()Lit/unimi/dsi/fastutil/longs/Long2LongMap;
+	public static final fun long2LongMapOf ([Lkotlin/Pair;)Lit/unimi/dsi/fastutil/longs/Long2LongMap;
+	public static final fun long2ObjectMapOf ()Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;
+	public static final fun long2ObjectMapOf ([Lkotlin/Pair;)Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;
+	public static final fun longSetOf ()Lit/unimi/dsi/fastutil/longs/LongSet;
+	public static final fun longSetOf ([J)Lit/unimi/dsi/fastutil/longs/LongSet;
+	public static final fun mutableInt2ObjectMapOf ()Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;
+	public static final fun mutableInt2ObjectMapOf ([Lkotlin/Pair;)Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;
+	public static final fun mutableIntSetOf ()Lit/unimi/dsi/fastutil/ints/IntOpenHashSet;
+	public static final fun mutableIntSetOf ([I)Lit/unimi/dsi/fastutil/ints/IntOpenHashSet;
+	public static final fun mutableLong2LongMapOf ()Lit/unimi/dsi/fastutil/longs/Long2LongOpenHashMap;
+	public static final fun mutableLong2LongMapOf ([Lkotlin/Pair;)Lit/unimi/dsi/fastutil/longs/Long2LongOpenHashMap;
+	public static final fun mutableLong2ObjectMapOf ()Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap;
+	public static final fun mutableLong2ObjectMapOf ([Lkotlin/Pair;)Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap;
+	public static final fun mutableLongSetOf ()Lit/unimi/dsi/fastutil/longs/LongOpenHashSet;
+	public static final fun mutableLongSetOf ([J)Lit/unimi/dsi/fastutil/longs/LongOpenHashSet;
+	public static final fun mutableObject2BooleanMapOf ()Lit/unimi/dsi/fastutil/objects/Object2BooleanOpenHashMap;
+	public static final fun mutableObject2BooleanMapOf ([Lkotlin/Pair;)Lit/unimi/dsi/fastutil/objects/Object2BooleanOpenHashMap;
+	public static final fun mutableObject2IntMapOf ()Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;
+	public static final fun mutableObject2IntMapOf ([Lkotlin/Pair;)Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;
+	public static final fun mutableObject2MultiObjectsMapOf ()Lit/unimi/dsi/fastutil/objects/Object2ObjectOpenHashMap;
+	public static final fun mutableObject2MultiObjectsMapOf ([Lkotlin/Pair;)Lit/unimi/dsi/fastutil/objects/Object2ObjectOpenHashMap;
+	public static final fun mutableObject2ObjectMapOf ()Lit/unimi/dsi/fastutil/objects/Object2ObjectOpenHashMap;
+	public static final fun mutableObject2ObjectMapOf (I)Lit/unimi/dsi/fastutil/objects/Object2ObjectOpenHashMap;
+	public static final fun mutableObject2ObjectMapOf ([Lkotlin/Pair;)Lit/unimi/dsi/fastutil/objects/Object2ObjectOpenHashMap;
+	public static final fun mutableObjectListOf ()Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
+	public static final fun mutableObjectListOf (I)Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
+	public static final fun mutableObjectListOf ([Ljava/lang/Object;)Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
+	public static final fun mutableObjectSetOf ()Lit/unimi/dsi/fastutil/objects/ObjectOpenHashSet;
+	public static final fun mutableObjectSetOf (I)Lit/unimi/dsi/fastutil/objects/ObjectOpenHashSet;
+	public static final fun mutableObjectSetOf (Ljava/lang/Iterable;)Lit/unimi/dsi/fastutil/objects/ObjectOpenHashSet;
+	public static final fun mutableObjectSetOf ([Ljava/lang/Object;)Lit/unimi/dsi/fastutil/objects/ObjectOpenHashSet;
+	public static final fun object2BooleanMapOf ()Lit/unimi/dsi/fastutil/objects/Object2BooleanMap;
+	public static final fun object2BooleanMapOf ([Lkotlin/Pair;)Lit/unimi/dsi/fastutil/objects/Object2BooleanMap;
+	public static final fun object2IntMapOf ()Lit/unimi/dsi/fastutil/objects/Object2IntMap;
+	public static final fun object2IntMapOf ([Lkotlin/Pair;)Lit/unimi/dsi/fastutil/objects/Object2IntMap;
+	public static final fun object2MultiObjectsMapOf ()Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;
+	public static final fun object2MultiObjectsMapOf ([Lkotlin/Pair;)Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;
+	public static final fun object2ObjectMapOf ()Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;
+	public static final fun object2ObjectMapOf ([Lkotlin/Pair;)Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;
+	public static final fun objectListOf ()Lit/unimi/dsi/fastutil/objects/ObjectList;
+	public static final fun objectListOf ([Ljava/lang/Object;)Lit/unimi/dsi/fastutil/objects/ObjectList;
+	public static final fun objectSetOf ()Lit/unimi/dsi/fastutil/objects/ObjectSet;
+	public static final fun objectSetOf (Ljava/lang/Iterable;)Lit/unimi/dsi/fastutil/objects/ObjectSet;
+	public static final fun objectSetOf ([Ljava/lang/Object;)Lit/unimi/dsi/fastutil/objects/ObjectSet;
+	public static final fun synchronize (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
+	public static final fun synchronize (Lit/unimi/dsi/fastutil/ints/IntSet;)Lit/unimi/dsi/fastutil/ints/IntSet;
+	public static final fun synchronize (Lit/unimi/dsi/fastutil/longs/Long2LongOpenHashMap;)Lit/unimi/dsi/fastutil/longs/Long2LongMap;
+	public static final fun synchronize (Lit/unimi/dsi/fastutil/longs/Long2ObjectOpenHashMap;)Lit/unimi/dsi/fastutil/longs/Long2ObjectMap;
+	public static final fun synchronize (Lit/unimi/dsi/fastutil/longs/LongSet;)Lit/unimi/dsi/fastutil/longs/LongSet;
+	public static final fun synchronize (Lit/unimi/dsi/fastutil/objects/Object2BooleanOpenHashMap;)Lit/unimi/dsi/fastutil/objects/Object2BooleanMap;
+	public static final fun synchronize (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)Lit/unimi/dsi/fastutil/objects/Object2IntMap;
+	public static final fun synchronize (Lit/unimi/dsi/fastutil/objects/Object2ObjectOpenHashMap;)Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;
+	public static final fun synchronize (Lit/unimi/dsi/fastutil/objects/ObjectArrayList;)Lit/unimi/dsi/fastutil/objects/ObjectList;
+	public static final fun synchronize (Lit/unimi/dsi/fastutil/objects/ObjectSet;)Lit/unimi/dsi/fastutil/objects/ObjectSet;
+	public static final fun toIntSet (Lkotlin/sequences/Sequence;)Lit/unimi/dsi/fastutil/ints/IntSet;
+	public static final fun toLongSet (Lkotlin/sequences/Sequence;)Lit/unimi/dsi/fastutil/longs/LongSet;
+	public static final fun toMutableIntSet (Lkotlin/sequences/Sequence;)Lit/unimi/dsi/fastutil/ints/IntOpenHashSet;
+	public static final fun toMutableLongSet (Lkotlin/sequences/Sequence;)Lit/unimi/dsi/fastutil/longs/LongOpenHashSet;
+	public static final fun toMutableObjectList (Lkotlin/sequences/Sequence;)Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
+	public static final fun toMutableObjectSet (Lkotlin/sequences/Sequence;)Lit/unimi/dsi/fastutil/objects/ObjectOpenHashSet;
+	public static final fun toObjectList (Ljava/lang/Iterable;)Lit/unimi/dsi/fastutil/objects/ObjectList;
+	public static final fun toObjectList (Ljava/util/Collection;)Lit/unimi/dsi/fastutil/objects/ObjectList;
+	public static final fun toObjectList (Lkotlin/sequences/Sequence;)Lit/unimi/dsi/fastutil/objects/ObjectList;
+	public static final fun toObjectSet (Ljava/lang/Iterable;)Lit/unimi/dsi/fastutil/objects/ObjectSet;
+	public static final fun toObjectSet (Lkotlin/sequences/Sequence;)Lit/unimi/dsi/fastutil/objects/ObjectSet;
+	public static final fun toObjectSet ([Ljava/lang/Object;)Lit/unimi/dsi/fastutil/objects/ObjectSet;
+}
+
+public final class dev/slne/surf/cloud/api/common/util/Gson_helperKt {
+	public static final fun convertToBigDecimal (Lcom/google/gson/JsonElement;Ljava/lang/String;)Ljava/math/BigDecimal;
+	public static final fun convertToBigInteger (Lcom/google/gson/JsonElement;Ljava/lang/String;)Ljava/math/BigInteger;
+	public static final fun convertToBoolean (Lcom/google/gson/JsonElement;Ljava/lang/String;)Z
+	public static final fun convertToByte (Lcom/google/gson/JsonElement;Ljava/lang/String;)B
+	public static final fun convertToInt (Lcom/google/gson/JsonElement;Ljava/lang/String;)I
+	public static final fun convertToJsonArray (Lcom/google/gson/JsonElement;Ljava/lang/String;)Lcom/google/gson/JsonArray;
+	public static final fun convertToJsonObject (Lcom/google/gson/JsonElement;Ljava/lang/String;)Lcom/google/gson/JsonObject;
+	public static final fun convertToLong (Lcom/google/gson/JsonElement;Ljava/lang/String;)J
+	public static final fun convertToNumber (Lcom/google/gson/JsonElement;Ljava/lang/String;)Ljava/lang/Number;
+	public static final fun convertToShort (Lcom/google/gson/JsonElement;Ljava/lang/String;)S
+	public static final fun convertToString (Lcom/google/gson/JsonElement;Ljava/lang/String;)Ljava/lang/String;
+	public static final fun fromJson (Lcom/google/gson/Gson;Ljava/io/Reader;Lcom/google/gson/reflect/TypeToken;)Ljava/lang/Object;
+	public static final fun fromJson (Lcom/google/gson/Gson;Ljava/io/Reader;Lcom/google/gson/reflect/TypeToken;Z)Ljava/lang/Object;
+	public static final fun fromJson (Lcom/google/gson/Gson;Ljava/io/Reader;Ljava/lang/Class;)Ljava/lang/Object;
+	public static final fun fromJson (Lcom/google/gson/Gson;Ljava/io/Reader;Ljava/lang/Class;Z)Ljava/lang/Object;
+	public static final fun fromJson (Lcom/google/gson/Gson;Ljava/lang/String;Lcom/google/gson/reflect/TypeToken;Z)Ljava/lang/Object;
+	public static final fun fromJson (Lcom/google/gson/Gson;Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/Object;
+	public static final fun fromJson (Lcom/google/gson/Gson;Ljava/lang/String;Ljava/lang/Class;Z)Ljava/lang/Object;
+	public static final fun fromNullableJson (Lcom/google/gson/Gson;Ljava/io/Reader;Lcom/google/gson/reflect/TypeToken;Z)Ljava/lang/Object;
+	public static final fun fromNullableJson (Lcom/google/gson/Gson;Ljava/io/Reader;Ljava/lang/Class;Z)Ljava/lang/Object;
+	public static final fun fromNullableJson (Lcom/google/gson/Gson;Ljava/lang/String;Lcom/google/gson/reflect/TypeToken;)Ljava/lang/Object;
+	public static final fun fromNullableJson (Lcom/google/gson/Gson;Ljava/lang/String;Lcom/google/gson/reflect/TypeToken;Z)Ljava/lang/Object;
+	public static final fun fromNullableJson (Lcom/google/gson/Gson;Ljava/lang/String;Ljava/lang/Class;Z)Ljava/lang/Object;
+	public static final fun getAsBigDecimal (Lcom/google/gson/JsonObject;Ljava/lang/String;)Ljava/math/BigDecimal;
+	public static final fun getAsBigDecimal (Lcom/google/gson/JsonObject;Ljava/lang/String;Ljava/math/BigDecimal;)Ljava/math/BigDecimal;
+	public static final fun getAsBigInteger (Lcom/google/gson/JsonObject;Ljava/lang/String;)Ljava/math/BigInteger;
+	public static final fun getAsBigInteger (Lcom/google/gson/JsonObject;Ljava/lang/String;Ljava/math/BigInteger;)Ljava/math/BigInteger;
+	public static final fun getAsBoolean (Lcom/google/gson/JsonObject;Ljava/lang/String;)Z
+	public static final fun getAsBoolean (Lcom/google/gson/JsonObject;Ljava/lang/String;Z)Z
+	public static final fun getAsByte (Lcom/google/gson/JsonObject;Ljava/lang/String;)B
+	public static final fun getAsByte (Lcom/google/gson/JsonObject;Ljava/lang/String;B)B
+	public static final fun getAsInt (Lcom/google/gson/JsonObject;Ljava/lang/String;)I
+	public static final fun getAsInt (Lcom/google/gson/JsonObject;Ljava/lang/String;I)I
+	public static final fun getAsJsonArray (Lcom/google/gson/JsonObject;Ljava/lang/String;)Lcom/google/gson/JsonArray;
+	public static final fun getAsJsonArray (Lcom/google/gson/JsonObject;Ljava/lang/String;Lcom/google/gson/JsonArray;)Lcom/google/gson/JsonArray;
+	public static final fun getAsJsonObject (Lcom/google/gson/JsonObject;Ljava/lang/String;)Lcom/google/gson/JsonObject;
+	public static final fun getAsJsonObject (Lcom/google/gson/JsonObject;Ljava/lang/String;Lcom/google/gson/JsonObject;)Lcom/google/gson/JsonObject;
+	public static final fun getAsLong (Lcom/google/gson/JsonObject;Ljava/lang/String;)J
+	public static final fun getAsLong (Lcom/google/gson/JsonObject;Ljava/lang/String;J)J
+	public static final fun getAsShort (Lcom/google/gson/JsonObject;Ljava/lang/String;)S
+	public static final fun getAsShort (Lcom/google/gson/JsonObject;Ljava/lang/String;S)S
+	public static final fun getAsString (Lcom/google/gson/JsonObject;Ljava/lang/String;)Ljava/lang/String;
+	public static final fun getAsString (Lcom/google/gson/JsonObject;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+	public static final fun getNonNull (Lcom/google/gson/JsonObject;Ljava/lang/String;)Lcom/google/gson/JsonElement;
+	public static final fun getType (Lcom/google/gson/JsonElement;)Ljava/lang/String;
+	public static final fun isArrayNode (Lcom/google/gson/JsonObject;Ljava/lang/String;)Z
+	public static final fun isBooleanValue (Lcom/google/gson/JsonElement;)Z
+	public static final fun isBooleanValue (Lcom/google/gson/JsonObject;Ljava/lang/String;)Z
+	public static final fun isNumberValue (Lcom/google/gson/JsonElement;)Z
+	public static final fun isNumberValue (Lcom/google/gson/JsonObject;Ljava/lang/String;)Z
+	public static final fun isObjectNode (Lcom/google/gson/JsonObject;Ljava/lang/String;)Z
+	public static final fun isStringValue (Lcom/google/gson/JsonElement;)Z
+	public static final fun isStringValue (Lcom/google/gson/JsonObject;Ljava/lang/String;)Z
+	public static final fun isValidNode (Lcom/google/gson/JsonObject;Ljava/lang/String;)Z
+	public static final fun isValidPrimitive (Lcom/google/gson/JsonObject;Ljava/lang/String;)Z
+	public static final fun parse (Ljava/io/Reader;)Lcom/google/gson/JsonObject;
+	public static final fun parse (Ljava/io/Reader;Z)Lcom/google/gson/JsonObject;
+	public static final fun parse (Ljava/lang/String;)Lcom/google/gson/JsonObject;
+	public static final fun parse (Ljava/lang/String;Z)Lcom/google/gson/JsonObject;
+	public static synthetic fun parse$default (Ljava/io/Reader;ZILjava/lang/Object;)Lcom/google/gson/JsonObject;
+	public static synthetic fun parse$default (Ljava/lang/String;ZILjava/lang/Object;)Lcom/google/gson/JsonObject;
+	public static final fun parseArray (Ljava/io/Reader;)Lcom/google/gson/JsonArray;
+	public static final fun parseArray (Ljava/lang/String;)Lcom/google/gson/JsonArray;
+	public static final fun toStableGsonString (Lcom/google/gson/JsonElement;)Ljava/lang/String;
+	public static final fun writeGsonValue (Lcom/google/gson/stream/JsonWriter;Lcom/google/gson/JsonElement;Ljava/util/Comparator;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/util/ObservableField {
+	public synthetic fun <init> (Lkotlin/jvm/functions/Function0;Ljava/lang/Object;JLkotlinx/coroutines/CoroutineDispatcher;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public synthetic fun <init> (Lkotlin/jvm/functions/Function0;Ljava/lang/Object;JLkotlinx/coroutines/CoroutineDispatcher;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun observe (Lkotlin/jvm/functions/Function1;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/util/ObservableField$ObservableCoroutineScope : kotlinx/coroutines/CoroutineScope {
+	public static final field INSTANCE Ldev/slne/surf/cloud/api/common/util/ObservableField$ObservableCoroutineScope;
+	public fun getCoroutineContext ()Lkotlin/coroutines/CoroutineContext;
+	public final fun getDispatcher ()Lkotlinx/coroutines/ExecutorCoroutineDispatcher;
+}
+
+public final class dev/slne/surf/cloud/api/common/util/Result_utilKt {
+	public static final fun getOrMapAndThrow (Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+	public static final fun mapFailure (Ljava/lang/Object;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/common/util/Spring_utilKt {
+	public static final fun executeAndAwait (Lorg/springframework/transaction/support/TransactionOperations;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun executeAndAwait$default (Lorg/springframework/transaction/support/TransactionOperations;Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	public static final fun getFieldValue (Lorg/springframework/core/type/AnnotationMetadata;Ljava/lang/String;Lkotlin/reflect/KClass;Ljava/lang/ClassLoader;)Ljava/lang/Object;
+	public static final fun getTxDispatcher ()Lkotlinx/coroutines/CoroutineDispatcher;
+	public static final fun getValue (Lorg/springframework/beans/factory/ObjectFactory;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public static final fun getValue (Lorg/springframework/beans/factory/ObjectFactory;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	public static final fun measureWithStopWatch (Ljava/lang/Object;Ljava/lang/String;Lkotlin/jvm/functions/Function0;)Lorg/springframework/util/StopWatch;
+	public static final fun selectFunctions (Lkotlin/reflect/KClass;Lkotlin/jvm/functions/Function1;)Ljava/util/Set;
+	public static final fun ultimateTargetClass (Ljava/lang/Object;)Lkotlin/reflect/KClass;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/util/StringRepresentable {
+	public static final field Companion Ldev/slne/surf/cloud/api/common/util/StringRepresentable$Companion;
+	public static final field PRE_BUILT_MAP_THRESHOLD I
+	public abstract fun getSerializedName ()Ljava/lang/String;
+}
+
+public final class dev/slne/surf/cloud/api/common/util/StringRepresentable$Companion {
+	public static final field PRE_BUILT_MAP_THRESHOLD I
+	public final fun createNameLookup ([Ldev/slne/surf/cloud/api/common/util/StringRepresentable;Lkotlin/jvm/functions/Function1;)Lkotlin/jvm/functions/Function1;
+	public final fun fromValues (Lkotlin/jvm/functions/Function0;)Lcom/mojang/serialization/Codec;
+}
+
+public final class dev/slne/surf/cloud/api/common/util/StringRepresentable$StringRepresentableCodec : com/mojang/serialization/Codec {
+	public fun <init> ([Ldev/slne/surf/cloud/api/common/util/StringRepresentable;Lkotlin/jvm/functions/Function1;Ljava/util/function/ToIntFunction;)V
+	public fun decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
+	public fun encode (Ldev/slne/surf/cloud/api/common/util/StringRepresentable;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
+	public synthetic fun encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;
+}
+
+public abstract interface annotation class dev/slne/surf/cloud/api/common/util/ThreadFactoryBuilderDsl : java/lang/annotation/Annotation {
+}
+
+public final class dev/slne/surf/cloud/api/common/util/Thread_utilKt {
+	public static final fun threadFactory (Lkotlin/jvm/functions/Function1;)Ljava/util/concurrent/ThreadFactory;
+}
+
+public final class dev/slne/surf/cloud/api/common/util/Time_utilKt {
+	public static final fun currentUtc ()Ljava/time/LocalDateTime;
+	public static final fun toEpochUtcMillis (Ljava/time/LocalDateTime;)J
+}
+
+public final class dev/slne/surf/cloud/api/common/util/UtilKt {
+	public static final field LINEAR_LOOKUP_THRESHOLD I
+	public static final fun createIndexLookup (Ljava/util/List;)Ljava/util/function/ToIntFunction;
+	public static final fun isSuspending (Ljava/lang/reflect/Method;)Z
+	public static final fun safeReplaceFile (Ljava/nio/file/Path;Ljava/nio/file/Path;Ljava/nio/file/Path;)V
+	public static final fun safeReplaceOrMoveFile (Ljava/nio/file/Path;Ljava/nio/file/Path;Ljava/nio/file/Path;Z)Z
+	public static final fun toIntArray (Ljava/util/UUID;)[I
+	public static final fun toUnsignedInt (B)I
+	public static final fun toUuid ([I)Ljava/util/UUID;
+}
+
+public abstract interface annotation class dev/slne/surf/cloud/api/common/util/annotation/InternalApi : java/lang/annotation/Annotation {
+}
+
+public final class dev/slne/surf/cloud/api/common/util/classloader/JoinClassLoader : java/lang/ClassLoader {
+	public fun <init> (Ljava/lang/ClassLoader;Ljava/util/Collection;)V
+	public fun <init> (Ljava/lang/ClassLoader;[Ljava/lang/ClassLoader;)V
+	public final fun addDelegateClassLoader (Ljava/lang/ClassLoader;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/util/codec/Codec_utilKt {
+	public static final fun bool (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/mojang/serialization/codecs/RecordCodecBuilder;
+	public static final fun byte (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/mojang/serialization/codecs/RecordCodecBuilder;
+	public static final fun createRecordCodec (Lkotlin/jvm/functions/Function1;)Lcom/mojang/serialization/Codec;
+	public static final fun createRecordMapCodec (Lkotlin/jvm/functions/Function1;)Lcom/mojang/serialization/MapCodec;
+	public static final fun double (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/mojang/serialization/codecs/RecordCodecBuilder;
+	public static final fun float (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/mojang/serialization/codecs/RecordCodecBuilder;
+	public static final fun getter (Lcom/mojang/serialization/MapCodec;Lkotlin/jvm/functions/Function1;)Lcom/mojang/serialization/codecs/RecordCodecBuilder;
+	public static final fun int (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/mojang/serialization/codecs/RecordCodecBuilder;
+	public static final fun long (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/mojang/serialization/codecs/RecordCodecBuilder;
+	public static final fun short (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/mojang/serialization/codecs/RecordCodecBuilder;
+	public static final fun string (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/mojang/serialization/codecs/RecordCodecBuilder;
+	public static final fun stringOptionalLenient (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/mojang/serialization/codecs/RecordCodecBuilder;
+	public static final fun tryCollapseToString (Lnet/kyori/adventure/text/Component;)Ljava/lang/String;
+}
+
+public final class dev/slne/surf/cloud/api/common/util/codec/Codec_util_utilKt {
+	public static final fun fixedSize (Ljava/util/stream/IntStream;I)Lcom/mojang/serialization/DataResult;
+}
+
+public final class dev/slne/surf/cloud/api/common/util/codec/ExtraCodecs {
+	public static final field INSTANCE Ldev/slne/surf/cloud/api/common/util/codec/ExtraCodecs;
+	public final fun converter (Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/Codec;
+	public final fun enumCodec (Lkotlin/enums/EnumEntries;)Lcom/mojang/serialization/Codec;
+	public final fun getCOMPONENT ()Lcom/mojang/serialization/Codec;
+	public final fun getCOMPONENT_STREAM ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public final fun getCOMPOUND_TAG_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public final fun getDURATION_STREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public final fun getJAVA ()Lcom/mojang/serialization/Codec;
+	public final fun getKEY_CODEC ()Lcom/mojang/serialization/Codec;
+	public final fun getSTREAM_BOOK_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public final fun getSTREAM_BOSSBAR_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public final fun getSTREAM_EMITTER_SELF_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public final fun getSTREAM_KEY_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public final fun getSTREAM_RESOURCE_PACK_INFO ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public final fun getSTREAM_RESOURCE_PACK_REQUEST_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public final fun getSTREAM_SOUND_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public final fun getSTREAM_SOUND_STOP_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public final fun getSTREAM_TITLE_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public final fun getSTREAM_TITLE_PART_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public final fun getTITLE_TIMES_STREAM_CODEC ()Ldev/slne/surf/cloud/api/common/netty/network/codec/StreamCodec;
+	public final fun getUUID_CODEC ()Lcom/mojang/serialization/Codec;
+	public final fun getUUID_LENIENT_CODEC ()Lcom/mojang/serialization/Codec;
+	public final fun getUUID_STRING_CODEC ()Lcom/mojang/serialization/Codec;
+	public final fun idResolverCodec (Ljava/util/function/ToIntFunction;Ljava/util/function/IntFunction;I)Lcom/mojang/serialization/Codec;
+	public final fun nonEmptyList (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
+	public final fun orCompressed (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
+	public final fun orCompressed (Lcom/mojang/serialization/MapCodec;Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/MapCodec;
+}
+
+public final class dev/slne/surf/cloud/api/common/util/codec/FuzzyCodec : com/mojang/serialization/MapCodec {
+	public fun <init> (Ljava/util/List;Lkotlin/jvm/functions/Function1;)V
+	public fun decode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult;
+	public fun encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/RecordBuilder;)Lcom/mojang/serialization/RecordBuilder;
+	public fun keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream;
+	public fun toString ()Ljava/lang/String;
+}
+
+public abstract interface annotation class dev/slne/surf/cloud/api/common/util/codec/RecordCodecDsl : java/lang/annotation/Annotation {
+}
+
+public final class dev/slne/surf/cloud/api/common/util/codec/StrictEither : com/mojang/serialization/MapCodec {
+	public fun <init> (Ljava/lang/String;Lcom/mojang/serialization/MapCodec;Lcom/mojang/serialization/MapCodec;)V
+	public fun decode (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult;
+	public fun encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/RecordBuilder;)Lcom/mojang/serialization/RecordBuilder;
+	public fun keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream;
+}
+
+public final class dev/slne/surf/cloud/api/common/util/math/Math_utilKt {
+	public static final fun lerp (FFF)F
+}
+
+public final class dev/slne/surf/cloud/api/common/util/nbt/FastNbtIo {
+	public static final field INSTANCE Ldev/slne/surf/cloud/api/common/util/nbt/FastNbtIo;
+	public final fun readCompoundTag (Ljava/io/InputStream;I)Lnet/querz/nbt/tag/CompoundTag;
+	public final fun readCompressed (Ljava/io/InputStream;I)Lnet/querz/nbt/tag/CompoundTag;
+	public final fun readCompressed (Ljava/nio/file/Path;I)Lnet/querz/nbt/tag/CompoundTag;
+	public final fun writeCompoundTag (Ljava/io/OutputStream;Lnet/querz/nbt/tag/CompoundTag;)V
+	public final fun writeCompressed (Lnet/querz/nbt/tag/CompoundTag;Ljava/io/OutputStream;)V
+	public final fun writeCompressed (Lnet/querz/nbt/tag/CompoundTag;Ljava/nio/file/Path;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/util/nbt/Nbt_extensionsKt {
+	public static final fun getCompound (Lnet/querz/nbt/tag/ListTag;I)Lnet/querz/nbt/tag/CompoundTag;
+	public static final fun readCompoundTag (Ljava/nio/file/Path;Z)Lnet/querz/nbt/tag/CompoundTag;
+	public static synthetic fun readCompoundTag$default (Ljava/nio/file/Path;ZILjava/lang/Object;)Lnet/querz/nbt/tag/CompoundTag;
+	public static final fun readTag (Ljava/nio/file/Path;Z)Lnet/querz/nbt/io/NamedTag;
+	public static synthetic fun readTag$default (Ljava/nio/file/Path;ZILjava/lang/Object;)Lnet/querz/nbt/io/NamedTag;
+	public static final fun set (Lnet/querz/nbt/tag/CompoundTag;Ljava/lang/String;B)Lnet/querz/nbt/tag/Tag;
+	public static final fun set (Lnet/querz/nbt/tag/CompoundTag;Ljava/lang/String;D)Lnet/querz/nbt/tag/Tag;
+	public static final fun set (Lnet/querz/nbt/tag/CompoundTag;Ljava/lang/String;F)Lnet/querz/nbt/tag/Tag;
+	public static final fun set (Lnet/querz/nbt/tag/CompoundTag;Ljava/lang/String;I)Lnet/querz/nbt/tag/Tag;
+	public static final fun set (Lnet/querz/nbt/tag/CompoundTag;Ljava/lang/String;J)Lnet/querz/nbt/tag/Tag;
+	public static final fun set (Lnet/querz/nbt/tag/CompoundTag;Ljava/lang/String;Ljava/lang/String;)Lnet/querz/nbt/tag/Tag;
+	public static final fun set (Lnet/querz/nbt/tag/CompoundTag;Ljava/lang/String;Lnet/querz/nbt/tag/Tag;)Lnet/querz/nbt/tag/Tag;
+	public static final fun set (Lnet/querz/nbt/tag/CompoundTag;Ljava/lang/String;S)Lnet/querz/nbt/tag/Tag;
+	public static final fun set (Lnet/querz/nbt/tag/CompoundTag;Ljava/lang/String;Z)Lnet/querz/nbt/tag/Tag;
+	public static final fun set (Lnet/querz/nbt/tag/CompoundTag;Ljava/lang/String;[B)Lnet/querz/nbt/tag/Tag;
+	public static final fun set (Lnet/querz/nbt/tag/CompoundTag;Ljava/lang/String;[I)Lnet/querz/nbt/tag/Tag;
+	public static final fun set (Lnet/querz/nbt/tag/CompoundTag;Ljava/lang/String;[J)Lnet/querz/nbt/tag/Tag;
+	public static final fun writeToPath (Lnet/querz/nbt/io/NamedTag;Ljava/nio/file/Path;Z)V
+	public static final fun writeToPath (Lnet/querz/nbt/tag/Tag;Ljava/nio/file/Path;Z)V
+	public static synthetic fun writeToPath$default (Lnet/querz/nbt/io/NamedTag;Ljava/nio/file/Path;ZILjava/lang/Object;)V
+	public static synthetic fun writeToPath$default (Lnet/querz/nbt/tag/Tag;Ljava/nio/file/Path;ZILjava/lang/Object;)V
+}
+
+public final class dev/slne/surf/cloud/api/common/util/netty/Netty_utilKt {
+	public static final fun suspend (Lio/netty/channel/ChannelFuture;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static final fun suspend (Lio/netty/util/concurrent/Future;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public abstract class dev/slne/surf/cloud/api/common/util/netty/UnifiedReadOnlyChannelHandler : io/netty/channel/ChannelDuplexHandler {
+	public fun <init> ()V
+	public fun <init> (Ljava/lang/Class;)V
+	public final fun acceptMessage (Ljava/lang/Object;)Z
+	public fun channelRead (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;)V
+	protected abstract fun handleRead (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;)V
+	protected abstract fun handleWrite (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Lio/netty/channel/ChannelPromise;)V
+	public fun write (Lio/netty/channel/ChannelHandlerContext;Ljava/lang/Object;Lio/netty/channel/ChannelPromise;)V
+}
+
+public abstract class dev/slne/surf/cloud/api/common/util/queue/AbstractSuspendingQueue : dev/slne/surf/cloud/api/common/util/queue/SuspendingQueue {
+	protected fun <init> ()V
+	public fun clear ()V
+	public fun contains (Ljava/lang/Object;)Z
+	public fun element ()Ljava/lang/Object;
+	public abstract fun getSize ()I
+	public fun isEmpty ()Z
+	public fun offerAll (Ljava/util/Collection;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun remove ()Ljava/lang/Object;
+	public fun remove (Ljava/lang/Object;)Z
+}
+
+public final class dev/slne/surf/cloud/api/common/util/queue/FairPriorityQueue : java/util/AbstractQueue {
+	public fun <init> (Ljava/util/Comparator;)V
+	public final fun addFirst (Ljava/lang/Object;)V
+	public fun getSize ()I
+	public fun iterator ()Ljava/util/Iterator;
+	public fun offer (Ljava/lang/Object;)Z
+	public fun peek ()Ljava/lang/Object;
+	public fun poll ()Ljava/lang/Object;
+	public final fun size ()I
+}
+
+public final class dev/slne/surf/cloud/api/common/util/queue/FairSuspendPriorityQueue : dev/slne/surf/cloud/api/common/util/queue/AbstractSuspendingQueue {
+	public fun <init> (Lkotlin/jvm/functions/Function3;)V
+	public final fun addFirst (Ljava/lang/Object;)V
+	public fun getSize ()I
+	public fun iterator ()Ljava/util/Iterator;
+	public fun offer (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun peek ()Ljava/lang/Object;
+	public fun poll ()Ljava/lang/Object;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/common/util/queue/SuspendingQueue : java/lang/Iterable, kotlin/jvm/internal/markers/KMutableIterable {
+	public abstract fun clear ()V
+	public abstract fun contains (Ljava/lang/Object;)Z
+	public abstract fun element ()Ljava/lang/Object;
+	public abstract fun isEmpty ()Z
+	public abstract fun offer (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun offerAll (Ljava/util/Collection;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun peek ()Ljava/lang/Object;
+	public abstract fun poll ()Ljava/lang/Object;
+	public abstract fun remove ()Ljava/lang/Object;
+	public abstract fun remove (Ljava/lang/Object;)Z
+}
+
diff --git a/surf-cloud-api/surf-cloud-api-common/build.gradle.kts b/surf-cloud-api/surf-cloud-api-common/build.gradle.kts
index a996ca94..112f4f8d 100644
--- a/surf-cloud-api/surf-cloud-api-common/build.gradle.kts
+++ b/surf-cloud-api/surf-cloud-api-common/build.gradle.kts
@@ -1,26 +1,24 @@
 plugins {
     id("dev.slne.surf.surfapi.gradle.core")
-    `core-convention`
 }
 
 dependencies {
-    api("org.springframework.boot:spring-boot-starter")
-    api("com.fasterxml.jackson.core:jackson-core")
-    api("com.fasterxml.jackson.core:jackson-databind")
-    // https://mvnrepository.com/artifact/tech.hiddenproject/aide-reflection
-    api("tech.hiddenproject:aide-reflection:1.3")
-    // https://mvnrepository.com/artifact/io.netty/netty-all
-    api("io.netty:netty-all:4.1.113.Final")
-    api("com.github.Querz:NBT:6.1")
+    api(libs.bundles.spring.api.common)
+    implementation(libs.spring.data.jpa) // Hide this from the API
+    api(libs.bundles.jackson.api.common)
+    api(libs.bundles.spring.aop)
 
-    // https://mvnrepository.com/artifact/jakarta.persistence/jakarta.persistence-api
-    api("jakarta.persistence:jakarta.persistence-api")
-    // https://mvnrepository.com/artifact/org.springframework/spring-jdbc
-//    api("org.springframework:spring-jdbc")
-    // https://mvnrepository.com/artifact/org.springframework.data/spring-data-jpa
-    api("org.springframework.data:spring-data-jpa")
-    api("com.mojang:datafixerupper:8.0.16") {
+    api(libs.aide.reflection)
+    api(libs.netty.all)
+    api(libs.nbt)
+    api(libs.datafixerupper) {
         isTransitive = false
     }
-    api("net.bytebuddy:byte-buddy:1.15.10")
+    api(libs.byte.buddy)
+}
+
+kotlin {
+    compilerOptions {
+        optIn.add("dev.slne.surf.cloud.api.common.util.annotation.InternalApi")
+    }
 }
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/SurfCloudInstance.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/CloudInstance.kt
similarity index 70%
rename from surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/SurfCloudInstance.kt
rename to surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/CloudInstance.kt
index 9387f9f8..d33858df 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/SurfCloudInstance.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/CloudInstance.kt
@@ -1,9 +1,9 @@
 package dev.slne.surf.cloud.api.common
 
-import dev.slne.surf.cloud.api.common.util.requiredService
+import dev.slne.surf.cloud.api.common.util.annotation.InternalApi
+import dev.slne.surf.surfapi.core.api.util.requiredService
 import org.jetbrains.annotations.ApiStatus
 import org.springframework.boot.builder.SpringApplicationBuilder
-import org.springframework.context.ApplicationListener
 import org.springframework.context.ConfigurableApplicationContext
 import kotlin.reflect.KClass
 
@@ -15,7 +15,7 @@ import kotlin.reflect.KClass
  * This interface is non-extendable.
  */
 @ApiStatus.NonExtendable
-interface SurfCloudInstance {
+interface CloudInstance {
 
     /**
      * Starts a Spring application with the specified parameters.
@@ -33,23 +33,13 @@ interface SurfCloudInstance {
         customizer: SpringApplicationBuilder.() -> Unit = {}
     ): ConfigurableApplicationContext
 
-    /**
-     * Internal listener for Netty packet processing events.
-     */
-    @get:ApiStatus.Internal
-    @Deprecated("Not needed anymore?", level = DeprecationLevel.ERROR)
-    val nettyPacketProcessorListener: ApplicationListener<*>
-
-    companion object {
-        val instance = requiredService<SurfCloudInstance>()
+    companion object : CloudInstance by INSTANCE {
+        @InternalApi
+        val instance = INSTANCE
     }
 }
 
-/**
- * Provides a convenient property to access the singleton [SurfCloudInstance].
- */
-val cloudInstance: SurfCloudInstance
-    get() = SurfCloudInstance.instance
+private val INSTANCE = requiredService<CloudInstance>()
 
 /**
  * Extension function to start a Spring application using [KClass].
@@ -60,9 +50,14 @@ val cloudInstance: SurfCloudInstance
  * @param customizer A block to customize the [SpringApplicationBuilder].
  * @return The resulting [ConfigurableApplicationContext].
  */
-fun SurfCloudInstance.startSpringApplication(
+fun CloudInstance.startSpringApplication(
     applicationClass: KClass<*>,
     classLoader: ClassLoader = applicationClass.java.classLoader,
     vararg parentClassLoader: ClassLoader,
     customizer: SpringApplicationBuilder.() -> Unit = {}
-) = startSpringApplication(applicationClass.java, classLoader, *parentClassLoader, customizer = customizer)
\ No newline at end of file
+) = startSpringApplication(
+    applicationClass.java,
+    classLoader,
+    *parentClassLoader,
+    customizer = customizer
+)
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/SurfCloudApplication.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/SurfCloudApplication.kt
index fe0abcdb..26f5a74d 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/SurfCloudApplication.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/SurfCloudApplication.kt
@@ -1,43 +1,39 @@
 package dev.slne.surf.cloud.api.common
 
+import org.springframework.boot.autoconfigure.AutoConfigurationPackage
 import org.springframework.boot.autoconfigure.SpringBootApplication
-import org.springframework.boot.autoconfigure.data.redis.RedisRepositoriesAutoConfiguration
 import org.springframework.boot.autoconfigure.domain.EntityScan
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
+import org.springframework.cache.annotation.EnableCaching
+import org.springframework.context.annotation.AdviceMode
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.EnableAspectJAutoProxy
-import org.springframework.core.annotation.AliasFor
+import org.springframework.context.annotation.EnableLoadTimeWeaving
+import org.springframework.context.annotation.Import
+import org.springframework.context.annotation.Primary
+import org.springframework.context.annotation.Profile
+import org.springframework.jdbc.datasource.DataSourceTransactionManager
 import org.springframework.scheduling.annotation.EnableAsync
 import org.springframework.scheduling.annotation.EnableScheduling
+import org.springframework.transaction.PlatformTransactionManager
 import org.springframework.transaction.annotation.EnableTransactionManagement
+import org.springframework.transaction.aspectj.AnnotationTransactionAspect
+import javax.sql.DataSource
+
 
 /**
  * Annotation for defining Surf Cloud applications with specific configurations.
  *
  * Combines multiple Spring features such as scheduling, async processing,
  * transaction management, and entity scanning, with options for JPA and Redis base packages.
- *
- * @property basePackages Base packages to scan for Spring components.
- * @property jpaBasePackages Base packages for JPA entities.
- * @property redisBasePackages Base packages for Redis repositories.
  */
 @Target(AnnotationTarget.CLASS)
 @Retention(AnnotationRetention.RUNTIME)
-@SpringBootApplication(
-    exclude = [DataSourceAutoConfiguration::class, RedisRepositoriesAutoConfiguration::class]
-)
+@SpringBootApplication
 @EnableScheduling
 @EnableAsync
-@EnableTransactionManagement
-@EnableAspectJAutoProxy
+@EnableAspectJAutoProxy(proxyTargetClass = true, exposeProxy = true)
 @EntityScan
-//@EnableRedisRepositories
-annotation class SurfCloudApplication(
-    @get:AliasFor(
-        annotation = SpringBootApplication::class,
-        attribute = "scanBasePackages"
-    ) val basePackages: Array<String> = [],
-    //  @AliasFor(annotation = JpaConfig.class, attribute = "basePackages")
-    val jpaBasePackages: Array<String> = [],
-    //  @AliasFor(annotation = RedisConfig.class, attribute = "basePackages")
-    val redisBasePackages: Array<String> = []
-)
+@EnableCaching
+@AutoConfigurationPackage
+annotation class SurfCloudApplication
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/config/properties/CloudProperties.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/config/properties/CloudProperties.kt
index dcb2a15a..90645748 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/config/properties/CloudProperties.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/config/properties/CloudProperties.kt
@@ -1,6 +1,5 @@
 package dev.slne.surf.cloud.api.common.config.properties
 
-
 /**
  * Contains predefined cloud properties for Surf Cloud applications.
  */
@@ -9,7 +8,7 @@ object CloudProperties {
     /**
      * Default value indicating that the server category is not set.
      */
-    private const val SERVER_CATEGORY_NOT_SET = "NOT_SET"
+    const val SERVER_CATEGORY_NOT_SET = "NOT_SET"
 
     /**
      * System property for the server category. Defaults to [SERVER_CATEGORY_NOT_SET].
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/event/CloudEvent.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/event/CloudEvent.kt
index 62619784..f6eab4c1 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/event/CloudEvent.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/event/CloudEvent.kt
@@ -1,10 +1,16 @@
 package dev.slne.surf.cloud.api.common.event
 
 import org.springframework.context.ApplicationEvent
+import java.io.Serial
 
 /**
  * Base class for all cloud-related events.
  *
  * @param source The object on which the event initially occurred.
  */
-abstract class CloudEvent(source: Any) : ApplicationEvent(source)
\ No newline at end of file
+abstract class CloudEvent(source: Any) : ApplicationEvent(source) {
+    companion object {
+        @Serial
+        private const val serialVersionUID: Long = -3330199602759544854L
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/event/player/CloudPlayerEvent.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/event/player/CloudPlayerEvent.kt
index e89bb26f..1ba37be1 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/event/player/CloudPlayerEvent.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/event/player/CloudPlayerEvent.kt
@@ -2,6 +2,7 @@ package dev.slne.surf.cloud.api.common.event.player
 
 import dev.slne.surf.cloud.api.common.event.CloudEvent
 import dev.slne.surf.cloud.api.common.player.CloudPlayer
+import java.io.Serial
 
 /**
  * Base class for all events related to a specific player.
@@ -9,4 +10,9 @@ import dev.slne.surf.cloud.api.common.player.CloudPlayer
  * @param source The object on which the event initially occurred.
  * @param player The player associated with the event.
  */
-abstract class CloudPlayerEvent(source: Any, val player: CloudPlayer) : CloudEvent(source)
\ No newline at end of file
+abstract class CloudPlayerEvent(source: Any, val player: CloudPlayer) : CloudEvent(source) {
+    companion object {
+        @Serial
+        private const val serialVersionUID: Long = 2525857345685742731L
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/event/player/connection/CloudPlayerConnectToNetworkEvent.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/event/player/connection/CloudPlayerConnectToNetworkEvent.kt
index 4c9595ff..303f9e4e 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/event/player/connection/CloudPlayerConnectToNetworkEvent.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/event/player/connection/CloudPlayerConnectToNetworkEvent.kt
@@ -2,6 +2,7 @@ package dev.slne.surf.cloud.api.common.event.player.connection
 
 import dev.slne.surf.cloud.api.common.event.player.CloudPlayerEvent
 import dev.slne.surf.cloud.api.common.player.CloudPlayer
+import java.io.Serial
 
 /**
  * Event triggered when a player connects to the network.
@@ -10,4 +11,10 @@ import dev.slne.surf.cloud.api.common.player.CloudPlayer
  * @param player The player who connected to the network.
  */
 class CloudPlayerConnectToNetworkEvent(source: Any, player: CloudPlayer) :
-    CloudPlayerEvent(source, player)
\ No newline at end of file
+    CloudPlayerEvent(source, player) {
+
+    companion object {
+        @Serial
+        private const val serialVersionUID: Long = -2827818539298350684L
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/meta/SurfNettyPacket.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/meta/SurfNettyPacket.kt
index 6a205976..0a8abb56 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/meta/SurfNettyPacket.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/meta/SurfNettyPacket.kt
@@ -2,7 +2,7 @@ package dev.slne.surf.cloud.api.common.meta
 
 import dev.slne.surf.cloud.api.common.netty.network.ConnectionProtocol
 import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
-import org.jetbrains.annotations.ApiStatus.Internal
+import dev.slne.surf.cloud.api.common.util.annotation.InternalApi
 
 /**
  * Annotation for marking a class as a Netty packet in the Surf Cloud application.
@@ -16,7 +16,8 @@ import org.jetbrains.annotations.ApiStatus.Internal
 annotation class SurfNettyPacket(
     val id: String,
     val flow: PacketFlow,
-    @Internal vararg val protocols: ConnectionProtocol = [ConnectionProtocol.RUNNING]
+    @property:InternalApi
+    vararg val protocols: ConnectionProtocol = [ConnectionProtocol.RUNNING]
 )
 
 /**
@@ -31,8 +32,6 @@ annotation class PacketCodec
  */
 object DefaultIds {
 
-    const val PROXIED_NETTY_PACKET = "cloud:proxied"
-
     // Handshake
     const val SERVERBOUND_HANDSHAKE_PACKET = "cloud:serverbound:handshake"
 
@@ -173,4 +172,12 @@ object DefaultIds {
     const val CLIENTBOUND_REGISTER_CLOUD_SERVERS_TO_PROXY =
         "cloud:clientbound:register_cloud_servers_to_proxy"
 
+    const val CLIENTBOUND_SHUTDOWN_PACKET = "cloud:clientbound:shutdown"
+    const val SERVERBOUND_SHUTDOWN_SERVER_PACKET = "cloud:serverbound:shutdown_server"
+
+    const val CLIENTBOUND_BATCH_UPDATE_SERVER = "cloud:clientbound:batch_update_server"
+
+    const val REQUEST_OFFLINE_DISPLAY_NAME_PACKET = "cloud:request:offline_display_name"
+    const val RESPONSE_REQUEST_OFFLINE_DISPLAY_NAME_PACKET = "cloud:response:request_offline_display_name"
+
 }
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/meta/SurfNettyPacketHandler.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/meta/SurfNettyPacketHandler.kt
index 4182e766..ac05f122 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/meta/SurfNettyPacketHandler.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/meta/SurfNettyPacketHandler.kt
@@ -1,5 +1,9 @@
 package dev.slne.surf.cloud.api.common.meta
 
+import org.springframework.aot.hint.annotation.Reflective
+import org.springframework.core.annotation.AliasFor
+import kotlin.reflect.KClass
+
 /**
  * Annotation for marking methods in a component as packet handlers.
  */
@@ -11,4 +15,10 @@ package dev.slne.surf.cloud.api.common.meta
 @Retention(
     AnnotationRetention.RUNTIME
 )
-annotation class SurfNettyPacketHandler 
+@Reflective
+annotation class SurfNettyPacketHandler(
+    @get:AliasFor("classes") val value: Array<KClass<*>> = [],
+    @get:AliasFor("values") val classes: Array<KClass<*>> = [],
+    val condition: String = "",
+    val id: String = ""
+)
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/ConnectionProtocol.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/ConnectionProtocol.kt
index c1bc0b97..0b9e51ec 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/ConnectionProtocol.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/ConnectionProtocol.kt
@@ -8,5 +8,6 @@ enum class ConnectionProtocol {
     INITIALIZE,
     LOGIN,
     PRE_RUNNING,
-    RUNNING
+    RUNNING,
+    SHUTDOWN
 }
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/codec/StringIdDispatchCodec.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/codec/StringIdDispatchCodec.kt
index d025aa70..31562398 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/codec/StringIdDispatchCodec.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/codec/StringIdDispatchCodec.kt
@@ -2,14 +2,12 @@
 
 package dev.slne.surf.cloud.api.common.netty.network.codec
 
-import dev.slne.surf.cloud.api.common.netty.protocol.buffer.readByteArray
-import dev.slne.surf.cloud.api.common.netty.protocol.buffer.writeByteArray
+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 io.netty.buffer.ByteBuf
-import io.netty.buffer.ByteBufAllocator
 import io.netty.handler.codec.DecoderException
 import io.netty.handler.codec.EncoderException
 import it.unimi.dsi.fastutil.objects.Object2ObjectMap
@@ -19,19 +17,15 @@ import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
 import kotlin.experimental.ExperimentalTypeInference
 
-//private const val UNKNOWN_TYPE = -1
 
 class StringIdDispatchCodec<B : ByteBuf, V, T> private constructor(
     private val typeGetter: Function<V, out T>,
-    private val byId: Object2ObjectMap<ByteArray, Entry<B, V, T>>,
-    private val toId: Object2ObjectMap<T, ByteArray>
+    private val byId: Object2ObjectMap<String, Entry<B, V, T>>,
+    private val toId: Object2ObjectMap<T, String>
 ) : StreamCodec<B, V> {
-    init {
-//        toId.defaultReturnValue(UNKNOWN_TYPE)
-    }
 
     override fun decode(buf: B): V {
-        val id = buf.readByteArray()
+        val id = buf.readUtf()
         val entry = byId[id]
 
         if (id.isNotEmpty() && entry != null) {
@@ -49,7 +43,7 @@ class StringIdDispatchCodec<B : ByteBuf, V, T> private constructor(
         val type = typeGetter.apply(value)
         val id = toId[type] ?: throw EncoderException("Sending unknown packet '$type'")
 
-        buf.writeByteArray(id)
+        buf.writeUtf(id)
         val entry = byId[id] ?: throw EncoderException("Messed up mapping for packet '$type'")
 
         try {
@@ -68,23 +62,16 @@ class StringIdDispatchCodec<B : ByteBuf, V, T> private constructor(
         }
 
         fun build(typeToIdMapper: (T) -> String): StringIdDispatchCodec<B, V, T> {
-            val typeToIdMap = mutableObject2ObjectMapOf<T, ByteArray>(entries.size)
-            val idToTypeMap = mutableObject2ObjectMapOf<ByteArray, Entry<B, V, T>>(entries.size)
-            val finalTypeToIdMapper = typeToIdMapper
+            val typeToIdMap = mutableObject2ObjectMapOf<T, String>(entries.size)
+            val idToTypeMap = mutableObject2ObjectMapOf<String, Entry<B, V, T>>(entries.size)
 
-            val tempBuf = ByteBufAllocator.DEFAULT.buffer()
             for (entry in this.entries) {
                 val type = entry.type
-                val id = finalTypeToIdMapper(type)
-
-                tempBuf.writeUtf(id)
-                val serializedId = tempBuf.readBytes(tempBuf.readableBytes()).array()
+                val id = typeToIdMapper(type)
 
-                val previousValue = typeToIdMap.putIfAbsent(type, serializedId)
+                val previousValue = typeToIdMap.putIfAbsent(type, id)
                 check(previousValue == null) { "Duplicate registration for type $type" }
-                idToTypeMap.put(serializedId, entry)
-
-                tempBuf.clear()
+                idToTypeMap.put(id, entry)
             }
 
             return StringIdDispatchCodec(
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/BooleanArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/BooleanArrayResponse.kt
deleted file mode 100644
index 01019465..00000000
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/BooleanArrayResponse.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package dev.slne.surf.cloud.api.common.netty.network.protocol
-
-import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
-import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
-import it.unimi.dsi.fastutil.booleans.BooleanCollection
-import it.unimi.dsi.fastutil.booleans.BooleanList
-
-@SurfNettyPacket("boolean_array_response", PacketFlow.BIDIRECTIONAL)
-class BooleanArrayResponse(val value: BooleanArray) : ResponseNettyPacket() {
-    companion object {
-        val STREAM_CODEC = packetCodec(BooleanArrayResponse::write, ::BooleanArrayResponse)
-    }
-
-    private constructor(buf: SurfByteBuf) : this(buf.readBooleanArray())
-
-    private fun write(buf: SurfByteBuf) {
-        buf.writeBooleanArray(value)
-    }
-
-    operator fun component1() = value
-}
-
-fun RespondingNettyPacket<BooleanArrayResponse>.respond(value: BooleanArray) =
-    respond(BooleanArrayResponse(value))
-
-fun RespondingNettyPacket<BooleanArrayResponse>.respond(value: BooleanCollection) =
-    respond(value.toBooleanArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/BooleanResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/BooleanResponse.kt
deleted file mode 100644
index ba129365..00000000
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/BooleanResponse.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package dev.slne.surf.cloud.api.common.netty.network.protocol
-
-import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
-import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
-
-@SurfNettyPacket("boolean_response", PacketFlow.BIDIRECTIONAL)
-class BooleanResponse(val value: Boolean) : ResponseNettyPacket() {
-    companion object {
-        val STREAM_CODEC = packetCodec(BooleanResponse::write, ::BooleanResponse)
-    }
-
-    private constructor(buf: SurfByteBuf) : this(buf.readBoolean())
-
-    private fun write(buf: SurfByteBuf) {
-        buf.writeBoolean(value)
-    }
-
-    operator fun component1() = value
-}
-
-fun RespondingNettyPacket<BooleanResponse>.respond(value: Boolean) =
-    respond(BooleanResponse(value))
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/ByteArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/ByteArrayResponse.kt
deleted file mode 100644
index eae1a2e7..00000000
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/ByteArrayResponse.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package dev.slne.surf.cloud.api.common.netty.network.protocol
-
-import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
-import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
-import it.unimi.dsi.fastutil.bytes.ByteCollection
-import it.unimi.dsi.fastutil.bytes.ByteList
-
-@SurfNettyPacket("byte_array_response", PacketFlow.BIDIRECTIONAL)
-class ByteArrayResponse(val value: ByteArray) : ResponseNettyPacket() {
-    companion object {
-        val STREAM_CODEC = packetCodec(ByteArrayResponse::write, ::ByteArrayResponse)
-    }
-
-    private constructor(buf: SurfByteBuf) : this(buf.readByteArray())
-
-    private fun write(buf: SurfByteBuf) {
-        buf.writeByteArray(value)
-    }
-
-    operator fun component1() = value
-}
-
-fun RespondingNettyPacket<ByteArrayResponse>.respond(value: ByteArray) =
-    respond(ByteArrayResponse(value))
-
-fun RespondingNettyPacket<ByteArrayResponse>.respond(value: ByteCollection) = respond(value.toByteArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType.kt
new file mode 100644
index 00000000..5d9a18a1
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/CommonResponseType.kt
@@ -0,0 +1,58 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol
+
+import dev.slne.surf.cloud.api.common.netty.network.Connection
+import dev.slne.surf.cloud.api.common.netty.packet.DEFAULT_TIMEOUT
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.util.annotation.InternalApi
+import kotlin.reflect.full.companionObjectInstance
+import kotlin.time.Duration
+
+@InternalApi
+interface CommonResponseType<T> {
+    val value: T
+}
+
+@InternalApi
+@PublishedApi
+internal interface CommonResponseTypeFactory<T : ResponseNettyPacket, R> {
+    fun create(value: R): T
+}
+
+inline fun <reified T, R> RespondingNettyPacket<T>.respond(value: R) where T : ResponseNettyPacket, T : CommonResponseType<R> {
+    respond(extractFactory<T, R>().create(value))
+}
+
+suspend inline fun <reified T, R> RespondingNettyPacket<T>.await(
+    connection: Connection,
+    timeout: Duration = DEFAULT_TIMEOUT
+): R? where T : ResponseNettyPacket, T : CommonResponseType<R> {
+    return fireAndAwait(connection, timeout)?.value
+}
+
+suspend inline fun <reified T, R> RespondingNettyPacket<T>.awaitUrgent(
+    connection: Connection
+): R? where T : ResponseNettyPacket, T : CommonResponseType<R> {
+    return fireAndAwaitUrgent(connection)?.value
+}
+
+suspend inline fun <reified T, R> RespondingNettyPacket<T>.awaitOrThrow(
+    connection: Connection,
+    timeout: Duration = DEFAULT_TIMEOUT
+): R where T : ResponseNettyPacket, T : CommonResponseType<R> {
+    return fireAndAwaitOrThrow(connection, timeout).value
+}
+
+suspend inline fun <reified T, R> RespondingNettyPacket<T>.awaitOrThrowUrgent(
+    connection: Connection
+): R where T : ResponseNettyPacket, T : CommonResponseType<R> {
+    return fireAndAwaitOrThrowUrgent(connection).value
+}
+
+@Suppress("UNCHECKED_CAST")
+@InternalApi
+@PublishedApi
+internal inline fun <reified T, R> extractFactory(): CommonResponseTypeFactory<T, R> where T : ResponseNettyPacket, T : CommonResponseType<R> {
+    return T::class.companionObjectInstance as? CommonResponseTypeFactory<T, R>
+        ?: error("No factory found for type ${T::class.simpleName}")
+}
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/DoubleArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/DoubleArrayResponse.kt
deleted file mode 100644
index 367849b0..00000000
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/DoubleArrayResponse.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package dev.slne.surf.cloud.api.common.netty.network.protocol
-
-import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
-import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
-import it.unimi.dsi.fastutil.doubles.DoubleCollection
-
-@SurfNettyPacket("boolean_array_response", PacketFlow.BIDIRECTIONAL)
-class DoubleArrayResponse(val value: DoubleArray) : ResponseNettyPacket() {
-    companion object {
-        val STREAM_CODEC = packetCodec(DoubleArrayResponse::write, ::DoubleArrayResponse)
-    }
-
-    private constructor(buf: SurfByteBuf) : this(buf.readDoubleArray())
-
-    private fun write(buf: SurfByteBuf) {
-        buf.writeDoubleArray(value)
-    }
-
-    operator fun component1() = value
-}
-
-fun RespondingNettyPacket<DoubleArrayResponse>.respond(value: DoubleArray) =
-    respond(DoubleArrayResponse(value))
-
-fun RespondingNettyPacket<DoubleArrayResponse>.respond(value: DoubleCollection) =
-    respond(value.toDoubleArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/FloatArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/FloatArrayResponse.kt
deleted file mode 100644
index 7fc8fb27..00000000
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/FloatArrayResponse.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package dev.slne.surf.cloud.api.common.netty.network.protocol
-
-import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
-import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
-import it.unimi.dsi.fastutil.floats.FloatCollection
-
-@SurfNettyPacket("float_array_response", PacketFlow.BIDIRECTIONAL)
-class FloatArrayResponse(val value: FloatArray) : ResponseNettyPacket() {
-    companion object {
-        val STREAM_CODEC = packetCodec(FloatArrayResponse::write, ::FloatArrayResponse)
-    }
-
-    private constructor(buf: SurfByteBuf) : this(buf.readFloatArray())
-
-    private fun write(buf: SurfByteBuf) {
-        buf.writeFloatArray(value)
-    }
-
-    operator fun component1() = value
-}
-
-fun RespondingNettyPacket<FloatArrayResponse>.respond(value: FloatArray) =
-    respond(FloatArrayResponse(value))
-
-fun RespondingNettyPacket<FloatArrayResponse>.respond(value: FloatCollection) =
-    respond(value.toFloatArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/IntArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/IntArrayResponse.kt
deleted file mode 100644
index f520931e..00000000
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/IntArrayResponse.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package dev.slne.surf.cloud.api.common.netty.network.protocol
-
-import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
-import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
-import it.unimi.dsi.fastutil.ints.IntCollection
-
-@SurfNettyPacket("int_array_response", PacketFlow.BIDIRECTIONAL)
-class IntArrayResponse(val value: IntArray) : ResponseNettyPacket() {
-    companion object {
-        val STREAM_CODEC = packetCodec(IntArrayResponse::write, ::IntArrayResponse)
-    }
-
-    private constructor(buf: SurfByteBuf) : this(buf.readIntArray())
-
-    private fun write(buf: SurfByteBuf) {
-        buf.writeIntArray(value)
-    }
-
-    operator fun component1() = value
-}
-
-fun RespondingNettyPacket<IntArrayResponse>.respond(value: IntArray) =
-    respond(IntArrayResponse(value))
-
-fun RespondingNettyPacket<IntArrayResponse>.respond(value: IntCollection) =
-    respond(value.toIntArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/LongArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/LongArrayResponse.kt
deleted file mode 100644
index 56052e7b..00000000
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/LongArrayResponse.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package dev.slne.surf.cloud.api.common.netty.network.protocol
-
-import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
-import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
-import it.unimi.dsi.fastutil.longs.LongCollection
-
-@SurfNettyPacket("long_array_response", PacketFlow.BIDIRECTIONAL)
-class LongArrayResponse(val value: LongArray) : ResponseNettyPacket() {
-    companion object {
-        val STREAM_CODEC = packetCodec(LongArrayResponse::write, ::LongArrayResponse)
-    }
-
-    private constructor(buf: SurfByteBuf) : this(buf.readLongArray())
-
-    private fun write(buf: SurfByteBuf) {
-        buf.writeLongArray(value)
-    }
-
-    operator fun component1() = value
-}
-
-fun RespondingNettyPacket<LongArrayResponse>.respond(value: LongArray) =
-    respond(LongArrayResponse(value))
-
-fun RespondingNettyPacket<LongArrayResponse>.respond(value: LongCollection) =
-    respond(LongArrayResponse(value.toLongArray()))
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/OptionalComponentResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/OptionalComponentResponse.kt
new file mode 100644
index 00000000..a733093f
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/OptionalComponentResponse.kt
@@ -0,0 +1,7 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol
+
+import dev.slne.surf.cloud.api.common.netty.network.protocol.component.OptionalComponentResponse
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+
+typealias OptionalComponentResponsePacket = RespondingNettyPacket<OptionalComponentResponse>
+
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/ShortArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/ShortArrayResponse.kt
deleted file mode 100644
index 5e161d90..00000000
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/ShortArrayResponse.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package dev.slne.surf.cloud.api.common.netty.network.protocol
-
-import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
-import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
-import it.unimi.dsi.fastutil.shorts.ShortCollection
-
-@SurfNettyPacket("short_array_response", PacketFlow.BIDIRECTIONAL)
-class ShortArrayResponse(val value: ShortArray) : ResponseNettyPacket() {
-    companion object {
-        val STREAM_CODEC = packetCodec(ShortArrayResponse::write, ::ShortArrayResponse)
-    }
-
-    private constructor(buf: SurfByteBuf) : this(buf.readShortArray())
-
-    private fun write(buf: SurfByteBuf) {
-        buf.writeShortArray(value)
-    }
-
-    operator fun component1() = value
-}
-
-fun RespondingNettyPacket<ShortArrayResponse>.respond(value: ShortArray) =
-    respond(ShortArrayResponse(value))
-
-fun RespondingNettyPacket<ShortArrayResponse>.respond(value: ShortCollection) =
-    respond(ShortArrayResponse(value.toShortArray()))
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/StringArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/StringArrayResponse.kt
deleted file mode 100644
index 9d067401..00000000
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/StringArrayResponse.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package dev.slne.surf.cloud.api.common.netty.network.protocol
-
-import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
-import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
-import it.unimi.dsi.fastutil.objects.ObjectCollection
-import it.unimi.dsi.fastutil.objects.ObjectList
-import kotlin.collections.toTypedArray
-
-@SurfNettyPacket("string_array_response", PacketFlow.BIDIRECTIONAL)
-class StringArrayResponse(val value: Array<String>) : ResponseNettyPacket() {
-    companion object {
-        val STREAM_CODEC = packetCodec(StringArrayResponse::write, ::StringArrayResponse)
-    }
-
-    private constructor(buf: SurfByteBuf) : this(buf.readStringArray())
-
-    private fun write(buf: SurfByteBuf) {
-        buf.writeStringArray(value)
-    }
-
-    operator fun component1() = value
-}
-
-fun RespondingNettyPacket<StringArrayResponse>.respond(value: Array<String>) =
-    respond(StringArrayResponse(value))
-
-fun RespondingNettyPacket<StringArrayResponse>.respond(value: Collection<String>) =
-    respond(value.toTypedArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/StringResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/StringResponse.kt
deleted file mode 100644
index a8b0dba8..00000000
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/StringResponse.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package dev.slne.surf.cloud.api.common.netty.network.protocol
-
-import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
-import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
-
-@SurfNettyPacket("string_response", PacketFlow.BIDIRECTIONAL)
-class StringResponse(val value: String) : ResponseNettyPacket() {
-    companion object {
-        val STREAM_CODEC = packetCodec(StringResponse::write, ::StringResponse)
-    }
-
-    private constructor(buf: SurfByteBuf) : this(buf.readUtf())
-
-    private fun write(buf: SurfByteBuf) {
-        buf.writeUtf(value)
-    }
-
-    operator fun component1() = value
-}
-
-fun RespondingNettyPacket<StringResponse>.respond(value: String) =
-    respond(StringResponse(value))
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/UUIDArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/UUIDArrayResponse.kt
deleted file mode 100644
index 93f06977..00000000
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/UUIDArrayResponse.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package dev.slne.surf.cloud.api.common.netty.network.protocol
-
-import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
-import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
-import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
-import java.util.UUID
-
-@SurfNettyPacket("uuid_array_response", PacketFlow.BIDIRECTIONAL)
-class UUIDArrayResponse(val value: Array<UUID>) : ResponseNettyPacket() {
-    companion object {
-        val STREAM_CODEC = packetCodec(UUIDArrayResponse::write, ::UUIDArrayResponse)
-    }
-
-    private constructor(buf: SurfByteBuf) : this(buf.readUuidArray())
-
-    private fun write(buf: SurfByteBuf) {
-        buf.writeUuidArray(value)
-    }
-
-    operator fun component1() = value
-}
-
-fun RespondingNettyPacket<UUIDArrayResponse>.respond(value: Array<UUID>) =
-    respond(UUIDArrayResponse(value))
-
-fun RespondingNettyPacket<UUIDArrayResponse>.respond(value: Collection<UUID>) =
-    respond(UUIDArrayResponse(value.toTypedArray()))
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/boolean/BooleanArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/boolean/BooleanArrayResponse.kt
new file mode 100644
index 00000000..78fffd1a
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/boolean/BooleanArrayResponse.kt
@@ -0,0 +1,37 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.boolean
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.network.protocol.respond
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+import it.unimi.dsi.fastutil.booleans.BooleanCollection
+
+typealias BooleanArrayResponsePacket = RespondingNettyPacket<BooleanArrayResponse>
+
+@SurfNettyPacket("boolean_array_response", PacketFlow.BIDIRECTIONAL)
+class BooleanArrayResponse(override val value: BooleanArray) : ResponseNettyPacket(),
+    CommonResponseType<BooleanArray> {
+
+    companion object : CommonResponseTypeFactory<BooleanArrayResponse, BooleanArray> {
+        val STREAM_CODEC = packetCodec(BooleanArrayResponse::write, ::BooleanArrayResponse)
+        override fun create(value: BooleanArray): BooleanArrayResponse {
+            return BooleanArrayResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readBooleanArray())
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeBooleanArray(value)
+    }
+
+    operator fun component1() = value
+}
+
+fun BooleanArrayResponsePacket.respond(value: BooleanCollection) =
+    respond(value.toBooleanArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/boolean/BooleanResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/boolean/BooleanResponse.kt
new file mode 100644
index 00000000..9e06a11b
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/boolean/BooleanResponse.kt
@@ -0,0 +1,31 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.boolean
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+
+typealias BooleanResponsePacket = RespondingNettyPacket<BooleanResponse>
+
+@SurfNettyPacket("boolean_response", PacketFlow.BIDIRECTIONAL)
+class BooleanResponse(override val value: Boolean) : ResponseNettyPacket(),
+    CommonResponseType<Boolean> {
+    companion object : CommonResponseTypeFactory<BooleanResponse, Boolean> {
+        val STREAM_CODEC = packetCodec(BooleanResponse::write, ::BooleanResponse)
+        override fun create(value: Boolean): BooleanResponse {
+            return BooleanResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readBoolean())
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeBoolean(value)
+    }
+
+    operator fun component1() = value
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/boolean/OptionalBooleanArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/boolean/OptionalBooleanArrayResponse.kt
new file mode 100644
index 00000000..73057c63
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/boolean/OptionalBooleanArrayResponse.kt
@@ -0,0 +1,39 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.boolean
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.network.protocol.respond
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+import it.unimi.dsi.fastutil.booleans.BooleanCollection
+
+typealias OptionalBooleanArrayResponsePacket = RespondingNettyPacket<OptionalBooleanArrayResponse>
+
+@SurfNettyPacket("optional_boolean_array_response", PacketFlow.BIDIRECTIONAL)
+class OptionalBooleanArrayResponse(override val value: BooleanArray?) : ResponseNettyPacket(),
+    CommonResponseType<BooleanArray?> {
+
+    companion object : CommonResponseTypeFactory<OptionalBooleanArrayResponse, BooleanArray?> {
+        val STREAM_CODEC =
+            packetCodec(OptionalBooleanArrayResponse::write, ::OptionalBooleanArrayResponse)
+
+        override fun create(value: BooleanArray?): OptionalBooleanArrayResponse {
+            return OptionalBooleanArrayResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readNullable { it.readBooleanArray() })
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeNullable(value) { buf, value -> buf.writeBooleanArray(value) }
+    }
+
+    operator fun component1() = value
+}
+
+fun OptionalBooleanArrayResponsePacket.respond(value: BooleanCollection?) =
+    respond(value?.toBooleanArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/boolean/OptionalBooleanResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/boolean/OptionalBooleanResponse.kt
new file mode 100644
index 00000000..39f34040
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/boolean/OptionalBooleanResponse.kt
@@ -0,0 +1,31 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.boolean
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+
+typealias OptionalBooleanResponsePacket = RespondingNettyPacket<OptionalBooleanResponse>
+
+@SurfNettyPacket("optional_boolean_response", PacketFlow.BIDIRECTIONAL)
+class OptionalBooleanResponse(override val value: Boolean?) : ResponseNettyPacket(),
+    CommonResponseType<Boolean?> {
+    companion object : CommonResponseTypeFactory<OptionalBooleanResponse, Boolean?> {
+        val STREAM_CODEC = packetCodec(OptionalBooleanResponse::write, ::OptionalBooleanResponse)
+        override fun create(value: Boolean?): OptionalBooleanResponse {
+            return OptionalBooleanResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readNullableBoolean())
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeNullable(value)
+    }
+
+    operator fun component1() = value
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/byte/ByteArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/byte/ByteArrayResponse.kt
new file mode 100644
index 00000000..51affec4
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/byte/ByteArrayResponse.kt
@@ -0,0 +1,35 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.byte
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.network.protocol.respond
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+import it.unimi.dsi.fastutil.bytes.ByteCollection
+
+typealias ByteArrayResponsePacket = RespondingNettyPacket<ByteArrayResponse>
+
+@SurfNettyPacket("byte_array_response", PacketFlow.BIDIRECTIONAL)
+class ByteArrayResponse(override val value: ByteArray) : ResponseNettyPacket(),
+    CommonResponseType<ByteArray> {
+    companion object : CommonResponseTypeFactory<ByteArrayResponse, ByteArray> {
+        val STREAM_CODEC = packetCodec(ByteArrayResponse::write, ::ByteArrayResponse)
+        override fun create(value: ByteArray): ByteArrayResponse {
+            return ByteArrayResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readByteArray())
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeByteArray(value)
+    }
+
+    operator fun component1() = value
+}
+
+fun ByteArrayResponsePacket.respond(value: ByteCollection) = respond(value.toByteArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/ByteResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/byte/ByteResponse.kt
similarity index 50%
rename from surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/ByteResponse.kt
rename to surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/byte/ByteResponse.kt
index b0d62f48..3ef9b1e4 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/ByteResponse.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/byte/ByteResponse.kt
@@ -1,15 +1,24 @@
-package dev.slne.surf.cloud.api.common.netty.network.protocol
+package dev.slne.surf.cloud.api.common.netty.network.protocol.byte
 
 import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
 import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
 import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
 
+typealias ByteResponsePacket = RespondingNettyPacket<ByteResponse>
+
 @SurfNettyPacket("byte_response", PacketFlow.BIDIRECTIONAL)
-class ByteResponse(val value: Byte) : ResponseNettyPacket() {
-    companion object {
+class ByteResponse(override val value: Byte) : ResponseNettyPacket(), CommonResponseType<Byte> {
+    companion object : CommonResponseTypeFactory<ByteResponse, Byte> {
         val STREAM_CODEC = packetCodec(ByteResponse::write, ::ByteResponse)
+
+        override fun create(value: Byte): ByteResponse {
+            return ByteResponse(value)
+        }
     }
 
     private constructor(buf: SurfByteBuf) : this(buf.readByte())
@@ -19,7 +28,4 @@ class ByteResponse(val value: Byte) : ResponseNettyPacket() {
     }
 
     operator fun component1() = value
-}
-
-fun RespondingNettyPacket<ByteResponse>.respond(value: Byte) =
-    respond(ByteResponse(value))
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/byte/OptionalByteArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/byte/OptionalByteArrayResponse.kt
new file mode 100644
index 00000000..baebbab1
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/byte/OptionalByteArrayResponse.kt
@@ -0,0 +1,38 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.byte
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.network.protocol.respond
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+import it.unimi.dsi.fastutil.bytes.ByteCollection
+
+typealias OptionalByteArrayResponsePacket = RespondingNettyPacket<OptionalByteArrayResponse>
+
+@SurfNettyPacket("optional_byte_array_response", PacketFlow.BIDIRECTIONAL)
+class OptionalByteArrayResponse(override val value: ByteArray?) : ResponseNettyPacket(),
+    CommonResponseType<ByteArray?> {
+    companion object : CommonResponseTypeFactory<OptionalByteArrayResponse, ByteArray?> {
+        val STREAM_CODEC =
+            packetCodec(OptionalByteArrayResponse::write, ::OptionalByteArrayResponse)
+
+        override fun create(value: ByteArray?): OptionalByteArrayResponse {
+            return OptionalByteArrayResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readNullable { it.readByteArray() })
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeNullable(value) { buf, value -> buf.writeByteArray(value) }
+    }
+
+    operator fun component1() = value
+}
+
+fun OptionalByteArrayResponsePacket.respond(value: ByteCollection?) =
+    respond(value?.toByteArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/byte/OptionalByteResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/byte/OptionalByteResponse.kt
new file mode 100644
index 00000000..8cdcdda7
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/byte/OptionalByteResponse.kt
@@ -0,0 +1,32 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.byte
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+
+typealias OptionalByteResponsePacket = RespondingNettyPacket<OptionalByteResponse>
+
+@SurfNettyPacket("optional_byte_response", PacketFlow.BIDIRECTIONAL)
+class OptionalByteResponse(override val value: Byte?) : ResponseNettyPacket(),
+    CommonResponseType<Byte?> {
+    companion object : CommonResponseTypeFactory<OptionalByteResponse, Byte?> {
+        val STREAM_CODEC = packetCodec(OptionalByteResponse::write, ::OptionalByteResponse)
+
+        override fun create(value: Byte?): OptionalByteResponse {
+            return OptionalByteResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readNullableByte())
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeNullable(value)
+    }
+
+    operator fun component1() = value
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/CharArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/char/CharArrayResponse.kt
similarity index 52%
rename from surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/CharArrayResponse.kt
rename to surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/char/CharArrayResponse.kt
index 0cdf1eea..dc548a90 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/CharArrayResponse.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/char/CharArrayResponse.kt
@@ -1,21 +1,31 @@
-package dev.slne.surf.cloud.api.common.netty.network.protocol
+package dev.slne.surf.cloud.api.common.netty.network.protocol.char
 
 import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.network.protocol.respond
 import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
 import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
 import it.unimi.dsi.fastutil.chars.CharCollection
 
+typealias CharArrayResponsePacket = RespondingNettyPacket<CharArrayResponse>
+
 /**
  * A Netty packet that represents a response containing a character array.
  *
  * @property value The character array being transmitted in the response.
  */
 @SurfNettyPacket("char_array_response", PacketFlow.BIDIRECTIONAL)
-class CharArrayResponse(val value: CharArray) : ResponseNettyPacket() {
-    companion object {
+class CharArrayResponse(override val value: CharArray) : ResponseNettyPacket(),
+    CommonResponseType<CharArray> {
+    companion object : CommonResponseTypeFactory<CharArrayResponse, CharArray> {
         val STREAM_CODEC = packetCodec(CharArrayResponse::write, ::CharArrayResponse)
+        override fun create(value: CharArray): CharArrayResponse {
+            return CharArrayResponse(value)
+        }
     }
 
     private constructor(buf: SurfByteBuf) : this(buf.readCharArray())
@@ -27,8 +37,5 @@ class CharArrayResponse(val value: CharArray) : ResponseNettyPacket() {
     operator fun component1() = value
 }
 
-fun RespondingNettyPacket<CharArrayResponse>.respond(value: CharArray) =
-    respond(CharArrayResponse(value))
-
-fun RespondingNettyPacket<CharArrayResponse>.respond(value: CharCollection) =
+fun CharArrayResponsePacket.respond(value: CharCollection) =
     respond(value.toCharArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/CharResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/char/CharResponse.kt
similarity index 50%
rename from surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/CharResponse.kt
rename to surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/char/CharResponse.kt
index c88a76c7..2298d7d4 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/CharResponse.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/char/CharResponse.kt
@@ -1,15 +1,23 @@
-package dev.slne.surf.cloud.api.common.netty.network.protocol
+package dev.slne.surf.cloud.api.common.netty.network.protocol.char
 
 import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
 import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
 import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
 
+typealias CharResponsePacket = RespondingNettyPacket<CharResponse>
+
 @SurfNettyPacket("char_response", PacketFlow.BIDIRECTIONAL)
-class CharResponse(val value: Char) : ResponseNettyPacket() {
-    companion object {
+class CharResponse(override val value: Char) : ResponseNettyPacket(), CommonResponseType<Char> {
+    companion object : CommonResponseTypeFactory<CharResponse, Char> {
         val STREAM_CODEC = packetCodec(CharResponse::write, ::CharResponse)
+        override fun create(value: Char): CharResponse {
+            return CharResponse(value)
+        }
     }
 
     private constructor(buf: SurfByteBuf) : this(buf.readChar())
@@ -19,7 +27,4 @@ class CharResponse(val value: Char) : ResponseNettyPacket() {
     }
 
     operator fun component1() = value
-}
-
-fun RespondingNettyPacket<CharResponse>.respond(value: Char) =
-    respond(CharResponse(value))
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/char/OptionalCharArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/char/OptionalCharArrayResponse.kt
new file mode 100644
index 00000000..8a45e787
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/char/OptionalCharArrayResponse.kt
@@ -0,0 +1,41 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.char
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.network.protocol.respond
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+import it.unimi.dsi.fastutil.chars.CharCollection
+
+typealias OptionalCharArrayResponsePacket = RespondingNettyPacket<OptionalCharArrayResponse>
+
+/**
+ * A Netty packet that represents a response containing a character array.
+ *
+ * @property value The character array being transmitted in the response.
+ */
+@SurfNettyPacket("optional_char_array_response", PacketFlow.BIDIRECTIONAL)
+class OptionalCharArrayResponse(override val value: CharArray?) : ResponseNettyPacket(),
+    CommonResponseType<CharArray?> {
+    companion object : CommonResponseTypeFactory<OptionalCharArrayResponse, CharArray?> {
+        val STREAM_CODEC = packetCodec(OptionalCharArrayResponse::write, ::OptionalCharArrayResponse)
+        override fun create(value: CharArray?): OptionalCharArrayResponse {
+            return OptionalCharArrayResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readNullable { it.readCharArray() })
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeNullable(value) { buf, value -> buf.writeCharArray(value) }
+    }
+
+    operator fun component1() = value
+}
+
+fun OptionalCharArrayResponsePacket.respond(value: CharCollection?) =
+    respond(value?.toCharArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/char/OptionalCharResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/char/OptionalCharResponse.kt
new file mode 100644
index 00000000..fa1e7a8a
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/char/OptionalCharResponse.kt
@@ -0,0 +1,31 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.char
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+
+typealias OptionalCharResponsePacket = RespondingNettyPacket<OptionalCharResponse>
+
+@SurfNettyPacket("optional_char_response", PacketFlow.BIDIRECTIONAL)
+class OptionalCharResponse(override val value: Char?) : ResponseNettyPacket(),
+    CommonResponseType<Char?> {
+    companion object : CommonResponseTypeFactory<OptionalCharResponse, Char?> {
+        val STREAM_CODEC = packetCodec(OptionalCharResponse::write, ::OptionalCharResponse)
+        override fun create(value: Char?): OptionalCharResponse {
+            return OptionalCharResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readNullableChar())
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeNullable(value)
+    }
+
+    operator fun component1() = value
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/component/ComponentArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/component/ComponentArrayResponse.kt
new file mode 100644
index 00000000..076d0cdc
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/component/ComponentArrayResponse.kt
@@ -0,0 +1,34 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.component
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.network.protocol.respond
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+import net.kyori.adventure.text.Component
+
+typealias ComponentArrayResponsePacket = RespondingNettyPacket<ComponentArrayResponse>
+
+@SurfNettyPacket("component_array_response", PacketFlow.BIDIRECTIONAL)
+class ComponentArrayResponse(override val value: Array<Component>) : ResponseNettyPacket(),
+    CommonResponseType<Array<Component>> {
+    companion object : CommonResponseTypeFactory<ComponentArrayResponse, Array<Component>> {
+        val STREAM_CODEC = packetCodec(ComponentArrayResponse::write, ::ComponentArrayResponse)
+        override fun create(value: Array<Component>): ComponentArrayResponse {
+            return ComponentArrayResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readArray { buf.readComponent() })
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeArray(value) { buf, value -> buf.writeComponent(value) }
+    }
+}
+
+fun ComponentArrayResponsePacket.respond(value: Collection<Component>) =
+    respond(value.toTypedArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/component/ComponentResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/component/ComponentResponse.kt
new file mode 100644
index 00000000..5171a358
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/component/ComponentResponse.kt
@@ -0,0 +1,32 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.component
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+import net.kyori.adventure.text.Component
+
+typealias ComponentResponsePacket = RespondingNettyPacket<ComponentResponse>
+
+@SurfNettyPacket("component_response", PacketFlow.BIDIRECTIONAL)
+class ComponentResponse(override val value: Component) : ResponseNettyPacket(),
+    CommonResponseType<Component> {
+    companion object : CommonResponseTypeFactory<ComponentResponse, Component> {
+        val STREAM_CODEC = packetCodec(ComponentResponse::write, ::ComponentResponse)
+        override fun create(value: Component): ComponentResponse {
+            return ComponentResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readComponent())
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeComponent(value)
+    }
+
+    operator fun component1() = value
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/component/OptionalComponentArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/component/OptionalComponentArrayResponse.kt
new file mode 100644
index 00000000..fe9d3419
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/component/OptionalComponentArrayResponse.kt
@@ -0,0 +1,37 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.component
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.network.protocol.respond
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+import net.kyori.adventure.text.Component
+
+typealias OptionalComponentArrayResponsePacket = RespondingNettyPacket<OptionalComponentArrayResponse>
+
+@SurfNettyPacket("optional_component_array_response", PacketFlow.BIDIRECTIONAL)
+class OptionalComponentArrayResponse(override val value: Array<Component>?) : ResponseNettyPacket(),
+    CommonResponseType<Array<Component>?> {
+    companion object :
+        CommonResponseTypeFactory<OptionalComponentArrayResponse, Array<Component>?> {
+        val STREAM_CODEC =
+            packetCodec(OptionalComponentArrayResponse::write, ::OptionalComponentArrayResponse)
+
+        override fun create(value: Array<Component>?): OptionalComponentArrayResponse {
+            return OptionalComponentArrayResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readNullable { it.readArray { it.readComponent() } })
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeNullable(value) { buf, v -> buf.writeArray(v) { buf, v -> buf.writeComponent(v) } }
+    }
+}
+
+fun OptionalComponentArrayResponsePacket.respond(value: Collection<Component>?) =
+    respond(value?.toTypedArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/component/OptionalComponentResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/component/OptionalComponentResponse.kt
new file mode 100644
index 00000000..77b9eff2
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/component/OptionalComponentResponse.kt
@@ -0,0 +1,34 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.component
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+import net.kyori.adventure.text.Component
+
+typealias OptionalComponentResponsePacket = RespondingNettyPacket<OptionalComponentResponse>
+
+@SurfNettyPacket("optional_component_response", PacketFlow.BIDIRECTIONAL)
+class OptionalComponentResponse(override val value: Component?) : ResponseNettyPacket(),
+    CommonResponseType<Component?> {
+    companion object : CommonResponseTypeFactory<OptionalComponentResponse, Component?> {
+        val STREAM_CODEC =
+            packetCodec(OptionalComponentResponse::write, ::OptionalComponentResponse)
+
+        override fun create(value: Component?): OptionalComponentResponse {
+            return OptionalComponentResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readNullable { it.readComponent() })
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeNullable(value) { buf, value -> buf.writeComponent(value) }
+    }
+
+    operator fun component1() = value
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/double/DoubleArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/double/DoubleArrayResponse.kt
new file mode 100644
index 00000000..d427957a
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/double/DoubleArrayResponse.kt
@@ -0,0 +1,36 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.double
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.network.protocol.respond
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+import it.unimi.dsi.fastutil.doubles.DoubleCollection
+
+typealias DoubleArrayResponsePacket = RespondingNettyPacket<DoubleArrayResponse>
+
+@SurfNettyPacket("double_array_response", PacketFlow.BIDIRECTIONAL)
+class DoubleArrayResponse(override val value: DoubleArray) : ResponseNettyPacket(),
+    CommonResponseType<DoubleArray> {
+    companion object : CommonResponseTypeFactory<DoubleArrayResponse, DoubleArray> {
+        val STREAM_CODEC = packetCodec(DoubleArrayResponse::write, ::DoubleArrayResponse)
+        override fun create(value: DoubleArray): DoubleArrayResponse {
+            return DoubleArrayResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readDoubleArray())
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeDoubleArray(value)
+    }
+
+    operator fun component1() = value
+}
+
+fun DoubleArrayResponsePacket.respond(value: DoubleCollection) =
+    respond(value.toDoubleArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/DoubleResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/double/DoubleResponse.kt
similarity index 63%
rename from surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/DoubleResponse.kt
rename to surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/double/DoubleResponse.kt
index 93be2901..e82aa665 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/DoubleResponse.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/double/DoubleResponse.kt
@@ -1,13 +1,17 @@
-package dev.slne.surf.cloud.api.common.netty.network.protocol
+package dev.slne.surf.cloud.api.common.netty.network.protocol.double
 
 import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
 import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
 import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
 
+typealias DoubleResponsePacket = RespondingNettyPacket<DoubleResponse>
+
 @SurfNettyPacket("double_response", PacketFlow.BIDIRECTIONAL)
-class DoubleResponse(val value: Double) : ResponseNettyPacket() {
+class DoubleResponse(override val value: Double) : ResponseNettyPacket(), CommonResponseType<Double> {
     companion object {
         val STREAM_CODEC = packetCodec(DoubleResponse::write, ::DoubleResponse)
     }
@@ -19,7 +23,4 @@ class DoubleResponse(val value: Double) : ResponseNettyPacket() {
     }
 
     operator fun component1() = value
-}
-
-fun RespondingNettyPacket<DoubleResponse>.respond(value: Double) =
-    respond(DoubleResponse(value))
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/double/OptionalDoubleArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/double/OptionalDoubleArrayResponse.kt
new file mode 100644
index 00000000..b02e52f1
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/double/OptionalDoubleArrayResponse.kt
@@ -0,0 +1,38 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.double
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.network.protocol.respond
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+import it.unimi.dsi.fastutil.doubles.DoubleCollection
+
+typealias OptionalDoubleArrayResponsePacket = RespondingNettyPacket<OptionalDoubleArrayResponse>
+
+@SurfNettyPacket("optional_double_array_response", PacketFlow.BIDIRECTIONAL)
+class OptionalDoubleArrayResponse(override val value: DoubleArray?) : ResponseNettyPacket(),
+    CommonResponseType<DoubleArray?> {
+    companion object : CommonResponseTypeFactory<OptionalDoubleArrayResponse, DoubleArray?> {
+        val STREAM_CODEC =
+            packetCodec(OptionalDoubleArrayResponse::write, ::OptionalDoubleArrayResponse)
+
+        override fun create(value: DoubleArray?): OptionalDoubleArrayResponse {
+            return OptionalDoubleArrayResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readNullable { it.readDoubleArray() })
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeNullable(value) { buf, v -> buf.writeDoubleArray(v) }
+    }
+
+    operator fun component1() = value
+}
+
+fun OptionalDoubleArrayResponsePacket.respond(value: DoubleCollection?) =
+    respond(value?.toDoubleArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/double/OptionalDoubleResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/double/OptionalDoubleResponse.kt
new file mode 100644
index 00000000..fe157e11
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/double/OptionalDoubleResponse.kt
@@ -0,0 +1,27 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.double
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+
+typealias OptionalDoubleResponsePacket = RespondingNettyPacket<OptionalDoubleResponse>
+
+@SurfNettyPacket("optional_double_response", PacketFlow.BIDIRECTIONAL)
+class OptionalDoubleResponse(override val value: Double?) : ResponseNettyPacket(),
+    CommonResponseType<Double?> {
+    companion object {
+        val STREAM_CODEC = packetCodec(OptionalDoubleResponse::write, ::OptionalDoubleResponse)
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readNullableDouble())
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeNullable(value)
+    }
+
+    operator fun component1() = value
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/float/FloatArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/float/FloatArrayResponse.kt
new file mode 100644
index 00000000..4d472952
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/float/FloatArrayResponse.kt
@@ -0,0 +1,35 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.float
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.network.protocol.respond
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+import it.unimi.dsi.fastutil.floats.FloatCollection
+
+typealias FloatArrayResponsePacket = RespondingNettyPacket<FloatArrayResponse>
+
+@SurfNettyPacket("float_array_response", PacketFlow.BIDIRECTIONAL)
+class FloatArrayResponse(override val value: FloatArray) : ResponseNettyPacket(),
+    CommonResponseType<FloatArray> {
+    companion object : CommonResponseTypeFactory<FloatArrayResponse, FloatArray> {
+        val STREAM_CODEC = packetCodec(FloatArrayResponse::write, ::FloatArrayResponse)
+        override fun create(value: FloatArray): FloatArrayResponse {
+            return FloatArrayResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readFloatArray())
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeFloatArray(value)
+    }
+
+    operator fun component1() = value
+}
+
+fun FloatArrayResponsePacket.respond(value: FloatCollection) = respond(value.toFloatArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/FloatResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/float/FloatResponse.kt
similarity index 50%
rename from surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/FloatResponse.kt
rename to surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/float/FloatResponse.kt
index f9a8a442..4b0501b9 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/FloatResponse.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/float/FloatResponse.kt
@@ -1,15 +1,23 @@
-package dev.slne.surf.cloud.api.common.netty.network.protocol
+package dev.slne.surf.cloud.api.common.netty.network.protocol.float
 
 import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
 import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
 import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
 
+typealias FloatResponsePacket = RespondingNettyPacket<FloatResponse>
+
 @SurfNettyPacket("float_response", PacketFlow.BIDIRECTIONAL)
-class FloatResponse(val value: Float) : ResponseNettyPacket() {
-    companion object {
+class FloatResponse(override val value: Float) : ResponseNettyPacket(), CommonResponseType<Float> {
+    companion object : CommonResponseTypeFactory<FloatResponse, Float> {
         val STREAM_CODEC = packetCodec(FloatResponse::write, ::FloatResponse)
+        override fun create(value: Float): FloatResponse {
+            return FloatResponse(value)
+        }
     }
 
     private constructor(buf: SurfByteBuf) : this(buf.readFloat())
@@ -19,7 +27,4 @@ class FloatResponse(val value: Float) : ResponseNettyPacket() {
     }
 
     operator fun component1() = value
-}
-
-fun RespondingNettyPacket<FloatResponse>.respond(value: Float) =
-    respond(FloatResponse(value))
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/float/OptionalFloatArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/float/OptionalFloatArrayResponse.kt
new file mode 100644
index 00000000..49f58bc9
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/float/OptionalFloatArrayResponse.kt
@@ -0,0 +1,35 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.float
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.network.protocol.respond
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+import it.unimi.dsi.fastutil.floats.FloatCollection
+
+typealias OptionalFloatArrayResponsePacket = RespondingNettyPacket<OptionalFloatArrayResponse>
+
+@SurfNettyPacket("optional_float_array_response", PacketFlow.BIDIRECTIONAL)
+class OptionalFloatArrayResponse(override val value: FloatArray?) : ResponseNettyPacket(),
+    CommonResponseType<FloatArray?> {
+    companion object : CommonResponseTypeFactory<OptionalFloatArrayResponse, FloatArray?> {
+        val STREAM_CODEC = packetCodec(OptionalFloatArrayResponse::write, ::OptionalFloatArrayResponse)
+        override fun create(value: FloatArray?): OptionalFloatArrayResponse {
+            return OptionalFloatArrayResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readNullable { it.readFloatArray() })
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeNullable(value) { buf, value -> buf.writeFloatArray(value) }
+    }
+
+    operator fun component1() = value
+}
+
+fun OptionalFloatArrayResponsePacket.respond(value: FloatCollection?) = respond(value?.toFloatArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/float/OptionalFloatResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/float/OptionalFloatResponse.kt
new file mode 100644
index 00000000..c2a5be92
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/float/OptionalFloatResponse.kt
@@ -0,0 +1,30 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.float
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+
+typealias OptionalFloatResponsePacket = RespondingNettyPacket<OptionalFloatResponse>
+
+@SurfNettyPacket("optional_float_response", PacketFlow.BIDIRECTIONAL)
+class OptionalFloatResponse(override val value: Float?) : ResponseNettyPacket(), CommonResponseType<Float?> {
+    companion object : CommonResponseTypeFactory<OptionalFloatResponse, Float?> {
+        val STREAM_CODEC = packetCodec(OptionalFloatResponse::write, ::OptionalFloatResponse)
+        override fun create(value: Float?): OptionalFloatResponse {
+            return OptionalFloatResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readNullableFloat())
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeNullable(value)
+    }
+
+    operator fun component1() = value
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/int/IntArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/int/IntArrayResponse.kt
new file mode 100644
index 00000000..dd0a5123
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/int/IntArrayResponse.kt
@@ -0,0 +1,35 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.int
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.network.protocol.respond
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+import it.unimi.dsi.fastutil.ints.IntCollection
+
+typealias IntArrayResponsePacket = RespondingNettyPacket<IntArrayResponse>
+
+@SurfNettyPacket("int_array_response", PacketFlow.BIDIRECTIONAL)
+class IntArrayResponse(override val value: IntArray) : ResponseNettyPacket(),
+    CommonResponseType<IntArray> {
+    companion object : CommonResponseTypeFactory<IntArrayResponse, IntArray> {
+        val STREAM_CODEC = packetCodec(IntArrayResponse::write, ::IntArrayResponse)
+        override fun create(value: IntArray): IntArrayResponse {
+            return IntArrayResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readIntArray())
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeIntArray(value)
+    }
+
+    operator fun component1() = value
+}
+
+fun IntArrayResponsePacket.respond(value: IntCollection) = respond(value.toIntArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/IntResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/int/IntResponse.kt
similarity index 51%
rename from surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/IntResponse.kt
rename to surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/int/IntResponse.kt
index 3651e757..e68ba962 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/IntResponse.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/int/IntResponse.kt
@@ -1,15 +1,23 @@
-package dev.slne.surf.cloud.api.common.netty.network.protocol
+package dev.slne.surf.cloud.api.common.netty.network.protocol.int
 
 import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
 import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
 import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
 
+typealias IntResponsePacket = RespondingNettyPacket<IntResponse>
+
 @SurfNettyPacket("int_response", PacketFlow.BIDIRECTIONAL)
-class IntResponse(val value: Int) : ResponseNettyPacket() {
-    companion object {
+class IntResponse(override val value: Int) : ResponseNettyPacket(), CommonResponseType<Int> {
+    companion object : CommonResponseTypeFactory<IntResponse, Int> {
         val STREAM_CODEC = packetCodec(IntResponse::write, ::IntResponse)
+        override fun create(value: Int): IntResponse {
+            return IntResponse(value)
+        }
     }
 
     private constructor(buf: SurfByteBuf) : this(buf.readVarInt())
@@ -19,7 +27,4 @@ class IntResponse(val value: Int) : ResponseNettyPacket() {
     }
 
     operator fun component1() = value
-}
-
-fun RespondingNettyPacket<IntResponse>.respond(value: Int) =
-    respond(IntResponse(value))
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/int/OptionalIntArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/int/OptionalIntArrayResponse.kt
new file mode 100644
index 00000000..5150b29f
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/int/OptionalIntArrayResponse.kt
@@ -0,0 +1,34 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.int
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.network.protocol.respond
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+import it.unimi.dsi.fastutil.ints.IntCollection
+
+typealias OptionalIntArrayResponsePacket = RespondingNettyPacket<OptionalIntArrayResponse>
+
+@SurfNettyPacket("optional_int_array_response", PacketFlow.BIDIRECTIONAL)
+class OptionalIntArrayResponse(override val value: IntArray?) : ResponseNettyPacket(), CommonResponseType<IntArray?> {
+    companion object : CommonResponseTypeFactory<OptionalIntArrayResponse, IntArray?> {
+        val STREAM_CODEC = packetCodec(OptionalIntArrayResponse::write, ::OptionalIntArrayResponse)
+        override fun create(value: IntArray?): OptionalIntArrayResponse {
+            return OptionalIntArrayResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readNullable { it.readIntArray() })
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeNullable(value) { buf, value -> buf.writeIntArray(value) }
+    }
+
+    operator fun component1() = value
+}
+
+fun OptionalIntArrayResponsePacket.respond(value: IntCollection?) = respond(value?.toIntArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/int/OptionalIntResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/int/OptionalIntResponse.kt
new file mode 100644
index 00000000..e0681bf9
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/int/OptionalIntResponse.kt
@@ -0,0 +1,31 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.int
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+
+typealias OptionalIntResponsePacket = RespondingNettyPacket<OptionalIntResponse>
+
+@SurfNettyPacket("optional_int_response", PacketFlow.BIDIRECTIONAL)
+class OptionalIntResponse(override val value: Int?) : ResponseNettyPacket(),
+    CommonResponseType<Int?> {
+    companion object : CommonResponseTypeFactory<OptionalIntResponse, Int?> {
+        val STREAM_CODEC = packetCodec(OptionalIntResponse::write, ::OptionalIntResponse)
+        override fun create(value: Int?): OptionalIntResponse {
+            return OptionalIntResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readNullableInt())
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeNullable(value)
+    }
+
+    operator fun component1() = value
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/long/LongArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/long/LongArrayResponse.kt
new file mode 100644
index 00000000..839fba32
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/long/LongArrayResponse.kt
@@ -0,0 +1,35 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.long
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.network.protocol.respond
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+import it.unimi.dsi.fastutil.longs.LongCollection
+
+typealias LongArrayResponsePacket = RespondingNettyPacket<LongArrayResponse>
+
+@SurfNettyPacket("long_array_response", PacketFlow.BIDIRECTIONAL)
+class LongArrayResponse(override val value: LongArray) : ResponseNettyPacket(),
+    CommonResponseType<LongArray> {
+    companion object : CommonResponseTypeFactory<LongArrayResponse, LongArray> {
+        val STREAM_CODEC = packetCodec(LongArrayResponse::write, ::LongArrayResponse)
+        override fun create(value: LongArray): LongArrayResponse {
+            return LongArrayResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readLongArray())
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeLongArray(value)
+    }
+
+    operator fun component1() = value
+}
+
+fun LongArrayResponsePacket.respond(value: LongCollection) = respond(value.toLongArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/LongResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/long/LongResponse.kt
similarity index 50%
rename from surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/LongResponse.kt
rename to surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/long/LongResponse.kt
index 42f55bb0..e08254c2 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/LongResponse.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/long/LongResponse.kt
@@ -1,15 +1,23 @@
-package dev.slne.surf.cloud.api.common.netty.network.protocol
+package dev.slne.surf.cloud.api.common.netty.network.protocol.long
 
 import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
 import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
 import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
 
+typealias LongResponsePacket = RespondingNettyPacket<LongResponse>
+
 @SurfNettyPacket("long_response", PacketFlow.BIDIRECTIONAL)
-class LongResponse(val value: Long) : ResponseNettyPacket() {
-    companion object {
+class LongResponse(override val value: Long) : ResponseNettyPacket(), CommonResponseType<Long> {
+    companion object : CommonResponseTypeFactory<LongResponse, Long> {
         val STREAM_CODEC = packetCodec(LongResponse::write, ::LongResponse)
+        override fun create(value: Long): LongResponse {
+            return LongResponse(value)
+        }
     }
 
     private constructor(buf: SurfByteBuf) : this(buf.readLong())
@@ -19,7 +27,4 @@ class LongResponse(val value: Long) : ResponseNettyPacket() {
     }
 
     operator fun component1() = value
-}
-
-fun RespondingNettyPacket<LongResponse>.respond(value: Long) =
-    respond(LongResponse(value))
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/long/OptionalLongArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/long/OptionalLongArrayResponse.kt
new file mode 100644
index 00000000..1e5bebea
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/long/OptionalLongArrayResponse.kt
@@ -0,0 +1,37 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.long
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.network.protocol.respond
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+import it.unimi.dsi.fastutil.longs.LongCollection
+
+typealias OptionalLongArrayResponsePacket = RespondingNettyPacket<OptionalLongArrayResponse>
+
+@SurfNettyPacket("optional_long_array_response", PacketFlow.BIDIRECTIONAL)
+class OptionalLongArrayResponse(override val value: LongArray?) : ResponseNettyPacket(),
+    CommonResponseType<LongArray?> {
+    companion object : CommonResponseTypeFactory<OptionalLongArrayResponse, LongArray?> {
+        val STREAM_CODEC =
+            packetCodec(OptionalLongArrayResponse::write, ::OptionalLongArrayResponse)
+
+        override fun create(value: LongArray?): OptionalLongArrayResponse {
+            return OptionalLongArrayResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readNullable { it.readLongArray() })
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeNullable(value) { buf, value -> buf.writeLongArray(value) }
+    }
+
+    operator fun component1() = value
+}
+
+fun OptionalLongArrayResponsePacket.respond(value: LongCollection?) = respond(value?.toLongArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/long/OptionalLongResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/long/OptionalLongResponse.kt
new file mode 100644
index 00000000..c2f4b326
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/long/OptionalLongResponse.kt
@@ -0,0 +1,31 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.long
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+
+typealias OptionalLongResponsePacket = RespondingNettyPacket<OptionalLongResponse>
+
+@SurfNettyPacket("optional_long_response", PacketFlow.BIDIRECTIONAL)
+class OptionalLongResponse(override val value: Long?) : ResponseNettyPacket(),
+    CommonResponseType<Long?> {
+    companion object : CommonResponseTypeFactory<OptionalLongResponse, Long?> {
+        val STREAM_CODEC = packetCodec(OptionalLongResponse::write, ::OptionalLongResponse)
+        override fun create(value: Long?): OptionalLongResponse {
+            return OptionalLongResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readNullableLong())
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeNullable(value)
+    }
+
+    operator fun component1() = value
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/package-info.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/package-info.kt
index d70283ab..4c81e249 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/package-info.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/package-info.kt
@@ -9,16 +9,16 @@
  *   communication between network nodes.
  *
  * - **Packet Flow**:
- *   All packets are annotated with [SurfNettyPacket], specifying their unique identifier
+ *   All packets are annotated with [dev.slne.surf.cloud.api.common.meta.SurfNettyPacket], specifying their unique identifier
  *   and flow direction, enabling seamless integration with the Netty framework.
  *
  * - **Serialization**:
  *   Packets implement efficient serialization and deserialization mechanisms using
- *   [SurfByteBuf], ensuring minimal overhead during transmission.
+ *   [dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf], ensuring minimal overhead during transmission.
  *
  * ### Extensibility:
  * New packet types can be easily added to support additional data structures or custom
  * requirements. Implement the codec logic for serialization, annotate with
- * [SurfNettyPacket], and register the packet as needed.
+ * [dev.slne.surf.cloud.api.common.meta.SurfNettyPacket], and register the packet as needed.
  */
 package dev.slne.surf.cloud.api.common.netty.network.protocol
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/short/OptionalShortArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/short/OptionalShortArrayResponse.kt
new file mode 100644
index 00000000..1d775b3f
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/short/OptionalShortArrayResponse.kt
@@ -0,0 +1,38 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.short
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.network.protocol.respond
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+import it.unimi.dsi.fastutil.shorts.ShortCollection
+
+typealias OptionalShortArrayResponsePacket = RespondingNettyPacket<OptionalShortArrayResponse>
+
+@SurfNettyPacket("optional_short_array_response", PacketFlow.BIDIRECTIONAL)
+class OptionalShortArrayResponse(override val value: ShortArray?) : ResponseNettyPacket(),
+    CommonResponseType<ShortArray?> {
+    companion object : CommonResponseTypeFactory<OptionalShortArrayResponse, ShortArray?> {
+        val STREAM_CODEC =
+            packetCodec(OptionalShortArrayResponse::write, ::OptionalShortArrayResponse)
+
+        override fun create(value: ShortArray?): OptionalShortArrayResponse {
+            return OptionalShortArrayResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readNullable { it.readShortArray() })
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeNullable(value) { buf, value -> buf.writeShortArray(value) }
+    }
+
+    operator fun component1() = value
+}
+
+fun OptionalShortArrayResponsePacket.respond(value: ShortCollection?) =
+    respond(value?.toShortArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/short/OptionalShortResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/short/OptionalShortResponse.kt
new file mode 100644
index 00000000..f0988723
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/short/OptionalShortResponse.kt
@@ -0,0 +1,31 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.short
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+
+typealias OptionalShortResponsePacket = RespondingNettyPacket<OptionalShortResponse>
+
+@SurfNettyPacket("optional_short_response", PacketFlow.BIDIRECTIONAL)
+class OptionalShortResponse(override val value: Short?) : ResponseNettyPacket(),
+    CommonResponseType<Short?> {
+    companion object : CommonResponseTypeFactory<OptionalShortResponse, Short?> {
+        val STREAM_CODEC = packetCodec(OptionalShortResponse::write, ::OptionalShortResponse)
+        override fun create(value: Short?): OptionalShortResponse {
+            return OptionalShortResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readNullable { it.readShort() })
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeNullable(value)
+    }
+
+    operator fun component1() = value
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/short/ShortArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/short/ShortArrayResponse.kt
new file mode 100644
index 00000000..f4813d40
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/short/ShortArrayResponse.kt
@@ -0,0 +1,35 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.short
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.network.protocol.respond
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+import it.unimi.dsi.fastutil.shorts.ShortCollection
+
+typealias ShortArrayResponsePacket = RespondingNettyPacket<ShortArrayResponse>
+
+@SurfNettyPacket("short_array_response", PacketFlow.BIDIRECTIONAL)
+class ShortArrayResponse(override val value: ShortArray) : ResponseNettyPacket(),
+    CommonResponseType<ShortArray> {
+    companion object : CommonResponseTypeFactory<ShortArrayResponse, ShortArray> {
+        val STREAM_CODEC = packetCodec(ShortArrayResponse::write, ::ShortArrayResponse)
+        override fun create(value: ShortArray): ShortArrayResponse {
+            return ShortArrayResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readShortArray())
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeShortArray(value)
+    }
+
+    operator fun component1() = value
+}
+
+fun ShortArrayResponsePacket.respond(value: ShortCollection) = respond(value.toShortArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/ShortResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/short/ShortResponse.kt
similarity index 50%
rename from surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/ShortResponse.kt
rename to surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/short/ShortResponse.kt
index 5537630f..504402f9 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/ShortResponse.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/short/ShortResponse.kt
@@ -1,15 +1,23 @@
-package dev.slne.surf.cloud.api.common.netty.network.protocol
+package dev.slne.surf.cloud.api.common.netty.network.protocol.short
 
 import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
 import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
 import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
 
+typealias ShortResponsePacket = RespondingNettyPacket<ShortResponse>
+
 @SurfNettyPacket("short_response", PacketFlow.BIDIRECTIONAL)
-class ShortResponse(val value: Short) : ResponseNettyPacket() {
-    companion object {
+class ShortResponse(override val value: Short) : ResponseNettyPacket(), CommonResponseType<Short> {
+    companion object : CommonResponseTypeFactory<ShortResponse, Short> {
         val STREAM_CODEC = packetCodec(ShortResponse::write, ::ShortResponse)
+        override fun create(value: Short): ShortResponse {
+            return ShortResponse(value)
+        }
     }
 
     private constructor(buf: SurfByteBuf) : this(buf.readShort())
@@ -19,7 +27,4 @@ class ShortResponse(val value: Short) : ResponseNettyPacket() {
     }
 
     operator fun component1() = value
-}
-
-fun RespondingNettyPacket<ShortResponse>.respond(value: Short) =
-    respond(ShortResponse(value))
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/string/OptionalStringArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/string/OptionalStringArrayResponse.kt
new file mode 100644
index 00000000..b9a92bca
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/string/OptionalStringArrayResponse.kt
@@ -0,0 +1,37 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.string
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.network.protocol.respond
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+
+typealias OptionalStringArrayResponsePacket = RespondingNettyPacket<OptionalStringArrayResponse>
+
+@SurfNettyPacket("optional_string_array_response", PacketFlow.BIDIRECTIONAL)
+class OptionalStringArrayResponse(override val value: Array<String>?) : ResponseNettyPacket(),
+    CommonResponseType<Array<String>?> {
+    companion object : CommonResponseTypeFactory<OptionalStringArrayResponse, Array<String>?> {
+        val STREAM_CODEC =
+            packetCodec(OptionalStringArrayResponse::write, ::OptionalStringArrayResponse)
+
+        override fun create(value: Array<String>?): OptionalStringArrayResponse {
+            return OptionalStringArrayResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readNullable { it.readStringArray() })
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeNullable(value) { buf, v -> buf.writeStringArray(v) }
+    }
+
+    operator fun component1() = value
+}
+
+fun OptionalStringArrayResponsePacket.respond(value: Collection<String>) =
+    respond(value.toTypedArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/string/OptionalStringResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/string/OptionalStringResponse.kt
new file mode 100644
index 00000000..2b314d38
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/string/OptionalStringResponse.kt
@@ -0,0 +1,31 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.string
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+
+typealias OptionalStringResponsePacket = RespondingNettyPacket<OptionalStringResponse>
+
+@SurfNettyPacket("optional_string_response", PacketFlow.BIDIRECTIONAL)
+class OptionalStringResponse(override val value: String?) : ResponseNettyPacket(),
+    CommonResponseType<String?> {
+    companion object : CommonResponseTypeFactory<OptionalStringResponse, String?> {
+        val STREAM_CODEC = packetCodec(OptionalStringResponse::write, ::OptionalStringResponse)
+        override fun create(value: String?): OptionalStringResponse {
+            return OptionalStringResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readNullableString())
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeNullable(value)
+    }
+
+    operator fun component1() = value
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/string/StringArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/string/StringArrayResponse.kt
new file mode 100644
index 00000000..b1f702ff
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/string/StringArrayResponse.kt
@@ -0,0 +1,34 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.string
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.network.protocol.respond
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+
+typealias StringArrayResponsePacket = RespondingNettyPacket<StringArrayResponse>
+
+@SurfNettyPacket("string_array_response", PacketFlow.BIDIRECTIONAL)
+class StringArrayResponse(override val value: Array<String>) : ResponseNettyPacket(),
+    CommonResponseType<Array<String>> {
+    companion object : CommonResponseTypeFactory<StringArrayResponse, Array<String>> {
+        val STREAM_CODEC = packetCodec(StringArrayResponse::write, ::StringArrayResponse)
+        override fun create(value: Array<String>): StringArrayResponse {
+            return StringArrayResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readStringArray())
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeStringArray(value)
+    }
+
+    operator fun component1() = value
+}
+
+fun StringArrayResponsePacket.respond(value: Collection<String>) = respond(value.toTypedArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/string/StringResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/string/StringResponse.kt
new file mode 100644
index 00000000..e4ebd34b
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/string/StringResponse.kt
@@ -0,0 +1,31 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.string
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+
+typealias StringResponsePacket = RespondingNettyPacket<StringResponse>
+
+@SurfNettyPacket("string_response", PacketFlow.BIDIRECTIONAL)
+class StringResponse(override val value: String) : ResponseNettyPacket(),
+    CommonResponseType<String> {
+    companion object : CommonResponseTypeFactory<StringResponse, String> {
+        val STREAM_CODEC = packetCodec(StringResponse::write, ::StringResponse)
+        override fun create(value: String): StringResponse {
+            return StringResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readUtf())
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeUtf(value)
+    }
+
+    operator fun component1() = value
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/uuid/OptionalUUIDArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/uuid/OptionalUUIDArrayResponse.kt
new file mode 100644
index 00000000..c87d8cc2
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/uuid/OptionalUUIDArrayResponse.kt
@@ -0,0 +1,38 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.uuid
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.network.protocol.respond
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+import java.util.*
+
+typealias OptionalUUIDArrayResponsePacket = RespondingNettyPacket<OptionalUUIDArrayResponse>
+
+@SurfNettyPacket("optional_uuid_array_response", PacketFlow.BIDIRECTIONAL)
+class OptionalUUIDArrayResponse(override val value: Array<UUID>?) : ResponseNettyPacket(),
+    CommonResponseType<Array<UUID>?> {
+    companion object : CommonResponseTypeFactory<OptionalUUIDArrayResponse, Array<UUID>?> {
+        val STREAM_CODEC =
+            packetCodec(OptionalUUIDArrayResponse::write, ::OptionalUUIDArrayResponse)
+
+        override fun create(value: Array<UUID>?): OptionalUUIDArrayResponse {
+            return OptionalUUIDArrayResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readNullable { it.readUuidArray() })
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeNullable(value) { buf, value -> buf.writeUuidArray(value) }
+    }
+
+    operator fun component1() = value
+}
+
+fun OptionalUUIDArrayResponsePacket.respond(value: Collection<UUID>?) =
+    respond(value?.toTypedArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/uuid/OptionalUUIDResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/uuid/OptionalUUIDResponse.kt
new file mode 100644
index 00000000..8d59cac3
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/uuid/OptionalUUIDResponse.kt
@@ -0,0 +1,32 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.uuid
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+import java.util.*
+
+typealias OptionalUUIDResponsePacket = RespondingNettyPacket<OptionalUUIDResponse>
+
+@SurfNettyPacket("optional_uuid_response", PacketFlow.BIDIRECTIONAL)
+class OptionalUUIDResponse(override val value: UUID?) : ResponseNettyPacket(),
+    CommonResponseType<UUID?> {
+    companion object : CommonResponseTypeFactory<OptionalUUIDResponse, UUID?> {
+        val STREAM_CODEC = packetCodec(OptionalUUIDResponse::write, ::OptionalUUIDResponse)
+        override fun create(value: UUID?): OptionalUUIDResponse {
+            return OptionalUUIDResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readNullableUuid())
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeNullable(value)
+    }
+
+    operator fun component1() = value
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/uuid/UUIDArrayResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/uuid/UUIDArrayResponse.kt
new file mode 100644
index 00000000..36bfd6fe
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/uuid/UUIDArrayResponse.kt
@@ -0,0 +1,35 @@
+package dev.slne.surf.cloud.api.common.netty.network.protocol.uuid
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.network.protocol.respond
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+import java.util.*
+
+typealias UUIDArrayResponsePacket = RespondingNettyPacket<UUIDArrayResponse>
+
+@SurfNettyPacket("uuid_array_response", PacketFlow.BIDIRECTIONAL)
+class UUIDArrayResponse(override val value: Array<UUID>) : ResponseNettyPacket(),
+    CommonResponseType<Array<UUID>> {
+    companion object : CommonResponseTypeFactory<UUIDArrayResponse, Array<UUID>> {
+        val STREAM_CODEC = packetCodec(UUIDArrayResponse::write, ::UUIDArrayResponse)
+        override fun create(value: Array<UUID>): UUIDArrayResponse {
+            return UUIDArrayResponse(value)
+        }
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readUuidArray())
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeUuidArray(value)
+    }
+
+    operator fun component1() = value
+}
+
+fun UUIDArrayResponsePacket.respond(value: Collection<UUID>) = respond(value.toTypedArray())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/UUIDResponse.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/uuid/UUIDResponse.kt
similarity index 51%
rename from surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/UUIDResponse.kt
rename to surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/uuid/UUIDResponse.kt
index fdacfb71..5dbe4d8b 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/UUIDResponse.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/network/protocol/uuid/UUIDResponse.kt
@@ -1,16 +1,24 @@
-package dev.slne.surf.cloud.api.common.netty.network.protocol
+package dev.slne.surf.cloud.api.common.netty.network.protocol.uuid
 
 import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseType
+import dev.slne.surf.cloud.api.common.netty.network.protocol.CommonResponseTypeFactory
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
 import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
 import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
 import java.util.*
 
+typealias UUIDResponsePacket = RespondingNettyPacket<UUIDResponse>
+
 @SurfNettyPacket("uuid_response", PacketFlow.BIDIRECTIONAL)
-class UUIDResponse(val value: UUID) : ResponseNettyPacket() {
-    companion object {
+class UUIDResponse(override val value: UUID) : ResponseNettyPacket(), CommonResponseType<UUID> {
+    companion object : CommonResponseTypeFactory<UUIDResponse, UUID> {
         val STREAM_CODEC = packetCodec(UUIDResponse::write, ::UUIDResponse)
+        override fun create(value: UUID): UUIDResponse {
+            return UUIDResponse(value)
+        }
     }
 
     private constructor(buf: SurfByteBuf) : this(buf.readUuid())
@@ -20,7 +28,4 @@ class UUIDResponse(val value: UUID) : ResponseNettyPacket() {
     }
 
     operator fun component1() = value
-}
-
-fun RespondingNettyPacket<UUIDResponse>.respond(value: UUID) =
-    respond(UUIDResponse(value))
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/packet/NettyPacket.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/packet/NettyPacket.kt
index ff9bb04c..a1090290 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/packet/NettyPacket.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/packet/NettyPacket.kt
@@ -3,7 +3,7 @@ package dev.slne.surf.cloud.api.common.netty.packet
 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.util.InternalApi
+import dev.slne.surf.cloud.api.common.util.annotation.InternalApi
 import io.netty.buffer.ByteBuf
 import org.apache.commons.lang3.builder.ToStringBuilder
 import java.util.concurrent.ThreadLocalRandom
@@ -118,7 +118,6 @@ abstract class NettyPacket {
         return result
     }
 
-    @OptIn(InternalApi::class)
     override fun toString(): String = runCatching {
         ToStringBuilder.reflectionToString(this).toString()
     }.getOrElse { "NettyPacket(id=$id, flow=$flow, skippable=$skippable, extraPackets=$extraPackets, terminal=$terminal, sessionId=$sessionId, handled=$handled)" }
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/packet/NettyPacketInfo.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/packet/NettyPacketInfo.kt
new file mode 100644
index 00000000..6a023a30
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/packet/NettyPacketInfo.kt
@@ -0,0 +1,6 @@
+package dev.slne.surf.cloud.api.common.netty.packet
+
+import dev.slne.surf.cloud.api.common.netty.network.Connection
+
+@JvmInline
+value class NettyPacketInfo(val origin: Connection)
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket.kt
index d29a5620..d79a9fb6 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/packet/RespondingNettyPacket.kt
@@ -3,7 +3,7 @@ package dev.slne.surf.cloud.api.common.netty.packet
 import dev.slne.surf.cloud.api.common.netty.network.Connection
 import dev.slne.surf.cloud.api.common.netty.protocol.buffer.readUuid
 import dev.slne.surf.cloud.api.common.netty.protocol.buffer.writeUuid
-import dev.slne.surf.cloud.api.common.util.InternalApi
+import dev.slne.surf.cloud.api.common.util.annotation.InternalApi
 import io.netty.buffer.ByteBuf
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.withTimeout
@@ -50,7 +50,6 @@ abstract class RespondingNettyPacket<P : ResponseNettyPacket> : NettyPacket() {
      * @param timeout The timeout duration. Defaults to [DEFAULT_TIMEOUT].
      * @return The response packet, or `null` if the timeout elapses.
      */
-    @OptIn(InternalApi::class)
     suspend fun fireAndAwait(connection: Connection, timeout: Duration = DEFAULT_TIMEOUT): P? =
         withTimeoutOrNull(timeout) {
             connection.send(this@RespondingNettyPacket)
@@ -73,7 +72,6 @@ abstract class RespondingNettyPacket<P : ResponseNettyPacket> : NettyPacket() {
      * @param timeout The timeout duration. Defaults to [DEFAULT_TIMEOUT].
      * @return The response packet.
      */
-    @OptIn(InternalApi::class)
     suspend fun fireAndAwaitOrThrow(
         connection: Connection,
         timeout: Duration = DEFAULT_TIMEOUT
@@ -97,7 +95,6 @@ abstract class RespondingNettyPacket<P : ResponseNettyPacket> : NettyPacket() {
      *
      * @param packet The response packet to send.
      */
-    @OptIn(InternalApi::class)
     fun respond(packet: P) {
         packet.responseTo = uniqueSessionId
             ?: error("Responding packet has no session id. Are you sure it was sent?")
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket.kt
index 249e40ea..f4593883 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/packet/ResponseNettyPacket.kt
@@ -2,9 +2,8 @@ package dev.slne.surf.cloud.api.common.netty.packet
 
 import dev.slne.surf.cloud.api.common.netty.protocol.buffer.readUuid
 import dev.slne.surf.cloud.api.common.netty.protocol.buffer.writeUuid
-import dev.slne.surf.cloud.api.common.util.InternalApi
+import dev.slne.surf.cloud.api.common.util.annotation.InternalApi
 import io.netty.buffer.ByteBuf
-import org.jetbrains.annotations.ApiStatus.Internal
 import java.util.*
 
 /**
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/packet/packet-extension.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/packet/packet-extension.kt
index 86a9120d..c20890cf 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/packet/packet-extension.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/packet/packet-extension.kt
@@ -44,7 +44,7 @@ fun KClass<out NettyPacket>.getPacketMetaOrNull() =
  * @return The [SurfNettyPacket] metadata annotation.
  */
 fun KClass<out NettyPacket>.getPacketMeta() = getPacketMetaOrNull()
-    ?: error("NettyPacket class must be annotated with SurfNettyPacket")
+    ?: error("NettyPacket class '$qualifiedName' must be annotated with @${SurfNettyPacket::class.simpleName}")
 
 /**
  * Retrieves the metadata for a [NettyPacket] class from a [Class] reference.
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf.kt
index 2b29d636..5785b81f 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/protocol/buffer/SurfByteBuf.kt
@@ -17,6 +17,7 @@ import dev.slne.surf.cloud.api.common.netty.protocol.buffer.types.VarLong
 import dev.slne.surf.cloud.api.common.util.codec.ExtraCodecs
 import dev.slne.surf.cloud.api.common.util.createUnresolvedInetSocketAddress
 import dev.slne.surf.cloud.api.common.util.fromJson
+import dev.slne.surf.surfapi.core.api.util.getCallerClass
 import io.netty.buffer.ByteBuf
 import io.netty.handler.codec.DecoderException
 import io.netty.handler.codec.EncoderException
@@ -27,14 +28,16 @@ import net.kyori.adventure.sound.Sound
 import net.kyori.adventure.text.Component
 import net.querz.nbt.tag.CompoundTag
 import java.io.*
+import java.net.Inet4Address
 import java.net.InetSocketAddress
 import java.net.URI
+import java.time.Instant
+import java.time.ZoneId
+import java.time.ZonedDateTime
 import java.util.*
 import java.util.function.Consumer
-import kotlin.Throws
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.contract
-import kotlin.experimental.and
 import kotlin.reflect.KClass
 
 private const val NUMBER_BYTE: Byte = 0
@@ -468,17 +471,17 @@ open class SurfByteBuf(source: ByteBuf) : WrappedByteBuf(source) {
         }
 
         fun readUuid(buf: ByteBuf) = UUID(buf.readLong(), buf.readLong())
-        fun readBitSet(buf: ByteBuf) = BitSet.valueOf(readLongArray(buf))
+        fun readBitSet(buf: ByteBuf): BitSet = BitSet.valueOf(readLongArray(buf))
         fun writeBitSet(buf: ByteBuf, bitSet: BitSet) =
             writeLongArray(buf, bitSet.toLongArray())
 
-        fun readFixedBitSet(buf: ByteBuf, size: Int) =
+        fun readFixedBitSet(buf: ByteBuf, size: Int): BitSet =
             ByteArray(positiveCeilDiv(size, Byte.SIZE_BITS)).run {
                 buf.readBytes(this)
                 BitSet.valueOf(this)
             }
 
-        fun writeFixedBitSet(buf: ByteBuf, bitSet: BitSet, size: Int) =
+        fun writeFixedBitSet(buf: ByteBuf, bitSet: BitSet, size: Int): ByteBuf =
             bitSet.length().let { bitSetSize ->
                 checkEncoded(bitSetSize <= size) { "BitSet is larger than expected size ($bitSetSize>$size)" }
                 buf.writeBytes(bitSet.toByteArray().copyOf(positiveCeilDiv(size, Byte.SIZE_BITS)))
@@ -562,12 +565,11 @@ open class SurfByteBuf(source: ByteBuf) : WrappedByteBuf(source) {
             buf: B,
             decodeFactory: DecodeLongFactory<in B> =
                 DecodeLongFactory { buf -> buf.readLong() }
-        ) =
-            if (buf.readBoolean()) OptionalLong.of(decodeFactory.decodeLong(buf)) else OptionalLong.empty()
+        ): OptionalLong = if (buf.readBoolean()) OptionalLong.of(decodeFactory.decodeLong(buf)) else OptionalLong.empty()
 
 
         @Deprecated("Use codec instead")
-        fun <B : ByteBuf> writeSerializable(buf: B, serializable: Serializable) =
+        fun <B : ByteBuf> writeSerializable(buf: B, serializable: Serializable): ByteBuf =
             ByteArrayOutputStream().use { bout ->
                 ObjectOutputStream(bout).use { out ->
                     try {
@@ -623,11 +625,42 @@ open class SurfByteBuf(source: ByteBuf) : WrappedByteBuf(source) {
         fun <B : ByteBuf> readInetSocketAddress(buf: B) =
             createUnresolvedInetSocketAddress(readUtf(buf), buf.readVarInt())
 
-        fun <B: ByteBuf> writeCompoundTag(buf: B, tag: CompoundTag) {
+        fun <B : ByteBuf> writeCompoundTag(buf: B, tag: CompoundTag) {
             ExtraCodecs.COMPOUND_TAG_CODEC.encode(buf, tag)
         }
 
-        fun <B: ByteBuf> readCompoundTag(buf: B) = ExtraCodecs.COMPOUND_TAG_CODEC.decode(buf)
+        fun <B : ByteBuf> readCompoundTag(buf: B) = ExtraCodecs.COMPOUND_TAG_CODEC.decode(buf)
+
+        fun <B: ByteBuf> writeZonedDateTime(buf: B, time: ZonedDateTime) {
+            buf.writeLong(time.toInstant().toEpochMilli())
+            writeUtf(buf, time.zone.id)
+        }
+
+        fun <B: ByteBuf> readZonedDateTime(buf: B): ZonedDateTime {
+            val epoch = buf.readLong()
+            val zone = readUtf(buf)
+            return ZonedDateTime.ofInstant(Instant.ofEpochMilli(epoch), ZoneId.of(zone))
+        }
+
+        fun <B : ByteBuf> writeInet4Address(buf: B, address: Inet4Address) {
+            writeByteArray(buf, address.address)
+        }
+
+        fun <B : ByteBuf> readInet4Address(buf: B): Inet4Address {
+            val address = readByteArray(buf)
+            return Inet4Address.getByAddress(address) as Inet4Address
+        }
+
+        fun <B : ByteBuf> writeSingleton(buf: B, singleton: Any) {
+            require(singleton::class.objectInstance != null) { "Object must be a singleton" }
+            writeUtf(buf, singleton::class.qualifiedName!!)
+        }
+
+        fun <B : ByteBuf> readSingleton(buf: B, classLoader: ClassLoader): Any {
+            val className = readUtf(buf)
+            return Class.forName(className, true, classLoader).kotlin.objectInstance
+                ?: throw DecoderException("Failed to read singleton: $className")
+        }
     }
 
 
@@ -797,6 +830,12 @@ open class SurfByteBuf(source: ByteBuf) : WrappedByteBuf(source) {
     fun readInetSocketAddress() = readInetSocketAddress(this)
     fun writeCompoundTag(tag: CompoundTag) = writeCompoundTag(this, tag)
     fun readCompoundTag() = readCompoundTag(this)
+    fun writeZonedDateTime(time: ZonedDateTime) = writeZonedDateTime(this, time)
+    fun readZonedDateTime() = readZonedDateTime(this)
+    fun writeInet4Address(address: Inet4Address) = writeInet4Address(this, address)
+    fun readInet4Address() = readInet4Address(this)
+    fun writeSingleton(singleton: Any) = writeSingleton(this, singleton)
+    fun readSingleton(classLoader: ClassLoader) = readSingleton(this, classLoader)
     // @formatter:on
 // endregion
 
@@ -1020,5 +1059,33 @@ fun <B : ByteBuf> B.writeInetSocketAddress(address: InetSocketAddress) =
 fun <B : ByteBuf> B.readCompoundTag() = SurfByteBuf.readCompoundTag(this)
 fun <B : ByteBuf> B.writeCompoundTag(tag: CompoundTag) = SurfByteBuf.writeCompoundTag(this, tag)
 
+fun <B : ByteBuf> B.readZonedDateTime() = SurfByteBuf.readZonedDateTime(this)
+fun <B : ByteBuf> B.writeZonedDateTime(time: ZonedDateTime) = SurfByteBuf.writeZonedDateTime(this, time)
+
+fun <B : ByteBuf> B.readInet4Address() = SurfByteBuf.readInet4Address(this)
+fun <B : ByteBuf> B.writeInet4Address(address: Inet4Address) = SurfByteBuf.writeInet4Address(this, address)
+
+fun <B : ByteBuf> B.readSingleton(classLoader: ClassLoader) = SurfByteBuf.readSingleton(this, classLoader)
+fun <B : ByteBuf> B.writeSingleton(singleton: Any) = SurfByteBuf.writeSingleton(this, singleton)
+
 fun ByteBuf.wrap() = SurfByteBuf(this)
-// endregion
\ No newline at end of file
+// endregion
+
+/**
+ * Reads a byte array from the buffer.
+ * If the buffer has an array, it will return the array directly.
+ * Otherwise, it will copy the bytes into a new array.
+ *
+ * @return The byte array
+ * @receiver The buffer
+ */
+fun ByteBuf.toByteArraySafe(): ByteArray {
+    if (hasArray()) {
+        return array()
+    }
+
+    val bytes = ByteArray(readableBytes())
+    getBytes(readerIndex(), bytes)
+
+    return bytes
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/CloudPlayer.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/CloudPlayer.kt
index 22a57877..ff974e7c 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/CloudPlayer.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/CloudPlayer.kt
@@ -1,12 +1,13 @@
 package dev.slne.surf.cloud.api.common.player
 
 import dev.slne.surf.cloud.api.common.player.ppdc.PersistentPlayerDataContainer
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportCause
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportFlag
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportLocation
 import dev.slne.surf.cloud.api.common.server.CloudServer
-import dev.slne.surf.cloud.api.common.util.position.FineLocation
-import dev.slne.surf.cloud.api.common.util.position.FineTeleportCause
-import dev.slne.surf.cloud.api.common.util.position.FineTeleportFlag
 import net.kyori.adventure.audience.Audience
 import net.kyori.adventure.text.Component
+import java.net.Inet4Address
 import java.util.*
 
 /**
@@ -16,17 +17,14 @@ import java.util.*
  * server connection management, and advanced teleportation utilities. As an [Audience],
  * it enables sending messages or components to the player.
  */
-interface CloudPlayer : Audience { // TODO: conversation but done correctly?
-    /**
-     * The unique identifier (UUID) of the player.
-     */
-    val uuid: UUID
+interface CloudPlayer : Audience, OfflineCloudPlayer { // TODO: conversation but done correctly?
+    override suspend fun latestIpAddress(): Inet4Address
+    override suspend fun lastServerRaw(): String
 
     /**
      * Whether the player is currently connected to a proxy server.
      */
     val connectedToProxy: Boolean
-
     /**
      * Whether the player is currently connected to a real server.
      */
@@ -37,13 +35,6 @@ interface CloudPlayer : Audience { // TODO: conversation but done correctly?
      */
     val connected get() = connectedToProxy || connectedToServer
 
-    /**
-     * Suspends until the display name of the player is retrieved.
-     *
-     * @return The [Component] representing the player's display name.
-     */
-    suspend fun displayName(): Component
-
     /**
      * Performs modifications on the player's persistent data container.
      *
@@ -121,9 +112,9 @@ interface CloudPlayer : Audience { // TODO: conversation but done correctly?
      * @throws IllegalStateException If the player is not connected to a supported server.
      */
     suspend fun teleport(
-        location: FineLocation,
-        teleportCause: FineTeleportCause = FineTeleportCause.PLUGIN,
-        vararg flags: FineTeleportFlag
+        location: TeleportLocation,
+        teleportCause: TeleportCause = TeleportCause.PLUGIN,
+        vararg flags: TeleportFlag
     ): Boolean
 
     /**
@@ -146,26 +137,12 @@ interface CloudPlayer : Audience { // TODO: conversation but done correctly?
         z: Double,
         yaw: Float = 0.0f,
         pitch: Float = 0.0f,
-        teleportCause: FineTeleportCause = FineTeleportCause.PLUGIN,
-        vararg flags: FineTeleportFlag,
-    ) = teleport(FineLocation(world, x, y, z, yaw, pitch), teleportCause, *flags)
+        teleportCause: TeleportCause = TeleportCause.PLUGIN,
+        vararg flags: TeleportFlag,
+    ) = teleport(TeleportLocation(world, x, y, z, yaw, pitch), teleportCause, *flags)
 
-    /**
-     * Retrieves metadata associated with the player's LuckPerms configuration.
-     *
-     * @param key The metadata key to retrieve.
-     * @return The value as a string, or `null` if unavailable.
-     */
-    suspend fun <R> getLuckpermsMetaData(key: String, transformer: (String) -> R): R?
-
-    /**
-     * Retrieves and transforms metadata associated with the player's LuckPerms configuration.
-     *
-     * @param key The metadata key to retrieve.
-     * @param transformer A transformation function applied to the metadata value.
-     * @return The transformed value, or `null` if unavailable.
-     */
-    suspend fun getLuckpermsMetaData(key: String): String?
+    override suspend fun displayName(): Component
+    override suspend fun name(): String
 }
 
 /**
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/CloudPlayerManager.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/CloudPlayerManager.kt
index 20e3d055..6cf8826b 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/CloudPlayerManager.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/CloudPlayerManager.kt
@@ -1,10 +1,14 @@
 package dev.slne.surf.cloud.api.common.player
 
-import dev.slne.surf.cloud.api.common.util.requiredService
+import dev.slne.surf.cloud.api.common.server.UserList
+import dev.slne.surf.cloud.api.common.util.annotation.InternalApi
+import dev.slne.surf.surfapi.core.api.util.requiredService
+import it.unimi.dsi.fastutil.objects.ObjectSet
 import net.kyori.adventure.audience.Audience
 import net.kyori.adventure.identity.Identity
 import org.jetbrains.annotations.ApiStatus
 import java.util.*
+import kotlin.jvm.optionals.getOrNull
 
 /**
  * Manages online players within the cloud infrastructure.
@@ -23,12 +27,17 @@ interface CloudPlayerManager {
      */
     fun getPlayer(uuid: UUID?): CloudPlayer?
 
-    companion object {
-        val instance = requiredService<CloudPlayerManager>()
+    fun getOfflinePlayer(uuid: UUID): OfflineCloudPlayer
+
+    fun getOnlinePlayers(): UserList
+
+    companion object : CloudPlayerManager by INSTANCE {
+        @InternalApi
+        val instance = INSTANCE
     }
 }
 
-val playerManager get() = CloudPlayerManager.instance
+private val INSTANCE = requiredService<CloudPlayerManager>()
 
 /**
  * Attempts to convert an [Audience] to its corresponding [CloudPlayer].
@@ -38,5 +47,16 @@ val playerManager get() = CloudPlayerManager.instance
  * or `null` if the [Audience] is not a player or cannot be resolved.
  */
 fun Audience?.toCloudPlayer(): CloudPlayer? {
-    return playerManager.getPlayer(this?.pointers()?.get(Identity.UUID)?.orElse(null))
+    return CloudPlayerManager.getPlayer(this?.pointers()?.get(Identity.UUID)?.getOrNull())
+}
+
+/**
+ * Attempts to convert an [Audience] to its corresponding [OfflineCloudPlayer].
+ *
+ * @receiver The [Audience] to convert.
+ * @return The [OfflineCloudPlayer] if the [Audience] represents a player,
+ * or `null` if the [Audience] is not a player or cannot be resolved.
+ */
+fun Audience?.toOfflineCloudPlayer(): OfflineCloudPlayer? {
+    return this?.pointers()?.get(Identity.UUID)?.getOrNull()?.let { CloudPlayerManager.getOfflinePlayer(it) }
 }
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/OfflineCloudPlayer.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/OfflineCloudPlayer.kt
new file mode 100644
index 00000000..431211ce
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/OfflineCloudPlayer.kt
@@ -0,0 +1,55 @@
+package dev.slne.surf.cloud.api.common.player
+
+import dev.slne.surf.cloud.api.common.player.name.NameHistory
+import dev.slne.surf.cloud.api.common.server.CloudServer
+import net.kyori.adventure.text.Component
+import java.net.Inet4Address
+import java.time.ZonedDateTime
+import java.util.*
+
+interface OfflineCloudPlayer {
+    /**
+     * The unique identifier (UUID) of the player.
+     */
+    val uuid: UUID
+
+    suspend fun nameHistory(): NameHistory
+    suspend fun lastServerRaw(): String?
+    suspend fun lastServer(): CloudServer?
+    suspend fun lastSeen(): ZonedDateTime?
+    suspend fun latestIpAddress(): Inet4Address?
+
+    suspend fun playedBefore(): Boolean
+
+    /**
+     * Returns the online player instance if the player is currently connected.
+     */
+    val player: CloudPlayer?
+
+    /**
+     * Suspends until the display name of the player is retrieved.
+     *
+     * @return The [Component] representing the player's display name.
+     */
+    suspend fun displayName(): Component?
+
+    suspend fun name(): String?
+
+    /**
+     * Retrieves and transforms metadata associated with the player's LuckPerms configuration.
+     *
+     * @param key The metadata key to retrieve.
+     * @param transformer A transformation function applied to the metadata value.
+     * @return The transformed value, or `null` if unavailable.
+     */
+    suspend fun <R> getLuckpermsMetaData(key: String, transformer: (String) -> R): R?
+
+    /**
+     * Retrieves metadata associated with the player's LuckPerms configuration.
+     *
+     * @param key The metadata key to retrieve.
+     * @return The value as a string, or `null` if unavailable.
+     */
+    suspend fun getLuckpermsMetaData(key: String): String?
+
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/name/NameHistory.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/name/NameHistory.kt
new file mode 100644
index 00000000..cfb537b8
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/name/NameHistory.kt
@@ -0,0 +1,115 @@
+package dev.slne.surf.cloud.api.common.player.name
+
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.readUtf
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.readVarLong
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.writeUtf
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.writeVarLong
+import dev.slne.surf.cloud.api.common.util.annotation.InternalApi
+import dev.slne.surf.surfapi.core.api.util.requiredService
+import io.netty.buffer.ByteBuf
+import it.unimi.dsi.fastutil.objects.ObjectList
+
+/**
+ * Represents an immutable history of player names with their associated timestamps.
+ */
+interface NameHistory {
+    /**
+     * The total number of name changes made.
+     */
+    val nameChanges: Int
+
+    /**
+     * Returns a list of all name entries, including their timestamps.
+     *
+     * @return A list of [NameEntry] objects representing the full name history.
+     */
+    fun names(): ObjectList<NameEntry>
+
+    /**
+     * Returns the most recently known name.
+     *
+     * @return The latest [NameEntry], or `null` if no names are recorded.
+     */
+    fun lastKnownName(): NameEntry?
+
+    /**
+     * Retrieves the name that was used at a specific point in time.
+     *
+     * @param time The timestamp in milliseconds for which to retrieve the name.
+     * @return The [NameEntry] valid at the specified time, or `null` if no name was set at that time.
+     */
+    fun getNameAtTime(time: Long): NameEntry?
+
+    /**
+     * Checks if a specific name was ever used.
+     *
+     * @param name The name to check.
+     * @return `true` if the name was used at any point, `false` otherwise.
+     */
+    fun wasNameUsed(name: String): Boolean
+
+    /**
+     * Returns the first name that was used.
+     *
+     * @return The first [NameEntry], or `null` if no names are recorded.
+     */
+    fun firstUsedName(): NameEntry?
+
+    /**
+     * Calculates the time elapsed since the last name change.
+     *
+     * @return The time in milliseconds since the last name change, or `0` if no names are recorded.
+     */
+    fun timeSinceLastChange(): Long
+
+    /**
+     * Writes the name history to a [ByteBuf].
+     *
+     * @param buf The buffer to write the history to.
+     */
+    fun writeToByteBuf(buf: ByteBuf)
+
+    companion object {
+        /**
+         * Reads a [NameHistory] from a [ByteBuf].
+         *
+         * @param buf The buffer to read the history from.
+         * @return The [NameHistory] read from the buffer.
+         */
+        fun readFromByteBuf(buf: ByteBuf): NameHistory {
+            return NameHistoryFactory.instance.createFromByteBuf(buf)
+        }
+    }
+}
+
+/**
+ * Represents a player's name along with the timestamp of when it was set.
+ *
+ * @property timestamp The time in milliseconds when the name was set.
+ * @property name The player's name at the given timestamp.
+ */
+data class NameEntry(val timestamp: Long, val name: String) {
+    fun writeToByteBuf(buf: ByteBuf) {
+        buf.writeVarLong(timestamp)
+        buf.writeUtf(name)
+    }
+
+    companion object {
+        fun readFromByteBuf(buf: ByteBuf): NameEntry {
+            val timestamp = buf.readVarLong()
+            val name = buf.readUtf()
+            return NameEntry(timestamp, name)
+        }
+    }
+}
+
+@InternalApi
+interface NameHistoryFactory {
+    fun create(entries: ObjectList<NameEntry>): NameHistory
+    fun createFromByteBuf(buf: ByteBuf): NameHistory
+    fun empty(): NameHistory
+
+    companion object {
+        val instance = requiredService<NameHistoryFactory>()
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/position/FineTeleportCause.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/teleport/TeleportCause.kt
similarity index 93%
rename from surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/position/FineTeleportCause.kt
rename to surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/teleport/TeleportCause.kt
index 6a670d52..138399c8 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/position/FineTeleportCause.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/teleport/TeleportCause.kt
@@ -1,6 +1,6 @@
-package dev.slne.surf.cloud.api.common.util.position
+package dev.slne.surf.cloud.api.common.player.teleport
 
-enum class FineTeleportCause {
+enum class TeleportCause {
     /**
      * Indicates the teleporation was caused by a player throwing an Ender
      * Pearl
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/position/FineTeleportFlag.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/teleport/TeleportFlag.kt
similarity index 91%
rename from surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/position/FineTeleportFlag.kt
rename to surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/teleport/TeleportFlag.kt
index a0888896..c7c7e290 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/position/FineTeleportFlag.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/teleport/TeleportFlag.kt
@@ -1,6 +1,6 @@
-package dev.slne.surf.cloud.api.common.util.position
+package dev.slne.surf.cloud.api.common.player.teleport
 
-enum class FineTeleportFlag {
+enum class TeleportFlag {
 
     /**
      * Indicates that a player should not have their current open inventory closed when teleporting.
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/position/FineLocation.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/teleport/TeleportLocation.kt
similarity index 72%
rename from surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/position/FineLocation.kt
rename to surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/teleport/TeleportLocation.kt
index 0e31c4f9..c3944aa4 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/position/FineLocation.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/player/teleport/TeleportLocation.kt
@@ -1,21 +1,20 @@
-package dev.slne.surf.cloud.api.common.util.position
+package dev.slne.surf.cloud.api.common.player.teleport
 
 import dev.slne.surf.cloud.api.common.netty.network.codec.streamCodec
 import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
 import java.util.*
 import kotlin.math.sqrt
 
-data class FineLocation(
+data class TeleportLocation(
     val world: UUID,
     val x: Double,
     val y: Double,
     val z: Double,
     val yaw: Float = 0.0f,
     val pitch: Float = 0.0f
-) { // TODO: 30.12.2024 15:30 - replace with Vector3d or merge into api with platform extensions
-
+) {
     companion object {
-        val STREAM_CODEC = streamCodec<SurfByteBuf, FineLocation>({ buf, value ->
+        val STREAM_CODEC = streamCodec<SurfByteBuf, TeleportLocation>({ buf, value ->
             buf.writeUuid(value.world)
             buf.writeDouble(value.x)
             buf.writeDouble(value.y)
@@ -23,7 +22,7 @@ data class FineLocation(
             buf.writeFloat(value.yaw)
             buf.writeFloat(value.pitch)
         }, { buf ->
-            FineLocation(
+            TeleportLocation(
                 buf.readUuid(),
                 buf.readDouble(),
                 buf.readDouble(),
@@ -34,7 +33,7 @@ data class FineLocation(
         })
     }
 
-    fun distanceSquared(other: FineLocation): Double { // TODO: Replace with fast math
+    fun distanceSquared(other: TeleportLocation): Double { // TODO: Replace with fast math
         if (world != other.world) error("Cannot calculate distance between locations in different worlds")
 
         val dx = x - other.x
@@ -44,7 +43,7 @@ data class FineLocation(
         return dx * dx + dy * dy + dz * dz
     }
 
-    fun distance(other: FineLocation): Double {
+    fun distance(other: TeleportLocation): Double {
         return sqrt(distanceSquared(other))
     }
 }
@@ -56,4 +55,4 @@ fun fineLocation(
     z: Double,
     yaw: Float = 0.0f,
     pitch: Float = 0.0f
-) = FineLocation(world, x, y, z, yaw, pitch)
\ No newline at end of file
+) = TeleportLocation(world, x, y, z, yaw, pitch)
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/server/CloudServer.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/server/CloudServer.kt
index 18a32bee..3ae90d3b 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/server/CloudServer.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/server/CloudServer.kt
@@ -18,5 +18,5 @@ interface CloudServer : CommonCloudServer {
      *
      * When enabled, only players on the allowlist (whitelist) can join the server.
      */
-    val whitelist: Boolean
+    val allowlist: Boolean
 }
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/server/CloudServerConstants.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/server/CloudServerConstants.kt
new file mode 100644
index 00000000..9b4a18a6
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/server/CloudServerConstants.kt
@@ -0,0 +1,5 @@
+package dev.slne.surf.cloud.api.common.server
+
+object CloudServerConstants {
+    const val LOBBY_CATEGORY = "lobby"
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/server/CloudServerManager.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/server/CloudServerManager.kt
index 53274c1e..9dde137a 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/server/CloudServerManager.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/server/CloudServerManager.kt
@@ -1,6 +1,8 @@
 package dev.slne.surf.cloud.api.common.server
 
-import dev.slne.surf.cloud.api.common.util.requiredService
+import dev.slne.surf.cloud.api.common.util.annotation.InternalApi
+import dev.slne.surf.surfapi.core.api.util.requiredService
+import it.unimi.dsi.fastutil.objects.ObjectCollection
 import it.unimi.dsi.fastutil.objects.ObjectList
 import org.jetbrains.annotations.ApiStatus.NonExtendable
 
@@ -54,15 +56,12 @@ interface CloudServerManager {
      */
     suspend fun retrieveServersByCategory(category: String): ObjectList<out CommonCloudServer>
 
-    companion object {
-        /**
-         * The singleton instance of the [CloudServerManager].
-         */
-        val instance = requiredService<CloudServerManager>()
+    suspend fun retrieveAllServers(): ObjectCollection<out CommonCloudServer>
+
+    companion object : CloudServerManager by INSTANCE {
+        @InternalApi
+        val instance = INSTANCE
     }
 }
 
-/**
- * A global reference to the singleton [CloudServerManager] instance.
- */
-val serverManager get() = CloudServerManager.instance
\ No newline at end of file
+private val INSTANCE = requiredService<CloudServerManager>()
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/server/CommonCloudServer.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/server/CommonCloudServer.kt
index 357ea343..1419afd5 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/server/CommonCloudServer.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/server/CommonCloudServer.kt
@@ -1,10 +1,20 @@
 package dev.slne.surf.cloud.api.common.server
 
 import dev.slne.surf.cloud.api.common.player.CloudPlayer
+import dev.slne.surf.cloud.api.common.player.ConnectionResult
 import dev.slne.surf.cloud.api.common.server.state.ServerState
+import it.unimi.dsi.fastutil.objects.Object2ObjectMap
 import net.kyori.adventure.audience.ForwardingAudience
 import org.jetbrains.annotations.ApiStatus
 
+/**
+ * Represents the result of a batch transfer operation.
+ *
+ * The result is a pair of a boolean indicating the overall success of the operation,
+ * and a map of [CloudPlayer]s to [ConnectionResult]s indicating the result of each transfer.
+ */
+typealias BatchTransferResult = Pair<Boolean, Object2ObjectMap<CloudPlayer, ConnectionResult>>
+
 /**
  * Represents a server within the cloud infrastructure.
  *
@@ -75,8 +85,9 @@ interface CommonCloudServer : ForwardingAudience {
      * This operation suspends until all players have been successfully transferred.
      *
      * @param server The target server to transfer players to.
+     * @return A [BatchTransferResult] indicating the result of the transfer operation.
      */
-    suspend fun sendAll(server: CommonCloudServer)
+    suspend fun sendAll(server: CloudServer): BatchTransferResult
 
     /**
      * Sends a subset of players, filtered by a condition, to the specified target server.
@@ -85,8 +96,11 @@ interface CommonCloudServer : ForwardingAudience {
      *
      * @param server The target server to transfer players to.
      * @param filter A filter function to determine which players to transfer.
+     * @return A [BatchTransferResult] indicating the result of the transfer operation.
      */
-    suspend fun sendAll(server: CommonCloudServer, filter: (CloudPlayer) -> Boolean)
+    suspend fun sendAll(server: CloudServer, filter: (CloudPlayer) -> Boolean): BatchTransferResult
+
+    suspend fun sendAll(category: String): BatchTransferResult
 
     /**
      * Shuts down the server.
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/server/UserListImpl.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/server/UserListImpl.kt
index a8405591..29122a8c 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/server/UserListImpl.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/server/UserListImpl.kt
@@ -3,8 +3,8 @@ package dev.slne.surf.cloud.api.common.server
 import dev.slne.surf.cloud.api.common.netty.network.codec.streamCodec
 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.playerManager
-import dev.slne.surf.cloud.api.common.util.InternalApi
+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 it.unimi.dsi.fastutil.objects.ObjectSet
@@ -18,6 +18,10 @@ open class UserListImpl : UserList {
         }, { buf ->
             UserListImpl(buf.readCollection({ mutableObjectSetOf(it) }, { it.readUuid() }))
         })
+
+        fun of(players: Iterable<CloudPlayer>): UserListImpl {
+            return UserListImpl(players.mapTo(mutableObjectSetOf()) { it.uuid })
+        }
     }
 
     internal val playerReferences: ObjectSet<UUID>
@@ -41,10 +45,8 @@ open class UserListImpl : UserList {
         return object : Iterator<CloudPlayer> {
             private val iterator = playerReferences.iterator()
             override fun hasNext() = iterator.hasNext()
-            override fun next() =
-                iterator.next().let { playerManager.getPlayer(it) } ?: throw NoSuchElementException(
-                    "Player not found"
-                )
+            override fun next() = CloudPlayerManager.getPlayer(iterator.next())
+                ?: throw NoSuchElementException("Player not found")
         }
     }
 
@@ -83,10 +85,8 @@ class MutableUserListImpl : UserListImpl(), MutableUserList {
         return object : MutableIterator<CloudPlayer> {
             private val iterator = playerReferences.iterator()
             override fun hasNext() = iterator.hasNext()
-            override fun next() =
-                iterator.next().let { playerManager.getPlayer(it) } ?: throw NoSuchElementException(
-                    "Player not found"
-                )
+            override fun next() = CloudPlayerManager.getPlayer(iterator.next())
+                ?: throw NoSuchElementException("Player not found")
 
             override fun remove() {
                 iterator.remove()
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/AdvancedAutoCloseable.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/AdvancedAutoCloseable.kt
deleted file mode 100644
index 1e431596..00000000
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/AdvancedAutoCloseable.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package dev.slne.surf.cloud.api.common.util
-
-import kotlinx.coroutines.runBlocking
-import org.jetbrains.annotations.ApiStatus.NonExtendable
-
-interface AdvancedAutoCloseable : AutoCloseable {
-    @NonExtendable
-    override fun close() = runBlocking { destroy() }
-
-    suspend fun start()
-    suspend fun destroy()
-}
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/ObservableField.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/ObservableField.kt
index 205104f6..629cc545 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/ObservableField.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/ObservableField.kt
@@ -1,5 +1,6 @@
 package dev.slne.surf.cloud.api.common.util
 
+import dev.slne.surf.surfapi.core.api.util.logger
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
 import org.jetbrains.annotations.ApiStatus
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/annotation-util.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/annotation-util.kt
deleted file mode 100644
index a0f09641..00000000
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/annotation-util.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package dev.slne.surf.cloud.api.common.util
-
-import java.util.concurrent.ConcurrentHashMap
-import kotlin.reflect.KProperty
-import kotlin.reflect.full.memberProperties
-
-private val annotationCache = ConcurrentHashMap<Pair<Annotation, String>, Any?>()
-
-@Suppress("UNCHECKED_CAST")
-operator fun <T : Annotation, R : Any> T.getValue(thisRef: Any?, property: KProperty<*>): R {
-    val propertyName = property.name
-    return annotationCache.computeIfAbsent(this to propertyName) {
-        this::class.memberProperties
-            .firstOrNull { it.name == propertyName }
-            ?.call(this)
-    } as? R ?: error("Property '$propertyName' not found or incorrect type.")
-}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/internal-api-annotations.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/annotation/internal-api-annotations.kt
similarity index 70%
rename from surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/internal-api-annotations.kt
rename to surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/annotation/internal-api-annotations.kt
index 40f365ef..aabaa066 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/internal-api-annotations.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/annotation/internal-api-annotations.kt
@@ -1,7 +1,8 @@
-package dev.slne.surf.cloud.api.common.util
+package dev.slne.surf.cloud.api.common.util.annotation
 
 @RequiresOptIn(
     "This API is internal and may change without notice.",
     RequiresOptIn.Level.ERROR,
 )
+
 annotation class InternalApi
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/JoinClassLoader.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/classloader/JoinClassLoader.kt
similarity index 98%
rename from surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/JoinClassLoader.kt
rename to surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/classloader/JoinClassLoader.kt
index 582c3747..f742e983 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/JoinClassLoader.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/classloader/JoinClassLoader.kt
@@ -1,4 +1,4 @@
-package dev.slne.surf.cloud.api.common.util
+package dev.slne.surf.cloud.api.common.util.classloader
 
 import java.io.IOException
 import java.net.URL
@@ -105,4 +105,4 @@ class JoinClassLoader(
         newDelegateClassLoaders[delegateClassLoaders.size] = classLoader
         delegateClassLoaders = newDelegateClassLoaders.requireNoNulls()
     }
-}
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/collection-utils.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/collection-utils.kt
new file mode 100644
index 00000000..4d12cd36
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/collection-utils.kt
@@ -0,0 +1,59 @@
+package dev.slne.surf.cloud.api.common.util
+
+/**
+ * Returns the single element of the collection if it contains exactly one element,
+ * or `null` if it is empty. Throws an exception if the collection contains more than one element.
+ *
+ * @return The single element or `null` if the collection is empty.
+ * @throws IllegalStateException if the collection contains more than one element.
+ */
+fun <T> Collection<T>.singleOrNullOrThrow(): T? {
+    return when (size) {
+        0 -> null
+        1 -> elementAt(0)
+        else -> error("List has more than one element")
+    }
+}
+
+/**
+ * Returns the single element of the iterable if it contains exactly one element,
+ * or `null` if it is empty. Throws an exception if the iterable contains more than one element.
+ *
+ * If the iterable is a collection, it delegates to [Collection.singleOrNullOrThrow].
+ *
+ * @return The single element or `null` if the iterable is empty.
+ * @throws IllegalStateException if the iterable contains more than one element.
+ */
+fun <T> Iterable<T>.singleOrNullOrThrow(): T? {
+    return when (this) {
+        is Collection -> singleOrNullOrThrow()
+        else -> {
+            val iterator = iterator()
+            if (!iterator.hasNext()) return null
+            val single = iterator.next()
+            if (iterator.hasNext()) error("Iterable has more than one element")
+            single
+        }
+    }
+}
+
+/**
+ * Returns the single element matching the given [predicate] if exactly one element matches,
+ * or `null` if no elements match. Throws an exception if more than one element matches.
+ *
+ * @param predicate A function that returns `true` for elements to be considered.
+ * @return The single matching element or `null` if no elements match.
+ * @throws IllegalStateException if more than one element matches the predicate.
+ */
+inline fun <T> Iterable<T>.singleOrNullOrThrow(predicate: (T) -> Boolean): T? {
+    var single: T? = null
+    var found = false
+    for (element in this) {
+        if (predicate(element)) {
+            if (found) error("Iterable has more than one matching element")
+            single = element
+            found = true
+        }
+    }
+    return single
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/log-util.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/log-util.kt
deleted file mode 100644
index 1542cafd..00000000
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/log-util.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-@file:OptIn(ExperimentalContracts::class)
-
-package dev.slne.surf.cloud.api.common.util
-
-import com.google.common.flogger.FluentLogger
-import com.google.common.flogger.LoggingApi
-import kotlin.contracts.ExperimentalContracts
-import kotlin.contracts.InvocationKind
-import kotlin.contracts.contract
-
-@Suppress("NOTHING_TO_INLINE") // Caller sensitive
-inline fun logger(): FluentLogger = FluentLogger.forEnclosingClass()
-
-inline fun <API : LoggingApi<API>> LoggingApi<API>.logIf(
-    condition: () -> Boolean,
-    logOperation: LoggingApi<API>.() -> Unit
-) {
-    contract {
-        callsInPlace(logOperation, InvocationKind.AT_MOST_ONCE)
-    }
-
-    if (condition()) {
-        logOperation()
-    }
-}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/math-util.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/math/math-util.kt
similarity index 50%
rename from surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/math-util.kt
rename to surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/math/math-util.kt
index bd88cd98..6980d0ad 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/math-util.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/math/math-util.kt
@@ -1,3 +1,3 @@
-package dev.slne.surf.cloud.api.common.util
+package dev.slne.surf.cloud.api.common.util.math
 
-fun lerp(delta: Float, start: Float, end: Float) = start + delta * (end - start)
+fun lerp(delta: Float, start: Float, end: Float) = start + delta * (end - start)
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/nbt/nbt-extensions.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/nbt/nbt-extensions.kt
index ea23f82c..5488589c 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/nbt/nbt-extensions.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/nbt/nbt-extensions.kt
@@ -1,8 +1,14 @@
 package dev.slne.surf.cloud.api.common.util.nbt
 
+import net.querz.nbt.io.NBTDeserializer
+import net.querz.nbt.io.NBTSerializer
+import net.querz.nbt.io.NamedTag
 import net.querz.nbt.tag.CompoundTag
 import net.querz.nbt.tag.ListTag
 import net.querz.nbt.tag.Tag
+import java.nio.file.Path
+import kotlin.io.path.inputStream
+import kotlin.io.path.outputStream
 
 /**
  * Extension function to put a tag into a compound tag.
@@ -36,4 +42,19 @@ fun ListTag<*>.getCompound(index: Int): CompoundTag {
     }
 
     return CompoundTag()
-}
\ No newline at end of file
+}
+
+fun Tag<*>.writeToPath(path: Path, compressed: Boolean = true) {
+    val tag = NamedTag(null, this)
+    tag.writeToPath(path, compressed)
+}
+
+fun NamedTag.writeToPath(path: Path, compressed: Boolean = true) {
+    path.outputStream().use { stream -> NBTSerializer(compressed).toStream(this, stream) }
+}
+
+fun Path.readTag(compressed: Boolean = true): NamedTag =
+    inputStream().use { stream -> NBTDeserializer(compressed).fromStream(stream) }
+
+fun Path.readCompoundTag(compressed: Boolean = true): CompoundTag =
+    readTag(compressed).tag as? CompoundTag ?: error("Expected a compound tag")
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/UnifiedReadOnlyChannelHandler.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/netty/UnifiedReadOnlyChannelHandler.kt
similarity index 96%
rename from surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/UnifiedReadOnlyChannelHandler.kt
rename to surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/netty/UnifiedReadOnlyChannelHandler.kt
index 25289c11..e908c219 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/UnifiedReadOnlyChannelHandler.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/netty/UnifiedReadOnlyChannelHandler.kt
@@ -1,4 +1,4 @@
-package dev.slne.surf.cloud.api.common.util
+package dev.slne.surf.cloud.api.common.util.netty
 
 import io.netty.channel.ChannelDuplexHandler
 import io.netty.channel.ChannelHandlerContext
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/netty-util.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/netty/netty-util.kt
similarity index 95%
rename from surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/netty-util.kt
rename to surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/netty/netty-util.kt
index 6be201a9..fc2e71c7 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/netty-util.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/netty/netty-util.kt
@@ -1,4 +1,4 @@
-package dev.slne.surf.cloud.api.common.util
+package dev.slne.surf.cloud.api.common.util.netty
 
 import io.netty.channel.ChannelFuture
 import io.netty.util.concurrent.Future
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/reflect-util.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/reflect-util.kt
deleted file mode 100644
index ec8edc3a..00000000
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/reflect-util.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package dev.slne.surf.cloud.api.common.util
-
-import java.lang.reflect.Field
-import java.lang.reflect.Modifier
-import kotlin.reflect.KProperty1
-import kotlin.reflect.jvm.javaField
-
-fun KProperty1<*, *>.isStaticFinal() = javaField?.let {
-    Modifier.isStatic(it.modifiers) && Modifier.isFinal(it.modifiers)
-} ?: false
-
-fun Field.isStaticFinal() = Modifier.isStatic(modifiers) && Modifier.isFinal(modifiers)
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/service-util.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/service-util.kt
deleted file mode 100644
index ebb46692..00000000
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/service-util.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package dev.slne.surf.cloud.api.common.util
-
-import net.kyori.adventure.util.Services
-
-inline fun <reified T> requiredService(): T = Services.serviceWithFallback(T::class.java)
-    .orElseThrow { Error("Service ${T::class.java.name} not available") }
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/spring-util.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/spring-util.kt
index cdabf7bc..6f4ee9d0 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/spring-util.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/spring-util.kt
@@ -1,12 +1,22 @@
 package dev.slne.surf.cloud.api.common.util
 
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.newSingleThreadContext
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.withContext
 import org.springframework.aop.framework.AopProxyUtils
 import org.springframework.beans.factory.ObjectFactory
 import org.springframework.core.MethodIntrospector
 import org.springframework.core.annotation.AnnotatedElementUtils
 import org.springframework.core.annotation.AnnotationUtils
 import org.springframework.core.type.AnnotationMetadata
+import org.springframework.transaction.TransactionStatus
+import org.springframework.transaction.support.TransactionOperations
+import org.springframework.util.StopWatch
 import java.lang.reflect.Method
+import kotlin.contracts.ExperimentalContracts
+import kotlin.contracts.contract
+import kotlin.coroutines.CoroutineContext
 import kotlin.reflect.KClass
 
 operator fun <T> ObjectFactory<T>.getValue(thisRef: Any?, property: Any?): T = this.getObject()
@@ -38,4 +48,65 @@ fun AnnotationMetadata.getFieldValue(fieldName: String, expectedType: KClass<*>,
     } catch (e: Exception) {
         null
     }
-}
\ No newline at end of file
+}
+
+inline fun Any.measureWithStopWatch(taskName: String, block: () -> Unit): StopWatch {
+    val stopWatch = StopWatch(javaClass.simpleName)
+    stopWatch.start(taskName)
+    block()
+    stopWatch.stop()
+    return stopWatch
+}
+
+/**
+ * Default dispatcher used for coroutine-based transactional execution.
+ * Limits the number of concurrent transactional operations to 8,
+ * to avoid exhausting the database connection pool.
+ */
+@PublishedApi
+internal val txDispatcher = newSingleThreadContext("txDispatcher").limitedParallelism(1)
+
+/**
+ * Coroutine-compatible transactional execution using [TransactionOperations].
+ *
+ * This function allows executing a transactional [block] within a coroutine,
+ * using a coroutine context that is safe and optimized for database operations.
+ *
+ * The default [context] is a custom limited-parallelism dispatcher (max 8 concurrent operations),
+ * which prevents excessive parallel access to the database, avoiding problems like:
+ * - connection pool exhaustion (e.g., in HikariCP)
+ * - too many open EntityManager instances
+ * - heavy database load due to uncontrolled concurrency
+ *
+ * If needed, you can override the [context], e.g., with [Dispatchers.Default] or [Dispatchers.IO].
+ *
+ * ### Example:
+ * ```
+ * val result = transactionTemplate.executeAndAwait {
+ *     myRepository.save(...)
+ *     "Done"
+ * }
+ * ```
+ *
+ * @param context Optional coroutine context; defaults to [txDispatcher], limiting DB concurrency.
+ * @param block The transactional code block to run.
+ * @return The result of the block.
+ */
+@OptIn(ExperimentalContracts::class)
+@Suppress("WRONG_INVOCATION_KIND", "LEAKED_IN_PLACE_LAMBDA")
+suspend inline fun <T> TransactionOperations.executeAndAwait(
+    context: CoroutineContext = txDispatcher,
+    crossinline block: suspend (TransactionStatus) -> T
+): T {
+    contract {
+        callsInPlace(block, kotlin.contracts.InvocationKind.EXACTLY_ONCE)
+    }
+
+    return withContext(context) {
+        execute{
+            runBlocking {
+                block(it)
+            }
+        } as T
+    }
+}
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/time-util.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/time-util.kt
new file mode 100644
index 00000000..e5836618
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/time-util.kt
@@ -0,0 +1,7 @@
+package dev.slne.surf.cloud.api.common.util
+
+import java.time.LocalDateTime
+import java.time.ZoneOffset
+
+fun currentUtc(): LocalDateTime = LocalDateTime.now(ZoneOffset.UTC)
+fun LocalDateTime.toEpochUtcMillis(): Long = toInstant(ZoneOffset.UTC).toEpochMilli()
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/util.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/util.kt
index ebab122d..d80e1b21 100644
--- a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/util.kt
+++ b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/util/util.kt
@@ -1,6 +1,7 @@
 package dev.slne.surf.cloud.api.common.util
 
 import net.kyori.adventure.text.logger.slf4j.ComponentLogger
+import java.lang.reflect.Method
 import java.nio.file.Path
 import java.util.*
 import java.util.function.ToIntFunction
@@ -10,6 +11,7 @@ import kotlin.io.path.fileVisitor
 import kotlin.io.path.isRegularFile
 import kotlin.io.path.moveTo
 import kotlin.io.path.visitFileTree
+import kotlin.reflect.jvm.kotlinFunction
 
 const val LINEAR_LOOKUP_THRESHOLD = 8
 
@@ -140,3 +142,5 @@ private fun createFileCreatedCheck(path: Path): () -> Boolean = {
 private fun createFileDeletedCheck(path: Path): () -> Boolean = {
     !path.exists()
 }
+
+fun Method.isSuspending() = kotlinFunction?.isSuspend == true
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-server/api/surf-cloud-api-server.api b/surf-cloud-api/surf-cloud-api-server/api/surf-cloud-api-server.api
new file mode 100644
index 00000000..0c965138
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-server/api/surf-cloud-api-server.api
@@ -0,0 +1,478 @@
+public abstract interface class dev/slne/surf/cloud/api/server/CloudServerInstance : dev/slne/surf/cloud/api/common/CloudInstance {
+	public static final field Companion Ldev/slne/surf/cloud/api/server/CloudServerInstance$Companion;
+	public abstract fun deleteNotInterestingPlayerData (Ljava/util/UUID;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun exportPlayerData (Ljava/util/UUID;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/server/CloudServerInstance$Companion : dev/slne/surf/cloud/api/server/CloudServerInstance {
+	public fun deleteNotInterestingPlayerData (Ljava/util/UUID;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun exportPlayerData (Ljava/util/UUID;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun startSpringApplication (Ljava/lang/Class;Ljava/lang/ClassLoader;[Ljava/lang/ClassLoader;Lkotlin/jvm/functions/Function1;)Lorg/springframework/context/ConfigurableApplicationContext;
+}
+
+public final class dev/slne/surf/cloud/api/server/command/CommandCompletion {
+	public fun <init> (Ljava/lang/String;Lnet/kyori/adventure/text/Component;)V
+	public synthetic fun <init> (Ljava/lang/String;Lnet/kyori/adventure/text/Component;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun component1 ()Ljava/lang/String;
+	public final fun component2 ()Lnet/kyori/adventure/text/Component;
+	public final fun copy (Ljava/lang/String;Lnet/kyori/adventure/text/Component;)Ldev/slne/surf/cloud/api/server/command/CommandCompletion;
+	public static synthetic fun copy$default (Ldev/slne/surf/cloud/api/server/command/CommandCompletion;Ljava/lang/String;Lnet/kyori/adventure/text/Component;ILjava/lang/Object;)Ldev/slne/surf/cloud/api/server/command/CommandCompletion;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getSuggestion ()Ljava/lang/String;
+	public final fun getTooltip ()Lnet/kyori/adventure/text/Component;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class dev/slne/surf/cloud/api/server/command/CommandException : java/lang/RuntimeException {
+	public static final field Companion Ldev/slne/surf/cloud/api/server/command/CommandException$Companion;
+	public fun <init> (Ljava/lang/String;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
+}
+
+public final class dev/slne/surf/cloud/api/server/command/CommandException$Companion {
+}
+
+public abstract interface class dev/slne/surf/cloud/api/server/command/CommandResultCallback {
+	public static final field Companion Ldev/slne/surf/cloud/api/server/command/CommandResultCallback$Companion;
+	public abstract fun onFailure ()V
+	public abstract fun onResult (ZI)V
+	public abstract fun onSuccess (I)V
+	public abstract fun plus (Ldev/slne/surf/cloud/api/server/command/CommandResultCallback;)Ldev/slne/surf/cloud/api/server/command/CommandResultCallback;
+}
+
+public final class dev/slne/surf/cloud/api/server/command/CommandResultCallback$Companion {
+	public final fun chain (Ldev/slne/surf/cloud/api/server/command/CommandResultCallback;Ldev/slne/surf/cloud/api/server/command/CommandResultCallback;)Ldev/slne/surf/cloud/api/server/command/CommandResultCallback;
+	public final fun getEMPTY ()Ldev/slne/surf/cloud/api/server/command/CommandResultCallback;
+}
+
+public final class dev/slne/surf/cloud/api/server/command/CommandResultCallback$DefaultImpls {
+	public static fun onFailure (Ldev/slne/surf/cloud/api/server/command/CommandResultCallback;)V
+	public static fun onSuccess (Ldev/slne/surf/cloud/api/server/command/CommandResultCallback;I)V
+	public static fun plus (Ldev/slne/surf/cloud/api/server/command/CommandResultCallback;Ldev/slne/surf/cloud/api/server/command/CommandResultCallback;)Ldev/slne/surf/cloud/api/server/command/CommandResultCallback;
+}
+
+public final class dev/slne/surf/cloud/api/server/command/CommandSource : dev/slne/surf/cloud/api/server/command/ExecutionCommandSource {
+	public fun <init> ()V
+	public fun <init> (ZLdev/slne/surf/cloud/api/server/command/CommandResultCallback;)V
+	public synthetic fun <init> (ZLdev/slne/surf/cloud/api/server/command/CommandResultCallback;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun clearCallbacks ()Ldev/slne/surf/cloud/api/server/command/CommandSource;
+	public synthetic fun clearCallbacks ()Ldev/slne/surf/cloud/api/server/command/ExecutionCommandSource;
+	public fun getCallback ()Ldev/slne/surf/cloud/api/server/command/CommandResultCallback;
+	public fun getSilent ()Z
+	public fun handleError (Lcom/mojang/brigadier/exceptions/CommandExceptionType;Lnet/kyori/adventure/text/Component;Z)V
+	public fun handleError (Lcom/mojang/brigadier/exceptions/CommandSyntaxException;Z)V
+	public final fun sendFailure (Lnet/kyori/adventure/text/Component;)V
+	public final fun sendInfo (Lnet/kyori/adventure/text/Component;)V
+	public final fun sendMessage (Lnet/kyori/adventure/text/Component;)V
+	public final fun sendSuccess (Ljava/lang/String;)V
+	public final fun sendSuccess (Lnet/kyori/adventure/text/Component;)V
+	public fun withCallback (Ldev/slne/surf/cloud/api/server/command/CommandResultCallback;)Ldev/slne/surf/cloud/api/server/command/CommandSource;
+	public synthetic fun withCallback (Ldev/slne/surf/cloud/api/server/command/CommandResultCallback;)Ldev/slne/surf/cloud/api/server/command/ExecutionCommandSource;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/server/command/ConsoleCommand {
+}
+
+public final class dev/slne/surf/cloud/api/server/command/ConsoleCommandKt {
+	public static final fun literal (Ldev/slne/surf/cloud/api/server/command/ConsoleCommand;Ljava/lang/String;Lkotlin/jvm/functions/Function1;)Lcom/mojang/brigadier/builder/LiteralArgumentBuilder;
+	public static synthetic fun literal$default (Ldev/slne/surf/cloud/api/server/command/ConsoleCommand;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/mojang/brigadier/builder/LiteralArgumentBuilder;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/server/command/ExecutionCommandSource {
+	public static final field Companion Ldev/slne/surf/cloud/api/server/command/ExecutionCommandSource$Companion;
+	public abstract fun clearCallbacks ()Ldev/slne/surf/cloud/api/server/command/ExecutionCommandSource;
+	public abstract fun getCallback ()Ldev/slne/surf/cloud/api/server/command/CommandResultCallback;
+	public abstract fun getSilent ()Z
+	public abstract fun handleError (Lcom/mojang/brigadier/exceptions/CommandExceptionType;Lnet/kyori/adventure/text/Component;Z)V
+	public abstract fun handleError (Lcom/mojang/brigadier/exceptions/CommandSyntaxException;Z)V
+	public abstract fun withCallback (Ldev/slne/surf/cloud/api/server/command/CommandResultCallback;)Ldev/slne/surf/cloud/api/server/command/ExecutionCommandSource;
+}
+
+public final class dev/slne/surf/cloud/api/server/command/ExecutionCommandSource$Companion {
+	public final fun resultConsumer ()Lcom/mojang/brigadier/ResultConsumer;
+}
+
+public final class dev/slne/surf/cloud/api/server/command/ExecutionCommandSource$DefaultImpls {
+	public static fun clearCallbacks (Ldev/slne/surf/cloud/api/server/command/ExecutionCommandSource;)Ldev/slne/surf/cloud/api/server/command/ExecutionCommandSource;
+	public static fun handleError (Ldev/slne/surf/cloud/api/server/command/ExecutionCommandSource;Lcom/mojang/brigadier/exceptions/CommandSyntaxException;Z)V
+}
+
+public final class dev/slne/surf/cloud/api/server/command/util/Command_extensionsKt {
+	public static final fun contains (Lcom/mojang/brigadier/context/StringRange;I)Z
+}
+
+public abstract interface class dev/slne/surf/cloud/api/server/export/PlayerDataExport {
+}
+
+public final class dev/slne/surf/cloud/api/server/export/PlayerDataExportEmpty : dev/slne/surf/cloud/api/server/export/PlayerDataExport {
+	public static final field INSTANCE Ldev/slne/surf/cloud/api/server/export/PlayerDataExportEmpty;
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
+public final class dev/slne/surf/cloud/api/server/export/RootExportPlayerData : dev/slne/surf/cloud/api/server/export/PlayerDataExport {
+	public static final field Companion Ldev/slne/surf/cloud/api/server/export/RootExportPlayerData$Companion;
+	public fun <init> (Ljava/util/List;)V
+	public final fun component1 ()Ljava/util/List;
+	public final fun copy (Ljava/util/List;)Ldev/slne/surf/cloud/api/server/export/RootExportPlayerData;
+	public static synthetic fun copy$default (Ldev/slne/surf/cloud/api/server/export/RootExportPlayerData;Ljava/util/List;ILjava/lang/Object;)Ldev/slne/surf/cloud/api/server/export/RootExportPlayerData;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getData ()Ljava/util/List;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public synthetic class dev/slne/surf/cloud/api/server/export/RootExportPlayerData$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
+	public static final field INSTANCE Ldev/slne/surf/cloud/api/server/export/RootExportPlayerData$$serializer;
+	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
+	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ldev/slne/surf/cloud/api/server/export/RootExportPlayerData;
+	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
+	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
+	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Ldev/slne/surf/cloud/api/server/export/RootExportPlayerData;)V
+	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
+}
+
+public final class dev/slne/surf/cloud/api/server/export/RootExportPlayerData$Companion {
+	public final fun serializer ()Lkotlinx/serialization/KSerializer;
+}
+
+public final class dev/slne/surf/cloud/api/server/exposed/columns/CharUuidColumnType : org/jetbrains/exposed/sql/ColumnType {
+	public static final field Companion Ldev/slne/surf/cloud/api/server/exposed/columns/CharUuidColumnType$Companion;
+	public fun <init> ()V
+	public synthetic fun nonNullValueToString (Ljava/lang/Object;)Ljava/lang/String;
+	public fun nonNullValueToString (Ljava/util/UUID;)Ljava/lang/String;
+	public synthetic fun notNullValueToDB (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun notNullValueToDB (Ljava/util/UUID;)Ljava/lang/Object;
+	public fun sqlType ()Ljava/lang/String;
+	public synthetic fun valueFromDB (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun valueFromDB (Ljava/lang/Object;)Ljava/util/UUID;
+}
+
+public final class dev/slne/surf/cloud/api/server/exposed/columns/CharUuidColumnType$Companion {
+}
+
+public final class dev/slne/surf/cloud/api/server/exposed/columns/CharUuidColumnTypeKt {
+	public static final fun charUuid (Lorg/jetbrains/exposed/sql/Table;Ljava/lang/String;)Lorg/jetbrains/exposed/sql/Column;
+}
+
+public class dev/slne/surf/cloud/api/server/exposed/columns/CurrentTimestampBase : org/jetbrains/exposed/sql/Function {
+	public fun <init> (Lorg/jetbrains/exposed/sql/IColumnType;)V
+	public fun toQueryBuilder (Lorg/jetbrains/exposed/sql/QueryBuilder;)V
+}
+
+public final class dev/slne/surf/cloud/api/server/exposed/columns/CurrentZonedDateTime : dev/slne/surf/cloud/api/server/exposed/columns/CurrentTimestampBase {
+	public static final field INSTANCE Ldev/slne/surf/cloud/api/server/exposed/columns/CurrentZonedDateTime;
+}
+
+public final class dev/slne/surf/cloud/api/server/exposed/columns/InetAddressColumnType : org/jetbrains/exposed/sql/ColumnType {
+	public fun <init> ()V
+	public synthetic fun notNullValueToDB (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun notNullValueToDB (Ljava/net/InetAddress;)Ljava/lang/Object;
+	public fun setParameter (Lorg/jetbrains/exposed/sql/statements/api/PreparedStatementApi;ILjava/lang/Object;)V
+	public fun sqlType ()Ljava/lang/String;
+	public synthetic fun valueFromDB (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun valueFromDB (Ljava/lang/Object;)Ljava/net/InetAddress;
+}
+
+public final class dev/slne/surf/cloud/api/server/exposed/columns/InetAddressColumnTypeKt {
+	public static final fun inet (Lorg/jetbrains/exposed/sql/Table;Ljava/lang/String;)Lorg/jetbrains/exposed/sql/Column;
+}
+
+public final class dev/slne/surf/cloud/api/server/exposed/columns/ZonedDateTimeColumnType : org/jetbrains/exposed/sql/ColumnType, org/jetbrains/exposed/sql/IDateColumnType {
+	public static final field Companion Ldev/slne/surf/cloud/api/server/exposed/columns/ZonedDateTimeColumnType$Companion;
+	public fun <init> ()V
+	public fun getHasTimePart ()Z
+	public synthetic fun nonNullValueAsDefaultString (Ljava/lang/Object;)Ljava/lang/String;
+	public fun nonNullValueAsDefaultString (Ljava/time/ZonedDateTime;)Ljava/lang/String;
+	public synthetic fun nonNullValueToString (Ljava/lang/Object;)Ljava/lang/String;
+	public fun nonNullValueToString (Ljava/time/ZonedDateTime;)Ljava/lang/String;
+	public synthetic fun notNullValueToDB (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun notNullValueToDB (Ljava/time/ZonedDateTime;)Ljava/lang/Object;
+	public fun readObject (Ljava/sql/ResultSet;I)Ljava/lang/Object;
+	public fun sqlType ()Ljava/lang/String;
+	public synthetic fun valueFromDB (Ljava/lang/Object;)Ljava/lang/Object;
+	public fun valueFromDB (Ljava/lang/Object;)Ljava/time/ZonedDateTime;
+}
+
+public final class dev/slne/surf/cloud/api/server/exposed/columns/ZonedDateTimeColumnType$Companion {
+}
+
+public final class dev/slne/surf/cloud/api/server/exposed/columns/ZonedDateTimeColumnTypeKt {
+	public static final fun zonedDateTime (Lorg/jetbrains/exposed/sql/Table;Ljava/lang/String;)Lorg/jetbrains/exposed/sql/Column;
+}
+
+public abstract class dev/slne/surf/cloud/api/server/exposed/service/AbstractExposedDAOService {
+	public fun <init> ()V
+	public fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/CoroutineContext;)V
+	public synthetic fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	protected abstract fun create (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	protected final fun evict (Ljava/lang/Object;)V
+	protected final fun find (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	protected final fun find (Ljava/lang/Object;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	protected final fun getCache ()Lcom/sksamuel/aedile/core/LoadingCache;
+	protected abstract fun load (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	protected final fun update (Ljava/lang/Object;ZLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun update$default (Ldev/slne/surf/cloud/api/server/exposed/service/AbstractExposedDAOService;Ljava/lang/Object;ZLkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
+	protected final fun withTransaction (Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public abstract interface annotation class dev/slne/surf/cloud/api/server/exposed/service/DirectCacheAccess : java/lang/annotation/Annotation {
+}
+
+public abstract class dev/slne/surf/cloud/api/server/exposed/table/AuditableLongEntity : org/jetbrains/exposed/dao/LongEntity {
+	public fun <init> (Lorg/jetbrains/exposed/dao/id/EntityID;Ldev/slne/surf/cloud/api/server/exposed/table/AuditableLongIdTable;)V
+	public final fun getCreatedAt ()Ljava/time/ZonedDateTime;
+	public final fun getUpdatedAt ()Ljava/time/ZonedDateTime;
+	public final fun setUpdatedAt (Ljava/time/ZonedDateTime;)V
+}
+
+public abstract class dev/slne/surf/cloud/api/server/exposed/table/AuditableLongEntityClass : org/jetbrains/exposed/dao/LongEntityClass {
+	public fun <init> (Ldev/slne/surf/cloud/api/server/exposed/table/AuditableLongIdTable;)V
+}
+
+public class dev/slne/surf/cloud/api/server/exposed/table/AuditableLongIdTable : org/jetbrains/exposed/dao/id/LongIdTable {
+	public fun <init> ()V
+	public fun <init> (Ljava/lang/String;)V
+	public synthetic fun <init> (Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public final fun getCreatedAt ()Lorg/jetbrains/exposed/sql/Column;
+	public final fun getUpdatedAt ()Lorg/jetbrains/exposed/sql/Column;
+}
+
+public abstract class dev/slne/surf/cloud/api/server/jpa/SurfAuditableEntity : dev/slne/surf/cloud/api/server/jpa/SurfEntity {
+	public fun <init> ()V
+	public fun getCreatedDate ()Ljava/time/ZonedDateTime;
+	public fun getLastModifiedDate ()Ljava/time/ZonedDateTime;
+	public fun setCreatedDate (Ljava/time/ZonedDateTime;)V
+	public fun setLastModifiedDate (Ljava/time/ZonedDateTime;)V
+}
+
+public abstract class dev/slne/surf/cloud/api/server/jpa/SurfEntity : org/springframework/data/domain/Persistable {
+	public fun <init> ()V
+	public final fun equals (Ljava/lang/Object;)Z
+	public fun getId ()Ljava/lang/Long;
+	public synthetic fun getId ()Ljava/lang/Object;
+	public final fun hashCode ()I
+	public fun isNew ()Z
+	public fun setId (Ljava/lang/Long;)V
+	public fun toString ()Ljava/lang/String;
+}
+
+public abstract class dev/slne/surf/cloud/api/server/jpa/service/AbstractSpringJpaService {
+	public fun <init> ()V
+	public fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/CoroutineContext;)V
+	public synthetic fun <init> (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/CoroutineContext;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	protected final fun evict (Ljava/lang/Object;)V
+	protected final fun find (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	protected final fun getCache ()Lcom/sksamuel/aedile/core/LoadingCache;
+	protected abstract fun load (Ljava/lang/Object;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	protected abstract fun runInTransaction (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	protected final fun update (Ljava/lang/Object;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/server/ktor/ExtensionKt {
+	public static final fun respondCss (Lio/ktor/server/application/ApplicationCall;Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public abstract interface annotation class dev/slne/surf/cloud/api/server/meta/SurfJpaRepository : java/lang/annotation/Annotation {
+	public abstract fun value ()Ljava/lang/String;
+}
+
+public abstract interface annotation class dev/slne/surf/cloud/api/server/meta/SurfRedisRepository : java/lang/annotation/Annotation {
+	public abstract fun value ()Ljava/lang/String;
+}
+
+public abstract interface annotation class dev/slne/surf/cloud/api/server/plugin/AdditionalStandaloneConfiguration : java/lang/annotation/Annotation {
+}
+
+public class dev/slne/surf/cloud/api/server/plugin/JpaAuditingConfiguration {
+	public fun <init> ()V
+	public fun auditingDateTimeProvider ()Lorg/springframework/data/auditing/DateTimeProvider;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/server/plugin/KtorPlugin {
+	public abstract fun configure (Lio/ktor/server/application/Application;)Lkotlin/jvm/functions/Function0;
+	public abstract fun installRoutes (Lio/ktor/server/routing/Routing;)V
+}
+
+public final class dev/slne/surf/cloud/api/server/plugin/KtorPlugin$DefaultImpls {
+	public static fun configure (Ldev/slne/surf/cloud/api/server/plugin/KtorPlugin;Lio/ktor/server/application/Application;)Lkotlin/jvm/functions/Function0;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/server/plugin/PluginManager {
+	public static final field Companion Ldev/slne/surf/cloud/api/server/plugin/PluginManager$Companion;
+	public abstract fun clearPlugins (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun disablePlugin (Ldev/slne/surf/cloud/api/server/plugin/StandalonePlugin;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun disablePlugins (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun enablePlugin (Ldev/slne/surf/cloud/api/server/plugin/StandalonePlugin;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun getPlugin (Ljava/lang/String;)Ldev/slne/surf/cloud/api/server/plugin/StandalonePlugin;
+	public abstract fun getPlugins ()[Ldev/slne/surf/cloud/api/server/plugin/StandalonePlugin;
+	public abstract fun isPluginEnabled (Ldev/slne/surf/cloud/api/server/plugin/StandalonePlugin;)Z
+	public abstract fun isPluginEnabled (Ljava/lang/String;)Z
+}
+
+public final class dev/slne/surf/cloud/api/server/plugin/PluginManager$Companion {
+	public final fun getInstance ()Ldev/slne/surf/cloud/api/server/plugin/PluginManager;
+}
+
+public abstract class dev/slne/surf/cloud/api/server/plugin/StandalonePlugin : net/kyori/adventure/key/Namespaced {
+	public static final field Companion Ldev/slne/surf/cloud/api/server/plugin/StandalonePlugin$Companion;
+	public fun <init> ()V
+	public fun deleteNotInterestingPlayerData (Ljava/util/UUID;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun disable (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun enable (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun exportPlayerData (Ljava/util/UUID;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun getClassLoader ()Ljava/lang/ClassLoader;
+	public final fun getDataFolder ()Ljava/nio/file/Path;
+	public final fun getDispatcher ()Lkotlin/coroutines/CoroutineContext;
+	public final fun getEnabled ()Z
+	public final fun getLogger ()Lnet/kyori/adventure/text/logger/slf4j/ComponentLogger;
+	public final fun getMeta ()Ldev/slne/surf/cloud/api/server/plugin/configuration/PluginMeta;
+	public final fun getScope ()Lkotlinx/coroutines/CoroutineScope;
+	public final fun launch (Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/CoroutineStart;Lkotlin/jvm/functions/Function2;)Lkotlinx/coroutines/Job;
+	public static synthetic fun launch$default (Ldev/slne/surf/cloud/api/server/plugin/StandalonePlugin;Lkotlin/coroutines/CoroutineContext;Lkotlinx/coroutines/CoroutineStart;Lkotlin/jvm/functions/Function2;ILjava/lang/Object;)Lkotlinx/coroutines/Job;
+	public abstract fun load (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public fun namespace ()Ljava/lang/String;
+}
+
+public final class dev/slne/surf/cloud/api/server/plugin/StandalonePlugin$Companion {
+}
+
+public class dev/slne/surf/cloud/api/server/plugin/TransactionConfiguration {
+	public fun <init> ()V
+	public fun transactionOperations (Lorg/springframework/transaction/PlatformTransactionManager;)Lorg/springframework/transaction/support/TransactionOperations;
+	public fun txManager (Ljavax/sql/DataSource;)Lorg/springframework/jdbc/datasource/DataSourceTransactionManager;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/server/plugin/bootstrap/BootstrapContext : dev/slne/surf/cloud/api/server/plugin/bootstrap/StandalonePluginProviderContext {
+}
+
+public abstract interface class dev/slne/surf/cloud/api/server/plugin/bootstrap/StandalonePluginBootstrap {
+	public abstract fun bootstrap (Ldev/slne/surf/cloud/api/server/plugin/bootstrap/BootstrapContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun createPlugin (Ldev/slne/surf/cloud/api/server/plugin/bootstrap/StandalonePluginProviderContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/server/plugin/bootstrap/StandalonePluginBootstrap$DefaultImpls {
+	public static fun createPlugin (Ldev/slne/surf/cloud/api/server/plugin/bootstrap/StandalonePluginBootstrap;Ldev/slne/surf/cloud/api/server/plugin/bootstrap/StandalonePluginProviderContext;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/server/plugin/bootstrap/StandalonePluginProviderContext {
+	public abstract fun getDataPath ()Ljava/nio/file/Path;
+	public abstract fun getMeta ()Ldev/slne/surf/cloud/api/server/plugin/configuration/PluginMeta;
+	public abstract fun getPluginSource ()Ljava/nio/file/Path;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/server/plugin/configuration/PluginMeta {
+	public abstract fun getAuthors ()Ljava/util/Set;
+	public abstract fun getContributors ()Ljava/util/Set;
+	public abstract fun getDescription ()Ljava/lang/String;
+	public abstract fun getDisplayName ()Ljava/lang/String;
+	public abstract fun getLoadBefore ()Ljava/util/Set;
+	public abstract fun getMain ()Ljava/lang/String;
+	public abstract fun getName ()Ljava/lang/String;
+	public abstract fun getPluginDependencies ()Ljava/util/Set;
+	public abstract fun getPluginSoftDependencies ()Ljava/util/Set;
+	public abstract fun getVersion ()Ljava/lang/String;
+}
+
+public final class dev/slne/surf/cloud/api/server/plugin/configuration/PluginMeta$DefaultImpls {
+	public static fun getDisplayName (Ldev/slne/surf/cloud/api/server/plugin/configuration/PluginMeta;)Ljava/lang/String;
+}
+
+public final class dev/slne/surf/cloud/api/server/plugin/coroutine/CoroutineManager$Companion {
+}
+
+public abstract interface class dev/slne/surf/cloud/api/server/plugin/coroutine/CoroutineSession {
+	public abstract fun getDispatcher ()Lkotlin/coroutines/CoroutineContext;
+	public abstract fun getScope ()Lkotlinx/coroutines/CoroutineScope;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/server/plugin/loader/PluginClasspathBuilder {
+	public abstract fun addLibrary (Ldev/slne/surf/cloud/api/server/plugin/loader/library/ClassPathLibrary;)Ldev/slne/surf/cloud/api/server/plugin/loader/PluginClasspathBuilder;
+	public abstract fun getContext ()Ldev/slne/surf/cloud/api/server/plugin/bootstrap/StandalonePluginProviderContext;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/server/plugin/loader/StandalonePluginLoader {
+	public abstract fun classloader (Ldev/slne/surf/cloud/api/server/plugin/loader/PluginClasspathBuilder;)V
+}
+
+public abstract interface class dev/slne/surf/cloud/api/server/plugin/loader/library/ClassPathLibrary {
+	public abstract fun register (Ldev/slne/surf/cloud/api/server/plugin/loader/library/LibraryStore;)V
+}
+
+public final class dev/slne/surf/cloud/api/server/plugin/loader/library/LibraryLoadingException : java/lang/RuntimeException {
+	public fun <init> (Ljava/lang/String;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/Throwable;)V
+}
+
+public final class dev/slne/surf/cloud/api/server/plugin/loader/library/impl/JarLibrary : dev/slne/surf/cloud/api/server/plugin/loader/library/ClassPathLibrary {
+	public fun <init> (Ljava/nio/file/Path;)V
+	public final fun getPath ()Ljava/nio/file/Path;
+	public fun register (Ldev/slne/surf/cloud/api/server/plugin/loader/library/LibraryStore;)V
+}
+
+public final class dev/slne/surf/cloud/api/server/plugin/loader/library/impl/MavenLibraryResolver : dev/slne/surf/cloud/api/server/plugin/loader/library/ClassPathLibrary {
+	public fun <init> ()V
+	public final fun addDefaultRepositories ()V
+	public final fun addDependency (Ljava/lang/String;)V
+	public final fun addDependency (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
+	public final fun addDependency (Lorg/eclipse/aether/graph/Dependency;)V
+	public final fun addGoogle ()V
+	public final fun addGradlePluginPortal ()V
+	public final fun addJCenter ()V
+	public final fun addJitpack ()V
+	public final fun addMavenCentral ()V
+	public final fun addRepository (Lorg/eclipse/aether/repository/RemoteRepository;)V
+	public fun register (Ldev/slne/surf/cloud/api/server/plugin/loader/library/LibraryStore;)V
+}
+
+public final class dev/slne/surf/cloud/api/server/plugin/provider/ProviderLoader {
+	public static final field INSTANCE Ldev/slne/surf/cloud/api/server/plugin/provider/ProviderLoader;
+	public final fun loadClass (Ljava/lang/String;Ljava/lang/Class;Ljava/lang/ClassLoader;Lkotlin/jvm/functions/Function0;)Ljava/lang/Object;
+	public static synthetic fun loadClass$default (Ldev/slne/surf/cloud/api/server/plugin/provider/ProviderLoader;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/ClassLoader;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/server/plugin/provider/classloader/SpringPluginClassloaderStorage$Companion {
+	public final fun getInstance ()Ldev/slne/surf/cloud/api/server/plugin/provider/classloader/SpringPluginClassloaderStorage;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/server/server/ServerCloudServer : dev/slne/surf/cloud/api/common/server/CloudServer, dev/slne/surf/cloud/api/server/server/ServerCommonCloudServer {
+}
+
+public final class dev/slne/surf/cloud/api/server/server/ServerCloudServer$DefaultImpls {
+	public static fun getEmptySlots (Ldev/slne/surf/cloud/api/server/server/ServerCloudServer;)I
+	public static fun hasEmptySlots (Ldev/slne/surf/cloud/api/server/server/ServerCloudServer;)Z
+}
+
+public abstract interface class dev/slne/surf/cloud/api/server/server/ServerCloudServerManager : dev/slne/surf/cloud/api/common/server/CloudServerManager {
+	public static final field Companion Ldev/slne/surf/cloud/api/server/server/ServerCloudServerManager$Companion;
+	public abstract fun retrieveServerByCategoryAndName (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun retrieveServerById (JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun retrieveServerByName (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public abstract fun retrieveServersByCategory (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+}
+
+public final class dev/slne/surf/cloud/api/server/server/ServerCloudServerManager$Companion {
+	public final fun getInstance ()Ldev/slne/surf/cloud/api/server/server/ServerCloudServerManager;
+}
+
+public final class dev/slne/surf/cloud/api/server/server/ServerCloudServerManagerKt {
+	public static final fun getServerServerManager ()Ldev/slne/surf/cloud/api/server/server/ServerCloudServerManager;
+}
+
+public abstract interface class dev/slne/surf/cloud/api/server/server/ServerCommonCloudServer : dev/slne/surf/cloud/api/common/server/CommonCloudServer {
+	public abstract fun getConnection ()Ldev/slne/surf/cloud/api/common/netty/network/Connection;
+}
+
+public final class dev/slne/surf/cloud/api/server/server/ServerCommonCloudServer$DefaultImpls {
+	public static fun getEmptySlots (Ldev/slne/surf/cloud/api/server/server/ServerCommonCloudServer;)I
+	public static fun hasEmptySlots (Ldev/slne/surf/cloud/api/server/server/ServerCommonCloudServer;)Z
+}
+
+public abstract interface class dev/slne/surf/cloud/api/server/server/ServerProxyCloudServer : dev/slne/surf/cloud/api/common/server/ProxyCloudServer, dev/slne/surf/cloud/api/server/server/ServerCommonCloudServer {
+}
+
+public final class dev/slne/surf/cloud/api/server/server/ServerProxyCloudServer$DefaultImpls {
+	public static fun getEmptySlots (Ldev/slne/surf/cloud/api/server/server/ServerProxyCloudServer;)I
+	public static fun hasEmptySlots (Ldev/slne/surf/cloud/api/server/server/ServerProxyCloudServer;)Z
+}
+
diff --git a/surf-cloud-api/surf-cloud-api-server/build.gradle.kts b/surf-cloud-api/surf-cloud-api-server/build.gradle.kts
index 19b2d421..7db901ea 100644
--- a/surf-cloud-api/surf-cloud-api-server/build.gradle.kts
+++ b/surf-cloud-api/surf-cloud-api-server/build.gradle.kts
@@ -1,11 +1,22 @@
 plugins {
     id("dev.slne.surf.surfapi.gradle.core")
-    `core-convention`
 }
 
 dependencies {
     api(project(":surf-cloud-api:surf-cloud-api-common"))
 
-    api("org.apache.maven:maven-impl:4.0.0-rc-2")
-    api("org.apache.maven.resolver:maven-resolver-supplier-mvn4:2.0.5")
+    api(libs.jakarta.persistence.api)
+    api(libs.spring.data.jpa)
+    api(libs.bundles.flyway)
+    api(libs.bundles.exposed.api.server)
+    api(libs.bundles.maven.libraries)
+    api(libs.bundles.console.api)
+    api(libs.bundles.ktor.api.server)
+    api(libs.bson.kotlinx)
+}
+
+kotlin {
+    compilerOptions {
+        optIn.add("dev.slne.surf.cloud.api.common.util.annotation.InternalApi")
+    }
 }
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/java/dev/slne/surf/cloud/api/server/jpa/SurfAuditableEntity.java b/surf-cloud-api/surf-cloud-api-server/src/main/java/dev/slne/surf/cloud/api/server/jpa/SurfAuditableEntity.java
new file mode 100644
index 00000000..27c5ea9c
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/java/dev/slne/surf/cloud/api/server/jpa/SurfAuditableEntity.java
@@ -0,0 +1,38 @@
+package dev.slne.surf.cloud.api.server.jpa;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.MappedSuperclass;
+import java.time.ZonedDateTime;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+@MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
+public abstract class SurfAuditableEntity extends SurfEntity {
+
+  @CreatedDate
+  @Column(name = "created_date")
+  private ZonedDateTime createdDate;
+
+  @LastModifiedDate
+  @Column(name = "last_modified_date")
+  private ZonedDateTime lastModifiedDate;
+
+  public ZonedDateTime getLastModifiedDate() {
+    return lastModifiedDate;
+  }
+
+  public void setLastModifiedDate(ZonedDateTime lastModifiedDate) {
+    this.lastModifiedDate = lastModifiedDate;
+  }
+
+  public ZonedDateTime getCreatedDate() {
+    return createdDate;
+  }
+
+  public void setCreatedDate(ZonedDateTime createdDate) {
+    this.createdDate = createdDate;
+  }
+}
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/java/dev/slne/surf/cloud/api/server/jpa/SurfEntity.java b/surf-cloud-api/surf-cloud-api-server/src/main/java/dev/slne/surf/cloud/api/server/jpa/SurfEntity.java
new file mode 100644
index 00000000..4ecafb25
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/java/dev/slne/surf/cloud/api/server/jpa/SurfEntity.java
@@ -0,0 +1,62 @@
+package dev.slne.surf.cloud.api.server.jpa;
+
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.Transient;
+import java.util.Objects;
+import org.springframework.data.domain.Persistable;
+import org.springframework.data.util.ProxyUtils;
+import org.springframework.lang.Nullable;
+
+/**
+ * Base class for JPA entities in the Surf Cloud application. Implements the {@link Persistable}
+ * interface to provide consistent behavior for entity lifecycle operations.
+ */
+@MappedSuperclass
+public abstract class SurfEntity implements Persistable<Long> {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Nullable
+  private Long id;
+
+  @Nullable
+  @Override
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(@Nullable Long id) {
+    this.id = id;
+  }
+
+  @Transient
+  @Override
+  public boolean isNew() {
+    return null == getId();
+  }
+
+  @Override
+  public String toString() {
+    return String.format("Entity of type %s with id: %s", this.getClass().getName(), getId());
+  }
+
+  @Override
+  public final boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || ProxyUtils.getUserClass(this) != ProxyUtils.getUserClass(o)) {
+      return false;
+    }
+    SurfEntity that = (SurfEntity) o;
+    return getId() != null && Objects.equals(getId(), that.getId());
+  }
+
+  @Override
+  public final int hashCode() {
+    return ProxyUtils.getUserClass(this).hashCode();
+  }
+}
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/CloudServerInstance.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/CloudServerInstance.kt
new file mode 100644
index 00000000..f50f42f4
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/CloudServerInstance.kt
@@ -0,0 +1,14 @@
+package dev.slne.surf.cloud.api.server
+
+import dev.slne.surf.cloud.api.common.CloudInstance
+import org.jetbrains.annotations.ApiStatus
+import java.util.*
+
+@ApiStatus.NonExtendable
+interface CloudServerInstance : CloudInstance {
+    suspend fun exportPlayerData(uuid: UUID): String
+    suspend fun deleteNotInterestingPlayerData(uuid: UUID)
+
+    companion object :
+        CloudServerInstance by CloudInstance.instance as CloudServerInstance
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/command/CommandCompletion.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/command/CommandCompletion.kt
new file mode 100644
index 00000000..f4b98ceb
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/command/CommandCompletion.kt
@@ -0,0 +1,8 @@
+package dev.slne.surf.cloud.api.server.command
+
+import net.kyori.adventure.text.Component
+
+data class CommandCompletion(
+    val suggestion: String,
+    val tooltip: Component? = null,
+)
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/command/CommandException.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/command/CommandException.kt
new file mode 100644
index 00000000..ed290e44
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/command/CommandException.kt
@@ -0,0 +1,18 @@
+package dev.slne.surf.cloud.api.server.command
+
+import java.io.Serial
+
+/**
+ * Thrown when an unhandled exception occurs during the execution of a Command.
+ *
+ * This should generally not be used directly
+ */
+class CommandException : RuntimeException {
+    constructor(message: String) : super(message)
+    constructor(message: String, cause: Throwable) : super(message, cause)
+
+    companion object {
+        @Serial
+        private const val serialVersionUID: Long = -3968454023580552854L
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/command/CommandResultCallback.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/command/CommandResultCallback.kt
new file mode 100644
index 00000000..d135c3e7
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/command/CommandResultCallback.kt
@@ -0,0 +1,28 @@
+package dev.slne.surf.cloud.api.server.command
+
+fun interface CommandResultCallback {
+    fun onResult(success: Boolean, result: Int)
+    fun onSuccess(result: Int) = onResult(true, result)
+    fun onFailure() = onResult(false, 0)
+
+    operator fun plus(other: CommandResultCallback): CommandResultCallback = chain(this, other)
+
+    companion object {
+        val EMPTY = object : CommandResultCallback {
+            override fun onResult(success: Boolean, result: Int) = Unit
+            override fun toString(): String = "<empty>"
+        }
+
+        fun chain(
+            first: CommandResultCallback,
+            second: CommandResultCallback
+        ): CommandResultCallback {
+            if (first == EMPTY) return second
+            if (second == EMPTY) return first
+            return CommandResultCallback { success, result ->
+                first.onResult(success, result)
+                second.onResult(success, result)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/command/CommandSource.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/command/CommandSource.kt
new file mode 100644
index 00000000..cdc24a26
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/command/CommandSource.kt
@@ -0,0 +1,65 @@
+package dev.slne.surf.cloud.api.server.command
+
+import com.mojang.brigadier.exceptions.CommandExceptionType
+import dev.slne.surf.surfapi.core.api.messages.Colors
+import net.kyori.adventure.text.Component
+import net.kyori.adventure.text.logger.slf4j.ComponentLogger
+
+class CommandSource(
+    silent: Boolean = false,
+    callback: CommandResultCallback = CommandResultCallback.EMPTY
+) : ExecutionCommandSource<CommandSource> {
+
+    private val logger = ComponentLogger.logger("Commands")
+
+    override var callback = callback
+        private set
+    override var silent = silent
+        private set
+
+    fun sendFailure(message: Component) {
+        if (!silent) {
+            logger.error(message.colorIfAbsent(Colors.ERROR))
+        }
+    }
+
+    fun sendSuccess(message: Component) {
+        if (!silent) {
+            logger.info(message.colorIfAbsent(Colors.SUCCESS))
+        }
+    }
+
+    fun sendInfo(info: Component) {
+        if (!silent) {
+            logger.info(info.colorIfAbsent(Colors.INFO))
+        }
+    }
+
+    fun sendMessage(message: Component) {
+        if (!silent) {
+            logger.info(message)
+        }
+    }
+
+    fun sendSuccess(message: String) = sendSuccess(Component.text(message))
+
+    override fun withCallback(callback: CommandResultCallback): CommandSource {
+        if (this.callback == callback) return this
+        return copy(callback = callback)
+    }
+
+    override fun handleError(
+        exceptionType: CommandExceptionType,
+        message: Component,
+        success: Boolean
+    ) {
+        if (!success) {
+            sendFailure(message)
+        }
+    }
+
+    private fun copy(
+        silent: Boolean = this.silent,
+        callback: CommandResultCallback = this.callback
+    ) = CommandSource(silent, callback)
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/command/ConsoleCommand.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/command/ConsoleCommand.kt
new file mode 100644
index 00000000..e9ed23a4
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/command/ConsoleCommand.kt
@@ -0,0 +1,10 @@
+package dev.slne.surf.cloud.api.server.command
+
+import com.mojang.brigadier.builder.LiteralArgumentBuilder
+
+interface ConsoleCommand
+
+inline fun <S> ConsoleCommand.literal(
+    literal: String,
+    block: LiteralArgumentBuilder<S>.() -> Unit = {}
+): LiteralArgumentBuilder<S> = LiteralArgumentBuilder.literal<S>(literal).apply(block)
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/command/ExecutionCommandSource.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/command/ExecutionCommandSource.kt
new file mode 100644
index 00000000..dda787ad
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/command/ExecutionCommandSource.kt
@@ -0,0 +1,30 @@
+package dev.slne.surf.cloud.api.server.command
+
+import com.mojang.brigadier.CommandDispatcher
+import com.mojang.brigadier.ResultConsumer
+import com.mojang.brigadier.exceptions.CommandExceptionType
+import com.mojang.brigadier.exceptions.CommandSyntaxException
+import net.kyori.adventure.text.Component
+
+interface ExecutionCommandSource<T : ExecutionCommandSource<T>> {
+    val callback: CommandResultCallback
+    val silent: Boolean
+
+    fun withCallback(callback: CommandResultCallback): T
+    fun clearCallbacks(): T = withCallback(CommandResultCallback.EMPTY)
+
+    fun handleError(exceptionType: CommandExceptionType, message: Component, success: Boolean)
+    fun handleError(exception: CommandSyntaxException, success: Boolean) =
+        handleError(exception.type, Component.text(exception.rawMessage.string), success)
+
+    companion object {
+        fun <T : ExecutionCommandSource<T>> resultConsumer() =
+            ResultConsumer<T> { source, success, result ->
+                source.source.callback.onResult(
+                    success,
+                    result
+                )
+            }
+    }
+
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/command/util/command-extensions.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/command/util/command-extensions.kt
new file mode 100644
index 00000000..16ed3256
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/command/util/command-extensions.kt
@@ -0,0 +1,7 @@
+package dev.slne.surf.cloud.api.server.command.util
+
+import com.mojang.brigadier.context.StringRange
+
+operator fun StringRange.contains(index: Int): Boolean {
+    return index >= start && index <= end
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/export/PlayerDataExport.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/export/PlayerDataExport.kt
new file mode 100644
index 00000000..5fb07ab5
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/export/PlayerDataExport.kt
@@ -0,0 +1,8 @@
+package dev.slne.surf.cloud.api.server.export
+
+import kotlinx.serialization.Serializable
+
+interface PlayerDataExport
+
+@Serializable
+object PlayerDataExportEmpty : PlayerDataExport
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/export/RootExportPlayerData.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/export/RootExportPlayerData.kt
new file mode 100644
index 00000000..824395a8
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/export/RootExportPlayerData.kt
@@ -0,0 +1,7 @@
+package dev.slne.surf.cloud.api.server.export
+
+import kotlinx.serialization.Contextual
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RootExportPlayerData(@Contextual val data: List<PlayerDataExport>) : PlayerDataExport
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/exposed/columns/CharUuidColumnType.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/exposed/columns/CharUuidColumnType.kt
new file mode 100644
index 00000000..74167be2
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/exposed/columns/CharUuidColumnType.kt
@@ -0,0 +1,34 @@
+package dev.slne.surf.cloud.api.server.exposed.columns
+
+import org.intellij.lang.annotations.Language
+import org.jetbrains.exposed.sql.Column
+import org.jetbrains.exposed.sql.ColumnType
+import org.jetbrains.exposed.sql.Table
+import java.nio.ByteBuffer
+import java.util.*
+
+class CharUuidColumnType : ColumnType<UUID>() {
+    @Language("SQL")
+    override fun sqlType(): String = "CHAR(36)"
+
+    override fun valueFromDB(value: Any): UUID? = when {
+        value is UUID -> value
+        value is ByteArray -> ByteBuffer.wrap(value).let { UUID(it.long, it.long) }
+        value is String && value.matches(uuidRegexp) -> UUID.fromString(value)
+        value is String -> ByteBuffer.wrap(value.toByteArray()).let { UUID(it.long, it.long) }
+        else -> error("Unexpected value of type UUID: $value of ${value::class.qualifiedName}")
+    }
+
+    override fun notNullValueToDB(value: UUID): Any = value.toString()
+    override fun nonNullValueToString(value: UUID): String = "'$value'"
+
+    companion object {
+        private val uuidRegexp =
+            Regex(
+                "[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}",
+                RegexOption.IGNORE_CASE
+            )
+    }
+}
+
+fun Table.charUuid(name: String): Column<UUID> = registerColumn(name, CharUuidColumnType())
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/exposed/columns/InetAddressColumnType.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/exposed/columns/InetAddressColumnType.kt
new file mode 100644
index 00000000..32be0224
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/exposed/columns/InetAddressColumnType.kt
@@ -0,0 +1,31 @@
+package dev.slne.surf.cloud.api.server.exposed.columns
+
+import org.jetbrains.exposed.sql.Column
+import org.jetbrains.exposed.sql.ColumnType
+import org.jetbrains.exposed.sql.Table
+import org.jetbrains.exposed.sql.statements.api.PreparedStatementApi
+import org.jetbrains.exposed.sql.vendors.currentDialect
+import java.net.InetAddress
+
+class InetAddressColumnType : ColumnType<InetAddress>() {
+    override fun sqlType(): String = currentDialect.dataTypeProvider.varcharType(45)
+
+    override fun valueFromDB(value: Any): InetAddress = when (value) {
+        is InetAddress -> value
+        is String -> InetAddress.getByName(value)
+        is ByteArray -> InetAddress.getByAddress(value)
+        else -> error("Cannot convert $value to InetAddress")
+    }
+
+    override fun notNullValueToDB(value: InetAddress): Any = value.hostAddress
+
+    override fun setParameter(stmt: PreparedStatementApi, index: Int, value: Any?) {
+        if (value is InetAddress) {
+            stmt[index] = value.hostAddress
+        } else {
+            super.setParameter(stmt, index, value)
+        }
+    }
+}
+
+fun Table.inet(name: String): Column<InetAddress> = registerColumn(name, InetAddressColumnType())
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/exposed/columns/ZonedDateTimeColumnType.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/exposed/columns/ZonedDateTimeColumnType.kt
new file mode 100644
index 00000000..48ec2cab
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/exposed/columns/ZonedDateTimeColumnType.kt
@@ -0,0 +1,158 @@
+package dev.slne.surf.cloud.api.server.exposed.columns
+
+import org.jetbrains.exposed.sql.*
+import org.jetbrains.exposed.sql.Function
+import org.jetbrains.exposed.sql.vendors.*
+import java.sql.ResultSet
+import java.sql.Timestamp
+import java.time.*
+import java.time.format.DateTimeFormatter
+import java.util.*
+
+private val SQLITE_AND_ORACLE_DATE_TIME_STRING_FORMATTER by lazy {
+    DateTimeFormatter.ofPattern(
+        "yyyy-MM-dd HH:mm:ss.SSS",
+        Locale.ROOT
+    ).withZone(ZoneOffset.UTC)
+}
+
+private val MYSQL_FRACTION_DATE_TIME_STRING_FORMATTER by lazy {
+    DateTimeFormatter.ofPattern(
+        "yyyy-MM-dd HH:mm:ss.SSSSSS",
+        Locale.ROOT
+    ).withZone(ZoneOffset.UTC)
+}
+
+private val MYSQL_DATE_TIME_STRING_FORMATTER by lazy {
+    DateTimeFormatter.ofPattern(
+        "yyyy-MM-dd HH:mm:ss",
+        Locale.ROOT
+    ).withZone(ZoneOffset.UTC)
+}
+
+private val DEFAULT_DATE_TIME_STRING_FORMATTER by lazy {
+    DateTimeFormatter.ISO_LOCAL_DATE_TIME.withLocale(Locale.ROOT).withZone(ZoneOffset.UTC)
+}
+
+private fun oracleDateTimeLiteral(instant: Instant) =
+    "TO_TIMESTAMP('${SQLITE_AND_ORACLE_DATE_TIME_STRING_FORMATTER.format(instant)}', 'YYYY-MM-DD HH24:MI:SS.FF3')"
+
+private fun formatterForDateString(date: String) = dateTimeWithFractionFormat(
+    date.substringAfterLast('.', "").length
+)
+
+private fun dateTimeWithFractionFormat(fraction: Int): DateTimeFormatter {
+    val baseFormat = "yyyy-MM-dd HH:mm:ss"
+    val newFormat = if (fraction in 1..9) {
+        (1..fraction).joinToString(prefix = "$baseFormat.", separator = "") { "S" }
+    } else {
+        baseFormat
+    }
+    return DateTimeFormatter.ofPattern(newFormat).withLocale(Locale.ROOT).withZone(ZoneOffset.UTC)
+}
+
+class ZonedDateTimeColumnType : ColumnType<ZonedDateTime>(), IDateColumnType {
+    override val hasTimePart: Boolean = true
+    override fun sqlType(): String = currentDialect.dataTypeProvider.timestampType()
+
+    override fun nonNullValueToString(value: ZonedDateTime): String {
+        val instant = value.withZoneSameInstant(ZoneOffset.UTC).toInstant()
+
+        return when (val dialect = currentDialect) {
+            is SQLiteDialect -> "'${SQLITE_AND_ORACLE_DATE_TIME_STRING_FORMATTER.format(instant)}'"
+            is OracleDialect -> oracleDateTimeLiteral(instant)
+            is MysqlDialect -> {
+                val formatter =
+                    if (dialect.isFractionDateTimeSupported()) MYSQL_FRACTION_DATE_TIME_STRING_FORMATTER else MYSQL_DATE_TIME_STRING_FORMATTER
+                "'${formatter.format(instant)}'"
+            }
+
+            else -> "'${DEFAULT_DATE_TIME_STRING_FORMATTER.format(instant)}'"
+        }
+    }
+
+    override fun valueFromDB(value: Any): ZonedDateTime = when (value) {
+        is ZonedDateTime -> value
+        is OffsetDateTime -> value.toLocalDateTime().atZone(ZoneId.systemDefault())
+        is LocalDateTime -> value.atZone(ZoneId.systemDefault())
+        is Timestamp -> value.toLocalDateTime().atZone(ZoneId.systemDefault())
+        is java.util.Date -> value.toInstant().atZone(ZoneId.systemDefault())
+        is Instant -> value.atZone(ZoneId.systemDefault())
+        is Int -> longToZonedDateTime(value.toLong())
+        is Long -> longToZonedDateTime(value)
+        is String -> runCatching { ZonedDateTime.parse(value, formatterForDateString(value)) }
+            .getOrElse {
+                runCatching { Instant.parse(value).atZone(ZoneOffset.UTC) }
+                    .getOrElse { error("Cannot parse ZonedDateTime from String: $value") }
+            }
+
+        else -> error("Unexpected value of type ZonedDateTime: $value of ${value::class.qualifiedName}")
+    }
+
+
+    override fun notNullValueToDB(value: ZonedDateTime): Any = when {
+        currentDialect is SQLiteDialect -> SQLITE_AND_ORACLE_DATE_TIME_STRING_FORMATTER.format(
+            LocalDateTime.ofInstant(value.toInstant(), ZoneOffset.UTC)
+        )
+
+        else -> {
+            val datetime = LocalDateTime.ofInstant(value.toInstant(), ZoneOffset.UTC)
+            Timestamp.valueOf(datetime)
+        }
+    }
+
+    override fun readObject(rs: ResultSet, index: Int): Any? {
+        return if (currentDialect is OracleDialect) {
+            rs.getObject(index, Timestamp::class.java)
+        } else {
+            super.readObject(rs, index)
+        }
+    }
+
+    override fun nonNullValueAsDefaultString(value: ZonedDateTime): String {
+        val dialect = currentDialect
+        return when {
+            dialect is PostgreSQLDialect ->
+                "'${
+                    SQLITE_AND_ORACLE_DATE_TIME_STRING_FORMATTER.format(
+                        value.withZoneSameInstant(
+                            ZoneOffset.UTC
+                        )
+                    ).trimEnd('0').trimEnd('.')
+                }'::timestamp without time zone"
+
+            (dialect as? H2Dialect)?.h2Mode == H2Dialect.H2CompatibilityMode.Oracle ->
+                "'${
+                    SQLITE_AND_ORACLE_DATE_TIME_STRING_FORMATTER.format(
+                        value.withZoneSameInstant(
+                            ZoneOffset.UTC
+                        )
+                    ).trimEnd('0').trimEnd('.')
+                }'"
+
+            else -> super.nonNullValueAsDefaultString(value)
+        }
+    }
+
+    private fun longToZonedDateTime(value: Long) =
+        ZonedDateTime.ofInstant(Instant.ofEpochMilli(value), ZoneId.systemDefault())
+
+    companion object {
+        internal val INSTANCE = ZonedDateTimeColumnType()
+    }
+}
+
+fun Table.zonedDateTime(name: String): Column<ZonedDateTime> =
+    registerColumn(name, ZonedDateTimeColumnType())
+
+
+open class CurrentTimestampBase<T>(columnType: IColumnType<T & Any>) : Function<T>(columnType) {
+    override fun toQueryBuilder(queryBuilder: QueryBuilder) = queryBuilder {
+        +when {
+            (currentDialect as? MysqlDialect)?.isFractionDateTimeSupported() == true -> "CURRENT_TIMESTAMP(6)"
+            else -> "CURRENT_TIMESTAMP"
+        }
+    }
+}
+
+object CurrentZonedDateTime : CurrentTimestampBase<ZonedDateTime>(ZonedDateTimeColumnType.INSTANCE)
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/exposed/service/AbstractExposedDAOService.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/exposed/service/AbstractExposedDAOService.kt
new file mode 100644
index 00000000..f17cab77
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/exposed/service/AbstractExposedDAOService.kt
@@ -0,0 +1,113 @@
+package dev.slne.surf.cloud.api.server.exposed.service
+
+import com.github.benmanes.caffeine.cache.Caffeine
+import com.sksamuel.aedile.core.asLoadingCache
+import kotlinx.coroutines.CoroutineName
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import org.checkerframework.checker.units.qual.K
+import org.jetbrains.exposed.dao.Entity
+import org.jetbrains.exposed.sql.Transaction
+import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction
+import kotlin.coroutines.CoroutineContext
+
+/**
+ * Abstract service class for managing Exposed DAO entities with caching support.
+ *
+ * @param K The type of the key used for caching.
+ * @param V The type of the Exposed [Entity] being managed.
+ * @param cacheCustomizer A lambda function to customize the Caffeine cache configuration.
+ * @param context The [CoroutineContext] in which transactions and cache operations are executed. Defaults to [Dispatchers.IO].
+ */
+@OptIn(DirectCacheAccess::class)
+abstract class AbstractExposedDAOService<K, V : Entity<*>>(
+    cacheCustomizer: Caffeine<Any, Any>.() -> Unit = {},
+    private val context: CoroutineContext = Dispatchers.IO
+) {
+    /**
+     * Cache for storing loaded entities, using Caffeine with coroutine-based loading.
+     */
+    @DirectCacheAccess
+    protected val cache = Caffeine.newBuilder()
+        .apply(cacheCustomizer)
+        .run {
+            val cacheName = CoroutineName("${this::class.simpleName} Cache")
+            val cacheContext = context + cacheName + SupervisorJob()
+
+            asLoadingCache<K, V?>(CoroutineScope(cacheContext)) {
+                withTransaction {
+                    load(it)
+                }
+            }
+        }
+
+    /**
+     * Loads an entity based on the given key. Must be implemented by subclasses.
+     *
+     * @param key The key used to identify the entity.
+     * @return The loaded entity, or `null` if not found.
+     */
+    protected abstract suspend fun load(key: K): V?
+    protected abstract suspend fun create(key: K): V?
+
+    /**
+     * Executes a suspendable transaction within the configured coroutine context.
+     *
+     * @param block The transactional block to execute.
+     * @return The result of the transaction.
+     */
+    protected suspend fun <T> withTransaction(block: suspend Transaction.() -> T) =
+        newSuspendedTransaction(context) {
+            block()
+        }
+
+    /**
+     * Retrieves an entity from the cache or loads it if not present.
+     *
+     * @param key The key used to identify the entity.
+     * @return The cached or loaded entity, or `null` if not found.
+     */
+    protected suspend fun find(key: K) = cache.get(key)
+
+    protected suspend fun <R> find(key: K, result: V.() -> R): R? = withTransaction {
+        val entity = cache.get(key) ?: return@withTransaction null
+        return@withTransaction entity.result()
+    }
+
+    /**
+     * Updates an entity by applying the given modification block.
+     *
+     * @param key The key used to identify the entity.
+     * @param block The modification block to apply to the entity.
+     * @return The updated entity, or `null` if not found.
+     */
+    protected suspend fun update(key: K, createIfMissing: Boolean = true, block: suspend V.() -> Unit) = withTransaction {
+        val entity = cache.get(key) ?: if (createIfMissing) create(key) else null
+        if (entity != null) {
+            entity.block()
+            cache.put(key, entity)
+        } else {
+            null
+        }
+    }
+
+    /**
+     * Removes an entity from the cache.
+     *
+     * @param key The key of the entity to evict.
+     */
+    protected fun evict(key: K) = cache.invalidate(key)
+}
+
+/**
+ * Opt-in annotation to indicate that direct access to the cache should be avoided unless necessary.
+ * Prefer using `find`, `update`, or other provided methods instead.
+ */
+@RequiresOptIn(
+    message = "Direct access to the cache is discouraged. Consider using provided methods like find() or update() instead.",
+    level = RequiresOptIn.Level.WARNING
+)
+@Retention(AnnotationRetention.BINARY)
+@Target(AnnotationTarget.PROPERTY, AnnotationTarget.FIELD, AnnotationTarget.FUNCTION)
+annotation class DirectCacheAccess
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/exposed/table/AuditableLongIdTable.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/exposed/table/AuditableLongIdTable.kt
new file mode 100644
index 00000000..83c9cf23
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/exposed/table/AuditableLongIdTable.kt
@@ -0,0 +1,36 @@
+package dev.slne.surf.cloud.api.server.exposed.table
+
+import dev.slne.surf.cloud.api.server.exposed.columns.CurrentZonedDateTime
+import dev.slne.surf.cloud.api.server.exposed.columns.zonedDateTime
+import dev.slne.surf.surfapi.core.api.util.logger
+import org.jetbrains.exposed.dao.*
+import org.jetbrains.exposed.dao.id.EntityID
+import org.jetbrains.exposed.dao.id.LongIdTable
+import java.time.ZonedDateTime
+
+open class AuditableLongIdTable(name: String = "") : LongIdTable(name) {
+    val createdAt = zonedDateTime("created_at").defaultExpression(CurrentZonedDateTime)
+    val updatedAt = zonedDateTime("updated_at").defaultExpression(CurrentZonedDateTime)
+}
+
+abstract class AuditableLongEntity(id: EntityID<Long>, table: AuditableLongIdTable) :
+    LongEntity(id) {
+    val createdAt by table.createdAt
+    var updatedAt by table.updatedAt
+}
+
+abstract class AuditableLongEntityClass<out E : AuditableLongEntity>(table: AuditableLongIdTable) :
+    LongEntityClass<E>(table) {
+    init {
+        EntityHook.subscribe { action ->
+            if (action.changeType == EntityChangeType.Updated) {
+                try {
+                    action.toEntity(this)?.updatedAt = ZonedDateTime.now()
+                } catch (_: Exception) {
+                    logger().atWarning()
+                        .log("Failed to update updatedAt field for entity: ${action.entityClass}")
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/jpa/SurfEntity.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/jpa/SurfEntity.kt
deleted file mode 100644
index 7f197943..00000000
--- a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/jpa/SurfEntity.kt
+++ /dev/null
@@ -1,96 +0,0 @@
-package dev.slne.surf.cloud.api.server.jpa
-
-import jakarta.persistence.*
-import org.springframework.data.domain.Persistable
-import org.springframework.data.jpa.domain.AbstractPersistable
-import org.springframework.data.util.ProxyUtils
-import org.springframework.lang.Nullable
-
-/**
- * Base class for JPA entities in the Surf Cloud application.
- * Implements the [Persistable] interface
- * to provide consistent behavior for entity lifecycle operations.
- */
-@MappedSuperclass
-abstract class SurfEntity : Persistable<Long?> {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Nullable
-    @JvmField
-    protected var id: Long? = null
-
-    /**
-     * Retrieves the entity's ID.
-     *
-     * @return The entity ID, or `null` if it has not been assigned yet.
-     */
-    override fun getId() = id
-
-    /**
-     * Sets the entity's ID.
-     *
-     * @param id The new ID value.
-     */
-    fun setId(id: Long?) {
-        this.id = id
-    }
-
-    /**
-     * Checks if the entity is new (not persisted).
-     *
-     * @return `true` if the entity is new; `false` otherwise.
-     */
-    @Transient
-    override fun isNew(): Boolean = null == id
-
-    /**
-     * Returns a string representation of the entity, including its type and ID.
-     *
-     * @return A string describing the entity.
-     */
-    override fun toString(): String {
-        return String.format(
-            "Entity of type %s with id: %s",
-            javaClass.name, getId()
-        )
-    }
-
-    /**
-     * Compares this entity with another for equality.
-     * Two entities are considered equal if they are of the same type
-     * and their IDs match.
-     *
-     * @param other The object to compare with.
-     * @return `true` if the entities are equal; `false` otherwise.
-     */
-    override fun equals(other: Any?): Boolean {
-        if (null == other) {
-            return false
-        }
-
-        if (this === other) {
-            return true
-        }
-
-        if (javaClass != ProxyUtils.getUserClass(other)) {
-            return false
-        }
-
-        val that = other as AbstractPersistable<*>
-
-        return null != this.getId() && this.getId() == that.id
-    }
-
-    /**
-     * Computes the hash code for the entity, based on its ID.
-     *
-     * @return The hash code.
-     */
-    override fun hashCode(): Int {
-        var hashCode = 17
-
-        hashCode += if (null == getId()) 0 else getId().hashCode() * 31
-
-        return hashCode
-    }
-}
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/jpa/service/AbstractSpringJpaService.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/jpa/service/AbstractSpringJpaService.kt
new file mode 100644
index 00000000..7ebd9076
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/jpa/service/AbstractSpringJpaService.kt
@@ -0,0 +1,52 @@
+@file:Suppress("OPT_IN_USAGE")
+
+package dev.slne.surf.cloud.api.server.jpa.service
+
+import com.github.benmanes.caffeine.cache.Caffeine
+import com.sksamuel.aedile.core.asLoadingCache
+import dev.slne.surf.cloud.api.server.exposed.service.DirectCacheAccess
+import kotlinx.coroutines.*
+import org.jetbrains.annotations.ApiStatus
+import kotlin.coroutines.CoroutineContext
+
+abstract class AbstractSpringJpaService<K, V>(
+    cacheCustomizer: Caffeine<Any, Any>.() -> Unit = {},
+    private val context: CoroutineContext = Dispatchers.IO
+) {
+
+    /**
+     * Cache for storing loaded entities, using Caffeine with coroutine-based loading.
+     */
+    @DirectCacheAccess
+    protected val cache = Caffeine.newBuilder()
+        .apply(cacheCustomizer)
+        .run {
+            val cacheName = CoroutineName("${this::class.simpleName} Cache")
+            val cacheContext = context + cacheName + SupervisorJob()
+
+            asLoadingCache<K, V?>(CoroutineScope(cacheContext)) { load(it) }
+        }
+
+    /**
+     * Loads an entity based on the given key. Must be implemented by subclasses.
+     *
+     * @param key The key used to identify the entity.
+     * @return The loaded entity, or `null` if not found.
+     */
+    protected abstract suspend fun load(key: K): V?
+
+    @ApiStatus.OverrideOnly
+    protected abstract suspend fun <R> runInTransaction(block: suspend () -> R): R
+
+    protected suspend fun update(key: K, block: suspend V.() -> Unit) = runInTransaction {
+        withContext(context) {
+            val entity = cache.get(key) ?: return@withContext null
+            block(entity)
+            entity
+        }
+    }
+
+    protected suspend fun find(key: K) = cache.get(key)
+
+    protected fun evict(key: K) = cache.invalidate(key)
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/ktor/extension.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/ktor/extension.kt
new file mode 100644
index 00000000..87a87072
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/ktor/extension.kt
@@ -0,0 +1,10 @@
+package dev.slne.surf.cloud.api.server.ktor
+
+import io.ktor.http.ContentType
+import io.ktor.server.application.ApplicationCall
+import io.ktor.server.response.respondText
+import kotlinx.css.CssBuilder
+
+suspend inline fun ApplicationCall.respondCss(builder: CssBuilder.() -> Unit) {
+    this.respondText(CssBuilder().apply(builder).toString(), ContentType.Text.CSS)
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/AdditionalStandaloneConfiguration.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/AdditionalStandaloneConfiguration.kt
new file mode 100644
index 00000000..d25f8e65
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/AdditionalStandaloneConfiguration.kt
@@ -0,0 +1,54 @@
+package dev.slne.surf.cloud.api.server.plugin
+
+import org.jetbrains.exposed.spring.autoconfigure.ExposedAutoConfiguration
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration
+import org.springframework.cache.annotation.EnableCaching
+import org.springframework.context.annotation.*
+import org.springframework.data.auditing.DateTimeProvider
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories
+import org.springframework.data.repository.util.TxUtils
+import org.springframework.jdbc.datasource.DataSourceTransactionManager
+import org.springframework.scheduling.annotation.EnableAsync
+import org.springframework.transaction.PlatformTransactionManager
+import org.springframework.transaction.annotation.EnableTransactionManagement
+import org.springframework.transaction.aspectj.AnnotationTransactionAspect
+import org.springframework.transaction.support.TransactionOperations
+import org.springframework.transaction.support.TransactionTemplate
+import java.time.ZonedDateTime
+import java.util.*
+import javax.sql.DataSource
+
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+@EnableJpaRepositories
+@Configuration
+@Import(TransactionConfiguration::class, JpaAuditingConfiguration::class)
+@ImportAutoConfiguration(ExposedAutoConfiguration::class)
+@EnableAsync(mode = AdviceMode.ASPECTJ)
+@EnableCaching(mode = AdviceMode.ASPECTJ)
+annotation class AdditionalStandaloneConfiguration
+
+@EnableJpaAuditing(dateTimeProviderRef = "auditingDateTimeProvider")
+@Configuration
+class JpaAuditingConfiguration {
+    @Bean
+    fun auditingDateTimeProvider() = DateTimeProvider { Optional.of(ZonedDateTime.now()) }
+}
+
+@EnableTransactionManagement(mode = AdviceMode.ASPECTJ)
+@Configuration
+@EnableLoadTimeWeaving(aspectjWeaving = EnableLoadTimeWeaving.AspectJWeaving.ENABLED)
+class TransactionConfiguration {
+
+    @Bean(TxUtils.DEFAULT_TRANSACTION_MANAGER)
+    @Primary
+    fun txManager(dataSource: DataSource) = DataSourceTransactionManager(dataSource).also {
+        AnnotationTransactionAspect.aspectOf().transactionManager = it
+    }
+
+    @Bean
+    fun transactionOperations(txManager: PlatformTransactionManager): TransactionOperations {
+        return TransactionTemplate(txManager)
+    }
+}
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/KtorPlugin.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/KtorPlugin.kt
new file mode 100644
index 00000000..23bee051
--- /dev/null
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/KtorPlugin.kt
@@ -0,0 +1,9 @@
+package dev.slne.surf.cloud.api.server.plugin
+
+import io.ktor.server.application.*
+import io.ktor.server.routing.*
+
+interface KtorPlugin {
+    fun Routing.installRoutes()
+    fun Application.configure() = {}
+}
\ No newline at end of file
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/PluginManager.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/PluginManager.kt
index cd3a35a0..4da2ae78 100644
--- a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/PluginManager.kt
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/PluginManager.kt
@@ -1,6 +1,6 @@
 package dev.slne.surf.cloud.api.server.plugin
 
-import dev.slne.surf.cloud.api.common.util.requiredService
+import dev.slne.surf.surfapi.core.api.util.requiredService
 
 
 interface PluginManager {
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/StandalonePlugin.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/StandalonePlugin.kt
index b3509e0c..19159999 100644
--- a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/StandalonePlugin.kt
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/StandalonePlugin.kt
@@ -2,21 +2,21 @@
 
 package dev.slne.surf.cloud.api.server.plugin
 
-import dev.slne.surf.cloud.api.common.util.InternalApi
+import dev.slne.surf.cloud.api.common.util.annotation.InternalApi
+import dev.slne.surf.cloud.api.server.export.PlayerDataExport
+import dev.slne.surf.cloud.api.server.export.PlayerDataExportEmpty
 import dev.slne.surf.cloud.api.server.plugin.configuration.PluginMeta
 import dev.slne.surf.cloud.api.server.plugin.coroutine.CoroutineManager
 import dev.slne.surf.cloud.api.server.plugin.provider.classloader.SpringPluginClassloader
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.CoroutineStart
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.isActive
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
+import net.kyori.adventure.key.Namespaced
 import net.kyori.adventure.text.logger.slf4j.ComponentLogger
 import java.nio.file.Path
+import java.util.*
 import kotlin.coroutines.CoroutineContext
 import kotlin.reflect.KClass
 
-abstract class StandalonePlugin {
+abstract class StandalonePlugin : Namespaced {
     var enabled = false
         private set
     lateinit var meta: PluginMeta
@@ -26,7 +26,7 @@ abstract class StandalonePlugin {
     lateinit var classLoader: ClassLoader
         private set
 
-    val logger = ComponentLogger.logger()
+    val logger = ComponentLogger.logger(javaClass)
     val scope get() = CoroutineManager.instance.getCoroutineSession(this).scope
     val dispatcher get() = CoroutineManager.instance.getCoroutineSession(this).dispatcher
 
@@ -39,6 +39,10 @@ abstract class StandalonePlugin {
     abstract suspend fun load()
     abstract suspend fun enable()
     abstract suspend fun disable()
+    open suspend fun exportPlayerData(uuid: UUID): PlayerDataExport {
+        return PlayerDataExportEmpty
+    }
+    open suspend fun deleteNotInterestingPlayerData(uuid: UUID) {}
 
     @InternalApi
     fun init(
@@ -76,6 +80,10 @@ abstract class StandalonePlugin {
         return scope.launch(context, start, block)
     }
 
+    override fun namespace(): String {
+        return meta.name.trim().replace(' ', '_').lowercase()
+    }
+
     companion object {
         inline fun <reified P : StandalonePlugin> getPlugin(clazz: KClass<P> = P::class): P {
             require(StandalonePlugin::class.java.isAssignableFrom(clazz.java)) { "Plugin class must be a subclass of StandalonePlugin" }
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/coroutine/CoroutineManager.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/coroutine/CoroutineManager.kt
index 40262216..37a4d586 100644
--- a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/coroutine/CoroutineManager.kt
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/coroutine/CoroutineManager.kt
@@ -1,8 +1,8 @@
 package dev.slne.surf.cloud.api.server.plugin.coroutine
 
-import dev.slne.surf.cloud.api.common.util.InternalApi
-import dev.slne.surf.cloud.api.common.util.requiredService
+import dev.slne.surf.cloud.api.common.util.annotation.InternalApi
 import dev.slne.surf.cloud.api.server.plugin.StandalonePlugin
+import dev.slne.surf.surfapi.core.api.util.requiredService
 
 @InternalApi
 interface CoroutineManager {
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/dependency/DependencyContext.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/dependency/DependencyContext.kt
index c95773f4..92e186fc 100644
--- a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/dependency/DependencyContext.kt
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/dependency/DependencyContext.kt
@@ -1,6 +1,6 @@
 package dev.slne.surf.cloud.api.server.plugin.dependency
 
-import dev.slne.surf.cloud.api.common.util.InternalApi
+import dev.slne.surf.cloud.api.common.util.annotation.InternalApi
 import dev.slne.surf.cloud.api.server.plugin.configuration.PluginMeta
 
 @InternalApi
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/loader/library/ClassPathLibrary.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/loader/library/ClassPathLibrary.kt
index 413c881b..29c26ce2 100644
--- a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/loader/library/ClassPathLibrary.kt
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/loader/library/ClassPathLibrary.kt
@@ -2,7 +2,7 @@
 
 package dev.slne.surf.cloud.api.server.plugin.loader.library
 
-import dev.slne.surf.cloud.api.common.util.InternalApi
+import dev.slne.surf.cloud.api.common.util.annotation.InternalApi
 
 interface ClassPathLibrary {
     fun register(store: LibraryStore)
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/loader/library/LibraryStore.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/loader/library/LibraryStore.kt
index e5442e6e..2ecb1795 100644
--- a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/loader/library/LibraryStore.kt
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/loader/library/LibraryStore.kt
@@ -1,6 +1,6 @@
 package dev.slne.surf.cloud.api.server.plugin.loader.library
 
-import dev.slne.surf.cloud.api.common.util.InternalApi
+import dev.slne.surf.cloud.api.common.util.annotation.InternalApi
 import java.nio.file.Path
 
 @InternalApi
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/loader/library/impl/JarLibrary.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/loader/library/impl/JarLibrary.kt
index be3f645f..2ebb2c87 100644
--- a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/loader/library/impl/JarLibrary.kt
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/loader/library/impl/JarLibrary.kt
@@ -2,7 +2,7 @@
 
 package dev.slne.surf.cloud.api.server.plugin.loader.library.impl
 
-import dev.slne.surf.cloud.api.common.util.InternalApi
+import dev.slne.surf.cloud.api.common.util.annotation.InternalApi
 import dev.slne.surf.cloud.api.server.plugin.loader.library.ClassPathLibrary
 import dev.slne.surf.cloud.api.server.plugin.loader.library.LibraryLoadingException
 import dev.slne.surf.cloud.api.server.plugin.loader.library.LibraryStore
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/loader/library/impl/MavenLibraryResolver.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/loader/library/impl/MavenLibraryResolver.kt
index 83164b29..8c194e4a 100644
--- a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/loader/library/impl/MavenLibraryResolver.kt
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/loader/library/impl/MavenLibraryResolver.kt
@@ -2,8 +2,7 @@
 
 package dev.slne.surf.cloud.api.server.plugin.loader.library.impl
 
-import dev.slne.surf.cloud.api.common.util.InternalApi
-import dev.slne.surf.cloud.api.common.util.logger
+import dev.slne.surf.cloud.api.common.util.annotation.InternalApi
 import dev.slne.surf.cloud.api.common.util.mutableObjectListOf
 import dev.slne.surf.cloud.api.server.plugin.loader.library.ClassPathLibrary
 import dev.slne.surf.cloud.api.server.plugin.loader.library.LibraryLoadingException
@@ -23,7 +22,7 @@ import org.eclipse.aether.transfer.AbstractTransferListener
 import org.eclipse.aether.transfer.TransferEvent
 
 class MavenLibraryResolver : ClassPathLibrary {
-    private val log = logger()
+    private val log = dev.slne.surf.surfapi.core.api.util.logger()
 
     private val repository: RepositorySystem = RepositorySystemSupplier().get()
 //    private val session = repository.createSessionBuilder().apply {
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/provider/classloader/ClassloaderAccess.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/provider/classloader/ClassloaderAccess.kt
index 2469e092..cdf59fe4 100644
--- a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/provider/classloader/ClassloaderAccess.kt
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/provider/classloader/ClassloaderAccess.kt
@@ -1,6 +1,6 @@
 package dev.slne.surf.cloud.api.server.plugin.provider.classloader
 
-import dev.slne.surf.cloud.api.common.util.InternalApi
+import dev.slne.surf.cloud.api.common.util.annotation.InternalApi
 
 @InternalApi
 fun interface ClassloaderAccess {
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/provider/classloader/SpringPluginClassloader.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/provider/classloader/SpringPluginClassloader.kt
index 86f7b0ce..af23a069 100644
--- a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/provider/classloader/SpringPluginClassloader.kt
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/provider/classloader/SpringPluginClassloader.kt
@@ -1,6 +1,6 @@
 package dev.slne.surf.cloud.api.server.plugin.provider.classloader
 
-import dev.slne.surf.cloud.api.common.util.InternalApi
+import dev.slne.surf.cloud.api.common.util.annotation.InternalApi
 import dev.slne.surf.cloud.api.server.plugin.StandalonePlugin
 import dev.slne.surf.cloud.api.server.plugin.configuration.PluginMeta
 import java.io.Closeable
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/provider/classloader/SpringPluginClassloaderGroup.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/provider/classloader/SpringPluginClassloaderGroup.kt
index b758691b..43803bd7 100644
--- a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/provider/classloader/SpringPluginClassloaderGroup.kt
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/provider/classloader/SpringPluginClassloaderGroup.kt
@@ -1,6 +1,6 @@
 package dev.slne.surf.cloud.api.server.plugin.provider.classloader
 
-import dev.slne.surf.cloud.api.common.util.InternalApi
+import dev.slne.surf.cloud.api.common.util.annotation.InternalApi
 
 @InternalApi
 interface SpringPluginClassloaderGroup {
diff --git a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/provider/classloader/SpringPluginClassloaderStorage.kt b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/provider/classloader/SpringPluginClassloaderStorage.kt
index 70233314..fae09a67 100644
--- a/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/provider/classloader/SpringPluginClassloaderStorage.kt
+++ b/surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/provider/classloader/SpringPluginClassloaderStorage.kt
@@ -1,7 +1,7 @@
 package dev.slne.surf.cloud.api.server.plugin.provider.classloader
 
-import dev.slne.surf.cloud.api.common.util.InternalApi
-import dev.slne.surf.cloud.api.common.util.requiredService
+import dev.slne.surf.cloud.api.common.util.annotation.InternalApi
+import dev.slne.surf.surfapi.core.api.util.requiredService
 
 @InternalApi
 interface SpringPluginClassloaderStorage {
diff --git a/surf-cloud-bukkit/build.gradle.kts b/surf-cloud-bukkit/build.gradle.kts
index d975ade3..65876476 100644
--- a/surf-cloud-bukkit/build.gradle.kts
+++ b/surf-cloud-bukkit/build.gradle.kts
@@ -2,13 +2,14 @@ import dev.slne.surf.surfapi.gradle.util.registerRequired
 
 plugins {
     id("dev.slne.surf.surfapi.gradle.paper-plugin")
-    `core-convention`
+    `exclude-kotlin`
 }
 
 surfPaperPluginApi {
     mainClass("dev.slne.surf.cloud.bukkit.BukkitMain")
     bootstrapper("dev.slne.surf.cloud.bukkit.BukkitBootstrap")
     authors.add("twisti")
+    generateLibraryLoader(false)
 
     serverDependencies {
         registerRequired("LuckPerms")
@@ -19,15 +20,11 @@ surfPaperPluginApi {
     }
 }
 
-
 dependencies {
     api(project(":surf-cloud-core:surf-cloud-core-client"))
+    api(project(":surf-cloud-api:surf-cloud-api-client:surf-cloud-api-client-paper"))
 
-    api("org.springframework.boot:spring-boot-starter-data-jpa")
-    api("org.springframework.boot:spring-boot-starter-data-redis")
-    api("org.springframework.boot:spring-boot-starter-jooq")
-    api("com.fasterxml.jackson.core:jackson-core")
-    api("com.fasterxml.jackson.core:jackson-databind")
+//    api("org.springframework.boot:spring-boot-starter-data-jpa")
 }
 
 configurations {
diff --git a/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/BukkitBootstrap.kt b/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/BukkitBootstrap.kt
index 95bf677b..2b04be55 100644
--- a/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/BukkitBootstrap.kt
+++ b/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/BukkitBootstrap.kt
@@ -1,6 +1,6 @@
 package dev.slne.surf.cloud.bukkit
 
-import dev.slne.surf.cloud.core.common.SurfCloudCoreInstance.BootstrapData
+import dev.slne.surf.cloud.core.common.CloudCoreInstance.BootstrapData
 import dev.slne.surf.cloud.core.common.handleEventuallyFatalError
 import io.papermc.paper.plugin.bootstrap.BootstrapContext
 import io.papermc.paper.plugin.bootstrap.PluginBootstrap
@@ -20,7 +20,7 @@ class BukkitBootstrap : PluginBootstrap {
                 )
             )
         } catch (e: Throwable) {
-            e.handleEventuallyFatalError { exitProcess(it.exitCode) }
+            e.handleEventuallyFatalError({ exitProcess(it.exitCode) })
         }
     }
 
diff --git a/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/BukkitMain.kt b/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/BukkitMain.kt
index f037cb3b..d4e7958d 100644
--- a/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/BukkitMain.kt
+++ b/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/BukkitMain.kt
@@ -4,29 +4,38 @@ import com.github.shynixn.mccoroutine.folia.SuspendingJavaPlugin
 import com.github.shynixn.mccoroutine.folia.globalRegionDispatcher
 import com.github.shynixn.mccoroutine.folia.launch
 import com.github.shynixn.mccoroutine.folia.ticks
+import dev.jorel.commandapi.CommandAPIBukkit
 import dev.jorel.commandapi.kotlindsl.*
+import dev.slne.surf.cloud.api.client.paper.player.toCloudOfflinePlayer
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportCause
+import dev.slne.surf.cloud.api.common.player.teleport.fineLocation
 import dev.slne.surf.cloud.api.common.player.toCloudPlayer
-import dev.slne.surf.cloud.api.common.server.serverManager
-import dev.slne.surf.cloud.api.common.util.position.FineTeleportCause
-import dev.slne.surf.cloud.api.common.util.position.fineLocation
+import dev.slne.surf.cloud.api.common.server.CloudServerManager
 import dev.slne.surf.cloud.bukkit.player.BukkitClientCloudPlayerImpl
 import dev.slne.surf.cloud.core.common.handleEventuallyFatalError
 import dev.slne.surf.surfapi.bukkit.api.event.listen
+import dev.slne.surf.surfapi.core.api.messages.CommonComponents
+import dev.slne.surf.surfapi.core.api.messages.adventure.buildText
+import dev.slne.surf.surfapi.core.api.messages.adventure.sendText
+import kotlinx.coroutines.async
 import kotlinx.coroutines.delay
 import net.kyori.adventure.text.Component
 import net.kyori.adventure.text.format.NamedTextColor
 import org.bukkit.Bukkit
 import org.bukkit.Location
 import org.bukkit.NamespacedKey
+import org.bukkit.OfflinePlayer
 import org.bukkit.entity.Player
 import org.bukkit.event.server.ServerLoadEvent
+import kotlin.contracts.ExperimentalContracts
+import kotlin.contracts.contract
 
 class BukkitMain : SuspendingJavaPlugin() {
     override suspend fun onLoadAsync() {
         try {
             bukkitCloudInstance.onLoad()
         } catch (t: Throwable) {
-            t.handleEventuallyFatalError { Bukkit.shutdown() }
+            t.handleEventuallyFatalError({ Bukkit.shutdown() })
         }
     }
 
@@ -34,7 +43,7 @@ class BukkitMain : SuspendingJavaPlugin() {
         try {
             bukkitCloudInstance.onEnable()
         } catch (t: Throwable) {
-            t.handleEventuallyFatalError { Bukkit.shutdown() }
+            t.handleEventuallyFatalError({ Bukkit.shutdown() })
         }
 
         var serverLoaded = false
@@ -53,7 +62,7 @@ class BukkitMain : SuspendingJavaPlugin() {
             try {
                 bukkitCloudInstance.afterStart()
             } catch (t: Throwable) {
-                t.handleEventuallyFatalError { Bukkit.shutdown() }
+                t.handleEventuallyFatalError({ Bukkit.shutdown() })
             }
         }
 
@@ -63,7 +72,7 @@ class BukkitMain : SuspendingJavaPlugin() {
                     anyExecutor { sender, args ->
                         val id: Long by args
                         launch {
-                            val server = serverManager.retrieveServerById(id)
+                            val server = CloudServerManager.retrieveServerById(id)
                             sender.sendMessage("Server: $server")
                         }
                     }
@@ -77,7 +86,10 @@ class BukkitMain : SuspendingJavaPlugin() {
                             val name: String by args
                             launch {
                                 val server =
-                                    serverManager.retrieveServerByCategoryAndName(category, name)
+                                    CloudServerManager.retrieveServerByCategoryAndName(
+                                        category,
+                                        name
+                                    )
                                 sender.sendMessage("Server: $server")
                             }
                         }
@@ -89,7 +101,7 @@ class BukkitMain : SuspendingJavaPlugin() {
                     anyExecutor { sender, args ->
                         val name: String by args
                         launch {
-                            val server = serverManager.retrieveServerByName(name)
+                            val server = CloudServerManager.retrieveServerByName(name)
                             sender.sendMessage("Server: $server")
                         }
                     }
@@ -100,7 +112,7 @@ class BukkitMain : SuspendingJavaPlugin() {
                     anyExecutor { sender, args ->
                         val category: String by args
                         launch {
-                            val servers = serverManager.retrieveServersByCategory(category)
+                            val servers = CloudServerManager.retrieveServersByCategory(category)
                             sender.sendMessage("Servers: $servers")
                         }
                     }
@@ -174,24 +186,115 @@ class BukkitMain : SuspendingJavaPlugin() {
                 )
 
                 plugin.launch {
-                    target.toCloudPlayer()?.teleport(fineLocation, FineTeleportCause.COMMAND)
+                    target.toCloudPlayer()?.teleport(fineLocation, TeleportCause.COMMAND)
 
                     player.sendMessage(
                         Component.text(
-                            "Deported player ${target.name} to ${location}",
+                            "Deported player ${target.name} to $location",
                             NamedTextColor.GREEN
                         )
                     )
                 }
             }
         }
+
+        commandAPICommand("cshutdown") {
+            longArgument("id")
+            anyExecutor { sender, args ->
+                val id: Long by args
+                launch {
+                    val server = CloudServerManager.retrieveServerById(id)
+                    requireCommand(server != null) { Component.text("Server with id $id not found") }
+
+                    server.shutdown()
+                }
+            }
+        }
+
+        commandAPICommand("offlinePlayer") {
+            offlinePlayerArgument("player")
+            anyExecutor { sender, args ->
+                val player: OfflinePlayer by args
+                val offlinePlayer = player.toCloudOfflinePlayer()
+
+                launch {
+                    val displayName = async { offlinePlayer.displayName() }
+                    val lastServer = async { offlinePlayer.lastServer() }
+                    val lastSeen = async { offlinePlayer.lastSeen() }
+                    val lastIpAddress = async { offlinePlayer.latestIpAddress() }
+                    val playedBefore = async { offlinePlayer.playedBefore() }
+                    val nameHistory = async { offlinePlayer.nameHistory() }
+
+                    sender.sendText {
+                        appendPrefix()
+                        appendNewPrefixedLine {
+                            variableKey("UUID")
+                            spacer(": ")
+                            variableValue(offlinePlayer.uuid.toString())
+                        }
+                        appendNewPrefixedLineAsync {
+                            variableKey("Display Name")
+                            spacer(": ")
+                            append(displayName.await() ?: Component.text("#Unknown"))
+                        }
+                        appendNewPrefixedLineAsync {
+                            variableKey("Last Server")
+                            spacer(": ")
+                            variableValue(lastServer.await()?.name ?: "#Unknown")
+                        }
+                        appendNewPrefixedLineAsync {
+                            variableKey("Last Seen")
+                            spacer(": ")
+                            variableValue(lastSeen.await()?.toString() ?: "#Unknown")
+                        }
+                        appendNewPrefixedLineAsync {
+                            variableKey("Last IP Address")
+                            spacer(": ")
+                            variableValue(lastIpAddress.await()?.hostAddress ?: "#Unknown")
+                        }
+                        appendNewPrefixedLineAsync {
+                            variableKey("Played Before")
+                            spacer(": ")
+                            variableValue(playedBefore.await().toString())
+                        }
+                        appendAsync {
+                            appendCollectionNewLine(nameHistory.await().names()) {(timestamp, name) ->
+                                buildText {
+                                    variableKey(timestamp.toString())
+                                    append(CommonComponents.MAP_SEPERATOR)
+                                    variableValue(name)
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @OptIn(ExperimentalContracts::class)
+    private fun requireCommand(
+        condition: Boolean,
+        message: () -> Component
+    ) { // TODO: 20.01.2025 20:51 - move to surf-api
+        contract {
+            returns() implies condition
+        }
+
+        if (!condition) {
+            failCommand(message)
+        }
+    }
+
+    private fun failCommand(message: () -> Component): Nothing { // TODO: 20.01.2025 20:51 - move to surf-api
+        throw CommandAPIBukkit.failWithAdventureComponent(message)
     }
 
     override suspend fun onDisableAsync() {
         try {
             bukkitCloudInstance.onDisable()
         } catch (t: Throwable) {
-            t.handleEventuallyFatalError { }
+            t.handleEventuallyFatalError({ })
         }
     }
 
diff --git a/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/SurfCloudBukkitInstance.kt b/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/CloudBukkitInstance.kt
similarity index 73%
rename from surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/SurfCloudBukkitInstance.kt
rename to surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/CloudBukkitInstance.kt
index 26c79871..1716cded 100644
--- a/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/SurfCloudBukkitInstance.kt
+++ b/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/CloudBukkitInstance.kt
@@ -1,15 +1,15 @@
 package dev.slne.surf.cloud.bukkit
 
 import com.google.auto.service.AutoService
-import dev.slne.surf.cloud.api.common.SurfCloudInstance
+import dev.slne.surf.cloud.api.common.CloudInstance
 import dev.slne.surf.cloud.bukkit.listener.ListenerManager
 import dev.slne.surf.cloud.bukkit.netty.BukkitNettyManager
 import dev.slne.surf.cloud.core.client.ClientCommonCloudInstance
 import dev.slne.surf.cloud.core.common.coreCloudInstance
 import dev.slne.surf.cloud.core.common.util.checkInstantiationByServiceLoader
 
-@AutoService(SurfCloudInstance::class)
-class SurfCloudBukkitInstance : ClientCommonCloudInstance(BukkitNettyManager) {
+@AutoService(CloudInstance::class)
+class CloudBukkitInstance : ClientCommonCloudInstance(BukkitNettyManager) {
     init {
         checkInstantiationByServiceLoader()
     }
@@ -27,4 +27,4 @@ class SurfCloudBukkitInstance : ClientCommonCloudInstance(BukkitNettyManager) {
     }
 }
 
-val bukkitCloudInstance get() = coreCloudInstance as SurfCloudBukkitInstance
\ No newline at end of file
+val bukkitCloudInstance get() = coreCloudInstance as CloudBukkitInstance
\ No newline at end of file
diff --git a/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/listener/ListenerManager.kt b/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/listener/ListenerManager.kt
index a65c59f4..41ecd61e 100644
--- a/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/listener/ListenerManager.kt
+++ b/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/listener/ListenerManager.kt
@@ -1,5 +1,6 @@
 package dev.slne.surf.cloud.bukkit.listener
 
+import dev.slne.surf.cloud.bukkit.listener.exception.SurfFatalErrorExceptionListener
 import dev.slne.surf.cloud.bukkit.listener.player.ConnectionListener
 import dev.slne.surf.cloud.bukkit.plugin
 import dev.slne.surf.surfapi.bukkit.api.event.register
@@ -9,6 +10,7 @@ object ListenerManager {
 
     fun registerListeners() {
         ConnectionListener.register()
+        SurfFatalErrorExceptionListener.register()
     }
 
     fun unregisterListeners() {
diff --git a/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/listener/exception/SurfFatalErrorExceptionListener.kt b/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/listener/exception/SurfFatalErrorExceptionListener.kt
new file mode 100644
index 00000000..dfcac66c
--- /dev/null
+++ b/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/listener/exception/SurfFatalErrorExceptionListener.kt
@@ -0,0 +1,22 @@
+package dev.slne.surf.cloud.bukkit.listener.exception
+
+import com.destroystokyo.paper.event.server.ServerExceptionEvent
+import dev.slne.surf.cloud.api.common.exceptions.FatalSurfError
+import dev.slne.surf.cloud.core.common.handleEventuallyFatalError
+import org.bukkit.Bukkit
+import org.bukkit.event.EventHandler
+import org.bukkit.event.Listener
+
+object SurfFatalErrorExceptionListener : Listener {
+    private val handler = { _: FatalSurfError -> Bukkit.shutdown() }
+
+    @EventHandler
+    fun onServerException(event: ServerExceptionEvent) {
+        val e = event.exception
+        if (e.handle()) return
+        if (e.cause?.handle() == true) return
+    }
+
+    private fun Throwable.handle() = handleEventuallyFatalError(handler, false, false)
+
+}
\ No newline at end of file
diff --git a/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/listener/player/ConnectionListener.kt b/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/listener/player/ConnectionListener.kt
index ac0711c8..a57c37dd 100644
--- a/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/listener/player/ConnectionListener.kt
+++ b/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/listener/player/ConnectionListener.kt
@@ -9,8 +9,9 @@ import org.bukkit.event.EventPriority
 import org.bukkit.event.Listener
 import org.bukkit.event.player.AsyncPlayerPreLoginEvent
 import org.bukkit.event.player.PlayerQuitEvent
+import java.net.Inet4Address
 
-object ConnectionListener: Listener {
+object ConnectionListener : Listener {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     fun AsyncPlayerPreLoginEvent.onAsyncPlayerPreLogin() {
@@ -20,8 +21,10 @@ object ConnectionListener: Listener {
 
         PlayerConnectToServerPacket(
             uniqueId,
-            CloudPersistentData.SERVER_ID,
-            false
+            name,
+            false,
+            address as? Inet4Address ?: error("Player address is not an Inet4Address"),
+            CloudPersistentData.SERVER_ID
         ).fireAndForget()
     }
 
diff --git a/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/netty/network/BukkitSpecificPacketListenerExtension.kt b/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/netty/network/BukkitSpecificPacketListenerExtension.kt
index 8c6be597..9e5ec42f 100644
--- a/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/netty/network/BukkitSpecificPacketListenerExtension.kt
+++ b/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/netty/network/BukkitSpecificPacketListenerExtension.kt
@@ -1,9 +1,12 @@
 package dev.slne.surf.cloud.bukkit.netty.network
 
+import com.github.shynixn.mccoroutine.folia.globalRegionDispatcher
+import com.github.shynixn.mccoroutine.folia.launch
 import dev.slne.surf.cloud.api.common.player.toCloudPlayer
-import dev.slne.surf.cloud.api.common.util.position.FineLocation
-import dev.slne.surf.cloud.api.common.util.position.FineTeleportCause
-import dev.slne.surf.cloud.api.common.util.position.FineTeleportFlag
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportLocation
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportCause
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportFlag
+import dev.slne.surf.cloud.bukkit.plugin
 import dev.slne.surf.cloud.core.client.netty.network.PlatformSpecificPacketListenerExtension
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.RegistrationInfo
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ServerboundTransferPlayerPacketResponse
@@ -30,9 +33,9 @@ object BukkitSpecificPacketListenerExtension : PlatformSpecificPacketListenerExt
 
     override suspend fun teleportPlayer(
         uuid: UUID,
-        location: FineLocation,
-        teleportCause: FineTeleportCause,
-        flags: Array<out FineTeleportFlag>
+        location: TeleportLocation,
+        teleportCause: TeleportCause,
+        flags: Array<out TeleportFlag>
     ): Boolean {
         val player = Bukkit.getPlayer(uuid) ?: return false
         val cloudPlayer = player.toCloudPlayer() ?: return false
@@ -43,4 +46,10 @@ object BukkitSpecificPacketListenerExtension : PlatformSpecificPacketListenerExt
     override fun registerCloudServersToProxy(packets: Array<RegistrationInfo>) {
         error("Requested wrong server! This packet can only be acknowledged on a proxy!")
     }
+
+    override fun triggerShutdown() {
+        plugin.launch(plugin.globalRegionDispatcher) {
+            Bukkit.shutdown()
+        }
+    }
 }
\ No newline at end of file
diff --git a/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/player/BukkitClientCloudPlayerImpl.kt b/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/player/BukkitClientCloudPlayerImpl.kt
index 75effb61..239c4f6a 100644
--- a/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/player/BukkitClientCloudPlayerImpl.kt
+++ b/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/player/BukkitClientCloudPlayerImpl.kt
@@ -1,24 +1,24 @@
 package dev.slne.surf.cloud.bukkit.player
 
 import dev.slne.surf.cloud.api.client.netty.packet.fireAndForget
-import dev.slne.surf.cloud.api.common.util.position.FineLocation
-import dev.slne.surf.cloud.api.common.util.position.FineTeleportCause
-import dev.slne.surf.cloud.api.common.util.position.FineTeleportFlag
+import dev.slne.surf.cloud.api.client.paper.toBukkitTpCause
+import dev.slne.surf.cloud.api.client.paper.toBukkitTpFlag
+import dev.slne.surf.cloud.api.client.paper.toLocation
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportCause
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportFlag
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportLocation
 import dev.slne.surf.cloud.bukkit.plugin
 import dev.slne.surf.cloud.core.client.player.ClientCloudPlayerImpl
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.DisconnectPlayerPacket
-import io.papermc.paper.entity.TeleportFlag
 import kotlinx.coroutines.future.await
 import net.kyori.adventure.text.Component
 import org.bukkit.Bukkit
-import org.bukkit.Location
 import org.bukkit.conversations.*
 import org.bukkit.entity.Player
-import org.bukkit.event.player.PlayerTeleportEvent
 import java.util.*
 
 class BukkitClientCloudPlayerImpl(uuid: UUID) : ClientCloudPlayerImpl<Player>(uuid) {
-    override val player: Player? get() = Bukkit.getPlayer(uuid)
+    override val audience: Player? get() = Bukkit.getPlayer(uuid)
     override val platformClass: Class<Player> = Player::class.java
 
     override fun disconnect(reason: Component) {
@@ -26,7 +26,7 @@ class BukkitClientCloudPlayerImpl(uuid: UUID) : ClientCloudPlayerImpl<Player>(uu
     }
 
     fun test() {
-        val player = player ?: return
+        val player = audience ?: return
 
         val factory = ConversationFactory(plugin)
         factory.withModality(true) // player dont receive messages from other players
@@ -72,42 +72,17 @@ class BukkitClientCloudPlayerImpl(uuid: UUID) : ClientCloudPlayerImpl<Player>(uu
     }
 
     override suspend fun teleport(
-        location: FineLocation,
-        teleportCause: FineTeleportCause,
-        vararg flags: FineTeleportFlag
+        location: TeleportLocation,
+        teleportCause: TeleportCause,
+        vararg flags: TeleportFlag
     ): Boolean {
-        val player = player ?: return super.teleport(location, teleportCause, *flags)
-        val world = Bukkit.getWorld(location.world) ?: return false
-        val bukkitLocation =
-            Location(world, location.x, location.y, location.z, location.yaw, location.pitch)
-
-        val bukkitTeleportCause = when (teleportCause) {
-            FineTeleportCause.PLUGIN -> PlayerTeleportEvent.TeleportCause.PLUGIN
-            FineTeleportCause.COMMAND -> PlayerTeleportEvent.TeleportCause.COMMAND
-            FineTeleportCause.UNKNOWN -> PlayerTeleportEvent.TeleportCause.UNKNOWN
-            FineTeleportCause.DISMOUNT -> PlayerTeleportEvent.TeleportCause.UNKNOWN
-            FineTeleportCause.EXIT_BED -> PlayerTeleportEvent.TeleportCause.UNKNOWN
-            FineTeleportCause.SPECTATE -> PlayerTeleportEvent.TeleportCause.UNKNOWN
-            FineTeleportCause.END_PORTAL -> PlayerTeleportEvent.TeleportCause.END_PORTAL
-            FineTeleportCause.ENDER_PEARL -> PlayerTeleportEvent.TeleportCause.ENDER_PEARL
-            FineTeleportCause.END_GATEWAY -> PlayerTeleportEvent.TeleportCause.END_GATEWAY
-            FineTeleportCause.CHORUS_FRUIT -> PlayerTeleportEvent.TeleportCause.CHORUS_FRUIT
-            FineTeleportCause.NETHER_PORTAL -> PlayerTeleportEvent.TeleportCause.NETHER_PORTAL
-        }
-
-        val bukkitTeleportFlags = flags.map {
-            when (it) {
-                FineTeleportFlag.VELOCITY_ROTATION -> TeleportFlag.Relative.VELOCITY_ROTATION
-                FineTeleportFlag.VELOCITY_X -> TeleportFlag.Relative.VELOCITY_X
-                FineTeleportFlag.VELOCITY_Y -> TeleportFlag.Relative.VELOCITY_Y
-                FineTeleportFlag.VELOCITY_Z -> TeleportFlag.Relative.VELOCITY_Z
-                FineTeleportFlag.RETAIN_VEHICLE -> TeleportFlag.EntityState.RETAIN_VEHICLE
-                FineTeleportFlag.RETAIN_PASSENGERS -> TeleportFlag.EntityState.RETAIN_PASSENGERS
-                FineTeleportFlag.RETAIN_OPEN_INVENTORY -> TeleportFlag.EntityState.RETAIN_OPEN_INVENTORY
-            }
-        }.toTypedArray<TeleportFlag>()
-
-        return player.teleportAsync(bukkitLocation, bukkitTeleportCause, *bukkitTeleportFlags)
-            .await()
+        val player = audience ?: return super.teleport(location, teleportCause, *flags)
+
+        val bukkitTeleportFlags = flags.map { it.toBukkitTpFlag() }.toTypedArray()
+        return player.teleportAsync(
+            location.toLocation(),
+            teleportCause.toBukkitTpCause(),
+            *bukkitTeleportFlags
+        ).await()
     }
 }
\ No newline at end of file
diff --git a/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/player/BukkitCloudPlayerManagerImpl.kt b/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/player/BukkitCloudPlayerManagerImpl.kt
index f6fcbca2..43c0dfa4 100644
--- a/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/player/BukkitCloudPlayerManagerImpl.kt
+++ b/surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/player/BukkitCloudPlayerManagerImpl.kt
@@ -7,6 +7,7 @@ import dev.slne.surf.cloud.core.common.util.checkInstantiationByServiceLoader
 import net.kyori.adventure.audience.Audience
 import org.bukkit.Bukkit
 import org.bukkit.entity.Player
+import java.net.Inet4Address
 import java.util.*
 
 @AutoService(CloudPlayerManager::class)
@@ -17,8 +18,10 @@ class BukkitCloudPlayerManagerImpl : CommonClientCloudPlayerManagerImpl<Player,
 
     override suspend fun createPlayer(
         uuid: UUID,
-        serverUid: Long,
-        proxy: Boolean
+        name: String,
+        proxy: Boolean,
+        ip: Inet4Address,
+        serverUid: Long
     ) = BukkitClientCloudPlayerImpl(uuid).also {
         if (proxy) {
             it.proxyServerUid = serverUid
diff --git a/surf-cloud-core/surf-cloud-core-client/build.gradle.kts b/surf-cloud-core/surf-cloud-core-client/build.gradle.kts
index dfd827d9..0b794c9d 100644
--- a/surf-cloud-core/surf-cloud-core-client/build.gradle.kts
+++ b/surf-cloud-core/surf-cloud-core-client/build.gradle.kts
@@ -1,17 +1,16 @@
 plugins {
     id("dev.slne.surf.surfapi.gradle.core")
-    `core-convention`
 }
 
 dependencies {
-    api(project(":surf-cloud-api:surf-cloud-api-client"))
+    api(project(":surf-cloud-api:surf-cloud-api-client:surf-cloud-api-client-common"))
     api(project(":surf-cloud-core:surf-cloud-core-common"))
 
-    compileOnly("net.luckperms:api:5.4")
+    compileOnly(libs.luckperms.api)
 }
 
 kotlin {
     compilerOptions {
-        optIn.add("dev.slne.surf.cloud.api.common.util.InternalApi")
+        optIn.add("dev.slne.surf.cloud.api.common.util.annotation.InternalApi")
     }
 }
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/ClientCommonCloudInstance.kt b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/ClientCommonCloudInstance.kt
index d85e53f5..e7219a42 100644
--- a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/ClientCommonCloudInstance.kt
+++ b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/ClientCommonCloudInstance.kt
@@ -1,14 +1,23 @@
 package dev.slne.surf.cloud.core.client
 
+import dev.slne.surf.cloud.core.client.netty.NettyCommonClientManager
 import dev.slne.surf.cloud.core.client.netty.network.ClientEncryptionManager
-import dev.slne.surf.cloud.core.common.SurfCloudCoreInstance
+import dev.slne.surf.cloud.core.common.CloudCoreInstance
 import dev.slne.surf.cloud.core.common.netty.NettyManager
+import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ServerboundShutdownServerPacket
+import dev.slne.surf.cloud.core.common.server.CommonCloudServerImpl
 
 abstract class ClientCommonCloudInstance(nettyManager: NettyManager) :
-    SurfCloudCoreInstance(nettyManager) {
+    CloudCoreInstance(nettyManager) {
 
     override suspend fun preBootstrap() {
         super.preBootstrap()
         ClientEncryptionManager.init()
     }
+
+    override fun shutdownServer(server: CommonCloudServerImpl) {
+        (nettyManager as NettyCommonClientManager).nettyClient.connection.send(
+            ServerboundShutdownServerPacket(server.uid)
+        )
+    }
 }
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/ClientNettyClientImpl.kt b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/ClientNettyClientImpl.kt
index 3685ba80..4a895810 100644
--- a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/ClientNettyClientImpl.kt
+++ b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/ClientNettyClientImpl.kt
@@ -5,9 +5,10 @@ import dev.slne.surf.cloud.api.common.exceptions.ExitCodes
 import dev.slne.surf.cloud.api.common.exceptions.FatalSurfError
 import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
 import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
-import dev.slne.surf.cloud.api.common.util.logger
+import dev.slne.surf.cloud.api.common.server.CloudServerConstants
 import dev.slne.surf.cloud.api.common.util.mutableObjectListOf
 import dev.slne.surf.cloud.core.client.netty.network.*
+import dev.slne.surf.cloud.core.client.server.serverManagerImpl
 import dev.slne.surf.cloud.core.common.config.cloudConfig
 import dev.slne.surf.cloud.core.common.coroutines.ConnectionTickScope
 import dev.slne.surf.cloud.core.common.data.CloudPersistentData
@@ -23,10 +24,10 @@ import dev.slne.surf.cloud.core.common.netty.network.protocol.login.ServerboundL
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ServerboundBroadcastPacket
 import dev.slne.surf.cloud.core.common.util.InetSocketAddress
 import dev.slne.surf.cloud.core.common.util.ServerAddress
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
+import dev.slne.surf.surfapi.core.api.util.logger
+import kotlinx.coroutines.*
 import java.net.InetSocketAddress
+import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 
 class ClientNettyClientImpl(
@@ -77,8 +78,8 @@ class ClientNettyClientImpl(
 
     fun finalizeHandler(handler: suspend () -> Unit) = finalizeHandler.add(handler)
 
-    fun stop() {
-        connection.disconnect(DisconnectionDetails("Client stopped"))
+    suspend fun stop() {
+        doShutdown()
     }
 
     suspend fun connectToServer(serverAddress: ServerAddress) {
@@ -152,6 +153,10 @@ class ClientNettyClientImpl(
                         responseId.completeExceptionally(IllegalStateException("The connection was closed before the server ID could be fetched."))
                     }
                 }
+
+                override fun isAcceptingMessages(): Boolean {
+                    return connection.connected
+                }
             }
 
             ConnectionTickScope.launch {
@@ -206,4 +211,19 @@ class ClientNettyClientImpl(
         ConnectionImpl.connect(address, useEpoll, connection)
         return connection
     }
+
+    suspend fun doShutdown() {
+        val server = serverManagerImpl.retrieveServerById(serverId)
+
+        try {
+            withTimeout(1.minutes) { server?.sendAll(CloudServerConstants.LOBBY_CATEGORY) }
+        } catch (e: TimeoutCancellationException) {
+            log.atWarning()
+                .withCause(e)
+                .log("Failed to transfer all players from server ${server?.name} to the lobby. Proceeding with shutdown anyway.")
+        }
+
+        listener.close()
+        connection.disconnect("Client shutdown")
+    }
 }
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/NettyCommonClientManager.kt b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/NettyCommonClientManager.kt
index 7c28ad2d..0ab0ce84 100644
--- a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/NettyCommonClientManager.kt
+++ b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/NettyCommonClientManager.kt
@@ -2,6 +2,7 @@ package dev.slne.surf.cloud.core.client.netty
 
 import dev.slne.surf.cloud.core.client.netty.network.PlatformSpecificPacketListenerExtension
 import dev.slne.surf.cloud.core.common.netty.NettyManager
+import kotlinx.coroutines.runBlocking
 
 abstract class NettyCommonClientManager(
     val proxy: Boolean,
@@ -23,7 +24,7 @@ abstract class NettyCommonClientManager(
         nettyClient.finalize()
     }
 
-    override fun stop() {
+    override fun stop() = runBlocking {
         super.stop()
         nettyClient.stop()
     }
diff --git a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientCommonPacketListenerImpl.kt b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientCommonPacketListenerImpl.kt
index 556b2816..bced8d12 100644
--- a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientCommonPacketListenerImpl.kt
+++ b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientCommonPacketListenerImpl.kt
@@ -1,17 +1,17 @@
 package dev.slne.surf.cloud.core.client.netty.network
 
 import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
-import dev.slne.surf.cloud.api.common.util.logger
 import dev.slne.surf.cloud.core.common.coroutines.ConnectionManagementScope
 import dev.slne.surf.cloud.core.common.netty.network.ConnectionImpl
 import dev.slne.surf.cloud.core.common.netty.network.DisconnectionDetails
 import dev.slne.surf.cloud.core.common.netty.network.protocol.common.ClientCommonPacketListener
+import dev.slne.surf.cloud.core.common.netty.network.protocol.common.ClientboundBundlePacket
 import dev.slne.surf.cloud.core.common.netty.network.protocol.common.ClientboundKeepAlivePacket
 import dev.slne.surf.cloud.core.common.netty.network.protocol.common.ServerboundKeepAlivePacket
-import dev.slne.surf.cloud.core.common.netty.network.protocol.common.ClientboundBundlePacket
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ClientboundDisconnectPacket
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ClientboundPingPacket
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ServerboundPongPacket
+import dev.slne.surf.surfapi.core.api.util.logger
 import kotlinx.coroutines.launch
 import kotlin.system.exitProcess
 
diff --git a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientEncryptionManager.kt b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientEncryptionManager.kt
index 9769e870..541a939d 100644
--- a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientEncryptionManager.kt
+++ b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientEncryptionManager.kt
@@ -1,9 +1,9 @@
 package dev.slne.surf.cloud.core.client.netty.network
 
 import dev.slne.surf.cloud.api.common.config.properties.CloudProperties
-import dev.slne.surf.cloud.api.common.util.logger
 import dev.slne.surf.cloud.core.common.netty.network.EncryptionManager
 import dev.slne.surf.cloud.core.common.netty.network.HandlerNames
+import dev.slne.surf.surfapi.core.api.util.logger
 import io.netty.channel.Channel
 import io.netty.handler.ssl.SslContext
 import io.netty.handler.ssl.SslContextBuilder
@@ -14,7 +14,8 @@ object ClientEncryptionManager : EncryptionManager() {
 
     private val clientCertificateFile =
         certificatesFolder.resolve("${CloudProperties.SERVER_NAME}.crt").toFile()
-    private val clientKeyFile = certificatesFolder.resolve("${CloudProperties.SERVER_NAME}.key").toFile()
+    private val clientKeyFile =
+        certificatesFolder.resolve("${CloudProperties.SERVER_NAME}.key").toFile()
     private val serverCertificate = certificatesFolder.resolve("server.crt").toFile()
 
     override fun setupEncryption(ch: Channel) {
diff --git a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientHandshakePacketListenerImpl.kt b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientHandshakePacketListenerImpl.kt
index 3d96ba1c..be56fc71 100644
--- a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientHandshakePacketListenerImpl.kt
+++ b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientHandshakePacketListenerImpl.kt
@@ -38,4 +38,7 @@ class ClientHandshakePacketListenerImpl(
     }
 
     override suspend fun onDisconnect(details: DisconnectionDetails) = Unit
+    override fun isAcceptingMessages(): Boolean {
+        return connection.connected
+    }
 }
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientPreRunningPacketListenerImpl.kt b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientPreRunningPacketListenerImpl.kt
index 8c3cc614..89a3042e 100644
--- a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientPreRunningPacketListenerImpl.kt
+++ b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientPreRunningPacketListenerImpl.kt
@@ -5,12 +5,7 @@ import dev.slne.surf.cloud.core.client.netty.ClientNettyClientImpl
 import dev.slne.surf.cloud.core.client.netty.network.AbstractStatusUpdater.State
 import dev.slne.surf.cloud.core.common.netty.network.ConnectionImpl
 import dev.slne.surf.cloud.core.common.netty.network.DisconnectionDetails
-import dev.slne.surf.cloud.core.common.netty.network.protocol.prerunning.ClientPreRunningPacketListener
-import dev.slne.surf.cloud.core.common.netty.network.protocol.prerunning.ClientboundPreRunningFinishedPacket
-import dev.slne.surf.cloud.core.common.netty.network.protocol.prerunning.ClientboundReadyToRunPacket
-import dev.slne.surf.cloud.core.common.netty.network.protocol.prerunning.ServerboundPreRunningAcknowledgedPacket
-import dev.slne.surf.cloud.core.common.netty.network.protocol.prerunning.ServerboundReadyToRunPacket
-import dev.slne.surf.cloud.core.common.netty.network.protocol.prerunning.ServerboundRequestContinuation
+import dev.slne.surf.cloud.core.common.netty.network.protocol.prerunning.*
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.RunningProtocols
 import kotlinx.coroutines.CompletableDeferred
 
@@ -39,7 +34,7 @@ class ClientPreRunningPacketListenerImpl(
     }
 
     override suspend fun handleReadyToRun(packet: ClientboundReadyToRunPacket) {
-        val listener = ClientRunningPacketListenerImpl(connection, platformExtension)
+        val listener = ClientRunningPacketListenerImpl(connection, client, platformExtension)
         connection.setupInboundProtocol(
             RunningProtocols.CLIENTBOUND,
             listener
@@ -65,4 +60,8 @@ class ClientPreRunningPacketListenerImpl(
             possibleSolution("Try restarting the client.")
         }
     }
+
+    override fun isAcceptingMessages(): Boolean {
+        return completion.isActive
+    }
 }
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientRunningPacketListenerImpl.kt b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientRunningPacketListenerImpl.kt
index 8d53ad09..e479ebc6 100644
--- a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientRunningPacketListenerImpl.kt
+++ b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientRunningPacketListenerImpl.kt
@@ -1,8 +1,11 @@
 package dev.slne.surf.cloud.core.client.netty.network
 
+import com.google.common.flogger.StackSize
+import dev.slne.surf.cloud.api.common.netty.network.protocol.respond
 import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.NettyPacketInfo
 import dev.slne.surf.cloud.api.common.server.UserListImpl
-import dev.slne.surf.cloud.api.common.util.logger
+import dev.slne.surf.cloud.core.client.netty.ClientNettyClientImpl
 import dev.slne.surf.cloud.core.client.player.commonPlayerManagerImpl
 import dev.slne.surf.cloud.core.client.server.serverManagerImpl
 import dev.slne.surf.cloud.core.client.util.getOrLoadUser
@@ -10,28 +13,40 @@ import dev.slne.surf.cloud.core.client.util.luckperms
 import dev.slne.surf.cloud.core.common.coroutines.PacketHandlerScope
 import dev.slne.surf.cloud.core.common.netty.network.ConnectionImpl
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.*
-import dev.slne.surf.cloud.core.common.netty.protocol.packet.NettyPacketInfo
 import dev.slne.surf.cloud.core.common.netty.registry.listener.NettyListenerRegistry
 import dev.slne.surf.cloud.core.common.player.playerManagerImpl
 import dev.slne.surf.cloud.core.common.server.CloudServerImpl
 import dev.slne.surf.cloud.core.common.server.ProxyCloudServerImpl
+import dev.slne.surf.surfapi.core.api.messages.adventure.getPointer
+import dev.slne.surf.surfapi.core.api.messages.adventure.text
+import dev.slne.surf.surfapi.core.api.util.logger
 import kotlinx.coroutines.launch
 import net.kyori.adventure.audience.Audience
 import net.kyori.adventure.identity.Identity
 import net.kyori.adventure.text.Component
 import net.kyori.adventure.title.Title
 import net.kyori.adventure.title.TitlePart
+import java.io.Closeable
 import java.util.*
-import java.util.concurrent.TimeUnit
 
 class ClientRunningPacketListenerImpl(
     connection: ConnectionImpl,
+    val client: ClientNettyClientImpl,
     val platformExtension: PlatformSpecificPacketListenerExtension
-) : ClientCommonPacketListenerImpl(connection), RunningClientPacketListener {
+) : ClientCommonPacketListenerImpl(connection), RunningClientPacketListener, Closeable {
     private val log = logger()
 
+    @Volatile
+    private var closed = false
+
     override suspend fun handlePlayerConnectToServer(packet: PlayerConnectToServerPacket) {
-        playerManagerImpl.updateOrCreatePlayer(packet.uuid, packet.serverUid, packet.proxy)
+        playerManagerImpl.updateOrCreatePlayer(
+            packet.uuid,
+            packet.name,
+            packet.proxy,
+            packet.playerIp,
+            packet.serverUid
+        )
     }
 
     override suspend fun handlePlayerDisconnectFromServer(packet: PlayerDisconnectFromServerPacket) {
@@ -128,11 +143,15 @@ class ClientRunningPacketListenerImpl(
 
     override fun handleRequestDisplayName(packet: ClientboundRequestDisplayNamePacket) {
         withRequiredAudience(packet.uuid, {
-            val displayName = pointers().get(Identity.DISPLAY_NAME).orElse(Component.empty())
+            val displayName = getPointer(Identity.DISPLAY_NAME) ?: Component.empty()
             packet.respond(ResponseDisplayNamePacketRequestPacket(packet.uuid, displayName))
         }) { "Display name requested for player ${packet.uuid} who is not online. Probably send to wrong server." }
     }
 
+    override suspend fun handleRequestOfflinePlayerDisplayName(packet: RequestOfflineDisplayNamePacket) {
+        packet.respond(luckperms.userManager.getOrLoadUser(packet.uuid).username?.let { text(it) })
+    }
+
     override suspend fun handleRegisterServerPacket(packet: ClientboundRegisterServerPacket) {
         val server = if (packet.proxy) {
             ProxyCloudServerImpl(
@@ -206,28 +225,37 @@ class ClientRunningPacketListenerImpl(
         platformExtension.registerCloudServersToProxy(packet.servers)
     }
 
+    override fun handleTriggerShutdown(packet: ClientboundTriggerShutdownPacket) {
+        platformExtension.triggerShutdown()
+    }
+
+    override suspend fun handleBatchUpdateServer(packet: ClientboundBatchUpdateServer) {
+        serverManagerImpl.batchUpdateServer(packet.servers.map {
+            if (it.proxy) {
+                ProxyCloudServerImpl(it.serverId, it.group, it.name)
+            } else {
+                CloudServerImpl(it.serverId, it.group, it.name)
+            }
+        })
+    }
+
     override fun handlePacket(packet: NettyPacket) {
         val listeners = NettyListenerRegistry.getListeners(packet.javaClass) ?: return
         if (listeners.isEmpty()) return
 
-        val (proxiedSource, finalPacket) = when (packet) {
-//            is ProxiedNettyPacket -> packet.source to packet.packet
-            else -> null to packet
-        }
-        val info = NettyPacketInfo(this, proxiedSource)
+        val info = NettyPacketInfo(connection)
 
         for (listener in listeners) {
             PacketHandlerScope.launch {
                 try {
-                    listener.handle(finalPacket, info)
-                } catch (e: Exception) {
+                    listener.handle(packet, info)
+                } catch (e: Throwable) {
                     log.atWarning()
                         .withCause(e)
-                        .atMostEvery(5, TimeUnit.SECONDS)
                         .log(
                             "Failed to call listener %s for packet %s",
                             listener::class.simpleName,
-                            finalPacket::class.simpleName
+                            packet::class.simpleName
                         )
                 }
             }
@@ -245,10 +273,20 @@ class ClientRunningPacketListenerImpl(
     ) {
         val audience = commonPlayerManagerImpl.getAudience(uuid)
         if (audience == null) {
-            log.atWarning().log(errorMessage())
+            log.atWarning()
+                .withStackTrace(StackSize.SMALL)
+                .log(errorMessage())
             return
         }
 
         audience.block()
     }
+
+    override fun close() {
+        closed = true
+    }
+
+    override fun isAcceptingMessages(): Boolean {
+        return connection.connected && !closed
+    }
 }
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/PlatformSpecificPacketListenerExtension.kt b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/PlatformSpecificPacketListenerExtension.kt
index 15b4780f..eddf2c4a 100644
--- a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/PlatformSpecificPacketListenerExtension.kt
+++ b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/PlatformSpecificPacketListenerExtension.kt
@@ -1,8 +1,8 @@
 package dev.slne.surf.cloud.core.client.netty.network
 
-import dev.slne.surf.cloud.api.common.util.position.FineLocation
-import dev.slne.surf.cloud.api.common.util.position.FineTeleportCause
-import dev.slne.surf.cloud.api.common.util.position.FineTeleportFlag
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportLocation
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportCause
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportFlag
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.RegistrationInfo
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ServerboundTransferPlayerPacketResponse
 import net.kyori.adventure.text.Component
@@ -22,10 +22,12 @@ interface PlatformSpecificPacketListenerExtension {
 
     suspend fun teleportPlayer(
         uuid: UUID,
-        location: FineLocation,
-        teleportCause: FineTeleportCause,
-        flags: Array<out FineTeleportFlag>
+        location: TeleportLocation,
+        teleportCause: TeleportCause,
+        flags: Array<out TeleportFlag>
     ): Boolean
 
     fun registerCloudServersToProxy(packets: Array<RegistrationInfo>)
+
+    fun triggerShutdown()
 }
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/player/ClientCloudPlayerImpl.kt b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/player/ClientCloudPlayerImpl.kt
index e89a595b..50495d2a 100644
--- a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/player/ClientCloudPlayerImpl.kt
+++ b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/player/ClientCloudPlayerImpl.kt
@@ -5,15 +5,22 @@ import dev.slne.surf.cloud.api.client.netty.packet.fireAndAwaitOrThrow
 import dev.slne.surf.cloud.api.client.netty.packet.fireAndForget
 import dev.slne.surf.cloud.api.common.netty.packet.DEFAULT_URGENT_TIMEOUT
 import dev.slne.surf.cloud.api.common.player.ConnectionResult
+import dev.slne.surf.cloud.api.common.player.name.NameHistory
 import dev.slne.surf.cloud.api.common.player.ppdc.PersistentPlayerDataContainer
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportCause
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportFlag
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportLocation
 import dev.slne.surf.cloud.api.common.server.CloudServer
-import dev.slne.surf.cloud.api.common.util.position.FineLocation
-import dev.slne.surf.cloud.api.common.util.position.FineTeleportCause
-import dev.slne.surf.cloud.api.common.util.position.FineTeleportFlag
 import dev.slne.surf.cloud.core.client.util.luckperms
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.*
+import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ServerboundRequestPlayerDataPacket.DataRequestType
+import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ServerboundRequestPlayerDataResponse.IpAddress
+import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ServerboundRequestPlayerDataResponse.LastServer
+import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ServerboundRequestPlayerDataResponse.Name
+import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ServerboundRequestPlayerDataResponse.NameHistory as NameHistoryResponse
 import dev.slne.surf.cloud.core.common.player.CommonCloudPlayerImpl
 import dev.slne.surf.cloud.core.common.player.ppdc.PersistentPlayerDataContainerImpl
+import dev.slne.surf.surfapi.core.api.messages.adventure.getPointer
 import net.kyori.adventure.audience.Audience
 import net.kyori.adventure.audience.MessageType
 import net.kyori.adventure.bossbar.BossBar
@@ -28,6 +35,7 @@ import net.kyori.adventure.title.Title
 import net.kyori.adventure.title.TitlePart
 import net.luckperms.api.model.user.User
 import net.luckperms.api.platform.PlayerAdapter
+import java.net.Inet4Address
 import java.util.*
 import kotlin.time.Duration
 
@@ -38,7 +46,6 @@ abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(uuid: UUID) :
 
     @Volatile
     var serverUid: Long? = null
-
     override val connectedToProxy get() = proxyServerUid != null
 
     override val connectedToServer get() = serverUid != null
@@ -47,10 +54,22 @@ abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(uuid: UUID) :
      * The audience for this player. If the player is on this server, this will point to
      * the bukkit / velocity player. Otherwise packets will be sent to the player via the network.
      */
-    protected abstract val player: PlatformPlayer?
+    protected abstract val audience: PlatformPlayer?
 
     protected abstract val platformClass: Class<PlatformPlayer>
 
+    override suspend fun latestIpAddress(): Inet4Address {
+        return request<IpAddress>(DataRequestType.LATEST_IP_ADDRESS).ip ?: error("Failed to get IP address")
+    }
+
+    override suspend fun lastServerRaw(): String {
+        return request<LastServer>(DataRequestType.LAST_SERVER).server ?: error("Failed to get last server")
+    }
+
+    override suspend fun nameHistory(): NameHistory {
+        return request<NameHistoryResponse>(DataRequestType.NAME_HISTORY).history
+    }
+
     override suspend fun <R> withPersistentData(block: PersistentPlayerDataContainer.() -> R): R {
         val response = ServerboundRequestPlayerPersistentDataContainer(uuid).fireAndAwaitOrThrow()
 
@@ -68,8 +87,7 @@ abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(uuid: UUID) :
     }
 
     override suspend fun displayName(): Component {
-        val localName =
-            player?.pointers()?.get(Identity.DISPLAY_NAME)?.orElse(null)
+        val localName = audience?.getPointer(Identity.DISPLAY_NAME)
         if (localName != null) {
             return localName
         }
@@ -78,6 +96,15 @@ abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(uuid: UUID) :
             ?: error("Failed to get display name (probably timed out)")
     }
 
+    override suspend fun name(): String {
+        val localName = audience?.getPointer(Identity.NAME)
+        if (localName != null) {
+            return localName
+        }
+        
+        return request<Name>(DataRequestType.NAME).name ?: error("Failed to get name")
+    }
+
     override suspend fun connectToServer(server: CloudServer): ConnectionResult {
         return ServerboundConnectPlayerToServerPacket(uuid, server.uid, false).fireAndAwaitOrThrow(
             Duration.INFINITE
@@ -91,7 +118,7 @@ abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(uuid: UUID) :
     }
 
     override suspend fun getLuckpermsMetaData(key: String): String? {
-        val player = player
+        val player = audience
         if (player != null) {
             return withLuckpermsAdapter { it.getMetaData(player).getMetaValue(key) }
         }
@@ -102,7 +129,7 @@ abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(uuid: UUID) :
     @Deprecated("Deprecated in Java")
     @Suppress("UnstableApiUsage", "DEPRECATION")
     override fun sendMessage(source: Identity, message: Component, type: MessageType) {
-        val audience = player
+        val audience = audience
         if (audience != null) {
             audience.sendMessage(source, message, type)
             return
@@ -112,7 +139,7 @@ abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(uuid: UUID) :
     }
 
     override fun sendActionBar(message: Component) {
-        val audience = player
+        val audience = audience
         if (audience != null) {
             audience.sendActionBar(message)
             return
@@ -122,7 +149,7 @@ abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(uuid: UUID) :
     }
 
     override fun sendPlayerListHeaderAndFooter(header: Component, footer: Component) {
-        val audience = player
+        val audience = audience
         if (audience != null) {
             audience.sendPlayerListHeaderAndFooter(header, footer)
             return
@@ -132,7 +159,7 @@ abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(uuid: UUID) :
     }
 
     override fun showTitle(title: Title) {
-        val audience = player
+        val audience = audience
         if (audience != null) {
             audience.showTitle(title)
             return
@@ -142,7 +169,7 @@ abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(uuid: UUID) :
     }
 
     override fun <T : Any> sendTitlePart(part: TitlePart<T>, value: T) {
-        val audience = player
+        val audience = audience
         if (audience != null) {
             audience.sendTitlePart(part, value)
             return
@@ -152,7 +179,7 @@ abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(uuid: UUID) :
     }
 
     override fun clearTitle() {
-        val audience = player
+        val audience = audience
         if (audience != null) {
             audience.clearTitle()
             return
@@ -162,7 +189,7 @@ abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(uuid: UUID) :
     }
 
     override fun resetTitle() {
-        val audience = player
+        val audience = audience
         if (audience != null) {
             audience.resetTitle()
             return
@@ -172,7 +199,7 @@ abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(uuid: UUID) :
     }
 
     override fun showBossBar(bar: BossBar) {
-        val audience = player
+        val audience = audience
         if (audience != null) {
             audience.showBossBar(bar)
             return
@@ -182,7 +209,7 @@ abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(uuid: UUID) :
     }
 
     override fun hideBossBar(bar: BossBar) {
-        val audience = player
+        val audience = audience
         if (audience != null) {
             audience.hideBossBar(bar)
             return
@@ -192,7 +219,7 @@ abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(uuid: UUID) :
     }
 
     override fun playSound(sound: Sound) {
-        val audience = player
+        val audience = audience
         if (audience != null) {
             audience.playSound(sound)
             return
@@ -202,7 +229,7 @@ abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(uuid: UUID) :
     }
 
     override fun playSound(sound: Sound, emitter: Emitter) {
-        val audience = player
+        val audience = audience
         if (audience != null) {
             audience.playSound(sound, emitter)
             return
@@ -216,7 +243,7 @@ abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(uuid: UUID) :
     }
 
     override fun playSound(sound: Sound, x: Double, y: Double, z: Double) {
-        val audience = player
+        val audience = audience
         if (audience != null) {
             audience.playSound(sound, x, y, z)
             return
@@ -226,7 +253,7 @@ abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(uuid: UUID) :
     }
 
     override fun stopSound(stop: SoundStop) {
-        val audience = player
+        val audience = audience
         if (audience != null) {
             audience.stopSound(stop)
             return
@@ -236,7 +263,7 @@ abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(uuid: UUID) :
     }
 
     override fun openBook(book: Book) {
-        val audience = player
+        val audience = audience
         if (audience != null) {
             audience.openBook(book)
             return
@@ -246,7 +273,7 @@ abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(uuid: UUID) :
     }
 
     override fun sendResourcePacks(request: ResourcePackRequest) {
-        val audience = player
+        val audience = audience
         if (audience != null) {
             audience.sendResourcePacks(request)
             return
@@ -256,7 +283,7 @@ abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(uuid: UUID) :
     }
 
     override fun removeResourcePacks(id: UUID, vararg others: UUID) {
-        val audience = player
+        val audience = audience
         if (audience != null) {
             audience.removeResourcePacks(id, *others)
             return
@@ -266,7 +293,7 @@ abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(uuid: UUID) :
     }
 
     override fun clearResourcePacks() {
-        val audience = player
+        val audience = audience
         if (audience != null) {
             audience.clearResourcePacks()
             return
@@ -276,9 +303,9 @@ abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(uuid: UUID) :
     }
 
     override suspend fun teleport(
-        location: FineLocation,
-        teleportCause: FineTeleportCause,
-        vararg flags: FineTeleportFlag
+        location: TeleportLocation,
+        teleportCause: TeleportCause,
+        vararg flags: TeleportFlag
     ) = TeleportPlayerPacket(uuid, location, teleportCause, *flags).fireAndAwaitOrThrow().result
 
     protected fun <R> withLuckpermsOrThrow(block: (User) -> R): R {
@@ -290,4 +317,14 @@ abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(uuid: UUID) :
     protected fun <R> withLuckpermsAdapter(block: (PlayerAdapter<PlatformPlayer>) -> R): R {
         return block(luckperms.getPlayerAdapter(platformClass))
     }
+
+    private suspend inline fun <reified T : ServerboundRequestPlayerDataResponse.DataResponse> request(
+        type: DataRequestType
+    ): T {
+        val response = ServerboundRequestPlayerDataPacket(uuid, type).fireAndAwaitOrThrow().data
+        if (response !is T) {
+            error("Unexpected response type: ${response::class.simpleName}")
+        }
+        return response
+    }
 }
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/player/CommonClientCloudPlayerManagerImpl.kt b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/player/CommonClientCloudPlayerManagerImpl.kt
index ccb7e2e9..e931ba97 100644
--- a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/player/CommonClientCloudPlayerManagerImpl.kt
+++ b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/player/CommonClientCloudPlayerManagerImpl.kt
@@ -1,5 +1,6 @@
 package dev.slne.surf.cloud.core.client.player
 
+import dev.slne.surf.cloud.api.common.player.OfflineCloudPlayer
 import dev.slne.surf.cloud.core.common.player.CloudPlayerManagerImpl
 import dev.slne.surf.cloud.core.common.player.playerManagerImpl
 import net.kyori.adventure.audience.Audience
@@ -43,6 +44,10 @@ abstract class CommonClientCloudPlayerManagerImpl<Platform: Audience, P : Client
         return player.serverUid
     }
 
+    override fun getOfflinePlayer(uuid: UUID): OfflineCloudPlayer {
+        return OfflineCloudPlayerImpl(uuid)
+    }
+
     abstract fun getAudience(uuid: UUID): Audience?
 }
 
diff --git a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/player/OfflineCloudPlayerImpl.kt b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/player/OfflineCloudPlayerImpl.kt
new file mode 100644
index 00000000..3c15c4e2
--- /dev/null
+++ b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/player/OfflineCloudPlayerImpl.kt
@@ -0,0 +1,54 @@
+package dev.slne.surf.cloud.core.client.player
+
+import dev.slne.surf.cloud.api.client.netty.packet.fireAndAwaitOrThrow
+import dev.slne.surf.cloud.api.common.player.name.NameHistory
+import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ServerboundRequestPlayerDataPacket
+import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ServerboundRequestPlayerDataPacket.DataRequestType
+import dev.slne.surf.cloud.core.common.netty.network.protocol.running.getGenericValue
+import dev.slne.surf.cloud.core.common.player.CommonOfflineCloudPlayerImpl
+import net.kyori.adventure.text.Component
+import java.net.Inet4Address
+import java.time.ZonedDateTime
+import java.util.*
+
+class OfflineCloudPlayerImpl(uuid: UUID) : CommonOfflineCloudPlayerImpl(uuid) {
+    override suspend fun nameHistory(): NameHistory {
+        return request(DataRequestType.NAME_HISTORY)
+    }
+
+    override suspend fun lastServerRaw(): String? {
+        return request(DataRequestType.LAST_SERVER)
+    }
+
+    override suspend fun lastSeen(): ZonedDateTime? {
+        return request(DataRequestType.LAST_SEEN)
+    }
+
+    override suspend fun latestIpAddress(): Inet4Address? {
+        return request(DataRequestType.LATEST_IP_ADDRESS)
+    }
+
+    override suspend fun displayName(): Component? {
+        return request(DataRequestType.DISPLAY_NAME)
+    }
+
+    override suspend fun name(): String? {
+        return request(DataRequestType.NAME)
+    }
+
+    override suspend fun <R> getLuckpermsMetaData(
+        key: String,
+        transformer: (String) -> R
+    ): R? {
+        TODO("Not yet implemented")
+    }
+
+    override suspend fun getLuckpermsMetaData(key: String): String? {
+        TODO("Not yet implemented")
+    }
+
+    private suspend inline fun <reified T> request(type: DataRequestType): T {
+        val data = ServerboundRequestPlayerDataPacket(uuid, type).fireAndAwaitOrThrow()
+        return data.data.getGenericValue<T>()
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-common/build.gradle.kts b/surf-cloud-core/surf-cloud-core-common/build.gradle.kts
index 71d52ff2..ef6d792b 100644
--- a/surf-cloud-core/surf-cloud-core-common/build.gradle.kts
+++ b/surf-cloud-core/surf-cloud-core-common/build.gradle.kts
@@ -1,6 +1,5 @@
 plugins {
     id("dev.slne.surf.surfapi.gradle.core")
-    `core-convention`
 }
 
 dependencies {
@@ -8,15 +7,12 @@ dependencies {
         exclude(group = "ch.qos.logback", module = "logback-classic")
     }
 
-    runtimeOnly("org.aspectj:aspectjweaver:1.9.22.1")
     compileOnlyApi(libs.velocity.native)
-
-    // https://mvnrepository.com/artifact/com.github.luben/zstd-jni
-    api("com.github.luben:zstd-jni:1.5.6-9")
+    api(libs.zstd.jni)
 }
 
 kotlin {
     compilerOptions {
-        optIn.add("dev.slne.surf.cloud.api.common.util.InternalApi")
+        optIn.add("dev.slne.surf.cloud.api.common.util.annotation.InternalApi")
     }
 }
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/SurfCloudMainApplication.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/SurfCloudMainApplication.kt
index 413ca720..aa14c6a7 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/SurfCloudMainApplication.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/SurfCloudMainApplication.kt
@@ -2,23 +2,21 @@ package dev.slne.surf.cloud
 
 import dev.slne.surf.cloud.api.common.SurfCloudApplication
 import dev.slne.surf.cloud.api.common.exceptions.FatalSurfError
-import dev.slne.surf.cloud.api.common.util.logger
+import dev.slne.surf.surfapi.core.api.util.logger
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.asExecutor
 import org.apache.commons.lang3.ArrayUtils
 import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler
 import org.springframework.boot.SpringApplication
+import org.springframework.boot.autoconfigure.AutoConfigurationPackage
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContextAware
 import org.springframework.core.NestedRuntimeException
 import org.springframework.scheduling.annotation.AsyncConfigurer
 import java.lang.reflect.Method
-import java.util.concurrent.TimeUnit
 
-@SurfCloudApplication(
-    jpaBasePackages = ["dev.slne.surf.cloud.core.test"],
-    redisBasePackages = ["dev.slne.surf.cloud.core.util"]
-)
+@SurfCloudApplication
+@AutoConfigurationPackage
 class SurfCloudMainApplication : AsyncConfigurer, ApplicationContextAware {
     private val log = logger()
     private lateinit var applicationContext: ApplicationContext
@@ -37,7 +35,6 @@ class SurfCloudMainApplication : AsyncConfigurer, ApplicationContextAware {
                 handleFatalSurfError(ex.rootCause as FatalSurfError, method, params)
             } else {
                 log.atSevere()
-                    .atMostEvery(1, TimeUnit.SECONDS)
                     .withCause(ex)
                     .log(
                         """
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/SurfCloudCoreInstance.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/CloudCoreInstance.kt
similarity index 86%
rename from surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/SurfCloudCoreInstance.kt
rename to surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/CloudCoreInstance.kt
index f8196b68..804993ce 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/SurfCloudCoreInstance.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/CloudCoreInstance.kt
@@ -1,19 +1,20 @@
 package dev.slne.surf.cloud.core.common
 
 import dev.slne.surf.cloud.SurfCloudMainApplication
-import dev.slne.surf.cloud.api.common.SurfCloudInstance
-import dev.slne.surf.cloud.api.common.cloudInstance
+import dev.slne.surf.cloud.api.common.CloudInstance
 import dev.slne.surf.cloud.api.common.exceptions.ExitCodes
 import dev.slne.surf.cloud.api.common.exceptions.FatalSurfError
 import dev.slne.surf.cloud.api.common.startSpringApplication
-import dev.slne.surf.cloud.api.common.util.JoinClassLoader
-import dev.slne.surf.cloud.api.common.util.logger
+import dev.slne.surf.cloud.api.common.util.classloader.JoinClassLoader
 import dev.slne.surf.cloud.core.common.netty.NettyManager
+import dev.slne.surf.cloud.core.common.player.playerManagerImpl
 import dev.slne.surf.cloud.core.common.processors.NettyPacketProcessor
+import dev.slne.surf.cloud.core.common.server.CommonCloudServerImpl
 import dev.slne.surf.cloud.core.common.spring.SurfSpringBanner
 import dev.slne.surf.cloud.core.common.spring.event.RootSpringContextInitialized
 import dev.slne.surf.cloud.core.common.util.getCallerClass
 import dev.slne.surf.cloud.core.common.util.tempChangeSystemClassLoader
+import dev.slne.surf.surfapi.core.api.util.logger
 import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.coroutines.withTimeout
 import org.jetbrains.annotations.MustBeInvokedByOverriders
@@ -26,9 +27,8 @@ import java.nio.file.Path
 import javax.annotation.OverridingMethodsMustInvokeSuper
 import kotlin.time.Duration.Companion.minutes
 
-abstract class SurfCloudCoreInstance(private val nettyManager: NettyManager) : SurfCloudInstance {
+abstract class CloudCoreInstance(protected val nettyManager: NettyManager) : CloudInstance {
     protected val log = logger()
-    override val nettyPacketProcessorListener get() = NettyPacketProcessor
 
     val dataContext get() = internalContext ?: error("Data context is not initialized yet.")
 
@@ -131,8 +131,9 @@ abstract class SurfCloudCoreInstance(private val nettyManager: NettyManager) : S
     open suspend fun onDisable() {
         log.atInfo().log("Disabling SurfCloudCoreInstance...")
 
+        playerManagerImpl.terminate()
         nettyManager.stop()
-        if (internalContext?.isActive == true) internalContext?.close()
+//        if (internalContext?.isActive == true) internalContext?.close()
 
         log.atInfo().log("SurfCloudCoreInstance disabled.")
     }
@@ -172,6 +173,13 @@ abstract class SurfCloudCoreInstance(private val nettyManager: NettyManager) : S
         }
     }
 
+    abstract fun shutdownServer(server: CommonCloudServerImpl)
+
+
+    fun isRunning(): Boolean {
+        return internalContext?.isActive == true
+    }
+
     companion object {
         @Volatile
         var internalContext: ConfigurableApplicationContext? = null
@@ -180,8 +188,8 @@ abstract class SurfCloudCoreInstance(private val nettyManager: NettyManager) : S
     data class BootstrapData(val dataFolder: Path)
 }
 
-val coreCloudInstance: SurfCloudCoreInstance
-    get() = cloudInstance as SurfCloudCoreInstance
+val coreCloudInstance: CloudCoreInstance
+    get() = CloudInstance.instance as CloudCoreInstance
 
 inline fun FatalSurfError.handle(additionalHandling: (FatalSurfError) -> Unit) {
     val log = logger()
@@ -192,16 +200,22 @@ inline fun FatalSurfError.handle(additionalHandling: (FatalSurfError) -> Unit) {
     additionalHandling(this)
 }
 
-inline fun Throwable.handleEventuallyFatalError(additionalHandling: (FatalSurfError) -> Unit) {
+inline fun Throwable.handleEventuallyFatalError(
+    additionalHandling: (FatalSurfError) -> Unit,
+    log: Boolean = true,
+    handleTimeout: Boolean = true
+): Boolean {
     if (this is OutOfMemoryError) {
         throw this
     }
 
     if (this is FatalSurfError) {
         handle(additionalHandling)
+        return true
     } else if (this is NestedRuntimeException && this.rootCause is FatalSurfError) {
         (this.rootCause as FatalSurfError).handle(additionalHandling)
-    } else if (this is TimeoutCancellationException) {
+        return true
+    } else if (this is TimeoutCancellationException && handleTimeout) {
         val fatalError = FatalSurfError {
             simpleErrorMessage("An operation timed out")
             detailedErrorMessage("An operation timed out")
@@ -210,7 +224,12 @@ inline fun Throwable.handleEventuallyFatalError(additionalHandling: (FatalSurfEr
             exitCode(ExitCodes.TIMEOUT)
         }
         fatalError.handle(additionalHandling)
+        return true
     } else {
-        logger().atSevere().withCause(this).log("An unexpected error occurred")
+        if (log) {
+            logger().atSevere().withCause(this).log("An unexpected error occurred")
+        }
     }
+
+    return false
 }
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/config/SurfCloudConfig.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/config/SurfCloudConfig.kt
index ab283bcf..12299a98 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/config/SurfCloudConfig.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/config/SurfCloudConfig.kt
@@ -7,6 +7,7 @@ import dev.slne.surf.surfapi.core.api.SurfCoreApi
 import dev.slne.surf.surfapi.core.api.config.createSpongeYmlConfig
 import dev.slne.surf.surfapi.core.api.config.surfConfigApi
 import dev.slne.surf.surfapi.core.api.surfCoreApi
+import io.netty.handler.logging.LogLevel
 import org.jetbrains.annotations.ApiStatus.Internal
 import org.spongepowered.configurate.objectmapping.ConfigSerializable
 import org.spongepowered.configurate.objectmapping.meta.Comment
@@ -54,8 +55,17 @@ data class DatabaseConfig(
 
     @Comment("Password for database connection")
     @Setting("password")
-    val password: String = ""
-)
+    val password: String = "",
+
+    @Comment("Type of database to connect to")
+    @Setting("type")
+    val type: DatabaseType = DatabaseType.MARIADB
+) {
+    enum class DatabaseType(val driver: String) {
+        MYSQL("com.mysql.cj.jdbc.Driver"),
+        MARIADB("org.mariadb.jdbc.Driver"),
+    }
+}
 
 @ConfigSerializable
 data class RedisConfig(
@@ -99,5 +109,22 @@ data class NettyConfig(
 data class LoggingConfig(
     @Comment("Whether to log IPs from clients")
     @Setting("log-ips")
-    val logIps: Boolean = true
-)
+    val logIps: Boolean = true,
+
+    @Comment("The logging level for netty")
+    @Setting("netty-log-level")
+    val nettyLogLevelInternal: LogLevelWrapper = LogLevelWrapper.DEBUG,
+) {
+    enum class LogLevelWrapper {
+        TRACE, DEBUG, INFO, WARN, ERROR
+    }
+
+    val nettyLogLevel: LogLevel
+        get() = when (nettyLogLevelInternal) {
+            LogLevelWrapper.TRACE -> LogLevel.TRACE
+            LogLevelWrapper.DEBUG -> LogLevel.DEBUG
+            LogLevelWrapper.INFO -> LogLevel.INFO
+            LogLevelWrapper.WARN -> LogLevel.WARN
+            LogLevelWrapper.ERROR -> LogLevel.ERROR
+        }
+}
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/coroutines/scopes.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/coroutines/scopes.kt
index a1bb2c08..6adbff31 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/coroutines/scopes.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/coroutines/scopes.kt
@@ -1,15 +1,30 @@
 package dev.slne.surf.cloud.core.common.coroutines
 
-import dev.slne.surf.cloud.api.common.util.logger
+import dev.slne.surf.cloud.api.common.util.mutableObjectListOf
 import dev.slne.surf.cloud.api.common.util.threadFactory
+import dev.slne.surf.surfapi.core.api.util.logger
 import kotlinx.coroutines.*
+import org.gradle.internal.declarativedsl.language.This
 import java.util.concurrent.Executors
+import kotlin.coroutines.CoroutineContext
 
 abstract class BaseScope(
     dispatcher: CoroutineDispatcher,
     private val name: String
 ) : CoroutineScope {
+    companion object {
+        private val scopes = mutableObjectListOf<BaseScope>()
+        fun terminateAll() {
+            scopes.forEach { it.cancel() }
+        }
+    }
+
     protected val log = logger()
+
+    init {
+        scopes.add(this)
+    }
+
     override val coroutineContext = dispatcher + CoroutineName(name) + SupervisorJob() +
             CoroutineExceptionHandler { context, throwable ->
                 val coroutineName = context[CoroutineName]?.name ?: "Unnamed Coroutine"
@@ -17,9 +32,12 @@ abstract class BaseScope(
                     .withCause(throwable)
                     .log("Unhandled exception in coroutine: $coroutineName")
             }
+
+    val context get() = coroutineContext
+
 }
 
-object PacketHandlerScope: BaseScope(
+object PacketHandlerScope : BaseScope(
     dispatcher = Dispatchers.Default,
     name = "netty-listener"
 )
@@ -59,9 +77,47 @@ object QueueDisplayScope : BaseScope(
 )
 
 object PlayerDataSaveScope : BaseScope(
+    dispatcher = Dispatchers.IO,
+    name = "player-data-save"
+)
+
+object PlayerBatchTransferScope : BaseScope(
     dispatcher = Executors.newSingleThreadExecutor(threadFactory {
-        nameFormat("player-data-save-thread-%d")
+        nameFormat("player-batch-transfer-thread-%d")
         daemon(false)
     }).asCoroutineDispatcher(),
-    name = "player-data-save"
+    name = "player-batch-transfer"
+)
+
+object ServerShutdownScope : BaseScope(
+    dispatcher = Executors.newSingleThreadExecutor(threadFactory {
+        nameFormat("server-shutdown-thread-%d")
+        daemon(false)
+    }).asCoroutineDispatcher(),
+    name = "server-shutdown"
+)
+
+object ConsoleCommandHandlerScope : BaseScope(
+    dispatcher = Dispatchers.IO,
+    name = "console-command-handler"
+)
+
+object ConsoleCommandInputScope : BaseScope(
+    dispatcher = Dispatchers.IO,
+    name = "Server console handler"
+)
+
+object KtorScope : BaseScope(
+    dispatcher = Dispatchers.IO,
+    name = "ktor"
+)
+
+object NameHistoryScope : BaseScope(
+    dispatcher = Dispatchers.IO,
+    name = "name-history"
+)
+
+object PlayerDatabaseScope : BaseScope(
+    dispatcher = newSingleThreadContext("player-database-thread"),
+    name = "player-database"
 )
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/data/PersistentDataImpl.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/data/PersistentDataImpl.kt
index 2d30b354..b322d808 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/data/PersistentDataImpl.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/data/PersistentDataImpl.kt
@@ -1,25 +1,29 @@
 package dev.slne.surf.cloud.core.common.data
 
+import dev.slne.surf.cloud.api.common.util.nbt.readCompoundTag
+import dev.slne.surf.cloud.api.common.util.nbt.writeToPath
 import dev.slne.surf.cloud.core.common.coreCloudInstance
-import net.querz.nbt.io.NBTUtil
 import net.querz.nbt.tag.CompoundTag
 import net.querz.nbt.tag.Tag
-import java.io.File
+import kotlin.io.path.createFile
+import kotlin.io.path.createParentDirectories
+import kotlin.io.path.div
+import kotlin.io.path.notExists
 
 
 internal object PersistentDataImpl {
-    private val file: File by lazy {
-        coreCloudInstance.dataFolder.resolve("data.dat").toFile().apply {
-            if (!exists()) {
-                parentFile?.mkdirs()
-                createNewFile()
-                NBTUtil.write(CompoundTag(), this, true)
+    private val file by lazy {
+        (coreCloudInstance.dataFolder / "storage" / "data.dat").apply {
+            if (notExists()) {
+                createParentDirectories()
+                createFile()
+                CompoundTag().writeToPath(this)
             }
         }
     }
 
-    private val tag: CompoundTag by lazy { NBTUtil.read(file, true).tag as CompoundTag }
-    private fun saveTag() = NBTUtil.write(tag, file, true)
+    private val tag by lazy { file.readCompoundTag() }
+    private fun saveTag() = tag.writeToPath(file)
 
     fun <T : Tag<D>, D> data(
         key: String,
@@ -31,7 +35,6 @@ internal object PersistentDataImpl {
         return DataImpl(tag, key, toValue, toTag, type, defaultValue)
     }
 
-
     private data class DataImpl<T : Tag<D>, D>(
         val tag: CompoundTag,
         val key: String,
@@ -50,6 +53,6 @@ internal object PersistentDataImpl {
             saveTag()
         }
 
-       override operator fun contains(key: String): Boolean = tag.containsKey(key)
+        override operator fun contains(key: String): Boolean = tag.containsKey(key)
     }
 }
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/NettyManager.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/NettyManager.kt
index a050a320..d05c48c7 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/NettyManager.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/NettyManager.kt
@@ -1,12 +1,17 @@
 package dev.slne.surf.cloud.core.common.netty
 
-import dev.slne.surf.cloud.api.common.util.logger
+import dev.slne.surf.surfapi.core.api.util.logger
 import org.jetbrains.annotations.MustBeInvokedByOverriders
 
+lateinit var nettyManager: NettyManager
 abstract class NettyManager {
 
     private val log = logger()
 
+    init {
+        nettyManager = this
+    }
+
     @MustBeInvokedByOverriders
     open suspend fun bootstrap() {
         log.atInfo().log("Bootstrapping NettyManager...")
@@ -30,6 +35,9 @@ abstract class NettyManager {
     @MustBeInvokedByOverriders
     open fun stop() {
         log.atInfo().log("Stopping NettyManager...")
+        for (thread in Thread.getAllStackTraces().keys) {
+            println("${thread.name} - ${thread.state}")
+        }
     }
 
     @MustBeInvokedByOverriders
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/ClientboundPacketListener.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/ClientboundPacketListener.kt
index 61d2bfa7..4ee1ed75 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/ClientboundPacketListener.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/ClientboundPacketListener.kt
@@ -1,7 +1,22 @@
 package dev.slne.surf.cloud.core.common.netty.network
 
 import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
+import dev.slne.surf.surfapi.core.api.util.logger
 
 interface ClientboundPacketListener : PacketListener {
     override val flow get() = PacketFlow.CLIENTBOUND
+
+    override fun onPacketError(
+        packet: NettyPacket,
+        exception: Throwable
+    ) {
+        log.atSevere()
+            .withCause(exception)
+            .log("Failed to handle packet '%s'", packet)
+    }
+
+    companion object {
+        private val log = logger()
+    }
 }
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/ConnectionImpl.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/ConnectionImpl.kt
index ea4b868f..51c7b065 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/ConnectionImpl.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/ConnectionImpl.kt
@@ -5,7 +5,10 @@ import dev.slne.surf.cloud.api.common.netty.network.Connection
 import dev.slne.surf.cloud.api.common.netty.network.ConnectionProtocol
 import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
 import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
-import dev.slne.surf.cloud.api.common.util.*
+import dev.slne.surf.cloud.api.common.util.DefaultUncaughtExceptionHandlerWithName
+import dev.slne.surf.cloud.api.common.util.math.lerp
+import dev.slne.surf.cloud.api.common.util.netty.suspend
+import dev.slne.surf.cloud.api.common.util.threadFactory
 import dev.slne.surf.cloud.core.common.config.cloudConfig
 import dev.slne.surf.cloud.core.common.coroutines.ConnectionManagementScope
 import dev.slne.surf.cloud.core.common.coroutines.PacketHandlerScope
@@ -18,6 +21,7 @@ import dev.slne.surf.cloud.core.common.netty.network.protocol.initialize.*
 import dev.slne.surf.cloud.core.common.netty.network.protocol.login.*
 import dev.slne.surf.cloud.core.common.netty.network.protocol.prerunning.*
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.*
+import dev.slne.surf.surfapi.core.api.util.logger
 import io.netty.bootstrap.Bootstrap
 import io.netty.channel.*
 import io.netty.channel.epoll.Epoll
@@ -30,6 +34,8 @@ import io.netty.handler.codec.EncoderException
 import io.netty.handler.codec.compression.ZstdDecoder
 import io.netty.handler.codec.compression.ZstdEncoder
 import io.netty.handler.flow.FlowControlHandler
+import io.netty.handler.logging.LogLevel
+import io.netty.handler.logging.LoggingHandler
 import io.netty.handler.timeout.ReadTimeoutHandler
 import io.netty.handler.timeout.TimeoutException
 import io.netty.util.AttributeKey
@@ -131,6 +137,11 @@ class ConnectionImpl(
     }
 
     override fun exceptionCaught(ctx: ChannelHandlerContext, e: Throwable?) {
+//        if (e is NotSslRecordException) {
+//            ctx.close()
+//            return
+//        }
+
         log.atInfo().withCause(e).log("Exception caught") // TODO: remove this debug line
         var throwable = e
 
@@ -204,6 +215,7 @@ class ConnectionImpl(
         check(packetListener != null) { "Received a packet before the packet listener was initialized" }
 
         if (stopReadingPackets) return
+        if (!packetListener.shouldHandleMessage(msg)) return
 
         this.receivedPackets++
         PacketHandlerScope.launch {
@@ -303,6 +315,10 @@ class ConnectionImpl(
                             msg
                         )
 
+                        is RequestOfflineDisplayNamePacket -> listener.handleRequestOfflinePlayerDisplayName(
+                            msg
+                        )
+
                         is ServerboundClientInformationPacket -> listener.handleClientInformation(
                             msg
                         )
@@ -326,6 +342,8 @@ class ConnectionImpl(
                         is DisconnectPlayerPacket -> listener.handleDisconnectPlayer(msg)
 
                         is TeleportPlayerPacket -> listener.handleTeleportPlayer(msg)
+                        is ServerboundShutdownServerPacket -> listener.handleShutdownServer(msg)
+                        is ServerboundRequestPlayerDataPacket -> listener.handleRequestPlayerData(msg)
 
                         else -> listener.handlePacket(msg) // handle other packets
                     }
@@ -410,6 +428,10 @@ class ConnectionImpl(
                             msg
                         )
 
+                        is RequestOfflineDisplayNamePacket -> listener.handleRequestOfflinePlayerDisplayName(
+                            msg
+                        )
+
                         is ClientboundRegisterServerPacket -> listener.handleRegisterServerPacket(
                             msg
                         )
@@ -444,6 +466,8 @@ class ConnectionImpl(
                         is ClientboundRegisterCloudServersToProxyPacket -> listener.handleRegisterCloudServersToProxy(
                             msg
                         )
+                        is ClientboundTriggerShutdownPacket -> listener.handleTriggerShutdown(msg)
+                        is ClientboundBatchUpdateServer -> listener.handleBatchUpdateServer(msg)
 
                         else -> listener.handlePacket(msg)
                     }
@@ -1024,8 +1048,11 @@ class ConnectionImpl(
             val receivingSide = side == PacketFlow.SERVERBOUND
             val sendingSide = opposite == PacketFlow.SERVERBOUND
 
-            pipeline.addLast(HandlerNames.COMPRESS, ZstdEncoder(8))
-                .addLast(HandlerNames.DECODER, ZstdDecoder())
+
+            pipeline.addFirst(HandlerNames.LOGGER, LoggingHandler(cloudConfig.logging.nettyLogLevel))
+//                .addLast(HandlerNames.SSL_HANDLER_ENFORCER, EnforceSslHandler())
+                .addLast(HandlerNames.COMPRESS, ZstdEncoder(8))
+                .addLast(HandlerNames.DECOMPRESS, ZstdDecoder())
                 .addLast(HandlerNames.SPLITTER, createFrameDecoder(local))
                 .addLast(FlowControlHandler())
                 .addLast(
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/EncryptionManager.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/EncryptionManager.kt
index 8739f2bc..d299c93b 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/EncryptionManager.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/EncryptionManager.kt
@@ -1,7 +1,7 @@
 package dev.slne.surf.cloud.core.common.netty.network
 
-import dev.slne.surf.cloud.api.common.util.logger
 import dev.slne.surf.cloud.core.common.coreCloudInstance
+import dev.slne.surf.surfapi.core.api.util.logger
 import io.netty.channel.Channel
 import kotlinx.coroutines.delay
 import java.io.File
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/EnforceSslHandler.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/EnforceSslHandler.kt
new file mode 100644
index 00000000..2eec66e8
--- /dev/null
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/EnforceSslHandler.kt
@@ -0,0 +1,32 @@
+package dev.slne.surf.cloud.core.common.netty.network
+
+import io.netty.buffer.ByteBuf
+import io.netty.channel.ChannelHandlerContext
+import io.netty.channel.ChannelInboundHandlerAdapter
+import io.netty.handler.ssl.NotSslRecordException
+import io.netty.handler.ssl.SslHandler
+
+class EnforceSslHandler : ChannelInboundHandlerAdapter() {
+    override fun channelRead(ctx: ChannelHandlerContext, msg: Any?) {
+        if (msg is ByteBuf) {
+            if (!looksLikeSsl(msg)) {
+                ctx.close()
+                return
+            }
+        }
+        ctx.pipeline().remove(this)
+        ctx.fireChannelRead(msg)
+    }
+
+    override fun exceptionCaught(ctx: ChannelHandlerContext, cause: Throwable?) {
+        if (cause is NotSslRecordException) {
+            ctx.close()
+        } else {
+            ctx.fireExceptionCaught(cause)
+        }
+    }
+
+    private fun looksLikeSsl(data: ByteBuf): Boolean {
+        return data.readableBytes() > 5 && SslHandler.isEncrypted(data, false)
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/HandlerNames.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/HandlerNames.kt
index 7a05f470..f00bd0d2 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/HandlerNames.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/HandlerNames.kt
@@ -1,6 +1,8 @@
 package dev.slne.surf.cloud.core.common.netty.network
 
 object HandlerNames {
+    const val LOGGER = "logger"
+    const val SSL_HANDLER_ENFORCER = "ssl_handler_enforcer"
     const val SSL_HANDLER: String = "ssl_handler"
     const val DECOMPRESS: String = "decompress"
     const val COMPRESS: String = "compress"
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/PacketEncoder.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/PacketEncoder.kt
index 4da95ef7..fdf9eeb4 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/PacketEncoder.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/PacketEncoder.kt
@@ -1,17 +1,13 @@
 package dev.slne.surf.cloud.core.common.netty.network
 
 import dev.slne.surf.cloud.api.common.exceptions.SkipPacketException
-import dev.slne.surf.cloud.api.common.netty.network.ConnectionProtocol
 import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
-import dev.slne.surf.cloud.api.common.netty.protocol.buffer.writeNullable
-import dev.slne.surf.cloud.api.common.netty.protocol.buffer.writeVarLong
-import dev.slne.surf.cloud.api.common.util.logger
+import dev.slne.surf.surfapi.core.api.util.logger
 import io.netty.buffer.ByteBuf
 import io.netty.channel.ChannelHandlerContext
 import io.netty.handler.codec.MessageToByteEncoder
-import org.checkerframework.checker.units.qual.m
 import java.io.Serial
 
 
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/PacketListener.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/PacketListener.kt
index ecc5328d..57a7b521 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/PacketListener.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/PacketListener.kt
@@ -2,11 +2,19 @@ package dev.slne.surf.cloud.core.common.netty.network
 
 import dev.slne.surf.cloud.api.common.netty.network.ConnectionProtocol
 import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
 
 interface PacketListener {
     val flow: PacketFlow
     val protocol: ConnectionProtocol
 
     suspend fun onDisconnect(details: DisconnectionDetails)
-    fun createDisconnectionInfo(reason: String, throwable: Throwable?): DisconnectionDetails = DisconnectionDetails(reason)
+    fun createDisconnectionInfo(reason: String, throwable: Throwable?): DisconnectionDetails =
+        DisconnectionDetails(reason)
+
+    fun onPacketError(packet: NettyPacket, exception: Throwable) {}
+
+    fun isAcceptingMessages(): Boolean
+    fun shouldHandleMessage(packet: NettyPacket): Boolean = isAcceptingMessages()
+
 }
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/RespondingPacketSendHandler.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/RespondingPacketSendHandler.kt
index 8246329c..45464596 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/RespondingPacketSendHandler.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/RespondingPacketSendHandler.kt
@@ -3,10 +3,10 @@ package dev.slne.surf.cloud.core.common.netty.network
 import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
-import dev.slne.surf.cloud.api.common.util.UnifiedReadOnlyChannelHandler
-import dev.slne.surf.cloud.api.common.util.logger
 import dev.slne.surf.cloud.api.common.util.mutableObject2ObjectMapOf
+import dev.slne.surf.cloud.api.common.util.netty.UnifiedReadOnlyChannelHandler
 import dev.slne.surf.cloud.api.common.util.synchronize
+import dev.slne.surf.surfapi.core.api.util.logger
 import io.netty.channel.ChannelHandlerContext
 import io.netty.channel.ChannelPromise
 import kotlinx.coroutines.CompletableDeferred
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/ServerboundPacketListener.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/ServerboundPacketListener.kt
index 4620a9fb..7fdc7f6e 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/ServerboundPacketListener.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/ServerboundPacketListener.kt
@@ -1,7 +1,22 @@
 package dev.slne.surf.cloud.core.common.netty.network
 
 import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
+import dev.slne.surf.surfapi.core.api.util.logger
 
 interface ServerboundPacketListener: PacketListener {
     override val flow get() = PacketFlow.SERVERBOUND
+
+    override fun onPacketError(
+        packet: NettyPacket,
+        exception: Throwable
+    ) {
+        log.atSevere()
+            .withCause(exception)
+            .log("Failed to handle packet '%s', suppressing error", packet)
+    }
+
+    companion object {
+        private val log = logger()
+    }
 }
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/ProtocolInfoBuilder.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/ProtocolInfoBuilder.kt
index 0419a304..0aa7a5f0 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/ProtocolInfoBuilder.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/ProtocolInfoBuilder.kt
@@ -60,7 +60,12 @@ class ProtocolInfoBuilder<T : PacketListener, B : ByteBuf>(
     }
 
     fun build(bufUpgrader: Function<ByteBuf, B>): ProtocolInfo<T> =
-        ProtocolInfoImpl(this.protocol, this.flow, this.buildPacketCodec(bufUpgrader, this.codecs), this.bundlerInfo)
+        ProtocolInfoImpl(
+            this.protocol,
+            this.flow,
+            this.buildPacketCodec(bufUpgrader, this.codecs),
+            this.bundlerInfo
+        )
 
     fun buildUnbound() = object : ProtocolInfo.Unbound<T, B> {
         override val id = protocol
@@ -162,4 +167,14 @@ fun <T : PacketListener, B : ByteBuf> buildProtocolInfo(
     }
 
     return ProtocolInfoBuilder<T, B>(protocol, flow).apply(block)
-}
\ No newline at end of file
+}
+
+fun <T : ClientboundPacketListener, B : ByteBuf> buildClientProtocolInfo(
+    protocol: ConnectionProtocol,
+    @BuilderInference block: ProtocolInfoBuilder<T, B>.() -> Unit
+) = ProtocolInfoBuilder.clientboundProtocol<T, B>(protocol, block)
+
+fun <T : ServerboundPacketListener, B : ByteBuf> buildServerProtocolInfo(
+    protocol: ConnectionProtocol,
+    @BuilderInference block: ProtocolInfoBuilder<T, B>.() -> Unit
+) = ProtocolInfoBuilder.serverboundProtocol<T, B>(protocol, block)
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/common/ClientboundKeepAlivePacket.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/common/ClientboundKeepAlivePacket.kt
index e21c4bdc..c4a34ada 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/common/ClientboundKeepAlivePacket.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/common/ClientboundKeepAlivePacket.kt
@@ -11,7 +11,7 @@ import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
 /**
  * The server will frequently send out a keep-alive, each containing a random ID. The client must
  * respond with the same payload (see
- * [dev.slne.surf.cloud.core.netty.protocol.packets.cloud.phase.running.serverbound.ServerboundKeepAlivePacket]).
+ * [ServerboundKeepAlivePacket]).
  * If the client does not respond to a
  * Keep Alive packet within `15 seconds` after it was sent, the server kicks the client. Vice versa,
  * if the server does not send any keep-alives for `20 seconds`, the client will disconnect and yields
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/handshake/ClientIntent.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/handshake/ClientIntent.kt
index 989210d0..14ad4013 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/handshake/ClientIntent.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/handshake/ClientIntent.kt
@@ -1,7 +1,7 @@
 package dev.slne.surf.cloud.core.common.netty.network.protocol.handshake
 
 enum class ClientIntent {
-    STATUS, // TODO: implement
+    STATUS, // Currently not in use
     INITIALIZE,
     LOGIN,
 }
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/handshake/ServerboundHandshakePacket.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/handshake/ServerboundHandshakePacket.kt
index 5b1e178c..fe02e45b 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/handshake/ServerboundHandshakePacket.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/handshake/ServerboundHandshakePacket.kt
@@ -8,7 +8,7 @@ import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
 import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
 
-const val PROTOCOL_VERSION = -1 // TODO: implement maybe?
+const val PROTOCOL_VERSION = 1
 
 /**
  * First packet sent by the client to the cloud server. It is used to establish a connection to the cloud server.
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/prerunning/PreRunningProtocols.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/prerunning/PreRunningProtocols.kt
index a50365e6..a4872a1f 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/prerunning/PreRunningProtocols.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/prerunning/PreRunningProtocols.kt
@@ -11,7 +11,7 @@ object PreRunningProtocols {
             ConnectionProtocol.PRE_RUNNING
         ) { builder ->
             builder.withBundlePacket(::ClientboundBundlePacket, ClientboundBundleDelimiterPacket())
-            // TODO: disconnect packet
+            // TODO: disconnect packet - needed?
             builder.addPacket(ClientboundKeepAlivePacket.STREAM_CODEC)
                 .addPacket(ClientboundPongResponsePacket.STREAM_CODEC)
                 .addPacket(ClientboundPreRunningFinishedPacket.STREAM_CODEC)
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/ClientboundBatchUpdateServer.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/ClientboundBatchUpdateServer.kt
new file mode 100644
index 00000000..f760a1b8
--- /dev/null
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/ClientboundBatchUpdateServer.kt
@@ -0,0 +1,50 @@
+package dev.slne.surf.cloud.core.common.netty.network.protocol.running
+
+import dev.slne.surf.cloud.api.common.meta.DefaultIds
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+import dev.slne.surf.cloud.api.common.server.CommonCloudServer
+import dev.slne.surf.cloud.api.common.server.ProxyCloudServer
+
+@SurfNettyPacket(DefaultIds.CLIENTBOUND_BATCH_UPDATE_SERVER, PacketFlow.CLIENTBOUND)
+class ClientboundBatchUpdateServer(
+    val servers: List<UpdateServerData>
+) : NettyPacket() {
+
+    companion object {
+        val STREAM_CODEC =
+            packetCodec(ClientboundBatchUpdateServer::write, ::ClientboundBatchUpdateServer)
+    }
+
+    constructor(servers: Iterable<CommonCloudServer>) : this(servers.map {
+        UpdateServerData(it.uid, it is ProxyCloudServer, it.group, it.name)
+    })
+
+    private constructor(buf: SurfByteBuf) : this(buf.readList {
+        UpdateServerData(
+            buf.readVarLong(),
+            buf.readBoolean(),
+            buf.readUtf(),
+            buf.readUtf()
+        )
+    })
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeCollection(servers) { buf, data ->
+            buf.writeVarLong(data.serverId)
+            buf.writeBoolean(data.proxy)
+            buf.writeUtf(data.group)
+            buf.writeUtf(data.name)
+        }
+    }
+}
+
+data class UpdateServerData(
+    val serverId: Long,
+    val proxy: Boolean,
+    val group: String,
+    val name: String
+)
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/ClientboundTriggerShutdownPacket.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/ClientboundTriggerShutdownPacket.kt
new file mode 100644
index 00000000..9aca43e1
--- /dev/null
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/ClientboundTriggerShutdownPacket.kt
@@ -0,0 +1,15 @@
+package dev.slne.surf.cloud.core.common.netty.network.protocol.running
+
+import dev.slne.surf.cloud.api.common.meta.DefaultIds
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.codec.streamCodecUnitSimple
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
+
+@SurfNettyPacket(
+    DefaultIds.CLIENTBOUND_SHUTDOWN_PACKET,
+    PacketFlow.CLIENTBOUND
+)
+object ClientboundTriggerShutdownPacket: NettyPacket() {
+    val STREAM_CODEC = streamCodecUnitSimple(this)
+}
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/PlayerConnectToServerPacket.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/PlayerConnectToServerPacket.kt
index 42b4fe7c..0488de85 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/PlayerConnectToServerPacket.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/PlayerConnectToServerPacket.kt
@@ -6,6 +6,7 @@ import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
 import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
 import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+import java.net.Inet4Address
 import java.util.*
 
 /**
@@ -38,6 +39,8 @@ class PlayerConnectToServerPacket : NettyPacket {
      */
     val uuid: UUID
 
+    val name: String
+
     /**
      * Represents the unique identifier of the server the player is connecting to.
      */
@@ -48,6 +51,8 @@ class PlayerConnectToServerPacket : NettyPacket {
      */
     val proxy: Boolean
 
+    val playerIp: Inet4Address
+
     /**
      * Constructs a new instance of `PlayerConnectToServerPacket`.
      *
@@ -55,10 +60,12 @@ class PlayerConnectToServerPacket : NettyPacket {
      * @param serverUid The unique identifier of the server the player is connecting to.
      * @param proxy Indicates if the server is a proxy.
      */
-    constructor(uuid: UUID, serverUid: Long, proxy: Boolean) {
+    constructor(uuid: UUID, name: String, proxy: Boolean, playerIp: Inet4Address, serverUid: Long) {
         this.uuid = uuid
+        this.name = name
         this.serverUid = serverUid
         this.proxy = proxy
+        this.playerIp = playerIp
     }
 
     /**
@@ -69,8 +76,10 @@ class PlayerConnectToServerPacket : NettyPacket {
      */
     private constructor(buf: SurfByteBuf) {
         this.uuid = buf.readUuid()
+        this.name = buf.readUtf(16)
         this.serverUid = buf.readLong()
         this.proxy = buf.readBoolean()
+        this.playerIp = buf.readInet4Address()
     }
 
     /**
@@ -80,7 +89,9 @@ class PlayerConnectToServerPacket : NettyPacket {
      */
     private fun write(buf: SurfByteBuf) {
         buf.writeUuid(uuid)
+        buf.writeUtf(name, 16)
         buf.writeLong(serverUid)
         buf.writeBoolean(proxy)
+        buf.writeInet4Address(playerIp)
     }
 }
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/RequestOfflineDisplayNamePacket.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/RequestOfflineDisplayNamePacket.kt
new file mode 100644
index 00000000..1bb3434d
--- /dev/null
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/RequestOfflineDisplayNamePacket.kt
@@ -0,0 +1,24 @@
+package dev.slne.surf.cloud.core.common.netty.network.protocol.running
+
+import dev.slne.surf.cloud.api.common.meta.DefaultIds
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.component.OptionalComponentResponse
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+import java.util.*
+
+@SurfNettyPacket(DefaultIds.REQUEST_OFFLINE_DISPLAY_NAME_PACKET, PacketFlow.BIDIRECTIONAL)
+class RequestOfflineDisplayNamePacket(val uuid: UUID) :
+    RespondingNettyPacket<OptionalComponentResponse>() {
+    private constructor(buf: SurfByteBuf) : this(buf.readUuid())
+
+    companion object {
+        val STREAM_CODEC = packetCodec(RequestOfflineDisplayNamePacket::write, ::RequestOfflineDisplayNamePacket)
+    }
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeUuid(uuid)
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/RunningClientPacketListener.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/RunningClientPacketListener.kt
index 4331a179..eaa3a913 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/RunningClientPacketListener.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/RunningClientPacketListener.kt
@@ -43,6 +43,8 @@ interface RunningClientPacketListener : ClientCommonPacketListener {
 
     fun handleRequestDisplayName(packet: ClientboundRequestDisplayNamePacket)
 
+    suspend fun handleRequestOfflinePlayerDisplayName(packet: RequestOfflineDisplayNamePacket)
+
     suspend fun handleRegisterServerPacket(packet: ClientboundRegisterServerPacket)
 
     suspend fun handleUnregisterServerPacket(packet: ClientboundUnregisterServerPacket)
@@ -65,5 +67,9 @@ interface RunningClientPacketListener : ClientCommonPacketListener {
 
     fun handleRegisterCloudServersToProxy(packet: ClientboundRegisterCloudServersToProxyPacket)
 
+    fun handleTriggerShutdown(packet: ClientboundTriggerShutdownPacket)
+
+    suspend fun handleBatchUpdateServer(packet: ClientboundBatchUpdateServer)
+
     fun handlePacket(packet: NettyPacket)
 }
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/RunningProtocols.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/RunningProtocols.kt
index 4df8f70c..18d3c9d5 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/RunningProtocols.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/RunningProtocols.kt
@@ -47,6 +47,10 @@ object RunningProtocols {
                 .addPacket(TeleportPlayerPacket.STREAM_CODEC)
                 .addPacket(TeleportPlayerResultPacket.STREAM_CODEC)
                 .addPacket(ClientboundRegisterCloudServersToProxyPacket.STREAM_CODEC)
+                .addPacket(ClientboundTriggerShutdownPacket.STREAM_CODEC)
+                .addPacket(RequestOfflineDisplayNamePacket.STREAM_CODEC)
+                .addPacket(ClientboundBatchUpdateServer.STREAM_CODEC)
+                .addPacket(ServerboundRequestPlayerDataResponse.STREAM_CODEC)
         }
 
     val CLIENTBOUND by lazy { CLIENTBOUND_TEMPLATE.freeze().bind(::SurfByteBuf) }
@@ -88,6 +92,9 @@ object RunningProtocols {
                 .addPacket(DisconnectPlayerPacket.STREAM_CODEC)
                 .addPacket(TeleportPlayerPacket.STREAM_CODEC)
                 .addPacket(TeleportPlayerResultPacket.STREAM_CODEC)
+                .addPacket(ServerboundShutdownServerPacket.STREAM_CODEC)
+                .addPacket(RequestOfflineDisplayNamePacket.STREAM_CODEC)
+                .addPacket(ServerboundRequestPlayerDataPacket.STREAM_CODEC)
         }
 
     val SERVERBOUND by lazy { SERVERBOUND_TEMPLATE.freeze().bind(::SurfByteBuf) }
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/RunningServerPacketListener.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/RunningServerPacketListener.kt
index eb8473e5..e191d15b 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/RunningServerPacketListener.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/RunningServerPacketListener.kt
@@ -44,6 +44,8 @@ interface RunningServerPacketListener : ServerCommonPacketListener, TickablePack
 
     suspend fun handleRequestDisplayName(packet: ServerboundRequestDisplayNamePacket)
 
+    suspend fun handleRequestOfflinePlayerDisplayName(packet: RequestOfflineDisplayNamePacket)
+
     suspend fun handleClientInformation(packet: ServerboundClientInformationPacket)
 
     suspend fun handleRequestLuckpermsMetaData(packet: RequestLuckpermsMetaDataPacket)
@@ -57,6 +59,10 @@ interface RunningServerPacketListener : ServerCommonPacketListener, TickablePack
     fun handleDisconnectPlayer(packet: DisconnectPlayerPacket)
 
     suspend fun handleTeleportPlayer(packet: TeleportPlayerPacket)
+
+    suspend fun handleShutdownServer(packet: ServerboundShutdownServerPacket)
+
+    suspend fun handleRequestPlayerData(packet: ServerboundRequestPlayerDataPacket)
     
     fun handlePacket(packet: NettyPacket)
 }
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/ServerboundClientInformationPacket.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/ServerboundClientInformationPacket.kt
index 14370b99..213538e4 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/ServerboundClientInformationPacket.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/ServerboundClientInformationPacket.kt
@@ -50,33 +50,33 @@ class ServerboundClientInformationPacket : NettyPacket {
 
 data class ClientInformation(
     val maxPlayerCount: Int,
-    val whitelist: Boolean,
+    val allowlist: Boolean,
     val state: ServerState
 ) {
     companion object {
         val CODEC = createRecordCodec<ClientInformation> {
             group(
                 int("maxPlayerCount") { maxPlayerCount },
-                bool("whitelist") { whitelist },
+                bool("allowlist") { allowlist },
                 enum("state") { state }
             ).apply(this, ::ClientInformation)
         }
 
         val STREAM_CODEC = streamCodec<SurfByteBuf, ClientInformation>({ buf, info ->
             buf.writeVarInt(info.maxPlayerCount)
-            buf.writeBoolean(info.whitelist)
+            buf.writeBoolean(info.allowlist)
             buf.writeEnum(info.state)
         }, { buf ->
             ClientInformation(
                 maxPlayerCount = buf.readVarInt(),
-                whitelist = buf.readBoolean(),
+                allowlist = buf.readBoolean(),
                 state = buf.readEnum()
             )
         })
 
         val NOT_AVAILABLE = ClientInformation(
             maxPlayerCount = -1,
-            whitelist = true,
+            allowlist = true,
             state = ServerState.OFFLINE
         )
     }
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/ServerboundRequestPlayerDataPacket.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/ServerboundRequestPlayerDataPacket.kt
new file mode 100644
index 00000000..0f4f15b3
--- /dev/null
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/ServerboundRequestPlayerDataPacket.kt
@@ -0,0 +1,159 @@
+package dev.slne.surf.cloud.core.common.netty.network.protocol.running
+
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.codec.StreamDecoder
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.ResponseNettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.readEnum
+import dev.slne.surf.cloud.api.common.player.OfflineCloudPlayer
+import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ServerboundRequestPlayerDataPacket.DataRequestType
+import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ServerboundRequestPlayerDataResponse.*
+import net.kyori.adventure.text.Component
+import java.net.Inet4Address
+import java.time.ZonedDateTime
+import java.util.*
+import dev.slne.surf.cloud.api.common.player.name.NameHistory as ApiNameHistory
+
+@SurfNettyPacket("cloud:request:player_data", PacketFlow.SERVERBOUND)
+class ServerboundRequestPlayerDataPacket(val uuid: UUID, val type: DataRequestType) :
+    RespondingNettyPacket<ServerboundRequestPlayerDataResponse>() {
+
+    companion object {
+        val STREAM_CODEC =
+            packetCodec(
+                ServerboundRequestPlayerDataPacket::write,
+                ::ServerboundRequestPlayerDataPacket
+            )
+    }
+
+    private constructor(buf: SurfByteBuf) : this(
+        buf.readUuid(),
+        buf.readEnum()
+    )
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeUuid(uuid)
+        buf.writeEnum(type)
+    }
+
+    enum class DataRequestType(val reader: StreamDecoder<SurfByteBuf, DataResponse>) {
+        LATEST_IP_ADDRESS(::IpAddress) {
+            override suspend fun readData(player: OfflineCloudPlayer): DataResponse {
+                return IpAddress(player.latestIpAddress())
+            }
+        },
+        LAST_SERVER(::LastServer) {
+            override suspend fun readData(player: OfflineCloudPlayer): DataResponse {
+                return LastServer(player.lastServerRaw())
+            }
+        },
+        LAST_SEEN(::LastSeen) {
+            override suspend fun readData(player: OfflineCloudPlayer): DataResponse {
+                return LastSeen(player.lastSeen())
+            }
+        },
+        DISPLAY_NAME(::DisplayName) {
+            override suspend fun readData(player: OfflineCloudPlayer): DataResponse {
+                return DisplayName(player.displayName())
+            }
+        },
+        NAME(::Name) {
+            override suspend fun readData(player: OfflineCloudPlayer): DataResponse {
+                return Name(player.name())
+            }
+        },
+        NAME_HISTORY(::NameHistory) {
+            override suspend fun readData(player: OfflineCloudPlayer): DataResponse {
+                return NameHistory(player.nameHistory())
+            }
+        };
+
+        abstract suspend fun readData(player: OfflineCloudPlayer): DataResponse
+    }
+}
+
+@SurfNettyPacket("cloud:response:player_data", PacketFlow.CLIENTBOUND)
+class ServerboundRequestPlayerDataResponse(val data: DataResponse) : ResponseNettyPacket() {
+    companion object {
+        val STREAM_CODEC =
+            packetCodec(
+                ServerboundRequestPlayerDataResponse::write,
+                ::ServerboundRequestPlayerDataResponse
+            )
+    }
+
+    private constructor(buf: SurfByteBuf) : this(
+        buf.readEnum<DataRequestType>().reader.decode(buf)
+    )
+
+    abstract class DataResponse(val type: DataRequestType) {
+        abstract fun write(buf: SurfByteBuf)
+    }
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeEnum(data.type)
+        data.write(buf)
+    }
+
+
+    class IpAddress(val ip: Inet4Address?) : DataResponse(DataRequestType.LATEST_IP_ADDRESS) {
+        constructor(buf: SurfByteBuf) : this(buf.readNullable { it.readInet4Address() })
+
+        override fun write(buf: SurfByteBuf) {
+            buf.writeNullable(ip) { buf, ip -> buf.writeInet4Address(ip) }
+        }
+    }
+
+    class LastServer(val server: String?) : DataResponse(DataRequestType.LAST_SERVER) {
+        constructor(buf: SurfByteBuf) : this(buf.readNullableString())
+
+        override fun write(buf: SurfByteBuf) {
+            buf.writeNullable(server)
+        }
+    }
+
+    class LastSeen(val lastSeen: ZonedDateTime?) : DataResponse(DataRequestType.LAST_SEEN) {
+        constructor(buf: SurfByteBuf) : this(buf.readNullable { it.readZonedDateTime() })
+
+        override fun write(buf: SurfByteBuf) {
+            buf.writeNullable(lastSeen) { buf, dateTime -> buf.writeZonedDateTime(dateTime) }
+        }
+    }
+
+    class DisplayName(val displayName: Component?) : DataResponse(DataRequestType.DISPLAY_NAME) {
+        constructor(buf: SurfByteBuf) : this(buf.readNullable { it.readComponent() })
+
+        override fun write(buf: SurfByteBuf) {
+            buf.writeNullable(displayName) { buf, name -> buf.writeComponent(name) }
+        }
+    }
+
+    class Name(val name: String?) : DataResponse(DataRequestType.NAME) {
+        constructor(buf: SurfByteBuf) : this(buf.readNullableString())
+
+        override fun write(buf: SurfByteBuf) {
+            buf.writeNullable(name)
+        }
+    }
+
+    class NameHistory(val history: ApiNameHistory) : DataResponse(DataRequestType.NAME_HISTORY) {
+        constructor(buf: SurfByteBuf) : this(ApiNameHistory.readFromByteBuf(buf))
+
+        override fun write(buf: SurfByteBuf) {
+            history.writeToByteBuf(buf)
+        }
+    }
+}
+
+inline fun <reified T> DataResponse.getGenericValue(): T = when (this) {
+    is IpAddress -> check(T::class == Inet4Address::class) { "Expected Inet4Address" }.let { ip as T }
+    is LastServer -> check(T::class == String::class) { "Expected String" }.let { server as T }
+    is LastSeen -> check(T::class == ZonedDateTime::class) { "Expected ZonedDateTime" }.let { lastSeen as T }
+    is DisplayName -> check(T::class == Component::class) { "Expected Component" }.let { displayName as T }
+    is Name -> check(T::class == String::class) { "Expected String" }.let { name as T }
+    is NameHistory -> check(T::class == ApiNameHistory::class) { "Expected ApiNameHistory" }.let { history as T }
+    else -> error("Unknown DataResponse type: ${this::class.simpleName}")
+}
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/ServerboundShutdownServerPacket.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/ServerboundShutdownServerPacket.kt
new file mode 100644
index 00000000..0a386857
--- /dev/null
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/ServerboundShutdownServerPacket.kt
@@ -0,0 +1,23 @@
+package dev.slne.surf.cloud.core.common.netty.network.protocol.running
+
+import dev.slne.surf.cloud.api.common.meta.DefaultIds
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
+import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
+import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
+
+@SurfNettyPacket(DefaultIds.SERVERBOUND_SHUTDOWN_SERVER_PACKET, PacketFlow.SERVERBOUND)
+class ServerboundShutdownServerPacket(val serverId: Long) : NettyPacket() {
+
+    companion object {
+        val STREAM_CODEC =
+            packetCodec(ServerboundShutdownServerPacket::write, ::ServerboundShutdownServerPacket)
+    }
+
+    private constructor(buf: SurfByteBuf) : this(buf.readVarLong())
+
+    private fun write(buf: SurfByteBuf) {
+        buf.writeVarLong(serverId)
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/TeleportPlayerPacket.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/TeleportPlayerPacket.kt
index 7faa4972..70b1e0d3 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/TeleportPlayerPacket.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/running/TeleportPlayerPacket.kt
@@ -7,9 +7,9 @@ import dev.slne.surf.cloud.api.common.netty.packet.RespondingNettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.packetCodec
 import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
 import dev.slne.surf.cloud.api.common.netty.protocol.buffer.readEnum
-import dev.slne.surf.cloud.api.common.util.position.FineLocation
-import dev.slne.surf.cloud.api.common.util.position.FineTeleportCause
-import dev.slne.surf.cloud.api.common.util.position.FineTeleportFlag
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportLocation
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportCause
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportFlag
 import java.util.*
 
 @SurfNettyPacket(DefaultIds.BIDIRECTIONAL_TELEPORT_PLAYER, PacketFlow.BIDIRECTIONAL)
@@ -23,15 +23,15 @@ class TeleportPlayerPacket : RespondingNettyPacket<TeleportPlayerResultPacket> {
     }
 
     val uuid: UUID
-    val location: FineLocation
-    val teleportCause: FineTeleportCause
-    val flags: Array<out FineTeleportFlag>
+    val location: TeleportLocation
+    val teleportCause: TeleportCause
+    val flags: Array<out TeleportFlag>
 
     constructor(
         uuid: UUID,
-        location: FineLocation,
-        teleportCause: FineTeleportCause,
-        vararg flags: FineTeleportFlag
+        location: TeleportLocation,
+        teleportCause: TeleportCause,
+        vararg flags: TeleportFlag
     ) {
         this.uuid = uuid
         this.location = location
@@ -41,14 +41,14 @@ class TeleportPlayerPacket : RespondingNettyPacket<TeleportPlayerResultPacket> {
 
     private constructor(buf: SurfByteBuf) {
         this.uuid = buf.readUuid()
-        this.location = FineLocation.STREAM_CODEC.decode(buf)
+        this.location = TeleportLocation.STREAM_CODEC.decode(buf)
         this.flags = buf.readArray { it.readEnum() }
         this.teleportCause = buf.readEnum()
     }
 
     private fun write(buf: SurfByteBuf) {
         buf.writeUuid(uuid)
-        FineLocation.STREAM_CODEC.encode(buf, location)
+        TeleportLocation.STREAM_CODEC.encode(buf, location)
         buf.writeArray(flags, SurfByteBuf::writeEnum)
         buf.writeEnum(teleportCause)
     }
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/protocol/packet/NettyPacketInfo.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/protocol/packet/NettyPacketInfo.kt
deleted file mode 100644
index 68ee2f2e..00000000
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/protocol/packet/NettyPacketInfo.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package dev.slne.surf.cloud.core.common.netty.protocol.packet
-
-data class NettyPacketInfo(
-    val connection: Any, // TODO
-    val proxiedSource: Any? // TODO
-) {
-    constructor(source: Any) : this(source, null)
-
-//    @Contract(pure = true)
-//    fun asClientSource() = source as NettyClientSource
-//
-//    @Contract(pure = true)
-//    fun asServerSource() = source as NettyServerSource
-
-}
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/registry/listener/NettyListenerRegistry.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/registry/listener/NettyListenerRegistry.kt
index 21fabccc..378b0685 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/registry/listener/NettyListenerRegistry.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/registry/listener/NettyListenerRegistry.kt
@@ -2,7 +2,9 @@ package dev.slne.surf.cloud.core.common.netty.registry.listener
 
 import dev.slne.surf.cloud.api.common.netty.exception.SurfNettyListenerRegistrationException
 import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
-import dev.slne.surf.cloud.core.common.netty.protocol.packet.NettyPacketInfo
+import dev.slne.surf.cloud.api.common.netty.packet.NettyPacketInfo
+import dev.slne.surf.cloud.api.common.util.isSuspending
+import dev.slne.surf.cloud.api.common.util.mutableObject2ObjectMapOf
 import it.unimi.dsi.fastutil.objects.Object2ObjectFunction
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet
@@ -10,11 +12,12 @@ import it.unimi.dsi.fastutil.objects.ObjectSet
 import java.lang.reflect.Method
 import java.lang.reflect.Modifier
 import kotlin.coroutines.Continuation
+import kotlin.jvm.java
 import kotlin.reflect.jvm.kotlinFunction
 
 object NettyListenerRegistry {
     private val listeners =
-        Object2ObjectOpenHashMap<Class<out NettyPacket>, ObjectSet<RegisteredListener>>()
+        mutableObject2ObjectMapOf<Class<out NettyPacket>, ObjectSet<RegisteredListener>>()
 
     fun registerListener(listenerMethod: Method, bean: Any) {
         val params = listenerMethod.parameterTypes
@@ -117,6 +120,4 @@ object NettyListenerRegistry {
 
     fun hasListeners(packetClass: Class<out NettyPacket>) = listeners.containsKey(packetClass)
     fun getListeners(packetClass: Class<out NettyPacket>) = listeners[packetClass]
-
-    private fun Method.isSuspending() = kotlinFunction?.isSuspend == true
 }
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/registry/listener/RegisteredListener.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/registry/listener/RegisteredListener.kt
index 4767db1b..68598b7e 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/registry/listener/RegisteredListener.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/registry/listener/RegisteredListener.kt
@@ -2,7 +2,7 @@ package dev.slne.surf.cloud.core.common.netty.registry.listener
 
 import dev.slne.surf.cloud.api.common.netty.exception.SurfNettyListenerRegistrationException
 import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
-import dev.slne.surf.cloud.core.common.netty.protocol.packet.NettyPacketInfo
+import dev.slne.surf.cloud.api.common.netty.packet.NettyPacketInfo
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import tech.hiddenproject.aide.reflection.LambdaWrapperHolder
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/registry/listener/processor/NettyListenerRegistryProcessor.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/registry/listener/processor/NettyListenerRegistryProcessor.kt
index 9681913c..cd00ccba 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/registry/listener/processor/NettyListenerRegistryProcessor.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/registry/listener/processor/NettyListenerRegistryProcessor.kt
@@ -1,54 +1,656 @@
 package dev.slne.surf.cloud.core.common.netty.registry.listener.processor
 
-import dev.slne.surf.cloud.api.common.meta.SurfNettyPacketHandler
 import dev.slne.surf.cloud.api.common.netty.exception.SurfNettyListenerRegistrationException
+import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.NettyPacketInfo
+import dev.slne.surf.cloud.api.common.util.*
 import dev.slne.surf.cloud.core.common.netty.registry.listener.NettyListenerRegistry
+import dev.slne.surf.surfapi.core.api.util.logger
+import it.unimi.dsi.fastutil.objects.ObjectList
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.CoroutineName
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import org.reactivestreams.Subscriber
+import org.reactivestreams.Subscription
 import org.springframework.aop.framework.AopInfrastructureBean
-import org.springframework.aop.framework.AopProxyUtils
+import org.springframework.aop.framework.autoproxy.AutoProxyUtils
+import org.springframework.aop.scope.ScopedObject
+import org.springframework.aop.scope.ScopedProxyUtils
+import org.springframework.aop.support.AopUtils
 import org.springframework.beans.factory.BeanCreationException
+import org.springframework.beans.factory.SmartInitializingSingleton
+import org.springframework.beans.factory.config.BeanFactoryPostProcessor
 import org.springframework.beans.factory.config.BeanPostProcessor
-import org.springframework.core.MethodIntrospector
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory
+import org.springframework.beans.factory.getBeanNamesForType
+import org.springframework.beans.factory.getBeansOfType
+import org.springframework.context.ApplicationContext
+import org.springframework.context.ApplicationContextAware
+import org.springframework.context.ConfigurableApplicationContext
+import org.springframework.context.expression.AnnotatedElementKey
+import org.springframework.context.expression.BeanFactoryResolver
+import org.springframework.context.expression.CachedExpressionEvaluator
+import org.springframework.context.expression.MethodBasedEvaluationContext
+import org.springframework.core.*
+import org.springframework.core.MethodIntrospector.MetadataLookup
 import org.springframework.core.annotation.AnnotatedElementUtils
+import org.springframework.core.annotation.AnnotationAwareOrderComparator
 import org.springframework.core.annotation.AnnotationUtils
+import org.springframework.core.annotation.Order
+import org.springframework.expression.EvaluationContext
+import org.springframework.expression.Expression
+import org.springframework.expression.spel.support.StandardEvaluationContext
 import org.springframework.stereotype.Component
+import org.springframework.util.ClassUtils
+import org.springframework.util.ReflectionUtils
+import java.lang.reflect.InvocationTargetException
 import java.lang.reflect.Method
+import java.lang.reflect.Proxy
+import java.lang.reflect.UndeclaredThrowableException
+import java.util.concurrent.CompletionStage
+import kotlin.contracts.ExperimentalContracts
+import kotlin.contracts.contract
+import kotlin.coroutines.CoroutineContext
+import dev.slne.surf.cloud.api.common.meta.SurfNettyPacketHandler as Handler
+
 
 @Component
 class NettyListenerRegistryProcessor : BeanPostProcessor {
     override fun postProcessAfterInitialization(bean: Any, beanName: String): Any {
-        if (bean is AopInfrastructureBean) return bean
-        val targetClass = AopProxyUtils.ultimateTargetClass(bean)
+        if (bean !is AopInfrastructureBean) {
+            val targetClass = bean.ultimateTargetClass()
+            if (targetClass.isCandidateFor<Handler>()) {
+                val nettyHandlers = targetClass.selectFunctions { it.isAnnotated<Handler>() }
+                if (nettyHandlers.isNotEmpty()) {
+                    registerNettyHandlers(beanName, bean, nettyHandlers)
+                }
+            }
+        }
 
-        if (!AnnotationUtils.isCandidateClass(
-                targetClass,
-                SurfNettyPacketHandler::class.java
+        return bean
+    }
+
+    private fun registerNettyHandlers(beanName: String, bean: Any, nettyHandlers: Set<Method>) {
+        try {
+            for (handler in nettyHandlers) {
+                NettyListenerRegistry.registerListener(handler, bean)
+            }
+        } catch (e: SurfNettyListenerRegistrationException) {
+            throw BeanCreationException(beanName, e.message ?: "<null>", e)
+        }
+    }
+}
+
+class Test : SmartInitializingSingleton, ApplicationContextAware, BeanFactoryPostProcessor {
+    private var context: ConfigurableApplicationContext? = null
+    private var beanFactory: ConfigurableListableBeanFactory? = null
+    private var eventListenerFactories: ObjectList<NettyListenerFactory>? = null
+
+    private val originalEvaluationContext = StandardEvaluationContext()
+    private val evaluator = NettyEventExpressionEvaluator(originalEvaluationContext)
+
+    private val nonAnnotatedClasses = mutableObjectSetOf<Class<*>>()
+
+    override fun setApplicationContext(applicationContext: ApplicationContext) {
+        require(applicationContext is ConfigurableApplicationContext) { "ApplicationContext must be ConfigurableApplicationContext" }
+        context = applicationContext
+    }
+
+    override fun postProcessBeanFactory(beanFactory: ConfigurableListableBeanFactory) {
+        this.beanFactory = beanFactory
+        this.originalEvaluationContext.setBeanResolver(BeanFactoryResolver(beanFactory))
+
+        val beans = beanFactory.getBeansOfType<NettyListenerFactory>(
+            includeNonSingletons = false,
+            allowEagerInit = false
+        )
+
+        val elements = beans.values.toTypedArray()
+        AnnotationAwareOrderComparator.sort(elements)
+        eventListenerFactories = objectListOf(*elements)
+    }
+
+    override fun afterSingletonsInstantiated() {
+        val beanFactory = this.beanFactory ?: error("No ConfigurableListableBeanFactory set")
+        val beanNames = beanFactory.getBeanNamesForType<Any>()
+
+        for (name in beanNames) {
+            if (ScopedProxyUtils.isScopedTarget(name)) continue
+            var type =
+                runCatching { AutoProxyUtils.determineTargetClass(beanFactory, name) }.getOrNull()
+                    ?: continue
+
+            if (ScopedObject::class.java.isAssignableFrom(type)) {
+                runCatching {
+                    val targetClass = AutoProxyUtils.determineTargetClass(
+                        beanFactory,
+                        ScopedProxyUtils.getTargetBeanName(name)
+                    )
+                    if (targetClass != null) {
+                        type = targetClass
+                    }
+                }
+            }
+
+            try {
+                processBean(name, type)
+            } catch (e: Throwable) {
+                throw BeanCreationException(
+                    "Failed to process @${Handler::class.simpleName} annotation on bean with name '$name': ${e.message}",
+                    e
+                )
+            }
+        }
+    }
+
+    private fun processBean(beanName: String, targetType: Class<*>) {
+        if (this.nonAnnotatedClasses.contains(targetType)) return
+        if (!AnnotationUtils.isCandidateClass(targetType, Handler::class.java)) return
+        if (isSpringContainerClass(targetType)) return
+
+        var annotatedMethods = runCatching {
+            MethodIntrospector.selectMethods(
+                targetType,
+                MetadataLookup {
+                    AnnotatedElementUtils.findMergedAnnotation(
+                        it,
+                        Handler::class.java
+                    )
+                }
             )
-        ) return bean
+        }.getOrNull()
+
+        if (annotatedMethods.isNullOrEmpty()) {
+            nonAnnotatedClasses.add(targetType)
+        } else {
+            val context = this.context ?: error("No ConfigurableApplicationContext set")
+            val factories = eventListenerFactories ?: error("No NettyListenerFactory beans found")
+
+            for (method in annotatedMethods.keys) {
+                for (factory in factories) {
+                    if (factory.supportsMethod(method)) {
+                        val methodToUse =
+                            AopUtils.selectInvocableMethod(method, context.getType(beanName))
+                        val listener =
+                            factory.createApplicationListener(beanName, targetType, methodToUse)
+                        dev.slne.surf.cloud.core.common.netty.registry.listener.processor.NettyListenerRegistry.registerListener(
+                            listener
+                        )
+                        break
+                    }
+                }
+            }
+        }
+    }
 
+    companion object {
 
-        val nettyHandlers = MethodIntrospector.selectMethods(
-            targetClass
-        ) { method ->
-            AnnotatedElementUtils.isAnnotated(
-                method,
-                SurfNettyPacketHandler::class.java
+        /**
+         * Determine whether the given class is an {@code org.springframework}
+         * bean class that is not annotated as a user or test {@link Component}...
+         * which indicates that there is no {@link EventListener} to be found there.
+         */
+        private fun isSpringContainerClass(clazz: Class<*>): Boolean =
+            clazz.getName().startsWith("org.springframework.")
+                    && !AnnotatedElementUtils.isAnnotated(
+                ClassUtils.getUserClass(clazz), Component::class.java
             )
+    }
+}
+
+interface NettyListenerFactory {
+    fun supportsMethod(method: Method): Boolean
+    fun createApplicationListener(
+        beanName: String,
+        type: Class<*>,
+        method: Method
+    ): NettyListener<*>
+}
+
+@Component
+class DefaultNettyListenerFactory : NettyListenerFactory, Ordered {
+    private var order = Ordered.LOWEST_PRECEDENCE
+
+    fun setOrder(order: Int) {
+        this.order = order
+    }
+
+    override fun getOrder(): Int {
+        return order
+    }
+
+    override fun supportsMethod(method: Method): Boolean {
+        return true
+    }
+
+    override fun createApplicationListener(
+        beanName: String,
+        type: Class<*>,
+        method: Method
+    ): NettyListener<*> {
+        return NettyListenerMethodAdapter(beanName, type, method)
+    }
+}
+
+interface NettyListener<P : NettyPacket> {
+    suspend fun onPacket(packet: P)
+}
+
+interface SmartNettyListener : NettyListener<NettyPacket>, Ordered {
+    val listenerId: String
+        get() = ""
+
+    fun supportsPacketType(type: Class<*>): Boolean
+
+    fun supportsSourceType(sourceType: Class<*>?): Boolean {
+        return true
+    }
+
+    override fun getOrder(): Int {
+        return Ordered.LOWEST_PRECEDENCE
+    }
+}
+
+interface GenericNettyListener : SmartNettyListener {
+    override fun supportsPacketType(type: Class<*>): Boolean {
+        return supportsPacketType(ResolvableType.forClass(type))
+    }
+
+    fun supportsPacketType(type: ResolvableType): Boolean
+}
+
+class NettyListenerMethodAdapter(
+    private val beanName: String,
+    targetClass: Class<*>,
+    method: Method
+) : GenericNettyListener {
+
+    private val method = BridgeMethodResolver.findBridgedMethod(method)
+    private val targetMethod = if (!Proxy.isProxyClass(targetClass)) AopUtils.getMostSpecificMethod(
+        method,
+        targetClass
+    ) else method
+    private val methodKey = AnnotatedElementKey(targetMethod, targetClass)
+
+    private val annotation =
+        AnnotatedElementUtils.findMergedAnnotation(targetMethod, Handler::class.java)
+
+    private val declaredEventTypes = resolveDeclaredPacketTypes(method, annotation)
+    private val condition = annotation?.condition
+    private val order = resolveOrder(method)
+
+    @Volatile
+    private var _listenerId: String?
+
+    private var applicationContext: ApplicationContext? = null
+    private var evaluator: NettyEventExpressionEvaluator? = null
+
+    private val coroutineContext: CoroutineContext by lazy {
+        Dispatchers.Default + CoroutineName("netty-packet-handler-${listenerId}") + SupervisorJob() + CoroutineExceptionHandler { _, throwable ->
+            log.atSevere()
+                .withCause(throwable)
+                .log("Unhandled exception in NettyListener method")
         }
+    }
 
-        if (nettyHandlers.isNotEmpty()) {
-            registerNettyHandlers(beanName, bean, nettyHandlers)
+    override val listenerId: String
+        get() {
+            var id = this._listenerId
+            if (id == null) {
+                id = getDefaultListenerId()
+                this._listenerId = id
+            }
+            return id
         }
 
-        return bean
+    init {
+        val id = annotation?.id ?: ""
+        _listenerId = if (id.isNotEmpty()) id else null
     }
 
-    private fun registerNettyHandlers(beanName: String, bean: Any, nettyHandlers: Set<Method>) {
+    fun init(applicationContext: ApplicationContext, evaluator: NettyEventExpressionEvaluator) {
+        this.applicationContext = applicationContext
+        this.evaluator = evaluator
+    }
+
+    override suspend fun onPacket(packet: NettyPacket) {
+        processPacket(packet)
+    }
+
+    override fun supportsPacketType(type: ResolvableType): Boolean {
+        for (declaredType in declaredEventTypes) {
+            if (if (type.hasUnresolvableGenerics()) declaredType.toClass()
+                    .isAssignableFrom(type.toClass()) else declaredType.isAssignableFrom(type)
+            ) {
+                return true
+            }
+        }
+
+        return false
+    }
+
+    override fun supportsPacketType(type: Class<*>): Boolean {
+        return true
+    }
+
+    override fun supportsSourceType(sourceType: Class<*>?): Boolean {
+        return true
+    }
+
+    override fun getOrder(): Int {
+        return order
+    }
+
+    fun getDefaultListenerId(): String {
+        val method = targetMethod
+        val joinedParams = method.parameterTypes.joinToString(
+            separator = ",",
+            prefix = "(",
+            postfix = ")"
+        ) { it.name }
+
+        return ClassUtils.getQualifiedMethodName(method) + joinedParams
+    }
+
+    fun processPacket(packet: NettyPacket) {
+        val args = resolveArguments(packet)
+        if (shouldHandle(packet, args)) {
+            val result = doInvoke(args)
+            if (result != null) {
+                handleResult(result)
+            }
+        }
+    }
+
+    fun shouldHandle(packet: NettyPacket): Boolean {
+        return shouldHandle(packet, resolveArguments(packet))
+    }
+
+    @OptIn(ExperimentalContracts::class)
+    private fun shouldHandle(packet: NettyPacket, args: Array<Any?>?): Boolean {
+        contract {
+            returns(true) implies (args != null)
+        }
+
+        if (args == null) return false
+        val condition = condition
+
+        if (!condition.isNullOrBlank()) {
+            val evaluator = this.evaluator ?: error("No NettyEventExpressionEvaluator set")
+            return evaluator.condition(condition, packet, this.targetMethod, this.methodKey, args)
+        }
+
+        return true
+    }
+
+    private fun resolveArguments(packet: NettyPacket): Array<Any?>? {
+        getResolvableType(packet) ?: return null
+
+        if (method.parameterCount == 0) {
+            return arrayOf()
+        }
+
+        return arrayOf(packet)
+    }
+
+    private fun handleResult(result: Any) {
+        if (ReactiveResultHandler().subscribeToPublisher(result)) {
+            return
+        } else if(result is CompletionStage<*>) {
+            result.whenComplete { returnValue, ex ->
+                if (ex != null) {
+                    log.atSevere().withCause(ex).log("Error in NettyListener method")
+                } else {
+                    if (returnValue != null && returnValue !is Unit) {
+                        error("Unexpected return value from NettyListener method. Expected Unit, got $returnValue")
+                    }
+                }
+            }
+        }
+    }
+
+    private fun doInvoke(args: Array<Any?>): Any? {
+        val bean = getTargetBean()
+        if (bean == null) {
+            return null
+        }
+
+        ReflectionUtils.makeAccessible(this.method)
+
         try {
-            for (handler in nettyHandlers) {
-                NettyListenerRegistry.registerListener(handler, bean)
+            if (KotlinDetector.isSuspendingFunction(this.method)) {
+                return CoroutinesUtils.invokeSuspendingFunction(
+                    coroutineContext,
+                    this.method,
+                    bean,
+                    args
+                )
             }
-        } catch (e: SurfNettyListenerRegistrationException) {
-            throw BeanCreationException(beanName, e.message ?: "<null>", e)
+
+            return this.method.invoke(bean, *args)
+        } catch (ex: IllegalArgumentException) {
+            assertTargetBean(this.method, bean, args)
+            throw IllegalStateException(getInvocationErrorMessage(bean, ex.message, args))
+        } catch (ex: IllegalAccessException) {
+            throw IllegalStateException(getInvocationErrorMessage(bean, ex.message, args))
+        } catch (ex: InvocationTargetException) {
+            val targetException = ex.targetException
+            if (targetException is RuntimeException) {
+                throw targetException
+            }
+            val msg =
+                getInvocationErrorMessage(bean, "Failed to invoke packet listener method", args)
+            throw UndeclaredThrowableException(targetException, msg)
+        }
+    }
+
+    private fun getTargetBean(): Any? {
+        val applicationContext = this.applicationContext ?: error("No ApplicationContext set")
+        return applicationContext.getBean(this.beanName)
+    }
+
+    private fun getDetailedErrorMessage(bean: Any, message: String?): String {
+        return buildString {
+            if (message?.isNotEmpty() == true) {
+                append(message)
+                appendLine()
+            }
+            append("HandlerMethod details: ")
+            appendLine()
+            append("Bean [${bean.javaClass.name}]")
+            appendLine()
+            append("Method [${method.toGenericString()}]")
+            appendLine()
+        }
+    }
+
+
+    private fun assertTargetBean(method: Method, targetBean: Any, args: Array<Any?>) {
+        val methodDeclaringClass = method.declaringClass
+        val targetBeanClass: Class<*> = targetBean.javaClass
+        if (!methodDeclaringClass.isAssignableFrom(targetBeanClass)) {
+            val msg = buildString {
+                append("The packet listener method class '")
+                append(methodDeclaringClass.getName())
+                append("' is not an instance of the actual bean class '")
+                append(targetBeanClass.getName())
+                append("'. If the bean requires proxying ")
+                append("(for example, due to @Transactional), please use class-based proxying.")
+            }
+
+            throw IllegalStateException(getInvocationErrorMessage(targetBean, msg, args))
+        }
+    }
+
+    private fun getInvocationErrorMessage(
+        bean: Any,
+        message: String?,
+        resolvedArgs: Array<Any?>
+    ): String {
+        return buildString {
+            append(getDetailedErrorMessage(bean, message))
+            append("Resolved arguments:")
+            appendLine()
+
+            for ((i, value) in resolvedArgs.withIndex()) {
+                append("[$i] ")
+                if (value == null) {
+                    append("[null]")
+                } else {
+                    append("[type=${value.javaClass.name}] ")
+                    append("[value=$value]")
+                }
+                appendLine()
+            }
+        }
+    }
+
+    private fun getResolvableType(packet: NettyPacket): ResolvableType? {
+        for (declaredType in declaredEventTypes) {
+            val packetClass = declaredType.toClass()
+            if (packetClass.isInstance(packet)) {
+                return declaredType
+            }
+        }
+        return null
+    }
+
+    private inner class ReactiveResultHandler {
+        fun subscribeToPublisher(result: Any): Boolean {
+            val adapter = ReactiveAdapterRegistry.getSharedInstance().getAdapter(result.javaClass)
+            if (adapter != null) {
+                adapter.toPublisher<Any>(result).subscribe(PacketListenerPublicationSubscriber())
+                return true
+            }
+
+            return false
         }
     }
+
+    private inner class PacketListenerPublicationSubscriber: Subscriber<Any> {
+        override fun onSubscribe(s: Subscription) {
+            s.request(Long.MAX_VALUE)
+        }
+
+        override fun onNext(t: Any?) {
+            error("Unexpected onNext signal")
+        }
+
+        override fun onError(t: Throwable?) {
+            log.atSevere().withCause(t).log("Error in NettyListener method")
+        }
+
+        override fun onComplete() {
+
+        }
+    }
+
+    companion object {
+        private val log = logger()
+
+        private fun resolveDeclaredPacketTypes(
+            method: Method,
+            annotation: Handler?
+        ): ObjectList<ResolvableType> {
+            val count =
+                if (KotlinDetector.isSuspendingFunction(method)) method.parameterCount - 1 else method.parameterCount
+
+            check(count <= 2) { "Maximum of 2 parameters allowed for @${Handler::class.simpleName} method" }
+            val params = (0 until count).map { ResolvableType.forMethodParameter(method, it) }
+            val packetType = params.find { it.isAssignableFrom(NettyPacket::class.java) }
+            val infoType = params.find { it.isAssignableFrom(NettyPacketInfo::class.java) }
+
+            if (annotation != null) {
+                val classes = annotation.classes
+                if (classes.isNotEmpty()) {
+                    val invalidParams =
+                        params.filterNot { it.isAssignableFrom(NettyPacketInfo::class.java) }
+                    check(invalidParams.isEmpty()) { "When using @${Handler::class.simpleName}(classes), parameters must be empty or only NettyPacketInfo" }
+                    check(params.count { it.isAssignableFrom(NettyPacketInfo::class.java) } <= 1) { "Only one NettyPacketInfo parameter allowed" }
+
+                    return classes.mapTo(mutableObjectListOf(classes.size)) {
+                        ResolvableType.forClass(
+                            it.java
+                        )
+                    }
+                }
+            }
+
+            check(count in 1..2) { "Handler method must have 1 or 2 parameters if no classes are specified in the annotation" }
+            check(packetType != null) { "Handler method must have a parameter of type NettyPacket" }
+
+            if (params.size == 2) {
+                check(infoType != null) { "If two parameters are provided, one must be NettyPacket and the other NettyPacketInfo" }
+            }
+
+            return objectListOf(packetType)
+        }
+
+        private fun resolveOrder(method: Method): Int {
+            val annotation = AnnotatedElementUtils.findMergedAnnotation(method, Order::class.java)
+            return annotation?.value ?: Ordered.LOWEST_PRECEDENCE
+        }
+    }
+}
+
+
+object NettyListenerRegistry {
+    fun registerListener(listener: NettyListener<*>) {
+
+    }
+}
+
+class NettyEventExpressionEvaluator(private val originalEvaluationContext: StandardEvaluationContext) :
+    CachedExpressionEvaluator() {
+    private val conditionCache = mutableObject2ObjectMapOf<ExpressionKey, Expression>(64)
+        .synchronize()
+
+    fun condition(
+        conditionExpression: String,
+        packet: NettyPacket,
+        targetMethod: Method,
+        methodKey: AnnotatedElementKey,
+        args: Array<Any?>
+    ): Boolean {
+        val rootObject = PacketExpressionRootObject(packet, args)
+        val evaluationContext = createEvaluationContext(rootObject, targetMethod, args)
+        val expression = getExpression(conditionCache, methodKey, conditionExpression)
+        val value = expression.getValue(evaluationContext, Boolean::class.java)
+
+        return value == true
+    }
+
+    private fun createEvaluationContext(
+        rootObject: PacketExpressionRootObject,
+        method: Method,
+        args: Array<Any?>
+    ): EvaluationContext {
+        val evaluationContext =
+            MethodBasedEvaluationContext(rootObject, method, args, parameterNameDiscoverer)
+        this.originalEvaluationContext.applyDelegatesTo(evaluationContext)
+        return evaluationContext
+    }
 }
+
+@JvmRecord
+data class PacketExpressionRootObject(
+    val packet: NettyPacket,
+    val args: Array<Any?>,
+) {
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is PacketExpressionRootObject) return false
+
+        if (packet != other.packet) return false
+        if (!args.contentEquals(other.args)) return false
+
+        return true
+    }
+
+    override fun hashCode(): Int {
+        var result = packet.hashCode()
+        result = 31 * result + args.contentHashCode()
+        return result
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/player/CloudPlayerManagerImpl.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/player/CloudPlayerManagerImpl.kt
index ef9cc7f6..e3c07018 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/player/CloudPlayerManagerImpl.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/player/CloudPlayerManagerImpl.kt
@@ -2,23 +2,30 @@ package dev.slne.surf.cloud.core.common.player
 
 import dev.slne.surf.cloud.api.common.event.player.connection.CloudPlayerConnectToNetworkEvent
 import dev.slne.surf.cloud.api.common.player.CloudPlayerManager
+import dev.slne.surf.cloud.api.common.server.UserList
+import dev.slne.surf.cloud.api.common.server.UserListImpl
 import dev.slne.surf.cloud.api.common.util.mutableObject2ObjectMapOf
 import dev.slne.surf.cloud.api.common.util.synchronize
-import dev.slne.surf.cloud.core.common.util.bean
 import dev.slne.surf.cloud.core.common.util.publish
 import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap
-import org.jetbrains.annotations.ApiStatus
 import org.jetbrains.annotations.MustBeInvokedByOverriders
+import java.net.Inet4Address
 import java.util.*
 
 abstract class CloudPlayerManagerImpl<P : CommonCloudPlayerImpl> : CloudPlayerManager {
-    private val players = mutableObject2ObjectMapOf<UUID, P>().synchronize()
+    protected val players = mutableObject2ObjectMapOf<UUID, P>().synchronize()
 
     override fun getPlayer(uuid: UUID?): P? {
         return players[uuid]
     }
 
-    abstract suspend fun createPlayer(uuid: UUID, serverUid: Long, proxy: Boolean): P
+    abstract suspend fun createPlayer(
+        uuid: UUID,
+        name: String,
+        proxy: Boolean,
+        ip: Inet4Address,
+        serverUid: Long
+    ): P
 
     abstract suspend fun updateProxyServer(player: P, serverUid: Long)
     abstract suspend fun updateServer(player: P, serverUid: Long)
@@ -33,7 +40,11 @@ abstract class CloudPlayerManagerImpl<P : CommonCloudPlayerImpl> : CloudPlayerMa
         players[player.uuid] = player
     }
 
-    protected fun forEachPlayer(action: (P) -> Unit) {
+    override fun getOnlinePlayers(): UserList {
+        return UserListImpl.of(players.values)
+    }
+
+    protected inline fun forEachPlayer(action: (P) -> Unit) {
         val tempPlayers = Object2ObjectArrayMap(players)
         tempPlayers.values.forEach(action)
         tempPlayers.clear()
@@ -47,25 +58,28 @@ abstract class CloudPlayerManagerImpl<P : CommonCloudPlayerImpl> : CloudPlayerMa
      * @param serverUid The unique identifier of the server the player is connecting to.
      * @param proxy A boolean indicating if the player is connecting through a proxy.
      */
-    suspend fun updateOrCreatePlayer(uuid: UUID, serverUid: Long, proxy: Boolean) {
+    suspend fun updateOrCreatePlayer(
+        uuid: UUID,
+        name: String,
+        proxy: Boolean,
+        ip: Inet4Address,
+        serverUid: Long
+    ) {
         val player = players[uuid]
 
-        if (proxy) {
-            if (player == null) {
-                val createPlayer = createPlayer(uuid, serverUid, true)
-                onConnect(uuid, createPlayer)
-                addPlayer(createPlayer)
-            } else {
-                updateProxyServer(player, serverUid)
+        if (player == null) {
+            createPlayer(uuid, name, proxy, ip, serverUid).also {
+                onNetworkConnect(uuid, it)
+                onServerConnect(uuid, it, serverUid)
+                addPlayer(it)
             }
         } else {
-            if (player == null) {
-                val createPlayer = createPlayer(uuid, serverUid, false)
-                onConnect(uuid, createPlayer)
-                addPlayer(createPlayer)
+            if (proxy) {
+                updateProxyServer(player, serverUid)
             } else {
                 updateServer(player, serverUid)
             }
+            onServerConnect(uuid, player, serverUid)
         }
     }
 
@@ -95,21 +109,23 @@ abstract class CloudPlayerManagerImpl<P : CommonCloudPlayerImpl> : CloudPlayerMa
         }
     }
 
+    open suspend fun onServerConnect(uuid: UUID, player: P, serverUid: Long) {
+    }
+
     @MustBeInvokedByOverriders
-    @ApiStatus.OverrideOnly
     open suspend fun onServerDisconnect(uuid: UUID, player: P, serverUid: Long) {
     }
 
     @MustBeInvokedByOverriders
-    @ApiStatus.OverrideOnly
     open suspend fun onNetworkDisconnect(uuid: UUID, player: P, oldProxy: Long?, oldServer: Long?) {
     }
 
     @MustBeInvokedByOverriders
-    @ApiStatus.OverrideOnly
-    open suspend fun onConnect(uuid: UUID, player: P) {
+    open suspend fun onNetworkConnect(uuid: UUID, player: P) {
         CloudPlayerConnectToNetworkEvent(this, player).publish()
     }
+
+    open fun terminate() {}
 }
 
 val playerManagerImpl get() = CloudPlayerManager.instance as CloudPlayerManagerImpl<*>
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/player/CommonCloudPlayerImpl.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/player/CommonCloudPlayerImpl.kt
index 5263a051..b53f250b 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/player/CommonCloudPlayerImpl.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/player/CommonCloudPlayerImpl.kt
@@ -4,15 +4,16 @@ import dev.slne.surf.cloud.api.common.player.CloudPlayer
 import dev.slne.surf.cloud.api.common.player.ConnectionResult
 import dev.slne.surf.cloud.api.common.player.ConnectionResultEnum
 import dev.slne.surf.cloud.api.common.server.CloudServer
-import dev.slne.surf.cloud.api.common.server.serverManager
+import dev.slne.surf.cloud.api.common.server.CloudServerManager
+import java.time.ZonedDateTime
 import java.util.*
 
-abstract class CommonCloudPlayerImpl(override val uuid: UUID) : CloudPlayer {
+abstract class CommonCloudPlayerImpl(uuid: UUID) : CommonOfflineCloudPlayerImpl(uuid), CloudPlayer {
 
     override suspend fun connectToServer(
         group: String,
         server: String
-    ): ConnectionResult = serverManager.retrieveServerByCategoryAndName(group, server)
+    ): ConnectionResult = CloudServerManager.retrieveServerByCategoryAndName(group, server)
         ?.let {
             it as? CloudServer ?: return (ConnectionResultEnum.CANNOT_CONNECT_TO_PROXY to null)
         }
@@ -20,7 +21,7 @@ abstract class CommonCloudPlayerImpl(override val uuid: UUID) : CloudPlayer {
         ?: (ConnectionResultEnum.SERVER_NOT_FOUND to null)
 
     override suspend fun connectToServer(group: String): ConnectionResult =
-        serverManager.retrieveServersByCategory(group).asSequence()
+        CloudServerManager.retrieveServersByCategory(group).asSequence()
             .filterIsInstance<CloudServer>()
             .filter { it.hasEmptySlots() }
             .also { if (it.none()) return (ConnectionResultEnum.CATEGORY_FULL to null) }
@@ -30,7 +31,7 @@ abstract class CommonCloudPlayerImpl(override val uuid: UUID) : CloudPlayer {
     override suspend fun connectToServerOrQueue(
         group: String,
         server: String
-    ): ConnectionResult = serverManager.retrieveServerByCategoryAndName(group, server)
+    ): ConnectionResult = CloudServerManager.retrieveServerByCategoryAndName(group, server)
         ?.let {
             it as? CloudServer ?: return (ConnectionResultEnum.CANNOT_CONNECT_TO_PROXY to null)
         }
@@ -38,7 +39,7 @@ abstract class CommonCloudPlayerImpl(override val uuid: UUID) : CloudPlayer {
         ?: (ConnectionResultEnum.SERVER_NOT_FOUND to null)
 
     override suspend fun connectToServerOrQueue(group: String): ConnectionResult =
-        serverManager.retrieveServersByCategory(group).asSequence()
+        CloudServerManager.retrieveServersByCategory(group).asSequence()
             .filterIsInstance<CloudServer>()
 //            .filter { it.emptySlots > 0 }
             .minBy { it.currentPlayerCount } // also check player count in queue / maybe do it completely different - a group queue?
@@ -49,6 +50,14 @@ abstract class CommonCloudPlayerImpl(override val uuid: UUID) : CloudPlayer {
         transformer: (String) -> R
     ): R? = getLuckpermsMetaData(key)?.let(transformer)
 
+    override suspend fun lastSeen(): ZonedDateTime? {
+        return ZonedDateTime.now()
+    }
+
+    override suspend fun playedBefore(): Boolean {
+        return true
+    }
+
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (other !is CommonCloudPlayerImpl) return false
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/player/CommonOfflineCloudPlayerImpl.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/player/CommonOfflineCloudPlayerImpl.kt
new file mode 100644
index 00000000..f997e9e1
--- /dev/null
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/player/CommonOfflineCloudPlayerImpl.kt
@@ -0,0 +1,20 @@
+package dev.slne.surf.cloud.core.common.player
+
+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.player.OfflineCloudPlayer
+import dev.slne.surf.cloud.api.common.server.CloudServer
+import dev.slne.surf.cloud.api.common.server.CloudServerManager
+import java.util.*
+
+abstract class CommonOfflineCloudPlayerImpl(override val uuid: UUID) : OfflineCloudPlayer {
+    override val player: CloudPlayer?
+        get() = this as? CloudPlayer ?: CloudPlayerManager.getPlayer(uuid)
+
+    override suspend fun lastServer(): CloudServer? =
+        lastServerRaw()?.let { CloudServerManager.retrieveServerByName(it) } as? CloudServer
+
+    override suspend fun playedBefore(): Boolean {
+        return player != null || lastSeen() != null
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/player/name/NameHistoryImpl.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/player/name/NameHistoryImpl.kt
new file mode 100644
index 00000000..e373a86d
--- /dev/null
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/player/name/NameHistoryImpl.kt
@@ -0,0 +1,46 @@
+package dev.slne.surf.cloud.core.common.player.name
+
+import com.google.auto.service.AutoService
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.readCollection
+import dev.slne.surf.cloud.api.common.netty.protocol.buffer.writeCollection
+import dev.slne.surf.cloud.api.common.player.name.NameEntry
+import dev.slne.surf.cloud.api.common.player.name.NameHistory
+import dev.slne.surf.cloud.api.common.player.name.NameHistoryFactory
+import dev.slne.surf.cloud.api.common.util.mutableObjectListOf
+import io.netty.buffer.ByteBuf
+import it.unimi.dsi.fastutil.objects.ObjectList
+import it.unimi.dsi.fastutil.objects.ObjectLists
+
+class NameHistoryImpl(private val entries: ObjectList<NameEntry>) : NameHistory {
+    override val nameChanges = entries.size
+
+    override fun names(): ObjectList<NameEntry> = ObjectLists.unmodifiable(entries)
+    override fun lastKnownName(): NameEntry? = entries.firstOrNull()
+    override fun getNameAtTime(time: Long): NameEntry? = entries.find { it.timestamp <= time }
+    override fun wasNameUsed(name: String): Boolean = entries.any { it.name == name }
+    override fun firstUsedName(): NameEntry? = entries.lastOrNull()
+
+    override fun timeSinceLastChange(): Long =
+        entries.firstOrNull()?.let { System.currentTimeMillis() - it.timestamp } ?: 0
+
+    override fun writeToByteBuf(buf: ByteBuf) {
+        buf.writeCollection(entries) { buf, entry -> entry.writeToByteBuf(buf) }
+    }
+}
+
+@AutoService(NameHistoryFactory::class)
+class NameHistoryFactoryImpl : NameHistoryFactory {
+    private val emptyNameHistory = NameHistoryImpl(ObjectLists.emptyList())
+
+    override fun create(entries: ObjectList<NameEntry>): NameHistory {
+        return NameHistoryImpl(entries)
+    }
+
+    override fun createFromByteBuf(buf: ByteBuf): NameHistory {
+        val entries =
+            buf.readCollection({ mutableObjectListOf(it) }, { NameEntry.readFromByteBuf(it) })
+        return NameHistoryImpl(entries)
+    }
+
+    override fun empty() = emptyNameHistory
+}
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/processors/NettyPacketProcessor.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/processors/NettyPacketProcessor.kt
index a60f1521..b2ba28e6 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/processors/NettyPacketProcessor.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/processors/NettyPacketProcessor.kt
@@ -8,9 +8,9 @@ import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
 import dev.slne.surf.cloud.api.common.netty.packet.findPacketCodec
 import dev.slne.surf.cloud.api.common.netty.packet.getPacketMetaOrNull
 import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
-import dev.slne.surf.cloud.api.common.util.logger
 import dev.slne.surf.cloud.core.common.netty.network.protocol.ProtocolInfoBuilder
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.RunningProtocols
+import dev.slne.surf.surfapi.core.api.util.logger
 import org.springframework.boot.autoconfigure.AutoConfigurationPackages
 import org.springframework.context.ApplicationListener
 import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/server/CloudServerImpl.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/server/CloudServerImpl.kt
index 0727abdb..ef4b7fd2 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/server/CloudServerImpl.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/server/CloudServerImpl.kt
@@ -31,5 +31,5 @@ open class CloudServerImpl(
         })
     }
 
-    override val whitelist get() = information.whitelist
+    override val allowlist get() = information.allowlist
 }
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/server/CommonCloudServerImpl.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/server/CommonCloudServerImpl.kt
index 395f446f..80a9868f 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/server/CommonCloudServerImpl.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/server/CommonCloudServerImpl.kt
@@ -1,9 +1,18 @@
 package dev.slne.surf.cloud.core.common.server
 
 import dev.slne.surf.cloud.api.common.player.CloudPlayer
+import dev.slne.surf.cloud.api.common.player.ConnectionResult
+import dev.slne.surf.cloud.api.common.player.ConnectionResultEnum
+import dev.slne.surf.cloud.api.common.server.BatchTransferResult
+import dev.slne.surf.cloud.api.common.server.CloudServer
 import dev.slne.surf.cloud.api.common.server.CommonCloudServer
 import dev.slne.surf.cloud.api.common.server.UserListImpl
+import dev.slne.surf.cloud.api.common.util.mutableObject2ObjectMapOf
+import dev.slne.surf.cloud.core.common.coreCloudInstance
+import dev.slne.surf.cloud.core.common.coroutines.PlayerBatchTransferScope
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ClientInformation
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.async
 
 abstract class CommonCloudServerImpl(
     override val uid: Long,
@@ -14,26 +23,41 @@ abstract class CommonCloudServerImpl(
     @Volatile
     var information: ClientInformation
 ) : CommonCloudServer {
-    override suspend fun sendAll(server: CommonCloudServer) {
-        TODO("Not yet implemented")
+    private suspend fun executeBatchTransfer(
+        filter: (CloudPlayer) -> Boolean = { true },
+        transferAction: suspend (CloudPlayer) -> Deferred<ConnectionResult>
+    ): BatchTransferResult {
+        val results = users
+            .filter(filter)
+            .associateWith { transferAction(it) }
+            .mapValuesTo(mutableObject2ObjectMapOf()) { (_, deferred) -> deferred.await() }
+
+        val success = results.all { (_, result) -> result.first == ConnectionResultEnum.SUCCESS }
+        return success to results
     }
 
+    override suspend fun sendAll(server: CloudServer): BatchTransferResult =
+        executeBatchTransfer { PlayerBatchTransferScope.async { it.connectToServer(server) } }
+
     override suspend fun sendAll(
-        server: CommonCloudServer,
+        server: CloudServer,
         filter: (CloudPlayer) -> Boolean
-    ) {
-        TODO("Not yet implemented")
-    }
+    ): BatchTransferResult =
+        executeBatchTransfer(filter) { PlayerBatchTransferScope.async { it.connectToServer(server) } }
 
-    override fun shutdown() {
-        TODO("Not yet implemented")
-    }
+    override suspend fun sendAll(category: String): BatchTransferResult =
+        executeBatchTransfer { PlayerBatchTransferScope.async { it.connectToServer(category) } }
 
     override val maxPlayerCount get() = information.maxPlayerCount
     override val currentPlayerCount get() = users.size
     override val state get() = information.state
 
     override fun audiences() = users
+
+    override fun shutdown() {
+        coreCloudInstance.shutdownServer(this)
+    }
+
     override fun toString(): String {
         return "CloudServerImpl(group='$group', uid=$uid, name='$name, users=$users, information=$information, maxPlayerCount=$maxPlayerCount, currentPlayerCount=$currentPlayerCount, state=$state)"
     }
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/server/CommonCloudServerManagerImpl.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/server/CommonCloudServerManagerImpl.kt
index 5f07d453..d0363727 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/server/CommonCloudServerManagerImpl.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/server/CommonCloudServerManagerImpl.kt
@@ -5,12 +5,14 @@ import dev.slne.surf.cloud.api.common.server.CommonCloudServer
 import dev.slne.surf.cloud.api.common.util.mutableLong2ObjectMapOf
 import dev.slne.surf.cloud.api.common.util.mutableObjectListOf
 import dev.slne.surf.cloud.api.common.util.synchronize
+import dev.slne.surf.cloud.api.common.util.toObjectSet
+import it.unimi.dsi.fastutil.objects.ObjectCollection
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 
 abstract class CommonCloudServerManagerImpl<S : CommonCloudServer> : CloudServerManager {
     protected val servers = mutableLong2ObjectMapOf<S>().synchronize()
-    private val serversMutex = Mutex()
+    protected val serversMutex = Mutex()
 
     open suspend fun registerServer(server: S) =
         serversMutex.withLock { servers[server.uid] = server }
@@ -38,4 +40,14 @@ abstract class CommonCloudServerManagerImpl<S : CommonCloudServer> : CloudServer
     override suspend fun retrieveServersByCategory(category: String) = serversMutex.withLock {
         servers.values.filterTo(mutableObjectListOf()) { it.group == category }
     }
+
+    suspend fun batchUpdateServer(update: List<CommonCloudServer>) {
+        serversMutex.withLock {
+            update.forEach { servers[it.uid] = it as S }
+        }
+    }
+
+    override suspend fun retrieveAllServers(): ObjectCollection<S> {
+        return serversMutex.withLock { servers.values.toObjectSet() }
+    }
 }
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/spring/config/CaffeineCacheConfig.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/spring/config/CaffeineCacheConfig.kt
new file mode 100644
index 00000000..92c1f77d
--- /dev/null
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/spring/config/CaffeineCacheConfig.kt
@@ -0,0 +1,20 @@
+package dev.slne.surf.cloud.core.common.spring.config
+
+import com.github.benmanes.caffeine.cache.Caffeine
+import com.sksamuel.aedile.core.expireAfterAccess
+import org.springframework.cache.annotation.EnableCaching
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import kotlin.time.Duration.Companion.minutes
+
+@Configuration
+@EnableCaching
+class CaffeineCacheConfig {
+
+//    @Bean
+//    fun caffeineConfig(): Caffeine<Any, Any> {
+//        return Caffeine.newBuilder()
+//            .expireAfterAccess(10.minutes)
+//            .maximumSize(1000)
+//    }
+}
\ No newline at end of file
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/util/util.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/util/util.kt
index 01e6ce87..e6c50624 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/util/util.kt
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/util/util.kt
@@ -2,8 +2,8 @@
 
 package dev.slne.surf.cloud.core.common.util
 
-import dev.slne.surf.cloud.api.common.util.logger
 import dev.slne.surf.cloud.core.common.coreCloudInstance
+import dev.slne.surf.surfapi.core.api.util.logger
 import org.jetbrains.annotations.ApiStatus
 import org.springframework.context.ApplicationEvent
 import java.security.SecureRandom
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/resources/application.properties b/surf-cloud-core/surf-cloud-core-common/src/main/resources/application.properties
index 4bfdeb2a..5974c924 100644
--- a/surf-cloud-core/surf-cloud-core-common/src/main/resources/application.properties
+++ b/surf-cloud-core/surf-cloud-core-common/src/main/resources/application.properties
@@ -1,23 +1,15 @@
 spring.application.name=surf-data
-# Specify explicitly the dialect (here for PostgreSQL, adapt for your database)
-#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MariaDBDialect
-#spring.jpa.database-platform=org.hibernate.dialect.MariaDBDialect
-# Database initialization should typically be performed outside of Spring lifecycle
 spring.jpa.hibernate.ddl-auto=none
 spring.sql.init.mode=never
 spring.main.web-application-type=none
-#
-#logging.level.org.hibernate=DEBUG
-#logging.level.org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator=TRACE
-#logging.level.*=debug
-#logging.pattern.console=[%d{HH:mm:ss} %level]: [%logger] %msg%n
-logging.pattern.console=%clr([%d{HH:mm:ss}]){faint} %clr([%t]){} %clr([%level]){} %clr(%logger{0}:){faint} %clr(%m){} %n%wEx
-logging.pattern.dateformat=HH:mm:ss
-logging.file.name=logs/latest.log
-logging.file.path=logs
-logging.logback.rollingpolicy.file-name-pattern=logs/%d{yyyy-MM-dd}-${LOG_FILE}.log.gz
-logging.logback.rollingpolicy.max-file-size=10MB
-logging.logback.rollingpolicy.max-history=30
-logging.logback.rollingpolicy.total-size-cap=1GB
 logging.include-application-name=false
-logging.level.root=info
\ No newline at end of file
+logging.level.root=info
+
+spring.jpa.show-sql=true
+spring.jpa.properties.jakarta.persistence.sharedCache.mode=ENABLE_SELECTIVE
+spring.jpa.properties.hibernate.generate_statistics=true
+spring.jpa.properties.hibernate.cache.use_second_level_cache=true
+spring.jpa.properties.hibernate.cache.use_query_cache=true
+spring.jpa.properties.hibernate.cache.region.factory_class=jcache
+spring.jpa.properties.hibernate.javax.cache.provider=org.ehcache.jsr107.EhcacheCachingProvider
+spring.jpa.properties.hibernate.javax.cache.missing_cache_strategy=create
diff --git a/surf-cloud-standalone-launcher/build.gradle.kts b/surf-cloud-standalone-launcher/build.gradle.kts
index e422b2c0..d30c4815 100644
--- a/surf-cloud-standalone-launcher/build.gradle.kts
+++ b/surf-cloud-standalone-launcher/build.gradle.kts
@@ -1,10 +1,10 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.springframework.boot.gradle.tasks.bundling.BootJar
 
 plugins {
     id("dev.slne.surf.surfapi.gradle.standalone")
 
     application
-    `core-convention`
+    alias(libs.plugins.spring.boot)
 }
 
 surfStandaloneApi {
@@ -12,8 +12,8 @@ surfStandaloneApi {
 }
 
 dependencies {
-    implementation("org.apache.maven:maven-impl:4.0.0-rc-2")
-    implementation("org.apache.maven.resolver:maven-resolver-supplier-mvn4:2.0.5")
+    implementation(libs.bundles.maven.libraries)
+    implementation(libs.spring.instrument)
 }
 
 application {
@@ -22,15 +22,18 @@ application {
 
 tasks {
     val standaloneProject = project(":surf-cloud-standalone")
+    val standaloneJarTask = standaloneProject.tasks.named<BootJar>("bootJar")
 
     val copyStandaloneJar by registering(Copy::class) {
-        val standaloneJarTask = standaloneProject.tasks.named<ShadowJar>("shadowJar")
         dependsOn(standaloneJarTask)
 
-        from(standaloneJarTask.map { it.archiveFile.get().asFile })
-        into(buildDirectory.resolve("libs"))
+        from(standaloneJarTask.flatMap { it.archiveFile })
+        into(layout.buildDirectory.dir("libs"))
         rename { "surf-cloud-standalone.jara" }
 
+        inputs.file(standaloneJarTask.flatMap { it.archiveFile })
+        outputs.file(layout.buildDirectory.file("libs/surf-cloud-standalone.jara"))
+
         doFirst {
             val standaloneJar = standaloneJarTask.get().archiveFile.get().asFile
 
@@ -39,14 +42,35 @@ tasks {
             }
         }
     }
+    val cleanupCopyStandaloneJar by registering(Delete::class) {
+        delete(layout.buildDirectory.dir("libs").map { it.file("surf-cloud-standalone.jara") })
+    }
 
-    shadowJar {
+    bootJar {
         dependsOn(copyStandaloneJar)
-        from(buildDirectory.resolve("libs/surf-cloud-standalone.jara"))
+        dependsOn(standaloneJarTask)
+
+        from(layout.buildDirectory.file("libs/surf-cloud-standalone.jara"))
+        from(resources.text.fromString("org.springframework.boot.loader.launch.JarLauncher")) {
+            into("META-INF")
+            rename { "main-class" }
+        }
+
+        from("$buildDir/classes/java/main/dev/slne/surf/cloud/launcher/LauncherAgent.class") {
+            into("dev/slne/surf/cloud/launcher")
+        }
+
+        val springInstrumentJar = configurations.runtimeClasspath.get()
+            .find { it.name.contains("spring-instrument") } ?: throw GradleException("spring-instrument.jar not found")
+
+        from(zipTree(springInstrumentJar)) {
+            include("org/springframework/instrument/InstrumentationSavingAgent.class")
+            into("")
+        }
 
         manifest {
             attributes(
-                "Standalone-Main-Class" to "dev.slne.surf.cloud.standalone.Bootstrap"
+                "Launcher-Agent-Class" to "dev.slne.surf.cloud.launcher.LauncherAgent"
             )
         }
 
@@ -54,20 +78,12 @@ tasks {
             file("${buildDirectory}/libs/surf-cloud-standalone.jara").delete()
         }
 
-        val relocations = listOf(
-            "com.ctc.wstx",
-            "com.google",
-            "org.apache",
-            "org.codehaus",
-            "org.eclipse",
-            "org.slf4j",
-        )
-
-        relocations.forEach { relocate(it, "dev.slne.surf.cloud.launcher.libs.$it") }
+        finalizedBy(cleanupCopyStandaloneJar)
     }
 
-    named<JavaExec>("run") {
-        dependsOn(shadowJar)
+    publish {
+        dependsOn(bootJar)
+        inputs.files(bootJar)
     }
 }
 
diff --git a/surf-cloud-standalone-launcher/src/main/java/dev/slne/surf/cloud/launcher/LauncherAgent.java b/surf-cloud-standalone-launcher/src/main/java/dev/slne/surf/cloud/launcher/LauncherAgent.java
new file mode 100644
index 00000000..55b00e3c
--- /dev/null
+++ b/surf-cloud-standalone-launcher/src/main/java/dev/slne/surf/cloud/launcher/LauncherAgent.java
@@ -0,0 +1,16 @@
+package dev.slne.surf.cloud.launcher;
+
+import java.lang.instrument.Instrumentation;
+import org.springframework.instrument.InstrumentationSavingAgent;
+
+public class LauncherAgent {
+
+  public static void agentmain(String agentArgs, Instrumentation inst) {
+    premain(agentArgs, inst);
+  }
+
+  public static void premain(String agentArgs, Instrumentation inst) {
+    System.out.println("Launcher-Agent started. Loading actual agent...");
+    InstrumentationSavingAgent.premain(agentArgs, inst);
+  }
+}
diff --git a/surf-cloud-standalone-launcher/src/main/java/dev/slne/surf/cloud/launcher/LauncherUtils.java b/surf-cloud-standalone-launcher/src/main/java/dev/slne/surf/cloud/launcher/LauncherUtils.java
index cb70fb6a..bd116b9c 100644
--- a/surf-cloud-standalone-launcher/src/main/java/dev/slne/surf/cloud/launcher/LauncherUtils.java
+++ b/surf-cloud-standalone-launcher/src/main/java/dev/slne/surf/cloud/launcher/LauncherUtils.java
@@ -1,5 +1,13 @@
 package dev.slne.surf.cloud.launcher;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringWriter;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
 final class LauncherUtils {
 
   @SuppressWarnings("CallToPrintStackTrace")
@@ -11,4 +19,20 @@ public static RuntimeException fail(final String message, final Throwable err) {
     System.exit(1);
     throw new InternalError();
   }
+
+  public static @Nullable String readResourceText(final @NotNull String path) throws IOException {
+    final String p = path.startsWith("/") ? path : "/" + path;
+    final InputStream stream = LauncherUtils.class.getResourceAsStream(p);
+    if (stream == null) {
+      return null;
+    }
+
+    final StringWriter writer = new StringWriter();
+    try (stream) {
+      final Reader reader = new InputStreamReader(stream);
+      reader.transferTo(writer);
+    }
+
+    return writer.toString();
+  }
 }
diff --git a/surf-cloud-standalone-launcher/src/main/java/dev/slne/surf/cloud/launcher/Main.java b/surf-cloud-standalone-launcher/src/main/java/dev/slne/surf/cloud/launcher/Main.java
index 8e7c9179..8303a3f7 100644
--- a/surf-cloud-standalone-launcher/src/main/java/dev/slne/surf/cloud/launcher/Main.java
+++ b/surf-cloud-standalone-launcher/src/main/java/dev/slne/surf/cloud/launcher/Main.java
@@ -11,7 +11,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
-import java.util.List;
 import java.util.Objects;
 import java.util.jar.JarFile;
 import java.util.stream.Stream;
@@ -19,6 +18,7 @@
 import org.eclipse.aether.resolution.DependencyResolutionException;
 
 public class Main {
+
   public static void main(String[] args) {
     if (Path.of("").toAbsolutePath().toString().contains("!")) {
       System.err.println(
@@ -27,7 +27,7 @@ public static void main(String[] args) {
     }
 
     final URL[] classpathUrls = setupClasspath();
-    final ClassLoader parentClassLoader = Main.class.getClassLoader();
+    final ClassLoader parentClassLoader = Main.class.getClassLoader().getParent().getParent();
     final StandaloneUrlClassLoader classLoader = new StandaloneUrlClassLoader(classpathUrls,
         parentClassLoader);
 
@@ -136,23 +136,10 @@ private static URL[] getLibraries(JarFile file) {
   }
 
   private static String findMainClass() {
-//    try (final InputStream manifestStream = Launcher.class.getResource("/META-INF/MANIFEST.MF")
-//        .openStream()) {
-//      final Manifest manifest = new Manifest(manifestStream);
-//      System.out.println("manifest: " + manifest);
-//
-//      System.out.println("main attributes: " + manifest.getMainAttributes().entrySet());
-//      String mainClass = manifest.getMainAttributes().getValue("Real-Main-Class");
-//      System.out.println("main class: " + mainClass);
-//
-//      if (mainClass == null) {
-//        throw new IllegalStateException("Main class not found in manifest");
-//      }
-//
-//      return mainClass;
-//    }
-
-    // TODO: 19.09.2024 18:47 - fix
-    return "dev.slne.surf.cloud.standalone.Bootstrap";
+    try {
+      return LauncherUtils.readResourceText("/META-INF/main-class");
+    } catch (final IOException e) {
+      throw LauncherUtils.fail("Failed to read main-class file", e);
+    }
   }
 }
\ No newline at end of file
diff --git a/surf-cloud-standalone-launcher/src/main/java/dev/slne/surf/cloud/launcher/StandaloneUrlClassLoader.java b/surf-cloud-standalone-launcher/src/main/java/dev/slne/surf/cloud/launcher/StandaloneUrlClassLoader.java
index 06ee3279..94961e29 100644
--- a/surf-cloud-standalone-launcher/src/main/java/dev/slne/surf/cloud/launcher/StandaloneUrlClassLoader.java
+++ b/surf-cloud-standalone-launcher/src/main/java/dev/slne/surf/cloud/launcher/StandaloneUrlClassLoader.java
@@ -7,6 +7,8 @@
 @Internal
 public class StandaloneUrlClassLoader extends URLClassLoader {
 
+  private static final String INSTRUMENTATION_SAVING_AGENT = "org.springframework.instrument.InstrumentationSavingAgent";
+
   public StandaloneUrlClassLoader(URL[] urls, ClassLoader parent) {
     super(urls, parent);
   }
@@ -16,4 +18,105 @@ public StandaloneUrlClassLoader(URL[] urls, ClassLoader parent) {
   public void addURL(URL url) {
     super.addURL(url);
   }
+
+  @Override
+  protected Class<?> findClass(String name) throws ClassNotFoundException {
+    // This is a workaround for the Spring InstrumentationSavingAgent
+    if (INSTRUMENTATION_SAVING_AGENT.equals(name)) {
+      for (int i = 0; i < 10; i++) {
+        System.out.println("Loading InstrumentationSavingAgent");
+      }
+
+      return Class.forName(name, false, Main.class.getClassLoader());
+    }
+
+    return super.findClass(name);
+  }
+
+  //  public void addTransformer(ClassFileTransformer transformer) {
+//    this.transformers.add(transformer);
+//  }
+//
+//  public ClassLoader getThrowawayClassLoader() {
+//    return new StandaloneUrlClassLoader(getURLs(), getParent());
+//  }
+
+//  @Override
+//  public Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+//    if (isExcludedFromTransformation(name)) {
+//      return super.loadClass(name, resolve);
+//    }
+//
+//    Class<?> c = findLoadedClass(name);
+//    if (c == null) {
+//      try {
+//        c = super.loadClass(name, false);
+//      } catch (ClassNotFoundException ex) {
+//        c = findClass(name);
+//      }
+//    }
+//
+//    if (resolve) {
+//      resolveClass(c);
+//    }
+//
+//    return c;
+//  }
+
+//  @Override
+//  protected Class<?> findClass(String name) throws ClassNotFoundException {
+//    String resourceName = name.replace('.', '/').concat(".class");
+//
+//    URL resource = getResource(resourceName);
+//    if (resource == null) {
+//      throw new ClassNotFoundException("Resource not found: " + resourceName);
+//    }
+//
+//    byte[] classBytes;
+//    try (InputStream is = resource.openStream()) {
+//      classBytes = is.readAllBytes();
+//    } catch (IOException ex) {
+//      throw new ClassNotFoundException("Could not read class:" + name, ex);
+//    }
+//
+//    byte[] transformedBytes = transformClassBytes(name, classBytes);
+//
+////    CodeSource codeSource = new CodeSource(resource, (java.security.cert.Certificate[]) null);
+////    ProtectionDomain pd = new ProtectionDomain(codeSource, null);
+//
+//    return defineClass(name, transformedBytes, 0, transformedBytes.length);
+//  }
+
+//  private byte[] transformClassBytes(String className, byte[] originalBytes)
+//      throws ClassNotFoundException {
+//    byte[] current = originalBytes;
+//    for (ClassFileTransformer transformer : transformers) {
+//      try {
+//        byte[] transformed = transformer.transform(
+//            this,
+//            className,
+//            null,
+//            null,
+//            current
+//        );
+//        if (transformed != null) {
+//          current = transformed;
+//        }
+//      } catch (IllegalClassFormatException e) {
+//        throw new ClassNotFoundException(
+//            "Error while transforming class " + className, e
+//        );
+//      }
+//    }
+//    return current;
+//  }
+
+  private boolean isExcludedFromTransformation(String className) {
+    return className.startsWith("java.")
+        || className.startsWith("javax.")
+        || className.startsWith("sun.")
+        || className.startsWith("jdk.")
+        || className.startsWith("org.objectweb.asm.")
+        || className.startsWith("org.springframework.asm.");
+  }
 }
diff --git a/surf-cloud-standalone-launcher/src/main/resources/logback.ad.daadda.xml b/surf-cloud-standalone-launcher/src/main/resources/logback.ad.daadda.xml
deleted file mode 100644
index 46451ec8..00000000
--- a/surf-cloud-standalone-launcher/src/main/resources/logback.ad.daadda.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<configuration>
-<!--  <conversionRule conversionWord="clr"-->
-<!--    class="org.springframework.boot.logging.logback.ColorConverter"/>-->
-<!--  <conversionRule conversionWord="wex"-->
-<!--    class="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>-->
-<!--  <conversionRule conversionWord="wEx"-->
-<!--    class="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>-->
-
-  <logger name="org.apache.catalina.startup.DigesterFactory" level="ERROR"/>
-  <logger name="org.apache.catalina.util.LifecycleBase" level="ERROR"/>
-  <logger name="org.apache.coyote.http11.Http11NioProtocol" level="WARN"/>
-  <logger name="org.apache.sshd.common.util.SecurityUtils" level="WARN"/>
-  <logger name="org.apache.tomcat.util.net.NioSelectorPool" level="WARN"/>
-  <logger name="org.eclipse.jetty.util.component.AbstractLifeCycle" level="ERROR"/>
-  <logger name="org.hibernate.validator.internal.util.Version" level="WARN"/>
-  <logger name="org.springframework.boot.actuate.endpoint.jmx" level="WARN"/>
-
-  <conversionRule conversionWord="cl"
-    converterClass="dev.slne.surf.cloud.standalone.spring.config.logback.ColorConverter0"/>
-
-  <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>DEBUG</level>
-    </filter>
-    <!--    <encoder>-->
-    <!--      <pattern>${FILE_LOG_PATTERN}</pattern>-->
-    <!--      <charset>${FILE_LOG_CHARSET}</charset>-->
-    <!--    </encoder>-->
-    <file>logs/latest.log</file>
-    <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-      <fileNamePattern>log.%d{yyyy-MM-dd}.%i.gz</fileNamePattern>
-      <cleanHistoryOnStart>false</cleanHistoryOnStart>
-      <maxFileSize>10MB</maxFileSize>
-      <totalSizeCap>1GB</totalSizeCap>
-      <maxHistory>30</maxHistory>
-    </rollingPolicy>
-  </appender>
-
-  <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-      <level>TRACE</level>
-    </filter>
-    <encoder>
-      <pattern>%cl([%d{HH:mm:ss}] ){faint} %cl([%t/%level]){} %cl( %logger{0}: ){faint} %cl(%m){${level.color}}%n
-<!--        %wEx-->
-      </pattern>
-      <charset>UTF-8</charset>
-    </encoder>
-  </appender>
-
-  <root level="INFO">
-    <appender-ref ref="CONSOLE"/>
-  </root>
-
-</configuration>
\ No newline at end of file
diff --git a/surf-cloud-standalone/build.gradle.kts b/surf-cloud-standalone/build.gradle.kts
index 24d3cd48..09b07f71 100644
--- a/surf-cloud-standalone/build.gradle.kts
+++ b/surf-cloud-standalone/build.gradle.kts
@@ -1,31 +1,45 @@
 plugins {
     id("dev.slne.surf.surfapi.gradle.standalone")
-    `core-convention`
+    alias(libs.plugins.spring.boot)
 }
 
 dependencies {
     api(project(":surf-cloud-core:surf-cloud-core-common"))
     api(project(":surf-cloud-api:surf-cloud-api-server"))
 
-    runtimeOnly("org.mariadb.jdbc:mariadb-java-client")
-    api("org.springframework.boot:spring-boot-starter-data-jpa")
-    api("org.springframework.boot:spring-boot-starter-data-redis")
-    api("org.reactivestreams:reactive-streams:1.0.4")
-    api("io.lettuce:lettuce-core")
+    runtimeOnly(libs.mariadb.java.client)
+    runtimeOnly(libs.mysql.connector.j)
+    api(libs.spring.boot.starter.data.jpa)
+    api(libs.reactive.streams)
     api(libs.velocity.native)
+
+    implementation(libs.hibernate.jcache)
+    implementation(libs.ehcache)
+
+
+    // Ktor
+    implementation(libs.ktor.server.status.pages)
+
+    implementation(libs.spring.boot.starter.log4j2)
+    modules {
+        module("org.springframework.boot:spring-boot-starter-logging") {
+            replacedBy(
+                libs.spring.boot.starter.log4j2.get().toString(),
+                "Use Log4j2 instead of Logback"
+            )
+        }
+    }
 }
 
 tasks {
-    jar {
-        manifest {
-            attributes["Main-Class"] = "dev.slne.surf.cloud.standalone.launcher.Launcher"
-            attributes["Real-Main-Class"] = "dev.slne.surf.cloud.standalone.Bootstrap"
-        }
+    publish {
+        dependsOn(bootJar)
+        inputs.files(bootJar)
     }
 }
 
 kotlin {
     compilerOptions {
-        optIn.add("dev.slne.surf.cloud.api.common.util.InternalApi")
+        optIn.add("dev.slne.surf.cloud.api.common.util.annotation.InternalApi")
     }
 }
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/java/dev/slne/surf/cloud/standalone/plugin/entrypoint/strategy/JohnsonSimpleCycles.java b/surf-cloud-standalone/src/main/java/dev/slne/surf/cloud/standalone/plugin/entrypoint/strategy/JohnsonSimpleCycles.java
index 0b7d52ee..c7f6f9da 100644
--- a/surf-cloud-standalone/src/main/java/dev/slne/surf/cloud/standalone/plugin/entrypoint/strategy/JohnsonSimpleCycles.java
+++ b/surf-cloud-standalone/src/main/java/dev/slne/surf/cloud/standalone/plugin/entrypoint/strategy/JohnsonSimpleCycles.java
@@ -25,6 +25,7 @@
  * @param <V> the vertex type.
  * @author Nikolay Ognyanov
  */
+@SuppressWarnings("all")
 public class JohnsonSimpleCycles<V> {
 
   // The graph.
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/Bootstrap.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/Bootstrap.kt
index c8bef593..5cf22719 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/Bootstrap.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/Bootstrap.kt
@@ -1,9 +1,8 @@
 package dev.slne.surf.cloud.standalone
 
-import dev.slne.surf.cloud.api.common.util.logger
-import dev.slne.surf.cloud.core.common.SurfCloudCoreInstance.BootstrapData
+import dev.slne.surf.cloud.core.common.CloudCoreInstance.BootstrapData
 import dev.slne.surf.cloud.core.common.handleEventuallyFatalError
-import dev.slne.surf.cloud.standalone.spring.config.logback.CloudLogbackConfigurator
+import dev.slne.surf.surfapi.core.api.util.logger
 import dev.slne.surf.surfapi.standalone.SurfApiStandaloneBootstrap
 import kotlinx.coroutines.runBlocking
 import org.springframework.boot.SpringApplication
@@ -15,14 +14,13 @@ object Bootstrap {
     val log = logger()
 
     @JvmStatic
-    fun main(args: Array<String>) = runBlocking {
+    fun main(args: Array<String>): Unit = runBlocking {
         try {
             log.atInfo()
                 .log("Classloader: " + Bootstrap::class.java.classLoader)
 
             SurfApiStandaloneBootstrap.bootstrap()
             SurfApiStandaloneBootstrap.enable()
-            CloudLogbackConfigurator.configure()
 
             standaloneCloudInstance.bootstrap(
                 BootstrapData(
@@ -34,19 +32,22 @@ object Bootstrap {
 
             Runtime.getRuntime().addShutdownHook(thread(start = false) {
                 runBlocking {
+                    repeat(20) {
+                        println("Running shutdown hook")
+                    }
                     standaloneCloudInstance.onDisable()
                     SurfApiStandaloneBootstrap.shutdown()
                 }
             })
         } catch (e: Throwable) {
-            e.handleEventuallyFatalError {
+            e.handleEventuallyFatalError({
                 val context = standaloneCloudInstance.dataContext
                 if (context.isActive) {
                     SpringApplication.exit(context, it)
                 } else {
                     exitProcess(it.exitCode)
                 }
-            }
+            })
         }
     }
 }
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/CloudStandaloneInstance.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/CloudStandaloneInstance.kt
new file mode 100644
index 00000000..51463d7e
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/CloudStandaloneInstance.kt
@@ -0,0 +1,169 @@
+package dev.slne.surf.cloud.standalone
+
+import com.google.auto.service.AutoService
+import dev.slne.surf.cloud.api.common.CloudInstance
+import dev.slne.surf.cloud.api.server.CloudServerInstance
+import dev.slne.surf.cloud.api.server.export.RootExportPlayerData
+import dev.slne.surf.cloud.api.server.plugin.PluginManager
+import dev.slne.surf.cloud.api.server.plugin.StandalonePlugin
+import dev.slne.surf.cloud.core.common.CloudCoreInstance
+import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ClientboundTriggerShutdownPacket
+import dev.slne.surf.cloud.core.common.server.CommonCloudServerImpl
+import dev.slne.surf.cloud.core.common.util.checkInstantiationByServiceLoader
+import dev.slne.surf.cloud.core.common.util.random
+import dev.slne.surf.cloud.standalone.ktor.KtorServer
+import dev.slne.surf.cloud.standalone.netty.server.StandaloneNettyManager
+import dev.slne.surf.cloud.standalone.netty.server.network.ServerEncryptionManager
+import dev.slne.surf.cloud.standalone.player.standalonePlayerManagerImpl
+import dev.slne.surf.cloud.standalone.plugin.PluginInitializerManager
+import dev.slne.surf.cloud.standalone.plugin.entrypoint.Entrypoint
+import dev.slne.surf.cloud.standalone.plugin.entrypoint.LaunchEntryPointHandler
+import dev.slne.surf.cloud.standalone.server.connection
+import kotlinx.coroutines.*
+import org.bson.BsonDocument
+import org.bson.BsonDocumentWriter
+import org.bson.codecs.EncoderContext
+import org.bson.codecs.kotlinx.KotlinSerializerCodec
+import java.util.*
+
+@AutoService(CloudInstance::class)
+class CloudStandaloneInstance : CloudCoreInstance(StandaloneNettyManager),
+    CloudServerInstance {
+    override val springProfile = "server"
+
+    init {
+        checkInstantiationByServiceLoader()
+    }
+
+    override suspend fun preBootstrap() {
+        super.preBootstrap()
+        ServerEncryptionManager.init()
+
+        PluginInitializerManager.load()
+    }
+
+    override suspend fun bootstrap(data: BootstrapData) {
+        super.bootstrap(data)
+        LaunchEntryPointHandler.enterBootstrappers()
+    }
+
+    override suspend fun onLoad() {
+        super.onLoad()
+        random
+
+        loadPlugins()
+    }
+
+    override suspend fun onEnable() {
+        super.onEnable()
+
+        enablePlugins()
+        KtorServer.start()
+        afterStart()
+
+        log.atInfo()
+            .log("Standalone instance is ready!")
+    }
+
+    override suspend fun onDisable() {
+        disablePlugins()
+        super.onDisable()
+    }
+
+    override fun shutdownServer(server: CommonCloudServerImpl) {
+        server.connection.send(ClientboundTriggerShutdownPacket)
+    }
+
+    private suspend fun loadPlugins() {
+        LaunchEntryPointHandler.enter(Entrypoint.SPRING_PLUGIN)
+    }
+
+    private suspend fun enablePlugins() {
+        val plugins = PluginManager.instance.getPlugins()
+
+        for (plugin in plugins) {
+            if (!plugin.enabled) {
+                enablePlugin(plugin)
+            }
+        }
+    }
+
+    private suspend fun enablePlugin(plugin: StandalonePlugin) {
+        try {
+            PluginManager.instance.enablePlugin(plugin)
+        } catch (e: Throwable) {
+            log.atSevere()
+                .withCause(e)
+                .log("${e.message} while enabling plugin ${plugin.meta.displayName}")
+        }
+    }
+
+    suspend fun disablePlugins() {
+        PluginManager.instance.disablePlugins()
+    }
+
+    private val playerDataCodec =
+        KotlinSerializerCodec.create<RootExportPlayerData>() ?: error("Codec not found")
+
+    override suspend fun exportPlayerData(uuid: UUID): String = supervisorScope {
+        val standaloneData = coroutineScope {
+            async(Dispatchers.IO) {
+                standalonePlayerManagerImpl.exportPlayerData(uuid)
+            }
+        }
+
+        val pluginData = PluginManager.instance.getPlugins().map { plugin ->
+            coroutineScope {
+                async(Dispatchers.IO) {
+                    runCatching {
+                        plugin.exportPlayerData(uuid)
+                    }.getOrElse {
+                        log.atSevere()
+                            .withCause(it)
+                            .log("Error while exporting player data for plugin ${plugin.meta.displayName}")
+                        null
+                    }
+                }
+            }
+        }
+
+        val dataExport = (listOf(standaloneData) + pluginData).awaitAll().filterNotNull()
+        val data = RootExportPlayerData(dataExport)
+
+        val document = BsonDocument()
+        playerDataCodec.encode(BsonDocumentWriter(document), data, EncoderContext.builder().build())
+        document.toJson()
+    }
+
+    override suspend fun deleteNotInterestingPlayerData(uuid: UUID): Unit = supervisorScope {
+        val standaloneDelete = coroutineScope {
+            async(Dispatchers.IO) {
+                standalonePlayerManagerImpl.deleteNotInterestingPlayerData(uuid)
+            }
+        }
+
+        val pluginDelete = PluginManager.instance.getPlugins().map { plugin ->
+            coroutineScope {
+                async(Dispatchers.IO) {
+                    runCatching {
+                        plugin.deleteNotInterestingPlayerData(uuid)
+                    }.getOrElse {
+                        log.atSevere()
+                            .withCause(it)
+                            .log("Error while deleting player data for plugin ${plugin.meta.displayName}")
+                    }
+                }
+            }
+        }
+
+        standaloneDelete.await()
+        pluginDelete.awaitAll()
+    }
+
+    companion object {
+        fun get() = CloudInstance.instance as CloudStandaloneInstance
+    }
+}
+
+val standaloneCloudInstance
+    get() = CloudStandaloneInstance.get()
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/SurfCloudStandaloneInstance.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/SurfCloudStandaloneInstance.kt
deleted file mode 100644
index d685f38a..00000000
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/SurfCloudStandaloneInstance.kt
+++ /dev/null
@@ -1,112 +0,0 @@
-package dev.slne.surf.cloud.standalone
-
-import com.google.auto.service.AutoService
-import dev.slne.surf.cloud.api.common.SurfCloudInstance
-import dev.slne.surf.cloud.api.server.plugin.PluginManager
-import dev.slne.surf.cloud.api.server.plugin.StandalonePlugin
-import dev.slne.surf.cloud.core.common.SurfCloudCoreInstance
-import dev.slne.surf.cloud.core.common.util.bean
-import dev.slne.surf.cloud.core.common.util.checkInstantiationByServiceLoader
-import dev.slne.surf.cloud.core.common.util.random
-import dev.slne.surf.cloud.standalone.netty.server.StandaloneNettyManager
-import dev.slne.surf.cloud.standalone.netty.server.network.ServerEncryptionManager
-import dev.slne.surf.cloud.standalone.plugin.PluginInitializerManager
-import dev.slne.surf.cloud.standalone.plugin.entrypoint.Entrypoint
-import dev.slne.surf.cloud.standalone.plugin.entrypoint.LaunchEntryPointHandler
-import dev.slne.surf.cloud.standalone.redis.RedisEvent
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.runBlocking
-import org.springframework.data.redis.core.ReactiveRedisTemplate
-import reactor.util.Loggers
-import kotlin.concurrent.thread
-import kotlin.time.Duration.Companion.seconds
-
-@AutoService(SurfCloudInstance::class)
-class SurfCloudStandaloneInstance : SurfCloudCoreInstance(StandaloneNettyManager) {
-    override val springProfile = "independent"
-
-    init {
-        checkInstantiationByServiceLoader()
-    }
-
-    override suspend fun preBootstrap() {
-        super.preBootstrap()
-        ServerEncryptionManager.init()
-
-        PluginInitializerManager.load()
-    }
-
-    override suspend fun bootstrap(data: BootstrapData) {
-        super.bootstrap(data)
-        LaunchEntryPointHandler.enterBootstrappers()
-    }
-
-    override suspend fun onLoad() {
-//        SpringApplication.getShutdownHandlers().add(StandalonePluginManager)
-        thread(name = "KeepAlive") { while (true) runBlocking { delay(5.seconds) } }
-        super.onLoad()
-        random
-
-        loadPlugins()
-    }
-
-    override suspend fun onEnable() {
-        super.onEnable()
-
-        enablePlugins()
-        afterStart()
-
-        log.atInfo()
-            .log("Standalone instance is ready!")
-    }
-
-    override suspend fun onDisable() {
-        disablePlugins()
-        super.onDisable()
-    }
-
-    private suspend fun loadPlugins() {
-        LaunchEntryPointHandler.enter(Entrypoint.SPRING_PLUGIN)
-    }
-
-    private suspend fun enablePlugins() {
-        val plugins = PluginManager.instance.getPlugins()
-
-        for (plugin in plugins) {
-            if (!plugin.enabled) {
-                enablePlugin(plugin)
-            }
-        }
-    }
-
-    private suspend fun enablePlugin(plugin: StandalonePlugin) {
-        try {
-            PluginManager.instance.enablePlugin(plugin)
-        } catch (e: Throwable) {
-            log.atSevere()
-                .withCause(e)
-                .log("${e.message} while enabling plugin ${plugin.meta.displayName}")
-        }
-    }
-
-    suspend fun disablePlugins() {
-        PluginManager.instance.disablePlugins()
-    }
-
-    private val redisEventLog = Loggers.getLogger("RedisEvent")
-    fun callRedisEvent(event: RedisEvent) {
-        val template = bean<ReactiveRedisTemplate<String, Any>>("reactiveRedisTemplate")
-        for (channel in event.channels) {
-            template.convertAndSend(channel, event)
-                .log(redisEventLog)
-                .subscribe()
-        }
-    }
-
-    companion object {
-        fun get() = SurfCloudInstance.instance as SurfCloudStandaloneInstance
-    }
-}
-
-val standaloneCloudInstance
-    get() = SurfCloudStandaloneInstance.get()
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/__AdditionalSpringStandaloneConfiguration.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/__AdditionalSpringStandaloneConfiguration.kt
index 4cec11f7..825b3698 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/__AdditionalSpringStandaloneConfiguration.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/__AdditionalSpringStandaloneConfiguration.kt
@@ -1,39 +1,11 @@
 package dev.slne.surf.cloud.standalone
 
-import dev.slne.surf.cloud.api.server.meta.SurfJpaRepository
-import dev.slne.surf.cloud.api.server.meta.SurfRedisRepository
-import org.springframework.context.annotation.ComponentScan
-import org.springframework.context.annotation.Configuration
-import org.springframework.context.annotation.FilterType
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories
-import org.springframework.data.redis.repository.configuration.EnableRedisRepositories
+import dev.slne.surf.cloud.api.server.plugin.AdditionalStandaloneConfiguration
 
 /**
  * Additional Spring configuration for standalone applications,
  * enabling selective JPA and Redis repository scanning.
  */
 @Suppress("ClassName")
-@EnableJpaRepositories(
-    includeFilters = [ComponentScan.Filter(
-        type = FilterType.ANNOTATION,
-        classes = [SurfJpaRepository::class]
-    )],
-    excludeFilters = [ComponentScan.Filter(
-        type = FilterType.ANNOTATION,
-        classes = [SurfRedisRepository::class]
-    )],
-    repositoryImplementationPostfix = "JpaImpl"
-)
-@EnableRedisRepositories(
-    includeFilters = [ComponentScan.Filter(
-        type = FilterType.ANNOTATION,
-        classes = [SurfRedisRepository::class]
-    )],
-    excludeFilters = [ComponentScan.Filter(
-        type = FilterType.ANNOTATION,
-        classes = [SurfJpaRepository::class]
-    )],
-    repositoryImplementationPostfix = "RedisImpl"
-)
-@Configuration
-internal class __AdditionalSpringStandaloneConfiguration 
+@AdditionalStandaloneConfiguration
+internal class __AdditionalSpringStandaloneConfiguration
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/CommandManagerImpl.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/CommandManagerImpl.kt
new file mode 100644
index 00000000..17c77052
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/CommandManagerImpl.kt
@@ -0,0 +1,197 @@
+package dev.slne.surf.cloud.standalone.commands
+
+import com.mojang.brigadier.CommandDispatcher
+import com.mojang.brigadier.ParseResults
+import com.mojang.brigadier.context.ContextChain
+import com.mojang.brigadier.exceptions.CommandSyntaxException
+import dev.slne.surf.cloud.api.server.command.CommandException
+import dev.slne.surf.cloud.api.server.command.CommandResultCallback
+import dev.slne.surf.cloud.api.server.command.CommandSource
+import dev.slne.surf.cloud.core.common.coroutines.ConsoleCommandHandlerScope
+import dev.slne.surf.cloud.standalone.commands.execution.ExecutionContext
+import dev.slne.surf.cloud.standalone.commands.impl.ShutdownCommand
+import dev.slne.surf.cloud.standalone.commands.impl.TestCommand
+import dev.slne.surf.surfapi.core.api.messages.Colors
+import dev.slne.surf.surfapi.core.api.messages.adventure.appendText
+import dev.slne.surf.surfapi.core.api.messages.adventure.buildText
+import dev.slne.surf.surfapi.core.api.util.logger
+import jakarta.annotation.PostConstruct
+import jakarta.annotation.PreDestroy
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import net.kyori.adventure.text.event.ClickEvent
+import org.springframework.stereotype.Component
+import java.util.concurrent.ConcurrentLinkedQueue
+
+@Component
+class CommandManagerImpl {
+
+    val dispatcher = CommandDispatcher<CommandSource>()
+    private val serverCommandQueue = ConcurrentLinkedQueue<ConsoleInput>()
+    private lateinit var task: Job
+
+    init {
+        ShutdownCommand.register(dispatcher)
+        TestCommand.register(dispatcher)
+    }
+
+    fun createCommandSource(): CommandSource {
+        return CommandSource()
+    }
+
+    fun handleConsoleInput(command: String, source: CommandSource) {
+        serverCommandQueue.add(ConsoleInput(command, source))
+    }
+
+    private fun handleConsoleInputs() {
+        while (serverCommandQueue.isNotEmpty()) {
+            val (msg, source) = serverCommandQueue.poll()
+            dispatchServerCommand(source, msg)
+        }
+    }
+
+    fun performCommand(
+        parseresults: ParseResults<CommandSource>,
+        input: String,
+        label: String,
+        throwOnError: Boolean = false
+    ) {
+        val source = parseresults.context.source
+        val contextChain = finishParsing(parseresults, input, source, label) ?: return
+
+        try {
+            println("Executing command in context")
+            executeCommandInContext {
+                ExecutionContext.queueInitialCommandExecution(
+                    it,
+                    input,
+                    contextChain,
+                    source,
+                    CommandResultCallback.EMPTY
+                )
+            }
+        } catch (e: Throwable) {
+            if (throwOnError) throw e
+
+            log.atSevere()
+                .withCause(e)
+                .log("Command Exception: /$input")
+
+            source.sendFailure(buildText {
+                appendText("An unexpected error occurred trying to execute that command") {
+                    hoverEvent(buildText {
+                        appendText(e.message ?: e.javaClass.name)
+                    })
+                }
+            })
+        }
+    }
+
+    fun executeCommandInContext(callback: (ExecutionContext<CommandSource>) -> Unit) {
+        val context: ExecutionContext<CommandSource>? = CURRENT_EXECUTION_CONTEXT.get()
+
+        if (context == null) {
+            try {
+                val newContext = ExecutionContext<CommandSource>(COMMAND_CHAIN_LIMIT, FORK_LIMIT)
+                CURRENT_EXECUTION_CONTEXT.set(newContext)
+                callback(newContext)
+                newContext.runCommandQueue()
+            } finally {
+                CURRENT_EXECUTION_CONTEXT.remove()
+            }
+        } else {
+            callback(context)
+        }
+    }
+
+    private fun finishParsing(
+        parseresults: ParseResults<CommandSource>,
+        input: String,
+        source: CommandSource,
+        label: String,
+    ): ContextChain<CommandSource>? {
+        try {
+            parseresults.validateParseResults()
+            return ContextChain.tryFlatten(parseresults.context.build(input)).orElseThrow {
+                CommandSyntaxException.BUILT_IN_EXCEPTIONS.dispatcherUnknownCommand()
+                    .createWithContext(parseresults.reader)
+            }
+        } catch (e: CommandSyntaxException) {
+            source.sendFailure(buildText {
+                color(Colors.ERROR)
+                appendText(e.message!!)
+                clickEvent(ClickEvent.suggestCommand("/$label"))
+            })
+
+            return null
+        }
+    }
+
+    fun dispatchServerCommand(sender: CommandSource, serverCommand: String) {
+        try {
+            dispatchCommand(sender, serverCommand)
+        } catch (e: Throwable) {
+            log.atWarning()
+                .withCause(e)
+                .log("Unexpected exception while parsing console command '$serverCommand'")
+        }
+    }
+
+    fun dispatchCommand(source: CommandSource, commandLine: String) {
+        val results = dispatcher.parse(commandLine, source)
+
+        try {
+            performCommand(results, commandLine, commandLine, true)
+        } catch (e: OutOfMemoryError) {
+            throw e
+        } catch (e: CommandException) {
+            throw e
+        } catch (e: Throwable) {
+            throw CommandException("Unhandled exception executing '$commandLine'", e)
+        }
+    }
+
+    private fun launchConsoleInputProcessingTask() = ConsoleCommandHandlerScope.launch {
+        while (true) {
+            delay(20)
+            handleConsoleInputs()
+        }
+    }
+
+    @Suppress("ProtectedInFinal") // IJ being dumb
+    @PostConstruct
+    protected fun init() {
+        task = launchConsoleInputProcessingTask()
+    }
+
+    @Suppress("ProtectedInFinal") // IJ being dumb
+    @PreDestroy
+    protected fun destroy() = runBlocking {
+        task.cancel()
+        task.join()
+    }
+
+    companion object {
+        private val log = logger()
+        private val CURRENT_EXECUTION_CONTEXT = ThreadLocal<ExecutionContext<CommandSource>>()
+        private const val COMMAND_CHAIN_LIMIT = 65536
+        private const val FORK_LIMIT = 65536
+    }
+}
+
+data class ConsoleInput(val msg: String, val source: CommandSource)
+
+fun <S> ParseResults<S>.validateParseResults() {
+    throw getParseException() ?: return
+}
+
+fun <S> ParseResults<S>.getParseException(): CommandSyntaxException? {
+    if (!reader.canRead()) return null
+    if (exceptions.size == 1) return exceptions.values.first()
+    if (context.range.isEmpty) return CommandSyntaxException.BUILT_IN_EXCEPTIONS.dispatcherUnknownCommand()
+        .createWithContext(reader)
+    return CommandSyntaxException.BUILT_IN_EXCEPTIONS.dispatcherUnknownArgument()
+        .createWithContext(reader)
+}
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/execution/ChainModifiers.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/execution/ChainModifiers.kt
new file mode 100644
index 00000000..1ddfbe9c
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/execution/ChainModifiers.kt
@@ -0,0 +1,23 @@
+package dev.slne.surf.cloud.standalone.commands.execution
+
+import kotlin.experimental.and
+import kotlin.experimental.or
+
+@JvmInline
+value class ChainModifiers(val flags: Byte) {
+
+    private fun setFlag(flag: Byte): ChainModifiers =
+        ChainModifiers(flags or flag).takeIf { it.flags != this.flags } ?: this
+
+    fun isForked(): Boolean = flags and FLAG_FORKED != 0.toByte()
+    fun setForked(): ChainModifiers = setFlag(FLAG_FORKED)
+
+    fun isReturn(): Boolean = flags and FLAG_IS_RETURN != 0.toByte()
+    fun setReturn(): ChainModifiers = setFlag(FLAG_IS_RETURN)
+
+    companion object {
+        val DEFAULT = ChainModifiers(0)
+        private const val FLAG_FORKED: Byte = 1
+        private const val FLAG_IS_RETURN: Byte = 2
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/execution/CommandQueueEntry.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/execution/CommandQueueEntry.kt
new file mode 100644
index 00000000..26ee3b79
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/execution/CommandQueueEntry.kt
@@ -0,0 +1,28 @@
+package dev.slne.surf.cloud.standalone.commands.execution
+
+import dev.slne.surf.cloud.api.server.command.CommandResultCallback
+
+data class CommandQueueEntry<T>(val frame: Frame, val action: EntryAction<T>) {
+    fun execute(context: ExecutionContext<T>) = action(context, frame)
+}
+
+data class Frame(
+    val depth: Int,
+    val resultCallback: CommandResultCallback,
+    val frameControl: FrameControl
+) {
+    fun returnSuccess(result: Int) = resultCallback.onSuccess(result)
+    fun returnFailure() = resultCallback.onFailure()
+    fun discard() = frameControl()
+}
+
+typealias FrameControl = () -> Unit
+
+fun interface EntryAction<T> {
+    operator fun invoke(context: ExecutionContext<T>, frame: Frame)
+}
+
+fun interface UnboundEntryAction<T> {
+    fun execute(source: T, executionContext: ExecutionContext<T>, frame: Frame)
+    fun bind(source: T) = EntryAction { context, frame -> this.execute(source, context, frame) }
+}
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/execution/ExecutionContext.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/execution/ExecutionContext.kt
new file mode 100644
index 00000000..01fee369
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/execution/ExecutionContext.kt
@@ -0,0 +1,109 @@
+package dev.slne.surf.cloud.standalone.commands.execution
+
+import com.mojang.brigadier.context.ContextChain
+import dev.slne.surf.cloud.api.server.command.CommandResultCallback
+import dev.slne.surf.cloud.api.server.command.ExecutionCommandSource
+import dev.slne.surf.cloud.standalone.commands.execution.tasks.BuildContexts
+import dev.slne.surf.surfapi.core.api.util.logger
+
+class ExecutionContext<T>(
+    private val commandLimit: Int,
+    val forkLimit: Int,
+    private var commandQuota: Int = commandLimit,
+) {
+    private val commandQueue = ArrayDeque<CommandQueueEntry<T>>()
+    private val newTopCommands = mutableListOf<CommandQueueEntry<T>>()
+
+    private var queueOverflow = false
+    private var currentFrameDepth = 0
+
+    private fun handleQueueOverflow() {
+        queueOverflow = true
+        commandQueue.clear()
+        newTopCommands.clear()
+    }
+
+    fun queueNext(entry: CommandQueueEntry<T>) {
+        if (newTopCommands.size + commandQueue.size > MAX_QUEUE_DEPTH) {
+            handleQueueOverflow()
+        }
+
+        if (!queueOverflow) {
+            newTopCommands.add(entry)
+        }
+    }
+
+    fun discardAtDepthOrHigher(depth: Int) {
+        while (commandQueue.isNotEmpty() && commandQueue.first().frame.depth >= depth) {
+            commandQueue.removeFirst()
+        }
+    }
+
+    fun frameControlForDepth(depth: Int): FrameControl = { discardAtDepthOrHigher(depth) }
+
+    fun runCommandQueue() {
+        pushNewCommands()
+
+        while (true) {
+            if (commandQuota <= 0) {
+                log.atInfo()
+                    .log("Command quota exhausted, stopping execution (executed $commandLimit commands)")
+                break
+            }
+
+            val entry = commandQueue.removeFirstOrNull() ?: return
+            currentFrameDepth = entry.frame.depth
+            entry.execute(this)
+
+            if (queueOverflow) {
+                log.atInfo()
+                    .log("Queue overflow detected, stopping execution (max $MAX_QUEUE_DEPTH commands)")
+                break
+            }
+
+            pushNewCommands()
+        }
+
+        currentFrameDepth = 0
+    }
+
+    private fun pushNewCommands() {
+        commandQueue.addAll(newTopCommands)
+        newTopCommands.clear()
+    }
+
+    fun incrementCost() {
+        commandQuota--
+    }
+
+    companion object {
+        private const val MAX_QUEUE_DEPTH = 10_000_000
+        private val log = logger()
+
+        fun <T : ExecutionCommandSource<T>> queueInitialCommandExecution(
+            context: ExecutionContext<T>,
+            commandInput: String,
+            command: ContextChain<T>,
+            source: T,
+            callback: CommandResultCallback,
+        ) {
+            println("Queueing initial command execution")
+            context.queueNext(
+                CommandQueueEntry(
+                    context.createTopFrame(callback),
+                    BuildContexts.TopLevel(commandInput, command, source)
+                )
+            )
+        }
+
+        private fun <T : ExecutionCommandSource<T>> ExecutionContext<T>.createTopFrame(callback: CommandResultCallback): Frame {
+            return if (currentFrameDepth == 0) {
+                Frame(0, callback) { commandQueue.clear() }
+            } else {
+                val frameDepth = currentFrameDepth + 1
+                Frame(frameDepth, callback, frameControlForDepth(frameDepth))
+            }
+        }
+    }
+}
+
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/execution/tasks/BuildContexts.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/execution/tasks/BuildContexts.kt
new file mode 100644
index 00000000..93f2579a
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/execution/tasks/BuildContexts.kt
@@ -0,0 +1,125 @@
+package dev.slne.surf.cloud.standalone.commands.execution.tasks
+
+import com.mojang.brigadier.LiteralMessage
+import com.mojang.brigadier.context.ContextChain
+import com.mojang.brigadier.exceptions.CommandSyntaxException
+import com.mojang.brigadier.exceptions.DynamicCommandExceptionType
+import dev.slne.surf.cloud.api.common.util.mutableObjectListOf
+import dev.slne.surf.cloud.api.common.util.objectListOf
+import dev.slne.surf.cloud.api.server.command.CommandResultCallback
+import dev.slne.surf.cloud.api.server.command.ExecutionCommandSource
+import dev.slne.surf.cloud.standalone.commands.execution.*
+
+open class BuildContexts<T : ExecutionCommandSource<T>>(
+    private val commandInput: String,
+    private val command: ContextChain<T>
+) {
+
+    protected open fun execute(
+        originalSource: T,
+        initialSources: List<T>,
+        executionContext: ExecutionContext<T>,
+        frame: Frame,
+        initialModifiers: ChainModifiers
+    ) {
+        var currentChain = command
+        var currentModifiers = initialModifiers
+        var currentSources = initialSources
+
+        if (currentChain.stage != ContextChain.Stage.EXECUTE) {
+            val forkLimit = executionContext.forkLimit
+            while (currentChain.stage != ContextChain.Stage.EXECUTE) {
+                val topContext = currentChain.getTopContext()
+                if (topContext.isForked) {
+                    currentModifiers = currentModifiers.setForked()
+                }
+
+                val redirectModifier = topContext.redirectModifier
+
+                if (redirectModifier != null) {
+                    executionContext.incrementCost()
+                    val isForked = currentModifiers.isForked()
+                    val modifiedSources = mutableObjectListOf<T>()
+
+                    for (source in currentSources) {
+                        try {
+                            val modifierResults = ContextChain.runModifier(
+                                topContext,
+                                source,
+                                { _, _, _ -> },
+                                isForked
+                            )
+                            if (modifiedSources.size + modifierResults.size >= forkLimit) {
+                                originalSource.handleError(
+                                    ERROR_FORK_LIMIT_REACHED.create(forkLimit),
+                                    isForked
+                                )
+                                return
+                            }
+
+                            modifiedSources.addAll(modifierResults)
+                        } catch (e: CommandSyntaxException) {
+                            source.handleError(e, isForked)
+                            if (!isForked) {
+                                return
+                            }
+                        }
+                    }
+
+                    currentSources = modifiedSources
+                }
+                currentChain = currentChain.nextStage()
+            }
+        }
+
+        if (currentSources.isEmpty()) {
+            if (currentModifiers.isReturn()) {
+                executionContext.queueNext(CommandQueueEntry(frame, FallthroughTask.instance()))
+            }
+        } else {
+            val finalContext = currentChain.topContext
+
+            if (currentModifiers.isReturn()) {
+                val firstSource = currentSources.first().withCallback(
+                    CommandResultCallback.chain(
+                        currentSources.first().callback,
+                        frame.resultCallback
+                    )
+                )
+                currentSources = objectListOf(firstSource)
+            }
+
+            val executeCommand = ExecuteCommand(currentModifiers, finalContext)
+            ContinuationTask.schedule(
+                executionContext,
+                frame,
+                currentSources
+            ) { nextFrame, argument ->
+                CommandQueueEntry(nextFrame, executeCommand.bind(argument))
+            }
+        }
+    }
+
+
+    override fun toString(): String {
+        return commandInput
+    }
+
+    class TopLevel<T : ExecutionCommandSource<T>>(
+        commandInput: String,
+        command: ContextChain<T>,
+        private val source: T
+    ) : BuildContexts<T>(commandInput, command), EntryAction<T> {
+        override fun invoke(
+            context: ExecutionContext<T>,
+            frame: Frame
+        ) {
+            execute(source, objectListOf(source), context, frame, ChainModifiers.DEFAULT)
+        }
+    }
+
+    companion object {
+        val ERROR_FORK_LIMIT_REACHED =
+            DynamicCommandExceptionType { LiteralMessage("Maximum number of contexts ($it) reached") }
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/execution/tasks/ContinuationTask.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/execution/tasks/ContinuationTask.kt
new file mode 100644
index 00000000..645a2753
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/execution/tasks/ContinuationTask.kt
@@ -0,0 +1,54 @@
+package dev.slne.surf.cloud.standalone.commands.execution.tasks
+
+import dev.slne.surf.cloud.standalone.commands.execution.CommandQueueEntry
+import dev.slne.surf.cloud.standalone.commands.execution.EntryAction
+import dev.slne.surf.cloud.standalone.commands.execution.ExecutionContext
+import dev.slne.surf.cloud.standalone.commands.execution.Frame
+
+
+class ContinuationTask<T, P> private constructor(
+    private val taskFactory: TaskProvider<T, P>,
+    private val arguments: List<P>,
+    frame: Frame
+) : EntryAction<T> {
+    private val selfEntry = CommandQueueEntry(frame, this)
+    private var index = 0
+
+    override fun invoke(context: ExecutionContext<T>, frame: Frame) {
+        val arg = arguments[index]
+        context.queueNext(taskFactory(frame, arg))
+
+        if (index++ < arguments.size) {
+            context.queueNext(selfEntry)
+        }
+    }
+
+    companion object {
+        fun <T, P> schedule(
+            executionContext: ExecutionContext<T>,
+            frame: Frame,
+            arguments: List<P>,
+            taskProvider: TaskProvider<T, P>
+        ) {
+            when (arguments.size) {
+                0 -> {}
+                1 -> executionContext.queueNext(taskProvider(frame, arguments[0]))
+                2 -> {
+                    executionContext.queueNext(taskProvider(frame, arguments[0]))
+                    executionContext.queueNext(taskProvider(frame, arguments[1]))
+                }
+
+                else -> executionContext.queueNext(
+                    ContinuationTask(
+                        taskProvider,
+                        arguments,
+                        frame
+                    ).selfEntry
+                )
+            }
+        }
+    }
+
+}
+
+typealias TaskProvider<T, P> = (Frame, P) -> CommandQueueEntry<T>
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/execution/tasks/ExecuteCommand.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/execution/tasks/ExecuteCommand.kt
new file mode 100644
index 00000000..0dfbd16c
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/execution/tasks/ExecuteCommand.kt
@@ -0,0 +1,33 @@
+package dev.slne.surf.cloud.standalone.commands.execution.tasks
+
+import com.mojang.brigadier.context.CommandContext
+import com.mojang.brigadier.context.ContextChain
+import com.mojang.brigadier.exceptions.CommandSyntaxException
+import dev.slne.surf.cloud.api.server.command.ExecutionCommandSource
+import dev.slne.surf.cloud.standalone.commands.execution.ChainModifiers
+import dev.slne.surf.cloud.standalone.commands.execution.ExecutionContext
+import dev.slne.surf.cloud.standalone.commands.execution.Frame
+import dev.slne.surf.cloud.standalone.commands.execution.UnboundEntryAction
+
+class ExecuteCommand<T : ExecutionCommandSource<T>>(
+    private val modifiers: ChainModifiers,
+    private val executionContext: CommandContext<T>
+) : UnboundEntryAction<T> {
+    override fun execute(
+        source: T,
+        executionContext: ExecutionContext<T>,
+        frame: Frame
+    ) {
+        try {
+            executionContext.incrementCost()
+            ContextChain.runExecutable(
+                this.executionContext,
+                source,
+                ExecutionCommandSource.resultConsumer(),
+                modifiers.isForked()
+            )
+        } catch (e: CommandSyntaxException) {
+            source.handleError(e, modifiers.isForked())
+        }
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/execution/tasks/FallthroughTask.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/execution/tasks/FallthroughTask.kt
new file mode 100644
index 00000000..cf982cd6
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/execution/tasks/FallthroughTask.kt
@@ -0,0 +1,25 @@
+package dev.slne.surf.cloud.standalone.commands.execution.tasks
+
+import dev.slne.surf.cloud.api.server.command.ExecutionCommandSource
+import dev.slne.surf.cloud.standalone.commands.execution.EntryAction
+import dev.slne.surf.cloud.standalone.commands.execution.ExecutionContext
+import dev.slne.surf.cloud.standalone.commands.execution.Frame
+
+class FallthroughTask<T : ExecutionCommandSource<out T>> : EntryAction<T> {
+
+    override fun invoke(
+        context: ExecutionContext<T>,
+        frame: Frame
+    ) {
+        frame.returnFailure()
+        frame.discard()
+    }
+
+    companion object {
+        private val INSTANCE = FallthroughTask<ExecutionCommandSource<*>>()
+
+        fun <T : ExecutionCommandSource<T>> instance(): EntryAction<T> {
+            return INSTANCE as EntryAction<T>
+        }
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/impl/ShutdownCommand.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/impl/ShutdownCommand.kt
new file mode 100644
index 00000000..50e01e2c
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/impl/ShutdownCommand.kt
@@ -0,0 +1,22 @@
+package dev.slne.surf.cloud.standalone.commands.impl
+
+import com.mojang.brigadier.CommandDispatcher
+import dev.slne.surf.cloud.api.common.exceptions.ExitCodes
+import dev.slne.surf.cloud.api.server.command.CommandSource
+import dev.slne.surf.cloud.api.server.command.ConsoleCommand
+import dev.slne.surf.cloud.api.server.command.literal
+import kotlin.system.exitProcess
+
+object ShutdownCommand: ConsoleCommand {
+    fun register(dispatcher: CommandDispatcher<CommandSource>) {
+        repeat(20) {
+            println("This is a fake loop")
+        }
+        dispatcher.register(literal("stop") {
+            executes { context ->
+                context.source.sendSuccess("Stopping standalone server...")
+                exitProcess(ExitCodes.NORMAL)
+            }
+        })
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/impl/TestCommand.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/impl/TestCommand.kt
new file mode 100644
index 00000000..e77f8ffc
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/commands/impl/TestCommand.kt
@@ -0,0 +1,25 @@
+package dev.slne.surf.cloud.standalone.commands.impl
+
+import com.mojang.brigadier.CommandDispatcher
+import com.mojang.brigadier.builder.LiteralArgumentBuilder
+import com.mojang.brigadier.tree.LiteralCommandNode
+import dev.slne.surf.cloud.api.server.command.CommandSource
+import dev.slne.surf.cloud.api.server.command.ConsoleCommand
+import dev.slne.surf.cloud.api.server.command.literal
+
+object TestCommand : ConsoleCommand {
+    fun register(dispatcher: CommandDispatcher<CommandSource>) {
+//        dispatcher.register(literal("test") {
+//            executes { context ->
+//                context.source.sendSuccess("This is a test command")
+//                1
+//            }
+//        })
+
+        dispatcher.register(LiteralArgumentBuilder.literal<CommandSource>("test")
+            .executes { context ->
+                context.source.sendSuccess("This is a test command")
+                1
+            })
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/config/StandaloneConfig.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/config/StandaloneConfig.kt
index 6cb8a488..56d30126 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/config/StandaloneConfig.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/config/StandaloneConfig.kt
@@ -1,7 +1,6 @@
 package dev.slne.surf.cloud.standalone.config
 
 import dev.slne.surf.cloud.core.common.coreCloudInstance
-import dev.slne.surf.surfapi.core.api.SurfCoreApi
 import dev.slne.surf.surfapi.core.api.config.createSpongeYmlConfig
 import dev.slne.surf.surfapi.core.api.config.surfConfigApi
 import org.spongepowered.configurate.objectmapping.ConfigSerializable
@@ -16,7 +15,26 @@ val standaloneConfig: StandaloneConfig by lazy {
 @ConfigSerializable
 data class StandaloneConfig(
 
+    @Comment("Configuration for the Ktor server.")
+    @Setting("ktor")
+    val ktor: KtorConfig = KtorConfig(),
+
     @Comment("Whether only one proxy is used by the network. If enabled the server are automatically registered to the proxy.")
-    @Setting("use-single-proxy-setup")
-    val useSingleProxySetup: Boolean = false
+    @Setting("use-single-proxy-setup2")
+    val useSingleProxySetup: Boolean = false,
+
+    @Comment("Configuration for the logging.")
+    @Setting("logging")
+    val logging: LoggingConfig = LoggingConfig(),
+)
+
+@ConfigSerializable
+data class KtorConfig(
+    val port: Int = 8080,
+    val host: String = "0.0.0.0"
+)
+
+@ConfigSerializable
+data class LoggingConfig(
+    val logPlayerConnections: Boolean = true,
 )
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/console/BrigadierCommandCompleter.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/console/BrigadierCommandCompleter.kt
new file mode 100644
index 00000000..d5670dbb
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/console/BrigadierCommandCompleter.kt
@@ -0,0 +1,104 @@
+package dev.slne.surf.cloud.standalone.console
+
+import com.mojang.brigadier.Message
+import com.mojang.brigadier.suggestion.Suggestion
+import dev.slne.surf.cloud.api.server.command.CommandCompletion
+import dev.slne.surf.cloud.standalone.commands.CommandManagerImpl
+import dev.slne.surf.surfapi.core.api.messages.ComponentMessage
+import kotlinx.coroutines.future.await
+import kotlinx.coroutines.runBlocking
+import net.kyori.adventure.text.Component
+import net.kyori.adventure.text.serializer.ansi.ANSIComponentSerializer
+import org.jline.reader.Candidate
+import org.jline.reader.Completer
+import org.jline.reader.LineReader
+import org.jline.reader.ParsedLine
+
+class BrigadierCommandCompleter(private val commandManager: CommandManagerImpl): Completer {
+    private val commandSource by lazy { commandManager.createCommandSource() }
+
+    override fun complete(
+        reader: LineReader,
+        line: ParsedLine,
+        candidates: MutableList<Candidate>
+    ) = runBlocking {
+        complete(reader, line, candidates, emptyList())
+    }
+
+    suspend fun complete(
+        reader: LineReader,
+        line: ParsedLine,
+        candidates: MutableList<Candidate>,
+        existing: List<CommandCompletion>
+    ) {
+        val dispatcher = commandManager.dispatcher
+        val results = dispatcher.parse(line.line(), commandSource)
+        addCandidates(
+            candidates,
+            dispatcher.getCompletionSuggestions(results).await().list,
+            existing,
+            ParseContext(line.line(), results.context.findSuggestionContext(line.cursor()).startPos)
+        )
+    }
+
+    private fun addCandidates(
+        candidates: MutableList<Candidate>,
+        brigSuggestion: List<Suggestion>,
+        existing: List<CommandCompletion>,
+        context: ParseContext
+    ) {
+        for (brigSuggestion in brigSuggestion) {
+            if (brigSuggestion.text.isEmpty()) continue
+            candidates.add(brigSuggestion.toCandidate(context))
+        }
+
+        for (completion in existing) {
+            if (completion.suggestion.isEmpty() || brigSuggestion.any { it.text == completion.suggestion }) continue
+            candidates.add(toCandidate(completion.suggestion, completion.tooltip))
+        }
+    }
+
+    private data class ParseContext(
+        val line: String,
+        val suggestionStart: Int,
+    )
+
+    private fun Suggestion.toCandidate(context: ParseContext): Candidate {
+        var tooltipComponent: Component? = null
+        val suggestedTooltip: Message? = tooltip
+        if (suggestedTooltip != null) {
+            tooltipComponent =
+                if (suggestedTooltip is ComponentMessage) suggestedTooltip.asComponent()
+                else Component.text(suggestedTooltip.string)
+        }
+
+
+        return toCandidate(
+            context.line.substring(context.suggestionStart, range.start) + text,
+            tooltipComponent
+        )
+    }
+
+    private fun toCandidate(suggestionText: String, tooltip: Component?): Candidate {
+        val suggestionTooltip = ANSIComponentSerializer.ansi().serializeOr(tooltip, null)
+        return CommandCompletionCandidate(
+            suggestionText,
+            suggestionText,
+            null,
+            suggestionTooltip,
+            null,
+            null,
+            false
+        )
+    }
+
+    class CommandCompletionCandidate(
+        value: String,
+        display: String,
+        group: String?,
+        descr: String?,
+        suffix: String?,
+        key: String?,
+        complete: Boolean
+    ) : Candidate(value, display, group, descr, suffix, key, complete)
+}
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/console/BrigadierCommandHighlighter.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/console/BrigadierCommandHighlighter.kt
new file mode 100644
index 00000000..17e2c760
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/console/BrigadierCommandHighlighter.kt
@@ -0,0 +1,59 @@
+package dev.slne.surf.cloud.standalone.console
+
+import com.mojang.brigadier.tree.LiteralCommandNode
+import dev.slne.surf.cloud.standalone.commands.CommandManagerImpl
+import org.jline.reader.Highlighter
+import org.jline.reader.LineReader
+import org.jline.utils.AttributedString
+import org.jline.utils.AttributedStringBuilder
+import org.jline.utils.AttributedStyle
+import java.util.regex.Pattern
+
+class BrigadierCommandHighlighter(private val commandManager: CommandManagerImpl) : Highlighter {
+    private val commandSource by lazy { commandManager.createCommandSource() }
+
+    companion object {
+        private val colors = arrayOf(
+            AttributedStyle.CYAN,
+            AttributedStyle.YELLOW,
+            AttributedStyle.GREEN,
+            AttributedStyle.MAGENTA,
+            AttributedStyle.BLUE
+        )
+    }
+
+    override fun highlight(
+        reader: LineReader?,
+        buffer: String
+    ): AttributedString? = AttributedStringBuilder().apply {
+        val results = commandManager.dispatcher.parse(buffer, commandSource)
+        var pos = 0
+        var component = 1
+
+        for (node in results.context.lastChild.nodes) {
+            if (node.range.start >= buffer.length) break
+            val start = node.range.start
+            val end = node.range.end.coerceAtMost(buffer.length)
+
+            append(buffer.substring(pos, start), AttributedStyle.DEFAULT)
+            val commandNode = node.node
+            if (commandNode is LiteralCommandNode<*>) {
+                append(buffer.substring(start, end), AttributedStyle.DEFAULT)
+            } else {
+                if (component++ >= colors.size) component = 0
+                append(
+                    buffer.substring(start, end),
+                    AttributedStyle.DEFAULT.foreground(colors[component])
+                )
+            }
+            pos = end
+        }
+
+        if (pos < buffer.length) {
+            append(buffer.substring(pos), AttributedStyle.DEFAULT.foreground(AttributedStyle.RED))
+        }
+    }.toAttributedString()
+
+    override fun setErrorPattern(errorPattern: Pattern?) = Unit
+    override fun setErrorIndex(errorIndex: Int) = Unit
+}
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/console/BrigadierCompletionMatcher.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/console/BrigadierCompletionMatcher.kt
new file mode 100644
index 00000000..66d90fa5
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/console/BrigadierCompletionMatcher.kt
@@ -0,0 +1,32 @@
+package dev.slne.surf.cloud.standalone.console
+
+import dev.slne.surf.cloud.api.common.util.mutableObject2ObjectMapOf
+import dev.slne.surf.cloud.api.common.util.toObjectList
+import it.unimi.dsi.fastutil.objects.ObjectList
+import org.jline.reader.Candidate
+import org.jline.reader.CompletingParsedLine
+import org.jline.reader.LineReader
+import org.jline.reader.impl.CompletionMatcherImpl
+
+class BrigadierCompletionMatcher : CompletionMatcherImpl() {
+    override fun defaultMatchers(
+        options: Map<LineReader.Option?, Boolean?>?,
+        prefix: Boolean,
+        line: CompletingParsedLine?,
+        caseInsensitive: Boolean,
+        errors: Int,
+        originalGroupName: String?
+    ) {
+        super.defaultMatchers(options, prefix, line, caseInsensitive, errors, originalGroupName)
+        matchers.addFirst { inputMap ->
+            val candidates = mutableObject2ObjectMapOf<String, ObjectList<Candidate>>()
+
+            inputMap.forEach { (key, value) ->
+                if (value.all { it is BrigadierCommandCompleter.CommandCompletionCandidate }) {
+                    candidates[key] = value.toObjectList()
+                }
+            }
+            candidates
+        }
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/console/BrigadierConsoleParser.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/console/BrigadierConsoleParser.kt
new file mode 100644
index 00000000..12261bfa
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/console/BrigadierConsoleParser.kt
@@ -0,0 +1,96 @@
+package dev.slne.surf.cloud.standalone.console
+
+import com.mojang.brigadier.StringReader
+import com.mojang.brigadier.context.CommandContextBuilder
+import dev.slne.surf.cloud.api.common.util.mutableObjectListOf
+import dev.slne.surf.cloud.api.server.command.CommandSource
+import dev.slne.surf.cloud.api.server.command.util.contains
+import dev.slne.surf.cloud.standalone.commands.CommandManagerImpl
+import org.jline.reader.ParsedLine
+import org.jline.reader.Parser
+
+class BrigadierConsoleParser(private val commandManager: CommandManagerImpl) : Parser {
+
+    override fun parse(
+        line: String?,
+        cursor: Int,
+        context: Parser.ParseContext?
+    ): ParsedLine? {
+        val results = commandManager.dispatcher.parse(
+            StringReader(line),
+            commandManager.createCommandSource()
+        )
+        val reader = results.reader
+        val words = mutableObjectListOf<String>()
+        var currentContext: CommandContextBuilder<CommandSource>? = results.context
+        var currentWordIdx = -1
+        var wordIdx = -1
+        var inWordCursor = -1
+
+        if (currentContext!!.range.length > 0) {
+            while (currentContext != null) {
+                for (node in currentContext.nodes) {
+                    val nodeRange = node.range
+                    val current = nodeRange.get(reader)
+                    words.add(current)
+                    currentWordIdx++
+
+                    if (wordIdx == -1 && cursor in nodeRange) {
+                        wordIdx = currentWordIdx
+                        inWordCursor = cursor - nodeRange.start
+                    }
+                }
+                currentContext = currentContext.child
+            }
+        }
+
+        val leftovers = reader.remaining
+        if (leftovers.isNotEmpty() && leftovers.isBlank()) {
+            currentWordIdx++
+            words.add("")
+            if (wordIdx == -1) {
+                wordIdx = currentWordIdx
+                inWordCursor = 0
+            }
+        } else if (leftovers.isNotEmpty()) {
+            currentWordIdx++
+            words.add(leftovers)
+            if (wordIdx == -1) {
+                wordIdx = currentWordIdx
+                inWordCursor = cursor - reader.cursor
+            }
+        }
+
+        if (wordIdx == -1) {
+            currentWordIdx++
+            words.add("")
+            wordIdx = currentWordIdx
+            inWordCursor = 0
+        }
+
+        return BrigadierParsedLine(
+            words[wordIdx],
+            inWordCursor,
+            wordIdx,
+            words,
+            line,
+            cursor
+        )
+    }
+
+    data class BrigadierParsedLine(
+        val word: String,
+        val wordCursor: Int,
+        val wordIndex: Int,
+        val words: List<String>,
+        val line: String?,
+        val cursor: Int
+    ) : ParsedLine {
+        override fun word() = word
+        override fun wordCursor() = wordCursor
+        override fun wordIndex() = wordIndex
+        override fun words() = words
+        override fun line() = line
+        override fun cursor() = cursor
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/console/StandaloneConsole.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/console/StandaloneConsole.kt
new file mode 100644
index 00000000..cc304585
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/console/StandaloneConsole.kt
@@ -0,0 +1,65 @@
+package dev.slne.surf.cloud.standalone.console
+
+import dev.slne.surf.cloud.api.common.exceptions.ExitCodes
+import dev.slne.surf.cloud.core.common.coroutines.ConsoleCommandInputScope
+import dev.slne.surf.cloud.standalone.commands.CommandManagerImpl
+import dev.slne.surf.surfapi.core.api.util.logger
+import jakarta.annotation.PostConstruct
+import kotlinx.coroutines.launch
+import net.minecrell.terminalconsole.SimpleTerminalConsole
+import org.jline.reader.LineReader
+import org.jline.reader.LineReaderBuilder
+import org.springframework.context.event.ContextClosedEvent
+import org.springframework.context.event.EventListener
+import org.springframework.stereotype.Component
+import kotlin.io.path.Path
+import kotlin.system.exitProcess
+
+@Component
+class StandaloneConsole(private val commandManager: CommandManagerImpl) :
+    SimpleTerminalConsole() {
+    @Volatile
+    private var running = true
+
+    override fun buildReader(builder: LineReaderBuilder): LineReader? = builder.run {
+        appName("SurfCloud")
+        variable(LineReader.HISTORY_FILE, Path(".console_history"))
+        completer(BrigadierCommandCompleter(commandManager))
+        option(LineReader.Option.COMPLETE_IN_WORD, true)
+        highlighter(BrigadierCommandHighlighter(commandManager))
+
+        System.setProperty("org.jline.reader.support.parsedline", "true")
+        parser(BrigadierConsoleParser(commandManager))
+        completionMatcher(BrigadierCompletionMatcher())
+
+        super.buildReader(builder)
+    }
+
+
+    override fun isRunning(): Boolean {
+        return running
+    }
+
+    override fun runCommand(command: String) {
+        commandManager.handleConsoleInput(command, commandManager.createCommandSource())
+    }
+
+    override fun shutdown() {
+        exitProcess(ExitCodes.NORMAL)
+    }
+
+    @Suppress("ProtectedInFinal") // IJ being dumb
+    @EventListener(ContextClosedEvent::class)
+    protected fun onContextClose() {
+        running = false
+        logger().atInfo().log("Shutting down console")
+    }
+
+    @Suppress("ProtectedInFinal") // IJ being dumb
+    @PostConstruct
+    protected fun init() {
+        ConsoleCommandInputScope.launch {
+            start()
+        }
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/ktor/KtorServer.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/ktor/KtorServer.kt
new file mode 100644
index 00000000..f0873c32
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/ktor/KtorServer.kt
@@ -0,0 +1,149 @@
+package dev.slne.surf.cloud.standalone.ktor
+
+import dev.slne.surf.cloud.api.server.plugin.KtorPlugin
+import dev.slne.surf.cloud.api.server.plugin.PluginManager
+import dev.slne.surf.cloud.core.common.coroutines.KtorScope
+import dev.slne.surf.cloud.standalone.config.standaloneConfig
+import io.ktor.http.*
+import io.ktor.server.application.*
+import io.ktor.server.engine.*
+import io.ktor.server.html.*
+import io.ktor.server.netty.*
+import io.ktor.server.plugins.*
+import io.ktor.server.plugins.statuspages.*
+import io.ktor.server.response.*
+import io.ktor.server.routing.*
+import io.ktor.server.websocket.*
+import io.ktor.websocket.*
+import kotlinx.coroutines.channels.consumeEach
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.launch
+import kotlinx.html.*
+import kotlin.time.Duration.Companion.seconds
+
+
+object KtorServer {
+    fun start() = KtorScope.launch {
+        val (port, host) = standaloneConfig.ktor
+        val plugins = PluginManager.instance.getPlugins().filterIsInstance<KtorPlugin>()
+
+        embeddedServer(Netty, port = port, host = host) {
+            install(StatusPages) { configure() }
+            install(WebSockets) {
+                pingPeriod = 15.seconds
+            }
+
+            for (plugin in plugins) {
+                plugin.apply { configure() }
+            }
+
+            routing {
+                for (plugin in plugins) {
+                    plugin.apply { installRoutes() }
+                }
+            }
+        }.start(wait = true)
+    }
+
+    private fun StatusPagesConfig.configure() {
+        status(HttpStatusCode.NotFound) { call, _ ->
+            call.respondErrorPage(
+                HttpStatusCode.NotFound,
+                "Oops! The page you requested was not found."
+            )
+        }
+
+        exception<IllegalStateException> { call, cause ->
+            call.respondErrorPage(
+                HttpStatusCode.InternalServerError,
+                "Application is in an illegal state: ${cause.message}"
+            )
+        }
+
+        exception<IllegalArgumentException> { call, cause ->
+            call.respondErrorPage(
+                HttpStatusCode.BadRequest,
+                "Bad Request: ${cause.message ?: "Unknown error"}"
+            )
+        }
+
+        exception<NotFoundException> { call, cause ->
+            call.respondErrorPage(
+                HttpStatusCode.NotFound,
+                "Not Found: ${cause.message ?: "The requested resource was not found"}"
+            )
+        }
+
+        exception<BadRequestException> { call, cause ->
+            call.respondErrorPage(HttpStatusCode.BadRequest, "Bad Request: ${cause.message}")
+        }
+
+        exception<MissingRequestParameterException> { call, cause ->
+            call.respondErrorPage(
+                HttpStatusCode.BadRequest,
+                "Missing Parameter: '${cause.parameterName}' is required."
+            )
+        }
+
+        exception<ParameterConversionException> { call, cause ->
+            call.respondErrorPage(
+                HttpStatusCode.BadRequest,
+                "Invalid Parameter: '${cause.parameterName}' must be a valid ${cause.type}."
+            )
+        }
+
+        exception<UnsupportedMediaTypeException> { call, cause ->
+            call.respondErrorPage(
+                HttpStatusCode.UnsupportedMediaType,
+                "Unsupported Media Type: ${cause.message}"
+            )
+        }
+
+        exception<PayloadTooLargeException> { call, cause ->
+            call.respondErrorPage(
+                HttpStatusCode.PayloadTooLarge,
+                "Payload Too Large: Request exceeds the size limit."
+            )
+        }
+
+        exception<ContentTransformationException> { call, cause ->
+            call.respondErrorPage(
+                HttpStatusCode.UnsupportedMediaType,
+                "Content Transformation Error: ${cause.message}"
+            )
+        }
+
+        exception<Throwable> { call, cause ->
+            call.respondErrorPage(
+                HttpStatusCode.InternalServerError,
+                "Unexpected error: ${cause.message}"
+            )
+        }
+    }
+
+    private suspend fun ApplicationCall.respondErrorPage(status: HttpStatusCode, message: String) {
+        respondHtml(status) {
+            head {
+                title { +"Error ${status.value}" }
+                style {
+                    //language=CSS
+                    unsafe {
+                        +"body { font-family: Arial, sans-serif; text-align: center; padding: 50px; background-color: #f4f4f4; }"
+                        +"h1 { color: #d9534f; }"
+                        +"p { color: #333; font-size: 18px; }"
+                        +".container { max-width: 600px; margin: auto; background: white; padding: 20px; border-radius: 10px; box-shadow: 0 0 10px rgba(0,0,0,0.1); }"
+                        +".btn { display: inline-block; margin-top: 20px; padding: 10px 20px; background: #0275d8; color: white; text-decoration: none; border-radius: 5px; }"
+                    }
+                }
+            }
+            body {
+                div("container") {
+                    h1 { +"Error ${status.value}" }
+                    p { +message }
+                    a(classes = "btn", href = "https://server.castcrafter.de") { +"Go Home" }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/NettyServerImpl.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/NettyServerImpl.kt
index c5e64e5f..7309ab2c 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/NettyServerImpl.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/NettyServerImpl.kt
@@ -1,28 +1,23 @@
 package dev.slne.surf.cloud.standalone.netty.server
 
-import dev.slne.surf.cloud.api.common.util.logger
 import dev.slne.surf.cloud.api.common.util.mutableObjectListOf
 import dev.slne.surf.cloud.api.common.util.synchronize
 import dev.slne.surf.cloud.core.common.config.cloudConfig
 import dev.slne.surf.cloud.core.common.coroutines.ConnectionTickScope
 import dev.slne.surf.cloud.core.common.util.encryption.Crypt
-import dev.slne.surf.cloud.standalone.config.standaloneConfig
 import dev.slne.surf.cloud.standalone.netty.server.connection.ServerConnectionListener
 import dev.slne.surf.cloud.standalone.netty.server.network.ServerEncryptionManager
 import dev.slne.surf.cloud.standalone.server.StandaloneCloudServerImpl
 import dev.slne.surf.cloud.standalone.server.StandaloneProxyCloudServerImpl
 import dev.slne.surf.cloud.standalone.server.serverManagerImpl
+import dev.slne.surf.surfapi.core.api.util.logger
 import io.netty.channel.epoll.Epoll
 import io.netty.channel.unix.DomainSocketAddress
 import jakarta.annotation.PostConstruct
 import jakarta.annotation.PreDestroy
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.*
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.withContext
 import org.springframework.context.annotation.Profile
 import org.springframework.stereotype.Component
 import java.net.InetAddress
@@ -32,7 +27,7 @@ import java.security.KeyPair
 import kotlin.time.Duration.Companion.seconds
 
 @Component
-@Profile("independent")
+@Profile("server")
 class NettyServerImpl {
     val log = logger()
 
@@ -46,24 +41,31 @@ class NettyServerImpl {
 
     lateinit var keyPair: KeyPair
 
+    @Volatile
+    private var running = false
+
     @PostConstruct
-    protected fun init() {
-        runBlocking {
-            ServerEncryptionManager
-
-            initServer()
-            finalizeServer()
-
-            ConnectionTickScope.launch {
-                while (true) {
-                    delay(1.seconds)
-                    tick()
-                }
+    protected fun init(): Unit = runBlocking {
+        ServerEncryptionManager
+
+        initServer()
+        finalizeServer()
+
+        ConnectionTickScope.launch {
+            while (isActive && running) {
+                delay(1.seconds)
+                tick()
             }
         }
     }
 
+    @PreDestroy
+    protected fun destroy(): Unit = runBlocking {
+        stopServer()
+    }
+
     suspend fun initServer(): Boolean = withContext(Dispatchers.IO) {
+
         val config = cloudConfig.connectionConfig.nettyConfig
         localIp = config.host
 
@@ -72,7 +74,8 @@ class NettyServerImpl {
         if (localIp.startsWith("unix:")) {
             if (!Epoll.isAvailable()) {
                 log.atSevere().log("**** INVALID CONFIGURATION! ****")
-                log.atSevere().log("You are trying to use a Unix domain socket but you're not on a supported OS.")
+                log.atSevere()
+                    .log("You are trying to use a Unix domain socket but you're not on a supported OS.")
                 return@withContext false
             }
             bindAddress = DomainSocketAddress(localIp.substring(5))
@@ -105,6 +108,7 @@ class NettyServerImpl {
 
     suspend fun finalizeServer() {
         initKeyPair()
+        running = true
         connection.acceptConnections()
     }
 
@@ -113,18 +117,14 @@ class NettyServerImpl {
         keyPair = Crypt.generateKeyPair()
     }
 
-    @PreDestroy
-    protected fun stop() {
-        runBlocking { stopServer() }
-    }
 
     suspend fun stopServer() {
         connection.stop()
+        running = false
     }
 
 
-//    @Scheduled(fixedRate = 1, timeUnit = TimeUnit.SECONDS)
-    suspend fun tick() {
+    private suspend fun tick() {
         connection.connections.forEach { it.tick() }
         connection.tick()
         schedules.removeAll { function ->
@@ -152,9 +152,19 @@ class NettyServerImpl {
         log.atInfo().log("Registered client ${client.displayName}")
 
         val server = if (proxy) {
-            StandaloneProxyCloudServerImpl(client.serverId, client.serverCategory, client.serverName, client.connection)
+            StandaloneProxyCloudServerImpl(
+                client.serverId,
+                client.serverCategory,
+                client.serverName,
+                client.connection
+            )
         } else {
-            StandaloneCloudServerImpl(client.serverId, client.serverCategory, client.serverName, client.connection)
+            StandaloneCloudServerImpl(
+                client.serverId,
+                client.serverCategory,
+                client.serverName,
+                client.connection
+            )
         }
 
         serverManagerImpl.registerServer(server)
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/connection/ServerConnectionListener.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/connection/ServerConnectionListener.kt
index 60ab10e4..e91a6cc4 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/connection/ServerConnectionListener.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/connection/ServerConnectionListener.kt
@@ -3,6 +3,7 @@ package dev.slne.surf.cloud.standalone.netty.server.connection
 import dev.slne.surf.cloud.api.common.netty.network.protocol.PacketFlow
 import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
 import dev.slne.surf.cloud.api.common.util.*
+import dev.slne.surf.cloud.api.common.util.netty.suspend
 import dev.slne.surf.cloud.core.common.config.cloudConfig
 import dev.slne.surf.cloud.core.common.coroutines.ConnectionManagementScope
 import dev.slne.surf.cloud.core.common.netty.network.ConnectionImpl
@@ -13,6 +14,7 @@ import dev.slne.surf.cloud.core.common.netty.network.protocol.running.Clientboun
 import dev.slne.surf.cloud.standalone.netty.server.NettyServerImpl
 import dev.slne.surf.cloud.standalone.netty.server.network.ServerEncryptionManager
 import dev.slne.surf.cloud.standalone.netty.server.network.ServerHandshakePacketListenerImpl
+import dev.slne.surf.surfapi.core.api.util.logger
 import io.netty.bootstrap.ServerBootstrap
 import io.netty.channel.*
 import io.netty.channel.epoll.Epoll
@@ -29,6 +31,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
+import org.jetbrains.annotations.Blocking
 import java.net.InetAddress
 import java.net.InetSocketAddress
 import java.net.SocketAddress
@@ -126,13 +129,14 @@ class ServerConnectionListener(val server: NettyServerImpl) {
         }
     }
 
+    @Blocking
     suspend fun stop() {
         this.running = false
 
         channelsMutex.withLock {
             for (future in channels) {
                 try {
-                    future.channel().close().suspend()
+                    future.channel().close().sync()
                 } catch (e: InterruptedException) {
                     log.atSevere().withCause(e).log("Interrupted whilst closing channel")
                 }
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerCommonPacketListenerImpl.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerCommonPacketListenerImpl.kt
index 2b02c3f9..f0e9f22d 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerCommonPacketListenerImpl.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerCommonPacketListenerImpl.kt
@@ -1,22 +1,17 @@
 package dev.slne.surf.cloud.standalone.netty.server.network
 
 import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
-import dev.slne.surf.cloud.api.common.util.logger
 import dev.slne.surf.cloud.core.common.coroutines.ConnectionManagementScope
 import dev.slne.surf.cloud.core.common.netty.network.CommonTickablePacketListener
 import dev.slne.surf.cloud.core.common.netty.network.ConnectionImpl
 import dev.slne.surf.cloud.core.common.netty.network.DisconnectionDetails
-import dev.slne.surf.cloud.core.common.netty.network.protocol.common.ClientboundKeepAlivePacket
+import dev.slne.surf.cloud.core.common.netty.network.protocol.common.*
 import dev.slne.surf.cloud.core.common.netty.network.protocol.common.ServerCommonPacketListener
-import dev.slne.surf.cloud.core.common.netty.network.protocol.common.ServerboundKeepAlivePacket
-import dev.slne.surf.cloud.core.common.netty.network.protocol.common.ServerboundPingRequestPacket
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ClientboundDisconnectPacket
-import dev.slne.surf.cloud.core.common.netty.network.protocol.common.ClientboundPongResponsePacket
-import dev.slne.surf.cloud.core.common.netty.network.protocol.common.ClientboundBundlePacket
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ServerboundBroadcastPacket
-import dev.slne.surf.cloud.core.common.netty.network.protocol.common.ServerboundBundlePacket
 import dev.slne.surf.cloud.standalone.netty.server.NettyServerImpl
 import dev.slne.surf.cloud.standalone.netty.server.ServerClientImpl
+import dev.slne.surf.surfapi.core.api.util.logger
 import kotlinx.coroutines.launch
 import javax.annotation.OverridingMethodsMustInvokeSuper
 import kotlin.time.Duration
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerEncryptionManager.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerEncryptionManager.kt
index 79ee0f58..77b7940f 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerEncryptionManager.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerEncryptionManager.kt
@@ -1,8 +1,8 @@
 package dev.slne.surf.cloud.standalone.netty.server.network
 
-import dev.slne.surf.cloud.api.common.util.logger
 import dev.slne.surf.cloud.core.common.netty.network.EncryptionManager
 import dev.slne.surf.cloud.core.common.netty.network.HandlerNames
+import dev.slne.surf.surfapi.core.api.util.logger
 import io.netty.channel.Channel
 import io.netty.handler.ssl.ClientAuth
 import io.netty.handler.ssl.SslContext
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerHandshakePacketListenerImpl.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerHandshakePacketListenerImpl.kt
index 0f0f9382..d639ea7b 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerHandshakePacketListenerImpl.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerHandshakePacketListenerImpl.kt
@@ -20,7 +20,7 @@ class ServerHandshakePacketListenerImpl(val server: NettyServerImpl, val connect
         when (packet.intention) {
             ClientIntent.INITIALIZE -> initialize(packet)
             ClientIntent.LOGIN -> beginLogin(packet)
-            ClientIntent.STATUS -> TODO("Not yet implemented")
+            ClientIntent.STATUS -> error("Status intention is not supported")
         }
 
         connection.virtualHost = prepareVirtualHost(packet.hostName, packet.port)
@@ -53,6 +53,9 @@ class ServerHandshakePacketListenerImpl(val server: NettyServerImpl, val connect
     }
 
     override suspend fun onDisconnect(details: DisconnectionDetails) = Unit
+    override fun isAcceptingMessages(): Boolean {
+        return connection.connected
+    }
 
     private fun prepareVirtualHost(host: String, port: Int): InetSocketAddress {
         var len = host.length
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerInitializePacketListenerImpl.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerInitializePacketListenerImpl.kt
index ea6b223f..84ed8fe5 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerInitializePacketListenerImpl.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerInitializePacketListenerImpl.kt
@@ -19,4 +19,8 @@ class ServerInitializePacketListenerImpl(val connection: ConnectionImpl) :
     override suspend fun onDisconnect(details: DisconnectionDetails) {
         // Do nothing
     }
+
+    override fun isAcceptingMessages(): Boolean {
+        return connection.connected
+    }
 }
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerLoginPacketListenerImpl.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerLoginPacketListenerImpl.kt
index 48e6490e..80643d6e 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerLoginPacketListenerImpl.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerLoginPacketListenerImpl.kt
@@ -1,6 +1,5 @@
 package dev.slne.surf.cloud.standalone.netty.server.network
 
-import dev.slne.surf.cloud.api.common.util.logger
 import dev.slne.surf.cloud.core.common.netty.network.CommonTickablePacketListener
 import dev.slne.surf.cloud.core.common.netty.network.ConnectionImpl
 import dev.slne.surf.cloud.core.common.netty.network.DisconnectionDetails
@@ -10,6 +9,7 @@ import dev.slne.surf.cloud.standalone.config.standaloneConfig
 import dev.slne.surf.cloud.standalone.netty.server.NettyServerImpl
 import dev.slne.surf.cloud.standalone.netty.server.ProxyServerAutoregistration
 import dev.slne.surf.cloud.standalone.netty.server.ServerClientImpl
+import dev.slne.surf.surfapi.core.api.util.logger
 
 private const val MAX_LOGIN_TIME = 30
 
@@ -80,6 +80,10 @@ class ServerLoginPacketListenerImpl(val server: NettyServerImpl, val connection:
         log.atInfo().log("${client?.displayName} lost connection: ${details.reason}")
     }
 
+    override fun isAcceptingMessages(): Boolean {
+        return connection.connected
+    }
+
     fun disconnect(reason: String) {
         disconnect(DisconnectionDetails(reason))
     }
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerPreRunningPacketListenerImpl.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerPreRunningPacketListenerImpl.kt
index 316be19d..db3ce6f5 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerPreRunningPacketListenerImpl.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerPreRunningPacketListenerImpl.kt
@@ -1,13 +1,7 @@
 package dev.slne.surf.cloud.standalone.netty.server.network
 
 import dev.slne.surf.cloud.core.common.netty.network.ConnectionImpl
-import dev.slne.surf.cloud.core.common.netty.network.DisconnectionDetails
-import dev.slne.surf.cloud.core.common.netty.network.protocol.prerunning.ClientboundPreRunningFinishedPacket
-import dev.slne.surf.cloud.core.common.netty.network.protocol.prerunning.ClientboundReadyToRunPacket
-import dev.slne.surf.cloud.core.common.netty.network.protocol.prerunning.ServerPreRunningPacketListener
-import dev.slne.surf.cloud.core.common.netty.network.protocol.prerunning.ServerboundPreRunningAcknowledgedPacket
-import dev.slne.surf.cloud.core.common.netty.network.protocol.prerunning.ServerboundReadyToRunPacket
-import dev.slne.surf.cloud.core.common.netty.network.protocol.prerunning.ServerboundRequestContinuation
+import dev.slne.surf.cloud.core.common.netty.network.protocol.prerunning.*
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.RunningProtocols
 import dev.slne.surf.cloud.standalone.netty.server.NettyServerImpl
 import dev.slne.surf.cloud.standalone.netty.server.ServerClientImpl
@@ -58,6 +52,10 @@ class ServerPreRunningPacketListenerImpl(
         server.registerClient(client, proxy)
     }
 
+    override fun isAcceptingMessages(): Boolean {
+        return connection.connected
+    }
+
     private enum class State {
         PRE_RUNNING,
         FINISHING_PRE_RUNNING,
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerRunningPacketListenerImpl.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerRunningPacketListenerImpl.kt
index 85055b4c..94af503e 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerRunningPacketListenerImpl.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerRunningPacketListenerImpl.kt
@@ -1,15 +1,15 @@
 package dev.slne.surf.cloud.standalone.netty.server.network
 
+import dev.slne.surf.cloud.api.common.netty.network.protocol.respond
 import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
+import dev.slne.surf.cloud.api.common.netty.packet.NettyPacketInfo
 import dev.slne.surf.cloud.api.common.player.ConnectionResultEnum
 import dev.slne.surf.cloud.api.common.server.CloudServer
-import dev.slne.surf.cloud.api.common.server.serverManager
-import dev.slne.surf.cloud.api.common.util.logger
+import dev.slne.surf.cloud.api.common.server.CloudServerManager
 import dev.slne.surf.cloud.api.common.util.mutableIntSetOf
 import dev.slne.surf.cloud.core.common.coroutines.PacketHandlerScope
 import dev.slne.surf.cloud.core.common.netty.network.ConnectionImpl
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.*
-import dev.slne.surf.cloud.core.common.netty.protocol.packet.NettyPacketInfo
 import dev.slne.surf.cloud.core.common.netty.registry.listener.NettyListenerRegistry
 import dev.slne.surf.cloud.core.common.player.playerManagerImpl
 import dev.slne.surf.cloud.core.common.util.random
@@ -19,12 +19,12 @@ import dev.slne.surf.cloud.standalone.player.StandaloneCloudPlayerImpl
 import dev.slne.surf.cloud.standalone.server.StandaloneCloudServerImpl
 import dev.slne.surf.cloud.standalone.server.StandaloneProxyCloudServerImpl
 import dev.slne.surf.cloud.standalone.server.serverManagerImpl
+import dev.slne.surf.surfapi.core.api.util.logger
 import kotlinx.coroutines.launch
 import net.kyori.adventure.text.Component
 import net.kyori.adventure.title.Title
 import net.kyori.adventure.title.TitlePart
 import java.util.*
-import java.util.concurrent.TimeUnit
 import kotlin.contracts.ExperimentalContracts
 import kotlin.contracts.InvocationKind
 import kotlin.contracts.contract
@@ -38,7 +38,13 @@ class ServerRunningPacketListenerImpl(
     private val log = logger()
 
     override suspend fun handlePlayerConnectToServer(packet: PlayerConnectToServerPacket) {
-        playerManagerImpl.updateOrCreatePlayer(packet.uuid, packet.serverUid, packet.proxy)
+        playerManagerImpl.updateOrCreatePlayer(
+            packet.uuid,
+            packet.name,
+            packet.proxy,
+            packet.playerIp,
+            packet.serverUid
+        )
         broadcast(packet)
         serverManagerImpl.getCommonStandaloneServerByUid(packet.serverUid)
             ?.handlePlayerConnect(packet.uuid)
@@ -163,6 +169,11 @@ class ServerRunningPacketListenerImpl(
         }
     }
 
+    override suspend fun handleRequestOfflinePlayerDisplayName(packet: RequestOfflineDisplayNamePacket) {
+        val name = serverManagerImpl.requestOfflineDisplayName(packet.uuid)
+        packet.respond(name)
+    }
+
     override suspend fun handleClientInformation(packet: ServerboundClientInformationPacket) {
         val server = serverManagerImpl.retrieveServerById(packet.serverId) ?: return
 
@@ -213,7 +224,7 @@ class ServerRunningPacketListenerImpl(
 
     override suspend fun handleConnectPlayerToServer(packet: ServerboundConnectPlayerToServerPacket) {
         withPlayer(packet.uuid) {
-            val server = serverManager.retrieveServerById(packet.serverId)
+            val server = CloudServerManager.retrieveServerById(packet.serverId)
 
             if (server == null) {
                 packet.respond(ClientboundConnectPlayerToServerResponse(ConnectionResultEnum.SERVER_NOT_FOUND to null))
@@ -251,28 +262,40 @@ class ServerRunningPacketListenerImpl(
         }
     }
 
+    override suspend fun handleShutdownServer(packet: ServerboundShutdownServerPacket) {
+        val server = CloudServerManager.retrieveServerById(packet.serverId) ?: return
+        server.shutdown()
+    }
+
+    override suspend fun handleRequestPlayerData(packet: ServerboundRequestPlayerDataPacket) {
+        packet.respond(
+            ServerboundRequestPlayerDataResponse(
+                packet.type.readData(
+                    playerManagerImpl.getOfflinePlayer(
+                        packet.uuid
+                    )
+                )
+            )
+        )
+    }
+
     override fun handlePacket(packet: NettyPacket) {
         val listeners = NettyListenerRegistry.getListeners(packet.javaClass) ?: return
         if (listeners.isEmpty()) return
 
-        val (proxiedSource, finalPacket) = when (packet) {
-//            is ProxiedNettyPacket -> packet.source to packet.packet
-            else -> null to packet
-        }
-        val info = NettyPacketInfo(this, proxiedSource)
+        val info = NettyPacketInfo(connection)
 
         for (listener in listeners) {
             PacketHandlerScope.launch {
                 try {
-                    listener.handle(finalPacket, info)
-                } catch (e: Exception) {
+                    listener.handle(packet, info)
+                } catch (e: Throwable) {
                     log.atWarning()
                         .withCause(e)
-                        .atMostEvery(5, TimeUnit.SECONDS)
                         .log(
                             "Failed to call listener %s for packet %s",
                             listener::class.simpleName,
-                            finalPacket::class.simpleName
+                            packet::class.simpleName
                         )
                 }
             }
@@ -288,5 +311,9 @@ class ServerRunningPacketListenerImpl(
         val player = playerManagerImpl.getPlayer(uuid) as? StandaloneCloudPlayerImpl ?: return
         player.block()
     }
+
+    override fun isAcceptingMessages(): Boolean {
+        return connection.connected
+    }
 }
 
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/persistent/PlayerDataStorage.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/persistent/PlayerDataStorage.kt
index 332d41d7..8090efa8 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/persistent/PlayerDataStorage.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/persistent/PlayerDataStorage.kt
@@ -1,9 +1,9 @@
 package dev.slne.surf.cloud.standalone.persistent
 
-import dev.slne.surf.cloud.api.common.util.logger
 import dev.slne.surf.cloud.api.common.util.nbt.FastNbtIo
 import dev.slne.surf.cloud.api.common.util.safeReplaceFile
 import dev.slne.surf.cloud.standalone.player.StandaloneCloudPlayerImpl
+import dev.slne.surf.surfapi.core.api.util.logger
 import net.querz.nbt.tag.CompoundTag
 import java.nio.file.Files
 import java.nio.file.StandardCopyOption
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/OfflineCloudPlayerImpl.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/OfflineCloudPlayerImpl.kt
new file mode 100644
index 00000000..1b06d6d9
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/OfflineCloudPlayerImpl.kt
@@ -0,0 +1,63 @@
+package dev.slne.surf.cloud.standalone.player
+
+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.player.name.NameHistory
+import dev.slne.surf.cloud.api.common.server.CloudServer
+import dev.slne.surf.cloud.core.common.player.CommonOfflineCloudPlayerImpl
+import dev.slne.surf.cloud.core.common.util.bean
+import dev.slne.surf.cloud.standalone.player.db.exposed.CloudPlayerService
+import dev.slne.surf.cloud.standalone.server.serverManagerImpl
+import dev.slne.surf.surfapi.core.api.service.PlayerLookupService
+import net.kyori.adventure.text.Component
+import java.net.Inet4Address
+import java.time.ZonedDateTime
+import java.util.*
+
+class OfflineCloudPlayerImpl(uuid: UUID) : CommonOfflineCloudPlayerImpl(uuid) {
+    companion object {
+        private val service by lazy { bean<CloudPlayerService>() }
+    }
+
+    override suspend fun nameHistory(): NameHistory {
+        val player = player
+        if (player != null) {
+            return player.nameHistory()
+        }
+
+        return service.findNameHistories(uuid)
+    }
+
+    override suspend fun lastServerRaw(): String? =
+        player?.lastServerRaw() ?: service.findLastServer(uuid)
+
+    override suspend fun lastServer(): CloudServer? = player?.lastServer()
+        ?: lastServerRaw()?.let { serverManagerImpl.retrieveServerByName(it) } as? CloudServer
+
+    override suspend fun lastSeen(): ZonedDateTime? =
+        player?.lastSeen() ?: service.findLastSeen(uuid)
+
+    override suspend fun latestIpAddress(): Inet4Address? =
+        player?.latestIpAddress() ?: service.findLastIpAddress(uuid)
+
+    override suspend fun displayName(): Component? {
+        return player?.displayName() ?: serverManagerImpl.requestOfflineDisplayName(uuid)
+    }
+
+    override suspend fun name(): String? {
+        return player?.name() ?: PlayerLookupService.getUsername(uuid)
+    }
+
+    override val player: CloudPlayer? get() = CloudPlayerManager.getPlayer(uuid)
+
+    override suspend fun <R> getLuckpermsMetaData(
+        key: String,
+        transformer: (String) -> R
+    ): R? {
+        TODO("Not yet implemented")
+    }
+
+    override suspend fun getLuckpermsMetaData(key: String): String? {
+        TODO("Not yet implemented")
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/PlayerConnectionLogger.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/PlayerConnectionLogger.kt
new file mode 100644
index 00000000..6f9ea63c
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/PlayerConnectionLogger.kt
@@ -0,0 +1,22 @@
+package dev.slne.surf.cloud.standalone.player
+
+import dev.slne.surf.cloud.api.common.event.player.connection.CloudPlayerConnectToNetworkEvent
+import dev.slne.surf.cloud.standalone.config.standaloneConfig
+import dev.slne.surf.surfapi.core.api.util.logger
+import org.springframework.context.event.EventListener
+import org.springframework.stereotype.Component
+
+@Component
+class PlayerConnectionLogger {
+
+    private val log = logger()
+
+    @EventListener
+    fun onCloudPlayerConnectToNetwork(event: CloudPlayerConnectToNetworkEvent) {
+        if (!standaloneConfig.logging.logPlayerConnections) return
+        val player = event.player as StandaloneCloudPlayerImpl
+
+        log.atInfo()
+            .log("Player ${player.name} (${player.uuid}) connected to the network")
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/StandaloneCloudPlayerImpl.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/StandaloneCloudPlayerImpl.kt
index 538f43fa..2a31334d 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/StandaloneCloudPlayerImpl.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/StandaloneCloudPlayerImpl.kt
@@ -3,18 +3,22 @@ package dev.slne.surf.cloud.standalone.player
 import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
 import dev.slne.surf.cloud.api.common.player.ConnectionResult
 import dev.slne.surf.cloud.api.common.player.ConnectionResultEnum
+import dev.slne.surf.cloud.api.common.player.name.NameHistory
 import dev.slne.surf.cloud.api.common.player.ppdc.PersistentPlayerDataContainer
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportCause
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportFlag
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportLocation
 import dev.slne.surf.cloud.api.common.server.CloudServer
-import dev.slne.surf.cloud.api.common.util.position.FineLocation
-import dev.slne.surf.cloud.api.common.util.position.FineTeleportCause
-import dev.slne.surf.cloud.api.common.util.position.FineTeleportFlag
 import dev.slne.surf.cloud.api.server.server.ServerCommonCloudServer
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.*
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ServerboundTransferPlayerPacketResponse.Status
 import dev.slne.surf.cloud.core.common.player.CommonCloudPlayerImpl
 import dev.slne.surf.cloud.core.common.player.ppdc.PersistentPlayerDataContainerImpl
+import dev.slne.surf.cloud.core.common.util.bean
+import dev.slne.surf.cloud.standalone.player.db.exposed.CloudPlayerService
 import dev.slne.surf.cloud.standalone.server.StandaloneCloudServerImpl
 import dev.slne.surf.cloud.standalone.server.StandaloneProxyCloudServerImpl
+import dev.slne.surf.surfapi.core.api.util.logger
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -22,6 +26,7 @@ import net.kyori.adventure.audience.MessageType
 import net.kyori.adventure.bossbar.BossBar
 import net.kyori.adventure.identity.Identity
 import net.kyori.adventure.inventory.Book
+import net.kyori.adventure.resource.ResourcePackCallback
 import net.kyori.adventure.resource.ResourcePackRequest
 import net.kyori.adventure.sound.Sound
 import net.kyori.adventure.sound.Sound.Emitter
@@ -30,10 +35,19 @@ import net.kyori.adventure.text.Component
 import net.kyori.adventure.title.Title
 import net.kyori.adventure.title.TitlePart
 import net.querz.nbt.tag.CompoundTag
+import java.net.Inet4Address
 import java.util.*
+import java.util.concurrent.TimeUnit
 import kotlin.time.Duration
 
-class StandaloneCloudPlayerImpl(uuid: UUID) : CommonCloudPlayerImpl(uuid) {
+class StandaloneCloudPlayerImpl(uuid: UUID, val name: String, val ip: Inet4Address) :
+    CommonCloudPlayerImpl(uuid) {
+
+    companion object {
+        private val log = logger()
+        private val service by lazy { bean<CloudPlayerService>() }
+    }
+
     @Volatile
     var proxyServer: StandaloneProxyCloudServerImpl? = null
 
@@ -42,7 +56,7 @@ class StandaloneCloudPlayerImpl(uuid: UUID) : CommonCloudPlayerImpl(uuid) {
 
     override val connectedToProxy get() = proxyServer != null
     override val connectedToServer get() = server != null
-    private val anyServer: ServerCommonCloudServer
+    val anyServer: ServerCommonCloudServer
         get() = server ?: proxyServer ?: error("Player is not connected to a server")
 
     @Volatile
@@ -85,10 +99,26 @@ class StandaloneCloudPlayerImpl(uuid: UUID) : CommonCloudPlayerImpl(uuid) {
     suspend fun updatePersistentData(tag: CompoundTag) =
         ppdcMutex.withLock { ppdc.fromTagCompound(tag) }
 
+    override suspend fun latestIpAddress(): Inet4Address {
+        return ip
+    }
+
+    override suspend fun lastServerRaw(): String {
+        return anyServer.name
+    }
+
+    override suspend fun nameHistory(): NameHistory {
+        return service.findNameHistories(uuid)
+    }
+
     override suspend fun displayName(): Component = ClientboundRequestDisplayNamePacket(uuid)
         .fireAndAwaitUrgent(anyServer.connection)?.displayName
         ?: error("Failed to get display name (probably timed out)")
 
+    override suspend fun name(): String {
+        return name
+    }
+
     override suspend fun connectToServer(server: CloudServer): ConnectionResult {
         check(server is StandaloneCloudServerImpl) { "Server must be a StandaloneCloudServerImpl" }
 
@@ -273,7 +303,13 @@ class StandaloneCloudPlayerImpl(uuid: UUID) : CommonCloudPlayerImpl(uuid) {
         send(ClientboundOpenBookPacket(uuid, book))
     }
 
-    override fun sendResourcePacks(request: ResourcePackRequest) { // TODO: Implement callback
+    override fun sendResourcePacks(request: ResourcePackRequest) {
+        if (request.callback() != ResourcePackCallback.noOp()) {
+            log.atWarning()
+                .atMostEvery(30, TimeUnit.SECONDS)
+                .log("Resource pack callback is not supported in standalone mode. Ignoring.")
+        }
+
         send(ClientboundSendResourcePacksPacket(uuid, request))
     }
 
@@ -286,9 +322,9 @@ class StandaloneCloudPlayerImpl(uuid: UUID) : CommonCloudPlayerImpl(uuid) {
     }
 
     override suspend fun teleport(
-        location: FineLocation,
-        teleportCause: FineTeleportCause,
-        vararg flags: FineTeleportFlag
+        location: TeleportLocation,
+        teleportCause: TeleportCause,
+        vararg flags: TeleportFlag
     ): Boolean {
         val server = server ?: return false
 
@@ -297,7 +333,7 @@ class StandaloneCloudPlayerImpl(uuid: UUID) : CommonCloudPlayerImpl(uuid) {
             location,
             teleportCause,
             *flags
-        ).fireAndAwait(server.connection)?.result ?: false
+        ).fireAndAwait(server.connection)?.result == true
     }
 
     private fun send(packet: NettyPacket) {
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/StandaloneCloudPlayerManagerImpl.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/StandaloneCloudPlayerManagerImpl.kt
index eb4561dc..cb9a9f98 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/StandaloneCloudPlayerManagerImpl.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/StandaloneCloudPlayerManagerImpl.kt
@@ -2,19 +2,23 @@ package dev.slne.surf.cloud.standalone.player
 
 import com.google.auto.service.AutoService
 import dev.slne.surf.cloud.api.common.player.CloudPlayerManager
-import dev.slne.surf.cloud.api.common.util.logger
+import dev.slne.surf.cloud.api.common.player.OfflineCloudPlayer
+import dev.slne.surf.cloud.api.server.export.PlayerDataExport
+import dev.slne.surf.cloud.api.server.export.PlayerDataExportEmpty
 import dev.slne.surf.cloud.core.common.coroutines.PlayerDataSaveScope
 import dev.slne.surf.cloud.core.common.player.CloudPlayerManagerImpl
+import dev.slne.surf.cloud.core.common.player.playerManagerImpl
+import dev.slne.surf.cloud.core.common.util.bean
 import dev.slne.surf.cloud.core.common.util.checkInstantiationByServiceLoader
 import dev.slne.surf.cloud.standalone.persistent.PlayerDataStorage
+import dev.slne.surf.cloud.standalone.player.db.exposed.CloudPlayerService
 import dev.slne.surf.cloud.standalone.server.StandaloneCloudServerImpl
 import dev.slne.surf.cloud.standalone.server.StandaloneProxyCloudServerImpl
 import dev.slne.surf.cloud.standalone.server.asStandaloneServer
 import dev.slne.surf.cloud.standalone.server.serverManagerImpl
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
+import dev.slne.surf.surfapi.core.api.util.logger
+import kotlinx.coroutines.*
+import java.net.Inet4Address
 import java.util.*
 import kotlin.time.Duration.Companion.minutes
 
@@ -27,8 +31,13 @@ class StandaloneCloudPlayerManagerImpl : CloudPlayerManagerImpl<StandaloneCloudP
         PlayerDataSaveScope.launch { createPlayerDataSaveTask() }
     }
 
-    private suspend fun createPlayerDataSaveTask() {
-        while (true) {
+//    override fun terminate() = runBlocking {
+//        super.terminate()
+//        saveJob.cancelAndJoin()
+//    }
+
+    private suspend fun createPlayerDataSaveTask() = coroutineScope {
+        while (isActive) {
             delay(3.minutes)
             forEachPlayer { PlayerDataStorage.save(it) }
         }
@@ -36,10 +45,12 @@ class StandaloneCloudPlayerManagerImpl : CloudPlayerManagerImpl<StandaloneCloudP
 
     override suspend fun createPlayer(
         uuid: UUID,
-        serverUid: Long,
-        proxy: Boolean
+        name: String,
+        proxy: Boolean,
+        ip: Inet4Address,
+        serverUid: Long
     ): StandaloneCloudPlayerImpl {
-        return StandaloneCloudPlayerImpl(uuid).also {
+        return StandaloneCloudPlayerImpl(uuid, name, ip).also {
             val server = serverUid.toServer()
             if (server != null) {
                 if (proxy) {
@@ -103,12 +114,42 @@ class StandaloneCloudPlayerManagerImpl : CloudPlayerManagerImpl<StandaloneCloudP
     override fun getProxyServerUid(player: StandaloneCloudPlayerImpl) = player.proxyServer?.uid
     override fun getServerUid(player: StandaloneCloudPlayerImpl) = player.server?.uid
 
-    override suspend fun onConnect(
+    override fun getOfflinePlayer(uuid: UUID): OfflineCloudPlayer {
+        return OfflineCloudPlayerImpl(uuid)
+    }
+
+    fun getRawOnlinePlayers() = players.values.toList()
+
+    override suspend fun onServerConnect(
+        uuid: UUID,
+        player: StandaloneCloudPlayerImpl,
+        serverUid: Long
+    ) {
+        supervisorScope {
+            awaitAll(
+                async {
+                    bean<CloudPlayerService>().updateOnServerConnect(player)
+                }
+            )
+        }
+
+        super.onServerConnect(uuid, player, serverUid)
+    }
+
+    override suspend fun onNetworkConnect(
         uuid: UUID,
         player: StandaloneCloudPlayerImpl
     ) {
-        withContext(Dispatchers.IO) { PlayerDataStorage.load(player) }
-        super.onConnect(uuid, player)
+
+        supervisorScope {
+            awaitAll(
+                async(PlayerDataSaveScope.context) {
+                    PlayerDataStorage.load(player)
+                }
+            )
+        }
+
+        super.onNetworkConnect(uuid, player)
     }
 
     override suspend fun onNetworkDisconnect(
@@ -119,14 +160,35 @@ class StandaloneCloudPlayerManagerImpl : CloudPlayerManagerImpl<StandaloneCloudP
     ) {
         super.onNetworkDisconnect(uuid, player, oldProxy, oldServer)
 
-        oldServer?.toServer()?.asStandaloneServer()?.queue?.handlePlayerLeave(player)
-        withContext(Dispatchers.IO) { PlayerDataStorage.save(player) }
+        supervisorScope {
+            awaitAll(
+                async {
+                    oldServer?.toServer()?.asStandaloneServer()?.queue?.handlePlayerLeave(player)
+                },
+                async(PlayerDataSaveScope.context) {
+                    PlayerDataStorage.save(player)
+                },
+                async {
+                    bean<CloudPlayerService>().updateOnDisconnect(player, oldServer)
+                }
+            )
+        }
     }
 
     private suspend fun Long.toServer() = serverManagerImpl.retrieveServerById(this)
 
+    suspend fun exportPlayerData(uuid: UUID): PlayerDataExport {
+        return PlayerDataExportEmpty
+    }
+
+    suspend fun deleteNotInterestingPlayerData(uuid: UUID) {
+
+    }
+
     private fun logServerNotFound(uid: Long, player: StandaloneCloudPlayerImpl) {
         log.atWarning()
             .log("Could not find server with id $uid for player ${player.uuid}")
     }
-}
\ No newline at end of file
+}
+
+val standalonePlayerManagerImpl get() = playerManagerImpl as StandaloneCloudPlayerManagerImpl
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/db/exposed/CloudPlayerEntities.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/db/exposed/CloudPlayerEntities.kt
new file mode 100644
index 00000000..ba7a056c
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/db/exposed/CloudPlayerEntities.kt
@@ -0,0 +1,26 @@
+package dev.slne.surf.cloud.standalone.player.db.exposed
+
+import dev.slne.surf.cloud.api.server.exposed.table.AuditableLongEntity
+import dev.slne.surf.cloud.api.server.exposed.table.AuditableLongEntityClass
+import org.jetbrains.exposed.dao.id.EntityID
+
+class CloudPlayerEntity(id: EntityID<Long>) : AuditableLongEntity(id, CloudPlayerTable) {
+    companion object : AuditableLongEntityClass<CloudPlayerEntity>(CloudPlayerTable)
+
+    var uuid by CloudPlayerTable.uuid
+    var lastServer by CloudPlayerTable.lastServer
+    var lastSeen by CloudPlayerTable.lastSeen
+    var lastIpAddress by CloudPlayerTable.lastIpAddress
+    val nameHistories by CloudPlayerNameHistoryEntity referrersOn CloudPlayerNameHistoryTable.player
+}
+
+class CloudPlayerNameHistoryEntity(id: EntityID<Long>) : AuditableLongEntity(
+    id,
+    CloudPlayerNameHistoryTable
+) {
+    companion object :
+        AuditableLongEntityClass<CloudPlayerNameHistoryEntity>(CloudPlayerNameHistoryTable)
+
+    var name by CloudPlayerNameHistoryTable.name
+    var player by CloudPlayerEntity referencedOn CloudPlayerNameHistoryTable.player
+}
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/db/exposed/CloudPlayerService.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/db/exposed/CloudPlayerService.kt
new file mode 100644
index 00000000..1e52f715
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/db/exposed/CloudPlayerService.kt
@@ -0,0 +1,60 @@
+package dev.slne.surf.cloud.standalone.player.db.exposed
+
+import dev.slne.surf.cloud.api.common.player.name.NameHistoryFactory
+import dev.slne.surf.cloud.api.server.exposed.service.AbstractExposedDAOService
+import dev.slne.surf.cloud.standalone.player.StandaloneCloudPlayerImpl
+import dev.slne.surf.cloud.standalone.player.name.create
+import dev.slne.surf.cloud.standalone.server.serverManagerImpl
+import org.springframework.stereotype.Service
+import java.time.ZonedDateTime
+import java.util.*
+
+@Service
+class CloudPlayerService : AbstractExposedDAOService<UUID, CloudPlayerEntity>({
+    maximumSize(1000)
+}) {
+    override suspend fun load(key: UUID): CloudPlayerEntity? =
+        CloudPlayerEntity.find { CloudPlayerTable.uuid eq key }.singleOrNull()
+
+    override suspend fun create(key: UUID) = CloudPlayerEntity.new {
+        uuid = key
+    }
+
+    suspend fun findNameHistories(uuid: UUID) =
+        find(uuid) { NameHistoryFactory.instance.create(nameHistories) }
+            ?: NameHistoryFactory.instance.empty()
+
+    suspend fun findLastServer(uuid: UUID) = find(uuid) { lastServer }
+    suspend fun findLastSeen(uuid: UUID) = find(uuid) { lastSeen }
+    suspend fun findLastIpAddress(uuid: UUID) = find(uuid) { lastIpAddress }
+
+    suspend fun updateOnDisconnect(player: StandaloneCloudPlayerImpl, oldServer: Long?) {
+        update(player.uuid) {
+            lastSeen = ZonedDateTime.now()
+            lastIpAddress = player.ip
+            if (oldServer != null) {
+                serverManagerImpl.retrieveServerById(oldServer)?.name?.let {
+                    lastServer = it
+                }
+            }
+        }
+    }
+
+    suspend fun updateOnServerConnect(player: StandaloneCloudPlayerImpl) {
+        update(player.uuid, createIfMissing = true) {
+            lastSeen = ZonedDateTime.now()
+            lastIpAddress = player.ip
+            lastServer =
+                player.server?.name ?: error("Player ${player.uuid} is not connected to a server")
+
+            val latestName = nameHistories.minByOrNull { it.createdAt }
+            val currentName = player.name()
+            if (latestName == null || latestName.name != currentName) {
+                CloudPlayerNameHistoryEntity.new {
+                    name = currentName
+                    this.player = this@update
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/db/exposed/CloudPlayerTables.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/db/exposed/CloudPlayerTables.kt
new file mode 100644
index 00000000..a7645ad8
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/db/exposed/CloudPlayerTables.kt
@@ -0,0 +1,26 @@
+package dev.slne.surf.cloud.standalone.player.db.exposed
+
+import dev.slne.surf.cloud.api.common.config.properties.CloudProperties
+import dev.slne.surf.cloud.api.server.exposed.columns.charUuid
+import dev.slne.surf.cloud.api.server.exposed.columns.inet
+import dev.slne.surf.cloud.api.server.exposed.columns.zonedDateTime
+import dev.slne.surf.cloud.api.server.exposed.table.AuditableLongIdTable
+import org.jetbrains.exposed.dao.id.LongIdTable
+import java.net.Inet4Address
+
+object CloudPlayerTable : AuditableLongIdTable("cloud_player") {
+    val uuid = charUuid("uuid").uniqueIndex()
+    val lastServer = char("last_server", 255).nullable()
+    val lastSeen = zonedDateTime("last_seen").nullable()
+    val lastIpAddress = inet("last_ip_address")
+        .transform(
+            wrap = { it as? Inet4Address ?: error("Invalid Inet4Address: $it") },
+            unwrap = { it }
+        )
+        .nullable()
+}
+
+object CloudPlayerNameHistoryTable : AuditableLongIdTable("cloud_player_name_history") {
+    val name = char("name", 16)
+    val player = reference("cloud_player_id", CloudPlayerTable)
+}
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/name/name-history-extension.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/name/name-history-extension.kt
new file mode 100644
index 00000000..9e248283
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/player/name/name-history-extension.kt
@@ -0,0 +1,15 @@
+package dev.slne.surf.cloud.standalone.player.name
+
+import dev.slne.surf.cloud.api.common.player.name.NameEntry
+import dev.slne.surf.cloud.api.common.player.name.NameHistoryFactory
+import dev.slne.surf.cloud.api.common.util.mutableObjectListOf
+import dev.slne.surf.cloud.core.common.player.name.NameHistoryImpl
+import dev.slne.surf.cloud.standalone.player.db.exposed.CloudPlayerNameHistoryEntity
+
+fun NameHistoryFactory.create(entries: Iterable<CloudPlayerNameHistoryEntity>) =
+    NameHistoryImpl(entries.mapTo(mutableObjectListOf()) {
+        NameEntry(
+            it.createdAt.toEpochSecond(),
+            it.name
+        )
+    })
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/PluginInitializerManager.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/PluginInitializerManager.kt
index 00eda1eb..abeb31c1 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/PluginInitializerManager.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/PluginInitializerManager.kt
@@ -1,10 +1,10 @@
 package dev.slne.surf.cloud.standalone.plugin
 
-import dev.slne.surf.cloud.api.common.util.logger
 import dev.slne.surf.cloud.standalone.plugin.entrypoint.LaunchEntryPointHandler
 import dev.slne.surf.cloud.standalone.plugin.provider.impl.StandalonePluginParent.StandalonePluginProvider
 import dev.slne.surf.cloud.standalone.plugin.provider.source.DirectoryProviderSource
 import dev.slne.surf.cloud.standalone.plugin.util.EntrypointUtil
+import dev.slne.surf.surfapi.core.api.util.logger
 import kotlin.io.path.Path
 
 object PluginInitializerManager {
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/coroutine/dispatcher/StandaloneCoroutineDispatcher.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/coroutine/dispatcher/StandaloneCoroutineDispatcher.kt
index 97ba7f9f..12e11540 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/coroutine/dispatcher/StandaloneCoroutineDispatcher.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/coroutine/dispatcher/StandaloneCoroutineDispatcher.kt
@@ -1,7 +1,7 @@
 package dev.slne.surf.cloud.standalone.plugin.coroutine.dispatcher
 
-import dev.slne.surf.cloud.api.common.util.logger
 import dev.slne.surf.cloud.api.common.util.threadFactory
+import dev.slne.surf.surfapi.core.api.util.logger
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Runnable
 import java.util.concurrent.Executors
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/entrypoint/strategy/LoadOrderTree.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/entrypoint/strategy/LoadOrderTree.kt
index 55504249..b5e660a2 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/entrypoint/strategy/LoadOrderTree.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/entrypoint/strategy/LoadOrderTree.kt
@@ -3,11 +3,11 @@
 package dev.slne.surf.cloud.standalone.plugin.entrypoint.strategy
 
 import com.google.common.graph.MutableGraph
-import dev.slne.surf.cloud.api.common.util.logger
 import dev.slne.surf.cloud.api.common.util.mutableObjectSetOf
 import dev.slne.surf.cloud.api.server.plugin.configuration.PluginMeta
 import dev.slne.surf.cloud.standalone.plugin.provider.PluginProvider
 import dev.slne.surf.cloud.standalone.plugin.provider.configuration.StandalonePluginMeta
+import dev.slne.surf.surfapi.core.api.util.logger
 
 class LoadOrderTree(
     private val providerMap: Map<String, PluginProvider<*>>,
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/entrypoint/strategy/PluginLoadingStrategy.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/entrypoint/strategy/PluginLoadingStrategy.kt
index 7cbcc799..d3176fd0 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/entrypoint/strategy/PluginLoadingStrategy.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/entrypoint/strategy/PluginLoadingStrategy.kt
@@ -4,12 +4,12 @@ package dev.slne.surf.cloud.standalone.plugin.entrypoint.strategy
 
 import com.google.common.collect.Maps
 import com.google.common.graph.GraphBuilder
-import dev.slne.surf.cloud.api.common.util.logger
 import dev.slne.surf.cloud.api.common.util.mutableObject2ObjectMapOf
 import dev.slne.surf.cloud.api.common.util.mutableObjectListOf
 import dev.slne.surf.cloud.standalone.plugin.entrypoint.dependency.PluginMetaDependencyTree
 import dev.slne.surf.cloud.standalone.plugin.exception.UnknownDependencyException
 import dev.slne.surf.cloud.standalone.plugin.provider.PluginProvider
+import dev.slne.surf.surfapi.core.api.util.logger
 import it.unimi.dsi.fastutil.objects.ObjectList
 
 class PluginLoadingStrategy<T>(private val configuration: ProviderConfiguration<T>) :
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/manager/StandalonePluginInstanceManager.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/manager/StandalonePluginInstanceManager.kt
index f31e8e26..1d2576ff 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/manager/StandalonePluginInstanceManager.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/manager/StandalonePluginInstanceManager.kt
@@ -1,6 +1,5 @@
 package dev.slne.surf.cloud.standalone.plugin.manager
 
-import dev.slne.surf.cloud.api.common.util.logger
 import dev.slne.surf.cloud.api.common.util.mutableObject2ObjectMapOf
 import dev.slne.surf.cloud.api.common.util.mutableObjectListOf
 import dev.slne.surf.cloud.api.server.plugin.PluginManager
@@ -14,6 +13,7 @@ import dev.slne.surf.cloud.standalone.plugin.entrypoint.dependency.SimplePluginM
 import dev.slne.surf.cloud.standalone.plugin.entrypoint.strategy.PluginGraphCycleException
 import dev.slne.surf.cloud.standalone.plugin.exception.InvalidPluginException
 import dev.slne.surf.cloud.standalone.plugin.provider.source.FileProviderSource
+import dev.slne.surf.surfapi.core.api.util.logger
 import java.io.IOException
 import java.nio.file.Path
 
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/provider/configuration/serializer/EnumValueSerializer.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/provider/configuration/serializer/EnumValueSerializer.kt
index 636aa84c..f3c124c9 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/provider/configuration/serializer/EnumValueSerializer.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/provider/configuration/serializer/EnumValueSerializer.kt
@@ -1,6 +1,6 @@
 package dev.slne.surf.cloud.standalone.plugin.provider.configuration.serializer
 
-import dev.slne.surf.cloud.api.common.util.logger
+import dev.slne.surf.surfapi.core.api.util.logger
 import io.leangen.geantyref.GenericTypeReflector
 import io.leangen.geantyref.TypeToken
 import org.spongepowered.configurate.serialize.ScalarSerializer
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/provider/impl/StandalonePluginParent.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/provider/impl/StandalonePluginParent.kt
index 1caabdae..8534dafc 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/provider/impl/StandalonePluginParent.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/provider/impl/StandalonePluginParent.kt
@@ -1,6 +1,5 @@
 package dev.slne.surf.cloud.standalone.plugin.provider.impl
 
-import dev.slne.surf.cloud.api.common.util.logger
 import dev.slne.surf.cloud.api.server.plugin.StandalonePlugin
 import dev.slne.surf.cloud.api.server.plugin.bootstrap.StandalonePluginBootstrap
 import dev.slne.surf.cloud.api.server.plugin.bootstrap.StandalonePluginProviderContext
@@ -13,9 +12,9 @@ import dev.slne.surf.cloud.standalone.plugin.provider.ProviderStatus
 import dev.slne.surf.cloud.standalone.plugin.provider.ProviderStatusHolder
 import dev.slne.surf.cloud.standalone.plugin.provider.configuration.LoadOrderConfiguration
 import dev.slne.surf.cloud.standalone.plugin.provider.configuration.StandalonePluginMeta
+import dev.slne.surf.surfapi.core.api.util.logger
 import java.nio.file.Path
 import java.util.jar.JarFile
-import kotlin.jvm.java
 
 class StandalonePluginParent(
     private val path: Path,
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/provider/source/DirectoryProviderSource.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/provider/source/DirectoryProviderSource.kt
index 26afb7ae..2430cacd 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/provider/source/DirectoryProviderSource.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/provider/source/DirectoryProviderSource.kt
@@ -2,8 +2,8 @@
 
 package dev.slne.surf.cloud.standalone.plugin.provider.source
 
-import dev.slne.surf.cloud.api.common.util.logger
 import dev.slne.surf.cloud.standalone.plugin.entrypoint.EntrypointHandler
+import dev.slne.surf.surfapi.core.api.util.logger
 import java.nio.file.FileVisitOption
 import java.nio.file.Files
 import java.nio.file.Path
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/spring/PluginDatabaseConfig.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/spring/PluginDatabaseConfig.kt
new file mode 100644
index 00000000..36f0b7ec
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/spring/PluginDatabaseConfig.kt
@@ -0,0 +1,9 @@
+package dev.slne.surf.cloud.standalone.plugin.spring
+
+import org.springframework.context.annotation.Configuration
+
+@Configuration
+class PluginDatabaseConfig {
+
+    // fun dataSource
+}
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/storage/BootstrapSpringProviderStorage.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/storage/BootstrapSpringProviderStorage.kt
index 196e0846..b982263d 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/storage/BootstrapSpringProviderStorage.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/storage/BootstrapSpringProviderStorage.kt
@@ -1,6 +1,5 @@
 package dev.slne.surf.cloud.standalone.plugin.storage
 
-import dev.slne.surf.cloud.api.common.util.logger
 import dev.slne.surf.cloud.api.server.plugin.bootstrap.StandalonePluginBootstrap
 import dev.slne.surf.cloud.api.server.plugin.dependency.DependencyContext
 import dev.slne.surf.cloud.standalone.plugin.PluginInitializerManager
@@ -12,6 +11,7 @@ import dev.slne.surf.cloud.standalone.plugin.entrypoint.strategy.ProviderConfigu
 import dev.slne.surf.cloud.standalone.plugin.provider.PluginProvider
 import dev.slne.surf.cloud.standalone.plugin.provider.ProviderStatus
 import dev.slne.surf.cloud.standalone.plugin.provider.ProviderStatusHolder
+import dev.slne.surf.surfapi.core.api.util.logger
 
 class BootstrapSpringProviderStorage : SimpleProviderStorage<StandalonePluginBootstrap>(
     PluginLoadingStrategy(object : ProviderConfiguration<StandalonePluginBootstrap> {
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/storage/ServerSpringPluginProviderStorage.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/storage/ServerSpringPluginProviderStorage.kt
index b57972da..cbe80125 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/storage/ServerSpringPluginProviderStorage.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/storage/ServerSpringPluginProviderStorage.kt
@@ -1,6 +1,5 @@
 package dev.slne.surf.cloud.standalone.plugin.storage
 
-import dev.slne.surf.cloud.api.common.util.logger
 import dev.slne.surf.cloud.api.server.plugin.PluginManager
 import dev.slne.surf.cloud.api.server.plugin.StandalonePlugin
 import dev.slne.surf.cloud.api.server.plugin.dependency.DependencyContext
@@ -9,6 +8,7 @@ import dev.slne.surf.cloud.standalone.plugin.entrypoint.strategy.ProviderConfigu
 import dev.slne.surf.cloud.standalone.plugin.manager.SpringPluginManagerImpl
 import dev.slne.surf.cloud.standalone.plugin.provider.PluginProvider
 import dev.slne.surf.cloud.standalone.plugin.provider.impl.StandalonePluginParent
+import dev.slne.surf.surfapi.core.api.util.logger
 import it.unimi.dsi.fastutil.objects.ObjectList
 
 open class ServerSpringPluginProviderStorage :
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/redis/RedisEvent.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/redis/RedisEvent.kt
deleted file mode 100644
index 836c0192..00000000
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/redis/RedisEvent.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-package dev.slne.surf.cloud.standalone.redis
-
-import com.fasterxml.jackson.annotation.JsonIgnore
-import dev.slne.surf.cloud.standalone.standaloneCloudInstance
-import org.apache.commons.lang3.ArrayUtils
-import org.apache.commons.lang3.builder.ToStringBuilder
-import java.util.*
-
-abstract class RedisEvent {
-
-    @get:JsonIgnore
-    val eventName: String by lazy { this.javaClass.simpleName }
-
-    @get:JsonIgnore
-    lateinit var channels: Array<String>
-        private set
-
-    @get:JsonIgnore
-    val channelList: List<String> by lazy { channels.toList() }
-
-    lateinit var packetId: UUID
-        private set
-
-    internal constructor()
-    constructor(firstChannel: String, vararg channels: String) {
-        this.channels = ArrayUtils.add(channels, firstChannel)
-        this.packetId = UUID.randomUUID()
-    }
-
-    fun send() {
-        standaloneCloudInstance.callRedisEvent(this)
-    }
-
-    override fun toString(): String {
-        return ToStringBuilder.reflectionToString(this)
-    }
-}
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/redis/RedisEventHandler.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/redis/RedisEventHandler.kt
deleted file mode 100644
index 08390961..00000000
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/redis/RedisEventHandler.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package dev.slne.surf.cloud.standalone.redis
-
-@Target(
-    AnnotationTarget.FUNCTION,
-    AnnotationTarget.PROPERTY_GETTER,
-    AnnotationTarget.PROPERTY_SETTER
-)
-@Retention(AnnotationRetention.RUNTIME)
-annotation class RedisEventHandler(vararg val value: String)
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/redis/RedisEventHandlerProcessor.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/redis/RedisEventHandlerProcessor.kt
deleted file mode 100644
index 9d46ed5b..00000000
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/redis/RedisEventHandlerProcessor.kt
+++ /dev/null
@@ -1,91 +0,0 @@
-package dev.slne.surf.cloud.standalone.redis
-
-import dev.slne.surf.cloud.api.common.util.*
-import org.springframework.beans.factory.ObjectProvider
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.beans.factory.config.BeanPostProcessor
-import org.springframework.data.redis.connection.Message
-import org.springframework.data.redis.connection.MessageListener
-import org.springframework.data.redis.listener.ChannelTopic
-import org.springframework.data.redis.listener.RedisMessageListenerContainer
-import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer
-import org.springframework.stereotype.Component
-import tech.hiddenproject.aide.reflection.LambdaWrapperHolder
-import tech.hiddenproject.aide.reflection.annotation.Invoker
-import java.lang.reflect.Method
-import java.util.concurrent.TimeUnit
-
-@Component
-class RedisEventHandlerProcessor @Autowired constructor(
-    containerProvider: ObjectProvider<RedisMessageListenerContainer>,
-    redisSerializerProvider: ObjectProvider<GenericJackson2JsonRedisSerializer>
-) : BeanPostProcessor {
-    private val container by containerProvider
-    private val redisSerializer by redisSerializerProvider
-
-    init {
-        LambdaWrapperHolder.DEFAULT.add(RedisEventHandlerInvoker::class.java)
-    }
-
-    override fun postProcessAfterInitialization(bean: Any, beanName: String): Any {
-        val targetClass = bean.ultimateTargetClass()
-        if (!targetClass.isCandidateFor<RedisEventHandler>()) return bean
-
-        val eventHandlers = targetClass.selectFunctions { it.isAnnotated<RedisEventHandler>() }
-
-        if (eventHandlers.isNotEmpty()) {
-            registerEventHandlers(beanName, bean, eventHandlers)
-        }
-
-        return bean
-    }
-
-    private fun registerEventHandlers(
-        beanName: String,
-        bean: Any,
-        eventHandlerMethods: Set<Method>
-    ) {
-        for (handlerMethod in eventHandlerMethods) {
-            val adapter =
-                RedisEventHandlerListenerAdapter(beanName, bean, handlerMethod, redisSerializer)
-            val eventHandler = handlerMethod.getAnnotation(RedisEventHandler::class.java)
-
-            container.addMessageListener(adapter, eventHandler.value.map { ChannelTopic.of(it) })
-        }
-    }
-
-
-    private class RedisEventHandlerListenerAdapter(
-        private val beanName: String,
-        private val bean: Any,
-        eventHandlerMethod: Method,
-        private val redisSerializer: GenericJackson2JsonRedisSerializer
-    ) : MessageListener {
-        private val log = logger()
-        private val eventType = eventHandlerMethod.parameterTypes[0]
-        private val invoker = createInvoker(eventHandlerMethod)
-
-        override fun onMessage(message: Message, pattern: ByteArray?) {
-            val receivedEvent = redisSerializer.deserialize(message.body, eventType) ?: return
-
-            if (eventType.isAssignableFrom(receivedEvent.javaClass)) {
-                try {
-                    invoker.handle(bean, receivedEvent as RedisEvent)
-                } catch (e: Throwable) {
-                    log.atWarning()
-                        .atMostEvery(1, TimeUnit.SECONDS)
-                        .withCause(RuntimeException("Failed to invoke event handler method", e))
-                        .log("Encountered an exception while handling event in bean %s", beanName)
-                }
-            }
-        }
-    }
-
-    fun interface RedisEventHandlerInvoker {
-        @Invoker
-        fun handle(caller: Any, event: RedisEvent)
-    }
-}
-
-private fun createInvoker(method: Method) =
-    LambdaWrapperHolder.DEFAULT.wrap(method, RedisEventHandlerProcessor.RedisEventHandlerInvoker::class.java).wrapper
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/CommonStandaloneServerImpl.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/CommonStandaloneServerImpl.kt
index d3920b6f..42ab1437 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/CommonStandaloneServerImpl.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/CommonStandaloneServerImpl.kt
@@ -58,7 +58,7 @@ class CommonStandaloneServerImpl : CommonStandaloneServer {
 //                return ConnectionResult.ALREADY_CONNECTED
 //            }
 //
-//            if (emptySlots <= 0) { // TODO: 26.11.2024 20:36 - add bypass perm
+//            if (emptySlots <= 0) {
 //                return ConnectionResult.SERVER_FULL
 //            }
 //        }
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/StandaloneCloudServerImpl.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/StandaloneCloudServerImpl.kt
index 68d39d9c..df7a6e21 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/StandaloneCloudServerImpl.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/StandaloneCloudServerImpl.kt
@@ -1,8 +1,8 @@
 package dev.slne.surf.cloud.standalone.server
 
-import dev.slne.surf.cloud.api.common.netty.network.Connection
 import dev.slne.surf.cloud.api.server.server.ServerCloudServer
 import dev.slne.surf.cloud.api.server.server.ServerCommonCloudServer
+import dev.slne.surf.cloud.core.common.netty.network.ConnectionImpl
 import dev.slne.surf.cloud.core.common.server.CloudServerImpl
 import dev.slne.surf.cloud.standalone.server.queue.SingleServerQueue
 
@@ -10,7 +10,7 @@ class StandaloneCloudServerImpl(
     uid: Long,
     group: String,
     name: String,
-    override val connection: Connection,
+    override val connection: ConnectionImpl,
 ) : CloudServerImpl(uid, group, name), ServerCloudServer,
     CommonStandaloneServer by CommonStandaloneServerImpl() {
 
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/StandaloneCloudServerManagerImpl.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/StandaloneCloudServerManagerImpl.kt
index 5a7be4ee..377b79a1 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/StandaloneCloudServerManagerImpl.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/StandaloneCloudServerManagerImpl.kt
@@ -1,27 +1,32 @@
 package dev.slne.surf.cloud.standalone.server
 
 import com.google.auto.service.AutoService
+import dev.slne.surf.cloud.api.common.netty.network.protocol.awaitOrThrowUrgent
 import dev.slne.surf.cloud.api.common.netty.packet.NettyPacket
 import dev.slne.surf.cloud.api.common.server.CloudServerManager
 import dev.slne.surf.cloud.api.server.server.ServerCloudServerManager
 import dev.slne.surf.cloud.api.server.server.ServerCommonCloudServer
 import dev.slne.surf.cloud.api.server.server.ServerProxyCloudServer
+import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ClientboundBatchUpdateServer
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ClientboundRegisterServerPacket
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ClientboundUnregisterServerPacket
+import dev.slne.surf.cloud.core.common.netty.network.protocol.running.RequestOfflineDisplayNamePacket
 import dev.slne.surf.cloud.core.common.server.CommonCloudServerManagerImpl
 import dev.slne.surf.cloud.core.common.util.bean
 import dev.slne.surf.cloud.standalone.config.standaloneConfig
 import dev.slne.surf.cloud.standalone.netty.server.NettyServerImpl
 import dev.slne.surf.cloud.standalone.netty.server.ProxyServerAutoregistration
-import dev.slne.surf.cloud.standalone.netty.server.ServerClientImpl
+import kotlinx.coroutines.sync.withLock
+import net.kyori.adventure.text.Component
+import java.util.*
 
 @AutoService(CloudServerManager::class)
 class StandaloneCloudServerManagerImpl : CommonCloudServerManagerImpl<ServerCommonCloudServer>(),
     ServerCloudServerManager {
     private val server by lazy { bean<NettyServerImpl>() }
 
-
-    suspend fun getCommonStandaloneServerByUid(uid: Long) = retrieveServerById(uid) as? CommonStandaloneServer
+    suspend fun getCommonStandaloneServerByUid(uid: Long) =
+        retrieveServerById(uid) as? CommonStandaloneServer
 
     override suspend fun registerServer(cloudServer: ServerCommonCloudServer) {
         super.registerServer(cloudServer)
@@ -34,6 +39,8 @@ class StandaloneCloudServerManagerImpl : CommonCloudServerManagerImpl<ServerComm
             )
         )
 
+        cloudServer.connection.send(ClientboundBatchUpdateServer(retrieveAllServers()))
+
         if (standaloneConfig.useSingleProxySetup) {
             if (cloudServer is StandaloneProxyCloudServerImpl) {
                 ProxyServerAutoregistration.setProxy(cloudServer)
@@ -48,7 +55,7 @@ class StandaloneCloudServerManagerImpl : CommonCloudServerManagerImpl<ServerComm
         broadcast(ClientboundUnregisterServerPacket(uid))
 
         if (standaloneConfig.useSingleProxySetup) {
-            if (serverManagerImpl.getCommonStandaloneServerByUid(uid) is StandaloneProxyCloudServerImpl) {
+            if (getCommonStandaloneServerByUid(uid) is StandaloneProxyCloudServerImpl) {
                 ProxyServerAutoregistration.clearProxy()
             }
         }
@@ -57,6 +64,43 @@ class StandaloneCloudServerManagerImpl : CommonCloudServerManagerImpl<ServerComm
     private fun broadcast(packet: NettyPacket) {
         server.connection.broadcast(packet)
     }
+
+    suspend fun requestOfflineDisplayName(uuid: UUID): Component? {
+        if (standaloneConfig.useSingleProxySetup) { // easy, we just ask the proxy
+            return RequestOfflineDisplayNamePacket(uuid).awaitOrThrowUrgent(singleProxyServer().connection)
+        } else {
+            // here we play the lottery until we get a response or all servers have been asked
+            val servers = retrieveAllServers()
+
+            // the chance that a proxy response with a display name is very high,
+            // so let's ask them first
+            val proxies = servers.filterIsInstance<StandaloneProxyCloudServerImpl>()
+            for (proxy in proxies) {
+                val name = RequestOfflineDisplayNamePacket(uuid).awaitOrThrowUrgent(proxy.connection)
+                if (name != null) {
+                    return name
+                }
+            }
+
+            // if no proxy responded, we ask the other servers
+            for (server in servers) {
+                if (server !is StandaloneProxyCloudServerImpl) {
+                    val (name) = RequestOfflineDisplayNamePacket(uuid).fireAndAwaitOrThrowUrgent(
+                        server.connection
+                    )
+                    if (name != null) {
+                        return name
+                    }
+                }
+            }
+
+            // I guess no one knows the name
+            return null
+        }
+    }
+
+    private suspend fun singleProxyServer() =
+        serversMutex.withLock { servers.values.single { it is StandaloneProxyCloudServerImpl } }
 }
 
 val serverManagerImpl get() = CloudServerManager.instance as StandaloneCloudServerManagerImpl
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/StandaloneProxyCloudServerImpl.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/StandaloneProxyCloudServerImpl.kt
index ae5fa3e9..0a34c40a 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/StandaloneProxyCloudServerImpl.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/StandaloneProxyCloudServerImpl.kt
@@ -3,6 +3,7 @@ package dev.slne.surf.cloud.standalone.server
 import dev.slne.surf.cloud.api.common.netty.network.Connection
 import dev.slne.surf.cloud.api.server.server.ServerCommonCloudServer
 import dev.slne.surf.cloud.api.server.server.ServerProxyCloudServer
+import dev.slne.surf.cloud.core.common.netty.network.ConnectionImpl
 import dev.slne.surf.cloud.core.common.server.ProxyCloudServerImpl
 import dev.slne.surf.cloud.standalone.netty.server.ServerClientImpl
 
@@ -10,7 +11,7 @@ class StandaloneProxyCloudServerImpl(
     uid: Long,
     group: String,
     name: String,
-    override val connection: Connection
+    override val connection: ConnectionImpl
 ) : ProxyCloudServerImpl(uid, group, name), ServerProxyCloudServer,
     CommonStandaloneServer by CommonStandaloneServerImpl() {
 
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/extension.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/extension.kt
new file mode 100644
index 00000000..1f227728
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/extension.kt
@@ -0,0 +1,11 @@
+package dev.slne.surf.cloud.standalone.server
+
+import dev.slne.surf.cloud.core.common.netty.network.ConnectionImpl
+import dev.slne.surf.cloud.core.common.server.CommonCloudServerImpl
+
+val CommonCloudServerImpl.connection: ConnectionImpl
+    get() = when (this) {
+        is StandaloneCloudServerImpl -> this.connection
+        is StandaloneProxyCloudServerImpl -> this.connection
+        else -> error("Unknown server type")
+    }
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/queue/ServerQueueDisplay.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/queue/ServerQueueDisplay.kt
index fcb01012..fb5365d2 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/queue/ServerQueueDisplay.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/queue/ServerQueueDisplay.kt
@@ -1,7 +1,9 @@
 package dev.slne.surf.cloud.standalone.server.queue
 
 import dev.slne.surf.cloud.core.common.coroutines.QueueDisplayScope
+import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import net.kyori.adventure.text.Component
 import kotlin.time.Duration.Companion.seconds
@@ -11,13 +13,11 @@ class ServerQueueDisplay(
 ) {
 
     init {
-        QueueDisplayScope.launch {
-            display()
-        }
+        QueueDisplayScope.launch { display() }
     }
 
-    private suspend fun display() {
-        while (true) {
+    private suspend fun display() = coroutineScope {
+        while (isActive) {
             delay(1.seconds)
             displayQueue()
         }
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/queue/SingleServerQueue.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/queue/SingleServerQueue.kt
index 746e4ae2..8ff5cd2c 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/queue/SingleServerQueue.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/server/queue/SingleServerQueue.kt
@@ -2,12 +2,14 @@ package dev.slne.surf.cloud.standalone.server.queue
 
 import dev.slne.surf.cloud.api.common.player.CloudPlayer
 import dev.slne.surf.cloud.api.common.player.ConnectionResultEnum.*
-import dev.slne.surf.cloud.api.common.util.logger
 import dev.slne.surf.cloud.api.common.util.queue.FairSuspendPriorityQueue
 import dev.slne.surf.cloud.api.common.util.toObjectList
 import dev.slne.surf.cloud.core.common.coroutines.QueueProcessingScope
 import dev.slne.surf.cloud.standalone.player.StandaloneCloudPlayerImpl
 import dev.slne.surf.cloud.standalone.server.StandaloneCloudServerImpl
+import dev.slne.surf.surfapi.core.api.util.logger
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -30,13 +32,13 @@ class SingleServerQueue(private val server: StandaloneCloudServerImpl) {
 
     val queueDisplay = ServerQueueDisplay(this)
 
-    private suspend fun processQueue() {
-        if (processing) return
+    private suspend fun processQueue() = coroutineScope {
+        if (processing) return@coroutineScope
         processing = true
 
-        while (true) {
+        while (isActive) {
             val player = mutex.withLock {
-                if (queue.isEmpty() || !server.hasEmptySlots()) return
+                if (queue.isEmpty() || !server.hasEmptySlots()) return@coroutineScope
                 queue.poll()
             } ?: break // No more players to process at the moment
             val rawResult = player.connectToServer(server) // suspend
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spring/config/EhcacheConfig.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spring/config/EhcacheConfig.kt
new file mode 100644
index 00000000..139f782b
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spring/config/EhcacheConfig.kt
@@ -0,0 +1,29 @@
+package dev.slne.surf.cloud.standalone.spring.config
+
+import org.springframework.boot.autoconfigure.cache.JCacheManagerCustomizer
+import org.springframework.cache.annotation.EnableCaching
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+import javax.cache.configuration.MutableConfiguration
+
+@Configuration
+@EnableCaching
+class EhcacheConfig {
+
+    @Bean
+    fun cacheCustomizer(): JCacheManagerCustomizer {
+        return JCacheManagerCustomizer {
+            it.createCache(
+                "default-update-timestamps-region",
+                MutableConfiguration<Any, Any>()
+                    .setStatisticsEnabled(true)
+            )
+
+            it.createCache(
+                "default-query-results-region",
+                MutableConfiguration<Any, Any>()
+                    .setStatisticsEnabled(true)
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spring/config/ExposedConfig.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spring/config/ExposedConfig.kt
new file mode 100644
index 00000000..3185ded7
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spring/config/ExposedConfig.kt
@@ -0,0 +1,16 @@
+package dev.slne.surf.cloud.standalone.spring.config
+
+import org.jetbrains.exposed.sql.DatabaseConfig
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Configuration
+
+@Configuration
+class ExposedConfig {
+
+    @Bean
+    @ConditionalOnClass(DatabaseConfig::class)
+    fun databaseConfig() = DatabaseConfig {
+        useNestedTransactions = true
+    }
+}
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spring/config/FlywayConfig.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spring/config/FlywayConfig.kt
new file mode 100644
index 00000000..61399780
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spring/config/FlywayConfig.kt
@@ -0,0 +1,8 @@
+package dev.slne.surf.cloud.standalone.spring.config
+
+import org.springframework.context.annotation.Configuration
+
+@Configuration
+class FlywayConfig {
+
+}
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spring/config/SurfCloudDataConfig.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spring/config/SurfCloudDataConfig.kt
index 62b11f4b..6924f973 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spring/config/SurfCloudDataConfig.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spring/config/SurfCloudDataConfig.kt
@@ -1,57 +1,132 @@
 package dev.slne.surf.cloud.standalone.spring.config
 
+import com.zaxxer.hikari.HikariDataSource
 import dev.slne.surf.cloud.api.common.exceptions.ExitCodes
 import dev.slne.surf.cloud.api.common.exceptions.FatalSurfError
-import dev.slne.surf.cloud.api.common.util.logger
 import dev.slne.surf.cloud.core.common.config.cloudConfig
+import dev.slne.surf.surfapi.core.api.util.logger
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass
+import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails
+import org.springframework.boot.autoconfigure.jdbc.metadata.DataSourcePoolMetadataProvidersConfiguration
+import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration
+import org.springframework.boot.jdbc.DataSourceBuilder
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Import
 import org.springframework.context.annotation.Primary
+import org.springframework.data.domain.Example
+import org.springframework.data.domain.ExampleMatcher
+import org.springframework.data.repository.query.QueryByExampleExecutor
 import org.springframework.jdbc.datasource.DriverManagerDataSource
+import org.springframework.orm.jpa.JpaTransactionManager
 import java.sql.SQLException
 import javax.sql.DataSource
 
 @Configuration
+//@Import(DataSourcePoolMetadataProvidersConfiguration::class)
+@Import(TransactionAutoConfiguration::class)
 class SurfCloudDataConfig {
-    private val log = logger()
+    companion object {
+        private val log = logger()
+    }
 
-    @Bean
-    @Primary
-    fun dataSource(): DataSource {
-        val databaseConfig = cloudConfig.connectionConfig.databaseConfig
-        val dataSource = DriverManagerDataSource()
+//    @Bean
+//    fun transactionManager(): TransactionManager {
+//        JpaTransactionManager
+//    }
 
-        with(dataSource) {
-            setDriverClassName("org.mariadb.jdbc.Driver")
-            username = databaseConfig.username
-            password = databaseConfig.password
-            url = databaseConfig.url
-        }
+    @Bean
+    fun connectionDetails(): JdbcConnectionDetails {
+//        JpaTransactionManager()
 
-        validateDatasource(dataSource)
+        val databaseConfig = cloudConfig.connectionConfig.databaseConfig
 
-        return dataSource
-    }
+        return object : JdbcConnectionDetails {
+            override fun getUsername(): String? {
+                return databaseConfig.username
+            }
 
-    private fun validateDatasource(dataSource: DriverManagerDataSource) {
-        try {
-            dataSource.connection.use {
-                log.atFine()
-                    .log("Successfully connected to the database.")
+            override fun getPassword(): String? {
+                return databaseConfig.password
             }
-        } catch (e: SQLException) {
-            throw FatalSurfError {
-                simpleErrorMessage("Failed to tryEstablishConnection0 to the database.")
-                detailedErrorMessage("The database connection could not be established using the provided configuration.")
-                cause(e)
-                additionalInformation("Database URL: ${dataSource.url}")
-                additionalInformation("Username: ${dataSource.username}")
-                additionalInformation("Password set: ${dataSource.password != null}")
-                possibleSolution("Check if the database server is running and accessible.")
-                possibleSolution("Verify that the database URL, username, and password are correct.")
-                possibleSolution("Ensure that the database driver (org.mariadb.jdbc.Driver) is compatible.")
-                exitCode(ExitCodes.UNABLE_TO_CONNECT_TO_DATABASE)
+
+            override fun getJdbcUrl(): String? {
+                return databaseConfig.url
             }
         }
     }
+
+//    @Configuration(proxyBeanMethods = false)
+//    class DataSourceConfig {
+//
+//        @Configuration(proxyBeanMethods = false)
+//        @ConditionalOnClass(HikariDataSource::class)
+//        class Hikari {
+//
+//            @Bean
+//            fun dataSource(connectionDetails: JdbcConnectionDetails): HikariDataSource {
+//                return createDataSource<HikariDataSource>(connectionDetails, null)
+//            }
+//        }
+//
+//        companion object {
+//            inline fun <reified T: DataSource> createDataSource(
+//                connectionDetails: JdbcConnectionDetails,
+//                classLoader: ClassLoader?
+//            ): T {
+//                return connectionDetails.run {
+//                    DataSourceBuilder.create(classLoader)
+//                        .type(T::class.java)
+//                        .driverClassName(driverClassName)
+//                        .url(jdbcUrl)
+//                        .username(username)
+//                        .password(password)
+//                        .build() as T
+//                }
+//            }
+//        }
+//
+//        @Bean
+//        @Primary
+//        fun dataSource(): DataSource {
+//            val databaseConfig = cloudConfig.connectionConfig.databaseConfig
+//            val dataSource = DriverManagerDataSource()
+//
+//            with(dataSource) {
+////            val driverClassName = databaseConfig.type.driver
+////            setDriverClassName("org.mariadb.jdbc.Driver")
+////            println("Driver class name: $driverClassName")
+//                username = databaseConfig.username
+//                password = databaseConfig.password
+//                url = databaseConfig.url
+//            }
+//
+//            validateDatasource(dataSource)
+//
+//            return dataSource
+//        }
+//
+//
+//        private fun validateDatasource(dataSource: DriverManagerDataSource) {
+//            try {
+//                dataSource.connection.use {
+//                    log.atFine()
+//                        .log("Successfully connected to the database.")
+//                }
+//            } catch (e: SQLException) {
+//                throw FatalSurfError {
+//                    simpleErrorMessage("Failed to tryEstablishConnection0 to the database.")
+//                    detailedErrorMessage("The database connection could not be established using the provided configuration.")
+//                    cause(e)
+//                    additionalInformation("Database URL: ${dataSource.url}")
+//                    additionalInformation("Username: ${dataSource.username}")
+//                    additionalInformation("Password set: ${dataSource.password != null}")
+//                    possibleSolution("Check if the database server is running and accessible.")
+//                    possibleSolution("Verify that the database URL, username, and password are correct.")
+//                    possibleSolution("Ensure that the database driver (org.mariadb.jdbc.Driver) is compatible.")
+//                    exitCode(ExitCodes.UNABLE_TO_CONNECT_TO_DATABASE)
+//                }
+//            }
+//        }
+//    }
 }
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spring/config/SurfCloudRedisConfig.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spring/config/SurfCloudRedisConfig.kt
deleted file mode 100644
index 793fd7c6..00000000
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spring/config/SurfCloudRedisConfig.kt
+++ /dev/null
@@ -1,80 +0,0 @@
-package dev.slne.surf.cloud.standalone.spring.config
-
-import com.fasterxml.jackson.databind.ObjectMapper
-import dev.slne.surf.cloud.core.common.config.cloudConfig
-import org.springframework.boot.autoconfigure.cache.RedisCacheManagerBuilderCustomizer
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
-import org.springframework.data.redis.cache.RedisCacheConfiguration
-import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory
-import org.springframework.data.redis.connection.RedisConnectionFactory
-import org.springframework.data.redis.connection.RedisStandaloneConfiguration
-import org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration
-import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory
-import org.springframework.data.redis.core.ReactiveRedisTemplate
-import org.springframework.data.redis.listener.RedisMessageListenerContainer
-import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer
-import org.springframework.data.redis.serializer.RedisSerializationContext
-import org.springframework.data.redis.serializer.RedisSerializer
-import org.springframework.transaction.annotation.EnableTransactionManagement
-
-@Configuration
-@EnableTransactionManagement
-class SurfCloudRedisConfig {
-    @Bean
-    fun redisConnectionFactory(): LettuceConnectionFactory {
-        val redisConfig = cloudConfig.connectionConfig.redisConfig
-        val standalone = RedisStandaloneConfiguration()
-        val clientConfig = LettuceClientConfiguration.builder()
-            //        .useSsl()
-            //        .startTls()
-            //        .and()
-            .clientName("surf-cloud-client")
-            .build()
-
-        with(standalone) {
-            hostName = redisConfig.host
-            port = redisConfig.port
-            username = redisConfig.username.ifBlank { null }
-            setPassword(redisConfig.password)
-        }
-
-        return LettuceConnectionFactory(standalone, clientConfig)
-    }
-
-    @Bean
-    fun redisSerializer(mapper: ObjectMapper) = GenericJackson2JsonRedisSerializer(mapper)
-
-    @Bean
-    fun reactiveRedisTemplate(
-        connectionFactory: ReactiveRedisConnectionFactory,
-        redisSerializer: GenericJackson2JsonRedisSerializer
-    ) = ReactiveRedisTemplate(
-        connectionFactory,
-        RedisSerializationContext.newSerializationContext<String, Any>(redisSerializer)
-            .key(RedisSerializer.string())
-            .value(redisSerializer)
-            .build()
-    )
-
-
-    //  @Bean
-    //  public RedisCacheManager cacheManager(RedisConnectionFactory connectionFactory) {
-    //    return RedisCacheManager.builder(connectionFactory)
-    //        .
-    //  }
-    @Bean
-    fun redisCacheManagerBuilderCustomizer() = RedisCacheManagerBuilderCustomizer { builder ->
-        builder.cacheDefaults(
-            RedisCacheConfiguration.defaultCacheConfig().prefixCacheNameWith("surf-cloud:")
-        ).transactionAware()
-    }
-
-
-    @Bean
-    fun redisMessageListenerContainer(
-        connectionFactory: RedisConnectionFactory
-    ) = RedisMessageListenerContainer().apply {
-        setConnectionFactory(connectionFactory)
-    }
-}
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spring/config/logback/CloudLogbackConfigurator.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spring/config/logback/CloudLogbackConfigurator.kt
deleted file mode 100644
index d245b7e5..00000000
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spring/config/logback/CloudLogbackConfigurator.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package dev.slne.surf.cloud.standalone.spring.config.logback
-
-object CloudLogbackConfigurator {
-    fun configure() {
-        try {
-            ColorConverterModifier.changeInfoColorToWhite()
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-}
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spring/config/logback/ColorConverterModifier.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spring/config/logback/ColorConverterModifier.kt
deleted file mode 100644
index 8c1d83f2..00000000
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spring/config/logback/ColorConverterModifier.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package dev.slne.surf.cloud.standalone.spring.config.logback
-
-import ch.qos.logback.classic.Level
-import dev.slne.surf.surfapi.core.api.util.setStaticFinalField
-import org.springframework.boot.ansi.AnsiColor
-import org.springframework.boot.ansi.AnsiElement
-import org.springframework.boot.logging.logback.ColorConverter
-import java.lang.reflect.Field
-import java.util.*
-
-internal object ColorConverterModifier {
-    private fun modify(modifiableLevels: MutableMap<Int, AnsiElement>) {
-        modifiableLevels[Level.INFO_INTEGER] = AnsiColor.DEFAULT
-    }
-
-    fun changeInfoColorToWhite() {
-        val levelsField = ColorConverter::class.java.getDeclaredField("LEVELS")
-        levelsField.isAccessible = true
-
-        val modifiableLevels = extractLevels(levelsField)
-        modify(modifiableLevels)
-
-        setStaticFinalField(levelsField, Collections.unmodifiableMap(modifiableLevels))
-    }
-
-    private fun extractLevels(field: Field) = HashMap(field.get(null) as Map<Int, AnsiElement>)
-}
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spring/entities/player/CloudPlayerEntity.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spring/entities/player/CloudPlayerEntity.kt
new file mode 100644
index 00000000..fe87d30e
--- /dev/null
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spring/entities/player/CloudPlayerEntity.kt
@@ -0,0 +1,44 @@
+package dev.slne.surf.cloud.standalone.spring.entities.player
+
+import jakarta.persistence.*
+import org.hibernate.annotations.JdbcTypeCode
+import org.hibernate.annotations.TimeZoneStorage
+import org.hibernate.annotations.TimeZoneStorageType
+import org.hibernate.type.SqlTypes
+import java.io.Serial
+import java.io.Serializable
+import java.net.Inet4Address
+import java.time.ZonedDateTime
+import java.util.*
+
+//@Entity
+//@Table(name = "cloud_player")
+//class CloudPlayerEntity : Serializable {
+//
+//    @Id
+//    @GeneratedValue(strategy = GenerationType.IDENTITY)
+//    @JdbcTypeCode(SqlTypes.BIGINT)
+//    @Column(nullable = false)
+//    var id: Long? = null
+//
+//    @JdbcTypeCode(SqlTypes.CHAR)
+//    @Column(name = "uuid", nullable = false, unique = true, length = 36)
+//    var uuid: UUID? = null
+//
+//    @JdbcTypeCode(SqlTypes.CHAR)
+//    @Column(name = "last_server")
+//    var lastServer: String? = null
+//
+//    @TimeZoneStorage(TimeZoneStorageType.AUTO)
+//    @Column(name = "last_seen")
+//    var lastSeen: ZonedDateTime? = null
+//
+//    @Column(name = "last_ip_address")
+//    var lastIpAddress: Inet4Address? = null
+//
+//
+//    companion object {
+//        @Serial
+//        private const val serialVersionUID: Long = -7433875414223638042L
+//    }
+//}
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/temp/NettyServerProxiedPacketHandler.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/temp/NettyServerProxiedPacketHandler.kt
index fca93e42..d82a5745 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/temp/NettyServerProxiedPacketHandler.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/temp/NettyServerProxiedPacketHandler.kt
@@ -1,7 +1,7 @@
 package dev.slne.surf.cloud.standalone.temp
 
 //@Component
-//@Profile("independent")
+//@Profile("server")
 //class NettyServerProxiedPacketHandler : ChannelInitializerModifier {
 //    override fun modify(channel: Channel) {
 //        channel.pipeline().addBefore("packetHandler", "proxiedPacketHandler", Handler())
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/temp/SurfNettyServerPacketHandler.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/temp/SurfNettyServerPacketHandler.kt
index ec0b13a3..3253dd83 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/temp/SurfNettyServerPacketHandler.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/temp/SurfNettyServerPacketHandler.kt
@@ -2,7 +2,7 @@ package dev.slne.surf.cloud.standalone.temp
 
 //
 //@Component
-//@Profile("independent")
+//@Profile("server")
 //class SurfNettyServerPacketHandler(private val nettyServerImpl: NettyServerImpl) {
 //    @SurfNettyPacketHandler
 //    fun onCloudServerRegistration(packet: CloudRegisterServerPacket, info: NettyPacketInfo) {
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/test/TestEntity.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/test/TestEntity.kt
deleted file mode 100644
index 00fda926..00000000
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/test/TestEntity.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package dev.slne.surf.cloud.standalone.test
-
-import dev.slne.surf.cloud.api.server.jpa.SurfEntity
-import jakarta.persistence.Column
-import jakarta.persistence.Entity
-import jakarta.persistence.Table
-import java.util.*
-
-@Entity(name = "test_entity")
-@Table(name = "test_entities")
-class TestEntity(
-
-) : SurfEntity() {
-
-    @Column(
-        name = "active",
-        nullable = false
-    )
-    private var active: Boolean? = null
-
-    @Column(
-        name = "age",
-        nullable = false
-    )
-    private var age: Int? = null
-
-    @Column(
-        name = "balance",
-        nullable = false
-    )
-    private var balance: Double? = null
-
-    @Column(
-        name = "uuid",
-        nullable = false,
-        unique = true
-    )
-    private var uuid: UUID? = null
-
-    @Column(
-        name = "name",
-        nullable = false,
-        length = 16
-    )
-    private var name: String? = null
-
-    @Column(
-        name = "dumb",
-        nullable = false
-    )
-    private var dumb: Boolean? = null
-
-    @Column(name = "dummy")
-    var dummy: String? = null
-}
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/test/TestPacket.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/test/TestPacket.kt
deleted file mode 100644
index c659f044..00000000
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/test/TestPacket.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package dev.slne.surf.cloud.standalone.test
-
-import dev.slne.surf.cloud.standalone.redis.RedisEvent
-
-
-class TestPacket : RedisEvent {
-    var entity: TestEntity? = null
-        private set
-
-    constructor()
-
-    constructor(entity: TestEntity?) : super(CHANNEL) {
-        this.entity = entity
-    }
-
-    companion object {
-        const val CHANNEL: String = "surf:test:channel"
-    }
-}
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/test/TestPacketListener.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/test/TestPacketListener.kt
index 5e281762..4a915fd0 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/test/TestPacketListener.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/test/TestPacketListener.kt
@@ -1,17 +1,10 @@
 package dev.slne.surf.cloud.standalone.test
 
-import dev.slne.surf.cloud.api.common.util.logger
-import dev.slne.surf.cloud.standalone.redis.RedisEventHandler
+import dev.slne.surf.surfapi.core.api.util.logger
 import org.springframework.stereotype.Component
 
 
 @Component
 class TestPacketListener {
     private val log = logger()
-
-    @RedisEventHandler(TestPacket.CHANNEL)
-    fun handle(packet: TestPacket?) {
-        log.atInfo()
-            .log("Received packet: %s", packet)
-    }
 }
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/test/TestPdc.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/test/TestPdc.kt
index f902357a..00e65353 100644
--- a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/test/TestPdc.kt
+++ b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/test/TestPdc.kt
@@ -3,6 +3,7 @@ package dev.slne.surf.cloud.standalone.test
 import dev.slne.surf.cloud.api.common.event.player.connection.CloudPlayerConnectToNetworkEvent
 import dev.slne.surf.cloud.standalone.player.StandaloneCloudPlayerImpl
 import dev.slne.surf.surfapi.core.api.messages.Colors
+import dev.slne.surf.surfapi.core.api.messages.adventure.buildText
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -14,31 +15,36 @@ import org.springframework.stereotype.Component as SpringComponent
 
 @SpringComponent
 class TestPdc {
-    private val logger = ComponentLogger.logger()
-
-    @EventListener
-    fun onCloudPlayerConnectToNetwork(event: CloudPlayerConnectToNetworkEvent) {
-        logger.info(
-            Component.text(
-                "Player ${event.player.uuid} connected to the network",
-                Colors.SUCCESS
-            )
-        )
-
-        event.player.sendMessage(
-            Component.text(
-                "Welcome to the network!",
-                Colors.SUCCESS
-            )
-        )
-
-        event.player as StandaloneCloudPlayerImpl
-
-//        GlobalScope.launch {
-//            while (player.connected) {
-//                delay(1.seconds)
-//                logger.info("pdc: ${player.getPersistentData()}")
+//    private val logger = ComponentLogger.logger()
+//
+//    @EventListener
+//    fun onCloudPlayerConnectToNetwork(event: CloudPlayerConnectToNetworkEvent) {
+//        val player = event.player as StandaloneCloudPlayerImpl
+//        logger.info(
+////            Component.text(
+////                "Player ${player.uuid} connected to the network",
+////                Colors.SUCCESS
+////            )
+//            buildText {
+//                info("Player ")
+//                variableValue("${player.name} (${player.uuid})")
+//                info(" connected to the network")
 //            }
-//        }
-    }
+//        )
+//
+//        player.sendMessage(
+//            Component.text(
+//                "Welcome to the network!",
+//                Colors.SUCCESS
+//            )
+//        )
+//
+//
+////        GlobalScope.launch {
+////            while (player.connected) {
+////                delay(1.seconds)
+////                logger.info("pdc: ${player.getPersistentData()}")
+////            }
+////        }
+//    }
 }
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/resources/db/migration/V1__Add_cloud_player_tables.sql b/surf-cloud-standalone/src/main/resources/db/migration/V1__Add_cloud_player_tables.sql
new file mode 100644
index 00000000..efc0c1ab
--- /dev/null
+++ b/surf-cloud-standalone/src/main/resources/db/migration/V1__Add_cloud_player_tables.sql
@@ -0,0 +1,29 @@
+CREATE TABLE cloud_player
+(
+    id              BIGINT AUTO_INCREMENT               NOT NULL,
+    uuid            CHAR(36)                            NOT NULL,
+    last_server     VARCHAR(255)                        NULL,
+    last_seen       TIMESTAMP                           NULL,
+    last_ip_address VARCHAR(45)                         NULL,
+    created_at      TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    updated_at      TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL ON UPDATE CURRENT_TIMESTAMP NOT NULL,
+    CONSTRAINT `PRIMARY` PRIMARY KEY (id)
+);
+
+CREATE TABLE cloud_player_name_history
+(
+    id              BIGINT AUTO_INCREMENT               NOT NULL,
+    name            VARCHAR(16)                         NOT NULL,
+    cloud_player_id BIGINT                              NOT NULL,
+    created_at      TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    updated_at      TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL ON UPDATE CURRENT_TIMESTAMP NOT NULL,
+    CONSTRAINT `PRIMARY` PRIMARY KEY (id)
+);
+
+ALTER TABLE cloud_player
+    ADD CONSTRAINT uc_cloud_player_uuid UNIQUE (uuid);
+
+ALTER TABLE cloud_player_name_history
+    ADD CONSTRAINT FK_CLOUD_PLAYER_NAME_HISTORY_ON_CLOUD_PLAYER FOREIGN KEY (cloud_player_id) REFERENCES cloud_player (id) ON DELETE CASCADE;
+
+CREATE INDEX FK_CLOUD_PLAYER_NAME_HISTORY_ON_CLOUD_PLAYER ON cloud_player_name_history (cloud_player_id);
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/resources/log4j2-spring.xml b/surf-cloud-standalone/src/main/resources/log4j2-spring.xml
new file mode 100644
index 00000000..77b1cc5f
--- /dev/null
+++ b/surf-cloud-standalone/src/main/resources/log4j2-spring.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN" shutdownHook="disable">
+  <Properties>
+    <Property name="LOG_PATTERN">%highlightError{[%d{dd.MM.yyyy HH:mm:ss} %level]: %msg%n%xEx{full}}</Property>
+    <Property name="LOG_FILE_PATH">logs</Property>
+    <Property name="LOG_FILE_NAME">latest.log</Property>
+  </Properties>
+
+  <Appenders>
+    <TerminalConsole name="TerminalConsole">
+      <PatternLayout>
+        <Pattern>${LOG_PATTERN}</Pattern>
+      </PatternLayout>
+    </TerminalConsole>
+
+    <RollingRandomAccessFile name="File" fileName="logs/latest.log"
+      filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
+      <PatternLayout>
+        <Pattern>${LOG_PATTERN}</Pattern>
+      </PatternLayout>
+      <Policies>
+        <TimeBasedTriggeringPolicy/>
+        <OnStartupTriggeringPolicy/>
+      </Policies>
+      <DefaultRolloverStrategy max="1000"/>
+    </RollingRandomAccessFile>
+
+    <Async name="Async">
+      <AppenderRef ref="rewrite"/>
+    </Async>
+
+    <Rewrite name="rewrite">
+      <AppenderRef ref="File"/>
+      <AppenderRef ref="TerminalConsole" level="info"/>
+    </Rewrite>
+  </Appenders>
+
+  <Loggers>
+    <Root level="info">
+      <AppenderRef ref="Async"/>
+    </Root>
+  </Loggers>
+</Configuration>
\ No newline at end of file
diff --git a/surf-cloud-standalone/src/main/resources/logbackadjbboadobua.xml b/surf-cloud-standalone/src/main/resources/logbackadjbboadobua.xml
deleted file mode 100644
index dc1774fb..00000000
--- a/surf-cloud-standalone/src/main/resources/logbackadjbboadobua.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<configuration>
-
-  <!-- Aktualisierte conversionRule für benutzerdefinierte Farben -->
-  <conversionRule conversionWord="clr" class="org.springframework.boot.logging.logback.ColorConverter"/>
-
-  <!-- Konsole mit direkten ANSI-Farbcodes -->
-  <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
-    <encoder>
-      <pattern>
-        %clr([%d{HH:mm:ss} %level]: [%logger] %msg%n){
-        TRACE=blue, DEBUG=38;5;34, INFO=255;255;255, WARN=38;5;214, ERROR=38;5;196
-        }
-      </pattern>
-    </encoder>
-  </appender>
-
-  <!-- Rolling File Appender (ähnlich zu RollingRandomAccessFile in log4j) -->
-  <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    <file>logs/latest.log</file>
-    <encoder>
-      <pattern>[%d{HH:mm:ss}] [%thread/%level]: %msg%n</pattern>
-    </encoder>
-    <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-      <!-- Tägliches Rollover mit maximal 10 MB pro Datei -->
-      <fileNamePattern>logs/%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
-      <maxFileSize>10MB</maxFileSize>
-      <maxHistory>30</maxHistory>
-    </rollingPolicy>
-  </appender>
-
-
-  <!-- Root Logger (ähnlich zu Root in log4j) -->
-  <root level="INFO">
-    <appender-ref ref="CONSOLE" />
-    <appender-ref ref="FILE" />
-  </root>
-
-</configuration>
diff --git a/surf-cloud-test-plugin/surf-cloud-test-standalone/build.gradle.kts b/surf-cloud-test-plugin/surf-cloud-test-standalone/build.gradle.kts
index e1853ac1..6ffbfa8d 100644
--- a/surf-cloud-test-plugin/surf-cloud-test-standalone/build.gradle.kts
+++ b/surf-cloud-test-plugin/surf-cloud-test-standalone/build.gradle.kts
@@ -1,11 +1,10 @@
 plugins {
     id("dev.slne.surf.surfapi.gradle.core")
-    `core-convention`
 }
 
 dependencies {
     compileOnly(project(":surf-cloud-api:surf-cloud-api-server"))
+
     // https://mvnrepository.com/artifact/commons-io/commons-io
     compileOnly("commons-io:commons-io:2.18.0")
-
 }
\ No newline at end of file
diff --git a/surf-cloud-test-plugin/surf-cloud-test-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/test/TestStandaloneBootstrap.kt b/surf-cloud-test-plugin/surf-cloud-test-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/test/TestStandaloneBootstrap.kt
index 5e397aa3..03c3d15b 100644
--- a/surf-cloud-test-plugin/surf-cloud-test-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/test/TestStandaloneBootstrap.kt
+++ b/surf-cloud-test-plugin/surf-cloud-test-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/test/TestStandaloneBootstrap.kt
@@ -1,6 +1,6 @@
 package dev.slne.surf.cloud.standalone.test
 
-import dev.slne.surf.cloud.api.common.cloudInstance
+import dev.slne.surf.cloud.api.common.CloudInstance
 import dev.slne.surf.cloud.api.common.startSpringApplication
 import dev.slne.surf.cloud.api.server.plugin.bootstrap.BootstrapContext
 import dev.slne.surf.cloud.api.server.plugin.bootstrap.StandalonePluginBootstrap
@@ -11,6 +11,6 @@ class TestStandaloneBootstrap : StandalonePluginBootstrap {
             println("# Bootstrapping $it")
         }
 
-        cloudInstance.startSpringApplication(TestStandaloneSpringApplication::class)
+        CloudInstance.startSpringApplication(TestStandaloneSpringApplication::class)
     }
 }
\ No newline at end of file
diff --git a/surf-cloud-test-plugin/surf-cloud-test-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/test/TestStandalonePlugin.kt b/surf-cloud-test-plugin/surf-cloud-test-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/test/TestStandalonePlugin.kt
index 800d8e0b..8e5d95c1 100644
--- a/surf-cloud-test-plugin/surf-cloud-test-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/test/TestStandalonePlugin.kt
+++ b/surf-cloud-test-plugin/surf-cloud-test-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/test/TestStandalonePlugin.kt
@@ -1,11 +1,15 @@
 package dev.slne.surf.cloud.standalone.test
 
+import dev.slne.surf.cloud.api.server.plugin.KtorPlugin
 import dev.slne.surf.cloud.api.server.plugin.StandalonePlugin
+import io.ktor.server.routing.Routing
+import io.ktor.server.routing.get
+import io.ktor.server.websocket.webSocket
 import kotlinx.coroutines.delay
 import org.apache.commons.io.FileSystemUtils
 import kotlin.time.Duration.Companion.seconds
 
-class TestStandalonePlugin : StandalonePlugin() {
+class TestStandalonePlugin : StandalonePlugin(), KtorPlugin {
     override suspend fun load() {
         repeat(20) {
             println("# Loading4554 $it")
@@ -34,6 +38,9 @@ class TestStandalonePlugin : StandalonePlugin() {
             println("# Disabling $it")
         }
     }
+
+    override fun Routing.installRoutes() {
+    }
 }
 
 val plugin get() = StandalonePlugin.getPlugin<TestStandalonePlugin>()
\ No newline at end of file
diff --git a/surf-cloud-velocity/build.gradle.kts b/surf-cloud-velocity/build.gradle.kts
index b70643d1..4457f877 100644
--- a/surf-cloud-velocity/build.gradle.kts
+++ b/surf-cloud-velocity/build.gradle.kts
@@ -1,16 +1,16 @@
 plugins {
     id("dev.slne.surf.surfapi.gradle.velocity")
-    `core-convention`
 }
 
 dependencies {
     api(project(":surf-cloud-core:surf-cloud-core-client"))
+    api(project(":surf-cloud-api:surf-cloud-api-client:surf-cloud-api-client-velocity"))
 
-    api("org.springframework.boot:spring-boot-starter-data-jpa")
-    api("org.springframework.boot:spring-boot-starter-data-redis")
-    api("org.springframework.boot:spring-boot-starter-jooq")
-    api("com.fasterxml.jackson.core:jackson-core")
-    api("com.fasterxml.jackson.core:jackson-databind")
+//    api("org.springframework.boot:spring-boot-starter-data-jpa")
+}
+
+velocityPluginFile {
+    main = "dev.slne.surf.cloud.velocity.VelocityMain"
 }
 
 configurations {
diff --git a/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/SurfCloudVelocityInstance.kt b/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/CloudVelocityInstance.kt
similarity index 75%
rename from surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/SurfCloudVelocityInstance.kt
rename to surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/CloudVelocityInstance.kt
index 53a9fd81..818964f7 100644
--- a/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/SurfCloudVelocityInstance.kt
+++ b/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/CloudVelocityInstance.kt
@@ -1,15 +1,15 @@
 package dev.slne.surf.cloud.velocity
 
 import com.google.auto.service.AutoService
-import dev.slne.surf.cloud.api.common.SurfCloudInstance
+import dev.slne.surf.cloud.api.common.CloudInstance
 import dev.slne.surf.cloud.core.client.ClientCommonCloudInstance
 import dev.slne.surf.cloud.core.common.coreCloudInstance
 import dev.slne.surf.cloud.core.common.util.checkInstantiationByServiceLoader
 import dev.slne.surf.cloud.velocity.listener.ListenerManager
 import dev.slne.surf.cloud.velocity.netty.VelocityNettyManager
 
-@AutoService(SurfCloudInstance::class)
-class SurfCloudVelocityInstance : ClientCommonCloudInstance(VelocityNettyManager) {
+@AutoService(CloudInstance::class)
+class CloudVelocityInstance : ClientCommonCloudInstance(VelocityNettyManager) {
     init {
         checkInstantiationByServiceLoader()
     }
@@ -28,4 +28,4 @@ class SurfCloudVelocityInstance : ClientCommonCloudInstance(VelocityNettyManager
 }
 
 val velocityCloudInstance
-    get() = coreCloudInstance as SurfCloudVelocityInstance
+    get() = coreCloudInstance as CloudVelocityInstance
diff --git a/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/VelocityMain.kt b/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/VelocityMain.kt
index b66df8d0..9ec60fc9 100644
--- a/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/VelocityMain.kt
+++ b/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/VelocityMain.kt
@@ -5,25 +5,23 @@ import com.velocitypowered.api.event.EventManager
 import com.velocitypowered.api.event.Subscribe
 import com.velocitypowered.api.event.proxy.ProxyInitializeEvent
 import com.velocitypowered.api.event.proxy.ProxyShutdownEvent
-import com.velocitypowered.api.plugin.Dependency
-import com.velocitypowered.api.plugin.Plugin
 import com.velocitypowered.api.plugin.PluginManager
 import com.velocitypowered.api.plugin.annotation.DataDirectory
 import com.velocitypowered.api.proxy.ProxyServer
-import dev.slne.surf.cloud.core.common.SurfCloudCoreInstance
+import dev.slne.surf.cloud.core.common.CloudCoreInstance
 import dev.slne.surf.cloud.core.common.handleEventuallyFatalError
 import kotlinx.coroutines.runBlocking
 import java.nio.file.Path
 import kotlin.system.exitProcess
 
-@Plugin(
-    id = "surf-cloud-velocity",
-    name = "Surf Cloud Velocity",
-    version = "1.21.4-1.0.0-SNAPSHOT",
-    description = "A cloud plugin for Velocity",
-    authors = ["twisti"],
-    dependencies = [Dependency("surf-api-velocity"), Dependency("luckperms")]
-)
+//@Plugin(
+//    id = "surf-cloud-velocity",
+//    name = "Surf Cloud Velocity",
+//    version = "1.21.4-1.0.0-SNAPSHOT",
+//    description = "A cloud plugin for Velocity",
+//    authors = ["twisti"],
+//    dependencies = [Dependency("surf-api-velocity"), Dependency("luckperms")]
+//)
 class VelocityMain @Inject constructor(
     val server: ProxyServer,
     val pluginManager: PluginManager,
@@ -35,14 +33,14 @@ class VelocityMain @Inject constructor(
             instance = this
             runBlocking {
                 velocityCloudInstance.bootstrap(
-                    SurfCloudCoreInstance.BootstrapData(
+                    CloudCoreInstance.BootstrapData(
                         dataFolder = dataPath
                     )
                 )
                 velocityCloudInstance.onLoad()
             }
         } catch (e: Throwable) {
-            e.handleEventuallyFatalError { exitProcess(it.exitCode) }
+            e.handleEventuallyFatalError({ exitProcess(it.exitCode) })
         }
     }
 
@@ -52,7 +50,7 @@ class VelocityMain @Inject constructor(
             velocityCloudInstance.onEnable()
             velocityCloudInstance.afterStart()
         } catch (e: Throwable) {
-            e.handleEventuallyFatalError { exitProcess(it.exitCode) }
+            e.handleEventuallyFatalError({ exitProcess(it.exitCode) })
         }
     }
 
@@ -61,7 +59,7 @@ class VelocityMain @Inject constructor(
         try {
             velocityCloudInstance.onDisable()
         } catch (e: Throwable) {
-            e.handleEventuallyFatalError { }
+            e.handleEventuallyFatalError({})
         }
     }
 
diff --git a/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/listener/player/ConnectionListener.kt b/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/listener/player/ConnectionListener.kt
index 0092b1b2..8c1165c1 100644
--- a/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/listener/player/ConnectionListener.kt
+++ b/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/listener/player/ConnectionListener.kt
@@ -7,7 +7,9 @@ import com.velocitypowered.api.event.connection.LoginEvent
 import dev.slne.surf.cloud.api.client.netty.packet.fireAndForget
 import dev.slne.surf.cloud.core.common.data.CloudPersistentData
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.PlayerConnectToServerPacket
+import dev.slne.surf.cloud.core.common.netty.network.protocol.running.PlayerDisconnectFromServerPacket
 import org.springframework.stereotype.Component
+import java.net.Inet4Address
 
 @Component
 class ConnectionListener {
@@ -16,16 +18,20 @@ class ConnectionListener {
     fun onLogin(event: LoginEvent) {
         if (!event.result.isAllowed) return
 
+        val player = event.player
         PlayerConnectToServerPacket(
-            event.player.uniqueId,
-            CloudPersistentData.SERVER_ID,
-            true
+            player.uniqueId,
+            player.username,
+            true,
+            player.remoteAddress.address as? Inet4Address
+                ?: error("Player address is not an Inet4Address"),
+            CloudPersistentData.SERVER_ID
         ).fireAndForget()
     }
 
     @Subscribe(order = PostOrder.CUSTOM)
     fun onDisconnect(event: DisconnectEvent) {
-        PlayerConnectToServerPacket(
+        PlayerDisconnectFromServerPacket(
             event.player.uniqueId,
             CloudPersistentData.SERVER_ID,
             true
diff --git a/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/netty/network/VelocitySpecificPacketListenerExtension.kt b/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/netty/network/VelocitySpecificPacketListenerExtension.kt
index a072a8cf..7cc62b7a 100644
--- a/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/netty/network/VelocitySpecificPacketListenerExtension.kt
+++ b/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/netty/network/VelocitySpecificPacketListenerExtension.kt
@@ -2,9 +2,9 @@ package dev.slne.surf.cloud.velocity.netty.network
 
 import com.velocitypowered.api.proxy.ConnectionRequestBuilder
 import com.velocitypowered.api.proxy.server.ServerInfo
-import dev.slne.surf.cloud.api.common.util.position.FineLocation
-import dev.slne.surf.cloud.api.common.util.position.FineTeleportCause
-import dev.slne.surf.cloud.api.common.util.position.FineTeleportFlag
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportLocation
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportCause
+import dev.slne.surf.cloud.api.common.player.teleport.TeleportFlag
 import dev.slne.surf.cloud.core.client.netty.network.PlatformSpecificPacketListenerExtension
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.RegistrationInfo
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ServerboundTransferPlayerPacketResponse.Status
@@ -45,9 +45,9 @@ object VelocitySpecificPacketListenerExtension : PlatformSpecificPacketListenerE
 
     override suspend fun teleportPlayer(
         uuid: UUID,
-        location: FineLocation,
-        teleportCause: FineTeleportCause,
-        flags: Array<out FineTeleportFlag>
+        location: TeleportLocation,
+        teleportCause: TeleportCause,
+        flags: Array<out TeleportFlag>
     ): Boolean {
         error("Teleporting players is not supported on Velocity")
     }
@@ -56,4 +56,8 @@ object VelocitySpecificPacketListenerExtension : PlatformSpecificPacketListenerE
         servers.map { (name, address) -> ServerInfo(name, address) }
             .forEach { proxy.registerServer(it) }
     }
+
+    override fun triggerShutdown() {
+        proxy.shutdown()
+    }
 }
\ No newline at end of file
diff --git a/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/player/VelocityClientCloudPlayerImpl.kt b/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/player/VelocityClientCloudPlayerImpl.kt
index 83f87900..eb51c535 100644
--- a/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/player/VelocityClientCloudPlayerImpl.kt
+++ b/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/player/VelocityClientCloudPlayerImpl.kt
@@ -8,8 +8,8 @@ import java.util.*
 
 class VelocityClientCloudPlayerImpl(uuid: UUID) : ClientCloudPlayerImpl<Player>(uuid) {
     override val platformClass = Player::class.java
-    override val player: Player? get() = proxy.getPlayer(uuid).orElse(null)
+    override val audience: Player? get() = proxy.getPlayer(uuid).orElse(null)
     override fun disconnect(reason: Component) {
-        player?.disconnect(reason)
+        audience?.disconnect(reason)
     }
 }
\ No newline at end of file
diff --git a/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/player/VelocityCloudPlayerManagerImpl.kt b/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/player/VelocityCloudPlayerManagerImpl.kt
index 634e7e15..10a8fe74 100644
--- a/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/player/VelocityCloudPlayerManagerImpl.kt
+++ b/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/player/VelocityCloudPlayerManagerImpl.kt
@@ -6,6 +6,7 @@ import dev.slne.surf.cloud.api.common.player.CloudPlayerManager
 import dev.slne.surf.cloud.core.client.player.CommonClientCloudPlayerManagerImpl
 import dev.slne.surf.cloud.core.common.util.checkInstantiationByServiceLoader
 import dev.slne.surf.cloud.velocity.proxy
+import java.net.Inet4Address
 import java.util.*
 
 @AutoService(CloudPlayerManager::class)
@@ -17,8 +18,10 @@ class VelocityCloudPlayerManagerImpl :
 
     override suspend fun createPlayer(
         uuid: UUID,
-        serverUid: Long,
-        proxy: Boolean
+        name: String,
+        proxy: Boolean,
+        ip: Inet4Address,
+        serverUid: Long
     ): VelocityClientCloudPlayerImpl {
         return VelocityClientCloudPlayerImpl(uuid).also {
             if (proxy) {
diff --git a/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/processor/VelocityListenerProcessor.kt b/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/processor/VelocityListenerProcessor.kt
index 08d619a1..6011529b 100644
--- a/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/processor/VelocityListenerProcessor.kt
+++ b/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/processor/VelocityListenerProcessor.kt
@@ -3,11 +3,11 @@ package dev.slne.surf.cloud.velocity.processor
 import com.velocitypowered.api.event.Subscribe
 import dev.slne.surf.cloud.api.common.util.containsMethodWithAnnotation
 import dev.slne.surf.cloud.api.common.util.isCandidateFor
-import dev.slne.surf.cloud.api.common.util.logger
 import dev.slne.surf.cloud.api.common.util.mutableObjectSetOf
 import dev.slne.surf.cloud.api.common.util.ultimateTargetClass
 import dev.slne.surf.cloud.velocity.VelocityMain
 import dev.slne.surf.cloud.velocity.plugin
+import dev.slne.surf.surfapi.core.api.util.logger
 import org.springframework.aop.framework.AopInfrastructureBean
 import org.springframework.beans.BeansException
 import org.springframework.beans.factory.BeanCreationException