Fixed some bugs and added EffKickPlayerFromCloud

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "de.bypixeltv"
-version = "1.3"
+version = "1.4"
 
 repositories {
     mavenCentral()

src/main/kotlin/de/bypixeltv/skcloudnet/commands/SkCloudnetCommands.kt

@@ -2,16 +2,14 @@ package de.bypixeltv.skcloudnet.commands
 
 import ch.njol.skript.Skript
 import de.bypixeltv.skcloudnet.Main
-import de.bypixeltv.skcloudnet.tasks.UpdateCheck
 import de.bypixeltv.skcloudnet.utils.GetVersion
-import de.bypixeltv.skcloudnet.utils.UpdateChecker
 import dev.jorel.commandapi.kotlindsl.commandTree
 import dev.jorel.commandapi.kotlindsl.literalArgument
 import dev.jorel.commandapi.kotlindsl.playerExecutor
+import dev.jorel.commandapi.kotlindsl.stringArgument
 import eu.cloudnetservice.driver.inject.InjectionLayer
-import eu.cloudnetservice.driver.provider.ServiceTaskProvider
-import eu.cloudnetservice.driver.service.ServiceTask
-import net.axay.kspigot.config.JsonConfigManager.saveConfig
+import eu.cloudnetservice.driver.registry.ServiceRegistry
+import eu.cloudnetservice.modules.bridge.player.PlayerManager
 import net.kyori.adventure.text.minimessage.MiniMessage
 import java.nio.file.Files
 import java.nio.file.Paths

src/main/kotlin/de/bypixeltv/skcloudnet/elements/effects/players/EffKickPlayerFromCloud.kt

@@ -0,0 +1,67 @@
+package de.bypixeltv.skcloudnet.elements.effects
+
+import ch.njol.skript.Skript
+import ch.njol.skript.doc.Description
+import ch.njol.skript.doc.Examples
+import ch.njol.skript.doc.Name
+import ch.njol.skript.doc.Since
+import ch.njol.skript.lang.Effect
+import ch.njol.skript.lang.Expression
+import ch.njol.skript.lang.SkriptParser
+import ch.njol.util.Kleenean
+import de.bypixeltv.skcloudnet.Main
+import eu.cloudnetservice.driver.inject.InjectionLayer
+import eu.cloudnetservice.driver.provider.CloudServiceProvider
+import eu.cloudnetservice.driver.registry.ServiceRegistry
+import eu.cloudnetservice.modules.bridge.player.PlayerManager
+import net.axay.kspigot.chat.literalText
+import org.bukkit.entity.Player
+import org.bukkit.event.Event
+
+@Name("Kick Player From Cloud")
+@Description("Kicks a player from the CloudNet network.")
+@Examples("kick \"byPixelTV\" parsed as player from proxy due to \"Star SkCloudnet now!!!\"")
+@Since("1.4")
+
+class EffKickPlayerFromCloud : Effect() {
+
+    private val serviceRegistry: ServiceRegistry = InjectionLayer.ext().instance(ServiceRegistry::class.java)
+    private val playerManager: PlayerManager = serviceRegistry.firstProvider(PlayerManager::class.java)
+
+    companion object{
+        init {
+            Skript.registerEffect(EffKickPlayerFromCloud::class.java, "(kick|disconnect) %player% from (cloud|cloudnet|network|proxy|bungee|velocity|bungeecord) [(due to|because of|with reason|for) %-string%]")
+        }
+    }
+
+    private var player: Expression<Player>? = null
+    private var reason: Expression<String>? = null
+
+    @Suppress("UNCHECKED_CAST")
+    override fun init(
+        expressions: Array<Expression<*>>,
+        matchedPattern: Int,
+        isDelayed: Kleenean,
+        parser: SkriptParser.ParseResult
+    ): Boolean {
+        this.player = expressions[0] as Expression<Player>
+        this.reason = expressions[1] as Expression<String>
+        return true
+    }
+
+    override fun toString(event: Event?, debug: Boolean): String {
+        return "kick ${this.player} from cloudnet ${this.reason}"
+    }
+
+    override fun execute(event: Event?) {
+        val player = this.player?.getSingle(event)
+        var reason = this.reason?.getSingle(event)
+        val playerExecutor = player?.let { playerManager.playerExecutor(it.uniqueId) }
+        if (reason == null) {
+            reason = " "
+        }
+        if (player != null) {
+            literalText(reason).let { playerManager.playerExecutor(player.uniqueId).kick(it) }
+        }
+    }
+}

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

@@ -15,6 +15,7 @@ import eu.cloudnetservice.driver.registry.ServiceRegistry
 import eu.cloudnetservice.modules.bridge.player.PlayerManager
 import org.bukkit.entity.Player
 import org.bukkit.event.Event
+import java.util.*
 
 
 @Name("CloudNet Proxy of Player")

src/main/resources/plugin.yml

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