Merge pull request #145 from SpigotBasics/dev

Fixed aliases, deprecated RawCommandBuilder
SpigotBasics · Feb 17, 2024 · ef0822f · ef0822f
2 parents eb25ec5 + a526c07
commit ef0822f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 1 deletion.
diff --git a/core/src/main/kotlin/com/github/spigotbasics/core/command/common/BasicsCommand.kt b/core/src/main/kotlin/com/github/spigotbasics/core/command/common/BasicsCommand.kt
@@ -35,6 +35,7 @@ class BasicsCommand internal constructor(
         permission = if (coreConfig.hideCommandsWhenNoPermission) permString else null
         description = info.description ?: ""
         usage = info.usage
+        aliases = info.aliases
         permissionMessage = info.permissionMessage.tagParsed("permission", permString).toLegacyString()
     }
 

diff --git a/core/src/main/kotlin/com/github/spigotbasics/core/command/factory/CommandFactory.kt b/core/src/main/kotlin/com/github/spigotbasics/core/command/factory/CommandFactory.kt
@@ -12,6 +12,7 @@ class CommandFactory(
     private val coreMessages: CoreMessages,
     private val commandManager: BasicsCommandManager,
 ) {
+    @Deprecated("Use ParsedCommandBuilder instead")
     fun rawCommandBuilder(
         name: String,
         permission: Permission,

diff --git a/core/src/main/kotlin/com/github/spigotbasics/core/command/factory/RawCommandBuilder.kt b/core/src/main/kotlin/com/github/spigotbasics/core/command/factory/RawCommandBuilder.kt
@@ -39,7 +39,6 @@ class RawCommandBuilder(
     @Deprecated("Ignored by Bukkit")
     private fun permissionMessage(permissionMessage: Message) = apply { this.permissionMessage = permissionMessage }
 
-    @Deprecated("Will be registered automatically in the future")
     fun aliases(aliases: List<String>) = apply { this.aliases = aliases }
 
     fun executor(executor: BasicsCommandExecutor) = apply { this.executor = executor }

diff --git a/core/src/main/kotlin/com/github/spigotbasics/core/command/parsed/arguments/IntRangeArg.kt b/core/src/main/kotlin/com/github/spigotbasics/core/command/parsed/arguments/IntRangeArg.kt
@@ -1,6 +1,7 @@
 package com.github.spigotbasics.core.command.parsed.arguments
 
 import com.github.spigotbasics.core.Basics
+import com.github.spigotbasics.core.extensions.partialMatches
 import com.github.spigotbasics.core.messages.Message
 import org.bukkit.command.CommandSender
 
@@ -24,4 +25,11 @@ class IntRangeArg(name: String, private val min: () -> Int, private val max: ()
         val given = value.toIntOrNull() ?: return Basics.messages.invalidValueForArgumentMustBeInteger(name, value)
         return Basics.messages.invalidValueForArgumentNumberNotInRange(name, given, min(), max())
     }
+
+    override fun tabComplete(
+        sender: CommandSender,
+        typing: String,
+    ): List<String> {
+        return listOf(min().toString(), max().toString()).partialMatches(typing)
+    }
 }
diff --git a/...in/com/github/spigotbasics/core/command/parsed/dsl/commandbuilder/ParsedCommandBuilder.kt b/...in/com/github/spigotbasics/core/command/parsed/dsl/commandbuilder/ParsedCommandBuilder.kt
@@ -44,6 +44,8 @@ open class ParsedCommandBuilder<T : CommandContext>(
             this.usage = usage
         }
 
+    fun aliases(aliases: List<String>) = apply { this.aliases = aliases }
+
     fun path(argumentPath: ArgumentPath<T>) = apply { this.argumentPaths.add(argumentPath) }
 
     fun path(argumentPathBuilder: ArgumentPathBuilder<T>) = apply { this.argumentPaths.add(argumentPathBuilder.build()) }

diff --git a/...asics-core/src/main/kotlin/com/github/spigotbasics/modules/basicscore/BasicsCoreModule.kt b/...asics-core/src/main/kotlin/com/github/spigotbasics/modules/basicscore/BasicsCoreModule.kt
@@ -28,6 +28,7 @@ class BasicsCoreModule(context: ModuleInstantiationContext) : AbstractBasicsModu
         commandFactory.parsedCommandBuilder("module", modulePermission)
             .mapContext {
                 usage = "<command> [module]"
+                aliases(listOf("mod"))
 
                 // module help
                 path {