feat: various improvements

UndefinedCreations · Jan 11, 2025 · 91c2635 · 91c2635
1 parent adbbeba
commit 91c2635
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 20 deletions.
diff --git a/api/src/main/kotlin/com/undefined/stellar/StellarCommand.kt b/api/src/main/kotlin/com/undefined/stellar/StellarCommand.kt
@@ -10,12 +10,15 @@ import org.bukkit.command.CommandSender
 import org.bukkit.plugin.java.JavaPlugin
 import org.jetbrains.annotations.ApiStatus
 
-class StellarCommand(name: String, permissions: List<String> = listOf()) : AbstractStellarCommand<StellarCommand>(name) {
+class StellarCommand(name: String, permissions: List<String> = listOf(), aliases: List<String> = listOf()) : AbstractStellarCommand<StellarCommand>(name) {
 
-    constructor(name: String, vararg permissions: String) : this(name, permissions = permissions.toList())
+    constructor(name: String, vararg aliases: String) : this(name, aliases = aliases.toList())
+    constructor(name: String, permission: String, vararg aliases: String) : this(name, listOf(permission), aliases.toList())
+    constructor(name: String, permission: String, aliases: List<String>) : this(name, listOf(permission), aliases)
 
     init {
         this.permissionRequirements.addAll(permissions.map { PermissionStellarRequirement(1, it) })
+        this.aliases.addAll(aliases)
     }
 
     private var registered = false

diff --git a/api/src/main/kotlin/com/undefined/stellar/util/Builders.kt b/api/src/main/kotlin/com/undefined/stellar/util/Builders.kt
@@ -2,13 +2,15 @@ package com.undefined.stellar.util
 
 import com.undefined.stellar.StellarCommand
 
-fun command(name: String, description: String, permissions: List<String>, builder: StellarCommand.() -> Unit): StellarCommand {
-    val command = StellarCommand(name, description)
-    command.addRequirements(*permissions.toTypedArray())
+fun command(name: String, description: String, permissions: List<String>, aliases: List<String>, builder: StellarCommand.() -> Unit): StellarCommand {
+    val command = StellarCommand(name, permissions, aliases)
+    command.setDescription(description)
     command.builder()
     return command
 }
 
-fun command(name: String, description: String, builder: StellarCommand.() -> Unit): StellarCommand = command(name, description, listOf(), builder)
-
+fun command(name: String, description: String, builder: StellarCommand.() -> Unit): StellarCommand = command(name, description, listOf(), listOf(), builder)
+fun command(name: String, description: String, permissions: List<String>, builder: StellarCommand.() -> Unit): StellarCommand = command(name, description, permissions, listOf(), builder)
+fun command(name: String, permissions: List<String>, builder: StellarCommand.() -> Unit): StellarCommand = command(name, "", permissions, listOf(), builder)
+fun command(name: String, permissions: List<String>, aliases: List<String>, builder: StellarCommand.() -> Unit): StellarCommand = command(name, "", permissions, aliases, builder)
 fun command(name: String, builder: StellarCommand.() -> Unit): StellarCommand = command(name, "", builder)
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 
 apply(plugin = "maven-publish")
 val projectGroupId = "com.undefined"
-val projectVersion = "0.0.38"
+val projectVersion = "0.0.39"
 val projectArtifactId = "stellar"
 
 group = projectGroupId

diff --git a/common/src/main/kotlin/com/undefined/stellar/argument/ArgumentHandler.kt b/common/src/main/kotlin/com/undefined/stellar/argument/ArgumentHandler.kt
@@ -93,39 +93,67 @@ open class ArgumentHandler {
     fun <T> addListArgument(
         name: String,
         list: List<T>,
-        stringifier: (T) -> Suggestion,
+        converter: (T) -> Suggestion,
         parse: (Any?) -> T
-    ): ListArgument<T> = addArgument { ListArgument(StringArgument(base, name, StringType.WORD), list, stringifier, parse) }
+    ): ListArgument<T> = addArgument { ListArgument(StringArgument(base, name, StringType.WORD), list, converter, parse) }
 
     fun <T> addListArgument(
         type: AbstractStellarArgument<*>,
         list: List<T>,
-        stringifier: (T) -> Suggestion,
+        converter: (T) -> Suggestion,
         parse: (Any?) -> T
-    ): ListArgument<T> = addArgument { ListArgument(type, list, stringifier, parse) }
+    ): ListArgument<T> = addArgument { ListArgument(type, list, converter, parse) }
 
     fun <T> addListArgument(
         name: String,
         list: CommandContext<CommandSender>.() -> List<T>,
-        stringifier: (T) -> Suggestion,
+        converter: (T) -> Suggestion,
         parse: (Any?) -> T
-    ): ListArgument<T> = addArgument { ListArgument(StringArgument(base, name, StringType.WORD), list, stringifier, parse) }
+    ): ListArgument<T> = addArgument { ListArgument(StringArgument(base, name, StringType.WORD), list, converter, parse) }
 
     fun <T> addListArgument(
         type: AbstractStellarArgument<*>,
         list: CommandContext<CommandSender>.() -> List<T>,
-        stringifier: (T) -> Suggestion,
+        converter: (T) -> Suggestion,
         parse: (Any?) -> T
-    ): ListArgument<T> = addArgument { ListArgument(type, list, stringifier, parse) }
+    ): ListArgument<T> = addArgument { ListArgument(type, list, converter, parse) }
 
-    fun addStringListArgument(name: String, list: List<String>, type: StringType = StringType.WORD): ListArgument<String> =
-        addArgument { ListArgument(StringArgument(base, name, type), list, { Suggestion.withText(it.toString()) }, { it }) }
+    fun <T> addBasicListArgument(
+        name: String,
+        list: List<T>,
+        converter: (T) -> String,
+        parse: (Any?) -> T
+    ): ListArgument<T> = addArgument { ListArgument(StringArgument(base, name, StringType.WORD), list, { Suggestion.withText(converter(it)) }, parse) }
+
+    fun <T> addBasicListArgument(
+        type: AbstractStellarArgument<*>,
+        list: List<T>,
+        converter: (T) -> String,
+        parse: (Any?) -> T
+    ): ListArgument<T> = addArgument { ListArgument(type, list, { Suggestion.withText(converter(it)) }, parse) }
+
+    fun <T> addBasicListArgument(
+        name: String,
+        list: CommandContext<CommandSender>.() -> List<T>,
+        converter: (T) -> String,
+        parse: (Any?) -> T
+    ): ListArgument<T> = addArgument { ListArgument(StringArgument(base, name, StringType.WORD), list, { Suggestion.withText(converter(it)) }, parse) }
+
+    fun <T> addBasicListArgument(
+        type: AbstractStellarArgument<*>,
+        list: CommandContext<CommandSender>.() -> List<T>,
+        converter: (T) -> String,
+        parse: (Any?) -> T
+    ): ListArgument<T> = addArgument { ListArgument(type, list, { Suggestion.withText(converter(it)) }, parse) }
+
+    fun addStringListArgument(name: String, list: List<String>, type: StringType = StringType.WORD, parse: (Any?) -> Any? = { it }): ListArgument<String> =
+        addArgument { ListArgument(StringArgument(base, name, type), list, { Suggestion.withText(it.toString()) }, parse) }
 
     fun addStringListArgument(name: String, vararg list: String): ListArgument<String> =
         addArgument { ListArgument(StringArgument(base, name, StringType.WORD), list.toList(), { Suggestion.withText(it.toString()) }, { it }) }
 
-    fun addUUIDListArgument(name: String, list: List<UUID>): ListArgument<UUID> =
-        addArgument { ListArgument(UUIDArgument(base, name), list, parse = { it }) }
+    fun addUUIDListArgument(name: String, list: List<UUID>, parse: (Any?) -> Any? = { it }): ListArgument<UUID> =
+        addArgument { ListArgument(UUIDArgument(base, name), list, parse = parse) }
 
     fun addStringListArgument(name: String, list: CommandContext<CommandSender>.() -> List<String>, type: StringType = StringType.WORD): ListArgument<String> =
         addArgument { ListArgument(StringArgument(base, name, type), list, { Suggestion.withText(it.toString()) }, { it }) }

diff --git a/gradle.properties b/gradle.properties
@@ -0,0 +1 @@
+kotlin.daemon.jvmargs=-Xmx4096M