feat: enhance bootstrap process with loader checks and support for folia

Author: Keviro

.idea/misc.xml

@@ -11,6 +11,7 @@ surfPaperPluginApi {
     bootstrapper("dev.slne.surf.cloud.bukkit.PaperBootstrap")
     authors.add("twisti")
     generateLibraryLoader(false)
+    foliaSupported(true)
 
     serverDependencies {
         registerRequired("LuckPerms")

surf-cloud-bukkit/build.gradle.kts

@@ -6,6 +6,7 @@ import dev.slne.surf.cloud.core.common.handleEventuallyFatalError
 import io.papermc.paper.plugin.bootstrap.BootstrapContext
 import io.papermc.paper.plugin.bootstrap.PluginBootstrap
 import io.papermc.paper.plugin.bootstrap.PluginProviderContext
+import io.papermc.paper.plugin.provider.classloader.ConfiguredPluginClassLoader
 import kotlinx.coroutines.runBlocking
 import org.bukkit.plugin.java.JavaPlugin
 import kotlin.system.exitProcess
@@ -14,6 +15,15 @@ import kotlin.system.exitProcess
 class PaperBootstrap : PluginBootstrap {
 
     override fun bootstrap(context: BootstrapContext): Unit = runBlocking {
+        val loader = net.kyori.adventure.nbt.CompoundBinaryTag::class.java.getClassLoader()
+        context.logger.info("Cloud sees CBTN from: $loader")
+
+        if (loader is ConfiguredPluginClassLoader) {
+            context.logger.info("CBTN is loaded by ConfiguredPluginClassLoader, all is good: ${loader.configuration.name}")
+        } else {
+            context.logger.warn("CBTN is NOT loaded by ConfiguredPluginClassLoader, things may go wrong!")
+        }
+
         try {
             coreCloudInstance.bootstrap(
                 BootstrapData(

surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/PaperBootstrap.kt

@@ -26,6 +26,7 @@ import kotlin.contracts.contract
 
 class PaperMain : SuspendingJavaPlugin() {
     override suspend fun onLoadAsync() {
+
         try {
             coreCloudInstance.onLoad()
         } catch (t: Throwable) {
@@ -34,6 +35,7 @@ class PaperMain : SuspendingJavaPlugin() {
     }
 
     override suspend fun onEnableAsync() {
+
         try {
             coreCloudInstance.onEnable()
         } catch (t: Throwable) {

surf-cloud-bukkit/src/main/kotlin/dev/slne/surf/cloud/bukkit/PaperMain.kt

@@ -25,13 +25,19 @@ import kotlinx.coroutines.future.await
 import net.kyori.adventure.text.Component
 import org.bukkit.Bukkit
 import java.net.InetSocketAddress
+import java.net.URI
 import java.util.*
 import org.springframework.stereotype.Component as SpringComponent
 
 @SpringComponent
 class BukkitSpecificPacketListenerExtension : PlatformSpecificPacketListenerExtension {
     @OptIn(NmsUseWithCaution::class)
-    override val playAddress: InetSocketAddress by lazy { nmsCommonBridge.getServerIp() }
+    override val playAddress: InetSocketAddress by lazy {
+        InetSocketAddress.createUnresolved(
+            URI("https://checkip.amazonaws.com").toURL().readText().trim(),
+            server.port
+        )
+    }
 
     override fun isServerManagedByThisProxy(address: InetSocketAddress): Boolean {
         error("Requested wrong server! This packet can only be acknowledged on a proxy!")