Final updates tp 1.20.6 + prepare for release

byPixelTV · Jun 1, 2024 · 16c926b · 16c926b
1 parent a9a25b9
commit 16c926b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,6 +12,7 @@ repositories {
     maven("https://jitpack.io")
     maven(url = "https://s01.oss.sonatype.org/content/repositories/snapshots/")
     maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
+    maven("https://repo.codemc.org/repository/maven-public/")
     maven {
         name = "papermc"
         url = uri("https://repo.papermc.io/repository/maven-public/")
@@ -23,8 +24,8 @@ repositories {
 
 dependencies {
     paperweight.paperDevBundle("1.20.6-R0.1-SNAPSHOT")
-    implementation("dev.jorel", "commandapi-bukkit-shade", "9.4.0")
-    implementation("dev.jorel", "commandapi-bukkit-kotlin", "9.4.0")
+    implementation("dev.jorel", "commandapi-bukkit-shade-mojang-mapped", "9.4.2")
+    implementation("dev.jorel", "commandapi-bukkit-kotlin", "9.4.2")
     implementation("net.axay:kspigot:1.20.4")
 
     implementation("com.github.SkriptLang:Skript:2.9.0-beta1-pre")
@@ -53,19 +54,20 @@ sourceSets {
 }
 
 tasks {
-    assemble {
-        dependsOn(reobfJar)
-    }
     compileJava {
         options.encoding = "UTF-8"
         options.release.set(21)
         options.compilerArgs.add("-Xlint:deprecation")
     }
-    compileKotlin {
-        kotlinOptions.jvmTarget = "21"
+    named("compileKotlin", org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask::class.java) {
+        compilerOptions {
+            freeCompilerArgs.add("-Xexport-kdoc")
+        }
     }
 }
 
+paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION
+
 kotlin {
     jvmToolchain(21)
 }
diff --git a/...kotlin/de/bypixeltv/skcloudnet/elements/conditions/services/CondCloudnetServiceDeleted.kt b/...kotlin/de/bypixeltv/skcloudnet/elements/conditions/services/CondCloudnetServiceDeleted.kt
@@ -10,6 +10,7 @@ import eu.cloudnetservice.driver.provider.CloudServiceProvider
 import org.bukkit.event.Event
 
 
+@Suppress("UNUSED")
 class CondCloudnetServiceDeleted : Condition() {
 
     val cnServiceProvider: CloudServiceProvider = InjectionLayer.ext().instance(CloudServiceProvider::class.java)
@@ -22,6 +23,7 @@ class CondCloudnetServiceDeleted : Condition() {
 
     private var service: Expression<String>? = null
 
+    @Suppress("DEPRECATED_IDENTITY_EQUALS", "UNCHECKED_CAST")
     override fun init(
         expressions: Array<Expression<*>>,
         matchedPattern: Int,
@@ -35,10 +37,10 @@ class CondCloudnetServiceDeleted : Condition() {
 
     override fun check(e: Event?): Boolean {
         val service = service?.getSingle(e) ?: return isNegated
-        if (cnServiceProvider.serviceByName(service)?.lifeCycle()?.name == "DELETED") {
-            return isNegated
+        return if (cnServiceProvider.serviceByName(service)?.lifeCycle()?.name == "DELETED") {
+            isNegated
         } else {
-            return !isNegated
+            !isNegated
         }
     }
 

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -5,11 +5,11 @@ api-version: "1.20"
 
 author: "byPixelTV"
 description: "A Skript-Addon to interact with your CloudNet v4 instance."
-website: "https://bypixeltv.me"
+website: "https://bypixeltv.de"
 
 libraries:
-  - "dev.jorel:commandapi-bukkit-shade:9.4.0"
-  - "dev.jorel:commandapi-bukkit-kotlin:9.4.0"
+  - "dev.jorel:commandapi-bukkit-shade-mojang-mapped:9.4.2"
+  - "dev.jorel:commandapi-bukkit-kotlin:9.4.2"
   - "net.axay:kspigot:1.20.4"
 
 depend: [Skript]