Merge branch 'master' into cleanup-dead-code

Author: ammodev

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

@@ -6,7 +6,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration
 import org.springframework.boot.autoconfigure.domain.EntityScan
 import org.springframework.boot.context.TypeExcludeFilter
 import org.springframework.cache.annotation.EnableCaching
-import org.springframework.context.annotation.AdviceMode
 import org.springframework.context.annotation.ComponentScan
 import org.springframework.context.annotation.FilterType
 import org.springframework.scheduling.annotation.EnableAsync
@@ -25,7 +24,7 @@ import java.lang.annotation.Inherited
 @EnableScheduling
 @EnableAsync(mode = AdviceMode.ASPECTJ)
 @EntityScan
-@EnableCaching(mode = AdviceMode.ASPECTJ)
+@EnableCaching
 @AutoConfigurationPackage
 @Inherited
 @EnableAutoConfiguration

surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/exposed/columns/ComponentColumnType.kt

@@ -19,7 +19,7 @@ class ComponentColumnType : ColumnType<Component>() {
         else -> error("Unexpected value of type Component: $value of ${value::class.qualifiedName}")
     }
 
-    override fun nonNullValueToString(value: Component): String =
+    override fun notNullValueToDB(value: Component): Any =
         GsonComponentSerializer.gson().serialize(value)
 }
 

surf-cloud-api/surf-cloud-api-server/src/main/kotlin/dev/slne/surf/cloud/api/server/plugin/AdditionalStandaloneConfiguration.kt

@@ -58,6 +58,9 @@ import kotlin.coroutines.startCoroutine
 )
 annotation class AdditionalStandaloneConfiguration
 
+@AdditionalStandaloneConfiguration
+class PluginConfig
+
 
 @EnableTransactionManagement(mode = AdviceMode.ASPECTJ)
 @Configuration

surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/player/ClientCloudPlayerImpl.kt

@@ -77,8 +77,7 @@ import dev.slne.surf.cloud.core.common.netty.network.protocol.running.serverboun
 
 abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(
     uuid: UUID,
-    name: String,
-    private val createIfNotExists: Boolean
+    name: String
 ) : CommonCloudPlayerImpl(uuid, name) {
     @Volatile
     var proxyServerUid: Long? = null
@@ -99,12 +98,6 @@ abstract class ClientCloudPlayerImpl<PlatformPlayer : Audience>(
 
     protected abstract val platformClass: Class<PlatformPlayer>
 
-    init {
-        if (createIfNotExists && player == null) {
-            ServerboundCreateOfflineCloudPlayerIfNotExistsPacket(uuid).fireAndForget()
-        }
-    }
-
     override suspend fun latestIpAddress(): Inet4Address {
         return request<IpAddress>(DataRequestType.LATEST_IP_ADDRESS).ip
             ?: error("Failed to get IP address")

surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/player/CommonClientCloudPlayerManagerImpl.kt

@@ -44,8 +44,8 @@ abstract class CommonClientCloudPlayerManagerImpl<Platform : Audience, P : Clien
         return player.serverUid
     }
 
-    override fun getOfflinePlayer(uuid: UUID): CommonOfflineCloudPlayerImpl { // FIXME: 24.07.2025 15:15 Fix create if not exists
-        return OfflineCloudPlayerImpl(uuid)
+    override fun getOfflinePlayer(uuid: UUID, createIfNotExists: Boolean): CommonOfflineCloudPlayerImpl {
+        return OfflineCloudPlayerImpl(uuid, createIfNotExists)
     }
 
     abstract fun getAudience(uuid: UUID): Audience?

surf-cloud-core/surf-cloud-core-client/src/main/kotlin/dev/slne/surf/cloud/core/client/player/OfflineCloudPlayerImpl.kt

@@ -1,11 +1,14 @@
 package dev.slne.surf.cloud.core.client.player
 
 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.player.name.NameHistory
 import dev.slne.surf.cloud.api.common.player.playtime.Playtime
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.serverbound.ServerboundRequestPlayerDataPacket
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.serverbound.ServerboundRequestPlayerDataPacket.DataRequestType
 import dev.slne.surf.cloud.core.common.netty.network.protocol.running.serverbound.getGenericValue
+import dev.slne.surf.cloud.core.common.netty.network.protocol.running.ServerboundCreateOfflineCloudPlayerIfNotExistsPacket
+import dev.slne.surf.cloud.core.common.netty.network.protocol.running.getGenericValue
 import dev.slne.surf.cloud.core.common.player.CommonOfflineCloudPlayerImpl
 import dev.slne.surf.surfapi.core.api.messages.Colors
 import dev.slne.surf.surfapi.core.api.messages.adventure.text
@@ -14,7 +17,14 @@ import java.net.Inet4Address
 import java.time.ZonedDateTime
 import java.util.*
 
-class OfflineCloudPlayerImpl(uuid: UUID) : CommonOfflineCloudPlayerImpl(uuid) {
+class OfflineCloudPlayerImpl(uuid: UUID, createIfNotExists: Boolean) :
+    CommonOfflineCloudPlayerImpl(uuid) {
+    init {
+        if (createIfNotExists && player == null) {
+            ServerboundCreateOfflineCloudPlayerIfNotExistsPacket(uuid).fireAndForget()
+        }
+    }
+
     override suspend fun nameHistory(): NameHistory {
         return request(DataRequestType.NAME_HISTORY)
     }

surf-cloud-core/surf-cloud-core-common/src/main/kotlin/dev/slne/surf/cloud/core/common/CloudCoreInstance.kt

@@ -164,7 +164,7 @@ class CloudCoreInstance : CloudInstance {
         val joinClassLoader = JoinClassLoader(classLoader, parentClassLoader)
         return tempChangeSystemClassLoader(joinClassLoader) {
             val parentContext = internalContext ?: error("Parent context is not initialized yet.")
-            val resourceLoader = DefaultResourceLoader(joinClassLoader)
+            val resourceLoader = DefaultResourceLoader(JoinClassLoader(joinClassLoader, listOf(javaClass.classLoader)))
             val childConfigurations =
                 parentContext.getBeansOfType(CloudChildSpringApplicationConfiguration::class.java)
 

surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/netty/server/connection/ServerConnectionListener.kt

@@ -209,7 +209,16 @@ class ServerConnectionListener(val server: NettyServerImpl) {
         val activeProtocols = packet.protocols
         for (connection in connections) {
             if (connection.outboundProtocolInfo.id !in activeProtocols) continue
-            connection.send(packet, flush)
+
+            try {
+                connection.send(packet, flush)
+            } catch (e: Throwable) {
+                log.atWarning()
+                    .withCause(e)
+                    .log(
+                        "Failed to broadcast packet ${packet::class.simpleName} to ${connection.getLoggableAddress(logIps)}"
+                    )
+            }
         }
     }
 
@@ -222,7 +231,16 @@ class ServerConnectionListener(val server: NettyServerImpl) {
 
         for (connection in connections) {
             if (connection.outboundProtocolInfo.id !in activeProtocols) continue
-            connection.send(packet, flush)
+
+            try {
+                connection.send(packet, flush)
+            } catch (e: Throwable) {
+                log.atWarning()
+                    .withCause(e)
+                    .log(
+                        "Failed to broadcast packet ${packet::class.simpleName} to ${connection.getLoggableAddress(logIps)}"
+                    )
+            }
         }
     }
 

…gin/spring/PluginDatabaseConfigModern.kt …lone/plugin/spring/PluginSpringConfig.ktsurf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/spring/PluginDatabaseConfigModern.kt renamed to surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/spring/PluginSpringConfig.kt surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/spring/PluginDatabaseConfigModern.kt renamed to surf-cloud-standalone/src/main/kotlin/dev/slne/surf/cloud/standalone/plugin/spring/PluginSpringConfig.kt

@@ -1,5 +1,6 @@
 package dev.slne.surf.cloud.standalone.plugin.spring
 
+import dev.slne.surf.cloud.api.server.plugin.PluginConfig
 import dev.slne.surf.cloud.api.server.plugin.configuration.PluginMeta
 import dev.slne.surf.cloud.api.server.plugin.provider.classloader.SpringPluginClassloader
 import dev.slne.surf.cloud.core.common.spring.CloudChildSpringApplicationConfiguration
@@ -15,7 +16,7 @@ import org.springframework.boot.builder.SpringApplicationBuilder
 import org.springframework.stereotype.Component
 
 @Component
-class PluginDatabaseConfigModern : CloudChildSpringApplicationConfiguration {
+class PluginSpringConfig : CloudChildSpringApplicationConfiguration {
 
     override fun configureChildApplication(
         builder: SpringApplicationBuilder,
@@ -43,6 +44,7 @@ class PluginDatabaseConfigModern : CloudChildSpringApplicationConfiguration {
             PluginDatasourceConfiguration::class.java,
             PluginFlywayConfigurationCustomizer::class.java,
             ExposedAutoConfiguration::class.java,
+            PluginConfig::class.java
         )
     }
 }