Fix/fix command api (#275)

Author: ammodev

gradle.properties

@@ -7,6 +7,6 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 javaVersion=25
 mcVersion=1.21.11
 group=dev.slne.surf
-version=1.21.11-2.73.1
+version=1.21.11-2.73.2
 relocationPrefix=dev.slne.surf.surfapi.libs
 snapshot=false

gradle/libs.versions.toml

@@ -16,7 +16,7 @@ packetevents = "2.11.2"
 packetevents-plugin = "2.11.2"
 
 # Command API
-commandapi = "11.1.0"
+commandapi = "11.2.0"
 
 # LuckPerms
 luckperms = "v5.5.0-bukkit"

surf-api-bukkit/surf-api-bukkit-api/src/main/kotlin/dev/slne/surf/surfapi/bukkit/api/command/args/AdventureCompoundBinaryTagArgument.kt

@@ -15,7 +15,7 @@ import net.kyori.adventure.nbt.TagStringIO
 @OptIn(NmsUseWithCaution::class)
 class AdventureCompoundBinaryTagArgument(nodeName: String) :
     SafeOverrideableArgument<CompoundBinaryTag, CompoundBinaryTag>(
-        nodeName, commandArgumentTypes.compoundTag(), { TagStringIO.tagStringIO().asString(it) }
+        nodeName, commandArgumentTypes::compoundTag, { TagStringIO.tagStringIO().asString(it) }
     ) {
     override fun getPrimitiveType(): Class<CompoundBinaryTag> {
         return CompoundBinaryTag::class.java
@@ -38,17 +38,20 @@ inline fun CommandTree.adventureCompoundBinaryTagArgument(
     nodeName: String,
     optional: Boolean = false,
     block: Argument<*>.() -> Unit = {}
-): CommandTree = then(AdventureCompoundBinaryTagArgument(nodeName).setOptional(optional).apply(block))
+): CommandTree =
+    then(AdventureCompoundBinaryTagArgument(nodeName).setOptional(optional).apply(block))
 
 inline fun Argument<*>.adventureCompoundBinaryTagArgument(
     nodeName: String,
     optional: Boolean = false,
     block: Argument<*>.() -> Unit = {}
-): Argument<*> = then(AdventureCompoundBinaryTagArgument(nodeName).setOptional(optional).apply(block))
+): Argument<*> =
+    then(AdventureCompoundBinaryTagArgument(nodeName).setOptional(optional).apply(block))
 
 
 inline fun CommandAPICommand.adventureCompoundBinaryTagArgument(
     nodeName: String,
     optional: Boolean = false,
     block: Argument<*>.() -> Unit = {}
-): CommandAPICommand = withArguments(AdventureCompoundBinaryTagArgument(nodeName).setOptional(optional).apply(block))
+): CommandAPICommand =
+    withArguments(AdventureCompoundBinaryTagArgument(nodeName).setOptional(optional).apply(block))

surf-api-velocity/surf-api-velocity-api/src/main/kotlin/dev/slne/surf/surfapi/velocity/api/command/args/MiniMessageArgument.kt

@@ -14,7 +14,7 @@ import net.kyori.adventure.text.minimessage.MiniMessage
 import net.kyori.adventure.text.minimessage.ParsingException
 
 open class MiniMessageArgument(nodeName: String) :
-    Argument<Component>(nodeName, StringArgumentType.string()) {
+    Argument<Component>(nodeName, StringArgumentType::string) {
     override fun getPrimitiveType(): Class<Component> {
         return Component::class.java
     }

surf-api-velocity/surf-api-velocity-api/src/main/kotlin/dev/slne/surf/surfapi/velocity/api/command/args/SuspendCustomArgument.kt

@@ -32,7 +32,9 @@ import java.util.concurrent.CompletableFuture
 abstract class SuspendCustomArgument<T, B>(
     private val base: Argument<B>,
     private val scope: CoroutineScope = defaultScope
-) : Argument<Deferred<T>>(base.nodeName, base.rawType) {
+) : Argument<Deferred<T>>(base.nodeName, {
+    base.rawType
+}) {
     private val primitiveType by lazy { object : TypeToken<Deferred<T>>(javaClass) {} }
 
     override fun instance() = this
@@ -42,7 +44,10 @@ abstract class SuspendCustomArgument<T, B>(
 
     protected abstract inner class SuspendArgumentSuggestions : ArgumentSuggestions<CommandSource> {
         @Throws(CommandSyntaxException::class)
-        abstract suspend fun CoroutineScope.suggest(info: SuggestionInfo<CommandSource>, builder: SuggestionsBuilder)
+        abstract suspend fun CoroutineScope.suggest(
+            info: SuggestionInfo<CommandSource>,
+            builder: SuggestionsBuilder
+        )
 
         final override fun suggest(
             info: SuggestionInfo<CommandSource>,