fix(command-context): arguments not being ordered correctly

UndefinedCreations · Dec 10, 2024 · e9c1843 · e9c1843
1 parent 300b5dc
commit e9c1843
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/server/src/main/kotlin/com/undefined/stellar/Main.kt b/server/src/main/kotlin/com/undefined/stellar/Main.kt
@@ -1,12 +1,20 @@
 package com.undefined.stellar
 
+import org.bukkit.Location
+import org.bukkit.entity.Player
 import org.bukkit.plugin.java.JavaPlugin
 
 class Main : JavaPlugin() {
 
     override fun onEnable() {
-        StellarCommand("test", "othertest")
-            .addFailureMessages("")
+        StellarCommand("test")
+            .addLocationArgument("location")
+            .addStringArgument("test")
+            .addExecution<Player> {
+//                sender.sendMessage(getArgument<Location>(0).toVector().toString())
+//                sender.sendMessage(getArgument<String>(3))
+                sender.sendMessage(arguments.toList().withIndex().joinToString(", ") { "${it.index}: ${it.value.first}" })
+            }
             .register(this)
     }
 

diff --git a/v1_20_6/src/main/kotlin/com/undefined/stellar/v1_20_6/CommandContextAdapter.kt b/v1_20_6/src/main/kotlin/com/undefined/stellar/v1_20_6/CommandContextAdapter.kt
@@ -3,6 +3,7 @@ package com.undefined.stellar.v1_20_6
 import com.mojang.brigadier.context.CommandContext
 import com.undefined.stellar.AbstractStellarCommand
 import com.undefined.stellar.StellarCommands
+import com.undefined.stellar.argument.AbstractStellarArgument
 import com.undefined.stellar.argument.LiteralStellarArgument
 import com.undefined.stellar.argument.types.custom.CustomArgument
 import com.undefined.stellar.data.argument.CommandNode
@@ -21,22 +22,21 @@ import org.bukkit.command.CommandSender
 
 object CommandContextAdapter {
 
+    @Suppress("UNCHECKED_CAST")
     fun getStellarCommandContext(context: CommandContext<CommandSourceStack>): com.undefined.stellar.data.argument.CommandContext<CommandSender> {
         val input = context.input.removePrefix("/")
         val baseCommand: AbstractStellarCommand<*> = StellarCommands.getStellarCommand(context.nodes[0].node.name)!!
         val arguments = BrigadierCommandHelper.getArguments(baseCommand, context)
         if (arguments.filter { it !is LiteralStellarArgument }.groupingBy { it.name }.eachCount().any { it.value > 1 }) throw DuplicateArgumentNameException()
-        val parsedArguments: CommandNode = CommandNode()
-        parsedArguments.putAll(
+        val parsedArguments: CommandNode =
             BrigadierCommandHelper.getArguments(baseCommand, context)
-                .associate { argument ->
+                .associate<AbstractStellarArgument<*>, String, (com.undefined.stellar.data.argument.CommandContext<CommandSender>) -> Any?> { argument ->
                     if (argument is CustomArgument) return@associate Pair(argument.name) { argument.parse(it) }
                     if (argument is LiteralStellarArgument) return@associate Pair(argument.name) { throw LiteralArgumentMismatchException() }
                     Pair(argument.name) {
                         ArgumentHelper.getParsedArgument(context, argument)
                     }
-                }
-        )
+                } as CommandNode
         return com.undefined.stellar.data.argument.CommandContext(
             parsedArguments,
             context.source.bukkitSender,

diff --git a/v1_21_3/src/main/kotlin/com/undefined/stellar/v1_21_3/CommandContextAdapter.kt b/v1_21_3/src/main/kotlin/com/undefined/stellar/v1_21_3/CommandContextAdapter.kt
@@ -3,6 +3,7 @@ package com.undefined.stellar.v1_21_3
 import com.mojang.brigadier.context.CommandContext
 import com.undefined.stellar.AbstractStellarCommand
 import com.undefined.stellar.StellarCommands
+import com.undefined.stellar.argument.AbstractStellarArgument
 import com.undefined.stellar.argument.LiteralStellarArgument
 import com.undefined.stellar.argument.types.custom.CustomArgument
 import com.undefined.stellar.data.argument.CommandNode
@@ -21,22 +22,21 @@ import org.bukkit.command.CommandSender
 
 object CommandContextAdapter {
 
+    @Suppress("UNCHECKED_CAST")
     fun getStellarCommandContext(context: CommandContext<CommandSourceStack>): com.undefined.stellar.data.argument.CommandContext<CommandSender> {
         val input = context.input.removePrefix("/")
         val baseCommand: AbstractStellarCommand<*> = StellarCommands.getStellarCommand(context.nodes[0].node.name)!!
         val arguments = BrigadierCommandHelper.getArguments(baseCommand, context)
         if (arguments.filter { it !is LiteralStellarArgument }.groupingBy { it.name }.eachCount().any { it.value > 1 }) throw DuplicateArgumentNameException()
-        val parsedArguments: CommandNode = CommandNode()
-        parsedArguments.putAll(
+        val parsedArguments: CommandNode =
             BrigadierCommandHelper.getArguments(baseCommand, context)
-                .associate { argument ->
+                .associate<AbstractStellarArgument<*>, String, (com.undefined.stellar.data.argument.CommandContext<CommandSender>) -> Any?> { argument ->
                     if (argument is CustomArgument) return@associate Pair(argument.name) { argument.parse(it) }
                     if (argument is LiteralStellarArgument) return@associate Pair(argument.name) { throw LiteralArgumentMismatchException() }
                     Pair(argument.name) {
                         ArgumentHelper.getParsedArgument(context, argument)
                     }
-                }
-        )
+                } as CommandNode
         return com.undefined.stellar.data.argument.CommandContext(
             parsedArguments,
             context.source.bukkitSender,