feat: platform migration

.gitignore

@@ -19,3 +19,7 @@ gradle-app.setting
 .project
 # JDT-specific (Eclipse Java Development Tools)
 .classpath
+
+.idea/
+
+.kotlin/

README.md

@@ -43,9 +43,9 @@ This repository is licensed under [Apache 2.0][license].
 
 <!-- ✅ PLEASE EDIT -->
 [banner]: https://github.com/simplecloudapp/branding/blob/main/readme/banner/plugin/cloud-command.png?raw=true
-[issue-bug-report]: https://github.com/theSimpleCloud/command-plugin/issues/new?labels=bug&projects=template=01_BUG-REPORT.yml&title=%5BBUG%5D+%3Ctitle%3E
-[issue-feature-request]: https://github.com/theSimpleCloud/command-plugin/discussions/new?category=ideas
-[docs-thisproject]: https://docs.simplecloud.app/plugin/cloud-command
+[issue-bug-report]: https://github.com/simplecloudapp/command-plugin/issues/new?labels=bug&projects=template=01_BUG-REPORT.yml&title=%5BBUG%5D+%3Ctitle%3E
+[issue-feature-request]: https://github.com/simplecloudapp/command-plugin/discussions/new?category=ideas
+[docs-thisproject]: https://docs.simplecloud.app/en/manual/plugin/cloud-command
 [docs-contribute]: https://docs.simplecloud.app/contribute
 
 [modrinth]: https://modrinth.com/plugin/command-plugin

build.gradle.kts

@@ -20,6 +20,7 @@ allprojects {
         maven("https://buf.build/gen/maven")
         maven("https://repo.simplecloud.app/snapshots")
         maven("https://repo.papermc.io/repository/maven-public/")
+        maven("https://repo.simplecloud.app/snapshots")
     }
 }
 
@@ -31,7 +32,8 @@ subprojects {
 
     dependencies {
         testImplementation(rootProject.libs.kotlin.test)
-        compileOnly(rootProject.libs.kotlin.jvm)
+        implementation(rootProject.libs.kotlin.jvm)
+        implementation(rootProject.libs.kotlinx.coroutines.core)
     }
 
     publishing {
@@ -55,27 +57,11 @@ subprojects {
     }
 
     tasks.named("shadowJar", ShadowJar::class) {
-        dependencies {
-            exclude(dependency("com.velocitypowered:velocity-api"))
-
-            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 {
-            include(project(":command-shared"))
-
-            /**
-             * TODO: Add dependencies ADDED BY YOU like this:
-             * include(dependency(libs.your.dependency.get()))
-             */
-            include(dependency(libs.cloud.core.get()))
-            // TODO: only include the velocity dependency in the velocity plugin
-            include(dependency(libs.cloud.velocity.get()))
-
-        } */
+        mergeServiceFiles()
+        relocate("org.incendo", "app.simplecloud.plugin.command.relocate.incendo")
+        relocate("org.spongepowered", "app.simplecloud.plugin.command.relocate.spongepowered")
         archiveFileName.set("${project.name}.jar")
+        archiveClassifier.set("")
     }
 }
 

command-bungeecord/build.gradle.kts

@@ -3,10 +3,10 @@ plugins {
 }
 
 dependencies {
-    api(project(":command-shared"))
-    api(libs.bungeecord.api)
-    api(libs.adveture.platform.bungeecord)
-    api(libs.cloud.bungeecord)
+    implementation(project(":command-shared"))
+    implementation(libs.adveture.platform.bungeecord)
+    implementation(libs.cloud.bungeecord)
+    compileOnly(libs.bungeecord.api)
 }
 
 modrinth {
@@ -16,8 +16,6 @@ modrinth {
     versionType.set("beta")
     uploadFile.set(tasks.shadowJar)
     gameVersions.addAll(
-
-
         "1.20",
         "1.20.1",
         "1.20.2",
@@ -36,8 +34,7 @@ modrinth {
         "1.21.8",
         "1.21.9",
         "1.21.10",
-
-
+        "1.21.11"
     )
     loaders.add("bungeecord")
     loaders.add("waterfall")

command-bungeecord/src/main/kotlin/app/simplecloud/plugin/command/bungeecord/BungeeCordPlugin.kt

@@ -10,11 +10,10 @@ import org.incendo.cloud.SenderMapper
 import org.incendo.cloud.bungee.BungeeCommandManager
 import org.incendo.cloud.execution.ExecutionCoordinator
 
-
 /**
  * @author Fynn Bauer in 2024
  */
-class BungeeCordPlugin(): Plugin() {
+class BungeeCordPlugin : Plugin() {
 
     private lateinit var commandManager: BungeeCommandManager<CloudSender>
     private lateinit var commandPlugin: CommandPlugin
@@ -45,6 +44,7 @@ class BungeeCordPlugin(): Plugin() {
 
     override fun onDisable() {
         adventure.close()
+        commandPlugin.config.close()
     }
 
     fun adventure(): BungeeAudiences {

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

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

command-shared/build.gradle.kts

@@ -1,12 +1,9 @@
 dependencies {
-    compileOnly(libs.simplecloud.controller)
+    compileOnly(libs.simplecloud.api)
     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")
-    }
+    implementation(libs.bundles.logging)
+    implementation(libs.bundles.configurate)
 }