From 23a28e6540bc3b8f42b3899f5ed3a7a4728c2b26 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Wed, 11 Jan 2017 11:45:13 -0600
Subject: [PATCH 01/24] General - Added ability to register Discord with
 Minecraft

Minecraft
- Added getDiscordIds command
- Added registeralias command
- Added config file to store aliases

Discord
- Added listserver command
- Added Oikos
---
 .../obsidian/discordbridge/CommandHandler.kt  | 47 ++++++++++-
 .../obsidian/discordbridge/ConfigAccessor.kt  | 79 +++++++++++++++++++
 .../discordbridge/DiscordConnection.kt        | 23 +++++-
 .../obsidian/discordbridge/DiscordListener.kt | 48 ++++++++++-
 .../obsidian/discordbridge/EventListener.kt   | 16 ++--
 .../gg/obsidian/discordbridge/Plugin.kt       | 64 +++++++++++++--
 .../gg/obsidian/discordbridge/UserAlias.kt    |  4 +
 7 files changed, 258 insertions(+), 23 deletions(-)
 create mode 100644 src/main/kotlin/gg/obsidian/discordbridge/ConfigAccessor.kt
 create mode 100644 src/main/kotlin/gg/obsidian/discordbridge/UserAlias.kt

diff --git a/src/main/kotlin/gg/obsidian/discordbridge/CommandHandler.kt b/src/main/kotlin/gg/obsidian/discordbridge/CommandHandler.kt
index 695e4ad..9bbb5ab 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/CommandHandler.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/CommandHandler.kt
@@ -9,13 +9,18 @@ import org.bukkit.entity.Player
 class CommandHandler(val plugin: Plugin): CommandExecutor {
 
     override fun onCommand(player: CommandSender, cmd: Command, alias: String?, args: Array<out String>?): Boolean {
+        if (cmd.name == "discord") return handleDiscord(player, args)
+        else if (cmd.name == "registeralias") return handleRegisterAlias(player, args)
+        else if (cmd.name == "getdiscordids") return handleGetDiscordIds(player)
+        return false
+    }
+
+    private fun handleDiscord(player: CommandSender, args: Array<out String>?): Boolean {
         if (player is Player && !Permissions.reload.has(player)) return true
 
         val isConsole = (player is Player)
 
-        if (cmd.name != "discord") return true
-
-        if (args == null || args.size != 1 || !args[0].equals("reload")) {
+        if (args == null || args.size != 1 || args[0] != "reload") {
             sendMessage("&eUsage: /discord reload", player, isConsole)
             return true
         }
@@ -25,6 +30,42 @@ class CommandHandler(val plugin: Plugin): CommandExecutor {
         return true
     }
 
+    private fun handleRegisterAlias(player: CommandSender, args: Array<out String>?): Boolean {
+        if (player !is Player) return true
+
+        if (args == null || args.size != 1) {
+            sendMessage("&eUsage: /registeralias <discord id>", player, false)
+            return true
+        }
+
+        val users = plugin.getDiscordUsers()
+        //val found: Boolean = users.any { it.second == args[0] }
+        val found: Pair<String, String>? = users.find { it.second == args[0] }
+        if (found == null) {
+            sendMessage("&eCould not find Discord user with that ID.", player, false)
+            return true
+        }
+
+        val ua: UserAlias = UserAlias(player.name, player.uniqueId.toString(), found.first,
+                found.second)
+
+        plugin.registerUserRequest(ua)
+        return true
+    }
+
+    private fun handleGetDiscordIds(player: CommandSender): Boolean {
+        val isConsole = (player !is Player)
+        val users = plugin.getDiscordUsers()
+        if (users.isEmpty()) {
+            sendMessage("&eNo Discord members could be found. Either server is empty or an error " +
+                    "has occurred.", player, isConsole)
+            return true
+        }
+        val response = users.joinToString("\n- ", "&eDiscord users:\n- ")
+        sendMessage(response, player, isConsole)
+        return true
+    }
+
     private fun sendMessage(message: String, player: CommandSender, isConsole: Boolean) {
         val formattedMessage = ChatColor.translateAlternateColorCodes('&', message)
         if (isConsole) {
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/ConfigAccessor.kt b/src/main/kotlin/gg/obsidian/discordbridge/ConfigAccessor.kt
new file mode 100644
index 0000000..75527d2
--- /dev/null
+++ b/src/main/kotlin/gg/obsidian/discordbridge/ConfigAccessor.kt
@@ -0,0 +1,79 @@
+package gg.obsidian.discordbridge
+
+/*
+* Copyright (C) 2012
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all
+* copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+* SOFTWARE.
+*/
+
+import org.bukkit.configuration.file.FileConfiguration
+import org.bukkit.configuration.file.YamlConfiguration
+import org.bukkit.plugin.java.JavaPlugin
+import java.io.File
+import java.io.IOException
+import java.io.InputStreamReader
+import java.util.logging.Level
+
+class ConfigAccessor(private val plugin: JavaPlugin, private val fileName: String) {
+
+    private val configFile: File?
+    private var fileConfiguration: FileConfiguration? = null
+
+    init {
+        plugin.dataFolder ?: throw IllegalStateException()
+        this.configFile = File(plugin.dataFolder, fileName)
+    }
+
+    fun reloadConfig() {
+        fileConfiguration = YamlConfiguration.loadConfiguration(configFile!!)
+
+        // Look for defaults in the jar
+        val defConfigReader = InputStreamReader(plugin.getResource(fileName))
+        val defConfig = YamlConfiguration.loadConfiguration(defConfigReader)
+        fileConfiguration!!.defaults = defConfig
+    }
+
+    val config: FileConfiguration
+        get() {
+            if (fileConfiguration == null) {
+                this.reloadConfig()
+            }
+            return fileConfiguration!!
+        }
+
+    fun saveConfig() {
+        if (fileConfiguration == null || configFile == null) {
+            return
+        } else {
+            try {
+                config.save(configFile)
+            } catch (ex: IOException) {
+                plugin.logger.log(Level.SEVERE, "Could not save config to " + configFile, ex)
+            }
+
+        }
+    }
+
+    fun saveDefaultConfig() {
+        if (!configFile!!.exists()) {
+            this.plugin.saveResource(fileName, false)
+        }
+    }
+
+}
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt b/src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt
index d509d36..c9e2e8a 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt
@@ -4,6 +4,7 @@ import net.dv8tion.jda.JDA
 import net.dv8tion.jda.JDABuilder
 import net.dv8tion.jda.entities.Guild
 import net.dv8tion.jda.entities.TextChannel
+import net.dv8tion.jda.events.message.MessageReceivedEvent
 
 class DiscordConnection(val plugin: Plugin) : Runnable {
     var api: JDA? = null
@@ -20,7 +21,7 @@ class DiscordConnection(val plugin: Plugin) : Runnable {
 
     }
 
-    fun send(message: String) {
+    fun relay(message: String) {
         server = if (server == null) getServerById(plugin.configuration.SERVER_ID) else server
         if (server == null) return
 
@@ -30,11 +31,29 @@ class DiscordConnection(val plugin: Plugin) : Runnable {
         channel!!.sendMessage(message)
     }
 
+    fun respond(message: String, event: MessageReceivedEvent) {
+        if (event.isPrivate) event.privateChannel.sendMessage(message)
+        else event.channel.sendMessage(message)
+    }
+
+    fun tell(message: String, id: String) {
+        api!!.getUserById(id).privateChannel.sendMessage(message)
+    }
+
     fun reconnect() {
         disconnect()
         connect()
     }
 
+    fun listUsers(): List<Pair<String, String>> {
+        channel = if (channel == null) getGroupByName(server!!, plugin.configuration.CHANNEL) else channel
+        if (channel == null) return mutableListOf()
+
+        val usernames: MutableList<Pair<String, String>> = mutableListOf()
+        channel!!.users.mapTo(usernames) { Pair(it.username, it.id) }
+        return usernames
+    }
+
     private fun disconnect() {
         api?.removeEventListener(listener)
         api?.shutdown(false)
@@ -61,7 +80,7 @@ class DiscordConnection(val plugin: Plugin) : Runnable {
 
     private fun getGroupByName(server: Guild, name: String): TextChannel? {
         for (group in server.textChannels)
-            if (group.name.equals(name))
+            if (group.name == name)
                 return group
         return null
     }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt b/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
index 9b2ae72..0cda0bd 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
@@ -12,7 +12,48 @@ class DiscordListener(val plugin: Plugin, val api: JDA, val connection: DiscordC
     override fun onMessageReceived(event: MessageReceivedEvent) {
         plugin.logDebug("Received message ${event.message.id} from Discord")
 
-        if (!event.guild.id.equals(plugin.configuration.SERVER_ID)) {
+        val rawmsg: String = event.message.rawContent
+        val msg: String = event.message.content
+        val username: String = event.author.username
+
+        if (rawmsg.startsWith("<@267902537074606082> confirm", true) && event.isPrivate) {
+            plugin.logDebug("user $username wants to confirm an alias")
+            val ua = plugin.requests.find {it.discordId == event.author.id}
+            if (ua == null) {
+                plugin.sendToDiscordRespond("You have not requested an alias, or your request has expired!", event)
+                return
+            }
+            plugin.updateAlias(ua)
+            plugin.requests.remove(ua)
+            plugin.sendToDiscordRespond("Successfully linked aliases!", event)
+            return
+        }
+
+        if (rawmsg.startsWith("<@267902537074606082> serverlist", true)) {
+            plugin.logDebug("user $username has requested a listing of online players")
+            val players = plugin.getOnlinePlayers()
+            if (players.isEmpty()) {
+                plugin.sendToDiscordRespond("Nobody is currently online.", event)
+                return
+            }
+            val response = players.joinToString("\n", "The following players are currently online:\n```\n", "\n```")
+            plugin.sendToDiscordRespond(response, event)
+            return
+        }
+
+        if (rawmsg.startsWith("<@267902537074606082> oikos", true)) {
+            plugin.logDebug("user $username has initiated oikos!")
+            plugin.sendToDiscordRespond("Delicious Greek yogurt from Danone!", event)
+            return
+        }
+
+        if (rawmsg == "<@267902537074606082> :D") {
+            plugin.logDebug("user $username has initiated Oikos Part 2!")
+            plugin.sendToDiscordRespond(":D", event)
+            return
+        }
+
+        if (event.guild.id != plugin.configuration.SERVER_ID) {
             plugin.logDebug("Ignoring message ${event.message.id} from Discord: server does not match")
             return
         }
@@ -22,15 +63,14 @@ class DiscordListener(val plugin: Plugin, val api: JDA, val connection: DiscordC
             return
         }
 
-        val username: String = event.author.username
-
         if (username.equals(plugin.configuration.USERNAME, true)) {
             plugin.logDebug("Ignoring message ${event.message.id} from Discord: it matches the server's username")
             return
         }
 
         plugin.logDebug("Broadcasting message ${event.message.id} from Discord as user $username")
-        plugin.sendToMinecraft(username, event.message.content)
+        plugin.logDebug(msg)
+        plugin.sendToMinecraft(username, event.author.id, event.message.content)
     }
 
     fun onUnexpectedError(ws: WebSocket, wse: WebSocketException) {
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt b/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
index 37078d8..42a2074 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
@@ -20,7 +20,7 @@ class EventListener(val plugin: Plugin): Listener {
         if (event.isCancelled && !plugin.configuration.RELAY_CANCELLED_MESSAGES) return
 
         // Check for vanished
-        val player = event.player;
+        val player = event.player
         if (player.hasMetadata("vanished") &&
                 player.getMetadata("vanished")[0].asBoolean() &&
                 !plugin.configuration.IF_VANISHED_CHAT) return
@@ -36,7 +36,7 @@ class EventListener(val plugin: Plugin): Listener {
                 )
         )
 
-        plugin.sendToDiscord(formattedMessage)
+        plugin.sendToDiscordRelay(formattedMessage, event.player.uniqueId.toString())
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
@@ -44,7 +44,7 @@ class EventListener(val plugin: Plugin): Listener {
         if (!plugin.configuration.MESSAGES_JOIN) return
 
         // Check for vanished
-        val player = event.player;
+        val player = event.player
         if (player.hasMetadata("vanished") &&
                 player.getMetadata("vanished")[0].asBoolean() &&
                 !plugin.configuration.IF_VANISHED_JOIN) return
@@ -60,7 +60,7 @@ class EventListener(val plugin: Plugin): Listener {
                 )
         )
 
-        plugin.sendToDiscord(formattedMessage)
+        plugin.sendToDiscordRelay(formattedMessage, player.uniqueId.toString())
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
@@ -68,7 +68,7 @@ class EventListener(val plugin: Plugin): Listener {
         if (!plugin.configuration.MESSAGES_LEAVE) return
 
         // Check for vanished
-        val player = event.player;
+        val player = event.player
         if (player.hasMetadata("vanished") &&
                 player.getMetadata("vanished")[0].asBoolean() &&
                 !plugin.configuration.IF_VANISHED_LEAVE) return
@@ -84,7 +84,7 @@ class EventListener(val plugin: Plugin): Listener {
                 )
         )
 
-        plugin.sendToDiscord(formattedMessage)
+        plugin.sendToDiscordRelay(formattedMessage, player.uniqueId.toString())
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
@@ -92,7 +92,7 @@ class EventListener(val plugin: Plugin): Listener {
         if (!plugin.configuration.MESSAGES_DEATH) return
 
         // Check for vanished
-        val player = event.entity;
+        val player = event.entity
         if (player.hasMetadata("vanished") &&
                 player.getMetadata("vanished")[0].asBoolean() &&
                 !plugin.configuration.IF_VANISHED_DEATH) return
@@ -110,6 +110,6 @@ class EventListener(val plugin: Plugin): Listener {
                 )
         )
 
-        plugin.sendToDiscord(formattedMessage)
+        plugin.sendToDiscordRelay(formattedMessage, player.uniqueId.toString())
     }
 }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
index bd96815..ff3b51f 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
@@ -1,11 +1,14 @@
 package gg.obsidian.discordbridge
 
+import net.dv8tion.jda.events.message.MessageReceivedEvent
 import org.bukkit.plugin.java.JavaPlugin
 
 class Plugin : JavaPlugin() {
 
     val configuration = Configuration(this)
     var connection: DiscordConnection? = null
+    var users: ConfigAccessor = ConfigAccessor(this, "usernames.yml")
+    var requests: MutableList<UserAlias> = mutableListOf()
 
     override fun onEnable() {
         updateConfig(description.version)
@@ -15,26 +18,44 @@ class Plugin : JavaPlugin() {
         server.scheduler.runTaskAsynchronously(this, connection)
         server.pluginManager.registerEvents(EventListener(this), this)
         getCommand("discord").executor = CommandHandler(this)
+        getCommand("registeralias").executor = CommandHandler(this)
+        getCommand("getdiscordids").executor = CommandHandler(this)
+    }
+
+    override fun onDisable() {
+        server.scheduler.cancelTasks(this)
     }
 
     fun reload() {
         reloadConfig()
+        users.reloadConfig()
         configuration.load()
         connection?.reconnect()
     }
 
     // Message senders
 
-    fun sendToDiscord(message: String) {
-        logDebug("Sending message to Discord - $message")
-        connection!!.send(message)
+    fun sendToDiscordRelay(message: String, uuid: String) {
+        val alias = users.config.getString("mcaliases.$uuid.discordusername")
+        var newMessage = message
+        if (alias != null) newMessage = message.replaceFirst(users.config.getString("mcaliases.$uuid.mcusername"), alias)
+        logDebug("Sending message to Discord - $newMessage")
+        connection!!.relay(newMessage)
+    }
+
+    fun sendToDiscordRespond(message: String, event: MessageReceivedEvent) {
+        if (event.isPrivate) logDebug("Sending message to ${event.author.username} - $message")
+        else logDebug("Sending message to Discord - $message")
+        connection!!.respond(message, event)
     }
 
-    fun sendToMinecraft(username: String, message: String) {
+    fun sendToMinecraft(username: String, id: String, message: String) {
+        var alias = users.config.getString("discordAliases.$id.mcusername")
+        if (alias == null) alias = username
         val formattedMessage = Util.formatMessage(
                 configuration.TEMPLATES_MINECRAFT_CHAT_MESSAGE,
                 mapOf(
-                        "%u" to username,
+                        "%u" to alias,
                         "%m" to message
                 ),
                 colors = true
@@ -54,7 +75,38 @@ class Plugin : JavaPlugin() {
     }
 
     fun logDebug(msg: String) {
-        if (!configuration.DEBUG) return;
+        if (!configuration.DEBUG) return
         logger.info(msg)
     }
+
+    // Stuff
+
+    fun getOnlinePlayers(): List<String> {
+        val names: MutableList<String> = mutableListOf()
+        val players = server.onlinePlayers.toTypedArray()
+        players.mapTo(names) { it.name }
+        return names.toList()
+    }
+
+    fun registerUserRequest(ua: UserAlias) {
+        requests.add(ua)
+        val msg = "Minecraft user '${ua.mcUsername}' has requested to become associated with your Discord" +
+                " account. If this is you, respond '<@267902537074606082> confirm'. If this is not" +
+                " you, respond '<@267902537074606082> deny'."
+        connection!!.tell(msg, ua.discordId)
+    }
+
+    fun getDiscordUsers(): List<Pair<String, String>> {
+        return connection!!.listUsers()
+    }
+
+    fun updateAlias(ua: UserAlias) {
+        users.config.set("mcaliases.${ua.mcUuid}.mcusername", ua.mcUsername)
+        users.config.set("mcaliases.${ua.mcUuid}.discordusername", ua.discordUsername)
+        users.config.set("mcaliases.${ua.mcUuid}.discordid", ua.discordId)
+        users.config.set("discordaliases.${ua.discordId}.mcuuid", ua.mcUuid)
+        users.config.set("discordaliases.${ua.discordId}.mcusername", ua.mcUsername)
+        users.config.set("discordaliases.${ua.discordId}.discordusername", ua.discordUsername)
+        users.saveConfig()
+    }
 }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/UserAlias.kt b/src/main/kotlin/gg/obsidian/discordbridge/UserAlias.kt
new file mode 100644
index 0000000..ed1ef2e
--- /dev/null
+++ b/src/main/kotlin/gg/obsidian/discordbridge/UserAlias.kt
@@ -0,0 +1,4 @@
+package gg.obsidian.discordbridge
+
+data class UserAlias(var mcUsername: String, var mcUuid: String,
+                     var discordUsername: String, var discordId: String)
\ No newline at end of file

From 5070e317c952c6fb6ddefcb092a87b4715d62ca0 Mon Sep 17 00:00:00 2001
From: Joel Howard <joel@paradoxalbyte.com>
Date: Thu, 12 Jan 2017 04:11:43 +1000
Subject: [PATCH 02/24] Fixed part 2 of Oikos

---
 src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt b/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
index 0cda0bd..422bbd9 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
@@ -47,9 +47,9 @@ class DiscordListener(val plugin: Plugin, val api: JDA, val connection: DiscordC
             return
         }
 
-        if (rawmsg == "<@267902537074606082> :D") {
+        if (rawmsg == "<@267902537074606082> :smile:") {
             plugin.logDebug("user $username has initiated Oikos Part 2!")
-            plugin.sendToDiscordRespond(":D", event)
+            plugin.sendToDiscordRespond(":smile:", event)
             return
         }
 

From e19cedff0533976f9447d34495336ec7753f1df9 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Wed, 11 Jan 2017 14:12:34 -0600
Subject: [PATCH 03/24] Updated to JDA 3.x Updated license

---
 LICENSE                                       |  5 ++-
 build.gradle                                  |  6 +--
 .../obsidian/discordbridge/CommandHandler.kt  |  1 -
 .../obsidian/discordbridge/ConfigAccessor.kt  |  3 +-
 .../discordbridge/DiscordConnection.kt        | 38 ++++++++-----------
 .../obsidian/discordbridge/DiscordListener.kt | 12 +++---
 .../gg/obsidian/discordbridge/Plugin.kt       |  5 ++-
 src/main/resources/config.yml                 |  3 +-
 8 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/LICENSE b/LICENSE
index 9bca104..ff45272 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,7 @@
-Copyright (c) 2015 Jacob Gillespie <jacobwgillespie@gmail.com>
+Copyrights for portions of this project are held by Jacob Gilles-
+pie (c) 2015 <jacobwgillespie@gmail.com> as part of project Disc-
+ordBridge. All other copyright for this project are held by Adam
+Hart and Joel Howard (c) 2016 unless otherwise noted.
 
 Permission  is  hereby granted, free of charge, to any person ob-
 taining a copy of  this  software  and  associated  documentation
diff --git a/build.gradle b/build.gradle
index c447c24..f32c3df 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 
 buildscript {
-    ext.kotlin_version = '1.0.0'
+    ext.kotlin_version = '1.0.6'
 
     repositories {
         mavenCentral()
@@ -23,7 +23,7 @@ plugins {
 apply plugin: 'kotlin'
 
 group = 'gg.obsidian'
-version = '1.7.1'
+version = '1.7.2'
 description = """Bridge chat between Minecraft and Discord"""
 ext.url = 'https://github.com/the-obsidian/DiscordBridge'
 
@@ -43,7 +43,7 @@ repositories {
 dependencies {
     compile group: 'org.spigotmc', name: 'spigot-api', version:'1.8.8-R0.1-SNAPSHOT'
     compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version:'1.0.0-rc-1036'
-    compile group: 'net.dv8tion', name: 'JDA', version:'1.4.0_238'
+    compile group: 'net.dv8tion', name: 'JDA', version:'3.0.BETA2_108'
 }
 
 processResources {
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/CommandHandler.kt b/src/main/kotlin/gg/obsidian/discordbridge/CommandHandler.kt
index 9bbb5ab..ffd642d 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/CommandHandler.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/CommandHandler.kt
@@ -39,7 +39,6 @@ class CommandHandler(val plugin: Plugin): CommandExecutor {
         }
 
         val users = plugin.getDiscordUsers()
-        //val found: Boolean = users.any { it.second == args[0] }
         val found: Pair<String, String>? = users.find { it.second == args[0] }
         if (found == null) {
             sendMessage("&eCould not find Discord user with that ID.", player, false)
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/ConfigAccessor.kt b/src/main/kotlin/gg/obsidian/discordbridge/ConfigAccessor.kt
index 75527d2..3f0bc8f 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/ConfigAccessor.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/ConfigAccessor.kt
@@ -1,7 +1,7 @@
 package gg.obsidian.discordbridge
 
 /*
-* Copyright (C) 2012
+* Copyright (C) 2012 SagaciousZed
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -70,6 +70,7 @@ class ConfigAccessor(private val plugin: JavaPlugin, private val fileName: Strin
         }
     }
 
+    @Suppress("unused")
     fun saveDefaultConfig() {
         if (!configFile!!.exists()) {
             this.plugin.saveResource(fileName, false)
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt b/src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt
index c9e2e8a..b34c985 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt
@@ -1,10 +1,12 @@
 package gg.obsidian.discordbridge
 
-import net.dv8tion.jda.JDA
-import net.dv8tion.jda.JDABuilder
-import net.dv8tion.jda.entities.Guild
-import net.dv8tion.jda.entities.TextChannel
-import net.dv8tion.jda.events.message.MessageReceivedEvent
+import net.dv8tion.jda.core.AccountType
+import net.dv8tion.jda.core.JDA
+import net.dv8tion.jda.core.JDABuilder
+import net.dv8tion.jda.core.entities.ChannelType
+import net.dv8tion.jda.core.entities.Guild
+import net.dv8tion.jda.core.entities.TextChannel
+import net.dv8tion.jda.core.events.message.MessageReceivedEvent
 
 class DiscordConnection(val plugin: Plugin) : Runnable {
     var api: JDA? = null
@@ -32,7 +34,7 @@ class DiscordConnection(val plugin: Plugin) : Runnable {
     }
 
     fun respond(message: String, event: MessageReceivedEvent) {
-        if (event.isPrivate) event.privateChannel.sendMessage(message)
+        if (event.isFromType(ChannelType.PRIVATE)) event.privateChannel.sendMessage(message)
         else event.channel.sendMessage(message)
     }
 
@@ -49,9 +51,9 @@ class DiscordConnection(val plugin: Plugin) : Runnable {
         channel = if (channel == null) getGroupByName(server!!, plugin.configuration.CHANNEL) else channel
         if (channel == null) return mutableListOf()
 
-        val usernames: MutableList<Pair<String, String>> = mutableListOf()
-        channel!!.users.mapTo(usernames) { Pair(it.username, it.id) }
-        return usernames
+        val listOfUsers: MutableList<Pair<String, String>> = mutableListOf()
+        channel!!.members.mapTo(listOfUsers) { Pair(it.nickname, it.user.id) }
+        return listOfUsers
     }
 
     private fun disconnect() {
@@ -60,28 +62,18 @@ class DiscordConnection(val plugin: Plugin) : Runnable {
     }
 
     private fun connect() {
-        var builder = JDABuilder().setAudioEnabled(false)
-        if (plugin.configuration.TOKEN != "") {
-            builder = builder.setBotToken(plugin.configuration.TOKEN)
-        } else {
-            builder = builder.setEmail(plugin.configuration.EMAIL).setPassword(plugin.configuration.PASSWORD)
-        }
+        var builder = JDABuilder(AccountType.BOT).setAudioEnabled(false)
+        builder = builder.setToken(plugin.configuration.TOKEN)
         api = builder.buildBlocking()
         listener = DiscordListener(plugin, api as JDA, this)
         api!!.addEventListener(listener)
     }
 
     private fun getServerById(id: String): Guild? {
-        for (server in api!!.guilds)
-            if (server.id.equals(id, true))
-                return server
-        return null
+        return api!!.guilds.firstOrNull { it.id.equals(id, true) }
     }
 
     private fun getGroupByName(server: Guild, name: String): TextChannel? {
-        for (group in server.textChannels)
-            if (group.name == name)
-                return group
-        return null
+        return server.textChannels.firstOrNull { it.name == name }
     }
 }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt b/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
index 422bbd9..c2ec848 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
@@ -3,10 +3,12 @@ package gg.obsidian.discordbridge
 import com.neovisionaries.ws.client.WebSocket
 import com.neovisionaries.ws.client.WebSocketException
 import com.neovisionaries.ws.client.WebSocketFrame
-import net.dv8tion.jda.JDA
-import net.dv8tion.jda.events.message.MessageReceivedEvent
-import net.dv8tion.jda.hooks.ListenerAdapter
+import net.dv8tion.jda.core.JDA
+import net.dv8tion.jda.core.entities.ChannelType
+import net.dv8tion.jda.core.events.message.MessageReceivedEvent
+import net.dv8tion.jda.core.hooks.ListenerAdapter
 
+@Suppress("unused", "UNUSED_PARAMETER")
 class DiscordListener(val plugin: Plugin, val api: JDA, val connection: DiscordConnection) : ListenerAdapter() {
 
     override fun onMessageReceived(event: MessageReceivedEvent) {
@@ -14,9 +16,9 @@ class DiscordListener(val plugin: Plugin, val api: JDA, val connection: DiscordC
 
         val rawmsg: String = event.message.rawContent
         val msg: String = event.message.content
-        val username: String = event.author.username
+        val username: String = event.member.effectiveName
 
-        if (rawmsg.startsWith("<@267902537074606082> confirm", true) && event.isPrivate) {
+        if (rawmsg.startsWith("<@267902537074606082> confirm", true) && event.isFromType(ChannelType.PRIVATE)) {
             plugin.logDebug("user $username wants to confirm an alias")
             val ua = plugin.requests.find {it.discordId == event.author.id}
             if (ua == null) {
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
index ff3b51f..be7a02f 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
@@ -1,6 +1,7 @@
 package gg.obsidian.discordbridge
 
-import net.dv8tion.jda.events.message.MessageReceivedEvent
+import net.dv8tion.jda.core.entities.ChannelType
+import net.dv8tion.jda.core.events.message.MessageReceivedEvent
 import org.bukkit.plugin.java.JavaPlugin
 
 class Plugin : JavaPlugin() {
@@ -44,7 +45,7 @@ class Plugin : JavaPlugin() {
     }
 
     fun sendToDiscordRespond(message: String, event: MessageReceivedEvent) {
-        if (event.isPrivate) logDebug("Sending message to ${event.author.username} - $message")
+        if (event.isFromType(ChannelType.PRIVATE)) logDebug("Sending message to ${event.author.name} - $message")
         else logDebug("Sending message to Discord - $message")
         connection!!.respond(message, event)
     }
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index c6297a0..73daff2 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -2,8 +2,7 @@ settings:
   server-id: '00000000'
   channel: 'test'
   username: 'username'
-  email: 'email@example.com'
-  password: 'password'
+  token: 'token'
   debug: false
   relay_cancelled_messages: true
   messages:

From af5fc97c7843458e9aab0a8bc2b0cce7676c0915 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Wed, 11 Jan 2017 22:33:03 -0600
Subject: [PATCH 04/24] Removed hardcoded id to make message generic Fixed
 oikos emoji(?) Added commands to plugins.yml

---
 .../gg/obsidian/discordbridge/DiscordListener.kt       | 10 +++++-----
 src/main/resources/plugin.yml                          |  6 ++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt b/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
index c2ec848..ce85b4e 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
@@ -18,7 +18,7 @@ class DiscordListener(val plugin: Plugin, val api: JDA, val connection: DiscordC
         val msg: String = event.message.content
         val username: String = event.member.effectiveName
 
-        if (rawmsg.startsWith("<@267902537074606082> confirm", true) && event.isFromType(ChannelType.PRIVATE)) {
+        if (rawmsg.startsWith("${api.selfUser.asMention} confirm", true) && event.isFromType(ChannelType.PRIVATE)) {
             plugin.logDebug("user $username wants to confirm an alias")
             val ua = plugin.requests.find {it.discordId == event.author.id}
             if (ua == null) {
@@ -31,7 +31,7 @@ class DiscordListener(val plugin: Plugin, val api: JDA, val connection: DiscordC
             return
         }
 
-        if (rawmsg.startsWith("<@267902537074606082> serverlist", true)) {
+        if (rawmsg.startsWith("${api.selfUser.asMention} serverlist", true)) {
             plugin.logDebug("user $username has requested a listing of online players")
             val players = plugin.getOnlinePlayers()
             if (players.isEmpty()) {
@@ -43,15 +43,15 @@ class DiscordListener(val plugin: Plugin, val api: JDA, val connection: DiscordC
             return
         }
 
-        if (rawmsg.startsWith("<@267902537074606082> oikos", true)) {
+        if (rawmsg.startsWith("${api.selfUser.asMention} oikos", true)) {
             plugin.logDebug("user $username has initiated oikos!")
             plugin.sendToDiscordRespond("Delicious Greek yogurt from Danone!", event)
             return
         }
 
-        if (rawmsg == "<@267902537074606082> :smile:") {
+        if (rawmsg == "<${api.selfUser.asMention} \uD83D\uDE04") {
             plugin.logDebug("user $username has initiated Oikos Part 2!")
-            plugin.sendToDiscordRespond(":smile:", event)
+            plugin.sendToDiscordRespond("\uD83D\uDE04", event)
             return
         }
 
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 4155085..c489bc8 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -18,3 +18,9 @@ commands:
   discord:
     description: Reload the Discord Bridge
     usage: /discord reload
+  registeralias:
+      description: Associate a Minecraft user with a Discord user
+      usage: /registeralias <discord id>
+    getdiscordids:
+      description: Lists the internal IDs of all Discord users currently in the server
+      usage: /getdiscordids
\ No newline at end of file

From 947c32cfbcc802b8850a1ed788944b75738735a2 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Thu, 12 Jan 2017 01:27:42 -0600
Subject: [PATCH 05/24] Marina actually works now Fixed relay function Alias
 feature now works properly Broke private messaging responses Oikos Part 2 is
 still broken

---
 build.gradle                                  |  8 +--
 .../obsidian/discordbridge/ConfigAccessor.kt  |  2 +
 .../discordbridge/DiscordConnection.kt        | 10 ++--
 .../obsidian/discordbridge/DiscordListener.kt | 55 ++++++++++---------
 .../gg/obsidian/discordbridge/Plugin.kt       |  3 +-
 src/main/resources/plugin.yml                 | 10 ++--
 6 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/build.gradle b/build.gradle
index f32c3df..224ad5f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
 
 plugins {
     id 'java'
-    id 'com.github.johnrengelman.shadow' version '1.2.3'
+    id 'com.github.johnrengelman.shadow' version '1.2.4'
 }
 
 apply plugin: 'kotlin'
@@ -27,9 +27,6 @@ version = '1.7.2'
 description = """Bridge chat between Minecraft and Discord"""
 ext.url = 'https://github.com/the-obsidian/DiscordBridge'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-
 repositories {
     maven { url 'https://maven-central.storage.googleapis.com' }
     maven { url 'https://hub.spigotmc.org/nexus/content/groups/public/' }
@@ -41,7 +38,7 @@ repositories {
 }
 
 dependencies {
-    compile group: 'org.spigotmc', name: 'spigot-api', version:'1.8.8-R0.1-SNAPSHOT'
+    compile group: 'org.spigotmc', name: 'spigot-api', version:'1.11.2-R0.1-SNAPSHOT'
     compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version:'1.0.0-rc-1036'
     compile group: 'net.dv8tion', name: 'JDA', version:'3.0.BETA2_108'
 }
@@ -57,6 +54,7 @@ processResources {
 build.finalizedBy(shadowJar)
 
 shadowJar {
+    relocate 'org.apache', 'shadow.apache'
     classifier 'dist'
     dependencies {
         exclude(dependency('org.spigotmc:.*:.*'))
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/ConfigAccessor.kt b/src/main/kotlin/gg/obsidian/discordbridge/ConfigAccessor.kt
index 3f0bc8f..bbce2d7 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/ConfigAccessor.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/ConfigAccessor.kt
@@ -44,6 +44,8 @@ class ConfigAccessor(private val plugin: JavaPlugin, private val fileName: Strin
         fileConfiguration = YamlConfiguration.loadConfiguration(configFile!!)
 
         // Look for defaults in the jar
+        if (plugin.getResource(fileName) == null)
+            plugin.logger.log(Level.SEVERE, "usernames.yml cannot be found for some reason")
         val defConfigReader = InputStreamReader(plugin.getResource(fileName))
         val defConfig = YamlConfiguration.loadConfiguration(defConfigReader)
         fileConfiguration!!.defaults = defConfig
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt b/src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt
index b34c985..6c2cfd7 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt
@@ -30,16 +30,16 @@ class DiscordConnection(val plugin: Plugin) : Runnable {
         channel = if (channel == null) getGroupByName(server!!, plugin.configuration.CHANNEL) else channel
         if (channel == null) return
 
-        channel!!.sendMessage(message)
+        channel!!.sendMessage(message).queue()
     }
 
     fun respond(message: String, event: MessageReceivedEvent) {
-        if (event.isFromType(ChannelType.PRIVATE)) event.privateChannel.sendMessage(message)
-        else event.channel.sendMessage(message)
+        if (event.isFromType(ChannelType.PRIVATE)) event.privateChannel.sendMessage(message).queue()
+        else event.channel.sendMessage(message).queue()
     }
 
     fun tell(message: String, id: String) {
-        api!!.getUserById(id).privateChannel.sendMessage(message)
+        api!!.getUserById(id).privateChannel.sendMessage(message).queue()
     }
 
     fun reconnect() {
@@ -52,7 +52,7 @@ class DiscordConnection(val plugin: Plugin) : Runnable {
         if (channel == null) return mutableListOf()
 
         val listOfUsers: MutableList<Pair<String, String>> = mutableListOf()
-        channel!!.members.mapTo(listOfUsers) { Pair(it.nickname, it.user.id) }
+        channel!!.members.mapTo(listOfUsers) { Pair(it.effectiveName, it.user.id) }
         return listOfUsers
     }
 
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt b/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
index ce85b4e..751b1e8 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
@@ -16,7 +16,7 @@ class DiscordListener(val plugin: Plugin, val api: JDA, val connection: DiscordC
 
         val rawmsg: String = event.message.rawContent
         val msg: String = event.message.content
-        val username: String = event.member.effectiveName
+        val username: String = event.author.name
 
         if (rawmsg.startsWith("${api.selfUser.asMention} confirm", true) && event.isFromType(ChannelType.PRIVATE)) {
             plugin.logDebug("user $username wants to confirm an alias")
@@ -43,36 +43,39 @@ class DiscordListener(val plugin: Plugin, val api: JDA, val connection: DiscordC
             return
         }
 
-        if (rawmsg.startsWith("${api.selfUser.asMention} oikos", true)) {
-            plugin.logDebug("user $username has initiated oikos!")
-            plugin.sendToDiscordRespond("Delicious Greek yogurt from Danone!", event)
-            return
-        }
+        // Relay
+        if (event.isFromType(ChannelType.TEXT)) {
+            if (rawmsg.startsWith("${api.selfUser.asMention} oikos", true)) {
+                plugin.logDebug("user $username has initiated oikos!")
+                plugin.sendToDiscordRespond("Delicious Greek yogurt from Danone!", event)
+                return
+            }
 
-        if (rawmsg == "<${api.selfUser.asMention} \uD83D\uDE04") {
-            plugin.logDebug("user $username has initiated Oikos Part 2!")
-            plugin.sendToDiscordRespond("\uD83D\uDE04", event)
-            return
-        }
+            if (rawmsg == "<${api.selfUser.asMention} \uD83D\uDE04") {
+                plugin.logDebug("user $username has initiated Oikos Part 2!")
+                plugin.sendToDiscordRespond("\uD83D\uDE04", event)
+                return
+            }
 
-        if (event.guild.id != plugin.configuration.SERVER_ID) {
-            plugin.logDebug("Ignoring message ${event.message.id} from Discord: server does not match")
-            return
-        }
+            if (event.guild.id != plugin.configuration.SERVER_ID) {
+                plugin.logDebug("Ignoring message ${event.message.id} from Discord: server does not match")
+                return
+            }
 
-        if (!event.textChannel.name.equals(plugin.configuration.CHANNEL, true)) {
-            plugin.logDebug("Ignoring message ${event.message.id} from Discord: channel does not match")
-            return
-        }
+            if (!event.textChannel.name.equals(plugin.configuration.CHANNEL, true)) {
+                plugin.logDebug("Ignoring message ${event.message.id} from Discord: channel does not match")
+                return
+            }
 
-        if (username.equals(plugin.configuration.USERNAME, true)) {
-            plugin.logDebug("Ignoring message ${event.message.id} from Discord: it matches the server's username")
-            return
-        }
+            if (username.equals(plugin.configuration.USERNAME, true)) {
+                plugin.logDebug("Ignoring message ${event.message.id} from Discord: it matches the server's username")
+                return
+            }
 
-        plugin.logDebug("Broadcasting message ${event.message.id} from Discord as user $username")
-        plugin.logDebug(msg)
-        plugin.sendToMinecraft(username, event.author.id, event.message.content)
+            plugin.logDebug("Broadcasting message ${event.message.id} from Discord as user $username")
+            plugin.logDebug(msg)
+            plugin.sendToMinecraft(username, event.author.id, event.message.content)
+        }
     }
 
     fun onUnexpectedError(ws: WebSocket, wse: WebSocketException) {
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
index be7a02f..e39bca1 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
@@ -13,6 +13,7 @@ class Plugin : JavaPlugin() {
 
     override fun onEnable() {
         updateConfig(description.version)
+        users.saveDefaultConfig()
 
         this.connection = DiscordConnection(this)
 
@@ -51,7 +52,7 @@ class Plugin : JavaPlugin() {
     }
 
     fun sendToMinecraft(username: String, id: String, message: String) {
-        var alias = users.config.getString("discordAliases.$id.mcusername")
+        var alias = users.config.getString("discordaliases.$id.mcusername")
         if (alias == null) alias = username
         val formattedMessage = Util.formatMessage(
                 configuration.TEMPLATES_MINECRAFT_CHAT_MESSAGE,
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index c489bc8..efb15cc 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -19,8 +19,8 @@ commands:
     description: Reload the Discord Bridge
     usage: /discord reload
   registeralias:
-      description: Associate a Minecraft user with a Discord user
-      usage: /registeralias <discord id>
-    getdiscordids:
-      description: Lists the internal IDs of all Discord users currently in the server
-      usage: /getdiscordids
\ No newline at end of file
+    description: Associate a Minecraft user with a Discord user
+    usage: /registeralias <discord id>
+  getdiscordids:
+    description: Lists the internal IDs of all Discord users currently in the server
+    usage: /getdiscordids
\ No newline at end of file

From 91a2d824d09991f1352def21d8f067cbd5330f1d Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Thu, 12 Jan 2017 15:00:36 -0600
Subject: [PATCH 06/24] Fixed private messaging Fixed Oikos Part 2 for reals

---
 build.gradle                                  |  4 +++
 .../discordbridge/DiscordConnection.kt        |  3 +-
 .../obsidian/discordbridge/DiscordListener.kt | 36 +++++++++++--------
 .../gg/obsidian/discordbridge/Plugin.kt       |  7 ++--
 4 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/build.gradle b/build.gradle
index 224ad5f..1e390e8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,6 +41,7 @@ dependencies {
     compile group: 'org.spigotmc', name: 'spigot-api', version:'1.11.2-R0.1-SNAPSHOT'
     compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version:'1.0.0-rc-1036'
     compile group: 'net.dv8tion', name: 'JDA', version:'3.0.BETA2_108'
+    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
 processResources {
@@ -72,3 +73,6 @@ task copyFinalJar(type: Copy) {
 }
 
 shadowJar.finalizedBy(copyFinalJar)
+sourceSets {
+    main.java.srcDirs += 'src/main/kotlin'
+}
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt b/src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt
index 6c2cfd7..5d8ab4c 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt
@@ -39,7 +39,8 @@ class DiscordConnection(val plugin: Plugin) : Runnable {
     }
 
     fun tell(message: String, id: String) {
-        api!!.getUserById(id).privateChannel.sendMessage(message).queue()
+        val modifiedMsg = message.replace("<@me>", api!!.selfUser.asMention)
+        api!!.getUserById(id).privateChannel.sendMessage(modifiedMsg).queue()
     }
 
     fun reconnect() {
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt b/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
index 751b1e8..1e5bca8 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
@@ -7,12 +7,12 @@ import net.dv8tion.jda.core.JDA
 import net.dv8tion.jda.core.entities.ChannelType
 import net.dv8tion.jda.core.events.message.MessageReceivedEvent
 import net.dv8tion.jda.core.hooks.ListenerAdapter
+import java.nio.charset.Charset
 
-@Suppress("unused", "UNUSED_PARAMETER")
 class DiscordListener(val plugin: Plugin, val api: JDA, val connection: DiscordConnection) : ListenerAdapter() {
 
     override fun onMessageReceived(event: MessageReceivedEvent) {
-        plugin.logDebug("Received message ${event.message.id} from Discord")
+        plugin.logDebug("Received message ${event.message.id} from Discord - ${event.message.rawContent}")
 
         val rawmsg: String = event.message.rawContent
         val msg: String = event.message.content
@@ -43,20 +43,26 @@ class DiscordListener(val plugin: Plugin, val api: JDA, val connection: DiscordC
             return
         }
 
-        // Relay
-        if (event.isFromType(ChannelType.TEXT)) {
-            if (rawmsg.startsWith("${api.selfUser.asMention} oikos", true)) {
-                plugin.logDebug("user $username has initiated oikos!")
-                plugin.sendToDiscordRespond("Delicious Greek yogurt from Danone!", event)
-                return
-            }
+        if (rawmsg.startsWith("${api.selfUser.asMention} oikos", true)) {
+            plugin.logDebug("user $username has initiated oikos!")
+            plugin.sendToDiscordRespond("Delicious Greek yogurt from Danone!", event)
+            return
+        }
 
-            if (rawmsg == "<${api.selfUser.asMention} \uD83D\uDE04") {
-                plugin.logDebug("user $username has initiated Oikos Part 2!")
-                plugin.sendToDiscordRespond("\uD83D\uDE04", event)
-                return
-            }
+        if (rawmsg == "${api.selfUser.asMention} \uD83D\uDE04") {
+            plugin.logDebug("user $username has initiated Oikos Part 2!")
+            plugin.sendToDiscordRespond("\uD83D\uDE04", event)
+            return
+        }
 
+        if (rawmsg.startsWith("${api.selfUser.asMention} smile", true)) {
+            plugin.logDebug("user $username has initiated Oikos Part 2!")
+            plugin.sendToDiscordRespond("\uD83D\uDE04", event)
+            return
+        }
+
+        // Relay
+        if (event.isFromType(ChannelType.TEXT)) {
             if (event.guild.id != plugin.configuration.SERVER_ID) {
                 plugin.logDebug("Ignoring message ${event.message.id} from Discord: server does not match")
                 return
@@ -78,10 +84,12 @@ class DiscordListener(val plugin: Plugin, val api: JDA, val connection: DiscordC
         }
     }
 
+    @Suppress("unused", "UNUSED_PARAMETER")
     fun onUnexpectedError(ws: WebSocket, wse: WebSocketException) {
         plugin.logger.severe("Unexpected error from DiscordBridge: ${wse.message}")
     }
 
+    @Suppress("unused", "UNUSED_PARAMETER")
     fun onDisconnected(webSocket: WebSocket, serverCloseFrame: WebSocketFrame, clientCloseFrame: WebSocketFrame, closedByServer: Boolean) {
         plugin.logDebug("Discord disconnected - attempting to reconnect")
         connection.reconnect()
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
index e39bca1..67f7cdd 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
@@ -3,6 +3,7 @@ package gg.obsidian.discordbridge
 import net.dv8tion.jda.core.entities.ChannelType
 import net.dv8tion.jda.core.events.message.MessageReceivedEvent
 import org.bukkit.plugin.java.JavaPlugin
+import java.util.logging.Level
 
 class Plugin : JavaPlugin() {
 
@@ -25,10 +26,12 @@ class Plugin : JavaPlugin() {
     }
 
     override fun onDisable() {
+        logger.log(Level.FINE, "Attempting to cancel tasks")
         server.scheduler.cancelTasks(this)
     }
 
     fun reload() {
+
         reloadConfig()
         users.reloadConfig()
         configuration.load()
@@ -93,8 +96,8 @@ class Plugin : JavaPlugin() {
     fun registerUserRequest(ua: UserAlias) {
         requests.add(ua)
         val msg = "Minecraft user '${ua.mcUsername}' has requested to become associated with your Discord" +
-                " account. If this is you, respond '<@267902537074606082> confirm'. If this is not" +
-                " you, respond '<@267902537074606082> deny'."
+                " account. If this is you, respond '<@me> confirm'. If this is not" +
+                " you, respond '<@me> deny'."
         connection!!.tell(msg, ua.discordId)
     }
 

From 2a8c31f4c0f8c7a9d8ab21f759b8c46e7de3a167 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Fri, 13 Jan 2017 10:44:19 -0600
Subject: [PATCH 07/24] 1.7.3 Restructured commands Added /discord get online

---
 build.gradle                                  |   2 +-
 .../obsidian/discordbridge/CommandHandler.kt  | 126 +++++++++++++++---
 .../discordbridge/DiscordConnection.kt        |  20 ++-
 .../obsidian/discordbridge/DiscordListener.kt |   9 +-
 .../gg/obsidian/discordbridge/Plugin.kt       |   7 +-
 src/main/resources/plugin.yml                 |  10 +-
 6 files changed, 132 insertions(+), 42 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1e390e8..8c9e870 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ plugins {
 apply plugin: 'kotlin'
 
 group = 'gg.obsidian'
-version = '1.7.2'
+version = '1.7.3'
 description = """Bridge chat between Minecraft and Discord"""
 ext.url = 'https://github.com/the-obsidian/DiscordBridge'
 
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/CommandHandler.kt b/src/main/kotlin/gg/obsidian/discordbridge/CommandHandler.kt
index ffd642d..5983902 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/CommandHandler.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/CommandHandler.kt
@@ -1,5 +1,6 @@
 package gg.obsidian.discordbridge
 
+import net.dv8tion.jda.core.OnlineStatus
 import org.bukkit.ChatColor
 import org.bukkit.command.Command
 import org.bukkit.command.CommandExecutor
@@ -10,38 +11,51 @@ class CommandHandler(val plugin: Plugin): CommandExecutor {
 
     override fun onCommand(player: CommandSender, cmd: Command, alias: String?, args: Array<out String>?): Boolean {
         if (cmd.name == "discord") return handleDiscord(player, args)
-        else if (cmd.name == "registeralias") return handleRegisterAlias(player, args)
-        else if (cmd.name == "getdiscordids") return handleGetDiscordIds(player)
         return false
     }
 
     private fun handleDiscord(player: CommandSender, args: Array<out String>?): Boolean {
-        if (player is Player && !Permissions.reload.has(player)) return true
+        if (args == null || args.isEmpty()) {
+            sendMessage("&eUsage: /discord <reload/alias/get>", player)
+            return true
+        }
+
+        when (args[0].toLowerCase()) {
+            "reload" -> return handleDiscordReload(player, args)
+            "alias" -> return handleDiscordAlias(player, args)
+            "get" -> return handleDiscordGet(player, args)
+            else -> {
+                sendMessage("&eUsage: /discord <reload/alias/get>", player)
+                return true
+            }
+        }
+    }
 
-        val isConsole = (player is Player)
+    private fun handleDiscordReload(player: CommandSender, args: Array<out String>): Boolean {
+        if (player is Player && !Permissions.reload.has(player)) return true
 
-        if (args == null || args.size != 1 || args[0] != "reload") {
-            sendMessage("&eUsage: /discord reload", player, isConsole)
+        if (args.size != 1) {
+            sendMessage("&eUsage: /discord reload", player)
             return true
         }
 
-        sendMessage("&eReloading Discord Bridge...", player, isConsole)
+        sendMessage("&eReloading Discord Bridge...", player)
         plugin.reload()
         return true
     }
 
-    private fun handleRegisterAlias(player: CommandSender, args: Array<out String>?): Boolean {
+    private fun handleDiscordAlias(player: CommandSender, args: Array<out String>): Boolean {
         if (player !is Player) return true
 
-        if (args == null || args.size != 1) {
-            sendMessage("&eUsage: /registeralias <discord id>", player, false)
+        if (args.size != 2) {
+            sendMessage("&eUsage: /discord alias <discord id>", player)
             return true
         }
 
         val users = plugin.getDiscordUsers()
-        val found: Pair<String, String>? = users.find { it.second == args[0] }
+        val found: Triple<String, String, Boolean>? = users.find { it.second == args[0] }
         if (found == null) {
-            sendMessage("&eCould not find Discord user with that ID.", player, false)
+            sendMessage("&eCould not find Discord user with that ID.", player)
             return true
         }
 
@@ -52,25 +66,95 @@ class CommandHandler(val plugin: Plugin): CommandExecutor {
         return true
     }
 
-    private fun handleGetDiscordIds(player: CommandSender): Boolean {
-        val isConsole = (player !is Player)
+    private fun handleDiscordGet(player: CommandSender, args: Array<out String>): Boolean {
+        if (args.size < 2) {
+            sendMessage("&eUsage: /discord get <ids/online>", player)
+            return true
+        }
+
+        when (args[1].toLowerCase()) {
+            "ids" -> return handleDiscordGetIds(player, args)
+            "online" -> return handleDiscordGetOnline(player, args)
+            else -> {
+                sendMessage("&eUsage: /discord get <ids/online>", player)
+                return true
+            }
+        }
+    }
+
+    private fun handleDiscordGetIds(player: CommandSender, args: Array<out String>): Boolean {
+        if (args.size != 2) {
+            sendMessage("&eUsage: /discord get ids", player)
+            return true
+        }
+
         val users = plugin.getDiscordUsers()
+
+        if (users.isEmpty()) {
+            sendMessage("&eNo Discord members could be found. Either server is empty or an error " +
+                    "has occurred.", player)
+            return true
+        }
+
+        var response = "&eDiscord users:"
+        for (user in users) {
+            if (user.third) response += "\n&6- ${user.first} (Bot), ${user.second}&r"
+            else response += "\n&e- ${user.first}, ${user.second}&r"
+        }
+        //val response = users.joinToString("\n- ", "&eDiscord users:\n- ")
+        sendMessage(response, player)
+        return true
+    }
+
+    private fun handleDiscordGetOnline(player: CommandSender, args: Array<out String>): Boolean {
+        if (args.size != 2) {
+            sendMessage("&eUsage: /discord get online", player)
+            return true
+        }
+
+        val users = plugin.getDiscordOnline()
+
         if (users.isEmpty()) {
             sendMessage("&eNo Discord members could be found. Either server is empty or an error " +
-                    "has occurred.", player, isConsole)
+                    "has occurred.", player)
             return true
         }
-        val response = users.joinToString("\n- ", "&eDiscord users:\n- ")
-        sendMessage(response, player, isConsole)
+
+        var response = ""
+        if (users.filter{it.third == OnlineStatus.ONLINE}.isNotEmpty()) {
+            response += "\n&2Online:&r"
+            for (user in users.filter{it.third == OnlineStatus.ONLINE}) {
+                if (user.second) response += "\n&2- ${user.first} (Bot)&r"
+                else response += "\n&2- ${user.first}&r"
+            }
+        }
+        if (users.filter{it.third == OnlineStatus.IDLE}.isNotEmpty()) {
+            response += "\n&eIdle:&r"
+            for (user in users.filter{it.third == OnlineStatus.IDLE}) {
+                if (user.second) response += "\n&e- ${user.first} (Bot)&r"
+                else response += "\n&e- ${user.first}&r"
+            }
+        }
+        if (users.filter{it.third == OnlineStatus.DO_NOT_DISTURB}.isNotEmpty()) {
+            response += "\n&cDo Not Disturb:&r"
+            for (user in users.filter { it.third == OnlineStatus.DO_NOT_DISTURB }) {
+                if (user.second) response += "\n&c- ${user.first} (Bot)&r"
+                else response += "\n&c- ${user.first}&r"
+            }
+        }
+
+        response.replaceFirst("\n", "")
+
+        sendMessage(response, player)
         return true
     }
 
-    private fun sendMessage(message: String, player: CommandSender, isConsole: Boolean) {
+    private fun sendMessage(message: String, player: CommandSender) {
         val formattedMessage = ChatColor.translateAlternateColorCodes('&', message)
-        if (isConsole) {
-            plugin.server.consoleSender.sendMessage(formattedMessage)
-        } else {
+        if (player is Player) {
             player.sendMessage(formattedMessage)
+        } else {
+            plugin.server.consoleSender.sendMessage(formattedMessage)
         }
     }
 }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt b/src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt
index 5d8ab4c..1877782 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt
@@ -3,6 +3,7 @@ package gg.obsidian.discordbridge
 import net.dv8tion.jda.core.AccountType
 import net.dv8tion.jda.core.JDA
 import net.dv8tion.jda.core.JDABuilder
+import net.dv8tion.jda.core.OnlineStatus
 import net.dv8tion.jda.core.entities.ChannelType
 import net.dv8tion.jda.core.entities.Guild
 import net.dv8tion.jda.core.entities.TextChannel
@@ -48,12 +49,25 @@ class DiscordConnection(val plugin: Plugin) : Runnable {
         connect()
     }
 
-    fun listUsers(): List<Pair<String, String>> {
+    fun listUsers(): List<Triple<String, String, Boolean>> {
         channel = if (channel == null) getGroupByName(server!!, plugin.configuration.CHANNEL) else channel
         if (channel == null) return mutableListOf()
 
-        val listOfUsers: MutableList<Pair<String, String>> = mutableListOf()
-        channel!!.members.mapTo(listOfUsers) { Pair(it.effectiveName, it.user.id) }
+        val listOfUsers: MutableList<Triple<String, String, Boolean>> = mutableListOf()
+        channel!!.members.mapTo(listOfUsers) {
+            Triple(it.effectiveName, it.user.id, it.user.isBot)
+        }
+        return listOfUsers
+    }
+
+    fun listOnline(): List<Triple<String, Boolean, OnlineStatus>> {
+        channel = if (channel == null) getGroupByName(server!!, plugin.configuration.CHANNEL) else channel
+        if (channel == null) return mutableListOf()
+
+        val listOfUsers: MutableList<Triple<String, Boolean, OnlineStatus>> = mutableListOf()
+        channel!!.members.mapTo(listOfUsers) {
+            Triple(it.effectiveName, it.user.isBot, it.onlineStatus)
+        }
         return listOfUsers
     }
 
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt b/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
index 1e5bca8..bf2a302 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
@@ -7,7 +7,6 @@ import net.dv8tion.jda.core.JDA
 import net.dv8tion.jda.core.entities.ChannelType
 import net.dv8tion.jda.core.events.message.MessageReceivedEvent
 import net.dv8tion.jda.core.hooks.ListenerAdapter
-import java.nio.charset.Charset
 
 class DiscordListener(val plugin: Plugin, val api: JDA, val connection: DiscordConnection) : ListenerAdapter() {
 
@@ -50,13 +49,7 @@ class DiscordListener(val plugin: Plugin, val api: JDA, val connection: DiscordC
         }
 
         if (rawmsg == "${api.selfUser.asMention} \uD83D\uDE04") {
-            plugin.logDebug("user $username has initiated Oikos Part 2!")
-            plugin.sendToDiscordRespond("\uD83D\uDE04", event)
-            return
-        }
-
-        if (rawmsg.startsWith("${api.selfUser.asMention} smile", true)) {
-            plugin.logDebug("user $username has initiated Oikos Part 2!")
+            plugin.logDebug("user $username has initiated oikos 2!")
             plugin.sendToDiscordRespond("\uD83D\uDE04", event)
             return
         }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
index 67f7cdd..0203b88 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
@@ -1,5 +1,6 @@
 package gg.obsidian.discordbridge
 
+import net.dv8tion.jda.core.OnlineStatus
 import net.dv8tion.jda.core.entities.ChannelType
 import net.dv8tion.jda.core.events.message.MessageReceivedEvent
 import org.bukkit.plugin.java.JavaPlugin
@@ -101,10 +102,14 @@ class Plugin : JavaPlugin() {
         connection!!.tell(msg, ua.discordId)
     }
 
-    fun getDiscordUsers(): List<Pair<String, String>> {
+    fun getDiscordUsers(): List<Triple<String, String, Boolean>> {
         return connection!!.listUsers()
     }
 
+    fun getDiscordOnline(): List<Triple<String, Boolean, OnlineStatus>> {
+        return connection!!.listOnline()
+    }
+
     fun updateAlias(ua: UserAlias) {
         users.config.set("mcaliases.${ua.mcUuid}.mcusername", ua.mcUsername)
         users.config.set("mcaliases.${ua.mcUuid}.discordusername", ua.discordUsername)
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index efb15cc..b1e846f 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -16,11 +16,5 @@ permissions:
 
 commands:
   discord:
-    description: Reload the Discord Bridge
-    usage: /discord reload
-  registeralias:
-    description: Associate a Minecraft user with a Discord user
-    usage: /registeralias <discord id>
-  getdiscordids:
-    description: Lists the internal IDs of all Discord users currently in the server
-    usage: /getdiscordids
\ No newline at end of file
+    description: Issue a command to the bot
+    usage: /discord <command>
\ No newline at end of file

From d5388fdf69b69d6a581ec16d75d75f0085bf6b07 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Fri, 13 Jan 2017 11:01:38 -0600
Subject: [PATCH 08/24] Removed commands from plugin.kt

---
 src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
index 0203b88..cfc259e 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
@@ -22,8 +22,6 @@ class Plugin : JavaPlugin() {
         server.scheduler.runTaskAsynchronously(this, connection)
         server.pluginManager.registerEvents(EventListener(this), this)
         getCommand("discord").executor = CommandHandler(this)
-        getCommand("registeralias").executor = CommandHandler(this)
-        getCommand("getdiscordids").executor = CommandHandler(this)
     }
 
     override fun onDisable() {

From cc8d98014926c4be5d53dd7704847b54a8e42a6c Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Sun, 12 Feb 2017 11:21:52 -0600
Subject: [PATCH 09/24] Various fixes

---
 build.gradle                                  |   5 +-
 .../obsidian/discordbridge/ConfigAccessor.kt  |  21 ++--
 .../obsidian/discordbridge/Configuration.kt   |   2 +
 .../discordbridge/DiscordConnection.kt        |   1 +
 .../obsidian/discordbridge/DiscordListener.kt | 111 +++++++++++-------
 .../obsidian/discordbridge/EventListener.kt   |  12 +-
 .../gg/obsidian/discordbridge/Plugin.kt       |  56 ++++++++-
 src/main/resources/config.yml                 |   1 +
 src/main/resources/plugin.yml                 |   6 +-
 src/main/resources/usernames.yml              |   2 +
 10 files changed, 160 insertions(+), 57 deletions(-)
 create mode 100644 src/main/resources/usernames.yml

diff --git a/build.gradle b/build.gradle
index 8c9e870..eb664ba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ plugins {
 apply plugin: 'kotlin'
 
 group = 'gg.obsidian'
-version = '1.7.3'
+version = '1.7.4'
 description = """Bridge chat between Minecraft and Discord"""
 ext.url = 'https://github.com/the-obsidian/DiscordBridge'
 
@@ -41,6 +41,7 @@ dependencies {
     compile group: 'org.spigotmc', name: 'spigot-api', version:'1.11.2-R0.1-SNAPSHOT'
     compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version:'1.0.0-rc-1036'
     compile group: 'net.dv8tion', name: 'JDA', version:'3.0.BETA2_108'
+    compile group: 'com.michaelwflaherty', name: 'cleverbotapi', version: '1.0.1'
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
@@ -52,12 +53,14 @@ processResources {
     ]
 }
 
+//noinspection GroovyAssignabilityCheck
 build.finalizedBy(shadowJar)
 
 shadowJar {
     relocate 'org.apache', 'shadow.apache'
     classifier 'dist'
     dependencies {
+        //noinspection GroovyAssignabilityCheck
         exclude(dependency('org.spigotmc:.*:.*'))
     }
     exclude '.cache'
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/ConfigAccessor.kt b/src/main/kotlin/gg/obsidian/discordbridge/ConfigAccessor.kt
index bbce2d7..52c80d9 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/ConfigAccessor.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/ConfigAccessor.kt
@@ -30,25 +30,26 @@ import java.io.IOException
 import java.io.InputStreamReader
 import java.util.logging.Level
 
-class ConfigAccessor(private val plugin: JavaPlugin, private val fileName: String) {
+class ConfigAccessor(private val plugin: JavaPlugin, filepath: File, private val fileName: String) {
 
     private val configFile: File?
     private var fileConfiguration: FileConfiguration? = null
 
     init {
         plugin.dataFolder ?: throw IllegalStateException()
-        this.configFile = File(plugin.dataFolder, fileName)
+        this.configFile = File(filepath, fileName)
     }
 
     fun reloadConfig() {
-        fileConfiguration = YamlConfiguration.loadConfiguration(configFile!!)
-
-        // Look for defaults in the jar
-        if (plugin.getResource(fileName) == null)
-            plugin.logger.log(Level.SEVERE, "usernames.yml cannot be found for some reason")
-        val defConfigReader = InputStreamReader(plugin.getResource(fileName))
-        val defConfig = YamlConfiguration.loadConfiguration(defConfigReader)
-        fileConfiguration!!.defaults = defConfig
+        try { fileConfiguration = YamlConfiguration.loadConfiguration(configFile) }
+        catch (e: IllegalArgumentException) {
+            // Look for defaults in the jar
+            if (plugin.getResource(fileName) == null)
+                plugin.logger.log(Level.SEVERE, "usernames.yml cannot be found for some reason")
+            val defConfigReader = InputStreamReader(plugin.getResource(fileName))
+            val defConfig = YamlConfiguration.loadConfiguration(defConfigReader)
+            fileConfiguration!!.defaults = defConfig
+        }
     }
 
     val config: FileConfiguration
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Configuration.kt b/src/main/kotlin/gg/obsidian/discordbridge/Configuration.kt
index 5110715..c566a8e 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Configuration.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Configuration.kt
@@ -5,6 +5,7 @@ class Configuration(val plugin: Plugin) {
     var SERVER_ID: String = ""
     var CHANNEL: String = ""
     var USERNAME: String = ""
+    var USERNAME_COLOR: String = ""
     var EMAIL: String = ""
     var PASSWORD: String = ""
     var TOKEN: String = ""
@@ -38,6 +39,7 @@ class Configuration(val plugin: Plugin) {
         SERVER_ID = plugin.config.getString("settings.server-id")
         CHANNEL = plugin.config.getString("settings.channel")
         USERNAME = plugin.config.getString("settings.username")
+        USERNAME_COLOR = plugin.config.getString("settings.username-color")
         EMAIL = plugin.config.getString("settings.email", "")
         PASSWORD = plugin.config.getString("settings.password", "")
         TOKEN = plugin.config.getString("settings.token", "")
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt b/src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt
index 1877782..6f53cbf 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt
@@ -82,6 +82,7 @@ class DiscordConnection(val plugin: Plugin) : Runnable {
         api = builder.buildBlocking()
         listener = DiscordListener(plugin, api as JDA, this)
         api!!.addEventListener(listener)
+        relay("Oikos!")
     }
 
     private fun getServerById(id: String): Guild? {
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt b/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
index bf2a302..90ac7e7 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
@@ -14,66 +14,95 @@ class DiscordListener(val plugin: Plugin, val api: JDA, val connection: DiscordC
         plugin.logDebug("Received message ${event.message.id} from Discord - ${event.message.rawContent}")
 
         val rawmsg: String = event.message.rawContent
-        val msg: String = event.message.content
         val username: String = event.author.name
 
-        if (rawmsg.startsWith("${api.selfUser.asMention} confirm", true) && event.isFromType(ChannelType.PRIVATE)) {
-            plugin.logDebug("user $username wants to confirm an alias")
-            val ua = plugin.requests.find {it.discordId == event.author.id}
-            if (ua == null) {
-                plugin.sendToDiscordRespond("You have not requested an alias, or your request has expired!", event)
-                return
-            }
-            plugin.updateAlias(ua)
-            plugin.requests.remove(ua)
-            plugin.sendToDiscordRespond("Successfully linked aliases!", event)
+        // Immediately throw out messages sent from itself or from non-matching servers
+        if (username.equals(plugin.configuration.USERNAME, true)) {
+            plugin.logDebug("Ignoring message ${event.message.id} from Discord: it matches this bot's username")
+            return
+        }
+        if (event.guild.id != plugin.configuration.SERVER_ID) {
+            plugin.logDebug("Not relaying message ${event.message.id} from Discord: server does not match")
             return
         }
 
-        if (rawmsg.startsWith("${api.selfUser.asMention} serverlist", true)) {
-            plugin.logDebug("user $username has requested a listing of online players")
-            val players = plugin.getOnlinePlayers()
-            if (players.isEmpty()) {
-                plugin.sendToDiscordRespond("Nobody is currently online.", event)
+        // NON-RELAY COMMANDS - the following commands and their responses are not sent to Minecraft
+        if(rawmsg.startsWith(api.selfUser.asMention, true)) {
+            val arg = rawmsg.replaceFirst(api.selfUser.asMention, "").replaceFirst("\\s+", "")
+
+            // CONFIRM - Confirm an alias
+            if (arg.startsWith("confirm", true) && event.isFromType(ChannelType.PRIVATE)) {
+                plugin.logDebug("user $username wants to confirm an alias")
+                val ua = plugin.requests.find { it.discordId == event.author.id }
+                if (ua == null) {
+                    plugin.sendToDiscordRespond("You have not requested an alias, or your request has expired!", event)
+                    return
+                }
+                plugin.updateAlias(ua)
+                plugin.requests.remove(ua)
+                plugin.sendToDiscordRespond("Successfully linked aliases!", event)
                 return
             }
-            val response = players.joinToString("\n", "The following players are currently online:\n```\n", "\n```")
-            plugin.sendToDiscordRespond(response, event)
-            return
-        }
 
-        if (rawmsg.startsWith("${api.selfUser.asMention} oikos", true)) {
-            plugin.logDebug("user $username has initiated oikos!")
-            plugin.sendToDiscordRespond("Delicious Greek yogurt from Danone!", event)
-            return
+            // SERVERLIST - List all players currently online on the server
+            if (arg.startsWith("serverlist", true)) {
+                plugin.logDebug("user $username has requested a listing of online players")
+                val players = plugin.getOnlinePlayers()
+                if (players.isEmpty()) {
+                    plugin.sendToDiscordRespond("Nobody is currently online.", event)
+                    return
+                }
+                val response = players.joinToString("\n", "The following players are currently online:\n```\n", "\n```")
+                plugin.sendToDiscordRespond(response, event)
+                return
+            }
         }
 
-        if (rawmsg == "${api.selfUser.asMention} \uD83D\uDE04") {
-            plugin.logDebug("user $username has initiated oikos 2!")
-            plugin.sendToDiscordRespond("\uD83D\uDE04", event)
-            return
+        // If it is from the relay channel, relay it immediately
+        if (event.isFromType(ChannelType.TEXT)) {
+
+            if (!event.textChannel.name.equals(plugin.configuration.CHANNEL, true))
+                plugin.logDebug("Not relaying message ${event.message.id} from Discord: channel does not match")
+            else {
+                plugin.logDebug("Broadcasting message ${event.message.id} from Discord to Minecraft as user $username")
+                plugin.sendToMinecraft(username, event.author.id, event.message.content)
+            }
         }
 
-        // Relay
-        if (event.isFromType(ChannelType.TEXT)) {
-            if (event.guild.id != plugin.configuration.SERVER_ID) {
-                plugin.logDebug("Ignoring message ${event.message.id} from Discord: server does not match")
+        // RELAY COMMANDS - These commands and their outputs DO get relayed to Minecraft
+        if(rawmsg.startsWith(api.selfUser.asMention, true)) {
+            val arg = rawmsg.replaceFirst(api.selfUser.asMention, "").removePrefix(" ")
+            if (arg.isEmpty()) return
+            plugin.logDebug("Relay command received.  Arg: $arg")
+
+            // OIKOS - Delicious Greek yogurt from Danone!
+            if (arg.startsWith("oikos", true)) {
+                plugin.logDebug("user $username has initiated oikos!")
+                plugin.sendToDiscordRespond("Delicious Greek yogurt from Danone!", event)
+                plugin.sendToMinecraftBroadcast("Delicious Greek yogurt from Danone!")
                 return
             }
-
-            if (!event.textChannel.name.equals(plugin.configuration.CHANNEL, true)) {
-                plugin.logDebug("Ignoring message ${event.message.id} from Discord: channel does not match")
+            if (arg.startsWith("delicious greek yogurt from danone", true)) {
+                plugin.logDebug("user $username has initiated oikos 2!")
+                plugin.sendToDiscordRespond("\uD83D\uDE04", event)
+                plugin.sendToMinecraftBroadcast(":D")
                 return
             }
-
-            if (username.equals(plugin.configuration.USERNAME, true)) {
-                plugin.logDebug("Ignoring message ${event.message.id} from Discord: it matches the server's username")
+            if (arg == "\uD83D\uDE04") {
+                plugin.logDebug("user $username has initiated oikos 3!")
+                plugin.sendToDiscordRespond("\uD83D\uDE04", event)
+                plugin.sendToMinecraftBroadcast(":D")
                 return
             }
 
-            plugin.logDebug("Broadcasting message ${event.message.id} from Discord as user $username")
-            plugin.logDebug(msg)
-            plugin.sendToMinecraft(username, event.author.id, event.message.content)
+            // CLEVERBOT - Assume anything else invokes Cleverbot
+            plugin.logDebug("user $username asks CleverBot something")
+            val response = Util.askCleverbot(arg)
+            plugin.sendToDiscordRespond(response, event)
+            // if this occurs in the relay channel, relay the response
+            if (event.isFromType(ChannelType.TEXT) && event.textChannel.name.equals(plugin.configuration.CHANNEL, true))
+                plugin.sendToMinecraftBroadcast(response)
+            return
         }
     }
 
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt b/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
index 42a2074..4055255 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
@@ -8,6 +8,7 @@ import org.bukkit.event.entity.PlayerDeathEvent
 import org.bukkit.event.player.AsyncPlayerChatEvent
 import org.bukkit.event.player.PlayerJoinEvent
 import org.bukkit.event.player.PlayerQuitEvent
+import java.lang.reflect.Method
 
 class EventListener(val plugin: Plugin): Listener {
 
@@ -26,13 +27,22 @@ class EventListener(val plugin: Plugin): Listener {
                 !plugin.configuration.IF_VANISHED_CHAT) return
 
         val username = ChatColor.stripColor(event.player.name)
+        var worldname = player.world.name
+        if (plugin.isMultiverse()) {
+            val worldProperties = plugin.worlds!!.config.get("worlds.$worldname")
+            val cls = Class.forName("com.onarandombox.MultiverseCore.WorldProperties")
+            val meth: Method = cls.getMethod("getAlias")
+            val alias = meth.invoke(worldProperties)
+            if (alias is String)  worldname = alias
+        }
+
         val formattedMessage = Util.formatMessage(
                 plugin.configuration.TEMPLATES_DISCORD_CHAT_MESSAGE,
                 mapOf(
                         "%u" to username,
                         "%m" to ChatColor.stripColor(event.message),
                         "%d" to ChatColor.stripColor(player.displayName),
-                        "%w" to player.world.name
+                        "%w" to worldname
                 )
         )
 
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
index cfc259e..a56cfc6 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
@@ -5,27 +5,34 @@ import net.dv8tion.jda.core.entities.ChannelType
 import net.dv8tion.jda.core.events.message.MessageReceivedEvent
 import org.bukkit.plugin.java.JavaPlugin
 import java.util.logging.Level
+import org.bukkit.ChatColor
+import java.io.File
 
 class Plugin : JavaPlugin() {
 
     val configuration = Configuration(this)
     var connection: DiscordConnection? = null
-    var users: ConfigAccessor = ConfigAccessor(this, "usernames.yml")
+    var users: ConfigAccessor = ConfigAccessor(this, dataFolder, "usernames.yml")
+    var worlds: ConfigAccessor? = null
     var requests: MutableList<UserAlias> = mutableListOf()
 
     override fun onEnable() {
         updateConfig(description.version)
         users.saveDefaultConfig()
+        if (isMultiverse()) worlds = ConfigAccessor(this, File("plugins/Multiverse-Core"), "worlds.yml")
+
 
         this.connection = DiscordConnection(this)
 
         server.scheduler.runTaskAsynchronously(this, connection)
         server.pluginManager.registerEvents(EventListener(this), this)
         getCommand("discord").executor = CommandHandler(this)
+        getCommand("marina").executor = HandleMarina(this)
     }
 
     override fun onDisable() {
-        logger.log(Level.FINE, "Attempting to cancel tasks")
+        connection!!.relay("Shutting down...")
+        logger.log(Level.INFO, "Attempting to cancel tasks")
         server.scheduler.cancelTasks(this)
     }
 
@@ -39,9 +46,36 @@ class Plugin : JavaPlugin() {
 
     // Message senders
 
+    fun sendToDiscordRelaySelf(message: String) {
+        logDebug("Sending message to Discord - $message")
+        connection!!.relay(message)
+    }
+
     fun sendToDiscordRelay(message: String, uuid: String) {
         val alias = users.config.getString("mcaliases.$uuid.discordusername")
         var newMessage = message
+
+        // This section should convert attempted @mentions to real ones wherever possible
+        val discordusers = getDiscordUsers()
+        val discordaliases: MutableList<Pair<String, String>> = mutableListOf()
+        discordusers
+                .filter { users.config.isSet("discordaliases.${it.second}") }
+                .mapTo(discordaliases) {
+                    Pair(users.config.getString("discordaliases.${it.second}.mcusername"),
+                            it.second)
+                }
+        for (match in Regex("""(?:^| )@(w+)""").findAll(message)) {
+            val found: Triple<String, String, Boolean>? = discordusers.firstOrNull {
+                it.first.replace("\\s+", "").toLowerCase() == match.value.toLowerCase()
+            }
+            if (found != null) newMessage = newMessage.replaceFirst("@${match.value}", "<@${found.second}>")
+
+            val found2: Pair<String, String>? = discordaliases.firstOrNull {
+                it.second.toLowerCase() == match.value.toLowerCase()
+            }
+            if (found2 != null) newMessage = newMessage.replaceFirst("@${match.value}", "<@${found2.first}>")
+        }
+
         if (alias != null) newMessage = message.replaceFirst(users.config.getString("mcaliases.$uuid.mcusername"), alias)
         logDebug("Sending message to Discord - $newMessage")
         connection!!.relay(newMessage)
@@ -55,7 +89,7 @@ class Plugin : JavaPlugin() {
 
     fun sendToMinecraft(username: String, id: String, message: String) {
         var alias = users.config.getString("discordaliases.$id.mcusername")
-        if (alias == null) alias = username
+        if (alias == null) alias = username.replace("\\s+", "")
         val formattedMessage = Util.formatMessage(
                 configuration.TEMPLATES_MINECRAFT_CHAT_MESSAGE,
                 mapOf(
@@ -68,6 +102,18 @@ class Plugin : JavaPlugin() {
         server.broadcastMessage(formattedMessage)
     }
 
+    fun sendToMinecraftBroadcast(message: String) {
+        val formattedMessage = Util.formatMessage(
+                configuration.TEMPLATES_MINECRAFT_CHAT_MESSAGE,
+                mapOf(
+                        "%u" to configuration.USERNAME_COLOR + configuration.USERNAME.replace("\\s+", "") + "&r",
+                        "%m" to message
+                ),
+                colors = true
+        )
+        server.broadcastMessage(formattedMessage)
+    }
+
     // Utilities
 
     fun updateConfig(version: String) {
@@ -83,6 +129,10 @@ class Plugin : JavaPlugin() {
         logger.info(msg)
     }
 
+    fun isMultiverse(): Boolean {
+        return server.pluginManager.getPlugin("Multiverse-Core") != null
+    }
+
     // Stuff
 
     fun getOnlinePlayers(): List<String> {
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 73daff2..6e44b6e 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -2,6 +2,7 @@ settings:
   server-id: '00000000'
   channel: 'test'
   username: 'username'
+  username-color: ''
   token: 'token'
   debug: false
   relay_cancelled_messages: true
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index b1e846f..2bef185 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -6,6 +6,7 @@ author: Jacob Gillespie
 website: '@URL@'
 
 loadbefore: [SpaceBukkit, RemoteToolkitPlugin]
+softdepend: [Multiverse-Core]
 
 main: gg.obsidian.discordbridge.Plugin
 
@@ -17,4 +18,7 @@ permissions:
 commands:
   discord:
     description: Issue a command to the bot
-    usage: /discord <command>
\ No newline at end of file
+    usage: /discord <command>
+  marina:
+    description: Chat with Marina!
+    usage: /marina <what to say to Marina>
\ No newline at end of file
diff --git a/src/main/resources/usernames.yml b/src/main/resources/usernames.yml
new file mode 100644
index 0000000..6da9d82
--- /dev/null
+++ b/src/main/resources/usernames.yml
@@ -0,0 +1,2 @@
+mcaliases:
+discordaliases:
\ No newline at end of file

From 552c5f2a1daee540ae5510166075826a2202bad9 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Sun, 12 Feb 2017 12:16:49 -0600
Subject: [PATCH 10/24] whoops

---
 src/main/kotlin/gg/obsidian/discordbridge/Configuration.kt   | 2 ++
 src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt | 2 +-
 src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt          | 1 -
 src/main/resources/config.yml                                | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Configuration.kt b/src/main/kotlin/gg/obsidian/discordbridge/Configuration.kt
index c566a8e..db50e1f 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Configuration.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Configuration.kt
@@ -9,6 +9,7 @@ class Configuration(val plugin: Plugin) {
     var EMAIL: String = ""
     var PASSWORD: String = ""
     var TOKEN: String = ""
+    var CLEVERBOT_KEY: String = ""
     var DEBUG: Boolean = false
     var RELAY_CANCELLED_MESSAGES = true
 
@@ -43,6 +44,7 @@ class Configuration(val plugin: Plugin) {
         EMAIL = plugin.config.getString("settings.email", "")
         PASSWORD = plugin.config.getString("settings.password", "")
         TOKEN = plugin.config.getString("settings.token", "")
+        CLEVERBOT_KEY = plugin.config.getString("settings.cleverbot-key", "")
         DEBUG = plugin.config.getBoolean("settings.debug", false)
         RELAY_CANCELLED_MESSAGES = plugin.config.getBoolean("settings.relay_cancelled_messages", true)
 
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt b/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
index 90ac7e7..31e4634 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
@@ -97,7 +97,7 @@ class DiscordListener(val plugin: Plugin, val api: JDA, val connection: DiscordC
 
             // CLEVERBOT - Assume anything else invokes Cleverbot
             plugin.logDebug("user $username asks CleverBot something")
-            val response = Util.askCleverbot(arg)
+            val response = Util.askCleverbot(plugin.configuration.CLEVERBOT_KEY, arg)
             plugin.sendToDiscordRespond(response, event)
             // if this occurs in the relay channel, relay the response
             if (event.isFromType(ChannelType.TEXT) && event.textChannel.name.equals(plugin.configuration.CHANNEL, true))
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
index a56cfc6..d7bc2ac 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
@@ -5,7 +5,6 @@ import net.dv8tion.jda.core.entities.ChannelType
 import net.dv8tion.jda.core.events.message.MessageReceivedEvent
 import org.bukkit.plugin.java.JavaPlugin
 import java.util.logging.Level
-import org.bukkit.ChatColor
 import java.io.File
 
 class Plugin : JavaPlugin() {
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 6e44b6e..5f37b58 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -4,6 +4,7 @@ settings:
   username: 'username'
   username-color: ''
   token: 'token'
+  cleverbot-key: ''
   debug: false
   relay_cancelled_messages: true
   messages:

From 94d27885d2fb8e1eec787af0f341869ef76b85ca Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Sun, 12 Feb 2017 12:57:31 -0600
Subject: [PATCH 11/24]  added handler for Marina command

---
 .../gg/obsidian/discordbridge/HandleMarina.kt | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 src/main/kotlin/gg/obsidian/discordbridge/HandleMarina.kt

diff --git a/src/main/kotlin/gg/obsidian/discordbridge/HandleMarina.kt b/src/main/kotlin/gg/obsidian/discordbridge/HandleMarina.kt
new file mode 100644
index 0000000..64a7e45
--- /dev/null
+++ b/src/main/kotlin/gg/obsidian/discordbridge/HandleMarina.kt
@@ -0,0 +1,31 @@
+package gg.obsidian.discordbridge
+
+import org.bukkit.command.Command
+import org.bukkit.command.CommandExecutor
+import org.bukkit.command.CommandSender
+import org.bukkit.entity.Player
+
+class HandleMarina(val plugin: Plugin): CommandExecutor {
+
+    override fun onCommand(player: CommandSender, cmd: Command, alias: String?, args: Array<out String>?): Boolean {
+        if (args == null || args.isEmpty()) return false
+
+        if (player is Player) {
+            val message: String = args.joinToString(" ")
+            player.chat("@MarinaFriend " + message)
+            val response: String = Util.askCleverbot(plugin.configuration.CLEVERBOT_KEY, message)
+            val formattedMessage = Util.formatMessage(
+                    plugin.configuration.TEMPLATES_MINECRAFT_CHAT_MESSAGE,
+                    mapOf(
+                            "%u" to plugin.configuration.USERNAME_COLOR + plugin.configuration.USERNAME.replace("\\s+", "") + "&r",
+                            "%m" to response
+                    ),
+                    colors = true
+            )
+            plugin.server.broadcastMessage(formattedMessage)
+            plugin.sendToDiscordRelaySelf(response)
+            return true
+        }
+        return true
+    }
+}
\ No newline at end of file

From 7a20a36d5b3db1d9098129cef544bee8b7e01e79 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Sun, 12 Feb 2017 12:59:53 -0600
Subject: [PATCH 12/24] Re-added the Util class after nuking it from orbit
 because I'm a dumbass

---
 .../kotlin/gg/obsidian/discordbridge/Util.kt  | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Util.kt b/src/main/kotlin/gg/obsidian/discordbridge/Util.kt
index 788828d..2487eec 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Util.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Util.kt
@@ -1,17 +1,38 @@
 package gg.obsidian.discordbridge
 
 import org.bukkit.ChatColor
+import java.io.IOException
+import com.michaelwflaherty.cleverbotapi.CleverBotQuery
 
 object Util {
+
     fun formatMessage(message: String, replacements: Map<String, String>, colors: Boolean = false): String {
         var formattedString = message
 
-        if (colors) formattedString = ChatColor.translateAlternateColorCodes('&', formattedString)
-
         for ((token, replacement) in replacements) {
             formattedString = formattedString.replace(token, replacement)
         }
 
+        if (colors) formattedString = ChatColor.translateAlternateColorCodes('&', formattedString)
+
         return formattedString
     }
+
+    fun askCleverbot(key: String, message: String): String {
+
+        if (key.isEmpty()) return "You do not have an API key. Go to https://www.cleverbot.com/api/ for more information."
+        val bot: CleverBotQuery = CleverBotQuery(key, message)
+        var response: String
+        try
+        {
+            bot.sendRequest()
+            response = bot.response
+        }
+        catch (e: IOException)
+        {
+            response = e.message!!
+        }
+
+        return response
+    }
 }

From 23f2735e93967a24d46a75421c7f88b9e1964a56 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Thu, 16 Feb 2017 14:25:03 -0600
Subject: [PATCH 13/24] Rearranged a lot of stuff

---
 README.md                                     |   8 +-
 build.gradle                                  |  10 +-
 .../{Util.kt => CommandLogic.kt}              |  25 +---
 ...onfigAccessor.kt => DataConfigAccessor.kt} |   8 +-
 .../obsidian/discordbridge/EventListener.kt   |  68 +++++-----
 .../gg/obsidian/discordbridge/HandleMarina.kt |  31 -----
 .../gg/obsidian/discordbridge/Plugin.kt       | 127 +++++++++++-------
 .../gg/obsidian/discordbridge/Utils/Utils.kt  |  22 +++
 .../Connection.kt}                            |  19 +--
 .../Listener.kt}                              |  46 ++++---
 .../commands/Discord.kt}                      |  22 ++-
 .../minecraft/commands/Marina.kt              |  35 +++++
 12 files changed, 228 insertions(+), 193 deletions(-)
 rename src/main/kotlin/gg/obsidian/discordbridge/{Util.kt => CommandLogic.kt} (50%)
 rename src/main/kotlin/gg/obsidian/discordbridge/{ConfigAccessor.kt => DataConfigAccessor.kt} (93%)
 delete mode 100644 src/main/kotlin/gg/obsidian/discordbridge/HandleMarina.kt
 create mode 100644 src/main/kotlin/gg/obsidian/discordbridge/Utils/Utils.kt
 rename src/main/kotlin/gg/obsidian/discordbridge/{DiscordConnection.kt => discord/Connection.kt} (85%)
 rename src/main/kotlin/gg/obsidian/discordbridge/{DiscordListener.kt => discord/Listener.kt} (72%)
 rename src/main/kotlin/gg/obsidian/discordbridge/{CommandHandler.kt => minecraft/commands/Discord.kt} (88%)
 create mode 100644 src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Marina.kt

diff --git a/README.md b/README.md
index 950f068..61d3982 100644
--- a/README.md
+++ b/README.md
@@ -10,14 +10,14 @@ Bridges chat between Discord and Minecraft (Bukkit/Spigot).
 
 1. Download the [latest release](https://github.com/the-obsidian/DiscordBridge/releases) from GitHub
 1. Add it to your `plugins` folder
-1. Either run Bukkit/Spigot once to generate `DiscordBridge/config.yml` or create it using the guide below.
+1. Either run Bukkit/Spigot once to generate `DiscordBridge/data.yml` or create it using the guide below.
 1. All done!
 
 ## Configuration
 
 **Note:** To use with the official Discord API and a bot user, add a `token: 'your-bot-token-here'` line alongside `email` and `password` (so it will have two spaces of indentation).  If a `token` setting is present, it will ignore `email` and `password`.  A more user-friendly version of this will be released shortly.
 
-DiscordBridge has several options that can be configured in the `config.yml` file:
+DiscordBridge has several options that can be configured in the `data.yml` file:
 
 ```yaml
 settings:
@@ -78,11 +78,11 @@ settings:
 
 ## Permissions
 
-- `discordbridge.reload` - ability to reload config and reconnect the Discord connection
+- `discordbridge.reload` - ability to reload data and reconnect the Discord connection
 
 ## Commands
 
-- `/discord reload` - reloads config and reconnects to Discord
+- `/discord reload` - reloads data and reconnects to Discord
 
 ## Upcoming Features
 
diff --git a/build.gradle b/build.gradle
index eb664ba..8ded0d5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,9 +38,9 @@ repositories {
 }
 
 dependencies {
-    compile group: 'org.spigotmc', name: 'spigot-api', version:'1.11.2-R0.1-SNAPSHOT'
-    compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version:'1.0.0-rc-1036'
-    compile group: 'net.dv8tion', name: 'JDA', version:'3.0.BETA2_108'
+    compile group: 'org.spigotmc', name: 'spigot-api', version: '1.11.2-R0.1-SNAPSHOT'
+    compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '1.0.0-rc-1036'
+    compile group: 'net.dv8tion', name: 'JDA', version: '3.0.BETA2_108'
     compile group: 'com.michaelwflaherty', name: 'cleverbotapi', version: '1.0.1'
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
@@ -48,8 +48,8 @@ dependencies {
 processResources {
     filter ReplaceTokens, tokens: [
             'DESCRIPTION': project.property('description'),
-            'URL': project.property('url'),
-            'VERSION': project.property('version')
+            'URL'        : project.property('url'),
+            'VERSION'    : project.property('version')
     ]
 }
 
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Util.kt b/src/main/kotlin/gg/obsidian/discordbridge/CommandLogic.kt
similarity index 50%
rename from src/main/kotlin/gg/obsidian/discordbridge/Util.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/CommandLogic.kt
index 2487eec..1056908 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Util.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/CommandLogic.kt
@@ -1,38 +1,23 @@
 package gg.obsidian.discordbridge
 
-import org.bukkit.ChatColor
-import java.io.IOException
 import com.michaelwflaherty.cleverbotapi.CleverBotQuery
+import java.io.IOException
 
-object Util {
-
-    fun formatMessage(message: String, replacements: Map<String, String>, colors: Boolean = false): String {
-        var formattedString = message
-
-        for ((token, replacement) in replacements) {
-            formattedString = formattedString.replace(token, replacement)
-        }
-
-        if (colors) formattedString = ChatColor.translateAlternateColorCodes('&', formattedString)
-
-        return formattedString
-    }
+object CommandLogic {
 
     fun askCleverbot(key: String, message: String): String {
 
         if (key.isEmpty()) return "You do not have an API key. Go to https://www.cleverbot.com/api/ for more information."
         val bot: CleverBotQuery = CleverBotQuery(key, message)
         var response: String
-        try
-        {
+        try {
             bot.sendRequest()
             response = bot.response
-        }
-        catch (e: IOException)
-        {
+        } catch (e: IOException) {
             response = e.message!!
         }
 
         return response
     }
+
 }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/ConfigAccessor.kt b/src/main/kotlin/gg/obsidian/discordbridge/DataConfigAccessor.kt
similarity index 93%
rename from src/main/kotlin/gg/obsidian/discordbridge/ConfigAccessor.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/DataConfigAccessor.kt
index 52c80d9..7a6bcc4 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/ConfigAccessor.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/DataConfigAccessor.kt
@@ -30,7 +30,7 @@ import java.io.IOException
 import java.io.InputStreamReader
 import java.util.logging.Level
 
-class ConfigAccessor(private val plugin: JavaPlugin, filepath: File, private val fileName: String) {
+class DataConfigAccessor(private val plugin: JavaPlugin, filepath: File, private val fileName: String) {
 
     private val configFile: File?
     private var fileConfiguration: FileConfiguration? = null
@@ -52,7 +52,7 @@ class ConfigAccessor(private val plugin: JavaPlugin, filepath: File, private val
         }
     }
 
-    val config: FileConfiguration
+    val data: FileConfiguration
         get() {
             if (fileConfiguration == null) {
                 this.reloadConfig()
@@ -65,9 +65,9 @@ class ConfigAccessor(private val plugin: JavaPlugin, filepath: File, private val
             return
         } else {
             try {
-                config.save(configFile)
+                data.save(configFile)
             } catch (ex: IOException) {
-                plugin.logger.log(Level.SEVERE, "Could not save config to " + configFile, ex)
+                plugin.logger.log(Level.SEVERE, "Could not save data to " + configFile, ex)
             }
 
         }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt b/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
index 4055255..fc3ba43 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
@@ -1,6 +1,6 @@
 package gg.obsidian.discordbridge
 
-import org.bukkit.ChatColor
+import gg.obsidian.discordbridge.Utils.*
 import org.bukkit.event.EventHandler
 import org.bukkit.event.EventPriority
 import org.bukkit.event.Listener
@@ -10,116 +10,116 @@ import org.bukkit.event.player.PlayerJoinEvent
 import org.bukkit.event.player.PlayerQuitEvent
 import java.lang.reflect.Method
 
-class EventListener(val plugin: Plugin): Listener {
+class EventListener(val plugin: Plugin) : Listener {
 
     @EventHandler(priority = EventPriority.MONITOR)
     fun onChat(event: AsyncPlayerChatEvent) {
         plugin.logDebug("Received a chat event from ${event.player.name}: ${event.message}")
 
 
-        if (!plugin.configuration.MESSAGES_CHAT) return
-        if (event.isCancelled && !plugin.configuration.RELAY_CANCELLED_MESSAGES) return
+        if (!plugin.cfg.MESSAGES_CHAT) return
+        if (event.isCancelled && !plugin.cfg.RELAY_CANCELLED_MESSAGES) return
 
         // Check for vanished
         val player = event.player
         if (player.hasMetadata("vanished") &&
                 player.getMetadata("vanished")[0].asBoolean() &&
-                !plugin.configuration.IF_VANISHED_CHAT) return
+                !plugin.cfg.IF_VANISHED_CHAT) return
 
-        val username = ChatColor.stripColor(event.player.name)
+        val username = event.player.name.stripColor()
         var worldname = player.world.name
         if (plugin.isMultiverse()) {
-            val worldProperties = plugin.worlds!!.config.get("worlds.$worldname")
+            val worldProperties = plugin.worlds!!.data.get("worlds.$worldname")
             val cls = Class.forName("com.onarandombox.MultiverseCore.WorldProperties")
             val meth: Method = cls.getMethod("getAlias")
             val alias = meth.invoke(worldProperties)
-            if (alias is String)  worldname = alias
+            if (alias is String) worldname = alias
         }
 
-        val formattedMessage = Util.formatMessage(
-                plugin.configuration.TEMPLATES_DISCORD_CHAT_MESSAGE,
+        val formattedMessage = Utils.formatMessage(
+                plugin.cfg.TEMPLATES_DISCORD_CHAT_MESSAGE,
                 mapOf(
                         "%u" to username,
-                        "%m" to ChatColor.stripColor(event.message),
-                        "%d" to ChatColor.stripColor(player.displayName),
+                        "%m" to event.message.stripColor(),
+                        "%d" to player.displayName.stripColor(),
                         "%w" to worldname
                 )
         )
 
-        plugin.sendToDiscordRelay(formattedMessage, event.player.uniqueId.toString())
+        plugin.sendToDiscord(formattedMessage, event.player.uniqueId.toString())
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     fun onPlayerJoin(event: PlayerJoinEvent) {
-        if (!plugin.configuration.MESSAGES_JOIN) return
+        if (!plugin.cfg.MESSAGES_JOIN) return
 
         // Check for vanished
         val player = event.player
         if (player.hasMetadata("vanished") &&
                 player.getMetadata("vanished")[0].asBoolean() &&
-                !plugin.configuration.IF_VANISHED_JOIN) return
+                !plugin.cfg.IF_VANISHED_JOIN) return
 
-        val username = ChatColor.stripColor(player.name)
+        val username = player.name.stripColor()
         plugin.logDebug("Received a join event for $username")
 
-        val formattedMessage = Util.formatMessage(
-                plugin.configuration.TEMPLATES_DISCORD_PLAYER_JOIN,
+        val formattedMessage = Utils.formatMessage(
+                plugin.cfg.TEMPLATES_DISCORD_PLAYER_JOIN,
                 mapOf(
                         "%u" to username,
-                        "%d" to ChatColor.stripColor(player.displayName)
+                        "%d" to player.displayName.stripColor()
                 )
         )
 
-        plugin.sendToDiscordRelay(formattedMessage, player.uniqueId.toString())
+        plugin.sendToDiscord(formattedMessage, player.uniqueId.toString())
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     fun onPlayerQuit(event: PlayerQuitEvent) {
-        if (!plugin.configuration.MESSAGES_LEAVE) return
+        if (!plugin.cfg.MESSAGES_LEAVE) return
 
         // Check for vanished
         val player = event.player
         if (player.hasMetadata("vanished") &&
                 player.getMetadata("vanished")[0].asBoolean() &&
-                !plugin.configuration.IF_VANISHED_LEAVE) return
+                !plugin.cfg.IF_VANISHED_LEAVE) return
 
-        val username = ChatColor.stripColor(event.player.name)
+        val username = event.player.name.stripColor()
         plugin.logDebug("Received a leave event for $username")
 
-        val formattedMessage = Util.formatMessage(
-                plugin.configuration.TEMPLATES_DISCORD_PLAYER_LEAVE,
+        val formattedMessage = Utils.formatMessage(
+                plugin.cfg.TEMPLATES_DISCORD_PLAYER_LEAVE,
                 mapOf(
                         "%u" to username,
-                        "%d" to ChatColor.stripColor(event.player.displayName)
+                        "%d" to event.player.displayName.stripColor()
                 )
         )
 
-        plugin.sendToDiscordRelay(formattedMessage, player.uniqueId.toString())
+        plugin.sendToDiscord(formattedMessage, player.uniqueId.toString())
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     fun onPlayerDeath(event: PlayerDeathEvent) {
-        if (!plugin.configuration.MESSAGES_DEATH) return
+        if (!plugin.cfg.MESSAGES_DEATH) return
 
         // Check for vanished
         val player = event.entity
         if (player.hasMetadata("vanished") &&
                 player.getMetadata("vanished")[0].asBoolean() &&
-                !plugin.configuration.IF_VANISHED_DEATH) return
+                !plugin.cfg.IF_VANISHED_DEATH) return
 
-        val username = ChatColor.stripColor(event.entity.name)
+        val username = event.entity.name.stripColor()
         plugin.logDebug("Received a death event for $username")
 
-        val formattedMessage = Util.formatMessage(
-                plugin.configuration.TEMPLATES_DISCORD_PLAYER_DEATH,
+        val formattedMessage = Utils.formatMessage(
+                plugin.cfg.TEMPLATES_DISCORD_PLAYER_DEATH,
                 mapOf(
                         "%u" to username,
-                        "%d" to ChatColor.stripColor(event.entity.displayName),
+                        "%d" to event.entity.displayName.stripColor(),
                         "%r" to event.deathMessage,
                         "%w" to event.entity.world.name
                 )
         )
 
-        plugin.sendToDiscordRelay(formattedMessage, player.uniqueId.toString())
+        plugin.sendToDiscord(formattedMessage, player.uniqueId.toString())
     }
 }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/HandleMarina.kt b/src/main/kotlin/gg/obsidian/discordbridge/HandleMarina.kt
deleted file mode 100644
index 64a7e45..0000000
--- a/src/main/kotlin/gg/obsidian/discordbridge/HandleMarina.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-package gg.obsidian.discordbridge
-
-import org.bukkit.command.Command
-import org.bukkit.command.CommandExecutor
-import org.bukkit.command.CommandSender
-import org.bukkit.entity.Player
-
-class HandleMarina(val plugin: Plugin): CommandExecutor {
-
-    override fun onCommand(player: CommandSender, cmd: Command, alias: String?, args: Array<out String>?): Boolean {
-        if (args == null || args.isEmpty()) return false
-
-        if (player is Player) {
-            val message: String = args.joinToString(" ")
-            player.chat("@MarinaFriend " + message)
-            val response: String = Util.askCleverbot(plugin.configuration.CLEVERBOT_KEY, message)
-            val formattedMessage = Util.formatMessage(
-                    plugin.configuration.TEMPLATES_MINECRAFT_CHAT_MESSAGE,
-                    mapOf(
-                            "%u" to plugin.configuration.USERNAME_COLOR + plugin.configuration.USERNAME.replace("\\s+", "") + "&r",
-                            "%m" to response
-                    ),
-                    colors = true
-            )
-            plugin.server.broadcastMessage(formattedMessage)
-            plugin.sendToDiscordRelaySelf(response)
-            return true
-        }
-        return true
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
index d7bc2ac..e2ee6f6 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
@@ -1,5 +1,9 @@
 package gg.obsidian.discordbridge
 
+import gg.obsidian.discordbridge.Utils.Utils
+import gg.obsidian.discordbridge.discord.Connection
+import gg.obsidian.discordbridge.minecraft.commands.Discord
+import gg.obsidian.discordbridge.minecraft.commands.Marina
 import net.dv8tion.jda.core.OnlineStatus
 import net.dv8tion.jda.core.entities.ChannelType
 import net.dv8tion.jda.core.events.message.MessageReceivedEvent
@@ -9,58 +13,59 @@ import java.io.File
 
 class Plugin : JavaPlugin() {
 
-    val configuration = Configuration(this)
-    var connection: DiscordConnection? = null
-    var users: ConfigAccessor = ConfigAccessor(this, dataFolder, "usernames.yml")
-    var worlds: ConfigAccessor? = null
+    val cfg = Configuration(this)
+    var connection: Connection? = null
+    var users: DataConfigAccessor = DataConfigAccessor(this, dataFolder, "usernames.yml")
+    var worlds: DataConfigAccessor? = null
     var requests: MutableList<UserAlias> = mutableListOf()
 
     override fun onEnable() {
+        // Load configs
         updateConfig(description.version)
         users.saveDefaultConfig()
-        if (isMultiverse()) worlds = ConfigAccessor(this, File("plugins/Multiverse-Core"), "worlds.yml")
-
-
-        this.connection = DiscordConnection(this)
+        if (isMultiverse()) worlds = DataConfigAccessor(this, File("plugins/Multiverse-Core"), "worlds.yml")
 
+        // Connect to Discord
+        this.connection = Connection(this)
         server.scheduler.runTaskAsynchronously(this, connection)
         server.pluginManager.registerEvents(EventListener(this), this)
-        getCommand("discord").executor = CommandHandler(this)
-        getCommand("marina").executor = HandleMarina(this)
+
+        // Register commands
+        getCommand("discord").executor = Discord(this)
+        getCommand("marina").executor = Marina(this)
     }
 
     override fun onDisable() {
         connection!!.relay("Shutting down...")
+
+        // Pretend like this does anything
         logger.log(Level.INFO, "Attempting to cancel tasks")
         server.scheduler.cancelTasks(this)
     }
 
-    fun reload() {
+    /*======================================
+      Messaging Functions
+    ===================================== */
 
-        reloadConfig()
-        users.reloadConfig()
-        configuration.load()
-        connection?.reconnect()
-    }
-
-    // Message senders
-
-    fun sendToDiscordRelaySelf(message: String) {
+    // Send a message to Discord as the bot itself
+    fun sendToDiscord(message: String) {
         logDebug("Sending message to Discord - $message")
         connection!!.relay(message)
     }
 
-    fun sendToDiscordRelay(message: String, uuid: String) {
-        val alias = users.config.getString("mcaliases.$uuid.discordusername")
+    // Send a message from a Minecraft player to Discord
+    fun sendToDiscord(message: String, uuid: String) {
+        val alias = users.data.getString("mcaliases.$uuid.discordusername")
         var newMessage = message
 
-        // This section should convert attempted @mentions to real ones wherever possible
+        // This gross section converts attempted @mentions to real ones wherever possible
+        // Mentionable names MUST not contain spaces!
         val discordusers = getDiscordUsers()
         val discordaliases: MutableList<Pair<String, String>> = mutableListOf()
         discordusers
-                .filter { users.config.isSet("discordaliases.${it.second}") }
+                .filter { users.data.isSet("discordaliases.${it.second}") }
                 .mapTo(discordaliases) {
-                    Pair(users.config.getString("discordaliases.${it.second}.mcusername"),
+                    Pair(users.data.getString("discordaliases.${it.second}.mcusername"),
                             it.second)
                 }
         for (match in Regex("""(?:^| )@(w+)""").findAll(message)) {
@@ -75,65 +80,78 @@ class Plugin : JavaPlugin() {
             if (found2 != null) newMessage = newMessage.replaceFirst("@${match.value}", "<@${found2.first}>")
         }
 
-        if (alias != null) newMessage = message.replaceFirst(users.config.getString("mcaliases.$uuid.mcusername"), alias)
+        if (alias != null) newMessage = message.replaceFirst(users.data.getString("mcaliases.$uuid.mcusername"), alias)
         logDebug("Sending message to Discord - $newMessage")
         connection!!.relay(newMessage)
     }
 
-    fun sendToDiscordRespond(message: String, event: MessageReceivedEvent) {
+    // TODO: this function is  little different because it isn't a simple relay. Consider refactoring.
+    // Send a direct message to a Discord user as the bot itself
+    fun sendToDiscord(message: String, event: MessageReceivedEvent) {
         if (event.isFromType(ChannelType.PRIVATE)) logDebug("Sending message to ${event.author.name} - $message")
         else logDebug("Sending message to Discord - $message")
         connection!!.respond(message, event)
     }
 
-    fun sendToMinecraft(username: String, id: String, message: String) {
-        var alias = users.config.getString("discordaliases.$id.mcusername")
-        if (alias == null) alias = username.replace("\\s+", "")
-        val formattedMessage = Util.formatMessage(
-                configuration.TEMPLATES_MINECRAFT_CHAT_MESSAGE,
+    // Send a message to Minecraft as the bot iself
+    fun sendToMinecraft(message: String) {
+        val formattedMessage = Utils.formatMessage(
+                cfg.TEMPLATES_MINECRAFT_CHAT_MESSAGE,
                 mapOf(
-                        "%u" to alias,
+                        "%u" to cfg.USERNAME_COLOR + cfg.USERNAME.replace("\\s+", "") + "&r",
                         "%m" to message
                 ),
                 colors = true
         )
-
         server.broadcastMessage(formattedMessage)
     }
 
-    fun sendToMinecraftBroadcast(message: String) {
-        val formattedMessage = Util.formatMessage(
-                configuration.TEMPLATES_MINECRAFT_CHAT_MESSAGE,
-                mapOf(
-                        "%u" to configuration.USERNAME_COLOR + configuration.USERNAME.replace("\\s+", "") + "&r",
-                        "%m" to message
-                ),
+    // Send a message to Minecraft from a Discord user
+    fun sendToMinecraft(message: String, username: String, id: String) {
+        var alias = users.data.getString("discordaliases.$id.mcusername")
+        if (alias == null) alias = username.replace("\\s+", "")
+        val formattedMessage = Utils.formatMessage(
+                cfg.TEMPLATES_MINECRAFT_CHAT_MESSAGE,
+                mapOf("%u" to alias, "%m" to message),
                 colors = true
         )
         server.broadcastMessage(formattedMessage)
     }
 
-    // Utilities
+    /*===========================================
+      Util
+    ===========================================*/
 
+    // Reload configs
+    fun reload() {
+        reloadConfig()
+        users.reloadConfig()
+        if (isMultiverse()) worlds!!.reloadConfig()
+        cfg.load()
+        //connection?.reconnect()
+    }
+
+    // Save default config
     fun updateConfig(version: String) {
         this.saveDefaultConfig()
         config.options().copyDefaults(true)
         config.set("version", version)
         saveConfig()
-        configuration.load()
+        cfg.load()
     }
 
+    // Log only if debug config is true
     fun logDebug(msg: String) {
-        if (!configuration.DEBUG) return
+        if (!cfg.DEBUG) return
         logger.info(msg)
     }
 
+    // Shorthand function to check if Multiverse is installed
     fun isMultiverse(): Boolean {
         return server.pluginManager.getPlugin("Multiverse-Core") != null
     }
 
-    // Stuff
-
+    // Get a list of usernames of players who are online
     fun getOnlinePlayers(): List<String> {
         val names: MutableList<String> = mutableListOf()
         val players = server.onlinePlayers.toTypedArray()
@@ -141,6 +159,7 @@ class Plugin : JavaPlugin() {
         return names.toList()
     }
 
+    // Open a request to link a Minecraft user with a Discord user
     fun registerUserRequest(ua: UserAlias) {
         requests.add(ua)
         val msg = "Minecraft user '${ua.mcUsername}' has requested to become associated with your Discord" +
@@ -149,21 +168,25 @@ class Plugin : JavaPlugin() {
         connection!!.tell(msg, ua.discordId)
     }
 
+    // Return a list of all Discord users in the specified server
     fun getDiscordUsers(): List<Triple<String, String, Boolean>> {
         return connection!!.listUsers()
     }
 
+    // Return a list of all Discord users in the specified server who are visibly available
     fun getDiscordOnline(): List<Triple<String, Boolean, OnlineStatus>> {
         return connection!!.listOnline()
     }
 
+    // TODO: Rename function to something more intuitive
+    // Add an alias to the Users data
     fun updateAlias(ua: UserAlias) {
-        users.config.set("mcaliases.${ua.mcUuid}.mcusername", ua.mcUsername)
-        users.config.set("mcaliases.${ua.mcUuid}.discordusername", ua.discordUsername)
-        users.config.set("mcaliases.${ua.mcUuid}.discordid", ua.discordId)
-        users.config.set("discordaliases.${ua.discordId}.mcuuid", ua.mcUuid)
-        users.config.set("discordaliases.${ua.discordId}.mcusername", ua.mcUsername)
-        users.config.set("discordaliases.${ua.discordId}.discordusername", ua.discordUsername)
+        users.data.set("mcaliases.${ua.mcUuid}.mcusername", ua.mcUsername)
+        users.data.set("mcaliases.${ua.mcUuid}.discordusername", ua.discordUsername)
+        users.data.set("mcaliases.${ua.mcUuid}.discordid", ua.discordId)
+        users.data.set("discordaliases.${ua.discordId}.mcuuid", ua.mcUuid)
+        users.data.set("discordaliases.${ua.discordId}.mcusername", ua.mcUsername)
+        users.data.set("discordaliases.${ua.discordId}.discordusername", ua.discordUsername)
         users.saveConfig()
     }
 }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Utils/Utils.kt b/src/main/kotlin/gg/obsidian/discordbridge/Utils/Utils.kt
new file mode 100644
index 0000000..070b915
--- /dev/null
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Utils/Utils.kt
@@ -0,0 +1,22 @@
+package gg.obsidian.discordbridge.Utils
+
+import org.bukkit.ChatColor
+
+fun String.noSpace() = this.replace(Regex("""\s+"""), "")
+fun String.stripColor() = ChatColor.stripColor(this)
+
+object Utils {
+
+    fun formatMessage(message: String, replacements: Map<String, String>, colors: Boolean = false): String {
+        var formattedString = message
+
+        for ((token, replacement) in replacements) {
+            formattedString = formattedString.replace(token, replacement)
+        }
+
+        if (colors) formattedString = ChatColor.translateAlternateColorCodes('&', formattedString)
+
+        return formattedString
+    }
+
+}
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt b/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
similarity index 85%
rename from src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
index 6f53cbf..de99154 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/DiscordConnection.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
@@ -1,5 +1,6 @@
-package gg.obsidian.discordbridge
+package gg.obsidian.discordbridge.discord
 
+import gg.obsidian.discordbridge.Plugin
 import net.dv8tion.jda.core.AccountType
 import net.dv8tion.jda.core.JDA
 import net.dv8tion.jda.core.JDABuilder
@@ -9,9 +10,9 @@ import net.dv8tion.jda.core.entities.Guild
 import net.dv8tion.jda.core.entities.TextChannel
 import net.dv8tion.jda.core.events.message.MessageReceivedEvent
 
-class DiscordConnection(val plugin: Plugin) : Runnable {
+class Connection(val plugin: Plugin) : Runnable {
     var api: JDA? = null
-    var listener: DiscordListener? = null
+    var listener: Listener? = null
     var server: Guild? = null
     var channel: TextChannel? = null
 
@@ -25,10 +26,10 @@ class DiscordConnection(val plugin: Plugin) : Runnable {
     }
 
     fun relay(message: String) {
-        server = if (server == null) getServerById(plugin.configuration.SERVER_ID) else server
+        server = if (server == null) getServerById(plugin.cfg.SERVER_ID) else server
         if (server == null) return
 
-        channel = if (channel == null) getGroupByName(server!!, plugin.configuration.CHANNEL) else channel
+        channel = if (channel == null) getGroupByName(server!!, plugin.cfg.CHANNEL) else channel
         if (channel == null) return
 
         channel!!.sendMessage(message).queue()
@@ -50,7 +51,7 @@ class DiscordConnection(val plugin: Plugin) : Runnable {
     }
 
     fun listUsers(): List<Triple<String, String, Boolean>> {
-        channel = if (channel == null) getGroupByName(server!!, plugin.configuration.CHANNEL) else channel
+        channel = if (channel == null) getGroupByName(server!!, plugin.cfg.CHANNEL) else channel
         if (channel == null) return mutableListOf()
 
         val listOfUsers: MutableList<Triple<String, String, Boolean>> = mutableListOf()
@@ -61,7 +62,7 @@ class DiscordConnection(val plugin: Plugin) : Runnable {
     }
 
     fun listOnline(): List<Triple<String, Boolean, OnlineStatus>> {
-        channel = if (channel == null) getGroupByName(server!!, plugin.configuration.CHANNEL) else channel
+        channel = if (channel == null) getGroupByName(server!!, plugin.cfg.CHANNEL) else channel
         if (channel == null) return mutableListOf()
 
         val listOfUsers: MutableList<Triple<String, Boolean, OnlineStatus>> = mutableListOf()
@@ -78,9 +79,9 @@ class DiscordConnection(val plugin: Plugin) : Runnable {
 
     private fun connect() {
         var builder = JDABuilder(AccountType.BOT).setAudioEnabled(false)
-        builder = builder.setToken(plugin.configuration.TOKEN)
+        builder = builder.setToken(plugin.cfg.TOKEN)
         api = builder.buildBlocking()
-        listener = DiscordListener(plugin, api as JDA, this)
+        listener = Listener(plugin, api as JDA, this)
         api!!.addEventListener(listener)
         relay("Oikos!")
     }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt b/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
similarity index 72%
rename from src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
index 31e4634..d5ef172 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/DiscordListener.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
@@ -1,14 +1,16 @@
-package gg.obsidian.discordbridge
+package gg.obsidian.discordbridge.discord
 
 import com.neovisionaries.ws.client.WebSocket
 import com.neovisionaries.ws.client.WebSocketException
 import com.neovisionaries.ws.client.WebSocketFrame
+import gg.obsidian.discordbridge.CommandLogic
+import gg.obsidian.discordbridge.Plugin
 import net.dv8tion.jda.core.JDA
 import net.dv8tion.jda.core.entities.ChannelType
 import net.dv8tion.jda.core.events.message.MessageReceivedEvent
 import net.dv8tion.jda.core.hooks.ListenerAdapter
 
-class DiscordListener(val plugin: Plugin, val api: JDA, val connection: DiscordConnection) : ListenerAdapter() {
+class Listener(val plugin: Plugin, val api: JDA, val connection: Connection) : ListenerAdapter() {
 
     override fun onMessageReceived(event: MessageReceivedEvent) {
         plugin.logDebug("Received message ${event.message.id} from Discord - ${event.message.rawContent}")
@@ -17,17 +19,17 @@ class DiscordListener(val plugin: Plugin, val api: JDA, val connection: DiscordC
         val username: String = event.author.name
 
         // Immediately throw out messages sent from itself or from non-matching servers
-        if (username.equals(plugin.configuration.USERNAME, true)) {
+        if (username.equals(plugin.cfg.USERNAME, true)) {
             plugin.logDebug("Ignoring message ${event.message.id} from Discord: it matches this bot's username")
             return
         }
-        if (event.guild.id != plugin.configuration.SERVER_ID) {
+        if (event.guild.id != plugin.cfg.SERVER_ID) {
             plugin.logDebug("Not relaying message ${event.message.id} from Discord: server does not match")
             return
         }
 
         // NON-RELAY COMMANDS - the following commands and their responses are not sent to Minecraft
-        if(rawmsg.startsWith(api.selfUser.asMention, true)) {
+        if (rawmsg.startsWith(api.selfUser.asMention, true)) {
             val arg = rawmsg.replaceFirst(api.selfUser.asMention, "").replaceFirst("\\s+", "")
 
             // CONFIRM - Confirm an alias
@@ -35,12 +37,12 @@ class DiscordListener(val plugin: Plugin, val api: JDA, val connection: DiscordC
                 plugin.logDebug("user $username wants to confirm an alias")
                 val ua = plugin.requests.find { it.discordId == event.author.id }
                 if (ua == null) {
-                    plugin.sendToDiscordRespond("You have not requested an alias, or your request has expired!", event)
+                    plugin.sendToDiscord("You have not requested an alias, or your request has expired!", event)
                     return
                 }
                 plugin.updateAlias(ua)
                 plugin.requests.remove(ua)
-                plugin.sendToDiscordRespond("Successfully linked aliases!", event)
+                plugin.sendToDiscord("Successfully linked aliases!", event)
                 return
             }
 
@@ -49,11 +51,11 @@ class DiscordListener(val plugin: Plugin, val api: JDA, val connection: DiscordC
                 plugin.logDebug("user $username has requested a listing of online players")
                 val players = plugin.getOnlinePlayers()
                 if (players.isEmpty()) {
-                    plugin.sendToDiscordRespond("Nobody is currently online.", event)
+                    plugin.sendToDiscord("Nobody is currently online.", event)
                     return
                 }
                 val response = players.joinToString("\n", "The following players are currently online:\n```\n", "\n```")
-                plugin.sendToDiscordRespond(response, event)
+                plugin.sendToDiscord(response, event)
                 return
             }
         }
@@ -61,16 +63,16 @@ class DiscordListener(val plugin: Plugin, val api: JDA, val connection: DiscordC
         // If it is from the relay channel, relay it immediately
         if (event.isFromType(ChannelType.TEXT)) {
 
-            if (!event.textChannel.name.equals(plugin.configuration.CHANNEL, true))
+            if (!event.textChannel.name.equals(plugin.cfg.CHANNEL, true))
                 plugin.logDebug("Not relaying message ${event.message.id} from Discord: channel does not match")
             else {
                 plugin.logDebug("Broadcasting message ${event.message.id} from Discord to Minecraft as user $username")
-                plugin.sendToMinecraft(username, event.author.id, event.message.content)
+                plugin.sendToMinecraft(event.message.content, username, event.author.id)
             }
         }
 
         // RELAY COMMANDS - These commands and their outputs DO get relayed to Minecraft
-        if(rawmsg.startsWith(api.selfUser.asMention, true)) {
+        if (rawmsg.startsWith(api.selfUser.asMention, true)) {
             val arg = rawmsg.replaceFirst(api.selfUser.asMention, "").removePrefix(" ")
             if (arg.isEmpty()) return
             plugin.logDebug("Relay command received.  Arg: $arg")
@@ -78,30 +80,30 @@ class DiscordListener(val plugin: Plugin, val api: JDA, val connection: DiscordC
             // OIKOS - Delicious Greek yogurt from Danone!
             if (arg.startsWith("oikos", true)) {
                 plugin.logDebug("user $username has initiated oikos!")
-                plugin.sendToDiscordRespond("Delicious Greek yogurt from Danone!", event)
-                plugin.sendToMinecraftBroadcast("Delicious Greek yogurt from Danone!")
+                plugin.sendToDiscord("Delicious Greek yogurt from Danone!", event)
+                plugin.sendToMinecraft("Delicious Greek yogurt from Danone!")
                 return
             }
             if (arg.startsWith("delicious greek yogurt from danone", true)) {
                 plugin.logDebug("user $username has initiated oikos 2!")
-                plugin.sendToDiscordRespond("\uD83D\uDE04", event)
-                plugin.sendToMinecraftBroadcast(":D")
+                plugin.sendToDiscord("\uD83D\uDE04", event)
+                plugin.sendToMinecraft(":D")
                 return
             }
             if (arg == "\uD83D\uDE04") {
                 plugin.logDebug("user $username has initiated oikos 3!")
-                plugin.sendToDiscordRespond("\uD83D\uDE04", event)
-                plugin.sendToMinecraftBroadcast(":D")
+                plugin.sendToDiscord("\uD83D\uDE04", event)
+                plugin.sendToMinecraft(":D")
                 return
             }
 
             // CLEVERBOT - Assume anything else invokes Cleverbot
             plugin.logDebug("user $username asks CleverBot something")
-            val response = Util.askCleverbot(plugin.configuration.CLEVERBOT_KEY, arg)
-            plugin.sendToDiscordRespond(response, event)
+            val response = CommandLogic.askCleverbot(plugin.cfg.CLEVERBOT_KEY, arg)
+            plugin.sendToDiscord(response, event)
             // if this occurs in the relay channel, relay the response
-            if (event.isFromType(ChannelType.TEXT) && event.textChannel.name.equals(plugin.configuration.CHANNEL, true))
-                plugin.sendToMinecraftBroadcast(response)
+            if (event.isFromType(ChannelType.TEXT) && event.textChannel.name.equals(plugin.cfg.CHANNEL, true))
+                plugin.sendToMinecraft(response)
             return
         }
     }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/CommandHandler.kt b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Discord.kt
similarity index 88%
rename from src/main/kotlin/gg/obsidian/discordbridge/CommandHandler.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Discord.kt
index 5983902..836e5ac 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/CommandHandler.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Discord.kt
@@ -1,5 +1,8 @@
-package gg.obsidian.discordbridge
+package gg.obsidian.discordbridge.minecraft.commands
 
+import gg.obsidian.discordbridge.Permissions
+import gg.obsidian.discordbridge.Plugin
+import gg.obsidian.discordbridge.UserAlias
 import net.dv8tion.jda.core.OnlineStatus
 import org.bukkit.ChatColor
 import org.bukkit.command.Command
@@ -7,14 +10,9 @@ import org.bukkit.command.CommandExecutor
 import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player
 
-class CommandHandler(val plugin: Plugin): CommandExecutor {
+class Discord(val plugin: Plugin) : CommandExecutor {
 
     override fun onCommand(player: CommandSender, cmd: Command, alias: String?, args: Array<out String>?): Boolean {
-        if (cmd.name == "discord") return handleDiscord(player, args)
-        return false
-    }
-
-    private fun handleDiscord(player: CommandSender, args: Array<out String>?): Boolean {
         if (args == null || args.isEmpty()) {
             sendMessage("&eUsage: /discord <reload/alias/get>", player)
             return true
@@ -121,21 +119,21 @@ class CommandHandler(val plugin: Plugin): CommandExecutor {
         }
 
         var response = ""
-        if (users.filter{it.third == OnlineStatus.ONLINE}.isNotEmpty()) {
+        if (users.filter { it.third == OnlineStatus.ONLINE }.isNotEmpty()) {
             response += "\n&2Online:&r"
-            for (user in users.filter{it.third == OnlineStatus.ONLINE}) {
+            for (user in users.filter { it.third == OnlineStatus.ONLINE }) {
                 if (user.second) response += "\n&2- ${user.first} (Bot)&r"
                 else response += "\n&2- ${user.first}&r"
             }
         }
-        if (users.filter{it.third == OnlineStatus.IDLE}.isNotEmpty()) {
+        if (users.filter { it.third == OnlineStatus.IDLE }.isNotEmpty()) {
             response += "\n&eIdle:&r"
-            for (user in users.filter{it.third == OnlineStatus.IDLE}) {
+            for (user in users.filter { it.third == OnlineStatus.IDLE }) {
                 if (user.second) response += "\n&e- ${user.first} (Bot)&r"
                 else response += "\n&e- ${user.first}&r"
             }
         }
-        if (users.filter{it.third == OnlineStatus.DO_NOT_DISTURB}.isNotEmpty()) {
+        if (users.filter { it.third == OnlineStatus.DO_NOT_DISTURB }.isNotEmpty()) {
             response += "\n&cDo Not Disturb:&r"
             for (user in users.filter { it.third == OnlineStatus.DO_NOT_DISTURB }) {
                 if (user.second) response += "\n&c- ${user.first} (Bot)&r"
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Marina.kt b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Marina.kt
new file mode 100644
index 0000000..2af5039
--- /dev/null
+++ b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Marina.kt
@@ -0,0 +1,35 @@
+package gg.obsidian.discordbridge.minecraft.commands
+
+import gg.obsidian.discordbridge.CommandLogic
+import gg.obsidian.discordbridge.Plugin
+import gg.obsidian.discordbridge.Utils.*
+import org.bukkit.command.Command
+import org.bukkit.command.CommandExecutor
+import org.bukkit.command.CommandSender
+import org.bukkit.entity.Player
+
+class Marina(val plugin: Plugin) : CommandExecutor {
+
+    override fun onCommand(player: CommandSender, cmd: Command, alias: String?, args: Array<out String>?): Boolean {
+        if (args == null || args.isEmpty()) return false
+
+        if (player is Player) {
+            val message: String = args.joinToString(" ")
+            player.chat("@${plugin.cfg.USERNAME.noSpace()} $message")
+            val response: String = CommandLogic.askCleverbot(plugin.cfg.CLEVERBOT_KEY, message)
+            val formattedMessage = Utils.formatMessage(
+                    plugin.cfg.TEMPLATES_MINECRAFT_CHAT_MESSAGE,
+                    mapOf(
+                            "%u" to plugin.cfg.USERNAME_COLOR
+                                    + plugin.cfg.USERNAME.noSpace() + "&r",
+                            "%m" to response
+                    ),
+                    colors = true
+            )
+            plugin.server.broadcastMessage(formattedMessage)
+            plugin.sendToDiscord(response)
+            return true
+        }
+        return true
+    }
+}
\ No newline at end of file

From a096d3d9155f22e5739658c14807237a95fd0bc1 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Sun, 26 Feb 2017 03:22:48 -0600
Subject: [PATCH 14/24] 1.7.5 Added scripted responses Unified the message
 sending methods under Plugin Broke up the formatMessage method into specific
 cases

---
 README.md                                     |  41 +++--
 build.gradle                                  |   2 +-
 .../obsidian/discordbridge/Configuration.kt   |  13 ++
 .../obsidian/discordbridge/EventListener.kt   |  53 ++----
 .../gg/obsidian/discordbridge/Permissions.kt  |   3 +-
 .../gg/obsidian/discordbridge/Plugin.kt       | 169 ++++++++++--------
 .../gg/obsidian/discordbridge/Utils/Utils.kt  |  18 +-
 .../discordbridge/discord/Connection.kt       |  27 +--
 .../discordbridge/discord/Listener.kt         |  60 ++++---
 .../minecraft/commands/Marina.kt              |  20 +--
 src/main/resources/botmemory.yml              |   1 +
 src/main/resources/config.yml                 |   3 +
 src/main/resources/plugin.yml                 |   3 +
 src/main/resources/scriptedresponses.yml      |   5 +
 14 files changed, 217 insertions(+), 201 deletions(-)
 create mode 100644 src/main/resources/botmemory.yml
 create mode 100644 src/main/resources/scriptedresponses.yml

diff --git a/README.md b/README.md
index 61d3982..46e3711 100644
--- a/README.md
+++ b/README.md
@@ -5,18 +5,14 @@ Bridges chat between Discord and Minecraft (Bukkit/Spigot).
 ## Requirements
 
 * Java 8
+* Spigot 1.11.2
 
 ## Installation
 
-1. Download the [latest release](https://github.com/the-obsidian/DiscordBridge/releases) from GitHub
-1. Add it to your `plugins` folder
-1. Either run Bukkit/Spigot once to generate `DiscordBridge/data.yml` or create it using the guide below.
-1. All done!
+<<Coming soon!>>
 
 ## Configuration
 
-**Note:** To use with the official Discord API and a bot user, add a `token: 'your-bot-token-here'` line alongside `email` and `password` (so it will have two spaces of indentation).  If a `token` setting is present, it will ignore `email` and `password`.  A more user-friendly version of this will be released shortly.
-
 DiscordBridge has several options that can be configured in the `data.yml` file:
 
 ```yaml
@@ -24,10 +20,12 @@ settings:
   server-id: '00000000'
   channel: 'test'
   username: 'username'
-  email: 'email@example.com'
-  password: 'password'
+  username-color: ''
+  token: 'token'
+  cleverbot-key: ''
   debug: false
   relay_cancelled_messages: true
+  announce_server_start_stop: true
   messages:
     chat: true
     join: true
@@ -44,6 +42,8 @@ settings:
       player_join: '%u joined the server'
       player_leave: '%u left the server'
       player_death: '%r'
+      server_start: 'Server started!'
+      server_stop: 'Shutting down...'
     minecraft:
       chat_message: '<%u&b(discord)&r> %m'
 ```
@@ -51,8 +51,9 @@ settings:
 * `server-id` is the ID of your Discord server.  This can be found under *Server Settings > Widget > Server ID*
 * `channel` is the Discord channel name you would like to bridge with your Minecraft server
 * `username` is the Discord username of your bot user
-* `email` is the Discord email address of your bot user
-* `password` is the Discord password of your bot user
+* `username_color` is for adding formatting codes to the name of your bot when it speaks in Minecraft's chat (optional)
+* `token` is the access token for the Discord bot
+* `cleverbot-key` is the access key necessary to chat with Cleverbot's API (optional)
 * `debug` enables more verbose logging
 * `relay_cancelled_messages` will relay chat messages even if they are cancelled
 * `messages` enables or disables certain kinds of messages
@@ -62,7 +63,7 @@ settings:
 **Templates**
 
 - `%u` will be replaced with the username 
-- '%d' will be replaced with the user's display name
+- `%d` will be replaced with the user's display name
 - `%m` will be replaced with the message
 - `%w` will be replaced with the world name
 - `%r` will be replaced with the death reason
@@ -72,9 +73,16 @@ settings:
 
 * Anything said in Minecraft chat will be sent to your chosen Discord channel
 * Anything said in your chosen Discord channel will be sent to your Minecraft chat (with a `(discord)` suffix added to usernames)
+* You can link Minecraft accounts to Discord accounts and the bot will translate display names to match where the message appears
 * Join / leave messages are sent to Discord
-* Death messages can optionally be sent to Discord
+* Death messages are sent to Discord
+* Server start and stop messages are sent to Discord
+* All of the above messages can be toggled if you don't want them to appear
 * Message templates are customized
+* Prefixing usernames with `@` in the Minecraft chat will be converted to mentions in the Discord chat if the user exists (you can use their Discord display name with spaces removed, or their Minecraft username if the accounts are linked)
+* Image attachments sent in the Discord channel will relay their URLs to Minecraft
+* Add scripted responses for the bot to say when it detects a trigger phrase
+* Cleverbot integration - chat with the bot on Discord using `@<mention>` or chat with the bot in Minecraft using a slash command
 
 ## Permissions
 
@@ -83,9 +91,12 @@ settings:
 ## Commands
 
 - `/discord reload` - reloads data and reconnects to Discord
+- `/discord get online` - provides a list of all Discord users in the relay channel who are Online, Do Not Disturb, and Idle
+- `/discord get ids` - provides a list of the Discord IDs of all users in the relay channel, which is useful for...
+- `/discord register <discord-id>` - this command will send a DM to the corresponding user asking if that user wishes to link their Discord account with the Minecraft user who issued the command
+- `/marina <message>` - Talk to Cleverbot! Anything you say after this command is relayed to Cleverbot's API, and the bot will speak the response. Only works if you specify a Cleverbot API key in the config.
 
 ## Upcoming Features
 
-* Deeper integration into Minecraft chat (like supporting chat channels inside Minecraft)
-* A "merge accounts" function to allow Minecraft players to associate their Discord accounts with their Minecraft accounts so that usernames are properly translated
-* Ability to post messages to Discord on behalf of Discord users, rather than using a bot user (hopefully after the official API is released)
+* Add support for a URL shortening service so attachment URLs aren't so flipping long
+* Some of the 'fun' commands that literally every Discord bot has (with matching Minecraft commands!)
diff --git a/build.gradle b/build.gradle
index 8ded0d5..34f674f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ plugins {
 apply plugin: 'kotlin'
 
 group = 'gg.obsidian'
-version = '1.7.4'
+version = '1.7.5'
 description = """Bridge chat between Minecraft and Discord"""
 ext.url = 'https://github.com/the-obsidian/DiscordBridge'
 
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Configuration.kt b/src/main/kotlin/gg/obsidian/discordbridge/Configuration.kt
index db50e1f..9c4c212 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Configuration.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Configuration.kt
@@ -1,5 +1,7 @@
 package gg.obsidian.discordbridge
 
+import gg.obsidian.discordbridge.Utils.noSpace
+
 class Configuration(val plugin: Plugin) {
 
     var SERVER_ID: String = ""
@@ -12,6 +14,7 @@ class Configuration(val plugin: Plugin) {
     var CLEVERBOT_KEY: String = ""
     var DEBUG: Boolean = false
     var RELAY_CANCELLED_MESSAGES = true
+    var ANNOUNCE_SERVER_START_STOP = true
 
     // Toggle message types
     var MESSAGES_CHAT = true
@@ -30,10 +33,15 @@ class Configuration(val plugin: Plugin) {
     var TEMPLATES_DISCORD_PLAYER_JOIN = ""
     var TEMPLATES_DISCORD_PLAYER_LEAVE = ""
     var TEMPLATES_DISCORD_PLAYER_DEATH = ""
+    var TEMPLATES_DISCORD_SERVER_START = ""
+    var TEMPLATES_DISCORD_SERVER_STOP = ""
 
     // Minecraft message templates
     var TEMPLATES_MINECRAFT_CHAT_MESSAGE = ""
 
+    // misc
+    var BOT_MC_USERNAME = ""
+
     fun load() {
         plugin.reloadConfig()
 
@@ -47,6 +55,7 @@ class Configuration(val plugin: Plugin) {
         CLEVERBOT_KEY = plugin.config.getString("settings.cleverbot-key", "")
         DEBUG = plugin.config.getBoolean("settings.debug", false)
         RELAY_CANCELLED_MESSAGES = plugin.config.getBoolean("settings.relay_cancelled_messages", true)
+        ANNOUNCE_SERVER_START_STOP = plugin.config.getBoolean("settings.announce_server_start_stop", true)
 
         MESSAGES_CHAT = plugin.config.getBoolean("settings.messages.chat", true)
         MESSAGES_JOIN = plugin.config.getBoolean("settings.messages.join", true)
@@ -62,7 +71,11 @@ class Configuration(val plugin: Plugin) {
         TEMPLATES_DISCORD_PLAYER_JOIN = plugin.config.getString("settings.templates.discord.player_join", "%u joined the server")
         TEMPLATES_DISCORD_PLAYER_LEAVE = plugin.config.getString("settings.templates.discord.player_leave", "%u left the server")
         TEMPLATES_DISCORD_PLAYER_DEATH = plugin.config.getString("settings.templates.discord.player_death", "%r")
+        TEMPLATES_DISCORD_SERVER_START = plugin.config.getString("settings.templates.discord.server_start", "Server started!")
+        TEMPLATES_DISCORD_SERVER_STOP = plugin.config.getString("settings.templates.discord.server_stop", "Shutting down...")
 
         TEMPLATES_MINECRAFT_CHAT_MESSAGE = plugin.config.getString("settings.templates.minecraft.chat_message", "<%u&b(discord)&r> %m")
+
+        BOT_MC_USERNAME = USERNAME_COLOR + USERNAME.noSpace() + "&r"
     }
 }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt b/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
index fc3ba43..2ea613c 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
@@ -36,17 +36,11 @@ class EventListener(val plugin: Plugin) : Listener {
             if (alias is String) worldname = alias
         }
 
-        val formattedMessage = Utils.formatMessage(
-                plugin.cfg.TEMPLATES_DISCORD_CHAT_MESSAGE,
-                mapOf(
-                        "%u" to username,
-                        "%m" to event.message.stripColor(),
-                        "%d" to player.displayName.stripColor(),
-                        "%w" to worldname
-                )
-        )
-
-        plugin.sendToDiscord(formattedMessage, event.player.uniqueId.toString())
+        var formattedMessage = plugin.toDiscordChatMessage(event.message.stripColor(), username, player.displayName.stripColor(), worldname)
+        formattedMessage = plugin.convertAtMentions(formattedMessage)
+        formattedMessage = plugin.translateAliasToDiscord(formattedMessage, event.player.uniqueId.toString())
+
+        plugin.sendToDiscord(formattedMessage, plugin.connection.getRelayChannel())
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
@@ -62,15 +56,10 @@ class EventListener(val plugin: Plugin) : Listener {
         val username = player.name.stripColor()
         plugin.logDebug("Received a join event for $username")
 
-        val formattedMessage = Utils.formatMessage(
-                plugin.cfg.TEMPLATES_DISCORD_PLAYER_JOIN,
-                mapOf(
-                        "%u" to username,
-                        "%d" to player.displayName.stripColor()
-                )
-        )
+        var formattedMessage = plugin.toDiscordPlayerJoin(username, player.displayName.stripColor())
+        formattedMessage = plugin.translateAliasToDiscord(formattedMessage, event.player.uniqueId.toString())
 
-        plugin.sendToDiscord(formattedMessage, player.uniqueId.toString())
+        plugin.sendToDiscord(formattedMessage, plugin.connection.getRelayChannel())
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
@@ -86,15 +75,10 @@ class EventListener(val plugin: Plugin) : Listener {
         val username = event.player.name.stripColor()
         plugin.logDebug("Received a leave event for $username")
 
-        val formattedMessage = Utils.formatMessage(
-                plugin.cfg.TEMPLATES_DISCORD_PLAYER_LEAVE,
-                mapOf(
-                        "%u" to username,
-                        "%d" to event.player.displayName.stripColor()
-                )
-        )
+        var formattedMessage = plugin.toDiscordPlayerLeave(username, event.player.displayName.stripColor())
+        formattedMessage = plugin.translateAliasToDiscord(formattedMessage, event.player.uniqueId.toString())
 
-        plugin.sendToDiscord(formattedMessage, player.uniqueId.toString())
+        plugin.sendToDiscord(formattedMessage, plugin.connection.getRelayChannel())
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
@@ -110,16 +94,9 @@ class EventListener(val plugin: Plugin) : Listener {
         val username = event.entity.name.stripColor()
         plugin.logDebug("Received a death event for $username")
 
-        val formattedMessage = Utils.formatMessage(
-                plugin.cfg.TEMPLATES_DISCORD_PLAYER_DEATH,
-                mapOf(
-                        "%u" to username,
-                        "%d" to event.entity.displayName.stripColor(),
-                        "%r" to event.deathMessage,
-                        "%w" to event.entity.world.name
-                )
-        )
-
-        plugin.sendToDiscord(formattedMessage, player.uniqueId.toString())
+        var formattedMessage = plugin.toDiscordPlayerDeath(event.deathMessage, username, event.entity.displayName.stripColor(), event.entity.world.name)
+        formattedMessage = plugin.translateAliasToDiscord(formattedMessage, player.uniqueId.toString())
+
+        plugin.sendToDiscord(formattedMessage, plugin.connection.getRelayChannel())
     }
 }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Permissions.kt b/src/main/kotlin/gg/obsidian/discordbridge/Permissions.kt
index 4fa57d1..e0fee5c 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Permissions.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Permissions.kt
@@ -3,7 +3,8 @@ package gg.obsidian.discordbridge
 import org.bukkit.entity.Player
 
 enum class Permissions(val node: String) {
-    reload("discordbridge.reload");
+    reload("discordbridge.reload"),
+    cleverbot("discordbridge.cleverbot");
 
     fun has(player: Player): Boolean {
         return player.hasPermission(node)
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
index e2ee6f6..e5d77d6 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
@@ -1,12 +1,11 @@
 package gg.obsidian.discordbridge
 
-import gg.obsidian.discordbridge.Utils.Utils
 import gg.obsidian.discordbridge.discord.Connection
 import gg.obsidian.discordbridge.minecraft.commands.Discord
 import gg.obsidian.discordbridge.minecraft.commands.Marina
 import net.dv8tion.jda.core.OnlineStatus
-import net.dv8tion.jda.core.entities.ChannelType
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent
+import net.dv8tion.jda.core.entities.MessageChannel
+import org.bukkit.ChatColor
 import org.bukkit.plugin.java.JavaPlugin
 import java.util.logging.Level
 import java.io.File
@@ -14,8 +13,10 @@ import java.io.File
 class Plugin : JavaPlugin() {
 
     val cfg = Configuration(this)
-    var connection: Connection? = null
+    lateinit var connection: Connection
     var users: DataConfigAccessor = DataConfigAccessor(this, dataFolder, "usernames.yml")
+    var memory: DataConfigAccessor = DataConfigAccessor(this, dataFolder, "botmemory.yml")
+    var scripted_responses: DataConfigAccessor = DataConfigAccessor(this, dataFolder, "scriptedresponses.yml")
     var worlds: DataConfigAccessor? = null
     var requests: MutableList<UserAlias> = mutableListOf()
 
@@ -23,6 +24,8 @@ class Plugin : JavaPlugin() {
         // Load configs
         updateConfig(description.version)
         users.saveDefaultConfig()
+        memory.saveDefaultConfig()
+        scripted_responses.saveDefaultConfig()
         if (isMultiverse()) worlds = DataConfigAccessor(this, File("plugins/Multiverse-Core"), "worlds.yml")
 
         // Connect to Discord
@@ -36,7 +39,8 @@ class Plugin : JavaPlugin() {
     }
 
     override fun onDisable() {
-        connection!!.relay("Shutting down...")
+        if (cfg.ANNOUNCE_SERVER_START_STOP)
+            connection.send(cfg.TEMPLATES_DISCORD_SERVER_STOP, connection.getRelayChannel())
 
         // Pretend like this does anything
         logger.log(Level.INFO, "Attempting to cancel tasks")
@@ -47,75 +51,15 @@ class Plugin : JavaPlugin() {
       Messaging Functions
     ===================================== */
 
-    // Send a message to Discord as the bot itself
-    fun sendToDiscord(message: String) {
+    // Send a message to Discord
+    fun sendToDiscord(message: String, channel: MessageChannel?) {
         logDebug("Sending message to Discord - $message")
-        connection!!.relay(message)
+        connection.send(message, channel)
     }
 
-    // Send a message from a Minecraft player to Discord
-    fun sendToDiscord(message: String, uuid: String) {
-        val alias = users.data.getString("mcaliases.$uuid.discordusername")
-        var newMessage = message
-
-        // This gross section converts attempted @mentions to real ones wherever possible
-        // Mentionable names MUST not contain spaces!
-        val discordusers = getDiscordUsers()
-        val discordaliases: MutableList<Pair<String, String>> = mutableListOf()
-        discordusers
-                .filter { users.data.isSet("discordaliases.${it.second}") }
-                .mapTo(discordaliases) {
-                    Pair(users.data.getString("discordaliases.${it.second}.mcusername"),
-                            it.second)
-                }
-        for (match in Regex("""(?:^| )@(w+)""").findAll(message)) {
-            val found: Triple<String, String, Boolean>? = discordusers.firstOrNull {
-                it.first.replace("\\s+", "").toLowerCase() == match.value.toLowerCase()
-            }
-            if (found != null) newMessage = newMessage.replaceFirst("@${match.value}", "<@${found.second}>")
-
-            val found2: Pair<String, String>? = discordaliases.firstOrNull {
-                it.second.toLowerCase() == match.value.toLowerCase()
-            }
-            if (found2 != null) newMessage = newMessage.replaceFirst("@${match.value}", "<@${found2.first}>")
-        }
-
-        if (alias != null) newMessage = message.replaceFirst(users.data.getString("mcaliases.$uuid.mcusername"), alias)
-        logDebug("Sending message to Discord - $newMessage")
-        connection!!.relay(newMessage)
-    }
-
-    // TODO: this function is  little different because it isn't a simple relay. Consider refactoring.
-    // Send a direct message to a Discord user as the bot itself
-    fun sendToDiscord(message: String, event: MessageReceivedEvent) {
-        if (event.isFromType(ChannelType.PRIVATE)) logDebug("Sending message to ${event.author.name} - $message")
-        else logDebug("Sending message to Discord - $message")
-        connection!!.respond(message, event)
-    }
-
-    // Send a message to Minecraft as the bot iself
+    // Send a message to Minecraft
     fun sendToMinecraft(message: String) {
-        val formattedMessage = Utils.formatMessage(
-                cfg.TEMPLATES_MINECRAFT_CHAT_MESSAGE,
-                mapOf(
-                        "%u" to cfg.USERNAME_COLOR + cfg.USERNAME.replace("\\s+", "") + "&r",
-                        "%m" to message
-                ),
-                colors = true
-        )
-        server.broadcastMessage(formattedMessage)
-    }
-
-    // Send a message to Minecraft from a Discord user
-    fun sendToMinecraft(message: String, username: String, id: String) {
-        var alias = users.data.getString("discordaliases.$id.mcusername")
-        if (alias == null) alias = username.replace("\\s+", "")
-        val formattedMessage = Utils.formatMessage(
-                cfg.TEMPLATES_MINECRAFT_CHAT_MESSAGE,
-                mapOf("%u" to alias, "%m" to message),
-                colors = true
-        )
-        server.broadcastMessage(formattedMessage)
+        server.broadcastMessage(message)
     }
 
     /*===========================================
@@ -126,6 +70,8 @@ class Plugin : JavaPlugin() {
     fun reload() {
         reloadConfig()
         users.reloadConfig()
+        memory.reloadConfig()
+        scripted_responses.reloadConfig()
         if (isMultiverse()) worlds!!.reloadConfig()
         cfg.load()
         //connection?.reconnect()
@@ -165,17 +111,17 @@ class Plugin : JavaPlugin() {
         val msg = "Minecraft user '${ua.mcUsername}' has requested to become associated with your Discord" +
                 " account. If this is you, respond '<@me> confirm'. If this is not" +
                 " you, respond '<@me> deny'."
-        connection!!.tell(msg, ua.discordId)
+        connection.tell(msg, ua.discordId)
     }
 
     // Return a list of all Discord users in the specified server
     fun getDiscordUsers(): List<Triple<String, String, Boolean>> {
-        return connection!!.listUsers()
+        return connection.listUsers()
     }
 
     // Return a list of all Discord users in the specified server who are visibly available
     fun getDiscordOnline(): List<Triple<String, Boolean, OnlineStatus>> {
-        return connection!!.listOnline()
+        return connection.listOnline()
     }
 
     // TODO: Rename function to something more intuitive
@@ -189,4 +135,81 @@ class Plugin : JavaPlugin() {
         users.data.set("discordaliases.${ua.discordId}.discordusername", ua.discordUsername)
         users.saveConfig()
     }
+
+    /*======================================
+      Message Formatting Functions
+    ===================================== */
+
+    // Converts attempted @mentions to real ones wherever possible
+    // Replaces the sender's name with their registered alias if it exists
+    // Mentionable names MUST NOT contain spaces!
+    fun convertAtMentions(message: String): String {
+        var newMessage = message
+
+        val discordusers = getDiscordUsers()
+        val discordaliases: MutableList<Pair<String, String>> = mutableListOf()
+        discordusers
+                .filter { users.data.isSet("discordaliases.${it.second}") }
+                .mapTo(discordaliases) { Pair(users.data.getString("discordaliases.${it.second}.mcusername"), it.second) }
+        for (match in Regex("""(?:^| )@(w+)""").findAll(message)) {
+            val found: Triple<String, String, Boolean>? = discordusers.firstOrNull {
+                it.first.replace("\\s+", "").toLowerCase() == match.value.toLowerCase()
+            }
+            if (found != null) newMessage = newMessage.replaceFirst("@${match.value}", "<@${found.second}>")
+
+            val found2: Pair<String, String>? = discordaliases.firstOrNull {
+                it.second.toLowerCase() == match.value.toLowerCase()
+            }
+            if (found2 != null) newMessage = newMessage.replaceFirst("@${match.value}", "<@${found2.first}>")
+        }
+
+        return newMessage
+    }
+
+    // Scans the string for occurrences of the Minecraft name matching the given UUID and attempts to translate it
+    // to a registered Discord name, if it exists
+    fun translateAliasToDiscord(message: String, uuid: String?): String {
+        var newMessage = message
+        val alias = users.data.getString("mcaliases.$uuid.discordusername")
+        if (alias != null)
+            newMessage = newMessage.replaceFirst(users.data.getString("mcaliases.$uuid.mcusername"), alias)
+        return newMessage
+    }
+
+    fun toMinecraftChatMessage(message: String, alias: String): String {
+        var formattedString = cfg.TEMPLATES_MINECRAFT_CHAT_MESSAGE
+        formattedString = formattedString.replace("%u", alias).replace("%m", message)
+        formattedString = ChatColor.translateAlternateColorCodes('&', formattedString)
+        return formattedString
+    }
+
+    fun toDiscordChatMessage(message: String, username: String, displayName: String, worldName: String): String {
+        var formattedString = cfg.TEMPLATES_DISCORD_CHAT_MESSAGE
+        formattedString = formattedString.replace("%u", username).replace("%m", message)
+                .replace("%d", displayName).replace("%w", worldName)
+        formattedString = ChatColor.translateAlternateColorCodes('&', formattedString)
+        return formattedString
+    }
+
+    fun toDiscordPlayerJoin(username: String, displayName: String): String {
+        var formattedString = cfg.TEMPLATES_DISCORD_PLAYER_JOIN
+        formattedString = formattedString.replace("%u", username).replace("%d", displayName)
+        formattedString = ChatColor.translateAlternateColorCodes('&', formattedString)
+        return formattedString
+    }
+
+    fun toDiscordPlayerLeave(username: String, displayName: String): String {
+        var formattedString = cfg.TEMPLATES_DISCORD_PLAYER_LEAVE
+        formattedString = formattedString.replace("%u", username).replace("%d", displayName)
+        formattedString = ChatColor.translateAlternateColorCodes('&', formattedString)
+        return formattedString
+    }
+
+    fun toDiscordPlayerDeath(deathMessage: String, username: String, displayName: String, worldName: String): String {
+        var formattedString = cfg.TEMPLATES_DISCORD_PLAYER_DEATH
+        formattedString = formattedString.replace("%u", username).replace("%r", deathMessage)
+                .replace("%d", displayName).replace("%w", worldName)
+        formattedString = ChatColor.translateAlternateColorCodes('&', formattedString)
+        return formattedString
+    }
 }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Utils/Utils.kt b/src/main/kotlin/gg/obsidian/discordbridge/Utils/Utils.kt
index 070b915..073e682 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Utils/Utils.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Utils/Utils.kt
@@ -3,20 +3,4 @@ package gg.obsidian.discordbridge.Utils
 import org.bukkit.ChatColor
 
 fun String.noSpace() = this.replace(Regex("""\s+"""), "")
-fun String.stripColor() = ChatColor.stripColor(this)
-
-object Utils {
-
-    fun formatMessage(message: String, replacements: Map<String, String>, colors: Boolean = false): String {
-        var formattedString = message
-
-        for ((token, replacement) in replacements) {
-            formattedString = formattedString.replace(token, replacement)
-        }
-
-        if (colors) formattedString = ChatColor.translateAlternateColorCodes('&', formattedString)
-
-        return formattedString
-    }
-
-}
+fun String.stripColor(): String = ChatColor.stripColor(this)
\ No newline at end of file
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt b/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
index de99154..2f1c643 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
@@ -5,10 +5,9 @@ import net.dv8tion.jda.core.AccountType
 import net.dv8tion.jda.core.JDA
 import net.dv8tion.jda.core.JDABuilder
 import net.dv8tion.jda.core.OnlineStatus
-import net.dv8tion.jda.core.entities.ChannelType
 import net.dv8tion.jda.core.entities.Guild
+import net.dv8tion.jda.core.entities.MessageChannel
 import net.dv8tion.jda.core.entities.TextChannel
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent
 
 class Connection(val plugin: Plugin) : Runnable {
     var api: JDA? = null
@@ -22,24 +21,23 @@ class Connection(val plugin: Plugin) : Runnable {
         } catch (e: Exception) {
             plugin.logger.severe("Error connecting to Discord: " + e)
         }
-
     }
 
-    fun relay(message: String) {
+    fun getRelayChannel(): TextChannel? {
         server = if (server == null) getServerById(plugin.cfg.SERVER_ID) else server
-        if (server == null) return
-
         channel = if (channel == null) getGroupByName(server!!, plugin.cfg.CHANNEL) else channel
-        if (channel == null) return
-
-        channel!!.sendMessage(message).queue()
+        return channel
     }
 
-    fun respond(message: String, event: MessageReceivedEvent) {
-        if (event.isFromType(ChannelType.PRIVATE)) event.privateChannel.sendMessage(message).queue()
-        else event.channel.sendMessage(message).queue()
+    fun send(message: String, toChannel: MessageChannel?) {
+        if (toChannel == null) {
+            plugin.logger.severe("Could not send message to Discord: Channel is not defined")
+            return
+        }
+        toChannel.sendMessage(message).queue()
     }
 
+    // TODO: Try to merge this into "send"
     fun tell(message: String, id: String) {
         val modifiedMsg = message.replace("<@me>", api!!.selfUser.asMention)
         api!!.getUserById(id).privateChannel.sendMessage(modifiedMsg).queue()
@@ -50,6 +48,7 @@ class Connection(val plugin: Plugin) : Runnable {
         connect()
     }
 
+    // TODO: Unfuck this
     fun listUsers(): List<Triple<String, String, Boolean>> {
         channel = if (channel == null) getGroupByName(server!!, plugin.cfg.CHANNEL) else channel
         if (channel == null) return mutableListOf()
@@ -61,6 +60,7 @@ class Connection(val plugin: Plugin) : Runnable {
         return listOfUsers
     }
 
+    // TODO: Unfuck this
     fun listOnline(): List<Triple<String, Boolean, OnlineStatus>> {
         channel = if (channel == null) getGroupByName(server!!, plugin.cfg.CHANNEL) else channel
         if (channel == null) return mutableListOf()
@@ -83,7 +83,8 @@ class Connection(val plugin: Plugin) : Runnable {
         api = builder.buildBlocking()
         listener = Listener(plugin, api as JDA, this)
         api!!.addEventListener(listener)
-        relay("Oikos!")
+        if(plugin.cfg.ANNOUNCE_SERVER_START_STOP)
+            send(plugin.cfg.TEMPLATES_DISCORD_SERVER_START, getRelayChannel())
     }
 
     private fun getServerById(id: String): Guild? {
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt b/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
index d5ef172..93c3cad 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
@@ -5,6 +5,7 @@ import com.neovisionaries.ws.client.WebSocketException
 import com.neovisionaries.ws.client.WebSocketFrame
 import gg.obsidian.discordbridge.CommandLogic
 import gg.obsidian.discordbridge.Plugin
+import gg.obsidian.discordbridge.Utils.noSpace
 import net.dv8tion.jda.core.JDA
 import net.dv8tion.jda.core.entities.ChannelType
 import net.dv8tion.jda.core.events.message.MessageReceivedEvent
@@ -23,12 +24,12 @@ class Listener(val plugin: Plugin, val api: JDA, val connection: Connection) : L
             plugin.logDebug("Ignoring message ${event.message.id} from Discord: it matches this bot's username")
             return
         }
-        if (event.guild.id != plugin.cfg.SERVER_ID) {
-            plugin.logDebug("Not relaying message ${event.message.id} from Discord: server does not match")
-            return
-        }
+//        if (event.guild.id != plugin.cfg.SERVER_ID) {
+//            plugin.logDebug("Not relaying message ${event.message.id} from Discord: server does not match")
+//            return
+//        }
 
-        // NON-RELAY COMMANDS - the following commands and their responses are not sent to Minecraft
+        // NON-RELAY COMMANDS - the following commands and their responses are never sent to Minecraft
         if (rawmsg.startsWith(api.selfUser.asMention, true)) {
             val arg = rawmsg.replaceFirst(api.selfUser.asMention, "").replaceFirst("\\s+", "")
 
@@ -37,25 +38,26 @@ class Listener(val plugin: Plugin, val api: JDA, val connection: Connection) : L
                 plugin.logDebug("user $username wants to confirm an alias")
                 val ua = plugin.requests.find { it.discordId == event.author.id }
                 if (ua == null) {
-                    plugin.sendToDiscord("You have not requested an alias, or your request has expired!", event)
+                    plugin.sendToDiscord("You have not requested an alias, or your request has expired!", event.privateChannel)
                     return
                 }
                 plugin.updateAlias(ua)
                 plugin.requests.remove(ua)
-                plugin.sendToDiscord("Successfully linked aliases!", event)
+                plugin.sendToDiscord("Successfully linked aliases!", event.privateChannel)
                 return
             }
 
             // SERVERLIST - List all players currently online on the server
             if (arg.startsWith("serverlist", true)) {
+                val channel = if (event.isFromType(ChannelType.PRIVATE)) event.privateChannel else event.channel
                 plugin.logDebug("user $username has requested a listing of online players")
                 val players = plugin.getOnlinePlayers()
                 if (players.isEmpty()) {
-                    plugin.sendToDiscord("Nobody is currently online.", event)
+                    plugin.sendToDiscord("Nobody is currently online.", channel)
                     return
                 }
                 val response = players.joinToString("\n", "The following players are currently online:\n```\n", "\n```")
-                plugin.sendToDiscord(response, event)
+                plugin.sendToDiscord(response, channel)
                 return
             }
         }
@@ -67,43 +69,43 @@ class Listener(val plugin: Plugin, val api: JDA, val connection: Connection) : L
                 plugin.logDebug("Not relaying message ${event.message.id} from Discord: channel does not match")
             else {
                 plugin.logDebug("Broadcasting message ${event.message.id} from Discord to Minecraft as user $username")
-                plugin.sendToMinecraft(event.message.content, username, event.author.id)
+                var alias = plugin.users.data.getString("discordaliases.${event.author.id}.mcusername")
+                if (alias == null) alias = username.noSpace()
+                plugin.sendToMinecraft(plugin.toMinecraftChatMessage(event.message.content, alias))
             }
         }
 
-        // RELAY COMMANDS - These commands and their outputs DO get relayed to Minecraft
+        // RELAY COMMANDS - The outputs of these commands WILL be relayed to Minecraft if sent to the relay channel
         if (rawmsg.startsWith(api.selfUser.asMention, true)) {
+            val isPrivate = event.isFromType(ChannelType.PRIVATE)
+            val channel = if (isPrivate) event.privateChannel else event.channel
             val arg = rawmsg.replaceFirst(api.selfUser.asMention, "").removePrefix(" ")
             if (arg.isEmpty()) return
             plugin.logDebug("Relay command received.  Arg: $arg")
 
-            // OIKOS - Delicious Greek yogurt from Danone!
-            if (arg.startsWith("oikos", true)) {
-                plugin.logDebug("user $username has initiated oikos!")
-                plugin.sendToDiscord("Delicious Greek yogurt from Danone!", event)
-                plugin.sendToMinecraft("Delicious Greek yogurt from Danone!")
-                return
-            }
-            if (arg.startsWith("delicious greek yogurt from danone", true)) {
-                plugin.logDebug("user $username has initiated oikos 2!")
-                plugin.sendToDiscord("\uD83D\uDE04", event)
-                plugin.sendToMinecraft(":D")
-                return
+            // SCRIPTED RESPONSE - The bot replies with a preprogrammed response if it detects a corresponding trigger string
+            val responses = plugin.scripted_responses.data.getConfigurationSection("responses").getKeys(false)
+            var scripted_response: String? = null
+            for (r in responses) {
+                val casesensitive = plugin.scripted_responses.data.getBoolean("responses.$r.casesensitive", false)
+                if (arg.startsWith(plugin.scripted_responses.data.getString("responses.$r.trigger").toLowerCase(), !casesensitive))
+                    scripted_response = plugin.scripted_responses.data.getString("responses.$r.response")
             }
-            if (arg == "\uD83D\uDE04") {
-                plugin.logDebug("user $username has initiated oikos 3!")
-                plugin.sendToDiscord("\uD83D\uDE04", event)
-                plugin.sendToMinecraft(":D")
+            if (scripted_response != null) {
+                plugin.logDebug("user $username has triggered the scripted response: $scripted_response")
+                plugin.sendToDiscord(scripted_response, channel)
+                if (event.isFromType(ChannelType.TEXT) && event.textChannel.name.equals(plugin.cfg.CHANNEL, true))
+                    plugin.sendToMinecraft(plugin.toMinecraftChatMessage(scripted_response, plugin.cfg.BOT_MC_USERNAME))
                 return
             }
 
             // CLEVERBOT - Assume anything else invokes Cleverbot
             plugin.logDebug("user $username asks CleverBot something")
             val response = CommandLogic.askCleverbot(plugin.cfg.CLEVERBOT_KEY, arg)
-            plugin.sendToDiscord(response, event)
+            plugin.sendToDiscord(response, channel)
             // if this occurs in the relay channel, relay the response
             if (event.isFromType(ChannelType.TEXT) && event.textChannel.name.equals(plugin.cfg.CHANNEL, true))
-                plugin.sendToMinecraft(response)
+                plugin.sendToMinecraft(plugin.toMinecraftChatMessage(response, plugin.cfg.BOT_MC_USERNAME))
             return
         }
     }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Marina.kt b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Marina.kt
index 2af5039..9dc8f1f 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Marina.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Marina.kt
@@ -1,6 +1,7 @@
 package gg.obsidian.discordbridge.minecraft.commands
 
-import gg.obsidian.discordbridge.CommandLogic
+import gg.obsidian.discordbridge.CommandLogic.askCleverbot
+import gg.obsidian.discordbridge.Permissions
 import gg.obsidian.discordbridge.Plugin
 import gg.obsidian.discordbridge.Utils.*
 import org.bukkit.command.Command
@@ -13,21 +14,12 @@ class Marina(val plugin: Plugin) : CommandExecutor {
     override fun onCommand(player: CommandSender, cmd: Command, alias: String?, args: Array<out String>?): Boolean {
         if (args == null || args.isEmpty()) return false
 
-        if (player is Player) {
+        if (player is Player && Permissions.cleverbot.has(player)) {
             val message: String = args.joinToString(" ")
             player.chat("@${plugin.cfg.USERNAME.noSpace()} $message")
-            val response: String = CommandLogic.askCleverbot(plugin.cfg.CLEVERBOT_KEY, message)
-            val formattedMessage = Utils.formatMessage(
-                    plugin.cfg.TEMPLATES_MINECRAFT_CHAT_MESSAGE,
-                    mapOf(
-                            "%u" to plugin.cfg.USERNAME_COLOR
-                                    + plugin.cfg.USERNAME.noSpace() + "&r",
-                            "%m" to response
-                    ),
-                    colors = true
-            )
-            plugin.server.broadcastMessage(formattedMessage)
-            plugin.sendToDiscord(response)
+            val response = askCleverbot(plugin.cfg.CLEVERBOT_KEY, message)
+            plugin.sendToMinecraft(plugin.toMinecraftChatMessage(response, plugin.cfg.BOT_MC_USERNAME))
+            plugin.sendToDiscord(response, plugin.connection.getRelayChannel())
             return true
         }
         return true
diff --git a/src/main/resources/botmemory.yml b/src/main/resources/botmemory.yml
new file mode 100644
index 0000000..4399866
--- /dev/null
+++ b/src/main/resources/botmemory.yml
@@ -0,0 +1 @@
+respects: 0
\ No newline at end of file
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 5f37b58..89e0b8b 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -7,6 +7,7 @@ settings:
   cleverbot-key: ''
   debug: false
   relay_cancelled_messages: true
+  announce_server_start_stop: true
   messages:
     chat: true
     join: true
@@ -23,5 +24,7 @@ settings:
       player_join: '%u joined the server'
       player_leave: '%u left the server'
       player_death: '%r'
+      server_start: 'Server started!'
+      server_stop: 'Shutting down...'
     minecraft:
       chat_message: '<%u&b(discord)&r> %m'
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 2bef185..a51bcf1 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -14,6 +14,9 @@ permissions:
   discordbridge.reload:
     description: Reload the Discord Bridge
     default: op
+  discordbridge.cleverbot:
+    description: Determines whether this user can talk to Cleverbot
+    default: true
 
 commands:
   discord:
diff --git a/src/main/resources/scriptedresponses.yml b/src/main/resources/scriptedresponses.yml
new file mode 100644
index 0000000..d4a9397
--- /dev/null
+++ b/src/main/resources/scriptedresponses.yml
@@ -0,0 +1,5 @@
+responses:
+  '1':
+    casesensitive: false
+    response: 'Hello World!'
+    trigger: 'hello world!'
\ No newline at end of file

From 85b6e3ea666caf3714ebef044ba01b7103e470fc Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Fri, 3 Mar 2017 01:29:50 -0600
Subject: [PATCH 15/24] 1.7.6 Added F Added 8ball Added Insult Added Rate
 Restructured a lot of the code to embrace more code resuse

---
 README.md                                     | 123 +++--
 build.gradle                                  |   2 +-
 .../gg/obsidian/discordbridge/CommandLogic.kt |  82 ++-
 .../obsidian/discordbridge/Configuration.kt   |  52 +-
 .../discordbridge/DataConfigAccessor.kt       |  20 +-
 .../obsidian/discordbridge/EventListener.kt   | 103 ++--
 .../gg/obsidian/discordbridge/Permissions.kt  |   6 +-
 .../gg/obsidian/discordbridge/Plugin.kt       | 193 ++++---
 .../gg/obsidian/discordbridge/UserAlias.kt    |   4 -
 .../gg/obsidian/discordbridge/Utils/Utils.kt  |   5 +-
 .../discordbridge/discord/Connection.kt       |  54 +-
 .../discordbridge/discord/Listener.kt         | 104 +++-
 .../minecraft/commands/Discord.kt             |  94 +---
 .../minecraft/commands/EightBall.kt           |  24 +
 .../discordbridge/minecraft/commands/F.kt     |  24 +
 .../minecraft/commands/Insult.kt              |  23 +
 .../minecraft/commands/Marina.kt              |  27 -
 .../discordbridge/minecraft/commands/Rate.kt  |  23 +
 src/main/resources/botmemory.yml              |  30 +-
 src/main/resources/config.yml                 |  89 ++--
 src/main/resources/insults.yml                | 504 ++++++++++++++++++
 src/main/resources/plugin.yml                 |  29 +-
 src/main/resources/scriptedresponses.yml      |   5 -
 23 files changed, 1205 insertions(+), 415 deletions(-)
 delete mode 100644 src/main/kotlin/gg/obsidian/discordbridge/UserAlias.kt
 create mode 100644 src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/EightBall.kt
 create mode 100644 src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/F.kt
 create mode 100644 src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Insult.kt
 delete mode 100644 src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Marina.kt
 create mode 100644 src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Rate.kt
 create mode 100644 src/main/resources/insults.yml
 delete mode 100644 src/main/resources/scriptedresponses.yml

diff --git a/README.md b/README.md
index 46e3711..c8e864a 100644
--- a/README.md
+++ b/README.md
@@ -13,48 +13,77 @@ Bridges chat between Discord and Minecraft (Bukkit/Spigot).
 
 ## Configuration
 
-DiscordBridge has several options that can be configured in the `data.yml` file:
+DiscordBridge has several options that can be configured in the `config.yml` file:
 
 ```yaml
-settings:
-  server-id: '00000000'
-  channel: 'test'
-  username: 'username'
-  username-color: ''
-  token: 'token'
-  cleverbot-key: ''
-  debug: false
-  relay_cancelled_messages: true
-  announce_server_start_stop: true
-  messages:
-    chat: true
-    join: true
-    leave: true
-    death: false
-  if_vanished:
-    chat: false
-    join: false
-    leave: false
-    death: false
-  templates:
-    discord:
-      chat_message: '<%u> %m'
-      player_join: '%u joined the server'
-      player_leave: '%u left the server'
-      player_death: '%r'
-      server_start: 'Server started!'
-      server_stop: 'Shutting down...'
-    minecraft:
-      chat_message: '<%u&b(discord)&r> %m'
+# DiscordBridge Config
+
+# The bot's Discord API access token
+token: ''
+
+# These values will control which channel the bot will watch to relay messages to and from the server.
+server-id: '00000000'
+channel: 'channel-name'
+
+# The bot's Discord username
+username: 'DiscordBridge'
+
+# (Optional) Apply formatting codes to the bot's name in Minecraft chat.
+# Use '&' in place of the formatting symbol.
+username-color: ''
+
+# (Optional) Set this value with a valid Cleverbot API key to enable chatting with Cleverbot
+# Look at https://www.cleverbot.com/api/ for more info
+cleverbot-key: ''
+
+# If true, prints verbose log messages to the server console for every action
+debug: false
+
+# If true, Minecraft chat events that are cancelled will still be relayed to Discord.
+relay-cancelled-messages: true
+
+# Controls which events in general are relayed to Discord
+messages:
+  player-chat: true
+  player-join: true
+  player-leave: true
+  player-death: false
+  server-start: true
+  server-stop: true
+
+# Controls which events caused by vanished players are relayed to Discord
+# NOTE: If set to true, it will only have effect if the corresponding message above is also set to true
+if-vanished:
+  player-chat: false
+  player-join: false
+  player-leave: false
+  player-death: false
+
+# Set the templates for relayed messages
+# %u - The sender's username
+# %m - The sender's message
+# %w - The name of the world the sender is in (Multiverse alias compatible)
+# %r - The death message (Death event only)
+# Use '&' in place of the formatting symbol to apply formatting codes.
+templates:
+  discord:
+    chat-message: '<**%u**> %m'
+    player-join: '**%u** joined the server'
+    player-leave: '**%u** left the server'
+    player-death: '%r'
+    server-start: 'Server started!'
+    server-stop: 'Shutting down...'
+  minecraft:
+    chat-message: '[&b&lDiscord&r]<%u> %m'
 ```
 
-* `server-id` is the ID of your Discord server.  This can be found under *Server Settings > Widget > Server ID*
+* `token` is the access token for the Discord bot. Without this, the bot will not function at all.
+* `server-id` is the ID of the Discord server with the channel you want to bridge.  This can be found under *Server Settings > Widget > Server ID*
 * `channel` is the Discord channel name you would like to bridge with your Minecraft server
-* `username` is the Discord username of your bot user
+* `username` is the Discord username of your bot
 * `username_color` is for adding formatting codes to the name of your bot when it speaks in Minecraft's chat (optional)
-* `token` is the access token for the Discord bot
-* `cleverbot-key` is the access key necessary to chat with Cleverbot's API (optional)
-* `debug` enables more verbose logging
+* `cleverbot-key` (optional) an access key necessary to chat with Cleverbot's API
+* `debug` enables verbose logging
 * `relay_cancelled_messages` will relay chat messages even if they are cancelled
 * `messages` enables or disables certain kinds of messages
 * `if_vanished` enables or disables messages if the user is vanished (applies after `messages`)
@@ -66,7 +95,7 @@ settings:
 - `%d` will be replaced with the user's display name
 - `%m` will be replaced with the message
 - `%w` will be replaced with the world name
-- `%r` will be replaced with the death reason
+- `%r` will be replaced with Minecraft's standard death message
 - Color codes, prefixed with `&`, will be translated on the Minecraft end
 
 ## Features
@@ -74,19 +103,26 @@ settings:
 * Anything said in Minecraft chat will be sent to your chosen Discord channel
 * Anything said in your chosen Discord channel will be sent to your Minecraft chat (with a `(discord)` suffix added to usernames)
 * You can link Minecraft accounts to Discord accounts and the bot will translate display names to match where the message appears
-* Join / leave messages are sent to Discord
-* Death messages are sent to Discord
-* Server start and stop messages are sent to Discord
+* Join / leave messages can be sent to Discord
+* Death messages can be sent to Discord
+* Server start and stop messages can be sent to Discord
 * All of the above messages can be toggled if you don't want them to appear
 * Message templates are customized
 * Prefixing usernames with `@` in the Minecraft chat will be converted to mentions in the Discord chat if the user exists (you can use their Discord display name with spaces removed, or their Minecraft username if the accounts are linked)
 * Image attachments sent in the Discord channel will relay their URLs to Minecraft
 * Add scripted responses for the bot to say when it detects a trigger phrase
-* Cleverbot integration - chat with the bot on Discord using `@<mention>` or chat with the bot in Minecraft using a slash command
+* A handful of fun and shitposting commands for the full Discord Bot experience both in and out of game
+* Cleverbot integration - chat with the bot using `@<name>`. Works in Discord AND Minecraft!
+* The bot can use any of its commands in any channel it can read (including DMs!) allowing it to function as a general-purpose Discord bot on the side
 
 ## Permissions
 
+- `discordbridge.cleverbot` - ability to talk to Cleverbot
+- `discordbridge.f` - ability to pay respects with /f
 - `discordbridge.reload` - ability to reload data and reconnect the Discord connection
+- `discordbridge.eightball` - ability to consult the Magic 8-Ball with /8ball
+- `discordbridge.rate` - ability to ask for an out-of-10 rating with /rate
+- `discordbridge.insult` - ability to make the bot insult something with /insult
 
 ## Commands
 
@@ -94,7 +130,10 @@ settings:
 - `/discord get online` - provides a list of all Discord users in the relay channel who are Online, Do Not Disturb, and Idle
 - `/discord get ids` - provides a list of the Discord IDs of all users in the relay channel, which is useful for...
 - `/discord register <discord-id>` - this command will send a DM to the corresponding user asking if that user wishes to link their Discord account with the Minecraft user who issued the command
-- `/marina <message>` - Talk to Cleverbot! Anything you say after this command is relayed to Cleverbot's API, and the bot will speak the response. Only works if you specify a Cleverbot API key in the config.
+- `/f` - press F to pay respects
+- `/8ball <query>` - consults the Magic 8-Ball to answer your yes/no questions (messages configurable in `botmemory.yml`)
+- `/rate <thing to rate>` - asks the bot to rate something on a 0-10 scale
+- `/insult <thing to insult>` - makes the bot insult something (messages configurable in `insults.yml`) (*WARNING: The supplied insults are quite offensive! Remove permissions for this command or replace the insults if you intend to use this bot on cleaner servers!*)
 
 ## Upcoming Features
 
diff --git a/build.gradle b/build.gradle
index 34f674f..f1757af 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ plugins {
 apply plugin: 'kotlin'
 
 group = 'gg.obsidian'
-version = '1.7.5'
+version = '1.7.6'
 description = """Bridge chat between Minecraft and Discord"""
 ext.url = 'https://github.com/the-obsidian/DiscordBridge'
 
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/CommandLogic.kt b/src/main/kotlin/gg/obsidian/discordbridge/CommandLogic.kt
index 1056908..8fe7815 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/CommandLogic.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/CommandLogic.kt
@@ -2,13 +2,13 @@ package gg.obsidian.discordbridge
 
 import com.michaelwflaherty.cleverbotapi.CleverBotQuery
 import java.io.IOException
+import java.util.*
 
 object CommandLogic {
 
-    fun askCleverbot(key: String, message: String): String {
-
-        if (key.isEmpty()) return "You do not have an API key. Go to https://www.cleverbot.com/api/ for more information."
-        val bot: CleverBotQuery = CleverBotQuery(key, message)
+    fun askCleverbot(plugin: Plugin, message: String): String {
+        if (plugin.cfg.CLEVERBOT_KEY.isEmpty()) return "You do not have an API key. Go to https://www.cleverbot.com/api/ for more information."
+        val bot: CleverBotQuery = CleverBotQuery(plugin.cfg.CLEVERBOT_KEY, message)
         var response: String
         try {
             bot.sendRequest()
@@ -20,4 +20,78 @@ object CommandLogic {
         return response
     }
 
+    fun eightBall(plugin: Plugin, name: String): String {
+        val responses = plugin.memory.data.getStringList("8-ball-responses")
+        val rand = Random().nextInt(responses.count())
+        return "$name - ${responses[rand]}"
+    }
+
+    fun f(plugin: Plugin, name: String): String {
+        var respects = plugin.memory.data.getInt("respects", 0)
+        val msg: String
+        val payed = Random().nextInt(100)
+        when {
+            payed == 99 -> {
+                respects += 5
+                msg = "$name breaks down and mournfully cries 5 respects out to the sky! (Total respects paid: $respects)"
+            }
+            payed > 95 -> {
+                respects += 3
+                msg = "$name manages to give 3 respects through their heavy sobbing! (Total respects paid: $respects)"
+            }
+            payed > 65 -> {
+                respects += 2
+                msg = "$name sheds a single tear and pays 2 respects! (Total respects paid: $respects)"
+            }
+            else -> {
+                respects += 1
+                msg = "$name solemnly pays respect! (Total respects paid: $respects)"
+            }
+        }
+        plugin.memory.data.set("respects", respects)
+        plugin.memory.saveConfig()
+
+        return msg
+    }
+
+    fun insult(plugin: Plugin, arg: String): String {
+        val responses = plugin.insults.data.getStringList("insults")
+        val rand = Random().nextInt(500)
+        return "$arg - ${responses[rand]}"
+    }
+
+    fun rate(name: String, arg: String): String {
+        val argArray = arg.split(" ").toMutableList()
+        val iterate = argArray.listIterator()
+        while (iterate.hasNext()) {
+            val oldValue = iterate.next()
+            if (oldValue == "me") iterate.set("you")
+            if (oldValue == "myself") iterate.set("yourself")
+            if (oldValue == "my") iterate.set("your")
+            if (oldValue == "your") iterate.set("my")
+            if (oldValue == "yourself") iterate.set("myself")
+        }
+        val thingToBeRated = argArray.joinToString(" ")
+        val rating = Random().nextInt(101)
+        var response = "I rate $thingToBeRated "
+        when (rating) {
+            42 -> response += "4/20: 'smoke weed erryday'."
+            78 -> response += "7.8/10: 'too much water'."
+            69 -> response += "69/69."
+            100 -> response += "a perfect 10/10, absolutely flawless in every regard."
+            in 90..99 -> response += "a very high ${rating/10f}/10."
+            in 80..89 -> response += "a high ${rating/10f}/10."
+            in 70..79 -> response += "a decently high ${rating/10f}/10."
+            in 60..69 -> response += "a good ${rating/10f}/10."
+            in 50..59 -> response += "a solid ${rating/10f}/10."
+            in 40..49 -> response += "a meh ${rating/10f}/10."
+            in 30..39 -> response += "a paltry ${rating/10f}/10."
+            in 20..29 -> response += "a pretty low ${rating/10f}/10."
+            in 10..19 -> response += "a low ${rating/10f}/10."
+            in 1..9 -> response += "a shitty ${rating/10f}/10."
+            else -> response += "0/0: 'amazing'."
+        }
+        return "$name - $response"
+    }
+
 }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Configuration.kt b/src/main/kotlin/gg/obsidian/discordbridge/Configuration.kt
index 9c4c212..8c100ad 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Configuration.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Configuration.kt
@@ -8,8 +8,6 @@ class Configuration(val plugin: Plugin) {
     var CHANNEL: String = ""
     var USERNAME: String = ""
     var USERNAME_COLOR: String = ""
-    var EMAIL: String = ""
-    var PASSWORD: String = ""
     var TOKEN: String = ""
     var CLEVERBOT_KEY: String = ""
     var DEBUG: Boolean = false
@@ -45,36 +43,34 @@ class Configuration(val plugin: Plugin) {
     fun load() {
         plugin.reloadConfig()
 
-        SERVER_ID = plugin.config.getString("settings.server-id")
-        CHANNEL = plugin.config.getString("settings.channel")
-        USERNAME = plugin.config.getString("settings.username")
-        USERNAME_COLOR = plugin.config.getString("settings.username-color")
-        EMAIL = plugin.config.getString("settings.email", "")
-        PASSWORD = plugin.config.getString("settings.password", "")
-        TOKEN = plugin.config.getString("settings.token", "")
-        CLEVERBOT_KEY = plugin.config.getString("settings.cleverbot-key", "")
-        DEBUG = plugin.config.getBoolean("settings.debug", false)
-        RELAY_CANCELLED_MESSAGES = plugin.config.getBoolean("settings.relay_cancelled_messages", true)
-        ANNOUNCE_SERVER_START_STOP = plugin.config.getBoolean("settings.announce_server_start_stop", true)
+        SERVER_ID = plugin.config.getString("server-id")
+        CHANNEL = plugin.config.getString("channel")
+        USERNAME = plugin.config.getString("username")
+        USERNAME_COLOR = plugin.config.getString("username-color")
+        TOKEN = plugin.config.getString("token", "")
+        CLEVERBOT_KEY = plugin.config.getString("cleverbot-key", "")
+        DEBUG = plugin.config.getBoolean("debug", false)
+        RELAY_CANCELLED_MESSAGES = plugin.config.getBoolean("relay-cancelled-messages", true)
+        ANNOUNCE_SERVER_START_STOP = plugin.config.getBoolean("announce-server-start-stop", true)
 
-        MESSAGES_CHAT = plugin.config.getBoolean("settings.messages.chat", true)
-        MESSAGES_JOIN = plugin.config.getBoolean("settings.messages.join", true)
-        MESSAGES_LEAVE = plugin.config.getBoolean("settings.messages.leave", true)
-        MESSAGES_DEATH = plugin.config.getBoolean("settings.messages.death", false)
+        MESSAGES_CHAT = plugin.config.getBoolean("messages.chat", true)
+        MESSAGES_JOIN = plugin.config.getBoolean("messages.join", true)
+        MESSAGES_LEAVE = plugin.config.getBoolean("messages.leave", true)
+        MESSAGES_DEATH = plugin.config.getBoolean("messages.death", false)
 
-        IF_VANISHED_CHAT = plugin.config.getBoolean("settings.if_vanished.chat", false)
-        IF_VANISHED_JOIN = plugin.config.getBoolean("settings.if_vanished.join", false)
-        IF_VANISHED_LEAVE = plugin.config.getBoolean("settings.if_vanished.leave", false)
-        IF_VANISHED_DEATH = plugin.config.getBoolean("settings.if_vanished.death", false)
+        IF_VANISHED_CHAT = plugin.config.getBoolean("if-vanished.chat", false)
+        IF_VANISHED_JOIN = plugin.config.getBoolean("if-vanished.join", false)
+        IF_VANISHED_LEAVE = plugin.config.getBoolean("if-vanished.leave", false)
+        IF_VANISHED_DEATH = plugin.config.getBoolean("if-vanished.death", false)
 
-        TEMPLATES_DISCORD_CHAT_MESSAGE = plugin.config.getString("settings.templates.discord.chat_message", "<%u> %m")
-        TEMPLATES_DISCORD_PLAYER_JOIN = plugin.config.getString("settings.templates.discord.player_join", "%u joined the server")
-        TEMPLATES_DISCORD_PLAYER_LEAVE = plugin.config.getString("settings.templates.discord.player_leave", "%u left the server")
-        TEMPLATES_DISCORD_PLAYER_DEATH = plugin.config.getString("settings.templates.discord.player_death", "%r")
-        TEMPLATES_DISCORD_SERVER_START = plugin.config.getString("settings.templates.discord.server_start", "Server started!")
-        TEMPLATES_DISCORD_SERVER_STOP = plugin.config.getString("settings.templates.discord.server_stop", "Shutting down...")
+        TEMPLATES_DISCORD_CHAT_MESSAGE = plugin.config.getString("templates.discord.chat-message", "<**%u**> %m")
+        TEMPLATES_DISCORD_PLAYER_JOIN = plugin.config.getString("templates.discord.player-join", "**%u** joined the server")
+        TEMPLATES_DISCORD_PLAYER_LEAVE = plugin.config.getString("templates.discord.player-leave", "**%u** left the server")
+        TEMPLATES_DISCORD_PLAYER_DEATH = plugin.config.getString("templates.discord.player-death", "%r")
+        TEMPLATES_DISCORD_SERVER_START = plugin.config.getString("templates.discord.server-start", "Server started!")
+        TEMPLATES_DISCORD_SERVER_STOP = plugin.config.getString("templates.discord.server_stop", "Shutting down...")
 
-        TEMPLATES_MINECRAFT_CHAT_MESSAGE = plugin.config.getString("settings.templates.minecraft.chat_message", "<%u&b(discord)&r> %m")
+        TEMPLATES_MINECRAFT_CHAT_MESSAGE = plugin.config.getString("templates.minecraft.chat-message", "[&b&lDiscord&r]<%u> %m")
 
         BOT_MC_USERNAME = USERNAME_COLOR + USERNAME.noSpace() + "&r"
     }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/DataConfigAccessor.kt b/src/main/kotlin/gg/obsidian/discordbridge/DataConfigAccessor.kt
index 7a6bcc4..446c835 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/DataConfigAccessor.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/DataConfigAccessor.kt
@@ -15,7 +15,7 @@ package gg.obsidian.discordbridge
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.IN NO EVENT SHALL THE
 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
@@ -41,8 +41,9 @@ class DataConfigAccessor(private val plugin: JavaPlugin, filepath: File, private
     }
 
     fun reloadConfig() {
-        try { fileConfiguration = YamlConfiguration.loadConfiguration(configFile) }
-        catch (e: IllegalArgumentException) {
+        try {
+            fileConfiguration = YamlConfiguration.loadConfiguration(configFile)
+        } catch (e: IllegalArgumentException) {
             // Look for defaults in the jar
             if (plugin.getResource(fileName) == null)
                 plugin.logger.log(Level.SEVERE, "usernames.yml cannot be found for some reason")
@@ -54,30 +55,27 @@ class DataConfigAccessor(private val plugin: JavaPlugin, filepath: File, private
 
     val data: FileConfiguration
         get() {
-            if (fileConfiguration == null) {
+            if (fileConfiguration == null)
                 this.reloadConfig()
-            }
             return fileConfiguration!!
         }
 
     fun saveConfig() {
-        if (fileConfiguration == null || configFile == null) {
+        if (fileConfiguration == null || configFile == null)
             return
-        } else {
+        else {
             try {
                 data.save(configFile)
             } catch (ex: IOException) {
-                plugin.logger.log(Level.SEVERE, "Could not save data to " + configFile, ex)
+                plugin.logger.log(Level.SEVERE, "Could not save data to $configFile", ex)
             }
-
         }
     }
 
     @Suppress("unused")
     fun saveDefaultConfig() {
-        if (!configFile!!.exists()) {
+        if (!configFile!!.exists())
             this.plugin.saveResource(fileName, false)
-        }
     }
 
 }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt b/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
index 2ea613c..7cd1417 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
@@ -8,27 +8,28 @@ import org.bukkit.event.entity.PlayerDeathEvent
 import org.bukkit.event.player.AsyncPlayerChatEvent
 import org.bukkit.event.player.PlayerJoinEvent
 import org.bukkit.event.player.PlayerQuitEvent
+import org.bukkit.ChatColor as CC
 import java.lang.reflect.Method
 
 class EventListener(val plugin: Plugin) : Listener {
 
     @EventHandler(priority = EventPriority.MONITOR)
     fun onChat(event: AsyncPlayerChatEvent) {
-        plugin.logDebug("Received a chat event from ${event.player.name}: ${event.message}")
-
+        val player = event.player
+        val username = event.player.name.stripColor()
+        val displayName = event.player.displayName.stripColor()
+        val uuid = event.player.uniqueId.toString()
+        val message = event.message.stripColor()
+        var worldname = event.player.world.name
 
+        plugin.logDebug("Received a chat event from $username: $message")
         if (!plugin.cfg.MESSAGES_CHAT) return
         if (event.isCancelled && !plugin.cfg.RELAY_CANCELLED_MESSAGES) return
-
-        // Check for vanished
-        val player = event.player
-        if (player.hasMetadata("vanished") &&
-                player.getMetadata("vanished")[0].asBoolean() &&
+        if (player.hasMetadata("vanished") && player.getMetadata("vanished")[0].asBoolean() &&
                 !plugin.cfg.IF_VANISHED_CHAT) return
 
-        val username = event.player.name.stripColor()
-        var worldname = player.world.name
-        if (plugin.isMultiverse()) {
+        // Get world alias if Multiverse is installed
+        if (plugin.foundMultiverse) {
             val worldProperties = plugin.worlds!!.data.get("worlds.$worldname")
             val cls = Class.forName("com.onarandombox.MultiverseCore.WorldProperties")
             val meth: Method = cls.getMethod("getAlias")
@@ -36,67 +37,75 @@ class EventListener(val plugin: Plugin) : Listener {
             if (alias is String) worldname = alias
         }
 
-        var formattedMessage = plugin.toDiscordChatMessage(event.message.stripColor(), username, player.displayName.stripColor(), worldname)
+        var formattedMessage = plugin.toDiscordChatMessage(message, username, displayName, worldname)
         formattedMessage = plugin.convertAtMentions(formattedMessage)
-        formattedMessage = plugin.translateAliasToDiscord(formattedMessage, event.player.uniqueId.toString())
-
-        plugin.sendToDiscord(formattedMessage, plugin.connection.getRelayChannel())
+        formattedMessage = plugin.translateAliasToDiscord(formattedMessage, uuid)
+        plugin.sendToDiscord(formattedMessage, plugin.conn.getRelayChannel())
+
+        // If it was a @mention to the bot, treat it as a Cleverbot invocation
+        if (message.startsWith("@" + plugin.cfg.USERNAME.noSpace())) {
+            val task = Runnable {
+                if (Permissions.cleverbot.has(player)) {
+                    val arg: String = message.removePrefix("@" + plugin.cfg.USERNAME.noSpace()).trimStart()
+                    val response = CommandLogic.askCleverbot(plugin, arg)
+                    plugin.sendToMinecraft(plugin.toMinecraftChatMessage(response, plugin.cfg.BOT_MC_USERNAME))
+                    plugin.sendToDiscord(response, plugin.conn.getRelayChannel())
+                } else
+                    player.sendMessage("${CC.RED}You do not have permission to talk to the bot.")
+            }
+            plugin.server.scheduler.runTaskAsynchronously(plugin, task)
+        }
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     fun onPlayerJoin(event: PlayerJoinEvent) {
-        if (!plugin.cfg.MESSAGES_JOIN) return
-
-        // Check for vanished
         val player = event.player
-        if (player.hasMetadata("vanished") &&
-                player.getMetadata("vanished")[0].asBoolean() &&
-                !plugin.cfg.IF_VANISHED_JOIN) return
+        val username = event.player.name.stripColor()
+        val displayName = event.player.displayName.stripColor()
+        val uuid = event.player.uniqueId.toString()
 
-        val username = player.name.stripColor()
         plugin.logDebug("Received a join event for $username")
+        if (!plugin.cfg.MESSAGES_JOIN) return
+        if (player.hasMetadata("vanished") && player.getMetadata("vanished")[0].asBoolean() &&
+                !plugin.cfg.IF_VANISHED_JOIN) return
 
-        var formattedMessage = plugin.toDiscordPlayerJoin(username, player.displayName.stripColor())
-        formattedMessage = plugin.translateAliasToDiscord(formattedMessage, event.player.uniqueId.toString())
-
-        plugin.sendToDiscord(formattedMessage, plugin.connection.getRelayChannel())
+        var formattedMessage = plugin.toDiscordPlayerJoin(username, displayName)
+        formattedMessage = plugin.translateAliasToDiscord(formattedMessage, uuid)
+        plugin.sendToDiscord(formattedMessage, plugin.conn.getRelayChannel())
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     fun onPlayerQuit(event: PlayerQuitEvent) {
-        if (!plugin.cfg.MESSAGES_LEAVE) return
-
-        // Check for vanished
         val player = event.player
-        if (player.hasMetadata("vanished") &&
-                player.getMetadata("vanished")[0].asBoolean() &&
-                !plugin.cfg.IF_VANISHED_LEAVE) return
-
         val username = event.player.name.stripColor()
-        plugin.logDebug("Received a leave event for $username")
+        val displayName = event.player.displayName.stripColor()
+        val uuid = event.player.uniqueId.toString()
 
-        var formattedMessage = plugin.toDiscordPlayerLeave(username, event.player.displayName.stripColor())
-        formattedMessage = plugin.translateAliasToDiscord(formattedMessage, event.player.uniqueId.toString())
+        plugin.logDebug("Received a leave event for $username")
+        if (!plugin.cfg.MESSAGES_LEAVE) return
+        if (player.hasMetadata("vanished") && player.getMetadata("vanished")[0].asBoolean() &&
+                !plugin.cfg.IF_VANISHED_LEAVE) return
 
-        plugin.sendToDiscord(formattedMessage, plugin.connection.getRelayChannel())
+        var formattedMessage = plugin.toDiscordPlayerLeave(username, displayName)
+        formattedMessage = plugin.translateAliasToDiscord(formattedMessage, uuid)
+        plugin.sendToDiscord(formattedMessage, plugin.conn.getRelayChannel())
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     fun onPlayerDeath(event: PlayerDeathEvent) {
-        if (!plugin.cfg.MESSAGES_DEATH) return
-
-        // Check for vanished
         val player = event.entity
-        if (player.hasMetadata("vanished") &&
-                player.getMetadata("vanished")[0].asBoolean() &&
-                !plugin.cfg.IF_VANISHED_DEATH) return
-
         val username = event.entity.name.stripColor()
-        plugin.logDebug("Received a death event for $username")
+        val displayName = event.entity.displayName.stripColor()
+        val uuid = event.entity.uniqueId.toString()
+        val deathMessage = event.deathMessage
 
-        var formattedMessage = plugin.toDiscordPlayerDeath(event.deathMessage, username, event.entity.displayName.stripColor(), event.entity.world.name)
-        formattedMessage = plugin.translateAliasToDiscord(formattedMessage, player.uniqueId.toString())
+        plugin.logDebug("Received a death event for $username")
+        if (!plugin.cfg.MESSAGES_DEATH) return
+        if (player.hasMetadata("vanished") && player.getMetadata("vanished")[0].asBoolean() &&
+                !plugin.cfg.IF_VANISHED_DEATH) return
 
-        plugin.sendToDiscord(formattedMessage, plugin.connection.getRelayChannel())
+        var formattedMessage = plugin.toDiscordPlayerDeath(deathMessage, username, displayName)
+        formattedMessage = plugin.translateAliasToDiscord(formattedMessage, uuid)
+        plugin.sendToDiscord(formattedMessage, plugin.conn.getRelayChannel())
     }
 }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Permissions.kt b/src/main/kotlin/gg/obsidian/discordbridge/Permissions.kt
index e0fee5c..90c98ba 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Permissions.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Permissions.kt
@@ -4,7 +4,11 @@ import org.bukkit.entity.Player
 
 enum class Permissions(val node: String) {
     reload("discordbridge.reload"),
-    cleverbot("discordbridge.cleverbot");
+    cleverbot("discordbridge.cleverbot"),
+    f("discordbridge.f"),
+    eightball("discordbridge.eightball"),
+    insult("discordbridge.insult"),
+    rate("discordbridge.rate");
 
     fun has(player: Player): Boolean {
         return player.hasPermission(node)
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
index e5d77d6..2026565 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
@@ -1,46 +1,61 @@
 package gg.obsidian.discordbridge
 
+import gg.obsidian.discordbridge.Utils.noSpace
+import gg.obsidian.discordbridge.Utils.UserAlias
 import gg.obsidian.discordbridge.discord.Connection
-import gg.obsidian.discordbridge.minecraft.commands.Discord
-import gg.obsidian.discordbridge.minecraft.commands.Marina
+import gg.obsidian.discordbridge.minecraft.commands.*
 import net.dv8tion.jda.core.OnlineStatus
+import net.dv8tion.jda.core.entities.Member
 import net.dv8tion.jda.core.entities.MessageChannel
-import org.bukkit.ChatColor
+import org.bukkit.ChatColor as CC
+import org.bukkit.entity.Player
 import org.bukkit.plugin.java.JavaPlugin
 import java.util.logging.Level
 import java.io.File
 
 class Plugin : JavaPlugin() {
 
+    // Connection to Discord
+    lateinit var conn: Connection
+
+    // Configs
     val cfg = Configuration(this)
-    lateinit var connection: Connection
     var users: DataConfigAccessor = DataConfigAccessor(this, dataFolder, "usernames.yml")
     var memory: DataConfigAccessor = DataConfigAccessor(this, dataFolder, "botmemory.yml")
-    var scripted_responses: DataConfigAccessor = DataConfigAccessor(this, dataFolder, "scriptedresponses.yml")
+    var insults: DataConfigAccessor = DataConfigAccessor(this, dataFolder, "insults.yml")
     var worlds: DataConfigAccessor? = null
+
+    // Temporary storage for alias linking requests
     var requests: MutableList<UserAlias> = mutableListOf()
 
+    // Detects if Multiverse-Core is installed
+    val foundMultiverse: Boolean
+        get() = server.pluginManager.getPlugin("Multiverse-Core") != null
+
     override fun onEnable() {
         // Load configs
         updateConfig(description.version)
         users.saveDefaultConfig()
         memory.saveDefaultConfig()
-        scripted_responses.saveDefaultConfig()
-        if (isMultiverse()) worlds = DataConfigAccessor(this, File("plugins/Multiverse-Core"), "worlds.yml")
+        insults.saveDefaultConfig()
+        if (foundMultiverse) worlds = DataConfigAccessor(this, File("plugins/Multiverse-Core"), "worlds.yml")
 
         // Connect to Discord
-        this.connection = Connection(this)
-        server.scheduler.runTaskAsynchronously(this, connection)
+        this.conn = Connection(this)
+        server.scheduler.runTaskAsynchronously(this, conn)
         server.pluginManager.registerEvents(EventListener(this), this)
 
         // Register commands
         getCommand("discord").executor = Discord(this)
-        getCommand("marina").executor = Marina(this)
+        getCommand("f").executor = F(this)
+        getCommand("rate").executor = Rate(this)
+        getCommand("8ball").executor = EightBall(this)
+        getCommand("insult").executor = Insult(this)
     }
 
     override fun onDisable() {
         if (cfg.ANNOUNCE_SERVER_START_STOP)
-            connection.send(cfg.TEMPLATES_DISCORD_SERVER_STOP, connection.getRelayChannel())
+            conn.send(cfg.TEMPLATES_DISCORD_SERVER_STOP, conn.getRelayChannel())
 
         // Pretend like this does anything
         logger.log(Level.INFO, "Attempting to cancel tasks")
@@ -54,7 +69,7 @@ class Plugin : JavaPlugin() {
     // Send a message to Discord
     fun sendToDiscord(message: String, channel: MessageChannel?) {
         logDebug("Sending message to Discord - $message")
-        connection.send(message, channel)
+        conn.send(message, channel)
     }
 
     // Send a message to Minecraft
@@ -71,10 +86,10 @@ class Plugin : JavaPlugin() {
         reloadConfig()
         users.reloadConfig()
         memory.reloadConfig()
-        scripted_responses.reloadConfig()
-        if (isMultiverse()) worlds!!.reloadConfig()
+        insults.reloadConfig()
+        if (foundMultiverse) worlds!!.reloadConfig()
         cfg.load()
-        //connection?.reconnect()
+        //conn?.reconnect()
     }
 
     // Save default config
@@ -92,11 +107,6 @@ class Plugin : JavaPlugin() {
         logger.info(msg)
     }
 
-    // Shorthand function to check if Multiverse is installed
-    fun isMultiverse(): Boolean {
-        return server.pluginManager.getPlugin("Multiverse-Core") != null
-    }
-
     // Get a list of usernames of players who are online
     fun getOnlinePlayers(): List<String> {
         val names: MutableList<String> = mutableListOf()
@@ -106,27 +116,69 @@ class Plugin : JavaPlugin() {
     }
 
     // Open a request to link a Minecraft user with a Discord user
-    fun registerUserRequest(ua: UserAlias) {
+    fun registerUserRequest(player: Player, id: String): Boolean {
+        val users = conn.listUsers()
+        val found: Member = users.find { it.user.id == id } ?: return false
+
+        val ua: UserAlias = UserAlias(player.name, player.uniqueId.toString(), found.effectiveName, found.user.id)
         requests.add(ua)
         val msg = "Minecraft user '${ua.mcUsername}' has requested to become associated with your Discord" +
-                " account. If this is you, respond '<@me> confirm'. If this is not" +
-                " you, respond '<@me> deny'."
-        connection.tell(msg, ua.discordId)
+                " account. If this is you, respond '${conn.api!!.selfUser.asMention} confirm'. If this is not" +
+                " you, respond ${conn.api!!.selfUser.asMention} deny'."
+        conn.send(msg, conn.api!!.getUserById(ua.discordId).privateChannel)
+        return true
     }
 
-    // Return a list of all Discord users in the specified server
-    fun getDiscordUsers(): List<Triple<String, String, Boolean>> {
-        return connection.listUsers()
+    // Return a formatted string listing the Discord IDs of all Discord users in the relay channel
+    fun getDiscordIds(): String {
+        val users = conn.listUsers()
+
+        if (users.isEmpty())
+            return "${CC.YELLOW}No Discord members could be found. Either server is empty or an error has occurred."
+
+        var response = "${CC.YELLOW}Discord users:"
+        for (user in users) {
+            if (user.user.isBot) response += "\n${CC.GOLD}- ${user.effectiveName} (Bot), ${user.user.id}${CC.RESET}"
+            else response += "\n${CC.YELLOW}- ${user.effectiveName}, ${user.user.id}${CC.RESET}"
+        }
+        return response
     }
 
-    // Return a list of all Discord users in the specified server who are visibly available
-    fun getDiscordOnline(): List<Triple<String, Boolean, OnlineStatus>> {
-        return connection.listOnline()
+    // Return a formatted string listing all Discord users in the relay channel who are visibly available
+    fun getDiscordOnline(): String {
+        val onlineUsers = conn.listOnline()
+        if (onlineUsers.isEmpty())
+            return "${CC.YELLOW}No Discord members could be found. Either server is empty or an error has occurred."
+
+        var response = ""
+        if (onlineUsers.filter { it.onlineStatus == OnlineStatus.ONLINE }.isNotEmpty()) {
+            response += "\n${CC.DARK_GREEN}Online:${CC.RESET}"
+            for (user in onlineUsers.filter { it.onlineStatus == OnlineStatus.ONLINE }) {
+                if (user.user.isBot) response += "\n${CC.DARK_GREEN}- ${user.effectiveName} (Bot)${CC.RESET}"
+                else response += "\n${CC.DARK_GREEN}- ${user.effectiveName}${CC.RESET}"
+            }
+        }
+        if (onlineUsers.filter { it.onlineStatus == OnlineStatus.IDLE }.isNotEmpty()) {
+            response += "\n${CC.YELLOW}Idle:${CC.RESET}"
+            for (user in onlineUsers.filter { it.onlineStatus == OnlineStatus.IDLE }) {
+                if (user.user.isBot) response += "\n${CC.YELLOW}- ${user.effectiveName} (Bot)${CC.RESET}"
+                else response += "\n${CC.YELLOW}- ${user.effectiveName}${CC.RESET}"
+            }
+        }
+        if (onlineUsers.filter { it.onlineStatus == OnlineStatus.DO_NOT_DISTURB }.isNotEmpty()) {
+            response += "\n${CC.RED}Do Not Disturb:${CC.RESET}"
+            for (user in onlineUsers.filter { it.onlineStatus == OnlineStatus.DO_NOT_DISTURB }) {
+                if (user.user.isBot) response += "\n${CC.RED}- ${user.effectiveName} (Bot)${CC.RESET}"
+                else response += "\n&${CC.RED} ${user.effectiveName}${CC.RESET}"
+            }
+        }
+
+        response.replaceFirst("\n", "")
+        return response
     }
 
-    // TODO: Rename function to something more intuitive
     // Add an alias to the Users data
-    fun updateAlias(ua: UserAlias) {
+    fun saveAlias(ua: UserAlias) {
         users.data.set("mcaliases.${ua.mcUuid}.mcusername", ua.mcUsername)
         users.data.set("mcaliases.${ua.mcUuid}.discordusername", ua.discordUsername)
         users.data.set("mcaliases.${ua.mcUuid}.discordid", ua.discordId)
@@ -141,75 +193,76 @@ class Plugin : JavaPlugin() {
     ===================================== */
 
     // Converts attempted @mentions to real ones wherever possible
-    // Replaces the sender's name with their registered alias if it exists
     // Mentionable names MUST NOT contain spaces!
     fun convertAtMentions(message: String): String {
         var newMessage = message
 
-        val discordusers = getDiscordUsers()
-        val discordaliases: MutableList<Pair<String, String>> = mutableListOf()
+        val discordusers = conn.listUsers()
+        val discordaliases: MutableList<Pair<String, Member>> = mutableListOf()
         discordusers
-                .filter { users.data.isSet("discordaliases.${it.second}") }
-                .mapTo(discordaliases) { Pair(users.data.getString("discordaliases.${it.second}.mcusername"), it.second) }
-        for (match in Regex("""(?:^| )@(w+)""").findAll(message)) {
-            val found: Triple<String, String, Boolean>? = discordusers.firstOrNull {
-                it.first.replace("\\s+", "").toLowerCase() == match.value.toLowerCase()
+                .filter { users.data.isSet("discordaliases.${it.user.id}") }
+                .mapTo(discordaliases) { Pair(users.data.getString("discordaliases.${it.user.id}.mcusername"), it) }
+        for (match in Regex("""(?:^| )@(\w+)""").findAll(message)) {
+            val found: Member? = discordusers.firstOrNull {
+                it.effectiveName.noSpace().toLowerCase() == match.groupValues[1].toLowerCase()
             }
-            if (found != null) newMessage = newMessage.replaceFirst("@${match.value}", "<@${found.second}>")
+            if (found != null) newMessage = newMessage.replaceFirst("@${match.groupValues[1]}", found.asMention)
 
-            val found2: Pair<String, String>? = discordaliases.firstOrNull {
-                it.second.toLowerCase() == match.value.toLowerCase()
+            val found2: Pair<String, Member>? = discordaliases.firstOrNull {
+                it.first.toLowerCase() == match.groupValues[1].toLowerCase()
             }
-            if (found2 != null) newMessage = newMessage.replaceFirst("@${match.value}", "<@${found2.first}>")
+            if (found2 != null) newMessage = newMessage.replaceFirst("@${match.groupValues[1]}", found2.second.asMention)
         }
 
         return newMessage
     }
 
+    //TODO: De-convert @mentions
+
     // Scans the string for occurrences of the Minecraft name matching the given UUID and attempts to translate it
     // to a registered Discord name, if it exists
     fun translateAliasToDiscord(message: String, uuid: String?): String {
         var newMessage = message
         val alias = users.data.getString("mcaliases.$uuid.discordusername")
         if (alias != null)
-            newMessage = newMessage.replaceFirst(users.data.getString("mcaliases.$uuid.mcusername"), alias)
+            newMessage = newMessage.replace(users.data.getString("mcaliases.$uuid.mcusername"), alias)
+        return newMessage
+    }
+
+    // Scans the string for occurrences of the Minecraft name matching the given UUID and attempts to translate it
+    // to a registered Discord name, if it exists
+    fun translateAliasToMinecraft(message: String, discordId: String?): String {
+        var newMessage = message
+        val alias = users.data.getString("discordaliases.$discordId.mcusername")
+        if (alias != null)
+            newMessage = newMessage.replace(users.data.getString("discordaliases.$discordId.mcusername"), alias)
         return newMessage
     }
 
     fun toMinecraftChatMessage(message: String, alias: String): String {
-        var formattedString = cfg.TEMPLATES_MINECRAFT_CHAT_MESSAGE
-        formattedString = formattedString.replace("%u", alias).replace("%m", message)
-        formattedString = ChatColor.translateAlternateColorCodes('&', formattedString)
-        return formattedString
+        return formatMessage(cfg.TEMPLATES_MINECRAFT_CHAT_MESSAGE, msg=message, u=alias)
     }
 
     fun toDiscordChatMessage(message: String, username: String, displayName: String, worldName: String): String {
-        var formattedString = cfg.TEMPLATES_DISCORD_CHAT_MESSAGE
-        formattedString = formattedString.replace("%u", username).replace("%m", message)
-                .replace("%d", displayName).replace("%w", worldName)
-        formattedString = ChatColor.translateAlternateColorCodes('&', formattedString)
-        return formattedString
+        return formatMessage(cfg.TEMPLATES_DISCORD_CHAT_MESSAGE, msg=message, u=username, d=displayName, w=worldName)
     }
 
     fun toDiscordPlayerJoin(username: String, displayName: String): String {
-        var formattedString = cfg.TEMPLATES_DISCORD_PLAYER_JOIN
-        formattedString = formattedString.replace("%u", username).replace("%d", displayName)
-        formattedString = ChatColor.translateAlternateColorCodes('&', formattedString)
-        return formattedString
+        return formatMessage(cfg.TEMPLATES_DISCORD_PLAYER_JOIN, u=username, d=displayName)
     }
 
     fun toDiscordPlayerLeave(username: String, displayName: String): String {
-        var formattedString = cfg.TEMPLATES_DISCORD_PLAYER_LEAVE
-        formattedString = formattedString.replace("%u", username).replace("%d", displayName)
-        formattedString = ChatColor.translateAlternateColorCodes('&', formattedString)
-        return formattedString
-    }
-
-    fun toDiscordPlayerDeath(deathMessage: String, username: String, displayName: String, worldName: String): String {
-        var formattedString = cfg.TEMPLATES_DISCORD_PLAYER_DEATH
-        formattedString = formattedString.replace("%u", username).replace("%r", deathMessage)
-                .replace("%d", displayName).replace("%w", worldName)
-        formattedString = ChatColor.translateAlternateColorCodes('&', formattedString)
-        return formattedString
+        return formatMessage(cfg.TEMPLATES_DISCORD_PLAYER_LEAVE, u=username, d=displayName)
+    }
+
+    fun toDiscordPlayerDeath(deathMessage: String, username: String, displayName: String): String {
+        return formatMessage(cfg.TEMPLATES_DISCORD_CHAT_MESSAGE, r=deathMessage, u=username, d=displayName)
+    }
+
+    private fun formatMessage(template: String, msg: String = "N/A", u: String = "N/A", d: String = "N/A",
+                              w: String = "N/A", r: String = "N/A"): String {
+        var out = CC.translateAlternateColorCodes('&', template)
+        out = out.replace("%u", u).replace("%m", msg).replace("%d", d).replace("%w", w).replace("%r", r)
+        return out
     }
 }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/UserAlias.kt b/src/main/kotlin/gg/obsidian/discordbridge/UserAlias.kt
deleted file mode 100644
index ed1ef2e..0000000
--- a/src/main/kotlin/gg/obsidian/discordbridge/UserAlias.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package gg.obsidian.discordbridge
-
-data class UserAlias(var mcUsername: String, var mcUuid: String,
-                     var discordUsername: String, var discordId: String)
\ No newline at end of file
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Utils/Utils.kt b/src/main/kotlin/gg/obsidian/discordbridge/Utils/Utils.kt
index 073e682..fe9fef1 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Utils/Utils.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Utils/Utils.kt
@@ -3,4 +3,7 @@ package gg.obsidian.discordbridge.Utils
 import org.bukkit.ChatColor
 
 fun String.noSpace() = this.replace(Regex("""\s+"""), "")
-fun String.stripColor(): String = ChatColor.stripColor(this)
\ No newline at end of file
+fun String.stripColor(): String = ChatColor.stripColor(this)
+
+data class UserAlias(var mcUsername: String, var mcUuid: String,
+                     var discordUsername: String, var discordId: String)
\ No newline at end of file
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt b/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
index 2f1c643..142519a 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
@@ -4,10 +4,7 @@ import gg.obsidian.discordbridge.Plugin
 import net.dv8tion.jda.core.AccountType
 import net.dv8tion.jda.core.JDA
 import net.dv8tion.jda.core.JDABuilder
-import net.dv8tion.jda.core.OnlineStatus
-import net.dv8tion.jda.core.entities.Guild
-import net.dv8tion.jda.core.entities.MessageChannel
-import net.dv8tion.jda.core.entities.TextChannel
+import net.dv8tion.jda.core.entities.*
 
 class Connection(val plugin: Plugin) : Runnable {
     var api: JDA? = null
@@ -37,44 +34,21 @@ class Connection(val plugin: Plugin) : Runnable {
         toChannel.sendMessage(message).queue()
     }
 
-    // TODO: Try to merge this into "send"
-    fun tell(message: String, id: String) {
-        val modifiedMsg = message.replace("<@me>", api!!.selfUser.asMention)
-        api!!.getUserById(id).privateChannel.sendMessage(modifiedMsg).queue()
-    }
-
     fun reconnect() {
         disconnect()
         connect()
     }
 
-    // TODO: Unfuck this
-    fun listUsers(): List<Triple<String, String, Boolean>> {
-        channel = if (channel == null) getGroupByName(server!!, plugin.cfg.CHANNEL) else channel
+    fun listUsers(): List<Member> {
+        channel = getRelayChannel()
         if (channel == null) return mutableListOf()
-
-        val listOfUsers: MutableList<Triple<String, String, Boolean>> = mutableListOf()
-        channel!!.members.mapTo(listOfUsers) {
-            Triple(it.effectiveName, it.user.id, it.user.isBot)
-        }
-        return listOfUsers
+        return channel!!.members
     }
 
-    // TODO: Unfuck this
-    fun listOnline(): List<Triple<String, Boolean, OnlineStatus>> {
-        channel = if (channel == null) getGroupByName(server!!, plugin.cfg.CHANNEL) else channel
-        if (channel == null) return mutableListOf()
-
-        val listOfUsers: MutableList<Triple<String, Boolean, OnlineStatus>> = mutableListOf()
-        channel!!.members.mapTo(listOfUsers) {
-            Triple(it.effectiveName, it.user.isBot, it.onlineStatus)
-        }
-        return listOfUsers
-    }
-
-    private fun disconnect() {
-        api?.removeEventListener(listener)
-        api?.shutdown(false)
+    fun listOnline(): List<Member> {
+        channel = getRelayChannel()
+        if (channel != null) return channel!!.members
+        return mutableListOf()
     }
 
     private fun connect() {
@@ -83,15 +57,21 @@ class Connection(val plugin: Plugin) : Runnable {
         api = builder.buildBlocking()
         listener = Listener(plugin, api as JDA, this)
         api!!.addEventListener(listener)
-        if(plugin.cfg.ANNOUNCE_SERVER_START_STOP)
+        if (plugin.cfg.ANNOUNCE_SERVER_START_STOP)
             send(plugin.cfg.TEMPLATES_DISCORD_SERVER_START, getRelayChannel())
+        api!!.presence.game = Game.of("Minecraft ${plugin.server.bukkitVersion.split("-")[0]}")
     }
 
-    private fun getServerById(id: String): Guild? {
-        return api!!.guilds.firstOrNull { it.id.equals(id, true) }
+    private fun disconnect() {
+        api?.removeEventListener(listener)
+        api?.shutdown(false)
     }
 
     private fun getGroupByName(server: Guild, name: String): TextChannel? {
         return server.textChannels.firstOrNull { it.name == name }
     }
+
+    private fun getServerById(id: String): Guild? {
+        return api!!.guilds.firstOrNull { it.id.equals(id, true) }
+    }
 }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt b/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
index 93c3cad..7b230d3 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
@@ -18,38 +18,37 @@ class Listener(val plugin: Plugin, val api: JDA, val connection: Connection) : L
 
         val rawmsg: String = event.message.rawContent
         val username: String = event.author.name
+        val channel = event.channel
+        val id = event.author.id
 
-        // Immediately throw out messages sent from itself or from non-matching servers
-        if (username.equals(plugin.cfg.USERNAME, true)) {
+        // Immediately throw out messages sent from itself
+        if (id == api.selfUser.id) {
             plugin.logDebug("Ignoring message ${event.message.id} from Discord: it matches this bot's username")
             return
         }
-//        if (event.guild.id != plugin.cfg.SERVER_ID) {
-//            plugin.logDebug("Not relaying message ${event.message.id} from Discord: server does not match")
-//            return
-//        }
 
-        // NON-RELAY COMMANDS - the following commands and their responses are never sent to Minecraft
+        // NON-TRIGGER-RELAY COMMANDS - the triggers of these commands are never relayed to Minecraft
         if (rawmsg.startsWith(api.selfUser.asMention, true)) {
-            val arg = rawmsg.replaceFirst(api.selfUser.asMention, "").replaceFirst("\\s+", "")
+            val arg = rawmsg.replaceFirst(api.selfUser.asMention, "").trimStart()
+
+            // NON-RESPONSE-RELAY COMMANDS - the responses of these commands are also never relayed to Minecraft
 
             // CONFIRM - Confirm an alias
             if (arg.startsWith("confirm", true) && event.isFromType(ChannelType.PRIVATE)) {
                 plugin.logDebug("user $username wants to confirm an alias")
-                val ua = plugin.requests.find { it.discordId == event.author.id }
+                val ua = plugin.requests.find { it.discordId == id }
                 if (ua == null) {
-                    plugin.sendToDiscord("You have not requested an alias, or your request has expired!", event.privateChannel)
+                    plugin.sendToDiscord("You have not requested an alias, or your request has expired!", channel)
                     return
                 }
-                plugin.updateAlias(ua)
+                plugin.saveAlias(ua)
                 plugin.requests.remove(ua)
-                plugin.sendToDiscord("Successfully linked aliases!", event.privateChannel)
+                plugin.sendToDiscord("Successfully linked aliases!", channel)
                 return
             }
 
             // SERVERLIST - List all players currently online on the server
             if (arg.startsWith("serverlist", true)) {
-                val channel = if (event.isFromType(ChannelType.PRIVATE)) event.privateChannel else event.channel
                 plugin.logDebug("user $username has requested a listing of online players")
                 val players = plugin.getOnlinePlayers()
                 if (players.isEmpty()) {
@@ -60,6 +59,55 @@ class Listener(val plugin: Plugin, val api: JDA, val connection: Connection) : L
                 plugin.sendToDiscord(response, channel)
                 return
             }
+
+            // RESPONSE-RELAY COMMANDS - only the responses of these commands will be relayed
+            // to Minecraft if sent to the relay channel
+
+            // 8BALL - consult the Magic 8-Ball to answer your yes or no questions
+            if (arg.startsWith("8ball", true)) {
+                plugin.logDebug("user $username consults the Magic 8-Ball")
+                val response = CommandLogic.eightBall(plugin, username)
+                plugin.sendToDiscord(response, channel)
+                if (event.isFromRelayChannel())
+                    plugin.sendToMinecraft(plugin.toMinecraftChatMessage(
+                            plugin.translateAliasToMinecraft(response, id), plugin.cfg.BOT_MC_USERNAME))
+                return
+            }
+
+            // F - press F to pay respects!
+            if (arg.equals("f", true)) {
+                plugin.logDebug("user $username pays respects")
+                val response = CommandLogic.f(plugin, username)
+                plugin.sendToDiscord(response, channel)
+                if (event.isFromRelayChannel())
+                    plugin.sendToMinecraft(plugin.toMinecraftChatMessage(
+                            plugin.translateAliasToMinecraft(response, id), plugin.cfg.BOT_MC_USERNAME))
+                return
+            }
+
+            // RATE - the bot rates something
+            if (arg.startsWith("rate", true)) {
+                val arg2 = arg.replaceFirst("rate", "").trimStart()
+                plugin.logDebug("user $username requests a rating")
+                val response = CommandLogic.rate(username, arg2)
+                plugin.sendToDiscord(response, channel)
+                if (event.isFromRelayChannel())
+                    plugin.sendToMinecraft(plugin.toMinecraftChatMessage(
+                            plugin.translateAliasToMinecraft(response, id), plugin.cfg.BOT_MC_USERNAME))
+                return
+            }
+
+            // INSULT - the bot insults something
+            if (arg.startsWith("insult", true)) {
+                val arg2 = arg.replaceFirst("insult", "").trimStart()
+                plugin.logDebug("user $username requests an insult against $arg2")
+                val response = CommandLogic.insult(plugin, arg2)
+                plugin.sendToDiscord(response, channel)
+                if (event.isFromRelayChannel())
+                    plugin.sendToMinecraft(plugin.toMinecraftChatMessage(
+                            plugin.translateAliasToMinecraft(response, id), plugin.cfg.BOT_MC_USERNAME))
+                return
+            }
         }
 
         // If it is from the relay channel, relay it immediately
@@ -69,7 +117,7 @@ class Listener(val plugin: Plugin, val api: JDA, val connection: Connection) : L
                 plugin.logDebug("Not relaying message ${event.message.id} from Discord: channel does not match")
             else {
                 plugin.logDebug("Broadcasting message ${event.message.id} from Discord to Minecraft as user $username")
-                var alias = plugin.users.data.getString("discordaliases.${event.author.id}.mcusername")
+                var alias = plugin.users.data.getString("discordaliases.$id.mcusername")
                 if (alias == null) alias = username.noSpace()
                 plugin.sendToMinecraft(plugin.toMinecraftChatMessage(event.message.content, alias))
             }
@@ -77,39 +125,43 @@ class Listener(val plugin: Plugin, val api: JDA, val connection: Connection) : L
 
         // RELAY COMMANDS - The outputs of these commands WILL be relayed to Minecraft if sent to the relay channel
         if (rawmsg.startsWith(api.selfUser.asMention, true)) {
-            val isPrivate = event.isFromType(ChannelType.PRIVATE)
-            val channel = if (isPrivate) event.privateChannel else event.channel
-            val arg = rawmsg.replaceFirst(api.selfUser.asMention, "").removePrefix(" ")
+            val arg = rawmsg.replaceFirst(api.selfUser.asMention, "").trimStart()
             if (arg.isEmpty()) return
             plugin.logDebug("Relay command received.  Arg: $arg")
 
-            // SCRIPTED RESPONSE - The bot replies with a preprogrammed response if it detects a corresponding trigger string
-            val responses = plugin.scripted_responses.data.getConfigurationSection("responses").getKeys(false)
+            // SCRIPTED RESPONSE - The bot replies with a pre-programmed response if it detects
+            // a corresponding trigger string
+            val responses = plugin.memory.data.getConfigurationSection("scripted-responses").getKeys(false)
             var scripted_response: String? = null
             for (r in responses) {
-                val casesensitive = plugin.scripted_responses.data.getBoolean("responses.$r.casesensitive", false)
-                if (arg.startsWith(plugin.scripted_responses.data.getString("responses.$r.trigger").toLowerCase(), !casesensitive))
-                    scripted_response = plugin.scripted_responses.data.getString("responses.$r.response")
+                val casesensitive = plugin.memory.data.getBoolean("scripted-responses.$r.case-sensitive", false)
+                if (arg.startsWith(plugin.memory.data.getString("scripted-responses.$r.trigger").toLowerCase(), !casesensitive))
+                    scripted_response = plugin.memory.data.getString("scripted-responses.$r.response")
             }
             if (scripted_response != null) {
                 plugin.logDebug("user $username has triggered the scripted response: $scripted_response")
                 plugin.sendToDiscord(scripted_response, channel)
-                if (event.isFromType(ChannelType.TEXT) && event.textChannel.name.equals(plugin.cfg.CHANNEL, true))
+                if (event.isFromRelayChannel())
                     plugin.sendToMinecraft(plugin.toMinecraftChatMessage(scripted_response, plugin.cfg.BOT_MC_USERNAME))
                 return
             }
 
             // CLEVERBOT - Assume anything else invokes Cleverbot
             plugin.logDebug("user $username asks CleverBot something")
-            val response = CommandLogic.askCleverbot(plugin.cfg.CLEVERBOT_KEY, arg)
+            val response = CommandLogic.askCleverbot(plugin, arg)
             plugin.sendToDiscord(response, channel)
-            // if this occurs in the relay channel, relay the response
-            if (event.isFromType(ChannelType.TEXT) && event.textChannel.name.equals(plugin.cfg.CHANNEL, true))
+            if (event.isFromRelayChannel())
                 plugin.sendToMinecraft(plugin.toMinecraftChatMessage(response, plugin.cfg.BOT_MC_USERNAME))
             return
         }
     }
 
+    private fun MessageReceivedEvent.isFromRelayChannel(): Boolean {
+        return this.guild.id == plugin.cfg.SERVER_ID
+                && this.isFromType(ChannelType.TEXT)
+                && this.textChannel.name.equals(plugin.cfg.CHANNEL, true)
+    }
+
     @Suppress("unused", "UNUSED_PARAMETER")
     fun onUnexpectedError(ws: WebSocket, wse: WebSocketException) {
         plugin.logger.severe("Unexpected error from DiscordBridge: ${wse.message}")
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Discord.kt b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Discord.kt
index 836e5ac..6a25083 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Discord.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Discord.kt
@@ -2,9 +2,7 @@ package gg.obsidian.discordbridge.minecraft.commands
 
 import gg.obsidian.discordbridge.Permissions
 import gg.obsidian.discordbridge.Plugin
-import gg.obsidian.discordbridge.UserAlias
-import net.dv8tion.jda.core.OnlineStatus
-import org.bukkit.ChatColor
+import org.bukkit.ChatColor as CC
 import org.bukkit.command.Command
 import org.bukkit.command.CommandExecutor
 import org.bukkit.command.CommandSender
@@ -14,7 +12,7 @@ class Discord(val plugin: Plugin) : CommandExecutor {
 
     override fun onCommand(player: CommandSender, cmd: Command, alias: String?, args: Array<out String>?): Boolean {
         if (args == null || args.isEmpty()) {
-            sendMessage("&eUsage: /discord <reload/alias/get>", player)
+            sendMessage("{${CC.YELLOW}Usage: /discord <reload/alias/get>", player)
             return true
         }
 
@@ -23,7 +21,7 @@ class Discord(val plugin: Plugin) : CommandExecutor {
             "alias" -> return handleDiscordAlias(player, args)
             "get" -> return handleDiscordGet(player, args)
             else -> {
-                sendMessage("&eUsage: /discord <reload/alias/get>", player)
+                sendMessage("${CC.YELLOW}Usage: /discord <reload/alias/get>", player)
                 return true
             }
         }
@@ -33,11 +31,11 @@ class Discord(val plugin: Plugin) : CommandExecutor {
         if (player is Player && !Permissions.reload.has(player)) return true
 
         if (args.size != 1) {
-            sendMessage("&eUsage: /discord reload", player)
+            sendMessage("${CC.YELLOW}Usage: /discord reload", player)
             return true
         }
 
-        sendMessage("&eReloading Discord Bridge...", player)
+        sendMessage("${CC.YELLOW}Reloading Discord Bridge...", player)
         plugin.reload()
         return true
     }
@@ -46,27 +44,20 @@ class Discord(val plugin: Plugin) : CommandExecutor {
         if (player !is Player) return true
 
         if (args.size != 2) {
-            sendMessage("&eUsage: /discord alias <discord id>", player)
+            sendMessage("${CC.YELLOW}Usage: /discord alias <discord id>", player)
             return true
         }
 
-        val users = plugin.getDiscordUsers()
-        val found: Triple<String, String, Boolean>? = users.find { it.second == args[0] }
-        if (found == null) {
-            sendMessage("&eCould not find Discord user with that ID.", player)
+        if (!plugin.registerUserRequest(player, args[1])) {
+            sendMessage("${CC.YELLOW}Could not find Discord user with that ID.", player)
             return true
         }
-
-        val ua: UserAlias = UserAlias(player.name, player.uniqueId.toString(), found.first,
-                found.second)
-
-        plugin.registerUserRequest(ua)
         return true
     }
 
     private fun handleDiscordGet(player: CommandSender, args: Array<out String>): Boolean {
         if (args.size < 2) {
-            sendMessage("&eUsage: /discord get <ids/online>", player)
+            sendMessage("${CC.YELLOW}Usage: /discord get <ids/online>", player)
             return true
         }
 
@@ -74,7 +65,7 @@ class Discord(val plugin: Plugin) : CommandExecutor {
             "ids" -> return handleDiscordGetIds(player, args)
             "online" -> return handleDiscordGetOnline(player, args)
             else -> {
-                sendMessage("&eUsage: /discord get <ids/online>", player)
+                sendMessage("${CC.YELLOW}Usage: /discord get <ids/online>", player)
                 return true
             }
         }
@@ -82,77 +73,28 @@ class Discord(val plugin: Plugin) : CommandExecutor {
 
     private fun handleDiscordGetIds(player: CommandSender, args: Array<out String>): Boolean {
         if (args.size != 2) {
-            sendMessage("&eUsage: /discord get ids", player)
-            return true
-        }
-
-        val users = plugin.getDiscordUsers()
-
-        if (users.isEmpty()) {
-            sendMessage("&eNo Discord members could be found. Either server is empty or an error " +
-                    "has occurred.", player)
+            sendMessage("${CC.YELLOW}Usage: /discord get ids", player)
             return true
         }
 
-        var response = "&eDiscord users:"
-        for (user in users) {
-            if (user.third) response += "\n&6- ${user.first} (Bot), ${user.second}&r"
-            else response += "\n&e- ${user.first}, ${user.second}&r"
-        }
-        //val response = users.joinToString("\n- ", "&eDiscord users:\n- ")
-        sendMessage(response, player)
+        sendMessage(plugin.getDiscordIds(), player)
         return true
     }
 
     private fun handleDiscordGetOnline(player: CommandSender, args: Array<out String>): Boolean {
         if (args.size != 2) {
-            sendMessage("&eUsage: /discord get online", player)
-            return true
-        }
-
-        val users = plugin.getDiscordOnline()
-
-        if (users.isEmpty()) {
-            sendMessage("&eNo Discord members could be found. Either server is empty or an error " +
-                    "has occurred.", player)
+            sendMessage("${CC.YELLOW}Usage: /discord get online", player)
             return true
         }
 
-        var response = ""
-        if (users.filter { it.third == OnlineStatus.ONLINE }.isNotEmpty()) {
-            response += "\n&2Online:&r"
-            for (user in users.filter { it.third == OnlineStatus.ONLINE }) {
-                if (user.second) response += "\n&2- ${user.first} (Bot)&r"
-                else response += "\n&2- ${user.first}&r"
-            }
-        }
-        if (users.filter { it.third == OnlineStatus.IDLE }.isNotEmpty()) {
-            response += "\n&eIdle:&r"
-            for (user in users.filter { it.third == OnlineStatus.IDLE }) {
-                if (user.second) response += "\n&e- ${user.first} (Bot)&r"
-                else response += "\n&e- ${user.first}&r"
-            }
-        }
-        if (users.filter { it.third == OnlineStatus.DO_NOT_DISTURB }.isNotEmpty()) {
-            response += "\n&cDo Not Disturb:&r"
-            for (user in users.filter { it.third == OnlineStatus.DO_NOT_DISTURB }) {
-                if (user.second) response += "\n&c- ${user.first} (Bot)&r"
-                else response += "\n&c- ${user.first}&r"
-            }
-        }
-
-        response.replaceFirst("\n", "")
-
-        sendMessage(response, player)
+        sendMessage(plugin.getDiscordOnline(), player)
         return true
     }
 
     private fun sendMessage(message: String, player: CommandSender) {
-        val formattedMessage = ChatColor.translateAlternateColorCodes('&', message)
-        if (player is Player) {
-            player.sendMessage(formattedMessage)
-        } else {
-            plugin.server.consoleSender.sendMessage(formattedMessage)
-        }
+        if (player is Player)
+            player.sendMessage(message)
+        else
+            plugin.server.consoleSender.sendMessage(message)
     }
 }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/EightBall.kt b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/EightBall.kt
new file mode 100644
index 0000000..e5c968e
--- /dev/null
+++ b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/EightBall.kt
@@ -0,0 +1,24 @@
+package gg.obsidian.discordbridge.minecraft.commands
+
+import gg.obsidian.discordbridge.CommandLogic
+import gg.obsidian.discordbridge.Permissions
+import gg.obsidian.discordbridge.Plugin
+import org.bukkit.command.Command
+import org.bukkit.command.CommandExecutor
+import org.bukkit.command.CommandSender
+import org.bukkit.entity.Player
+
+class EightBall(val plugin: Plugin) : CommandExecutor {
+    override fun onCommand(player: CommandSender, cmd: Command, alias: String?, args: Array<out String>?): Boolean {
+        if (args == null || args.isEmpty()) {
+            if (player is Player && Permissions.eightball.has(player)) {
+                var msg = CommandLogic.eightBall(plugin, player.name)
+                plugin.sendToMinecraft(plugin.toMinecraftChatMessage(msg, plugin.cfg.BOT_MC_USERNAME))
+                msg = plugin.translateAliasToDiscord(msg, player.uniqueId.toString())
+                plugin.sendToDiscord(msg, plugin.conn.getRelayChannel())
+            }
+            return true
+        }
+        return false
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/F.kt b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/F.kt
new file mode 100644
index 0000000..73a5de1
--- /dev/null
+++ b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/F.kt
@@ -0,0 +1,24 @@
+package gg.obsidian.discordbridge.minecraft.commands
+
+import gg.obsidian.discordbridge.CommandLogic
+import gg.obsidian.discordbridge.Permissions
+import gg.obsidian.discordbridge.Plugin
+import org.bukkit.command.Command
+import org.bukkit.command.CommandExecutor
+import org.bukkit.command.CommandSender
+import org.bukkit.entity.Player
+
+class F(val plugin: Plugin) : CommandExecutor {
+    override fun onCommand(player: CommandSender, cmd: Command, alias: String?, args: Array<out String>?): Boolean {
+        if (args == null || args.isEmpty()) {
+            if (player is Player && Permissions.f.has(player)) {
+                var msg = CommandLogic.f(plugin, player.name)
+                plugin.sendToMinecraft(plugin.toMinecraftChatMessage(msg, plugin.cfg.BOT_MC_USERNAME))
+                msg = plugin.translateAliasToDiscord(msg, player.uniqueId.toString())
+                plugin.sendToDiscord(msg, plugin.conn.getRelayChannel())
+            }
+            return true
+        }
+        return false
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Insult.kt b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Insult.kt
new file mode 100644
index 0000000..b9c86f3
--- /dev/null
+++ b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Insult.kt
@@ -0,0 +1,23 @@
+package gg.obsidian.discordbridge.minecraft.commands
+
+import gg.obsidian.discordbridge.CommandLogic
+import gg.obsidian.discordbridge.Permissions
+import gg.obsidian.discordbridge.Plugin
+import org.bukkit.command.Command
+import org.bukkit.command.CommandExecutor
+import org.bukkit.command.CommandSender
+import org.bukkit.entity.Player
+
+class Insult(val plugin: Plugin) : CommandExecutor {
+    override fun onCommand(player: CommandSender, cmd: Command, alias: String?, args: Array<out String>?): Boolean {
+        if (args == null || args.isEmpty()) return false
+
+        if (player is Player && Permissions.insult.has(player)) {
+            var msg = CommandLogic.insult(plugin, args.joinToString(" "))
+            plugin.sendToMinecraft(plugin.toMinecraftChatMessage(msg, plugin.cfg.BOT_MC_USERNAME))
+            msg = plugin.translateAliasToDiscord(msg, player.uniqueId.toString())
+            plugin.sendToDiscord(msg, plugin.conn.getRelayChannel())
+        }
+        return true
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Marina.kt b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Marina.kt
deleted file mode 100644
index 9dc8f1f..0000000
--- a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Marina.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package gg.obsidian.discordbridge.minecraft.commands
-
-import gg.obsidian.discordbridge.CommandLogic.askCleverbot
-import gg.obsidian.discordbridge.Permissions
-import gg.obsidian.discordbridge.Plugin
-import gg.obsidian.discordbridge.Utils.*
-import org.bukkit.command.Command
-import org.bukkit.command.CommandExecutor
-import org.bukkit.command.CommandSender
-import org.bukkit.entity.Player
-
-class Marina(val plugin: Plugin) : CommandExecutor {
-
-    override fun onCommand(player: CommandSender, cmd: Command, alias: String?, args: Array<out String>?): Boolean {
-        if (args == null || args.isEmpty()) return false
-
-        if (player is Player && Permissions.cleverbot.has(player)) {
-            val message: String = args.joinToString(" ")
-            player.chat("@${plugin.cfg.USERNAME.noSpace()} $message")
-            val response = askCleverbot(plugin.cfg.CLEVERBOT_KEY, message)
-            plugin.sendToMinecraft(plugin.toMinecraftChatMessage(response, plugin.cfg.BOT_MC_USERNAME))
-            plugin.sendToDiscord(response, plugin.connection.getRelayChannel())
-            return true
-        }
-        return true
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Rate.kt b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Rate.kt
new file mode 100644
index 0000000..5ba397c
--- /dev/null
+++ b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Rate.kt
@@ -0,0 +1,23 @@
+package gg.obsidian.discordbridge.minecraft.commands
+
+import gg.obsidian.discordbridge.CommandLogic
+import gg.obsidian.discordbridge.Permissions
+import gg.obsidian.discordbridge.Plugin
+import org.bukkit.command.Command
+import org.bukkit.command.CommandExecutor
+import org.bukkit.command.CommandSender
+import org.bukkit.entity.Player
+
+class Rate(val plugin: Plugin) : CommandExecutor {
+    override fun onCommand(player: CommandSender, cmd: Command, alias: String?, args: Array<out String>?): Boolean {
+        if (args == null || args.isEmpty()) return false
+
+        if (player is Player && Permissions.rate.has(player)) {
+            var msg = CommandLogic.rate(player.name, args.joinToString(" "))
+            plugin.sendToMinecraft(plugin.toMinecraftChatMessage(msg, plugin.cfg.BOT_MC_USERNAME))
+            msg = plugin.translateAliasToDiscord(msg, player.uniqueId.toString())
+            plugin.sendToDiscord(msg, plugin.conn.getRelayChannel())
+        }
+        return true
+    }
+}
diff --git a/src/main/resources/botmemory.yml b/src/main/resources/botmemory.yml
index 4399866..9e44592 100644
--- a/src/main/resources/botmemory.yml
+++ b/src/main/resources/botmemory.yml
@@ -1 +1,29 @@
-respects: 0
\ No newline at end of file
+8-ball-responses:
+  - 'It is certain.'
+  - 'Seems pretty likely.'
+  - 'Absolutely.'
+  - 'Definitely.'
+  - 'Yes.'
+  - 'I think so.'
+  - 'Without a doubt.'
+  - 'Signs point to yes.'
+  - 'Probably.'
+  - 'The opposite is certain.'
+  - 'Seems pretty unlikely.'
+  - 'Absolutely not.'
+  - 'Definitely not.'
+  - 'No.'
+  - 'I don''t think so.'
+  - 'There''s plenty of doubt.'
+  - 'Signs point to no.'
+  - 'Probably not.'
+  - 'I''m not sure.'
+  - 'That''s hard to say at this time.'
+  - 'It''s impossible to know. Unless you ask me again.'
+  - 'Figure it out on your own.'
+respects: 0
+scripted-responses:
+  '1':
+    case-sensitive: false
+    response: 'Hello World!'
+    trigger: 'hello world!'
\ No newline at end of file
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 89e0b8b..24ce4c4 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -1,30 +1,59 @@
-settings:
-  server-id: '00000000'
-  channel: 'test'
-  username: 'username'
-  username-color: ''
-  token: 'token'
-  cleverbot-key: ''
-  debug: false
-  relay_cancelled_messages: true
-  announce_server_start_stop: true
-  messages:
-    chat: true
-    join: true
-    leave: true
-    death: false
-  if_vanished:
-    chat: false
-    join: false
-    leave: false
-    death: false
-  templates:
-    discord:
-      chat_message: '<%u> %m'
-      player_join: '%u joined the server'
-      player_leave: '%u left the server'
-      player_death: '%r'
-      server_start: 'Server started!'
-      server_stop: 'Shutting down...'
-    minecraft:
-      chat_message: '<%u&b(discord)&r> %m'
+# DiscordBridge Config
+
+# The bot's Discord API access token
+token: ''
+
+# These values will control which channel the bot will watch to relay messages to and from the server.
+server-id: '00000000'
+channel: 'channel-name'
+
+# The bot's Discord username
+username: 'DiscordBridge'
+
+# (Optional) Apply formatting codes to the bot's name in Minecraft chat.
+# Use '&' in place of the formatting symbol.
+username-color: ''
+
+# (Optional) Set this value with a valid Cleverbot API key to enable chatting with Cleverbot
+# Look at https://www.cleverbot.com/api/ for more info
+cleverbot-key: ''
+
+# If true, prints verbose log messages to the server console for every action
+debug: false
+
+# If true, Minecraft chat events that are cancelled will still be relayed to Discord.
+relay-cancelled-messages: true
+
+# Controls which events in general are relayed to Discord
+messages:
+  player-chat: true
+  player-join: true
+  player-leave: true
+  player-death: false
+  server-start: true
+  server-stop: true
+
+# Controls which events caused by vanished players are relayed to Discord
+# NOTE: If set to true, it will only have effect if the corresponding message above is also set to true
+if-vanished:
+  player-chat: false
+  player-join: false
+  player-leave: false
+  player-death: false
+
+# Set the templates for relayed messages
+# %u - The sender's username
+# %m - The sender's message
+# %w - The name of the world the sender is in (Multiverse alias compatible)
+# %r - The death message (Death event only)
+# Use '&' in place of the formatting symbol to apply formatting codes.
+templates:
+  discord:
+    chat-message: '<**%u**> %m'
+    player-join: '**%u** joined the server'
+    player-leave: '**%u** left the server'
+    player-death: '%r'
+    server-start: 'Server started!'
+    server-stop: 'Shutting down...'
+  minecraft:
+    chat-message: '[&b&lDiscord&r]<%u> %m'
diff --git a/src/main/resources/insults.yml b/src/main/resources/insults.yml
new file mode 100644
index 0000000..06672e5
--- /dev/null
+++ b/src/main/resources/insults.yml
@@ -0,0 +1,504 @@
+insults:
+- "I hate you so much I can't even breathe."
+- "You really have an adorable smile. I'd like to annihilate it with my monstrous penis."
+- "For the love of God simply stop being a miserable butt muncher for at least the next 10 minutes."
+- "Eat a knob, you Colombian cock farmer."
+- "My idea of a romantic Thursday morning is watching hooker obliterate your colon."
+- "I just douched a hunk of ham out of my roomy hog funnel and it was the spitting image of you."
+- "Hey pork chop, I find your back fat revolting."
+- "Suck a bushel of putrid dicks."
+- "Die in an ocean of anal pus, you pitiable cocksucker."
+- "You have a yeast infection. Don't cry though, it's not the worst thing that could happen. You're also going to die from it."
+- "I will bash you square in your stinking cunt, you retarded cock."
+- "The point is, you no longer have the ability to socialize normally. It's most likely because you have dendrophilia."
+- "Drown in a puddle of your own excrement, you shitty bastard."
+- "The truth is, you no longer have the ability to function. It's presumably because you have alcoholism."
+- "My idea of a superb Friday evening is seeing a jogger abuse your whore mouth."
+- "My girlfriend and I are having an excessively hard time picturing a bleaker destiny than seeing you naked."
+- "I just douched a piece of tomato out of my huge cooch and it was the spitting image of you."
+- "I'm not saying you're a slut, but if your beaver had a password, it would be qwerty."
+- "It seems like every time I think I might try to talk to you for more than a couple minutes, you shout at the homeless and I have to apologize to everyone on your behalf."
+- "You disgust me so completely that I burn an effigy of you every Winter Solstice."
+- "Wallow in an ocean of smegma, you pitiable fuckhole."
+- "The way I understand it, there is no way in hell I would come within a thousand feet of your stinking cooch."
+- "I will buttfuck you so vengefully that your bathroom will smell for hours."
+- "Hey wide load, I find your quivering back fat terrible to behold."
+- "Go fuck yourself, you classless, illiterate, homophobic teabagger."
+- "Just so we're clear, there is no fucking way I would come within a kilometer of your wretched spunk dumpster."
+- "You are fucking unattractive, grungy, retarded, you reek and you will forever be alone."
+- "I will fuck you so vengefully that your living room will stink for weeks."
+- "If you have any self respect just shut your overfucked face, you slow piss drinker."
+- "Just so we're clear, there is no fucking way I would come within three counties of your bloody tits."
+- "Go fuck your dad, you lonely shitfalcon."
+- "OK fucklord, here's how it's gonna work. You either loosen the fuck up, or I will literally burn your house down."
+- "Every damn time I intend to visit you in prison, you spit at strangers and I forget why I wanted to hang out with you in the first place."
+- "Everyone says the only loving you get is from your dad."
+- "A pox on thy family, thou horrible common-kissing herb woman."
+- "We should hang out sometime, it's legendary to visit with someone with so many dependencies."
+- "I hate you so much I can't even go to the bathroom by yourself."
+- "Every time I see a hippie take a monsterous liquid shit on television, it reminds me of you."
+- "You are not even remotely swell, in fact you're a shit-breathing bitch."
+- "I'm not saying you're a ho, but if your messy cleft palate had a password, it would be qwerty."
+- "Don't give me an excuse to take a humungous fucking crap on you while you sleep."
+- "Why the hell do you reek like your Mom just crapped you out, did you embrace your love of wallowing in your own shit?"
+- "Nobody who knows you cares about your aspirations, in fact I honestly think it would be the best for everyone if you just died."
+- "I can't wait until you experience tapeworms."
+- "Oh man, do you remember when when your best friends went to New York City? You don't? Oh yeah, now I remember, nobody wants to be around you."
+- "It is written that you regularly shit yourself."
+- "I often like to go for a jog and picture you being publically executed."
+- "People don't hate you because you're humpbacked. I mean you are uncommonly humpbacked, that's just not why people hate you."
+- "Hey doublewide, I find your back fat appalling."
+- "Fuck yourself, you classless, hillbilly, unsophisticated meth baby."
+- "I'm going to bend over so you can lick my butthole, you nasty sack of ass."
+- "Absolutely nobody cares about your dreams, in fact I honestly think it would save everyone a lot of trouble if you hung yourself in your fucking closet."
+- "I don't loathe you because you're senseless or because you're disfigured, I loathe you because you're a Republican."
+- "I'd rather masturbate with a jar full of scorpions to Sarah Palin rolling around in gravy than spend another day with you."
+- "Oh man, do you remember when when your co-workers went on vacation to Europe? Haha, you don't? Aw shit, I can't believe I forgot, nobody wants to spend time with you."
+- "I very much hope you get a urinary tract infection."
+- "Sometimes I like to relax in the hot tub and envision you being shot."
+- "I have heard that your festering and shriveled penis has been steadily retreating into your fat pelvis."
+- "I'm not saying you're a skank, but if your dick holster had a password, it would be 1234."
+- "I'd rather masturbate with battery acid to horse surgery than be your friend."
+- "Dude we are not going back to that whorehouse, what the fist-fucking christ is the matter with you?"
+- "You will never survive to see your children grow up."
+- "Why don't you suck ejaculate from my asshole, you grungy prick."
+- "You're the first nerd I've ever hungered to slay."
+- "I don't dislike you because you're simpleminded or because you're deformed, I dislike you because you're white."
+- "I would smother you, but then the title of &quot;Most awesomely disgusting spermatorium on the planet&quot; would be awarded to someone else."
+- "I will pummel you square in your fishy flabby meat flap, you hideous fuck."
+- "My version of a superb Monday morning is witnessing a Catholic stab your hole."
+- "You are not at all hot, in fact you're a butt fister."
+- "Wouldn't you like to hear something that would make me excessively elated? You being brutally fucked by an angry mob."
+- "Bitch, you best shift yo fat white ass you shit-ass moose knuckle."
+- "For the love of God shut your dripping mouth, you foolish druggie."
+- "Everyone says that your huge vagina smells like lobsters."
+- "Hey, remember that time when your best friends became adults? You don't? Oh yeah, I can't believe I forgot, everyone finds you repulsive."
+- "You have a shitty sense of humor, terrible swamp ass, and you're pretty fucking irritating."
+- "You are so sexy. And by sexy I actually mean loathsome."
+- "Eat a man spear, you Iraqi AIDS patient."
+- "Your shitty odor is in fact revolting."
+- "Uh, eat shit, you bitch. I don't want your fat ass in my life."
+- "I heard the only fucking you get is from your brother."
+- "Scholars will write parables of your outrageous slowness for many years after an angry mob kills you."
+- "You have a dreadful wife, bad morals, and you're pretty fucking fat."
+- "I dream of a time when you get giardia."
+- "Piss off, you poor, ignorant, banjo playing hog wrestler."
+- "We should meet up, it's absurd to talk to someone with real and crippling issues."
+- "You're the first moron I've ever needed to slaughter."
+- "I will give you a Chinese steamboat."
+- "I can't explain how much I need you to simply stop being an insignificant swamp donkey for at least a few days."
+- "I just queefed a hunk of carrot out of my cavernous cunt and it was the spitting image of you."
+- "Do chug a can of ejaculate, you son of a bitch."
+- "You have a horrible girlfriend, bad ambitions, and you're pretty fucking dumb."
+- "Get out of my life, you displeasing cuntass."
+- "You are gross, nasty, dumb, you reek and I never want to see you again."
+- "Your continued existence makes me sad."
+- "Die in a lake of anal pus, you wretched cocksucker."
+- "I just farted a piece of silly putty out of my humongous snatch and it looked a lot like you."
+- "Why are you bitchy, dicknose, did someone take a big old poop in your cocoa puffs?"
+- "Yeah I know that you're a good-for-nothing nerd, but holy shit, throw yourself off the nearest bridge."
+- "I will bash you straight in your festering slit, you piece of shit slut."
+- "I heard the only loving you get is from your mom."
+- "I will fuck you so spitefully that your bed will stink for years."
+- "I'm not saying you're a slut, but if your flabby meat flap had a password, it would be 11111."
+- "I wake up every morning hoping that you are diagnosed with cancer."
+- "I just can't feel sorry for the family member I poisoned."
+- "Go suck your Dad's dick, you destitute, hillbilly, inbred crack baby."
+- "Go shake your ears, thou dastardly crook-pated cursed drab."
+- "I'm fully aware that you're a valueless shitfalcon, but holy titty-fucking christ, throw yourself off the nearest bridge."
+- "We should meet up next week, it's overwhelming to see someone with so many dependencies."
+- "My idea of a perfect Tuesday afternoon is witnessing an ape forcefuck your throat."
+- "Nobody gives one single fuck about your opinions, in fact I really think it would make the world a better place if you were hit by a train."
+- "Why are you so aggravated, dickface, did someone take a poop in your fruit loops?"
+- "I'd rather masturbate with a weedwhacker to Kim Jong Un than spend another day with you."
+- "Every time I see an ape take a gigantic moist poop in the park, it reminds me of you."
+- "I hope that someday soon you suffocate on your own dick, you leg humping bastard."
+- "Hey, remember that time when your family took a vacation to the Bahamas? Oh, you don't? Ahh right, now I remember, nobody can tolerate your presence."
+- "I loathe you so much I can't even have a baby."
+- "I find you so detestable that I have night terrors now."
+- "Why are you angry, skid row, did someone take a big old shit in your backpack?"
+- "In comparison with you, drowning doesn't seem so bad."
+- "You're the first prick I've ever desired to sacrifice."
+- "My understanding is that the only action you get is from your wet towel."
+- "I hate you so much I can't even go to the bathroom by yourself."
+- "Sit on a pole and rotate, you wretched fuckdoll."
+- "Dude be polite, what the shit slinging fuck is the matter with you?"
+- "You are not even remotely sweet, in fact you're a pile of shit."
+- "My understanding is that the only action you get is from your brother."
+- "Keep talking and I will take a mutant wet shit directly into your mouth."
+- "If the tales are true, you no longer have the ability to walk in a straight line. It's presumably because you have rabies."
+- "My version of a splendid Friday night is watching a fat chick wreck your chasm."
+- "The realization that you're not dead hurts the human race as a species."
+- "Just quaff a bucket of cockwater, you cock."
+- "You are fucking unattractive, raunchy, senseless, you reek and you're pathetic."
+- "Dear Lord just stop being an insignificant whorebag for at least the rest of the evening."
+- "You're the first fucker I've ever aspired to smother."
+- "Get off my dick, you annoying poopmonster."
+- "Your Mom says your turn-ons consist of messy butthole fondling and frogs in your butt."
+- "When you least expect it I will take a huge stinking poop in your garage."
+- "Why don't you suck ejaculate from my asshole, you filthy twat."
+- "Goddamn you are deformed and you smell, let's just hang out sometime so I can put you out of your misery."
+- "I really give not a single fuck about your worthless life, in fact I really think things would just be better if you hurled yourself into traffic."
+- "In comparison with you, Hitler seems not so scary."
+- "You are gross and you smell like muff mustard."
+- "Dude, sod off, you dick. I don't need you in my life now or ever."
+- "Sometimes I like to relax and visualize you as my slave."
+- "You really have a cute ass. It's a shame I have to ravage it with my mutant pants porpoise."
+- "Historians will spin yarns of your epic mental deficiency for decades after your murder."
+- "I will give you a Cuban waxing."
+- "The moral of the story is, there is no motherfucking way I would come within pissing distance of your shriveled nappy dugout."
+- "Fuck you with a pitchfork."
+- "Bro, you best shut the fuck up you shit-ass porch monkey."
+- "Storytellers will be making fun of your outrageous mindlessness for many lifetimes after your death."
+- "Every time I see a journalist take a monsterous steaming shit at a comic book convention, it reminds me of you."
+- "Listen son, you best shut the fuck up you crack smokin' gaylord."
+- "I will bash you straight in your shriveled vag, you Jewish cock."
+- "Eat a dyke spike, you Mexican pedophile."
+- "Storytellers will write parables of your immense brainlessness for many lifetimes after I kill you."
+- "I will kick you straight in your rotting nappy dugout, you heinous fuck."
+- "I don't despise you because you're mentally deficient or because you're repelling, I despise you because you have poor taste in nearly everything."
+- "Most people say that the reek of your taint is vomit-inducing."
+- "You really have a hot ass. I'd like to ravage it with my humungous unit."
+- "I don't even feel sorry for the family member I poisoned."
+- "Listen up whitebread, you gonna need a new face when I'm through with yo ass you pole smokin' hillbilly."
+- "I'd rather masturbate with a riding crop to a pile of shit than wake up next to you."
+- "I was thinking about you on Sunday night, and oh my good god I needed to felch you in a beastly manner."
+- "Jesus you are foul and you reek, why don't we hang out so I can shoot you in the face."
+- "You have anal herpes. Never fear however, the news isn't all bad. You're also going to get hit by a train."
+- "I find you so detestable that I told everyone you have AIDS."
+- "Why in God's name do you reek like dolphin queef, did you void your bowels?"
+- "I will be the man your father was and you will be living behind a dumpster."
+- "I saw you on Facebook on Wednesday evening, and oh my sweet christ I needed to finger you in a disgusting manner."
+- "I find it hard to feel sorry for you."
+- "I will survive to see your children grow up and you will be hanging by your neck."
+- "I'm definitely going to take a huge wet shit on your floor."
+- "I'm fully aware that you're a trashy twat, but holy shitting fuck, fuck off."
+- "Why don't you come here and suck man batter from my butt cave, you scuzzy bitch."
+- "Your purposeless existence makes the world seem a little less nice."
+- "Go fuck yourself, you repugnant twatbag."
+- "Your shitty odor is totally repulsive."
+- "Go fuck your stuffed animals, you shitty fuck."
+- "Everyone says that your tits are sagging prematurely."
+- "I will give you a Chinese mudbath."
+- "In a couple weeks, you will almost certainly be giving handjobs to a convict in a deserted brothel for coke, you hateful prick."
+- "I will be happy with your life and you will be buried in a shallow grave."
+- "Don't you just have a gorgeous smile. It's a shame I have to ruin it with my gigantic veiny bastard."
+- "I will kill you if you don't shut your white cake hole, you idiotic republican."
+- "Listen up whitebread, you best bounce the fuck outta here you dumb shit fuckwit."
+- "Every damn time we attempt to hang out with you, you whisper dark curses to other peoples pets and I have to apologize to everyone on your behalf."
+- "I have heard that there are religious groups contemplating ways in which to render you sterile."
+- "The fact of the matter is, there is absolutely no way I would come within pissing distance of your festering dick holster."
+- "I hope that someday soon you get a yeast infection in your mouth."
+- "I'm not saying you're a ho, but if your moose knuckle had a password, it would be hellohello."
+- "Fuck you with a snow shovel."
+- "I pray that a strange dude kills you in the snow, you aborted cunt."
+- "So I know that you're a worthless twat, but holy shitting fuck, eat a bag of dicks."
+- "I don't loathe you because you're witless or because you're disfigured, I loathe you because you're a Republican."
+- "Oh man, do you remember when when your co-workers went on vacation to Europe? Oh, you don't? Oh right, I completely forgot, nobody can tolerate your presence."
+- "I just queefed a piece of baseball bat out of my gaping spunk dumpster and it looked a lot like you."
+- "Eat a bushel of bloody dicks."
+- "Damn you have a hot ass. It's a shame I have to demolish it with my giant cock."
+- "When compared to you, drowning isn't really that bad."
+- "Listen up whitebread, you best shut the fuck up you shit-ass fuckwit."
+- "I'd rather masturbate with a live piranha to horse surgery than see you again."
+- "You have a terrible laptop, dreadful goals, and you're pretty fucking disgusting."
+- "Your overpowering stench is in fact nasty."
+- "I'm not saying you're a skank, but if your labia had a password, it would be 11111."
+- "You are hereby cordially invited to shut your fucking cake hole, you insignificant barrel of ass."
+- "Everyone says the only fucking you get is from disease-ridden prostitutes."
+- "You have a shitty car, terrible morals, and you're pretty goddamn irritating."
+- "My version of a fantastic Saturday night is watching a game show host ram your taint."
+- "You are welcome to shut your face, you inconsiderate bag of lard."
+- "You're the first bitch I've ever desired to asphyxiate."
+- "In comparison with you, drowning in a sea of shit isn't so bad."
+- "I have heard that you have a tiny penis."
+- "I would exterminate you, but then the title of &quot;Most monstrously hideous fuckass on the planet&quot; would be awarded to someone else."
+- "People don't hate you because you're homely. It's true that you are uncommonly homely, that's just not why people hate you."
+- "Not even your closest friends care about your pathetic life, in fact I sometimes think it would save everyone a lot of trouble if we killed you."
+- "Damn you're sexy. And by sexy I of course mean gross."
+- "Boils and plagues plaster you over, thou malevolent horn-mad kitchen trull."
+- "I don't despise you because you're senseless or because you're gross, I despise you because you're white."
+- "You have a shitty job, shitty swamp ass, and you're pretty fucking useless."
+- "We should meet up, it's astonishing to visit with someone with such major problems."
+- "Run along and gargle a tub of ejaculate, you twat."
+- "Every time I see a weird looking guy take a giant moist poop in the park, it reminds me of you."
+- "You are unbeautiful and you smell like pussy pesto."
+- "I will screw you so brutally that your garage will smell for months."
+- "Why are you so pissed off, cockbreath, did someone poop in your glove box?"
+- "Sure you can jump my chocolate starfish, you scuzzy twat."
+- "I will pummel you square in your shriveled devil's hallway, you throbbing slut."
+- "You are foul and you smell like anus aoli."
+- "People don't hate you because you're fucking unattractive. Don't get me wrong you are uncommonly fucking unattractive, that's just not why people hate you."
+- "Everyone says that even your friends are reluctant to spend time with you."
+- "Bathe in an ocean of anal pus, you pitiable son of a bitch."
+- "Listen, sod off, you son of a bitch. I do not need your daddy issues in my life now or ever."
+- "If you have any self respect just just quit being a terrible shitass for at least the rest of the evening."
+- "Go fuck yourself, you annoying cuntface."
+- "You are homely and you smell like nipple scabs."
+- "You have downs syndrome. Never fear however, the news isn't all bad. You're also going to die tomorrow."
+- "In a year, you will almost certainly be weeping silently while being ridden by a fat guy in a derelict restaurant for cheap liquor, you worthless whore."
+- "I heard the only loving you get is from your mom."
+- "I will buttfuck you so harshly that your room will stink for weeks."
+- "If you have even a single shred of decency you'll just quit being a terrible dog raper for at least the rest of the evening."
+- "Fuck you with a post digger."
+- "Your Mom says your turn-ons are old man fondling and feces."
+- "Squat on a jar, you wretched fuckdoll."
+- "Get off my dick, you dreaded cockweasel."
+- "It suddenly strikes me that you're nice. And by nice I really mean foul."
+- "Hey, remember that time when your co-workers went on vacation to Europe? Wow, you don't? Oh damn, I can't believe I forgot, nobody wants to be around you."
+- "You have a horrid wife, terrible pants, and you're pretty goddamn dumb."
+- "I am inclined to believe you love goats just a bit too much."
+- "People don't loathe you because you're homely. Don't get me wrong you are astonishingly homely, that's just not why people loathe you."
+- "I'm fucking begging you to shut your dickless orifice, you senseless cock-fuck."
+- "A lot of people think that your turn-ons are old woman fondling and fecal painting."
+- "I just can't feel sorry for your hideous face."
+- "I'm definitely going to take a huge runny shit inside your chest cavity."
+- "I don't even feel sorry for the time we all forgot your birthday."
+- "There are rumors that your turn-ons consist of camel fondling and assless chaps."
+- "Your stench is utterly lousy."
+- "I would slaughter you, but then the title of &quot;Most loathsome shitface in existence&quot; would pass on to someone else."
+- "I will strike you straight in your wretched shaggy DA, you rotting loser."
+- "Eat a bowl of severed dicks."
+- "If what I hear is true, there is no motherfucking way I would come within pissing distance of your festering flabby meat flap."
+- "I'm not saying you're a ho, but if your moose knuckle had a password, it would be 1234."
+- "Go fuck your tube sock you fucker."
+- "You make it very hard to feel sorry for that time in high school."
+- "You can go right ahead and screw my cornhole, you foul butthole."
+- "I hope that someday soon you get necrotizing fasciitis."
+- "Suck a sack of bloody dicks."
+- "Why the hell do you reek like you showered in feces, did you use your own feces as shaving cream?"
+- "I will buffet you straight in your stinking twat, you heinous cunt."
+- "I'm sure it's true that your loose ham cave is starting to rot."
+- "Suck a fat dick, you classless, ignorant, narrow-minded republican."
+- "I dream of a time when a thug donkey punches you in a tree, you vomit-inducing child molester."
+- "Eat a pound of gorilla dicks."
+- "I'm not saying you're a ho, but if your cunt had a password, it would be hellohello."
+- "I will give you a Russian steamboat."
+- "I often like to take a nap and picture you being tortured."
+- "Why are you bitchy, shitfalcon, did someone poop in your Captain Crunch?"
+- "You are appalling and you smell like rectum relish."
+- "I hope that someday soon a football team murders you in a tree, you dripping transvestite."
+- "You have fleas. Never fear however, the news isn't all bad. You're also going to die."
+- "I will see her again and you will be hanging by your neck in your fucking closet."
+- "I'd rather masturbate with a live piranha to Sarah Jessica Parker than see you naked."
+- "I can't wait until you break your last wagon tongue miles from chimney rock."
+- "I'm going to bend over so you can screw my bleached butthole, you dirty sack of ass."
+- "I'm not saying you're a slut, but if your vag had a password, it would be 12345."
+- "Leave me the fuck alone, you repugnant pooplord."
+- "Yeah I know that you're a terrible shitfalcon, but holy word, go hang yourself."
+- "You are fucking motherfucking hideous and you reek, we should hang out sometime so I can strangle you."
+- "In comparison with you, cancer sounds pretty good."
+- "Seriously why do you smell like a plague victim, did you fingerbang a diarrheal pork lover?"
+- "Do quaff a cup of spunk, you loser."
+- "Bro, I'ma smack up yo dumb cracka ass you lazy piece of shit fuckass."
+- "It suddenly strikes me that you're nice. And by nice I of course mean awesomely disgusting."
+- "Minstrels will be making fun of your breathtaking slowness for milennia after your death is met with joy and laughter."
+- "Sometimes I like to chill out at home and envision you being disemboweled."
+- "The painful reality that is your life makes me hit my wife."
+- "Your nauseating stink is utterly heinous."
+- "I will buffet you square in your stinking flabby meat flap, you piece of shit nerd."
+- "Damn you're sexy. And by sexy I actually mean hideous."
+- "You will never grow up."
+- "You are gross and you smell like nipple scabs."
+- "Drown in a puddle of your own excrement, you wretched cunt."
+- "I just farted a piece of potato out of my gaping hatchet wound and it looked just like you."
+- "I can't wait until a hooker kills you in central park, you oversexed tranny."
+- "Why are you so bitter, Tinkerbell, did someone take a poop in your purse?"
+- "Some say that your tits are sagging prematurely."
+- "I will skullfuck the shit out of you, you wretched bitch."
+- "For the love of god why do you smell like buttrot, did you void your bowels?"
+- "You are invited to shut the fuck up, you intolerant bag of boiled dicks."
+- "My understanding is that the only loving you get is from your wet towel."
+- "You are not even close to good looking, in fact you're a douche spigot."
+- "Your astonishing stench is just so horrible."
+- "My idea of a flawless Sunday morning is watching a convict wreck your neck."
+- "I wake up every morning hoping that you suffocate on a plastic dick, you disgusting cunt."
+- "I just queefed a piece of potato out of my roomy hog funnel and it looked kind of like you."
+- "You will never find someone to love."
+- "It would be fantastic if you shut your fucking mouth, you unthinking bag of shit."
+- "I hope that someday soon a southerner humps you in grand union, you overfucked tranny whore."
+- "I'm not saying you're a slut, but if your gash had a password, it would be 12345."
+- "Do slurp a bucket of man batter, you nerd."
+- "You are not at all cool, in fact you're a tard."
+- "Just so we're clear, there is absolutely no way I would come within ten feet of your festering cooch."
+- "Go fuck yourself, you repellent fucksicle."
+- "I fervently hope a Canadian dick-whips you in the woods, you rotting republican."
+- "I have heard that the reek of your taint is vomit-inducing."
+- "We should meet up, it's overwhelming to see someone with so many future health problems."
+- "Every time I see a rapist take a gigantic stinking poop on the subway, it reminds me of you."
+- "You're the first bitch I've ever strongly desired to poison."
+- "My version of a brilliant Wednesday afternoon is watching a yeti mutilate your taint."
+- "Listen up whitebread, you best pull that dick out yo face you pole smokin' tranny."
+- "So I know that you're a good-for-nothing skank, but holy shit-slinging fuck, go fuck yourself."
+- "People don't despise you because you're repugnant. Don't get me wrong you are unbelievably repugnant, that's just not why people despise you."
+- "I don't want to visit your apartment, even your own friends don't want to visit your apartment, perchance it would save everyone a lot of trouble if you threw yourself from the tallest building you could find."
+- "Ugh you are just foul and you smell, let's just hang out sometime so I can drown you myself."
+- "I just farted a hunk of silly putty out of my gigantic serpent socket and it looked just like you."
+- "I would execute you, but then the title of &quot;Most awesomely disgusting douche caboose in the universe&quot; would be awarded to someone else."
+- "A pox on thy family, thou spiteful idle-headed king of codpieces."
+- "Suck a bushel of putrid dicks."
+- "Every time I see a&amp;nbspgorilla take a gigantic moist poop out of a moving vehicle, it reminds me of you."
+- "People don't hate you because you're foul. Don't get me wrong you are unbelievably foul, that's just not why people hate you."
+- "We should meet for coffee, it's legendary to see someone with so many lice."
+- "You are not at all good looking, in fact you're a child molester."
+- "People don't dislike you because you're disfigured. Don't get me wrong you are unbelievably disfigured, that's just not why people dislike you."
+- "I'm not saying you're a slut, but if your serpent socket had a password, it would be 12345."
+- "People don't hate you because you're foul. Don't get me wrong you are astonishingly foul, that's just not why people hate you."
+- "The point is, there is no way in hell I would come within spitting distance of your wretched stench trench."
+- "We should meet up next week, it's absurd to have a conversation with someone with such major problems."
+- "Hey, remember that time when your best friends took a vacation to the Bahamas? Oh, you don't? Oh right, I can't believe I forgot, everyone hates you."
+- "Fuck you with a snow shovel."
+- "Please be quiet, you discourteous sack of ass."
+- "The reality that you're still alive keeps me up at night."
+- "I'd rather masturbate with battery acid to Kim Jong Un than be friends with you."
+- "You really have a beautiful smile. I'd like to wreck it with my monsterous trouser snake."
+- "Go fuck disease-ridden prostitutes, you shitty douche."
+- "You have lupus. Never fear however, it's not the end of the world. You're also going to be murdered."
+- "In just over a year, I'd be surprised if you weren't porking strange men in a deserted factory for scratch tickets, you despicable nerd."
+- "Rub my crab-infested pubes in your eyes, you terrible son of a bitch."
+- "I will bang you so thoroughly that your kitchen will smell for days."
+- "Your brother says that your turn-ons include messy butthole banging and stomach hair."
+- "It feels like every time I intend to talk to you for more than a couple minutes, you start talking about high school and I forget why I wanted to hang out with you in the first place."
+- "It's simply an uncommonly laborious time envisioning a more dreadful future than watching you poop."
+- "Seriously why do you reek like buttrot, did you move in with a cow?"
+- "Sure you can suck cockwater from my rectal opening, you filthy fuck."
+- "You're the first shitfalcon I've ever hoped to suffocate."
+- "You're the first shitlord I've ever hoped to execute."
+- "You are loathsome, dirty, idiotic, you smell and you're pathetic."
+- "You're the first loser I've ever desired to drown."
+- "Every time I see a fat chick take a humungous poop at a comic book convention, it reminds me of you."
+- "We should hang out, it's overwhelming to be in the same room with someone with actual STDs."
+- "Die in an ocean of shit, you pathetic son of a bitch."
+- "Everyone says the only action you get is from your cousin."
+- "I want you to hump my pooper, you foul piece of shit."
+- "Goddamn you are disfigured and you smell, let us hang out sometime so I can drown you myself."
+- "For fuck's sake fucking stop being a trashy dick chaser for at least the rest of the evening."
+- "I will give you a Vietnamese corndog."
+- "I will grow old and you will be in prison."
+- "Go fist yourself, you insignificant son of a bitch."
+- "I dislike you so much I can't even stand without crying."
+- "You have cholera. Don't cry though, it's not the worst thing that could happen. You're also going to die."
+- "I'm pretty sure I saw you on Friday, and oh my christ I longed to pound you in a horrible manner."
+- "I will be attractive and you will be hanging by your neck in your fucking closet."
+- "Man, fuck off, you bitch. I don't need to deal with you right now."
+- "You are humpbacked and you smell like dick cheese."
+- "So I know that you're a miserable moron, but holy shit, hang yourself."
+- "I'm not saying you're a skank, but if your hog funnel had a password, it would be hellohello."
+- "When compared to you, being killed doesn't seem so bad."
+- "It suddenly strikes me that you're sexy. And by sexy I really mean unsightly."
+- "I will give you a Iraqi bee sting."
+- "Fuck you with a post digger."
+- "You're the first loser I've ever hungered to eradicate."
+- "Storytellers will still be amazed by your horrifying half-wittedness for centuries after you are hanged."
+- "If you have any self respect just just stop being a trashy leg humper for at least a few years."
+- "Your unbelievable odor is utterly gruesome."
+- "Why are you upset, bitchtits, did someone take a poop in your soup?"
+- "I don't want to visit you in prison, even your own family doesn't want to visit you in prison, possibly it would solve a lot of problems if we killed you."
+- "I don't dislike you because you're brainless or because you're motherfucking hideous, I dislike you because you're white."
+- "I am inclined to believe you adore children a trifle too much."
+- "I believe that you are the ugliest human alive."
+- "You are not at all sweet, in fact you're a wanker."
+- "You're the first fuck I've ever aspired to slaughter."
+- "Why are you angry, Nancy Drew, did someone take a big old shit in your soup?"
+- "Fuck you with a pitchfork."
+- "When compared to you, getting a blowjob from a crocodile doesn't seem so bad."
+- "Your continued existence is what causes people to cross the street when they see you."
+- "The fact you haven't killed yourself makes me realize there is no justice in the world."
+- "I would execute you, but then the title of &quot;Most gross dicknose in the universe&quot; would be awarded to someone else."
+- "Why are you so pissy, shitbreath, did someone shit in your yogurt?"
+- "We should hang out, it's overwhelming to be in the same room with someone with so much baggage."
+- "Hey you ate all my oreos, what the hell is the matter with you?"
+- "Why are you in a bad mood, shitbreath, did someone take a big old poop in your frosted flakes?"
+- "Nobody who knows you cares about your wishes, in fact we all agreed that it would make the world a better place if you just died."
+- "Go fuck your mom you bitch."
+- "Yeah I know that you're an insignificant skank, but holy shitsnacks, get fucked."
+- "You are not at all swell, in fact you're a cocksucker."
+- "I hate you so much I can't even have children."
+- "I'd rather masturbate with scissors to a pile of shit than be friends with you."
+- "You definitely have a pretty ass. I'd like to wreck it with my mutant dyke spike."
+- "Every time I see a drug dealer take a humungous moist poop while giving head, it reminds me of you."
+- "Dude get in the car, what the dick is the matter with you?"
+- "Wallow in a lake of diarrhea, you sorrowful asshole."
+- "Wow you have a gorgeous smile. It will be enjoyable to annihilate it with my giant pants porpoise."
+- "I just douched a chunk of potato out of my huge vagina and it looked a little bit like you."
+- "The truth is, you lack the ability to go to the bathroom by yourself. It's most likely because you have warts."
+- "Thy loins are ripe, thou repugnant crook-pated knave."
+- "Just so we're clear, you no longer have the ability to walk in a straight line. It's most likely because you have expleosive diarrhea."
+- "I'm not saying you're a ho, but if your serpent socket had a password, it would be qwerty."
+- "You're the first fucker I've ever desired to strangle."
+- "You repulse me so thoroughly that I sometimes weep at the thought of you."
+- "Eat a dick, you Japanese cotton picker."
+- "I can't wait until you suffocate on a homeless man's cock, you tree hugging asshole."
+- "If you have even a single shred of decency you'll shut your smelly mouth, you witless cum chaser."
+- "Why are you cunty, cockbreath, did someone take a poop in your funyuns?"
+- "Everyone says the only fucking you get is from your brother."
+- "I dream of a time when you get genital warts."
+- "Suck a bucket of salted dicks."
+- "Listen, eat shit, you shitlord. I do not need your fat ass in my life now or ever."
+- "I dream of a time when you suffocate on an unfamiliar cock, you filthy fucking piece of shit."
+- "Fuck you with a hoe."
+- "People don't despise you because you're repulsive. I mean you are astonishingly repulsive, that's just not why people despise you."
+- "Hey, remember that time when your co-workers became productive members of society? You don't? Oh damn, I can't believe I forgot, nobody wants to be around you."
+- "Suck a satchel of gorilla dicks."
+- "I fervently hope a hideous chick slaps you in a horse stall, you shit-eating porch monkey."
+- "Oh my christ why do you reek like you bathed in a swamp, did you make love to a manure pile?"
+- "Hey ham planet, I find your quivering back fat difficult to believe."
+- "Fuck you, you poverty-stricken, backwoods, moonshine-drinking couch jockey."
+- "Why are you so aggravated, dicknose, did someone poop in your Captain Crunch?"
+- "In just over a year, I believe strongly that you'll be presenting yourself for anal sex to an ugly ugly man in a godforsaken basement for free, you wretched shitfalcon."
+- "I'm encouraging you to shut your face, you intolerant barrel of feces."
+- "For your information, you can no longer solve simple problems. It's presumably because you have tapeworms."
+- "Every fucking time we try to be your friend, you expose yourself to strangers and I realize you're just not worth it."
+- "I suspect you like craigslist a trifle too much."
+- "I hate you so much I can't even pee standing up."
+- "I will pummel you square in your swampy stench trench, you christian whore."
+- "Down to hell and say I send thee thither, thou wretched pottle-deep egregious dog."
+- "I'm not saying you're a slut, but if your shaggy DA had a password, it would be qwerty."
+- "A lot of people think that your turn-ons are slippery butt licking and NASCAR."
+- "We should hang out sometime, it's legendary to hang out with someone with such major problems."
+- "Go rate thy minions, thou wretched dread-bolted common dog."
+- "Yeah I'm going to need you to go ahead and shut your reasty gob, you mentally deficient dick taster."
+- "Hey, remember that time when some of your co-workers became adults? Wait, you don't? Oh damn, I can't believe I forgot, nobody likes you."
+- "I'm not saying you're a slut, but if your slit had a password, it would be abc123."
+- "Bro, I'ma slap that silly-ass grin off yo face you crack smokin' shit lover."
+- "I'm encouraging you to shut your face, you rude barrel of dicks."
+- "I hope you drown in a stagnant cum pool, you trashy asshole."
+- "I don't hate you because you're unintelligent or because you're fucking unattractive, I hate you because you have poor taste in nearly everything."
+- "Mothafucka, I'ma slap that silly-ass grin off yo face you shit-ass queef."
+- "Bro, you need to step the fuck back you dumb fuckin' cock jockey."
+- "Go fuck your tube sock you douche."
+- "Some of us are having a seriously challenging time visualizing a bleaker destiny than being forced to spend time with you."
+- "People don't hate you because you're appalling. Don't get me wrong you are unbelievably appalling, that's just not why people hate you."
+- "Everyone says that your huge vagina smells like lobsters."
+- "Wallow in an ocean of anal pus, you pathetic son of a bitch."
+- "You are fucking unattractive and you reek, let us meet up so I can slap the shit out of you."
+- "Suck my dick, you classless, illiterate, inbred meth baby."
+- "Damn you, thou hateful purple-hued dissembling harlot."
+- "Compared with you, getting a blowjob from a crocodile doesn't seem so bad."
+- "You are repulsive, raunchy, half-witted, you smell and I never want to see you again."
+- "Assuming the stories are true, you no longer have the ability to socialize normally. It's presumably because you have tapeworms."
+- "Why don't you shut your fucking noise hole, you unimportant bag of shit."
+- "Go fuck your wet towel you moron."
+- "You are not even remotely very nice, in fact you're a shit-breathing bitch."
+- "In comparison with you, contracting malaria isn't really that bad."
+- "If what I hear is true, you no longer have the ability to socialize normally. It's likely because you have hepatitis."
+- "You will never be likeable."
+- "Hey, remember that time when your co-workers went to New York City? Wait, you don't? Oh right, I can't believe I forgot, nobody likes you."
+- "I'm fully aware that you're a worthless son of a bitch, but holy heavenly father, go fuck a meat grinder."
+- "I'm just going to go ahead and take a mutant liquid shit on your cat."
+- "I saw you on Facebook on Saturday afternoon, and oh my lord in heaven I yearned to pork you in an unpleasant place."
+- "I don't even feel sorry for your chronic poverty."
+- "I don't want to visit your apartment, even your own friends don't want to visit your apartment, perhaps it would make everybody happier if you were disemboweled."
+- "Eat a penis, you Mexican poolboy."
+- "Death would be too good for you, you wretched cunt."
+- "People don't hate you because you're foul. Don't get me wrong you are uncommonly foul, that's just not why people hate you."
+- "Please fuck off, you incommodious cuntface."
+- "We should hang out, it's stunning to visit with someone with such a huge potential for failure."
+- "I would lynch you, but then the title of &quot;Most awesomely disgusting twatwaffle alive&quot; would be awarded to someone else."
+- "Go away, you troublesome cockskank."
+- "Everyone says the only loving you get is from your family members."
+- "Everyone says the only fucking you get is from your wet towel."
+- "Why don't you shut the fuck up, you insignificant bag of feces."
+
+# Insults from INSULTGENERATOR.ORG
+# http://pastebin.com/wjABXq7j
\ No newline at end of file
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index a51bcf1..be1ba74 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -2,7 +2,7 @@ name: DiscordBridge
 version: '@VERSION@'
 description: '@DESCRIPTION@'
 
-author: Jacob Gillespie
+authors: [Jacob Gillespie, Adam Hart]
 website: '@URL@'
 
 loadbefore: [SpaceBukkit, RemoteToolkitPlugin]
@@ -17,11 +17,32 @@ permissions:
   discordbridge.cleverbot:
     description: Determines whether this user can talk to Cleverbot
     default: true
+  discordbridge.f:
+    description: Determines whether this user can use the f command
+    default: true
+  discordbridge.rate:
+    description: Determines whether this user can use the rate command
+    default: true
+  discordbridge.eightball:
+    description: Determines whether this user can use the 8ball command
+    default: true
+  discordbridge.insult:
+    description: Determines whether this user can use the insult command
+    default: op
 
 commands:
+  8ball:
+    description: Consult the Magic 8-Ball to answer your yes/no questions
+    usage: /8ball <question>
   discord:
     description: Issue a command to the bot
     usage: /discord <command>
-  marina:
-    description: Chat with Marina!
-    usage: /marina <what to say to Marina>
\ No newline at end of file
+  f:
+    description: Press f to pay respects
+    usage: /f
+  rate:
+    description: Have the bot rate something for you
+    usage: /rate <thing to be rated>
+  insult:
+    description: Have the bot insult someone for your
+    usage: /insult <thing to insult>
\ No newline at end of file
diff --git a/src/main/resources/scriptedresponses.yml b/src/main/resources/scriptedresponses.yml
deleted file mode 100644
index d4a9397..0000000
--- a/src/main/resources/scriptedresponses.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-responses:
-  '1':
-    casesensitive: false
-    response: 'Hello World!'
-    trigger: 'hello world!'
\ No newline at end of file

From 83d37a55b1f960dab3b013f14bf5cd4f3ad0b714 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Sat, 4 Mar 2017 09:50:38 -0600
Subject: [PATCH 16/24] partway there to having everything config-driven

---
 .../gg/obsidian/discordbridge/CommandLogic.kt | 127 ++++++++++--------
 .../discordbridge/DataConfigAccessor.kt       |   4 +-
 .../gg/obsidian/discordbridge/Plugin.kt       |  29 ++--
 .../gg/obsidian/discordbridge/Utils/Utils.kt  |  56 +++++++-
 .../discordbridge/discord/Listener.kt         |  54 +++++---
 .../{ => minecraft}/EventListener.kt          |   4 +-
 .../{ => minecraft}/Permissions.kt            |   2 +-
 .../minecraft/commands/Discord.kt             |   2 +-
 .../minecraft/commands/EightBall.kt           |   2 +-
 .../discordbridge/minecraft/commands/F.kt     |   2 +-
 .../minecraft/commands/Insult.kt              |   4 +-
 .../discordbridge/minecraft/commands/Rate.kt  |   4 +-
 .../resources/{botmemory.yml => 8ball.yml}    |  13 +-
 src/main/resources/f.yaml                     |  30 +++++
 .../resources/{insults.yml => insult.yml}     |  61 +++++----
 src/main/resources/rate.yml                   |  78 +++++++++++
 src/main/resources/script.yml                 |  20 +++
 17 files changed, 360 insertions(+), 132 deletions(-)
 rename src/main/kotlin/gg/obsidian/discordbridge/{ => minecraft}/EventListener.kt (97%)
 rename src/main/kotlin/gg/obsidian/discordbridge/{ => minecraft}/Permissions.kt (89%)
 rename src/main/resources/{botmemory.yml => 8ball.yml} (74%)
 create mode 100644 src/main/resources/f.yaml
 rename src/main/resources/{insults.yml => insult.yml} (94%)
 create mode 100644 src/main/resources/rate.yml
 create mode 100644 src/main/resources/script.yml

diff --git a/src/main/kotlin/gg/obsidian/discordbridge/CommandLogic.kt b/src/main/kotlin/gg/obsidian/discordbridge/CommandLogic.kt
index 8fe7815..c7a4c24 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/CommandLogic.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/CommandLogic.kt
@@ -1,13 +1,16 @@
 package gg.obsidian.discordbridge
 
 import com.michaelwflaherty.cleverbotapi.CleverBotQuery
+import gg.obsidian.discordbridge.Utils.Rating
+import gg.obsidian.discordbridge.Utils.Respect
 import java.io.IOException
 import java.util.*
 
 object CommandLogic {
 
     fun askCleverbot(plugin: Plugin, message: String): String {
-        if (plugin.cfg.CLEVERBOT_KEY.isEmpty()) return "You do not have an API key. Go to https://www.cleverbot.com/api/ for more information."
+        if (plugin.cfg.CLEVERBOT_KEY.isEmpty())
+            return "You do not have an API key. Go to https://www.cleverbot.com/api/ for more information."
         val bot: CleverBotQuery = CleverBotQuery(plugin.cfg.CLEVERBOT_KEY, message)
         var response: String
         try {
@@ -21,77 +24,83 @@ object CommandLogic {
     }
 
     fun eightBall(plugin: Plugin, name: String): String {
-        val responses = plugin.memory.data.getStringList("8-ball-responses")
+        val responses = plugin.eightball.data.getStringList("responses")
         val rand = Random().nextInt(responses.count())
         return "$name - ${responses[rand]}"
     }
 
-    fun f(plugin: Plugin, name: String): String {
-        var respects = plugin.memory.data.getInt("respects", 0)
-        val msg: String
-        val payed = Random().nextInt(100)
-        when {
-            payed == 99 -> {
-                respects += 5
-                msg = "$name breaks down and mournfully cries 5 respects out to the sky! (Total respects paid: $respects)"
-            }
-            payed > 95 -> {
-                respects += 3
-                msg = "$name manages to give 3 respects through their heavy sobbing! (Total respects paid: $respects)"
-            }
-            payed > 65 -> {
-                respects += 2
-                msg = "$name sheds a single tear and pays 2 respects! (Total respects paid: $respects)"
-            }
-            else -> {
-                respects += 1
-                msg = "$name solemnly pays respect! (Total respects paid: $respects)"
+    fun f(plugin: Plugin, sender_name: String): String {
+        var totalRespects = plugin.f.data.getInt("total-respects", 0)
+        val responses = plugin.f.data.getList("responses").checkItemsAre<Respect>()
+                ?: return "ERROR: Responses for this command could not be read from the config."
+        val totalWeight = responses.sumBy { it.weight }
+        var rand = Random().nextInt(totalWeight) + 1
+        var found: Respect? = null
+        for(r in responses) {
+            rand -= r.weight
+            if (rand <= 0) {
+                found = r
+                break
             }
         }
-        plugin.memory.data.set("respects", respects)
-        plugin.memory.saveConfig()
+
+        totalRespects += found!!.count
+        val msg = found.message.replace("%u", sender_name).replace("%t", totalRespects.toString())
+                .replace("%c", found.count.toString())
+
+        plugin.f.data.set("total-respects", totalRespects)
+        plugin.f.saveConfig()
 
         return msg
     }
 
-    fun insult(plugin: Plugin, arg: String): String {
-        val responses = plugin.insults.data.getStringList("insults")
-        val rand = Random().nextInt(500)
-        return "$arg - ${responses[rand]}"
+    fun insult(plugin: Plugin, sender_name: String, arg: String): String {
+        val responses = plugin.insult.data.getStringList("responses")
+        val rand = Random().nextInt(responses.count())
+        return plugin.insult.data.getString("template", "").replace("%u", sender_name)
+                .replace("%i", responses[rand]).replace("%t", arg)
     }
 
-    fun rate(name: String, arg: String): String {
-        val argArray = arg.split(" ").toMutableList()
-        val iterate = argArray.listIterator()
-        while (iterate.hasNext()) {
-            val oldValue = iterate.next()
-            if (oldValue == "me") iterate.set("you")
-            if (oldValue == "myself") iterate.set("yourself")
-            if (oldValue == "my") iterate.set("your")
-            if (oldValue == "your") iterate.set("my")
-            if (oldValue == "yourself") iterate.set("myself")
-        }
-        val thingToBeRated = argArray.joinToString(" ")
-        val rating = Random().nextInt(101)
-        var response = "I rate $thingToBeRated "
-        when (rating) {
-            42 -> response += "4/20: 'smoke weed erryday'."
-            78 -> response += "7.8/10: 'too much water'."
-            69 -> response += "69/69."
-            100 -> response += "a perfect 10/10, absolutely flawless in every regard."
-            in 90..99 -> response += "a very high ${rating/10f}/10."
-            in 80..89 -> response += "a high ${rating/10f}/10."
-            in 70..79 -> response += "a decently high ${rating/10f}/10."
-            in 60..69 -> response += "a good ${rating/10f}/10."
-            in 50..59 -> response += "a solid ${rating/10f}/10."
-            in 40..49 -> response += "a meh ${rating/10f}/10."
-            in 30..39 -> response += "a paltry ${rating/10f}/10."
-            in 20..29 -> response += "a pretty low ${rating/10f}/10."
-            in 10..19 -> response += "a low ${rating/10f}/10."
-            in 1..9 -> response += "a shitty ${rating/10f}/10."
-            else -> response += "0/0: 'amazing'."
+    fun rate(plugin: Plugin, sender_name: String, arg: String): String {
+        val responses = plugin.rate.data.getList("responses").checkItemsAre<Rating>()
+                ?: return "ERROR: Responses for this command could not be read from the config."
+
+        var rateOutOf = plugin.rate.data.getInt("rate-out-of", 10)
+        if (rateOutOf > 1000000) rateOutOf = 1000000
+        if (rateOutOf < 0) rateOutOf = 0
+
+        var granularity = plugin.rate.data.getInt("granularity", 1)
+        if (granularity > 2) granularity = 2
+        if (granularity < 0) granularity = 0
+
+        val conversionFactor = Math.pow(10.0, granularity.toDouble())
+        val rating = Random().nextInt((rateOutOf * conversionFactor.toInt()) + 1) / conversionFactor
+
+
+        val found: Rating = responses.firstOrNull { rating <= it.high && rating >= it.low }
+                ?: return "ERROR: No response set for rating $rating"
+
+        var thingToBeRated = arg
+        if (plugin.rate.data.getBoolean("translate-first-and-second-person", true)) {
+            val argArray = arg.split(" ").toMutableList()
+            val iterate = argArray.listIterator()
+            while (iterate.hasNext()) {
+                val oldValue = iterate.next()
+                if (oldValue == "me") iterate.set("you")
+                if (oldValue == "myself") iterate.set("yourself")
+                if (oldValue == "my") iterate.set("your")
+                if (oldValue == "your") iterate.set("my")
+                if (oldValue == "yourself") iterate.set("myself")
+            }
+            thingToBeRated = argArray.joinToString(" ")
         }
-        return "$name - $response"
+
+        return found.message.replace("%u", sender_name).replace("%m", thingToBeRated).replace("%r", "$rating/$rateOutOf")
     }
 
+    // UTIL
+
+    @Suppress("UNCHECKED_CAST")
+    inline fun <reified T : Any> List<*>.checkItemsAre() = if (all { it is T }) this as List<T> else null
+
 }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/DataConfigAccessor.kt b/src/main/kotlin/gg/obsidian/discordbridge/DataConfigAccessor.kt
index 446c835..965014b 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/DataConfigAccessor.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/DataConfigAccessor.kt
@@ -46,7 +46,7 @@ class DataConfigAccessor(private val plugin: JavaPlugin, filepath: File, private
         } catch (e: IllegalArgumentException) {
             // Look for defaults in the jar
             if (plugin.getResource(fileName) == null)
-                plugin.logger.log(Level.SEVERE, "usernames.yml cannot be found for some reason")
+                plugin.logger.log(Level.SEVERE, "$fileName cannot be found for some reason")
             val defConfigReader = InputStreamReader(plugin.getResource(fileName))
             val defConfig = YamlConfiguration.loadConfiguration(defConfigReader)
             fileConfiguration!!.defaults = defConfig
@@ -67,7 +67,7 @@ class DataConfigAccessor(private val plugin: JavaPlugin, filepath: File, private
             try {
                 data.save(configFile)
             } catch (ex: IOException) {
-                plugin.logger.log(Level.SEVERE, "Could not save data to $configFile", ex)
+                plugin.logger.log(Level.SEVERE, "Could not save data to $fileName", ex)
             }
         }
     }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
index 2026565..43cb165 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
@@ -1,8 +1,8 @@
 package gg.obsidian.discordbridge
 
-import gg.obsidian.discordbridge.Utils.noSpace
-import gg.obsidian.discordbridge.Utils.UserAlias
+import gg.obsidian.discordbridge.Utils.*
 import gg.obsidian.discordbridge.discord.Connection
+import gg.obsidian.discordbridge.minecraft.EventListener
 import gg.obsidian.discordbridge.minecraft.commands.*
 import net.dv8tion.jda.core.OnlineStatus
 import net.dv8tion.jda.core.entities.Member
@@ -10,6 +10,7 @@ import net.dv8tion.jda.core.entities.MessageChannel
 import org.bukkit.ChatColor as CC
 import org.bukkit.entity.Player
 import org.bukkit.plugin.java.JavaPlugin
+import org.bukkit.configuration.serialization.ConfigurationSerialization
 import java.util.logging.Level
 import java.io.File
 
@@ -21,8 +22,11 @@ class Plugin : JavaPlugin() {
     // Configs
     val cfg = Configuration(this)
     var users: DataConfigAccessor = DataConfigAccessor(this, dataFolder, "usernames.yml")
-    var memory: DataConfigAccessor = DataConfigAccessor(this, dataFolder, "botmemory.yml")
-    var insults: DataConfigAccessor = DataConfigAccessor(this, dataFolder, "insults.yml")
+    var eightball: DataConfigAccessor = DataConfigAccessor(this, dataFolder, "8ball.yml")
+    var insult: DataConfigAccessor = DataConfigAccessor(this, dataFolder, "insult.yml")
+    var f: DataConfigAccessor = DataConfigAccessor(this, dataFolder, "f.yml")
+    var rate: DataConfigAccessor = DataConfigAccessor(this, dataFolder, "rate.yml")
+    var script: DataConfigAccessor = DataConfigAccessor(this, dataFolder, "script.yml")
     var worlds: DataConfigAccessor? = null
 
     // Temporary storage for alias linking requests
@@ -36,8 +40,11 @@ class Plugin : JavaPlugin() {
         // Load configs
         updateConfig(description.version)
         users.saveDefaultConfig()
-        memory.saveDefaultConfig()
-        insults.saveDefaultConfig()
+        eightball.saveDefaultConfig()
+        insult.saveDefaultConfig()
+        f.saveConfig()
+        rate.saveConfig()
+        script.saveConfig()
         if (foundMultiverse) worlds = DataConfigAccessor(this, File("plugins/Multiverse-Core"), "worlds.yml")
 
         // Connect to Discord
@@ -51,6 +58,9 @@ class Plugin : JavaPlugin() {
         getCommand("rate").executor = Rate(this)
         getCommand("8ball").executor = EightBall(this)
         getCommand("insult").executor = Insult(this)
+
+        ConfigurationSerialization.registerClass(Respect::class.java, "Respect")
+        ConfigurationSerialization.registerClass(Rating::class.java, "Rating")
     }
 
     override fun onDisable() {
@@ -85,8 +95,11 @@ class Plugin : JavaPlugin() {
     fun reload() {
         reloadConfig()
         users.reloadConfig()
-        memory.reloadConfig()
-        insults.reloadConfig()
+        eightball.reloadConfig()
+        insult.reloadConfig()
+        f.reloadConfig()
+        rate.reloadConfig()
+        script.reloadConfig()
         if (foundMultiverse) worlds!!.reloadConfig()
         cfg.load()
         //conn?.reconnect()
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Utils/Utils.kt b/src/main/kotlin/gg/obsidian/discordbridge/Utils/Utils.kt
index fe9fef1..ccf5a9c 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Utils/Utils.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Utils/Utils.kt
@@ -1,9 +1,61 @@
 package gg.obsidian.discordbridge.Utils
 
 import org.bukkit.ChatColor
+import org.bukkit.configuration.serialization.ConfigurationSerializable
+import org.bukkit.configuration.serialization.SerializableAs
 
 fun String.noSpace() = this.replace(Regex("""\s+"""), "")
 fun String.stripColor(): String = ChatColor.stripColor(this)
 
-data class UserAlias(var mcUsername: String, var mcUuid: String,
-                     var discordUsername: String, var discordId: String)
\ No newline at end of file
+data class UserAlias(var mcUsername: String, var mcUuid: String, var discordUsername: String, var discordId: String)
+
+//TODO: make null safe
+@SerializableAs("Respect")
+data class Respect(val message: String = "%u solemnly pays respect!", val count: Int = 1, val weight: Int = 1): ConfigurationSerializable{
+    @Suppress("unused")
+    constructor(map: MutableMap<String, Any>):
+            this(map["message"] as String, map["respects-paid"] as Int, map["weight"] as Int)
+
+    override fun serialize(): MutableMap<String, Any> {
+        return mutableMapOf("message" to message, "respects-paid" to count, "weight" to weight)
+    }
+
+}
+
+//TODO: Make null safe
+@SerializableAs("Rating")
+data class Rating(val message: String = "%u - I rate %m %r", val low: Double = 0.0, val high: Double = 0.0): ConfigurationSerializable{
+    @Suppress("unused")
+    constructor(map: MutableMap<String, Any>):
+            this(map["message"] as String, map["low"] as Double, map["high"] as Double)
+
+    override fun serialize(): MutableMap<String, Any> {
+        return mutableMapOf("message" to message, "low" to low, "high" to high)
+    }
+
+}
+
+@SerializableAs("Script")
+data class Script(val triggerMC: String?, val triggerDis: String?, val responseMC: String?, val responseDis: String?,
+                  val caseSensitive: Boolean?, val requiresMention: Boolean?,
+                  val startsWith: Boolean?): ConfigurationSerializable{
+    @Suppress("unused")
+    constructor(map: MutableMap<String, Any>):
+            this(map["trigger-minecraft"] as? String, map["trigger-discord"] as? String, map["response-minecraft"] as? String,
+                    map["response-discord"] as String, map["case-sensitive"] as? Boolean, map["requires-mention"] as? Boolean,
+                    map["starts-with"] as? Boolean)
+
+    override fun serialize(): MutableMap<String, Any> {
+        val map: MutableMap<String, Any> = mutableMapOf()
+        if (triggerMC != null) map.put("trigger-minecraft", triggerMC)
+        if (triggerDis != null) map.put("trigger-discord", triggerDis)
+        if (responseMC != null) map.put("respose-minecraft", responseMC)
+        if (responseDis != null) map.put("response-discord", responseDis)
+        if (caseSensitive != null) map.put("case-sensitive", caseSensitive)
+        if (requiresMention != null) map.put("requires-mention", requiresMention)
+        if (startsWith != null) map.put("starts-with", startsWith)
+
+        return map
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt b/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
index 7b230d3..4c3935a 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
@@ -5,6 +5,7 @@ import com.neovisionaries.ws.client.WebSocketException
 import com.neovisionaries.ws.client.WebSocketFrame
 import gg.obsidian.discordbridge.CommandLogic
 import gg.obsidian.discordbridge.Plugin
+import gg.obsidian.discordbridge.Utils.Script
 import gg.obsidian.discordbridge.Utils.noSpace
 import net.dv8tion.jda.core.JDA
 import net.dv8tion.jda.core.entities.ChannelType
@@ -27,6 +28,21 @@ class Listener(val plugin: Plugin, val api: JDA, val connection: Connection) : L
             return
         }
 
+        // SCRIPTED RESPONSE - The bot replies with a pre-programmed response if it detects
+        // a corresponding trigger string
+        val responses = plugin.script.data.getList("responses").checkItemsAre<Script>()
+        if (responses == null) plugin.logger.warning("ERROR: Responses for this command could not be read from the config.")
+        else {
+            val response: Script?
+            for (r in responses) {
+                val ignorecase = !(r.caseSensitive != null && r.caseSensitive)
+                val startswith = r.startsWith != null && r.startsWith
+                val requiresmention = r.requiresMention != null && r.requiresMention
+
+                if (requiresmention) if ()
+            }
+        }
+
         // NON-TRIGGER-RELAY COMMANDS - the triggers of these commands are never relayed to Minecraft
         if (rawmsg.startsWith(api.selfUser.asMention, true)) {
             val arg = rawmsg.replaceFirst(api.selfUser.asMention, "").trimStart()
@@ -89,7 +105,7 @@ class Listener(val plugin: Plugin, val api: JDA, val connection: Connection) : L
             if (arg.startsWith("rate", true)) {
                 val arg2 = arg.replaceFirst("rate", "").trimStart()
                 plugin.logDebug("user $username requests a rating")
-                val response = CommandLogic.rate(username, arg2)
+                val response = CommandLogic.rate(plugin, username, arg2)
                 plugin.sendToDiscord(response, channel)
                 if (event.isFromRelayChannel())
                     plugin.sendToMinecraft(plugin.toMinecraftChatMessage(
@@ -101,7 +117,7 @@ class Listener(val plugin: Plugin, val api: JDA, val connection: Connection) : L
             if (arg.startsWith("insult", true)) {
                 val arg2 = arg.replaceFirst("insult", "").trimStart()
                 plugin.logDebug("user $username requests an insult against $arg2")
-                val response = CommandLogic.insult(plugin, arg2)
+                val response = CommandLogic.insult(plugin, username, arg2)
                 plugin.sendToDiscord(response, channel)
                 if (event.isFromRelayChannel())
                     plugin.sendToMinecraft(plugin.toMinecraftChatMessage(
@@ -129,22 +145,21 @@ class Listener(val plugin: Plugin, val api: JDA, val connection: Connection) : L
             if (arg.isEmpty()) return
             plugin.logDebug("Relay command received.  Arg: $arg")
 
-            // SCRIPTED RESPONSE - The bot replies with a pre-programmed response if it detects
-            // a corresponding trigger string
-            val responses = plugin.memory.data.getConfigurationSection("scripted-responses").getKeys(false)
-            var scripted_response: String? = null
-            for (r in responses) {
-                val casesensitive = plugin.memory.data.getBoolean("scripted-responses.$r.case-sensitive", false)
-                if (arg.startsWith(plugin.memory.data.getString("scripted-responses.$r.trigger").toLowerCase(), !casesensitive))
-                    scripted_response = plugin.memory.data.getString("scripted-responses.$r.response")
-            }
-            if (scripted_response != null) {
-                plugin.logDebug("user $username has triggered the scripted response: $scripted_response")
-                plugin.sendToDiscord(scripted_response, channel)
-                if (event.isFromRelayChannel())
-                    plugin.sendToMinecraft(plugin.toMinecraftChatMessage(scripted_response, plugin.cfg.BOT_MC_USERNAME))
-                return
-            }
+
+
+//            var scripted_response: String? = null
+//            for (r in responses) {
+//                val casesensitive = plugin.script.data.getBoolean("responses.$r.case-sensitive", false)
+//                if (arg.startsWith(plugin.script.data.getString("responses.$r.trigger").toLowerCase(), !casesensitive))
+//                    scripted_response = plugin.script.data.getString("responses.$r.response")
+//            }
+//            if (scripted_response != null) {
+//                plugin.logDebug("user $username has triggered the scripted response: $scripted_response")
+//                plugin.sendToDiscord(scripted_response, channel)
+//                if (event.isFromRelayChannel())
+//                    plugin.sendToMinecraft(plugin.toMinecraftChatMessage(scripted_response, plugin.cfg.BOT_MC_USERNAME))
+//                return
+//            }
 
             // CLEVERBOT - Assume anything else invokes Cleverbot
             plugin.logDebug("user $username asks CleverBot something")
@@ -172,4 +187,7 @@ class Listener(val plugin: Plugin, val api: JDA, val connection: Connection) : L
         plugin.logDebug("Discord disconnected - attempting to reconnect")
         connection.reconnect()
     }
+
+    @Suppress("UNCHECKED_CAST")
+    inline fun <reified T : Any> List<*>.checkItemsAre() = if (all { it is T }) this as List<T> else null
 }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/EventListener.kt
similarity index 97%
rename from src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/minecraft/EventListener.kt
index 7cd1417..4c6f2de 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/EventListener.kt
@@ -1,5 +1,7 @@
-package gg.obsidian.discordbridge
+package gg.obsidian.discordbridge.minecraft
 
+import gg.obsidian.discordbridge.CommandLogic
+import gg.obsidian.discordbridge.Plugin
 import gg.obsidian.discordbridge.Utils.*
 import org.bukkit.event.EventHandler
 import org.bukkit.event.EventPriority
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Permissions.kt b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/Permissions.kt
similarity index 89%
rename from src/main/kotlin/gg/obsidian/discordbridge/Permissions.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/minecraft/Permissions.kt
index 90c98ba..4469eb5 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Permissions.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/Permissions.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge
+package gg.obsidian.discordbridge.minecraft
 
 import org.bukkit.entity.Player
 
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Discord.kt b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Discord.kt
index 6a25083..35428db 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Discord.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Discord.kt
@@ -1,6 +1,6 @@
 package gg.obsidian.discordbridge.minecraft.commands
 
-import gg.obsidian.discordbridge.Permissions
+import gg.obsidian.discordbridge.minecraft.Permissions
 import gg.obsidian.discordbridge.Plugin
 import org.bukkit.ChatColor as CC
 import org.bukkit.command.Command
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/EightBall.kt b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/EightBall.kt
index e5c968e..a44365d 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/EightBall.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/EightBall.kt
@@ -1,7 +1,7 @@
 package gg.obsidian.discordbridge.minecraft.commands
 
 import gg.obsidian.discordbridge.CommandLogic
-import gg.obsidian.discordbridge.Permissions
+import gg.obsidian.discordbridge.minecraft.Permissions
 import gg.obsidian.discordbridge.Plugin
 import org.bukkit.command.Command
 import org.bukkit.command.CommandExecutor
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/F.kt b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/F.kt
index 73a5de1..9c79382 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/F.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/F.kt
@@ -1,7 +1,7 @@
 package gg.obsidian.discordbridge.minecraft.commands
 
 import gg.obsidian.discordbridge.CommandLogic
-import gg.obsidian.discordbridge.Permissions
+import gg.obsidian.discordbridge.minecraft.Permissions
 import gg.obsidian.discordbridge.Plugin
 import org.bukkit.command.Command
 import org.bukkit.command.CommandExecutor
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Insult.kt b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Insult.kt
index b9c86f3..34180f4 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Insult.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Insult.kt
@@ -1,7 +1,7 @@
 package gg.obsidian.discordbridge.minecraft.commands
 
 import gg.obsidian.discordbridge.CommandLogic
-import gg.obsidian.discordbridge.Permissions
+import gg.obsidian.discordbridge.minecraft.Permissions
 import gg.obsidian.discordbridge.Plugin
 import org.bukkit.command.Command
 import org.bukkit.command.CommandExecutor
@@ -13,7 +13,7 @@ class Insult(val plugin: Plugin) : CommandExecutor {
         if (args == null || args.isEmpty()) return false
 
         if (player is Player && Permissions.insult.has(player)) {
-            var msg = CommandLogic.insult(plugin, args.joinToString(" "))
+            var msg = CommandLogic.insult(plugin, player.name, args.joinToString(" "))
             plugin.sendToMinecraft(plugin.toMinecraftChatMessage(msg, plugin.cfg.BOT_MC_USERNAME))
             msg = plugin.translateAliasToDiscord(msg, player.uniqueId.toString())
             plugin.sendToDiscord(msg, plugin.conn.getRelayChannel())
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Rate.kt b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Rate.kt
index 5ba397c..ed19457 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Rate.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Rate.kt
@@ -1,7 +1,7 @@
 package gg.obsidian.discordbridge.minecraft.commands
 
 import gg.obsidian.discordbridge.CommandLogic
-import gg.obsidian.discordbridge.Permissions
+import gg.obsidian.discordbridge.minecraft.Permissions
 import gg.obsidian.discordbridge.Plugin
 import org.bukkit.command.Command
 import org.bukkit.command.CommandExecutor
@@ -13,7 +13,7 @@ class Rate(val plugin: Plugin) : CommandExecutor {
         if (args == null || args.isEmpty()) return false
 
         if (player is Player && Permissions.rate.has(player)) {
-            var msg = CommandLogic.rate(player.name, args.joinToString(" "))
+            var msg = CommandLogic.rate(plugin, player.name, args.joinToString(" "))
             plugin.sendToMinecraft(plugin.toMinecraftChatMessage(msg, plugin.cfg.BOT_MC_USERNAME))
             msg = plugin.translateAliasToDiscord(msg, player.uniqueId.toString())
             plugin.sendToDiscord(msg, plugin.conn.getRelayChannel())
diff --git a/src/main/resources/botmemory.yml b/src/main/resources/8ball.yml
similarity index 74%
rename from src/main/resources/botmemory.yml
rename to src/main/resources/8ball.yml
index 9e44592..97d2d1b 100644
--- a/src/main/resources/botmemory.yml
+++ b/src/main/resources/8ball.yml
@@ -1,4 +1,7 @@
-8-ball-responses:
+# 8Ball Config
+
+# List of possible responses to the 8Ball command
+responses:
   - 'It is certain.'
   - 'Seems pretty likely.'
   - 'Absolutely.'
@@ -20,10 +23,4 @@
   - 'I''m not sure.'
   - 'That''s hard to say at this time.'
   - 'It''s impossible to know. Unless you ask me again.'
-  - 'Figure it out on your own.'
-respects: 0
-scripted-responses:
-  '1':
-    case-sensitive: false
-    response: 'Hello World!'
-    trigger: 'hello world!'
\ No newline at end of file
+  - 'Figure it out on your own.'
\ No newline at end of file
diff --git a/src/main/resources/f.yaml b/src/main/resources/f.yaml
new file mode 100644
index 0000000..78cbbd4
--- /dev/null
+++ b/src/main/resources/f.yaml
@@ -0,0 +1,30 @@
+# F Config
+
+# The running total of respects given since the bot was started
+total-respects: 0
+
+# The responses that are returned by the F command
+# All entries must be prefixed with the "==: Respect" attribute, as shown in the default
+# message = the message to display
+#   '%u' = the name of the command sender
+#   '%t' = the value of total-respects after adding respects-paid
+# respects-paid = how many respects are paid with this message
+# weight = the weighted chance of this response being displayed
+#   (a weight of 5 means it is 5x more likely to appear than a message of weight 1)
+responses:
+- ==: Respect
+  message: '%u solemnly pays respect (Total respects paid: %t)'
+  respects-paid: 1
+  weight: 65
+- ==: Respect
+  message: '%u sheds a single tear and pays %c respects! (Total respects paid: %t)'
+  respects-paid: 2
+  weight: 30
+- ==: Respect
+  message: '%u manages to give %c respects through their heavy sobbing! (Total respects paid: %t)'
+  respects-paid: 3
+  weight: 4
+- ==: Respect
+  message: '%u breaks down and mournfully cries %c respects out to the sky! (Total respects paid: %t)'
+  respects-paid: 5
+  weight: 1
\ No newline at end of file
diff --git a/src/main/resources/insults.yml b/src/main/resources/insult.yml
similarity index 94%
rename from src/main/resources/insults.yml
rename to src/main/resources/insult.yml
index 06672e5..a2c0fb3 100644
--- a/src/main/resources/insults.yml
+++ b/src/main/resources/insult.yml
@@ -1,4 +1,13 @@
-insults:
+# Insult Config
+
+# The template for the response of the Insult command
+# '%u' = the name of the command sender
+# '%t' = whatever is being insulted
+# '%i' = the insult message
+template: '%t - %i'
+
+# A list of possible responses to the Insult command
+responses:
 - "I hate you so much I can't even breathe."
 - "You really have an adorable smile. I'd like to annihilate it with my monstrous penis."
 - "For the love of God simply stop being a miserable butt muncher for at least the next 10 minutes."
@@ -36,20 +45,20 @@ insults:
 - "A pox on thy family, thou horrible common-kissing herb woman."
 - "We should hang out sometime, it's legendary to visit with someone with so many dependencies."
 - "I hate you so much I can't even go to the bathroom by yourself."
-- "Every time I see a hippie take a monsterous liquid shit on television, it reminds me of you."
+- "Every time I see a hippie take a monstrous liquid shit on television, it reminds me of you."
 - "You are not even remotely swell, in fact you're a shit-breathing bitch."
 - "I'm not saying you're a ho, but if your messy cleft palate had a password, it would be qwerty."
-- "Don't give me an excuse to take a humungous fucking crap on you while you sleep."
+- "Don't give me an excuse to take a humongous fucking crap on you while you sleep."
 - "Why the hell do you reek like your Mom just crapped you out, did you embrace your love of wallowing in your own shit?"
 - "Nobody who knows you cares about your aspirations, in fact I honestly think it would be the best for everyone if you just died."
 - "I can't wait until you experience tapeworms."
 - "Oh man, do you remember when when your best friends went to New York City? You don't? Oh yeah, now I remember, nobody wants to be around you."
 - "It is written that you regularly shit yourself."
-- "I often like to go for a jog and picture you being publically executed."
+- "I often like to go for a jog and picture you being publicly executed."
 - "People don't hate you because you're humpbacked. I mean you are uncommonly humpbacked, that's just not why people hate you."
-- "Hey doublewide, I find your back fat appalling."
+- "Hey double-wide, I find your back fat appalling."
 - "Fuck yourself, you classless, hillbilly, unsophisticated meth baby."
-- "I'm going to bend over so you can lick my butthole, you nasty sack of ass."
+- "I'm going to bend over so you can lick my butt hole, you nasty sack of ass."
 - "Absolutely nobody cares about your dreams, in fact I honestly think it would save everyone a lot of trouble if you hung yourself in your fucking closet."
 - "I don't loathe you because you're senseless or because you're disfigured, I loathe you because you're a Republican."
 - "I'd rather masturbate with a jar full of scorpions to Sarah Palin rolling around in gravy than spend another day with you."
@@ -64,7 +73,7 @@ insults:
 - "Why don't you suck ejaculate from my asshole, you grungy prick."
 - "You're the first nerd I've ever hungered to slay."
 - "I don't dislike you because you're simpleminded or because you're deformed, I dislike you because you're white."
-- "I would smother you, but then the title of &quot;Most awesomely disgusting spermatorium on the planet&quot; would be awarded to someone else."
+- "I would smother you, but then the title of \x34Most awesomely disgusting spermatorium on the planet\x34 would be awarded to someone else."
 - "I will pummel you square in your fishy flabby meat flap, you hideous fuck."
 - "My version of a superb Monday morning is witnessing a Catholic stab your hole."
 - "You are not at all hot, in fact you're a butt fister."
@@ -81,7 +90,7 @@ insults:
 - "I heard the only fucking you get is from your brother."
 - "Scholars will write parables of your outrageous slowness for many years after an angry mob kills you."
 - "You have a dreadful wife, bad morals, and you're pretty fucking fat."
-- "I dream of a time when you get giardia."
+- "I dream of a time when you get giardiasis."
 - "Piss off, you poor, ignorant, banjo playing hog wrestler."
 - "We should meet up, it's absurd to talk to someone with real and crippling issues."
 - "You're the first moron I've ever needed to slaughter."
@@ -150,7 +159,7 @@ insults:
 - "Fuck you with a pitchfork."
 - "Bro, you best shut the fuck up you shit-ass porch monkey."
 - "Storytellers will be making fun of your outrageous mindlessness for many lifetimes after your death."
-- "Every time I see a journalist take a monsterous steaming shit at a comic book convention, it reminds me of you."
+- "Every time I see a journalist take a monstrous steaming shit at a comic book convention, it reminds me of you."
 - "Listen son, you best shut the fuck up you crack smokin' gaylord."
 - "I will bash you straight in your shriveled vag, you Jewish cock."
 - "Eat a dyke spike, you Mexican pedophile."
@@ -158,7 +167,7 @@ insults:
 - "I will kick you straight in your rotting nappy dugout, you heinous fuck."
 - "I don't despise you because you're mentally deficient or because you're repelling, I despise you because you have poor taste in nearly everything."
 - "Most people say that the reek of your taint is vomit-inducing."
-- "You really have a hot ass. I'd like to ravage it with my humungous unit."
+- "You really have a hot ass. I'd like to ravage it with my humongous unit."
 - "I don't even feel sorry for the family member I poisoned."
 - "Listen up whitebread, you gonna need a new face when I'm through with yo ass you pole smokin' hillbilly."
 - "I'd rather masturbate with a riding crop to a pile of shit than wake up next to you."
@@ -189,7 +198,7 @@ insults:
 - "I have heard that there are religious groups contemplating ways in which to render you sterile."
 - "The fact of the matter is, there is absolutely no way I would come within pissing distance of your festering dick holster."
 - "I hope that someday soon you get a yeast infection in your mouth."
-- "I'm not saying you're a ho, but if your moose knuckle had a password, it would be hellohello."
+- "I'm not saying you're a ho, but if your moose knuckle had a password, it would be 'hellohello'."
 - "Fuck you with a snow shovel."
 - "I pray that a strange dude kills you in the snow, you aborted cunt."
 - "So I know that you're a worthless twat, but holy shitting fuck, eat a bag of dicks."
@@ -212,7 +221,7 @@ insults:
 - "You're the first bitch I've ever desired to asphyxiate."
 - "In comparison with you, drowning in a sea of shit isn't so bad."
 - "I have heard that you have a tiny penis."
-- "I would exterminate you, but then the title of &quot;Most monstrously hideous fuckass on the planet&quot; would be awarded to someone else."
+- "I would exterminate you, but then the title of \x34Most monstrously hideous fuckass on the planet\x34 would be awarded to someone else."
 - "People don't hate you because you're homely. It's true that you are uncommonly homely, that's just not why people hate you."
 - "Not even your closest friends care about your pathetic life, in fact I sometimes think it would save everyone a lot of trouble if we killed you."
 - "Damn you're sexy. And by sexy I of course mean gross."
@@ -256,7 +265,7 @@ insults:
 - "I don't even feel sorry for the time we all forgot your birthday."
 - "There are rumors that your turn-ons consist of camel fondling and assless chaps."
 - "Your stench is utterly lousy."
-- "I would slaughter you, but then the title of &quot;Most loathsome shitface in existence&quot; would pass on to someone else."
+- "I would slaughter you, but then the title of \x34Most loathsome shitface in existence\x34 would pass on to someone else."
 - "I will strike you straight in your wretched shaggy DA, you rotting loser."
 - "Eat a bowl of severed dicks."
 - "If what I hear is true, there is no motherfucking way I would come within pissing distance of your festering flabby meat flap."
@@ -292,7 +301,7 @@ insults:
 - "Do quaff a cup of spunk, you loser."
 - "Bro, I'ma smack up yo dumb cracka ass you lazy piece of shit fuckass."
 - "It suddenly strikes me that you're nice. And by nice I of course mean awesomely disgusting."
-- "Minstrels will be making fun of your breathtaking slowness for milennia after your death is met with joy and laughter."
+- "Minstrels will be making fun of your breathtaking slowness for millennia after your death is met with joy and laughter."
 - "Sometimes I like to chill out at home and envision you being disemboweled."
 - "The painful reality that is your life makes me hit my wife."
 - "Your nauseating stink is utterly heinous."
@@ -334,10 +343,10 @@ insults:
 - "I don't want to visit your apartment, even your own friends don't want to visit your apartment, perchance it would save everyone a lot of trouble if you threw yourself from the tallest building you could find."
 - "Ugh you are just foul and you smell, let's just hang out sometime so I can drown you myself."
 - "I just farted a hunk of silly putty out of my gigantic serpent socket and it looked just like you."
-- "I would execute you, but then the title of &quot;Most awesomely disgusting douche caboose in the universe&quot; would be awarded to someone else."
+- "I would execute you, but then the title of \x34Most awesomely disgusting douche caboose in the universe\x34 would be awarded to someone else."
 - "A pox on thy family, thou spiteful idle-headed king of codpieces."
 - "Suck a bushel of putrid dicks."
-- "Every time I see a&amp;nbspgorilla take a gigantic moist poop out of a moving vehicle, it reminds me of you."
+- "Every time I see a gorilla take a gigantic moist poop out of a moving vehicle, it reminds me of you."
 - "People don't hate you because you're foul. Don't get me wrong you are unbelievably foul, that's just not why people hate you."
 - "We should meet for coffee, it's legendary to see someone with so many lice."
 - "You are not at all good looking, in fact you're a child molester."
@@ -351,7 +360,7 @@ insults:
 - "Please be quiet, you discourteous sack of ass."
 - "The reality that you're still alive keeps me up at night."
 - "I'd rather masturbate with battery acid to Kim Jong Un than be friends with you."
-- "You really have a beautiful smile. I'd like to wreck it with my monsterous trouser snake."
+- "You really have a beautiful smile. I'd like to wreck it with my monstrous trouser snake."
 - "Go fuck disease-ridden prostitutes, you shitty douche."
 - "You have lupus. Never fear however, it's not the end of the world. You're also going to be murdered."
 - "In just over a year, I'd be surprised if you weren't porking strange men in a deserted factory for scratch tickets, you despicable nerd."
@@ -366,7 +375,7 @@ insults:
 - "You're the first shitlord I've ever hoped to execute."
 - "You are loathsome, dirty, idiotic, you smell and you're pathetic."
 - "You're the first loser I've ever desired to drown."
-- "Every time I see a fat chick take a humungous poop at a comic book convention, it reminds me of you."
+- "Every time I see a fat chick take a humongous poop at a comic book convention, it reminds me of you."
 - "We should hang out, it's overwhelming to be in the same room with someone with actual STDs."
 - "Die in an ocean of shit, you pathetic son of a bitch."
 - "Everyone says the only action you get is from your cousin."
@@ -404,10 +413,10 @@ insults:
 - "When compared to you, getting a blowjob from a crocodile doesn't seem so bad."
 - "Your continued existence is what causes people to cross the street when they see you."
 - "The fact you haven't killed yourself makes me realize there is no justice in the world."
-- "I would execute you, but then the title of &quot;Most gross dicknose in the universe&quot; would be awarded to someone else."
+- "I would execute you, but then the title of \x34Most gross dicknose in the universe\x34 would be awarded to someone else."
 - "Why are you so pissy, shitbreath, did someone shit in your yogurt?"
 - "We should hang out, it's overwhelming to be in the same room with someone with so much baggage."
-- "Hey you ate all my oreos, what the hell is the matter with you?"
+- "Hey you ate all my Oreos, what the hell is the matter with you?"
 - "Why are you in a bad mood, shitbreath, did someone take a big old poop in your frosted flakes?"
 - "Nobody who knows you cares about your wishes, in fact we all agreed that it would make the world a better place if you just died."
 - "Go fuck your mom you bitch."
@@ -416,21 +425,21 @@ insults:
 - "I hate you so much I can't even have children."
 - "I'd rather masturbate with scissors to a pile of shit than be friends with you."
 - "You definitely have a pretty ass. I'd like to wreck it with my mutant dyke spike."
-- "Every time I see a drug dealer take a humungous moist poop while giving head, it reminds me of you."
+- "Every time I see a drug dealer take a humongous moist poop while giving head, it reminds me of you."
 - "Dude get in the car, what the dick is the matter with you?"
 - "Wallow in a lake of diarrhea, you sorrowful asshole."
 - "Wow you have a gorgeous smile. It will be enjoyable to annihilate it with my giant pants porpoise."
 - "I just douched a chunk of potato out of my huge vagina and it looked a little bit like you."
 - "The truth is, you lack the ability to go to the bathroom by yourself. It's most likely because you have warts."
 - "Thy loins are ripe, thou repugnant crook-pated knave."
-- "Just so we're clear, you no longer have the ability to walk in a straight line. It's most likely because you have expleosive diarrhea."
+- "Just so we're clear, you no longer have the ability to walk in a straight line. It's most likely because you have explosive diarrhea."
 - "I'm not saying you're a ho, but if your serpent socket had a password, it would be qwerty."
 - "You're the first fucker I've ever desired to strangle."
 - "You repulse me so thoroughly that I sometimes weep at the thought of you."
 - "Eat a dick, you Japanese cotton picker."
 - "I can't wait until you suffocate on a homeless man's cock, you tree hugging asshole."
 - "If you have even a single shred of decency you'll shut your smelly mouth, you witless cum chaser."
-- "Why are you cunty, cockbreath, did someone take a poop in your funyuns?"
+- "Why are you cunty, cockbreath, did someone take a poop in your Funyuns?"
 - "Everyone says the only fucking you get is from your brother."
 - "I dream of a time when you get genital warts."
 - "Suck a bucket of salted dicks."
@@ -449,7 +458,7 @@ insults:
 - "I'm encouraging you to shut your face, you intolerant barrel of feces."
 - "For your information, you can no longer solve simple problems. It's presumably because you have tapeworms."
 - "Every fucking time we try to be your friend, you expose yourself to strangers and I realize you're just not worth it."
-- "I suspect you like craigslist a trifle too much."
+- "I suspect you like Craigslist a trifle too much."
 - "I hate you so much I can't even pee standing up."
 - "I will pummel you square in your swampy stench trench, you christian whore."
 - "Down to hell and say I send thee thither, thou wretched pottle-deep egregious dog."
@@ -482,7 +491,7 @@ insults:
 - "You are not even remotely very nice, in fact you're a shit-breathing bitch."
 - "In comparison with you, contracting malaria isn't really that bad."
 - "If what I hear is true, you no longer have the ability to socialize normally. It's likely because you have hepatitis."
-- "You will never be likeable."
+- "You will never be likable."
 - "Hey, remember that time when your co-workers went to New York City? Wait, you don't? Oh right, I can't believe I forgot, nobody likes you."
 - "I'm fully aware that you're a worthless son of a bitch, but holy heavenly father, go fuck a meat grinder."
 - "I'm just going to go ahead and take a mutant liquid shit on your cat."
@@ -494,7 +503,7 @@ insults:
 - "People don't hate you because you're foul. Don't get me wrong you are uncommonly foul, that's just not why people hate you."
 - "Please fuck off, you incommodious cuntface."
 - "We should hang out, it's stunning to visit with someone with such a huge potential for failure."
-- "I would lynch you, but then the title of &quot;Most awesomely disgusting twatwaffle alive&quot; would be awarded to someone else."
+- "I would lynch you, but then the title of \x34Most awesomely disgusting twatwaffle alive\x34 would be awarded to someone else."
 - "Go away, you troublesome cockskank."
 - "Everyone says the only loving you get is from your family members."
 - "Everyone says the only fucking you get is from your wet towel."
diff --git a/src/main/resources/rate.yml b/src/main/resources/rate.yml
new file mode 100644
index 0000000..8162f6c
--- /dev/null
+++ b/src/main/resources/rate.yml
@@ -0,0 +1,78 @@
+# Rate config
+
+# Determines the max rating of the Rate command
+# Ratings given by the bot will be expressed on a scale from 0 to this number inclusive
+# Must be an integer between 1 and 1000000
+rate-out-of: 10
+
+# Determines how many decimal places the rating should be accurate to
+# Must be an integer between 0 and 2
+rate-granularity: 1
+
+# If true, the bot will make the following replacements in the rating argument to make it feel more conversational:
+#   me -> you
+#   my -> your
+#   myself -> yourself
+#   your -> my
+#   yourself -> myself
+# Example: "rate my build" with a template of "I rate %m..." will become "I rate your build..."
+translate-first-and-second-person: true
+
+# The responses that are returned by the Rate command
+# A message will be displayed if the random number rolled between 0 and rate-out-of falls within the range of
+# [low, high] inclusive. For ratings that should appear only for specific values, set low and high to the same value.
+# All entries must be prefixed with the "==: Rating" attribute, as shown in the default
+# message = the message to display
+#   '%m' = the thing that is being rated
+#   '%r' = the rating itself, expressed in the form <rating>/<max>
+# low = the lower bound at which this message will display, inclusive
+# high = the higher bound at which this message will display, inclusive
+responses:
+- ==: Rating
+  message: 'I rate %m 0/10, absolutely awful'
+  low: 0
+  high: 0
+- ==: Rating
+  message: 'I rate %m a shitty %r'
+  low: 0.1
+  high: 0.9
+- ==: Rating
+  message: 'I rate %m a very low %r'
+  low: 1.0
+  high: 1.9
+- ==: Rating
+  message: 'I rate %m a low %r'
+  low: 2.0
+  high: 2.9
+- ==: Rating
+  message: 'I rate %m a paltry %r'
+  low: 3.0
+  high: 3.9
+- ==: Rating
+  message: 'I rate %m a meh %r'
+  low: 4.0
+  high: 4.9
+- ==: Rating
+  message: 'I rate %m a solid %r'
+  low: 5.0
+  high: 5.9
+- ==: Rating
+  message: 'I rate %m a somewhat good %r'
+  low: 6.0
+  high: 6.9
+- ==: Rating
+  message: 'I rate %m a good %r'
+  low: 7.0
+  high: 7.9
+- ==: Rating
+  message: 'I rate %m a great %r'
+  low: 8.0
+  high: 8.9
+- ==: Rating
+  message: 'I rate %m a fantastic %r'
+  low: 9.0
+  high: 9.9
+- ==: Rating
+  message: 'I rate %m a perfect 10/10'
+  low: 10
+  high: 10
\ No newline at end of file
diff --git a/src/main/resources/script.yml b/src/main/resources/script.yml
new file mode 100644
index 0000000..ddf543a
--- /dev/null
+++ b/src/main/resources/script.yml
@@ -0,0 +1,20 @@
+# Script Config
+
+# A list of responses that are automatically triggered by special phrases
+# trigger-minecraft: (optional) the phrase that triggers the response(s) in Minecraft
+# trigger-discord: (optional) the phrase that triggers the response(s) in Discord
+# response-minecraft: (optional) the message that is sent to Minecraft
+#   '%u' - the sender's username
+#   Color codes prefixed with '&' may be applied
+# response-discord: (optional) the message that is sent to Discord
+#   '%u' - the sender's username
+# case-sensitive: (optional) if true, the response will only activate if the message matches the case of the trigger phrase
+# requires-mention: (optional) if true, the response will only activate if the message follows an @mention of the bot
+# starts-with: (optional) if true, the response will trigger on any string that starts with the trigger phrase
+responses:
+- ==: Script
+  trigger-minecraft: 'hello world!'
+  trigger-discord: 'hello world!'
+  response-minecraft: 'Hello World!'
+  response-discord: 'Hello World!'
+  requires-mention: true
\ No newline at end of file

From 3f95d579ef1634fe172c9a44f6932e193dd515ca Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Tue, 4 Apr 2017 11:34:04 -0500
Subject: [PATCH 17/24] Implemented most of a reflection-based command handling
 system

---
 README.md                                     |   2 +-
 build.gradle                                  |  10 +-
 .../orre}/discordbridge/CommandLogic.kt       |  67 ++--
 .../orre/discordbridge/Config.kt}             |  15 +-
 .../orre}/discordbridge/DataConfigAccessor.kt |   7 +-
 .../orre}/discordbridge/Plugin.kt             | 122 +++----
 .../orre}/discordbridge/discord/Connection.kt |  38 ++-
 .../co/orre/discordbridge/discord/Listener.kt |  33 ++
 .../controllers/BotControllerManager.kt       | 297 +++++++++++++++++
 .../controllers/FunCommandsController.kt      |  78 +++++
 .../controllers/UtilCommandsController.kt     |  61 ++++
 .../discord/interfaces/BotCommand.kt          |   8 +
 .../discord/interfaces/BotController.kt       |   7 +
 .../discordbridge/minecraft/EventListener.kt  | 123 +++++++
 .../discordbridge/minecraft/Permissions.kt    |   2 +-
 .../minecraft/commands/Discord.kt             |  26 +-
 .../minecraft/commands/EightBall.kt           |  17 +-
 .../discordbridge/minecraft/commands/F.kt     |  15 +-
 .../minecraft/commands/Insult.kt              |  15 +-
 .../discordbridge/minecraft/commands/Rate.kt  |  15 +-
 .../controllers/BotControllerManager.kt       | 307 ++++++++++++++++++
 .../controllers/FunCommandsController.kt      |  81 +++++
 .../minecraft/interfaces/BotCommand.kt        |   8 +
 .../minecraft/interfaces/BotController.kt     |   7 +
 .../co/orre/discordbridge/utils/Rating.kt     |  17 +
 .../co/orre/discordbridge/utils/Respect.kt    |  17 +
 .../orre/discordbridge/utils/Script.kt}       |  36 +-
 .../co/orre/discordbridge/utils/UserAlias.kt  |   3 +
 .../orre/discordbridge/utils/UtilFunctions.kt |  49 +++
 .../discordbridge/discord/Listener.kt         | 193 -----------
 .../discordbridge/minecraft/EventListener.kt  | 113 -------
 src/main/resources/config.yml                 |  20 +-
 src/main/resources/{f.yaml => f.yml}          |   5 +-
 src/main/resources/plugin.yml                 |   2 +-
 src/main/resources/script.yml                 |   1 +
 35 files changed, 1294 insertions(+), 523 deletions(-)
 rename src/main/kotlin/{gg/obsidian => co/orre}/discordbridge/CommandLogic.kt (53%)
 rename src/main/kotlin/{gg/obsidian/discordbridge/Configuration.kt => co/orre/discordbridge/Config.kt} (87%)
 rename src/main/kotlin/{gg/obsidian => co/orre}/discordbridge/DataConfigAccessor.kt (92%)
 rename src/main/kotlin/{gg/obsidian => co/orre}/discordbridge/Plugin.kt (66%)
 rename src/main/kotlin/{gg/obsidian => co/orre}/discordbridge/discord/Connection.kt (64%)
 create mode 100644 src/main/kotlin/co/orre/discordbridge/discord/Listener.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/discord/controllers/BotControllerManager.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/discord/controllers/FunCommandsController.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/discord/controllers/UtilCommandsController.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/discord/interfaces/BotCommand.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/discord/interfaces/BotController.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/minecraft/EventListener.kt
 rename src/main/kotlin/{gg/obsidian => co/orre}/discordbridge/minecraft/Permissions.kt (89%)
 rename src/main/kotlin/{gg/obsidian => co/orre}/discordbridge/minecraft/commands/Discord.kt (69%)
 rename src/main/kotlin/{gg/obsidian => co/orre}/discordbridge/minecraft/commands/EightBall.kt (51%)
 rename src/main/kotlin/{gg/obsidian => co/orre}/discordbridge/minecraft/commands/F.kt (56%)
 rename src/main/kotlin/{gg/obsidian => co/orre}/discordbridge/minecraft/commands/Insult.kt (57%)
 rename src/main/kotlin/{gg/obsidian => co/orre}/discordbridge/minecraft/commands/Rate.kt (56%)
 create mode 100644 src/main/kotlin/co/orre/discordbridge/minecraft/controllers/BotControllerManager.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/minecraft/controllers/FunCommandsController.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/minecraft/interfaces/BotCommand.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/minecraft/interfaces/BotController.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/utils/Rating.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/utils/Respect.kt
 rename src/main/kotlin/{gg/obsidian/discordbridge/Utils/Utils.kt => co/orre/discordbridge/utils/Script.kt} (52%)
 create mode 100644 src/main/kotlin/co/orre/discordbridge/utils/UserAlias.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/utils/UtilFunctions.kt
 delete mode 100644 src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
 delete mode 100644 src/main/kotlin/gg/obsidian/discordbridge/minecraft/EventListener.kt
 rename src/main/resources/{f.yaml => f.yml} (81%)

diff --git a/README.md b/README.md
index c8e864a..c304239 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ username: 'DiscordBridge'
 username-color: ''
 
 # (Optional) Set this value with a valid Cleverbot API key to enable chatting with Cleverbot
-# Look at https://www.cleverbot.com/api/ for more info
+# Look at https://www.cleverbot.com/JDA/ for more info
 cleverbot-key: ''
 
 # If true, prints verbose log messages to the server console for every action
diff --git a/build.gradle b/build.gradle
index f1757af..80c1ac1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 
 buildscript {
-    ext.kotlin_version = '1.0.6'
+    ext.kotlin_version = '1.1.1'
 
     repositories {
         mavenCentral()
@@ -22,14 +22,14 @@ plugins {
 
 apply plugin: 'kotlin'
 
-group = 'gg.obsidian'
-version = '1.7.6'
+group = 'co.orre'
+version = '2.0.0'
 description = """Bridge chat between Minecraft and Discord"""
-ext.url = 'https://github.com/the-obsidian/DiscordBridge'
+ext.url = 'https://github.com/DiamondIceNS/DiscordBridge'
 
 repositories {
     maven { url 'https://maven-central.storage.googleapis.com' }
-    maven { url 'https://hub.spigotmc.org/nexus/content/groups/public/' }
+    maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
     maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
     maven { url 'http://lutece.paris.fr/nexus/content/repositories/lutece_third_party' }
     maven { url 'https://github.com/DV8FromTheWorld/Maven-Repository/raw/master/repo' }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/CommandLogic.kt b/src/main/kotlin/co/orre/discordbridge/CommandLogic.kt
similarity index 53%
rename from src/main/kotlin/gg/obsidian/discordbridge/CommandLogic.kt
rename to src/main/kotlin/co/orre/discordbridge/CommandLogic.kt
index c7a4c24..f161bcb 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/CommandLogic.kt
+++ b/src/main/kotlin/co/orre/discordbridge/CommandLogic.kt
@@ -1,17 +1,17 @@
-package gg.obsidian.discordbridge
+package co.orre.discordbridge
 
 import com.michaelwflaherty.cleverbotapi.CleverBotQuery
-import gg.obsidian.discordbridge.Utils.Rating
-import gg.obsidian.discordbridge.Utils.Respect
+import co.orre.discordbridge.utils.Rating
+import co.orre.discordbridge.utils.Respect
 import java.io.IOException
 import java.util.*
 
 object CommandLogic {
 
-    fun askCleverbot(plugin: Plugin, message: String): String {
-        if (plugin.cfg.CLEVERBOT_KEY.isEmpty())
-            return "You do not have an API key. Go to https://www.cleverbot.com/api/ for more information."
-        val bot: CleverBotQuery = CleverBotQuery(plugin.cfg.CLEVERBOT_KEY, message)
+    fun askCleverbot(invokerName: String, query: String): String {
+        if (Config.CLEVERBOT_KEY.isEmpty())
+            return "You do not have an API key. Go to https://www.cleverbot.com/JDA/ for more information."
+        val bot: CleverBotQuery = CleverBotQuery(Config.CLEVERBOT_KEY, query)
         var response: String
         try {
             bot.sendRequest()
@@ -20,18 +20,24 @@ object CommandLogic {
             response = e.message!!
         }
 
-        return response
+        return "$invokerName | $response"
     }
 
-    fun eightBall(plugin: Plugin, name: String): String {
-        val responses = plugin.eightball.data.getStringList("responses")
+    fun choose(invokerName: String, query: String): String {
+        val choices = query.split(", or ", " or ", ",", "|")
+        val rand = Random().nextInt(choices.count())
+        return "$invokerName | I pick '${choices[rand]}'"
+    }
+
+    fun eightBall(p: Plugin, invokerName: String): String {
+        val responses = p.eightball.data.getStringList("responses")
         val rand = Random().nextInt(responses.count())
-        return "$name - ${responses[rand]}"
+        return "$invokerName | ${responses[rand]}"
     }
 
-    fun f(plugin: Plugin, sender_name: String): String {
-        var totalRespects = plugin.f.data.getInt("total-respects", 0)
-        val responses = plugin.f.data.getList("responses").checkItemsAre<Respect>()
+    fun f(p: Plugin, invokerName: String): String {
+        var totalRespects = p.f.data.getInt("total-respects", 0)
+        val responses = p.f.data.getList("responses").checkItemsAre<Respect>()
                 ?: return "ERROR: Responses for this command could not be read from the config."
         val totalWeight = responses.sumBy { it.weight }
         var rand = Random().nextInt(totalWeight) + 1
@@ -45,31 +51,31 @@ object CommandLogic {
         }
 
         totalRespects += found!!.count
-        val msg = found.message.replace("%u", sender_name).replace("%t", totalRespects.toString())
+        val msg = found.message.replace("%u", invokerName).replace("%t", totalRespects.toString())
                 .replace("%c", found.count.toString())
 
-        plugin.f.data.set("total-respects", totalRespects)
-        plugin.f.saveConfig()
+        p.f.data.set("total-respects", totalRespects)
+        p.f.saveConfig()
 
         return msg
     }
 
-    fun insult(plugin: Plugin, sender_name: String, arg: String): String {
-        val responses = plugin.insult.data.getStringList("responses")
+    fun insult(p: Plugin, invokerName: String, thingToBeInsulted: String): String {
+        val responses = p.insult.data.getStringList("responses")
         val rand = Random().nextInt(responses.count())
-        return plugin.insult.data.getString("template", "").replace("%u", sender_name)
-                .replace("%i", responses[rand]).replace("%t", arg)
+        return p.insult.data.getString("template", "").replace("%u", invokerName)
+                .replace("%i", responses[rand]).replace("%t", thingToBeInsulted)
     }
 
-    fun rate(plugin: Plugin, sender_name: String, arg: String): String {
-        val responses = plugin.rate.data.getList("responses").checkItemsAre<Rating>()
+    fun rate(p: Plugin, sender_name: String, arg: String): String {
+        val responses = p.rate.data.getList("responses").checkItemsAre<Rating>()
                 ?: return "ERROR: Responses for this command could not be read from the config."
 
-        var rateOutOf = plugin.rate.data.getInt("rate-out-of", 10)
+        var rateOutOf = p.rate.data.getInt("rate-out-of", 10)
         if (rateOutOf > 1000000) rateOutOf = 1000000
         if (rateOutOf < 0) rateOutOf = 0
 
-        var granularity = plugin.rate.data.getInt("granularity", 1)
+        var granularity = p.rate.data.getInt("granularity", 1)
         if (granularity > 2) granularity = 2
         if (granularity < 0) granularity = 0
 
@@ -81,7 +87,7 @@ object CommandLogic {
                 ?: return "ERROR: No response set for rating $rating"
 
         var thingToBeRated = arg
-        if (plugin.rate.data.getBoolean("translate-first-and-second-person", true)) {
+        if (p.rate.data.getBoolean("translate-first-and-second-person", true)) {
             val argArray = arg.split(" ").toMutableList()
             val iterate = argArray.listIterator()
             while (iterate.hasNext()) {
@@ -98,6 +104,15 @@ object CommandLogic {
         return found.message.replace("%u", sender_name).replace("%m", thingToBeRated).replace("%r", "$rating/$rateOutOf")
     }
 
+    fun roll(invokerName: String, sides: Int): String {
+        if (sides == 1)
+            return "$invokerName | You rolled... 1. Was it any surprise?"
+        if (sides > 100 || sides < 1)
+            return "$invokerName | I can't roll a die with $sides sides. It must have between 1 and 100 sides."
+        val rand = Random().nextInt(sides)
+        return "$invokerName | You rolled... $rand"
+    }
+
     // UTIL
 
     @Suppress("UNCHECKED_CAST")
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Configuration.kt b/src/main/kotlin/co/orre/discordbridge/Config.kt
similarity index 87%
rename from src/main/kotlin/gg/obsidian/discordbridge/Configuration.kt
rename to src/main/kotlin/co/orre/discordbridge/Config.kt
index 8c100ad..dc31091 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Configuration.kt
+++ b/src/main/kotlin/co/orre/discordbridge/Config.kt
@@ -1,14 +1,16 @@
-package gg.obsidian.discordbridge
+package co.orre.discordbridge
 
-import gg.obsidian.discordbridge.Utils.noSpace
+import org.bukkit.ChatColor
+import co.orre.discordbridge.utils.UtilFunctions.noSpace
 
-class Configuration(val plugin: Plugin) {
+object Config {
 
     var SERVER_ID: String = ""
     var CHANNEL: String = ""
     var USERNAME: String = ""
     var USERNAME_COLOR: String = ""
     var TOKEN: String = ""
+    var COMMAND_PREFIX: String = ""
     var CLEVERBOT_KEY: String = ""
     var DEBUG: Boolean = false
     var RELAY_CANCELLED_MESSAGES = true
@@ -40,7 +42,7 @@ class Configuration(val plugin: Plugin) {
     // misc
     var BOT_MC_USERNAME = ""
 
-    fun load() {
+    fun load(plugin: Plugin) {
         plugin.reloadConfig()
 
         SERVER_ID = plugin.config.getString("server-id")
@@ -48,6 +50,7 @@ class Configuration(val plugin: Plugin) {
         USERNAME = plugin.config.getString("username")
         USERNAME_COLOR = plugin.config.getString("username-color")
         TOKEN = plugin.config.getString("token", "")
+        COMMAND_PREFIX = plugin.config.getString("command-prefix", "")
         CLEVERBOT_KEY = plugin.config.getString("cleverbot-key", "")
         DEBUG = plugin.config.getBoolean("debug", false)
         RELAY_CANCELLED_MESSAGES = plugin.config.getBoolean("relay-cancelled-messages", true)
@@ -66,12 +69,12 @@ class Configuration(val plugin: Plugin) {
         TEMPLATES_DISCORD_CHAT_MESSAGE = plugin.config.getString("templates.discord.chat-message", "<**%u**> %m")
         TEMPLATES_DISCORD_PLAYER_JOIN = plugin.config.getString("templates.discord.player-join", "**%u** joined the server")
         TEMPLATES_DISCORD_PLAYER_LEAVE = plugin.config.getString("templates.discord.player-leave", "**%u** left the server")
-        TEMPLATES_DISCORD_PLAYER_DEATH = plugin.config.getString("templates.discord.player-death", "%r")
+        TEMPLATES_DISCORD_PLAYER_DEATH = plugin.config.getString("templates.discord.player-death", "%m")
         TEMPLATES_DISCORD_SERVER_START = plugin.config.getString("templates.discord.server-start", "Server started!")
         TEMPLATES_DISCORD_SERVER_STOP = plugin.config.getString("templates.discord.server_stop", "Shutting down...")
 
         TEMPLATES_MINECRAFT_CHAT_MESSAGE = plugin.config.getString("templates.minecraft.chat-message", "[&b&lDiscord&r]<%u> %m")
 
-        BOT_MC_USERNAME = USERNAME_COLOR + USERNAME.noSpace() + "&r"
+        BOT_MC_USERNAME = ChatColor.translateAlternateColorCodes('&', USERNAME_COLOR + USERNAME.noSpace() + "&r")
     }
 }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/DataConfigAccessor.kt b/src/main/kotlin/co/orre/discordbridge/DataConfigAccessor.kt
similarity index 92%
rename from src/main/kotlin/gg/obsidian/discordbridge/DataConfigAccessor.kt
rename to src/main/kotlin/co/orre/discordbridge/DataConfigAccessor.kt
index 965014b..423af0e 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/DataConfigAccessor.kt
+++ b/src/main/kotlin/co/orre/discordbridge/DataConfigAccessor.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge
+package co.orre.discordbridge
 
 /*
 * Copyright (C) 2012 SagaciousZed
@@ -24,13 +24,12 @@ package gg.obsidian.discordbridge
 
 import org.bukkit.configuration.file.FileConfiguration
 import org.bukkit.configuration.file.YamlConfiguration
-import org.bukkit.plugin.java.JavaPlugin
 import java.io.File
 import java.io.IOException
 import java.io.InputStreamReader
 import java.util.logging.Level
 
-class DataConfigAccessor(private val plugin: JavaPlugin, filepath: File, private val fileName: String) {
+class DataConfigAccessor(val plugin: Plugin, filepath: File, private val fileName: String) {
 
     private val configFile: File?
     private var fileConfiguration: FileConfiguration? = null
@@ -75,7 +74,7 @@ class DataConfigAccessor(private val plugin: JavaPlugin, filepath: File, private
     @Suppress("unused")
     fun saveDefaultConfig() {
         if (!configFile!!.exists())
-            this.plugin.saveResource(fileName, false)
+            plugin.saveResource(fileName, false)
     }
 
 }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt b/src/main/kotlin/co/orre/discordbridge/Plugin.kt
similarity index 66%
rename from src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
rename to src/main/kotlin/co/orre/discordbridge/Plugin.kt
index 43cb165..492988b 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
+++ b/src/main/kotlin/co/orre/discordbridge/Plugin.kt
@@ -1,26 +1,24 @@
-package gg.obsidian.discordbridge
-
-import gg.obsidian.discordbridge.Utils.*
-import gg.obsidian.discordbridge.discord.Connection
-import gg.obsidian.discordbridge.minecraft.EventListener
-import gg.obsidian.discordbridge.minecraft.commands.*
+package co.orre.discordbridge
+
+import co.orre.discordbridge.utils.UserAlias
+import co.orre.discordbridge.utils.UtilFunctions.noSpace
+import co.orre.discordbridge.utils.*
+import co.orre.discordbridge.discord.Connection
+import co.orre.discordbridge.minecraft.EventListener
+import co.orre.discordbridge.minecraft.commands.*
 import net.dv8tion.jda.core.OnlineStatus
 import net.dv8tion.jda.core.entities.Member
 import net.dv8tion.jda.core.entities.MessageChannel
-import org.bukkit.ChatColor as CC
+import org.bukkit.configuration.serialization.ConfigurationSerialization
 import org.bukkit.entity.Player
 import org.bukkit.plugin.java.JavaPlugin
-import org.bukkit.configuration.serialization.ConfigurationSerialization
-import java.util.logging.Level
 import java.io.File
+import java.util.logging.Level
+import org.bukkit.ChatColor as CC
 
 class Plugin : JavaPlugin() {
 
-    // Connection to Discord
-    lateinit var conn: Connection
-
     // Configs
-    val cfg = Configuration(this)
     var users: DataConfigAccessor = DataConfigAccessor(this, dataFolder, "usernames.yml")
     var eightball: DataConfigAccessor = DataConfigAccessor(this, dataFolder, "8ball.yml")
     var insult: DataConfigAccessor = DataConfigAccessor(this, dataFolder, "insult.yml")
@@ -33,7 +31,7 @@ class Plugin : JavaPlugin() {
     var requests: MutableList<UserAlias> = mutableListOf()
 
     // Detects if Multiverse-Core is installed
-    val foundMultiverse: Boolean
+    val isMultiverseInstalled: Boolean
         get() = server.pluginManager.getPlugin("Multiverse-Core") != null
 
     override fun onEnable() {
@@ -45,11 +43,11 @@ class Plugin : JavaPlugin() {
         f.saveConfig()
         rate.saveConfig()
         script.saveConfig()
-        if (foundMultiverse) worlds = DataConfigAccessor(this, File("plugins/Multiverse-Core"), "worlds.yml")
+        if (isMultiverseInstalled) worlds = DataConfigAccessor(this, File("plugins/Multiverse-Core"), "worlds.yml")
 
         // Connect to Discord
-        this.conn = Connection(this)
-        server.scheduler.runTaskAsynchronously(this, conn)
+        Connection.plugin = this //TODO: enforce this better
+        server.scheduler.runTaskAsynchronously(this, Connection)
         server.pluginManager.registerEvents(EventListener(this), this)
 
         // Register commands
@@ -61,11 +59,12 @@ class Plugin : JavaPlugin() {
 
         ConfigurationSerialization.registerClass(Respect::class.java, "Respect")
         ConfigurationSerialization.registerClass(Rating::class.java, "Rating")
+        ConfigurationSerialization.registerClass(Script::class.java, "Script")
     }
 
     override fun onDisable() {
-        if (cfg.ANNOUNCE_SERVER_START_STOP)
-            conn.send(cfg.TEMPLATES_DISCORD_SERVER_STOP, conn.getRelayChannel())
+        if (Config.ANNOUNCE_SERVER_START_STOP)
+            Connection.send(Config.TEMPLATES_DISCORD_SERVER_STOP, Connection.getRelayChannel())
 
         // Pretend like this does anything
         logger.log(Level.INFO, "Attempting to cancel tasks")
@@ -79,7 +78,7 @@ class Plugin : JavaPlugin() {
     // Send a message to Discord
     fun sendToDiscord(message: String, channel: MessageChannel?) {
         logDebug("Sending message to Discord - $message")
-        conn.send(message, channel)
+        Connection.send(message, channel)
     }
 
     // Send a message to Minecraft
@@ -100,9 +99,9 @@ class Plugin : JavaPlugin() {
         f.reloadConfig()
         rate.reloadConfig()
         script.reloadConfig()
-        if (foundMultiverse) worlds!!.reloadConfig()
-        cfg.load()
-        //conn?.reconnect()
+        if (isMultiverseInstalled) worlds!!.reloadConfig()
+        Config.load(this)
+        Connection.reconnect()
     }
 
     // Save default config
@@ -111,12 +110,12 @@ class Plugin : JavaPlugin() {
         config.options().copyDefaults(true)
         config.set("version", version)
         saveConfig()
-        cfg.load()
+        Config.load(this)
     }
 
     // Log only if debug config is true
     fun logDebug(msg: String) {
-        if (!cfg.DEBUG) return
+        if (!Config.DEBUG) return
         logger.info(msg)
     }
 
@@ -129,60 +128,60 @@ class Plugin : JavaPlugin() {
     }
 
     // Open a request to link a Minecraft user with a Discord user
-    fun registerUserRequest(player: Player, id: String): Boolean {
-        val users = conn.listUsers()
-        val found: Member = users.find { it.user.id == id } ?: return false
+    fun registerUserRequest(player: Player, discordId: String): Boolean {
+        val users = Connection.listUsers()
+        val found: Member = users.find { it.user.id == discordId } ?: return false
 
         val ua: UserAlias = UserAlias(player.name, player.uniqueId.toString(), found.effectiveName, found.user.id)
         requests.add(ua)
         val msg = "Minecraft user '${ua.mcUsername}' has requested to become associated with your Discord" +
-                " account. If this is you, respond '${conn.api!!.selfUser.asMention} confirm'. If this is not" +
-                " you, respond ${conn.api!!.selfUser.asMention} deny'."
-        conn.send(msg, conn.api!!.getUserById(ua.discordId).privateChannel)
+                " account. If this is you, respond '${Connection.JDA.selfUser.asMention} confirm'. If this is not" +
+                " you, respond ${Connection.JDA.selfUser.asMention} deny'."
+        Connection.send(msg, Connection.JDA.getUserById(ua.discordId).privateChannel)
         return true
     }
 
     // Return a formatted string listing the Discord IDs of all Discord users in the relay channel
     fun getDiscordIds(): String {
-        val users = conn.listUsers()
+        val users = Connection.listUsers()
 
         if (users.isEmpty())
-            return "${CC.YELLOW}No Discord members could be found. Either server is empty or an error has occurred."
+            return "${org.bukkit.ChatColor.YELLOW}No Discord members could be found. Either server is empty or an error has occurred."
 
-        var response = "${CC.YELLOW}Discord users:"
+        var response = "${org.bukkit.ChatColor.YELLOW}Discord users:"
         for (user in users) {
-            if (user.user.isBot) response += "\n${CC.GOLD}- ${user.effectiveName} (Bot), ${user.user.id}${CC.RESET}"
-            else response += "\n${CC.YELLOW}- ${user.effectiveName}, ${user.user.id}${CC.RESET}"
+            if (user.user.isBot) response += "\n${org.bukkit.ChatColor.GOLD}- ${user.effectiveName} (Bot), ${user.user.id}${org.bukkit.ChatColor.RESET}"
+            else response += "\n${org.bukkit.ChatColor.YELLOW}- ${user.effectiveName}, ${user.user.id}${org.bukkit.ChatColor.RESET}"
         }
         return response
     }
 
     // Return a formatted string listing all Discord users in the relay channel who are visibly available
     fun getDiscordOnline(): String {
-        val onlineUsers = conn.listOnline()
+        val onlineUsers = Connection.listOnline()
         if (onlineUsers.isEmpty())
-            return "${CC.YELLOW}No Discord members could be found. Either server is empty or an error has occurred."
+            return "${org.bukkit.ChatColor.YELLOW}No Discord members could be found. Either server is empty or an error has occurred."
 
         var response = ""
         if (onlineUsers.filter { it.onlineStatus == OnlineStatus.ONLINE }.isNotEmpty()) {
-            response += "\n${CC.DARK_GREEN}Online:${CC.RESET}"
+            response += "\n${org.bukkit.ChatColor.DARK_GREEN}Online:${org.bukkit.ChatColor.RESET}"
             for (user in onlineUsers.filter { it.onlineStatus == OnlineStatus.ONLINE }) {
-                if (user.user.isBot) response += "\n${CC.DARK_GREEN}- ${user.effectiveName} (Bot)${CC.RESET}"
-                else response += "\n${CC.DARK_GREEN}- ${user.effectiveName}${CC.RESET}"
+                if (user.user.isBot) response += "\n${org.bukkit.ChatColor.DARK_GREEN}- ${user.effectiveName} (Bot)${org.bukkit.ChatColor.RESET}"
+                else response += "\n${org.bukkit.ChatColor.DARK_GREEN}- ${user.effectiveName}${org.bukkit.ChatColor.RESET}"
             }
         }
         if (onlineUsers.filter { it.onlineStatus == OnlineStatus.IDLE }.isNotEmpty()) {
-            response += "\n${CC.YELLOW}Idle:${CC.RESET}"
+            response += "\n${org.bukkit.ChatColor.YELLOW}Idle:${org.bukkit.ChatColor.RESET}"
             for (user in onlineUsers.filter { it.onlineStatus == OnlineStatus.IDLE }) {
-                if (user.user.isBot) response += "\n${CC.YELLOW}- ${user.effectiveName} (Bot)${CC.RESET}"
-                else response += "\n${CC.YELLOW}- ${user.effectiveName}${CC.RESET}"
+                if (user.user.isBot) response += "\n${org.bukkit.ChatColor.YELLOW}- ${user.effectiveName} (Bot)${org.bukkit.ChatColor.RESET}"
+                else response += "\n${org.bukkit.ChatColor.YELLOW}- ${user.effectiveName}${org.bukkit.ChatColor.RESET}"
             }
         }
         if (onlineUsers.filter { it.onlineStatus == OnlineStatus.DO_NOT_DISTURB }.isNotEmpty()) {
-            response += "\n${CC.RED}Do Not Disturb:${CC.RESET}"
+            response += "\n${org.bukkit.ChatColor.RED}Do Not Disturb:${org.bukkit.ChatColor.RESET}"
             for (user in onlineUsers.filter { it.onlineStatus == OnlineStatus.DO_NOT_DISTURB }) {
-                if (user.user.isBot) response += "\n${CC.RED}- ${user.effectiveName} (Bot)${CC.RESET}"
-                else response += "\n&${CC.RED} ${user.effectiveName}${CC.RESET}"
+                if (user.user.isBot) response += "\n${org.bukkit.ChatColor.RED}- ${user.effectiveName} (Bot)${org.bukkit.ChatColor.RESET}"
+                else response += "\n&${org.bukkit.ChatColor.RED} ${user.effectiveName}${org.bukkit.ChatColor.RESET}"
             }
         }
 
@@ -210,7 +209,7 @@ class Plugin : JavaPlugin() {
     fun convertAtMentions(message: String): String {
         var newMessage = message
 
-        val discordusers = conn.listUsers()
+        val discordusers = Connection.listUsers()
         val discordaliases: MutableList<Pair<String, Member>> = mutableListOf()
         discordusers
                 .filter { users.data.isSet("discordaliases.${it.user.id}") }
@@ -251,31 +250,4 @@ class Plugin : JavaPlugin() {
             newMessage = newMessage.replace(users.data.getString("discordaliases.$discordId.mcusername"), alias)
         return newMessage
     }
-
-    fun toMinecraftChatMessage(message: String, alias: String): String {
-        return formatMessage(cfg.TEMPLATES_MINECRAFT_CHAT_MESSAGE, msg=message, u=alias)
-    }
-
-    fun toDiscordChatMessage(message: String, username: String, displayName: String, worldName: String): String {
-        return formatMessage(cfg.TEMPLATES_DISCORD_CHAT_MESSAGE, msg=message, u=username, d=displayName, w=worldName)
-    }
-
-    fun toDiscordPlayerJoin(username: String, displayName: String): String {
-        return formatMessage(cfg.TEMPLATES_DISCORD_PLAYER_JOIN, u=username, d=displayName)
-    }
-
-    fun toDiscordPlayerLeave(username: String, displayName: String): String {
-        return formatMessage(cfg.TEMPLATES_DISCORD_PLAYER_LEAVE, u=username, d=displayName)
-    }
-
-    fun toDiscordPlayerDeath(deathMessage: String, username: String, displayName: String): String {
-        return formatMessage(cfg.TEMPLATES_DISCORD_CHAT_MESSAGE, r=deathMessage, u=username, d=displayName)
-    }
-
-    private fun formatMessage(template: String, msg: String = "N/A", u: String = "N/A", d: String = "N/A",
-                              w: String = "N/A", r: String = "N/A"): String {
-        var out = CC.translateAlternateColorCodes('&', template)
-        out = out.replace("%u", u).replace("%m", msg).replace("%d", d).replace("%w", w).replace("%r", r)
-        return out
-    }
 }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt b/src/main/kotlin/co/orre/discordbridge/discord/Connection.kt
similarity index 64%
rename from src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
rename to src/main/kotlin/co/orre/discordbridge/discord/Connection.kt
index 142519a..74fcd27 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
+++ b/src/main/kotlin/co/orre/discordbridge/discord/Connection.kt
@@ -1,14 +1,16 @@
-package gg.obsidian.discordbridge.discord
+package co.orre.discordbridge.discord
 
-import gg.obsidian.discordbridge.Plugin
+import co.orre.discordbridge.Config
+import co.orre.discordbridge.Plugin
 import net.dv8tion.jda.core.AccountType
 import net.dv8tion.jda.core.JDA
 import net.dv8tion.jda.core.JDABuilder
 import net.dv8tion.jda.core.entities.*
 
-class Connection(val plugin: Plugin) : Runnable {
-    var api: JDA? = null
-    var listener: Listener? = null
+object Connection: Runnable {
+    lateinit var plugin: Plugin
+    lateinit var JDA: JDA
+    lateinit var listener: Listener
     var server: Guild? = null
     var channel: TextChannel? = null
 
@@ -21,8 +23,8 @@ class Connection(val plugin: Plugin) : Runnable {
     }
 
     fun getRelayChannel(): TextChannel? {
-        server = if (server == null) getServerById(plugin.cfg.SERVER_ID) else server
-        channel = if (channel == null) getGroupByName(server!!, plugin.cfg.CHANNEL) else channel
+        server = if (server == null) getServerById(Config.SERVER_ID) else server
+        channel = if (channel == null) getGroupByName(server!!, Config.CHANNEL) else channel
         return channel
     }
 
@@ -52,19 +54,19 @@ class Connection(val plugin: Plugin) : Runnable {
     }
 
     private fun connect() {
-        var builder = JDABuilder(AccountType.BOT).setAudioEnabled(false)
-        builder = builder.setToken(plugin.cfg.TOKEN)
-        api = builder.buildBlocking()
-        listener = Listener(plugin, api as JDA, this)
-        api!!.addEventListener(listener)
-        if (plugin.cfg.ANNOUNCE_SERVER_START_STOP)
-            send(plugin.cfg.TEMPLATES_DISCORD_SERVER_START, getRelayChannel())
-        api!!.presence.game = Game.of("Minecraft ${plugin.server.bukkitVersion.split("-")[0]}")
+        var builder = JDABuilder(AccountType.BOT).setAudioEnabled(true)
+        builder = builder.setToken(Config.TOKEN)
+        JDA = builder.buildBlocking()
+        listener = Listener(plugin)
+        JDA.addEventListener(listener)
+        if (Config.ANNOUNCE_SERVER_START_STOP)
+            send(Config.TEMPLATES_DISCORD_SERVER_START, getRelayChannel())
+        JDA.presence.game = Game.of("Minecraft ${plugin.server.bukkitVersion.split("-")[0]}")
     }
 
     private fun disconnect() {
-        api?.removeEventListener(listener)
-        api?.shutdown(false)
+        JDA.removeEventListener(listener)
+        JDA.shutdown(false)
     }
 
     private fun getGroupByName(server: Guild, name: String): TextChannel? {
@@ -72,6 +74,6 @@ class Connection(val plugin: Plugin) : Runnable {
     }
 
     private fun getServerById(id: String): Guild? {
-        return api!!.guilds.firstOrNull { it.id.equals(id, true) }
+        return JDA.guilds.firstOrNull { it.id.equals(id, true) }
     }
 }
diff --git a/src/main/kotlin/co/orre/discordbridge/discord/Listener.kt b/src/main/kotlin/co/orre/discordbridge/discord/Listener.kt
new file mode 100644
index 0000000..78c2e63
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/discord/Listener.kt
@@ -0,0 +1,33 @@
+package co.orre.discordbridge.discord
+
+// TODO: Apache License
+
+import co.orre.discordbridge.Plugin
+import co.orre.discordbridge.discord.controllers.BotControllerManager
+import co.orre.discordbridge.discord.controllers.FunCommandsController
+import co.orre.discordbridge.discord.controllers.UtilCommandsController
+import net.dv8tion.jda.core.events.message.MessageReceivedEvent
+import net.dv8tion.jda.core.hooks.ListenerAdapter
+
+class Listener(val plugin: Plugin) : ListenerAdapter() {
+
+    val controllerManager = BotControllerManager(plugin)
+
+    init {
+        controllerManager.registerController(FunCommandsController(plugin))
+        controllerManager.registerController(UtilCommandsController(plugin))
+    }
+
+    override fun onMessageReceived(event: MessageReceivedEvent) {
+        plugin.logDebug("Received message ${event.message.id} from Discord - ${event.message.rawContent}")
+
+        // Immediately throw out messages sent from itself
+        if (event.author.id == Connection.JDA.selfUser.id) {
+            plugin.logDebug("Ignoring message ${event.message.id} from Discord: it matches this bot's username")
+            return
+        }
+
+        controllerManager.dispatchMessage(event.message)
+    }
+
+}
diff --git a/src/main/kotlin/co/orre/discordbridge/discord/controllers/BotControllerManager.kt b/src/main/kotlin/co/orre/discordbridge/discord/controllers/BotControllerManager.kt
new file mode 100644
index 0000000..467b328
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/discord/controllers/BotControllerManager.kt
@@ -0,0 +1,297 @@
+package co.orre.discordbridge.discord.controllers
+
+// TODO: Add Apache license
+
+import co.orre.discordbridge.Config
+import co.orre.discordbridge.Plugin
+import co.orre.discordbridge.discord.Connection
+import co.orre.discordbridge.discord.interfaces.BotCommand
+import co.orre.discordbridge.discord.interfaces.BotController
+import co.orre.discordbridge.utils.Script
+import co.orre.discordbridge.utils.UtilFunctions.noSpace
+import co.orre.discordbridge.utils.UtilFunctions.toMinecraftChatMessage
+import net.dv8tion.jda.core.entities.ChannelType
+import net.dv8tion.jda.core.entities.Message
+import java.lang.reflect.InvocationTargetException
+import java.lang.reflect.Method
+import java.util.*
+import java.util.logging.Level
+import co.orre.discordbridge.Config as cfg
+
+class BotControllerManager(val plugin: Plugin) {
+
+    private val commands: MutableMap<String, Command> = mutableMapOf()
+    private val controllers: MutableMap<Class<out BotController>, BotController> = mutableMapOf()
+
+    fun registerController(controller: BotController) {
+        controllers.put(controller.javaClass, controller)
+        val controllerClass = controller.javaClass
+
+        for (method in controllerClass.declaredMethods) {
+            val annotation = method.getAnnotation(BotCommand::class.java)
+            if (annotation != null) registerControllerMethod(controllerClass, method, annotation)
+        }
+    }
+
+    private fun registerControllerMethod(controllerClass: Class<*>, method: Method, annotation: BotCommand) {
+        val commandName = if (annotation.name.isEmpty()) method.name.toLowerCase() else annotation.name
+        val usage = annotation.usage
+        val methodParameters = method.parameters
+
+        if (methodParameters.isEmpty() || !methodParameters[0].type.isAssignableFrom(Message::class.java)) return
+
+        method.isAccessible = true
+        val parameters = (1..methodParameters.size - 1).mapTo(ArrayList<Class<*>>()) { methodParameters[it].type }
+        val command = Command(commandName, usage, annotation.description, parameters, annotation.relayTriggerMessage,
+                annotation.ignoreExcessArguments, controllerClass, method)
+        commands.put(command.name, command)
+    }
+
+    fun dispatchMessage(message: Message) {
+
+        // SCRIPTED RESPONSE - The bot replies with a pre-programmed response if it detects
+        // a corresponding trigger string
+        if (scriptedResponse(message)) return
+
+        val args = message.rawContent.trim().split("\\s+".toRegex(), 2).toTypedArray()
+
+        // <prefix>command
+        if (Config.COMMAND_PREFIX.isNotBlank() && args[0].startsWith(Config.COMMAND_PREFIX)) {
+            val commandName = args[0].substring(Config.COMMAND_PREFIX.length).toLowerCase()
+            val command = commands[commandName]
+
+            if (command == null) {
+                commandNotFound(message, commandName)
+                return
+            }
+
+            val inputArguments = if (args.size == 1) arrayOf<String>()
+                else args[1].split("\\s+".toRegex(), command.parameters.size).toTypedArray()
+
+            invokeCommand(command, controllers, message, inputArguments)
+            return
+        }
+
+        // @<mention> command
+        if (args[0] == Connection.JDA.selfUser.asMention && args.count() == 2) {
+            val args2 = args[1].split("\\s+".toRegex(), 2).toTypedArray()
+            val commandName = args2[0].toLowerCase()
+            var params = if (args2.size > 1) args2[1] else ""
+            var command = commands[commandName]
+
+            if (command == null) {
+                // Assume user wants to talk to Cleverbot
+                command = commands["talk"]
+                if (command == null) {
+                    commandNotFound(message, commandName)
+                    return
+                }
+                params = args[1]
+            }
+
+            val inputArguments = if (params == "") arrayOf<String>()
+            else params.split("\\s+".toRegex(), command.parameters.size).toTypedArray()
+
+            invokeCommand(command, controllers, message, inputArguments)
+            return
+        }
+
+        // Just relay the message if it is neither
+        relay(message, true)
+    }
+
+    private fun scriptedResponse(message: Message): Boolean {
+        val responses = plugin.script.data.getList("responses").checkItemsAre<Script>()
+        if (responses == null) {
+            plugin.logger.warning("ERROR: Unable to read script.yml!")
+            return false
+        }
+        var response: Script? = null
+        for (r in responses) {
+            var arg = message.rawContent
+            val msg = r.triggerDis ?: continue
+            val ignorecase = !(r.caseSensitive != null && r.caseSensitive)
+            val startswith = r.startsWith != null && r.startsWith
+            val requiresmention = r.requiresMention != null && r.requiresMention
+
+            if (requiresmention) {
+                if (arg.startsWith(Connection.JDA.selfUser.asMention, true))
+                    arg = arg.replaceFirst(Connection.JDA.selfUser.asMention, "").trimStart()
+                else continue
+            }
+
+            if (startswith)
+                if (arg.startsWith(msg, ignorecase)) response = r
+                else
+                    if (arg.equals(msg, ignorecase)) response = r
+        }
+        if (response == null) return false
+        plugin.logDebug("user ${message.author.name} has triggered a scripted response")
+        val responseDis: String? = response.responseDis
+        val responseMC: String? = response.responseMC
+        if (responseDis != null) {
+            val out = responseDis.replace("%u", message.author.name)
+            plugin.sendToDiscord(out, message.channel)
+        }
+        if (responseMC != null && message.isFromRelayChannel()) {
+            var alias = plugin.users.data.getString("discordaliases.${message.author.id}.mcusername")
+            if (alias == null) alias = message.author.name.noSpace()
+            val out = responseMC.replace("%u", alias)
+            plugin.sendToMinecraft(out.toMinecraftChatMessage(cfg.BOT_MC_USERNAME))
+        }
+        return true
+    }
+
+    private fun invokeCommand(command: Command, instances: Map<Class<out BotController>, BotController>,
+                              message: Message, inputArguments: Array<String>) {
+        if (command.relayTriggerMessage) relay(message, false)
+
+        if (command.name == "help") {
+            try {
+                command.commandMethod.invoke(instances[command.controllerClass], message, commands, instances)
+                return
+            } catch (e: InvocationTargetException) {
+                commandException(message, e.cause)
+                return
+            } catch (e: IllegalAccessException) {
+                throw RuntimeException(e)
+            } catch (e: IllegalArgumentException) {
+                commandWrongParameterCount(message, command.name, command.usage, 2, command.parameters.size)
+                return
+            }
+        }
+
+        if (inputArguments.size < command.parameters.size) {
+            commandWrongParameterCount(message, command.name, command.usage, inputArguments.size, command.parameters.size)
+            return
+        }
+        if (inputArguments.size != command.parameters.size && !command.ignoreExcessArguments) {
+            commandWrongParameterCount(message, command.name, command.usage, inputArguments.size, command.parameters.size)
+            return
+        }
+
+        val arguments = arrayOfNulls<Any>(command.parameters.size + 1)
+        arguments[0] = message
+
+        var paramRange = command.parameters.indices
+
+        if (command.ignoreExcessArguments && inputArguments.size > command.parameters.size)
+            paramRange = IntRange(0, command.parameters.size - 1)
+
+        for (i in paramRange) {
+            val parameterClass = command.parameters[i]
+
+            try {
+                arguments[i + 1] = parseArgument(parameterClass, inputArguments[i])
+            } catch (ignored: IllegalArgumentException) {
+                commandWrongParameterType(message, command.name, command.usage, i,
+                        inputArguments[i].javaClass, parameterClass)
+                return
+            }
+        }
+
+        try {
+            command.commandMethod.invoke(instances[command.controllerClass], *arguments)
+        } catch (e: InvocationTargetException) {
+            commandException(message, e.cause)
+        } catch (e: IllegalAccessException) {
+            throw RuntimeException(e)
+        } catch (e: IllegalArgumentException) {
+            commandWrongParameterCount(message, command.name, command.usage, inputArguments.size, command.parameters.size)
+            return
+        }
+    }
+
+    private fun relay(message: Message, logIgnore: Boolean) {
+        if (message.isFromRelayChannel()) {
+            plugin.logDebug("Broadcasting message ${message.id} from Discord to Minecraft as user ${message.author.name}")
+            var alias = plugin.users.data.getString("discordaliases.${message.author.id}.mcusername")
+            if (alias == null) alias = message.author.name.noSpace()
+            plugin.sendToMinecraft(message.content.toMinecraftChatMessage(alias))
+        } else if (logIgnore) plugin.logDebug("Not relaying message ${message.id} from Discord: channel does not match")
+    }
+
+    private fun parseArgument(parameterClass: Class<*>, value: String): Any {
+        try {
+            when (parameterClass) {
+                String::class.java -> return value
+                Int::class.javaPrimitiveType, Int::class.java -> return Integer.valueOf(value)
+                Long::class.javaPrimitiveType, Long::class.java -> return java.lang.Long.valueOf(value)
+                Boolean::class.javaPrimitiveType, Boolean::class.java -> return parseBooleanArgument(value)
+                Float::class.javaPrimitiveType, Float::class.java -> return java.lang.Float.valueOf(value)
+                Double::class.javaPrimitiveType, Double::class.java -> return java.lang.Double.valueOf(value)
+                else -> throw IllegalArgumentException()
+            }
+        } catch (ignored: NumberFormatException) {
+            throw IllegalArgumentException()
+        }
+    }
+
+    private fun parseBooleanArgument(value: String): Boolean {
+        when (value.toLowerCase()) {
+            "yes", "true" -> return true
+            "no", "false" -> return false
+            else -> {
+                val integerValue = Integer.valueOf(value)!!
+                when (integerValue) {
+                    1 -> return true
+                    0 -> return false
+                    else -> throw IllegalArgumentException()
+                }
+            }
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    private inline fun <reified T : Any> List<*>.checkItemsAre() = if (all { it is T }) this as List<T> else null
+
+    private fun commandNotFound(message: Message, commandName: String) {
+        message.channel.sendMessage(
+                "${message.author.asMention} | I don't seem to have a command called '$commandName'. " +
+                "See '${Connection.JDA.selfUser.asMention} help' ${orPrefixHelp()}for the commands I do have.").queue()
+    }
+
+    private fun commandWrongParameterCount(message: Message, name: String, usage: String, given: Int, required: Int) {
+        message.channel.sendMessage(
+                "${message.author.asMention} | I didn't seem to get the correct number of arguments for that command. " +
+                "I got $given from you, but I need $required. " +
+                "(Usage: $name $usage)").queue()
+    }
+
+    private fun commandWrongParameterType(message: Message, name: String, usage: String, index: Int,
+                                          actualType: Class<*>, expectedType: Class<*>) {
+        message.channel.sendMessage(
+                "${message.author.asMention} | One of the arguments for that command doesn't seem to be the right type. " +
+                "Argument $index seems like ${actualType.simpleName}, but I need ${expectedType.simpleName}. " +
+                "(Usage: $name $usage)").queue()
+    }
+
+    @Suppress("unused")
+    private fun commandRestricted(message: Message) {
+        message.channel.sendMessage("${message.author.asMention} | Sorry, that command is not permitted.").queue()
+    }
+
+    private fun commandException(message: Message, throwable: Throwable?) {
+        plugin.logger.log(Level.SEVERE, "Command with content ${message.content} threw an exception.", throwable)
+        message.channel.sendMessage("${message.author.asMention} | Ouch! That command threw an exception. " +
+                "Sorry about that...").queue()
+    }
+
+    private fun orPrefixHelp(): String = if (cfg.COMMAND_PREFIX != "") "or ${cfg.COMMAND_PREFIX}help " else ""
+
+    private fun Message.isFromRelayChannel():
+            Boolean = guild.id == cfg.SERVER_ID
+            && this.isFromType(ChannelType.TEXT)
+            && this.textChannel.name.equals(cfg.CHANNEL, true)
+
+    data class Command(
+            val name: String,
+            val usage: String,
+            val description: String,
+            val parameters: List<Class<*>>,
+            val relayTriggerMessage: Boolean,
+            val ignoreExcessArguments: Boolean,
+            val controllerClass: Class<*>,
+            val commandMethod: Method
+    )
+}
diff --git a/src/main/kotlin/co/orre/discordbridge/discord/controllers/FunCommandsController.kt b/src/main/kotlin/co/orre/discordbridge/discord/controllers/FunCommandsController.kt
new file mode 100644
index 0000000..e77752e
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/discord/controllers/FunCommandsController.kt
@@ -0,0 +1,78 @@
+package co.orre.discordbridge.discord.controllers
+
+import co.orre.discordbridge.CommandLogic
+import co.orre.discordbridge.Config
+import co.orre.discordbridge.Plugin
+import co.orre.discordbridge.discord.interfaces.BotCommand
+import co.orre.discordbridge.discord.interfaces.BotController
+import co.orre.discordbridge.utils.UtilFunctions.toMinecraftChatMessage
+import net.dv8tion.jda.core.entities.Message
+
+class FunCommandsController(val plugin: Plugin) : BotController {
+
+    override fun getDescription(): String = ":balloon:  **FUN** - Every bot has to have them!"
+
+    // 8BALL - consult the Magic 8-Ball to answer your yes or no questions
+    @BotCommand(name = "8ball", usage = "<question>", description = "Consult the Magic 8 Ball")
+    private fun eightBall(message: Message){
+        plugin.logDebug("user ${message.author.name} consults the Magic 8-Ball")
+        dispatchResponse(message, CommandLogic.eightBall(plugin, message.author.asMention))
+    }
+
+    // CHOOSE - chooses between some number of options
+    @BotCommand(name = "choose", usage = "<option>, <option>, ... (delimiters include ',', 'or', '|')",
+            description = "Have the bot choose between given options")
+    private fun choose(message: Message, query: String){
+        plugin.logDebug("user ${message.author.name} needs a choice made")
+        dispatchResponse(message, CommandLogic.choose(message.author.asMention, query))
+    }
+
+    // F - press F to pay respects!
+    @BotCommand(usage="", description = "Press F to pay respects")
+    private fun f(message: Message) {
+        plugin.logDebug("user ${message.author.name} pays respects")
+        dispatchResponse(message, CommandLogic.f(plugin, message.author.asMention))
+    }
+
+    // INSULT - the bot insults something
+    @BotCommand(usage="<thing to insult>", description = "Make the bot insult something for you")
+    private fun insult(message: Message, thingToInsult: String) {
+        plugin.logDebug("user ${message.author.name} requests an insult against '$thingToInsult'")
+        dispatchResponse(message, CommandLogic.insult(plugin, message.author.name, thingToInsult))
+    }
+
+    // RATE - the bot rates something
+    @BotCommand(usage="<thing to be rated>", description = "Have the bot rate something for you")
+    private fun rate(message: Message, thingToRate: String) {
+        plugin.logDebug("user ${message.author.name} requests a rating")
+        dispatchResponse(message, CommandLogic.rate(plugin, message.author.name, thingToRate))
+    }
+
+    // ROLL - roll a die for a random number
+    @BotCommand(name = "roll", usage = "<sides>", description = "Roll a die for a random number")
+    private fun roll(message: Message, sides: Int){
+        plugin.logDebug("user ${message.author.name} needs a choice made")
+        dispatchResponse(message, CommandLogic.roll(message.author.asMention, sides))
+    }
+
+    // TALK - directly speak to Cleverbot (useful for not accidentally invoking other commands)
+    @BotCommand(usage="<say something>", description = "Say something to Cleverbot")
+    private fun talk(message: Message, query: String) {
+        plugin.logDebug("user ${message.author.name} invokes Cleverbot")
+        dispatchResponse(message, CommandLogic.askCleverbot(message.author.asMention, query))
+    }
+
+    private fun dispatchResponse(message: Message, response: String) {
+        plugin.sendToDiscord(response, message.channel)
+
+        if (message.isFromRelayChannel()) {
+            var response1 = plugin.translateAliasToMinecraft(response, message.author.id)
+            response1 = response1.toMinecraftChatMessage(Config.BOT_MC_USERNAME)
+            plugin.sendToMinecraft(response1)
+        }
+    }
+
+    private fun Message.isFromRelayChannel(): Boolean = guild.id == Config.SERVER_ID
+            && this.isFromType(net.dv8tion.jda.core.entities.ChannelType.TEXT)
+            && this.textChannel.name.equals(Config.CHANNEL, true)
+}
diff --git a/src/main/kotlin/co/orre/discordbridge/discord/controllers/UtilCommandsController.kt b/src/main/kotlin/co/orre/discordbridge/discord/controllers/UtilCommandsController.kt
new file mode 100644
index 0000000..8869130
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/discord/controllers/UtilCommandsController.kt
@@ -0,0 +1,61 @@
+package co.orre.discordbridge.discord.controllers
+
+import co.orre.discordbridge.Plugin
+import co.orre.discordbridge.discord.interfaces.BotCommand
+import co.orre.discordbridge.discord.interfaces.BotController
+import net.dv8tion.jda.core.entities.ChannelType
+import net.dv8tion.jda.core.entities.Message
+
+class UtilCommandsController(val plugin: Plugin) : BotController {
+
+    override fun getDescription(): String = ":wrench:  **UTIL** - Utility commands"
+
+    // CONFIRM - Confirm an alias
+    @BotCommand(usage="", description="Confirm an alias link request", relayTriggerMessage = false)
+    private fun confirm(message: Message) {
+        if (!message.isFromType(ChannelType.PRIVATE)) return
+        plugin.logDebug("user ${message.author.name} wants to confirm an alias")
+
+        val ua = plugin.requests.find { it.discordId == message.author.id }
+        if (ua == null) {
+            plugin.sendToDiscord("You have not requested an alias, or your request has expired!", message.channel)
+            return
+        }
+
+        plugin.saveAlias(ua)
+        plugin.requests.remove(ua)
+        plugin.sendToDiscord("Successfully linked aliases!", message.channel)
+    }
+
+    @BotCommand(usage="", description="You just used it", relayTriggerMessage = false)
+    private fun help(message: Message, commands: MutableMap<String, BotControllerManager.Command>,
+                     instances: Map<Class<out BotController>, BotController>) {
+        plugin.logDebug("user ${message.author.name} requested help")
+        plugin.sendToDiscord("**DiscordBridge** - Bridge your Minecraft and Discord chats\n**---**", message.channel)
+        var out: String
+        for (bc: BotController in instances.values) {
+            out = bc.getDescription() + "\n```"
+            commands.values.sortedBy { (name) -> name }
+                    .filter { it.controllerClass == bc.javaClass }
+                    .forEach { out += "\n${it.name} ${it.usage}\n  ${it.description}\n" }
+            out += "```"
+            plugin.sendToDiscord(out, message.channel)
+        }
+    }
+
+    // SERVERLIST - List all players currently online on the server
+    @BotCommand(usage="", description = "List all Minecraft players currently online on the server",
+            relayTriggerMessage = false)
+    private fun serverList(message: Message) {
+        plugin.logDebug("user ${message.author.name} has requested a listing of online players")
+
+        val players = plugin.getOnlinePlayers()
+        if (players.isEmpty()) {
+            plugin.sendToDiscord("Nobody is currently online.", message.channel)
+            return
+        }
+
+        val response = players.joinToString("\n", "The following players are currently online:\n```\n", "\n```")
+        plugin.sendToDiscord(response, message.channel)
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/co/orre/discordbridge/discord/interfaces/BotCommand.kt b/src/main/kotlin/co/orre/discordbridge/discord/interfaces/BotCommand.kt
new file mode 100644
index 0000000..cb69367
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/discord/interfaces/BotCommand.kt
@@ -0,0 +1,8 @@
+package co.orre.discordbridge.discord.interfaces
+
+// TODO: Apache License
+
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class BotCommand(val usage: String, val description: String, val name: String = "",
+                            val relayTriggerMessage: Boolean = true, val ignoreExcessArguments: Boolean = true)
diff --git a/src/main/kotlin/co/orre/discordbridge/discord/interfaces/BotController.kt b/src/main/kotlin/co/orre/discordbridge/discord/interfaces/BotController.kt
new file mode 100644
index 0000000..fe5492c
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/discord/interfaces/BotController.kt
@@ -0,0 +1,7 @@
+package co.orre.discordbridge.discord.interfaces
+
+// Todo: Apache License
+
+interface BotController{
+    fun getDescription(): String
+}
diff --git a/src/main/kotlin/co/orre/discordbridge/minecraft/EventListener.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/EventListener.kt
new file mode 100644
index 0000000..27893f4
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/minecraft/EventListener.kt
@@ -0,0 +1,123 @@
+package co.orre.discordbridge.minecraft
+
+import co.orre.discordbridge.utils.UtilFunctions.stripColor
+import co.orre.discordbridge.utils.UtilFunctions.noSpace
+import co.orre.discordbridge.CommandLogic
+import co.orre.discordbridge.Config
+import co.orre.discordbridge.Plugin
+import co.orre.discordbridge.discord.Connection
+import co.orre.discordbridge.minecraft.controllers.BotControllerManager
+import co.orre.discordbridge.minecraft.controllers.FunCommandsController
+import co.orre.discordbridge.utils.UtilFunctions.toDiscordChatMessage
+import co.orre.discordbridge.utils.UtilFunctions.toDiscordPlayerDeath
+import co.orre.discordbridge.utils.UtilFunctions.toDiscordPlayerJoin
+import co.orre.discordbridge.utils.UtilFunctions.toDiscordPlayerLeave
+import co.orre.discordbridge.utils.UtilFunctions.toMinecraftChatMessage
+import org.bukkit.event.EventHandler
+import org.bukkit.event.EventPriority
+import org.bukkit.event.Listener
+import org.bukkit.event.entity.PlayerDeathEvent
+import org.bukkit.event.player.AsyncPlayerChatEvent
+import org.bukkit.event.player.PlayerJoinEvent
+import org.bukkit.event.player.PlayerQuitEvent
+import org.bukkit.ChatColor as CC
+import java.lang.reflect.Method
+
+class EventListener(val plugin: Plugin): Listener {
+
+    val controllerManager = BotControllerManager(plugin)
+
+    init {
+        controllerManager.registerController(FunCommandsController(plugin))
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    fun onChat(event: AsyncPlayerChatEvent) {
+
+        plugin.logDebug("Received a chat event from ${event.player.name}: ${event.message}")
+        if (!Config.MESSAGES_CHAT) return
+        if (event.isCancelled && !Config.RELAY_CANCELLED_MESSAGES) return
+        if (event.player.hasMetadata("vanished") && event.player.getMetadata("vanished")[0].asBoolean() &&
+                !Config.IF_VANISHED_CHAT) return
+
+        // Get world alias if Multiverse is installed
+//        if (plugin.isMultiverseInstalled) {
+//            val worldProperties = plugin.worlds!!.data.get("worlds.$worldname")
+//            val cls = Class.forName("com.onarandombox.MultiverseCore.WorldProperties")
+//            val meth: Method = cls.getMethod("getAlias")
+//            val alias = meth.invoke(worldProperties)
+//            if (alias is String) worldname = alias
+//        }
+
+        controllerManager.dispatchMessage(event)
+
+//        var formattedMessage = message.toDiscordChatMessage(username, displayName, worldname)
+//        formattedMessage = plugin.convertAtMentions(formattedMessage)
+//        formattedMessage = plugin.translateAliasToDiscord(formattedMessage, uuid)
+//        plugin.sendToDiscord(formattedMessage, Connection.getRelayChannel())
+
+        // If it was a @mention to the bot, treat it as a Cleverbot invocation
+//        if (message.startsWith("@" + Config.USERNAME.noSpace())) {
+//            val task = Runnable {
+//                if (Permissions.cleverbot.has(player)) {
+//                    val arg: String = message.removePrefix("@" + Config.USERNAME.noSpace()).trimStart()
+//                    val response = CommandLogic.askCleverbot(arg)
+//                    plugin.sendToMinecraft(response.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
+//                    plugin.sendToDiscord(response, Connection.getRelayChannel())
+//                } else
+//                    player.sendMessage("${org.bukkit.ChatColor.RED}You do not have permission to talk to the bot.")
+//            }
+//            plugin.server.scheduler.runTaskAsynchronously(plugin, task)
+//        }
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    fun onPlayerJoin(event: PlayerJoinEvent) {
+        val player = event.player
+        val username = event.player.name.stripColor()
+        val uuid = event.player.uniqueId.toString()
+
+        plugin.logDebug("Received a join event for $username")
+        if (!Config.MESSAGES_JOIN) return
+        if (player.hasMetadata("vanished") && player.getMetadata("vanished")[0].asBoolean() &&
+                !Config.IF_VANISHED_JOIN) return
+
+        var formattedMessage = player.toDiscordPlayerJoin()
+        formattedMessage = plugin.translateAliasToDiscord(formattedMessage, uuid)
+        plugin.sendToDiscord(formattedMessage, Connection.getRelayChannel())
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    fun onPlayerQuit(event: PlayerQuitEvent) {
+        val player = event.player
+        val username = event.player.name.stripColor()
+        val uuid = event.player.uniqueId.toString()
+
+        plugin.logDebug("Received a leave event for $username")
+        if (!Config.MESSAGES_LEAVE) return
+        if (player.hasMetadata("vanished") && player.getMetadata("vanished")[0].asBoolean() &&
+                !Config.IF_VANISHED_LEAVE) return
+
+        var formattedMessage = player.toDiscordPlayerLeave()
+        formattedMessage = plugin.translateAliasToDiscord(formattedMessage, uuid)
+        plugin.sendToDiscord(formattedMessage, Connection.getRelayChannel())
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    fun onPlayerDeath(event: PlayerDeathEvent) {
+        val player = event.entity
+        val username = event.entity.name.stripColor()
+        val displayName = event.entity.displayName.stripColor()
+        val uuid = event.entity.uniqueId.toString()
+        val deathMessage = event.deathMessage
+
+        plugin.logDebug("Received a death event for $username")
+        if (!Config.MESSAGES_DEATH) return
+        if (player.hasMetadata("vanished") && player.getMetadata("vanished")[0].asBoolean() &&
+                !Config.IF_VANISHED_DEATH) return
+
+        var formattedMessage = deathMessage.toDiscordPlayerDeath(username, displayName)
+        formattedMessage = plugin.translateAliasToDiscord(formattedMessage, uuid)
+        plugin.sendToDiscord(formattedMessage, Connection.getRelayChannel())
+    }
+}
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/Permissions.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/Permissions.kt
similarity index 89%
rename from src/main/kotlin/gg/obsidian/discordbridge/minecraft/Permissions.kt
rename to src/main/kotlin/co/orre/discordbridge/minecraft/Permissions.kt
index 4469eb5..0e0d20a 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/Permissions.kt
+++ b/src/main/kotlin/co/orre/discordbridge/minecraft/Permissions.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.minecraft
+package co.orre.discordbridge.minecraft
 
 import org.bukkit.entity.Player
 
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Discord.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/commands/Discord.kt
similarity index 69%
rename from src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Discord.kt
rename to src/main/kotlin/co/orre/discordbridge/minecraft/commands/Discord.kt
index 35428db..b3711b4 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Discord.kt
+++ b/src/main/kotlin/co/orre/discordbridge/minecraft/commands/Discord.kt
@@ -1,7 +1,7 @@
-package gg.obsidian.discordbridge.minecraft.commands
+package co.orre.discordbridge.minecraft.commands
 
-import gg.obsidian.discordbridge.minecraft.Permissions
-import gg.obsidian.discordbridge.Plugin
+import co.orre.discordbridge.minecraft.Permissions
+import co.orre.discordbridge.Plugin
 import org.bukkit.ChatColor as CC
 import org.bukkit.command.Command
 import org.bukkit.command.CommandExecutor
@@ -12,7 +12,7 @@ class Discord(val plugin: Plugin) : CommandExecutor {
 
     override fun onCommand(player: CommandSender, cmd: Command, alias: String?, args: Array<out String>?): Boolean {
         if (args == null || args.isEmpty()) {
-            sendMessage("{${CC.YELLOW}Usage: /discord <reload/alias/get>", player)
+            sendMessage("{${org.bukkit.ChatColor.YELLOW}Usage: /discord <reload/alias/get>", player)
             return true
         }
 
@@ -21,7 +21,7 @@ class Discord(val plugin: Plugin) : CommandExecutor {
             "alias" -> return handleDiscordAlias(player, args)
             "get" -> return handleDiscordGet(player, args)
             else -> {
-                sendMessage("${CC.YELLOW}Usage: /discord <reload/alias/get>", player)
+                sendMessage("${org.bukkit.ChatColor.YELLOW}Usage: /discord <reload/alias/get>", player)
                 return true
             }
         }
@@ -31,11 +31,11 @@ class Discord(val plugin: Plugin) : CommandExecutor {
         if (player is Player && !Permissions.reload.has(player)) return true
 
         if (args.size != 1) {
-            sendMessage("${CC.YELLOW}Usage: /discord reload", player)
+            sendMessage("${org.bukkit.ChatColor.YELLOW}Usage: /discord reload", player)
             return true
         }
 
-        sendMessage("${CC.YELLOW}Reloading Discord Bridge...", player)
+        sendMessage("${org.bukkit.ChatColor.YELLOW}Reloading Discord Bridge...", player)
         plugin.reload()
         return true
     }
@@ -44,12 +44,12 @@ class Discord(val plugin: Plugin) : CommandExecutor {
         if (player !is Player) return true
 
         if (args.size != 2) {
-            sendMessage("${CC.YELLOW}Usage: /discord alias <discord id>", player)
+            sendMessage("${org.bukkit.ChatColor.YELLOW}Usage: /discord alias <discord id>", player)
             return true
         }
 
         if (!plugin.registerUserRequest(player, args[1])) {
-            sendMessage("${CC.YELLOW}Could not find Discord user with that ID.", player)
+            sendMessage("${org.bukkit.ChatColor.YELLOW}Could not find Discord user with that ID.", player)
             return true
         }
         return true
@@ -57,7 +57,7 @@ class Discord(val plugin: Plugin) : CommandExecutor {
 
     private fun handleDiscordGet(player: CommandSender, args: Array<out String>): Boolean {
         if (args.size < 2) {
-            sendMessage("${CC.YELLOW}Usage: /discord get <ids/online>", player)
+            sendMessage("${org.bukkit.ChatColor.YELLOW}Usage: /discord get <ids/online>", player)
             return true
         }
 
@@ -65,7 +65,7 @@ class Discord(val plugin: Plugin) : CommandExecutor {
             "ids" -> return handleDiscordGetIds(player, args)
             "online" -> return handleDiscordGetOnline(player, args)
             else -> {
-                sendMessage("${CC.YELLOW}Usage: /discord get <ids/online>", player)
+                sendMessage("${org.bukkit.ChatColor.YELLOW}Usage: /discord get <ids/online>", player)
                 return true
             }
         }
@@ -73,7 +73,7 @@ class Discord(val plugin: Plugin) : CommandExecutor {
 
     private fun handleDiscordGetIds(player: CommandSender, args: Array<out String>): Boolean {
         if (args.size != 2) {
-            sendMessage("${CC.YELLOW}Usage: /discord get ids", player)
+            sendMessage("${org.bukkit.ChatColor.YELLOW}Usage: /discord get ids", player)
             return true
         }
 
@@ -83,7 +83,7 @@ class Discord(val plugin: Plugin) : CommandExecutor {
 
     private fun handleDiscordGetOnline(player: CommandSender, args: Array<out String>): Boolean {
         if (args.size != 2) {
-            sendMessage("${CC.YELLOW}Usage: /discord get online", player)
+            sendMessage("${org.bukkit.ChatColor.YELLOW}Usage: /discord get online", player)
             return true
         }
 
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/EightBall.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/commands/EightBall.kt
similarity index 51%
rename from src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/EightBall.kt
rename to src/main/kotlin/co/orre/discordbridge/minecraft/commands/EightBall.kt
index a44365d..757796e 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/EightBall.kt
+++ b/src/main/kotlin/co/orre/discordbridge/minecraft/commands/EightBall.kt
@@ -1,8 +1,11 @@
-package gg.obsidian.discordbridge.minecraft.commands
+package co.orre.discordbridge.minecraft.commands
 
-import gg.obsidian.discordbridge.CommandLogic
-import gg.obsidian.discordbridge.minecraft.Permissions
-import gg.obsidian.discordbridge.Plugin
+import co.orre.discordbridge.CommandLogic
+import co.orre.discordbridge.Config
+import co.orre.discordbridge.minecraft.Permissions
+import co.orre.discordbridge.Plugin
+import co.orre.discordbridge.discord.Connection
+import co.orre.discordbridge.utils.UtilFunctions.toMinecraftChatMessage
 import org.bukkit.command.Command
 import org.bukkit.command.CommandExecutor
 import org.bukkit.command.CommandSender
@@ -12,10 +15,10 @@ class EightBall(val plugin: Plugin) : CommandExecutor {
     override fun onCommand(player: CommandSender, cmd: Command, alias: String?, args: Array<out String>?): Boolean {
         if (args == null || args.isEmpty()) {
             if (player is Player && Permissions.eightball.has(player)) {
-                var msg = CommandLogic.eightBall(plugin, player.name)
-                plugin.sendToMinecraft(plugin.toMinecraftChatMessage(msg, plugin.cfg.BOT_MC_USERNAME))
+                var msg = "@" + CommandLogic.eightBall(plugin, player.name)
+                plugin.sendToMinecraft(msg.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
                 msg = plugin.translateAliasToDiscord(msg, player.uniqueId.toString())
-                plugin.sendToDiscord(msg, plugin.conn.getRelayChannel())
+                plugin.sendToDiscord(msg, Connection.getRelayChannel())
             }
             return true
         }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/F.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/commands/F.kt
similarity index 56%
rename from src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/F.kt
rename to src/main/kotlin/co/orre/discordbridge/minecraft/commands/F.kt
index 9c79382..15da95a 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/F.kt
+++ b/src/main/kotlin/co/orre/discordbridge/minecraft/commands/F.kt
@@ -1,8 +1,11 @@
-package gg.obsidian.discordbridge.minecraft.commands
+package co.orre.discordbridge.minecraft.commands
 
-import gg.obsidian.discordbridge.CommandLogic
-import gg.obsidian.discordbridge.minecraft.Permissions
-import gg.obsidian.discordbridge.Plugin
+import co.orre.discordbridge.CommandLogic
+import co.orre.discordbridge.Config
+import co.orre.discordbridge.minecraft.Permissions
+import co.orre.discordbridge.Plugin
+import co.orre.discordbridge.discord.Connection
+import co.orre.discordbridge.utils.UtilFunctions.toMinecraftChatMessage
 import org.bukkit.command.Command
 import org.bukkit.command.CommandExecutor
 import org.bukkit.command.CommandSender
@@ -13,9 +16,9 @@ class F(val plugin: Plugin) : CommandExecutor {
         if (args == null || args.isEmpty()) {
             if (player is Player && Permissions.f.has(player)) {
                 var msg = CommandLogic.f(plugin, player.name)
-                plugin.sendToMinecraft(plugin.toMinecraftChatMessage(msg, plugin.cfg.BOT_MC_USERNAME))
+                plugin.sendToMinecraft(msg.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
                 msg = plugin.translateAliasToDiscord(msg, player.uniqueId.toString())
-                plugin.sendToDiscord(msg, plugin.conn.getRelayChannel())
+                plugin.sendToDiscord(msg, Connection.getRelayChannel())
             }
             return true
         }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Insult.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/commands/Insult.kt
similarity index 57%
rename from src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Insult.kt
rename to src/main/kotlin/co/orre/discordbridge/minecraft/commands/Insult.kt
index 34180f4..91dd433 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Insult.kt
+++ b/src/main/kotlin/co/orre/discordbridge/minecraft/commands/Insult.kt
@@ -1,8 +1,11 @@
-package gg.obsidian.discordbridge.minecraft.commands
+package co.orre.discordbridge.minecraft.commands
 
-import gg.obsidian.discordbridge.CommandLogic
-import gg.obsidian.discordbridge.minecraft.Permissions
-import gg.obsidian.discordbridge.Plugin
+import co.orre.discordbridge.CommandLogic
+import co.orre.discordbridge.Config
+import co.orre.discordbridge.minecraft.Permissions
+import co.orre.discordbridge.Plugin
+import co.orre.discordbridge.discord.Connection
+import co.orre.discordbridge.utils.UtilFunctions.toMinecraftChatMessage
 import org.bukkit.command.Command
 import org.bukkit.command.CommandExecutor
 import org.bukkit.command.CommandSender
@@ -14,9 +17,9 @@ class Insult(val plugin: Plugin) : CommandExecutor {
 
         if (player is Player && Permissions.insult.has(player)) {
             var msg = CommandLogic.insult(plugin, player.name, args.joinToString(" "))
-            plugin.sendToMinecraft(plugin.toMinecraftChatMessage(msg, plugin.cfg.BOT_MC_USERNAME))
+            plugin.sendToMinecraft(msg.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
             msg = plugin.translateAliasToDiscord(msg, player.uniqueId.toString())
-            plugin.sendToDiscord(msg, plugin.conn.getRelayChannel())
+            plugin.sendToDiscord(msg, Connection.getRelayChannel())
         }
         return true
     }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Rate.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/commands/Rate.kt
similarity index 56%
rename from src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Rate.kt
rename to src/main/kotlin/co/orre/discordbridge/minecraft/commands/Rate.kt
index ed19457..9176b86 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/commands/Rate.kt
+++ b/src/main/kotlin/co/orre/discordbridge/minecraft/commands/Rate.kt
@@ -1,8 +1,11 @@
-package gg.obsidian.discordbridge.minecraft.commands
+package co.orre.discordbridge.minecraft.commands
 
-import gg.obsidian.discordbridge.CommandLogic
-import gg.obsidian.discordbridge.minecraft.Permissions
-import gg.obsidian.discordbridge.Plugin
+import co.orre.discordbridge.CommandLogic
+import co.orre.discordbridge.Config
+import co.orre.discordbridge.minecraft.Permissions
+import co.orre.discordbridge.Plugin
+import co.orre.discordbridge.discord.Connection
+import co.orre.discordbridge.utils.UtilFunctions.toMinecraftChatMessage
 import org.bukkit.command.Command
 import org.bukkit.command.CommandExecutor
 import org.bukkit.command.CommandSender
@@ -14,9 +17,9 @@ class Rate(val plugin: Plugin) : CommandExecutor {
 
         if (player is Player && Permissions.rate.has(player)) {
             var msg = CommandLogic.rate(plugin, player.name, args.joinToString(" "))
-            plugin.sendToMinecraft(plugin.toMinecraftChatMessage(msg, plugin.cfg.BOT_MC_USERNAME))
+            plugin.sendToMinecraft(msg.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
             msg = plugin.translateAliasToDiscord(msg, player.uniqueId.toString())
-            plugin.sendToDiscord(msg, plugin.conn.getRelayChannel())
+            plugin.sendToDiscord(msg, Connection.getRelayChannel())
         }
         return true
     }
diff --git a/src/main/kotlin/co/orre/discordbridge/minecraft/controllers/BotControllerManager.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/controllers/BotControllerManager.kt
new file mode 100644
index 0000000..903f93d
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/minecraft/controllers/BotControllerManager.kt
@@ -0,0 +1,307 @@
+package co.orre.discordbridge.minecraft.controllers
+
+// TODO: Add Apache license
+
+import co.orre.discordbridge.CommandLogic
+import co.orre.discordbridge.Config
+import co.orre.discordbridge.Plugin
+import co.orre.discordbridge.discord.Connection
+import co.orre.discordbridge.minecraft.Permissions
+import co.orre.discordbridge.minecraft.interfaces.BotCommand
+import co.orre.discordbridge.minecraft.interfaces.BotController
+import co.orre.discordbridge.utils.Script
+import co.orre.discordbridge.utils.UtilFunctions
+import co.orre.discordbridge.utils.UtilFunctions.noSpace
+import co.orre.discordbridge.utils.UtilFunctions.toMinecraftChatMessage
+import net.dv8tion.jda.core.entities.ChannelType
+import org.bukkit.event.player.AsyncPlayerChatEvent
+import java.lang.reflect.InvocationTargetException
+import java.lang.reflect.Method
+import java.util.*
+import java.util.logging.Level
+import co.orre.discordbridge.Config as cfg
+
+class BotControllerManager(val plugin: Plugin) {
+
+    private val commands: MutableMap<String, Command> = mutableMapOf()
+    private val controllers: MutableMap<Class<out BotController>, BotController> = mutableMapOf()
+
+    fun registerController(controller: BotController) {
+        controllers.put(controller.javaClass, controller)
+        val controllerClass = controller.javaClass
+
+        for (method in controllerClass.declaredMethods) {
+            val annotation = method.getAnnotation(BotCommand::class.java)
+            if (annotation != null) registerControllerMethod(controllerClass, method, annotation)
+        }
+    }
+
+    private fun registerControllerMethod(controllerClass: Class<*>, method: Method, annotation: BotCommand) {
+        val commandName = if (annotation.name.isEmpty()) method.name.toLowerCase() else annotation.name
+        val usage = annotation.usage
+        val methodParameters = method.parameters
+
+        if (methodParameters.isEmpty() || !methodParameters[0].type.isAssignableFrom(AsyncPlayerChatEvent::class.java)) return
+
+        method.isAccessible = true
+        val parameters = (1..methodParameters.size - 1).mapTo(ArrayList<Class<*>>()) { methodParameters[it].type }
+        val command = Command(commandName, usage, annotation.description, parameters, annotation.relayTriggerMessage,
+                annotation.ignoreExcessArguments, controllerClass, method)
+        commands.put(command.name, command)
+    }
+
+    fun dispatchMessage(event: AsyncPlayerChatEvent) {
+
+        // SCRIPTED RESPONSE - The bot replies with a pre-programmed response if it detects
+        // a corresponding trigger string
+        //if (scriptedResponse(event)) return
+
+        val args = event.message.trim().split("\\s+".toRegex(), 2).toTypedArray()
+
+        // <prefix>command
+        if (Config.COMMAND_PREFIX.isNotBlank() && args[0].startsWith(Config.COMMAND_PREFIX)) {
+            val commandName = args[0].substring(Config.COMMAND_PREFIX.length).toLowerCase()
+            val command = commands[commandName]
+
+            if (command == null) {
+                commandNotFound(event, commandName)
+                return
+            }
+
+            val inputArguments = if (args.size == 1) arrayOf<String>()
+            else args[1].split("\\s+".toRegex(), command.parameters.size).toTypedArray()
+
+            invokeCommand(command, controllers, event, inputArguments)
+            return
+        }
+
+        // @<mention> command
+        if (args[0] == Connection.JDA.selfUser.asMention && args.count() == 2) {
+            val args2 = args[1].split("\\s+".toRegex(), 2).toTypedArray()
+            val commandName = args2[0].toLowerCase()
+            var params = if (args2.size > 1) args2[1] else ""
+            var command = commands[commandName]
+
+            if (command == null) {
+                // Assume user wants to talk to Cleverbot
+                command = commands["talk"]
+                if (command == null) {
+                    commandNotFound(event, commandName)
+                    return
+                }
+                params = args[1]
+            }
+
+            val inputArguments = if (params == "") arrayOf<String>()
+            else params.split("\\s+".toRegex(), command.parameters.size).toTypedArray()
+
+            invokeCommand(command, controllers, event, inputArguments)
+            return
+        }
+
+        // Just relay the message i8f it is neither
+        relay(event, true)
+    }
+
+    //TODO
+//    private fun scriptedResponse(event: AsyncPlayerChatEvent): Boolean {
+//        val responses = plugin.script.data.getList("responses").checkItemsAre<Script>()
+//        if (responses == null) {
+//            plugin.logger.warning("ERROR: Unable to read script.yml!")
+//            return false
+//        }
+//        var response: Script? = null
+//        for (r in responses) {
+//            var arg = event.message
+//            val msg = r.triggerDis ?: continue
+//            val ignorecase = !(r.caseSensitive != null && r.caseSensitive)
+//            val startswith = r.startsWith != null && r.startsWith
+//            val requiresmention = r.requiresMention != null && r.requiresMention
+//
+//            if (requiresmention) {
+//                if (arg.startsWith(Connection.JDA.selfUser.asMention, true))
+//                    arg = arg.replaceFirst(Connection.JDA.selfUser.asMention, "").trimStart()
+//                else continue
+//            }
+//
+//            if (startswith)
+//                if (arg.startsWith(msg, ignorecase)) response = r
+//                else
+//                    if (arg.equals(msg, ignorecase)) response = r
+//        }
+//        if (response == null) return false
+//        plugin.logDebug("user ${event.player.name} has triggered a scripted response")
+//        val responseDis: String? = response.responseDis
+//        val responseMC: String? = response.responseMC
+//        if (responseDis != null) {
+//            val out = responseDis.replace("%u", event.player.name)
+//            plugin.sendToDiscord(out, Connection.getRelayChannel())
+//        }
+//        if (responseMC != null) {
+//            var alias = plugin.users.data.getString("discordaliases.${message.author.id}.mcusername")
+//            if (alias == null) alias = message.author.name.noSpace()
+//            val out = responseMC.replace("%u", alias)
+//            plugin.sendToMinecraft(out.toMinecraftChatMessage(cfg.BOT_MC_USERNAME))
+//        }
+//        return true
+//    }
+
+    private fun invokeCommand(command: Command, instances: Map<Class<out BotController>, BotController>,
+                              event: AsyncPlayerChatEvent, inputArguments: Array<String>) {
+        if (command.relayTriggerMessage) relay(event, false)
+
+        if (command.name == "help") {
+            try {
+                // If it was a @mention to the bot, treat it as a Cleverbot invocation
+                if (event.message.startsWith("@" + Config.USERNAME.noSpace())) {
+                    val task = Runnable {
+                        if (Permissions.cleverbot.has(event.player)) {
+                            val arg: String = event.message.removePrefix("@" + Config.USERNAME.noSpace()).trimStart()
+                            val response = CommandLogic.askCleverbot(event.player.name, arg)
+                            plugin.sendToMinecraft(response.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
+                            plugin.sendToDiscord(response, Connection.getRelayChannel())
+                        } else
+                            event.player.sendMessage("${org.bukkit.ChatColor.RED}You do not have permission to talk to the bot.")
+                    }
+                    plugin.server.scheduler.runTaskAsynchronously(plugin, task)
+                }
+                command.commandMethod.invoke(instances[command.controllerClass], event, commands, instances)
+                return
+            } catch (e: InvocationTargetException) {
+                commandException(event, e.cause)
+                return
+            } catch (e: IllegalAccessException) {
+                throw RuntimeException(e)
+            } catch (e: IllegalArgumentException) {
+                commandWrongParameterCount(event, command.name, command.usage, 2, command.parameters.size)
+                return
+            }
+        }
+
+        if (inputArguments.size < command.parameters.size) {
+            commandWrongParameterCount(event, command.name, command.usage, inputArguments.size, command.parameters.size)
+            return
+        }
+        if (inputArguments.size != command.parameters.size && !command.ignoreExcessArguments) {
+            commandWrongParameterCount(event, command.name, command.usage, inputArguments.size, command.parameters.size)
+            return
+        }
+
+        val arguments = arrayOfNulls<Any>(command.parameters.size + 1)
+        arguments[0] = event
+
+        var paramRange = command.parameters.indices
+
+        if (command.ignoreExcessArguments && inputArguments.size > command.parameters.size)
+            paramRange = IntRange(0, command.parameters.size - 1)
+
+        for (i in paramRange) {
+            val parameterClass = command.parameters[i]
+
+            try {
+                arguments[i + 1] = parseArgument(parameterClass, inputArguments[i])
+            } catch (ignored: IllegalArgumentException) {
+                commandWrongParameterType(event, command.name, command.usage, i,
+                        inputArguments[i].javaClass, parameterClass)
+                return
+            }
+        }
+
+        try {
+            command.commandMethod.invoke(instances[command.controllerClass], *arguments)
+        } catch (e: InvocationTargetException) {
+            commandException(event, e.cause)
+        } catch (e: IllegalAccessException) {
+            throw RuntimeException(e)
+        } catch (e: IllegalArgumentException) {
+            commandWrongParameterCount(event, command.name, command.usage, inputArguments.size, command.parameters.size)
+            return
+        }
+    }
+
+    private fun relay(event: AsyncPlayerChatEvent, logIgnore: Boolean) {
+        plugin.logDebug("Broadcasting message from Minecraft to Discord as player ${event.player.name}")
+        val response = plugin.translateAliasToDiscord(event.message, event.player.uniqueId.toString())
+        plugin.sendToMinecraft(event.message.toMinecraftChatMessage(response))
+    }
+
+    private fun parseArgument(parameterClass: Class<*>, value: String): Any {
+        try {
+            when (parameterClass) {
+                String::class.java -> return value
+                Int::class.javaPrimitiveType, Int::class.java -> return Integer.valueOf(value)
+                Long::class.javaPrimitiveType, Long::class.java -> return java.lang.Long.valueOf(value)
+                Boolean::class.javaPrimitiveType, Boolean::class.java -> return parseBooleanArgument(value)
+                Float::class.javaPrimitiveType, Float::class.java -> return java.lang.Float.valueOf(value)
+                Double::class.javaPrimitiveType, Double::class.java -> return java.lang.Double.valueOf(value)
+                else -> throw IllegalArgumentException()
+            }
+        } catch (ignored: NumberFormatException) {
+            throw IllegalArgumentException()
+        }
+    }
+
+    private fun parseBooleanArgument(value: String): Boolean {
+        when (value.toLowerCase()) {
+            "yes", "true" -> return true
+            "no", "false" -> return false
+            else -> {
+                val integerValue = Integer.valueOf(value)!!
+                when (integerValue) {
+                    1 -> return true
+                    0 -> return false
+                    else -> throw IllegalArgumentException()
+                }
+            }
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    private inline fun <reified T : Any> List<*>.checkItemsAre() = if (all { it is T }) this as List<T> else null
+
+    private fun commandNotFound(event: AsyncPlayerChatEvent, commandName: String) {
+        val response = "${event.player.name} | I don't seem to have a command called '$commandName'. " +
+                "See '${Connection.JDA.selfUser.asMention} help' ${orPrefixHelp()}for the commands I do have."
+        plugin.sendToMinecraft(response.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
+    }
+
+    private fun commandWrongParameterCount(event: AsyncPlayerChatEvent, name: String, usage: String, given: Int, required: Int) {
+        val response = "${event.player.name} | I didn't seem to get the correct number of arguments for that command. " +
+                "I got $given from you, but I need $required. " +
+                "(Usage: $name $usage)"
+        plugin.sendToMinecraft(response.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
+    }
+
+    private fun commandWrongParameterType(event: AsyncPlayerChatEvent, name: String, usage: String, index: Int,
+                                          actualType: Class<*>, expectedType: Class<*>) {
+        val response = "${event.player.name} | One of the arguments for that command doesn't seem to be the right type. " +
+                "Argument $index seems like ${actualType.simpleName}, but I need ${expectedType.simpleName}. " +
+                "(Usage: $name $usage)"
+        plugin.sendToMinecraft(response.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
+    }
+
+    @Suppress("unused")
+    private fun commandRestricted(event: AsyncPlayerChatEvent) {
+        val response = "${event.player.name} | Sorry, that command is not permitted."
+        plugin.sendToMinecraft(response.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
+    }
+
+    private fun commandException(event: AsyncPlayerChatEvent, throwable: Throwable?) {
+        plugin.logger.log(Level.SEVERE, "Command with content ${event.message} threw an exception.", throwable)
+        val response = "${event.player.name} | Ouch! That command threw an exception. Sorry about that..."
+        plugin.sendToMinecraft(response.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
+    }
+
+    private fun orPrefixHelp(): String = if (cfg.COMMAND_PREFIX != "") "or ${cfg.COMMAND_PREFIX}help " else ""
+
+    data class Command(
+            val name: String,
+            val usage: String,
+            val description: String,
+            val parameters: List<Class<*>>,
+            val relayTriggerMessage: Boolean,
+            val ignoreExcessArguments: Boolean,
+            val controllerClass: Class<*>,
+            val commandMethod: Method
+    )
+}
diff --git a/src/main/kotlin/co/orre/discordbridge/minecraft/controllers/FunCommandsController.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/controllers/FunCommandsController.kt
new file mode 100644
index 0000000..fc3e7a3
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/minecraft/controllers/FunCommandsController.kt
@@ -0,0 +1,81 @@
+package co.orre.discordbridge.minecraft.controllers
+
+import co.orre.discordbridge.CommandLogic
+import co.orre.discordbridge.Config
+import co.orre.discordbridge.Plugin
+import co.orre.discordbridge.discord.Connection
+import co.orre.discordbridge.minecraft.Permissions
+import co.orre.discordbridge.minecraft.interfaces.BotCommand
+import co.orre.discordbridge.minecraft.interfaces.BotController
+import co.orre.discordbridge.utils.UtilFunctions.toMinecraftChatMessage
+import net.dv8tion.jda.core.entities.Message
+import org.bukkit.event.player.AsyncPlayerChatEvent
+
+class FunCommandsController(val plugin: Plugin) : BotController {
+
+    override fun getDescription(): String = ":balloon:  **FUN** - Every bot has to have them!"
+
+    // 8BALL - consult the Magic 8-Ball to answer your yes or no questions
+    @BotCommand(name = "8ball", usage = "<question>", description = "Consult the Magic 8 Ball")
+    private fun eightBall(event: AsyncPlayerChatEvent){
+        if (!Permissions.eightball.has(event.player))
+            return
+        plugin.logDebug("player ${event.player.name} consults the Magic 8-Ball")
+        dispatchResponse(event, CommandLogic.eightBall(plugin, event.player.name))
+    }
+
+    // CHOOSE - chooses between some number of options
+    @BotCommand(name = "choose", usage = "<option>, <option>, ... (delimiters include ',', 'or', '|')",
+            description = "Have the bot choose between given options")
+    private fun choose(event: AsyncPlayerChatEvent, query: String){
+        plugin.logDebug("user ${event.player.name} needs a choice made")
+        dispatchResponse(event, CommandLogic.choose(event.player.name, query))
+    }
+
+    // F - press F to pay respects!
+    @BotCommand(usage="", description = "Press F to pay respects")
+    private fun f(event: AsyncPlayerChatEvent) {
+        plugin.logDebug("user ${event.player.name} pays respects")
+        dispatchResponse(event, CommandLogic.f(plugin, event.player.name))
+    }
+
+    // INSULT - the bot insults something
+    @BotCommand(usage="<thing to insult>", description = "Make the bot insult something for you")
+    private fun insult(event: AsyncPlayerChatEvent, thingToInsult: String) {
+        plugin.logDebug("user ${event.player.name} requests an insult against '$thingToInsult'")
+        dispatchResponse(event, CommandLogic.insult(plugin, event.player.name, thingToInsult))
+    }
+
+    // RATE - the bot rates something
+    @BotCommand(usage="<thing to be rated>", description = "Have the bot rate something for you")
+    private fun rate(event: AsyncPlayerChatEvent, thingToRate: String) {
+        plugin.logDebug("user ${event.player.name} requests a rating")
+        dispatchResponse(event, CommandLogic.rate(plugin, event.player.name, thingToRate))
+    }
+
+    // ROLL - roll a die for a random number
+    @BotCommand(name = "roll", usage = "<sides>", description = "Roll a die for a random number")
+    private fun roll(event: AsyncPlayerChatEvent, sides: Int){
+        plugin.logDebug("user ${event.player.name} needs a choice made")
+        dispatchResponse(event, CommandLogic.roll(event.player.name, sides))
+    }
+
+    // TALK - directly speak to Cleverbot (useful for not accidentally invoking other commands)
+    @BotCommand(usage="<say something>", description = "Say something to Cleverbot")
+    private fun talk(event: AsyncPlayerChatEvent, query: String) {
+        plugin.logDebug("user ${event.player.name} invokes Cleverbot")
+        dispatchResponse(event, CommandLogic.askCleverbot(event.player.name, query))
+    }
+
+    private fun dispatchResponse(event: AsyncPlayerChatEvent, response: String) {
+        plugin.sendToMinecraft(response.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
+
+        var response1 = plugin.convertAtMentions(response)
+
+        plugin.sendToDiscord(response1, Connection.getRelayChannel())
+    }
+
+    private fun Message.isFromRelayChannel(): Boolean = guild.id == Config.SERVER_ID
+            && this.isFromType(net.dv8tion.jda.core.entities.ChannelType.TEXT)
+            && this.textChannel.name.equals(Config.CHANNEL, true)
+}
diff --git a/src/main/kotlin/co/orre/discordbridge/minecraft/interfaces/BotCommand.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/interfaces/BotCommand.kt
new file mode 100644
index 0000000..c2d3915
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/minecraft/interfaces/BotCommand.kt
@@ -0,0 +1,8 @@
+package co.orre.discordbridge.minecraft.interfaces
+
+// TODO: Apache License
+
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class BotCommand(val usage: String, val description: String, val name: String = "",
+                            val relayTriggerMessage: Boolean = true, val ignoreExcessArguments: Boolean = true)
diff --git a/src/main/kotlin/co/orre/discordbridge/minecraft/interfaces/BotController.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/interfaces/BotController.kt
new file mode 100644
index 0000000..f955b94
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/minecraft/interfaces/BotController.kt
@@ -0,0 +1,7 @@
+package co.orre.discordbridge.minecraft.interfaces
+
+// Todo: Apache License
+
+interface BotController{
+    fun getDescription(): String
+}
diff --git a/src/main/kotlin/co/orre/discordbridge/utils/Rating.kt b/src/main/kotlin/co/orre/discordbridge/utils/Rating.kt
new file mode 100644
index 0000000..d66ba1f
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/utils/Rating.kt
@@ -0,0 +1,17 @@
+package co.orre.discordbridge.utils
+
+import org.bukkit.configuration.serialization.ConfigurationSerializable
+import org.bukkit.configuration.serialization.SerializableAs
+
+//TODO: Make null safe
+@SerializableAs("Rating")
+data class Rating(val message: String = "%u - I rate %m %r", val low: Double = 0.0, val high: Double = 0.0): ConfigurationSerializable {
+    @Suppress("unused")
+    constructor(map: MutableMap<String, Any>):
+            this(map["message"] as String, map["low"] as Double, map["high"] as Double)
+
+    override fun serialize(): MutableMap<String, Any> {
+        return mutableMapOf("message" to message, "low" to low, "high" to high)
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/kotlin/co/orre/discordbridge/utils/Respect.kt b/src/main/kotlin/co/orre/discordbridge/utils/Respect.kt
new file mode 100644
index 0000000..728b83e
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/utils/Respect.kt
@@ -0,0 +1,17 @@
+package co.orre.discordbridge.utils
+
+import org.bukkit.configuration.serialization.ConfigurationSerializable
+import org.bukkit.configuration.serialization.SerializableAs
+
+//TODO: make null safe
+@SerializableAs("Respect")
+data class Respect(val message: String = "%u solemnly pays respect!", val count: Int = 1, val weight: Int = 1): ConfigurationSerializable {
+    @Suppress("unused")
+    constructor(map: MutableMap<String, Any>):
+            this(map["message"] as String, map["respects-paid"] as Int, map["weight"] as Int)
+
+    override fun serialize(): MutableMap<String, Any> {
+        return mutableMapOf("message" to message, "respects-paid" to count, "weight" to weight)
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Utils/Utils.kt b/src/main/kotlin/co/orre/discordbridge/utils/Script.kt
similarity index 52%
rename from src/main/kotlin/gg/obsidian/discordbridge/Utils/Utils.kt
rename to src/main/kotlin/co/orre/discordbridge/utils/Script.kt
index ccf5a9c..4cc08ea 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Utils/Utils.kt
+++ b/src/main/kotlin/co/orre/discordbridge/utils/Script.kt
@@ -1,44 +1,12 @@
-package gg.obsidian.discordbridge.Utils
+package co.orre.discordbridge.utils
 
-import org.bukkit.ChatColor
 import org.bukkit.configuration.serialization.ConfigurationSerializable
 import org.bukkit.configuration.serialization.SerializableAs
 
-fun String.noSpace() = this.replace(Regex("""\s+"""), "")
-fun String.stripColor(): String = ChatColor.stripColor(this)
-
-data class UserAlias(var mcUsername: String, var mcUuid: String, var discordUsername: String, var discordId: String)
-
-//TODO: make null safe
-@SerializableAs("Respect")
-data class Respect(val message: String = "%u solemnly pays respect!", val count: Int = 1, val weight: Int = 1): ConfigurationSerializable{
-    @Suppress("unused")
-    constructor(map: MutableMap<String, Any>):
-            this(map["message"] as String, map["respects-paid"] as Int, map["weight"] as Int)
-
-    override fun serialize(): MutableMap<String, Any> {
-        return mutableMapOf("message" to message, "respects-paid" to count, "weight" to weight)
-    }
-
-}
-
-//TODO: Make null safe
-@SerializableAs("Rating")
-data class Rating(val message: String = "%u - I rate %m %r", val low: Double = 0.0, val high: Double = 0.0): ConfigurationSerializable{
-    @Suppress("unused")
-    constructor(map: MutableMap<String, Any>):
-            this(map["message"] as String, map["low"] as Double, map["high"] as Double)
-
-    override fun serialize(): MutableMap<String, Any> {
-        return mutableMapOf("message" to message, "low" to low, "high" to high)
-    }
-
-}
-
 @SerializableAs("Script")
 data class Script(val triggerMC: String?, val triggerDis: String?, val responseMC: String?, val responseDis: String?,
                   val caseSensitive: Boolean?, val requiresMention: Boolean?,
-                  val startsWith: Boolean?): ConfigurationSerializable{
+                  val startsWith: Boolean?): ConfigurationSerializable {
     @Suppress("unused")
     constructor(map: MutableMap<String, Any>):
             this(map["trigger-minecraft"] as? String, map["trigger-discord"] as? String, map["response-minecraft"] as? String,
diff --git a/src/main/kotlin/co/orre/discordbridge/utils/UserAlias.kt b/src/main/kotlin/co/orre/discordbridge/utils/UserAlias.kt
new file mode 100644
index 0000000..d84245c
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/utils/UserAlias.kt
@@ -0,0 +1,3 @@
+package co.orre.discordbridge.utils
+
+data class UserAlias(var mcUsername: String, var mcUuid: String, var discordUsername: String, var discordId: String)
\ No newline at end of file
diff --git a/src/main/kotlin/co/orre/discordbridge/utils/UtilFunctions.kt b/src/main/kotlin/co/orre/discordbridge/utils/UtilFunctions.kt
new file mode 100644
index 0000000..5857997
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/utils/UtilFunctions.kt
@@ -0,0 +1,49 @@
+package co.orre.discordbridge.utils
+
+import co.orre.discordbridge.Config
+import org.bukkit.ChatColor
+import org.bukkit.entity.Player
+
+object UtilFunctions {
+
+    @JvmStatic
+    fun String.noSpace() = this.replace(Regex("""\s+"""), "")
+
+    @JvmStatic
+    fun String.stripColor(): String = ChatColor.stripColor(this)
+
+    @JvmStatic
+    fun String.toMinecraftChatMessage(alias: String): String {
+        return formatMessage(Config.TEMPLATES_MINECRAFT_CHAT_MESSAGE, msg = this, u = alias)
+    }
+
+    @JvmStatic
+    fun String.toDiscordChatMessage(username: String, displayName: String, worldName: String): String {
+        return formatMessage(Config.TEMPLATES_DISCORD_CHAT_MESSAGE, msg = this, u = username, d = displayName, w = worldName)
+    }
+
+    @JvmStatic
+    fun Player.toDiscordPlayerJoin(): String {
+        return formatMessage(Config.TEMPLATES_DISCORD_PLAYER_JOIN, u = this.name.stripColor(),
+                d = this.displayName.stripColor())
+    }
+
+    @JvmStatic
+    fun Player.toDiscordPlayerLeave(): String {
+        return formatMessage(Config.TEMPLATES_DISCORD_PLAYER_LEAVE, u = this.name.stripColor(),
+                d = this.displayName.stripColor())
+    }
+
+    @JvmStatic
+    fun String.toDiscordPlayerDeath(username: String, displayName: String): String {
+        return formatMessage(Config.TEMPLATES_DISCORD_CHAT_MESSAGE, msg = this, u = username, d = displayName)
+    }
+
+    @JvmStatic
+    private fun formatMessage(template: String, msg: String = "N/A", u: String = "N/A", d: String = "N/A",
+                              w: String = "N/A"): String {
+        var out = org.bukkit.ChatColor.translateAlternateColorCodes('&', template)
+        out = out.replace("%u", u).replace("%m", msg).replace("%d", d).replace("%w", w)
+        return out
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt b/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
deleted file mode 100644
index 4c3935a..0000000
--- a/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
+++ /dev/null
@@ -1,193 +0,0 @@
-package gg.obsidian.discordbridge.discord
-
-import com.neovisionaries.ws.client.WebSocket
-import com.neovisionaries.ws.client.WebSocketException
-import com.neovisionaries.ws.client.WebSocketFrame
-import gg.obsidian.discordbridge.CommandLogic
-import gg.obsidian.discordbridge.Plugin
-import gg.obsidian.discordbridge.Utils.Script
-import gg.obsidian.discordbridge.Utils.noSpace
-import net.dv8tion.jda.core.JDA
-import net.dv8tion.jda.core.entities.ChannelType
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent
-import net.dv8tion.jda.core.hooks.ListenerAdapter
-
-class Listener(val plugin: Plugin, val api: JDA, val connection: Connection) : ListenerAdapter() {
-
-    override fun onMessageReceived(event: MessageReceivedEvent) {
-        plugin.logDebug("Received message ${event.message.id} from Discord - ${event.message.rawContent}")
-
-        val rawmsg: String = event.message.rawContent
-        val username: String = event.author.name
-        val channel = event.channel
-        val id = event.author.id
-
-        // Immediately throw out messages sent from itself
-        if (id == api.selfUser.id) {
-            plugin.logDebug("Ignoring message ${event.message.id} from Discord: it matches this bot's username")
-            return
-        }
-
-        // SCRIPTED RESPONSE - The bot replies with a pre-programmed response if it detects
-        // a corresponding trigger string
-        val responses = plugin.script.data.getList("responses").checkItemsAre<Script>()
-        if (responses == null) plugin.logger.warning("ERROR: Responses for this command could not be read from the config.")
-        else {
-            val response: Script?
-            for (r in responses) {
-                val ignorecase = !(r.caseSensitive != null && r.caseSensitive)
-                val startswith = r.startsWith != null && r.startsWith
-                val requiresmention = r.requiresMention != null && r.requiresMention
-
-                if (requiresmention) if ()
-            }
-        }
-
-        // NON-TRIGGER-RELAY COMMANDS - the triggers of these commands are never relayed to Minecraft
-        if (rawmsg.startsWith(api.selfUser.asMention, true)) {
-            val arg = rawmsg.replaceFirst(api.selfUser.asMention, "").trimStart()
-
-            // NON-RESPONSE-RELAY COMMANDS - the responses of these commands are also never relayed to Minecraft
-
-            // CONFIRM - Confirm an alias
-            if (arg.startsWith("confirm", true) && event.isFromType(ChannelType.PRIVATE)) {
-                plugin.logDebug("user $username wants to confirm an alias")
-                val ua = plugin.requests.find { it.discordId == id }
-                if (ua == null) {
-                    plugin.sendToDiscord("You have not requested an alias, or your request has expired!", channel)
-                    return
-                }
-                plugin.saveAlias(ua)
-                plugin.requests.remove(ua)
-                plugin.sendToDiscord("Successfully linked aliases!", channel)
-                return
-            }
-
-            // SERVERLIST - List all players currently online on the server
-            if (arg.startsWith("serverlist", true)) {
-                plugin.logDebug("user $username has requested a listing of online players")
-                val players = plugin.getOnlinePlayers()
-                if (players.isEmpty()) {
-                    plugin.sendToDiscord("Nobody is currently online.", channel)
-                    return
-                }
-                val response = players.joinToString("\n", "The following players are currently online:\n```\n", "\n```")
-                plugin.sendToDiscord(response, channel)
-                return
-            }
-
-            // RESPONSE-RELAY COMMANDS - only the responses of these commands will be relayed
-            // to Minecraft if sent to the relay channel
-
-            // 8BALL - consult the Magic 8-Ball to answer your yes or no questions
-            if (arg.startsWith("8ball", true)) {
-                plugin.logDebug("user $username consults the Magic 8-Ball")
-                val response = CommandLogic.eightBall(plugin, username)
-                plugin.sendToDiscord(response, channel)
-                if (event.isFromRelayChannel())
-                    plugin.sendToMinecraft(plugin.toMinecraftChatMessage(
-                            plugin.translateAliasToMinecraft(response, id), plugin.cfg.BOT_MC_USERNAME))
-                return
-            }
-
-            // F - press F to pay respects!
-            if (arg.equals("f", true)) {
-                plugin.logDebug("user $username pays respects")
-                val response = CommandLogic.f(plugin, username)
-                plugin.sendToDiscord(response, channel)
-                if (event.isFromRelayChannel())
-                    plugin.sendToMinecraft(plugin.toMinecraftChatMessage(
-                            plugin.translateAliasToMinecraft(response, id), plugin.cfg.BOT_MC_USERNAME))
-                return
-            }
-
-            // RATE - the bot rates something
-            if (arg.startsWith("rate", true)) {
-                val arg2 = arg.replaceFirst("rate", "").trimStart()
-                plugin.logDebug("user $username requests a rating")
-                val response = CommandLogic.rate(plugin, username, arg2)
-                plugin.sendToDiscord(response, channel)
-                if (event.isFromRelayChannel())
-                    plugin.sendToMinecraft(plugin.toMinecraftChatMessage(
-                            plugin.translateAliasToMinecraft(response, id), plugin.cfg.BOT_MC_USERNAME))
-                return
-            }
-
-            // INSULT - the bot insults something
-            if (arg.startsWith("insult", true)) {
-                val arg2 = arg.replaceFirst("insult", "").trimStart()
-                plugin.logDebug("user $username requests an insult against $arg2")
-                val response = CommandLogic.insult(plugin, username, arg2)
-                plugin.sendToDiscord(response, channel)
-                if (event.isFromRelayChannel())
-                    plugin.sendToMinecraft(plugin.toMinecraftChatMessage(
-                            plugin.translateAliasToMinecraft(response, id), plugin.cfg.BOT_MC_USERNAME))
-                return
-            }
-        }
-
-        // If it is from the relay channel, relay it immediately
-        if (event.isFromType(ChannelType.TEXT)) {
-
-            if (!event.textChannel.name.equals(plugin.cfg.CHANNEL, true))
-                plugin.logDebug("Not relaying message ${event.message.id} from Discord: channel does not match")
-            else {
-                plugin.logDebug("Broadcasting message ${event.message.id} from Discord to Minecraft as user $username")
-                var alias = plugin.users.data.getString("discordaliases.$id.mcusername")
-                if (alias == null) alias = username.noSpace()
-                plugin.sendToMinecraft(plugin.toMinecraftChatMessage(event.message.content, alias))
-            }
-        }
-
-        // RELAY COMMANDS - The outputs of these commands WILL be relayed to Minecraft if sent to the relay channel
-        if (rawmsg.startsWith(api.selfUser.asMention, true)) {
-            val arg = rawmsg.replaceFirst(api.selfUser.asMention, "").trimStart()
-            if (arg.isEmpty()) return
-            plugin.logDebug("Relay command received.  Arg: $arg")
-
-
-
-//            var scripted_response: String? = null
-//            for (r in responses) {
-//                val casesensitive = plugin.script.data.getBoolean("responses.$r.case-sensitive", false)
-//                if (arg.startsWith(plugin.script.data.getString("responses.$r.trigger").toLowerCase(), !casesensitive))
-//                    scripted_response = plugin.script.data.getString("responses.$r.response")
-//            }
-//            if (scripted_response != null) {
-//                plugin.logDebug("user $username has triggered the scripted response: $scripted_response")
-//                plugin.sendToDiscord(scripted_response, channel)
-//                if (event.isFromRelayChannel())
-//                    plugin.sendToMinecraft(plugin.toMinecraftChatMessage(scripted_response, plugin.cfg.BOT_MC_USERNAME))
-//                return
-//            }
-
-            // CLEVERBOT - Assume anything else invokes Cleverbot
-            plugin.logDebug("user $username asks CleverBot something")
-            val response = CommandLogic.askCleverbot(plugin, arg)
-            plugin.sendToDiscord(response, channel)
-            if (event.isFromRelayChannel())
-                plugin.sendToMinecraft(plugin.toMinecraftChatMessage(response, plugin.cfg.BOT_MC_USERNAME))
-            return
-        }
-    }
-
-    private fun MessageReceivedEvent.isFromRelayChannel(): Boolean {
-        return this.guild.id == plugin.cfg.SERVER_ID
-                && this.isFromType(ChannelType.TEXT)
-                && this.textChannel.name.equals(plugin.cfg.CHANNEL, true)
-    }
-
-    @Suppress("unused", "UNUSED_PARAMETER")
-    fun onUnexpectedError(ws: WebSocket, wse: WebSocketException) {
-        plugin.logger.severe("Unexpected error from DiscordBridge: ${wse.message}")
-    }
-
-    @Suppress("unused", "UNUSED_PARAMETER")
-    fun onDisconnected(webSocket: WebSocket, serverCloseFrame: WebSocketFrame, clientCloseFrame: WebSocketFrame, closedByServer: Boolean) {
-        plugin.logDebug("Discord disconnected - attempting to reconnect")
-        connection.reconnect()
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    inline fun <reified T : Any> List<*>.checkItemsAre() = if (all { it is T }) this as List<T> else null
-}
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/EventListener.kt b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/EventListener.kt
deleted file mode 100644
index 4c6f2de..0000000
--- a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/EventListener.kt
+++ /dev/null
@@ -1,113 +0,0 @@
-package gg.obsidian.discordbridge.minecraft
-
-import gg.obsidian.discordbridge.CommandLogic
-import gg.obsidian.discordbridge.Plugin
-import gg.obsidian.discordbridge.Utils.*
-import org.bukkit.event.EventHandler
-import org.bukkit.event.EventPriority
-import org.bukkit.event.Listener
-import org.bukkit.event.entity.PlayerDeathEvent
-import org.bukkit.event.player.AsyncPlayerChatEvent
-import org.bukkit.event.player.PlayerJoinEvent
-import org.bukkit.event.player.PlayerQuitEvent
-import org.bukkit.ChatColor as CC
-import java.lang.reflect.Method
-
-class EventListener(val plugin: Plugin) : Listener {
-
-    @EventHandler(priority = EventPriority.MONITOR)
-    fun onChat(event: AsyncPlayerChatEvent) {
-        val player = event.player
-        val username = event.player.name.stripColor()
-        val displayName = event.player.displayName.stripColor()
-        val uuid = event.player.uniqueId.toString()
-        val message = event.message.stripColor()
-        var worldname = event.player.world.name
-
-        plugin.logDebug("Received a chat event from $username: $message")
-        if (!plugin.cfg.MESSAGES_CHAT) return
-        if (event.isCancelled && !plugin.cfg.RELAY_CANCELLED_MESSAGES) return
-        if (player.hasMetadata("vanished") && player.getMetadata("vanished")[0].asBoolean() &&
-                !plugin.cfg.IF_VANISHED_CHAT) return
-
-        // Get world alias if Multiverse is installed
-        if (plugin.foundMultiverse) {
-            val worldProperties = plugin.worlds!!.data.get("worlds.$worldname")
-            val cls = Class.forName("com.onarandombox.MultiverseCore.WorldProperties")
-            val meth: Method = cls.getMethod("getAlias")
-            val alias = meth.invoke(worldProperties)
-            if (alias is String) worldname = alias
-        }
-
-        var formattedMessage = plugin.toDiscordChatMessage(message, username, displayName, worldname)
-        formattedMessage = plugin.convertAtMentions(formattedMessage)
-        formattedMessage = plugin.translateAliasToDiscord(formattedMessage, uuid)
-        plugin.sendToDiscord(formattedMessage, plugin.conn.getRelayChannel())
-
-        // If it was a @mention to the bot, treat it as a Cleverbot invocation
-        if (message.startsWith("@" + plugin.cfg.USERNAME.noSpace())) {
-            val task = Runnable {
-                if (Permissions.cleverbot.has(player)) {
-                    val arg: String = message.removePrefix("@" + plugin.cfg.USERNAME.noSpace()).trimStart()
-                    val response = CommandLogic.askCleverbot(plugin, arg)
-                    plugin.sendToMinecraft(plugin.toMinecraftChatMessage(response, plugin.cfg.BOT_MC_USERNAME))
-                    plugin.sendToDiscord(response, plugin.conn.getRelayChannel())
-                } else
-                    player.sendMessage("${CC.RED}You do not have permission to talk to the bot.")
-            }
-            plugin.server.scheduler.runTaskAsynchronously(plugin, task)
-        }
-    }
-
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    fun onPlayerJoin(event: PlayerJoinEvent) {
-        val player = event.player
-        val username = event.player.name.stripColor()
-        val displayName = event.player.displayName.stripColor()
-        val uuid = event.player.uniqueId.toString()
-
-        plugin.logDebug("Received a join event for $username")
-        if (!plugin.cfg.MESSAGES_JOIN) return
-        if (player.hasMetadata("vanished") && player.getMetadata("vanished")[0].asBoolean() &&
-                !plugin.cfg.IF_VANISHED_JOIN) return
-
-        var formattedMessage = plugin.toDiscordPlayerJoin(username, displayName)
-        formattedMessage = plugin.translateAliasToDiscord(formattedMessage, uuid)
-        plugin.sendToDiscord(formattedMessage, plugin.conn.getRelayChannel())
-    }
-
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    fun onPlayerQuit(event: PlayerQuitEvent) {
-        val player = event.player
-        val username = event.player.name.stripColor()
-        val displayName = event.player.displayName.stripColor()
-        val uuid = event.player.uniqueId.toString()
-
-        plugin.logDebug("Received a leave event for $username")
-        if (!plugin.cfg.MESSAGES_LEAVE) return
-        if (player.hasMetadata("vanished") && player.getMetadata("vanished")[0].asBoolean() &&
-                !plugin.cfg.IF_VANISHED_LEAVE) return
-
-        var formattedMessage = plugin.toDiscordPlayerLeave(username, displayName)
-        formattedMessage = plugin.translateAliasToDiscord(formattedMessage, uuid)
-        plugin.sendToDiscord(formattedMessage, plugin.conn.getRelayChannel())
-    }
-
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    fun onPlayerDeath(event: PlayerDeathEvent) {
-        val player = event.entity
-        val username = event.entity.name.stripColor()
-        val displayName = event.entity.displayName.stripColor()
-        val uuid = event.entity.uniqueId.toString()
-        val deathMessage = event.deathMessage
-
-        plugin.logDebug("Received a death event for $username")
-        if (!plugin.cfg.MESSAGES_DEATH) return
-        if (player.hasMetadata("vanished") && player.getMetadata("vanished")[0].asBoolean() &&
-                !plugin.cfg.IF_VANISHED_DEATH) return
-
-        var formattedMessage = plugin.toDiscordPlayerDeath(deathMessage, username, displayName)
-        formattedMessage = plugin.translateAliasToDiscord(formattedMessage, uuid)
-        plugin.sendToDiscord(formattedMessage, plugin.conn.getRelayChannel())
-    }
-}
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 24ce4c4..2788caf 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -14,6 +14,11 @@ username: 'DiscordBridge'
 # Use '&' in place of the formatting symbol.
 username-color: ''
 
+# (Optional) Define an alternate prefix for all of the bot's commands. These will work in addition to @mentions.
+# Will also work in Minecraft if the sender has the required permission for the command they try.
+# Leave blank to only allow @mentions to prefix commands
+command-prefix: ''
+
 # (Optional) Set this value with a valid Cleverbot API key to enable chatting with Cleverbot
 # Look at https://www.cleverbot.com/api/ for more info
 cleverbot-key: ''
@@ -41,18 +46,19 @@ if-vanished:
   player-leave: false
   player-death: false
 
-# Set the templates for relayed messages
-# %u - The sender's username
-# %m - The sender's message
-# %w - The name of the world the sender is in (Multiverse alias compatible)
-# %r - The death message (Death event only)
-# Use '&' in place of the formatting symbol to apply formatting codes.
+# Set the templates for various message types
+# %u - The username of the one who sent the message or invoked a command, if applicable
+# %m - The raw message that would normally display, if applicable
+# %w - The name of the world the sender is in
+#   - Applicable to messages from Minecraft only
+#   - Multiverse alias compatible
+# Use '&' in place of the formatting symbol to apply formatting codes to messages sent to Minecraft
 templates:
   discord:
     chat-message: '<**%u**> %m'
     player-join: '**%u** joined the server'
     player-leave: '**%u** left the server'
-    player-death: '%r'
+    player-death: '%m'
     server-start: 'Server started!'
     server-stop: 'Shutting down...'
   minecraft:
diff --git a/src/main/resources/f.yaml b/src/main/resources/f.yml
similarity index 81%
rename from src/main/resources/f.yaml
rename to src/main/resources/f.yml
index 78cbbd4..9fb8942 100644
--- a/src/main/resources/f.yaml
+++ b/src/main/resources/f.yml
@@ -6,7 +6,10 @@ total-respects: 0
 # The responses that are returned by the F command
 # All entries must be prefixed with the "==: Respect" attribute, as shown in the default
 # message = the message to display
-#   '%u' = the name of the command sender
+#   '%u' = the name of the command sender.
+#       If this is not specified, the user's name will be prepended to the front of the message with a vertical bar
+#       like other commands.
+#   '%c' = the value of respects-paid for this response
 #   '%t' = the value of total-respects after adding respects-paid
 # respects-paid = how many respects are paid with this message
 # weight = the weighted chance of this response being displayed
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index be1ba74..9925a3d 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -8,7 +8,7 @@ website: '@URL@'
 loadbefore: [SpaceBukkit, RemoteToolkitPlugin]
 softdepend: [Multiverse-Core]
 
-main: gg.obsidian.discordbridge.Plugin
+main: co.orre.discordbridge.Plugin
 
 permissions:
   discordbridge.reload:
diff --git a/src/main/resources/script.yml b/src/main/resources/script.yml
index ddf543a..8d5cacd 100644
--- a/src/main/resources/script.yml
+++ b/src/main/resources/script.yml
@@ -1,6 +1,7 @@
 # Script Config
 
 # A list of responses that are automatically triggered by special phrases
+# Special phrases that look exactly like syntax for bot commands will take precedence over those commands
 # trigger-minecraft: (optional) the phrase that triggers the response(s) in Minecraft
 # trigger-discord: (optional) the phrase that triggers the response(s) in Discord
 # response-minecraft: (optional) the message that is sent to Minecraft

From 06e8f93c578c71d819af57b24d5ed48b4ce82608 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Thu, 6 Apr 2017 19:23:27 -0500
Subject: [PATCH 18/24] Unfinished transition to a completely reflection-based
 system

---
 .../kotlin/co/orre/discordbridge/Plugin.kt    |  43 +-
 .../co/orre/discordbridge/UserAliasConfig.kt  |  21 +
 .../commands/Annotations/BotCommand.kt        |   8 +
 .../Annotations/ChatExclusiveCommand.kt       |   5 +
 .../Annotations/DiscordExclusiveCommand.kt    |   5 +
 .../Annotations/MinecraftExclusiveCommand.kt  |   5 +
 .../commands/AsyncPlayerChatEventWrapper.kt   |  25 ++
 .../discordbridge/commands/IBotController.kt  |   7 +
 .../discordbridge/commands/IEventWrapper.kt   |  14 +
 .../discordbridge/commands/MessageWrapper.kt  |  37 ++
 .../commands/MinecraftCommandWrapper.kt       |  29 ++
 .../discordbridge/commands/WrapperType.kt     |   7 +
 .../controllers/BotControllerManager.kt       | 368 ++++++++++++++++++
 .../controllers/FunCommandsController.kt      |  80 ++++
 .../controllers/UtilCommandsController.kt     |  69 ++++
 .../co/orre/discordbridge/discord/Listener.kt |  13 +-
 .../discordbridge/minecraft/EventListener.kt  |  30 +-
 .../minecraft/commands/CommandListener.kt     |  25 ++
 .../controllers/BotControllerManager.kt       | 307 ---------------
 .../controllers/FunCommandsController.kt      |  81 ----
 .../co/orre/discordbridge/utils/UserAlias.kt  |  18 +-
 21 files changed, 769 insertions(+), 428 deletions(-)
 create mode 100644 src/main/kotlin/co/orre/discordbridge/UserAliasConfig.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/commands/Annotations/BotCommand.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/commands/Annotations/ChatExclusiveCommand.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/commands/Annotations/DiscordExclusiveCommand.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/commands/Annotations/MinecraftExclusiveCommand.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/commands/AsyncPlayerChatEventWrapper.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/commands/IBotController.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/commands/IEventWrapper.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/commands/MessageWrapper.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/commands/MinecraftCommandWrapper.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/commands/WrapperType.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/commands/controllers/BotControllerManager.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/commands/controllers/FunCommandsController.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/commands/controllers/UtilCommandsController.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/minecraft/commands/CommandListener.kt
 delete mode 100644 src/main/kotlin/co/orre/discordbridge/minecraft/controllers/BotControllerManager.kt
 delete mode 100644 src/main/kotlin/co/orre/discordbridge/minecraft/controllers/FunCommandsController.kt

diff --git a/src/main/kotlin/co/orre/discordbridge/Plugin.kt b/src/main/kotlin/co/orre/discordbridge/Plugin.kt
index 492988b..6cb95d3 100644
--- a/src/main/kotlin/co/orre/discordbridge/Plugin.kt
+++ b/src/main/kotlin/co/orre/discordbridge/Plugin.kt
@@ -37,12 +37,6 @@ class Plugin : JavaPlugin() {
     override fun onEnable() {
         // Load configs
         updateConfig(description.version)
-        users.saveDefaultConfig()
-        eightball.saveDefaultConfig()
-        insult.saveDefaultConfig()
-        f.saveConfig()
-        rate.saveConfig()
-        script.saveConfig()
         if (isMultiverseInstalled) worlds = DataConfigAccessor(this, File("plugins/Multiverse-Core"), "worlds.yml")
 
         // Connect to Discord
@@ -101,6 +95,7 @@ class Plugin : JavaPlugin() {
         script.reloadConfig()
         if (isMultiverseInstalled) worlds!!.reloadConfig()
         Config.load(this)
+        UserAliasConfig.load(this)
         Connection.reconnect()
     }
 
@@ -110,7 +105,16 @@ class Plugin : JavaPlugin() {
         config.options().copyDefaults(true)
         config.set("version", version)
         saveConfig()
+
+        users.saveDefaultConfig()
+        eightball.saveDefaultConfig()
+        insult.saveDefaultConfig()
+        f.saveDefaultConfig()
+        rate.saveDefaultConfig()
+        script.saveDefaultConfig()
+
         Config.load(this)
+        UserAliasConfig.load(this)
     }
 
     // Log only if debug config is true
@@ -190,15 +194,15 @@ class Plugin : JavaPlugin() {
     }
 
     // Add an alias to the Users data
-    fun saveAlias(ua: UserAlias) {
-        users.data.set("mcaliases.${ua.mcUuid}.mcusername", ua.mcUsername)
-        users.data.set("mcaliases.${ua.mcUuid}.discordusername", ua.discordUsername)
-        users.data.set("mcaliases.${ua.mcUuid}.discordid", ua.discordId)
-        users.data.set("discordaliases.${ua.discordId}.mcuuid", ua.mcUuid)
-        users.data.set("discordaliases.${ua.discordId}.mcusername", ua.mcUsername)
-        users.data.set("discordaliases.${ua.discordId}.discordusername", ua.discordUsername)
-        users.saveConfig()
-    }
+//    fun saveAlias(ua: UserAlias) {
+//        users.data.set("mcaliases.${ua.mcUuid}.mcusername", ua.mcUsername)
+//        users.data.set("mcaliases.${ua.mcUuid}.discordusername", ua.discordUsername)
+//        users.data.set("mcaliases.${ua.mcUuid}.discordid", ua.discordId)
+//        users.data.set("discordaliases.${ua.discordId}.mcuuid", ua.mcUuid)
+//        users.data.set("discordaliases.${ua.discordId}.mcusername", ua.mcUsername)
+//        users.data.set("discordaliases.${ua.discordId}.discordusername", ua.discordUsername)
+//        users.saveConfig()
+//    }
 
     /*======================================
       Message Formatting Functions
@@ -235,8 +239,13 @@ class Plugin : JavaPlugin() {
     // to a registered Discord name, if it exists
     fun translateAliasToDiscord(message: String, uuid: String?): String {
         var newMessage = message
-        val alias = users.data.getString("mcaliases.$uuid.discordusername")
-        if (alias != null)
+        //val alias = users.data.getString("mcaliases.$uuid.discordusername")
+        val userAlias = UserAliasConfig.aliases.firstOrNull { it.mcUuid == uuid }
+        if (userAlias != null) {
+            val user = Connection.listUsers().firstOrNull { it.user.id == userAlias.discordId }
+            if (user != null) return newMessage.replace(users.data.getString("mcaliases.$uuid.mcusername"), alias)
+            val name = Connection.JDA.getUserById(userAlias.discordId).name
+        }
             newMessage = newMessage.replace(users.data.getString("mcaliases.$uuid.mcusername"), alias)
         return newMessage
     }
diff --git a/src/main/kotlin/co/orre/discordbridge/UserAliasConfig.kt b/src/main/kotlin/co/orre/discordbridge/UserAliasConfig.kt
new file mode 100644
index 0000000..8df839b
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/UserAliasConfig.kt
@@ -0,0 +1,21 @@
+package co.orre.discordbridge
+
+import co.orre.discordbridge.utils.UserAlias
+
+object UserAliasConfig {
+    var aliases: List<UserAlias> = mutableListOf()
+
+    fun load(plugin: Plugin) {
+        aliases = plugin.users.data.getList("aliases").checkItemsAre<UserAlias>()
+            ?: throw IllegalStateException("usernames.yml could not be read - list items are not properly formatted")
+    }
+
+    fun add(plugin: Plugin, ua: UserAlias) {
+        aliases = aliases.plus(ua)
+        plugin.users.data.set("aliases", aliases)
+        plugin.users.saveConfig()
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    inline fun <reified T : Any> List<*>.checkItemsAre() = if (all { it is T }) this as List<T> else null
+}
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/Annotations/BotCommand.kt b/src/main/kotlin/co/orre/discordbridge/commands/Annotations/BotCommand.kt
new file mode 100644
index 0000000..bafcbb1
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/commands/Annotations/BotCommand.kt
@@ -0,0 +1,8 @@
+package co.orre.discordbridge.commands.Annotations
+
+// TODO: Apache License
+
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class BotCommand(val usage: String, val description: String, val name: String = "",
+                            val relayTriggerMessage: Boolean = true, val ignoreExcessArguments: Boolean = true)
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/Annotations/ChatExclusiveCommand.kt b/src/main/kotlin/co/orre/discordbridge/commands/Annotations/ChatExclusiveCommand.kt
new file mode 100644
index 0000000..22766e1
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/commands/Annotations/ChatExclusiveCommand.kt
@@ -0,0 +1,5 @@
+package co.orre.discordbridge.commands.Annotations
+
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class ChatExclusiveCommand
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/Annotations/DiscordExclusiveCommand.kt b/src/main/kotlin/co/orre/discordbridge/commands/Annotations/DiscordExclusiveCommand.kt
new file mode 100644
index 0000000..88a5e13
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/commands/Annotations/DiscordExclusiveCommand.kt
@@ -0,0 +1,5 @@
+package co.orre.discordbridge.commands.Annotations
+
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class DiscordExclusiveCommand
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/Annotations/MinecraftExclusiveCommand.kt b/src/main/kotlin/co/orre/discordbridge/commands/Annotations/MinecraftExclusiveCommand.kt
new file mode 100644
index 0000000..39caec9
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/commands/Annotations/MinecraftExclusiveCommand.kt
@@ -0,0 +1,5 @@
+package co.orre.discordbridge.commands.Annotations
+
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class MinecraftExclusiveCommand
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/AsyncPlayerChatEventWrapper.kt b/src/main/kotlin/co/orre/discordbridge/commands/AsyncPlayerChatEventWrapper.kt
new file mode 100644
index 0000000..c5e4768
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/commands/AsyncPlayerChatEventWrapper.kt
@@ -0,0 +1,25 @@
+package co.orre.discordbridge.commands
+
+import co.orre.discordbridge.discord.Connection
+import net.dv8tion.jda.core.entities.MessageChannel
+import org.bukkit.event.player.AsyncPlayerChatEvent
+
+class AsyncPlayerChatEventWrapper(val event: AsyncPlayerChatEvent) : IEventWrapper {
+    override val senderName: String
+        get() = event.player.name
+    override val message: String
+        get() = event.message
+    override val rawMessage: String
+        get() = event.message
+    override val senderAsMention: String
+        get() = "@" + event.player.name
+    override val channel: MessageChannel
+        get() = Connection.getRelayChannel()!!
+    override val senderId: String
+        get() = event.player.uniqueId.toString()
+    override val type: WrapperType
+        get() = WrapperType.ASYNC_PLAYER_CHAT_EVENT
+    override val isFromRelayChannel: Boolean
+        get() = true
+
+}
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/IBotController.kt b/src/main/kotlin/co/orre/discordbridge/commands/IBotController.kt
new file mode 100644
index 0000000..3da9976
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/commands/IBotController.kt
@@ -0,0 +1,7 @@
+package co.orre.discordbridge.commands
+
+// Todo: Apache License
+
+interface IBotController {
+    fun getDescription(): String
+}
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/IEventWrapper.kt b/src/main/kotlin/co/orre/discordbridge/commands/IEventWrapper.kt
new file mode 100644
index 0000000..a9806c4
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/commands/IEventWrapper.kt
@@ -0,0 +1,14 @@
+package co.orre.discordbridge.commands
+
+import net.dv8tion.jda.core.entities.MessageChannel
+
+interface IEventWrapper {
+    val senderName : String
+    val message : String
+    val rawMessage : String
+    val senderAsMention : String
+    val channel : MessageChannel
+    val senderId : String
+    val type: WrapperType
+    val isFromRelayChannel: Boolean
+}
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/MessageWrapper.kt b/src/main/kotlin/co/orre/discordbridge/commands/MessageWrapper.kt
new file mode 100644
index 0000000..b9ca6d5
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/commands/MessageWrapper.kt
@@ -0,0 +1,37 @@
+package co.orre.discordbridge.commands
+
+import co.orre.discordbridge.Config
+import co.orre.discordbridge.Plugin
+import net.dv8tion.jda.core.entities.ChannelType
+import net.dv8tion.jda.core.entities.Message
+import net.dv8tion.jda.core.entities.MessageChannel
+
+class MessageWrapper(val originalMessage: Message) : IEventWrapper {
+
+    override val type: WrapperType
+        get() = WrapperType.MESSAGE
+
+    override val senderAsMention: String
+        get() = originalMessage.author.asMention
+
+    override val channel: MessageChannel
+        get() = originalMessage.channel
+
+    override val isFromRelayChannel: Boolean
+        get() = originalMessage.guild.id == Config.SERVER_ID
+                && originalMessage.isFromType(ChannelType.TEXT)
+                && originalMessage.textChannel.name.equals(Config.CHANNEL, true)
+
+    override val message: String
+        get() = originalMessage.content
+
+    override val rawMessage: String
+        get() = originalMessage.rawContent
+
+    override val senderName: String
+        get() = originalMessage.author.name
+
+    override val senderId: String
+        get() = originalMessage.author.id
+
+}
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/MinecraftCommandWrapper.kt b/src/main/kotlin/co/orre/discordbridge/commands/MinecraftCommandWrapper.kt
new file mode 100644
index 0000000..38d0e03
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/commands/MinecraftCommandWrapper.kt
@@ -0,0 +1,29 @@
+package co.orre.discordbridge.commands
+
+import co.orre.discordbridge.discord.Connection
+import net.dv8tion.jda.core.entities.MessageChannel
+import org.bukkit.command.Command
+import org.bukkit.command.CommandSender
+import org.bukkit.entity.Player
+import org.bukkit.plugin.Plugin
+
+class MinecraftCommandWrapper(val plugin: Plugin, val sender: CommandSender, val cmd: Command,
+                              val args: Array<out String>): IEventWrapper {
+    override val senderName: String
+        get() = if (sender is Player) sender.name else "Console"
+    override val message: String
+        get() = args.joinToString(separator = " ")
+    override val rawMessage: String
+        get() = args.joinToString(separator = " ")
+    override val senderAsMention: String
+        get() = "@${sender.name}"
+    override val channel: MessageChannel
+        get() = Connection.getRelayChannel()!!
+    override val senderId: String
+        get() = (sender as? Player)?.uniqueId?.toString() ?: ""
+    override val type: WrapperType
+        get() = WrapperType.MINECRAFT_COMMAND
+    override val isFromRelayChannel: Boolean
+        get() = true
+
+}
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/WrapperType.kt b/src/main/kotlin/co/orre/discordbridge/commands/WrapperType.kt
new file mode 100644
index 0000000..75be0d1
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/commands/WrapperType.kt
@@ -0,0 +1,7 @@
+package co.orre.discordbridge.commands
+
+enum class WrapperType {
+    ASYNC_PLAYER_CHAT_EVENT,
+    MESSAGE,
+    MINECRAFT_COMMAND
+}
\ No newline at end of file
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/controllers/BotControllerManager.kt b/src/main/kotlin/co/orre/discordbridge/commands/controllers/BotControllerManager.kt
new file mode 100644
index 0000000..ada02cb
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/commands/controllers/BotControllerManager.kt
@@ -0,0 +1,368 @@
+package co.orre.discordbridge.commands.controllers
+
+// TODO: Add Apache license
+
+import co.orre.discordbridge.Config
+import co.orre.discordbridge.Plugin
+import co.orre.discordbridge.commands.*
+import co.orre.discordbridge.commands.Annotations.BotCommand
+import co.orre.discordbridge.commands.Annotations.ChatExclusiveCommand
+import co.orre.discordbridge.commands.Annotations.DiscordExclusiveCommand
+import co.orre.discordbridge.commands.Annotations.MinecraftExclusiveCommand
+import co.orre.discordbridge.discord.Connection
+import co.orre.discordbridge.utils.Script
+import co.orre.discordbridge.utils.UtilFunctions.stripColor
+import co.orre.discordbridge.utils.UtilFunctions.toMinecraftChatMessage
+import net.dv8tion.jda.core.entities.Message
+import org.bukkit.ChatColor
+import java.lang.reflect.InvocationTargetException
+import java.lang.reflect.Method
+import java.util.*
+import java.util.logging.Level
+import co.orre.discordbridge.Config as cfg
+
+class BotControllerManager(val plugin: Plugin) {
+
+    private val commands: MutableMap<String, Command> = mutableMapOf()
+    private val controllers: MutableMap<Class<out IBotController>, IBotController> = mutableMapOf()
+
+    fun registerController(controller: IBotController, discordExclusive: Boolean = false,
+                           minecraftExclusive: Boolean = false, chatExclusive: Boolean = false) {
+        controllers.put(controller.javaClass, controller)
+        val controllerClass = controller.javaClass
+
+        for (method in controllerClass.declaredMethods) {
+            val annotation = method.getAnnotation(BotCommand::class.java)
+            if (annotation != null
+                    && (discordExclusive || method.getAnnotation(DiscordExclusiveCommand::class.java) == null)
+                    && (minecraftExclusive || method.getAnnotation(MinecraftExclusiveCommand::class.java) == null)
+                    && (chatExclusive || method.getAnnotation(ChatExclusiveCommand::class.java) == null)) {
+                registerControllerMethod(controllerClass, method, annotation)
+            }
+        }
+    }
+
+    private fun registerControllerMethod(controllerClass: Class<*>, method: Method, annotation: BotCommand) {
+        val commandName = if (annotation.name.isEmpty()) method.name.toLowerCase() else annotation.name
+        val usage = annotation.usage
+        val methodParameters = method.parameters
+
+        if (methodParameters.isEmpty() || !methodParameters[0].type.isAssignableFrom(Message::class.java)) return
+
+        method.isAccessible = true
+        val parameters = (1..methodParameters.size - 1).mapTo(ArrayList<Class<*>>()) { methodParameters[it].type }
+        val command = Command(commandName, usage, annotation.description, parameters, annotation.relayTriggerMessage,
+                annotation.ignoreExcessArguments, controllerClass, method)
+        commands.put(command.name, command)
+    }
+
+    fun dispatchMessage(event: IEventWrapper): Boolean {
+
+        if (event is MinecraftCommandWrapper) {
+            val command = commands[event.cmd.name] ?: return false
+            val inputArguments = event.rawMessage.split("\\s+".toRegex(), command.parameters.size).toTypedArray()
+            return invokeCommand(command, controllers, event, inputArguments)
+        }
+
+        // SCRIPTED RESPONSE - The bot replies with a pre-programmed response if it detects
+        // a corresponding trigger string
+        if (scriptedResponse(event)) return true
+
+        val args = event.rawMessage.trim().split("\\s+".toRegex(), 2).toTypedArray()
+
+        // <prefix>command
+        if (Config.COMMAND_PREFIX.isNotBlank() && args[0].startsWith(Config.COMMAND_PREFIX)) {
+            val commandName = args[0].substring(Config.COMMAND_PREFIX.length).toLowerCase()
+            if (commandName == "") return true
+            val command = commands[commandName]
+
+            if (command == null) {
+                commandNotFound(event, commandName)
+                return false
+            }
+
+            val inputArguments = if (args.size == 1) arrayOf<String>()
+                else args[1].split("\\s+".toRegex(), command.parameters.size).toTypedArray()
+
+            return invokeCommand(command, controllers, event, inputArguments)
+        }
+
+        // @<mention> command
+        if (args[0] == Connection.JDA.selfUser.asMention && args.count() == 2) {
+            val args2 = args[1].split("\\s+".toRegex(), 2).toTypedArray()
+            val commandName = args2[0].toLowerCase()
+            if (commandName == "") return true
+            var params = if (args2.size > 1) args2[1] else ""
+            var command = commands[commandName]
+
+            if (command == null) {
+                // Assume user wants to talk to Cleverbot
+                command = commands["talk"]
+                if (command == null) {
+                    commandNotFound(event, commandName)
+                    return false
+                }
+                params = args[1]
+            }
+
+            val inputArguments = if (params == "") arrayOf<String>()
+            else params.split("\\s+".toRegex(), command.parameters.size).toTypedArray()
+
+            return invokeCommand(command, controllers, event, inputArguments)
+        }
+
+        // Just relay the message if it is neither
+        relay(event, true)
+        return true
+    }
+
+    private fun scriptedResponse(event: IEventWrapper): Boolean {
+        val responses = plugin.script.data.getList("responses").checkItemsAre<Script>()
+        if (responses == null) {
+            plugin.logger.warning("ERROR: Unable to read script.yml!")
+            return false
+        }
+        var response: Script? = null
+        // TODO: Switch if Minecraft or Discord
+        for (r in responses) {
+            var arg = event.rawMessage
+            val triggerDis = r.triggerDis ?: ""
+            val triggerMC = r.triggerMC ?: ""
+            val ignorecase = !(r.caseSensitive != null && r.caseSensitive)
+            val startswith = r.startsWith != null && r.startsWith
+            val requiresmention = r.requiresMention != null && r.requiresMention
+
+            if (requiresmention) {
+                if (arg.startsWith(Connection.JDA.selfUser.asMention, true))
+                    arg = arg.replaceFirst(Connection.JDA.selfUser.asMention, "").trimStart()
+                else continue
+            }
+
+            when (event.type) {
+                WrapperType.ASYNC_PLAYER_CHAT_EVENT -> {
+                    if (startswith)
+                        if (triggerMC.isNotEmpty() && arg.startsWith(triggerMC, ignorecase)) response = r
+                        else
+                            if (triggerMC.isNotEmpty() && arg.equals(triggerMC, ignorecase)) response = r
+                }
+                WrapperType.MESSAGE -> {
+                    if (startswith)
+                        if (triggerDis.isNotEmpty() && arg.startsWith(triggerDis, ignorecase)) response = r
+                        else
+                            if (triggerDis.isNotEmpty() && arg.equals(triggerDis, ignorecase)) response = r
+                }
+                else -> return false
+            }
+        }
+        if (response == null) return false
+        plugin.logDebug("user ${event.senderName} has triggered a scripted response")
+        val responseDis: String? = response.responseDis
+        val responseMC: String? = response.responseMC
+        if (responseDis != null) {
+            val out = responseDis.replace("%u", event.senderAsMention)
+            plugin.sendToDiscord(out, event.channel)
+        }
+        if (responseMC != null && event.isFromRelayChannel) {
+            var alias = plugin.users.data.getString("discordaliases.${message.author.id}.mcusername")
+            if (alias == null) alias = message.author.name.noSpace()
+            val out = responseMC.replace("%u", alias)
+            plugin.sendToMinecraft(out.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
+        }
+        return true
+    }
+
+    private fun invokeCommand(command: Command, instances: Map<Class<out IBotController>, IBotController>,
+                              event: IEventWrapper, inputArguments: Array<String>): Boolean {
+        if (command.relayTriggerMessage) relay(event, false)
+
+        if (command.name == "help") {
+            try {
+                command.commandMethod.invoke(instances[command.controllerClass], event, commands, instances)
+                return true
+            } catch (e: InvocationTargetException) {
+                commandException(event, e.cause)
+                return false
+            } catch (e: IllegalAccessException) {
+                throw RuntimeException(e)
+            } catch (e: IllegalArgumentException) {
+                commandWrongParameterCount(event, command.name, command.usage, 2, command.parameters.size)
+                return false
+            }
+        }
+
+        if (inputArguments.size < command.parameters.size) {
+            commandWrongParameterCount(event, command.name, command.usage, inputArguments.size, command.parameters.size)
+            return false
+        }
+        if (inputArguments.size != command.parameters.size && !command.ignoreExcessArguments) {
+            commandWrongParameterCount(event, command.name, command.usage, inputArguments.size, command.parameters.size)
+            return false
+        }
+
+        val arguments = arrayOfNulls<Any>(command.parameters.size + 1)
+        arguments[0] = event
+
+        var paramRange = command.parameters.indices
+
+        if (command.ignoreExcessArguments && inputArguments.size > command.parameters.size)
+            paramRange = IntRange(0, command.parameters.size - 1)
+
+        for (i in paramRange) {
+            val parameterClass = command.parameters[i]
+
+            try {
+                arguments[i + 1] = parseArgument(parameterClass, inputArguments[i])
+            } catch (ignored: IllegalArgumentException) {
+                commandWrongParameterType(event, command.name, command.usage, i,
+                        inputArguments[i].javaClass, parameterClass)
+                return false
+            }
+        }
+
+        try {
+            command.commandMethod.invoke(instances[command.controllerClass], *arguments)
+            return true
+        } catch (e: InvocationTargetException) {
+            commandException(event, e.cause)
+            return false
+        } catch (e: IllegalAccessException) {
+            throw RuntimeException(e)
+        } catch (e: IllegalArgumentException) {
+            commandWrongParameterCount(event, command.name, command.usage, inputArguments.size, command.parameters.size)
+            return false
+        }
+    }
+
+    private fun relay(event: IEventWrapper, logIgnore: Boolean) {
+        when (event.type) {
+            WrapperType.ASYNC_PLAYER_CHAT_EVENT -> {
+
+            }
+            WrapperType.MESSAGE -> {
+                if (event.isFromRelayChannel) {
+                    plugin.logDebug("Broadcasting message from Discord to Minecraft as user ${event.senderName}")
+                    //var alias = plugin.users.data.getString("discordaliases.${message.author.id}.mcusername")
+                    //if (alias == null) alias = message.author.name.noSpace()
+                    plugin.sendToMinecraft(message.content.toMinecraftChatMessage(alias))
+                } else if (logIgnore) plugin.logDebug("Not relaying message ${message.id} from Discord: channel does not match")
+            }
+            else -> return
+        }
+
+    }
+
+    private fun parseArgument(parameterClass: Class<*>, value: String): Any {
+        try {
+            when (parameterClass) {
+                String::class.java -> return value
+                Int::class.javaPrimitiveType, Int::class.java -> return Integer.valueOf(value)
+                Long::class.javaPrimitiveType, Long::class.java -> return java.lang.Long.valueOf(value)
+                Boolean::class.javaPrimitiveType, Boolean::class.java -> return parseBooleanArgument(value)
+                Float::class.javaPrimitiveType, Float::class.java -> return java.lang.Float.valueOf(value)
+                Double::class.javaPrimitiveType, Double::class.java -> return java.lang.Double.valueOf(value)
+                else -> throw IllegalArgumentException()
+            }
+        } catch (ignored: NumberFormatException) {
+            throw IllegalArgumentException()
+        }
+    }
+
+    private fun parseBooleanArgument(value: String): Boolean {
+        when (value.toLowerCase()) {
+            "yes", "true" -> return true
+            "no", "false" -> return false
+            else -> {
+                val integerValue = Integer.valueOf(value)!!
+                when (integerValue) {
+                    1 -> return true
+                    0 -> return false
+                    else -> throw IllegalArgumentException()
+                }
+            }
+        }
+    }
+
+    @Suppress("UNCHECKED_CAST")
+    private inline fun <reified T : Any> List<*>.checkItemsAre() = if (all { it is T }) this as List<T> else null
+
+    private fun commandNotFound(event: IEventWrapper, commandName: String) {
+        when (event) {
+            is MessageWrapper ->
+                    event.channel.sendMessage(
+                        "${event.senderAsMention} | I don't seem to have a command called '$commandName'. " +
+                        "See '${Connection.JDA.selfUser.asMention} help' ${orPrefixHelp()}for the commands I do have.").queue()
+            is AsyncPlayerChatEventWrapper ->
+                    event.event.player.sendMessage("${ChatColor.ITALIC}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
+                    "I don't seem to have a command called '$commandName'. " +
+                    "See '@${Config.BOT_MC_USERNAME.stripColor()} help' ${orPrefixHelp()}for the commands I do have.")
+        }
+
+    }
+
+    private fun commandWrongParameterCount(event: IEventWrapper, commandName: String, usage: String, given: Int, required: Int) {
+        when (event) {
+            is MessageWrapper ->
+                event.channel.sendMessage(
+                        "${event.senderAsMention} | I didn't seem to get the correct number of arguments for that command. " +
+                                "I got $given from you, but I need $required. " +
+                                "(Usage: $commandName $usage)").queue()
+            is AsyncPlayerChatEventWrapper ->
+                event.event.player.sendMessage("${ChatColor.ITALIC}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
+                        "I didn't seem to get the correct number of arguments for that command. " +
+                        "I got $given from you, but I need $required. " +
+                        "(Usage: $commandName $usage)")
+        }
+    }
+
+    private fun commandWrongParameterType(event: IEventWrapper, name: String, usage: String, index: Int,
+                                          actualType: Class<*>, expectedType: Class<*>) {
+        when (event) {
+            is MessageWrapper ->
+                event.channel.sendMessage(
+                        "${event.senderAsMention} | One of the arguments for that command doesn't seem to be the right type. " +
+                                "Argument $index seems like ${actualType.simpleName}, but I need ${expectedType.simpleName}. " +
+                                "(Usage: $name $usage)").queue()
+            is AsyncPlayerChatEventWrapper ->
+                event.event.player.sendMessage("${ChatColor.ITALIC}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
+                        "One of the arguments for that command doesn't seem to be the right type. " +
+                        "Argument $index seems like ${actualType.simpleName}, but I need ${expectedType.simpleName}. " +
+                        "(Usage: $name $usage)")
+        }
+    }
+
+    @Suppress("unused")
+    private fun commandRestricted(event: IEventWrapper) {
+        when (event) {
+            is MessageWrapper ->
+                event.channel.sendMessage("${event.senderAsMention} | Sorry, that command is not permitted.").queue()
+            is AsyncPlayerChatEventWrapper ->
+                event.event.player.sendMessage("${ChatColor.ITALIC}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
+                        "Sorry, that command is not permitted.")
+        }
+    }
+
+    private fun commandException(event: IEventWrapper, throwable: Throwable?) {
+        plugin.logger.log(Level.SEVERE, "Command with content ${event.rawMessage} threw an exception.", throwable)
+        when (event) {
+            is MessageWrapper ->
+                event.channel.sendMessage(
+                        "${event.senderAsMention} | Ouch! That command threw an exception. Sorry about that...").queue()
+            is AsyncPlayerChatEventWrapper ->
+                event.event.player.sendMessage("${ChatColor.ITALIC}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
+                        "Ouch! That command threw an exception. Sorry about that...")
+        }
+    }
+
+    private fun orPrefixHelp(): String = if (Config.COMMAND_PREFIX != "") "or ${Config.COMMAND_PREFIX}help " else ""
+
+    data class Command(
+            val name: String,
+            val usage: String,
+            val description: String,
+            val parameters: List<Class<*>>,
+            val relayTriggerMessage: Boolean,
+            val ignoreExcessArguments: Boolean,
+            val controllerClass: Class<*>,
+            val commandMethod: Method
+    )
+}
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/controllers/FunCommandsController.kt b/src/main/kotlin/co/orre/discordbridge/commands/controllers/FunCommandsController.kt
new file mode 100644
index 0000000..f0dd7ec
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/commands/controllers/FunCommandsController.kt
@@ -0,0 +1,80 @@
+package co.orre.discordbridge.commands.controllers
+
+import co.orre.discordbridge.CommandLogic
+import co.orre.discordbridge.Config
+import co.orre.discordbridge.Plugin
+import co.orre.discordbridge.commands.Annotations.BotCommand
+import co.orre.discordbridge.commands.IBotController
+import co.orre.discordbridge.commands.IEventWrapper
+import co.orre.discordbridge.utils.UtilFunctions.toMinecraftChatMessage
+import net.dv8tion.jda.core.entities.Message
+
+class FunCommandsController(val plugin: Plugin) : IBotController {
+
+    override fun getDescription(): String = ":balloon:  **FUN** - Every bot has to have them!"
+
+    // 8BALL - consult the Magic 8-Ball to answer your yes or no questions
+    @BotCommand(name = "8ball", usage = "<question>", description = "Consult the Magic 8 Ball")
+    private fun eightBall(event: IEventWrapper) : String {
+        plugin.logDebug("user ${event.senderName} consults the Magic 8-Ball")
+        return CommandLogic.eightBall(plugin, event.senderAsMention)
+        //dispatchResponse(message, CommandLogic.eightBall(plugin, message.author.asMention))
+    }
+
+    // CHOOSE - chooses between some number of options
+    @BotCommand(name = "choose", usage = "<option>, <option>, ... (delimiters include ',', 'or', '|')",
+            description = "Have the bot choose between given options")
+    private fun choose(event: IEventWrapper, query: String){
+        plugin.logDebug("user ${event.senderName} needs a choice made")
+        //dispatchResponse(message, CommandLogic.choose(message.author.asMention, query))
+    }
+
+    // F - press F to pay respects!
+    @BotCommand(usage="", description = "Press F to pay respects")
+    private fun f(event: IEventWrapper) {
+        plugin.logDebug("user ${event.senderName}} pays respects")
+        //dispatchResponse(message, CommandLogic.f(plugin, message.author.asMention))
+    }
+
+    // INSULT - the bot insults something
+    @BotCommand(usage="<thing to insult>", description = "Make the bot insult something for you")
+    private fun insult(event: IEventWrapper, thingToInsult: String) {
+        plugin.logDebug("user ${event.senderName} requests an insult against '$thingToInsult'")
+        //dispatchResponse(message, CommandLogic.insult(plugin, message.author.name, thingToInsult))
+    }
+
+    // RATE - the bot rates something
+    @BotCommand(usage="<thing to be rated>", description = "Have the bot rate something for you")
+    private fun rate(event: IEventWrapper, thingToRate: String) {
+        plugin.logDebug("user ${event.senderName} requests a rating")
+        //dispatchResponse(message, CommandLogic.rate(plugin, message.author.name, thingToRate))
+    }
+
+    // ROLL - roll a die for a random number
+    @BotCommand(name = "roll", usage = "<sides>", description = "Roll a die for a random number")
+    private fun roll(event: IEventWrapper, sides: Int){
+        plugin.logDebug("user ${event.senderName} needs a choice made")
+        //dispatchResponse(message, CommandLogic.roll(message.author.asMention, sides))
+    }
+
+    // TALK - directly speak to Cleverbot (useful for not accidentally invoking other commands)
+    @BotCommand(usage="<say something>", description = "Say something to Cleverbot")
+    private fun talk(event: IEventWrapper, query: String) {
+        plugin.logDebug("user ${event.senderName} invokes Cleverbot")
+        //dispatchResponse(message, CommandLogic.askCleverbot(message.author.asMention, query))
+    }
+
+    private fun dispatchResponse(event: IEventWrapper, response: String) {
+        plugin.sendToDiscord(response, event.channel)
+
+        if (message.isFromRelayChannel()) {
+            var response1 = plugin.translateAliasToMinecraft(response, message.author.id)
+            response1 = response1.toMinecraftChatMessage(Config.BOT_MC_USERNAME)
+            plugin.sendToMinecraft(response1)
+        }
+    }
+
+    private fun Message.isFromRelayChannel(): Boolean = guild.id == Config.SERVER_ID
+            && this.isFromType(net.dv8tion.jda.core.entities.ChannelType.TEXT)
+            && this.textChannel.name.equals(Config.CHANNEL, true)
+}
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/controllers/UtilCommandsController.kt b/src/main/kotlin/co/orre/discordbridge/commands/controllers/UtilCommandsController.kt
new file mode 100644
index 0000000..4bcd421
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/commands/controllers/UtilCommandsController.kt
@@ -0,0 +1,69 @@
+package co.orre.discordbridge.commands.controllers
+
+import co.orre.discordbridge.Plugin
+import co.orre.discordbridge.commands.Annotations.BotCommand
+import co.orre.discordbridge.commands.Annotations.ChatExclusiveCommand
+import co.orre.discordbridge.commands.Annotations.DiscordExclusiveCommand
+import co.orre.discordbridge.commands.IBotController
+import co.orre.discordbridge.commands.IEventWrapper
+import co.orre.discordbridge.commands.MessageWrapper
+import net.dv8tion.jda.core.entities.ChannelType
+import net.dv8tion.jda.core.entities.Message
+
+class UtilCommandsController(val plugin: Plugin) : IBotController {
+
+    override fun getDescription(): String = ":wrench:  **UTIL** - Utility commands"
+
+    // CONFIRM - Confirm an alias
+    @BotCommand(usage="", description="Confirm an alias link request", relayTriggerMessage = false)
+    @DiscordExclusiveCommand
+    private fun confirm(message: MessageWrapper) {
+        if (!message.originalMessage.isFromType(ChannelType.PRIVATE)) return
+        plugin.logDebug("user ${message.senderName} wants to confirm an alias")
+
+        val ua = plugin.requests.find { it.discordId == message.senderId }
+        if (ua == null) {
+            plugin.sendToDiscord("You have not requested an alias, or your request has expired!", message.channel)
+            return
+        }
+
+        plugin.saveAlias(ua)
+        plugin.requests.remove(ua)
+        plugin.sendToDiscord("Successfully linked aliases!", message.channel)
+    }
+
+    @BotCommand(usage="", description="You just used it", relayTriggerMessage = false)
+    @ChatExclusiveCommand
+    private fun help(event: IEventWrapper, commands: MutableMap<String, BotControllerManager.Command>,
+                     instances: Map<Class<out IBotController>, IBotController>) {
+        plugin.logDebug("user ${event.senderName} requested help")
+        //todo
+        plugin.sendToDiscord("**DiscordBridge** - Bridge your Minecraft and Discord chats\n**---**", message.channel)
+        var out: String
+        for (bc: IBotController in instances.values) {
+            out = bc.getDescription() + "\n```"
+            commands.values.sortedBy { (name) -> name }
+                    .filter { it.controllerClass == bc.javaClass }
+                    .forEach { out += "\n${it.name} ${it.usage}\n  ${it.description}\n" }
+            out += "```"
+            plugin.sendToDiscord(out, message.channel)
+        }
+    }
+
+    // SERVERLIST - List all players currently online on the server
+    @DiscordExclusiveCommand
+    @BotCommand(usage="", description = "List all Minecraft players currently online on the server",
+            relayTriggerMessage = false)
+    private fun serverList(message: MessageWrapper) {
+        plugin.logDebug("user ${message.originalMessage.author.name} has requested a listing of online players")
+
+        val players = plugin.getOnlinePlayers()
+        if (players.isEmpty()) {
+            plugin.sendToDiscord("Nobody is currently online.", message.channel)
+            return
+        }
+
+        val response = players.joinToString("\n", "The following players are currently online:\n```\n", "\n```")
+        plugin.sendToDiscord(response, message.channel)
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/co/orre/discordbridge/discord/Listener.kt b/src/main/kotlin/co/orre/discordbridge/discord/Listener.kt
index 78c2e63..554f7ea 100644
--- a/src/main/kotlin/co/orre/discordbridge/discord/Listener.kt
+++ b/src/main/kotlin/co/orre/discordbridge/discord/Listener.kt
@@ -3,9 +3,10 @@ package co.orre.discordbridge.discord
 // TODO: Apache License
 
 import co.orre.discordbridge.Plugin
-import co.orre.discordbridge.discord.controllers.BotControllerManager
-import co.orre.discordbridge.discord.controllers.FunCommandsController
-import co.orre.discordbridge.discord.controllers.UtilCommandsController
+import co.orre.discordbridge.commands.controllers.BotControllerManager
+import co.orre.discordbridge.commands.controllers.FunCommandsController
+import co.orre.discordbridge.commands.MessageWrapper
+import co.orre.discordbridge.commands.controllers.UtilCommandsController
 import net.dv8tion.jda.core.events.message.MessageReceivedEvent
 import net.dv8tion.jda.core.hooks.ListenerAdapter
 
@@ -14,8 +15,8 @@ class Listener(val plugin: Plugin) : ListenerAdapter() {
     val controllerManager = BotControllerManager(plugin)
 
     init {
-        controllerManager.registerController(FunCommandsController(plugin))
-        controllerManager.registerController(UtilCommandsController(plugin))
+        controllerManager.registerController(FunCommandsController(plugin), discordExclusive = true, chatExclusive = true)
+        controllerManager.registerController(UtilCommandsController(plugin), discordExclusive = true, chatExclusive = true)
     }
 
     override fun onMessageReceived(event: MessageReceivedEvent) {
@@ -27,7 +28,7 @@ class Listener(val plugin: Plugin) : ListenerAdapter() {
             return
         }
 
-        controllerManager.dispatchMessage(event.message)
+        controllerManager.dispatchMessage(MessageWrapper(event.message))
     }
 
 }
diff --git a/src/main/kotlin/co/orre/discordbridge/minecraft/EventListener.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/EventListener.kt
index 27893f4..582ae7a 100644
--- a/src/main/kotlin/co/orre/discordbridge/minecraft/EventListener.kt
+++ b/src/main/kotlin/co/orre/discordbridge/minecraft/EventListener.kt
@@ -51,24 +51,22 @@ class EventListener(val plugin: Plugin): Listener {
 
         controllerManager.dispatchMessage(event)
 
-//        var formattedMessage = message.toDiscordChatMessage(username, displayName, worldname)
-//        formattedMessage = plugin.convertAtMentions(formattedMessage)
-//        formattedMessage = plugin.translateAliasToDiscord(formattedMessage, uuid)
-//        plugin.sendToDiscord(formattedMessage, Connection.getRelayChannel())
+        var formattedMessage = message.toDiscordChatMessage(username, displayName, worldname)
+        formattedMessage = plugin.convertAtMentions(formattedMessage)
+        formattedMessage = plugin.translateAliasToDiscord(formattedMessage, uuid)
+        plugin.sendToDiscord(formattedMessage, Connection.getRelayChannel())
 
         // If it was a @mention to the bot, treat it as a Cleverbot invocation
-//        if (message.startsWith("@" + Config.USERNAME.noSpace())) {
-//            val task = Runnable {
-//                if (Permissions.cleverbot.has(player)) {
-//                    val arg: String = message.removePrefix("@" + Config.USERNAME.noSpace()).trimStart()
-//                    val response = CommandLogic.askCleverbot(arg)
-//                    plugin.sendToMinecraft(response.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
-//                    plugin.sendToDiscord(response, Connection.getRelayChannel())
-//                } else
-//                    player.sendMessage("${org.bukkit.ChatColor.RED}You do not have permission to talk to the bot.")
-//            }
-//            plugin.server.scheduler.runTaskAsynchronously(plugin, task)
-//        }
+        val task = Runnable {
+            if (Permissions.cleverbot.has(player)) {
+                val arg: String = message.removePrefix("@" + Config.USERNAME.noSpace()).trimStart()
+                val response = CommandLogic.askCleverbot(arg)
+                plugin.sendToMinecraft(response.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
+                plugin.sendToDiscord(response, Connection.getRelayChannel())
+            } else
+                player.sendMessage("${org.bukkit.ChatColor.RED}You do not have permission to talk to the bot.")
+        }
+        plugin.server.scheduler.runTaskAsynchronously(plugin, task)
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
diff --git a/src/main/kotlin/co/orre/discordbridge/minecraft/commands/CommandListener.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/commands/CommandListener.kt
new file mode 100644
index 0000000..92e8f76
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/minecraft/commands/CommandListener.kt
@@ -0,0 +1,25 @@
+package co.orre.discordbridge.minecraft.commands
+
+import co.orre.discordbridge.Plugin
+import co.orre.discordbridge.commands.MinecraftCommandWrapper
+import co.orre.discordbridge.commands.controllers.BotControllerManager
+import co.orre.discordbridge.commands.controllers.FunCommandsController
+import co.orre.discordbridge.commands.controllers.UtilCommandsController
+import org.bukkit.command.Command
+import org.bukkit.command.CommandExecutor
+import org.bukkit.command.CommandSender
+
+class CommandListener(val plugin: Plugin) : CommandExecutor {
+
+    val controllerManager = BotControllerManager(plugin)
+
+    init {
+        controllerManager.registerController(FunCommandsController(plugin), discordExclusive = true, chatExclusive = true)
+        controllerManager.registerController(UtilCommandsController(plugin), discordExclusive = true, chatExclusive = true)
+    }
+
+    override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array<out String>): Boolean {
+        return controllerManager.dispatchMessage(MinecraftCommandWrapper(plugin, sender, command, args))
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/kotlin/co/orre/discordbridge/minecraft/controllers/BotControllerManager.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/controllers/BotControllerManager.kt
deleted file mode 100644
index 903f93d..0000000
--- a/src/main/kotlin/co/orre/discordbridge/minecraft/controllers/BotControllerManager.kt
+++ /dev/null
@@ -1,307 +0,0 @@
-package co.orre.discordbridge.minecraft.controllers
-
-// TODO: Add Apache license
-
-import co.orre.discordbridge.CommandLogic
-import co.orre.discordbridge.Config
-import co.orre.discordbridge.Plugin
-import co.orre.discordbridge.discord.Connection
-import co.orre.discordbridge.minecraft.Permissions
-import co.orre.discordbridge.minecraft.interfaces.BotCommand
-import co.orre.discordbridge.minecraft.interfaces.BotController
-import co.orre.discordbridge.utils.Script
-import co.orre.discordbridge.utils.UtilFunctions
-import co.orre.discordbridge.utils.UtilFunctions.noSpace
-import co.orre.discordbridge.utils.UtilFunctions.toMinecraftChatMessage
-import net.dv8tion.jda.core.entities.ChannelType
-import org.bukkit.event.player.AsyncPlayerChatEvent
-import java.lang.reflect.InvocationTargetException
-import java.lang.reflect.Method
-import java.util.*
-import java.util.logging.Level
-import co.orre.discordbridge.Config as cfg
-
-class BotControllerManager(val plugin: Plugin) {
-
-    private val commands: MutableMap<String, Command> = mutableMapOf()
-    private val controllers: MutableMap<Class<out BotController>, BotController> = mutableMapOf()
-
-    fun registerController(controller: BotController) {
-        controllers.put(controller.javaClass, controller)
-        val controllerClass = controller.javaClass
-
-        for (method in controllerClass.declaredMethods) {
-            val annotation = method.getAnnotation(BotCommand::class.java)
-            if (annotation != null) registerControllerMethod(controllerClass, method, annotation)
-        }
-    }
-
-    private fun registerControllerMethod(controllerClass: Class<*>, method: Method, annotation: BotCommand) {
-        val commandName = if (annotation.name.isEmpty()) method.name.toLowerCase() else annotation.name
-        val usage = annotation.usage
-        val methodParameters = method.parameters
-
-        if (methodParameters.isEmpty() || !methodParameters[0].type.isAssignableFrom(AsyncPlayerChatEvent::class.java)) return
-
-        method.isAccessible = true
-        val parameters = (1..methodParameters.size - 1).mapTo(ArrayList<Class<*>>()) { methodParameters[it].type }
-        val command = Command(commandName, usage, annotation.description, parameters, annotation.relayTriggerMessage,
-                annotation.ignoreExcessArguments, controllerClass, method)
-        commands.put(command.name, command)
-    }
-
-    fun dispatchMessage(event: AsyncPlayerChatEvent) {
-
-        // SCRIPTED RESPONSE - The bot replies with a pre-programmed response if it detects
-        // a corresponding trigger string
-        //if (scriptedResponse(event)) return
-
-        val args = event.message.trim().split("\\s+".toRegex(), 2).toTypedArray()
-
-        // <prefix>command
-        if (Config.COMMAND_PREFIX.isNotBlank() && args[0].startsWith(Config.COMMAND_PREFIX)) {
-            val commandName = args[0].substring(Config.COMMAND_PREFIX.length).toLowerCase()
-            val command = commands[commandName]
-
-            if (command == null) {
-                commandNotFound(event, commandName)
-                return
-            }
-
-            val inputArguments = if (args.size == 1) arrayOf<String>()
-            else args[1].split("\\s+".toRegex(), command.parameters.size).toTypedArray()
-
-            invokeCommand(command, controllers, event, inputArguments)
-            return
-        }
-
-        // @<mention> command
-        if (args[0] == Connection.JDA.selfUser.asMention && args.count() == 2) {
-            val args2 = args[1].split("\\s+".toRegex(), 2).toTypedArray()
-            val commandName = args2[0].toLowerCase()
-            var params = if (args2.size > 1) args2[1] else ""
-            var command = commands[commandName]
-
-            if (command == null) {
-                // Assume user wants to talk to Cleverbot
-                command = commands["talk"]
-                if (command == null) {
-                    commandNotFound(event, commandName)
-                    return
-                }
-                params = args[1]
-            }
-
-            val inputArguments = if (params == "") arrayOf<String>()
-            else params.split("\\s+".toRegex(), command.parameters.size).toTypedArray()
-
-            invokeCommand(command, controllers, event, inputArguments)
-            return
-        }
-
-        // Just relay the message i8f it is neither
-        relay(event, true)
-    }
-
-    //TODO
-//    private fun scriptedResponse(event: AsyncPlayerChatEvent): Boolean {
-//        val responses = plugin.script.data.getList("responses").checkItemsAre<Script>()
-//        if (responses == null) {
-//            plugin.logger.warning("ERROR: Unable to read script.yml!")
-//            return false
-//        }
-//        var response: Script? = null
-//        for (r in responses) {
-//            var arg = event.message
-//            val msg = r.triggerDis ?: continue
-//            val ignorecase = !(r.caseSensitive != null && r.caseSensitive)
-//            val startswith = r.startsWith != null && r.startsWith
-//            val requiresmention = r.requiresMention != null && r.requiresMention
-//
-//            if (requiresmention) {
-//                if (arg.startsWith(Connection.JDA.selfUser.asMention, true))
-//                    arg = arg.replaceFirst(Connection.JDA.selfUser.asMention, "").trimStart()
-//                else continue
-//            }
-//
-//            if (startswith)
-//                if (arg.startsWith(msg, ignorecase)) response = r
-//                else
-//                    if (arg.equals(msg, ignorecase)) response = r
-//        }
-//        if (response == null) return false
-//        plugin.logDebug("user ${event.player.name} has triggered a scripted response")
-//        val responseDis: String? = response.responseDis
-//        val responseMC: String? = response.responseMC
-//        if (responseDis != null) {
-//            val out = responseDis.replace("%u", event.player.name)
-//            plugin.sendToDiscord(out, Connection.getRelayChannel())
-//        }
-//        if (responseMC != null) {
-//            var alias = plugin.users.data.getString("discordaliases.${message.author.id}.mcusername")
-//            if (alias == null) alias = message.author.name.noSpace()
-//            val out = responseMC.replace("%u", alias)
-//            plugin.sendToMinecraft(out.toMinecraftChatMessage(cfg.BOT_MC_USERNAME))
-//        }
-//        return true
-//    }
-
-    private fun invokeCommand(command: Command, instances: Map<Class<out BotController>, BotController>,
-                              event: AsyncPlayerChatEvent, inputArguments: Array<String>) {
-        if (command.relayTriggerMessage) relay(event, false)
-
-        if (command.name == "help") {
-            try {
-                // If it was a @mention to the bot, treat it as a Cleverbot invocation
-                if (event.message.startsWith("@" + Config.USERNAME.noSpace())) {
-                    val task = Runnable {
-                        if (Permissions.cleverbot.has(event.player)) {
-                            val arg: String = event.message.removePrefix("@" + Config.USERNAME.noSpace()).trimStart()
-                            val response = CommandLogic.askCleverbot(event.player.name, arg)
-                            plugin.sendToMinecraft(response.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
-                            plugin.sendToDiscord(response, Connection.getRelayChannel())
-                        } else
-                            event.player.sendMessage("${org.bukkit.ChatColor.RED}You do not have permission to talk to the bot.")
-                    }
-                    plugin.server.scheduler.runTaskAsynchronously(plugin, task)
-                }
-                command.commandMethod.invoke(instances[command.controllerClass], event, commands, instances)
-                return
-            } catch (e: InvocationTargetException) {
-                commandException(event, e.cause)
-                return
-            } catch (e: IllegalAccessException) {
-                throw RuntimeException(e)
-            } catch (e: IllegalArgumentException) {
-                commandWrongParameterCount(event, command.name, command.usage, 2, command.parameters.size)
-                return
-            }
-        }
-
-        if (inputArguments.size < command.parameters.size) {
-            commandWrongParameterCount(event, command.name, command.usage, inputArguments.size, command.parameters.size)
-            return
-        }
-        if (inputArguments.size != command.parameters.size && !command.ignoreExcessArguments) {
-            commandWrongParameterCount(event, command.name, command.usage, inputArguments.size, command.parameters.size)
-            return
-        }
-
-        val arguments = arrayOfNulls<Any>(command.parameters.size + 1)
-        arguments[0] = event
-
-        var paramRange = command.parameters.indices
-
-        if (command.ignoreExcessArguments && inputArguments.size > command.parameters.size)
-            paramRange = IntRange(0, command.parameters.size - 1)
-
-        for (i in paramRange) {
-            val parameterClass = command.parameters[i]
-
-            try {
-                arguments[i + 1] = parseArgument(parameterClass, inputArguments[i])
-            } catch (ignored: IllegalArgumentException) {
-                commandWrongParameterType(event, command.name, command.usage, i,
-                        inputArguments[i].javaClass, parameterClass)
-                return
-            }
-        }
-
-        try {
-            command.commandMethod.invoke(instances[command.controllerClass], *arguments)
-        } catch (e: InvocationTargetException) {
-            commandException(event, e.cause)
-        } catch (e: IllegalAccessException) {
-            throw RuntimeException(e)
-        } catch (e: IllegalArgumentException) {
-            commandWrongParameterCount(event, command.name, command.usage, inputArguments.size, command.parameters.size)
-            return
-        }
-    }
-
-    private fun relay(event: AsyncPlayerChatEvent, logIgnore: Boolean) {
-        plugin.logDebug("Broadcasting message from Minecraft to Discord as player ${event.player.name}")
-        val response = plugin.translateAliasToDiscord(event.message, event.player.uniqueId.toString())
-        plugin.sendToMinecraft(event.message.toMinecraftChatMessage(response))
-    }
-
-    private fun parseArgument(parameterClass: Class<*>, value: String): Any {
-        try {
-            when (parameterClass) {
-                String::class.java -> return value
-                Int::class.javaPrimitiveType, Int::class.java -> return Integer.valueOf(value)
-                Long::class.javaPrimitiveType, Long::class.java -> return java.lang.Long.valueOf(value)
-                Boolean::class.javaPrimitiveType, Boolean::class.java -> return parseBooleanArgument(value)
-                Float::class.javaPrimitiveType, Float::class.java -> return java.lang.Float.valueOf(value)
-                Double::class.javaPrimitiveType, Double::class.java -> return java.lang.Double.valueOf(value)
-                else -> throw IllegalArgumentException()
-            }
-        } catch (ignored: NumberFormatException) {
-            throw IllegalArgumentException()
-        }
-    }
-
-    private fun parseBooleanArgument(value: String): Boolean {
-        when (value.toLowerCase()) {
-            "yes", "true" -> return true
-            "no", "false" -> return false
-            else -> {
-                val integerValue = Integer.valueOf(value)!!
-                when (integerValue) {
-                    1 -> return true
-                    0 -> return false
-                    else -> throw IllegalArgumentException()
-                }
-            }
-        }
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    private inline fun <reified T : Any> List<*>.checkItemsAre() = if (all { it is T }) this as List<T> else null
-
-    private fun commandNotFound(event: AsyncPlayerChatEvent, commandName: String) {
-        val response = "${event.player.name} | I don't seem to have a command called '$commandName'. " +
-                "See '${Connection.JDA.selfUser.asMention} help' ${orPrefixHelp()}for the commands I do have."
-        plugin.sendToMinecraft(response.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
-    }
-
-    private fun commandWrongParameterCount(event: AsyncPlayerChatEvent, name: String, usage: String, given: Int, required: Int) {
-        val response = "${event.player.name} | I didn't seem to get the correct number of arguments for that command. " +
-                "I got $given from you, but I need $required. " +
-                "(Usage: $name $usage)"
-        plugin.sendToMinecraft(response.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
-    }
-
-    private fun commandWrongParameterType(event: AsyncPlayerChatEvent, name: String, usage: String, index: Int,
-                                          actualType: Class<*>, expectedType: Class<*>) {
-        val response = "${event.player.name} | One of the arguments for that command doesn't seem to be the right type. " +
-                "Argument $index seems like ${actualType.simpleName}, but I need ${expectedType.simpleName}. " +
-                "(Usage: $name $usage)"
-        plugin.sendToMinecraft(response.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
-    }
-
-    @Suppress("unused")
-    private fun commandRestricted(event: AsyncPlayerChatEvent) {
-        val response = "${event.player.name} | Sorry, that command is not permitted."
-        plugin.sendToMinecraft(response.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
-    }
-
-    private fun commandException(event: AsyncPlayerChatEvent, throwable: Throwable?) {
-        plugin.logger.log(Level.SEVERE, "Command with content ${event.message} threw an exception.", throwable)
-        val response = "${event.player.name} | Ouch! That command threw an exception. Sorry about that..."
-        plugin.sendToMinecraft(response.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
-    }
-
-    private fun orPrefixHelp(): String = if (cfg.COMMAND_PREFIX != "") "or ${cfg.COMMAND_PREFIX}help " else ""
-
-    data class Command(
-            val name: String,
-            val usage: String,
-            val description: String,
-            val parameters: List<Class<*>>,
-            val relayTriggerMessage: Boolean,
-            val ignoreExcessArguments: Boolean,
-            val controllerClass: Class<*>,
-            val commandMethod: Method
-    )
-}
diff --git a/src/main/kotlin/co/orre/discordbridge/minecraft/controllers/FunCommandsController.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/controllers/FunCommandsController.kt
deleted file mode 100644
index fc3e7a3..0000000
--- a/src/main/kotlin/co/orre/discordbridge/minecraft/controllers/FunCommandsController.kt
+++ /dev/null
@@ -1,81 +0,0 @@
-package co.orre.discordbridge.minecraft.controllers
-
-import co.orre.discordbridge.CommandLogic
-import co.orre.discordbridge.Config
-import co.orre.discordbridge.Plugin
-import co.orre.discordbridge.discord.Connection
-import co.orre.discordbridge.minecraft.Permissions
-import co.orre.discordbridge.minecraft.interfaces.BotCommand
-import co.orre.discordbridge.minecraft.interfaces.BotController
-import co.orre.discordbridge.utils.UtilFunctions.toMinecraftChatMessage
-import net.dv8tion.jda.core.entities.Message
-import org.bukkit.event.player.AsyncPlayerChatEvent
-
-class FunCommandsController(val plugin: Plugin) : BotController {
-
-    override fun getDescription(): String = ":balloon:  **FUN** - Every bot has to have them!"
-
-    // 8BALL - consult the Magic 8-Ball to answer your yes or no questions
-    @BotCommand(name = "8ball", usage = "<question>", description = "Consult the Magic 8 Ball")
-    private fun eightBall(event: AsyncPlayerChatEvent){
-        if (!Permissions.eightball.has(event.player))
-            return
-        plugin.logDebug("player ${event.player.name} consults the Magic 8-Ball")
-        dispatchResponse(event, CommandLogic.eightBall(plugin, event.player.name))
-    }
-
-    // CHOOSE - chooses between some number of options
-    @BotCommand(name = "choose", usage = "<option>, <option>, ... (delimiters include ',', 'or', '|')",
-            description = "Have the bot choose between given options")
-    private fun choose(event: AsyncPlayerChatEvent, query: String){
-        plugin.logDebug("user ${event.player.name} needs a choice made")
-        dispatchResponse(event, CommandLogic.choose(event.player.name, query))
-    }
-
-    // F - press F to pay respects!
-    @BotCommand(usage="", description = "Press F to pay respects")
-    private fun f(event: AsyncPlayerChatEvent) {
-        plugin.logDebug("user ${event.player.name} pays respects")
-        dispatchResponse(event, CommandLogic.f(plugin, event.player.name))
-    }
-
-    // INSULT - the bot insults something
-    @BotCommand(usage="<thing to insult>", description = "Make the bot insult something for you")
-    private fun insult(event: AsyncPlayerChatEvent, thingToInsult: String) {
-        plugin.logDebug("user ${event.player.name} requests an insult against '$thingToInsult'")
-        dispatchResponse(event, CommandLogic.insult(plugin, event.player.name, thingToInsult))
-    }
-
-    // RATE - the bot rates something
-    @BotCommand(usage="<thing to be rated>", description = "Have the bot rate something for you")
-    private fun rate(event: AsyncPlayerChatEvent, thingToRate: String) {
-        plugin.logDebug("user ${event.player.name} requests a rating")
-        dispatchResponse(event, CommandLogic.rate(plugin, event.player.name, thingToRate))
-    }
-
-    // ROLL - roll a die for a random number
-    @BotCommand(name = "roll", usage = "<sides>", description = "Roll a die for a random number")
-    private fun roll(event: AsyncPlayerChatEvent, sides: Int){
-        plugin.logDebug("user ${event.player.name} needs a choice made")
-        dispatchResponse(event, CommandLogic.roll(event.player.name, sides))
-    }
-
-    // TALK - directly speak to Cleverbot (useful for not accidentally invoking other commands)
-    @BotCommand(usage="<say something>", description = "Say something to Cleverbot")
-    private fun talk(event: AsyncPlayerChatEvent, query: String) {
-        plugin.logDebug("user ${event.player.name} invokes Cleverbot")
-        dispatchResponse(event, CommandLogic.askCleverbot(event.player.name, query))
-    }
-
-    private fun dispatchResponse(event: AsyncPlayerChatEvent, response: String) {
-        plugin.sendToMinecraft(response.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
-
-        var response1 = plugin.convertAtMentions(response)
-
-        plugin.sendToDiscord(response1, Connection.getRelayChannel())
-    }
-
-    private fun Message.isFromRelayChannel(): Boolean = guild.id == Config.SERVER_ID
-            && this.isFromType(net.dv8tion.jda.core.entities.ChannelType.TEXT)
-            && this.textChannel.name.equals(Config.CHANNEL, true)
-}
diff --git a/src/main/kotlin/co/orre/discordbridge/utils/UserAlias.kt b/src/main/kotlin/co/orre/discordbridge/utils/UserAlias.kt
index d84245c..698aa2e 100644
--- a/src/main/kotlin/co/orre/discordbridge/utils/UserAlias.kt
+++ b/src/main/kotlin/co/orre/discordbridge/utils/UserAlias.kt
@@ -1,3 +1,19 @@
 package co.orre.discordbridge.utils
 
-data class UserAlias(var mcUsername: String, var mcUuid: String, var discordUsername: String, var discordId: String)
\ No newline at end of file
+import org.bukkit.configuration.serialization.ConfigurationSerializable
+import org.bukkit.configuration.serialization.SerializableAs
+
+//data class UserAlias(var mcUsername: String, var mcUuid: String, var discordUsername: String, var discordId: String)
+
+//TODO: make null safe
+@SerializableAs("UserAlias")
+data class UserAlias(val mcUuid: String, val discordId: String): ConfigurationSerializable {
+    @Suppress("unused")
+    constructor(map: MutableMap<String, Any>):
+            this(map["mcUuid"] as String, map["discordId"] as String)
+
+    override fun serialize(): MutableMap<String, Any> {
+        return mutableMapOf("mcUuid" to mcUuid, "discordId" to discordId)
+    }
+
+}
\ No newline at end of file

From f294e5166e52d022bb4b0c08512fea4ff4574051 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Fri, 7 Apr 2017 00:43:14 -0500
Subject: [PATCH 19/24] It'll compile, but is it broken? Probably.

---
 .../co/orre/discordbridge/CommandLogic.kt     | 121 -------
 .../kotlin/co/orre/discordbridge/Plugin.kt    |  93 +++---
 .../commands/Annotations/BotCommand.kt        |   8 -
 .../commands/AsyncPlayerChatEventWrapper.kt   |   2 -
 .../discordbridge/commands/IBotController.kt  |   2 -
 .../discordbridge/commands/IEventWrapper.kt   |   1 -
 .../discordbridge/commands/MessageWrapper.kt  |   4 -
 .../commands/MinecraftCommandWrapper.kt       |   7 +-
 .../discordbridge/commands/WrapperType.kt     |   7 -
 .../annotations}/BotCommand.kt                |   4 +-
 .../ChatExclusiveCommand.kt                   |   2 +-
 .../DiscordExclusiveCommand.kt                |   2 +-
 .../MinecraftExclusiveCommand.kt              |   2 +-
 .../commands/annotations/PrivateResponse.kt   |   5 +
 .../commands/annotations/TaggedResponse.kt    |   5 +
 .../controllers/BotControllerManager.kt       | 259 ++++++++++-----
 .../controllers/FunCommandsController.kt      | 132 ++++++--
 .../controllers/UtilCommandsController.kt     |  83 +++--
 .../co/orre/discordbridge/discord/Listener.kt |   4 +-
 .../controllers/BotControllerManager.kt       | 297 ------------------
 .../controllers/FunCommandsController.kt      |  78 -----
 .../controllers/UtilCommandsController.kt     |  61 ----
 .../discord/interfaces/BotController.kt       |   7 -
 .../discordbridge/minecraft/EventListener.kt  |  57 +---
 .../minecraft/commands/CommandListener.kt     |   6 +-
 .../minecraft/commands/EightBall.kt           |  27 --
 .../discordbridge/minecraft/commands/F.kt     |  27 --
 .../minecraft/commands/Insult.kt              |  26 --
 .../discordbridge/minecraft/commands/Rate.kt  |  26 --
 .../minecraft/interfaces/BotCommand.kt        |   8 -
 .../minecraft/interfaces/BotController.kt     |   7 -
 .../co/orre/discordbridge/utils/UserAlias.kt  |   9 +-
 .../orre/discordbridge/utils/UtilFunctions.kt |  19 +-
 src/main/resources/insult.yml                 |   6 -
 34 files changed, 434 insertions(+), 970 deletions(-)
 delete mode 100644 src/main/kotlin/co/orre/discordbridge/CommandLogic.kt
 delete mode 100644 src/main/kotlin/co/orre/discordbridge/commands/Annotations/BotCommand.kt
 delete mode 100644 src/main/kotlin/co/orre/discordbridge/commands/WrapperType.kt
 rename src/main/kotlin/co/orre/discordbridge/{discord/interfaces => commands/annotations}/BotCommand.kt (79%)
 rename src/main/kotlin/co/orre/discordbridge/commands/{Annotations => annotations}/ChatExclusiveCommand.kt (69%)
 rename src/main/kotlin/co/orre/discordbridge/commands/{Annotations => annotations}/DiscordExclusiveCommand.kt (69%)
 rename src/main/kotlin/co/orre/discordbridge/commands/{Annotations => annotations}/MinecraftExclusiveCommand.kt (70%)
 create mode 100644 src/main/kotlin/co/orre/discordbridge/commands/annotations/PrivateResponse.kt
 create mode 100644 src/main/kotlin/co/orre/discordbridge/commands/annotations/TaggedResponse.kt
 delete mode 100644 src/main/kotlin/co/orre/discordbridge/discord/controllers/BotControllerManager.kt
 delete mode 100644 src/main/kotlin/co/orre/discordbridge/discord/controllers/FunCommandsController.kt
 delete mode 100644 src/main/kotlin/co/orre/discordbridge/discord/controllers/UtilCommandsController.kt
 delete mode 100644 src/main/kotlin/co/orre/discordbridge/discord/interfaces/BotController.kt
 delete mode 100644 src/main/kotlin/co/orre/discordbridge/minecraft/commands/EightBall.kt
 delete mode 100644 src/main/kotlin/co/orre/discordbridge/minecraft/commands/F.kt
 delete mode 100644 src/main/kotlin/co/orre/discordbridge/minecraft/commands/Insult.kt
 delete mode 100644 src/main/kotlin/co/orre/discordbridge/minecraft/commands/Rate.kt
 delete mode 100644 src/main/kotlin/co/orre/discordbridge/minecraft/interfaces/BotCommand.kt
 delete mode 100644 src/main/kotlin/co/orre/discordbridge/minecraft/interfaces/BotController.kt

diff --git a/src/main/kotlin/co/orre/discordbridge/CommandLogic.kt b/src/main/kotlin/co/orre/discordbridge/CommandLogic.kt
deleted file mode 100644
index f161bcb..0000000
--- a/src/main/kotlin/co/orre/discordbridge/CommandLogic.kt
+++ /dev/null
@@ -1,121 +0,0 @@
-package co.orre.discordbridge
-
-import com.michaelwflaherty.cleverbotapi.CleverBotQuery
-import co.orre.discordbridge.utils.Rating
-import co.orre.discordbridge.utils.Respect
-import java.io.IOException
-import java.util.*
-
-object CommandLogic {
-
-    fun askCleverbot(invokerName: String, query: String): String {
-        if (Config.CLEVERBOT_KEY.isEmpty())
-            return "You do not have an API key. Go to https://www.cleverbot.com/JDA/ for more information."
-        val bot: CleverBotQuery = CleverBotQuery(Config.CLEVERBOT_KEY, query)
-        var response: String
-        try {
-            bot.sendRequest()
-            response = bot.response
-        } catch (e: IOException) {
-            response = e.message!!
-        }
-
-        return "$invokerName | $response"
-    }
-
-    fun choose(invokerName: String, query: String): String {
-        val choices = query.split(", or ", " or ", ",", "|")
-        val rand = Random().nextInt(choices.count())
-        return "$invokerName | I pick '${choices[rand]}'"
-    }
-
-    fun eightBall(p: Plugin, invokerName: String): String {
-        val responses = p.eightball.data.getStringList("responses")
-        val rand = Random().nextInt(responses.count())
-        return "$invokerName | ${responses[rand]}"
-    }
-
-    fun f(p: Plugin, invokerName: String): String {
-        var totalRespects = p.f.data.getInt("total-respects", 0)
-        val responses = p.f.data.getList("responses").checkItemsAre<Respect>()
-                ?: return "ERROR: Responses for this command could not be read from the config."
-        val totalWeight = responses.sumBy { it.weight }
-        var rand = Random().nextInt(totalWeight) + 1
-        var found: Respect? = null
-        for(r in responses) {
-            rand -= r.weight
-            if (rand <= 0) {
-                found = r
-                break
-            }
-        }
-
-        totalRespects += found!!.count
-        val msg = found.message.replace("%u", invokerName).replace("%t", totalRespects.toString())
-                .replace("%c", found.count.toString())
-
-        p.f.data.set("total-respects", totalRespects)
-        p.f.saveConfig()
-
-        return msg
-    }
-
-    fun insult(p: Plugin, invokerName: String, thingToBeInsulted: String): String {
-        val responses = p.insult.data.getStringList("responses")
-        val rand = Random().nextInt(responses.count())
-        return p.insult.data.getString("template", "").replace("%u", invokerName)
-                .replace("%i", responses[rand]).replace("%t", thingToBeInsulted)
-    }
-
-    fun rate(p: Plugin, sender_name: String, arg: String): String {
-        val responses = p.rate.data.getList("responses").checkItemsAre<Rating>()
-                ?: return "ERROR: Responses for this command could not be read from the config."
-
-        var rateOutOf = p.rate.data.getInt("rate-out-of", 10)
-        if (rateOutOf > 1000000) rateOutOf = 1000000
-        if (rateOutOf < 0) rateOutOf = 0
-
-        var granularity = p.rate.data.getInt("granularity", 1)
-        if (granularity > 2) granularity = 2
-        if (granularity < 0) granularity = 0
-
-        val conversionFactor = Math.pow(10.0, granularity.toDouble())
-        val rating = Random().nextInt((rateOutOf * conversionFactor.toInt()) + 1) / conversionFactor
-
-
-        val found: Rating = responses.firstOrNull { rating <= it.high && rating >= it.low }
-                ?: return "ERROR: No response set for rating $rating"
-
-        var thingToBeRated = arg
-        if (p.rate.data.getBoolean("translate-first-and-second-person", true)) {
-            val argArray = arg.split(" ").toMutableList()
-            val iterate = argArray.listIterator()
-            while (iterate.hasNext()) {
-                val oldValue = iterate.next()
-                if (oldValue == "me") iterate.set("you")
-                if (oldValue == "myself") iterate.set("yourself")
-                if (oldValue == "my") iterate.set("your")
-                if (oldValue == "your") iterate.set("my")
-                if (oldValue == "yourself") iterate.set("myself")
-            }
-            thingToBeRated = argArray.joinToString(" ")
-        }
-
-        return found.message.replace("%u", sender_name).replace("%m", thingToBeRated).replace("%r", "$rating/$rateOutOf")
-    }
-
-    fun roll(invokerName: String, sides: Int): String {
-        if (sides == 1)
-            return "$invokerName | You rolled... 1. Was it any surprise?"
-        if (sides > 100 || sides < 1)
-            return "$invokerName | I can't roll a die with $sides sides. It must have between 1 and 100 sides."
-        val rand = Random().nextInt(sides)
-        return "$invokerName | You rolled... $rand"
-    }
-
-    // UTIL
-
-    @Suppress("UNCHECKED_CAST")
-    inline fun <reified T : Any> List<*>.checkItemsAre() = if (all { it is T }) this as List<T> else null
-
-}
diff --git a/src/main/kotlin/co/orre/discordbridge/Plugin.kt b/src/main/kotlin/co/orre/discordbridge/Plugin.kt
index 6cb95d3..7ab6327 100644
--- a/src/main/kotlin/co/orre/discordbridge/Plugin.kt
+++ b/src/main/kotlin/co/orre/discordbridge/Plugin.kt
@@ -1,11 +1,14 @@
 package co.orre.discordbridge
 
-import co.orre.discordbridge.utils.UserAlias
-import co.orre.discordbridge.utils.UtilFunctions.noSpace
-import co.orre.discordbridge.utils.*
 import co.orre.discordbridge.discord.Connection
 import co.orre.discordbridge.minecraft.EventListener
-import co.orre.discordbridge.minecraft.commands.*
+import co.orre.discordbridge.minecraft.commands.CommandListener
+import co.orre.discordbridge.minecraft.commands.Discord
+import co.orre.discordbridge.utils.Rating
+import co.orre.discordbridge.utils.Respect
+import co.orre.discordbridge.utils.Script
+import co.orre.discordbridge.utils.UserAlias
+import co.orre.discordbridge.utils.UtilFunctions.noSpace
 import net.dv8tion.jda.core.OnlineStatus
 import net.dv8tion.jda.core.entities.Member
 import net.dv8tion.jda.core.entities.MessageChannel
@@ -45,11 +48,15 @@ class Plugin : JavaPlugin() {
         server.pluginManager.registerEvents(EventListener(this), this)
 
         // Register commands
-        getCommand("discord").executor = Discord(this)
-        getCommand("f").executor = F(this)
-        getCommand("rate").executor = Rate(this)
-        getCommand("8ball").executor = EightBall(this)
-        getCommand("insult").executor = Insult(this)
+        //TODO: automate this?
+        getCommand("discord").executor = Discord(this) //TODO: move this to Reflection
+        getCommand("f").executor = CommandListener(this)
+        getCommand("rate").executor = CommandListener(this)
+        getCommand("8ball").executor = CommandListener(this)
+        getCommand("insult").executor = CommandListener(this)
+        getCommand("choose").executor = CommandListener(this)
+        getCommand("talk").executor = CommandListener(this)
+        getCommand("roll").executor = CommandListener(this)
 
         ConfigurationSerialization.registerClass(Respect::class.java, "Respect")
         ConfigurationSerialization.registerClass(Rating::class.java, "Rating")
@@ -136,9 +143,10 @@ class Plugin : JavaPlugin() {
         val users = Connection.listUsers()
         val found: Member = users.find { it.user.id == discordId } ?: return false
 
-        val ua: UserAlias = UserAlias(player.name, player.uniqueId.toString(), found.effectiveName, found.user.id)
+        //val ua: UserAlias = UserAlias(player.name, player.uniqueId.toString(), found.effectiveName, found.user.id)
+        val ua: UserAlias = UserAlias(player.uniqueId, found.user.id)
         requests.add(ua)
-        val msg = "Minecraft user '${ua.mcUsername}' has requested to become associated with your Discord" +
+        val msg = "Minecraft user '${server.getOfflinePlayer(ua.mcUuid)}' has requested to become associated with your Discord" +
                 " account. If this is you, respond '${Connection.JDA.selfUser.asMention} confirm'. If this is not" +
                 " you, respond ${Connection.JDA.selfUser.asMention} deny'."
         Connection.send(msg, Connection.JDA.getUserById(ua.discordId).privateChannel)
@@ -193,17 +201,6 @@ class Plugin : JavaPlugin() {
         return response
     }
 
-    // Add an alias to the Users data
-//    fun saveAlias(ua: UserAlias) {
-//        users.data.set("mcaliases.${ua.mcUuid}.mcusername", ua.mcUsername)
-//        users.data.set("mcaliases.${ua.mcUuid}.discordusername", ua.discordUsername)
-//        users.data.set("mcaliases.${ua.mcUuid}.discordid", ua.discordId)
-//        users.data.set("discordaliases.${ua.discordId}.mcuuid", ua.mcUuid)
-//        users.data.set("discordaliases.${ua.discordId}.mcusername", ua.mcUsername)
-//        users.data.set("discordaliases.${ua.discordId}.discordusername", ua.discordUsername)
-//        users.saveConfig()
-//    }
-
     /*======================================
       Message Formatting Functions
     ===================================== */
@@ -233,30 +230,40 @@ class Plugin : JavaPlugin() {
         return newMessage
     }
 
-    //TODO: De-convert @mentions
+    fun deconvertAtMentions(message: String): String {
+        var modifiedMessage = message
+        for (match in Regex("""<@!(\d)+>""").findAll(message)) {
+            val discordUser = Connection.listUsers().firstOrNull{it.user.id == match.groupValues[1] }
+            val nameDis = if (discordUser != null) discordUser.effectiveName else Connection.JDA.getUserById(match.groupValues[1]).name
+            modifiedMessage = modifiedMessage.replace(match.value, nameDis)
+        }
+        return message
+    }
 
-    // Scans the string for occurrences of the Minecraft name matching the given UUID and attempts to translate it
-    // to a registered Discord name, if it exists
-    fun translateAliasToDiscord(message: String, uuid: String?): String {
-        var newMessage = message
-        //val alias = users.data.getString("mcaliases.$uuid.discordusername")
-        val userAlias = UserAliasConfig.aliases.firstOrNull { it.mcUuid == uuid }
-        if (userAlias != null) {
-            val user = Connection.listUsers().firstOrNull { it.user.id == userAlias.discordId }
-            if (user != null) return newMessage.replace(users.data.getString("mcaliases.$uuid.mcusername"), alias)
-            val name = Connection.JDA.getUserById(userAlias.discordId).name
+    // Scans the string for occurrences of Minecraft names and attempts to translate them
+    // to registered Discord names, if they exist
+    fun translateAliasesToDiscord(message: String): String {
+        var modifiedMessage = message
+        for ((mcUuid, discordId) in UserAliasConfig.aliases) {
+            val nameMC = server.getOfflinePlayer(mcUuid).name
+            val discordUser = Connection.listUsers().firstOrNull{it.user.id == discordId }
+            val nameDis = if (discordUser != null) discordUser.effectiveName else Connection.JDA.getUserById(discordId).name
+            modifiedMessage = modifiedMessage.replace(nameMC, nameDis)
         }
-            newMessage = newMessage.replace(users.data.getString("mcaliases.$uuid.mcusername"), alias)
-        return newMessage
+        return modifiedMessage
     }
 
-    // Scans the string for occurrences of the Minecraft name matching the given UUID and attempts to translate it
-    // to a registered Discord name, if it exists
-    fun translateAliasToMinecraft(message: String, discordId: String?): String {
-        var newMessage = message
-        val alias = users.data.getString("discordaliases.$discordId.mcusername")
-        if (alias != null)
-            newMessage = newMessage.replace(users.data.getString("discordaliases.$discordId.mcusername"), alias)
-        return newMessage
+    // Scans the string for occurrences of Discord names and attempts to translate them
+    // to registered Minecraft names, if they exist
+    fun translateAliasesToMinecraft(message: String): String {
+        var modifiedMessage = message
+        for ((mcUuid, discordId) in UserAliasConfig.aliases) {
+            val nameMC = server.getOfflinePlayer(mcUuid).name
+            val nameDis = Connection.JDA.getUserById(discordId).name
+            modifiedMessage = modifiedMessage.replace(nameDis, nameMC)
+            val discordUser = Connection.listUsers().firstOrNull{it.user.id == discordId}
+            if (discordUser != null) modifiedMessage = modifiedMessage.replace(discordUser.effectiveName, nameMC)
+        }
+        return modifiedMessage
     }
 }
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/Annotations/BotCommand.kt b/src/main/kotlin/co/orre/discordbridge/commands/Annotations/BotCommand.kt
deleted file mode 100644
index bafcbb1..0000000
--- a/src/main/kotlin/co/orre/discordbridge/commands/Annotations/BotCommand.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package co.orre.discordbridge.commands.Annotations
-
-// TODO: Apache License
-
-@Target(AnnotationTarget.FUNCTION)
-@Retention(AnnotationRetention.RUNTIME)
-annotation class BotCommand(val usage: String, val description: String, val name: String = "",
-                            val relayTriggerMessage: Boolean = true, val ignoreExcessArguments: Boolean = true)
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/AsyncPlayerChatEventWrapper.kt b/src/main/kotlin/co/orre/discordbridge/commands/AsyncPlayerChatEventWrapper.kt
index c5e4768..5f58014 100644
--- a/src/main/kotlin/co/orre/discordbridge/commands/AsyncPlayerChatEventWrapper.kt
+++ b/src/main/kotlin/co/orre/discordbridge/commands/AsyncPlayerChatEventWrapper.kt
@@ -17,8 +17,6 @@ class AsyncPlayerChatEventWrapper(val event: AsyncPlayerChatEvent) : IEventWrapp
         get() = Connection.getRelayChannel()!!
     override val senderId: String
         get() = event.player.uniqueId.toString()
-    override val type: WrapperType
-        get() = WrapperType.ASYNC_PLAYER_CHAT_EVENT
     override val isFromRelayChannel: Boolean
         get() = true
 
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/IBotController.kt b/src/main/kotlin/co/orre/discordbridge/commands/IBotController.kt
index 3da9976..19bfad4 100644
--- a/src/main/kotlin/co/orre/discordbridge/commands/IBotController.kt
+++ b/src/main/kotlin/co/orre/discordbridge/commands/IBotController.kt
@@ -1,7 +1,5 @@
 package co.orre.discordbridge.commands
 
-// Todo: Apache License
-
 interface IBotController {
     fun getDescription(): String
 }
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/IEventWrapper.kt b/src/main/kotlin/co/orre/discordbridge/commands/IEventWrapper.kt
index a9806c4..dc89275 100644
--- a/src/main/kotlin/co/orre/discordbridge/commands/IEventWrapper.kt
+++ b/src/main/kotlin/co/orre/discordbridge/commands/IEventWrapper.kt
@@ -9,6 +9,5 @@ interface IEventWrapper {
     val senderAsMention : String
     val channel : MessageChannel
     val senderId : String
-    val type: WrapperType
     val isFromRelayChannel: Boolean
 }
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/MessageWrapper.kt b/src/main/kotlin/co/orre/discordbridge/commands/MessageWrapper.kt
index b9ca6d5..3e6891d 100644
--- a/src/main/kotlin/co/orre/discordbridge/commands/MessageWrapper.kt
+++ b/src/main/kotlin/co/orre/discordbridge/commands/MessageWrapper.kt
@@ -1,16 +1,12 @@
 package co.orre.discordbridge.commands
 
 import co.orre.discordbridge.Config
-import co.orre.discordbridge.Plugin
 import net.dv8tion.jda.core.entities.ChannelType
 import net.dv8tion.jda.core.entities.Message
 import net.dv8tion.jda.core.entities.MessageChannel
 
 class MessageWrapper(val originalMessage: Message) : IEventWrapper {
 
-    override val type: WrapperType
-        get() = WrapperType.MESSAGE
-
     override val senderAsMention: String
         get() = originalMessage.author.asMention
 
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/MinecraftCommandWrapper.kt b/src/main/kotlin/co/orre/discordbridge/commands/MinecraftCommandWrapper.kt
index 38d0e03..8035b72 100644
--- a/src/main/kotlin/co/orre/discordbridge/commands/MinecraftCommandWrapper.kt
+++ b/src/main/kotlin/co/orre/discordbridge/commands/MinecraftCommandWrapper.kt
@@ -5,10 +5,9 @@ import net.dv8tion.jda.core.entities.MessageChannel
 import org.bukkit.command.Command
 import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player
-import org.bukkit.plugin.Plugin
 
-class MinecraftCommandWrapper(val plugin: Plugin, val sender: CommandSender, val cmd: Command,
-                              val args: Array<out String>): IEventWrapper {
+class MinecraftCommandWrapper(val sender: CommandSender, val command: Command,
+                              val args: Array<out String>) : IEventWrapper {
     override val senderName: String
         get() = if (sender is Player) sender.name else "Console"
     override val message: String
@@ -21,8 +20,6 @@ class MinecraftCommandWrapper(val plugin: Plugin, val sender: CommandSender, val
         get() = Connection.getRelayChannel()!!
     override val senderId: String
         get() = (sender as? Player)?.uniqueId?.toString() ?: ""
-    override val type: WrapperType
-        get() = WrapperType.MINECRAFT_COMMAND
     override val isFromRelayChannel: Boolean
         get() = true
 
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/WrapperType.kt b/src/main/kotlin/co/orre/discordbridge/commands/WrapperType.kt
deleted file mode 100644
index 75be0d1..0000000
--- a/src/main/kotlin/co/orre/discordbridge/commands/WrapperType.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package co.orre.discordbridge.commands
-
-enum class WrapperType {
-    ASYNC_PLAYER_CHAT_EVENT,
-    MESSAGE,
-    MINECRAFT_COMMAND
-}
\ No newline at end of file
diff --git a/src/main/kotlin/co/orre/discordbridge/discord/interfaces/BotCommand.kt b/src/main/kotlin/co/orre/discordbridge/commands/annotations/BotCommand.kt
similarity index 79%
rename from src/main/kotlin/co/orre/discordbridge/discord/interfaces/BotCommand.kt
rename to src/main/kotlin/co/orre/discordbridge/commands/annotations/BotCommand.kt
index cb69367..5a19ae0 100644
--- a/src/main/kotlin/co/orre/discordbridge/discord/interfaces/BotCommand.kt
+++ b/src/main/kotlin/co/orre/discordbridge/commands/annotations/BotCommand.kt
@@ -1,6 +1,4 @@
-package co.orre.discordbridge.discord.interfaces
-
-// TODO: Apache License
+package co.orre.discordbridge.commands.annotations
 
 @Target(AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.RUNTIME)
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/Annotations/ChatExclusiveCommand.kt b/src/main/kotlin/co/orre/discordbridge/commands/annotations/ChatExclusiveCommand.kt
similarity index 69%
rename from src/main/kotlin/co/orre/discordbridge/commands/Annotations/ChatExclusiveCommand.kt
rename to src/main/kotlin/co/orre/discordbridge/commands/annotations/ChatExclusiveCommand.kt
index 22766e1..9d621db 100644
--- a/src/main/kotlin/co/orre/discordbridge/commands/Annotations/ChatExclusiveCommand.kt
+++ b/src/main/kotlin/co/orre/discordbridge/commands/annotations/ChatExclusiveCommand.kt
@@ -1,4 +1,4 @@
-package co.orre.discordbridge.commands.Annotations
+package co.orre.discordbridge.commands.annotations
 
 @Target(AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.RUNTIME)
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/Annotations/DiscordExclusiveCommand.kt b/src/main/kotlin/co/orre/discordbridge/commands/annotations/DiscordExclusiveCommand.kt
similarity index 69%
rename from src/main/kotlin/co/orre/discordbridge/commands/Annotations/DiscordExclusiveCommand.kt
rename to src/main/kotlin/co/orre/discordbridge/commands/annotations/DiscordExclusiveCommand.kt
index 88a5e13..af52140 100644
--- a/src/main/kotlin/co/orre/discordbridge/commands/Annotations/DiscordExclusiveCommand.kt
+++ b/src/main/kotlin/co/orre/discordbridge/commands/annotations/DiscordExclusiveCommand.kt
@@ -1,4 +1,4 @@
-package co.orre.discordbridge.commands.Annotations
+package co.orre.discordbridge.commands.annotations
 
 @Target(AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.RUNTIME)
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/Annotations/MinecraftExclusiveCommand.kt b/src/main/kotlin/co/orre/discordbridge/commands/annotations/MinecraftExclusiveCommand.kt
similarity index 70%
rename from src/main/kotlin/co/orre/discordbridge/commands/Annotations/MinecraftExclusiveCommand.kt
rename to src/main/kotlin/co/orre/discordbridge/commands/annotations/MinecraftExclusiveCommand.kt
index 39caec9..dd7d179 100644
--- a/src/main/kotlin/co/orre/discordbridge/commands/Annotations/MinecraftExclusiveCommand.kt
+++ b/src/main/kotlin/co/orre/discordbridge/commands/annotations/MinecraftExclusiveCommand.kt
@@ -1,4 +1,4 @@
-package co.orre.discordbridge.commands.Annotations
+package co.orre.discordbridge.commands.annotations
 
 @Target(AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.RUNTIME)
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/annotations/PrivateResponse.kt b/src/main/kotlin/co/orre/discordbridge/commands/annotations/PrivateResponse.kt
new file mode 100644
index 0000000..43e9ea6
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/commands/annotations/PrivateResponse.kt
@@ -0,0 +1,5 @@
+package co.orre.discordbridge.commands.annotations
+
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class PrivateResponse
\ No newline at end of file
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/annotations/TaggedResponse.kt b/src/main/kotlin/co/orre/discordbridge/commands/annotations/TaggedResponse.kt
new file mode 100644
index 0000000..a48821e
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/commands/annotations/TaggedResponse.kt
@@ -0,0 +1,5 @@
+package co.orre.discordbridge.commands.annotations
+
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class TaggedResponse
\ No newline at end of file
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/controllers/BotControllerManager.kt b/src/main/kotlin/co/orre/discordbridge/commands/controllers/BotControllerManager.kt
index ada02cb..a2490bf 100644
--- a/src/main/kotlin/co/orre/discordbridge/commands/controllers/BotControllerManager.kt
+++ b/src/main/kotlin/co/orre/discordbridge/commands/controllers/BotControllerManager.kt
@@ -1,25 +1,20 @@
 package co.orre.discordbridge.commands.controllers
 
-// TODO: Add Apache license
-
 import co.orre.discordbridge.Config
 import co.orre.discordbridge.Plugin
 import co.orre.discordbridge.commands.*
-import co.orre.discordbridge.commands.Annotations.BotCommand
-import co.orre.discordbridge.commands.Annotations.ChatExclusiveCommand
-import co.orre.discordbridge.commands.Annotations.DiscordExclusiveCommand
-import co.orre.discordbridge.commands.Annotations.MinecraftExclusiveCommand
+import co.orre.discordbridge.commands.annotations.*
 import co.orre.discordbridge.discord.Connection
 import co.orre.discordbridge.utils.Script
 import co.orre.discordbridge.utils.UtilFunctions.stripColor
+import co.orre.discordbridge.utils.UtilFunctions.toDiscordChatMessage
 import co.orre.discordbridge.utils.UtilFunctions.toMinecraftChatMessage
 import net.dv8tion.jda.core.entities.Message
-import org.bukkit.ChatColor
-import java.lang.reflect.InvocationTargetException
 import java.lang.reflect.Method
 import java.util.*
 import java.util.logging.Level
 import co.orre.discordbridge.Config as cfg
+import org.bukkit.ChatColor as CC
 
 class BotControllerManager(val plugin: Plugin) {
 
@@ -51,21 +46,27 @@ class BotControllerManager(val plugin: Plugin) {
 
         method.isAccessible = true
         val parameters = (1..methodParameters.size - 1).mapTo(ArrayList<Class<*>>()) { methodParameters[it].type }
+        val isTagged: Boolean = method.getAnnotation(TaggedResponse::class.java) != null
+        val isPrivate: Boolean = method.getAnnotation(PrivateResponse::class.java) != null
         val command = Command(commandName, usage, annotation.description, parameters, annotation.relayTriggerMessage,
-                annotation.ignoreExcessArguments, controllerClass, method)
+                annotation.ignoreExcessArguments, isTagged, isPrivate, controllerClass, method)
         commands.put(command.name, command)
     }
 
     fun dispatchMessage(event: IEventWrapper): Boolean {
 
+        // Short circuit if event was a Minecraft command
         if (event is MinecraftCommandWrapper) {
-            val command = commands[event.cmd.name] ?: return false
+            val command = commands[event.command.name]
+            if (command == null) {
+                commandNotFound(event, event.command.name)
+                return true
+            }
             val inputArguments = event.rawMessage.split("\\s+".toRegex(), command.parameters.size).toTypedArray()
             return invokeCommand(command, controllers, event, inputArguments)
         }
 
-        // SCRIPTED RESPONSE - The bot replies with a pre-programmed response if it detects
-        // a corresponding trigger string
+        // Short circuit scripted responses
         if (scriptedResponse(event)) return true
 
         val args = event.rawMessage.trim().split("\\s+".toRegex(), 2).toTypedArray()
@@ -82,7 +83,7 @@ class BotControllerManager(val plugin: Plugin) {
             }
 
             val inputArguments = if (args.size == 1) arrayOf<String>()
-                else args[1].split("\\s+".toRegex(), command.parameters.size).toTypedArray()
+            else args[1].split("\\s+".toRegex(), command.parameters.size).toTypedArray()
 
             return invokeCommand(command, controllers, event, inputArguments)
         }
@@ -123,7 +124,6 @@ class BotControllerManager(val plugin: Plugin) {
             return false
         }
         var response: Script? = null
-        // TODO: Switch if Minecraft or Discord
         for (r in responses) {
             var arg = event.rawMessage
             val triggerDis = r.triggerDis ?: ""
@@ -138,14 +138,14 @@ class BotControllerManager(val plugin: Plugin) {
                 else continue
             }
 
-            when (event.type) {
-                WrapperType.ASYNC_PLAYER_CHAT_EVENT -> {
+            when (event) {
+                is AsyncPlayerChatEventWrapper -> {
                     if (startswith)
                         if (triggerMC.isNotEmpty() && arg.startsWith(triggerMC, ignorecase)) response = r
                         else
                             if (triggerMC.isNotEmpty() && arg.equals(triggerMC, ignorecase)) response = r
                 }
-                WrapperType.MESSAGE -> {
+                is MessageWrapper -> {
                     if (startswith)
                         if (triggerDis.isNotEmpty() && arg.startsWith(triggerDis, ignorecase)) response = r
                         else
@@ -159,13 +159,19 @@ class BotControllerManager(val plugin: Plugin) {
         val responseDis: String? = response.responseDis
         val responseMC: String? = response.responseMC
         if (responseDis != null) {
-            val out = responseDis.replace("%u", event.senderAsMention)
+            var out = responseDis.replace("%u", event.senderAsMention)
+            if (event is AsyncPlayerChatEventWrapper) {
+                out = plugin.convertAtMentions(out)
+                out = plugin.translateAliasesToDiscord(out)
+            }
             plugin.sendToDiscord(out, event.channel)
         }
         if (responseMC != null && event.isFromRelayChannel) {
-            var alias = plugin.users.data.getString("discordaliases.${message.author.id}.mcusername")
-            if (alias == null) alias = message.author.name.noSpace()
-            val out = responseMC.replace("%u", alias)
+            var out = responseMC.replace("%u", event.senderAsMention)
+            if (event is MessageWrapper) {
+                out = plugin.deconvertAtMentions(out)
+                out = plugin.translateAliasesToMinecraft(out)
+            }
             plugin.sendToMinecraft(out.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
         }
         return true
@@ -173,82 +179,159 @@ class BotControllerManager(val plugin: Plugin) {
 
     private fun invokeCommand(command: Command, instances: Map<Class<out IBotController>, IBotController>,
                               event: IEventWrapper, inputArguments: Array<String>): Boolean {
+        // Relay the trigger if applicable
         if (command.relayTriggerMessage) relay(event, false)
 
-        if (command.name == "help") {
-            try {
-                command.commandMethod.invoke(instances[command.controllerClass], event, commands, instances)
+        when {
+            // Check for permission
+            event is AsyncPlayerChatEventWrapper && !event.event.player.hasPermission("discordbridge.${command.name}") -> {
+                commandRestricted(event)
                 return true
-            } catch (e: InvocationTargetException) {
-                commandException(event, e.cause)
-                return false
-            } catch (e: IllegalAccessException) {
-                throw RuntimeException(e)
-            } catch (e: IllegalArgumentException) {
-                commandWrongParameterCount(event, command.name, command.usage, 2, command.parameters.size)
+            }
+            event is MinecraftCommandWrapper && !event.sender.hasPermission("discordbridge.${command.name}") -> {
+                commandRestricted(event)
+                return true
+            }
+
+            // Short circuit "help"
+            command.name == "help" -> {
+                try {
+                    val response = command.commandMethod.invoke(instances[command.controllerClass], event, commands, instances) as? String ?: return true
+                    respond(event, command, response)
+                    return true
+                } catch (e: IllegalArgumentException) {
+                    commandWrongParameterCount(event, command.name, command.usage, 2, command.parameters.size)
+                    return false
+                } catch (e: Exception) {
+                    commandException(event, e.cause)
+                    return true
+                }
+            }
+
+            // Fail if not enough arguments
+            inputArguments.size < command.parameters.size -> {
+                commandWrongParameterCount(event, command.name, command.usage, inputArguments.size, command.parameters.size)
                 return false
             }
-        }
 
-        if (inputArguments.size < command.parameters.size) {
-            commandWrongParameterCount(event, command.name, command.usage, inputArguments.size, command.parameters.size)
-            return false
-        }
-        if (inputArguments.size != command.parameters.size && !command.ignoreExcessArguments) {
-            commandWrongParameterCount(event, command.name, command.usage, inputArguments.size, command.parameters.size)
-            return false
+            // Fail if command forces exact argument count AND the supplied argument count does not match expected
+            inputArguments.size != command.parameters.size && !command.ignoreExcessArguments -> {
+                commandWrongParameterCount(event, command.name, command.usage, inputArguments.size, command.parameters.size)
+                return false
+            }
         }
 
+        // Package arguments to send to method
         val arguments = arrayOfNulls<Any>(command.parameters.size + 1)
         arguments[0] = event
-
-        var paramRange = command.parameters.indices
-
-        if (command.ignoreExcessArguments && inputArguments.size > command.parameters.size)
-            paramRange = IntRange(0, command.parameters.size - 1)
-
+        val paramRange = if (command.ignoreExcessArguments && inputArguments.size > command.parameters.size)
+            IntRange(0, command.parameters.size - 1) else command.parameters.indices
         for (i in paramRange) {
             val parameterClass = command.parameters[i]
 
             try {
                 arguments[i + 1] = parseArgument(parameterClass, inputArguments[i])
             } catch (ignored: IllegalArgumentException) {
-                commandWrongParameterType(event, command.name, command.usage, i,
-                        inputArguments[i].javaClass, parameterClass)
+                commandWrongParameterType(event, command.name, command.usage, i, inputArguments[i].javaClass, parameterClass)
                 return false
             }
         }
 
+        // Invoke the method
         try {
-            command.commandMethod.invoke(instances[command.controllerClass], *arguments)
+            val response = command.commandMethod.invoke(instances[command.controllerClass], *arguments) as? String ?: return true
+            respond(event, command, response)
             return true
-        } catch (e: InvocationTargetException) {
-            commandException(event, e.cause)
-            return false
-        } catch (e: IllegalAccessException) {
-            throw RuntimeException(e)
         } catch (e: IllegalArgumentException) {
             commandWrongParameterCount(event, command.name, command.usage, inputArguments.size, command.parameters.size)
             return false
+        } catch (e: Exception) {
+            commandException(event, e.cause)
+            return true
+        }
+
+    }
+
+    private fun respond(event: IEventWrapper, command: Command, response: String) {
+        var modifiedResponse = response
+        when (event) {
+            is AsyncPlayerChatEventWrapper -> {
+                if (command.isPrivate) {
+                    modifiedResponse = "${CC.ITALIC}${CC.GRAY}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
+                            modifiedResponse
+                    event.event.player.sendMessage(modifiedResponse)
+                    return
+                }
+                if (command.isTagged) modifiedResponse = "${event.senderAsMention} | $modifiedResponse"
+                plugin.sendToMinecraft(modifiedResponse.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
+
+                modifiedResponse = plugin.convertAtMentions(modifiedResponse)
+                modifiedResponse = plugin.translateAliasesToDiscord(modifiedResponse)
+                plugin.sendToDiscord(modifiedResponse, event.channel)
+                return
+            }
+            is MessageWrapper -> {
+                if (command.isPrivate) {
+                    event.originalMessage.author.openPrivateChannel()
+                    event.originalMessage.author.privateChannel.sendMessage(modifiedResponse)
+                    return
+                }
+                if (command.isTagged) modifiedResponse = "${event.senderAsMention} | $modifiedResponse"
+                plugin.sendToDiscord(modifiedResponse, event.channel)
+
+                modifiedResponse = modifiedResponse.toMinecraftChatMessage(Config.BOT_MC_USERNAME)
+                modifiedResponse = plugin.deconvertAtMentions(modifiedResponse)
+                modifiedResponse = plugin.translateAliasesToMinecraft(modifiedResponse)
+                plugin.sendToMinecraft(modifiedResponse)
+                return
+            }
+            is MinecraftCommandWrapper -> {
+                if (command.isPrivate || command.isTagged) {
+                    modifiedResponse = "${CC.ITALIC}${CC.GRAY}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
+                            modifiedResponse
+                    event.sender.sendMessage(modifiedResponse)
+                    return
+                }
+                plugin.sendToMinecraft(modifiedResponse.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
+
+                modifiedResponse = plugin.convertAtMentions(modifiedResponse)
+                modifiedResponse = plugin.translateAliasesToDiscord(modifiedResponse)
+                plugin.sendToDiscord(modifiedResponse, event.channel)
+                return
+            }
         }
     }
 
     private fun relay(event: IEventWrapper, logIgnore: Boolean) {
-        when (event.type) {
-            WrapperType.ASYNC_PLAYER_CHAT_EVENT -> {
+        when (event) {
+            is AsyncPlayerChatEventWrapper -> {
+                var worldname = event.event.player.world.name
+
+                // Get world alias if Multiverse is installed
+                if (plugin.isMultiverseInstalled) {
+                    val worldProperties = plugin.worlds!!.data.get("worlds.$worldname")
+                    val cls = Class.forName("com.onarandombox.MultiverseCore.WorldProperties")
+                    val meth: Method = cls.getMethod("getAlias")
+                    val alias = meth.invoke(worldProperties)
+                    if (alias is String) worldname = alias
+                }
 
+                var formattedMessage = event.message.toDiscordChatMessage(event.senderName, worldname)
+                formattedMessage = plugin.convertAtMentions(formattedMessage)
+                formattedMessage = plugin.translateAliasesToDiscord(formattedMessage)
+                plugin.sendToDiscord(formattedMessage, Connection.getRelayChannel())
             }
-            WrapperType.MESSAGE -> {
+            is MessageWrapper -> {
                 if (event.isFromRelayChannel) {
                     plugin.logDebug("Broadcasting message from Discord to Minecraft as user ${event.senderName}")
-                    //var alias = plugin.users.data.getString("discordaliases.${message.author.id}.mcusername")
-                    //if (alias == null) alias = message.author.name.noSpace()
-                    plugin.sendToMinecraft(message.content.toMinecraftChatMessage(alias))
-                } else if (logIgnore) plugin.logDebug("Not relaying message ${message.id} from Discord: channel does not match")
+                    var formattedMessage = event.message.toMinecraftChatMessage(event.senderName)
+                    formattedMessage = plugin.deconvertAtMentions(formattedMessage)
+                    formattedMessage = plugin.translateAliasesToMinecraft(formattedMessage)
+                    plugin.sendToMinecraft(formattedMessage)
+                } else if (logIgnore) plugin.logDebug("Not relaying message from Discord: channel does not match")
             }
-            else -> return
+            else -> return // slash commands do not get relayed
         }
-
     }
 
     private fun parseArgument(parameterClass: Class<*>, value: String): Any {
@@ -288,13 +371,17 @@ class BotControllerManager(val plugin: Plugin) {
     private fun commandNotFound(event: IEventWrapper, commandName: String) {
         when (event) {
             is MessageWrapper ->
-                    event.channel.sendMessage(
+                event.channel.sendMessage(
                         "${event.senderAsMention} | I don't seem to have a command called '$commandName'. " +
-                        "See '${Connection.JDA.selfUser.asMention} help' ${orPrefixHelp()}for the commands I do have.").queue()
+                                "See '${Connection.JDA.selfUser.asMention} help' ${orPrefixHelp()}for the commands I do have.").queue()
             is AsyncPlayerChatEventWrapper ->
-                    event.event.player.sendMessage("${ChatColor.ITALIC}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
-                    "I don't seem to have a command called '$commandName'. " +
-                    "See '@${Config.BOT_MC_USERNAME.stripColor()} help' ${orPrefixHelp()}for the commands I do have.")
+                event.event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
+                        "I don't seem to have a command called '$commandName'. " +
+                        "See '@${Config.BOT_MC_USERNAME.stripColor()} help' ${orPrefixHelp()}for the commands I do have.")
+            is MinecraftCommandWrapper ->
+                event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
+                        "I don't seem to have a command called '$commandName'. " +
+                        "See '@${Config.BOT_MC_USERNAME.stripColor()} help' ${orPrefixHelp()}for the commands I do have.")
         }
 
     }
@@ -307,7 +394,12 @@ class BotControllerManager(val plugin: Plugin) {
                                 "I got $given from you, but I need $required. " +
                                 "(Usage: $commandName $usage)").queue()
             is AsyncPlayerChatEventWrapper ->
-                event.event.player.sendMessage("${ChatColor.ITALIC}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
+                event.event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
+                        "I didn't seem to get the correct number of arguments for that command. " +
+                        "I got $given from you, but I need $required. " +
+                        "(Usage: $commandName $usage)")
+            is MinecraftCommandWrapper ->
+                event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
                         "I didn't seem to get the correct number of arguments for that command. " +
                         "I got $given from you, but I need $required. " +
                         "(Usage: $commandName $usage)")
@@ -323,21 +415,28 @@ class BotControllerManager(val plugin: Plugin) {
                                 "Argument $index seems like ${actualType.simpleName}, but I need ${expectedType.simpleName}. " +
                                 "(Usage: $name $usage)").queue()
             is AsyncPlayerChatEventWrapper ->
-                event.event.player.sendMessage("${ChatColor.ITALIC}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
+                event.event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
+                        "One of the arguments for that command doesn't seem to be the right type. " +
+                        "Argument $index seems like ${actualType.simpleName}, but I need ${expectedType.simpleName}. " +
+                        "(Usage: $name $usage)")
+            is MinecraftCommandWrapper ->
+                event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
                         "One of the arguments for that command doesn't seem to be the right type. " +
                         "Argument $index seems like ${actualType.simpleName}, but I need ${expectedType.simpleName}. " +
                         "(Usage: $name $usage)")
         }
     }
 
-    @Suppress("unused")
     private fun commandRestricted(event: IEventWrapper) {
         when (event) {
             is MessageWrapper ->
-                event.channel.sendMessage("${event.senderAsMention} | Sorry, that command is not permitted.").queue()
+                event.channel.sendMessage("${event.senderAsMention} | Sorry, you don't have permission to use that command.").queue()
             is AsyncPlayerChatEventWrapper ->
-                event.event.player.sendMessage("${ChatColor.ITALIC}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
-                        "Sorry, that command is not permitted.")
+                event.event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
+                        "Sorry, you don't have permission to use that command.")
+            is MinecraftCommandWrapper ->
+                event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
+                        "Sorry, you don't have permission to use that command.")
         }
     }
 
@@ -346,10 +445,16 @@ class BotControllerManager(val plugin: Plugin) {
         when (event) {
             is MessageWrapper ->
                 event.channel.sendMessage(
-                        "${event.senderAsMention} | Ouch! That command threw an exception. Sorry about that...").queue()
+                        "${event.senderAsMention} | Ouch! That command threw an exception. Sorry about that..." +
+                                "Have an admin check the logs for more info.").queue()
             is AsyncPlayerChatEventWrapper ->
-                event.event.player.sendMessage("${ChatColor.ITALIC}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
-                        "Ouch! That command threw an exception. Sorry about that...")
+                event.event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
+                        "Ouch! That command threw an exception. Sorry about that..." +
+                        "Have an admin check the logs for more info.")
+            is MinecraftCommandWrapper ->
+                event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
+                        "Ouch! That command threw an exception. Sorry about that..." +
+                        "Have an admin check the logs for more info.")
         }
     }
 
@@ -362,6 +467,8 @@ class BotControllerManager(val plugin: Plugin) {
             val parameters: List<Class<*>>,
             val relayTriggerMessage: Boolean,
             val ignoreExcessArguments: Boolean,
+            val isTagged: Boolean,
+            val isPrivate: Boolean,
             val controllerClass: Class<*>,
             val commandMethod: Method
     )
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/controllers/FunCommandsController.kt b/src/main/kotlin/co/orre/discordbridge/commands/controllers/FunCommandsController.kt
index f0dd7ec..74755f0 100644
--- a/src/main/kotlin/co/orre/discordbridge/commands/controllers/FunCommandsController.kt
+++ b/src/main/kotlin/co/orre/discordbridge/commands/controllers/FunCommandsController.kt
@@ -1,13 +1,15 @@
 package co.orre.discordbridge.commands.controllers
 
-import co.orre.discordbridge.CommandLogic
 import co.orre.discordbridge.Config
 import co.orre.discordbridge.Plugin
-import co.orre.discordbridge.commands.Annotations.BotCommand
 import co.orre.discordbridge.commands.IBotController
 import co.orre.discordbridge.commands.IEventWrapper
-import co.orre.discordbridge.utils.UtilFunctions.toMinecraftChatMessage
-import net.dv8tion.jda.core.entities.Message
+import co.orre.discordbridge.commands.annotations.BotCommand
+import co.orre.discordbridge.commands.annotations.TaggedResponse
+import co.orre.discordbridge.utils.Rating
+import co.orre.discordbridge.utils.Respect
+import com.michaelwflaherty.cleverbotapi.CleverBotQuery
+import java.util.*
 
 class FunCommandsController(val plugin: Plugin) : IBotController {
 
@@ -15,66 +17,134 @@ class FunCommandsController(val plugin: Plugin) : IBotController {
 
     // 8BALL - consult the Magic 8-Ball to answer your yes or no questions
     @BotCommand(name = "8ball", usage = "<question>", description = "Consult the Magic 8 Ball")
-    private fun eightBall(event: IEventWrapper) : String {
+    @TaggedResponse
+    private fun eightBall(event: IEventWrapper): String {
         plugin.logDebug("user ${event.senderName} consults the Magic 8-Ball")
-        return CommandLogic.eightBall(plugin, event.senderAsMention)
-        //dispatchResponse(message, CommandLogic.eightBall(plugin, message.author.asMention))
+        val responses = plugin.eightball.data.getStringList("responses")
+        val rand = Random().nextInt(responses.count())
+        return responses[rand]
     }
 
     // CHOOSE - chooses between some number of options
     @BotCommand(name = "choose", usage = "<option>, <option>, ... (delimiters include ',', 'or', '|')",
             description = "Have the bot choose between given options")
-    private fun choose(event: IEventWrapper, query: String){
+    @TaggedResponse
+    private fun choose(event: IEventWrapper, query: String): String {
         plugin.logDebug("user ${event.senderName} needs a choice made")
-        //dispatchResponse(message, CommandLogic.choose(message.author.asMention, query))
+        val choices = query.split(", or ", " or ", ",", "|")
+        val rand = Random().nextInt(choices.count())
+        return "I pick '${choices[rand]}'"
     }
 
     // F - press F to pay respects!
     @BotCommand(usage="", description = "Press F to pay respects")
-    private fun f(event: IEventWrapper) {
+    private fun f(event: IEventWrapper): String {
         plugin.logDebug("user ${event.senderName}} pays respects")
-        //dispatchResponse(message, CommandLogic.f(plugin, message.author.asMention))
+        var totalRespects = plugin.f.data.getInt("total-respects", 0)
+        val responses = plugin.f.data.getList("responses").checkItemsAre<Respect>()
+                ?: return "ERROR: Responses for this command could not be read from the config."
+        val totalWeight = responses.sumBy { it.weight }
+        var rand = Random().nextInt(totalWeight) + 1
+        var found: Respect? = null
+        for(r in responses) {
+            rand -= r.weight
+            if (rand <= 0) {
+                found = r
+                break
+            }
+        }
+
+        totalRespects += found!!.count
+        val msg: String
+        if (found.message.contains("%u"))
+            msg = found.message.replace("%u", event.senderAsMention).replace("%t", totalRespects.toString())
+                .replace("%c", found.count.toString())
+        else
+            msg = "${event.senderAsMention} | ${found.message}".replace("%t", totalRespects.toString())
+                    .replace("%c", found.count.toString())
+
+        plugin.f.data.set("total-respects", totalRespects)
+        plugin.f.saveConfig()
+
+        return msg
     }
 
     // INSULT - the bot insults something
     @BotCommand(usage="<thing to insult>", description = "Make the bot insult something for you")
-    private fun insult(event: IEventWrapper, thingToInsult: String) {
+    private fun insult(event: IEventWrapper, thingToInsult: String): String {
         plugin.logDebug("user ${event.senderName} requests an insult against '$thingToInsult'")
-        //dispatchResponse(message, CommandLogic.insult(plugin, message.author.name, thingToInsult))
+        val responses = plugin.insult.data.getStringList("responses")
+        val rand = Random().nextInt(responses.count())
+        return "${event.senderAsMention} \uD83E\uDC52 $thingToInsult | ${responses[rand]}"
     }
 
     // RATE - the bot rates something
     @BotCommand(usage="<thing to be rated>", description = "Have the bot rate something for you")
-    private fun rate(event: IEventWrapper, thingToRate: String) {
+    @TaggedResponse
+    private fun rate(event: IEventWrapper, thingToRate: String): String {
         plugin.logDebug("user ${event.senderName} requests a rating")
-        //dispatchResponse(message, CommandLogic.rate(plugin, message.author.name, thingToRate))
+        val responses = plugin.rate.data.getList("responses").checkItemsAre<Rating>()
+                ?: return "ERROR: Responses for this command could not be read from the config."
+
+        var rateOutOf = plugin.rate.data.getInt("rate-out-of", 10)
+        if (rateOutOf > 1000000) rateOutOf = 1000000
+        if (rateOutOf < 0) rateOutOf = 0
+
+        var granularity = plugin.rate.data.getInt("granularity", 1)
+        if (granularity > 2) granularity = 2
+        if (granularity < 0) granularity = 0
+
+        val conversionFactor = Math.pow(10.0, granularity.toDouble())
+        val rating = Random().nextInt((rateOutOf * conversionFactor.toInt()) + 1) / conversionFactor
+
+
+        val found: Rating = responses.firstOrNull { rating <= it.high && rating >= it.low }
+                ?: return "ERROR: No response set for rating $rating"
+
+        var thingToBeRated = thingToRate
+        if (plugin.rate.data.getBoolean("translate-first-and-second-person", true)) {
+            val argArray = thingToRate.split(" ").toMutableList()
+            val iterate = argArray.listIterator()
+            while (iterate.hasNext()) {
+                val oldValue = iterate.next()
+                if (oldValue == "me") iterate.set("you")
+                if (oldValue == "myself") iterate.set("yourself")
+                if (oldValue == "my") iterate.set("your")
+                if (oldValue == "your") iterate.set("my")
+                if (oldValue == "yourself") iterate.set("myself")
+            }
+            thingToBeRated = argArray.joinToString(" ")
+        }
+
+        return found.message.replace("%m", thingToBeRated).replace("%r", "$rating/$rateOutOf")
     }
 
     // ROLL - roll a die for a random number
     @BotCommand(name = "roll", usage = "<sides>", description = "Roll a die for a random number")
-    private fun roll(event: IEventWrapper, sides: Int){
+    @TaggedResponse
+    private fun roll(event: IEventWrapper, sides: Int): String {
         plugin.logDebug("user ${event.senderName} needs a choice made")
-        //dispatchResponse(message, CommandLogic.roll(message.author.asMention, sides))
+        if (sides == 1)
+            return "You rolled... 1. Was it any surprise?"
+        if (sides > 100 || sides < 1)
+            return "I can't roll a die with $sides sides. It must have between 1 and 100 sides."
+        val rand = Random().nextInt(sides)
+        return "You rolled... $rand"
     }
 
     // TALK - directly speak to Cleverbot (useful for not accidentally invoking other commands)
+    @TaggedResponse
     @BotCommand(usage="<say something>", description = "Say something to Cleverbot")
-    private fun talk(event: IEventWrapper, query: String) {
+    private fun talk(event: IEventWrapper, query: String): String {
         plugin.logDebug("user ${event.senderName} invokes Cleverbot")
-        //dispatchResponse(message, CommandLogic.askCleverbot(message.author.asMention, query))
-    }
-
-    private fun dispatchResponse(event: IEventWrapper, response: String) {
-        plugin.sendToDiscord(response, event.channel)
 
-        if (message.isFromRelayChannel()) {
-            var response1 = plugin.translateAliasToMinecraft(response, message.author.id)
-            response1 = response1.toMinecraftChatMessage(Config.BOT_MC_USERNAME)
-            plugin.sendToMinecraft(response1)
-        }
+        if (Config.CLEVERBOT_KEY.isEmpty())
+            return "You do not have an API key. Go to https://www.cleverbot.com/JDA/ for more information."
+        val bot: CleverBotQuery = CleverBotQuery(Config.CLEVERBOT_KEY, query)
+        bot.sendRequest()
+        return bot.response
     }
 
-    private fun Message.isFromRelayChannel(): Boolean = guild.id == Config.SERVER_ID
-            && this.isFromType(net.dv8tion.jda.core.entities.ChannelType.TEXT)
-            && this.textChannel.name.equals(Config.CHANNEL, true)
+    @Suppress("UNCHECKED_CAST")
+    private inline fun <reified T : Any> List<*>.checkItemsAre() = if (all { it is T }) this as List<T> else null
 }
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/controllers/UtilCommandsController.kt b/src/main/kotlin/co/orre/discordbridge/commands/controllers/UtilCommandsController.kt
index 4bcd421..715ae14 100644
--- a/src/main/kotlin/co/orre/discordbridge/commands/controllers/UtilCommandsController.kt
+++ b/src/main/kotlin/co/orre/discordbridge/commands/controllers/UtilCommandsController.kt
@@ -1,52 +1,85 @@
 package co.orre.discordbridge.commands.controllers
 
 import co.orre.discordbridge.Plugin
-import co.orre.discordbridge.commands.Annotations.BotCommand
-import co.orre.discordbridge.commands.Annotations.ChatExclusiveCommand
-import co.orre.discordbridge.commands.Annotations.DiscordExclusiveCommand
+import co.orre.discordbridge.UserAliasConfig
+import co.orre.discordbridge.commands.AsyncPlayerChatEventWrapper
 import co.orre.discordbridge.commands.IBotController
 import co.orre.discordbridge.commands.IEventWrapper
 import co.orre.discordbridge.commands.MessageWrapper
+import co.orre.discordbridge.commands.annotations.BotCommand
+import co.orre.discordbridge.commands.annotations.ChatExclusiveCommand
+import co.orre.discordbridge.commands.annotations.DiscordExclusiveCommand
+import co.orre.discordbridge.commands.annotations.PrivateResponse
 import net.dv8tion.jda.core.entities.ChannelType
-import net.dv8tion.jda.core.entities.Message
+import org.bukkit.ChatColor as CC
 
 class UtilCommandsController(val plugin: Plugin) : IBotController {
 
     override fun getDescription(): String = ":wrench:  **UTIL** - Utility commands"
 
-    // CONFIRM - Confirm an alias
+    // CONFIRM - Confirm an alias request
     @BotCommand(usage="", description="Confirm an alias link request", relayTriggerMessage = false)
     @DiscordExclusiveCommand
-    private fun confirm(message: MessageWrapper) {
-        if (!message.originalMessage.isFromType(ChannelType.PRIVATE)) return
-        plugin.logDebug("user ${message.senderName} wants to confirm an alias")
+    @PrivateResponse
+    private fun confirm(message: MessageWrapper): String? {
+        if (!message.originalMessage.isFromType(ChannelType.PRIVATE)) return null
+        plugin.logDebug("user ${message.senderName} confirms an alias request")
 
-        val ua = plugin.requests.find { it.discordId == message.senderId }
-        if (ua == null) {
-            plugin.sendToDiscord("You have not requested an alias, or your request has expired!", message.channel)
-            return
-        }
+        val ua = plugin.requests.find { it.discordId == message.senderId } ?: return "You have no alias requests pending."
+
+        UserAliasConfig.add(plugin, ua)
+        plugin.requests.remove(ua)
+        return "Successfully linked aliases!"
+    }
+
+    // DENY - Deny an alias request
+    @BotCommand(usage="", description="Deny an alias link request", relayTriggerMessage = false)
+    @DiscordExclusiveCommand
+    @PrivateResponse
+    private fun deny(message: MessageWrapper): String? {
+        if (!message.originalMessage.isFromType(ChannelType.PRIVATE)) return null
+        plugin.logDebug("user ${message.senderName} denies an alias request")
+
+        val ua = plugin.requests.find { it.discordId == message.senderId } ?: return "You have no alias requests pending."
 
-        plugin.saveAlias(ua)
         plugin.requests.remove(ua)
-        plugin.sendToDiscord("Successfully linked aliases!", message.channel)
+        return "The alias link request has been cancelled."
     }
 
     @BotCommand(usage="", description="You just used it", relayTriggerMessage = false)
     @ChatExclusiveCommand
+    @PrivateResponse
     private fun help(event: IEventWrapper, commands: MutableMap<String, BotControllerManager.Command>,
                      instances: Map<Class<out IBotController>, IBotController>) {
         plugin.logDebug("user ${event.senderName} requested help")
-        //todo
-        plugin.sendToDiscord("**DiscordBridge** - Bridge your Minecraft and Discord chats\n**---**", message.channel)
-        var out: String
-        for (bc: IBotController in instances.values) {
-            out = bc.getDescription() + "\n```"
-            commands.values.sortedBy { (name) -> name }
-                    .filter { it.controllerClass == bc.javaClass }
-                    .forEach { out += "\n${it.name} ${it.usage}\n  ${it.description}\n" }
-            out += "```"
-            plugin.sendToDiscord(out, message.channel)
+        when (event) {
+            is AsyncPlayerChatEventWrapper -> {
+                val player = event.event.player
+                player.sendMessage("${CC.BOLD}${CC.AQUA}DiscordBridge${CC.RESET} - Bridge your Minecraft and Discord chats\n---")
+                var out: String
+                for (bc: IBotController in instances.values) {
+                    out = bc.getDescription() + "\n```"
+                    commands.values.sortedBy { (name) -> name }
+                            .filter { it.controllerClass == bc.javaClass }
+                            .forEach { out += "\n${it.name} ${it.usage}\n  ${it.description}\n" }
+                    out += "```"
+                    player.sendMessage(out)
+                }
+            }
+            is MessageWrapper -> {
+                event.originalMessage.author.openPrivateChannel()
+                val channel = event.originalMessage.author.privateChannel
+                channel.sendMessage("**DiscordBridge** - Bridge your Minecraft and Discord chats\n**---**")
+                var out: String
+                for (bc: IBotController in instances.values) {
+                    out = bc.getDescription() + "\n```"
+                    commands.values.sortedBy { (name) -> name }
+                            .filter { it.controllerClass == bc.javaClass }
+                            .forEach { out += "\n${it.name} ${it.usage}\n  ${it.description}\n" }
+                    out += "```"
+                    channel.sendMessage(out)
+                }
+            }
         }
     }
 
diff --git a/src/main/kotlin/co/orre/discordbridge/discord/Listener.kt b/src/main/kotlin/co/orre/discordbridge/discord/Listener.kt
index 554f7ea..91e56bb 100644
--- a/src/main/kotlin/co/orre/discordbridge/discord/Listener.kt
+++ b/src/main/kotlin/co/orre/discordbridge/discord/Listener.kt
@@ -1,11 +1,9 @@
 package co.orre.discordbridge.discord
 
-// TODO: Apache License
-
 import co.orre.discordbridge.Plugin
+import co.orre.discordbridge.commands.MessageWrapper
 import co.orre.discordbridge.commands.controllers.BotControllerManager
 import co.orre.discordbridge.commands.controllers.FunCommandsController
-import co.orre.discordbridge.commands.MessageWrapper
 import co.orre.discordbridge.commands.controllers.UtilCommandsController
 import net.dv8tion.jda.core.events.message.MessageReceivedEvent
 import net.dv8tion.jda.core.hooks.ListenerAdapter
diff --git a/src/main/kotlin/co/orre/discordbridge/discord/controllers/BotControllerManager.kt b/src/main/kotlin/co/orre/discordbridge/discord/controllers/BotControllerManager.kt
deleted file mode 100644
index 467b328..0000000
--- a/src/main/kotlin/co/orre/discordbridge/discord/controllers/BotControllerManager.kt
+++ /dev/null
@@ -1,297 +0,0 @@
-package co.orre.discordbridge.discord.controllers
-
-// TODO: Add Apache license
-
-import co.orre.discordbridge.Config
-import co.orre.discordbridge.Plugin
-import co.orre.discordbridge.discord.Connection
-import co.orre.discordbridge.discord.interfaces.BotCommand
-import co.orre.discordbridge.discord.interfaces.BotController
-import co.orre.discordbridge.utils.Script
-import co.orre.discordbridge.utils.UtilFunctions.noSpace
-import co.orre.discordbridge.utils.UtilFunctions.toMinecraftChatMessage
-import net.dv8tion.jda.core.entities.ChannelType
-import net.dv8tion.jda.core.entities.Message
-import java.lang.reflect.InvocationTargetException
-import java.lang.reflect.Method
-import java.util.*
-import java.util.logging.Level
-import co.orre.discordbridge.Config as cfg
-
-class BotControllerManager(val plugin: Plugin) {
-
-    private val commands: MutableMap<String, Command> = mutableMapOf()
-    private val controllers: MutableMap<Class<out BotController>, BotController> = mutableMapOf()
-
-    fun registerController(controller: BotController) {
-        controllers.put(controller.javaClass, controller)
-        val controllerClass = controller.javaClass
-
-        for (method in controllerClass.declaredMethods) {
-            val annotation = method.getAnnotation(BotCommand::class.java)
-            if (annotation != null) registerControllerMethod(controllerClass, method, annotation)
-        }
-    }
-
-    private fun registerControllerMethod(controllerClass: Class<*>, method: Method, annotation: BotCommand) {
-        val commandName = if (annotation.name.isEmpty()) method.name.toLowerCase() else annotation.name
-        val usage = annotation.usage
-        val methodParameters = method.parameters
-
-        if (methodParameters.isEmpty() || !methodParameters[0].type.isAssignableFrom(Message::class.java)) return
-
-        method.isAccessible = true
-        val parameters = (1..methodParameters.size - 1).mapTo(ArrayList<Class<*>>()) { methodParameters[it].type }
-        val command = Command(commandName, usage, annotation.description, parameters, annotation.relayTriggerMessage,
-                annotation.ignoreExcessArguments, controllerClass, method)
-        commands.put(command.name, command)
-    }
-
-    fun dispatchMessage(message: Message) {
-
-        // SCRIPTED RESPONSE - The bot replies with a pre-programmed response if it detects
-        // a corresponding trigger string
-        if (scriptedResponse(message)) return
-
-        val args = message.rawContent.trim().split("\\s+".toRegex(), 2).toTypedArray()
-
-        // <prefix>command
-        if (Config.COMMAND_PREFIX.isNotBlank() && args[0].startsWith(Config.COMMAND_PREFIX)) {
-            val commandName = args[0].substring(Config.COMMAND_PREFIX.length).toLowerCase()
-            val command = commands[commandName]
-
-            if (command == null) {
-                commandNotFound(message, commandName)
-                return
-            }
-
-            val inputArguments = if (args.size == 1) arrayOf<String>()
-                else args[1].split("\\s+".toRegex(), command.parameters.size).toTypedArray()
-
-            invokeCommand(command, controllers, message, inputArguments)
-            return
-        }
-
-        // @<mention> command
-        if (args[0] == Connection.JDA.selfUser.asMention && args.count() == 2) {
-            val args2 = args[1].split("\\s+".toRegex(), 2).toTypedArray()
-            val commandName = args2[0].toLowerCase()
-            var params = if (args2.size > 1) args2[1] else ""
-            var command = commands[commandName]
-
-            if (command == null) {
-                // Assume user wants to talk to Cleverbot
-                command = commands["talk"]
-                if (command == null) {
-                    commandNotFound(message, commandName)
-                    return
-                }
-                params = args[1]
-            }
-
-            val inputArguments = if (params == "") arrayOf<String>()
-            else params.split("\\s+".toRegex(), command.parameters.size).toTypedArray()
-
-            invokeCommand(command, controllers, message, inputArguments)
-            return
-        }
-
-        // Just relay the message if it is neither
-        relay(message, true)
-    }
-
-    private fun scriptedResponse(message: Message): Boolean {
-        val responses = plugin.script.data.getList("responses").checkItemsAre<Script>()
-        if (responses == null) {
-            plugin.logger.warning("ERROR: Unable to read script.yml!")
-            return false
-        }
-        var response: Script? = null
-        for (r in responses) {
-            var arg = message.rawContent
-            val msg = r.triggerDis ?: continue
-            val ignorecase = !(r.caseSensitive != null && r.caseSensitive)
-            val startswith = r.startsWith != null && r.startsWith
-            val requiresmention = r.requiresMention != null && r.requiresMention
-
-            if (requiresmention) {
-                if (arg.startsWith(Connection.JDA.selfUser.asMention, true))
-                    arg = arg.replaceFirst(Connection.JDA.selfUser.asMention, "").trimStart()
-                else continue
-            }
-
-            if (startswith)
-                if (arg.startsWith(msg, ignorecase)) response = r
-                else
-                    if (arg.equals(msg, ignorecase)) response = r
-        }
-        if (response == null) return false
-        plugin.logDebug("user ${message.author.name} has triggered a scripted response")
-        val responseDis: String? = response.responseDis
-        val responseMC: String? = response.responseMC
-        if (responseDis != null) {
-            val out = responseDis.replace("%u", message.author.name)
-            plugin.sendToDiscord(out, message.channel)
-        }
-        if (responseMC != null && message.isFromRelayChannel()) {
-            var alias = plugin.users.data.getString("discordaliases.${message.author.id}.mcusername")
-            if (alias == null) alias = message.author.name.noSpace()
-            val out = responseMC.replace("%u", alias)
-            plugin.sendToMinecraft(out.toMinecraftChatMessage(cfg.BOT_MC_USERNAME))
-        }
-        return true
-    }
-
-    private fun invokeCommand(command: Command, instances: Map<Class<out BotController>, BotController>,
-                              message: Message, inputArguments: Array<String>) {
-        if (command.relayTriggerMessage) relay(message, false)
-
-        if (command.name == "help") {
-            try {
-                command.commandMethod.invoke(instances[command.controllerClass], message, commands, instances)
-                return
-            } catch (e: InvocationTargetException) {
-                commandException(message, e.cause)
-                return
-            } catch (e: IllegalAccessException) {
-                throw RuntimeException(e)
-            } catch (e: IllegalArgumentException) {
-                commandWrongParameterCount(message, command.name, command.usage, 2, command.parameters.size)
-                return
-            }
-        }
-
-        if (inputArguments.size < command.parameters.size) {
-            commandWrongParameterCount(message, command.name, command.usage, inputArguments.size, command.parameters.size)
-            return
-        }
-        if (inputArguments.size != command.parameters.size && !command.ignoreExcessArguments) {
-            commandWrongParameterCount(message, command.name, command.usage, inputArguments.size, command.parameters.size)
-            return
-        }
-
-        val arguments = arrayOfNulls<Any>(command.parameters.size + 1)
-        arguments[0] = message
-
-        var paramRange = command.parameters.indices
-
-        if (command.ignoreExcessArguments && inputArguments.size > command.parameters.size)
-            paramRange = IntRange(0, command.parameters.size - 1)
-
-        for (i in paramRange) {
-            val parameterClass = command.parameters[i]
-
-            try {
-                arguments[i + 1] = parseArgument(parameterClass, inputArguments[i])
-            } catch (ignored: IllegalArgumentException) {
-                commandWrongParameterType(message, command.name, command.usage, i,
-                        inputArguments[i].javaClass, parameterClass)
-                return
-            }
-        }
-
-        try {
-            command.commandMethod.invoke(instances[command.controllerClass], *arguments)
-        } catch (e: InvocationTargetException) {
-            commandException(message, e.cause)
-        } catch (e: IllegalAccessException) {
-            throw RuntimeException(e)
-        } catch (e: IllegalArgumentException) {
-            commandWrongParameterCount(message, command.name, command.usage, inputArguments.size, command.parameters.size)
-            return
-        }
-    }
-
-    private fun relay(message: Message, logIgnore: Boolean) {
-        if (message.isFromRelayChannel()) {
-            plugin.logDebug("Broadcasting message ${message.id} from Discord to Minecraft as user ${message.author.name}")
-            var alias = plugin.users.data.getString("discordaliases.${message.author.id}.mcusername")
-            if (alias == null) alias = message.author.name.noSpace()
-            plugin.sendToMinecraft(message.content.toMinecraftChatMessage(alias))
-        } else if (logIgnore) plugin.logDebug("Not relaying message ${message.id} from Discord: channel does not match")
-    }
-
-    private fun parseArgument(parameterClass: Class<*>, value: String): Any {
-        try {
-            when (parameterClass) {
-                String::class.java -> return value
-                Int::class.javaPrimitiveType, Int::class.java -> return Integer.valueOf(value)
-                Long::class.javaPrimitiveType, Long::class.java -> return java.lang.Long.valueOf(value)
-                Boolean::class.javaPrimitiveType, Boolean::class.java -> return parseBooleanArgument(value)
-                Float::class.javaPrimitiveType, Float::class.java -> return java.lang.Float.valueOf(value)
-                Double::class.javaPrimitiveType, Double::class.java -> return java.lang.Double.valueOf(value)
-                else -> throw IllegalArgumentException()
-            }
-        } catch (ignored: NumberFormatException) {
-            throw IllegalArgumentException()
-        }
-    }
-
-    private fun parseBooleanArgument(value: String): Boolean {
-        when (value.toLowerCase()) {
-            "yes", "true" -> return true
-            "no", "false" -> return false
-            else -> {
-                val integerValue = Integer.valueOf(value)!!
-                when (integerValue) {
-                    1 -> return true
-                    0 -> return false
-                    else -> throw IllegalArgumentException()
-                }
-            }
-        }
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    private inline fun <reified T : Any> List<*>.checkItemsAre() = if (all { it is T }) this as List<T> else null
-
-    private fun commandNotFound(message: Message, commandName: String) {
-        message.channel.sendMessage(
-                "${message.author.asMention} | I don't seem to have a command called '$commandName'. " +
-                "See '${Connection.JDA.selfUser.asMention} help' ${orPrefixHelp()}for the commands I do have.").queue()
-    }
-
-    private fun commandWrongParameterCount(message: Message, name: String, usage: String, given: Int, required: Int) {
-        message.channel.sendMessage(
-                "${message.author.asMention} | I didn't seem to get the correct number of arguments for that command. " +
-                "I got $given from you, but I need $required. " +
-                "(Usage: $name $usage)").queue()
-    }
-
-    private fun commandWrongParameterType(message: Message, name: String, usage: String, index: Int,
-                                          actualType: Class<*>, expectedType: Class<*>) {
-        message.channel.sendMessage(
-                "${message.author.asMention} | One of the arguments for that command doesn't seem to be the right type. " +
-                "Argument $index seems like ${actualType.simpleName}, but I need ${expectedType.simpleName}. " +
-                "(Usage: $name $usage)").queue()
-    }
-
-    @Suppress("unused")
-    private fun commandRestricted(message: Message) {
-        message.channel.sendMessage("${message.author.asMention} | Sorry, that command is not permitted.").queue()
-    }
-
-    private fun commandException(message: Message, throwable: Throwable?) {
-        plugin.logger.log(Level.SEVERE, "Command with content ${message.content} threw an exception.", throwable)
-        message.channel.sendMessage("${message.author.asMention} | Ouch! That command threw an exception. " +
-                "Sorry about that...").queue()
-    }
-
-    private fun orPrefixHelp(): String = if (cfg.COMMAND_PREFIX != "") "or ${cfg.COMMAND_PREFIX}help " else ""
-
-    private fun Message.isFromRelayChannel():
-            Boolean = guild.id == cfg.SERVER_ID
-            && this.isFromType(ChannelType.TEXT)
-            && this.textChannel.name.equals(cfg.CHANNEL, true)
-
-    data class Command(
-            val name: String,
-            val usage: String,
-            val description: String,
-            val parameters: List<Class<*>>,
-            val relayTriggerMessage: Boolean,
-            val ignoreExcessArguments: Boolean,
-            val controllerClass: Class<*>,
-            val commandMethod: Method
-    )
-}
diff --git a/src/main/kotlin/co/orre/discordbridge/discord/controllers/FunCommandsController.kt b/src/main/kotlin/co/orre/discordbridge/discord/controllers/FunCommandsController.kt
deleted file mode 100644
index e77752e..0000000
--- a/src/main/kotlin/co/orre/discordbridge/discord/controllers/FunCommandsController.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-package co.orre.discordbridge.discord.controllers
-
-import co.orre.discordbridge.CommandLogic
-import co.orre.discordbridge.Config
-import co.orre.discordbridge.Plugin
-import co.orre.discordbridge.discord.interfaces.BotCommand
-import co.orre.discordbridge.discord.interfaces.BotController
-import co.orre.discordbridge.utils.UtilFunctions.toMinecraftChatMessage
-import net.dv8tion.jda.core.entities.Message
-
-class FunCommandsController(val plugin: Plugin) : BotController {
-
-    override fun getDescription(): String = ":balloon:  **FUN** - Every bot has to have them!"
-
-    // 8BALL - consult the Magic 8-Ball to answer your yes or no questions
-    @BotCommand(name = "8ball", usage = "<question>", description = "Consult the Magic 8 Ball")
-    private fun eightBall(message: Message){
-        plugin.logDebug("user ${message.author.name} consults the Magic 8-Ball")
-        dispatchResponse(message, CommandLogic.eightBall(plugin, message.author.asMention))
-    }
-
-    // CHOOSE - chooses between some number of options
-    @BotCommand(name = "choose", usage = "<option>, <option>, ... (delimiters include ',', 'or', '|')",
-            description = "Have the bot choose between given options")
-    private fun choose(message: Message, query: String){
-        plugin.logDebug("user ${message.author.name} needs a choice made")
-        dispatchResponse(message, CommandLogic.choose(message.author.asMention, query))
-    }
-
-    // F - press F to pay respects!
-    @BotCommand(usage="", description = "Press F to pay respects")
-    private fun f(message: Message) {
-        plugin.logDebug("user ${message.author.name} pays respects")
-        dispatchResponse(message, CommandLogic.f(plugin, message.author.asMention))
-    }
-
-    // INSULT - the bot insults something
-    @BotCommand(usage="<thing to insult>", description = "Make the bot insult something for you")
-    private fun insult(message: Message, thingToInsult: String) {
-        plugin.logDebug("user ${message.author.name} requests an insult against '$thingToInsult'")
-        dispatchResponse(message, CommandLogic.insult(plugin, message.author.name, thingToInsult))
-    }
-
-    // RATE - the bot rates something
-    @BotCommand(usage="<thing to be rated>", description = "Have the bot rate something for you")
-    private fun rate(message: Message, thingToRate: String) {
-        plugin.logDebug("user ${message.author.name} requests a rating")
-        dispatchResponse(message, CommandLogic.rate(plugin, message.author.name, thingToRate))
-    }
-
-    // ROLL - roll a die for a random number
-    @BotCommand(name = "roll", usage = "<sides>", description = "Roll a die for a random number")
-    private fun roll(message: Message, sides: Int){
-        plugin.logDebug("user ${message.author.name} needs a choice made")
-        dispatchResponse(message, CommandLogic.roll(message.author.asMention, sides))
-    }
-
-    // TALK - directly speak to Cleverbot (useful for not accidentally invoking other commands)
-    @BotCommand(usage="<say something>", description = "Say something to Cleverbot")
-    private fun talk(message: Message, query: String) {
-        plugin.logDebug("user ${message.author.name} invokes Cleverbot")
-        dispatchResponse(message, CommandLogic.askCleverbot(message.author.asMention, query))
-    }
-
-    private fun dispatchResponse(message: Message, response: String) {
-        plugin.sendToDiscord(response, message.channel)
-
-        if (message.isFromRelayChannel()) {
-            var response1 = plugin.translateAliasToMinecraft(response, message.author.id)
-            response1 = response1.toMinecraftChatMessage(Config.BOT_MC_USERNAME)
-            plugin.sendToMinecraft(response1)
-        }
-    }
-
-    private fun Message.isFromRelayChannel(): Boolean = guild.id == Config.SERVER_ID
-            && this.isFromType(net.dv8tion.jda.core.entities.ChannelType.TEXT)
-            && this.textChannel.name.equals(Config.CHANNEL, true)
-}
diff --git a/src/main/kotlin/co/orre/discordbridge/discord/controllers/UtilCommandsController.kt b/src/main/kotlin/co/orre/discordbridge/discord/controllers/UtilCommandsController.kt
deleted file mode 100644
index 8869130..0000000
--- a/src/main/kotlin/co/orre/discordbridge/discord/controllers/UtilCommandsController.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package co.orre.discordbridge.discord.controllers
-
-import co.orre.discordbridge.Plugin
-import co.orre.discordbridge.discord.interfaces.BotCommand
-import co.orre.discordbridge.discord.interfaces.BotController
-import net.dv8tion.jda.core.entities.ChannelType
-import net.dv8tion.jda.core.entities.Message
-
-class UtilCommandsController(val plugin: Plugin) : BotController {
-
-    override fun getDescription(): String = ":wrench:  **UTIL** - Utility commands"
-
-    // CONFIRM - Confirm an alias
-    @BotCommand(usage="", description="Confirm an alias link request", relayTriggerMessage = false)
-    private fun confirm(message: Message) {
-        if (!message.isFromType(ChannelType.PRIVATE)) return
-        plugin.logDebug("user ${message.author.name} wants to confirm an alias")
-
-        val ua = plugin.requests.find { it.discordId == message.author.id }
-        if (ua == null) {
-            plugin.sendToDiscord("You have not requested an alias, or your request has expired!", message.channel)
-            return
-        }
-
-        plugin.saveAlias(ua)
-        plugin.requests.remove(ua)
-        plugin.sendToDiscord("Successfully linked aliases!", message.channel)
-    }
-
-    @BotCommand(usage="", description="You just used it", relayTriggerMessage = false)
-    private fun help(message: Message, commands: MutableMap<String, BotControllerManager.Command>,
-                     instances: Map<Class<out BotController>, BotController>) {
-        plugin.logDebug("user ${message.author.name} requested help")
-        plugin.sendToDiscord("**DiscordBridge** - Bridge your Minecraft and Discord chats\n**---**", message.channel)
-        var out: String
-        for (bc: BotController in instances.values) {
-            out = bc.getDescription() + "\n```"
-            commands.values.sortedBy { (name) -> name }
-                    .filter { it.controllerClass == bc.javaClass }
-                    .forEach { out += "\n${it.name} ${it.usage}\n  ${it.description}\n" }
-            out += "```"
-            plugin.sendToDiscord(out, message.channel)
-        }
-    }
-
-    // SERVERLIST - List all players currently online on the server
-    @BotCommand(usage="", description = "List all Minecraft players currently online on the server",
-            relayTriggerMessage = false)
-    private fun serverList(message: Message) {
-        plugin.logDebug("user ${message.author.name} has requested a listing of online players")
-
-        val players = plugin.getOnlinePlayers()
-        if (players.isEmpty()) {
-            plugin.sendToDiscord("Nobody is currently online.", message.channel)
-            return
-        }
-
-        val response = players.joinToString("\n", "The following players are currently online:\n```\n", "\n```")
-        plugin.sendToDiscord(response, message.channel)
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/co/orre/discordbridge/discord/interfaces/BotController.kt b/src/main/kotlin/co/orre/discordbridge/discord/interfaces/BotController.kt
deleted file mode 100644
index fe5492c..0000000
--- a/src/main/kotlin/co/orre/discordbridge/discord/interfaces/BotController.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package co.orre.discordbridge.discord.interfaces
-
-// Todo: Apache License
-
-interface BotController{
-    fun getDescription(): String
-}
diff --git a/src/main/kotlin/co/orre/discordbridge/minecraft/EventListener.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/EventListener.kt
index 582ae7a..582cf39 100644
--- a/src/main/kotlin/co/orre/discordbridge/minecraft/EventListener.kt
+++ b/src/main/kotlin/co/orre/discordbridge/minecraft/EventListener.kt
@@ -1,18 +1,15 @@
 package co.orre.discordbridge.minecraft
 
-import co.orre.discordbridge.utils.UtilFunctions.stripColor
-import co.orre.discordbridge.utils.UtilFunctions.noSpace
-import co.orre.discordbridge.CommandLogic
 import co.orre.discordbridge.Config
 import co.orre.discordbridge.Plugin
+import co.orre.discordbridge.commands.AsyncPlayerChatEventWrapper
+import co.orre.discordbridge.commands.controllers.BotControllerManager
+import co.orre.discordbridge.commands.controllers.FunCommandsController
 import co.orre.discordbridge.discord.Connection
-import co.orre.discordbridge.minecraft.controllers.BotControllerManager
-import co.orre.discordbridge.minecraft.controllers.FunCommandsController
-import co.orre.discordbridge.utils.UtilFunctions.toDiscordChatMessage
+import co.orre.discordbridge.utils.UtilFunctions.stripColor
 import co.orre.discordbridge.utils.UtilFunctions.toDiscordPlayerDeath
 import co.orre.discordbridge.utils.UtilFunctions.toDiscordPlayerJoin
 import co.orre.discordbridge.utils.UtilFunctions.toDiscordPlayerLeave
-import co.orre.discordbridge.utils.UtilFunctions.toMinecraftChatMessage
 import org.bukkit.event.EventHandler
 import org.bukkit.event.EventPriority
 import org.bukkit.event.Listener
@@ -21,59 +18,28 @@ import org.bukkit.event.player.AsyncPlayerChatEvent
 import org.bukkit.event.player.PlayerJoinEvent
 import org.bukkit.event.player.PlayerQuitEvent
 import org.bukkit.ChatColor as CC
-import java.lang.reflect.Method
 
 class EventListener(val plugin: Plugin): Listener {
 
     val controllerManager = BotControllerManager(plugin)
 
-    init {
-        controllerManager.registerController(FunCommandsController(plugin))
-    }
+    init { controllerManager.registerController(FunCommandsController(plugin), chatExclusive = true) }
 
     @EventHandler(priority = EventPriority.MONITOR)
     fun onChat(event: AsyncPlayerChatEvent) {
-
         plugin.logDebug("Received a chat event from ${event.player.name}: ${event.message}")
         if (!Config.MESSAGES_CHAT) return
         if (event.isCancelled && !Config.RELAY_CANCELLED_MESSAGES) return
         if (event.player.hasMetadata("vanished") && event.player.getMetadata("vanished")[0].asBoolean() &&
                 !Config.IF_VANISHED_CHAT) return
 
-        // Get world alias if Multiverse is installed
-//        if (plugin.isMultiverseInstalled) {
-//            val worldProperties = plugin.worlds!!.data.get("worlds.$worldname")
-//            val cls = Class.forName("com.onarandombox.MultiverseCore.WorldProperties")
-//            val meth: Method = cls.getMethod("getAlias")
-//            val alias = meth.invoke(worldProperties)
-//            if (alias is String) worldname = alias
-//        }
-
-        controllerManager.dispatchMessage(event)
-
-        var formattedMessage = message.toDiscordChatMessage(username, displayName, worldname)
-        formattedMessage = plugin.convertAtMentions(formattedMessage)
-        formattedMessage = plugin.translateAliasToDiscord(formattedMessage, uuid)
-        plugin.sendToDiscord(formattedMessage, Connection.getRelayChannel())
-
-        // If it was a @mention to the bot, treat it as a Cleverbot invocation
-        val task = Runnable {
-            if (Permissions.cleverbot.has(player)) {
-                val arg: String = message.removePrefix("@" + Config.USERNAME.noSpace()).trimStart()
-                val response = CommandLogic.askCleverbot(arg)
-                plugin.sendToMinecraft(response.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
-                plugin.sendToDiscord(response, Connection.getRelayChannel())
-            } else
-                player.sendMessage("${org.bukkit.ChatColor.RED}You do not have permission to talk to the bot.")
-        }
-        plugin.server.scheduler.runTaskAsynchronously(plugin, task)
+        plugin.server.scheduler.runTaskAsynchronously(plugin, { controllerManager.dispatchMessage(AsyncPlayerChatEventWrapper(event)) })
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     fun onPlayerJoin(event: PlayerJoinEvent) {
         val player = event.player
         val username = event.player.name.stripColor()
-        val uuid = event.player.uniqueId.toString()
 
         plugin.logDebug("Received a join event for $username")
         if (!Config.MESSAGES_JOIN) return
@@ -81,7 +47,7 @@ class EventListener(val plugin: Plugin): Listener {
                 !Config.IF_VANISHED_JOIN) return
 
         var formattedMessage = player.toDiscordPlayerJoin()
-        formattedMessage = plugin.translateAliasToDiscord(formattedMessage, uuid)
+        formattedMessage = plugin.translateAliasesToDiscord(formattedMessage)
         plugin.sendToDiscord(formattedMessage, Connection.getRelayChannel())
     }
 
@@ -89,7 +55,6 @@ class EventListener(val plugin: Plugin): Listener {
     fun onPlayerQuit(event: PlayerQuitEvent) {
         val player = event.player
         val username = event.player.name.stripColor()
-        val uuid = event.player.uniqueId.toString()
 
         plugin.logDebug("Received a leave event for $username")
         if (!Config.MESSAGES_LEAVE) return
@@ -97,7 +62,7 @@ class EventListener(val plugin: Plugin): Listener {
                 !Config.IF_VANISHED_LEAVE) return
 
         var formattedMessage = player.toDiscordPlayerLeave()
-        formattedMessage = plugin.translateAliasToDiscord(formattedMessage, uuid)
+        formattedMessage = plugin.translateAliasesToDiscord(formattedMessage)
         plugin.sendToDiscord(formattedMessage, Connection.getRelayChannel())
     }
 
@@ -105,8 +70,6 @@ class EventListener(val plugin: Plugin): Listener {
     fun onPlayerDeath(event: PlayerDeathEvent) {
         val player = event.entity
         val username = event.entity.name.stripColor()
-        val displayName = event.entity.displayName.stripColor()
-        val uuid = event.entity.uniqueId.toString()
         val deathMessage = event.deathMessage
 
         plugin.logDebug("Received a death event for $username")
@@ -114,8 +77,8 @@ class EventListener(val plugin: Plugin): Listener {
         if (player.hasMetadata("vanished") && player.getMetadata("vanished")[0].asBoolean() &&
                 !Config.IF_VANISHED_DEATH) return
 
-        var formattedMessage = deathMessage.toDiscordPlayerDeath(username, displayName)
-        formattedMessage = plugin.translateAliasToDiscord(formattedMessage, uuid)
+        var formattedMessage = deathMessage.toDiscordPlayerDeath(username)
+        formattedMessage = plugin.translateAliasesToDiscord(formattedMessage)
         plugin.sendToDiscord(formattedMessage, Connection.getRelayChannel())
     }
 }
diff --git a/src/main/kotlin/co/orre/discordbridge/minecraft/commands/CommandListener.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/commands/CommandListener.kt
index 92e8f76..fd79ad1 100644
--- a/src/main/kotlin/co/orre/discordbridge/minecraft/commands/CommandListener.kt
+++ b/src/main/kotlin/co/orre/discordbridge/minecraft/commands/CommandListener.kt
@@ -14,12 +14,12 @@ class CommandListener(val plugin: Plugin) : CommandExecutor {
     val controllerManager = BotControllerManager(plugin)
 
     init {
-        controllerManager.registerController(FunCommandsController(plugin), discordExclusive = true, chatExclusive = true)
-        controllerManager.registerController(UtilCommandsController(plugin), discordExclusive = true, chatExclusive = true)
+        controllerManager.registerController(FunCommandsController(plugin), minecraftExclusive = true)
+        controllerManager.registerController(UtilCommandsController(plugin), minecraftExclusive = true)
     }
 
     override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array<out String>): Boolean {
-        return controllerManager.dispatchMessage(MinecraftCommandWrapper(plugin, sender, command, args))
+        return controllerManager.dispatchMessage(MinecraftCommandWrapper(sender, command, args))
     }
 
 }
\ No newline at end of file
diff --git a/src/main/kotlin/co/orre/discordbridge/minecraft/commands/EightBall.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/commands/EightBall.kt
deleted file mode 100644
index 757796e..0000000
--- a/src/main/kotlin/co/orre/discordbridge/minecraft/commands/EightBall.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package co.orre.discordbridge.minecraft.commands
-
-import co.orre.discordbridge.CommandLogic
-import co.orre.discordbridge.Config
-import co.orre.discordbridge.minecraft.Permissions
-import co.orre.discordbridge.Plugin
-import co.orre.discordbridge.discord.Connection
-import co.orre.discordbridge.utils.UtilFunctions.toMinecraftChatMessage
-import org.bukkit.command.Command
-import org.bukkit.command.CommandExecutor
-import org.bukkit.command.CommandSender
-import org.bukkit.entity.Player
-
-class EightBall(val plugin: Plugin) : CommandExecutor {
-    override fun onCommand(player: CommandSender, cmd: Command, alias: String?, args: Array<out String>?): Boolean {
-        if (args == null || args.isEmpty()) {
-            if (player is Player && Permissions.eightball.has(player)) {
-                var msg = "@" + CommandLogic.eightBall(plugin, player.name)
-                plugin.sendToMinecraft(msg.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
-                msg = plugin.translateAliasToDiscord(msg, player.uniqueId.toString())
-                plugin.sendToDiscord(msg, Connection.getRelayChannel())
-            }
-            return true
-        }
-        return false
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/co/orre/discordbridge/minecraft/commands/F.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/commands/F.kt
deleted file mode 100644
index 15da95a..0000000
--- a/src/main/kotlin/co/orre/discordbridge/minecraft/commands/F.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-package co.orre.discordbridge.minecraft.commands
-
-import co.orre.discordbridge.CommandLogic
-import co.orre.discordbridge.Config
-import co.orre.discordbridge.minecraft.Permissions
-import co.orre.discordbridge.Plugin
-import co.orre.discordbridge.discord.Connection
-import co.orre.discordbridge.utils.UtilFunctions.toMinecraftChatMessage
-import org.bukkit.command.Command
-import org.bukkit.command.CommandExecutor
-import org.bukkit.command.CommandSender
-import org.bukkit.entity.Player
-
-class F(val plugin: Plugin) : CommandExecutor {
-    override fun onCommand(player: CommandSender, cmd: Command, alias: String?, args: Array<out String>?): Boolean {
-        if (args == null || args.isEmpty()) {
-            if (player is Player && Permissions.f.has(player)) {
-                var msg = CommandLogic.f(plugin, player.name)
-                plugin.sendToMinecraft(msg.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
-                msg = plugin.translateAliasToDiscord(msg, player.uniqueId.toString())
-                plugin.sendToDiscord(msg, Connection.getRelayChannel())
-            }
-            return true
-        }
-        return false
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/co/orre/discordbridge/minecraft/commands/Insult.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/commands/Insult.kt
deleted file mode 100644
index 91dd433..0000000
--- a/src/main/kotlin/co/orre/discordbridge/minecraft/commands/Insult.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package co.orre.discordbridge.minecraft.commands
-
-import co.orre.discordbridge.CommandLogic
-import co.orre.discordbridge.Config
-import co.orre.discordbridge.minecraft.Permissions
-import co.orre.discordbridge.Plugin
-import co.orre.discordbridge.discord.Connection
-import co.orre.discordbridge.utils.UtilFunctions.toMinecraftChatMessage
-import org.bukkit.command.Command
-import org.bukkit.command.CommandExecutor
-import org.bukkit.command.CommandSender
-import org.bukkit.entity.Player
-
-class Insult(val plugin: Plugin) : CommandExecutor {
-    override fun onCommand(player: CommandSender, cmd: Command, alias: String?, args: Array<out String>?): Boolean {
-        if (args == null || args.isEmpty()) return false
-
-        if (player is Player && Permissions.insult.has(player)) {
-            var msg = CommandLogic.insult(plugin, player.name, args.joinToString(" "))
-            plugin.sendToMinecraft(msg.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
-            msg = plugin.translateAliasToDiscord(msg, player.uniqueId.toString())
-            plugin.sendToDiscord(msg, Connection.getRelayChannel())
-        }
-        return true
-    }
-}
\ No newline at end of file
diff --git a/src/main/kotlin/co/orre/discordbridge/minecraft/commands/Rate.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/commands/Rate.kt
deleted file mode 100644
index 9176b86..0000000
--- a/src/main/kotlin/co/orre/discordbridge/minecraft/commands/Rate.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package co.orre.discordbridge.minecraft.commands
-
-import co.orre.discordbridge.CommandLogic
-import co.orre.discordbridge.Config
-import co.orre.discordbridge.minecraft.Permissions
-import co.orre.discordbridge.Plugin
-import co.orre.discordbridge.discord.Connection
-import co.orre.discordbridge.utils.UtilFunctions.toMinecraftChatMessage
-import org.bukkit.command.Command
-import org.bukkit.command.CommandExecutor
-import org.bukkit.command.CommandSender
-import org.bukkit.entity.Player
-
-class Rate(val plugin: Plugin) : CommandExecutor {
-    override fun onCommand(player: CommandSender, cmd: Command, alias: String?, args: Array<out String>?): Boolean {
-        if (args == null || args.isEmpty()) return false
-
-        if (player is Player && Permissions.rate.has(player)) {
-            var msg = CommandLogic.rate(plugin, player.name, args.joinToString(" "))
-            plugin.sendToMinecraft(msg.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
-            msg = plugin.translateAliasToDiscord(msg, player.uniqueId.toString())
-            plugin.sendToDiscord(msg, Connection.getRelayChannel())
-        }
-        return true
-    }
-}
diff --git a/src/main/kotlin/co/orre/discordbridge/minecraft/interfaces/BotCommand.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/interfaces/BotCommand.kt
deleted file mode 100644
index c2d3915..0000000
--- a/src/main/kotlin/co/orre/discordbridge/minecraft/interfaces/BotCommand.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package co.orre.discordbridge.minecraft.interfaces
-
-// TODO: Apache License
-
-@Target(AnnotationTarget.FUNCTION)
-@Retention(AnnotationRetention.RUNTIME)
-annotation class BotCommand(val usage: String, val description: String, val name: String = "",
-                            val relayTriggerMessage: Boolean = true, val ignoreExcessArguments: Boolean = true)
diff --git a/src/main/kotlin/co/orre/discordbridge/minecraft/interfaces/BotController.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/interfaces/BotController.kt
deleted file mode 100644
index f955b94..0000000
--- a/src/main/kotlin/co/orre/discordbridge/minecraft/interfaces/BotController.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package co.orre.discordbridge.minecraft.interfaces
-
-// Todo: Apache License
-
-interface BotController{
-    fun getDescription(): String
-}
diff --git a/src/main/kotlin/co/orre/discordbridge/utils/UserAlias.kt b/src/main/kotlin/co/orre/discordbridge/utils/UserAlias.kt
index 698aa2e..132f45d 100644
--- a/src/main/kotlin/co/orre/discordbridge/utils/UserAlias.kt
+++ b/src/main/kotlin/co/orre/discordbridge/utils/UserAlias.kt
@@ -2,18 +2,17 @@ package co.orre.discordbridge.utils
 
 import org.bukkit.configuration.serialization.ConfigurationSerializable
 import org.bukkit.configuration.serialization.SerializableAs
-
-//data class UserAlias(var mcUsername: String, var mcUuid: String, var discordUsername: String, var discordId: String)
+import java.util.*
 
 //TODO: make null safe
 @SerializableAs("UserAlias")
-data class UserAlias(val mcUuid: String, val discordId: String): ConfigurationSerializable {
+data class UserAlias(val mcUuid: UUID, val discordId: String): ConfigurationSerializable {
     @Suppress("unused")
     constructor(map: MutableMap<String, Any>):
-            this(map["mcUuid"] as String, map["discordId"] as String)
+            this(UUID.fromString(map["mcUuid"] as String), map["discordId"] as String)
 
     override fun serialize(): MutableMap<String, Any> {
-        return mutableMapOf("mcUuid" to mcUuid, "discordId" to discordId)
+        return mutableMapOf("mcUuid" to mcUuid.toString(), "discordId" to discordId)
     }
 
 }
\ No newline at end of file
diff --git a/src/main/kotlin/co/orre/discordbridge/utils/UtilFunctions.kt b/src/main/kotlin/co/orre/discordbridge/utils/UtilFunctions.kt
index 5857997..e8ebc5c 100644
--- a/src/main/kotlin/co/orre/discordbridge/utils/UtilFunctions.kt
+++ b/src/main/kotlin/co/orre/discordbridge/utils/UtilFunctions.kt
@@ -18,32 +18,29 @@ object UtilFunctions {
     }
 
     @JvmStatic
-    fun String.toDiscordChatMessage(username: String, displayName: String, worldName: String): String {
-        return formatMessage(Config.TEMPLATES_DISCORD_CHAT_MESSAGE, msg = this, u = username, d = displayName, w = worldName)
+    fun String.toDiscordChatMessage(username: String, worldName: String): String {
+        return formatMessage(Config.TEMPLATES_DISCORD_CHAT_MESSAGE, msg = this, u = username, w = worldName)
     }
 
     @JvmStatic
     fun Player.toDiscordPlayerJoin(): String {
-        return formatMessage(Config.TEMPLATES_DISCORD_PLAYER_JOIN, u = this.name.stripColor(),
-                d = this.displayName.stripColor())
+        return formatMessage(Config.TEMPLATES_DISCORD_PLAYER_JOIN, u = this.name.stripColor())
     }
 
     @JvmStatic
     fun Player.toDiscordPlayerLeave(): String {
-        return formatMessage(Config.TEMPLATES_DISCORD_PLAYER_LEAVE, u = this.name.stripColor(),
-                d = this.displayName.stripColor())
+        return formatMessage(Config.TEMPLATES_DISCORD_PLAYER_LEAVE, u = this.name.stripColor())
     }
 
     @JvmStatic
-    fun String.toDiscordPlayerDeath(username: String, displayName: String): String {
-        return formatMessage(Config.TEMPLATES_DISCORD_CHAT_MESSAGE, msg = this, u = username, d = displayName)
+    fun String.toDiscordPlayerDeath(username: String): String {
+        return formatMessage(Config.TEMPLATES_DISCORD_CHAT_MESSAGE, msg = this, u = username)
     }
 
     @JvmStatic
-    private fun formatMessage(template: String, msg: String = "N/A", u: String = "N/A", d: String = "N/A",
-                              w: String = "N/A"): String {
+    private fun formatMessage(template: String, msg: String = "N/A", u: String = "N/A", w: String = "N/A"): String {
         var out = org.bukkit.ChatColor.translateAlternateColorCodes('&', template)
-        out = out.replace("%u", u).replace("%m", msg).replace("%d", d).replace("%w", w)
+        out = out.replace("%u", u).replace("%m", msg).replace("%w", w)
         return out
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/insult.yml b/src/main/resources/insult.yml
index a2c0fb3..c6fbe51 100644
--- a/src/main/resources/insult.yml
+++ b/src/main/resources/insult.yml
@@ -1,11 +1,5 @@
 # Insult Config
 
-# The template for the response of the Insult command
-# '%u' = the name of the command sender
-# '%t' = whatever is being insulted
-# '%i' = the insult message
-template: '%t - %i'
-
 # A list of possible responses to the Insult command
 responses:
 - "I hate you so much I can't even breathe."

From 3dcd078469dfc805b87649e7eeefabd1dbe74da6 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Fri, 7 Apr 2017 08:45:19 -0500
Subject: [PATCH 20/24] fixed no commands; some commands are still spotty

---
 .../kotlin/co/orre/discordbridge/Plugin.kt    |  2 +-
 .../co/orre/discordbridge/UserAliasConfig.kt  |  6 ++++--
 .../discordbridge/commands/MessageWrapper.kt  |  3 ++-
 .../controllers/BotControllerManager.kt       | 17 +++++++--------
 src/main/resources/plugin.yml                 | 21 ++++++++++++++++---
 src/main/resources/usernames.yml              |  3 +--
 6 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/src/main/kotlin/co/orre/discordbridge/Plugin.kt b/src/main/kotlin/co/orre/discordbridge/Plugin.kt
index 7ab6327..ca49b51 100644
--- a/src/main/kotlin/co/orre/discordbridge/Plugin.kt
+++ b/src/main/kotlin/co/orre/discordbridge/Plugin.kt
@@ -146,7 +146,7 @@ class Plugin : JavaPlugin() {
         //val ua: UserAlias = UserAlias(player.name, player.uniqueId.toString(), found.effectiveName, found.user.id)
         val ua: UserAlias = UserAlias(player.uniqueId, found.user.id)
         requests.add(ua)
-        val msg = "Minecraft user '${server.getOfflinePlayer(ua.mcUuid)}' has requested to become associated with your Discord" +
+        val msg = "Minecraft user '${server.getOfflinePlayer(ua.mcUuid).name}' has requested to become associated with your Discord" +
                 " account. If this is you, respond '${Connection.JDA.selfUser.asMention} confirm'. If this is not" +
                 " you, respond ${Connection.JDA.selfUser.asMention} deny'."
         Connection.send(msg, Connection.JDA.getUserById(ua.discordId).privateChannel)
diff --git a/src/main/kotlin/co/orre/discordbridge/UserAliasConfig.kt b/src/main/kotlin/co/orre/discordbridge/UserAliasConfig.kt
index 8df839b..922830a 100644
--- a/src/main/kotlin/co/orre/discordbridge/UserAliasConfig.kt
+++ b/src/main/kotlin/co/orre/discordbridge/UserAliasConfig.kt
@@ -6,8 +6,10 @@ object UserAliasConfig {
     var aliases: List<UserAlias> = mutableListOf()
 
     fun load(plugin: Plugin) {
-        aliases = plugin.users.data.getList("aliases").checkItemsAre<UserAlias>()
-            ?: throw IllegalStateException("usernames.yml could not be read - list items are not properly formatted")
+        val list = plugin.users.data.getList("aliases")
+        if (list != null) aliases = list.checkItemsAre<UserAlias>() ?:
+                throw IllegalStateException("usernames.yml could not be read - list items are not properly formatted")
+        else mutableListOf<UserAlias>()
     }
 
     fun add(plugin: Plugin, ua: UserAlias) {
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/MessageWrapper.kt b/src/main/kotlin/co/orre/discordbridge/commands/MessageWrapper.kt
index 3e6891d..8ae0429 100644
--- a/src/main/kotlin/co/orre/discordbridge/commands/MessageWrapper.kt
+++ b/src/main/kotlin/co/orre/discordbridge/commands/MessageWrapper.kt
@@ -14,7 +14,8 @@ class MessageWrapper(val originalMessage: Message) : IEventWrapper {
         get() = originalMessage.channel
 
     override val isFromRelayChannel: Boolean
-        get() = originalMessage.guild.id == Config.SERVER_ID
+        get() = if (originalMessage.isFromType(ChannelType.PRIVATE)) false
+                else originalMessage.guild.id == Config.SERVER_ID
                 && originalMessage.isFromType(ChannelType.TEXT)
                 && originalMessage.textChannel.name.equals(Config.CHANNEL, true)
 
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/controllers/BotControllerManager.kt b/src/main/kotlin/co/orre/discordbridge/commands/controllers/BotControllerManager.kt
index a2490bf..b16f04f 100644
--- a/src/main/kotlin/co/orre/discordbridge/commands/controllers/BotControllerManager.kt
+++ b/src/main/kotlin/co/orre/discordbridge/commands/controllers/BotControllerManager.kt
@@ -9,7 +9,6 @@ import co.orre.discordbridge.utils.Script
 import co.orre.discordbridge.utils.UtilFunctions.stripColor
 import co.orre.discordbridge.utils.UtilFunctions.toDiscordChatMessage
 import co.orre.discordbridge.utils.UtilFunctions.toMinecraftChatMessage
-import net.dv8tion.jda.core.entities.Message
 import java.lang.reflect.Method
 import java.util.*
 import java.util.logging.Level
@@ -42,7 +41,7 @@ class BotControllerManager(val plugin: Plugin) {
         val usage = annotation.usage
         val methodParameters = method.parameters
 
-        if (methodParameters.isEmpty() || !methodParameters[0].type.isAssignableFrom(Message::class.java)) return
+        if (methodParameters.isEmpty() || !methodParameters[0].type.isAssignableFrom(IEventWrapper::class.java)) return
 
         method.isAccessible = true
         val parameters = (1..methodParameters.size - 1).mapTo(ArrayList<Class<*>>()) { methodParameters[it].type }
@@ -54,7 +53,6 @@ class BotControllerManager(val plugin: Plugin) {
     }
 
     fun dispatchMessage(event: IEventWrapper): Boolean {
-
         // Short circuit if event was a Minecraft command
         if (event is MinecraftCommandWrapper) {
             val command = commands[event.command.name]
@@ -89,6 +87,7 @@ class BotControllerManager(val plugin: Plugin) {
         }
 
         // @<mention> command
+        //TODO: Support bot mentions from Minecraft
         if (args[0] == Connection.JDA.selfUser.asMention && args.count() == 2) {
             val args2 = args[1].split("\\s+".toRegex(), 2).toTypedArray()
             val commandName = args2[0].toLowerCase()
@@ -203,7 +202,7 @@ class BotControllerManager(val plugin: Plugin) {
                     commandWrongParameterCount(event, command.name, command.usage, 2, command.parameters.size)
                     return false
                 } catch (e: Exception) {
-                    commandException(event, e.cause)
+                    commandException(event, e)
                     return true
                 }
             }
@@ -246,7 +245,7 @@ class BotControllerManager(val plugin: Plugin) {
             commandWrongParameterCount(event, command.name, command.usage, inputArguments.size, command.parameters.size)
             return false
         } catch (e: Exception) {
-            commandException(event, e.cause)
+            commandException(event, e)
             return true
         }
 
@@ -440,20 +439,20 @@ class BotControllerManager(val plugin: Plugin) {
         }
     }
 
-    private fun commandException(event: IEventWrapper, throwable: Throwable?) {
+    private fun commandException(event: IEventWrapper, throwable: Throwable) {
         plugin.logger.log(Level.SEVERE, "Command with content ${event.rawMessage} threw an exception.", throwable)
         when (event) {
             is MessageWrapper ->
                 event.channel.sendMessage(
-                        "${event.senderAsMention} | Ouch! That command threw an exception. Sorry about that..." +
+                        "${event.senderAsMention} | Ouch! That command threw an exception. Sorry about that... " +
                                 "Have an admin check the logs for more info.").queue()
             is AsyncPlayerChatEventWrapper ->
                 event.event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
-                        "Ouch! That command threw an exception. Sorry about that..." +
+                        "Ouch! That command threw an exception. Sorry about that... " +
                         "Have an admin check the logs for more info.")
             is MinecraftCommandWrapper ->
                 event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
-                        "Ouch! That command threw an exception. Sorry about that..." +
+                        "Ouch! That command threw an exception. Sorry about that... " +
                         "Have an admin check the logs for more info.")
         }
     }
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 9925a3d..dd26fe0 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -14,7 +14,7 @@ permissions:
   discordbridge.reload:
     description: Reload the Discord Bridge
     default: op
-  discordbridge.cleverbot:
+  discordbridge.talk:
     description: Determines whether this user can talk to Cleverbot
     default: true
   discordbridge.f:
@@ -29,6 +29,12 @@ permissions:
   discordbridge.insult:
     description: Determines whether this user can use the insult command
     default: op
+  discordbridge.choose:
+    description: Determines whether this user can use the choose command
+    default: true
+  discordbridge.roll:
+    description: Determines whether this user can use the roll command
+    default: true
 
 commands:
   8ball:
@@ -44,5 +50,14 @@ commands:
     description: Have the bot rate something for you
     usage: /rate <thing to be rated>
   insult:
-    description: Have the bot insult someone for your
-    usage: /insult <thing to insult>
\ No newline at end of file
+    description: Have the bot insult someone for you
+    usage: /insult <thing to insult>
+  choose:
+    description: Have the bot make a choice for you
+    usage: /choose <option1> or <option2> or ...
+  roll:
+    description: The bot rolls a die with a specified number of sides
+    usage: /roll <sides>
+  talk:
+    description: Talk to Cleverbot!
+    usage: /talk <say something>
\ No newline at end of file
diff --git a/src/main/resources/usernames.yml b/src/main/resources/usernames.yml
index 6da9d82..cea2b93 100644
--- a/src/main/resources/usernames.yml
+++ b/src/main/resources/usernames.yml
@@ -1,2 +1 @@
-mcaliases:
-discordaliases:
\ No newline at end of file
+aliases:
\ No newline at end of file

From d0dd5c0161250f8ec00c8e52e0baafe66b4cdd49 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Sun, 9 Apr 2017 01:38:17 -0500
Subject: [PATCH 21/24] Build is now mostly stable on the new system

---
 build.gradle                                  |   1 +
 .../kotlin/co/orre/discordbridge/Plugin.kt    |  86 ++++-----
 .../co/orre/discordbridge/UserAliasConfig.kt  |   8 +
 .../controllers/BotControllerManager.kt       |  46 +++--
 .../controllers/FunCommandsController.kt      |   2 +-
 .../controllers/UtilCommandsController.kt     | 169 ++++++++++++++----
 .../orre/discordbridge/discord/Connection.kt  |  18 +-
 .../{commands => }/CommandListener.kt         |   2 +-
 .../discordbridge/minecraft/EventListener.kt  |   6 +-
 .../discordbridge/minecraft/Permissions.kt    |  16 --
 .../minecraft/commands/Discord.kt             | 100 -----------
 src/main/resources/plugin.yml                 |  15 +-
 12 files changed, 249 insertions(+), 220 deletions(-)
 rename src/main/kotlin/co/orre/discordbridge/minecraft/{commands => }/CommandListener.kt (95%)
 delete mode 100644 src/main/kotlin/co/orre/discordbridge/minecraft/Permissions.kt
 delete mode 100644 src/main/kotlin/co/orre/discordbridge/minecraft/commands/Discord.kt

diff --git a/build.gradle b/build.gradle
index 80c1ac1..5064f08 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,6 +42,7 @@ dependencies {
     compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '1.0.0-rc-1036'
     compile group: 'net.dv8tion', name: 'JDA', version: '3.0.BETA2_108'
     compile group: 'com.michaelwflaherty', name: 'cleverbotapi', version: '1.0.1'
+    compile group: 'org.pegdown', name:'pegdown', version: '1.6.0'
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
diff --git a/src/main/kotlin/co/orre/discordbridge/Plugin.kt b/src/main/kotlin/co/orre/discordbridge/Plugin.kt
index ca49b51..058bccf 100644
--- a/src/main/kotlin/co/orre/discordbridge/Plugin.kt
+++ b/src/main/kotlin/co/orre/discordbridge/Plugin.kt
@@ -1,9 +1,8 @@
 package co.orre.discordbridge
 
 import co.orre.discordbridge.discord.Connection
+import co.orre.discordbridge.minecraft.CommandListener
 import co.orre.discordbridge.minecraft.EventListener
-import co.orre.discordbridge.minecraft.commands.CommandListener
-import co.orre.discordbridge.minecraft.commands.Discord
 import co.orre.discordbridge.utils.Rating
 import co.orre.discordbridge.utils.Respect
 import co.orre.discordbridge.utils.Script
@@ -38,6 +37,12 @@ class Plugin : JavaPlugin() {
         get() = server.pluginManager.getPlugin("Multiverse-Core") != null
 
     override fun onEnable() {
+
+        ConfigurationSerialization.registerClass(Respect::class.java, "Respect")
+        ConfigurationSerialization.registerClass(Rating::class.java, "Rating")
+        ConfigurationSerialization.registerClass(Script::class.java, "Script")
+        ConfigurationSerialization.registerClass(UserAlias::class.java, "UserAlias")
+
         // Load configs
         updateConfig(description.version)
         if (isMultiverseInstalled) worlds = DataConfigAccessor(this, File("plugins/Multiverse-Core"), "worlds.yml")
@@ -49,7 +54,7 @@ class Plugin : JavaPlugin() {
 
         // Register commands
         //TODO: automate this?
-        getCommand("discord").executor = Discord(this) //TODO: move this to Reflection
+        getCommand("discord").executor = CommandListener(this)
         getCommand("f").executor = CommandListener(this)
         getCommand("rate").executor = CommandListener(this)
         getCommand("8ball").executor = CommandListener(this)
@@ -57,10 +62,6 @@ class Plugin : JavaPlugin() {
         getCommand("choose").executor = CommandListener(this)
         getCommand("talk").executor = CommandListener(this)
         getCommand("roll").executor = CommandListener(this)
-
-        ConfigurationSerialization.registerClass(Respect::class.java, "Respect")
-        ConfigurationSerialization.registerClass(Rating::class.java, "Rating")
-        ConfigurationSerialization.registerClass(Script::class.java, "Script")
     }
 
     override fun onDisable() {
@@ -91,8 +92,8 @@ class Plugin : JavaPlugin() {
       Util
     ===========================================*/
 
-    // Reload configs
-    fun reload() {
+    // Reloads everything
+    fun reload(callback: Runnable) {
         reloadConfig()
         users.reloadConfig()
         eightball.reloadConfig()
@@ -103,7 +104,7 @@ class Plugin : JavaPlugin() {
         if (isMultiverseInstalled) worlds!!.reloadConfig()
         Config.load(this)
         UserAliasConfig.load(this)
-        Connection.reconnect()
+        Connection.reconnect(callback)
     }
 
     // Save default config
@@ -139,66 +140,66 @@ class Plugin : JavaPlugin() {
     }
 
     // Open a request to link a Minecraft user with a Discord user
-    fun registerUserRequest(player: Player, discordId: String): Boolean {
+    fun registerUserRequest(player: Player, discriminator: String): Member? {
         val users = Connection.listUsers()
-        val found: Member = users.find { it.user.id == discordId } ?: return false
+        val found: Member = users.find { it.user.name + "#" + it.user.discriminator == discriminator } ?: return null
 
-        //val ua: UserAlias = UserAlias(player.name, player.uniqueId.toString(), found.effectiveName, found.user.id)
         val ua: UserAlias = UserAlias(player.uniqueId, found.user.id)
         requests.add(ua)
         val msg = "Minecraft user '${server.getOfflinePlayer(ua.mcUuid).name}' has requested to become associated with your Discord" +
                 " account. If this is you, respond '${Connection.JDA.selfUser.asMention} confirm'. If this is not" +
                 " you, respond ${Connection.JDA.selfUser.asMention} deny'."
-        Connection.send(msg, Connection.JDA.getUserById(ua.discordId).privateChannel)
-        return true
+        val member = Connection.JDA.getUserById(ua.discordId)
+        member.openPrivateChannel().queue({p -> p.sendMessage(msg).queue()})
+        return found
     }
 
     // Return a formatted string listing the Discord IDs of all Discord users in the relay channel
-    fun getDiscordIds(): String {
+    fun getDiscordMembersAll(): String {
         val users = Connection.listUsers()
 
         if (users.isEmpty())
-            return "${org.bukkit.ChatColor.YELLOW}No Discord members could be found. Either server is empty or an error has occurred."
+            return "${CC.YELLOW}No Discord members could be found. Either server is empty or an error has occurred."
 
-        var response = "${org.bukkit.ChatColor.YELLOW}Discord users:"
+        var response = "${CC.YELLOW}Discord users:"
         for (user in users) {
-            if (user.user.isBot) response += "\n${org.bukkit.ChatColor.GOLD}- ${user.effectiveName} (Bot), ${user.user.id}${org.bukkit.ChatColor.RESET}"
-            else response += "\n${org.bukkit.ChatColor.YELLOW}- ${user.effectiveName}, ${user.user.id}${org.bukkit.ChatColor.RESET}"
+            if (user.user.isBot) response += "\n${CC.GOLD}- ${user.effectiveName} (Bot) | ${user.user.name}#${user.user.discriminator}${CC.RESET}"
+            else response += "\n${CC.YELLOW}- ${user.effectiveName} | ${user.user.name}#${user.user.discriminator}${CC.RESET}"
         }
-        return response
+        return response.trim()
     }
 
     // Return a formatted string listing all Discord users in the relay channel who are visibly available
-    fun getDiscordOnline(): String {
+    fun getDiscordMembersOnline(): String {
         val onlineUsers = Connection.listOnline()
         if (onlineUsers.isEmpty())
-            return "${org.bukkit.ChatColor.YELLOW}No Discord members could be found. Either server is empty or an error has occurred."
+            return "${CC.YELLOW}No Discord members could be found. Either server is empty or an error has occurred."
 
         var response = ""
         if (onlineUsers.filter { it.onlineStatus == OnlineStatus.ONLINE }.isNotEmpty()) {
-            response += "\n${org.bukkit.ChatColor.DARK_GREEN}Online:${org.bukkit.ChatColor.RESET}"
+            response += "\n${CC.DARK_GREEN}Online:${CC.RESET}"
             for (user in onlineUsers.filter { it.onlineStatus == OnlineStatus.ONLINE }) {
-                if (user.user.isBot) response += "\n${org.bukkit.ChatColor.DARK_GREEN}- ${user.effectiveName} (Bot)${org.bukkit.ChatColor.RESET}"
-                else response += "\n${org.bukkit.ChatColor.DARK_GREEN}- ${user.effectiveName}${org.bukkit.ChatColor.RESET}"
+                if (user.user.isBot) response += "\n${CC.DARK_GREEN}- ${user.effectiveName} (Bot)${CC.RESET}"
+                else response += "\n${CC.DARK_GREEN}- ${user.effectiveName}${CC.RESET}"
             }
         }
         if (onlineUsers.filter { it.onlineStatus == OnlineStatus.IDLE }.isNotEmpty()) {
-            response += "\n${org.bukkit.ChatColor.YELLOW}Idle:${org.bukkit.ChatColor.RESET}"
+            response += "\n${CC.YELLOW}Idle:${CC.RESET}"
             for (user in onlineUsers.filter { it.onlineStatus == OnlineStatus.IDLE }) {
-                if (user.user.isBot) response += "\n${org.bukkit.ChatColor.YELLOW}- ${user.effectiveName} (Bot)${org.bukkit.ChatColor.RESET}"
-                else response += "\n${org.bukkit.ChatColor.YELLOW}- ${user.effectiveName}${org.bukkit.ChatColor.RESET}"
+                if (user.user.isBot) response += "\n${CC.YELLOW}- ${user.effectiveName} (Bot)${CC.RESET}"
+                else response += "\n${CC.YELLOW}- ${user.effectiveName}${CC.RESET}"
             }
         }
         if (onlineUsers.filter { it.onlineStatus == OnlineStatus.DO_NOT_DISTURB }.isNotEmpty()) {
-            response += "\n${org.bukkit.ChatColor.RED}Do Not Disturb:${org.bukkit.ChatColor.RESET}"
+            response += "\n${CC.RED}Do Not Disturb:${CC.RESET}"
             for (user in onlineUsers.filter { it.onlineStatus == OnlineStatus.DO_NOT_DISTURB }) {
-                if (user.user.isBot) response += "\n${org.bukkit.ChatColor.RED}- ${user.effectiveName} (Bot)${org.bukkit.ChatColor.RESET}"
-                else response += "\n&${org.bukkit.ChatColor.RED} ${user.effectiveName}${org.bukkit.ChatColor.RESET}"
+                if (user.user.isBot) response += "\n${CC.RED}- ${user.effectiveName} (Bot)${CC.RESET}"
+                else response += "\n${CC.RED}- ${user.effectiveName}${CC.RESET}"
             }
         }
 
         response.replaceFirst("\n", "")
-        return response
+        return response.trim()
     }
 
     /*======================================
@@ -212,11 +213,15 @@ class Plugin : JavaPlugin() {
 
         val discordusers = Connection.listUsers()
         val discordaliases: MutableList<Pair<String, Member>> = mutableListOf()
-        discordusers
-                .filter { users.data.isSet("discordaliases.${it.user.id}") }
-                .mapTo(discordaliases) { Pair(users.data.getString("discordaliases.${it.user.id}.mcusername"), it) }
+
+        for (du in discordusers)
+            for ((mcUuid, discordId) in UserAliasConfig.aliases)
+                if (discordId == du.user.id) discordaliases.add(Pair(server.getOfflinePlayer(mcUuid).name, du))
+
         for (match in Regex("""(?:^| )@(\w+)""").findAll(message)) {
             val found: Member? = discordusers.firstOrNull {
+                it.user.name.noSpace().toLowerCase() == match.groupValues[1].toLowerCase() ||
+                it.user.name + "#" + it.user.discriminator == match.groupValues[1].toLowerCase() ||
                 it.effectiveName.noSpace().toLowerCase() == match.groupValues[1].toLowerCase()
             }
             if (found != null) newMessage = newMessage.replaceFirst("@${match.groupValues[1]}", found.asMention)
@@ -232,12 +237,11 @@ class Plugin : JavaPlugin() {
 
     fun deconvertAtMentions(message: String): String {
         var modifiedMessage = message
-        for (match in Regex("""<@!(\d)+>""").findAll(message)) {
-            val discordUser = Connection.listUsers().firstOrNull{it.user.id == match.groupValues[1] }
-            val nameDis = if (discordUser != null) discordUser.effectiveName else Connection.JDA.getUserById(match.groupValues[1]).name
-            modifiedMessage = modifiedMessage.replace(match.value, nameDis)
+        for (match in Regex("""<@!(\d+)>|<@(\d+)>""").findAll(message)) {
+            val discordUser = Connection.listUsers().firstOrNull { it.user.id == match.groupValues[1] || it.user.id == match.groupValues[2] }
+            if (discordUser != null) modifiedMessage = modifiedMessage.replace(match.value, "@"+discordUser.effectiveName)
         }
-        return message
+        return modifiedMessage
     }
 
     // Scans the string for occurrences of Minecraft names and attempts to translate them
diff --git a/src/main/kotlin/co/orre/discordbridge/UserAliasConfig.kt b/src/main/kotlin/co/orre/discordbridge/UserAliasConfig.kt
index 922830a..4838caa 100644
--- a/src/main/kotlin/co/orre/discordbridge/UserAliasConfig.kt
+++ b/src/main/kotlin/co/orre/discordbridge/UserAliasConfig.kt
@@ -16,6 +16,14 @@ object UserAliasConfig {
         aliases = aliases.plus(ua)
         plugin.users.data.set("aliases", aliases)
         plugin.users.saveConfig()
+        plugin.users.reloadConfig()
+    }
+
+    fun remove(plugin: Plugin, ua: UserAlias) {
+        aliases = aliases.minus(ua)
+        plugin.users.data.set("aliases", aliases)
+        plugin.users.saveConfig()
+        plugin.users.reloadConfig()
     }
 
     @Suppress("UNCHECKED_CAST")
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/controllers/BotControllerManager.kt b/src/main/kotlin/co/orre/discordbridge/commands/controllers/BotControllerManager.kt
index b16f04f..438fd13 100644
--- a/src/main/kotlin/co/orre/discordbridge/commands/controllers/BotControllerManager.kt
+++ b/src/main/kotlin/co/orre/discordbridge/commands/controllers/BotControllerManager.kt
@@ -6,6 +6,7 @@ import co.orre.discordbridge.commands.*
 import co.orre.discordbridge.commands.annotations.*
 import co.orre.discordbridge.discord.Connection
 import co.orre.discordbridge.utils.Script
+import co.orre.discordbridge.utils.UtilFunctions.noSpace
 import co.orre.discordbridge.utils.UtilFunctions.stripColor
 import co.orre.discordbridge.utils.UtilFunctions.toDiscordChatMessage
 import co.orre.discordbridge.utils.UtilFunctions.toMinecraftChatMessage
@@ -53,13 +54,18 @@ class BotControllerManager(val plugin: Plugin) {
     }
 
     fun dispatchMessage(event: IEventWrapper): Boolean {
+        plugin.logger.info("Entered dispatchMessage()")
+        plugin.logger.info("Known commands: ${commands.keys}")
+
         // Short circuit if event was a Minecraft command
         if (event is MinecraftCommandWrapper) {
+            plugin.logger.info("MinecraftCommandWrapper detected!")
             val command = commands[event.command.name]
             if (command == null) {
                 commandNotFound(event, event.command.name)
                 return true
             }
+            plugin.logger.info("Command found: '${command.name}'")
             val inputArguments = event.rawMessage.split("\\s+".toRegex(), command.parameters.size).toTypedArray()
             return invokeCommand(command, controllers, event, inputArguments)
         }
@@ -71,7 +77,9 @@ class BotControllerManager(val plugin: Plugin) {
 
         // <prefix>command
         if (Config.COMMAND_PREFIX.isNotBlank() && args[0].startsWith(Config.COMMAND_PREFIX)) {
+            plugin.logger.info("Prefixed command detected!")
             val commandName = args[0].substring(Config.COMMAND_PREFIX.length).toLowerCase()
+            plugin.logger.info("Searching for command '$commandName'...")
             if (commandName == "") return true
             val command = commands[commandName]
 
@@ -79,6 +87,7 @@ class BotControllerManager(val plugin: Plugin) {
                 commandNotFound(event, commandName)
                 return false
             }
+            plugin.logger.info("Command found: '${command.name}'")
 
             val inputArguments = if (args.size == 1) arrayOf<String>()
             else args[1].split("\\s+".toRegex(), command.parameters.size).toTypedArray()
@@ -87,10 +96,12 @@ class BotControllerManager(val plugin: Plugin) {
         }
 
         // @<mention> command
-        //TODO: Support bot mentions from Minecraft
-        if (args[0] == Connection.JDA.selfUser.asMention && args.count() == 2) {
+        if ((event is AsyncPlayerChatEventWrapper && args[0] == "@"+Config.USERNAME.noSpace() ||
+                args[0] == Connection.JDA.selfUser.asMention) && args.count() == 2) {
+            plugin.logger.info("Bot Mention command detected!")
             val args2 = args[1].split("\\s+".toRegex(), 2).toTypedArray()
             val commandName = args2[0].toLowerCase()
+            plugin.logger.info("Searching for command '$commandName'...")
             if (commandName == "") return true
             var params = if (args2.size > 1) args2[1] else ""
             var command = commands[commandName]
@@ -104,6 +115,7 @@ class BotControllerManager(val plugin: Plugin) {
                 }
                 params = args[1]
             }
+            plugin.logger.info("Command found: '${command.name}'")
 
             val inputArguments = if (params == "") arrayOf<String>()
             else params.split("\\s+".toRegex(), command.parameters.size).toTypedArray()
@@ -138,26 +150,21 @@ class BotControllerManager(val plugin: Plugin) {
             }
 
             when (event) {
-                is AsyncPlayerChatEventWrapper -> {
-                    if (startswith)
-                        if (triggerMC.isNotEmpty() && arg.startsWith(triggerMC, ignorecase)) response = r
-                        else
-                            if (triggerMC.isNotEmpty() && arg.equals(triggerMC, ignorecase)) response = r
-                }
-                is MessageWrapper -> {
-                    if (startswith)
-                        if (triggerDis.isNotEmpty() && arg.startsWith(triggerDis, ignorecase)) response = r
-                        else
-                            if (triggerDis.isNotEmpty() && arg.equals(triggerDis, ignorecase)) response = r
-                }
+                is AsyncPlayerChatEventWrapper -> if (startswith)
+                    if (triggerMC.isNotEmpty() && arg.startsWith(triggerMC, ignorecase)) response = r
+                    else if (triggerMC.isNotEmpty() && arg.equals(triggerMC, ignorecase)) response = r
+                is MessageWrapper -> if (startswith)
+                    if (triggerDis.isNotEmpty() && arg.startsWith(triggerDis, ignorecase)) response = r
+                    else if (triggerDis.isNotEmpty() && arg.equals(triggerDis, ignorecase)) response = r
                 else -> return false
             }
         }
         if (response == null) return false
+        plugin.logger.info("A scripted response was found!")
         plugin.logDebug("user ${event.senderName} has triggered a scripted response")
         val responseDis: String? = response.responseDis
         val responseMC: String? = response.responseMC
-        if (responseDis != null) {
+        if (responseDis != null && responseDis.isNotBlank()) {
             var out = responseDis.replace("%u", event.senderAsMention)
             if (event is AsyncPlayerChatEventWrapper) {
                 out = plugin.convertAtMentions(out)
@@ -165,7 +172,7 @@ class BotControllerManager(val plugin: Plugin) {
             }
             plugin.sendToDiscord(out, event.channel)
         }
-        if (responseMC != null && event.isFromRelayChannel) {
+        if (responseMC != null && responseMC.isNotBlank() && event.isFromRelayChannel) {
             var out = responseMC.replace("%u", event.senderAsMention)
             if (event is MessageWrapper) {
                 out = plugin.deconvertAtMentions(out)
@@ -178,6 +185,7 @@ class BotControllerManager(val plugin: Plugin) {
 
     private fun invokeCommand(command: Command, instances: Map<Class<out IBotController>, IBotController>,
                               event: IEventWrapper, inputArguments: Array<String>): Boolean {
+        plugin.logger.info("Entered invokeCommand()")
         // Relay the trigger if applicable
         if (command.relayTriggerMessage) relay(event, false)
 
@@ -194,6 +202,7 @@ class BotControllerManager(val plugin: Plugin) {
 
             // Short circuit "help"
             command.name == "help" -> {
+                plugin.logger.info("Short-circuiting command 'help'")
                 try {
                     val response = command.commandMethod.invoke(instances[command.controllerClass], event, commands, instances) as? String ?: return true
                     respond(event, command, response)
@@ -237,6 +246,7 @@ class BotControllerManager(val plugin: Plugin) {
         }
 
         // Invoke the method
+        plugin.logger.info("Attempting to invoke command...")
         try {
             val response = command.commandMethod.invoke(instances[command.controllerClass], *arguments) as? String ?: return true
             respond(event, command, response)
@@ -271,8 +281,7 @@ class BotControllerManager(val plugin: Plugin) {
             }
             is MessageWrapper -> {
                 if (command.isPrivate) {
-                    event.originalMessage.author.openPrivateChannel()
-                    event.originalMessage.author.privateChannel.sendMessage(modifiedResponse)
+                    event.originalMessage.author.openPrivateChannel().queue({ p -> p.sendMessage(modifiedResponse).queue() })
                     return
                 }
                 if (command.isTagged) modifiedResponse = "${event.senderAsMention} | $modifiedResponse"
@@ -302,6 +311,7 @@ class BotControllerManager(val plugin: Plugin) {
     }
 
     private fun relay(event: IEventWrapper, logIgnore: Boolean) {
+        plugin.logger.info("Entered relay()")
         when (event) {
             is AsyncPlayerChatEventWrapper -> {
                 var worldname = event.event.player.world.name
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/controllers/FunCommandsController.kt b/src/main/kotlin/co/orre/discordbridge/commands/controllers/FunCommandsController.kt
index 74755f0..87b84df 100644
--- a/src/main/kotlin/co/orre/discordbridge/commands/controllers/FunCommandsController.kt
+++ b/src/main/kotlin/co/orre/discordbridge/commands/controllers/FunCommandsController.kt
@@ -75,7 +75,7 @@ class FunCommandsController(val plugin: Plugin) : IBotController {
         plugin.logDebug("user ${event.senderName} requests an insult against '$thingToInsult'")
         val responses = plugin.insult.data.getStringList("responses")
         val rand = Random().nextInt(responses.count())
-        return "${event.senderAsMention} \uD83E\uDC52 $thingToInsult | ${responses[rand]}"
+        return "${event.senderAsMention} \u27A4 $thingToInsult | ${responses[rand]}"
     }
 
     // RATE - the bot rates something
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/controllers/UtilCommandsController.kt b/src/main/kotlin/co/orre/discordbridge/commands/controllers/UtilCommandsController.kt
index 715ae14..fd3985a 100644
--- a/src/main/kotlin/co/orre/discordbridge/commands/controllers/UtilCommandsController.kt
+++ b/src/main/kotlin/co/orre/discordbridge/commands/controllers/UtilCommandsController.kt
@@ -1,16 +1,14 @@
 package co.orre.discordbridge.commands.controllers
 
+import co.orre.discordbridge.Config
 import co.orre.discordbridge.Plugin
 import co.orre.discordbridge.UserAliasConfig
-import co.orre.discordbridge.commands.AsyncPlayerChatEventWrapper
-import co.orre.discordbridge.commands.IBotController
-import co.orre.discordbridge.commands.IEventWrapper
-import co.orre.discordbridge.commands.MessageWrapper
-import co.orre.discordbridge.commands.annotations.BotCommand
-import co.orre.discordbridge.commands.annotations.ChatExclusiveCommand
-import co.orre.discordbridge.commands.annotations.DiscordExclusiveCommand
-import co.orre.discordbridge.commands.annotations.PrivateResponse
+import co.orre.discordbridge.commands.*
+import co.orre.discordbridge.commands.annotations.*
+import co.orre.discordbridge.discord.Connection
+import co.orre.discordbridge.utils.UtilFunctions.stripColor
 import net.dv8tion.jda.core.entities.ChannelType
+import org.bukkit.entity.Player
 import org.bukkit.ChatColor as CC
 
 class UtilCommandsController(val plugin: Plugin) : IBotController {
@@ -21,11 +19,15 @@ class UtilCommandsController(val plugin: Plugin) : IBotController {
     @BotCommand(usage="", description="Confirm an alias link request", relayTriggerMessage = false)
     @DiscordExclusiveCommand
     @PrivateResponse
-    private fun confirm(message: MessageWrapper): String? {
-        if (!message.originalMessage.isFromType(ChannelType.PRIVATE)) return null
-        plugin.logDebug("user ${message.senderName} confirms an alias request")
+    private fun confirm(event: IEventWrapper): String? {
+        if (event !is MessageWrapper) return null
+        if (!event.originalMessage.isFromType(ChannelType.PRIVATE)) {
+            event.channel.sendMessage("${event.senderAsMention} | That command can only be sent to me via DM.").queue()
+            return null
+        }
+        plugin.logDebug("user ${event.senderName} confirms an alias request")
 
-        val ua = plugin.requests.find { it.discordId == message.senderId } ?: return "You have no alias requests pending."
+        val ua = plugin.requests.find { it.discordId == event.senderId } ?: return "You have no alias requests pending."
 
         UserAliasConfig.add(plugin, ua)
         plugin.requests.remove(ua)
@@ -36,21 +38,120 @@ class UtilCommandsController(val plugin: Plugin) : IBotController {
     @BotCommand(usage="", description="Deny an alias link request", relayTriggerMessage = false)
     @DiscordExclusiveCommand
     @PrivateResponse
-    private fun deny(message: MessageWrapper): String? {
-        if (!message.originalMessage.isFromType(ChannelType.PRIVATE)) return null
-        plugin.logDebug("user ${message.senderName} denies an alias request")
+    private fun deny(event: IEventWrapper): String? {
+        if (event !is MessageWrapper) return null
+        if (!event.originalMessage.isFromType(ChannelType.PRIVATE)) {
+            event.channel.sendMessage("${event.senderAsMention} | That command can only be sent to me via DM.").queue()
+            return null
+        }
+        plugin.logDebug("user ${event.senderName} denies an alias request")
 
-        val ua = plugin.requests.find { it.discordId == message.senderId } ?: return "You have no alias requests pending."
+        val ua = plugin.requests.find { it.discordId == event.senderId } ?: return "You have no alias requests pending."
 
         plugin.requests.remove(ua)
         return "The alias link request has been cancelled."
     }
 
+    @BotCommand(usage="<reload|get|alias> [args...]", description = "For in-game functions", relayTriggerMessage = false)
+    @MinecraftExclusiveCommand
+    @PrivateResponse
+    private fun discord(event: IEventWrapper, argString: String): String? {
+        if (event !is MinecraftCommandWrapper) return null
+        if (argString.isBlank()) {
+            event.sender.sendMessage("${CC.YELLOW}Usage: /discord <reload|listmembers|linkalias>")
+            return null
+        }
+
+        val args = argString.split(" ")
+        val subCommand = args[0]
+
+        when (subCommand.toLowerCase()) {
+            "reload" -> {
+                if (event.sender is Player && !event.sender.hasPermission("discordbridge.discord.reload")) {
+                    event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
+                            "Sorry, you don't have permission to use that command.")
+                } else {
+                    event.sender.sendMessage("${CC.YELLOW}Reloading Discord Bridge...")
+                    plugin.reload(Runnable { event.sender.sendMessage("${CC.DARK_GREEN}Discord Bridge has reloaded!") })
+                }
+            }
+            "linkalias" -> {
+                if (event.sender !is Player) return null
+
+                if (!event.sender.hasPermission("discordbridge.discord.linkalias")) {
+                    event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
+                            "Sorry, you don't have permission to use that command.")
+                }
+
+                if (args.size < 2) {
+                    event.sender.sendMessage("${CC.YELLOW}Usage: /discord linkalias <discriminator> [-u]")
+                    return null
+                }
+
+                val ua = UserAliasConfig.aliases.firstOrNull{it.mcUuid == event.sender.uniqueId}
+                if (ua != null) {
+                    event.sender.sendMessage("${CC.YELLOW}You already have an alias linked with Discord user " +
+                            "${Connection.JDA.getUserById(ua.discordId)}. " +
+                            "If you want to unlink this account, use '/discord unlinkalias'.")
+                    return null
+                }
+
+                val pendingRequest = plugin.requests.firstOrNull{it.mcUuid == event.sender.uniqueId}
+                if (pendingRequest != null) {
+                    if (args.size < 3 || args[3] != "-u") {
+                        event.sender.sendMessage("${CC.YELLOW}You already have an alias link request pending with " +
+                                "Discord user '${Connection.JDA.getUserById(pendingRequest.discordId)}'. " +
+                                "If you want to override this request, repeat this command with the '-u' flag.")
+                        return null
+                    } else if (args[3] == "-u")
+                        plugin.requests.remove(pendingRequest)
+                }
+
+                val foundMember = plugin.registerUserRequest(event.sender, args[1])
+                if (foundMember == null)
+                    event.sender.sendMessage("${CC.YELLOW}Could not find Discord user with that discriminator. " +
+                            "Try '/discord listmembers all' to see a list of valid users.")
+                else event.sender.sendMessage("${CC.YELLOW}An alias link request has been sent to Discord user '${foundMember.user.name}'")
+            }
+            "listmembers" -> {
+                if (args.size < 2) {
+                    event.sender.sendMessage("${CC.YELLOW}Usage: /discord listmembers <all|online>")
+                    return null
+                }
+
+                if (event.sender is Player && !event.sender.hasPermission("discordbridge.discord.listmembers")) {
+                    event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
+                            "Sorry, you don't have permission to use that command.")
+                }
+
+                when (args[1].toLowerCase()) {
+                    "all" -> event.sender.sendMessage(plugin.getDiscordMembersAll())
+                    "online" -> event.sender.sendMessage(plugin.getDiscordMembersOnline())
+                    else -> event.sender.sendMessage("${CC.YELLOW}Usage: /discord listmembers <all/online>")
+                }
+            }
+            "unlinkalias" -> {
+                if (event.sender !is Player) return null
+
+                val ua = UserAliasConfig.aliases.firstOrNull{it.mcUuid == event.sender.uniqueId}
+                if (ua == null) {
+                    event.sender.sendMessage("${CC.YELLOW}You do not have an alias to unlink.")
+                    return null
+                }
+                UserAliasConfig.remove(plugin, ua)
+                event.sender.sendMessage("${CC.YELLOW}Alias link with Discord user ${Connection.JDA.getUserById(ua.discordId)} " +
+                        "succeessfully removed.")
+            }
+        }
+        return null
+    }
+
     @BotCommand(usage="", description="You just used it", relayTriggerMessage = false)
     @ChatExclusiveCommand
     @PrivateResponse
     private fun help(event: IEventWrapper, commands: MutableMap<String, BotControllerManager.Command>,
                      instances: Map<Class<out IBotController>, IBotController>) {
+        plugin.logger.info("Entered 'help'")
         plugin.logDebug("user ${event.senderName} requested help")
         when (event) {
             is AsyncPlayerChatEventWrapper -> {
@@ -67,18 +168,21 @@ class UtilCommandsController(val plugin: Plugin) : IBotController {
                 }
             }
             is MessageWrapper -> {
-                event.originalMessage.author.openPrivateChannel()
-                val channel = event.originalMessage.author.privateChannel
-                channel.sendMessage("**DiscordBridge** - Bridge your Minecraft and Discord chats\n**---**")
-                var out: String
-                for (bc: IBotController in instances.values) {
-                    out = bc.getDescription() + "\n```"
-                    commands.values.sortedBy { (name) -> name }
-                            .filter { it.controllerClass == bc.javaClass }
-                            .forEach { out += "\n${it.name} ${it.usage}\n  ${it.description}\n" }
-                    out += "```"
-                    channel.sendMessage(out)
-                }
+                plugin.logger.info("MessageWrapper detected!")
+                event.originalMessage.author.openPrivateChannel().queue({p ->
+                    plugin.logger.info("RestAction returned: $p")
+                    p.sendMessage("**DiscordBridge** - Bridge your Minecraft and Discord chats\n**---**").queue()
+                    var out: String
+                    for (bc: IBotController in instances.values) {
+                        out = bc.getDescription() + "\n```"
+                        commands.values.sortedBy { (name) -> name }
+                                .filter { it.controllerClass == bc.javaClass }
+                                .forEach { out += "\n${it.name} ${it.usage}\n  ${it.description}\n" }
+                        out += "```"
+                        p.sendMessage(out).queue()
+                    }
+                })
+                plugin.logger.info("Continuing non-blocking thread")
             }
         }
     }
@@ -87,16 +191,17 @@ class UtilCommandsController(val plugin: Plugin) : IBotController {
     @DiscordExclusiveCommand
     @BotCommand(usage="", description = "List all Minecraft players currently online on the server",
             relayTriggerMessage = false)
-    private fun serverList(message: MessageWrapper) {
-        plugin.logDebug("user ${message.originalMessage.author.name} has requested a listing of online players")
+    private fun serverList(event: IEventWrapper) {
+        if (event !is MessageWrapper) return
+        plugin.logDebug("user ${event.originalMessage.author.name} has requested a listing of online players")
 
         val players = plugin.getOnlinePlayers()
         if (players.isEmpty()) {
-            plugin.sendToDiscord("Nobody is currently online.", message.channel)
+            plugin.sendToDiscord("Nobody is currently online.", event.channel)
             return
         }
 
         val response = players.joinToString("\n", "The following players are currently online:\n```\n", "\n```")
-        plugin.sendToDiscord(response, message.channel)
+        plugin.sendToDiscord(response, event.channel)
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/co/orre/discordbridge/discord/Connection.kt b/src/main/kotlin/co/orre/discordbridge/discord/Connection.kt
index 74fcd27..232576b 100644
--- a/src/main/kotlin/co/orre/discordbridge/discord/Connection.kt
+++ b/src/main/kotlin/co/orre/discordbridge/discord/Connection.kt
@@ -36,9 +36,18 @@ object Connection: Runnable {
         toChannel.sendMessage(message).queue()
     }
 
-    fun reconnect() {
-        disconnect()
+    fun reconnect(callback: Runnable) {
+        //disconnect
+        if (Config.ANNOUNCE_SERVER_START_STOP)
+            send("Refreshing Discord connection...", getRelayChannel())
+        JDA.removeEventListener(listener)
+        server = null
+        channel = null
+        JDA.shutdown(false)
+
+        //reconnect
         connect()
+        callback.run()
     }
 
     fun listUsers(): List<Member> {
@@ -64,11 +73,6 @@ object Connection: Runnable {
         JDA.presence.game = Game.of("Minecraft ${plugin.server.bukkitVersion.split("-")[0]}")
     }
 
-    private fun disconnect() {
-        JDA.removeEventListener(listener)
-        JDA.shutdown(false)
-    }
-
     private fun getGroupByName(server: Guild, name: String): TextChannel? {
         return server.textChannels.firstOrNull { it.name == name }
     }
diff --git a/src/main/kotlin/co/orre/discordbridge/minecraft/commands/CommandListener.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/CommandListener.kt
similarity index 95%
rename from src/main/kotlin/co/orre/discordbridge/minecraft/commands/CommandListener.kt
rename to src/main/kotlin/co/orre/discordbridge/minecraft/CommandListener.kt
index fd79ad1..f8c1487 100644
--- a/src/main/kotlin/co/orre/discordbridge/minecraft/commands/CommandListener.kt
+++ b/src/main/kotlin/co/orre/discordbridge/minecraft/CommandListener.kt
@@ -1,4 +1,4 @@
-package co.orre.discordbridge.minecraft.commands
+package co.orre.discordbridge.minecraft
 
 import co.orre.discordbridge.Plugin
 import co.orre.discordbridge.commands.MinecraftCommandWrapper
diff --git a/src/main/kotlin/co/orre/discordbridge/minecraft/EventListener.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/EventListener.kt
index 582cf39..5e236a2 100644
--- a/src/main/kotlin/co/orre/discordbridge/minecraft/EventListener.kt
+++ b/src/main/kotlin/co/orre/discordbridge/minecraft/EventListener.kt
@@ -5,6 +5,7 @@ import co.orre.discordbridge.Plugin
 import co.orre.discordbridge.commands.AsyncPlayerChatEventWrapper
 import co.orre.discordbridge.commands.controllers.BotControllerManager
 import co.orre.discordbridge.commands.controllers.FunCommandsController
+import co.orre.discordbridge.commands.controllers.UtilCommandsController
 import co.orre.discordbridge.discord.Connection
 import co.orre.discordbridge.utils.UtilFunctions.stripColor
 import co.orre.discordbridge.utils.UtilFunctions.toDiscordPlayerDeath
@@ -23,7 +24,10 @@ class EventListener(val plugin: Plugin): Listener {
 
     val controllerManager = BotControllerManager(plugin)
 
-    init { controllerManager.registerController(FunCommandsController(plugin), chatExclusive = true) }
+    init {
+        controllerManager.registerController(FunCommandsController(plugin), chatExclusive = true)
+        controllerManager.registerController(UtilCommandsController(plugin), chatExclusive = true)
+    }
 
     @EventHandler(priority = EventPriority.MONITOR)
     fun onChat(event: AsyncPlayerChatEvent) {
diff --git a/src/main/kotlin/co/orre/discordbridge/minecraft/Permissions.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/Permissions.kt
deleted file mode 100644
index 0e0d20a..0000000
--- a/src/main/kotlin/co/orre/discordbridge/minecraft/Permissions.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package co.orre.discordbridge.minecraft
-
-import org.bukkit.entity.Player
-
-enum class Permissions(val node: String) {
-    reload("discordbridge.reload"),
-    cleverbot("discordbridge.cleverbot"),
-    f("discordbridge.f"),
-    eightball("discordbridge.eightball"),
-    insult("discordbridge.insult"),
-    rate("discordbridge.rate");
-
-    fun has(player: Player): Boolean {
-        return player.hasPermission(node)
-    }
-}
diff --git a/src/main/kotlin/co/orre/discordbridge/minecraft/commands/Discord.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/commands/Discord.kt
deleted file mode 100644
index b3711b4..0000000
--- a/src/main/kotlin/co/orre/discordbridge/minecraft/commands/Discord.kt
+++ /dev/null
@@ -1,100 +0,0 @@
-package co.orre.discordbridge.minecraft.commands
-
-import co.orre.discordbridge.minecraft.Permissions
-import co.orre.discordbridge.Plugin
-import org.bukkit.ChatColor as CC
-import org.bukkit.command.Command
-import org.bukkit.command.CommandExecutor
-import org.bukkit.command.CommandSender
-import org.bukkit.entity.Player
-
-class Discord(val plugin: Plugin) : CommandExecutor {
-
-    override fun onCommand(player: CommandSender, cmd: Command, alias: String?, args: Array<out String>?): Boolean {
-        if (args == null || args.isEmpty()) {
-            sendMessage("{${org.bukkit.ChatColor.YELLOW}Usage: /discord <reload/alias/get>", player)
-            return true
-        }
-
-        when (args[0].toLowerCase()) {
-            "reload" -> return handleDiscordReload(player, args)
-            "alias" -> return handleDiscordAlias(player, args)
-            "get" -> return handleDiscordGet(player, args)
-            else -> {
-                sendMessage("${org.bukkit.ChatColor.YELLOW}Usage: /discord <reload/alias/get>", player)
-                return true
-            }
-        }
-    }
-
-    private fun handleDiscordReload(player: CommandSender, args: Array<out String>): Boolean {
-        if (player is Player && !Permissions.reload.has(player)) return true
-
-        if (args.size != 1) {
-            sendMessage("${org.bukkit.ChatColor.YELLOW}Usage: /discord reload", player)
-            return true
-        }
-
-        sendMessage("${org.bukkit.ChatColor.YELLOW}Reloading Discord Bridge...", player)
-        plugin.reload()
-        return true
-    }
-
-    private fun handleDiscordAlias(player: CommandSender, args: Array<out String>): Boolean {
-        if (player !is Player) return true
-
-        if (args.size != 2) {
-            sendMessage("${org.bukkit.ChatColor.YELLOW}Usage: /discord alias <discord id>", player)
-            return true
-        }
-
-        if (!plugin.registerUserRequest(player, args[1])) {
-            sendMessage("${org.bukkit.ChatColor.YELLOW}Could not find Discord user with that ID.", player)
-            return true
-        }
-        return true
-    }
-
-    private fun handleDiscordGet(player: CommandSender, args: Array<out String>): Boolean {
-        if (args.size < 2) {
-            sendMessage("${org.bukkit.ChatColor.YELLOW}Usage: /discord get <ids/online>", player)
-            return true
-        }
-
-        when (args[1].toLowerCase()) {
-            "ids" -> return handleDiscordGetIds(player, args)
-            "online" -> return handleDiscordGetOnline(player, args)
-            else -> {
-                sendMessage("${org.bukkit.ChatColor.YELLOW}Usage: /discord get <ids/online>", player)
-                return true
-            }
-        }
-    }
-
-    private fun handleDiscordGetIds(player: CommandSender, args: Array<out String>): Boolean {
-        if (args.size != 2) {
-            sendMessage("${org.bukkit.ChatColor.YELLOW}Usage: /discord get ids", player)
-            return true
-        }
-
-        sendMessage(plugin.getDiscordIds(), player)
-        return true
-    }
-
-    private fun handleDiscordGetOnline(player: CommandSender, args: Array<out String>): Boolean {
-        if (args.size != 2) {
-            sendMessage("${org.bukkit.ChatColor.YELLOW}Usage: /discord get online", player)
-            return true
-        }
-
-        sendMessage(plugin.getDiscordOnline(), player)
-        return true
-    }
-
-    private fun sendMessage(message: String, player: CommandSender) {
-        if (player is Player)
-            player.sendMessage(message)
-        else
-            plugin.server.consoleSender.sendMessage(message)
-    }
-}
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index dd26fe0..5167766 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -11,9 +11,18 @@ softdepend: [Multiverse-Core]
 main: co.orre.discordbridge.Plugin
 
 permissions:
-  discordbridge.reload:
-    description: Reload the Discord Bridge
+  discordbridge.discord:
+    description: Give the ability to use any command in of the /discord subcommand tree
+    default: true
+  discordbridge.discord.reload:
+    description: Reload configs and JDA
     default: op
+  discordbridge.discord.listmembers:
+    description: Returns a list of members in the Discord channel
+    default: true
+  discordbridge.discord.linkalias:
+    description: Sends a request to a Discord member to set up alias translation
+    default: true
   discordbridge.talk:
     description: Determines whether this user can talk to Cleverbot
     default: true
@@ -42,7 +51,7 @@ commands:
     usage: /8ball <question>
   discord:
     description: Issue a command to the bot
-    usage: /discord <command>
+    usage: /discord <reload|get|alias> [arguments]...
   f:
     description: Press f to pay respects
     usage: /f

From a81f9f8213e1820f91ee7405f92fde57fb8c7322 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Thu, 13 Apr 2017 20:52:37 -0500
Subject: [PATCH 22/24] Minor changes, added todo list

---
 build.gradle                                  |   3 +-
 .../kotlin/co/orre/discordbridge/Plugin.kt    |   4 +
 .../controllers/BotControllerManager.kt       |  30 +--
 .../discordbridge/minecraft/EventListener.kt  |  20 ++
 .../utils/MarkdownToMinecraftSeralizer.kt     | 216 ++++++++++++++++++
 todo                                          |   8 +
 6 files changed, 260 insertions(+), 21 deletions(-)
 create mode 100644 src/main/kotlin/co/orre/discordbridge/utils/MarkdownToMinecraftSeralizer.kt
 create mode 100644 todo

diff --git a/build.gradle b/build.gradle
index 5064f08..68bb5f5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,7 @@ plugins {
 apply plugin: 'kotlin'
 
 group = 'co.orre'
-version = '2.0.0'
+version = '2.0.1'
 description = """Bridge chat between Minecraft and Discord"""
 ext.url = 'https://github.com/DiamondIceNS/DiscordBridge'
 
@@ -43,6 +43,7 @@ dependencies {
     compile group: 'net.dv8tion', name: 'JDA', version: '3.0.BETA2_108'
     compile group: 'com.michaelwflaherty', name: 'cleverbotapi', version: '1.0.1'
     compile group: 'org.pegdown', name:'pegdown', version: '1.6.0'
+
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
diff --git a/src/main/kotlin/co/orre/discordbridge/Plugin.kt b/src/main/kotlin/co/orre/discordbridge/Plugin.kt
index 058bccf..c9e87a8 100644
--- a/src/main/kotlin/co/orre/discordbridge/Plugin.kt
+++ b/src/main/kotlin/co/orre/discordbridge/Plugin.kt
@@ -14,6 +14,7 @@ import net.dv8tion.jda.core.entities.MessageChannel
 import org.bukkit.configuration.serialization.ConfigurationSerialization
 import org.bukkit.entity.Player
 import org.bukkit.plugin.java.JavaPlugin
+import org.pegdown.PegDownProcessor
 import java.io.File
 import java.util.logging.Level
 import org.bukkit.ChatColor as CC
@@ -29,6 +30,9 @@ class Plugin : JavaPlugin() {
     var script: DataConfigAccessor = DataConfigAccessor(this, dataFolder, "script.yml")
     var worlds: DataConfigAccessor? = null
 
+    // Markdown deserializer
+    var pegDownProc = PegDownProcessor()
+
     // Temporary storage for alias linking requests
     var requests: MutableList<UserAlias> = mutableListOf()
 
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/controllers/BotControllerManager.kt b/src/main/kotlin/co/orre/discordbridge/commands/controllers/BotControllerManager.kt
index 438fd13..10208af 100644
--- a/src/main/kotlin/co/orre/discordbridge/commands/controllers/BotControllerManager.kt
+++ b/src/main/kotlin/co/orre/discordbridge/commands/controllers/BotControllerManager.kt
@@ -5,6 +5,7 @@ import co.orre.discordbridge.Plugin
 import co.orre.discordbridge.commands.*
 import co.orre.discordbridge.commands.annotations.*
 import co.orre.discordbridge.discord.Connection
+import co.orre.discordbridge.utils.MarkdownToMinecraftSeralizer
 import co.orre.discordbridge.utils.Script
 import co.orre.discordbridge.utils.UtilFunctions.noSpace
 import co.orre.discordbridge.utils.UtilFunctions.stripColor
@@ -54,18 +55,13 @@ class BotControllerManager(val plugin: Plugin) {
     }
 
     fun dispatchMessage(event: IEventWrapper): Boolean {
-        plugin.logger.info("Entered dispatchMessage()")
-        plugin.logger.info("Known commands: ${commands.keys}")
-
         // Short circuit if event was a Minecraft command
         if (event is MinecraftCommandWrapper) {
-            plugin.logger.info("MinecraftCommandWrapper detected!")
             val command = commands[event.command.name]
             if (command == null) {
                 commandNotFound(event, event.command.name)
                 return true
             }
-            plugin.logger.info("Command found: '${command.name}'")
             val inputArguments = event.rawMessage.split("\\s+".toRegex(), command.parameters.size).toTypedArray()
             return invokeCommand(command, controllers, event, inputArguments)
         }
@@ -77,9 +73,7 @@ class BotControllerManager(val plugin: Plugin) {
 
         // <prefix>command
         if (Config.COMMAND_PREFIX.isNotBlank() && args[0].startsWith(Config.COMMAND_PREFIX)) {
-            plugin.logger.info("Prefixed command detected!")
             val commandName = args[0].substring(Config.COMMAND_PREFIX.length).toLowerCase()
-            plugin.logger.info("Searching for command '$commandName'...")
             if (commandName == "") return true
             val command = commands[commandName]
 
@@ -87,7 +81,6 @@ class BotControllerManager(val plugin: Plugin) {
                 commandNotFound(event, commandName)
                 return false
             }
-            plugin.logger.info("Command found: '${command.name}'")
 
             val inputArguments = if (args.size == 1) arrayOf<String>()
             else args[1].split("\\s+".toRegex(), command.parameters.size).toTypedArray()
@@ -98,10 +91,8 @@ class BotControllerManager(val plugin: Plugin) {
         // @<mention> command
         if ((event is AsyncPlayerChatEventWrapper && args[0] == "@"+Config.USERNAME.noSpace() ||
                 args[0] == Connection.JDA.selfUser.asMention) && args.count() == 2) {
-            plugin.logger.info("Bot Mention command detected!")
             val args2 = args[1].split("\\s+".toRegex(), 2).toTypedArray()
             val commandName = args2[0].toLowerCase()
-            plugin.logger.info("Searching for command '$commandName'...")
             if (commandName == "") return true
             var params = if (args2.size > 1) args2[1] else ""
             var command = commands[commandName]
@@ -115,7 +106,6 @@ class BotControllerManager(val plugin: Plugin) {
                 }
                 params = args[1]
             }
-            plugin.logger.info("Command found: '${command.name}'")
 
             val inputArguments = if (params == "") arrayOf<String>()
             else params.split("\\s+".toRegex(), command.parameters.size).toTypedArray()
@@ -131,7 +121,6 @@ class BotControllerManager(val plugin: Plugin) {
     private fun scriptedResponse(event: IEventWrapper): Boolean {
         val responses = plugin.script.data.getList("responses").checkItemsAre<Script>()
         if (responses == null) {
-            plugin.logger.warning("ERROR: Unable to read script.yml!")
             return false
         }
         var response: Script? = null
@@ -160,8 +149,7 @@ class BotControllerManager(val plugin: Plugin) {
             }
         }
         if (response == null) return false
-        plugin.logger.info("A scripted response was found!")
-        plugin.logDebug("user ${event.senderName} has triggered a scripted response")
+                plugin.logDebug("user ${event.senderName} has triggered a scripted response")
         val responseDis: String? = response.responseDis
         val responseMC: String? = response.responseMC
         if (responseDis != null && responseDis.isNotBlank()) {
@@ -185,7 +173,6 @@ class BotControllerManager(val plugin: Plugin) {
 
     private fun invokeCommand(command: Command, instances: Map<Class<out IBotController>, IBotController>,
                               event: IEventWrapper, inputArguments: Array<String>): Boolean {
-        plugin.logger.info("Entered invokeCommand()")
         // Relay the trigger if applicable
         if (command.relayTriggerMessage) relay(event, false)
 
@@ -202,7 +189,6 @@ class BotControllerManager(val plugin: Plugin) {
 
             // Short circuit "help"
             command.name == "help" -> {
-                plugin.logger.info("Short-circuiting command 'help'")
                 try {
                     val response = command.commandMethod.invoke(instances[command.controllerClass], event, commands, instances) as? String ?: return true
                     respond(event, command, response)
@@ -246,7 +232,6 @@ class BotControllerManager(val plugin: Plugin) {
         }
 
         // Invoke the method
-        plugin.logger.info("Attempting to invoke command...")
         try {
             val response = command.commandMethod.invoke(instances[command.controllerClass], *arguments) as? String ?: return true
             respond(event, command, response)
@@ -266,13 +251,15 @@ class BotControllerManager(val plugin: Plugin) {
         when (event) {
             is AsyncPlayerChatEventWrapper -> {
                 if (command.isPrivate) {
+                    modifiedResponse = MarkdownToMinecraftSeralizer().toMinecraft(plugin.pegDownProc.parseMarkdown(modifiedResponse.toCharArray()))
                     modifiedResponse = "${CC.ITALIC}${CC.GRAY}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
                             modifiedResponse
                     event.event.player.sendMessage(modifiedResponse)
                     return
                 }
                 if (command.isTagged) modifiedResponse = "${event.senderAsMention} | $modifiedResponse"
-                plugin.sendToMinecraft(modifiedResponse.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
+                val mcModifiedResponse = MarkdownToMinecraftSeralizer().toMinecraft(plugin.pegDownProc.parseMarkdown(modifiedResponse.toCharArray()))
+                plugin.sendToMinecraft(mcModifiedResponse.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
 
                 modifiedResponse = plugin.convertAtMentions(modifiedResponse)
                 modifiedResponse = plugin.translateAliasesToDiscord(modifiedResponse)
@@ -290,17 +277,20 @@ class BotControllerManager(val plugin: Plugin) {
                 modifiedResponse = modifiedResponse.toMinecraftChatMessage(Config.BOT_MC_USERNAME)
                 modifiedResponse = plugin.deconvertAtMentions(modifiedResponse)
                 modifiedResponse = plugin.translateAliasesToMinecraft(modifiedResponse)
+                modifiedResponse = MarkdownToMinecraftSeralizer().toMinecraft(plugin.pegDownProc.parseMarkdown(modifiedResponse.toCharArray()))
                 plugin.sendToMinecraft(modifiedResponse)
                 return
             }
             is MinecraftCommandWrapper -> {
                 if (command.isPrivate || command.isTagged) {
+                    modifiedResponse = MarkdownToMinecraftSeralizer().toMinecraft(plugin.pegDownProc.parseMarkdown(modifiedResponse.toCharArray()))
                     modifiedResponse = "${CC.ITALIC}${CC.GRAY}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
                             modifiedResponse
                     event.sender.sendMessage(modifiedResponse)
                     return
                 }
-                plugin.sendToMinecraft(modifiedResponse.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
+                val mcModifiedResponse = MarkdownToMinecraftSeralizer().toMinecraft(plugin.pegDownProc.parseMarkdown(modifiedResponse.toCharArray()))
+                plugin.sendToMinecraft(mcModifiedResponse.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
 
                 modifiedResponse = plugin.convertAtMentions(modifiedResponse)
                 modifiedResponse = plugin.translateAliasesToDiscord(modifiedResponse)
@@ -311,7 +301,6 @@ class BotControllerManager(val plugin: Plugin) {
     }
 
     private fun relay(event: IEventWrapper, logIgnore: Boolean) {
-        plugin.logger.info("Entered relay()")
         when (event) {
             is AsyncPlayerChatEventWrapper -> {
                 var worldname = event.event.player.world.name
@@ -336,6 +325,7 @@ class BotControllerManager(val plugin: Plugin) {
                     var formattedMessage = event.message.toMinecraftChatMessage(event.senderName)
                     formattedMessage = plugin.deconvertAtMentions(formattedMessage)
                     formattedMessage = plugin.translateAliasesToMinecraft(formattedMessage)
+                    formattedMessage = MarkdownToMinecraftSeralizer().toMinecraft(plugin.pegDownProc.parseMarkdown(formattedMessage.toCharArray()))
                     plugin.sendToMinecraft(formattedMessage)
                 } else if (logIgnore) plugin.logDebug("Not relaying message from Discord: channel does not match")
             }
diff --git a/src/main/kotlin/co/orre/discordbridge/minecraft/EventListener.kt b/src/main/kotlin/co/orre/discordbridge/minecraft/EventListener.kt
index 5e236a2..380ddb8 100644
--- a/src/main/kotlin/co/orre/discordbridge/minecraft/EventListener.kt
+++ b/src/main/kotlin/co/orre/discordbridge/minecraft/EventListener.kt
@@ -7,6 +7,7 @@ import co.orre.discordbridge.commands.controllers.BotControllerManager
 import co.orre.discordbridge.commands.controllers.FunCommandsController
 import co.orre.discordbridge.commands.controllers.UtilCommandsController
 import co.orre.discordbridge.discord.Connection
+import co.orre.discordbridge.utils.MarkdownToMinecraftSeralizer
 import co.orre.discordbridge.utils.UtilFunctions.stripColor
 import co.orre.discordbridge.utils.UtilFunctions.toDiscordPlayerDeath
 import co.orre.discordbridge.utils.UtilFunctions.toDiscordPlayerJoin
@@ -37,7 +38,26 @@ class EventListener(val plugin: Plugin): Listener {
         if (event.player.hasMetadata("vanished") && event.player.getMetadata("vanished")[0].asBoolean() &&
                 !Config.IF_VANISHED_CHAT) return
 
+        event.message = event.message.replace(":lenny:", "( \u0361\u00B0 \u035C\u0296 \u0361\u00B0)")
+                .replace(":tableflip:", "(\u256F\u00B0\u25A1\u00B0\uFF09\u256F\uFE35 \u253B\u2501\u253B")
+                .replace(":unflip:", "\u252C\u2500\u2500\u252C \u30CE( \u309C-\u309C\u30CE)")
+                .replace(":shrug:", "\u00AF\\_(\u30C4)_/\u00AF")
+                .replace(":donger:", "\u30FD\u0F3C\u0E88\u0644\u035C\u0E88\u0F3D\uFF89")
+                .replace(":disapproval:", "\u0CA0_\u0CA0")
+                .replace(":kawaii:", "(\uFF89\u25D5\u30EE\u25D5)\uFF89*:\uFF65\uFF9F\u2727")
+                .replace(":amendo:", "\u0F3C \u3064 \u25D5_\u25D5 \u0F3D\u3064")
+                .replace(":yuno:", "\u10DA(\u0CA0\u76CA\u0CA0\u10DA)")
+                .replace(":fingerguns:", "(\u261E\uFF9F\u30EE\uFF9F)\u261E")
+                .replace(":fingergunsr:", "(\u261E\uFF9F\u30EE\uFF9F)\u261E")
+                .replace(":fingergunsl:", "\u261C(\uFF9F\u30EE\uFF9F\u261C)")
+                .replace(":fight:", "(\u0E07 \u2022\u0300_\u2022\u0301)\u0E07")
+                .replace(":happygary:", "\u1555(\u141B)\u1557")
+                .replace(":denko:", "(\u00B4\uFF65\u03C9\uFF65`)")
+                .replace(":masteryourdonger:", "(\u0E07 \u0360\u00B0 \u0644\u035C \u00B0)\u0E07")
+
         plugin.server.scheduler.runTaskAsynchronously(plugin, { controllerManager.dispatchMessage(AsyncPlayerChatEventWrapper(event)) })
+
+        event.message = MarkdownToMinecraftSeralizer().toMinecraft(plugin.pegDownProc.parseMarkdown(event.message.toCharArray()))
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
diff --git a/src/main/kotlin/co/orre/discordbridge/utils/MarkdownToMinecraftSeralizer.kt b/src/main/kotlin/co/orre/discordbridge/utils/MarkdownToMinecraftSeralizer.kt
new file mode 100644
index 0000000..95b9801
--- /dev/null
+++ b/src/main/kotlin/co/orre/discordbridge/utils/MarkdownToMinecraftSeralizer.kt
@@ -0,0 +1,216 @@
+package co.orre.discordbridge.utils
+
+import org.parboiled.common.Preconditions
+import org.pegdown.Printer
+import org.pegdown.ast.*
+
+class MarkdownToMinecraftSeralizer : Visitor {
+
+    private var printer = Printer()
+
+    fun toMinecraft(astRoot: RootNode): String {
+        Preconditions.checkArgNotNull<Any>(astRoot, "astRoot")
+        astRoot.accept(this)
+        return printer.string
+    }
+
+    override fun visit(node: RootNode) {
+        visitChildren(node)
+    }
+
+    override fun visit(node: AnchorLinkNode) {
+        return
+    }
+
+    override fun visit(node: AutoLinkNode) {
+        printer.print(node.text)
+    }
+
+    override fun visit(node: BlockQuoteNode) {
+        visitChildren(node)
+    }
+
+    override fun visit(node: BulletListNode) {
+        visitChildren(node)
+    }
+
+    override fun visit(node: CodeNode) {
+        printer.print(node.text)
+    }
+
+    override fun visit(node: DefinitionListNode) {
+        visitChildren(node)
+    }
+
+    override fun visit(node: DefinitionNode) {
+        visitChildren(node)
+    }
+
+    override fun visit(node: DefinitionTermNode) {
+        visitChildren(node)
+    }
+
+    override fun visit(node: ExpImageNode) {
+        visitChildren(node)
+    }
+
+    override fun visit(node: ExpLinkNode) {
+        visitChildren(node)
+    }
+
+    override fun visit(node: HeaderNode) {
+        visitChildren(node)
+    }
+
+    override fun visit(node: HtmlBlockNode) {
+        printer.print(node.text)
+    }
+
+    override fun visit(node: InlineHtmlNode) {
+        printer.print(node.text)
+    }
+
+    override fun visit(node: ListItemNode) {
+        visitChildren(node)
+    }
+
+    override fun visit(node: MailLinkNode) {
+        printer.print(node.text)
+    }
+
+    override fun visit(node: OrderedListNode) {
+        visitChildren(node)
+    }
+
+    override fun visit(node: ParaNode) {
+        visitChildren(node)
+    }
+
+    override fun visit(node: QuotedNode) {
+        visitChildren(node)
+    }
+
+    override fun visit(node: ReferenceNode) {
+        visitChildren(node)
+    }
+
+    override fun visit(node: RefImageNode) {
+        visitChildren(node)
+    }
+
+    override fun visit(node: RefLinkNode) {
+        visitChildren(node)
+    }
+
+    override fun visit(node: SimpleNode) {
+        when (node.type) {
+            SimpleNode.Type.Apostrophe -> printer.print("'")
+            SimpleNode.Type.Ellipsis -> printer.print("...")
+            SimpleNode.Type.Emdash -> printer.print("--")
+            SimpleNode.Type.Endash -> printer.print("-")
+            SimpleNode.Type.HRule -> return
+            SimpleNode.Type.Linebreak -> return
+            SimpleNode.Type.Nbsp -> return
+            else -> return
+        }
+    }
+
+    override fun visit(node: SpecialTextNode) {
+        printer.printEncoded(node.text)
+    }
+
+    override fun visit(node: StrikeNode) {
+        printTag(node, "\u00A7m")
+    }
+
+    override fun visit(node: StrongEmphSuperNode) {
+        if (node.isClosed) {
+            if (node.isStrong) {
+                if (node.chars == "**")
+                    printTag(node, "\u00A7l")
+                else if (node.chars == "__")
+                    printTag(node, "\u00A7n")
+            }
+            else
+                printTag(node, "\u00A7o")
+        } else {
+            //sequence was not closed, treat open chars as ordinary chars
+            printer.print(node.chars)
+            visitChildren(node)
+        }
+    }
+
+    override fun visit(node: TableBodyNode) {
+        visitChildren(node)
+    }
+
+    override fun visit(node: TableCaptionNode) {
+        visitChildren(node)
+    }
+
+    override fun visit(node: TableCellNode) {
+        visitChildren(node)
+    }
+
+    override fun visit(node: TableColumnNode) {
+        visitChildren(node)
+    }
+
+    override fun visit(node: TableHeaderNode) {
+        visitChildren(node)
+    }
+
+    override fun visit(node: TableNode) {
+        visitChildren(node)
+    }
+
+    override fun visit(node: TableRowNode) {
+        visitChildren(node)
+    }
+
+    override fun visit(node: VerbatimNode) {
+        printer.print(node.text)
+    }
+
+    override fun visit(node: WikiLinkNode) {
+        printer.print(node.text)
+    }
+
+    override fun visit(node: TextNode) {
+        printer.print(node.text)
+    }
+
+    override fun visit(node: SuperNode) {
+        visitChildren(node)
+    }
+
+    override fun visit(node: Node) {
+        return
+    }
+
+    override fun visit(node: AbbreviationNode) {
+        visitChildren(node)
+    }
+
+    // helpers
+    private fun visitChildren(node: SuperNode, tag: String) {
+        for ((index, child) in node.children.withIndex()) {
+            child.accept(this)
+            if (index != node.children.size - 1)
+                printer.print(tag)
+        }
+    }
+
+    private fun visitChildren(node: SuperNode) {
+        for (child in node.children) {
+            child.accept(this)
+        }
+    }
+
+    private fun printTag(node: SuperNode, tag: String) {
+        printer.print(tag)
+        visitChildren(node, tag)
+        printer.print("\u00A7r")
+    }
+
+}
\ No newline at end of file
diff --git a/todo b/todo
new file mode 100644
index 0000000..536245b
--- /dev/null
+++ b/todo
@@ -0,0 +1,8 @@
+Attempt to add Minecraft in-chat formatting
+Unfuck !!help in Minecraft
+Consider making !!help and !!serverlist reply using embeds
+
+markdown parser is sending selector symbols to Discord
+markdown parser is removing the square brackets from "[Discord]" when relaying Discord chat messages
+
+remove logging when done
\ No newline at end of file

From 34575bbf478c97cf184433e6fdb8e200a2af098e Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Fri, 28 Apr 2017 13:16:45 -0500
Subject: [PATCH 23/24] - Reverted package name, license, version, etc back to
 gg.obsidian to prepare for pull request

- Added basic Dynmap integration

- Fixed text issues with Parboiled

- Began adding verbose Javadoc
---
 LICENSE                                       |   5 +-
 LICENSE-THIRD-PARTY.txt                       | 207 ++++++++++++++++++
 NOTICE-THIRD-PARTY.txt                        |   5 +
 build.gradle                                  |  10 +-
 libraries/dynmap-api-2.5-SNAPSHOT.jar         | Bin 0 -> 33279 bytes
 .../commands/annotations/BotCommand.kt        |   6 -
 .../annotations/ChatExclusiveCommand.kt       |   5 -
 .../annotations/DiscordExclusiveCommand.kt    |   5 -
 .../annotations/MinecraftExclusiveCommand.kt  |   5 -
 .../commands/annotations/PrivateResponse.kt   |   5 -
 .../commands/annotations/TaggedResponse.kt    |   5 -
 .../obsidian}/discordbridge/Config.kt         |   4 +-
 .../discordbridge/DataConfigAccessor.kt       |   2 +-
 .../obsidian}/discordbridge/Plugin.kt         |  20 +-
 .../discordbridge/UserAliasConfig.kt          |   4 +-
 .../commands/AsyncPlayerChatEventWrapper.kt   |   4 +-
 .../discordbridge/commands/IBotController.kt  |   2 +-
 .../discordbridge/commands/IEventWrapper.kt   |   2 +-
 .../discordbridge/commands/MessageWrapper.kt  |   4 +-
 .../commands/MinecraftCommandWrapper.kt       |   4 +-
 .../commands/annotations/BotCommand.kt        |  15 ++
 .../annotations/ChatExclusiveCommand.kt       |  10 +
 .../annotations/DiscordExclusiveCommand.kt    |  10 +
 .../annotations/MinecraftExclusiveCommand.kt  |  10 +
 .../commands/annotations/PrivateResponse.kt   |  17 ++
 .../commands/annotations/TaggedResponse.kt    |  12 +
 .../controllers/BotControllerManager.kt       | 166 ++++++++++++--
 .../controllers/FunCommandsController.kt      |  20 +-
 .../controllers/UtilCommandsController.kt     |  18 +-
 .../discordbridge/discord/Connection.kt       |   6 +-
 .../discordbridge/discord/Listener.kt         |  12 +-
 .../minecraft/CommandListener.kt              |  12 +-
 .../discordbridge/minecraft/EventListener.kt  |  39 ++--
 .../utils/MarkdownToMinecraftSeralizer.kt     |   4 +-
 .../obsidian}/discordbridge/utils/Rating.kt   |   2 +-
 .../obsidian}/discordbridge/utils/Respect.kt  |   2 +-
 .../obsidian}/discordbridge/utils/Script.kt   |   2 +-
 .../discordbridge/utils/UserAlias.kt          |   2 +-
 .../discordbridge/utils/UtilFunctions.kt      |   4 +-
 src/main/resources/plugin.yml                 |   2 +-
 40 files changed, 529 insertions(+), 140 deletions(-)
 create mode 100644 LICENSE-THIRD-PARTY.txt
 create mode 100644 NOTICE-THIRD-PARTY.txt
 create mode 100644 libraries/dynmap-api-2.5-SNAPSHOT.jar
 delete mode 100644 src/main/kotlin/co/orre/discordbridge/commands/annotations/BotCommand.kt
 delete mode 100644 src/main/kotlin/co/orre/discordbridge/commands/annotations/ChatExclusiveCommand.kt
 delete mode 100644 src/main/kotlin/co/orre/discordbridge/commands/annotations/DiscordExclusiveCommand.kt
 delete mode 100644 src/main/kotlin/co/orre/discordbridge/commands/annotations/MinecraftExclusiveCommand.kt
 delete mode 100644 src/main/kotlin/co/orre/discordbridge/commands/annotations/PrivateResponse.kt
 delete mode 100644 src/main/kotlin/co/orre/discordbridge/commands/annotations/TaggedResponse.kt
 rename src/main/kotlin/{co/orre => gg/obsidian}/discordbridge/Config.kt (97%)
 rename src/main/kotlin/{co/orre => gg/obsidian}/discordbridge/DataConfigAccessor.kt (98%)
 rename src/main/kotlin/{co/orre => gg/obsidian}/discordbridge/Plugin.kt (96%)
 rename src/main/kotlin/{co/orre => gg/obsidian}/discordbridge/UserAliasConfig.kt (92%)
 rename src/main/kotlin/{co/orre => gg/obsidian}/discordbridge/commands/AsyncPlayerChatEventWrapper.kt (88%)
 rename src/main/kotlin/{co/orre => gg/obsidian}/discordbridge/commands/IBotController.kt (59%)
 rename src/main/kotlin/{co/orre => gg/obsidian}/discordbridge/commands/IEventWrapper.kt (87%)
 rename src/main/kotlin/{co/orre => gg/obsidian}/discordbridge/commands/MessageWrapper.kt (92%)
 rename src/main/kotlin/{co/orre => gg/obsidian}/discordbridge/commands/MinecraftCommandWrapper.kt (90%)
 create mode 100644 src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/BotCommand.kt
 create mode 100644 src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/ChatExclusiveCommand.kt
 create mode 100644 src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/DiscordExclusiveCommand.kt
 create mode 100644 src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/MinecraftExclusiveCommand.kt
 create mode 100644 src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/PrivateResponse.kt
 create mode 100644 src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/TaggedResponse.kt
 rename src/main/kotlin/{co/orre => gg/obsidian}/discordbridge/commands/controllers/BotControllerManager.kt (78%)
 rename src/main/kotlin/{co/orre => gg/obsidian}/discordbridge/commands/controllers/FunCommandsController.kt (93%)
 rename src/main/kotlin/{co/orre => gg/obsidian}/discordbridge/commands/controllers/UtilCommandsController.kt (96%)
 rename src/main/kotlin/{co/orre => gg/obsidian}/discordbridge/discord/Connection.kt (95%)
 rename src/main/kotlin/{co/orre => gg/obsidian}/discordbridge/discord/Listener.kt (73%)
 rename src/main/kotlin/{co/orre => gg/obsidian}/discordbridge/minecraft/CommandListener.kt (64%)
 rename src/main/kotlin/{co/orre => gg/obsidian}/discordbridge/minecraft/EventListener.kt (76%)
 rename src/main/kotlin/{co/orre => gg/obsidian}/discordbridge/utils/MarkdownToMinecraftSeralizer.kt (98%)
 rename src/main/kotlin/{co/orre => gg/obsidian}/discordbridge/utils/Rating.kt (93%)
 rename src/main/kotlin/{co/orre => gg/obsidian}/discordbridge/utils/Respect.kt (94%)
 rename src/main/kotlin/{co/orre => gg/obsidian}/discordbridge/utils/Script.kt (97%)
 rename src/main/kotlin/{co/orre => gg/obsidian}/discordbridge/utils/UserAlias.kt (93%)
 rename src/main/kotlin/{co/orre => gg/obsidian}/discordbridge/utils/UtilFunctions.kt (94%)

diff --git a/LICENSE b/LICENSE
index ff45272..2c60978 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,4 @@
-Copyrights for portions of this project are held by Jacob Gilles-
-pie (c) 2015 <jacobwgillespie@gmail.com> as part of project Disc-
-ordBridge. All other copyright for this project are held by Adam
-Hart and Joel Howard (c) 2016 unless otherwise noted.
+Copyright Jacob Gillespie & Adam Hart (c) 2015-2017.
 
 Permission  is  hereby granted, free of charge, to any person ob-
 taining a copy of  this  software  and  associated  documentation
diff --git a/LICENSE-THIRD-PARTY.txt b/LICENSE-THIRD-PARTY.txt
new file mode 100644
index 0000000..670dc41
--- /dev/null
+++ b/LICENSE-THIRD-PARTY.txt
@@ -0,0 +1,207 @@
+---------------------------------------------------------------------------------------
+                                Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+    applies to:
+     - Dynmap-API, Copyright (C) 2016 mikeprimm
+     - pegdown, Copyright (C) 2010-2011 Mathias Doenitz
+---------------------------------------------------------------------------------------
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+limitations under the License.
\ No newline at end of file
diff --git a/NOTICE-THIRD-PARTY.txt b/NOTICE-THIRD-PARTY.txt
new file mode 100644
index 0000000..218c5b3
--- /dev/null
+++ b/NOTICE-THIRD-PARTY.txt
@@ -0,0 +1,5 @@
+pegdown
+Copyright (C) 2010-2011 Mathias Doenitz
+
+Based on peg-markdown - markdown in c, implemented using PEG grammar
+Copyright (c) 2008 John MacFarlane (http://github.com/jgm/peg-markdown)
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 68bb5f5..0878a56 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 
 buildscript {
-    ext.kotlin_version = '1.1.1'
+    ext.kotlin_version = '1.1.2'
 
     repositories {
         mavenCentral()
@@ -14,7 +14,6 @@ buildscript {
     }
 }
 
-
 plugins {
     id 'java'
     id 'com.github.johnrengelman.shadow' version '1.2.4'
@@ -22,10 +21,10 @@ plugins {
 
 apply plugin: 'kotlin'
 
-group = 'co.orre'
-version = '2.0.1'
+group = 'gg.obsidian'
+version = '1.8.0'
 description = """Bridge chat between Minecraft and Discord"""
-ext.url = 'https://github.com/DiamondIceNS/DiscordBridge'
+ext.url = 'https://github.com/the-obsidian/DiscordBridge'
 
 repositories {
     maven { url 'https://maven-central.storage.googleapis.com' }
@@ -45,6 +44,7 @@ dependencies {
     compile group: 'org.pegdown', name:'pegdown', version: '1.6.0'
 
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    compile files('libraries/dynmap-api-2.5-SNAPSHOT.jar')
 }
 
 processResources {
diff --git a/libraries/dynmap-api-2.5-SNAPSHOT.jar b/libraries/dynmap-api-2.5-SNAPSHOT.jar
new file mode 100644
index 0000000000000000000000000000000000000000..81d961823feb58151e50c79c3f9492cd705e3260
GIT binary patch
literal 33279
zcmcG$WmH{Twk?bYcXzko5-hm86Wnd%?vUUX+%>occXxLu!QI{cBRS_*)jjtl_p5sE
z(b{hOV6WBYus-|fV@~8GLBUXgAR!@vYARDCfd1tN3J45HT3CsnR$NAe{&^4x2oy+8
z@(tvVZ-D&yHMw6tjQaYGe>^PBFC#7@tf)jMEpj0}JR~JaOE&>0NlQICJXWQ^FwMNW
zWk(}1+D{`%D**XsGe;#B{cSs`OGByzv%Q2v8g&UOt|GF%YeQ<N0*a)9A|Ww&@BmgJ
zbZf9tp(}K+TOJ_^|GuI_i$W#8is~*_Hx4$|x!su^@Xys!&}TVYyspLP_4Di1g1!FL
z+RlXj-?0$p&u0u>tt|Cy{;fx`|NEmtKi|MFCr)Qzp=WRJsUR&2!ief2Y>0%0bjLvM
z7T|l_5eh|-&Df#K$7tSJ0#ieESetVceLDC47W7fRw{A#eR+rs^BI(AMGv;{irjG(h
zQ*g>V8PxF&HrT!j%xIFAo?WNI%aS5LDicUTN&4jCRrWV2)w=xNX=pO8m*^up?;<@X
z#Bs8zbcRj@KP}|?TZ7IV;aM$9M-fW|<@ed=Jra(s!ZY|tro(aK%Cf_lgWrnX40wQ@
zL(AE6VfG=E?3{z*$WFR%*ydCsB>H#6=BJB&296V$a_l1jzO+!&>PONTAo<gnd5Q_8
zn%!4Z<ZKJ~CZZRF>jLYP0i<dq2m40vB?Zy;7~K(pTNPZ<&YZ?uLSpoK=N+OWk56D1
zzS`eBQQ>HSnBb&1Q^Uq}KY;*)a6CGlI#X>!ZR%kFRRGEO2+vEFgFQgu=R6X{qP+K!
z@abdBl0_TCO?~{C37!vcaTI}pfV^Lm_t%*~@^_*6V5Bc-s^=i=WMt*=M~uRhG-Ofa
z5uat64r_B!x58snf@)zL8eBGr>Cw6b`H>Mp>5Uhx1_zxa8#R!19))>=zDJs_Bb<t2
z?WAgbZ(Pa%FfntPv|6_&RW0bWwY`9q2ONR9RbY#Pm@mHH-iBh6ZE)=!u?IhZ>Mk$R
z73|3Kp$%AmOzFy=b3X}}fp@}$fIhjB)T(l5%ED`OoGP_oy4*6a-Po^n|Ed8;5`Y0)
z!MsGLA+n^GNIkueRx;1d%ceC_&tmam;R+rmZv$D=$t=umKsVB&MM9<!J3RXXWk`ZU
zlc8$7ys>V6PLBiKeho6-#ph<D?|Drl<>`AWSG-Awj90^RgVTj=y5D=fvejAkMcpQt
zZgXm)t?&*UV|X9L2e_F5IRHk5J729C`s#$v7S@nE=B1^z3rpzSyV`40a>@Oe@HHpW
z++ivVLU-oLa<ne)OE$*XfdE?d%xKSwY%pPWHuEgwH%B$6@9-j~QyMQ7o~#ZejDwyD
z5~9sOT>`8eiVg1`WL%hZl03+=mo9edFG+hVBD)C{#9?ijheseqVlX$h=^!vC>k4%f
zn;l1BNwjQUGE(Mrnw`T^*>=vh8(kS;o(spxGsh7<#pD-dSLDE)Z6aVW7^TS{BToW7
zWl5lU$=~l_QJ{8#aeL-83wcSjKqz7)2Ni@$3(e$`ld^snLSQ?OYtMJZqXKe_4C0m<
zrdr1(-DX@*C7l)LROS}Bmj)%qMh$W8t`QdMo)M<v5}a~XXE|>!5`79tmo15}6w3p5
zoP2v)h;?i*`o>z0l_GuyO2HG2PZs7f=)(ju`3CU7j`YqMgOJds{U_shO5NFVHY||o
zFyJNv9SVr=37|&<j%DDF=}@3mDpq|H3X_AE#6N1)2C8t4+rhL1krAX_Xh`a0fEn#@
zmPbc~DPBXQpi@}V9JH5?zqHOyvQr#~Yp)OlrD>8pqYWwpjf*;|L8{(?{s8xQ@HN)y
z*8(ww_+618ycWqnz}-^swJiQE_`~|2k2~7a{RcQo`nwnX@jhBT8^FJ{xVQg5-)UoQ
zN#|l|(V{GGzQBO!HLClP>BkL6^X;2NhiO11_t){#Oe}-4q7qIs3rR7%Xr}8Gih)X+
zCO~{xMgDFp*OKSTo}GwhxoC88m8TZ#d6!2Csw~mhvv?LD`_wWh-7LSM1)N*_Zo+iu
zs6A~3f|iA&_T#iLjc!|zwiV5?%N}ge>L_S7j-)m()+sgxz?ylyfv}prKtojm@pa{H
zdw(ym<ruRT_{>+r88+e^x=1wwACh6PIG>uwqJDL#ko>$}+zxyuD;iYK_J&F0op6SH
zNQm;_Mr(kPEOU2p?X-Hyghm?U^yF7};52M!fYNtO$Uz5adlh?iBqT?+JfY#V5|p}e
z9}GyVHzmC(RomY2CFNSqtFYp;A*qH?^?c)L?g^b)q($}(Rg&Ncn*t0<k7HXytaSZQ
z-%)Iyr8vIDG_y+O&TVJnPkf$Jjh2d8SdBJioxNO+UK`YLb}|+R9B&_ztg&C(tbhi;
zUHJerMPByZ2doCd26N^z=IO2<tU*&dH$pYX8tJgh$KlkqHPcgX&o{zs6;KQ!^!z2i
z&cJnYk)H27p-eUu_HFK7gIzKPt=Gk4<3S(63qp!X9VF~5q>on%AwPSJ5+nbT27G_a
z5UH5(<@kL!ipIOdAy&m@Uhsky2lA_Npy?25d#-sGK4~^T81*?mYqFq>Gw02|RFEbE
z%W@x^Nz|Ny7Q~24fzG4`Yc`xBaz$i#aRP?4P+c<3Po&|;`jJA#^a(>VI}2qSRQxsq
zYeo`*yyylZ*)Q8j`qp0c2=q4nV;j{V3s-cQPZz%5FWDW*Ds_Goq<YwDn&xXkZoT<k
zK{EXtNo!+gZDVBT05GywbdnvBq?Mo%mzEbRQaY8UksR6BQh*<zRJNg^RA6BGz`#_=
z#8l11s9@s+CC|Xbz_PPN{U>c>on)SYyS9ggygo%(+mfIkq^CWVs-UHvl`I?{lBQYR
zlAxg;kdl<50}c`Jb3lP%a&7pz3s;uiTH3s>*5UQ@>s^@e^{+qp*q@m22SF0FwzRai
z`Ug!4Q(Up0VnF1HsO-cnkE=dVf!NrY#JF!qN%rf0Ck_3*y0VfujDpQJtggG%!bIV2
z%4HQ{H9|l$HC9A}d<5Zc{la-A?PT=h^Yc9%&`G97;1TC7SUg9SsFDuDQy~H3{CQKL
z#Dz9X98}sRva`P13l<kxvtcb%PPtF-Iz=et;#rdk7<Ryb>4&%2{?qei`#3mA^VbMt
zdt^sFO6SY%W<+<Rj*{EU-8!R5Jp5>R5q*Ma`A{U|g>sOK`}&j1Xk|;P{up52XJnH4
z8ue;r6}#Xk*?BUf#H5ccAg3RzjuELIjV0{2y*PsljO@9}YT1~)r1GT@{E@O%=c&9^
zgx%=ud=utLqN-BR4!`PKn!!$i^F}5ld9AH~056d1h%BibEYF!prc_LfNMwwy%E~9O
znwi=+HMgG_ljx@}Oq7;T9%NG*=%PMqqFPc+hN~DA5NFu{(y=Ej55}9v2ng4&z46^%
zyI1#jp&;Fq?lW_uVSb01;O>txTE~vOHN_W>My-ne-Qw{BMZ<SKn_wi;zQU*7H*qMp
zPqqH)*ab>~hkV@y+ap#fq!Q}~?g<Tu^OW3kZ(%{++JD=a;K*wf`_v9%I8?lr?T-z#
zuBGar8t4vx(iPqHru^`f=)K)-{b~v7!;JpQCkl9OQ%;MH<Sr-ggYva<P+2^yPUgTd
zy`i;G;^QHK6SU@DSg7WX6OiVoH$RGIJS+Yd<F#n&UU~hmlZ^7WNhSrbcQCRtvip<o
zDQhTdD5E|*+4XbtQB{8$hsh;NsFnXdiOk>+Q4kAMl9}O>B4`JjPfjr`&Ue<+M%4Bx
zp|v_KQ`<O|=Wey>W5>jo4Bz!S=V+9i5LjmSvX*Og^N%ZavrxQGS4#*$R;#u^`H`1h
z5fwn+8R$ytKs6Q4UD$%4qz1RrF#vn%(Z>M5NdH!==JJ`oN@I-nd&JY7x{~PDOzT7t
z&!kE%v1#03s+!!PT!nAR9_(Db<5_Bj*ztNFz}Ax}?&H(vzb5wxm0E1Qvs@@I3U+Wc
zaGy}G7%5@|EZjQ<U@<Y9qtmoB0&qYgWYRgjVAG}WhEzkYxHs~QR1`su#T?Z5Boi(?
z3TX}0dpnH*BjpK~HN@O_Np>>ybO*ImV~+VMT5JQRr=$^3U<K3FWXu;JJ0yKn<e6Yt
zJVq+}XI5nPTyr8l10LGiemrcmlLu~&ZlUUspGC}w(Hx5-`&BHbs6VH5qiE%#$DQY;
zDH`fDQK(7MpN(oTQKPl+4VmD82lt?3a)yVIcpH+1NLfhv^08~o*nb&0z>$!r-=>_(
zo1s~h=&Z7cEW{Y0CtG5`lMK*e;y^uLd@cmwynTsmH;J2SjAOoyR^4KmVorZMyMWtI
z9nPG0sI&5su!U|fa6Bv>k#hn~0OEqkVbuY0$Ck(soCetp65))}&p8SW^Y-ICk!JK&
zykVgpKr1#E!d8vYZM}hf&Db1$E*+Djku!O(N=dpb-jajCb#Thj1=sAXXohDB>OD%Z
zu{M2sfcxClpwF4GvL{Zl9nf@U71GCg^1!}#5?i!_P5mpuijO_EM1*MBXpz`H2vjF(
zU;st+(w0lodYEI{iUh<lrG6Yu?m;Xef;l-_peOb>rUKWWOo+h0Vl?EQpSpQlDX&T$
zRjTl*feMkYv}~>hy?tqm-R1Smlo#l4ok1b6nKKN(z7*R=i^D2j;*4n8B~ZAb6Ebax
zMa$jFb6^B1oOw#tX1m$6uh)0CDSIDyP14C|<!<_|hw#b$)Np;J^KH4W3^tGVhtn~g
zB|+VrRknfdlG9Y*gaZbTN73<+l-R9zvd#=X^3P!$#BeAF$|90d;+l#<WpA&Kk3C(Q
z#UA-P9$lvRT~jKeL)!wF>L+9AGX@toviAg$?+=WgT!sKTzWYI0yLS+o^Dw6SHg}Li
zrGhjD3W2^lDJ*Yp(HR8qPO6@1IxR*4!)HCPg(LP-=y*kQ>~e5LBxd-yMbDnqZ;M*K
zG960wfA}0X0R>K@4f+nF7?cag9B8OpIkdCsO&jE-Y3BhM!|6?@FHIqR#YV)p6C<97
zbdqs!Cy7pEIEDwvw=|x1oL20LHz8@!Gvw8=KFsRAG1G3<oEb!b8ALJ-H+6km8Q}wX
zpC_(Uv!?OI!X@7?4`1;4Z-A-1#IShRW4(q4Zo#N_p_ingo%{(Zh31HLRP14mg!fUn
zGq+U-WAz_tRpMzlGoON;_^}^?To{>%ymrDOs-_-qHH#EdP!HX!TV9Zl=vUqHcxtw3
zgvHh2m+@E)vOoUh<~r`#H=kY+ZShrt`8BGc{C8Bd)Uz`;va|oUDDYo;;Qx9Bznzhu
z^v~D*fr*y#12SC<sJK-ua<#RG4=Qr?k)S$2VUg5m${^itOdZfv08I{v!nR&-gw<?B
z`r5aAHe$Wj%PAA@A2u$I@Y<2Cxewh6+~*BW^)u;>PU7|Ec_Fa|mA;6T7$p>(Y3|ym
z_xOxvdtu^hGD=PH2^L8e1b7ToPq3DZPO`z0c-gNSHE;!(@ldKWt#d|U2@Y7RPksMl
zEHm-=aJpPgK_E<BU5+x_sw+M%!DO5HP*`pp@Fj%yBW?7p_(Hev((xJPgeNj*7Lj7%
z*D*kJ-e@4YB|JLqu1=-TEfH4~(_B7PM5vrIxzb~3?oj5^5XQN%uuu0Uul-jr-i>{=
zf-d-vTd)TTJsk$T2j|-3tYPnO@%0N(4frJxkg5qdiL=u7U&IbwD9^>nTGrtuVPOR?
z;ijtQL?}r_fIFiF5ey*u<lnJ-i~B0V=QA3V`xJFx8^ew2EwB1a(Q>wteV{k!SuNU_
z!)*(P^G%u05`ta0B<LK)__4heRP5wBzA70>zg05G{yq@|0d@u!M*l62QIbFOCVyF1
zXdfS0kF4NOy$u@8#uz9lr~n~kVJAmZGuuR>H2qE;`?Vhm23Hz(V7Ktjrbo-psO7`e
z(;3t%M1oOj!UWxhPsU)<ex)2E2YEji9(`zfm9c<a@JBfQA*|tDE=N#oJLjAn$h(pq
z*R(#C3%-1Ptca@KcVck-6XM0@$#6pbB4%g|KG9P*_fTaQvAm2OI&oN~vgJm5HvFEM
zDx6mQY|z9>P6xq+<x7{cQdOk!t2L@1OchO(A<Fa_sTr$M!=@f#`%sryMcJlQo_Sr3
zAFJNx5R|)9uOv3h(D`NHi66^+SWBf_Z1@(mWP!!Mak3pi&%AvwrS*g&F~p7jpg<EF
z)QJqtFH_d+)hEI~7EGK`V_0M12#S`ie85&RE63L8Z<!6p5_UZQq;+spZhhH)E;yvY
z&gAwPg&Vk|@Oj(j`e&`eX&XDqy@p8rw;>|``w)r#;2i*ie~po++>p#`jJSotHi?2h
zS!Xx>3=u0fvIl95X=f?JNDe!~Bzm@2G7N8f1XFFAt)Ez`@L0=E`jmU#7o8IVpix`R
zUOg;Pu$oVWIMnHhn3~8Asn0eNUkY(1*=@MVTyQlJr|qNqP&<NE$cSy8=Ge2C*(y=?
zwxKs7CBqeWJ_^3@Yj~hD^(aK^jxZVuTYE_f?V?mWx~2pL1w4k`@scLo+*8w`h0gdm
z#;ON83=3!tHXm|+{5VdtU$QD{Jia=qKC*Rz#Xr*w9w91@{7o8EdH}p=7xweW;I8DL
z8vnA(fTq+u8bZ?O#}R$<ThcHuW8&Q#tuqx#PM=xp`KGg2X{F##89*1Tp`4f@pL!i*
zY2xK8>b;A4)Zdkv%(v(D7|+&~$LTGsJH0!}Fs}&23vE(sGjU7P)%gOB>+v%v?3LY#
z{I5YV{cTVP{yr%G8V&!*4zo@^RN)iFlxlU25*#gREz*?HEXg{-%*b^C%6%(Ncp?>)
zBq^Au8oEayUI`CzuswmsL=M;!{Q8UQz!khtCYK%#9uA)G5wR<5nFY8Zjjj?us3NL2
z*vjX{Nmj;=BV@(htLT?Zs!F9vPrA_L!mdDBj<!)f01k`kvbqRAGvS18$u`PsR8WaF
zu#5H{ZhlOYKaD`P%id;rsQlhcYTk8Kw5B)_!ccFD!nv~^6A?ENe(J(VCtYe;Ny~GD
z1j)+dsGTym+OrC+>qc=;p}mo3h*A<=XIjNyztI%%K=K1;I2GjCHeS8q`s%Y^Z#cxi
z^VdJRwX~Q8nNB{$fEQsf{_u1J7X-F<gJj*^iHVWAq=msy&gM%jJ(JOutZOsPr@$VR
z8`Zm&^6)*&hof!GE7dPDygVz*z$~`$JpgppfGpZgJOphaU1$#Df?1p;;E!7(lz4N5
zB|VYMcncd$uwY$1Cl^k02o@Wz>u`7dn7ug_nL#CQi|BW`G3gEzeTKLf7>rh3oQf+_
zJLPIYI&#Mu5bPO3QLh-E;=(#V>L$31S9nB7sV>#!NQFrBMoAB(Js)T3n2<8E%w2G9
zGblM!<!3x&*Rr=xoQY(T%Ae}_cui>BX!6`)bs7rhQBOxw8HEw0$WKQC5>q%5y|R)f
z8zPFSj@qz7^F%0iq<LX!Y!B)$t>g3Zv~M_fkUnSDj=KzIny1$^f5e8AG{(eK2ujyX
z)&m8Euu(}63EHA-0F`iT#<fb@@(;aL&=lYpEzZC$<NAI_*W*4PaRrJ?{S@TXcXqr9
z^CN5<Yc&)muOZ9*ZTCa{yRZov*&EmaY#adAR)6mG5iRh*{HXq8Mp!TM87h>fQkm1x
zaPk&e1O}B@yj3aRh|bKQ5mqz1GYC~|?PFq2n%H)n+BAVb%b64~C}ElTi4-jg<xcK*
z@698Af4Wmi1zUkZIU85A%sSKE>ezi_arH(mS`KO>JI<`=CS+U<vPtoJ2!{tvfW8)K
zC3S?K^zl?*Azcq@WXyNVtvH9o;U$sTD0b%DGeeAU^KsMjn<gKm9MB`3&z+x~+cqWd
zYrejLv~Hk|sdzOL;kWrq_d7?38(3SB{!#jh05_vQoDrv}r8vch$_<zzhpX^E4f{k~
zU|BJ(z#prwQ9)@Chn1D4=V2od%o>>|^PQ=`EIMm_clY!#!mhbVh$m;Go#$|=%Kf-y
zXL;%A>R~|^2tX4+NSv#S4S?!GHbyl~G@8<KVxq{_=;ij0zrjjRn4l-=ibpVn?eDML
z5`^La9=v!Qtm+(0X*lA5fOVd7a5V2j&7k85-=musX|b9G?+#_Hi`INuRSLTqpx&8@
z34F}88%bh!N~6%BH#2kMVs(d|np)Tc0Jq+U1C`Y4Szw7T*iehNtf|ZRKjs80wB8nF
zz$AKjMtOA5c3CmS1)ClUgs%%&rkRDI()M{wd@W5nmNXd2!wVMG^m<E(!(Ghc6oso^
zq4Mr9dQF|C8bin7Gj)<~uiaM>6~1ce_}q8FlAGUMOymoRmWtR#viB4cmz}VKsg;L&
z*DSAv434nrOa^Q7+X;;DlTg0;Ono&T)d9q>Q@NGw#g7Pw&R}wEOIH+7(^buJekG0&
zMMf{!zkv9_7|=&unw_DKD3}wEPt(Pw<d7}P_lcJk?FsiZFi-!J_vxO`Znec+Dl@H`
z_5#BY9JStNTQb;i>LKe3{>2e~|K3;By0Rs>K8Xg@C*iPGM?$uK3E=)~cc)Kk*h);}
z9NqVQiI93=*@!m&<E)hyl(djKt6ZO6NQi(x0N~H7WY!~W@i$hyBTlH3F<(O3frWZ+
z($*uUzT#Ihbl6RCTqPT$uTeebBw?Nnta*ZM1dl~JMd<tOq2_RjDLcr4Z{Xg!bf;)@
zKOzTXY-uwNqW0zF(~HL&!FTiW-+%Z%4g~<FPyMVR<}#X6J=7a>g7|^;TbciL=3%C<
zpz<`GE#@`@@;E2QA@nohp>?L94w?q!L9sV_<0Us_lW5wsOOIC2xLNEm6~ESf@y8Gr
zW_O&HW`j%N!XfU44&EQt5m4J#)cLv-R)GHw-G9*w{817=s^d?6L}5S%gdg>5-#Z36
z%F=>*0z$^oj%*CHX(^xNApP|cZzrbjmx*dD_W=CY4RP=mQ>vY;SI{|E`$J1^)5@}r
zHt?Zt7vDg8r8k<7EAb=O9^0acIA%>vyq9t?VI*)z0UrL5&MZBo|9y!IVm$Kq3hc}i
zGm``cl`98CXuNm+A%^J1eo9?DJR|yHk*%CuWpkCP6q|Th*TwUevJ0%84h`oTot+qZ
zTGcu0x~Gyhd5=>%056OMt+i97i!b_fRTiEE{$CTaa1KVom6&3=8Hv=6{q3x55F4ng
zAEL}VHxp{_*=l-FTv`nr(;Yr6YAoHdmqS#JbhMls8h3?0*1oqxbH4zcaVldJ*c(&w
z3+^a4Dbe@_54H88vSV`CkAp<@E*E5O&0$Y;>_Zx?cjPKUln@dY=5XaOaz7(m;4S3E
z1Q8Dei7=)pzHaJmw>YYPYNx|z=EN{t_zOn#3dAOi4NoY5NQ^zXYwmRj!H)p?)v`3%
zyh2;rZ|Tf$w`WD8Kj)b>DjJGYa)`^IV!)CBNti4bVESt9AUowyN;1NktYIY=%8k#N
z+|#<r?BdYZWp}HueE^45Z9ZTU##q<m-uULw%cPBa$Kw29Y)l8J9Fjobln2Zeg2>g}
z-GKKcnE(C9tW@ggyj`?H-IOBj0S3$^7Kb4fhX=k1GY?27tj|jIEyal|^#I18+{v)&
z<PtLl?}bEWO}V#?`g2mFx~-m`wAP7eg_?84gU*HDGor8^k{qSN2_FIm(3}JP`Cv;>
z^@B-<(lci+ibl2a;`pSVS@c7R7xK*FtI_8a2<fbm8T}<y^J(A1$|$CBBdkXmH8|tg
zlL?NYPVHPKb*N>8g}&(RL>Va4v%OAL2ibYKXC=mFF9wn3PF=92Ewz9lzR(w)$nnHB
zy**uIXwH?vT86{$r9PV=ePSui5)zDhp=P4g5>cktvb@1t30G8lm@VeNavYa-oNVCS
zfJ<98>0BKmJI-4a%sC-i53@BpKWW5O(#4rE<cfPsw>~P4i@<>;Tf@QpNb+tw45fjw
zcq-vgWexaVc?fQ)3tD+-yKy9gH;!(-h*_3(gneUcmIUs-3iru(EFGv^&0|6XhLn5J
zQpN3@f#P1OlW3k&bqr!*#|^6!F%_AWy3=fCm2GTm8MRoEmUiT<`5C;L;VQ=@g14-2
z7!V4=>V*zp**jcwM@P67S*2!5xjGt*Z5E)<ce)egXF>zyg}ctNm39!uB&HxW)<41M
zgfT;)EDMfe2lU2?JanSzXihpOBzwCEh*6Nbq$CwMIF99vCe=<Gey!D=9!6eKVLi0y
zKH6)p;_}@~-<!TME$)pFrD*mmjfBK8Y|lXWC}JbT#|ulS&0mZFp=Slur3=a3wTZ?5
zP}B#X&AneiVjAIkNco*H2oy0Kg`7~FoyZ2c6iKGTu@eU*e~o;NwqDvrbQN|OdD-9H
z?*^Rb6GvxkJIi}g53mTRFE0DZq8dK=n;*$-fIs%)YMO;=1fZRlb=r4g_?(a#Le8zC
ztu?mKb-swq<8+R8l4rtd_$}zK)Rhaij7@}}JcIlwG|71S5iC$3AS~$LA>}U$P0m8k
z)yVE2g%%bmE&GE9uLz?Sc))ns&BTUsyG*+<k&}`qvz)bC=EfLT&>A;I{@2-#Z^Cj!
z<k#m;#$Q}H7j7cv*nlv0<7_lLgZVhfQKGRHAsrr{msCd$Bl~IK1+taVb)a3O-jmwN
zaAKI!CKbwyxBJ2>380xwO0hzvmVVK(q%JFAc_FfVFdu!+Zclnahys7h6oO9eUD_tD
zmRCfTHf$O^qtxnxXK3+kV9~!Hgv_*=NV^iUPmQnxkQn|PZwZ0pk+$-b#ar#++t%%@
z)Q~w`4@#dZbroc#+}T##s_Kg{dISQ}5*+Spnx1=3CYI~9{Y|$AlBI3#mE2DCA3{Q+
z>JpUoFJwU4SQ!L9kR7ATZ8w5gE1%eD36I!bm04u$Rr=QsaXV-_Rh*o+&swlM1Z2zp
z2m@_SKQ!Ab-iiJe?<oGB&dFI@xJm)6{vvz~y$V=}!Y9?anX>n*BhbOZl|(Q+nMew`
zS;Wfg4NQe-3X}DAnmLcyFg%|k1m<P<gb9aulDV9F@$Y_0Sl}|axSZ^EHd4DHnqhuY
z4Y<LMMUcvKI4H@y=Xjah;Vrs~O)IeYkWYtPi9wNtsySeNcyIVumk=R7R$^tY@jw`3
z3A&G>l)9`@l`<F6rF2t$DSW@?*LZAlC8M-k_dYybnbA8q|1Ekibsfs?T&<)lDRO4Y
zI}?3cK`*Qn?Jo1EO>)<sO_+oonCn5vd;yW?_p%8VTlAL17awt;xDBpQ;zgb>0Ud&#
zFW-2L{JB@vC^zDg>SYL(E=%_bOlK}5=RsHwY-s8v-$}fisI<s7_|_9{gy1>Eug2S5
zx|JU6_~PlQVsi@q!~fSP-Cy3m`v35^bQ=9H{<k)?ceJswwsZKmBuM&SzC{3FB4}!4
z@1SJl;^1g!Bm%Jbla+H_S<mr6KtLEk$T&f~bAoVkf`Au+C|!M=%-U3{8%|Xcfq=>%
zcG&qmy&fGo9TGiBTwb89qOV3w;%n?B-{>V_q-~||?PcX9VGH2r_mU6hL5KSc3qnYH
z&k^jpcmFJ|RyaWR88&3Th6G?>V5n=T3!-lff%y6xI9dw!>(7oO<?)30)9cb}Uq8R@
zm}!1voVBIVe`1+@{_x}C^q*!${%Mx_-<#EFCISH*>GqV`-R$7`lJj+X6Ild8_|Pq?
zx`L7Eb;=9O$P5a}z*G(-P7a~+(<~z7LlV!|MVJ59tiP&R|BSqVg|&gXw6&p;#UE_Z
zD6&PSix1JyWCKx9KjsvLlvARq1Dq`GE{52G(q}S<FVM3xdY)&<IlQ}A{uJmvstper
zH1gbMr<0U#GhUt_JwWO^lfo2n417>l+Wc(UJw4#EgZNN<+}}zRsumj4Sl3@=6J(A}
zUXo)BnAwT$x}kg&!8FvgbgQ(yw?A^KT}64zu6HObS!>KcI!KdP<R))CS2DNcrXf|E
z%KIX_&px0$jK<uADDv$Kld+v}`Fov+BUxcZibuUDb2HOugQ)Yz$`Mk{AWoRcn@U|}
zxge!?%4B9}hwOMQDbJ6!o5A~g_8Hk@!t8<mrL){xj^l!5lI0Z$rrdlhyFlUc7=a>z
zDKALjQoR*t>5o6R7_!<o>hQ01<@?*(`m3b-7Y{1}4F9Z!u-FHM*KuWUn;`svO#c?5
zm47X9EHv-}AJiO}7-Xg}Xh%99RLMF~4hstgEYvK<DU=7Wr_Z%RFDIwdeccAiEf|mY
zN6ylkZ+an4G=|#`N7hF*bKg>0M(>VJzUY7^b~Cd%9J-w%MrhU_bnf7P-hhec_J%@`
zKDO;m0Ev;3B<x(oNYvj3&r5m(!aVHLPIFPwj(Z`en|>!mI7kECohS+dGn@|+Ivm}O
zTt$Ouq5_6IT-45Vp-MRLD52}Gh9br&t65-fQ%W9P*kTI@x@UI8;BhLQYk?OyG~*l7
zduCgsf<T{8beC^@mVszVF3a-9IoWq$n{X0WYC@MIX2f`wmAx`a8m<H<>EWBZ5OY<}
zG(pZV4N;tKy`B4kIgSQ7?a+~Bp6lv&ZiJ(Ef?PY9cxcGM4&OC3#0!adQ&9qIQTAx@
z;dq*d8)QlpvTd^TOi3M*Jh;`kDNP}BLgP9`vYT}Zj7px6g*7YXwkrY(qb{Qy&HN=*
zwiqmC&3gv*SR8^UI~-W8<7!LPquv%(y7f?FxE%A60ZuCPb5(Vw$DhI}O8sjAj!)uI
zqucL71JR0?3*^cAAZ3G8TXWE5TWj7a17ZzMmiCFc7YtNzYCQC6`cp2yj4f@eYkxhL
zw4DoukYT-S%YU5@dmQzc)SvW#9lPv35eJt`RY+A0m%p|a6~k3RYWg%VG@&$-G`8_z
zLrjv<M*d{rW|}WO7YaJtk~7eF+4iKDvoFL|AC>y&vR@j<3<o$lf?E%K=vBgcDRzZ%
z^2>xjG$%xWBT}G|geZngg)oOyh1iE&gvj?KuKTQKtw-x?GG^9)O;pm9mtqX#X{G;O
z2+ww`2Zzl=#3r`M8v%DDTHWlu!NCFdC7N?9HRgOu^}`)fb$<axLBzA)EZaCo+m^sH
zMBxn$43@>9YooJ5DFg7EC!o3A`I-+lt+!vc=w46q85)hEgVl;}iKySg^l?2sW9&9$
z44px*lPylVH~_xqoYhKf#PpuTk`solMdxWHXGG=+Cd+Kllu0&P#m$o}p>5DqeQ4zA
zqFqwnE5*X!E0w(Qo*>t1b0EOh-h;@&Veyz;inQuKm2_5YjQIS?p=&Y>Gr)mpPbAD~
zuQ%sm9#X<tvT;Eq&_OTz;=?(7N-HGCl1NIDdCeNLy$lX8^G@Z2)wW+4JhO>hK`37Z
zJ_xuwloiegsA=RmD9d;EP}(@4U|+&;z}mu6{62;0`RI`dnbt9iKz^?m-YrLZrz7BQ
zyDYn~8=bJ99eS8uik<fylo576Cz){EMRIHF2bA8?UT50p47vWsVU>gPEP3`h-0IOA
z|1tROElf*tI1jBD+*B6!Ca@E!{mW0xo@S3Ae0e3UoxeRe^jGogFNpHzR-|BLU~Omk
z2X>dlYuHcnq4tfT(@11uQ0ca)lvoPXoK1!%Okk;7Qv&ex?kD9<q-Vuopkl!CpUik}
zfgk1ekM#h+zEuJj=P9H+k7Gt`CKnfTHv~YZK=>4^dLZ~nVoCHx!d0rS4~439D1>An
zd$eP40{a0?)yw)7E04sHIkhcnH(z}x?Lllya!!yFZB!}0fUjq^_O&SDby<Gb1*=qd
z{o<7^lGYe55A~FM@E)mkFT9Ka#xJe)rj9HDM%A=3QlAbiFRfG~2I38ve)4FSalO_|
zzSVdRk9`TrR8_-WrOLHOUwOnLge5lI7`*yO-cF!M8`XBKZ59i3aw)ZdZgjqU;kU1Y
z@Llm^EpsIM1cZS{h@*+a#omQ=xjM7^QqlktV*lvq9rHNc=^UPd8~%`s@Y&Ys#4?o}
zE`g>1=-V^iMouLl>)34sG}{pCWoMS^R{WD?O{J(#2XQJ6y`+ffcDCebh-4l-ubYgQ
zYpP>-RF8L^``PWIfKoc@kcoL#x9(JJ9Ml~1rR)H!(ho%_f$cbG{57cy8?{_|bH;&S
z=%@mxuDlzU$I9|n@dT3cTbmCSvinq!2s0ig4}!HQ=z&DClmz{tmP5tvt>P(t1QS_<
z3ZZCHD$ViMYus~!jDYiWwRG#UpzpWN7ZJ~w^B3H<lVNFN55v%XcSr~Zj~JiYak~je
zT?1CaI@pK%ph#C~fOa^<h$#sDrMgJ%BwD`&U~Rhg6Pgf(4)bfD`)sCe3J*v|Cy<qi
zX$x!nx(*yfvyoa$(1|TaYsP8{m}QW_lz(o9bB=tgOL)@Bz3KT3Lt0OLpyAJYIKX+W
zzk%?Bc<$}<a#+8TehR4Hu_~%xvnp$szcP@2l0|JN2s$SSD<=qi5s1<C>FA)0?&ix^
zuBZZsfic1mq)Ms;+a2yx+2C^_85*s)#AN>omni=cIzRPs(_-Z@b{e<kYj>rP2*lQ7
zmcvu*VDn-($kXCu?E0jS&tn#{Cu;5w4%u_h!6$h26jP}XBZ-NHYGdkmp#NVKG6N$~
z4HHWhQxyyI6AMnP@tX-gS9rpK?sll3b^O#Sq@VX{+R<;h*RLt%e@vF;|CK5KU#FC9
z<M4+6JEi<_uJK>a0b2eOo&>FJTz>}jZy+ixs^fLmgz0Aj%<oMdQV@hNUR3cWA{~*H
zs5TjLt+V6nQ68{F9iUD`d&C!ERj_a&H$xu&`rPOxElK9t^Tovz)FwO|8D7#9N$Kdo
zYr*QqieMpLn6D8`J@8FMhBu}huil;P9a3!Jf%g4kl0z9JwA&meqSAZvO0`t@uuO*!
z7@b_4MqqGD*i$BE_bjKw=|Lji&QWeP{%mnQg`=3y%7gWZP$^JFjfm6D1fnUuC_c?r
z4m%j!=|b=twbSw0)BJJ?@=rk!wqhjc?93@mOlLxME}KcmG>Mbrsdj8KospuQkF?4)
z2g^mD4VG@LgBCZNr$+h{MpXg>nP=+9w1to>-fW-tb4#-E+ca`I)QBFhx_`WpHP{Zy
z@{rry^hIHb66Lp(PPe1X(j=tR!;4(xQ>*YP$_kL~DLHHnu<S|ueD%4>l=4_l=V^n_
zh^_5sDxO7H0+e0}s?l#7@ZY4OqrNr3@UNw48PNj$s)+cR7_gAbk9RIhRG&ew@ClbA
zf_L=pM|0`xN5kA9d9cC|v<D)`P(rSEmNPtzwDY9baecySgrEVf^@i`*6rh0?z4OtH
zNVvkCivi8l(Nc&rQaE%uPB#=O=MjQabyv<Q)x66jg<U4QkZafpLuN{ac<h8CiF1?E
z+z6teQ6PRBEtJdgkPFokVnP(bUF!(4x9zv~a>zDAj99G@c1|x%v1<ylWz|86C(v}R
z*ZR{TkgM=Rb+0LU|J&N6{dE#M+B;ZV{-)o<cly!H{=g>@h}QLK<eka&=*PuR-O-z{
zA`o<NvXJAS^$l0YKQaFko)oaKx(U?<6y8cmgtqIusRbJae}>(^6W+V0igRrU2ET8(
zqw2{82fq_0yT=^F!UE&NzO+ZanEWR?RhWxR_V)I-_qT&}5A#JZRJ`_r4CPD=p8)SN
zAW1;E#8SQgxF>Z^;xw4^YTUtZ&HwA5@t-v;WNmHt%WQZGeSubSLZ8)ML%H=eMIy$u
z*pdp@eP2aH?o(#G26`*EUg!^v-ZV_J(tdd4)c}H-Wt3@^sh25UKqGo=*lL?b=8f*x
z>z8dno$WyDn0FrVCi6L<H~fI}`a;BSKcuQ#u_{f)Z#0$z%l!KK-Gc;zfNQiL4~6&X
z*aUy?diyhDsDX^a*%0z~S#?t^@Xl`mgOX4!F9WhghTn-z$gQ0)z){2Kl8iZ2dlT9`
zwyp%Oa?O8kR$O3Mwk@v?0sCzy_v4nq-vgVd9l-E68S$D9f3IyI-DC~N{wV+i{V4#L
z{k;H?tp7s*u=}e3p#EzCfRAbr-{W=3rN52zugT<V@Bg#?7cw#iSONYyR&I&2mYtGA
z?Hv=&VR&cA4*rOc<&^Pu@NEwUG>kaP=Wg1>+vC!faQ(T3>N<$lWco)SFUpO*wSaGq
za0^n4p-+?BuA}zHdq+oQE4*GH?eNV^tNy@n5LH^4JYsWJOa)0-U5d|X8axP%Dw4w5
z<4Z<z4RW}ll-Guzn3}CZnd5}As9N2;^LL#<mzeg|k6p(%GG}6}QvEVN$NF!l;vdl2
z&T+?kO`;@jW{BOw)=DqX6-{BB+)dtzz<<419(Lxo3WL6$R9Fmkz)3OI1CKTuZW6@C
zT+-^<9b3FX5L$(71hl{N<!H3}66nMK4ITvP=;3|1@Nhfhk<WgD<2@8kf+Ms$_IhXQ
zbfofA;5;~PpVwqmdNDzd%2{^(xY40?p9{L+p^+5ty7&0EtMx;rxQbRR5)KoYn-wI^
znVE+OLzI)YW_SGTo6RKnccH%Wv5c+wBu?WgqYYF>4p*s)Gu`&1Nq|vJ4hoWCjyP$a
zoz$j)i7z?p5{8_n7_Gy;WQXf9j9<t_KDxh9<ztiMt%S-xKO<{0ALwAlsxt-S+OFQY
z_|Rsj(|Br;93il2uCW>Ljp<gjWksYZu2F(&GtDQhN_FC~RhkC?`%;O0d^=Uoo(RFG
zJ(mjX%MN3oOt$_$mi28nxawrH_}32Fk%ev})d@|qW$&iso1mLD?`^?#64fb93Z4MC
z5sL2oQ>iJ^Sv`~w4B#4<FSteh$fbu6s^zy<S3gUu0rA5M_3Pe)_1goGzvh9jDX92|
z7Wt23DPi)`l3jeLsg_eYB{j46@(6B-NE!&+s};hC!iei{YA;)*XY0vE0$7lqKByr0
zy!rU)$7vp4VVL!;mT%(5+uX~2I}2Q&1TA7S^=kay&%%DiF=g0vCB$-~MQhBv*o|<}
z4Uc6G_vQ1Ca?MOVM#b0pQipXJere<&RB2p1mXSs&%0QzwiIH$-O4x}{;L<%!Yh+(G
zCYaRBtPpy<nfP8as-E$XRpaHeWu#wyx=YZyTx!UIA#|ZfKuR9#=FQ?|{Yml?Wo+w0
zy2*2Y(nU_ae&2N^_mCD^U@d#ho(k_ar<gu9gWT5)pftT5f+2=!<0&n;fX?u0%f>*F
z8$GcwNPyo!f?2ROxuZx+`3v+rqDaA{qV#A^^a7PUUOCxKGMcR9V74iG!@JLmir7q3
zDy)roW_}^6&*2M$sNmN=i<=4E8S1j4s&_wytegRBE$LV2Q~51NVE85cy~gNI^!qDT
zl*Il#b@4hm$qDlDs21or8H<&-?;vB=Mit3tCN_<OIT5JJlbo_JuCm=MbNz8tkpn-T
zwpx52RgnH%s&=ROBxQ5>?rCR-9!O*UYkOfv2Lp~x3&qnco!|_hnfJQY-D+3Zdtp{W
zsN-GNqgoHqhu}!0uJdo)2+ntGNKlsWItpb<-UnZVJn5YtCS@nt<0YDuk_*X4a@o0|
zg(vai>$h22nP^BgKW_6n6y18~H^H(}5ER*p`Sa)52%qthCckyRSMf{LYbx-Rns%1B
z6&#7RFUx59y!@STLneX3jdV9qK}C)G{5z%#t8ir9gX&-@Uo`HAH{q5@LL^pO%LXD=
z-GvmT(*ULL)Y-ALM!@_K>>NKwRqFa_j8Q<K-bdmp74vhz*DtaL$)?|4BJMCx;$v{r
zpYtL;z5J)X%#f5N?>vmiIk{cmqMV3rF*n=wii{@2jHXB)MhJLwf`5xT6PHh<&A*CZ
zQ=JzI(IJ0eNtjJDA5wBWd{a0zSqqLKd4E+1)3rS>{pCPcwOOq8qr)(lTY$G7bbi}D
zONplxX!k)pa{=b)dcYd474~xF%a}pOdF>i;JZwURzN+xZDZC2YoE)2GU%;ByB6D-Z
zn*fBf{_~18l=n3rB2ZZAQ;yK|f6Uydk{WmSU-O9bxAMiWxrLmbmC;|h#Xp-quh(|Z
z3F5W&<9VGB0QDi7M7XetntTv}5Rnyu(B64$UXSi>jxO&`om4W;fPko{{(#~9Arg{A
zj+DKvnv!FNmYE_hil3d3k$#4Xf|p}~jhBp7l>Ti6O;i*=SsSGmZ!Qx(TLm948*grX
zbp~Nufe?W*Er~CXSdEvAzIJ2lM+Fr#J17!g5T`UqEepQ7pQ3wYtf8)+E_mg)Pjm+Q
zx^K=oB5zX>5k7re{K++MZD7nBUdsmbKjam1dJYDrfAvU7H2*97A^NXO&rer>FS=Ug
zKh2obhTW~ekf#EpHUn+3u9B3JuF|VQyZ_^^`8qjtVY06eOqI3nj^}BBr>DCYuuV8O
zjwKEr&VnDr#$)*2YDX_!=ANjgR2EHgug~~-v`|5DqES*mWX$qa0&_IA!yQvn)wDA4
zngG;RcxWCWyjn)CI(`Ymo2QA-+>C6-;=A|i!s6_Ni#N|-T;-VFt}Kw>sG8;Vh<XUL
z-Pn&_G)vTN4EaNMGYrm6(*h+_z~WnzVw?f22yx4Vk|fh<CzYs=yl}`JB%Y5P$U&sp
zzt+an;b?V!TX7a<ze_8WA)J;fNg^;%1A~E^+H5>4l*yE?9u|U2>1hF9C@}CinCE}e
zf5H2qJNUcg5@5f&+u^rZ_G>ElI{LM8_^ZqRJ_(QinS`K!pM~%cs73*VL?V9~X+?d)
z&4B+OV#LhfixDh6Kg5Wwd%lT(4t~H7)sY(KKaCpw7-tbu4YYT*LmO5BFZFh}!*ALX
zo^f<|t%6iF0RM0Z1RpnX{c8@s`E3sVng%MGI$FHmM)*(Y?b+(*$<)K?tUnoU#-9vV
z<nI}7p4$(G3;$P!+xTmSi{23W_2a8))vuplPwsvlYej&G)qi4F)avkM^ZzT_&d4WY
z{lC-p-xy^M_z#Ub9R7c1)KH0R&i|274tjvUX*&mgh!8@>OY5zlFs!wkIp4IkquED7
zLTMXGLCE(>1)+54T&%vim0uS^2oakaFDvjVeb{gVW#AhUSQ6+Gh>=r+Z#nZg`W{m#
zNthysQ+%4^TJS-WoY)+hFn0Ofm|7kPQjxXZrb~L2SPg9EVG-$dj|ByI=8;)zsHnnS
zpg*+V;mKVRiW~KE<tj41Yj-#`JDGfr{)pGGpRt)qbfCtz#dYVL-|@>Xg)#$pBx4He
z6hFMHJ;vmUE*71a?SRc)=-aaRnK>=@pF9lj0t{~CHJ7P=TdIFOEb-6Y{D0)KzwFTK
z31GypXY*I;xR0MwS`vM;NutC^Npac3S=Ic~MiSAyMmpZyQciS{E?(*t<tr#JJ-I9&
z1G$;r7d)6UOzQ*C&-IyT`ve12C{ho5)J}cH^m*9a61qJD?mw`8$0HR?3fkf`3fAj)
z?mP=r<H(a}nV~JE0tgN&ac-xW+o4kN7L8CzD(1qy1Xn9yqej}3OI16H$2AN(YzDmh
zc&XJyCiq~@@U8WY^qe~uR)jav8x3vmYf)fA8qUkrwu;U2&x1I{*RrG7EgWF<Kj184
z!tLwWtB<69>!V+n$G`YU$<^k+Mz4wsGAQz>T2nGyQwkZeT(J*5wUlT`Xc|Zbxh$y3
z4E{M237MZA#kefph|c+2CB?f<S>8V&Jcrnxbaj71o^n++pKVQRxk<e{I~Z~X8k)c6
z>qVhYUr+ME0x#BvUE>gx>M2i1Weg80#x(NEB<^p{)Bk*z8)Ccdh=wwZLrtE<rYyxs
zf!Z8Rn14Mbbi)*<&gkZ09Cu|_t;tc!Ry-q7f;574f-{m_VHE#)QEetj+=i?+MqS3I
zF-hiIS!KM;5#v!#FskJPVO7jx!m13eX~QAimPKAwlepaozLg<-bh6+0K`nyAm;Ky4
z`2<8L|Anz=lsE%H0q5T8&n?Dx{RLZ>*~n_B@^lX>0yME46S7yP;&mbNCGyNA`ZSBz
zz}`~1842)L$pel@>y^0)aMw?YiQ7Rb@!wQq7;O3)_D+e6*p`!6@<o|L<460%Z35;q
zdtu19T(3l|Ce7kEEZ;SY;JMUDRH-1ogYx_+Ok<}-kaw3iavRwl@7GXk_JAlb82Co@
zQV)}a=Q9%+Rxf5R7C9z4RvrU!=D{_pgD`Y%NROp|CmZ=Nej27fL`|!my-9Gic3I!?
zy-Qtj?`*<uI>N-*rW(QaEYP}qitoFKZ||)x{6=El$ud5Ox-ct=2fV3D^!0O9nCgCX
z(TL>fum#@{Rk-9rYV;oyKO^!xy6v-pEM_AV<>_(+Pujq%TPN{rJ)opnZ9Sc`f@<hQ
z7G@8Q>lZjhKE8O#c^hPR;6kY%pRta#=19T|K=k7A@J~gc9F;7<IE7q`^WR16+(FJ#
z45F(;ToSlNBXaYDED*Sap4e#%Kfo|+hsV7vUJ>KcaA>=*gTYf@o)O58cdi>R*@{DV
zt8V@-P!@j^Q}`vw!uLCP&IK=5TE68u+pb@zh<%K7W?Ioa;RF8B0UW1|fTYd5Abm`N
z>lWLO+PF9RK-~4pdz62BI{1IBjn{S#U<~-jE$a9q1(Xk%eJ?OX98gd+YtnKD?yeQs
zNQewUe$A0RWEJ0n!fI=PK>`B&0=mssc(0({z*|7HOw97rIK8ag!CQQ^`FWl0-y?|n
z&+Y*+zpOlu^6VUPG?`#{Jw4>_0QH`Q5#W2E@*x%T&^(l*w}Z`cNI=H`bE>U}!1+^c
z=XJ7Nw06Q)eYJ^e$VD{r`pPi$l~U8d>g_ONG4xy#tH0}ZxWMPT;7*XLQbdzuYSKhF
zf6}VLNPQkTRYR|$NMjzQ^27+#_{1+%i@ILNT^JDWlPt&qy8WdyY$OK}MGHM?{Z5vi
zbq!UD#cafPlU*WJ+Ulhx32cM8Zqt0aj2QN*@2?~<A@eG0(KMvY;1<KTVmN3m8!WuG
zqk-vdEz}7#)3ZQ74%S-bRdF1Idq>99D%=TOJCWm6DMCQNyU@hU>zEs@*9!aYR5iFH
z_eK@6tN5Ug<JZMhq{e+?evzhj=O_dZEvmV-9HMJ}uia|2b7i}GRb&{F_JBc7n>lBW
za^gAju<R|F(zw&w;c4<g|GFf{K=<}I^Q7vAzhaW+2pba*pTmP*wz*b2Yj0u8jB098
zn|9`+X9l|F*0BCCz<am6McG5{vr@>+NYGS4LUGDOl%Niw#oTO2T%3N(@Wy@z_sqIe
z@Ys`yu6mzEgSyo))~<V(V@VX+{!+b8p5uMmxp7T@0`oZMFvawty0CNlw>dU7ORF(_
zyH5LNgEaN3Ruzdj*COthqWb;~2)zrK7ToTH+rjn*!7w}_c%3)4I49tY!EgDcY^Cgn
zZ8W!n?1t?$Hxf7MM;XVEHdI%G>`B?9ajC+E!&w4*D!Oe!KfpTRHe*~Cl_;AjYcHPm
zw?4#bEm4=S?m|c%w_Th`*gCV_=h52OOz%EodXkdw4$blMw!?r0DJD-PGbevw%}%aL
zo@3czDKj56?`6SY*+_;O$$9<946kSg0MG%Jb(4J`-vhSsZ=?9pA*`a)$j@cl{m($v
zwKJ|5lf0d&TI@z8uQ=Eny+CLuu_4_>J_;?sxYW09@p+~*)qn8UP>s5%CZTloW2~N}
zU&Z16c!<?3`<&l|0G`fyEH<J=*(^(i0tlWIaLH?Xf|VsYH1~wKLiLLJB$}f|I!}&_
zymuPn5R%9fMHf|$yobKWc(d=;bMK(nHjiXqX2)kSei@2~#$^oA9Uj_ZR2!Ox$OVAt
zkqJ(FC#Y}IJ(`TCztg?^j;kl2J3v~|LdatJ5SfeqIvfkViO^}{5Ir<Vi^;vax0^1d
zMSsJ1g?_Vy&QlE<ALB?Sb0oKo4ZJK=CV$m_Vhc4k)GA+BL6P43`#sb&JKt#&yF|v3
zUF!JpIvCOJIx5lTI&5ZF4~Ia0D3Q;ezTf!P`g@|ob&$*jVZZSW{m<hE`irj68w15@
zH$?YaXMwv>2$Rn^ATOd5GS(uI*H%Hb{BLT<g991PXd6%QI&blpTt4H!7p3<SC3wzY
zeC|ei^at+p<tO=^-7AjEOgD*cKB2J>+K7Cy{PV7Z>?8TO<Lh;(@!u+kzn)wv+38u?
z+vwRDSsA$g5VHTg2c&TFL%rs<KKNdW+PlveNErf&Lx|QvZ$(67NKU#D=s=_Pcv(B6
zHd!NC7j>#LAojY~dt65_Eq}nMqGGHfI3Do4S+pPX^j!Jq@eH90vtTQxIuXgQ!Y|QL
z6hQSgxV)4&Q{GmKA-zxxdQnafk_GL(Nn}JgjI~TCY*I7<%Sf;P+`47e78_@a(*i=H
zF~_QQ{s`zou@3Gn99JKMJP#GFdY^yHx?U2I9vZ^6s7!3GM5cp!HD;xC--o!dhJ`9F
zSo5S8K+HAdfbhWCVV8EX@f#y;`#mA3tMFyUP3Bx?uTkj)cj>8pi14{#qrNY?v5%b2
zZ{OSao$_g&y9}Y%w8a8qnm0I>@B+SRK%AJoonG=h8PBsF0=P9Vz=%;LBZ0H(IKLSw
z3vdh7E{h|WJA+pnr)k5OKAH<Z<-DLU5~Mt+C()La=p)x=poz#YB?+U&L#W6g@dn_D
zBf&~BONHGV1<h!!WZxA^IhiJ8e^1gniSA42s;k;Lm!WW8_=v4Ma%45Rkd_rlf0XAB
z`ibFn(!P3`Ixoe5*avIeVUtiPEN}+!ERP6UB)s=#3UEi=Dn}>t!nOx}en-4kXe?Iz
z1+mGS^fn6V*)!yx9)0_a@axo!94d55cMvjlvH8VZB>l@o>1tGYcps4o5_P&?fd6Od
z(4ewYaD^GUtU0+dL<AIR=$K%J2?ISQs{gOFvw(`K>-soID1u0Lmr4&IEfUhAC@I|_
z9Rez05CSSFpa=}oASK-)Eg(`#2@296(j_3@9Z~1bJTtt{v%bS(t;=HF-|V^foO93J
zXYc>^OXVI)@7Id@5uKNre~u%EE3f^_4ozZ;Kd{a-rslHX5TL5@PiN-c$A&#+IZx|$
zoCBV+riZ5Lq4$<*JK5iGuyhBKg^}G14q+06_kca{X+`V{_{mYw)N5q{BK+O{^|~fA
zH|>v=<zZ8h=30$mN=CZmLpaDH0ADuO)Vi-E<~K+&q-1O$nutPJ$B2}{|DmJKO_hLA
zNZqx{+{$IV)!HA?&okLY<Lxsa%tKCb`<#i1%i?@glU4Yze893!ipkzGDzA)ZCBdTn
z;d~mmWvVWtO!N%`Qkf@ts?p0z#M*niVFkyq<?Ir|s5$ByiMkwb<hoV1Lw@{na!p>^
zh$sM7<U5DHg^L0IMZI~ZV`^`&01Q%)>yPc%-|+Q0^s0kX&t)=S-bnI_$IAlbQ{FF<
zj>IwvJi@auCE;g_@-Zpk_T@}9v$j=ERNZ(@ryAF7voXkMDOt*jFK<Rr+A1ctStZ#i
zCbikW=p>CvmQQ-`P76sq6Aue73ztkY1?4B1Y^90eDdJ1_AGktEpI9IJVApZ|5wm7L
z&qZlb`WXV(h64BW>zNIS=PbMu2h{n#NEQE>WBO8BDd)+b2i5p_S@<H~e6g+F%g;lG
zBWi{^XCTLdZimz}r48L~tGpIEHo1et#RJVqYkyUxVoj05tT`KEss-V$p52hBa7*w|
zt01oay2D6CV>_uUrLmfJeSIb8iMej|6)TytXfwOaL2df`$!ZDMstfbOo0J6Wx@Wn~
zi`t#t2tyUpE)FJ#;dU^65V-YB+?76a;*y(UUiOQK36ZPi!tD#sDU)hdy;Ghohy!9F
zqRWkOTXc#~iN~`jo-Y&N5O-3C;A6BYC7d27{NAQ3Bd<V49Jpl9Rg@KDtKVqF1ATGb
zt=28uj@2w~+sR^Rc9!{etWnJ7qBV6SC(bPq0jaZo?5)8^Qj!f6`?i_hvNHJ#4`b{p
z7BGZQDbn2cxw}a6v(o}H%u+tFokaHXyemm9)=N*WCjW0b*u2b3USHI9#g(@?kC*0;
zZQHuC-3&OgyM}4zVK;t6)p}ov(k1L_iw~a_sZ3I(7;{gG!d9zKkTV(S9_6uk)(PsT
zqtxwp87;P3ioz7@soHbg@(Smt>KTHmPMlGHpiz)}nSo_;R#A7ICLu=wcT8pF*Jji@
zc2l)HFm#&_9lGe_*im%VgQp7g@~;dLAAF^#lQ_~cd<>FZp;FFEqZcrPFEX(w*4;l^
zSVDV*yYiyG+Lj%|F6K`lS(+`4gYMzrH}%i4H&?BuSLgSz&eKxjz9$eO5IPYj_-#F4
z#lMmeTdql4#ow?sSxKH?vb*||k2m$F>L3VKA$6u<PEvH1SN){Q#4E;(hO~D#6!7XY
zIs#`zbLR<2c@>8>8>!P{pNVyieOT$g-il@SYR`roTl`_pDPGHK15bwZ35xk9K87tl
zOKkS><G+eOmX6~Qme^I$fhPy$_O(o6vpm;3oSJVG5I@t&c2lH8*PwHo)|!7`lJvw=
zCGOUbA6$*5>qDt|OWO-GH>7<HQzlszMJ}b|VO6&FMN}urm&MhQ*MB7VtXT8L`3}wb
z{KpMK3}d1l@hOXELdaB8&UB5G+xh-V@mF*(*bxI>=eZ7b*-|1-Ab=d2gRPqzknH^5
zbW)IRE*Ntej#M&rw6Op41{8IrUA_J?k<|Sr*$YjZJH=107X|Y&JE}dzPvW4W{Lbrq
zra$soQBz~>N<P2K7~pPdwtaOkNke2c-py+2^Yi|6YmA)%{sdF@Q0DA8-QIlluGsn<
ziJnvT&!xVU%!xRv7Uh(z>2n^7oW||b>pb_Jf)cNReKK?D4!<Tp-?5=Yo#+0`1+J6I
z=~_`g%QM93UU1(Q9y2&*e8HFGLw(xuV+u?S<DNf8>ZP|>+cYa%i98q^)$4Zq36n1p
zuaWq7$Zo3`;I|X!I%vrnmwUMIn;DUCoVyX<SlQ|Pt*G01>xhrNe>J0qM51eU2tnu+
z<;(D#)1SyqTdYUhjWJd3;~X`Xsm)<l^AizfzM3i4ibYHQdc1$)Nr;i7<5GAfu_K|l
zfLIDdjema^*WcSIqjxSUJ75TRU;U9E7pbDNz2!ik`3uWVvy0ii`e6wYXRjC><4w_h
zocHbqzOLee-a|8P+t2$pzUMRh?elO~-bpOunMh*3b*sY9qqD|XV0iV(qRn$f?@_Hp
znrN%_#WeyeF%e3^j>1}^rkl^3!hEzz8im+d*X3xqpMRY?cnuaXX8x27^rt2uk`}#N
z7$$ZMdLRMIL<>t-OV|HT#>-!Z+^-lRIVXE3*NZpo-EE!i;jhz|>i|&@A|EXL(+Q(7
zUQ1KT;f+#Wjb3`@W(6}c4b|Kyo<(|Gtx%9|j|e^r(*=3Y+e|cR600^{{r<M#i?Gg8
zPYmk;r=$=^tlKC2{eP4Tv>6j+R{xA9YV_d5gUVCijNs$w83_%x;!v~aT+<cR8g&v_
zI(c20imk6BX|_=B0k><9T51Gu$ZBe7=)m=Ph4Kx~UX=>wF{Y1Kq9u3M8+fdG_L;+O
z({?DbRFWAr_IYhj1nt?$uD+k*jnc`C{^o4H*<0>K=760+{9`}<MHi3z6ACMe5%np7
z^*UnCs-~}+gO5+tWpVebdfy#t<(dhII8H+syGsE%kFOtBtaD+&iZHI!mjIW&xuVR7
zWGp6JyZ#Q<Vx(7T_IK}JI~L!aG5Q&S`!{*0i|;g=`*(2dul&B9zo%#IFK)Ct<UezZ
zdQ?`fi(GUmNW;4*JJdF05_I-1o5u)Ix#LH151L9s+vAozIg^hpm6ftSyvO2`j6B0%
zR3vA6+~+ibv^YU;<cl7UJEw4|tbQ;qy^*M@qa|qYT+E#;jxizb$lj>jj9-j%>lE7@
z-dpuMw@ZH~$XPgu`Q2oA!!8l;=qv8-CT@y6QUCOOHcDRQwF|+#^Ii%q<d|7=Ib|ca
zmJEPw_bektCYMz1@c1=aUw-y*?uWd1HmO!0lb5o;EKOC+w;SE=Hq3RiTC^|x+V_08
zgs-JLg(CZhrn`H|VD2Lw5!!i2yQ&4@OruYBVb3d|3FW>J8uiNoMH7`b_A5$-x%l<U
z*u}`om<*vVTr!2#Vj8@iMmJuUkB_{09rn^wpES9%Yu>}|f{6+Jkyn#HVvNa&hHv|p
zf6mU<8hK;rDPecy#c@N&@`W4Jcc3NM8w&()tn9dso$?G(4{WITl<|lU+o4t?c5CY$
z8MzhZ?zM&!6%KQ{HRGoVY}A|EGCxR_b~`v6^-Gz;3H2ShT|~T9H}!DwV-{4bGwT*X
zm$T_wTZ=G+a3aoAWOx1hkEBxO5kBF{N9W0j%;yNINY7M1Z!=RZ^bHDOs4YJ3=n?aZ
zQ<xTWLA|Tekf2+yAxFEN%dMl?pwx&`RO128C7Rd)tsrr-8<YL<z5-bp?9N^o(hPIS
z>fhU*kUup(Hrz(DNv}1O>brSVL$Hgm_hE1ORN#5r(Y5uX=GXReBemX~?c2jm7R*Ud
ztsY8?8B=|f8<aeMJyL_d^>sl+_VBB185ZKrE|W2yEv-vAc-#cOKO>*I-gLi{ZAWi>
z_G<MwPP-c0sfw|hN>j4jfMmPtk@g~b=H*P1SAC<d279Qs6drNgSM;QMoBz%tm7#cV
zShny}u9sj9cV4CE#y1GHITi;u*5;Tmy|KWOrKI(n^F}Q?1e%vWj#2B%bet!Cd{=7=
zH*M*`n<pcS*bJ{0a0P3<KW6bC+58Udgp>=e6VPYroXsBeb;w+h64m|oxXo2}MWROh
zx}1c9LV5SnP-?}e*|(vB<)VIfJ1pL$G?EK$Y@Td3d#an%{kXc`eb@6;;L%Kc)sk_m
zQCuV80`FKOy7Z`{oZ<`o6V~`lOUioE^0-2J`f-EFHFg91Tk7O~CtM<!?pAKS9H*71
z`QB`F;fgGskL(%R=5s1aI9zn8Y?pR$_9H@|+C4#JtMX+u5cZ*y`Z=fgWz$KHkH|%8
z&R`Js%%$HtJNd3UPAp}~^gaEo*y3qpB2P&nDH^wHYjHn?9xF7OcjuCRg`S&QrgCey
zy~xnun>OSacXN(HO=b#<cva{N9{KEM_{^!7S0{WD&+}=&;@75;E-qt#K_0(x`ny(5
zs{7|{tiX`>N0m67XVX@+GljK8DaCHZoa1TwFkK$hd3yckL({ma()&F9k5~8fqEt-f
zHT;P5DB6O%3btrhO_v?QqW$Ej3~j965etfK;4(Oeq(RT}ob%Sl(Jyo>S?0asx{Z}`
z@~h7bYnp<FVu%%Y=*ce}7kEBp=y~L(H5NyEg?!x<Yr1Dkp_X;tWv-~#Ljf<%?4Ip$
z2DgwBg_A<J67>3>^~8INbG#1nReBWpUPDyTtb@}&bRM#-RwUPZRtaL$7%nkP(y=CA
z8o|##-l&#33h~T}TXi9^i<XBLo=D=TdGz|LR?)IP_Lfw|mPCAubRP4D`BnA>z2^9Q
z?I?@@iy!{7r<TQDTuJIAwLK1HQQ>lrIi1`^ofIcaDjz5tp;l53y_LEt`b5o#;#RJx
zHWee60?raYrB}6oRGe3^q9#TC372N^r4ml|<>N$A+`8GL0XS7n(|iUJZ>E#XAIJ1%
z*gn4I(bl(+E!CKJB9_y}I(uw){;RTeqYB}4gsVWr)WoHxGeL1Qt8b-))mn?cF>?s(
z&rhFJ{%L4-L)7@u>>FwNc1;hSn7&rEkB+AFjLK&_TA~@n(*_H<eaaq9d+E8z^+JB$
zP#j|aB;eFiCC^bxx9K@FC}6D+yU%E}cuIO`rQ|X3Jk*HG$Se!jXmo~FZ7J02$d^XR
zngGkH#_skl!kW;Rqqnz6jT#iU&ixEwJa$5wOt0z;;TR7jfH9cFm;2e0;Ii<pfj7NV
zX#bL`Rt(S0!Uwea3n8bkFUVUr^r^4mJTthG=q7(AKt;YnwpU&+fPww^dPjJy&J2Xb
zL*SZs9JK99Q#s|2S{F6N?TOmU;(N#TJ2U6JS>_6PCoRaYU6{sTwYhdQsCYAc!D(%=
z#qm^Dze~>N1q%m<yEYsZQ0~d_=Bw)#i-h9rozSX<jTFC#$~d+6#(i5UTPfQ!-U6-L
z#xj+!a_>9rT+-OgUYV7QV7@I;8#I_bQpmdhEAh7)^W=v`Tnr31qQe$J=pLdMO`YXU
z-A(139NmGG-Ghhd4OjvwKbb<UzARQ^O27)MHf|(;_}zTc%Pbc-k7(eU2nLg1ktNZ?
zeWGJNis^OQABr29G+NhEQS<Y$w{-1iX$(5^md0nn4zkiyD<Q2*-PVckfS3{YVP#%3
zKF&gGZLfRQ#FPeJ{T~wtC0GXLwryjAE{Ryy-G`XAx?ssJrb}8qCHC;Ed>Z-ETHs0Q
z%OxQeI?)K~+m=Rc1p~1vPb`+-Iz;j^T1iH#2<ehRm1O(z?w$YiE$!l$Z+qjto{pg!
z(?!ZBqTD1}M(8%N?P6*lgzs?1@K>1xl*CWIm~dKA3L@J0G*vqA%6Cm?fSpLZt6ks&
zn<+*}`;4}bU9L%SQb2J?b<BJo*T#H}Ovj0fQB|)t2m`;sd_tP<>C&ly<qFoJuP{id
zpnsQ(2aA<o!9E9<8Xj)~gbp9%ME_j-aF79=q}f>&`Qf+%uGNW)K;RQXuJqjm%>)CD
z^JdDffxlxdyg{)R#JXpTl^B(&FOw=If<u~US+Q8LNP+a>0*nPy6U=-n-Meh0ShT;K
zI~hA1I)T7SD;D@gzm^t7vlat=F$Gg|cPH1IY_NP+ZCf{6vp*@|P)$QvRR*c&BOayg
zvWc>G#LM{kIDiVlb=rF*G)kH5jt)Ir?t{6OtsZtI`XoQ2BIO?{G!#m=iEj1;kv!;j
zj1ZH63JO}MZEpN>?qnwr-4AKOjW^MdyVh_O%UqYlO0T6%rp~fXw;OWCSxfQCXw2it
zH`X+L)R8JT!%PQU=hZ(tRPMw#n0)_HLu!AsYQ$rRAS+e7>+Q#|J&yfIe7f52*y`c8
zPZ@7`*)Woo)0f;EAFN@y88|cVntH{zA)%+8P$s`fHK%BBE~{t9A=GrC;Z8tUSwC@o
zpWq;-YKDG}_z4=m@|x9>-eJ#s$Db$L6?km3HmIk$zYX(xKkmzF9dLJEWM#0ff?b6t
z_O=#7S(5VWh`H4?Rx_Q7E`OYU&xR9$6T&PWg<5TdCk=+qzjLKMcTxgV>xuwN0;T=y
z=LX-}M>Zrn>Y3(5lpdQFi{D)!Gfb4YA#AF#264GcS6>u7?Ugvj-mtP?DhRn>6?`;W
z81fj8G@_m@KpDttTw9SRApT^xopPNeVj;Gq%5P?X`OM255j=N_9ZH@{zCSBo?z`^n
zPLYfxLn<CV=_u;LCsN<wA8d$xlYb_k!7THE>G9Gx{1-p_$SzYE=J8R92d%u24E$t~
zEWoiPSk^oK+DysUj_t$t>j!ai<hzNgyOkCl_!QqYjuNK_JS8W8me6&yYl<?hlSpb?
zwIVP`R(y(Wn%Ldqt<kaN2WR5jJTr>@)8b^LFQ|zJazagKqlsr9Dp?D0Ld!PpOQx!(
zm!^5l)}~X;nl)x#sC=NGZgNUTJ7G=80>bBlDKg>ZellFnOz=QtTC*vZ+7=k2WQXpM
zBJC-l8mGUz^TBYfe$uW21SALUzbbxJJ#fpmsak26Dq}Q_Hj#wj1Ab1~OOBxEr|NAM
zEDKrXFrhpb0i_&Wn-MRQDMqWUpKkBt4m3h+^hNWWZ4#R<(<@*~U9c4j2~M2ClPREF
z6-tdvq<ea6w9U_oY3G*Mk6;3*2``8DoDvD9^3(Tk=m<t#joDp&3no6Vzwgs941BV8
zQkkaWwM<f3(r8vS?QNc^*@4EY+>XU93sWE4&6eE&2?%APpr!!Hn3YyZaW`v+CP!=U
zrl1Z-g#NjYC%NdW8Rhv}{jU+_kjoQl1}by-xF&mVDc06*NTyS%i_l`rtxB}-*{Ic+
z&FuO-V8;zSvT~Z7S|tx7*)mxogDNM<s_3yHptvcl@g{z7Ge4&|30ktoX+-b$E6T+n
zT;7fom@D@WohxBcE=c7n;Poc{Xv@1=0zu*b>5Uy0=k_nLzl%lWTs2e$9(z8yqkdFA
zPCZ%|sPg&O>gv+&2XE2zX1Ci!JWbKx+e}j)y1`h_;9a>H=jQgkyeQ+TnQAbDuw~uH
zt7Y94G3Rx^(obUOMBASx5(sMF#Hl(8c_5b_Cls<ix959u!&Cct<1&>m&lH!S?$-w{
zsgP4bRn>U!8s+u8c#rj|EpdHQ@H;~jCB|PMZt{a)m^Xurn&;dr&1R-zx_gScTy3ct
zS$fa<j$24qHIm<>|Inj*y`)(_cB84MQ?_T;HE{HfZNL{{E_?EX%nUcu{<DVDG54W*
zRqdlkwi8)5Jxol-Wl1!&vl9edNz+4%1SMYbL0*tzdj^&9sA3xzRz2HTVju`7DP|L*
zzpsexGonG$9(P@Fdq^6GuPR`af4R2Bv(k|K9Oii8Qc+@x<8v*aDu%gmjC}5<Yq9H9
z(7{m4qvDihGt)jV9rJ}gm1@1duPBRs35xrm!nrCppYGlsWuU+{jd%@ps`X)N*Rp!K
zqFb@NI<FTQ8_c6iM;7A`f{Vpe4L<t=-Dc}hua5A4yTAXnu0ozbf#(0Ku0q9~fVkDr
zEA&{BziTUWIpm*()m88WelM$H9wEa(EbIjgl3xv0*bA}!?Z&V&U&yC|OK8D7UGOFa
z9R58OROAbp06XK)ha-OUJn$cw=j^aE@L{L_Z7^>R$k&E^BDl&Etjrd?T|+$aVBG&r
z1VQG23*oTBA;8f(@J&Dl9B}?wAqp7?WBj=WClP=&z|#8fRXnJsbJ)qS>N)VH_s^5z
zbK7AUHaG(~N;(W<@vA=BuSz<|L~wZ$STGR0ZTw5(@2L?P46YLb%L0bCEWCeQF8DVF
znF<5L$0RZzTq1%A4hN2IA4hS2k!p`1)4<Z~u=gN%8znf5hFD|*nF^!)=`t``cX%ry
zMxZ+U7I{YofQ7;lJMlJZ0J6k8G7v0l4SNHDw_3nJ(5U!h(LdG3k&$3gW)3(HI5Hzg
ziA14}jm!iK7sKS7;cXL;r$S-oft=;R3Je(rmeXZ{lYpaBRENOO&MaV6T3G%HynP0S
zHd^EUA<2tuCs@xDwlsmaX<#Bm%SEYhi_8W~O(J$A9EShFMtxDil6r_2wHdf!XpQ|V
zqlauDSQ`$J#|PMpf`=r_hs*<Ooxzrm@Kyp$oTzvx^yQGDFvy?r43kNNx3fUc2Sed;
z*vJg9!WeA-5#GGfGSEt<A;ZBsU$7S!c+&$e0%`+gZBa><A(O%SR*0jVADA!Ekdaiw
zkeOhG8^p=zDUbtt2otW8g^UC%jUbMp2_TFA5ajPraIjDgG8-)90oVs>uYmv`H0*yW
zmmp)oLK=woEE|Fji&_%|nGBYDKzsz>2mVBD@L{qX$b7JR0;1(2LTLFYB_xo^U||B7
z`U1Qu0gHMxmZR2UKt_Yp`w?ev#k1(psB{jHx!??Y#D$cB2s$oGsQ_d!IB6QOOG5xx
z8|rHTggC;Y9PN=)aFN;IWM9NCT`GPE8#xIZ84J$+gvGwWo4({B*xzIDe;Ex<q(r=f
z$>-3~QDu`NTMf<@M7)DV(&)J;k}{FO;H*1D@F^LzU{tAx$Y5~J8)DZGl|=_em%@k4
z2B)4O8ciyPmW?Wh4jBwi|3U=Mpa-MMV?zdmGo}#1)$(X9MwLs33<jqeA+9CHFQ5a1
zQj1V8puqVVh}Ire{1;GoJS4KU;81BqFssV{03#-QAcMiNu87n9vN~EY%D8J}GB|1!
zalQ!FKu1O&Ig3mO2l~MxPvPyw6?AkI!F|YasK_4!j$A`r*vV`ChmS$sTVOW-S$V>O
z-{5UX8v%|G!-nKS0>?rjTF9(}9)czi4*BcDEc#<1qLYbJ4*~wygN{r9hx#Cz=ZJ=I
zNN5!@9J~dJ_<}!o4YhfwVuz5a;H^GHDxVo@Dyq#?WGZ-{4RKuzHAhVa?X98iKj6I%
z*ajWEd06~UB--sdWW&MUe8d^zg7v@s6x8;^?ETZb5U1c)n?t-w2fjTyr-Qu#WOKn@
sWW>iOlkLBTqH%wLUAZtnG^pAACpOpvhJy>k$N@hj!0Tr}0K&ldKb;~urvLx|

literal 0
HcmV?d00001

diff --git a/src/main/kotlin/co/orre/discordbridge/commands/annotations/BotCommand.kt b/src/main/kotlin/co/orre/discordbridge/commands/annotations/BotCommand.kt
deleted file mode 100644
index 5a19ae0..0000000
--- a/src/main/kotlin/co/orre/discordbridge/commands/annotations/BotCommand.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package co.orre.discordbridge.commands.annotations
-
-@Target(AnnotationTarget.FUNCTION)
-@Retention(AnnotationRetention.RUNTIME)
-annotation class BotCommand(val usage: String, val description: String, val name: String = "",
-                            val relayTriggerMessage: Boolean = true, val ignoreExcessArguments: Boolean = true)
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/annotations/ChatExclusiveCommand.kt b/src/main/kotlin/co/orre/discordbridge/commands/annotations/ChatExclusiveCommand.kt
deleted file mode 100644
index 9d621db..0000000
--- a/src/main/kotlin/co/orre/discordbridge/commands/annotations/ChatExclusiveCommand.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package co.orre.discordbridge.commands.annotations
-
-@Target(AnnotationTarget.FUNCTION)
-@Retention(AnnotationRetention.RUNTIME)
-annotation class ChatExclusiveCommand
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/annotations/DiscordExclusiveCommand.kt b/src/main/kotlin/co/orre/discordbridge/commands/annotations/DiscordExclusiveCommand.kt
deleted file mode 100644
index af52140..0000000
--- a/src/main/kotlin/co/orre/discordbridge/commands/annotations/DiscordExclusiveCommand.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package co.orre.discordbridge.commands.annotations
-
-@Target(AnnotationTarget.FUNCTION)
-@Retention(AnnotationRetention.RUNTIME)
-annotation class DiscordExclusiveCommand
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/annotations/MinecraftExclusiveCommand.kt b/src/main/kotlin/co/orre/discordbridge/commands/annotations/MinecraftExclusiveCommand.kt
deleted file mode 100644
index dd7d179..0000000
--- a/src/main/kotlin/co/orre/discordbridge/commands/annotations/MinecraftExclusiveCommand.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package co.orre.discordbridge.commands.annotations
-
-@Target(AnnotationTarget.FUNCTION)
-@Retention(AnnotationRetention.RUNTIME)
-annotation class MinecraftExclusiveCommand
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/annotations/PrivateResponse.kt b/src/main/kotlin/co/orre/discordbridge/commands/annotations/PrivateResponse.kt
deleted file mode 100644
index 43e9ea6..0000000
--- a/src/main/kotlin/co/orre/discordbridge/commands/annotations/PrivateResponse.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package co.orre.discordbridge.commands.annotations
-
-@Target(AnnotationTarget.FUNCTION)
-@Retention(AnnotationRetention.RUNTIME)
-annotation class PrivateResponse
\ No newline at end of file
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/annotations/TaggedResponse.kt b/src/main/kotlin/co/orre/discordbridge/commands/annotations/TaggedResponse.kt
deleted file mode 100644
index a48821e..0000000
--- a/src/main/kotlin/co/orre/discordbridge/commands/annotations/TaggedResponse.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package co.orre.discordbridge.commands.annotations
-
-@Target(AnnotationTarget.FUNCTION)
-@Retention(AnnotationRetention.RUNTIME)
-annotation class TaggedResponse
\ No newline at end of file
diff --git a/src/main/kotlin/co/orre/discordbridge/Config.kt b/src/main/kotlin/gg/obsidian/discordbridge/Config.kt
similarity index 97%
rename from src/main/kotlin/co/orre/discordbridge/Config.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/Config.kt
index dc31091..72f47d9 100644
--- a/src/main/kotlin/co/orre/discordbridge/Config.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Config.kt
@@ -1,7 +1,7 @@
-package co.orre.discordbridge
+package gg.obsidian.discordbridge
 
+import gg.obsidian.discordbridge.utils.UtilFunctions.noSpace
 import org.bukkit.ChatColor
-import co.orre.discordbridge.utils.UtilFunctions.noSpace
 
 object Config {
 
diff --git a/src/main/kotlin/co/orre/discordbridge/DataConfigAccessor.kt b/src/main/kotlin/gg/obsidian/discordbridge/DataConfigAccessor.kt
similarity index 98%
rename from src/main/kotlin/co/orre/discordbridge/DataConfigAccessor.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/DataConfigAccessor.kt
index 423af0e..77391da 100644
--- a/src/main/kotlin/co/orre/discordbridge/DataConfigAccessor.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/DataConfigAccessor.kt
@@ -1,4 +1,4 @@
-package co.orre.discordbridge
+package gg.obsidian.discordbridge
 
 /*
 * Copyright (C) 2012 SagaciousZed
diff --git a/src/main/kotlin/co/orre/discordbridge/Plugin.kt b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
similarity index 96%
rename from src/main/kotlin/co/orre/discordbridge/Plugin.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
index c9e87a8..19d6769 100644
--- a/src/main/kotlin/co/orre/discordbridge/Plugin.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
@@ -1,13 +1,13 @@
-package co.orre.discordbridge
-
-import co.orre.discordbridge.discord.Connection
-import co.orre.discordbridge.minecraft.CommandListener
-import co.orre.discordbridge.minecraft.EventListener
-import co.orre.discordbridge.utils.Rating
-import co.orre.discordbridge.utils.Respect
-import co.orre.discordbridge.utils.Script
-import co.orre.discordbridge.utils.UserAlias
-import co.orre.discordbridge.utils.UtilFunctions.noSpace
+package gg.obsidian.discordbridge
+
+import gg.obsidian.discordbridge.discord.Connection
+import gg.obsidian.discordbridge.minecraft.CommandListener
+import gg.obsidian.discordbridge.minecraft.EventListener
+import gg.obsidian.discordbridge.utils.Rating
+import gg.obsidian.discordbridge.utils.Respect
+import gg.obsidian.discordbridge.utils.Script
+import gg.obsidian.discordbridge.utils.UserAlias
+import gg.obsidian.discordbridge.utils.UtilFunctions.noSpace
 import net.dv8tion.jda.core.OnlineStatus
 import net.dv8tion.jda.core.entities.Member
 import net.dv8tion.jda.core.entities.MessageChannel
diff --git a/src/main/kotlin/co/orre/discordbridge/UserAliasConfig.kt b/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
similarity index 92%
rename from src/main/kotlin/co/orre/discordbridge/UserAliasConfig.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
index 4838caa..4186c39 100644
--- a/src/main/kotlin/co/orre/discordbridge/UserAliasConfig.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
@@ -1,6 +1,6 @@
-package co.orre.discordbridge
+package gg.obsidian.discordbridge
 
-import co.orre.discordbridge.utils.UserAlias
+import gg.obsidian.discordbridge.utils.UserAlias
 
 object UserAliasConfig {
     var aliases: List<UserAlias> = mutableListOf()
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/AsyncPlayerChatEventWrapper.kt b/src/main/kotlin/gg/obsidian/discordbridge/commands/AsyncPlayerChatEventWrapper.kt
similarity index 88%
rename from src/main/kotlin/co/orre/discordbridge/commands/AsyncPlayerChatEventWrapper.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/commands/AsyncPlayerChatEventWrapper.kt
index 5f58014..4d36576 100644
--- a/src/main/kotlin/co/orre/discordbridge/commands/AsyncPlayerChatEventWrapper.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/commands/AsyncPlayerChatEventWrapper.kt
@@ -1,6 +1,6 @@
-package co.orre.discordbridge.commands
+package gg.obsidian.discordbridge.commands
 
-import co.orre.discordbridge.discord.Connection
+import gg.obsidian.discordbridge.discord.Connection
 import net.dv8tion.jda.core.entities.MessageChannel
 import org.bukkit.event.player.AsyncPlayerChatEvent
 
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/IBotController.kt b/src/main/kotlin/gg/obsidian/discordbridge/commands/IBotController.kt
similarity index 59%
rename from src/main/kotlin/co/orre/discordbridge/commands/IBotController.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/commands/IBotController.kt
index 19bfad4..52756b7 100644
--- a/src/main/kotlin/co/orre/discordbridge/commands/IBotController.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/commands/IBotController.kt
@@ -1,4 +1,4 @@
-package co.orre.discordbridge.commands
+package gg.obsidian.discordbridge.commands
 
 interface IBotController {
     fun getDescription(): String
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/IEventWrapper.kt b/src/main/kotlin/gg/obsidian/discordbridge/commands/IEventWrapper.kt
similarity index 87%
rename from src/main/kotlin/co/orre/discordbridge/commands/IEventWrapper.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/commands/IEventWrapper.kt
index dc89275..8f586e3 100644
--- a/src/main/kotlin/co/orre/discordbridge/commands/IEventWrapper.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/commands/IEventWrapper.kt
@@ -1,4 +1,4 @@
-package co.orre.discordbridge.commands
+package gg.obsidian.discordbridge.commands
 
 import net.dv8tion.jda.core.entities.MessageChannel
 
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/MessageWrapper.kt b/src/main/kotlin/gg/obsidian/discordbridge/commands/MessageWrapper.kt
similarity index 92%
rename from src/main/kotlin/co/orre/discordbridge/commands/MessageWrapper.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/commands/MessageWrapper.kt
index 8ae0429..65be83e 100644
--- a/src/main/kotlin/co/orre/discordbridge/commands/MessageWrapper.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/commands/MessageWrapper.kt
@@ -1,6 +1,6 @@
-package co.orre.discordbridge.commands
+package gg.obsidian.discordbridge.commands
 
-import co.orre.discordbridge.Config
+import gg.obsidian.discordbridge.Config
 import net.dv8tion.jda.core.entities.ChannelType
 import net.dv8tion.jda.core.entities.Message
 import net.dv8tion.jda.core.entities.MessageChannel
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/MinecraftCommandWrapper.kt b/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt
similarity index 90%
rename from src/main/kotlin/co/orre/discordbridge/commands/MinecraftCommandWrapper.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt
index 8035b72..9a863ca 100644
--- a/src/main/kotlin/co/orre/discordbridge/commands/MinecraftCommandWrapper.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt
@@ -1,6 +1,6 @@
-package co.orre.discordbridge.commands
+package gg.obsidian.discordbridge.commands
 
-import co.orre.discordbridge.discord.Connection
+import gg.obsidian.discordbridge.discord.Connection
 import net.dv8tion.jda.core.entities.MessageChannel
 import org.bukkit.command.Command
 import org.bukkit.command.CommandSender
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/BotCommand.kt b/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/BotCommand.kt
new file mode 100644
index 0000000..ed1de34
--- /dev/null
+++ b/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/BotCommand.kt
@@ -0,0 +1,15 @@
+package gg.obsidian.discordbridge.commands.annotations
+
+/**
+ * Annotates a function as a command the bot can run.
+ *
+ * @param usage a short string that describes the command's parameter syntax
+ * @param description a short string that describes the command's function
+ * @param name an optional field to override the command's access name if it is not the same as the method name
+ * @param relayTriggerMessage whether the message used to trigger this command should be relayed
+ * @param ignoreExcessArguments if false, this command will fail if the invoker provides too many arguments
+ */
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class BotCommand(val usage: String, val description: String, val name: String = "",
+                            val relayTriggerMessage: Boolean = true, val ignoreExcessArguments: Boolean = true)
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/ChatExclusiveCommand.kt b/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/ChatExclusiveCommand.kt
new file mode 100644
index 0000000..3b6a510
--- /dev/null
+++ b/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/ChatExclusiveCommand.kt
@@ -0,0 +1,10 @@
+package gg.obsidian.discordbridge.commands.annotations
+
+/**
+ * Annotates a BotCommand as a command that is exposed to Discord chat and Minecraft chat
+ *
+ * @see BotCommand
+ */
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class ChatExclusiveCommand
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/DiscordExclusiveCommand.kt b/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/DiscordExclusiveCommand.kt
new file mode 100644
index 0000000..f9e8f1a
--- /dev/null
+++ b/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/DiscordExclusiveCommand.kt
@@ -0,0 +1,10 @@
+package gg.obsidian.discordbridge.commands.annotations
+
+/**
+ * Annotates a BotCommand as a command that is only exposed to Discord chat
+ *
+ * @see BotCommand
+ */
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class DiscordExclusiveCommand
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/MinecraftExclusiveCommand.kt b/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/MinecraftExclusiveCommand.kt
new file mode 100644
index 0000000..9611d52
--- /dev/null
+++ b/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/MinecraftExclusiveCommand.kt
@@ -0,0 +1,10 @@
+package gg.obsidian.discordbridge.commands.annotations
+
+/**
+ * Annotates a BotCommand as a command that is only exposed as a Minecraft console command
+ *
+ * @see BotCommand
+ */
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class MinecraftExclusiveCommand
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/PrivateResponse.kt b/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/PrivateResponse.kt
new file mode 100644
index 0000000..fe5d10d
--- /dev/null
+++ b/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/PrivateResponse.kt
@@ -0,0 +1,17 @@
+package gg.obsidian.discordbridge.commands.annotations
+
+/**
+ * Annotates a BotCommand as a command that will return its output privately to the invoker using
+ * whatever medium is appropriate for the invocation source
+ *
+ * Discord chat commands will return in a DM to the invoker
+ *
+ * Minecraft chat commands will return as a Minecraft PM to the invoker
+ *
+ * Minecraft console commands will return as a Minecraft PM to the invoker
+ *
+ * @see BotCommand
+ */
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class PrivateResponse
\ No newline at end of file
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/TaggedResponse.kt b/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/TaggedResponse.kt
new file mode 100644
index 0000000..ebcb073
--- /dev/null
+++ b/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/TaggedResponse.kt
@@ -0,0 +1,12 @@
+package gg.obsidian.discordbridge.commands.annotations
+
+/**
+ * Annotates a BotCommand as a command where the response will be prepended with "@invokerName | "
+ *
+ * In Discord, "@invoker" will be converted to a tag mention if that user exists in the relay channel
+ *
+ * @see BotCommand
+ */
+@Target(AnnotationTarget.FUNCTION)
+@Retention(AnnotationRetention.RUNTIME)
+annotation class TaggedResponse
\ No newline at end of file
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/controllers/BotControllerManager.kt b/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
similarity index 78%
rename from src/main/kotlin/co/orre/discordbridge/commands/controllers/BotControllerManager.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
index 10208af..2a40453 100644
--- a/src/main/kotlin/co/orre/discordbridge/commands/controllers/BotControllerManager.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
@@ -1,27 +1,45 @@
-package co.orre.discordbridge.commands.controllers
-
-import co.orre.discordbridge.Config
-import co.orre.discordbridge.Plugin
-import co.orre.discordbridge.commands.*
-import co.orre.discordbridge.commands.annotations.*
-import co.orre.discordbridge.discord.Connection
-import co.orre.discordbridge.utils.MarkdownToMinecraftSeralizer
-import co.orre.discordbridge.utils.Script
-import co.orre.discordbridge.utils.UtilFunctions.noSpace
-import co.orre.discordbridge.utils.UtilFunctions.stripColor
-import co.orre.discordbridge.utils.UtilFunctions.toDiscordChatMessage
-import co.orre.discordbridge.utils.UtilFunctions.toMinecraftChatMessage
+package gg.obsidian.discordbridge.commands.controllers
+
+import gg.obsidian.discordbridge.Config
+import gg.obsidian.discordbridge.Plugin
+import gg.obsidian.discordbridge.commands.*
+import gg.obsidian.discordbridge.commands.annotations.*
+import gg.obsidian.discordbridge.discord.Connection
+import gg.obsidian.discordbridge.utils.MarkdownToMinecraftSeralizer
+import gg.obsidian.discordbridge.utils.Script
+import gg.obsidian.discordbridge.utils.UtilFunctions.noSpace
+import gg.obsidian.discordbridge.utils.UtilFunctions.stripColor
+import gg.obsidian.discordbridge.utils.UtilFunctions.toDiscordChatMessage
+import gg.obsidian.discordbridge.utils.UtilFunctions.toMinecraftChatMessage
 import java.lang.reflect.Method
 import java.util.*
 import java.util.logging.Level
-import co.orre.discordbridge.Config as cfg
+import gg.obsidian.discordbridge.Config as cfg
 import org.bukkit.ChatColor as CC
 
+/**
+ * A class that manages an assortment of IBotControllers and allows dynamic access to a configurable assortment
+ * of their commands
+ *
+ * @param plugin a reference to the base Plugin object
+ * @see IBotController
+ */
 class BotControllerManager(val plugin: Plugin) {
 
     private val commands: MutableMap<String, Command> = mutableMapOf()
     private val controllers: MutableMap<Class<out IBotController>, IBotController> = mutableMapOf()
 
+    /**
+     * Adds an IBotController to the manager.
+     *
+     * @param controller the IBotController to add
+     * @param discordExclusive (optional) whether this BotControllerManager instance should have access to this IBotController's
+     * methods annotated by DiscordExclusiveCommand (defaults false)
+     * @param minecraftExclusive (optional) whether this BotControllerManager instance should have access to this IBotController's
+     * methods annotated by MinecraftExclusiveCommand (defaults false)
+     * @param chatExclusive (optional) whether this BotControllerManager instance should have access to this IBotController's
+     * methods annotated by ChatExclusiveCommand (defaults false)
+     */
     fun registerController(controller: IBotController, discordExclusive: Boolean = false,
                            minecraftExclusive: Boolean = false, chatExclusive: Boolean = false) {
         controllers.put(controller.javaClass, controller)
@@ -38,6 +56,13 @@ class BotControllerManager(val plugin: Plugin) {
         }
     }
 
+    /**
+     * Registers an individual method from the IBotController
+     *
+     * @param controllerClass the Java class of the IBotController
+     * @param method the method to register
+     * @param annotation the BotCommand annotation object of the method
+     */
     private fun registerControllerMethod(controllerClass: Class<*>, method: Method, annotation: BotCommand) {
         val commandName = if (annotation.name.isEmpty()) method.name.toLowerCase() else annotation.name
         val usage = annotation.usage
@@ -54,7 +79,14 @@ class BotControllerManager(val plugin: Plugin) {
         commands.put(command.name, command)
     }
 
+    /**
+     * Reads an incoming message and attempts to parse and execute a command.
+     *
+     * @param event the incoming event object
+     * @return false if a command execution attempt failed, true otherwise
+     */
     fun dispatchMessage(event: IEventWrapper): Boolean {
+
         // Short circuit if event was a Minecraft command
         if (event is MinecraftCommandWrapper) {
             val command = commands[event.command.name]
@@ -118,11 +150,15 @@ class BotControllerManager(val plugin: Plugin) {
         return true
     }
 
+    /**
+     * Looks for a scripted trigger and returns a respective response
+     *
+     * @param event the incoming event object
+     * @return true if a trigger was found and successfully responded to, false otherwise
+     */
     private fun scriptedResponse(event: IEventWrapper): Boolean {
-        val responses = plugin.script.data.getList("responses").checkItemsAre<Script>()
-        if (responses == null) {
-            return false
-        }
+        val responses = plugin.script.data.getList("responses").checkItemsAre<Script>() ?: return false
+
         var response: Script? = null
         for (r in responses) {
             var arg = event.rawMessage
@@ -149,7 +185,8 @@ class BotControllerManager(val plugin: Plugin) {
             }
         }
         if (response == null) return false
-                plugin.logDebug("user ${event.senderName} has triggered a scripted response")
+
+        plugin.logDebug("user ${event.senderName} has triggered a scripted response")
         val responseDis: String? = response.responseDis
         val responseMC: String? = response.responseMC
         if (responseDis != null && responseDis.isNotBlank()) {
@@ -171,6 +208,15 @@ class BotControllerManager(val plugin: Plugin) {
         return true
     }
 
+    /**
+     * Attempts to invoke a discovered command
+     *
+     * @param command the command to invoke
+     * @param instances a map of IBotController instances accessed by their Java classes
+     * @param event the incoming event object
+     * @param inputArguments an array of String arguments to pass to the command method
+     * @return false if the command invocation has invalid arguments, true otherwise
+     */
     private fun invokeCommand(command: Command, instances: Map<Class<out IBotController>, IBotController>,
                               event: IEventWrapper, inputArguments: Array<String>): Boolean {
         // Relay the trigger if applicable
@@ -246,6 +292,13 @@ class BotControllerManager(val plugin: Plugin) {
 
     }
 
+    /**
+     * Sends the response of a successful command invocation to its respective medium
+     *
+     * @param event the incoming event object
+     * @param command the command that was invoked
+     * @param response the output string of the invoked command
+     */
     private fun respond(event: IEventWrapper, command: Command, response: String) {
         var modifiedResponse = response
         when (event) {
@@ -300,7 +353,15 @@ class BotControllerManager(val plugin: Plugin) {
         }
     }
 
+    /**
+     * Attempts to relay the message between Minecraft and Discord, if applicable
+     *
+     * @param event the incoming event object
+     * @param logIgnore if true, and if this message was from Discord, a debug log message will be generated if the
+     * message is not relayed to Minecraft
+     */
     private fun relay(event: IEventWrapper, logIgnore: Boolean) {
+        plugin.logger.info("Entered relay. event: ${event.message}")
         when (event) {
             is AsyncPlayerChatEventWrapper -> {
                 var worldname = event.event.player.world.name
@@ -333,6 +394,12 @@ class BotControllerManager(val plugin: Plugin) {
         }
     }
 
+    /**
+     * Attempts to parse a string parameter to an expected value type
+     *
+     * @param parameterClass the expected type of the parameter
+     * @param value a string representation of the value to be parsed
+     */
     private fun parseArgument(parameterClass: Class<*>, value: String): Any {
         try {
             when (parameterClass) {
@@ -349,6 +416,11 @@ class BotControllerManager(val plugin: Plugin) {
         }
     }
 
+    /**
+     * Attempts to parse a string parameter to a Boolean type
+     *
+     * @param value a string representation of the value to be parsed
+     */
     private fun parseBooleanArgument(value: String): Boolean {
         when (value.toLowerCase()) {
             "yes", "true" -> return true
@@ -364,9 +436,18 @@ class BotControllerManager(val plugin: Plugin) {
         }
     }
 
+    /**
+     * A function to assert that all the items in a given list are of a specific type
+     */
     @Suppress("UNCHECKED_CAST")
     private inline fun <reified T : Any> List<*>.checkItemsAre() = if (all { it is T }) this as List<T> else null
 
+    /**
+     * Handler for if command syntax is given but no matching command is found
+     *
+     * @param event the incoming event object
+     * @param commandName the name of the command that was not found
+     */
     private fun commandNotFound(event: IEventWrapper, commandName: String) {
         when (event) {
             is MessageWrapper ->
@@ -385,6 +466,15 @@ class BotControllerManager(val plugin: Plugin) {
 
     }
 
+    /**
+     * Handler for when a command is invoked with the wrong number of parameters
+     *
+     * @param event the incoming event object
+     * @param commandName the name of the command that was invoked
+     * @param usage the usage description of the command
+     * @param given how many arguments were passed in the invocation
+     * @param required how many arguments were expected
+     */
     private fun commandWrongParameterCount(event: IEventWrapper, commandName: String, usage: String, given: Int, required: Int) {
         when (event) {
             is MessageWrapper ->
@@ -405,6 +495,16 @@ class BotControllerManager(val plugin: Plugin) {
         }
     }
 
+    /**
+     * Handler for when one of the arguments in a command invocation was of an unexpected type
+     *
+     * @param event the incoming event object
+     * @param name the name of the command that was invoked
+     * @param usage the usage description of the command
+     * @param index the index of the offending argument
+     * @param actualType the actual type of the offending argument during invocation
+     * @param expectedType the argument type that was expected
+     */
     private fun commandWrongParameterType(event: IEventWrapper, name: String, usage: String, index: Int,
                                           actualType: Class<*>, expectedType: Class<*>) {
         when (event) {
@@ -426,6 +526,11 @@ class BotControllerManager(val plugin: Plugin) {
         }
     }
 
+    /**
+     * Handler for when an invoker invokes a command they do not have permission to use
+     *
+     * @param event the incoming event object
+     */
     private fun commandRestricted(event: IEventWrapper) {
         when (event) {
             is MessageWrapper ->
@@ -439,6 +544,12 @@ class BotControllerManager(val plugin: Plugin) {
         }
     }
 
+    /**
+     * Handler for when a command invocation throws an uncaught exception
+     *
+     * @param event the incoming event object
+     * @param throwable the uncaught exception
+     */
     private fun commandException(event: IEventWrapper, throwable: Throwable) {
         plugin.logger.log(Level.SEVERE, "Command with content ${event.rawMessage} threw an exception.", throwable)
         when (event) {
@@ -457,8 +568,25 @@ class BotControllerManager(val plugin: Plugin) {
         }
     }
 
+    /**
+     * Shortcut method for adding "or <prefix>help " to the CommandNotFound output if a COMMAND_PREFIX is set in config
+     */
     private fun orPrefixHelp(): String = if (Config.COMMAND_PREFIX != "") "or ${Config.COMMAND_PREFIX}help " else ""
 
+    /**
+     * Represents a command that the bot can execute
+     *
+     * @param name the name of the command (not necessarily the name of the method called)
+     * @param usage the usage description of the method
+     * @param description a description of the command's function
+     * @param parameters a List of the command arguments' expected Java class types
+     * @param relayTriggerMessage whether the message that triggered this command should be relayed
+     * @param ignoreExcessArguments whether this command should ignore excess arguments
+     * @param isTagged if the output of this command should be prepended with "@invokerName | "
+     * @param isPrivate if the output of this command should be sent via DM/PM to the invoker
+     * @param controllerClass the Java class type of the IBotController that defines this command
+     * @param commandMethod the method that is called when this command is invoked
+     */
     data class Command(
             val name: String,
             val usage: String,
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/controllers/FunCommandsController.kt b/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt
similarity index 93%
rename from src/main/kotlin/co/orre/discordbridge/commands/controllers/FunCommandsController.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt
index 87b84df..a63f777 100644
--- a/src/main/kotlin/co/orre/discordbridge/commands/controllers/FunCommandsController.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt
@@ -1,14 +1,14 @@
-package co.orre.discordbridge.commands.controllers
-
-import co.orre.discordbridge.Config
-import co.orre.discordbridge.Plugin
-import co.orre.discordbridge.commands.IBotController
-import co.orre.discordbridge.commands.IEventWrapper
-import co.orre.discordbridge.commands.annotations.BotCommand
-import co.orre.discordbridge.commands.annotations.TaggedResponse
-import co.orre.discordbridge.utils.Rating
-import co.orre.discordbridge.utils.Respect
+package gg.obsidian.discordbridge.commands.controllers
+
 import com.michaelwflaherty.cleverbotapi.CleverBotQuery
+import gg.obsidian.discordbridge.Config
+import gg.obsidian.discordbridge.Plugin
+import gg.obsidian.discordbridge.commands.IBotController
+import gg.obsidian.discordbridge.commands.IEventWrapper
+import gg.obsidian.discordbridge.commands.annotations.BotCommand
+import gg.obsidian.discordbridge.commands.annotations.TaggedResponse
+import gg.obsidian.discordbridge.utils.Rating
+import gg.obsidian.discordbridge.utils.Respect
 import java.util.*
 
 class FunCommandsController(val plugin: Plugin) : IBotController {
diff --git a/src/main/kotlin/co/orre/discordbridge/commands/controllers/UtilCommandsController.kt b/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
similarity index 96%
rename from src/main/kotlin/co/orre/discordbridge/commands/controllers/UtilCommandsController.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
index fd3985a..63a8f25 100644
--- a/src/main/kotlin/co/orre/discordbridge/commands/controllers/UtilCommandsController.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
@@ -1,12 +1,12 @@
-package co.orre.discordbridge.commands.controllers
-
-import co.orre.discordbridge.Config
-import co.orre.discordbridge.Plugin
-import co.orre.discordbridge.UserAliasConfig
-import co.orre.discordbridge.commands.*
-import co.orre.discordbridge.commands.annotations.*
-import co.orre.discordbridge.discord.Connection
-import co.orre.discordbridge.utils.UtilFunctions.stripColor
+package gg.obsidian.discordbridge.commands.controllers
+
+import gg.obsidian.discordbridge.Config
+import gg.obsidian.discordbridge.Plugin
+import gg.obsidian.discordbridge.UserAliasConfig
+import gg.obsidian.discordbridge.commands.*
+import gg.obsidian.discordbridge.commands.annotations.*
+import gg.obsidian.discordbridge.discord.Connection
+import gg.obsidian.discordbridge.utils.UtilFunctions.stripColor
 import net.dv8tion.jda.core.entities.ChannelType
 import org.bukkit.entity.Player
 import org.bukkit.ChatColor as CC
diff --git a/src/main/kotlin/co/orre/discordbridge/discord/Connection.kt b/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
similarity index 95%
rename from src/main/kotlin/co/orre/discordbridge/discord/Connection.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
index 232576b..dcff0d4 100644
--- a/src/main/kotlin/co/orre/discordbridge/discord/Connection.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
@@ -1,7 +1,7 @@
-package co.orre.discordbridge.discord
+package gg.obsidian.discordbridge.discord
 
-import co.orre.discordbridge.Config
-import co.orre.discordbridge.Plugin
+import gg.obsidian.discordbridge.Config
+import gg.obsidian.discordbridge.Plugin
 import net.dv8tion.jda.core.AccountType
 import net.dv8tion.jda.core.JDA
 import net.dv8tion.jda.core.JDABuilder
diff --git a/src/main/kotlin/co/orre/discordbridge/discord/Listener.kt b/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
similarity index 73%
rename from src/main/kotlin/co/orre/discordbridge/discord/Listener.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
index 91e56bb..1c316eb 100644
--- a/src/main/kotlin/co/orre/discordbridge/discord/Listener.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
@@ -1,10 +1,10 @@
-package co.orre.discordbridge.discord
+package gg.obsidian.discordbridge.discord
 
-import co.orre.discordbridge.Plugin
-import co.orre.discordbridge.commands.MessageWrapper
-import co.orre.discordbridge.commands.controllers.BotControllerManager
-import co.orre.discordbridge.commands.controllers.FunCommandsController
-import co.orre.discordbridge.commands.controllers.UtilCommandsController
+import gg.obsidian.discordbridge.Plugin
+import gg.obsidian.discordbridge.commands.MessageWrapper
+import gg.obsidian.discordbridge.commands.controllers.BotControllerManager
+import gg.obsidian.discordbridge.commands.controllers.FunCommandsController
+import gg.obsidian.discordbridge.commands.controllers.UtilCommandsController
 import net.dv8tion.jda.core.events.message.MessageReceivedEvent
 import net.dv8tion.jda.core.hooks.ListenerAdapter
 
diff --git a/src/main/kotlin/co/orre/discordbridge/minecraft/CommandListener.kt b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/CommandListener.kt
similarity index 64%
rename from src/main/kotlin/co/orre/discordbridge/minecraft/CommandListener.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/minecraft/CommandListener.kt
index f8c1487..0deee23 100644
--- a/src/main/kotlin/co/orre/discordbridge/minecraft/CommandListener.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/CommandListener.kt
@@ -1,10 +1,10 @@
-package co.orre.discordbridge.minecraft
+package gg.obsidian.discordbridge.minecraft
 
-import co.orre.discordbridge.Plugin
-import co.orre.discordbridge.commands.MinecraftCommandWrapper
-import co.orre.discordbridge.commands.controllers.BotControllerManager
-import co.orre.discordbridge.commands.controllers.FunCommandsController
-import co.orre.discordbridge.commands.controllers.UtilCommandsController
+import gg.obsidian.discordbridge.Plugin
+import gg.obsidian.discordbridge.commands.MinecraftCommandWrapper
+import gg.obsidian.discordbridge.commands.controllers.BotControllerManager
+import gg.obsidian.discordbridge.commands.controllers.FunCommandsController
+import gg.obsidian.discordbridge.commands.controllers.UtilCommandsController
 import org.bukkit.command.Command
 import org.bukkit.command.CommandExecutor
 import org.bukkit.command.CommandSender
diff --git a/src/main/kotlin/co/orre/discordbridge/minecraft/EventListener.kt b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/EventListener.kt
similarity index 76%
rename from src/main/kotlin/co/orre/discordbridge/minecraft/EventListener.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/minecraft/EventListener.kt
index 380ddb8..0a2cfb2 100644
--- a/src/main/kotlin/co/orre/discordbridge/minecraft/EventListener.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/EventListener.kt
@@ -1,17 +1,18 @@
-package co.orre.discordbridge.minecraft
-
-import co.orre.discordbridge.Config
-import co.orre.discordbridge.Plugin
-import co.orre.discordbridge.commands.AsyncPlayerChatEventWrapper
-import co.orre.discordbridge.commands.controllers.BotControllerManager
-import co.orre.discordbridge.commands.controllers.FunCommandsController
-import co.orre.discordbridge.commands.controllers.UtilCommandsController
-import co.orre.discordbridge.discord.Connection
-import co.orre.discordbridge.utils.MarkdownToMinecraftSeralizer
-import co.orre.discordbridge.utils.UtilFunctions.stripColor
-import co.orre.discordbridge.utils.UtilFunctions.toDiscordPlayerDeath
-import co.orre.discordbridge.utils.UtilFunctions.toDiscordPlayerJoin
-import co.orre.discordbridge.utils.UtilFunctions.toDiscordPlayerLeave
+package gg.obsidian.discordbridge.minecraft
+
+import gg.obsidian.discordbridge.Config
+import gg.obsidian.discordbridge.Plugin
+import gg.obsidian.discordbridge.commands.AsyncPlayerChatEventWrapper
+import gg.obsidian.discordbridge.commands.controllers.BotControllerManager
+import gg.obsidian.discordbridge.commands.controllers.FunCommandsController
+import gg.obsidian.discordbridge.commands.controllers.UtilCommandsController
+import gg.obsidian.discordbridge.discord.Connection
+import gg.obsidian.discordbridge.utils.MarkdownToMinecraftSeralizer
+import gg.obsidian.discordbridge.utils.UtilFunctions.stripColor
+import gg.obsidian.discordbridge.utils.UtilFunctions.toDiscordChatMessage
+import gg.obsidian.discordbridge.utils.UtilFunctions.toDiscordPlayerDeath
+import gg.obsidian.discordbridge.utils.UtilFunctions.toDiscordPlayerJoin
+import gg.obsidian.discordbridge.utils.UtilFunctions.toDiscordPlayerLeave
 import org.bukkit.event.EventHandler
 import org.bukkit.event.EventPriority
 import org.bukkit.event.Listener
@@ -19,6 +20,7 @@ import org.bukkit.event.entity.PlayerDeathEvent
 import org.bukkit.event.player.AsyncPlayerChatEvent
 import org.bukkit.event.player.PlayerJoinEvent
 import org.bukkit.event.player.PlayerQuitEvent
+import org.dynmap.DynmapWebChatEvent
 import org.bukkit.ChatColor as CC
 
 class EventListener(val plugin: Plugin): Listener {
@@ -55,9 +57,16 @@ class EventListener(val plugin: Plugin): Listener {
                 .replace(":denko:", "(\u00B4\uFF65\u03C9\uFF65`)")
                 .replace(":masteryourdonger:", "(\u0E07 \u0360\u00B0 \u0644\u035C \u00B0)\u0E07")
 
-        plugin.server.scheduler.runTaskAsynchronously(plugin, { controllerManager.dispatchMessage(AsyncPlayerChatEventWrapper(event)) })
+        val wrapper = AsyncPlayerChatEventWrapper(AsyncPlayerChatEvent(true, event.player, event.message, event.recipients))
+        plugin.server.scheduler.runTaskAsynchronously(plugin, { controllerManager.dispatchMessage(wrapper) })
 
         event.message = MarkdownToMinecraftSeralizer().toMinecraft(plugin.pegDownProc.parseMarkdown(event.message.toCharArray()))
+        plugin.logger.info("Seralized! (synchronous)")
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    fun onDynmapCatEvent(event: DynmapWebChatEvent) {
+        plugin.sendToDiscord(plugin.translateAliasesToDiscord(event.message.toDiscordChatMessage(event.name, "Dynmap")), Connection.getRelayChannel())
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
diff --git a/src/main/kotlin/co/orre/discordbridge/utils/MarkdownToMinecraftSeralizer.kt b/src/main/kotlin/gg/obsidian/discordbridge/utils/MarkdownToMinecraftSeralizer.kt
similarity index 98%
rename from src/main/kotlin/co/orre/discordbridge/utils/MarkdownToMinecraftSeralizer.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/utils/MarkdownToMinecraftSeralizer.kt
index 95b9801..722277e 100644
--- a/src/main/kotlin/co/orre/discordbridge/utils/MarkdownToMinecraftSeralizer.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/utils/MarkdownToMinecraftSeralizer.kt
@@ -1,4 +1,4 @@
-package co.orre.discordbridge.utils
+package gg.obsidian.discordbridge.utils
 
 import org.parboiled.common.Preconditions
 import org.pegdown.Printer
@@ -116,7 +116,7 @@ class MarkdownToMinecraftSeralizer : Visitor {
     }
 
     override fun visit(node: SpecialTextNode) {
-        printer.printEncoded(node.text)
+        printer.print(node.text)
     }
 
     override fun visit(node: StrikeNode) {
diff --git a/src/main/kotlin/co/orre/discordbridge/utils/Rating.kt b/src/main/kotlin/gg/obsidian/discordbridge/utils/Rating.kt
similarity index 93%
rename from src/main/kotlin/co/orre/discordbridge/utils/Rating.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/utils/Rating.kt
index d66ba1f..f329f89 100644
--- a/src/main/kotlin/co/orre/discordbridge/utils/Rating.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/utils/Rating.kt
@@ -1,4 +1,4 @@
-package co.orre.discordbridge.utils
+package gg.obsidian.discordbridge.utils
 
 import org.bukkit.configuration.serialization.ConfigurationSerializable
 import org.bukkit.configuration.serialization.SerializableAs
diff --git a/src/main/kotlin/co/orre/discordbridge/utils/Respect.kt b/src/main/kotlin/gg/obsidian/discordbridge/utils/Respect.kt
similarity index 94%
rename from src/main/kotlin/co/orre/discordbridge/utils/Respect.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/utils/Respect.kt
index 728b83e..ed0a6e8 100644
--- a/src/main/kotlin/co/orre/discordbridge/utils/Respect.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/utils/Respect.kt
@@ -1,4 +1,4 @@
-package co.orre.discordbridge.utils
+package gg.obsidian.discordbridge.utils
 
 import org.bukkit.configuration.serialization.ConfigurationSerializable
 import org.bukkit.configuration.serialization.SerializableAs
diff --git a/src/main/kotlin/co/orre/discordbridge/utils/Script.kt b/src/main/kotlin/gg/obsidian/discordbridge/utils/Script.kt
similarity index 97%
rename from src/main/kotlin/co/orre/discordbridge/utils/Script.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/utils/Script.kt
index 4cc08ea..6406471 100644
--- a/src/main/kotlin/co/orre/discordbridge/utils/Script.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/utils/Script.kt
@@ -1,4 +1,4 @@
-package co.orre.discordbridge.utils
+package gg.obsidian.discordbridge.utils
 
 import org.bukkit.configuration.serialization.ConfigurationSerializable
 import org.bukkit.configuration.serialization.SerializableAs
diff --git a/src/main/kotlin/co/orre/discordbridge/utils/UserAlias.kt b/src/main/kotlin/gg/obsidian/discordbridge/utils/UserAlias.kt
similarity index 93%
rename from src/main/kotlin/co/orre/discordbridge/utils/UserAlias.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/utils/UserAlias.kt
index 132f45d..8837eb4 100644
--- a/src/main/kotlin/co/orre/discordbridge/utils/UserAlias.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/utils/UserAlias.kt
@@ -1,4 +1,4 @@
-package co.orre.discordbridge.utils
+package gg.obsidian.discordbridge.utils
 
 import org.bukkit.configuration.serialization.ConfigurationSerializable
 import org.bukkit.configuration.serialization.SerializableAs
diff --git a/src/main/kotlin/co/orre/discordbridge/utils/UtilFunctions.kt b/src/main/kotlin/gg/obsidian/discordbridge/utils/UtilFunctions.kt
similarity index 94%
rename from src/main/kotlin/co/orre/discordbridge/utils/UtilFunctions.kt
rename to src/main/kotlin/gg/obsidian/discordbridge/utils/UtilFunctions.kt
index e8ebc5c..b36d33c 100644
--- a/src/main/kotlin/co/orre/discordbridge/utils/UtilFunctions.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/utils/UtilFunctions.kt
@@ -1,6 +1,6 @@
-package co.orre.discordbridge.utils
+package gg.obsidian.discordbridge.utils
 
-import co.orre.discordbridge.Config
+import gg.obsidian.discordbridge.Config
 import org.bukkit.ChatColor
 import org.bukkit.entity.Player
 
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 5167766..2e7bdbf 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -8,7 +8,7 @@ website: '@URL@'
 loadbefore: [SpaceBukkit, RemoteToolkitPlugin]
 softdepend: [Multiverse-Core]
 
-main: co.orre.discordbridge.Plugin
+main: gg.obsidian.discordbridge.Plugin
 
 permissions:
   discordbridge.discord:

From c70956554240d3d68206ef4057d1c907fd549310 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Fri, 28 Apr 2017 19:37:18 -0500
Subject: [PATCH 24/24] 1.8.0

- Finished Javadoc

- Cleaned up some stuff

- Updated README.md
---
 README.md                                     |  92 ++++++++++------
 .../gg/obsidian/discordbridge/Config.kt       |   7 ++
 .../discordbridge/DataConfigAccessor.kt       |  20 ++++
 .../gg/obsidian/discordbridge/Plugin.kt       | 100 ++++++++++++++----
 .../obsidian/discordbridge/UserAliasConfig.kt |  15 +++
 .../commands/AsyncPlayerChatEventWrapper.kt   |  29 +++++
 .../discordbridge/commands/IBotController.kt  |   6 ++
 .../discordbridge/commands/IEventWrapper.kt   |  51 +++++++++
 .../discordbridge/commands/MessageWrapper.kt  |  34 ++++++
 .../commands/MinecraftCommandWrapper.kt       |  35 ++++++
 .../controllers/FunCommandsController.kt      |  65 ++++++++++--
 .../controllers/UtilCommandsController.kt     |  53 +++++++++-
 .../discordbridge/discord/Connection.kt       |  48 +++++++++
 .../discordbridge/discord/Listener.kt         |  10 ++
 .../minecraft/CommandListener.kt              |  14 +++
 .../discordbridge/minecraft/EventListener.kt  |  68 +++++++++++-
 .../utils/MarkdownToMinecraftSeralizer.kt     |  10 ++
 .../gg/obsidian/discordbridge/utils/Rating.kt |   7 ++
 .../obsidian/discordbridge/utils/Respect.kt   |   7 ++
 .../gg/obsidian/discordbridge/utils/Script.kt |  11 ++
 .../obsidian/discordbridge/utils/UserAlias.kt |   6 ++
 .../discordbridge/utils/UtilFunctions.kt      |  63 +++++++++--
 todo                                          |  14 +--
 23 files changed, 686 insertions(+), 79 deletions(-)

diff --git a/README.md b/README.md
index c304239..5c37baa 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,12 @@ Bridges chat between Discord and Minecraft (Bukkit/Spigot).
 
 ## Installation
 
-<<Coming soon!>>
+
+1. Download the latest release from GitHub
+2. Add it to your plugins folder
+3. Either run Bukkit/Spigot once to generate DiscordBridge/config.yml or create it using the guide below.
+4. All done!
+
 
 ## Configuration
 
@@ -32,8 +37,13 @@ username: 'DiscordBridge'
 # Use '&' in place of the formatting symbol.
 username-color: ''
 
+# (Optional) Define an alternate prefix for all of the bot's commands. These will work in addition to @mentions.
+# Will also work in Minecraft if the sender has the required permission for the command they try.
+# Leave blank to only allow @mentions to prefix commands
+command-prefix: ''
+
 # (Optional) Set this value with a valid Cleverbot API key to enable chatting with Cleverbot
-# Look at https://www.cleverbot.com/JDA/ for more info
+# Look at https://www.cleverbot.com/api/ for more info
 cleverbot-key: ''
 
 # If true, prints verbose log messages to the server console for every action
@@ -59,22 +69,23 @@ if-vanished:
   player-leave: false
   player-death: false
 
-# Set the templates for relayed messages
-# %u - The sender's username
-# %m - The sender's message
-# %w - The name of the world the sender is in (Multiverse alias compatible)
-# %r - The death message (Death event only)
-# Use '&' in place of the formatting symbol to apply formatting codes.
+# Set the templates for various message types
+# %u - The username of the one who sent the message or invoked a command, if applicable
+# %m - The raw message that would normally display, if applicable
+# %w - The name of the world the sender is in
+#   - Applicable to messages from Minecraft only
+#   - Multiverse alias compatible
+# Use '&' in place of the formatting symbol to apply formatting codes to messages sent to Minecraft
 templates:
   discord:
     chat-message: '<**%u**> %m'
     player-join: '**%u** joined the server'
     player-leave: '**%u** left the server'
-    player-death: '%r'
+    player-death: '%m'
     server-start: 'Server started!'
     server-stop: 'Shutting down...'
   minecraft:
-    chat-message: '[&b&lDiscord&r]<%u> %m'
+    chat-message: '[&b&l%w&r]<%u> %m'
 ```
 
 * `token` is the access token for the Discord bot. Without this, the bot will not function at all.
@@ -91,51 +102,64 @@ templates:
 
 **Templates**
 
-- `%u` will be replaced with the username 
-- `%d` will be replaced with the user's display name
+- `%u` will be replaced with the player/user's username
 - `%m` will be replaced with the message
 - `%w` will be replaced with the world name
-- `%r` will be replaced with Minecraft's standard death message
 - Color codes, prefixed with `&`, will be translated on the Minecraft end
 
 ## Features
 
 * Anything said in Minecraft chat will be sent to your chosen Discord channel
-* Anything said in your chosen Discord channel will be sent to your Minecraft chat (with a `(discord)` suffix added to usernames)
+* If Multiverse-Core is installed and the `%w` tag is specified in your relay message syntax, the alias assigned to your Multiverse worlds will be displayed
+* Anything said in your chosen Discord channel will be sent to your Minecraft chat (if the `%w` tag is used in your relay message syntax, Discord messages will display `Discord`)
+* If Dynmap is installed, anything said over Dynmap chat will be relayed to your chosen Discord channel (if the `%w` tag is used in your relay messag syntax, Dynmap messages will display `Dynmap`)
 * You can link Minecraft accounts to Discord accounts and the bot will translate display names to match where the message appears
 * Join / leave messages can be sent to Discord
 * Death messages can be sent to Discord
 * Server start and stop messages can be sent to Discord
 * All of the above messages can be toggled if you don't want them to appear
-* Message templates are customized
-* Prefixing usernames with `@` in the Minecraft chat will be converted to mentions in the Discord chat if the user exists (you can use their Discord display name with spaces removed, or their Minecraft username if the accounts are linked)
-* Image attachments sent in the Discord channel will relay their URLs to Minecraft
-* Add scripted responses for the bot to say when it detects a trigger phrase
+* Message templates are customizeable
+* Prefixing usernames with `@` in the Minecraft chat will be converted to tag mentions in the Discord chat if the user exists (you can use their Discord display name with spaces removed, or their Minecraft username if the accounts are linked)
+* Add customizeable scripted responses for the bot to say when it detects a trigger phrase
 * A handful of fun and shitposting commands for the full Discord Bot experience both in and out of game
-* Cleverbot integration - chat with the bot using `@<name>`. Works in Discord AND Minecraft!
+* Cleverbot integration - chat with the bot using `@<bot name>` or `/talk`. Works in Discord AND Minecraft! (requires Cleverbot API key)
 * The bot can use any of its commands in any channel it can read (including DMs!) allowing it to function as a general-purpose Discord bot on the side
+* Command permissions affect both Minecraft slash command and Minecraft in-chat commands
 
 ## Permissions
 
-- `discordbridge.cleverbot` - ability to talk to Cleverbot
-- `discordbridge.f` - ability to pay respects with /f
-- `discordbridge.reload` - ability to reload data and reconnect the Discord connection
-- `discordbridge.eightball` - ability to consult the Magic 8-Ball with /8ball
-- `discordbridge.rate` - ability to ask for an out-of-10 rating with /rate
-- `discordbridge.insult` - ability to make the bot insult something with /insult
+- `discordbridge.discord` - ability to use any command in of the /discord subcommand tree
+- `discordbridge.discord.reload` - ability to reload configs and JDA
+- `discordbridge.discord.listmembers` - abiliyt to receive a list of members in the Discord channel
+- `discordbridge.discord.linkalias` - abiliy to send a request to a Discord member to set up alias translation
+- `discordbridge.talk` - ability to talk to Cleverbot
+- `discordbridge.f` - ability to use the f command
+- `discordbridge.rate` - ability to use the rate command
+- `discordbridge.eightball` - ability to use the 8ball command
+- `discordbridge.insult` - ability to use the insult command
+- `discordbridge.choose` - ability to use the choose command
+- `discordbridge.roll` - ability to use the roll command
 
 ## Commands
 
-- `/discord reload` - reloads data and reconnects to Discord
-- `/discord get online` - provides a list of all Discord users in the relay channel who are Online, Do Not Disturb, and Idle
-- `/discord get ids` - provides a list of the Discord IDs of all users in the relay channel, which is useful for...
-- `/discord register <discord-id>` - this command will send a DM to the corresponding user asking if that user wishes to link their Discord account with the Minecraft user who issued the command
-- `/f` - press F to pay respects
-- `/8ball <query>` - consults the Magic 8-Ball to answer your yes/no questions (messages configurable in `botmemory.yml`)
-- `/rate <thing to rate>` - asks the bot to rate something on a 0-10 scale
-- `/insult <thing to insult>` - makes the bot insult something (messages configurable in `insults.yml`) (*WARNING: The supplied insults are quite offensive! Remove permissions for this command or replace the insults if you intend to use this bot on cleaner servers!*)
+- `8ball <question>` - consult the Magic 8-Ball to answer your yes/no questions (messages configurable in `botmemory.yml`)
+- `discord reload` - refreshes the JDA connection and reloads configs
+- `discord linkalias` - sends a request to a specified Discord user to link aliases for username translation
+- `discord listmembers all` - lists all the members in the Discord relay channel
+- `discord listmembers online` - lists all the members in the Discord relay channel who are online along with their statuses
+- `discord unlinkalias ` - silently breaks an alias link with a Discord user, if one exists
+- `f` - press F to pay respects (messages configurable in `f.yml`)
+- `rate <thing to be rated>` - have the bot rate something for you (rating scale and messages configurable in `rate.yml`)
+- `insult <thing to insult>` - makes the bot insult something (messages configurable in `insults.yml`) (*WARNING: The supplied insults are quite offensive! Remove permissions for this command or replace the insults if you intend to use this bot on cleaner servers!*)
+- `choose <choiceA or choiceB || choiceC, choice D...>` - have the bot make a choice for you
+- `roll <sides>` - roll a die with a specified number of sides (up to 100)
+- `talk <message` - talk to Cleverbot!
 
 ## Upcoming Features
 
+* Vanilla Minecraft admin commands (kick, ban, start, stop, give, etc) usable from Discord
 * Add support for a URL shortening service so attachment URLs aren't so flipping long
-* Some of the 'fun' commands that literally every Discord bot has (with matching Minecraft commands!)
+* Add support for relaying embeds
+* Make Discord responses for certain commands return in pretty embeds
+* More of the 'fun' commands that literally every Discord bot has (with matching Minecraft commands!)
+* Multiple Discord channel support?
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Config.kt b/src/main/kotlin/gg/obsidian/discordbridge/Config.kt
index 72f47d9..abdd864 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Config.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Config.kt
@@ -3,6 +3,9 @@ package gg.obsidian.discordbridge
 import gg.obsidian.discordbridge.utils.UtilFunctions.noSpace
 import org.bukkit.ChatColor
 
+/**
+ * Caches primary config information
+ */
 object Config {
 
     var SERVER_ID: String = ""
@@ -42,6 +45,10 @@ object Config {
     // misc
     var BOT_MC_USERNAME = ""
 
+    /**
+     * Load values into memory from the config file
+     * @param plugin the base Plugin object
+     */
     fun load(plugin: Plugin) {
         plugin.reloadConfig()
 
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/DataConfigAccessor.kt b/src/main/kotlin/gg/obsidian/discordbridge/DataConfigAccessor.kt
index 77391da..e3004e6 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/DataConfigAccessor.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/DataConfigAccessor.kt
@@ -20,6 +20,8 @@ package gg.obsidian.discordbridge
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 * SOFTWARE.
+*
+* NOTE: This code has been modified from Java to Kotlin. The functionality is largely identical.
 */
 
 import org.bukkit.configuration.file.FileConfiguration
@@ -29,6 +31,13 @@ import java.io.IOException
 import java.io.InputStreamReader
 import java.util.logging.Level
 
+/**
+ * Acts as an interface between the plugin and a target config file
+ *
+ * @param plugin a reference to the base Plugin object
+ * @param filepath the path to the config file
+ * @param fileName the name of the config file plus its extension
+ */
 class DataConfigAccessor(val plugin: Plugin, filepath: File, private val fileName: String) {
 
     private val configFile: File?
@@ -39,6 +48,11 @@ class DataConfigAccessor(val plugin: Plugin, filepath: File, private val fileNam
         this.configFile = File(filepath, fileName)
     }
 
+    /**
+     * Reloads the data from the config file into memory
+     *
+     * If the file is null, the default file from within the jar file is loaded instead
+     */
     fun reloadConfig() {
         try {
             fileConfiguration = YamlConfiguration.loadConfiguration(configFile)
@@ -59,6 +73,9 @@ class DataConfigAccessor(val plugin: Plugin, filepath: File, private val fileNam
             return fileConfiguration!!
         }
 
+    /**
+     * Writes the current memory contents of the config back to file
+     */
     fun saveConfig() {
         if (fileConfiguration == null || configFile == null)
             return
@@ -71,6 +88,9 @@ class DataConfigAccessor(val plugin: Plugin, filepath: File, private val fileNam
         }
     }
 
+    /**
+     * Saves the default config file within the jar to its own file, if it does not already exist
+     */
     @Suppress("unused")
     fun saveDefaultConfig() {
         if (!configFile!!.exists())
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
index 19d6769..adf5411 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
@@ -19,6 +19,9 @@ import java.io.File
 import java.util.logging.Level
 import org.bukkit.ChatColor as CC
 
+/**
+ * The primary Plugin class that maintains the plugin's connection with Bukkit
+ */
 class Plugin : JavaPlugin() {
 
     // Configs
@@ -36,12 +39,17 @@ class Plugin : JavaPlugin() {
     // Temporary storage for alias linking requests
     var requests: MutableList<UserAlias> = mutableListOf()
 
-    // Detects if Multiverse-Core is installed
+    /**
+     * Returns whether Multiverse-Core is installed
+     */
     val isMultiverseInstalled: Boolean
         get() = server.pluginManager.getPlugin("Multiverse-Core") != null
 
+    /**
+     * Runs at plugin startup
+     */
     override fun onEnable() {
-
+        // Register data class types to the config deserializer
         ConfigurationSerialization.registerClass(Respect::class.java, "Respect")
         ConfigurationSerialization.registerClass(Rating::class.java, "Rating")
         ConfigurationSerialization.registerClass(Script::class.java, "Script")
@@ -68,6 +76,9 @@ class Plugin : JavaPlugin() {
         getCommand("roll").executor = CommandListener(this)
     }
 
+    /**
+     * Runs cleanup when the plugin is disabled
+     */
     override fun onDisable() {
         if (Config.ANNOUNCE_SERVER_START_STOP)
             Connection.send(Config.TEMPLATES_DISCORD_SERVER_STOP, Connection.getRelayChannel())
@@ -81,13 +92,22 @@ class Plugin : JavaPlugin() {
       Messaging Functions
     ===================================== */
 
-    // Send a message to Discord
+    /**
+     * Sends a message to the specified Discord channel
+     *
+     * @param message the message to send
+     * @param channel the channel to send the message to
+     */
     fun sendToDiscord(message: String, channel: MessageChannel?) {
         logDebug("Sending message to Discord - $message")
         Connection.send(message, channel)
     }
 
-    // Send a message to Minecraft
+    /**
+     * Broadcast a message on the Minecraft server
+     *
+     * @param message the message to send
+     */
     fun sendToMinecraft(message: String) {
         server.broadcastMessage(message)
     }
@@ -96,7 +116,9 @@ class Plugin : JavaPlugin() {
       Util
     ===========================================*/
 
-    // Reloads everything
+    /**
+     * Reloads all configs and the JDA connection
+     */
     fun reload(callback: Runnable) {
         reloadConfig()
         users.reloadConfig()
@@ -111,7 +133,9 @@ class Plugin : JavaPlugin() {
         Connection.reconnect(callback)
     }
 
-    // Save default config
+    /**
+     * Saves all default configs where configs do not exist and reloads data from file into memory
+     */
     fun updateConfig(version: String) {
         this.saveDefaultConfig()
         config.options().copyDefaults(true)
@@ -129,13 +153,17 @@ class Plugin : JavaPlugin() {
         UserAliasConfig.load(this)
     }
 
-    // Log only if debug config is true
+    /**
+     * Sends a log message to console if the DEBUG flag in config.yml is true
+     */
     fun logDebug(msg: String) {
         if (!Config.DEBUG) return
-        logger.info(msg)
+        logger.info("[DiscordBridge] $msg")
     }
 
-    // Get a list of usernames of players who are online
+    /**
+     * @return a list of names of all players currently on the Minecraft server
+     */
     fun getOnlinePlayers(): List<String> {
         val names: MutableList<String> = mutableListOf()
         val players = server.onlinePlayers.toTypedArray()
@@ -143,7 +171,13 @@ class Plugin : JavaPlugin() {
         return names.toList()
     }
 
-    // Open a request to link a Minecraft user with a Discord user
+    /**
+     * Opens an alias link request and sends it to the target Discord user
+     *
+     * @param player the Minecraft player that initiated the request
+     * @param discriminator the Discord username+discriminator of the target Discord user
+     * @return a Discord Member object, or null if no matching member was found
+     */
     fun registerUserRequest(player: Player, discriminator: String): Member? {
         val users = Connection.listUsers()
         val found: Member = users.find { it.user.name + "#" + it.user.discriminator == discriminator } ?: return null
@@ -158,7 +192,9 @@ class Plugin : JavaPlugin() {
         return found
     }
 
-    // Return a formatted string listing the Discord IDs of all Discord users in the relay channel
+    /**
+     * @return a formatted string listing the Discord IDs of all Discord users in the relay channel
+     */
     fun getDiscordMembersAll(): String {
         val users = Connection.listUsers()
 
@@ -173,7 +209,9 @@ class Plugin : JavaPlugin() {
         return response.trim()
     }
 
-    // Return a formatted string listing all Discord users in the relay channel who are visibly available
+    /**
+     * @return a formatted string listing all Discord users in the relay channel who are online along with their statuses
+     */
     fun getDiscordMembersOnline(): String {
         val onlineUsers = Connection.listOnline()
         if (onlineUsers.isEmpty())
@@ -210,8 +248,18 @@ class Plugin : JavaPlugin() {
       Message Formatting Functions
     ===================================== */
 
-    // Converts attempted @mentions to real ones wherever possible
-    // Mentionable names MUST NOT contain spaces!
+    /**
+     * Attempts to convert all instances of "@name" into Discord @tag mentions
+     *
+     * This should work for "@<Discord server name>", "@<Minecraft username>" (if an alias is linked),
+     * and "@<Discord name + #discrminator>"
+     *
+     * NOTE: If the Discord name contains spaces, that name must be typed in this string without spaces.
+     * e.g. a member named "Discord Bridge" must be tagged as "@DiscordBridge"
+     *
+     * @param message the message to format
+     * @return the formatted message
+     */
     fun convertAtMentions(message: String): String {
         var newMessage = message
 
@@ -239,6 +287,12 @@ class Plugin : JavaPlugin() {
         return newMessage
     }
 
+    /**
+     * Attempts to de-convert all instances of Discord @tag mentions back into simple "@name" syntax
+     *
+     * @param message the message to format
+     * @return the formatted message
+     */
     fun deconvertAtMentions(message: String): String {
         var modifiedMessage = message
         for (match in Regex("""<@!(\d+)>|<@(\d+)>""").findAll(message)) {
@@ -248,8 +302,13 @@ class Plugin : JavaPlugin() {
         return modifiedMessage
     }
 
-    // Scans the string for occurrences of Minecraft names and attempts to translate them
-    // to registered Discord names, if they exist
+    /**
+     * Scans the input string for occurrences of Minecraft names in the alias registry and replaces them with
+     * their corresponding Discord aliases
+     *
+     * @param message the message to format
+     * @return the formatted message
+     */
     fun translateAliasesToDiscord(message: String): String {
         var modifiedMessage = message
         for ((mcUuid, discordId) in UserAliasConfig.aliases) {
@@ -261,8 +320,13 @@ class Plugin : JavaPlugin() {
         return modifiedMessage
     }
 
-    // Scans the string for occurrences of Discord names and attempts to translate them
-    // to registered Minecraft names, if they exist
+    /**
+     * Scans the input string for occurrences of Discord names in the alias registry and replaces them with
+     * their corresponding Minecraft aliases
+     *
+     * @param message the message to format
+     * @return the formatted message
+     */
     fun translateAliasesToMinecraft(message: String): String {
         var modifiedMessage = message
         for ((mcUuid, discordId) in UserAliasConfig.aliases) {
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt b/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
index 4186c39..2398afa 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
@@ -2,9 +2,15 @@ package gg.obsidian.discordbridge
 
 import gg.obsidian.discordbridge.utils.UserAlias
 
+/**
+ * An accessor object for the users config file
+ */
 object UserAliasConfig {
     var aliases: List<UserAlias> = mutableListOf()
 
+    /**
+     * Load the stored aliases from file into memory
+     */
     fun load(plugin: Plugin) {
         val list = plugin.users.data.getList("aliases")
         if (list != null) aliases = list.checkItemsAre<UserAlias>() ?:
@@ -12,6 +18,9 @@ object UserAliasConfig {
         else mutableListOf<UserAlias>()
     }
 
+    /**
+     * Adds a new alias to the list and saves the updated list to file
+     */
     fun add(plugin: Plugin, ua: UserAlias) {
         aliases = aliases.plus(ua)
         plugin.users.data.set("aliases", aliases)
@@ -19,6 +28,9 @@ object UserAliasConfig {
         plugin.users.reloadConfig()
     }
 
+    /**
+     * Removes an alias from the list and saves the updated list to file
+     */
     fun remove(plugin: Plugin, ua: UserAlias) {
         aliases = aliases.minus(ua)
         plugin.users.data.set("aliases", aliases)
@@ -26,6 +38,9 @@ object UserAliasConfig {
         plugin.users.reloadConfig()
     }
 
+    /**
+     * A function to assert that all the items in a given list are of a specific type
+     */
     @Suppress("UNCHECKED_CAST")
     inline fun <reified T : Any> List<*>.checkItemsAre() = if (all { it is T }) this as List<T> else null
 }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/AsyncPlayerChatEventWrapper.kt b/src/main/kotlin/gg/obsidian/discordbridge/commands/AsyncPlayerChatEventWrapper.kt
index 4d36576..9166b38 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/commands/AsyncPlayerChatEventWrapper.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/commands/AsyncPlayerChatEventWrapper.kt
@@ -4,19 +4,48 @@ import gg.obsidian.discordbridge.discord.Connection
 import net.dv8tion.jda.core.entities.MessageChannel
 import org.bukkit.event.player.AsyncPlayerChatEvent
 
+/**
+ * A wrapper for Bukkit's AsyncPlayerChatEvent class
+ *
+ * @param event the underlying AsyncPlayerChatEvent instance
+ */
 class AsyncPlayerChatEventWrapper(val event: AsyncPlayerChatEvent) : IEventWrapper {
+    /**
+     * The Minecraft username of the event author
+     */
     override val senderName: String
         get() = event.player.name
+    /**
+     * The message of this event
+     */
     override val message: String
         get() = event.message
+    /**
+     * The raw message of this event
+     *
+     * This is identical to the message property for this wrapper type
+     */
     override val rawMessage: String
         get() = event.message
+    /**
+     * The Minecraft username of the sender in "@name" format
+     */
     override val senderAsMention: String
         get() = "@" + event.player.name
+    /**
+     * Returns the value at Connection.getRelayChannel()
+     * @see Connection.getRelayChannel
+     */
     override val channel: MessageChannel
         get() = Connection.getRelayChannel()!!
+    /**
+     * The message author's Minecraft UUID
+     */
     override val senderId: String
         get() = event.player.uniqueId.toString()
+    /**
+     * Always returns true for this wrapper type
+     */
     override val isFromRelayChannel: Boolean
         get() = true
 
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/IBotController.kt b/src/main/kotlin/gg/obsidian/discordbridge/commands/IBotController.kt
index 52756b7..2acf55e 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/commands/IBotController.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/commands/IBotController.kt
@@ -1,5 +1,11 @@
 package gg.obsidian.discordbridge.commands
 
+/**
+ * Controls a number of commands that can be bulk applied to a BotControllerManager
+ */
 interface IBotController {
+    /**
+     * @return a short description of this IBotController's methods as seen in the Help command
+     */
     fun getDescription(): String
 }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/IEventWrapper.kt b/src/main/kotlin/gg/obsidian/discordbridge/commands/IEventWrapper.kt
index 8f586e3..5116f7c 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/commands/IEventWrapper.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/commands/IEventWrapper.kt
@@ -2,12 +2,63 @@ package gg.obsidian.discordbridge.commands
 
 import net.dv8tion.jda.core.entities.MessageChannel
 
+/**
+ * Interface for wrappers of various message event types
+ */
 interface IEventWrapper {
+    /**
+     * The name of the event author
+     */
     val senderName : String
+    /**
+     * The message in the event
+     *
+     * For MessageWrapper instances, this calls getContent()
+     *
+     * Otherwise, this is identical to rawMessage
+     */
     val message : String
+    /**
+     * The raw message in the event
+     *
+     * For MessageWrapper instances, this calls getRawContent()
+     *
+     * Otherwise, this is identical to message
+     */
     val rawMessage : String
+    /**
+     * The name of the author of the event in @tag format
+     *
+     * For MessageWrapper instances, this will return a mention tag in the form <@##########>
+     *
+     * Otherwise, this will return the player's username prefixed with '@'
+     */
     val senderAsMention : String
+    /**
+     * The originating channel of the message
+     *
+     * For MessageWrapper instances, this returns the origin channel or private channel of the message
+     *
+     * Otherwise, this returns Connection.getRelayChannel()
+     * @see gg.obsidian.discordbridge.discord.Connection.getRelayChannel
+     */
     val channel : MessageChannel
+    /**
+     * The ID string of the message author
+     *
+     * For MessageWrapper instances, this returns the author's Discord ID
+     *
+     * Otherwise, this returns the author's Minecraft UUID
+     */
     val senderId : String
+    /**
+     * Whether this message is from the channel that is relayed to Minecraft
+     *
+     * For MessageWrapper instances, this is true if the inner event's getChannel() is equal to
+     * Connection.getRelayChannel(), and false otherwise
+     * @see gg.obsidian.discordbridge.discord.Connection.getRelayChannel
+     *
+     * Otherwise, this always returns true
+     */
     val isFromRelayChannel: Boolean
 }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/MessageWrapper.kt b/src/main/kotlin/gg/obsidian/discordbridge/commands/MessageWrapper.kt
index 65be83e..c00ff01 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/commands/MessageWrapper.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/commands/MessageWrapper.kt
@@ -5,29 +5,63 @@ import net.dv8tion.jda.core.entities.ChannelType
 import net.dv8tion.jda.core.entities.Message
 import net.dv8tion.jda.core.entities.MessageChannel
 
+/**
+ * A wrapper for JDA's Message class
+ *
+ * @param originalMessage the underlying Message instance
+ */
 class MessageWrapper(val originalMessage: Message) : IEventWrapper {
 
+    /**
+     * Returns a formatted mention tag in the form <@##########>
+     */
     override val senderAsMention: String
         get() = originalMessage.author.asMention
 
+    /**
+     * Returns the channel in which this event was sent
+     */
     override val channel: MessageChannel
         get() = originalMessage.channel
 
+    /**
+     * Whether this message was sent from the relay channel
+     *
+     * Returns true if the underlying message's getChannel() is equal to
+     * Connection.getRelayChannel(), false otherwise
+     * @see gg.obsidian.discordbridge.discord.Connection.getRelayChannel
+     */
     override val isFromRelayChannel: Boolean
         get() = if (originalMessage.isFromType(ChannelType.PRIVATE)) false
                 else originalMessage.guild.id == Config.SERVER_ID
                 && originalMessage.isFromType(ChannelType.TEXT)
                 && originalMessage.textChannel.name.equals(Config.CHANNEL, true)
 
+    /**
+     * The message of this event
+     *
+     * This is equivalent to Message.getContent()
+     */
     override val message: String
         get() = originalMessage.content
 
+    /**
+     * The raw message of this event
+     *
+     * This is equivalent to Message.getRawContent()
+     */
     override val rawMessage: String
         get() = originalMessage.rawContent
 
+    /**
+     * The visible server name of the author of the event
+     */
     override val senderName: String
         get() = originalMessage.author.name
 
+    /**
+     * The Discord ID of the author
+     */
     override val senderId: String
         get() = originalMessage.author.id
 
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt b/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt
index 9a863ca..141817b 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt
@@ -6,20 +6,55 @@ import org.bukkit.command.Command
 import org.bukkit.command.CommandSender
 import org.bukkit.entity.Player
 
+/**
+ * A wrapper for the parameters passed to onCommand() in Bukkit's CommandExecutor class
+ *
+ * @param sender the sender of the command
+ * @param command the command that was invoked
+ * @param args an array of argument strings passed to the command
+ */
 class MinecraftCommandWrapper(val sender: CommandSender, val command: Command,
                               val args: Array<out String>) : IEventWrapper {
+    /**
+     * The Minecraft username of the command sender
+     *
+     * Returns "Console" if the command was sent from the server console
+     */
     override val senderName: String
         get() = if (sender is Player) sender.name else "Console"
+    /**
+     * Returns a space-delimited string of all the arguments passed with the command
+     *
+     * This is identical to rawMessage
+     */
     override val message: String
         get() = args.joinToString(separator = " ")
+    /**
+     * Returns a space-delimited string of all the arguments passed with the command
+     *
+     * This is identical to message
+     */
     override val rawMessage: String
         get() = args.joinToString(separator = " ")
+    /**
+     * The Minecraft username of the command sender in "@name" format
+     */
     override val senderAsMention: String
         get() = "@${sender.name}"
+    /**
+     * Returns the value at Connection.getRelayChannel()
+     * @see Connection.getRelayChannel
+     */
     override val channel: MessageChannel
         get() = Connection.getRelayChannel()!!
+    /**
+     * The command sender's Minecraft UUID
+     */
     override val senderId: String
         get() = (sender as? Player)?.uniqueId?.toString() ?: ""
+    /**
+     * Always returns true for this wrapper type
+     */
     override val isFromRelayChannel: Boolean
         get() = true
 
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt b/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt
index a63f777..1214aa5 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt
@@ -11,11 +11,24 @@ import gg.obsidian.discordbridge.utils.Rating
 import gg.obsidian.discordbridge.utils.Respect
 import java.util.*
 
+/**
+ * Controller for fun commands that have no purpose outside of amusement
+ *
+ * @param plugin a reference to the base Plugin object
+ */
 class FunCommandsController(val plugin: Plugin) : IBotController {
 
+    /**
+     * @return a description of this class of commands, used in the Help command
+     */
     override fun getDescription(): String = ":balloon:  **FUN** - Every bot has to have them!"
 
-    // 8BALL - consult the Magic 8-Ball to answer your yes or no questions
+    /**
+     * Answers a yes/no question
+     *
+     * @param event the incoming event object
+     * @return the response string
+     */
     @BotCommand(name = "8ball", usage = "<question>", description = "Consult the Magic 8 Ball")
     @TaggedResponse
     private fun eightBall(event: IEventWrapper): String {
@@ -25,7 +38,13 @@ class FunCommandsController(val plugin: Plugin) : IBotController {
         return responses[rand]
     }
 
-    // CHOOSE - chooses between some number of options
+    /**
+     * Makes a selection among an arbitrary number of supplied choices
+     *
+     * @param event the incoming event object
+     * @param query a delimited string of the options to choose from
+     * @return the response string
+     */
     @BotCommand(name = "choose", usage = "<option>, <option>, ... (delimiters include ',', 'or', '|')",
             description = "Have the bot choose between given options")
     @TaggedResponse
@@ -36,7 +55,12 @@ class FunCommandsController(val plugin: Plugin) : IBotController {
         return "I pick '${choices[rand]}'"
     }
 
-    // F - press F to pay respects!
+    /**
+     * Press F to pay respects
+     *
+     * @param event the incoming event object
+     * @return the response string
+     */
     @BotCommand(usage="", description = "Press F to pay respects")
     private fun f(event: IEventWrapper): String {
         plugin.logDebug("user ${event.senderName}} pays respects")
@@ -69,7 +93,13 @@ class FunCommandsController(val plugin: Plugin) : IBotController {
         return msg
     }
 
-    // INSULT - the bot insults something
+    /**
+     * Insult someone or something
+     *
+     * @param event the incoming event object
+     * @param thingToInsult the target of the insult
+     * @return the response string
+     */
     @BotCommand(usage="<thing to insult>", description = "Make the bot insult something for you")
     private fun insult(event: IEventWrapper, thingToInsult: String): String {
         plugin.logDebug("user ${event.senderName} requests an insult against '$thingToInsult'")
@@ -78,7 +108,13 @@ class FunCommandsController(val plugin: Plugin) : IBotController {
         return "${event.senderAsMention} \u27A4 $thingToInsult | ${responses[rand]}"
     }
 
-    // RATE - the bot rates something
+    /**
+     * Rate something on a scale specified by the config
+     *
+     * @param event the incoming event object
+     * @param thingToRate the thing that will receive the rating
+     * @return the response string
+     */
     @BotCommand(usage="<thing to be rated>", description = "Have the bot rate something for you")
     @TaggedResponse
     private fun rate(event: IEventWrapper, thingToRate: String): String {
@@ -119,7 +155,13 @@ class FunCommandsController(val plugin: Plugin) : IBotController {
         return found.message.replace("%m", thingToBeRated).replace("%r", "$rating/$rateOutOf")
     }
 
-    // ROLL - roll a die for a random number
+    /**
+     * Roll a die with a specified number of sides
+     *
+     * @param event the incoming event object
+     * @param sides the number of sides of the die
+     * @return the response string
+     */
     @BotCommand(name = "roll", usage = "<sides>", description = "Roll a die for a random number")
     @TaggedResponse
     private fun roll(event: IEventWrapper, sides: Int): String {
@@ -132,7 +174,13 @@ class FunCommandsController(val plugin: Plugin) : IBotController {
         return "You rolled... $rand"
     }
 
-    // TALK - directly speak to Cleverbot (useful for not accidentally invoking other commands)
+    /**
+     * Talk to Cleverbot
+     *
+     * @param event the incoming event object
+     * @param query the message to send to Cleverbot
+     * @return the response string
+     */
     @TaggedResponse
     @BotCommand(usage="<say something>", description = "Say something to Cleverbot")
     private fun talk(event: IEventWrapper, query: String): String {
@@ -145,6 +193,9 @@ class FunCommandsController(val plugin: Plugin) : IBotController {
         return bot.response
     }
 
+    /**
+     * Shortcut method for adding "or <prefix>help " to the CommandNotFound output if a COMMAND_PREFIX is set in config
+     */
     @Suppress("UNCHECKED_CAST")
     private inline fun <reified T : Any> List<*>.checkItemsAre() = if (all { it is T }) this as List<T> else null
 }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt b/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
index 63a8f25..e495b86 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
@@ -11,11 +11,24 @@ import net.dv8tion.jda.core.entities.ChannelType
 import org.bukkit.entity.Player
 import org.bukkit.ChatColor as CC
 
+/**
+ * Controller for utility commands that configure the way the bot works
+ *
+ * @param plugin a reference to the base Plugin object
+ */
 class UtilCommandsController(val plugin: Plugin) : IBotController {
 
+    /**
+     * @return a short description of this IBotController's methods as seen in the Help command
+     */
     override fun getDescription(): String = ":wrench:  **UTIL** - Utility commands"
 
-    // CONFIRM - Confirm an alias request
+    /**
+     * Confirms an open request to link aliases with a Minecraft account
+     *
+     * @param event the incoming event object
+     * @return a status message if the event is type MessageWrapper and is sent via DM, null otherwise
+     */
     @BotCommand(usage="", description="Confirm an alias link request", relayTriggerMessage = false)
     @DiscordExclusiveCommand
     @PrivateResponse
@@ -34,7 +47,12 @@ class UtilCommandsController(val plugin: Plugin) : IBotController {
         return "Successfully linked aliases!"
     }
 
-    // DENY - Deny an alias request
+    /**
+     * Denies an open request to link aliases with a Minecraft account
+     *
+     * @param event the incoming event object
+     * @return a status message if the event is type MessageWrapper and is sent via DM, null otherwise
+     */
     @BotCommand(usage="", description="Deny an alias link request", relayTriggerMessage = false)
     @DiscordExclusiveCommand
     @PrivateResponse
@@ -52,7 +70,23 @@ class UtilCommandsController(val plugin: Plugin) : IBotController {
         return "The alias link request has been cancelled."
     }
 
-    @BotCommand(usage="<reload|get|alias> [args...]", description = "For in-game functions", relayTriggerMessage = false)
+    /**
+     * A supercommand for utility functions available within Minecraft
+     *
+     * reload - Refreshes the JDA connection and reloads configs
+     *
+     * linkalias - sends a request to a specified Discord user to link aliases for username translation
+     *
+     * listmembers - lists all the members in the Discord relay channel. Can specify "all" to get all members, or
+     * "online" to list only online members and their availability statuses
+     *
+     * unlinkalias - silently breaks an alias link with a Discord user if one exists
+     *
+     * @param event the incoming event object
+     * @param argString a space-delimited string of subcommands to execute
+     * @return this command always returns null
+     */
+    @BotCommand(usage="<reload|linkalias|listmembers|unlinkalias> [args...]", description = "For in-game functions", relayTriggerMessage = false)
     @MinecraftExclusiveCommand
     @PrivateResponse
     private fun discord(event: IEventWrapper, argString: String): String? {
@@ -146,6 +180,13 @@ class UtilCommandsController(val plugin: Plugin) : IBotController {
         return null
     }
 
+    /**
+     * Displays a pretty list of available commands to the invoker
+     *
+     * @param event the incoming event object
+     * @param commands a map of all commands that can be called by the invoker in the given medium indexed by name
+     * @param instances a map of IBotController instances accessed by their Java classes
+     */
     @BotCommand(usage="", description="You just used it", relayTriggerMessage = false)
     @ChatExclusiveCommand
     @PrivateResponse
@@ -187,7 +228,11 @@ class UtilCommandsController(val plugin: Plugin) : IBotController {
         }
     }
 
-    // SERVERLIST - List all players currently online on the server
+    /**
+     * Displays a pretty list of all currently logged-in Minecraft players
+     *
+     * @param event the incoming event object
+     */
     @DiscordExclusiveCommand
     @BotCommand(usage="", description = "List all Minecraft players currently online on the server",
             relayTriggerMessage = false)
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt b/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
index dcff0d4..41de582 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
@@ -7,6 +7,11 @@ import net.dv8tion.jda.core.JDA
 import net.dv8tion.jda.core.JDABuilder
 import net.dv8tion.jda.core.entities.*
 
+/**
+ * Maintains the connection to Discord's servers. All calls to and from the Discord API are passed through this object.
+ *
+ * This object is designed to run asynchronously on its own thread.
+ */
 object Connection: Runnable {
     lateinit var plugin: Plugin
     lateinit var JDA: JDA
@@ -14,6 +19,9 @@ object Connection: Runnable {
     var server: Guild? = null
     var channel: TextChannel? = null
 
+    /**
+     * Starts the connection
+     */
     override fun run() {
         try {
             connect()
@@ -22,12 +30,23 @@ object Connection: Runnable {
         }
     }
 
+    /**
+     * Gets the channel instance of the designated relay channel specified in the config
+     *
+     * @return the relay TextChannel, null if the value could not be read
+     */
     fun getRelayChannel(): TextChannel? {
         server = if (server == null) getServerById(Config.SERVER_ID) else server
         channel = if (channel == null) getGroupByName(server!!, Config.CHANNEL) else channel
         return channel
     }
 
+    /**
+     * Sends a message to Discord
+     *
+     * @param message the message to send
+     * @param toChannel the channel to send the message to
+     */
     fun send(message: String, toChannel: MessageChannel?) {
         if (toChannel == null) {
             plugin.logger.severe("Could not send message to Discord: Channel is not defined")
@@ -36,6 +55,9 @@ object Connection: Runnable {
         toChannel.sendMessage(message).queue()
     }
 
+    /**
+     * Shuts down the current JDA instance and creates a new one
+     */
     fun reconnect(callback: Runnable) {
         //disconnect
         if (Config.ANNOUNCE_SERVER_START_STOP)
@@ -50,18 +72,31 @@ object Connection: Runnable {
         callback.run()
     }
 
+    /**
+     * Gets a list of users in the relay channel
+     *
+     * @return a List of Member objects
+     */
     fun listUsers(): List<Member> {
         channel = getRelayChannel()
         if (channel == null) return mutableListOf()
         return channel!!.members
     }
 
+    /**
+     * Gets a list of members in the relay channel who are not offline
+     *
+     * @return a List of Member objects
+     */
     fun listOnline(): List<Member> {
         channel = getRelayChannel()
         if (channel != null) return channel!!.members
         return mutableListOf()
     }
 
+    /**
+     * Builds a JDA instance to connect to the Discord API
+     */
     private fun connect() {
         var builder = JDABuilder(AccountType.BOT).setAudioEnabled(true)
         builder = builder.setToken(Config.TOKEN)
@@ -73,10 +108,23 @@ object Connection: Runnable {
         JDA.presence.game = Game.of("Minecraft ${plugin.server.bukkitVersion.split("-")[0]}")
     }
 
+    /**
+     * Fetches a text channel given its Guild and its name
+     *
+     * @param server the Guild object of the server the channel is on
+     * @param name the name of the channel
+     * @return the channel's TextChannel object, or null if it couldn't be found
+     */
     private fun getGroupByName(server: Guild, name: String): TextChannel? {
         return server.textChannels.firstOrNull { it.name == name }
     }
 
+    /**
+     * Fetches a server given its unique ID
+     *
+     * @param id the unique ID of the server
+     * @return the server's Guild object, or null if it couldn't be found
+     */
     private fun getServerById(id: String): Guild? {
         return JDA.guilds.firstOrNull { it.id.equals(id, true) }
     }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt b/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
index 1c316eb..adce7a5 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
@@ -8,6 +8,11 @@ import gg.obsidian.discordbridge.commands.controllers.UtilCommandsController
 import net.dv8tion.jda.core.events.message.MessageReceivedEvent
 import net.dv8tion.jda.core.hooks.ListenerAdapter
 
+/**
+ * Listens for events from Discord
+ *
+ * @param plugin a reference to the base Plugin object
+ */
 class Listener(val plugin: Plugin) : ListenerAdapter() {
 
     val controllerManager = BotControllerManager(plugin)
@@ -17,6 +22,11 @@ class Listener(val plugin: Plugin) : ListenerAdapter() {
         controllerManager.registerController(UtilCommandsController(plugin), discordExclusive = true, chatExclusive = true)
     }
 
+    /**
+     * Callback for captured messages
+     *
+     * @param event the MessageReceivedEvent object
+     */
     override fun onMessageReceived(event: MessageReceivedEvent) {
         plugin.logDebug("Received message ${event.message.id} from Discord - ${event.message.rawContent}")
 
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/CommandListener.kt b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/CommandListener.kt
index 0deee23..ce806d9 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/CommandListener.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/CommandListener.kt
@@ -9,6 +9,11 @@ import org.bukkit.command.Command
 import org.bukkit.command.CommandExecutor
 import org.bukkit.command.CommandSender
 
+/**
+ * Listens for commands sent to the Minecraft server
+ *
+ * @param plugin a reference to the base Plugin object
+ */
 class CommandListener(val plugin: Plugin) : CommandExecutor {
 
     val controllerManager = BotControllerManager(plugin)
@@ -18,6 +23,15 @@ class CommandListener(val plugin: Plugin) : CommandExecutor {
         controllerManager.registerController(UtilCommandsController(plugin), minecraftExclusive = true)
     }
 
+    /**
+     * Callback for a captured command event
+     *
+     * @param sender the sender of the command
+     * @param command the command that was captured
+     * @param label no idea lol
+     * @param args an array of argument strings passed to the command
+     * @return whether the command "succeeded". this returns false, the default usage message will be sent to the sender
+     */
     override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array<out String>): Boolean {
         return controllerManager.dispatchMessage(MinecraftCommandWrapper(sender, command, args))
     }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/EventListener.kt b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/EventListener.kt
index 0a2cfb2..72c1c13 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/EventListener.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/EventListener.kt
@@ -21,8 +21,14 @@ import org.bukkit.event.player.AsyncPlayerChatEvent
 import org.bukkit.event.player.PlayerJoinEvent
 import org.bukkit.event.player.PlayerQuitEvent
 import org.dynmap.DynmapWebChatEvent
+import java.lang.reflect.Method
 import org.bukkit.ChatColor as CC
 
+/**
+ * Listens for the various event triggers passed through Bukkit
+ *
+ * @param plugin a reference to the base Plugin object
+ */
 class EventListener(val plugin: Plugin): Listener {
 
     val controllerManager = BotControllerManager(plugin)
@@ -32,6 +38,11 @@ class EventListener(val plugin: Plugin): Listener {
         controllerManager.registerController(UtilCommandsController(plugin), chatExclusive = true)
     }
 
+    /**
+     * Callback for when a chat event is received
+     *
+     * @param event the AsyncPlayerChatEvent
+     */
     @EventHandler(priority = EventPriority.MONITOR)
     fun onChat(event: AsyncPlayerChatEvent) {
         plugin.logDebug("Received a chat event from ${event.player.name}: ${event.message}")
@@ -40,6 +51,7 @@ class EventListener(val plugin: Plugin): Listener {
         if (event.player.hasMetadata("vanished") && event.player.getMetadata("vanished")[0].asBoolean() &&
                 !Config.IF_VANISHED_CHAT) return
 
+        // Emoticons!
         event.message = event.message.replace(":lenny:", "( \u0361\u00B0 \u035C\u0296 \u0361\u00B0)")
                 .replace(":tableflip:", "(\u256F\u00B0\u25A1\u00B0\uFF09\u256F\uFE35 \u253B\u2501\u253B")
                 .replace(":unflip:", "\u252C\u2500\u2500\u252C \u30CE( \u309C-\u309C\u30CE)")
@@ -64,53 +76,103 @@ class EventListener(val plugin: Plugin): Listener {
         plugin.logger.info("Seralized! (synchronous)")
     }
 
+    /**
+     * Callback for when a chat event is received from Dynmap, if a Dynmap is running
+     *
+     * @param event the DynmapWebChatEvent
+     */
     @EventHandler(priority = EventPriority.MONITOR)
     fun onDynmapCatEvent(event: DynmapWebChatEvent) {
         plugin.sendToDiscord(plugin.translateAliasesToDiscord(event.message.toDiscordChatMessage(event.name, "Dynmap")), Connection.getRelayChannel())
     }
 
+    /**
+     * Callback for when a player logs in to the server
+     *
+     * @param event the PlayerJoinEvent
+     */
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     fun onPlayerJoin(event: PlayerJoinEvent) {
         val player = event.player
         val username = event.player.name.stripColor()
+        var worldname = event.player.world.name
 
         plugin.logDebug("Received a join event for $username")
         if (!Config.MESSAGES_JOIN) return
         if (player.hasMetadata("vanished") && player.getMetadata("vanished")[0].asBoolean() &&
                 !Config.IF_VANISHED_JOIN) return
 
-        var formattedMessage = player.toDiscordPlayerJoin()
+        // Get world alias if Multiverse is installed
+        if (plugin.isMultiverseInstalled) {
+            val worldProperties = plugin.worlds!!.data.get("worlds.$worldname")
+            val cls = Class.forName("com.onarandombox.MultiverseCore.WorldProperties")
+            val meth: Method = cls.getMethod("getAlias")
+            val alias = meth.invoke(worldProperties)
+            if (alias is String) worldname = alias
+        }
+
+        var formattedMessage = player.toDiscordPlayerJoin(worldname)
         formattedMessage = plugin.translateAliasesToDiscord(formattedMessage)
         plugin.sendToDiscord(formattedMessage, Connection.getRelayChannel())
     }
 
+    /**
+     * Callback for when a player logs out of the server
+     *
+     * @param event the PlayerQuitEvent
+     */
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     fun onPlayerQuit(event: PlayerQuitEvent) {
         val player = event.player
         val username = event.player.name.stripColor()
+        var worldname = event.player.world.name
 
         plugin.logDebug("Received a leave event for $username")
         if (!Config.MESSAGES_LEAVE) return
         if (player.hasMetadata("vanished") && player.getMetadata("vanished")[0].asBoolean() &&
                 !Config.IF_VANISHED_LEAVE) return
 
-        var formattedMessage = player.toDiscordPlayerLeave()
+        // Get world alias if Multiverse is installed
+        if (plugin.isMultiverseInstalled) {
+            val worldProperties = plugin.worlds!!.data.get("worlds.$worldname")
+            val cls = Class.forName("com.onarandombox.MultiverseCore.WorldProperties")
+            val meth: Method = cls.getMethod("getAlias")
+            val alias = meth.invoke(worldProperties)
+            if (alias is String) worldname = alias
+        }
+
+        var formattedMessage = player.toDiscordPlayerLeave(worldname)
         formattedMessage = plugin.translateAliasesToDiscord(formattedMessage)
         plugin.sendToDiscord(formattedMessage, Connection.getRelayChannel())
     }
 
+    /**
+     * Callback for when a player dies
+     *
+     * @param event the PlayerDeathEvent
+     */
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     fun onPlayerDeath(event: PlayerDeathEvent) {
         val player = event.entity
         val username = event.entity.name.stripColor()
         val deathMessage = event.deathMessage
+        var worldname = event.entity.world.name
 
         plugin.logDebug("Received a death event for $username")
         if (!Config.MESSAGES_DEATH) return
         if (player.hasMetadata("vanished") && player.getMetadata("vanished")[0].asBoolean() &&
                 !Config.IF_VANISHED_DEATH) return
 
-        var formattedMessage = deathMessage.toDiscordPlayerDeath(username)
+        // Get world alias if Multiverse is installed
+        if (plugin.isMultiverseInstalled) {
+            val worldProperties = plugin.worlds!!.data.get("worlds.$worldname")
+            val cls = Class.forName("com.onarandombox.MultiverseCore.WorldProperties")
+            val meth: Method = cls.getMethod("getAlias")
+            val alias = meth.invoke(worldProperties)
+            if (alias is String) worldname = alias
+        }
+
+        var formattedMessage = deathMessage.toDiscordPlayerDeath(username, worldname)
         formattedMessage = plugin.translateAliasesToDiscord(formattedMessage)
         plugin.sendToDiscord(formattedMessage, Connection.getRelayChannel())
     }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/utils/MarkdownToMinecraftSeralizer.kt b/src/main/kotlin/gg/obsidian/discordbridge/utils/MarkdownToMinecraftSeralizer.kt
index 722277e..f56f1a7 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/utils/MarkdownToMinecraftSeralizer.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/utils/MarkdownToMinecraftSeralizer.kt
@@ -4,10 +4,20 @@ import org.parboiled.common.Preconditions
 import org.pegdown.Printer
 import org.pegdown.ast.*
 
+/**
+ * This class will descend the parse tree created by pegdown and convert basic Discord Markdown syntax into equivalent
+ * Minecraft formatting codes
+ */
 class MarkdownToMinecraftSeralizer : Visitor {
 
     private var printer = Printer()
 
+    /**
+     * Descends a parse tree and returns a formatted string
+     *
+     * @param astRoot = the root node of the parse tree
+     * @return a string formatted with Minecraft formatting symbols
+     */
     fun toMinecraft(astRoot: RootNode): String {
         Preconditions.checkArgNotNull<Any>(astRoot, "astRoot")
         astRoot.accept(this)
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/utils/Rating.kt b/src/main/kotlin/gg/obsidian/discordbridge/utils/Rating.kt
index f329f89..2c9dc98 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/utils/Rating.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/utils/Rating.kt
@@ -4,6 +4,13 @@ import org.bukkit.configuration.serialization.ConfigurationSerializable
 import org.bukkit.configuration.serialization.SerializableAs
 
 //TODO: Make null safe
+/**
+ * Represents a Rating entry in rate.yml
+ *
+ * @param message the rating message template
+ * @param low the lower bound of ratings that will trigger this message
+ * @param high the upper bound of ratings that will trigger this message
+ */
 @SerializableAs("Rating")
 data class Rating(val message: String = "%u - I rate %m %r", val low: Double = 0.0, val high: Double = 0.0): ConfigurationSerializable {
     @Suppress("unused")
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/utils/Respect.kt b/src/main/kotlin/gg/obsidian/discordbridge/utils/Respect.kt
index ed0a6e8..9313bb2 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/utils/Respect.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/utils/Respect.kt
@@ -4,6 +4,13 @@ import org.bukkit.configuration.serialization.ConfigurationSerializable
 import org.bukkit.configuration.serialization.SerializableAs
 
 //TODO: make null safe
+/**
+ * Represents a Respect entry in f.yml
+ *
+ * @param message the respects message template
+ * @param count the number of respects that will be paid
+ * @param weight the probability weight that this entry will be selected
+ */
 @SerializableAs("Respect")
 data class Respect(val message: String = "%u solemnly pays respect!", val count: Int = 1, val weight: Int = 1): ConfigurationSerializable {
     @Suppress("unused")
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/utils/Script.kt b/src/main/kotlin/gg/obsidian/discordbridge/utils/Script.kt
index 6406471..b46d7cb 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/utils/Script.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/utils/Script.kt
@@ -3,6 +3,17 @@ package gg.obsidian.discordbridge.utils
 import org.bukkit.configuration.serialization.ConfigurationSerializable
 import org.bukkit.configuration.serialization.SerializableAs
 
+/**
+ * Represents a Script entry in script.yml
+ *
+ * @param triggerMC the string that, if sent from Minecraft, will trigger this response
+ * @param triggerDis the string that, if sent from Discord, will trigger this response
+ * @param responseMC the response that will be broadcast to Minecraft if this script is triggered
+ * @param responseDis the response that will be broadcast to Discord if this script is triggered
+ * @param caseSensitive whether the trigger strings are case sensitive
+ * @param requiresMention whether the trigger strings can only be activated by @tag mentioning the bot
+ * @param startsWith whether the trigger strings only need to match the start of the string
+ */
 @SerializableAs("Script")
 data class Script(val triggerMC: String?, val triggerDis: String?, val responseMC: String?, val responseDis: String?,
                   val caseSensitive: Boolean?, val requiresMention: Boolean?,
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/utils/UserAlias.kt b/src/main/kotlin/gg/obsidian/discordbridge/utils/UserAlias.kt
index 8837eb4..8331546 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/utils/UserAlias.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/utils/UserAlias.kt
@@ -5,6 +5,12 @@ import org.bukkit.configuration.serialization.SerializableAs
 import java.util.*
 
 //TODO: make null safe
+/**
+ * Represents a UserAlias entry in usernames.yml
+ *
+ * @param mcUuid the UUID of the Minecraft account linked to this alias
+ * @param discordId the unique Discord ID of the Discord account linked to this alias
+ */
 @SerializableAs("UserAlias")
 data class UserAlias(val mcUuid: UUID, val discordId: String): ConfigurationSerializable {
     @Suppress("unused")
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/utils/UtilFunctions.kt b/src/main/kotlin/gg/obsidian/discordbridge/utils/UtilFunctions.kt
index b36d33c..ca4668c 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/utils/UtilFunctions.kt
+++ b/src/main/kotlin/gg/obsidian/discordbridge/utils/UtilFunctions.kt
@@ -4,39 +4,88 @@ import gg.obsidian.discordbridge.Config
 import org.bukkit.ChatColor
 import org.bukkit.entity.Player
 
+/**
+ * Various utility functions
+ */
 object UtilFunctions {
 
+    /**
+     * @return the input string with all whitespace removed
+     */
     @JvmStatic
     fun String.noSpace() = this.replace(Regex("""\s+"""), "")
 
+    /**
+     * @return the input string with any Minecraft formatting codes removed
+     */
     @JvmStatic
     fun String.stripColor(): String = ChatColor.stripColor(this)
 
+    /**
+     * Converts a string to the Minecraft chat message template defined in config.yml
+     *
+     * @param alias the name of the message author
+     * @return the formatted string
+     */
     @JvmStatic
     fun String.toMinecraftChatMessage(alias: String): String {
-        return formatMessage(Config.TEMPLATES_MINECRAFT_CHAT_MESSAGE, msg = this, u = alias)
+        return formatMessage(Config.TEMPLATES_MINECRAFT_CHAT_MESSAGE, msg = this, u = alias, w = "Discord")
     }
 
+    /**
+     * Converts a string to the Discord chat message template defined in config.yml
+     *
+     * @param username the username of the message author
+     * @param worldName the name of the world the author was in when the message was sent
+     * @return the formatted string
+     */
     @JvmStatic
     fun String.toDiscordChatMessage(username: String, worldName: String): String {
         return formatMessage(Config.TEMPLATES_DISCORD_CHAT_MESSAGE, msg = this, u = username, w = worldName)
     }
 
+    /**
+     * Converts a string to the Discord player join message template defined in config.yml
+     *
+     * @param worldName the name of the world where the player joined
+     * @return the formatted string
+     */
     @JvmStatic
-    fun Player.toDiscordPlayerJoin(): String {
-        return formatMessage(Config.TEMPLATES_DISCORD_PLAYER_JOIN, u = this.name.stripColor())
+    fun Player.toDiscordPlayerJoin(worldName: String): String {
+        return formatMessage(Config.TEMPLATES_DISCORD_PLAYER_JOIN, u = this.name.stripColor(), w = worldName)
     }
 
+    /**
+     * Converts a string to the Discord player leave message template defined in config.yml
+     *
+     * @param worldName the name of the world the player has left
+     * @return the formatted string
+     */
     @JvmStatic
-    fun Player.toDiscordPlayerLeave(): String {
-        return formatMessage(Config.TEMPLATES_DISCORD_PLAYER_LEAVE, u = this.name.stripColor())
+    fun Player.toDiscordPlayerLeave(worldName: String): String {
+        return formatMessage(Config.TEMPLATES_DISCORD_PLAYER_LEAVE, u = this.name.stripColor(), w = worldName)
     }
 
+    /**
+     * Converts a string to the Discord player death message template defined in config.yml
+     *
+     * @param username the name of the player that died
+     * @param worldName the world where the player died
+     * @return the formatted string
+     */
     @JvmStatic
-    fun String.toDiscordPlayerDeath(username: String): String {
-        return formatMessage(Config.TEMPLATES_DISCORD_CHAT_MESSAGE, msg = this, u = username)
+    fun String.toDiscordPlayerDeath(username: String, worldName: String): String {
+        return formatMessage(Config.TEMPLATES_DISCORD_CHAT_MESSAGE, msg = this, u = username, w = worldName)
     }
 
+    /**
+     * Performs all the replacements for the "to" conversion functions
+     *
+     * @param template the template string
+     * @param msg the raw message
+     * @param u the name of the author or target player
+     * @param w the world name
+     */
     @JvmStatic
     private fun formatMessage(template: String, msg: String = "N/A", u: String = "N/A", w: String = "N/A"): String {
         var out = org.bukkit.ChatColor.translateAlternateColorCodes('&', template)
diff --git a/todo b/todo
index 536245b..34b9406 100644
--- a/todo
+++ b/todo
@@ -1,8 +1,10 @@
-Attempt to add Minecraft in-chat formatting
-Unfuck !!help in Minecraft
-Consider making !!help and !!serverlist reply using embeds
+Things to fix:
+- Unfuck !!help in Minecraft
+- Make util data classes null safe
 
-markdown parser is sending selector symbols to Discord
-markdown parser is removing the square brackets from "[Discord]" when relaying Discord chat messages
+Things to try:
+- Consider making !!help and !!serverlist reply using embeds
 
-remove logging when done
\ No newline at end of file
+Things to add:
+- Fix image embeds
+- Admin commands
\ No newline at end of file