refactor: use new cloud api

Author: FllipEis

build.gradle.kts

@@ -29,10 +29,9 @@ subprojects {
 
     dependencies {
         testImplementation(rootProject.libs.kotlin.test)
-        implementation(rootProject.libs.kotlin.jvm)
+        compileOnly(rootProject.libs.kotlin.jvm)
     }
 
-
     kotlin {
         jvmToolchain(21)
         compilerOptions {
@@ -44,17 +43,30 @@ subprojects {
     tasks.named("shadowJar", ShadowJar::class) {
         dependsOn("processResources")
         dependencies {
-            include(project(":registration-shared"))
+            exclude(dependency("app.simplecloud.controller:controller-api"))
+            exclude(dependency("app.simplecloud.controller:controller-shared"))
+            exclude(dependency("app.simplecloud:simplecloud-pubsub"))
         }
+
         archiveFileName.set("${project.name}.jar")
+
+        relocate("com.google.protobuf", "app.simplecloud.relocate.google.protobuf")
+        relocate("com.google.common", "app.simplecloud.relocate.google.common")
+        relocate("io.grpc", "app.simplecloud.relocate.io.grpc")
+
+        relocate("org.incendo", "app.simplecloud.plugin.registration.relocate.incendo")
+        relocate("org.spongepowered", "app.simplecloud.plugin.registration.relocate.spongepowered")
+        relocate("app.simplecloud.plugin.api", "app.simplecloud.plugin.registration.relocate.plugin.api")
     }
 
     tasks.test {
         useJUnitPlatform()
     }
 
     tasks.processResources {
-        expand("version" to project.version,
-            "name" to project.name)
+        expand(
+            "version" to project.version,
+            "name" to project.name
+        )
     }
 }

gradle/libs.versions.toml

@@ -1,8 +1,7 @@
 [versions]
-kotlin = "2.0.20"
+kotlin = "2.1.20"
 kotlin-coroutines = "1.9.0"
-shadow = "8.3.3"
-simplecloud-event = "0.0.1-dev.950792a"
+shadow = "8.3.6"
 simplecloud-controller = "0.0.30-dev.bf5da83"
 bungeecord = "1.20-R0.2-SNAPSHOT"
 configurate = "4.1.2"
@@ -13,8 +12,6 @@ kotlin-jvm = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref =
 kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin-coroutines" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
 
-simplecloud-event-velocity = { module = "app.simplecloud.event:event-wrapper-velocity", version.ref = "simplecloud-event"}
-simplecloud-event-bungeecord = { module = "app.simplecloud.event:event-wrapper-bungeecord", version.ref = "simplecloud-event" }
 simplecloud-controller = { module = "app.simplecloud.controller:controller-api", version.ref = "simplecloud-controller" }
 configurate = { module = "org.spongepowered:configurate-yaml", version.ref = "configurate"}
 configurate-kotlin = { module = "org.spongepowered:configurate-extra-kotlin", version.ref = "configurate"}

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -5,6 +5,8 @@ plugins {
 dependencies {
     api(project(":registration-shared"))
     compileOnly(libs.bungeecord)
+    compileOnly(libs.simplecloud.controller)
+    compileOnly(libs.kotlin.coroutines)
 }
 
 modrinth {
@@ -25,9 +27,10 @@ modrinth {
         "1.21.1",
         "1.21.2",
         "1.21.3",
-        "1.21.4"
+        "1.21.4",
+        "1.21.5",
     )
     loaders.add("bungeecord")
     changelog.set("https://docs.simplecloud.app/changelog")
     syncBodyFrom.set(rootProject.file("README.md").readText())
-}
+}

gradlew

@@ -1,5 +1,9 @@
 dependencies {
-    api(libs.bundles.configurate)
-    api(libs.simplecloud.controller)
-    api(libs.kotlin.coroutines)
-}
+    api(libs.bundles.configurate) {
+        exclude(group = "org.jetbrains.kotlin")
+        exclude(group = "org.jetbrains.kotlinx")
+    }
+
+    compileOnly(libs.simplecloud.controller)
+    compileOnly(libs.kotlin.coroutines)
+}

gradlew.bat

@@ -11,6 +11,8 @@ kotlin {
 dependencies {
     api(project(":registration-shared"))
     compileOnly("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT")
+    compileOnly(libs.simplecloud.controller)
+    compileOnly(libs.kotlin.coroutines)
 }
 
 tasks.named("compileKotlin") {
@@ -51,7 +53,8 @@ modrinth {
         "1.21.1",
         "1.21.2",
         "1.21.3",
-        "1.21.4"
+        "1.21.4",
+        "1.21.5",
     )
     loaders.add("velocity")
     changelog.set("https://docs.simplecloud.app/changelog")

registration-bungeecord/build.gradle.kts

@@ -8,4 +8,6 @@ repositories {
 dependencies {
     api(project(":registration-shared"))
     compileOnly("dev.waterdog.waterdogpe:waterdog:2.0.3-SNAPSHOT")
-}
+    compileOnly(libs.simplecloud.controller)
+    compileOnly(libs.kotlin.coroutines)
+}