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

feat: integrate new cloud api

Author: FllipEis

build.gradle.kts

@@ -31,7 +31,7 @@ subprojects {
 
     dependencies {
         testImplementation(rootProject.libs.kotlin.test)
-        implementation(rootProject.libs.kotlin.jvm)
+        compileOnly(rootProject.libs.kotlin.jvm)
     }
 
     publishing {
@@ -58,7 +58,9 @@ subprojects {
         dependencies {
             exclude(dependency("com.velocitypowered:velocity-api"))
 
-            relocate("org.incendo", "app.simplecloud.plugin.command.external")
+            relocate("org.incendo", "app.simplecloud.plugin.command.relocate.incendo")
+            relocate("org.spongepowered", "app.simplecloud.plugin.command.relocate.spongepowered")
+            relocate("app.simplecloud.plugin.api", "app.simplecloud.plugin.command.relocate.plugin.api")
         }
        /* dependsOn("processResources")
         dependencies {

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

@@ -1,4 +1,5 @@
 name: CommandPlugin
 version: 0.0.1-EXPERIMENTAL
 author: Kaseax
-main: app.simplecloud.plugin.command.bungeecord.BungeeCordPlugin
+main: app.simplecloud.plugin.command.bungeecord.BungeeCordPlugin
+depends: [simplecloud-api]

command-shared/build.gradle.kts

@@ -1,6 +1,12 @@
 dependencies {
-    api(libs.simplecloud.controller)
+    compileOnly(libs.simplecloud.controller)
     api(libs.cloud.core)
     api(libs.adventure.api)
     api(libs.adventure.text.minimessage)
+
+    implementation(rootProject.libs.configurate.yaml)
+    implementation(rootProject.libs.configurate.kotlin) {
+        exclude(group = "org.jetbrains.kotlin")
+        exclude(group = "org.jetbrains.kotlinx")
+    }
 }

command-velocity/src/main/kotlin/app/simplecloud/plugin/command/velocity/VelocityPlugin.kt

@@ -3,12 +3,11 @@ package app.simplecloud.plugin.command.velocity
 import app.simplecloud.plugin.command.shared.CloudCommandHandler
 import app.simplecloud.plugin.command.shared.CloudSender
 import app.simplecloud.plugin.command.shared.CommandPlugin
-import app.simplecloud.plugin.command.shared.config.MessageConfig
-import app.simplecloud.plugin.command.shared.config.YamlConfig
 import com.google.inject.Inject
 import com.velocitypowered.api.command.CommandSource
 import com.velocitypowered.api.event.Subscribe
 import com.velocitypowered.api.event.proxy.ProxyInitializeEvent
+import com.velocitypowered.api.plugin.Dependency
 import com.velocitypowered.api.plugin.Plugin
 import com.velocitypowered.api.plugin.PluginContainer
 import com.velocitypowered.api.plugin.annotation.DataDirectory
@@ -23,7 +22,17 @@ import kotlin.io.path.pathString
  * @author Fynn Bauer in 2024
  */
 
-@Plugin(id = "command-plugin", name = "SimpleCloud Command Plugin", authors = ["Kaseax"], version = "0.0.1-EXPERIMENTAL")
+@Plugin(
+    id = "command-plugin",
+    name = "SimpleCloud Command Plugin",
+    authors = ["Kaseax"],
+    version = "0.0.1-EXPERIMENTAL",
+    dependencies = [
+        Dependency(
+            id = "simplecloud-api"
+        )
+    ]
+)
 class VelocityPlugin @Inject constructor(
     private val server: ProxyServer,
     @DataDirectory val dataDirectory: Path,

gradle/libs.versions.toml

@@ -13,6 +13,9 @@ adventure-platform-bungeecord = "4.3.4"
 adventure-text-minimessage = "4.17.0"
 minotaur = "2.8.7"
 
+configurate-yaml = "4.0.0"
+configurate-kotlin = "4.1.2"
+
 [libraries]
 kotlin-jvm = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
@@ -25,6 +28,8 @@ bungeecord-api = { module = "net.md-5:bungeecord-api", version.ref = "bungeecord
 adventure-api = { module = "net.kyori:adventure-api", version.ref = "adventure-api" }
 adveture-platform-bungeecord = { module = "net.kyori:adventure-platform-bungeecord", version.ref = "adventure-platform-bungeecord" }
 adventure-text-minimessage = { module = "net.kyori:adventure-text-minimessage", version.ref = "adventure-text-minimessage" }
+configurate-yaml = { module = "org.spongepowered:configurate-yaml", version.ref = "configurate-yaml" }
+configurate-kotlin = { module = "org.spongepowered:configurate-extra-kotlin", version.ref = "configurate-kotlin" }
 
 [plugins]
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }