Changed most of the syntax and added some new syntax. I might break s…

…ome stuff

build.gradle.kts

@@ -1,11 +1,11 @@
 plugins {
-    kotlin("jvm") version "1.9.23"
+    kotlin("jvm") version "1.9.24"
     id("io.papermc.paperweight.userdev") version "1.7.0"
     id("xyz.jpenilla.run-paper") version "1.1.0"
 }
 
 group = "de.bypixeltv"
-version = "1.7.3-beta1"
+version = "1.7.3"
 
 repositories {
     mavenCentral()
@@ -27,7 +27,7 @@ dependencies {
     implementation("dev.jorel", "commandapi-bukkit-kotlin", "9.4.0")
     implementation("net.axay:kspigot:1.20.3")
 
-    implementation("com.github.SkriptLang:Skript:2.8.5")
+    implementation("com.github.SkriptLang:Skript:2.9.0-beta1-pre")
 
 
     implementation("eu.cloudnetservice.cloudnet:syncproxy:4.0.0-RC10")

src/main/kotlin/de/bypixeltv/skcloudnet/elements/conditions/tasks/CondTaskInMaintenance.kt

@@ -16,7 +16,7 @@ class CondTaskInMaintenance : Condition() {
 
     companion object{
         init {
-            Skript.registerCondition(CondTaskInMaintenance::class.java, "[cloudnet] task %string% (1¦is|2¦is(n't| not)) in maintenance")
+            Skript.registerCondition(CondTaskInMaintenance::class.java, "[(the task|task|cloudnet task|the cloudnet task)] %string% (1¦is|2¦is(n't| not)) in maintenance")
         }
     }
 

src/main/kotlin/de/bypixeltv/skcloudnet/elements/effects/services/EffCreateCloudnetService.kt

@@ -17,7 +17,7 @@ class EffCreateCloudnetService : Effect() {
 
     companion object{
         init {
-            Skript.registerEffect(EffCreateCloudnetService::class.java, "create [a] [cloudnet] service by [the] [task] %string%")
+            Skript.registerEffect(EffCreateCloudnetService::class.java, "create [a] [cloudnet] service by [(the task|task|cloudnet task|the cloudnet task)] %string%")
         }
     }
 

src/main/kotlin/de/bypixeltv/skcloudnet/elements/effects/services/EffCreateCloudnetServiceWithId.kt

@@ -17,7 +17,7 @@ class EffCreateCloudnetServiceWithId : Effect() {
 
     companion object{
         init {
-            Skript.registerEffect(EffCreateCloudnetServiceWithId::class.java, "create [a] [cloudnet] service by [the task] %string% with (the id|id) %number%")
+            Skript.registerEffect(EffCreateCloudnetServiceWithId::class.java, "create [a] [cloudnet] service by [(the task|task|cloudnet task|the cloudnet task)] %string% with (the id|id) %number%")
         }
     }
 

src/main/kotlin/de/bypixeltv/skcloudnet/elements/effects/services/EffCreateStartedCloudnetService.kt

@@ -17,7 +17,7 @@ class EffCreateStartedCloudnetService : Effect() {
 
     companion object{
         init {
-            Skript.registerEffect(EffCreateStartedCloudnetService::class.java, "create [a] started [cloudnet] service by [the task] %string%")
+            Skript.registerEffect(EffCreateStartedCloudnetService::class.java, "create [a] started [cloudnet] service by [(the task|task|cloudnet task|the cloudnet task)] %string%")
         }
     }
 

src/main/kotlin/de/bypixeltv/skcloudnet/elements/effects/services/EffCreateStartedCloudnetServiceWithId.kt

@@ -17,7 +17,7 @@ class EffCreateStartedCloudnetServiceWithId : Effect() {
 
     companion object{
         init {
-            Skript.registerEffect(EffCreateStartedCloudnetServiceWithId::class.java, "create [a] started [cloudnet] service by [the task] %string% with (the id|id) %number%")
+            Skript.registerEffect(EffCreateStartedCloudnetServiceWithId::class.java, "create [a] started [cloudnet] service by [(the task|task|cloudnet task|the cloudnet task)] %string% with (the id|id) %number%")
         }
     }
 

src/main/kotlin/de/bypixeltv/skcloudnet/elements/effects/services/EffExecuteCommandOnAllServices.kt

@@ -16,7 +16,7 @@ class EffExecuteCommandOnAllServices : Effect() {
 
     companion object{
         init {
-            Skript.registerEffect(EffExecuteCommandOnAllServices::class.java, "execute [cloudnet] command %string% on all services")
+            Skript.registerEffect(EffExecuteCommandOnAllServices::class.java, "execute command %string% on all [cloudnet] services")
         }
     }
 
@@ -34,7 +34,7 @@ class EffExecuteCommandOnAllServices : Effect() {
     }
 
     override fun toString(event: Event?, debug: Boolean): String {
-        return "execute cloudnet command ${commandExpression?.getSingle(event)} on all services"
+        return "execute command ${commandExpression?.getSingle(event)} on all [cloudnet] services"
     }
 
     override fun execute(event: Event?) {

src/main/kotlin/de/bypixeltv/skcloudnet/elements/effects/services/EffExecuteCommandOnService.kt

@@ -16,7 +16,7 @@ class EffExecuteCommandOnService : Effect() {
 
     companion object{
         init {
-            Skript.registerEffect(EffExecuteCommandOnService::class.java, "execute [cloudnet] command %string% on [cloudnet] service %string%")
+            Skript.registerEffect(EffExecuteCommandOnService::class.java, "execute command %string% on [cloudnet] service %string%")
         }
     }
 

src/main/kotlin/de/bypixeltv/skcloudnet/elements/effects/services/EffExecuteCommandOnTask.kt

@@ -16,7 +16,7 @@ class EffExecuteCommandOnTask : Effect() {
 
     companion object{
         init {
-            Skript.registerEffect(RestartAllServicesOnTask::class.java, "execute [cloudnet] command %string% on [the] task %string%")
+            Skript.registerEffect(RestartAllServicesOnTask::class.java, "execute command %string% on [(the task|task|cloudnet task|the cloudnet task)] %string%")
         }
     }
 

src/main/kotlin/de/bypixeltv/skcloudnet/elements/effects/services/EffStartAllServicesOnTask.kt

@@ -16,7 +16,7 @@ class EffStartAllServicesOnTask : Effect() {
 
     companion object{
         init {
-            Skript.registerEffect(EffStartAllServicesOnTask::class.java, "start all [cloudnet] services on [the] [task] %string%")
+            Skript.registerEffect(EffStartAllServicesOnTask::class.java, "start all [cloudnet] services on [(the task|task|cloudnet task|the cloudnet task)] %string%")
         }
     }
 

src/main/kotlin/de/bypixeltv/skcloudnet/elements/effects/services/EffStopAllServicesOnTask.kt

@@ -16,7 +16,7 @@ class EffStopAllServicesOnTask : Effect() {
 
     companion object{
         init {
-            Skript.registerEffect(EffStopAllServicesOnTask::class.java, "stop all [cloudnet] services on [the] [task] %string%")
+            Skript.registerEffect(EffStopAllServicesOnTask::class.java, "stop all [cloudnet] services on [(the task|task|cloudnet task|the cloudnet task)] %string%")
         }
     }
 

src/main/kotlin/de/bypixeltv/skcloudnet/elements/effects/services/RestartAllServicesOnTask.kt

@@ -16,7 +16,7 @@ class RestartAllServicesOnTask : Effect() {
 
     companion object{
         init {
-            Skript.registerEffect(RestartAllServicesOnTask::class.java, "restart all [cloudnet] services on [the] [task] %string%")
+            Skript.registerEffect(RestartAllServicesOnTask::class.java, "restart all [cloudnet] services on [(the task|task|cloudnet task|the cloudnet task)] %string%")
         }
     }
 

src/main/kotlin/de/bypixeltv/skcloudnet/elements/effects/tasks/EffSetMinServiceCount.kt

@@ -17,7 +17,7 @@ class EffSetMinServiceCount : Effect() {
 
     companion object{
         init {
-            Skript.registerEffect(EffSetMinServiceCount::class.java, "set (minsercount|msc|minservicecount|sercount) of [cloudnet] task %string% to %number%")
+            Skript.registerEffect(EffSetMinServiceCount::class.java, "set (minsercount|msc|minservicecount|sercount) of [(the task|task|cloudnet task|the cloudnet task)] %string% to %number%")
         }
     }
 

src/main/kotlin/de/bypixeltv/skcloudnet/elements/effects/tasks/EffSetTaskMaintenance.kt

@@ -17,7 +17,7 @@ class EffSetTaskMaintenance : Effect() {
 
     companion object{
         init {
-            Skript.registerEffect(EffSetTaskMaintenance::class.java, "set maintenance of [cloudnet] task %string% to %boolean%")
+            Skript.registerEffect(EffSetTaskMaintenance::class.java, "set maintenance of [(the task|task|cloudnet task|the cloudnet task)] %string% to %boolean%")
         }
     }
 

src/main/kotlin/de/bypixeltv/skcloudnet/elements/expressions/players/ExprGetCloudnetPlayerTask.kt

@@ -23,7 +23,7 @@ class ExprGetCloudnetPlayerTask : SimpleExpression<String>() {
         init {
             Skript.registerExpression(
                 ExprGetCloudnetPlayerTask::class.java, String::class.java,
-                ExpressionType.SIMPLE, "cloudnet task of [(the player|player)] %string%")
+                    ExpressionType.SIMPLE, "cloudnet task of [(the player|player)] %string%")
         }
     }
 

src/main/kotlin/de/bypixeltv/skcloudnet/elements/expressions/tasks/ExprAllServicesOnTask.kt → src/main/kotlin/de/bypixeltv/skcloudnet/elements/expressions/tasks/ExprAllCloudnetServicesOnTask.kt

@@ -11,15 +11,15 @@ import eu.cloudnetservice.driver.provider.CloudServiceProvider
 import org.bukkit.event.Event
 
 
-class ExprAllServicesOnTask : SimpleExpression<String>() {
+class ExprAllCloudnetServicesOnTask : SimpleExpression<String>() {
 
     private val cnServiceProvider: CloudServiceProvider = InjectionLayer.ext().instance(CloudServiceProvider::class.java)
 
     companion object{
         init {
             Skript.registerExpression(
-                ExprAllServicesOnTask::class.java, String::class.java,
-                ExpressionType.SIMPLE, "[(all [[of] the]|the)] [running] cloudnet services on [the] [task] %string%")
+                ExprAllCloudnetServicesOnTask::class.java, String::class.java,
+                ExpressionType.SIMPLE, "[(all [[of] the]|the)] cloudnet services on [(the task|task|cloudnet task|the cloudnet task)] %string%")
         }
     }
 
@@ -52,7 +52,7 @@ class ExprAllServicesOnTask : SimpleExpression<String>() {
     }
 
     override fun toString(e: Event?, debug: Boolean): String {
-        return "all cloudnet services on task %string%"
+        return "all cloudnet services on task ${this.task?.getSingle(e)}"
     }
 
 }

src/main/kotlin/de/bypixeltv/skcloudnet/elements/expressions/tasks/ExprAllPreparedCloudnetServicesOnTask.kt

@@ -0,0 +1,65 @@
+package de.bypixeltv.skcloudnet.elements.expressions.tasks
+
+import ch.njol.skript.Skript
+import ch.njol.skript.lang.Expression
+import ch.njol.skript.lang.ExpressionType
+import ch.njol.skript.lang.SkriptParser
+import ch.njol.skript.lang.util.SimpleExpression
+import ch.njol.util.Kleenean
+import eu.cloudnetservice.driver.inject.InjectionLayer
+import eu.cloudnetservice.driver.provider.CloudServiceProvider
+import org.bukkit.event.Event
+
+
+class ExprAllPreparedCloudnetServicesOnTask : SimpleExpression<String>() {
+
+    private val cnServiceProvider: CloudServiceProvider = InjectionLayer.ext().instance(CloudServiceProvider::class.java)
+
+    companion object{
+        init {
+            Skript.registerExpression(
+                ExprAllPreparedCloudnetServicesOnTask::class.java, String::class.java,
+                ExpressionType.SIMPLE, "[(all [[of] the]|the)] prepapred cloudnet services on [(the task|task|cloudnet task|the cloudnet task)] %string%")
+        }
+    }
+
+    private var task: Expression<String>? = null
+
+    override fun isSingle(): Boolean {
+        return false
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    override fun init(
+        exprs: Array<Expression<*>>,
+        matchedPattern: Int,
+        isDelayed: Kleenean?,
+        parseResult: SkriptParser.ParseResult?
+    ): Boolean {
+        this.task = exprs[0] as Expression<String>?
+        return true
+    }
+    override fun get(e: Event?): Array<String?>? {
+        val task = this.task?.getSingle(e)
+        val preparedServices = mutableListOf<String?>()
+        if (task != null) {
+            for (service in cnServiceProvider.servicesByTask(task)) {
+                if (service.lifeCycle().name == "PREPARED") {
+                    preparedServices.add(service.name())
+                }
+            }
+            val preparedServicesArray = preparedServices.toTypedArray()
+            return preparedServicesArray
+        }
+        return null
+    }
+
+    override fun getReturnType(): Class<out String> {
+        return String::class.java
+    }
+
+    override fun toString(e: Event?, debug: Boolean): String {
+        return "all prepared cloudnet services on task ${this.task?.getSingle(e)}"
+    }
+
+}

src/main/kotlin/de/bypixeltv/skcloudnet/elements/expressions/tasks/ExprAllRunningCloudnetServicesOnTask.kt

@@ -0,0 +1,65 @@
+package de.bypixeltv.skcloudnet.elements.expressions.tasks
+
+import ch.njol.skript.Skript
+import ch.njol.skript.lang.Expression
+import ch.njol.skript.lang.ExpressionType
+import ch.njol.skript.lang.SkriptParser
+import ch.njol.skript.lang.util.SimpleExpression
+import ch.njol.util.Kleenean
+import eu.cloudnetservice.driver.inject.InjectionLayer
+import eu.cloudnetservice.driver.provider.CloudServiceProvider
+import org.bukkit.event.Event
+
+
+class ExprAllRunningCloudnetServicesOnTask : SimpleExpression<String>() {
+
+    private val cnServiceProvider: CloudServiceProvider = InjectionLayer.ext().instance(CloudServiceProvider::class.java)
+
+    companion object{
+        init {
+            Skript.registerExpression(
+                ExprAllRunningCloudnetServicesOnTask::class.java, String::class.java,
+                ExpressionType.SIMPLE, "[(all [[of] the]|the)] (running|started) cloudnet services on [(the task|task|cloudnet task|the cloudnet task)] %string%")
+        }
+    }
+
+    private var task: Expression<String>? = null
+
+    override fun isSingle(): Boolean {
+        return false
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    override fun init(
+        exprs: Array<Expression<*>>,
+        matchedPattern: Int,
+        isDelayed: Kleenean?,
+        parseResult: SkriptParser.ParseResult?
+    ): Boolean {
+        this.task = exprs[0] as Expression<String>?
+        return true
+    }
+    override fun get(e: Event?): Array<String?>? {
+        val task = this.task?.getSingle(e)
+        val preparedServices = mutableListOf<String?>()
+        if (task != null) {
+            for (service in cnServiceProvider.servicesByTask(task)) {
+                if (service.lifeCycle().name == "RUNNING") {
+                    preparedServices.add(service.name())
+                }
+            }
+            val preparedServicesArray = preparedServices.toTypedArray()
+            return preparedServicesArray
+        }
+        return null
+    }
+
+    override fun getReturnType(): Class<out String> {
+        return String::class.java
+    }
+
+    override fun toString(e: Event?, debug: Boolean): String {
+        return "all cloudnet services on task ${this.task?.getSingle(e)}"
+    }
+
+}

src/main/kotlin/de/bypixeltv/skcloudnet/elements/expressions/tasks/ExprGetAllCloudnetPlayersOnTask.kt

@@ -21,7 +21,7 @@ class ExprGetAllCloudnetPlayersOnTask : SimpleExpression<String>() {
         init {
             Skript.registerExpression(
                 ExprGetAllCloudnetPlayersOnTask::class.java, String::class.java,
-                ExpressionType.SIMPLE, "all [of the] cloudnet players on [the] task %string%")
+                ExpressionType.SIMPLE, "all [of the] cloudnet players on [(the task|task|cloudnet task|the cloudnet task)] %string%")
         }
     }
 

src/main/kotlin/de/bypixeltv/skcloudnet/elements/expressions/tasks/ExprMinServiceCount.kt → src/main/kotlin/de/bypixeltv/skcloudnet/elements/expressions/tasks/ExprMinServiceCountOfCloudnetTask.kt

@@ -11,15 +11,15 @@ import eu.cloudnetservice.driver.provider.ServiceTaskProvider
 import org.bukkit.event.Event
 
 
-class ExprMinServiceCount : SimpleExpression<String>() {
+class ExprMinServiceCountOfCloudnetTask : SimpleExpression<Number>() {
 
     val serviceTaskProvider = InjectionLayer.ext().instance(ServiceTaskProvider::class.java)
 
     companion object{
         init {
             Skript.registerExpression(
-                ExprMinServiceCount::class.java, String::class.java,
-                ExpressionType.SIMPLE, "(minservicecount|minsercount|msc) of [the] [cloudnet] task %string%")
+                ExprMinServiceCountOfCloudnetTask::class.java, Number::class.java,
+                ExpressionType.SIMPLE, "(minservicecount|minsercount|msc) of [(the task|task|cloudnet task|the cloudnet task)] %string%")
         }
     }
 
@@ -39,19 +39,20 @@ class ExprMinServiceCount : SimpleExpression<String>() {
         this.task = exprs[0] as Expression<String>?
         return true
     }
-    override fun get(e: Event?): Array<out String?> {
+
+    override fun get(e: Event?): Array<out Number?> {
         val task = this.task?.getSingle(e)
         if (task != null) {
             val serviceTask = serviceTaskProvider.serviceTask(task.toString())
             if (serviceTask != null) {
-                return arrayOf(serviceTask.minServiceCount().toString())
+                return arrayOf(serviceTask.minServiceCount())
             }
         }
         return arrayOfNulls(0)
     }
 
-    override fun getReturnType(): Class<out String> {
-        return String::class.java
+    override fun getReturnType(): Class<out Number> {
+        return Number::class.java
     }
 
     override fun toString(e: Event?, debug: Boolean): String {

src/main/resources/plugin.yml

@@ -1,6 +1,6 @@
 main: "de.bypixeltv.skcloudnet.Main"
 name: "SkCloudnet"
-version: "1.7.3-beta1"
+version: "1.7.3-"
 api-version: "1.20"
 
 author: "byPixelTV"