feat(proxy): add support for dynamic velocity secret management

twisti-dev · twisti-dev · commit b88c0d9a1a17 · 2025-06-22T19:27:04.000+02:00
diff --git a/surf-cloud-api/surf-cloud-api-common/build.gradle.kts b/surf-cloud-api/surf-cloud-api-common/build.gradle.kts
@@ -1,5 +1,4 @@
 import dev.slne.surf.surfapi.gradle.util.slneReleases
-import jdk.tools.jlink.resources.plugins
 
 plugins {
     id("dev.slne.surf.surfapi.gradle.core")
diff --git a/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/NettyClient.kt b/surf-cloud-api/surf-cloud-api-common/src/main/kotlin/dev/slne/surf/cloud/api/common/netty/NettyClient.kt
@@ -15,6 +15,8 @@ interface NettyClient {
     val serverCategory: String
     val serverName: String
 
+    val velocitySecret: ByteArray
+
     val connection: Connection
 
     /**
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
@@ -5,12 +5,10 @@ import dev.slne.surf.cloud.api.common.meta.SurfNettyPacket
 import dev.slne.surf.cloud.api.common.netty.network.codec.StreamCodec
 import dev.slne.surf.cloud.api.common.netty.network.codec.StreamDecoder
 import dev.slne.surf.cloud.api.common.netty.network.codec.StreamMemberEncoder
-import dev.slne.surf.cloud.api.common.netty.network.codec.kotlinx.SurfCloudBufSerializer
 import dev.slne.surf.cloud.api.common.netty.protocol.buffer.SurfByteBuf
 import dev.slne.surf.cloud.api.common.util.mutableObject2ObjectMapOf
 import io.netty.buffer.ByteBuf
 import kotlinx.serialization.InternalSerializationApi
-import kotlinx.serialization.KSerializer
 import kotlinx.serialization.serializer
 import kotlinx.serialization.serializerOrNull
 import kotlin.reflect.KClass
@@ -68,17 +66,8 @@ private val codecCache = mutableObject2ObjectMapOf<KClass<out NettyPacket>, Stre
 
 
 @OptIn(InternalSerializationApi::class)
-fun <P : Any> KClass<out P>.createCodec(): StreamCodec<SurfByteBuf, P> {
-    val serializer = serializer()
-    return object : StreamCodec<SurfByteBuf, P> {
-        override fun decode(buf: SurfByteBuf): P {
-            return SurfCloudBufSerializer.serializer.decodeFromBuf(buf, serializer)
-        }
-
-        override fun encode(buf: SurfByteBuf, value: P) {
-            SurfCloudBufSerializer.serializer.encodeToBuf(buf, serializer as KSerializer<P>, value)
-        }
-    }
+fun <P : Any> KClass<P>.createCodec(): StreamCodec<SurfByteBuf, P> {
+    return SurfByteBuf.streamCodecFromKotlin(serializer())
 }
 
 /**
@@ -96,19 +85,7 @@ fun <B : ByteBuf, V : NettyPacket> KClass<out V>.findPacketCodec(): StreamCodec<
 
     val serializer = serializerOrNull()
     if (serializer != null) {
-        return object : StreamCodec<B, V> {
-            override fun decode(buf: B): V {
-                return SurfCloudBufSerializer.serializer.decodeFromBuf(buf, serializer)
-            }
-
-            override fun encode(buf: B, value: V) {
-                SurfCloudBufSerializer.serializer.encodeToBuf(
-                    buf,
-                    serializer as KSerializer<V>,
-                    value
-                )
-            }
-        }
+        return SurfByteBuf.streamCodecFromKotlin(serializer)
     }
 
     val properties =
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
@@ -97,18 +97,18 @@ open class SurfByteBuf(source: ByteBuf) : WrappedByteBuf(source) {
 
         private val GSON = Gson()
 
-        fun <T> streamCodecFromKotlin(serializer: KSerializer<T>): StreamCodec<SurfByteBuf, T> {
+        fun <B: ByteBuf, T> streamCodecFromKotlin(serializer: KSerializer<T>): StreamCodec<B, T> {
             return SerializerCodec(serializer)
         }
 
-        private class SerializerCodec<T>(private val serializer: KSerializer<T>) :
-            StreamCodec<SurfByteBuf, T> {
-            override fun decode(buf: SurfByteBuf): T {
+        private class SerializerCodec<B: ByteBuf, T>(private val serializer: KSerializer<T>) :
+            StreamCodec<B, T> {
+            override fun decode(buf: B): T {
                 return SurfCloudBufSerializer.serializer.decodeFromBuf(buf, serializer)
             }
 
             override fun encode(
-                buf: SurfByteBuf,
+                buf: B,
                 value: T
             ) {
                 SurfCloudBufSerializer.serializer.encodeToBuf(buf, serializer, value)
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
@@ -13,12 +13,15 @@ import dev.slne.surf.cloud.core.client.server.ClientCloudServerImpl
 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 dev.slne.surf.surfapi.bukkit.api.extensions.server
+import dev.slne.surf.surfapi.bukkit.api.nms.NmsUseWithCaution
+import dev.slne.surf.surfapi.bukkit.api.nms.bridges.nmsCommonBridge
 import dev.slne.surf.surfapi.bukkit.api.util.dispatcher
 import kotlinx.coroutines.future.await
 import net.kyori.adventure.text.Component
 import org.bukkit.Bukkit
 import java.net.InetAddress
 import java.net.InetSocketAddress
+import java.nio.charset.StandardCharsets
 import java.util.*
 import kotlin.io.path.Path
 import kotlin.io.path.inputStream
@@ -100,6 +103,12 @@ class BukkitSpecificPacketListenerExtension : PlatformSpecificPacketListenerExte
         return player.teleportAsync(targetPlayer.location).await()
     }
 
+    @OptIn(NmsUseWithCaution::class)
+    override fun setVelocitySecret(secret: ByteArray) {
+        nmsCommonBridge.setVelocityEnabled(true)
+        nmsCommonBridge.setVelocitySecret(secret.toString(StandardCharsets.UTF_8))
+    }
+
     override fun triggerShutdown() {
         plugin.launch(plugin.globalRegionDispatcher) {
             Bukkit.shutdown()
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
@@ -61,6 +61,8 @@ class ClientNettyClientImpl(
         log.atInfo().log(it)
     }
 
+    override var velocitySecret = ByteArray(0)
+
     /**
      * Bootstraps the client. Setup the connection protocol until the PreRunning state.
      */
@@ -72,6 +74,7 @@ class ClientNettyClientImpl(
 
 
     suspend fun stop() {
+        velocitySecret.fill(0)
         doShutdown()
     }
 
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
@@ -19,6 +19,7 @@ import dev.slne.surf.cloud.core.client.util.getOrLoadUser
 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.common.ClientboundSetVelocitySecretPacket
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.*
 import dev.slne.surf.cloud.core.common.netty.registry.listener.NettyListenerRegistry
 import dev.slne.surf.cloud.core.common.player.playerManagerImpl
@@ -342,6 +343,17 @@ class ClientRunningPacketListenerImpl(
         }
     }
 
+    override fun handleSetVelocitySecret(packet: ClientboundSetVelocitySecretPacket) {
+        try {
+            client.velocitySecret = packet.secret
+            platformExtension.setVelocitySecret(packet.secret)
+        } catch (e: Throwable) {
+            log.atWarning()
+                .withCause(e)
+                .log("Failed to set velocity secret for packet $packet")
+        }
+    }
+
     override fun handlePacket(packet: NettyPacket) {
         val listeners = NettyListenerRegistry.getListeners(packet.javaClass) ?: return
         if (listeners.isEmpty()) return
diff --git a/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientSynchronizingPacketListenerImpl.kt b/surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/netty/network/ClientSynchronizingPacketListenerImpl.kt
@@ -11,6 +11,7 @@ import dev.slne.surf.cloud.core.client.sync.SyncRegistryImpl
 import dev.slne.surf.cloud.core.common.coroutines.BeforeStartTaskScope
 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.common.ClientboundSetVelocitySecretPacket
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ClientboundBatchUpdateServer
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.RunningProtocols
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.SyncSetDeltaPacket
@@ -113,6 +114,17 @@ class ClientSynchronizingPacketListenerImpl(
         }
     }
 
+    override fun handleSetVelocitySecret(packet: ClientboundSetVelocitySecretPacket) {
+        try {
+            client.velocitySecret = packet.secret
+            platformExtension.setVelocitySecret(packet.secret)
+        } catch (e: Exception) {
+            log.atWarning()
+                .withCause(e)
+                .log("Failed to set velocity secret for packet $packet")
+        }
+    }
+
     override fun handlePacket(packet: NettyPacket) {
         val listeners = NettyListenerRegistry.getListeners(packet.javaClass) ?: return
         if (listeners.isEmpty()) return
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
@@ -38,6 +38,8 @@ interface PlatformSpecificPacketListenerExtension {
 
     suspend fun teleportPlayerToPlayer(uuid: UUID, target: UUID): Boolean
 
+    fun setVelocitySecret(secret: ByteArray)
+
     fun triggerShutdown()
 
     fun restart()
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
@@ -23,6 +23,7 @@ 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.hasPermissionPlattform
 import dev.slne.surf.surfapi.core.api.messages.adventure.getPointer
+import dev.slne.surf.surfapi.core.api.nbt.fast
 import net.kyori.adventure.audience.Audience
 import net.kyori.adventure.audience.MessageType
 import net.kyori.adventure.bossbar.BossBar
@@ -120,7 +121,7 @@ abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(uuid: UUID, name
         val response = ServerboundRequestPlayerPersistentDataContainer(uuid).fireAndAwaitOrThrow()
 
         val nbt = response.nbt
-        val container = PersistentPlayerDataContainerImpl(nbt)
+        val container = PersistentPlayerDataContainerImpl(nbt.fast(true))
         val result = container.block()
 
         ServerboundPlayerPersistentDataContainerUpdatePacket(
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
@@ -460,6 +460,7 @@ class ConnectionImpl(
                         is ClientboundBatchSyncSetPacket -> listener.handleBatchSyncSet(msg)
                         is ClientboundBatchUpdateServer -> listener.handleBatchUpdateServer(msg)
                         is SyncSetDeltaPacket -> listener.handleSyncSetDelta(msg)
+                        is ClientboundSetVelocitySecretPacket -> listener.handleSetVelocitySecret(msg)
 
                         else -> listener.handlePacket(msg)
                     }
@@ -564,6 +565,7 @@ class ConnectionImpl(
                         )
                         is SyncValueChangePacket -> listener.handleSyncValueChange(msg)
                         is SyncSetDeltaPacket -> listener.handleSyncSetDelta(msg)
+                        is ClientboundSetVelocitySecretPacket -> listener.handleSetVelocitySecret(msg)
 
                         else -> listener.handlePacket(msg)
                     }
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/common/ClientboundSetVelocitySecretPacket.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/common/ClientboundSetVelocitySecretPacket.kt
@@ -0,0 +1,15 @@
+package dev.slne.surf.cloud.core.common.netty.network.protocol.common
+
+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 kotlinx.serialization.Serializable
+
+@SurfNettyPacket("cloud:clientbound:set_velocity_secret", PacketFlow.CLIENTBOUND)
+@Serializable
+class ClientboundSetVelocitySecretPacket(val secret: ByteArray): NettyPacket() {
+    override fun toString(): String {
+        return "ClientboundSetVelocitySecretPacket(secret=***)" +
+                " ${super.toString()}"
+    }
+}
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
@@ -3,6 +3,7 @@ package dev.slne.surf.cloud.core.common.netty.network.protocol.running
 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.core.common.netty.network.protocol.common.ClientCommonPacketListener
+import dev.slne.surf.cloud.core.common.netty.network.protocol.common.ClientboundSetVelocitySecretPacket
 
 interface RunningClientPacketListener : ClientCommonPacketListener {
     override val protocol get() = ConnectionProtocol.RUNNING
@@ -87,5 +88,7 @@ interface RunningClientPacketListener : ClientCommonPacketListener {
 
     fun handleSyncSetDelta(packet: SyncSetDeltaPacket)
 
+    fun handleSetVelocitySecret(packet: ClientboundSetVelocitySecretPacket)
+
     fun handlePacket(packet: NettyPacket)
 }
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
@@ -68,6 +68,7 @@ object RunningProtocols {
                 .addPacket(RequestPlayerPermissionPacket::class.createCodec())
                 .addPacket(SyncValueChangePacket.STREAM_CODEC)
                 .addPacket(SyncSetDeltaPacket.STREAM_CODEC)
+                .addPacket(ClientboundSetVelocitySecretPacket::class.createCodec())
         }
 
     val CLIENTBOUND by lazy { CLIENTBOUND_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/synchronizing/ClientSynchronizingPacketListener.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/synchronizing/ClientSynchronizingPacketListener.kt
@@ -3,6 +3,7 @@ package dev.slne.surf.cloud.core.common.netty.network.protocol.synchronizing
 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.core.common.netty.network.protocol.common.ClientCommonPacketListener
+import dev.slne.surf.cloud.core.common.netty.network.protocol.common.ClientboundSetVelocitySecretPacket
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ClientboundBatchUpdateServer
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.SyncSetDeltaPacket
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.SyncValueChangePacket
@@ -22,5 +23,7 @@ interface ClientSynchronizingPacketListener : ClientCommonPacketListener {
 
     fun handleSyncSetDelta(packet: SyncSetDeltaPacket)
 
+    fun handleSetVelocitySecret(packet: ClientboundSetVelocitySecretPacket)
+
     fun handlePacket(packet: NettyPacket)
 }
diff --git a/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/synchronizing/SynchronizingProtocols.kt b/surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/netty/network/protocol/synchronizing/SynchronizingProtocols.kt
@@ -25,6 +25,7 @@ object SynchronizingProtocols {
                 .addPacket(SyncSetDeltaPacket.STREAM_CODEC)
                 .addPacket(FinishSynchronizingPacket.STREAM_CODEC)
                 .addPacket(ClientboundSynchronizeFinishPacket.STREAM_CODEC)
+                .addPacket(ClientboundSetVelocitySecretPacket::class.createCodec())
         }
 
     val CLIENTBOUND by lazy { CLIENTBOUND_TEMPLATE.bind(::SurfByteBuf) }
diff --git a/surf-cloud-standalone/libs/spark-1.10.138-standalone-agent.jar b/surf-cloud-standalone/libs/spark-1.10.138-standalone-agent.jar
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
@@ -36,6 +36,9 @@ data class StandaloneConfig(
     @Comment("Configuration for the queue system.")
     @Setting("queue")
     val queue: QueueConfig = QueueConfig(),
+
+    @Setting("proxy")
+    val proxy: ProxyConfig = ProxyConfig(),
 )
 
 @ConfigSerializable
@@ -82,3 +85,20 @@ data class QueueConfig(
 
     val suspendedQueueCharacter: Char = '⏸',
 )
+
+@ConfigSerializable
+data class ProxyConfig(
+    @Setting("secret")
+    val secretConfig: SecretConfig = SecretConfig())
+{
+    @ConfigSerializable
+    data class SecretConfig(
+        val type: SecretType = SecretType.DYNAMIC,
+        val manualSecret: String = "",
+    ) {
+        enum class SecretType {
+            MANUAL,
+            DYNAMIC
+        }
+    }
+}
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/ProxySecretHolder.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/ProxySecretHolder.kt
@@ -0,0 +1,27 @@
+package dev.slne.surf.cloud.standalone.netty.server
+
+import dev.slne.surf.cloud.api.server.netty.packet.broadcast
+import dev.slne.surf.cloud.core.common.netty.network.protocol.common.ClientboundSetVelocitySecretPacket
+import dev.slne.surf.cloud.standalone.config.ProxyConfig.SecretConfig.SecretType
+import dev.slne.surf.cloud.standalone.config.standaloneConfig
+import dev.slne.surf.surfapi.core.api.util.random
+
+object ProxySecretHolder {
+
+    private var dynamicSecret = randomSecret()
+
+    private fun randomSecret() = ByteArray(128).apply { random.nextBytes(this) }
+
+    fun currentSecret(): ByteArray {
+        val secretConfig = standaloneConfig.proxy.secretConfig
+        return when (secretConfig.type) {
+            SecretType.MANUAL -> secretConfig.manualSecret.toByteArray()
+            SecretType.DYNAMIC -> dynamicSecret
+        }
+    }
+
+    fun reloadSecret() {
+        dynamicSecret = randomSecret()
+        ClientboundSetVelocitySecretPacket(currentSecret()).broadcast()
+    }
+}
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/ServerClientImpl.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/ServerClientImpl.kt
@@ -12,12 +12,15 @@ class ServerClientImpl(
     serverCategory: String,
     serverName: String,
     override val playAddress: InetSocketAddress,
-    val lobbyServer: Boolean
+    val lobbyServer: Boolean,
 ) : CommonNettyClientImpl(serverId, serverCategory, serverName) {
 
     private var _listener: ServerRunningPacketListenerImpl? = null
     val listener get() = _listener ?: error("listener not yet set")
 
+    override val velocitySecret: ByteArray
+        get() = ProxySecretHolder.currentSecret()
+
     fun initListener(listener: ServerRunningPacketListenerImpl) {
         _listener = listener
     }
@@ -28,6 +31,13 @@ class ServerClientImpl(
 
     companion object {
         fun fromPacket(server: NettyServerImpl, packet: ServerboundLoginStartPacket) =
-            ServerClientImpl(server, packet.serverId, packet.serverCategory, packet.serverName, packet.playAddress, packet.lobby)
+            ServerClientImpl(
+                server,
+                packet.serverId,
+                packet.serverCategory,
+                packet.serverName,
+                packet.playAddress,
+                packet.lobby
+            )
     }
 }
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerSynchronizingPacketListenerImpl.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/network/ServerSynchronizingPacketListenerImpl.kt
diff --git a/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spark/provider/CloudMetadataProvider.kt b/surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/spark/provider/CloudMetadataProvider.kt
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
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
diff --git a/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/reflection/VelocityConfigurationProxy.kt b/surf-cloud-velocity/src/main/kotlin/dev/slne/surf/cloud/velocity/reflection/VelocityConfigurationProxy.kt

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import dev.slne.surf.surfapi.gradle.util.slneReleases`
`2`		`-import jdk.tools.jlink.resources.plugins`
`3`	`2`
`4`	`3`	`plugins {`
`5`	`4`	`id("dev.slne.surf.surfapi.gradle.core")`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,8 @@ class ClientNettyClientImpl(`
`61`	`61`	`log.atInfo().log(it)`
`62`	`62`	`}`
`63`	`63`
	`64`	`+ override var velocitySecret = ByteArray(0)`
	`65`	`+`
`64`	`66`	`/**`
`65`	`67`	`* Bootstraps the client. Setup the connection protocol until the PreRunning state.`
`66`	`68`	`*/`
`@@ -72,6 +74,7 @@ class ClientNettyClientImpl(`
`72`	`74`
`73`	`75`
`74`	`76`	`suspend fun stop() {`
	`77`	`+ velocitySecret.fill(0)`
`75`	`78`	`doShutdown()`
`76`	`79`	`}`
`77`	`80`