/item give completions and formatting fix

Stellarica · Jun 21, 2022 · f43cee2 · f43cee2
1 parent 80f1010
commit f43cee2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/src/main/kotlin/io/github/hydrazinemc/hydrazine/Hydrazine.kt b/src/main/kotlin/io/github/hydrazinemc/hydrazine/Hydrazine.kt
@@ -75,6 +75,8 @@ class Hydrazine : JavaPlugin() {
 			StarshipDebugCommands(),
 			CustomItemCommands()
 		).forEach { commandManager.registerCommand(it) }
+		commandManager.commandCompletions.registerCompletion("customitems"
+		) { CustomItems.all.keys }
 
 		// Reload the config
 		saveDefaultConfig()

diff --git a/src/main/kotlin/io/github/hydrazinemc/hydrazine/customitems/CustomItems.kt b/src/main/kotlin/io/github/hydrazinemc/hydrazine/customitems/CustomItems.kt
@@ -23,6 +23,12 @@ object CustomItems {
 	 */
 	operator fun get(name: String?): CustomItem? = items[name]
 
+	/**
+	 * The registered custom items
+	 */ // id rather not expose items itself
+	val all: Map<String, CustomItem>
+		get() = items.toMap()
+
 
 	/**
 	 * Load custom items from the config file

diff --git a/src/main/kotlin/io/github/hydrazinemc/hydrazine/customitems/commands/CustomItemCommands.kt b/src/main/kotlin/io/github/hydrazinemc/hydrazine/customitems/commands/CustomItemCommands.kt
@@ -2,8 +2,11 @@ package io.github.hydrazinemc.hydrazine.customitems.commands
 
 import co.aikar.commands.BaseCommand
 import co.aikar.commands.annotation.CommandAlias
+import co.aikar.commands.annotation.CommandCompletion
 import co.aikar.commands.annotation.CommandPermission
+import co.aikar.commands.annotation.Default
 import co.aikar.commands.annotation.Description
+import co.aikar.commands.annotation.Optional
 import co.aikar.commands.annotation.Subcommand
 import io.github.hydrazinemc.hydrazine.customitems.CustomItems
 import io.github.hydrazinemc.hydrazine.customitems.customItem
@@ -23,13 +26,18 @@ class CustomItemCommands : BaseCommand() {
 	@Subcommand("give")
 	@Description("Get a custom item")
 	@CommandPermission("hydrazine.customitems.give")
-	fun onGive(sender: Player, id: String, count: Int = 1, target: Player = sender) {
+	@CommandCompletion("@customitems")
+	fun onGive(
+		sender: Player,
+		id: String,
+		@Default("1") count: Int,
+		@Optional target: Player = sender) {
 		val item = CustomItems[id] ?: run {
 			sender.sendRichMessage("<red>No custom item with the id '$id' found.")
 			return
 		}
 		target.inventory.addItem(item.getItem(count))
-		sender.sendRichMessage("Gave <b>$count</b> of ${item.name} to ${target.name}.")
+		sender.sendRichMessage("Gave <b>$count</b> of ${item.name}<reset> to ${target.name}.")
 	}
 
 	/**