Merge pull request #10 from simplecloudapp/feat/integrate-cloud-api

Feat/integrate cloud api

Author: FllipEis

build.gradle.kts

@@ -1,5 +1,4 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     alias(libs.plugins.kotlin)
@@ -42,8 +41,8 @@ subprojects {
 
     dependencies {
         testImplementation(rootProject.libs.kotlin.test)
-        implementation(rootProject.libs.kotlin.jvm)
-        implementation(rootProject.libs.kotlin.coroutines)
+        compileOnly(rootProject.libs.kotlin.jvm)
+        compileOnly(rootProject.libs.kotlin.coroutines)
     }
 
     java {
@@ -60,6 +59,14 @@ subprojects {
     tasks.named("shadowJar", ShadowJar::class) {
         mergeServiceFiles()
         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.proxy.relocate.incendo")
+        relocate("org.spongepowered", "app.simplecloud.plugin.proxy.relocate.spongepowered")
+        relocate("app.simplecloud.plugin.api", "app.simplecloud.plugin.proxy.relocate.plugin.api")
     }
 
     tasks.test {

proxy-bungeecord/build.gradle.kts

@@ -21,10 +21,7 @@ dependencies {
 
 
 tasks.shadowJar {
-    relocate("org.incendo", "app.simplecloud.relocate.incendo")
-    relocate("org.spongepowered", "app.simplecloud.relocate.spongepowered")
     relocate("net.kyori", "app.simplecloud.relocate.kyori")
-    relocate("app.simplecloud.plugin.api", "app.simplecloud.relocate.plugin.api")
 }
 
 modrinth {

proxy-bungeecord/src/main/resources/plugin.yml

@@ -1,4 +1,5 @@
 name: proxy-essentials-bungeecord
 main: app.simplecloud.plugin.proxy.bungeecord.ProxyBungeeCordPlugin
 version: 1.0.0
-author: D151l
+author: D151l
+depends: [simplecloud-api]

proxy-shared/build.gradle.kts

@@ -4,9 +4,14 @@ dependencies {
     compileOnly(rootProject.libs.adventure.minimessage)
 
     implementation(rootProject.libs.configurate.yaml)
-    implementation(rootProject.libs.configurate.kotlin)
+    implementation(rootProject.libs.configurate.kotlin) {
+        exclude(group = "org.jetbrains.kotlin")
+        exclude(group = "org.jetbrains.kotlinx")
+    }
 
     compileOnly(rootProject.libs.simplecloud.controller)
 
+    api(rootProject.libs.simplecloud.plugin.api)
+
     compileOnly(rootProject.libs.command.cloud.core)
 }

proxy-velocity/build.gradle.kts

@@ -20,12 +20,6 @@ dependencies {
     implementation(rootProject.libs.command.cloud.velocity)
 }
 
-tasks.shadowJar {
-    relocate("org.incendo", "app.simplecloud.relocate.incendo")
-    relocate("org.spongepowered", "app.simplecloud.relocate.spongepowered")
-    relocate("app.simplecloud.plugin.api", "app.simplecloud.relocate.plugin.api")
-}
-
 modrinth {
     token.set(project.findProperty("modrinthToken") as String? ?: System.getenv("MODRINTH_TOKEN"))
     projectId.set("WzfN2mLK")

proxy-velocity/src/main/resources/velocity-plugin.json

@@ -6,5 +6,9 @@
     "D151l"
   ],
   "main": "app.simplecloud.plugin.proxy.velocity.ProxyVelocityPlugin",
-  "dependencies": []
+  "dependencies": [
+    {
+      "id": "simplecloud-api"
+    }
+  ]
 }