From 0ae1004fadc9a0c8d568ac7e8e4a7bd08b00d2eb Mon Sep 17 00:00:00 2001 From: ericscott-uk Date: Tue, 29 Jan 2019 20:15:25 +0000 Subject: [PATCH] Made permission and command usage messages configurable through a setter --- pom.xml | 14 +++++++++++++- src/main/kotlin/com/qrakn/honcho/Honcho.kt | 15 +++++++++++++++ .../kotlin/com/qrakn/honcho/HonchoExecutor.kt | 4 ++-- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 31ff924..07e2d4f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.qrakn honcho - 1.2-SNAPSHOT + 1.3-SNAPSHOT 1.3.11 @@ -39,6 +39,18 @@ + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + diff --git a/src/main/kotlin/com/qrakn/honcho/Honcho.kt b/src/main/kotlin/com/qrakn/honcho/Honcho.kt index 8155aad..1af4073 100644 --- a/src/main/kotlin/com/qrakn/honcho/Honcho.kt +++ b/src/main/kotlin/com/qrakn/honcho/Honcho.kt @@ -3,13 +3,20 @@ package com.qrakn.honcho import com.qrakn.honcho.command.adapter.CommandTypeAdapter import com.qrakn.honcho.command.adapter.impl.PlayerTypeAdapter import com.qrakn.honcho.command.adapter.impl.StringTypeAdapter +import org.bukkit.ChatColor import org.bukkit.entity.Player import org.bukkit.plugin.java.JavaPlugin +import org.omg.CORBA.NO_PERMISSION class Honcho(val plugin: JavaPlugin) { private val executor: HonchoExecutor = HonchoExecutor(this) + companion object { + var noPermission: String = "${ChatColor.RED}Insufficient permission." + var commandUsage: String = "${ChatColor.RED}Usage: {usage}" + } + init { registerTypeAdapter(String::class.java, StringTypeAdapter()) registerTypeAdapter(Player::class.java, PlayerTypeAdapter()) @@ -33,4 +40,12 @@ class Honcho(val plugin: JavaPlugin) { executor.adapters.putIfAbsent(clazz, adapter) } + fun setPermissionMessage(value: String){ + noPermission = value + } + + fun setUsageMessage(value: String){ + commandUsage = value + } + } \ No newline at end of file diff --git a/src/main/kotlin/com/qrakn/honcho/HonchoExecutor.kt b/src/main/kotlin/com/qrakn/honcho/HonchoExecutor.kt index 7383482..5511aa5 100644 --- a/src/main/kotlin/com/qrakn/honcho/HonchoExecutor.kt +++ b/src/main/kotlin/com/qrakn/honcho/HonchoExecutor.kt @@ -61,7 +61,7 @@ internal class HonchoExecutor(private val honcho: Honcho) : CommandExecutor { val instance = binding.command if (meta.permission.isNotEmpty() && !sender.hasPermission(meta.permission)) { - sender.sendMessage("Nope.") // TODO send configurable no permission message (make command specific or impl specific?) + sender.sendMessage(Honcho.noPermission) return true } @@ -120,7 +120,7 @@ internal class HonchoExecutor(private val honcho: Honcho) : CommandExecutor { } } - sender.sendMessage("${ChatColor.RED}Usage: ${command.usage}") // todo: make configurable + sender.sendMessage(Honcho.commandUsage.replace("{usage}", command.usage)) } }