Merge branch 'version/1.21.10' into fix/18-whitelist-command-classcastexeption

Author: TheBjoRedCraft

gradle.properties

@@ -1,4 +1,4 @@
 kotlin.code.style=official
 kotlin.stdlib.default.dependency=false
 org.gradle.parallel=true
-version=1.21.10-2.0.5-SNAPSHOT
+version=1.21.10-2.0.6-SNAPSHOT

src/main/kotlin/dev/slne/surf/essentials/PaperCommandManager.kt

@@ -25,7 +25,6 @@ object PaperCommandManager {
         giveCommand()
         infoCommand()
         itemEditCommand()
-        signCommand()
         teleportCommand()
         teleportOfflineCommand()
         teleportRandomCommand()
@@ -62,7 +61,12 @@ object PaperCommandManager {
         soundCommand()
         stopCommand()
         restartCommand()
-        makeSpecialCommand()
+
+        if (!plugin.isSurvivalServer()) {
+            makeSpecialCommand()
+            signCommand()
+        }
+
         knightCommand()
         toolCommand()
         experienceCommand()
@@ -71,5 +75,6 @@ object PaperCommandManager {
         timeCommand()
         skinChangeCommand()
         worldCommand()
+        pingCommand()
     }
 }

src/main/kotlin/dev/slne/surf/essentials/PaperMain.kt

@@ -1,6 +1,7 @@
 package dev.slne.surf.essentials
 
 import com.github.shynixn.mccoroutine.folia.SuspendingJavaPlugin
+import dev.slne.surf.surfapi.bukkit.api.extensions.pluginManager
 import org.bukkit.plugin.java.JavaPlugin
 
 val plugin get() = JavaPlugin.getPlugin(PaperMain::class.java)
@@ -18,4 +19,6 @@ class PaperMain : SuspendingJavaPlugin() {
     override fun onDisable() {
         super.onDisable()
     }
+
+    fun isSurvivalServer() = pluginManager.isPluginEnabled("surf-freebuild-bukkit")
 }

src/main/kotlin/dev/slne/surf/essentials/command/PingCommand.kt

@@ -0,0 +1,38 @@
+package dev.slne.surf.essentials.command
+
+import dev.jorel.commandapi.kotlindsl.*
+import dev.slne.surf.essentials.util.permission.EssentialsPermissionRegistry
+import dev.slne.surf.essentials.util.util.coloredPing
+import dev.slne.surf.surfapi.core.api.messages.adventure.sendText
+import org.bukkit.entity.Player
+
+fun pingCommand() = commandTree("ping") {
+    withPermission(EssentialsPermissionRegistry.PING_COMMAND)
+    playerExecutor { player, _ ->
+        val ping = player.ping.toLong()
+
+        player.sendText {
+            appendPrefix()
+            info("Du hast einen Ping von ")
+            coloredPing(ping)
+            info(".")
+        }
+    }
+
+    entitySelectorArgumentOnePlayer("target") {
+        withPermission(EssentialsPermissionRegistry.PING_COMMAND_OTHER)
+        anyExecutor { executor, args ->
+            val target: Player by args
+
+            val ping = target.ping.toLong()
+
+            executor.sendText {
+                appendPrefix()
+                variableValue(target.name)
+                info(" hat einen Ping von ")
+                coloredPing(ping)
+                info(".")
+            }
+        }
+    }
+}

src/main/kotlin/dev/slne/surf/essentials/listener/SpecialItemListener.kt

@@ -1,5 +1,6 @@
 package dev.slne.surf.essentials.listener
 
+import dev.slne.surf.essentials.plugin
 import dev.slne.surf.essentials.service.specialItemService
 import dev.slne.surf.essentials.util.util.appendNewLineArrow
 import dev.slne.surf.essentials.util.util.translatable
@@ -28,6 +29,10 @@ object SpecialItemListener : Listener {
         val player = event.entity as? Player ?: return
         val itemStack = event.item.itemStack
 
+        if (plugin.isSurvivalServer()) {
+            return
+        }
+
         if (!specialItemService.isSpecial(itemStack)) {
             return
         }

src/main/kotlin/dev/slne/surf/essentials/util/permission/EssentialsPermissionRegistry.kt

@@ -108,4 +108,6 @@ object EssentialsPermissionRegistry : PermissionRegistry() {
     val WORLD_COMMAND_LIST = create("$PREFIX.world.command.list")
     val WORLD_COMMAND_JOIN = create("$PREFIX.world.command.join")
     val WORLD_BYPASS = create("$PREFIX.world.bypass")
+    val PING_COMMAND = create("$PREFIX.ping.command")
+    val PING_COMMAND_OTHER = create("$PREFIX.ping.command.other")
 }

src/main/kotlin/dev/slne/surf/essentials/util/util/surf-util.kt

@@ -89,4 +89,50 @@ fun Duration.userContent(): String {
     if (parts.isEmpty() && millis > 0) parts.add("$millis Millisekunden")
 
     return parts.joinToString(", ")
-}
+}
+
+fun SurfComponentBuilder.coloredDuration(
+    duration: Duration,
+    good: Duration = Duration.ofMillis(200),
+    okay: Duration = Duration.ofMillis(1000)
+) {
+    val millis = duration.toMillis()
+    when {
+        duration < good -> text(
+            millis.toString() + "ms",
+            Colors.GREEN
+        )
+
+        duration < okay -> text(
+            millis.toString() + "ms",
+            Colors.YELLOW
+        )
+
+        else -> text(millis.toString() + "ms", Colors.RED)
+    }
+}
+
+fun SurfComponentBuilder.coloredPing(
+    ping: Long
+) = coloredDuration(Duration.ofMillis(ping), Duration.ofMillis(100), Duration.ofMillis(300))
+
+fun Long.coloredComponent(good: Long = 200L, okay: Long = 1000L) =
+    buildText {
+        when {
+            this@coloredComponent < good -> append(
+                Component.text(
+                    this@coloredComponent.toString() + "ms",
+                    Colors.GREEN
+                )
+            )
+
+            this@coloredComponent < okay -> append(
+                Component.text(
+                    this@coloredComponent.toString() + "ms",
+                    Colors.YELLOW
+                )
+            )
+
+            else -> append(Component.text(this@coloredComponent.toString() + "ms", Colors.RED))
+        }
+    }