refactor: add/improve some constructors in AbstractStellarCommand & S…

…tellarCommand
UndefinedCreations · Nov 30, 2024 · 1db2682 · 1db2682
1 parent a67a3b6
commit 1db2682
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/api/src/main/kotlin/com/undefined/stellar/StellarCommand.kt b/api/src/main/kotlin/com/undefined/stellar/StellarCommand.kt
@@ -12,7 +12,11 @@ val registrars = mapOf(
     "1.20.6" to com.undefined.stellar.v1_20_6.BrigadierCommandRegistrar
 )
 
-class StellarCommand(name: String, vararg aliases: String) : AbstractStellarCommand<StellarCommand>(name) {
+class StellarCommand(name: String, description: String = "", vararg aliases: String = arrayOf()) : AbstractStellarCommand<StellarCommand>(name, description) {
+
+    constructor(name: String, vararg aliases: String) : this(name, "", aliases = aliases)
+    constructor(name: String, aliases: List<String>) : this(name, "", aliases = aliases.toTypedArray())
+
     init {
         this.aliases.addAll(aliases)
     }
@@ -30,4 +34,5 @@ class StellarCommand(name: String, vararg aliases: String) : AbstractStellarComm
             return registrar.parseAndReturnCancelled(sender, input)
         }
     }
+
 }
diff --git a/common/src/main/kotlin/com/undefined/stellar/AbstractStellarCommand.kt b/common/src/main/kotlin/com/undefined/stellar/AbstractStellarCommand.kt
@@ -15,13 +15,11 @@ import org.bukkit.entity.Player
 import org.bukkit.plugin.java.JavaPlugin
 
 @Suppress("UNCHECKED_CAST")
-abstract class AbstractStellarCommand<T>(val name: String) : SubCommandHandler() {
+abstract class AbstractStellarCommand<T>(val name: String, var description: String = "", var usage: String = "") : SubCommandHandler() {
 
     override fun getBase(): AbstractStellarCommand<*> = this
 
     val aliases: MutableList<String> = mutableListOf()
-    var description: String = ""
-    var usage: String = ""
     val failureMessages: MutableList<Component> = mutableListOf()
     val globalFailureMessages: MutableList<Component> = mutableListOf()
     val failureExecutions: MutableList<CustomStellarExecution<*, Any>> = mutableListOf()