Merge branch 'version/1.21.8' into feat/serializers

Author: ammodev

.idea/kotlinc.xml

@@ -9,4 +9,4 @@ mcVersion=1.21.8
 group=dev.slne.surf
 version=1.21.8-2.38.0
 relocationPrefix=dev.slne.surf.surfapi.libs
-snapshot=true
+snapshot=false

gradle.properties

@@ -3,13 +3,13 @@
 paper-api = "1.21.8-R0.1-SNAPSHOT"
 
 # Kolin
-kotlinVersion = "2.2.0"
+kotlinVersion = "2.2.20"
 kotlinxCoroutines = "1.10.2"
 kotlinx-serialization = "1.9.0"
 
 # Packet Events
-packetevents = "2.9.1"
-packetevents-plugin = "2.9.1"
+packetevents = "2.9.5"
+packetevents-plugin = "2.9.5"
 
 # Command API
 commandapi = "10.1.2"
@@ -18,9 +18,9 @@ commandapi = "10.1.2"
 luckperms = "v5.5.0-bukkit"
 
 # Scoreboard Library
-scoreboard-library = "2.4.1"
-scoreboard-library-implementation = "2.4.1"
-scoreboard-library-modern = "2.4.1"
+scoreboard-library = "2.4.2"
+scoreboard-library-implementation = "2.4.2"
+scoreboard-library-modern = "2.4.2"
 
 # Adventure
 adventure-api = "4.24.0"
@@ -58,8 +58,7 @@ auto-service = "1.1.1"
 auto-service-ksp = "1.2.0"
 ktor = "3.1.1"
 glm = "0.9.9.1-12"
-ksp-version = "2.2.0-2.0.2"
-datafixerupper = "8.0.16"
+ksp-version = "2.2.20-2.0.3"
 
 # Plugin versions
 maven-repo-auth = "3.0.4"

gradle/libs.versions.toml

@@ -20,7 +20,7 @@ plugins {
 group = groupId
 version = buildString {
     append(mcVersion)
-    append("-1.4.3")
+    append("-1.4.5")
     if (snapshot) append("-SNAPSHOT")
 }
 

surf-api-bukkit/surf-api-bukkit-api/api/surf-api-bukkit-api.api

@@ -0,0 +1,10 @@
+package dev.slne.surf.surfapi.gradle.platform
+
+import dev.slne.surf.surfapi.gradle.platform.common.CommonSurfPlugin
+
+fun CommonSurfPlugin<*>.relocateCloudNetty() {
+    addRelocationsForDependency(
+        "surf-cloud-api-common",
+        "io.netty" to "dev.slne.surf.cloud.netty"
+    )
+}

surf-api-core/surf-api-core-api/api/surf-api-core-api.api

@@ -40,13 +40,6 @@ abstract class CommonSurfPlugin<E : CommonSurfExtension>(
     private val relocations = mutableMapOf<String, String>()
     private val dependencyDependentRelocations = mutableMapOf<String, MutableMap<String, String>>()
 
-    init {
-        addRelocationsForDependency(
-            "surf-cloud-api-common",
-            "io.netty" to "dev.slne.surf.cloud.netty"
-        )
-    }
-
     protected abstract fun createExtension(objects: ObjectFactory, project: Project): E
 
     override fun apply(target: Project) = with(target) {
@@ -76,7 +69,7 @@ abstract class CommonSurfPlugin<E : CommonSurfExtension>(
         relocations[this] = to
     }
 
-    protected fun addRelocationsForDependency(
+    fun addRelocationsForDependency(
         dependency: String,
         vararg relocations: Pair<String, String>,
     ) {

surf-api-gradle-plugin/build.gradle.kts

@@ -3,13 +3,18 @@ package dev.slne.surf.surfapi.gradle.platform.paper
 import dev.slne.surf.surfapi.gradle.generated.Constants
 import dev.slne.surf.surfapi.gradle.platform.SurfApiPlatform
 import dev.slne.surf.surfapi.gradle.platform.core.AbstractCoreSurfPlugin
+import dev.slne.surf.surfapi.gradle.platform.relocateCloudNetty
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
 import org.jetbrains.kotlin.gradle.utils.COMPILE_ONLY
 
 internal abstract class AbstractPaperSurfPlugin<E : AbstractPaperSurfExtension>(platformName: String) :
     AbstractCoreSurfPlugin<E>(platformName, SurfApiPlatform.PAPER) {
 
+    init {
+        relocateCloudNetty()
+    }
+
     override fun Project.configure0() {
         dependencies {
             add(COMPILE_ONLY, Constants.PAPER_API)

surf-api-gradle-plugin/src/main/kotlin/dev/slne/surf/surfapi/gradle/platform/common-configurations.kt

@@ -21,7 +21,7 @@ open class PaperPluginSurfExtension @Inject constructor(objects: ObjectFactory)
             .convention(null)
     internal val runServer = objects.property<Action<RunServer>>().convention(null)
     internal val foliaSupported = objects.property<Boolean>().convention(false)
-    internal val generateLibraryLoader = objects.property<Boolean>().convention(true)
+    internal val generateLibraryLoader = objects.property<Boolean>().convention(false)
 
     fun mainClass(mainClass: String) {
         this.mainClass.set(mainClass)