From f68439cd13e43a2030a9c193159754d2846fa4d6 Mon Sep 17 00:00:00 2001 From: DaMachinator Date: Thu, 8 Feb 2018 13:05:19 -0500 Subject: [PATCH] Commands can be disabled now --- src/main/kotlin/matterlink/MatterLinkConfig.kt | 9 ++++++++- src/main/kotlin/matterlink/bridge/ServerChatHelper.kt | 2 +- .../kotlin/matterlink/bridge/command/BridgeCommand.kt | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/matterlink/MatterLinkConfig.kt b/src/main/kotlin/matterlink/MatterLinkConfig.kt index 23f053c..ae8243d 100644 --- a/src/main/kotlin/matterlink/MatterLinkConfig.kt +++ b/src/main/kotlin/matterlink/MatterLinkConfig.kt @@ -37,7 +37,8 @@ class MatterLinkConfig(file: File) { ) data class CommandOptions( - val prefix: String + val prefix: String, + val enable: Boolean ) init { @@ -75,6 +76,12 @@ class MatterLinkConfig(file: File) { config.addCustomCategoryComment(CATEGORY_COMMAND,"User commands") command = CommandOptions( + enable = config.getBoolean( + "enable", + CATEGORY_COMMAND, + true, + "Enable MC bridge commands" + ), prefix = config.getString( "commandPrefix", CATEGORY_COMMAND, diff --git a/src/main/kotlin/matterlink/bridge/ServerChatHelper.kt b/src/main/kotlin/matterlink/bridge/ServerChatHelper.kt index b72e425..342c2d7 100644 --- a/src/main/kotlin/matterlink/bridge/ServerChatHelper.kt +++ b/src/main/kotlin/matterlink/bridge/ServerChatHelper.kt @@ -21,7 +21,7 @@ class ServerChatHelper { val message = when (nextMessage.event) { "user_action" -> nextMessage.format(cfg!!.formatting.action) "" -> { - BridgeCommand.handleCommand(nextMessage.text) + if (BridgeCommand.handleCommand(nextMessage.text)) return nextMessage.format(cfg!!.formatting.chat) } "join_leave" -> nextMessage.format(cfg!!.formatting.joinLeave) diff --git a/src/main/kotlin/matterlink/bridge/command/BridgeCommand.kt b/src/main/kotlin/matterlink/bridge/command/BridgeCommand.kt index 677ffda..013ff55 100644 --- a/src/main/kotlin/matterlink/bridge/command/BridgeCommand.kt +++ b/src/main/kotlin/matterlink/bridge/command/BridgeCommand.kt @@ -11,6 +11,7 @@ class BridgeCommand(val name: String, command: (String) -> Boolean, val help: St private val commandMap: HashMap = HashMap() fun handleCommand(input: String): Boolean { + if (!cfg!!.command.enable) return false if (input[0] != cfg!!.command.prefix[0] || input.length < 2) return false val cmd = input.substring(1).split(delimiters = ' ', ignoreCase = false, limit = 2)