✨ feat(command): add (async) (offline) player argument support

gradle.properties

@@ -7,6 +7,6 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 javaVersion=25
 mcVersion=26.1.2
 group=dev.slne.surf.api
-version=3.10.0
+version=3.10.1
 relocationPrefix=dev.slne.surf.api.libs
 snapshot=false

gradle/libs.versions.toml

@@ -9,7 +9,7 @@ kotlinxCoroutines = "1.10.2"
 kotlinx-serialization = "1.11.0"
 
 # Packet Events
-packetevents = "2.11.2"
+packetevents = "2.12.1"
 packetevents-plugin = "2.12.1"
 
 # Command API
@@ -115,7 +115,7 @@ adventure-nbt = { module = "net.kyori:adventure-nbt", version.ref = "adventure-a
 
 # Velocity
 velocity-api = { module = "com.velocitypowered:velocity-api", version.ref = "velocity-api" }
-velocity-proxy-ctd = { module = "com.velocityctd:velocity-proxy", version.ref = "velocity-api"}
+velocity-proxy-ctd = { module = "com.velocityctd:velocity-proxy", version.ref = "velocity-api" }
 
 # PAPI
 placeholder-api = { module = "me.clip:placeholderapi", version.ref = "placeholder-api" }

surf-api-paper/surf-api-paper/src/main/kotlin/dev/slne/surf/api/paper/command/args/audience/AsyncOfflinePlayerArgument.kt

@@ -0,0 +1,55 @@
+package dev.slne.surf.api.paper.command.args.audience
+
+import dev.jorel.commandapi.CommandAPICommand
+import dev.jorel.commandapi.CommandTree
+import dev.jorel.commandapi.arguments.Argument
+import dev.jorel.commandapi.arguments.ArgumentSuggestions
+import dev.jorel.commandapi.arguments.StringArgument
+import dev.slne.surf.api.paper.command.args.SuspendCustomArgument
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.bukkit.Bukkit
+import org.bukkit.OfflinePlayer
+import org.bukkit.entity.Player
+
+class AsyncOfflinePlayerArgument(nodeName: String) :
+    SuspendCustomArgument<OfflinePlayer, String>(StringArgument(nodeName)) {
+
+    override suspend fun CoroutineScope.parse(info: CustomArgumentInfo<String>) =
+        withContext(Dispatchers.IO) {
+            Bukkit.getOfflinePlayer(info.input)
+        }
+
+    init {
+        this.replaceSuggestions(
+            ArgumentSuggestions.stringCollection { viewerInfo ->
+                Bukkit.getOnlinePlayers().filter { viewerInfo.sender !is Player || it.canSee(it) }
+                    .map(Player::getName)
+            }
+        )
+    }
+}
+
+inline fun CommandTree.asyncOfflinePlayerArgument(
+    nodeName: String,
+    optional: Boolean = false,
+    block: Argument<*>.() -> Unit = {}
+): CommandTree = then(
+    AsyncOfflinePlayerArgument(nodeName).setOptional(optional).apply(block)
+)
+
+inline fun Argument<*>.asyncOfflinePlayerArgument(
+    nodeName: String,
+    optional: Boolean = false,
+    block: Argument<*>.() -> Unit = {}
+): Argument<*> = then(
+    AsyncOfflinePlayerArgument(nodeName).setOptional(optional).apply(block)
+)
+
+inline fun CommandAPICommand.asyncOfflinePlayerArgument(
+    nodeName: String,
+    optional: Boolean = false,
+    block: Argument<*>.() -> Unit = {}
+): CommandAPICommand =
+    withArguments(AsyncOfflinePlayerArgument(nodeName).setOptional(optional).apply(block))

surf-api-paper/surf-api-paper/src/main/kotlin/dev/slne/surf/api/paper/command/args/audience/OfflinePlayerArgument.kt

@@ -0,0 +1,48 @@
+package dev.slne.surf.api.paper.command.args.audience
+
+import dev.jorel.commandapi.CommandAPICommand
+import dev.jorel.commandapi.CommandTree
+import dev.jorel.commandapi.arguments.Argument
+import dev.jorel.commandapi.arguments.ArgumentSuggestions
+import dev.jorel.commandapi.arguments.CustomArgument
+import dev.jorel.commandapi.arguments.StringArgument
+import org.bukkit.Bukkit
+import org.bukkit.OfflinePlayer
+import org.bukkit.entity.Player
+
+class OfflinePlayerArgument(nodeName: String) :
+    CustomArgument<OfflinePlayer, String>(StringArgument(nodeName), { info ->
+        Bukkit.getOfflinePlayer(info.input)
+    }) {
+    init {
+        this.replaceSuggestions(
+            ArgumentSuggestions.stringCollection { viewerInfo ->
+                Bukkit.getOnlinePlayers().filter { viewerInfo.sender !is Player || it.canSee(it) }
+                    .map(Player::getName)
+            }
+        )
+    }
+}
+
+inline fun CommandTree.offlinePlayerArgument(
+    nodeName: String,
+    optional: Boolean = false,
+    block: Argument<*>.() -> Unit = {}
+): CommandTree = then(
+    OfflinePlayerArgument(nodeName).setOptional(optional).apply(block)
+)
+
+inline fun Argument<*>.offlinePlayerArgument(
+    nodeName: String,
+    optional: Boolean = false,
+    block: Argument<*>.() -> Unit = {}
+): Argument<*> = then(
+    OfflinePlayerArgument(nodeName).setOptional(optional).apply(block)
+)
+
+inline fun CommandAPICommand.offlinePlayerArgument(
+    nodeName: String,
+    optional: Boolean = false,
+    block: Argument<*>.() -> Unit = {}
+): CommandAPICommand =
+    withArguments(OfflinePlayerArgument(nodeName).setOptional(optional).apply(block))

surf-api-paper/surf-api-paper/src/main/kotlin/dev/slne/surf/api/paper/command/args/audience/PlayerArgument.kt

@@ -0,0 +1,54 @@
+package dev.slne.surf.api.paper.command.args.audience
+
+import dev.jorel.commandapi.CommandAPICommand
+import dev.jorel.commandapi.CommandTree
+import dev.jorel.commandapi.arguments.Argument
+import dev.jorel.commandapi.arguments.ArgumentSuggestions
+import dev.jorel.commandapi.arguments.CustomArgument
+import dev.jorel.commandapi.arguments.StringArgument
+import dev.slne.surf.api.core.messages.adventure.buildText
+import org.bukkit.Bukkit
+import org.bukkit.entity.Player
+
+class PlayerArgument(nodeName: String) :
+    CustomArgument<Player, String>(StringArgument(nodeName), { info ->
+        Bukkit.getPlayer(info.input)?.takeIf {
+            info.sender !is Player || it.canSee(it)
+        } ?: throw CustomArgumentException.fromAdventureComponent(
+            buildText {
+                appendErrorPrefix()
+                error("Der Spieler wurde nicht gefunden.")
+            })
+    }) {
+    init {
+        this.replaceSuggestions(
+            ArgumentSuggestions.stringCollection { viewerInfo ->
+                Bukkit.getOnlinePlayers().filter { viewerInfo.sender !is Player || it.canSee(it) }
+                    .map(Player::getName)
+            }
+        )
+    }
+}
+
+inline fun CommandTree.playerArgument(
+    nodeName: String,
+    optional: Boolean = false,
+    block: Argument<*>.() -> Unit = {}
+): CommandTree = then(
+    PlayerArgument(nodeName).setOptional(optional).apply(block)
+)
+
+inline fun Argument<*>.playerArgument(
+    nodeName: String,
+    optional: Boolean = false,
+    block: Argument<*>.() -> Unit = {}
+): Argument<*> = then(
+    PlayerArgument(nodeName).setOptional(optional).apply(block)
+)
+
+inline fun CommandAPICommand.playerArgument(
+    nodeName: String,
+    optional: Boolean = false,
+    block: Argument<*>.() -> Unit = {}
+): CommandAPICommand =
+    withArguments(PlayerArgument(nodeName).setOptional(optional).apply(block))