From 3d2628628e1d908947e7038715a54ff5fc0fad1a Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Sat, 30 Dec 2017 18:44:16 -0600
Subject: [PATCH 01/30] Break up project into core and wrapper modules

discordbridge-core: the core API module
discordbridge-bukkit: bukkit plugin wrapper

Project will build and plugin will load, but many things are still
very, very broken.

Discord relaying works flawlessly.

All relevant server events are captured and relayed.

Plugin can create and read configuration files, but keels over and
dies when attempting to write and read back user-defined objects.
Discord alias linking is useless without this feature.

Some commands like 8ball seem to be broken. This seems to be an
issue that affects the current master branch as well.
---
 build.gradle                                  | 107 ++--
 discordbridge-bukkit/build.gradle             |  48 ++
 .../discordbridge/DiscordBridgePlugin.kt      |  35 ++
 .../discordbridge}/DiscordCommandSender.kt    |   2 +-
 .../obsidian/discordbridge/EventListener.kt   |  54 ++
 .../discordbridge/wrappers/Command.kt         |  10 +
 .../discordbridge/wrappers/ConsoleSender.kt   |  26 +
 .../obsidian/discordbridge/wrappers/Player.kt |  31 ++
 .../discordbridge/wrappers/Scheduler.kt       |  12 +
 .../obsidian/discordbridge/wrappers/Server.kt |  52 ++
 .../obsidian/discordbridge/wrappers/World.kt  |  10 +
 .../src}/main/resources/plugin.yml            |   4 +-
 discordbridge-core/build.gradle               |  29 ++
 .../discordbridge/ConfigurationNode.kt        | 413 ++++++++++++++++
 .../obsidian/discordbridge/DiscordBridge.kt   | 465 ++++++++++++++++++
 .../obsidian/discordbridge/UserAliasConfig.kt |  43 ++
 .../commands/DiscordCommandSender.kt          |  84 ++++
 .../commands/DiscordMessageWrapper.kt         |   8 +-
 .../discordbridge/commands/IEventWrapper.kt   |  12 +-
 .../commands/MinecraftChatEventWrapper.kt     |  14 +-
 .../commands/MinecraftCommandWrapper.kt       |  14 +-
 .../commands/annotations/BotCommand.kt        |   0
 .../annotations/ChatExclusiveCommand.kt       |   0
 .../annotations/DiscordExclusiveCommand.kt    |   0
 .../annotations/MinecraftExclusiveCommand.kt  |   0
 .../commands/annotations/PrivateResponse.kt   |   0
 .../commands/annotations/TaggedResponse.kt    |   0
 .../controllers/BotControllerManager.kt       | 273 +++++-----
 .../controllers/FunCommandsController.kt      |  57 ++-
 .../commands/controllers}/IBotController.kt   |   2 +-
 .../controllers/UtilCommandsController.kt     |  95 ++--
 .../discordbridge/discord/Connection.kt       |  27 +-
 .../discordbridge/discord/Listener.kt         |  20 +-
 .../obsidian/discordbridge/util/ChatColor.kt  | 152 ++++++
 .../util}/MarkdownToMinecraftSeralizer.kt     |   2 +-
 .../gg/obsidian/discordbridge/util/Rating.kt  |  28 ++
 .../obsidian/discordbridge/util}/Respect.kt   |  12 +-
 .../gg/obsidian/discordbridge/util}/Script.kt |  21 +-
 .../obsidian/discordbridge/util/UserAlias.kt  |  20 +
 .../discordbridge/util}/UtilFunctions.kt      |  29 +-
 .../discordbridge/wrappers/ICommand.kt        |   5 +
 .../discordbridge/wrappers/ICommandSender.kt  |  10 +
 .../discordbridge/wrappers/IConsoleSender.kt  |   4 +
 .../discordbridge/wrappers/IPlayer.kt         |   6 +
 .../discordbridge/wrappers/IScheduler.kt      |   5 +
 .../discordbridge/wrappers/IServer.kt         |  29 ++
 .../obsidian/discordbridge/wrappers/IWorld.kt |   5 +
 .../src}/main/resources/8ball.yml             |   0
 .../src}/main/resources/config.yml            |   0
 .../src}/main/resources/f.yml                 |  30 +-
 .../src}/main/resources/insult.yml            |   0
 .../src}/main/resources/rate.yml              |  96 ++--
 .../src}/main/resources/script.yml            |  12 +-
 .../src}/main/resources/usernames.yml         |   0
 settings.gradle                               |   3 +
 .../gg/obsidian/discordbridge/Config.kt       |  87 ----
 .../discordbridge/DataConfigAccessor.kt       | 100 ----
 .../gg/obsidian/discordbridge/Plugin.kt       | 341 -------------
 .../obsidian/discordbridge/UserAliasConfig.kt |  46 --
 .../minecraft/CommandListener.kt              |  39 --
 .../discordbridge/minecraft/EventListener.kt  | 178 -------
 .../gg/obsidian/discordbridge/utils/Rating.kt |  24 -
 .../obsidian/discordbridge/utils/UserAlias.kt |  24 -
 63 files changed, 1977 insertions(+), 1278 deletions(-)
 create mode 100644 discordbridge-bukkit/build.gradle
 create mode 100644 discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
 rename {src/main/kotlin/gg/obsidian/discordbridge/commands => discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge}/DiscordCommandSender.kt (98%)
 create mode 100644 discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
 create mode 100644 discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Command.kt
 create mode 100644 discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ConsoleSender.kt
 create mode 100644 discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Player.kt
 create mode 100644 discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Scheduler.kt
 create mode 100644 discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
 create mode 100644 discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/World.kt
 rename {src => discordbridge-bukkit/src}/main/resources/plugin.yml (94%)
 create mode 100644 discordbridge-core/build.gradle
 create mode 100644 discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/ConfigurationNode.kt
 create mode 100644 discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
 create mode 100644 discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
 create mode 100644 discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordCommandSender.kt
 rename src/main/kotlin/gg/obsidian/discordbridge/commands/MessageWrapper.kt => discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordMessageWrapper.kt (83%)
 rename {src => discordbridge-core/src}/main/kotlin/gg/obsidian/discordbridge/commands/IEventWrapper.kt (73%)
 rename src/main/kotlin/gg/obsidian/discordbridge/commands/AsyncPlayerChatEventWrapper.kt => discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftChatEventWrapper.kt (78%)
 rename {src => discordbridge-core/src}/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt (80%)
 rename {src => discordbridge-core/src}/main/kotlin/gg/obsidian/discordbridge/commands/annotations/BotCommand.kt (100%)
 rename {src => discordbridge-core/src}/main/kotlin/gg/obsidian/discordbridge/commands/annotations/ChatExclusiveCommand.kt (100%)
 rename {src => discordbridge-core/src}/main/kotlin/gg/obsidian/discordbridge/commands/annotations/DiscordExclusiveCommand.kt (100%)
 rename {src => discordbridge-core/src}/main/kotlin/gg/obsidian/discordbridge/commands/annotations/MinecraftExclusiveCommand.kt (100%)
 rename {src => discordbridge-core/src}/main/kotlin/gg/obsidian/discordbridge/commands/annotations/PrivateResponse.kt (100%)
 rename {src => discordbridge-core/src}/main/kotlin/gg/obsidian/discordbridge/commands/annotations/TaggedResponse.kt (100%)
 rename {src => discordbridge-core/src}/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt (72%)
 rename {src => discordbridge-core/src}/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt (77%)
 rename {src/main/kotlin/gg/obsidian/discordbridge/commands => discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers}/IBotController.kt (82%)
 rename {src => discordbridge-core/src}/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt (73%)
 rename {src => discordbridge-core/src}/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt (79%)
 rename {src => discordbridge-core/src}/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt (60%)
 create mode 100644 discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/ChatColor.kt
 rename {src/main/kotlin/gg/obsidian/discordbridge/utils => discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util}/MarkdownToMinecraftSeralizer.kt (99%)
 create mode 100644 discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Rating.kt
 rename {src/main/kotlin/gg/obsidian/discordbridge/utils => discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util}/Respect.kt (52%)
 rename {src/main/kotlin/gg/obsidian/discordbridge/utils => discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util}/Script.kt (57%)
 create mode 100644 discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UserAlias.kt
 rename {src/main/kotlin/gg/obsidian/discordbridge/utils => discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util}/UtilFunctions.kt (60%)
 create mode 100644 discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ICommand.kt
 create mode 100644 discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ICommandSender.kt
 create mode 100644 discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IConsoleSender.kt
 create mode 100644 discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IPlayer.kt
 create mode 100644 discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IScheduler.kt
 create mode 100644 discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IServer.kt
 create mode 100644 discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IWorld.kt
 rename {src => discordbridge-core/src}/main/resources/8ball.yml (100%)
 rename {src => discordbridge-core/src}/main/resources/config.yml (100%)
 rename {src => discordbridge-core/src}/main/resources/f.yml (60%)
 rename {src => discordbridge-core/src}/main/resources/insult.yml (100%)
 rename {src => discordbridge-core/src}/main/resources/rate.yml (60%)
 rename {src => discordbridge-core/src}/main/resources/script.yml (84%)
 rename {src => discordbridge-core/src}/main/resources/usernames.yml (100%)
 delete mode 100644 src/main/kotlin/gg/obsidian/discordbridge/Config.kt
 delete mode 100644 src/main/kotlin/gg/obsidian/discordbridge/DataConfigAccessor.kt
 delete mode 100644 src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
 delete mode 100644 src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
 delete mode 100644 src/main/kotlin/gg/obsidian/discordbridge/minecraft/CommandListener.kt
 delete mode 100644 src/main/kotlin/gg/obsidian/discordbridge/minecraft/EventListener.kt
 delete mode 100644 src/main/kotlin/gg/obsidian/discordbridge/utils/Rating.kt
 delete mode 100644 src/main/kotlin/gg/obsidian/discordbridge/utils/UserAlias.kt

diff --git a/build.gradle b/build.gradle
index ce9bd56..4122ea6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,84 +11,65 @@ buildscript {
 
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.4'
     }
 }
 
-plugins {
-    id 'java'
-    id 'com.github.johnrengelman.shadow' version '1.2.4'
+allprojects {
+    group = 'gg.obsidian'
+    version = '3.1.0'
+    description = """Bridge chat between Minecraft and Discord"""
+    ext.url = 'https://github.com/the-obsidian/DiscordBridge'
 }
 
-apply plugin: 'kotlin'
-
-group = 'gg.obsidian'
-version = '3.1.0'
-description = """Bridge chat between Minecraft and Discord"""
-ext.url = 'https://github.com/the-obsidian/DiscordBridge'
+apply plugin: 'java'
 
 repositories {
     mavenCentral()
-    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' }
-
-    jcenter()
 }
 
 dependencies {
-    compile group: 'org.spigotmc', name: 'spigot-api', version: '1.12-R0.1-SNAPSHOT'
-    compile group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib', version: '1.1.3-2'
-    compile group: 'net.dv8tion', name: 'JDA', version: '3.3.1_286'
-    compile group: 'com.michaelwflaherty', name: 'cleverbotapi', version: '1.0.1'
-    compile group: 'org.pegdown', name:'pegdown', version: '1.6.0'
-    compile group: 'org.json', name: 'json', version: '20160810'
-
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    compile files('libraries/dynmap-api-2.5-SNAPSHOT.jar')
+    compile project('discordbridge-bukkit')
+    compile project('discordbridge-core')
 }
 
-compileKotlin {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-}
-
-processResources {
-    filter ReplaceTokens, tokens: [
-            'DESCRIPTION': project.property('description'),
-            'URL'        : project.property('url'),
-            'VERSION'    : project.property('version')
-    ]
+sourceSets {
+    main.java.srcDirs += 'src/main/kotlin'
 }
 
-//noinspection GroovyAssignabilityCheck
-build.finalizedBy(shadowJar)
-
-shadowJar {
-    relocate 'org.apache', 'shadow.apache'
-    relocate 'org.json', 'shadow.json'
-    classifier 'dist'
-    dependencies {
-        //noinspection GroovyAssignabilityCheck
-        exclude(dependency('org.spigotmc:.*:.*'))
+subprojects {
+    apply plugin: 'java'
+    apply plugin: 'kotlin'
+    apply plugin: 'com.github.johnrengelman.shadow'
+
+    processResources {
+        filter ReplaceTokens, tokens: [
+                'DESCRIPTION': project.property('description'),
+                'URL'        : project.property('url'),
+                'VERSION'    : project.property('version')
+        ]
     }
-    exclude '.cache'
-}
 
-task copyFinalJar(type: Copy) {
-    from "build/libs/${shadowJar.archiveName}"
-    into "build"
-    rename(
-            shadowJar.archiveName,
-            "${project.property('name')}-${project.property('version')}.jar"
-    )
-}
+    shadowJar {
+        dependencies {
+            include(dependency("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"))
+            include(dependency('net.dv8tion:JDA:3.3.1_286'))
+            include(dependency(group: 'org.yaml', name: 'snakeyaml', version: '1.19'))
+            include(dependency(group: 'org.pegdown', name:'pegdown', version: '1.6.0'))
+            include(dependency(group: 'commons-lang', name:'commons-lang', version: '2.3'))
+            include(dependency(group: 'com.michaelwflaherty', name: 'cleverbotapi', version: '1.0.1'))
+            include(dependency('org.parboiled:parboiled-core'))
+            include(dependency('org.parboiled:parboiled-java'))
+            include(dependency('org.ow2.asm:asm'))
+            include(dependency('org.ow2.asm:asm-analysis'))
+            include(dependency('org.ow2.asm:asm-tree'))
+            include(dependency('org.ow2.asm:asm-util'))
+            include(dependency('com.squareup.okhttp3:okhttp:'))
+            include(dependency('com.squareup.okio:okio'))
+            include(dependency('com.neovisionaries:nv-websocket-client'))
+            include(dependency('org.slf4j:slf4j-api'))
+            include(dependency('org.json:json'))
+        }
+    }
 
-shadowJar.finalizedBy(copyFinalJar)
-sourceSets {
-    main.java.srcDirs += 'src/main/kotlin'
-}
+}
\ No newline at end of file
diff --git a/discordbridge-bukkit/build.gradle b/discordbridge-bukkit/build.gradle
new file mode 100644
index 0000000..259f237
--- /dev/null
+++ b/discordbridge-bukkit/build.gradle
@@ -0,0 +1,48 @@
+apply plugin: 'kotlin'
+
+repositories {
+    mavenCentral()
+    maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
+    maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
+    maven { url 'https://github.com/DV8FromTheWorld/Maven-Repository/raw/master/repo' }
+    jcenter()
+}
+
+dependencies {
+    compile project(':discordbridge-core')
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    compile group: 'org.spigotmc', name: 'spigot-api', version: '1.12-R0.1-SNAPSHOT'
+
+    compile files('../libraries/dynmap-api-2.5-SNAPSHOT.jar')
+}
+
+sourceSets {
+    main.java.srcDirs += 'src/main/kotlin'
+}
+
+shadowJar {
+    dependencies {
+        include(project(':discordbridge-core'))
+        include(dependency("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"))
+    }
+}
+build.dependsOn(shadowJar)
+
+artifacts {
+    archives shadowJar
+}
+
+//
+//compileKotlin {
+//    kotlinOptions.jvmTarget = "1.8"
+//}
+//compileTestKotlin {
+//    kotlinOptions.jvmTarget = "1.8"
+//}
+//
+//shadowJar {
+//    dependencies {
+//        include(project(':discordbridge-core'))
+//    }
+//}
+//build.dependsOn(shadowJar)
\ No newline at end of file
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
new file mode 100644
index 0000000..e0fc1a1
--- /dev/null
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
@@ -0,0 +1,35 @@
+package gg.obsidian.discordbridge
+
+import gg.obsidian.discordbridge.wrappers.Server
+import org.bukkit.plugin.java.JavaPlugin
+
+/**
+ * The primary Plugin class that maintains the plugin's connection with Bukkit
+ */
+class DiscordBridgePlugin : JavaPlugin() {
+
+    private lateinit var core: DiscordBridge
+    private lateinit var instance: DiscordBridgePlugin
+
+    fun getPlugin() : DiscordBridgePlugin = instance
+
+    fun getCore() : DiscordBridge = core
+
+    override fun onEnable() {
+        instance = this
+        core = DiscordBridge(Server(this, this.server), dataFolder)
+        core.postInit()
+
+        server.pluginManager.registerEvents(EventListener(core), this)
+
+        getCommand("discord").executor = EventListener(core)
+        getCommand("f").executor = EventListener(core)
+        getCommand("rate").executor = EventListener(core)
+        getCommand("8ball").executor = EventListener(core)
+        getCommand("insult").executor = EventListener(core)
+        getCommand("choose").executor = EventListener(core)
+        getCommand("talk").executor = EventListener(core)
+        getCommand("roll").executor = EventListener(core)
+    }
+
+}
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordCommandSender.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordCommandSender.kt
similarity index 98%
rename from src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordCommandSender.kt
rename to discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordCommandSender.kt
index 8658bcf..2a2bea7 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordCommandSender.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordCommandSender.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.commands
+package gg.obsidian.discordbridge
 
 import net.dv8tion.jda.core.entities.MessageChannel
 import org.bukkit.Bukkit
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
new file mode 100644
index 0000000..da57a4c
--- /dev/null
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
@@ -0,0 +1,54 @@
+package gg.obsidian.discordbridge
+
+import gg.obsidian.discordbridge.wrappers.ConsoleSender
+import gg.obsidian.discordbridge.wrappers.Player
+import org.bukkit.Bukkit
+import org.bukkit.command.Command
+import org.bukkit.command.CommandExecutor
+import org.bukkit.command.CommandSender
+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.dynmap.DynmapWebChatEvent
+
+class EventListener(val db: DiscordBridge) : Listener, CommandExecutor {
+
+    override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array<out String>): Boolean {
+        return if (sender is org.bukkit.entity.Player) {
+            val wp = Player(sender)
+            db.handleCommand(wp, gg.obsidian.discordbridge.wrappers.Command(command), args)
+        } else {
+            db.handleCommand(ConsoleSender(db, Bukkit.getConsoleSender()), gg.obsidian.discordbridge.wrappers.Command(command), args)
+        }
+    }
+
+    @EventHandler
+    fun onChat(event: AsyncPlayerChatEvent) {
+        event.message = db.handlePlayerChat(Player(event.player), event.message, event.isCancelled)
+    }
+
+    @EventHandler
+    fun onPlayerJoin(event: PlayerJoinEvent) {
+        db.handlePlayerJoin(Player(event.player))
+    }
+
+    @EventHandler
+    fun onPlayerLeave(event: PlayerQuitEvent) {
+        db.handlePlayerQuit(Player(event.player))
+    }
+
+    @EventHandler
+    fun onPlayerDeath(event: PlayerDeathEvent) {
+        db.handlePlayerDeath(Player(event.entity.player), event.deathMessage)
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    fun onDynmapCatEvent(event: DynmapWebChatEvent) {
+        db.handleDynmapChat(event.name, event.message)
+    }
+
+}
\ No newline at end of file
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Command.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Command.kt
new file mode 100644
index 0000000..11fe0f2
--- /dev/null
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Command.kt
@@ -0,0 +1,10 @@
+package gg.obsidian.discordbridge.wrappers
+
+import org.bukkit.command.Command
+
+class Command(val cmd: Command) : ICommand {
+    override fun getName(): String {
+        return cmd.name
+    }
+
+}
\ No newline at end of file
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ConsoleSender.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ConsoleSender.kt
new file mode 100644
index 0000000..a356c20
--- /dev/null
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ConsoleSender.kt
@@ -0,0 +1,26 @@
+package gg.obsidian.discordbridge.wrappers
+
+import gg.obsidian.discordbridge.DiscordBridge
+import net.dv8tion.jda.core.entities.MessageChannel
+import org.bukkit.command.ConsoleCommandSender
+import java.util.*
+
+class ConsoleSender(val db: DiscordBridge, val bukkitConsoleSender: ConsoleCommandSender) : IConsoleSender {
+
+    override fun sendMessage(message: String) {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun hasPermission(permission: String): Boolean {
+        return bukkitConsoleSender.hasPermission(permission)
+    }
+
+    override fun getUUID(): UUID {
+        TODO("not implemented")
+    }
+
+    override fun getName(): String {
+        return "DiscordRemote"
+    }
+
+}
\ No newline at end of file
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Player.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Player.kt
new file mode 100644
index 0000000..c8ec073
--- /dev/null
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Player.kt
@@ -0,0 +1,31 @@
+package gg.obsidian.discordbridge.wrappers
+
+import org.bukkit.entity.Player
+import java.util.*
+
+class Player(val bukkitPlayer: Player) : IPlayer {
+    override fun hasPermission(permission: String): Boolean {
+        return bukkitPlayer.hasPermission(permission)
+    }
+
+    override fun getWorld(): IWorld {
+        return World(bukkitPlayer.world)
+    }
+
+    override fun isVanished(): Boolean {
+        return bukkitPlayer.hasMetadata("vanished") && bukkitPlayer.getMetadata("vanished")[0].asBoolean()
+    }
+
+    override fun getName(): String {
+        return bukkitPlayer.name
+    }
+
+    override fun sendMessage(message: String) {
+        bukkitPlayer.sendMessage(message)
+    }
+
+    override fun getUUID(): UUID {
+        return bukkitPlayer.uniqueId
+    }
+
+}
\ No newline at end of file
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Scheduler.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Scheduler.kt
new file mode 100644
index 0000000..42ccad4
--- /dev/null
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Scheduler.kt
@@ -0,0 +1,12 @@
+package gg.obsidian.discordbridge.wrappers
+
+import gg.obsidian.discordbridge.DiscordBridgePlugin
+import org.bukkit.scheduler.BukkitScheduler
+
+class Scheduler(val plugin: DiscordBridgePlugin, val bukkitScheduler: BukkitScheduler) : IScheduler {
+
+    override fun runAsyncTask(task: Runnable) {
+        bukkitScheduler.runTaskAsynchronously(plugin, task)
+    }
+
+}
\ No newline at end of file
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
new file mode 100644
index 0000000..40184f4
--- /dev/null
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
@@ -0,0 +1,52 @@
+package gg.obsidian.discordbridge.wrappers
+
+import gg.obsidian.discordbridge.DiscordBridgePlugin
+import gg.obsidian.discordbridge.DiscordCommandSender
+import net.dv8tion.jda.core.entities.MessageChannel
+import org.bukkit.Server
+import java.util.*
+import java.util.logging.Logger
+
+class Server(val plugin: DiscordBridgePlugin, val bukkitServer: Server) : IServer {
+    override fun getRemoteConsoleSender(): IConsoleSender {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun getScheduler(): IScheduler {
+        return Scheduler(plugin, bukkitServer.scheduler)
+    }
+
+    override fun getVersion(): String {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun getMinecraftShortVersion(): String {
+        return bukkitServer.bukkitVersion.split("-")[0]
+    }
+
+    override fun getPlayer(uuid: UUID): IPlayer {
+        return Player(bukkitServer.getPlayer(uuid))
+    }
+
+    override fun getPlayer(name: String): IPlayer {
+        return Player(bukkitServer.getPlayer(name))
+    }
+
+    override fun getOnlinePlayers(): List<IPlayer> {
+        return bukkitServer.onlinePlayers.map { Player(it) }
+    }
+
+    override fun broadcastMessage(message: String) {
+        bukkitServer.broadcastMessage(message)
+    }
+
+    override fun dispatchCommand(channel: MessageChannel, command: String) {
+        val sender = DiscordCommandSender(channel)
+        bukkitServer.dispatchCommand(sender, command)
+    }
+
+    override fun getLogger(): Logger {
+        return plugin.logger
+    }
+
+}
\ No newline at end of file
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/World.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/World.kt
new file mode 100644
index 0000000..a0d5935
--- /dev/null
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/World.kt
@@ -0,0 +1,10 @@
+package gg.obsidian.discordbridge.wrappers
+
+import org.bukkit.World
+
+class World(val bukkitWorld: World) : IWorld {
+    override fun getName(): String {
+        return "world"
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/resources/plugin.yml b/discordbridge-bukkit/src/main/resources/plugin.yml
similarity index 94%
rename from src/main/resources/plugin.yml
rename to discordbridge-bukkit/src/main/resources/plugin.yml
index 2e7bdbf..558a316 100644
--- a/src/main/resources/plugin.yml
+++ b/discordbridge-bukkit/src/main/resources/plugin.yml
@@ -8,7 +8,7 @@ website: '@URL@'
 loadbefore: [SpaceBukkit, RemoteToolkitPlugin]
 softdepend: [Multiverse-Core]
 
-main: gg.obsidian.discordbridge.Plugin
+main: gg.obsidian.discordbridge.DiscordBridgePlugin
 
 permissions:
   discordbridge.discord:
@@ -51,7 +51,7 @@ commands:
     usage: /8ball <question>
   discord:
     description: Issue a command to the bot
-    usage: /discord <reload|get|alias> [arguments]...
+    usage: <reload|linkalias|listmembers|unlinkalias> [args...]
   f:
     description: Press f to pay respects
     usage: /f
diff --git a/discordbridge-core/build.gradle b/discordbridge-core/build.gradle
new file mode 100644
index 0000000..af5efd9
--- /dev/null
+++ b/discordbridge-core/build.gradle
@@ -0,0 +1,29 @@
+apply plugin: 'kotlin'
+
+repositories {
+    mavenCentral()
+    maven { url 'https://github.com/DV8FromTheWorld/Maven-Repository/raw/master/repo' }
+    jcenter()
+}
+
+dependencies {
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    compile group: 'net.dv8tion', name: 'JDA', version: '3.3.1_286'
+    compile group: 'org.yaml', name: 'snakeyaml', version: '1.19'
+    compile group: 'org.pegdown', name:'pegdown', version: '1.6.0'
+    compile group: 'commons-lang', name:'commons-lang', version: '2.3'
+    compile group: 'com.michaelwflaherty', name: 'cleverbotapi', version: '1.0.1'
+}
+
+sourceSets {
+    main.java.srcDirs += 'src/main/kotlin'
+}
+
+build.dependsOn(shadowJar)
+//
+//compileKotlin {
+//    kotlinOptions.jvmTarget = "1.8"
+//}
+//compileTestKotlin {
+//    kotlinOptions.jvmTarget = "1.8"
+//}
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/ConfigurationNode.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/ConfigurationNode.kt
new file mode 100644
index 0000000..29e7691
--- /dev/null
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/ConfigurationNode.kt
@@ -0,0 +1,413 @@
+// Class borrowed from dynmap-core (https://github.com/webbukkit/DynmapCore/blob/master/src/main/java/org/dynmap/ConfigurationNode.java)
+
+package gg.obsidian.discordbridge
+
+import gg.obsidian.discordbridge.util.Rating
+import gg.obsidian.discordbridge.util.Respect
+import gg.obsidian.discordbridge.util.Script
+import gg.obsidian.discordbridge.util.UserAlias
+import java.io.File
+import java.io.FileInputStream
+import java.io.FileOutputStream
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStreamWriter
+import java.util.ArrayList
+import java.util.LinkedHashMap
+
+import org.yaml.snakeyaml.DumperOptions
+import org.yaml.snakeyaml.Yaml
+import org.yaml.snakeyaml.constructor.CustomClassLoaderConstructor
+import org.yaml.snakeyaml.constructor.SafeConstructor
+import org.yaml.snakeyaml.error.YAMLException
+import org.yaml.snakeyaml.introspector.Property
+import org.yaml.snakeyaml.nodes.CollectionNode
+import org.yaml.snakeyaml.nodes.MappingNode
+import org.yaml.snakeyaml.nodes.Node
+import org.yaml.snakeyaml.nodes.NodeTuple
+import org.yaml.snakeyaml.nodes.SequenceNode
+import org.yaml.snakeyaml.nodes.Tag
+import org.yaml.snakeyaml.reader.UnicodeReader
+import org.yaml.snakeyaml.representer.Represent
+import org.yaml.snakeyaml.representer.Representer
+
+class ConfigurationNode() : MutableMap<String, Any> {
+    var entries2: MutableMap<String, Any>? = null
+    private var f: File? = null
+    private var yaml: Yaml? = null
+
+    init {
+        entries2 = LinkedHashMap()
+    }
+
+    private fun initparse() {
+        if(yaml == null) {
+            val options = DumperOptions()
+
+            options.indent = 4
+            options.defaultFlowStyle = DumperOptions.FlowStyle.BLOCK
+            options.isPrettyFlow = true
+
+            val representer = EmptyNullRepresenter()
+//            representer.addClassTag(Rating::class.java, Tag("!!Rating"))
+//            representer.addClassTag(Respect::class.java, Tag("!!Respect"))
+//            representer.addClassTag(Script::class.java, Tag("!!Script"))
+//            representer.addClassTag(UserAlias::class.java, Tag("!!UserAlias"))
+
+            //yaml = Yaml(SafeConstructor(), representer, options)
+            yaml = Yaml(CustomClassLoaderConstructor(DiscordBridge::class.java.classLoader), representer, options)
+        }
+    }
+
+    constructor(f: File): this() {
+        this.f = f
+    }
+
+    constructor(map: MutableMap<String, Any>): this() {
+        if (map == null) {
+            throw IllegalArgumentException()
+        }
+        entries2 = map
+    }
+
+    constructor(input: InputStream): this() {
+        load(input)
+    }
+
+    @SuppressWarnings("unchecked")
+    fun load(input: InputStream): Boolean {
+        initparse()
+
+        val o: Any = yaml!!.load(UnicodeReader(input))
+        if(o is MutableMap<*, *>)
+            entries2 = o as MutableMap<String, Any>
+        return (entries2 != null)
+    }
+
+    @SuppressWarnings("unchecked")
+    fun load(): Boolean {
+        initparse()
+
+        var fis: FileInputStream? = null
+        try {
+            fis = FileInputStream(f)
+            val o: Any? = yaml!!.load(UnicodeReader(fis))
+            if((o != null) && (o is MutableMap<*, *>))
+                entries2 = o as MutableMap<String, Any>
+            fis.close()
+        }
+        catch (e: YAMLException) {
+            //Log.severe("Error parsing " + f.path + ". Use http://yamllint.com to debug the YAML syntax." )
+            throw e
+        } catch(iox: IOException) {
+            //Log.severe("Error reading " + f.path)
+            return false
+        } finally {
+            if(fis != null) {
+                try { fis.close(); } catch (x: IOException) {}
+            }
+        }
+        return (entries2 != null)
+    }
+
+    fun save(): Boolean {
+        return save(f)
+    }
+
+    fun save(file: File?): Boolean {
+        initparse()
+
+        var stream: FileOutputStream? = null
+
+        file?.parentFile?.mkdirs()
+
+        try {
+            stream = FileOutputStream(file)
+            val writer = OutputStreamWriter(stream, "UTF-8")
+            yaml!!.dump(entries2, writer)
+            return true
+        } catch (e: IOException) {
+        } finally {
+            try {
+                if (stream != null) {
+                    stream.close()
+                }
+            } catch (e: IOException) {
+            }
+        }
+        return false
+    }
+
+    @SuppressWarnings("unchecked")
+    fun getObject(path: String): Any? {
+        if (path.isEmpty())
+            return entries2
+        val separator = path.indexOf('.')
+        if (separator < 0)
+            return get(path)
+        val localKey = path.substring(0, separator)
+        val subvalue = (get(localKey) ?: return null) as? MutableMap<*, *> ?: return null
+        val submap: MutableMap<String, Any>
+        try {
+            submap = subvalue as MutableMap<String, Any>
+        } catch (e: ClassCastException) {
+            return null
+        }
+
+        val subpath = path.substring(separator + 1)
+        val ret = ConfigurationNode(submap).getObject(subpath)
+        return ret
+    }
+
+    fun getObject(path: String, default: Any): Any {
+        return getObject(path) ?: return default
+    }
+
+    @SuppressWarnings("unchecked")
+    fun <T> getGeneric(path: String, default: T): T {
+        val o = getObject(path, default as Any)
+        return try {
+            o as T
+        } catch(e: ClassCastException) {
+            default
+        }
+    }
+
+    fun getInteger(path: String, default: Int): Int {
+        return Integer.parseInt(getObject(path, default).toString())
+    }
+
+    fun getLong(path: String, default: Long): Double {
+        return getObject(path, default).toString().toLong().toDouble()
+    }
+
+    fun getFloat(path: String, default: Float): Float {
+        return getObject(path, default).toString().toFloat()
+    }
+
+    fun getDouble(path: String, default: Double): Double {
+        return getObject(path, default).toString().toDouble()
+    }
+
+    fun getBoolean(path: String, default: Boolean): Boolean {
+        return getObject(path, default).toString().toBoolean()
+    }
+
+    fun getString(path: String): String? {
+        val o = getObject(path)
+        return o.toString()
+    }
+
+    fun getStrings(path: String, default: List<String>): List<String> {
+        val o = getObject(path) as? List<*> ?: return default
+        return o.mapTo(ArrayList()) { it.toString() }
+    }
+
+    fun getString(path: String, default: String): String {
+        val o = getObject(path, default)
+        return o.toString()
+    }
+
+    @SuppressWarnings("unchecked")
+    fun <T> getList(path: String): List<T> {
+        try {
+            val list = getObject(path) as List<T>
+            return list
+        } catch (e: ClassCastException) {
+            try {
+                val o = getObject(path) as T ?: return ArrayList()
+                val al = ArrayList<T>()
+                al.add(o)
+                return al
+            } catch (e2: ClassCastException) {
+                return ArrayList()
+            }
+        }
+    }
+
+    fun getMapList(path: String): List<MutableMap<String, Any>> {
+        return getList(path)
+    }
+
+    fun getNode(path: String): ConfigurationNode? {
+        var v: MutableMap<String, Any>? = null
+        v = getGeneric(path, v)
+        if (v == null)
+            return null
+        return ConfigurationNode(v)
+    }
+
+    @SuppressWarnings("unchecked")
+    fun getNodes(path: String): List<ConfigurationNode> {
+        val o: List<Any> = getList(path)
+
+        val nodes = ArrayList<ConfigurationNode>()
+        for(i in o) {
+            if (i is MutableMap<*, *>) {
+                var map: MutableMap<String, Any>
+                try {
+                    map = i as MutableMap<String, Any>
+                } catch(e: ClassCastException) {
+                    continue
+                }
+                nodes.add(ConfigurationNode(map))
+            }
+        }
+        return nodes
+    }
+
+    fun extend(other: MutableMap<String, Any>) {
+        if (other != null)
+            extendMap(this, other)
+    }
+
+    companion object {
+        private fun copyValue(v: Any): Any {
+            when (v) {
+                is MutableMap<*, *> -> {
+                    //@SuppressWarnings("unchecked")
+                    val mv = v as MutableMap<String, Any>
+                    val newv = LinkedHashMap<String,Any>()
+                    for(me in mv.entries) {
+                        newv.put(me.key, copyValue(me.value))
+                    }
+                    return newv
+                }
+                is List<*> -> {
+                    @SuppressWarnings("unchecked")
+                    val lv = v as List<Any>
+                    return lv.indices.mapTo(ArrayList()) { copyValue(lv[it]) }
+                }
+                else -> return v
+            }
+        }
+
+        private fun extendMap(left: MutableMap<String, Any>, right: MutableMap<String, Any>) {
+            val original = ConfigurationNode(left)
+            for(entry in right.entries) {
+                val key = entry.key
+                val value = entry.value
+                original.put(key, copyValue(value))
+            }
+        }
+    }
+
+    fun <T> createInstance(constructorParameters: Array<Class<*>>, constructorArguments: Array<Any>): T? {
+        val typeName = getString("class")
+        try {
+            val mapTypeClass = Class.forName(typeName)
+
+            val constructorParameterWithConfiguration = arrayOfNulls<Class<*>>(constructorParameters.size+1)
+            for(i in constructorParameters.indices) { constructorParameterWithConfiguration[i] = constructorParameters[i]; }
+            constructorParameterWithConfiguration[constructorParameterWithConfiguration.size-1] = javaClass
+
+            val constructorArgumentsWithConfiguration = arrayOfNulls<Any>(constructorArguments.size+1)
+            for(i in constructorArguments.indices) { constructorArgumentsWithConfiguration[i] = constructorArguments[i]; }
+            constructorArgumentsWithConfiguration[constructorArgumentsWithConfiguration.size-1] = this
+            val constructor = mapTypeClass.getConstructor(*constructorParameterWithConfiguration)
+            @SuppressWarnings("unchecked")
+            val t = constructor.newInstance(constructorArgumentsWithConfiguration) as T
+            return t
+        } catch (e: Exception) {
+            // TODO: Remove reference to MapManager.
+            //Log.severe("Error loading maptype", e)
+            e.printStackTrace()
+        }
+        return null
+    }
+
+    fun <T> createInstances(path: String, constructorParameters: Array<Class<*>>, constructorArguments: Array<Any>): List<T> {
+        val nodes = getNodes(path)
+        val instances = ArrayList<T>()
+        for(node in nodes) {
+            val instance = node.createInstance<T>(constructorParameters, constructorArguments)
+            if (instance != null) instances.add(instance)
+        }
+        return instances
+    }
+
+    override val size: Int get() {
+        return entries2!!.size
+    }
+
+    override fun isEmpty(): Boolean {
+        return entries2!!.isEmpty()
+    }
+
+    override fun containsKey(key: String): Boolean {
+        return entries2!!.containsKey(key)
+    }
+
+    override fun containsValue(value: Any): Boolean {
+        return entries2!!.containsValue(value)
+    }
+
+    override fun get(key: String): Any? {
+        return entries2!![key]
+    }
+
+    override fun put(key: String, value: Any): Any? {
+        return entries2!!.put(key, value)
+    }
+
+    override fun remove(key: String): Any? {
+        return entries2!!.remove(key)
+    }
+
+    override fun putAll(from: Map<out String, Any>) {
+        entries2!!.putAll(from)
+    }
+
+    override fun clear() {
+        entries2!!.clear()
+    }
+
+    override val keys: MutableSet<String> get() {
+        return entries2!!.keys
+    }
+
+    override val values: MutableCollection<Any> get() {
+        return entries2!!.values
+    }
+
+    override val entries: MutableSet<MutableMap.MutableEntry<String, Any>> get() {
+        return entries2!!.entries
+    }
+
+    private class EmptyNullRepresenter : Representer() {
+
+        init {
+            this.nullRepresenter = EmptyRepresentNull()
+        }
+
+        private inner class EmptyRepresentNull : Represent {
+            override fun representData(data: Any): Node {
+                return representScalar(Tag.NULL, "") // Changed "null" to "" so as to avoid writing nulls
+            }
+        }
+
+        // Code borrowed from snakeyaml (http://code.google.com/p/snakeyaml/source/browse/src/test/java/org/yaml/snakeyaml/issues/issue60/SkipBeanTest.java)
+        override fun representJavaBeanProperty(javaBean: Any, property: Property, propertyValue: Any, customTag: Tag): NodeTuple? {
+            val tuple = super.representJavaBeanProperty(javaBean, property, propertyValue, customTag)
+            val valueNode = tuple.valueNode
+            if (valueNode is CollectionNode<*>) {
+                // Removed null check
+                if (Tag.SEQ == valueNode.getTag()) {
+                    val seq = valueNode as SequenceNode
+                    if (seq.value.isEmpty()) {
+                        return null // skip empty lists
+                    }
+                }
+                if (Tag.MAP == valueNode.getTag()) {
+                    val seq = valueNode as MappingNode
+                    if (seq.value.isEmpty()) {
+                        return null // skip empty maps
+                    }
+                }
+            }
+            return tuple
+        }
+        // End of borrowed code
+    }
+
+}
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
new file mode 100644
index 0000000..e2d83cf
--- /dev/null
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
@@ -0,0 +1,465 @@
+package gg.obsidian.discordbridge
+
+import gg.obsidian.discordbridge.commands.MinecraftChatEventWrapper
+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 gg.obsidian.discordbridge.discord.Connection
+import gg.obsidian.discordbridge.util.MarkdownToMinecraftSeralizer
+import gg.obsidian.discordbridge.util.Respect
+import gg.obsidian.discordbridge.util.UserAlias
+import gg.obsidian.discordbridge.wrappers.IServer
+import gg.obsidian.discordbridge.util.ChatColor as CC
+import gg.obsidian.discordbridge.util.UtilFunctions.noSpace
+import gg.obsidian.discordbridge.util.UtilFunctions.toDiscordChatMessage
+import gg.obsidian.discordbridge.util.UtilFunctions.toDiscordPlayerJoin
+import gg.obsidian.discordbridge.util.UtilFunctions.toDiscordPlayerLeave
+import gg.obsidian.discordbridge.util.UtilFunctions.toDiscordPlayerDeath
+import gg.obsidian.discordbridge.wrappers.ICommand
+import gg.obsidian.discordbridge.wrappers.ICommandSender
+import gg.obsidian.discordbridge.wrappers.IPlayer
+import net.dv8tion.jda.core.OnlineStatus
+import net.dv8tion.jda.core.entities.Member
+import net.dv8tion.jda.core.entities.MessageChannel
+import org.pegdown.PegDownProcessor
+import java.io.File
+import java.util.logging.Logger
+import java.io.IOException
+import java.io.FileOutputStream
+
+class DiscordBridge(private val server: IServer, private val dataFolder: File) {
+
+    private val config: ConfigurationNode
+    private val users: ConfigurationNode
+    private val scripts: ConfigurationNode
+    private val eightball: ConfigurationNode
+    private val f: ConfigurationNode
+    private val rate: ConfigurationNode
+    private val insult: ConfigurationNode
+    private val pegDownProc = PegDownProcessor()
+    private val minecraftChatControllerManager = BotControllerManager(this)
+    private val discordChatControllerManager = BotControllerManager(this)
+    private val minecraftCommandControllerManager = BotControllerManager(this)
+
+    // Temporary storage for alias linking requests
+    var requests: MutableList<UserAlias> = mutableListOf()
+
+    val logger: Logger = server.getLogger()
+
+    init {
+        Connection.db  = this //TODO: enforce this better
+        server.getScheduler().runAsyncTask(Connection)
+
+        if (!dataFolder.exists()) dataFolder.mkdirs()
+
+        val cf = File(dataFolder, "config.yml")
+        if (!createDefaultFileFromResource("/config.yml", cf)) {logger.severe("Could not create default for config.yml")} //return false
+        val uaf = File(dataFolder, "usernames.yml")
+        if (!createDefaultFileFromResource("/usernames.yml", uaf)) {logger.severe("Could not create default for usernamess.yml")} // return false
+        val sf = File(dataFolder, "script.yml")
+        if (!createDefaultFileFromResource("/script.yml", sf)) {logger.severe("Could not create default for script.yml")} // return false
+        val ebf = File(dataFolder, "8ball.yml")
+        if (!createDefaultFileFromResource("/8ball.yml", ebf)) {logger.severe("Could not create default for 8ball.yml")} //return false
+        val ff = File(dataFolder, "f.yml")
+        if (!createDefaultFileFromResource("/f.yml", ff)) {logger.severe("Could not create default for f.yml")} // return false
+        val rf = File(dataFolder, "rate.yml")
+        if (!createDefaultFileFromResource("/rate.yml", rf)) {logger.severe("Could not create default for rate.yml")} // return false
+        val inf = File(dataFolder, "insult.yml")
+        if (!createDefaultFileFromResource("/insult.yml", inf)) {logger.severe("Could not create default for insult.yml")} // return false
+
+        config = ConfigurationNode(cf)
+        users = ConfigurationNode(uaf)
+        scripts = ConfigurationNode(sf)
+        eightball = ConfigurationNode(ebf)
+        f = ConfigurationNode(ff)
+        rate = ConfigurationNode(rf)
+        insult = ConfigurationNode(inf)
+
+        minecraftChatControllerManager.registerController(FunCommandsController(this), chatExclusive = true)
+        minecraftChatControllerManager.registerController(UtilCommandsController(this), chatExclusive = true)
+        minecraftCommandControllerManager.registerController(FunCommandsController(this), minecraftExclusive = true)
+        minecraftCommandControllerManager.registerController(UtilCommandsController(this), minecraftExclusive = true)
+        discordChatControllerManager.registerController(FunCommandsController(this), discordExclusive = true, chatExclusive = true)
+        discordChatControllerManager.registerController(UtilCommandsController(this), discordExclusive = true, chatExclusive = true)
+    }
+
+    fun postInit() {
+        config.load()
+        users.load()
+        scripts.load()
+        eightball.load()
+        f.load()
+        rate.load()
+        insult.load()
+    }
+
+    fun logDebug(msg: String) {
+        if (!getConfig().getBoolean("debug", false)) return
+        logger.info("[DiscordBridge] $msg")
+    }
+
+    fun getServer(): IServer = server
+    fun getPegDownProcessor(): PegDownProcessor = pegDownProc
+
+    fun getConfig(): ConfigurationNode = config
+    fun getUsersConfig(): ConfigurationNode = users
+    fun getScriptsConfig(): ConfigurationNode = scripts
+    fun getEightBallConfig(): ConfigurationNode = eightball
+    fun getFConfig(): ConfigurationNode = f
+    fun getRateConfig(): ConfigurationNode = rate
+    fun getInsultConfig(): ConfigurationNode = insult
+
+    // Borrowed code from dynmap-core
+    /* Uses resource to create default file, if file does not yet exist */
+    private fun createDefaultFileFromResource(resourcename: String, deffile: File): Boolean {
+        if (deffile.canRead()) return true
+        //TODO: This is initialized before the config that controls the debug logger is!
+        logger.info(deffile.path + " not found - creating default")
+        //logger.info(deffile.path + " not found - creating default")
+        val inputStream = javaClass.getResourceAsStream(resourcename)
+        if (inputStream == null) {
+            logger.severe("Unable to find default resource - " + resourcename)
+            return false
+        } else {
+            var fos: FileOutputStream? = null
+            try {
+                fos = FileOutputStream(deffile)
+                while (inputStream.copyTo(fos, 512) > 0) { }
+            } catch (iox: IOException) {
+                logger.severe("ERROR creating default for " + deffile.path)
+                return false
+            } finally {
+                if (fos != null)
+                    try { fos.close() }
+                    catch (iox: IOException) { }
+
+                try { inputStream.close() }
+                catch (iox: IOException) { }
+
+            }
+            return true
+        }
+    }
+
+    /*======================================
+      Messaging Functions
+    ===================================== */
+
+    /**
+     * 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)
+    }
+
+    /**
+     * Broadcast a message on the Minecraft server
+     *
+     * @param message the message to send
+     */
+    fun sendToMinecraft(message: String) {
+        server.broadcastMessage(message)
+    }
+
+
+    fun reload(callback: Runnable) {
+        config.load()
+        users.load()
+        eightball.load()
+        insult.load()
+        f.load()
+        rate.load()
+        scripts.load()
+        //if (isMultiverseInstalled) worlds!!.reloadConfig()
+        UserAliasConfig.load(this)
+        Connection.reconnect(callback)
+    }
+
+    /**
+     * @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.getOnlinePlayers().toTypedArray()
+        players.mapTo(names) { it.getName() }
+        return names.toList()
+    }
+
+    /**
+     * 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: IPlayer, discriminator: String): Member? {
+        val users = Connection.listUsers()
+        val found: Member = users.find { it.user.name + "#" + it.user.discriminator == discriminator } ?: return null
+
+        val ua = UserAlias(player.getUUID(), found.user.id)
+        requests.add(ua)
+        val msg = "Minecraft user '${server.getPlayer(ua.mcUuid).getName()}' 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'."
+        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 getDiscordMembersAll(): String {
+        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."
+
+        var response = "${CC.YELLOW}Discord users:"
+        for (user in users) {
+            response += if (user.user.isBot) "\n${CC.GOLD}- ${user.effectiveName} (Bot) | ${user.user.name}#${user.user.discriminator}${CC.RESET}"
+            else "\n${CC.YELLOW}- ${user.effectiveName} | ${user.user.name}#${user.user.discriminator}${CC.RESET}"
+        }
+        return response.trim()
+    }
+
+    /**
+     * @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())
+            return "${CC.YELLOW}No Discord members could be found. Either server is empty or an error has occurred."
+
+        var response = ""
+        if (onlineUsers.any { it.onlineStatus == OnlineStatus.ONLINE }) {
+            response += "\n${CC.DARK_GREEN}Online:${CC.RESET}"
+            for (user in onlineUsers.filter { it.onlineStatus == OnlineStatus.ONLINE }) {
+                response += if (user.user.isBot) "\n${CC.DARK_GREEN}- ${user.effectiveName} (Bot)${CC.RESET}"
+                else "\n${CC.DARK_GREEN}- ${user.effectiveName}${CC.RESET}"
+            }
+        }
+        if (onlineUsers.any { it.onlineStatus == OnlineStatus.IDLE }) {
+            response += "\n${CC.YELLOW}Idle:${CC.RESET}"
+            for (user in onlineUsers.filter { it.onlineStatus == OnlineStatus.IDLE }) {
+                response += if (user.user.isBot) "\n${CC.YELLOW}- ${user.effectiveName} (Bot)${CC.RESET}"
+                else "\n${CC.YELLOW}- ${user.effectiveName}${CC.RESET}"
+            }
+        }
+        if (onlineUsers.any { it.onlineStatus == OnlineStatus.DO_NOT_DISTURB }) {
+            response += "\n${CC.RED}Do Not Disturb:${CC.RESET}"
+            for (user in onlineUsers.filter { it.onlineStatus == OnlineStatus.DO_NOT_DISTURB }) {
+                response += if (user.user.isBot) "\n${CC.RED}- ${user.effectiveName} (Bot)${CC.RESET}"
+                else "\n${CC.RED}- ${user.effectiveName}${CC.RESET}"
+            }
+        }
+
+        response.replaceFirst("\n", "")
+        return response.trim()
+    }
+
+    /*======================================
+      Message Formatting Functions
+    ===================================== */
+
+    /**
+     * 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
+
+        val discordusers = Connection.listUsers()
+        val discordaliases: MutableList<Pair<String, Member>> = mutableListOf()
+
+        for (du in discordusers)
+            for ((mcUuid, discordId) in UserAliasConfig.aliases)
+                if (discordId == du.user.id) discordaliases.add(Pair(server.getPlayer(mcUuid).getName(), 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)
+
+            val found2: Pair<String, Member>? = discordaliases.firstOrNull {
+                it.first.toLowerCase() == match.groupValues[1].toLowerCase()
+            }
+            if (found2 != null) newMessage = newMessage.replaceFirst("@${match.groupValues[1]}", found2.second.asMention)
+        }
+
+        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)) {
+            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 modifiedMessage
+    }
+
+    /**
+     * 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) {
+            val nameMC = server.getPlayer(mcUuid).getName()
+            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)
+        }
+        return modifiedMessage
+    }
+
+    /**
+     * 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) {
+            val nameMC = server.getPlayer(mcUuid).getName()
+            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
+    }
+
+    fun handlePlayerChat(player: IPlayer, message: String, isCancelled: Boolean): String {
+        // TODO: the order of these if statements may produce undesired behavior
+        logDebug("Received a chat event from ${player.getName()}: $message")
+        if (!getConfig().getBoolean("messages.chat", true)) return message
+        if (isCancelled && !getConfig().getBoolean("relay-cancelled-messages", true)) return message
+        if (player.isVanished() && !getConfig().getBoolean("if-vanished.chat", false)) return message
+
+        // Emoticons!
+        var newMessage = 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")
+
+        //val wrapper = MinecraftChatEventWrapper(AsyncPlayerChatEvent(true, event.player, event.message, event.recipients))
+        server.getScheduler().runAsyncTask(Runnable { minecraftChatControllerManager.dispatchMessage(MinecraftChatEventWrapper(player, newMessage)) })
+
+        newMessage = MarkdownToMinecraftSeralizer().toMinecraft(pegDownProc.parseMarkdown(newMessage.toCharArray()))
+        return newMessage
+    }
+
+    fun handlePlayerJoin(player: IPlayer) {
+        val username = player.getName()
+        val worldname = player.getWorld().getName()
+        logDebug("Received a join event for $username")
+        if (!getConfig().getBoolean("messages.join", true)) return
+        if (player.isVanished() && !getConfig().getBoolean("if-vanished.join", false)) 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
+//        }
+
+        var formattedMessage = player.toDiscordPlayerJoin(this, worldname)
+        formattedMessage = translateAliasesToDiscord(formattedMessage)
+        sendToDiscord(formattedMessage, Connection.getRelayChannel())
+    }
+
+    fun handlePlayerQuit(player: IPlayer) {
+        val username = player.getName()
+        val worldname = player.getWorld().getName()
+        logDebug("Received a leave event for $username")
+        if (!getConfig().getBoolean("messages.leave", true)) return
+        if (player.isVanished() && !getConfig().getBoolean("if-vanished.leave", false)) 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
+//        }
+
+        var formattedMessage = player.toDiscordPlayerLeave(this, worldname)
+        formattedMessage = translateAliasesToDiscord(formattedMessage)
+        sendToDiscord(formattedMessage, Connection.getRelayChannel())
+    }
+
+    fun handlePlayerDeath(player: IPlayer, deathMessage: String) {
+        val username = player.getName()
+        val worldname = player.getWorld().getName()
+
+        logDebug("Received a death event for $username")
+        if (!getConfig().getBoolean("messages.death", false)) return
+        if (player.isVanished() && !getConfig().getBoolean("if-vanished.death", false)) 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
+//        }
+
+        var formattedMessage = deathMessage.toDiscordPlayerDeath(this, username, worldname)
+        formattedMessage = translateAliasesToDiscord(formattedMessage)
+        sendToDiscord(formattedMessage, Connection.getRelayChannel())
+    }
+
+    fun handleDynmapChat(name: String, message: String) {
+        sendToDiscord(translateAliasesToDiscord(message.toDiscordChatMessage(this, name, "Dynmap")), Connection.getRelayChannel())
+    }
+
+    fun handleCommand(sender: ICommandSender, command: ICommand, args: Array<out String>): Boolean {
+        return minecraftCommandControllerManager.dispatchMessage(MinecraftCommandWrapper(sender, command, args))
+    }
+
+}
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
new file mode 100644
index 0000000..310aeac
--- /dev/null
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
@@ -0,0 +1,43 @@
+package gg.obsidian.discordbridge
+
+import gg.obsidian.discordbridge.util.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(db: DiscordBridge) {
+        val list = db.getUsersConfig().getList<HashMap<String, Any>>("aliases")
+        aliases = list.castTo({UserAlias(it)}) ?:
+                throw IllegalStateException("usernames.yml could not be read - list items are not properly formatted")
+    }
+
+    /**
+     * Adds a new alias to the list and saves the updated list to file
+     */
+    fun add(db: DiscordBridge, ua: UserAlias) {
+        aliases = aliases.plus(ua)
+        db.getUsersConfig().put("aliases", aliases)
+        db.getUsersConfig().save()
+        db.getUsersConfig().load()
+    }
+
+    /**
+     * Removes an alias from the list and saves the updated list to file
+     */
+    fun remove(db: DiscordBridge, ua: UserAlias) {
+        aliases = aliases.minus(ua)
+        db.getUsersConfig().put("aliases", aliases)
+        db.getUsersConfig().save()
+        db.getUsersConfig().load()
+    }
+
+    private inline fun <reified T : Any> List<HashMap<String, Any>>.castTo(factory: (HashMap<String, Any>) -> T): List<T> {
+        return this.mapTo(mutableListOf()) { factory(it) }.toList()
+    }
+}
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordCommandSender.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordCommandSender.kt
new file mode 100644
index 0000000..0d7074c
--- /dev/null
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordCommandSender.kt
@@ -0,0 +1,84 @@
+package gg.obsidian.discordbridge.commands
+
+import gg.obsidian.discordbridge.wrappers.IConsoleSender
+import net.dv8tion.jda.core.entities.MessageChannel
+
+class DiscordCommandSender(val sender: IConsoleSender, val channel: MessageChannel) {
+
+    //private val sender:ConsoleCommandSender = Bukkit.getServer().consoleSender
+
+    init {
+
+    }
+
+    fun sendMessage(message: String?) {
+        channel.sendMessage(message).queue()
+    }
+
+    fun sendMessage(messages: Array<out String>?) {
+        if (messages != null)
+            for (m in messages) channel.sendMessage(m)
+    }
+
+//    override fun addAttachment(plugin: Plugin?): PermissionAttachment {
+//        return sender.addAttachment(plugin)
+//    }
+//
+//    override fun addAttachment(plugin: Plugin?, ticks: Int): PermissionAttachment {
+//        return sender.addAttachment(plugin, ticks)
+//    }
+//
+//    override fun addAttachment(plugin: Plugin?, name: String?, value: Boolean): PermissionAttachment {
+//        return sender.addAttachment(plugin, name, value)
+//    }
+//
+//    override fun addAttachment(plugin: Plugin?, name: String?, value: Boolean, ticks: Int): PermissionAttachment {
+//        return sender.addAttachment(plugin, name, value, ticks)
+//    }
+//
+//    override fun getEffectivePermissions(): MutableSet<PermissionAttachmentInfo> {
+//        return sender.effectivePermissions
+//    }
+
+//    fun getName(): String {
+//        return sender.name
+//    }
+//
+//    override fun getServer(): Server {
+//        return sender.server
+//    }
+//
+//    override fun hasPermission(name: String?): Boolean {
+//        return sender.hasPermission(name)
+//    }
+//
+//    override fun hasPermission(perm: Permission?): Boolean {
+//        return sender.hasPermission(perm)
+//    }
+//
+//    override fun isOp(): Boolean {
+//        return sender.isOp
+//    }
+//
+//    override fun isPermissionSet(name: String?): Boolean {
+//        return sender.isPermissionSet(name)
+//    }
+//
+//    override fun isPermissionSet(perm: Permission?): Boolean {
+//        return sender.isPermissionSet(perm)
+//    }
+//
+//    override fun recalculatePermissions() {
+//        return sender.recalculatePermissions()
+//    }
+//
+//    override fun removeAttachment(attachment: PermissionAttachment?) {
+//        return sender.removeAttachment(attachment)
+//    }
+//
+//    override fun setOp(value: Boolean) {
+//        return sender.setOp(value)
+//    }
+
+
+}
\ No newline at end of file
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/MessageWrapper.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordMessageWrapper.kt
similarity index 83%
rename from src/main/kotlin/gg/obsidian/discordbridge/commands/MessageWrapper.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordMessageWrapper.kt
index c00ff01..30cd2d8 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/commands/MessageWrapper.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordMessageWrapper.kt
@@ -1,6 +1,6 @@
 package gg.obsidian.discordbridge.commands
 
-import gg.obsidian.discordbridge.Config
+import gg.obsidian.discordbridge.DiscordBridge
 import net.dv8tion.jda.core.entities.ChannelType
 import net.dv8tion.jda.core.entities.Message
 import net.dv8tion.jda.core.entities.MessageChannel
@@ -10,7 +10,7 @@ import net.dv8tion.jda.core.entities.MessageChannel
  *
  * @param originalMessage the underlying Message instance
  */
-class MessageWrapper(val originalMessage: Message) : IEventWrapper {
+class DiscordMessageWrapper(val db: DiscordBridge, val originalMessage: Message) : IEventWrapper {
 
     /**
      * Returns a formatted mention tag in the form <@##########>
@@ -33,9 +33,9 @@ class MessageWrapper(val originalMessage: Message) : IEventWrapper {
      */
     override val isFromRelayChannel: Boolean
         get() = if (originalMessage.isFromType(ChannelType.PRIVATE)) false
-                else originalMessage.guild.id == Config.SERVER_ID
+                else originalMessage.guild.id == db.getConfig().getString("server-id")
                 && originalMessage.isFromType(ChannelType.TEXT)
-                && originalMessage.textChannel.name.equals(Config.CHANNEL, true)
+                && originalMessage.textChannel.name.equals(db.getConfig().getString("channel"), true)
 
     /**
      * The message of this event
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/IEventWrapper.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/IEventWrapper.kt
similarity index 73%
rename from src/main/kotlin/gg/obsidian/discordbridge/commands/IEventWrapper.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/IEventWrapper.kt
index 5116f7c..bc1c27c 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/commands/IEventWrapper.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/IEventWrapper.kt
@@ -13,7 +13,7 @@ interface IEventWrapper {
     /**
      * The message in the event
      *
-     * For MessageWrapper instances, this calls getContent()
+     * For DiscordMessageWrapper instances, this calls getContent()
      *
      * Otherwise, this is identical to rawMessage
      */
@@ -21,7 +21,7 @@ interface IEventWrapper {
     /**
      * The raw message in the event
      *
-     * For MessageWrapper instances, this calls getRawContent()
+     * For DiscordMessageWrapper instances, this calls getRawContent()
      *
      * Otherwise, this is identical to message
      */
@@ -29,7 +29,7 @@ interface IEventWrapper {
     /**
      * The name of the author of the event in @tag format
      *
-     * For MessageWrapper instances, this will return a mention tag in the form <@##########>
+     * For DiscordMessageWrapper instances, this will return a mention tag in the form <@##########>
      *
      * Otherwise, this will return the player's username prefixed with '@'
      */
@@ -37,7 +37,7 @@ interface IEventWrapper {
     /**
      * The originating channel of the message
      *
-     * For MessageWrapper instances, this returns the origin channel or private channel of the message
+     * For DiscordMessageWrapper instances, this returns the origin channel or private channel of the message
      *
      * Otherwise, this returns Connection.getRelayChannel()
      * @see gg.obsidian.discordbridge.discord.Connection.getRelayChannel
@@ -46,7 +46,7 @@ interface IEventWrapper {
     /**
      * The ID string of the message author
      *
-     * For MessageWrapper instances, this returns the author's Discord ID
+     * For DiscordMessageWrapper instances, this returns the author's Discord ID
      *
      * Otherwise, this returns the author's Minecraft UUID
      */
@@ -54,7 +54,7 @@ interface IEventWrapper {
     /**
      * 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
+     * For DiscordMessageWrapper 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
      *
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/AsyncPlayerChatEventWrapper.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftChatEventWrapper.kt
similarity index 78%
rename from src/main/kotlin/gg/obsidian/discordbridge/commands/AsyncPlayerChatEventWrapper.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftChatEventWrapper.kt
index 9166b38..1b031f7 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/commands/AsyncPlayerChatEventWrapper.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftChatEventWrapper.kt
@@ -1,37 +1,37 @@
 package gg.obsidian.discordbridge.commands
 
 import gg.obsidian.discordbridge.discord.Connection
+import gg.obsidian.discordbridge.wrappers.IPlayer
 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 {
+class MinecraftChatEventWrapper(val player: IPlayer, val chatMessage: String) : IEventWrapper {
     /**
      * The Minecraft username of the event author
      */
     override val senderName: String
-        get() = event.player.name
+        get() = player.getName()
     /**
      * The message of this event
      */
     override val message: String
-        get() = event.message
+        get() = chatMessage
     /**
      * The raw message of this event
      *
      * This is identical to the message property for this wrapper type
      */
     override val rawMessage: String
-        get() = event.message
+        get() = chatMessage
     /**
      * The Minecraft username of the sender in "@name" format
      */
     override val senderAsMention: String
-        get() = "@" + event.player.name
+        get() = "@" + player.getName()
     /**
      * Returns the value at Connection.getRelayChannel()
      * @see Connection.getRelayChannel
@@ -42,7 +42,7 @@ class AsyncPlayerChatEventWrapper(val event: AsyncPlayerChatEvent) : IEventWrapp
      * The message author's Minecraft UUID
      */
     override val senderId: String
-        get() = event.player.uniqueId.toString()
+        get() = player.getUUID().toString()
     /**
      * Always returns true for this wrapper type
      */
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt
similarity index 80%
rename from src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt
index 141817b..abf0bf9 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt
@@ -1,10 +1,10 @@
 package gg.obsidian.discordbridge.commands
 
 import gg.obsidian.discordbridge.discord.Connection
+import gg.obsidian.discordbridge.wrappers.ICommandSender
+import gg.obsidian.discordbridge.wrappers.ICommand
+import gg.obsidian.discordbridge.wrappers.IPlayer
 import net.dv8tion.jda.core.entities.MessageChannel
-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
@@ -13,7 +13,7 @@ import org.bukkit.entity.Player
  * @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,
+class MinecraftCommandWrapper(val sender: ICommandSender, val command: ICommand,
                               val args: Array<out String>) : IEventWrapper {
     /**
      * The Minecraft username of the command sender
@@ -21,7 +21,7 @@ class MinecraftCommandWrapper(val sender: CommandSender, val command: Command,
      * Returns "Console" if the command was sent from the server console
      */
     override val senderName: String
-        get() = if (sender is Player) sender.name else "Console"
+        get() = if (sender is IPlayer) sender.getName() else "Console"
     /**
      * Returns a space-delimited string of all the arguments passed with the command
      *
@@ -40,7 +40,7 @@ class MinecraftCommandWrapper(val sender: CommandSender, val command: Command,
      * The Minecraft username of the command sender in "@name" format
      */
     override val senderAsMention: String
-        get() = "@${sender.name}"
+        get() = "@${sender.getName()}"
     /**
      * Returns the value at Connection.getRelayChannel()
      * @see Connection.getRelayChannel
@@ -51,7 +51,7 @@ class MinecraftCommandWrapper(val sender: CommandSender, val command: Command,
      * The command sender's Minecraft UUID
      */
     override val senderId: String
-        get() = (sender as? Player)?.uniqueId?.toString() ?: ""
+        get() = (sender as? IPlayer)?.getUUID()?.toString() ?: ""
     /**
      * Always returns true for this wrapper type
      */
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/BotCommand.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/BotCommand.kt
similarity index 100%
rename from src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/BotCommand.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/BotCommand.kt
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/ChatExclusiveCommand.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/ChatExclusiveCommand.kt
similarity index 100%
rename from src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/ChatExclusiveCommand.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/ChatExclusiveCommand.kt
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/DiscordExclusiveCommand.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/DiscordExclusiveCommand.kt
similarity index 100%
rename from src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/DiscordExclusiveCommand.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/DiscordExclusiveCommand.kt
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/MinecraftExclusiveCommand.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/MinecraftExclusiveCommand.kt
similarity index 100%
rename from src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/MinecraftExclusiveCommand.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/MinecraftExclusiveCommand.kt
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/PrivateResponse.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/PrivateResponse.kt
similarity index 100%
rename from src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/PrivateResponse.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/PrivateResponse.kt
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/TaggedResponse.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/TaggedResponse.kt
similarity index 100%
rename from src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/TaggedResponse.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/TaggedResponse.kt
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
similarity index 72%
rename from src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
index 8f09c83..2de6258 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
@@ -1,23 +1,21 @@
 package gg.obsidian.discordbridge.commands.controllers
 
-import gg.obsidian.discordbridge.Config
-import gg.obsidian.discordbridge.Plugin
+import gg.obsidian.discordbridge.DiscordBridge
 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 gg.obsidian.discordbridge.util.ChatColor as CC
+import gg.obsidian.discordbridge.util.MarkdownToMinecraftSeralizer
+import gg.obsidian.discordbridge.util.Script
+import gg.obsidian.discordbridge.util.UtilFunctions.noSpace
+import gg.obsidian.discordbridge.util.UtilFunctions.stripColor
+import gg.obsidian.discordbridge.util.UtilFunctions.toDiscordChatMessage
+import gg.obsidian.discordbridge.util.UtilFunctions.toMinecraftChatMessage
 import net.dv8tion.jda.core.Permission
-import org.bukkit.Bukkit
 import java.lang.reflect.Method
 import java.util.*
 import java.util.logging.Level
-import gg.obsidian.discordbridge.Config as cfg
-import org.bukkit.ChatColor as CC
+import kotlin.collections.HashMap
 
 /**
  * A class that manages an assortment of IBotControllers and allows dynamic access to a configurable assortment
@@ -26,7 +24,7 @@ import org.bukkit.ChatColor as CC
  * @param plugin a reference to the base Plugin object
  * @see IBotController
  */
-class BotControllerManager(val plugin: Plugin) {
+class BotControllerManager(val db: DiscordBridge) {
 
     private val commands: MutableMap<String, Command> = mutableMapOf()
     private val controllers: MutableMap<Class<out IBotController>, IBotController> = mutableMapOf()
@@ -97,9 +95,9 @@ class BotControllerManager(val plugin: Plugin) {
 
         // Short circuit if event was a Minecraft command
         if (event is MinecraftCommandWrapper) {
-            val command = commands[event.command.name]
+            val command = commands[event.command.getName()]
             if (command == null) {
-                commandNotFound(event, event.command.name)
+                commandNotFound(event, event.command.getName())
                 return true
             }
             return invokeBotCommand(command, controllers, event, event.args.asList().toTypedArray())
@@ -109,19 +107,19 @@ class BotControllerManager(val plugin: Plugin) {
         if (sendScriptedResponse(event)) return true
 
         // <prefix>command
-        if (Config.COMMAND_PREFIX.isNotBlank() && event.rawMessage.startsWith(Config.COMMAND_PREFIX)) {
-            val split = event.rawMessage.replaceFirst(Config.COMMAND_PREFIX, "").trim().split("\\s+".toRegex()).toTypedArray()
+        if (db.getConfig().getString("command-prefix", "").isNotBlank() && event.rawMessage.startsWith(db.getConfig().getString("command-prefix", ""))) {
+            val split = event.rawMessage.replaceFirst(db.getConfig().getString("command-prefix", ""), "").trim().split("\\s+".toRegex()).toTypedArray()
             return parseCommand(event, split, false)
         }
 
         // @<mention> command from Minecraft
-        if (event is AsyncPlayerChatEventWrapper && event.rawMessage.startsWith("@${Config.USERNAME.noSpace()} ")) {
-            val split = event.rawMessage.replaceFirst("@${Config.USERNAME.noSpace()} ", "").trim().split("\\s+".toRegex()).toTypedArray()
+        if (event is MinecraftChatEventWrapper && event.rawMessage.startsWith("@${db.getConfig().getString("username", "DiscordBridge").noSpace()} ")) {
+            val split = event.rawMessage.replaceFirst("@${db.getConfig().getString("username", "DiscordBridge").noSpace()} ", "").trim().split("\\s+".toRegex()).toTypedArray()
             return parseCommand(event, split, true)
         }
 
         // @<mention> command from Discord
-        if (event is MessageWrapper && event.rawMessage.startsWith(Connection.JDA.selfUser.asMention + " ")) {
+        if (event is DiscordMessageWrapper && event.rawMessage.startsWith(Connection.JDA.selfUser.asMention + " ")) {
             val split = event.rawMessage.replaceFirst(Connection.JDA.selfUser.asMention + " ", "").trim().split("\\s+".toRegex()).toTypedArray()
             return parseCommand(event, split, true)
         }
@@ -138,7 +136,7 @@ class BotControllerManager(val plugin: Plugin) {
      * @return true if a trigger was found and successfully responded to, false otherwise
      */
     private fun sendScriptedResponse(event: IEventWrapper): Boolean {
-        val responses = plugin.script.data.getList("responses").checkItemsAre<Script>() ?: return false
+        val responses = db.getScriptsConfig().getList<HashMap<String, Any>>("responses").castTo({Script(it)}) ?: return false
 
         var response: Script? = null
         for (r in responses) {
@@ -156,10 +154,10 @@ class BotControllerManager(val plugin: Plugin) {
             }
 
             when (event) {
-                is AsyncPlayerChatEventWrapper -> if (startswith)
+                is MinecraftChatEventWrapper -> 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)
+                is DiscordMessageWrapper -> if (startswith)
                     if (triggerDis.isNotEmpty() && arg.startsWith(triggerDis, ignorecase)) response = r
                     else if (triggerDis.isNotEmpty() && arg.equals(triggerDis, ignorecase)) response = r
                 else -> return false
@@ -167,24 +165,24 @@ class BotControllerManager(val plugin: Plugin) {
         }
         if (response == null) return false
 
-        plugin.logDebug("user ${event.senderName} has triggered a scripted response")
+        db.logDebug("user ${event.senderName} has triggered a scripted response")
         val responseDis: String? = response.responseDis
         val responseMC: String? = response.responseMC
         if (responseDis != null && responseDis.isNotBlank()) {
             var out = responseDis.replace("%u", event.senderAsMention)
-            if (event is AsyncPlayerChatEventWrapper) {
-                out = plugin.convertAtMentions(out)
-                out = plugin.translateAliasesToDiscord(out)
+            if (event is MinecraftChatEventWrapper) {
+                out = db.convertAtMentions(out)
+                out = db.translateAliasesToDiscord(out)
             }
-            plugin.sendToDiscord(out, event.channel)
+            db.sendToDiscord(out, event.channel)
         }
         if (responseMC != null && responseMC.isNotBlank() && event.isFromRelayChannel) {
             var out = responseMC.replace("%u", event.senderAsMention)
-            if (event is MessageWrapper) {
-                out = plugin.deconvertAtMentions(out)
-                out = plugin.translateAliasesToMinecraft(out)
+            if (event is DiscordMessageWrapper) {
+                out = db.deconvertAtMentions(out)
+                out = db.translateAliasesToMinecraft(out)
             }
-            plugin.sendToMinecraft(out.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
+            db.sendToMinecraft(out.toMinecraftChatMessage(db, db.getConfig().getString("username", "DiscordBridge")))
         }
         return true
     }
@@ -204,7 +202,7 @@ class BotControllerManager(val plugin: Plugin) {
 
         if (command == null) {
             // Attempt to run as a server command if sent from Discord
-            if (event is MessageWrapper && event.originalMessage.member.hasPermission(Permission.ADMINISTRATOR))
+            if (event is DiscordMessageWrapper && event.originalMessage.member.hasPermission(Permission.ADMINISTRATOR))
                 if (invokeServerCommand(event, args)) return true
 
             if (defaultToTalk) command = commands["talk"]
@@ -236,7 +234,7 @@ class BotControllerManager(val plugin: Plugin) {
 
         when {
             // Check for permission
-            event is AsyncPlayerChatEventWrapper && !event.event.player.hasPermission("discordbridge.${command.name}") -> {
+            event is MinecraftChatEventWrapper && !event.player.hasPermission("discordbridge.${command.name}") -> {
                 commandRestricted(event)
                 return true
             }
@@ -318,52 +316,52 @@ class BotControllerManager(val plugin: Plugin) {
     private fun sendBotCommandOutput(event: IEventWrapper, command: Command, response: String) {
         var modifiedResponse = response
         when (event) {
-            is AsyncPlayerChatEventWrapper -> {
+            is MinecraftChatEventWrapper -> {
                 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 = MarkdownToMinecraftSeralizer().toMinecraft(db.getPegDownProcessor().parseMarkdown(modifiedResponse.toCharArray()))
+                    modifiedResponse = "${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                             modifiedResponse
-                    event.event.player.sendMessage(modifiedResponse)
+                    event.player.sendMessage(modifiedResponse)
                     return
                 }
                 if (command.isTagged) modifiedResponse = "${event.senderAsMention} | $modifiedResponse"
-                val mcModifiedResponse = MarkdownToMinecraftSeralizer().toMinecraft(plugin.pegDownProc.parseMarkdown(modifiedResponse.toCharArray()))
-                plugin.sendToMinecraft(mcModifiedResponse.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
+                val mcModifiedResponse = MarkdownToMinecraftSeralizer().toMinecraft(db.getPegDownProcessor().parseMarkdown(modifiedResponse.toCharArray()))
+                db.sendToMinecraft(mcModifiedResponse.toMinecraftChatMessage(db, db.getConfig().getString("username", "DiscordBridge")))
 
-                modifiedResponse = plugin.convertAtMentions(modifiedResponse)
-                modifiedResponse = plugin.translateAliasesToDiscord(modifiedResponse)
-                plugin.sendToDiscord(modifiedResponse, event.channel)
+                modifiedResponse = db.convertAtMentions(modifiedResponse)
+                modifiedResponse = db.translateAliasesToDiscord(modifiedResponse)
+                db.sendToDiscord(modifiedResponse, event.channel)
                 return
             }
-            is MessageWrapper -> {
+            is DiscordMessageWrapper -> {
                 if (command.isPrivate) {
                     event.originalMessage.author.openPrivateChannel().queue({ p -> p.sendMessage(modifiedResponse).queue() })
                     return
                 }
                 if (command.isTagged) modifiedResponse = "${event.senderAsMention} | $modifiedResponse"
-                plugin.sendToDiscord(modifiedResponse, event.channel)
+                db.sendToDiscord(modifiedResponse, event.channel)
 
-                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)
+                modifiedResponse = modifiedResponse.toMinecraftChatMessage(db, db.getConfig().getString("username", "DiscordBridge"))
+                modifiedResponse = db.deconvertAtMentions(modifiedResponse)
+                modifiedResponse = db.translateAliasesToMinecraft(modifiedResponse)
+                modifiedResponse = MarkdownToMinecraftSeralizer().toMinecraft(db.getPegDownProcessor().parseMarkdown(modifiedResponse.toCharArray()))
+                db.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 = MarkdownToMinecraftSeralizer().toMinecraft(db.getPegDownProcessor().parseMarkdown(modifiedResponse.toCharArray()))
+                    modifiedResponse = "${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                             modifiedResponse
                     event.sender.sendMessage(modifiedResponse)
                     return
                 }
-                val mcModifiedResponse = MarkdownToMinecraftSeralizer().toMinecraft(plugin.pegDownProc.parseMarkdown(modifiedResponse.toCharArray()))
-                plugin.sendToMinecraft(mcModifiedResponse.toMinecraftChatMessage(Config.BOT_MC_USERNAME))
+                val mcModifiedResponse = MarkdownToMinecraftSeralizer().toMinecraft(db.getPegDownProcessor().parseMarkdown(modifiedResponse.toCharArray()))
+                db.sendToMinecraft(mcModifiedResponse.toMinecraftChatMessage(db, db.getConfig().getString("username", "DiscordBridge")))
 
-                modifiedResponse = plugin.convertAtMentions(modifiedResponse)
-                modifiedResponse = plugin.translateAliasesToDiscord(modifiedResponse)
-                plugin.sendToDiscord(modifiedResponse, event.channel)
+                modifiedResponse = db.convertAtMentions(modifiedResponse)
+                modifiedResponse = db.translateAliasesToDiscord(modifiedResponse)
+                db.sendToDiscord(modifiedResponse, event.channel)
                 return
             }
         }
@@ -376,36 +374,38 @@ class BotControllerManager(val plugin: Plugin) {
      * @param args the arguments associated with the command, space-delimited
      */
     private fun invokeServerCommand(event: IEventWrapper, args: Array<String>): Boolean {
-            val sender = DiscordCommandSender(event.channel)
-            val commandName = args[0].toLowerCase()
-            when {
-                DefaultCommands.minecraft.contains(commandName) -> {
-                    plugin.logDebug("Discord user ${event.senderName} invoked Minecraft command '${args.joinToString(" ")}'")
-                    Bukkit.getServer().dispatchCommand(sender, args.joinToString(" "))
-                    return true
-                }
-
-                DefaultCommands.bukkit.contains(commandName) -> {
-                    plugin.logDebug("Discord user ${event.senderName} invoked Bukkit command '${args.joinToString(" ")}'")
-                    Bukkit.getServer().dispatchCommand(sender, args.joinToString(" "))
-                    return true
-                }
-
-                DefaultCommands.spigot.contains(commandName) -> {
-                    plugin.logDebug("Discord user ${event.senderName} invoked Spigot command '${args.joinToString(" ")}'")
-                    Bukkit.getServer().dispatchCommand(sender, args.joinToString(" "))
-                    return true
-                }
-
-                else -> {
-                    val pluginCommand = Bukkit.getServer().getPluginCommand(commandName)
-                    if (pluginCommand != null) {
-                        plugin.logDebug("Discord user ${event.senderName} invoked ${pluginCommand.plugin.name} command '${args.joinToString(" ")}'")
-                        pluginCommand.execute(sender, commandName, args.sliceArray(1 until args.size))
-                        return true
-                    }
-                }
-            }
+        TODO("Not implemented yet")
+//            val sender = DiscordCommandSender(db.getServer().getRemoteConsoleSender(), event.channel)
+//            val commandName = args[0].toLowerCase()
+//            when {
+//                DefaultCommands.minecraft.contains(commandName) -> {
+//                    db.logDebug("Discord user ${event.senderName} invoked Minecraft command '${args.joinToString(" ")}'")
+//                    db.getServer().dispatchCommand(sender, args.joinToString(" "))
+//                    return true
+//                }
+//
+//                DefaultCommands.bukkit.contains(commandName) -> {
+//                    db.logDebug("Discord user ${event.senderName} invoked Bukkit command '${args.joinToString(" ")}'")
+//                    db.getServer().dispatchCommand(sender, args.joinToString(" "))
+//                    return true
+//                }
+//
+//                DefaultCommands.spigot.contains(commandName) -> {
+//                    db.logDebug("Discord user ${event.senderName} invoked Spigot command '${args.joinToString(" ")}'")
+//                    db.getServer().dispatchCommand(sender, args.joinToString(" "))
+//                    return true
+//                }
+//
+//                else -> {
+//                    //TODO
+////                    val pluginCommand = db.getServer().getPluginCommand(commandName)
+////                    if (pluginCommand != null) {
+////                        db.logDebug("Discord user ${event.senderName} invoked ${pluginCommand.plugin.name} command '${args.joinToString(" ")}'")
+////                        pluginCommand.execute(sender, commandName, args.sliceArray(1 until args.size))
+////                        return true
+////                    }
+//                }
+//            }
         return false
     }
 
@@ -418,32 +418,33 @@ class BotControllerManager(val plugin: Plugin) {
      */
     private fun relay(event: IEventWrapper, logIgnore: Boolean) {
         when (event) {
-            is AsyncPlayerChatEventWrapper -> {
-                var worldname = event.event.player.world.name
+            is MinecraftChatEventWrapper -> {
+                var worldname = event.player.getWorld().getName()
 
+                // TODO
                 // 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())
+//                if (db.isMultiverseInstalled) {
+//                    val worldProperties = db.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(db, event.senderName, worldname)
+                formattedMessage = db.convertAtMentions(formattedMessage)
+                formattedMessage = db.translateAliasesToDiscord(formattedMessage)
+                db.sendToDiscord(formattedMessage, Connection.getRelayChannel())
             }
-            is MessageWrapper -> {
+            is DiscordMessageWrapper -> {
                 if (event.isFromRelayChannel) {
-                    plugin.logDebug("Broadcasting message from Discord to Minecraft as user ${event.senderName}")
-                    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")
+                    db.logDebug("Broadcasting message from Discord to Minecraft as user ${event.senderName}")
+                    var formattedMessage = event.message.toMinecraftChatMessage(db, event.senderName)
+                    formattedMessage = db.deconvertAtMentions(formattedMessage)
+                    formattedMessage = db.translateAliasesToMinecraft(formattedMessage)
+                    formattedMessage = MarkdownToMinecraftSeralizer().toMinecraft(db.getPegDownProcessor().parseMarkdown(formattedMessage.toCharArray()))
+                    db.sendToMinecraft(formattedMessage)
+                } else if (logIgnore) db.logDebug("Not relaying message from Discord: channel does not match")
             }
             else -> return // slash commands do not get relayed
         }
@@ -460,18 +461,18 @@ class BotControllerManager(val plugin: Plugin) {
      */
     private fun commandNotFound(event: IEventWrapper, commandName: String) {
         when (event) {
-            is MessageWrapper ->
+            is DiscordMessageWrapper ->
                 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("${CC.ITALIC}${CC.GRAY}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
+            is MinecraftChatEventWrapper ->
+                event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").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.")
+                        "See '@${db.getConfig().getString("username", "DiscordBridge").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: " +
+                event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").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.")
+                        "See '@${db.getConfig().getString("username", "DiscordBridge").stripColor()} help' ${orPrefixHelp()}for the commands I do have.")
         }
 
     }
@@ -487,18 +488,18 @@ class BotControllerManager(val plugin: Plugin) {
      */
     private fun commandWrongParameterCount(event: IEventWrapper, commandName: String, usage: String, given: Int, required: Int) {
         when (event) {
-            is MessageWrapper ->
+            is DiscordMessageWrapper ->
                 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("${CC.ITALIC}${CC.GRAY}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
+            is MinecraftChatEventWrapper ->
+                event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").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: " +
+                event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").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)")
@@ -518,18 +519,18 @@ class BotControllerManager(val plugin: Plugin) {
     private fun commandWrongParameterType(event: IEventWrapper, name: String, usage: String, index: Int,
                                           actualType: Class<*>, expectedType: Class<*>) {
         when (event) {
-            is MessageWrapper ->
+            is DiscordMessageWrapper ->
                 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("${CC.ITALIC}${CC.GRAY}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
+            is MinecraftChatEventWrapper ->
+                event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").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: " +
+                event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").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)")
@@ -543,13 +544,13 @@ class BotControllerManager(val plugin: Plugin) {
      */
     private fun commandRestricted(event: IEventWrapper) {
         when (event) {
-            is MessageWrapper ->
+            is DiscordMessageWrapper ->
                 event.channel.sendMessage("${event.senderAsMention} | Sorry, you don't have permission to use that command.").queue()
-            is AsyncPlayerChatEventWrapper ->
-                event.event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
+            is MinecraftChatEventWrapper ->
+                event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").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: " +
+                event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                         "Sorry, you don't have permission to use that command.")
         }
     }
@@ -561,18 +562,18 @@ class BotControllerManager(val plugin: Plugin) {
      * @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)
+        db.logger.log(Level.SEVERE, "Command with content ${event.rawMessage} threw an exception.", throwable)
         when (event) {
-            is MessageWrapper ->
+            is DiscordMessageWrapper ->
                 event.channel.sendMessage(
                         "${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: " +
+            is MinecraftChatEventWrapper ->
+                event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").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: " +
+                event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                         "Ouch! That command threw an exception. Sorry about that... " +
                         "Have an admin check the logs for more info.")
         }
@@ -624,13 +625,17 @@ 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 ""
+    private fun orPrefixHelp(): String = if (db.getConfig().getString("command-prefix", "") != "") "or ${db.getConfig().getString("command-prefix", "")}help " else ""
 
     /**
      * 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
+//    @Suppress("UNCHECKED_CAST")
+//    private inline fun <reified T : Any> List<*>.checkItemsAre() = if (all { it is T }) this as List<T> else null
+
+    private inline fun <reified T : Any> List<HashMap<String, Any>>.castTo(factory: (HashMap<String, Any>) -> T): List<T> {
+        return this.mapTo(mutableListOf()) { factory(it) }.toList()
+    }
 
     // =============================================
     // =============== HELPER OBJECTS ==============
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt
similarity index 77%
rename from src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt
index 0ca3c56..d170296 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt
@@ -1,22 +1,21 @@
 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.DiscordBridge
 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 gg.obsidian.discordbridge.util.Rating
+import gg.obsidian.discordbridge.util.Respect
 import java.util.*
+import kotlin.collections.LinkedHashMap
 
 /**
  * Controller for fun commands that have no purpose outside of amusement
  *
- * @param plugin a reference to the base Plugin object
+ * @param db a reference to the base Plugin object
  */
-class FunCommandsController(val plugin: Plugin) : IBotController {
+class FunCommandsController(val db: DiscordBridge) : IBotController {
 
     /**
      * @return a description of this class of commands, used in the Help command
@@ -32,8 +31,8 @@ class FunCommandsController(val plugin: Plugin) : IBotController {
     @BotCommand(name = "8ball", usage = "<question>", description = "Consult the Magic 8 Ball", squishExcessArgs = true)
     @TaggedResponse
     private fun eightBall(event: IEventWrapper): String {
-        plugin.logDebug("user ${event.senderName} consults the Magic 8-Ball")
-        val responses = plugin.eightball.data.getStringList("responses")
+        db.logDebug("user ${event.senderName} consults the Magic 8-Ball")
+        val responses = db.getEightBallConfig().getList<String>("responses")
         val rand = Random().nextInt(responses.count())
         return responses[rand]
     }
@@ -49,7 +48,7 @@ class FunCommandsController(val plugin: Plugin) : IBotController {
             description = "Have the bot choose between given options", squishExcessArgs = true)
     @TaggedResponse
     private fun choose(event: IEventWrapper, query: String): String {
-        plugin.logDebug("user ${event.senderName} needs a choice made")
+        db.logDebug("user ${event.senderName} needs a choice made")
         val choices = query.split(", or ", " or ", ",", "|")
         val rand = Random().nextInt(choices.count())
         return "I pick '${choices[rand]}'"
@@ -63,9 +62,10 @@ class FunCommandsController(val plugin: Plugin) : IBotController {
      */
     @BotCommand(usage="", description = "Press F to pay respects")
     private fun f(event: IEventWrapper): String {
-        plugin.logDebug("user ${event.senderName}} pays respects")
-        var totalRespects = plugin.f.data.getInt("total-respects", 0)
-        val responses = plugin.f.data.getList("responses").checkItemsAre<Respect>()
+        db.logDebug("user ${event.senderName}} pays respects")
+        var totalRespects = db.getFConfig().getInteger("total-respects", 0)
+        db.logger.info(db.getFConfig().getList<Any>("responses").toString())
+        val responses = db.getFConfig().getList<LinkedHashMap<String, Any>>("responses").castTo({Respect(it)})
                 ?: 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
@@ -87,8 +87,8 @@ class FunCommandsController(val plugin: Plugin) : IBotController {
             "${event.senderAsMention} | ${found.message}".replace("%t", totalRespects.toString())
                     .replace("%c", found.count.toString())
 
-        plugin.f.data.set("total-respects", totalRespects)
-        plugin.f.saveConfig()
+        db.getFConfig().put("total-respects", totalRespects)
+        db.getFConfig().save()
 
         return msg
     }
@@ -102,8 +102,8 @@ class FunCommandsController(val plugin: Plugin) : IBotController {
      */
     @BotCommand(usage="<thing to insult>", description = "Make the bot insult something for you", squishExcessArgs = true)
     private fun insult(event: IEventWrapper, thingToInsult: String): String {
-        plugin.logDebug("user ${event.senderName} requests an insult against '$thingToInsult'")
-        val responses = plugin.insult.data.getStringList("responses")
+        db.logDebug("user ${event.senderName} requests an insult against '$thingToInsult'")
+        val responses = db.getInsultConfig().getList<String>("responses")
         val rand = Random().nextInt(responses.count())
         return "${event.senderAsMention} \u27A4 $thingToInsult | ${responses[rand]}"
     }
@@ -118,27 +118,26 @@ class FunCommandsController(val plugin: Plugin) : IBotController {
     @BotCommand(usage="<thing to be rated>", description = "Have the bot rate something for you", squishExcessArgs = true)
     @TaggedResponse
     private fun rate(event: IEventWrapper, thingToRate: String): String {
-        plugin.logDebug("user ${event.senderName} requests a rating")
-        val responses = plugin.rate.data.getList("responses").checkItemsAre<Rating>()
+        db.logDebug("user ${event.senderName} requests a rating")
+        val responses = db.getRateConfig().getList<LinkedHashMap<String, Any>>("responses").castTo({Rating(it)})
                 ?: 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 = db.getRateConfig().getInteger("rate-out-of", 10)
         if (rateOutOf > 1000000) rateOutOf = 1000000
         if (rateOutOf < 0) rateOutOf = 0
 
-        var granularity = plugin.rate.data.getInt("granularity", 1)
+        var granularity = db.getRateConfig().getInteger("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)) {
+        if (db.getRateConfig().getBoolean("translate-first-and-second-person", true)) {
             val argArray = thingToRate.split(" ").toMutableList()
             val iterate = argArray.listIterator()
             while (iterate.hasNext()) {
@@ -165,7 +164,7 @@ class FunCommandsController(val plugin: Plugin) : IBotController {
     @BotCommand(name = "roll", usage = "<sides>", description = "Roll a die for a random number")
     @TaggedResponse
     private fun roll(event: IEventWrapper, sides: Int): String {
-        plugin.logDebug("user ${event.senderName} needs a choice made")
+        db.logDebug("user ${event.senderName} needs a choice made")
         if (sides == 1)
             return "You rolled... 1. Was it any surprise?"
         if (sides > 100 || sides < 1)
@@ -184,11 +183,11 @@ class FunCommandsController(val plugin: Plugin) : IBotController {
     @TaggedResponse
     @BotCommand(usage="<say something>", description = "Say something to Cleverbot", squishExcessArgs = true)
     private fun talk(event: IEventWrapper, query: String): String {
-        plugin.logDebug("user ${event.senderName} invokes Cleverbot")
+        db.logDebug("user ${event.senderName} invokes Cleverbot")
 
-        if (Config.CLEVERBOT_KEY.isEmpty())
+        if (db.getConfig().getString("cleverbot-key", "").isEmpty())
             return "You do not have an API key. Go to https://www.cleverbot.com/JDA/ for more information."
-        val bot = CleverBotQuery(Config.CLEVERBOT_KEY, query)
+        val bot = CleverBotQuery(db.getConfig().getString("cleverbot-key", ""), query)
         bot.sendRequest()
         return bot.response
     }
@@ -198,4 +197,8 @@ class FunCommandsController(val plugin: Plugin) : IBotController {
      */
     @Suppress("UNCHECKED_CAST")
     private inline fun <reified T : Any> List<*>.checkItemsAre() = if (all { it is T }) this as List<T> else null
+
+    private inline fun <reified T : Any> List<HashMap<String, Any>>.castTo(factory: (HashMap<String, Any>) -> T): List<T> {
+        return this.mapTo(mutableListOf()) { factory(it) }.toList()
+    }
 }
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/IBotController.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/IBotController.kt
similarity index 82%
rename from src/main/kotlin/gg/obsidian/discordbridge/commands/IBotController.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/IBotController.kt
index 2acf55e..fa9314b 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/commands/IBotController.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/IBotController.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.commands
+package gg.obsidian.discordbridge.commands.controllers
 
 /**
  * Controls a number of commands that can be bulk applied to a BotControllerManager
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
similarity index 73%
rename from src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
index e495b86..babbd4a 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
@@ -1,22 +1,21 @@
 package gg.obsidian.discordbridge.commands.controllers
 
-import gg.obsidian.discordbridge.Config
-import gg.obsidian.discordbridge.Plugin
+import gg.obsidian.discordbridge.DiscordBridge
 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 gg.obsidian.discordbridge.util.ChatColor as CC
+import gg.obsidian.discordbridge.util.UtilFunctions.stripColor
+import gg.obsidian.discordbridge.wrappers.IPlayer
 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
+ * @param db a reference to the base Plugin object
  */
-class UtilCommandsController(val plugin: Plugin) : IBotController {
+class UtilCommandsController(val db: DiscordBridge) : IBotController {
 
     /**
      * @return a short description of this IBotController's methods as seen in the Help command
@@ -27,23 +26,23 @@ class UtilCommandsController(val plugin: Plugin) : IBotController {
      * 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
+     * @return a status message if the event is type DiscordMessageWrapper and is sent via DM, null otherwise
      */
     @BotCommand(usage="", description="Confirm an alias link request", relayTriggerMessage = false)
     @DiscordExclusiveCommand
     @PrivateResponse
     private fun confirm(event: IEventWrapper): String? {
-        if (event !is MessageWrapper) return null
+        if (event !is DiscordMessageWrapper) 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")
+        db.logDebug("user ${event.senderName} confirms an alias request")
 
-        val ua = plugin.requests.find { it.discordId == event.senderId } ?: return "You have no alias requests pending."
+        val ua = db.requests.find { it.discordId == event.senderId } ?: return "You have no alias requests pending."
 
-        UserAliasConfig.add(plugin, ua)
-        plugin.requests.remove(ua)
+        UserAliasConfig.add(db, ua)
+        db.requests.remove(ua)
         return "Successfully linked aliases!"
     }
 
@@ -51,22 +50,22 @@ class UtilCommandsController(val plugin: Plugin) : IBotController {
      * 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
+     * @return a status message if the event is type DiscordMessageWrapper and is sent via DM, null otherwise
      */
     @BotCommand(usage="", description="Deny an alias link request", relayTriggerMessage = false)
     @DiscordExclusiveCommand
     @PrivateResponse
     private fun deny(event: IEventWrapper): String? {
-        if (event !is MessageWrapper) return null
+        if (event !is DiscordMessageWrapper) 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")
+        db.logDebug("user ${event.senderName} denies an alias request")
 
-        val ua = plugin.requests.find { it.discordId == event.senderId } ?: return "You have no alias requests pending."
+        val ua = db.requests.find { it.discordId == event.senderId } ?: return "You have no alias requests pending."
 
-        plugin.requests.remove(ua)
+        db.requests.remove(ua)
         return "The alias link request has been cancelled."
     }
 
@@ -86,7 +85,7 @@ class UtilCommandsController(val plugin: Plugin) : IBotController {
      * @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)
+    @BotCommand(usage="<reload|linkalias|listmembers|unlinkalias> [args...]", description = "For in-game functions", relayTriggerMessage = false, squishExcessArgs = true)
     @MinecraftExclusiveCommand
     @PrivateResponse
     private fun discord(event: IEventWrapper, argString: String): String? {
@@ -101,19 +100,19 @@ class UtilCommandsController(val plugin: Plugin) : IBotController {
 
         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: " +
+                if (event.sender is IPlayer && !event.sender.hasPermission("discordbridge.discord.reload")) {
+                    event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").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!") })
+                    db.reload(Runnable { event.sender.sendMessage("${CC.DARK_GREEN}Discord Bridge has reloaded!") })
                 }
             }
             "linkalias" -> {
-                if (event.sender !is Player) return null
+                if (event.sender !is IPlayer) return null
 
                 if (!event.sender.hasPermission("discordbridge.discord.linkalias")) {
-                    event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${Config.BOT_MC_USERNAME.stripColor()} whispers to you: " +
+                    event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                             "Sorry, you don't have permission to use that command.")
                 }
 
@@ -122,7 +121,7 @@ class UtilCommandsController(val plugin: Plugin) : IBotController {
                     return null
                 }
 
-                val ua = UserAliasConfig.aliases.firstOrNull{it.mcUuid == event.sender.uniqueId}
+                val ua = UserAliasConfig.aliases.firstOrNull{it.mcUuid == event.sender.getUUID()}
                 if (ua != null) {
                     event.sender.sendMessage("${CC.YELLOW}You already have an alias linked with Discord user " +
                             "${Connection.JDA.getUserById(ua.discordId)}. " +
@@ -130,7 +129,7 @@ class UtilCommandsController(val plugin: Plugin) : IBotController {
                     return null
                 }
 
-                val pendingRequest = plugin.requests.firstOrNull{it.mcUuid == event.sender.uniqueId}
+                val pendingRequest = db.requests.firstOrNull{it.mcUuid == event.sender.getUUID()}
                 if (pendingRequest != null) {
                     if (args.size < 3 || args[3] != "-u") {
                         event.sender.sendMessage("${CC.YELLOW}You already have an alias link request pending with " +
@@ -138,10 +137,10 @@ class UtilCommandsController(val plugin: Plugin) : IBotController {
                                 "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)
+                        db.requests.remove(pendingRequest)
                 }
 
-                val foundMember = plugin.registerUserRequest(event.sender, args[1])
+                val foundMember = db.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.")
@@ -153,26 +152,26 @@ class UtilCommandsController(val plugin: Plugin) : IBotController {
                     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: " +
+                if (event.sender is IPlayer && !event.sender.hasPermission("discordbridge.discord.listmembers")) {
+                    event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").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())
+                    "all" -> event.sender.sendMessage(db.getDiscordMembersAll())
+                    "online" -> event.sender.sendMessage(db.getDiscordMembersOnline())
                     else -> event.sender.sendMessage("${CC.YELLOW}Usage: /discord listmembers <all/online>")
                 }
             }
             "unlinkalias" -> {
-                if (event.sender !is Player) return null
+                if (event.sender !is IPlayer) return null
 
-                val ua = UserAliasConfig.aliases.firstOrNull{it.mcUuid == event.sender.uniqueId}
+                val ua = UserAliasConfig.aliases.firstOrNull{it.mcUuid == event.sender.getUUID()}
                 if (ua == null) {
                     event.sender.sendMessage("${CC.YELLOW}You do not have an alias to unlink.")
                     return null
                 }
-                UserAliasConfig.remove(plugin, ua)
+                UserAliasConfig.remove(db, ua)
                 event.sender.sendMessage("${CC.YELLOW}Alias link with Discord user ${Connection.JDA.getUserById(ua.discordId)} " +
                         "succeessfully removed.")
             }
@@ -192,11 +191,11 @@ class UtilCommandsController(val plugin: Plugin) : IBotController {
     @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")
+        db.logger.info("Entered 'help'")
+        db.logDebug("user ${event.senderName} requested help")
         when (event) {
-            is AsyncPlayerChatEventWrapper -> {
-                val player = event.event.player
+            is MinecraftChatEventWrapper -> {
+                val player = 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) {
@@ -208,10 +207,10 @@ class UtilCommandsController(val plugin: Plugin) : IBotController {
                     player.sendMessage(out)
                 }
             }
-            is MessageWrapper -> {
-                plugin.logger.info("MessageWrapper detected!")
+            is DiscordMessageWrapper -> {
+                db.logger.info("DiscordMessageWrapper detected!")
                 event.originalMessage.author.openPrivateChannel().queue({p ->
-                    plugin.logger.info("RestAction returned: $p")
+                    db.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) {
@@ -223,7 +222,7 @@ class UtilCommandsController(val plugin: Plugin) : IBotController {
                         p.sendMessage(out).queue()
                     }
                 })
-                plugin.logger.info("Continuing non-blocking thread")
+                db.logger.info("Continuing non-blocking thread")
             }
         }
     }
@@ -237,16 +236,16 @@ class UtilCommandsController(val plugin: Plugin) : IBotController {
     @BotCommand(usage="", description = "List all Minecraft players currently online on the server",
             relayTriggerMessage = false)
     private fun serverList(event: IEventWrapper) {
-        if (event !is MessageWrapper) return
-        plugin.logDebug("user ${event.originalMessage.author.name} has requested a listing of online players")
+        if (event !is DiscordMessageWrapper) return
+        db.logDebug("user ${event.originalMessage.author.name} has requested a listing of online players")
 
-        val players = plugin.getOnlinePlayers()
+        val players = db.getOnlinePlayers()
         if (players.isEmpty()) {
-            plugin.sendToDiscord("Nobody is currently online.", event.channel)
+            db.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, event.channel)
+        db.sendToDiscord(response, event.channel)
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
similarity index 79%
rename from src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
index d5b9295..4259699 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
@@ -1,7 +1,6 @@
 package gg.obsidian.discordbridge.discord
 
-import gg.obsidian.discordbridge.Config
-import gg.obsidian.discordbridge.Plugin
+import gg.obsidian.discordbridge.DiscordBridge
 import net.dv8tion.jda.core.AccountType
 import net.dv8tion.jda.core.JDA
 import net.dv8tion.jda.core.JDABuilder
@@ -13,7 +12,7 @@ import net.dv8tion.jda.core.entities.*
  * This object is designed to run asynchronously on its own thread.
  */
 object Connection: Runnable {
-    lateinit var plugin: Plugin
+    lateinit var db: DiscordBridge
     lateinit var JDA: JDA
     private lateinit var listener: Listener
     var server: Guild? = null
@@ -26,7 +25,7 @@ object Connection: Runnable {
         try {
             connect()
         } catch (e: Exception) {
-            plugin.logger.severe("Error connecting to Discord: " + e)
+            db.logger.severe("Error connecting to Discord: " + e)
         }
     }
 
@@ -36,8 +35,8 @@ object Connection: Runnable {
      * @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
+        server = if (server == null) getServerById(db.getConfig().getString("server-id", "")) else server
+        channel = if (channel == null) getGroupByName(server!!, db.getConfig().getString("channel", "")) else channel
         return channel
     }
 
@@ -49,7 +48,7 @@ object Connection: Runnable {
      */
     fun send(message: String, toChannel: MessageChannel?) {
         if (toChannel == null) {
-            plugin.logger.severe("Could not send message to Discord: Channel is not defined")
+            db.logger.severe("Could not send message to Discord: Channel is not defined")
             return
         }
         toChannel.sendMessage(message).queue()
@@ -60,7 +59,7 @@ object Connection: Runnable {
      */
     fun reconnect(callback: Runnable) {
         //disconnect
-        if (Config.ANNOUNCE_SERVER_START_STOP)
+        if (db.getConfig().getBoolean("announce-server-start-stop", true))
             send("Refreshing Discord connection...", getRelayChannel())
         JDA.removeEventListener(listener)
         server = null
@@ -99,13 +98,13 @@ object Connection: Runnable {
      */
     private fun connect() {
         var builder = JDABuilder(AccountType.BOT).setAudioEnabled(true)
-        builder = builder.setToken(Config.TOKEN)
+        builder = builder.setToken(db.getConfig().getString("token", ""))
         JDA = builder.buildBlocking()
-        listener = Listener(plugin)
+        listener = Listener(db)
         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]}")
+        if (db.getConfig().getBoolean("announce-server-start-stop", true))
+            send(db.getConfig().getString("templates.discord.server-start", "Server started!"), getRelayChannel())
+        JDA.presence.game = Game.of("Minecraft ${db.getServer().getMinecraftShortVersion()}")
     }
 
     /**
@@ -128,4 +127,4 @@ object Connection: Runnable {
     private fun getServerById(id: String): Guild? {
         return JDA.guilds.firstOrNull { it.id.equals(id, true) }
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
similarity index 60%
rename from src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
index e9b78a6..9b7ffb4 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
@@ -1,7 +1,7 @@
 package gg.obsidian.discordbridge.discord
 
-import gg.obsidian.discordbridge.Plugin
-import gg.obsidian.discordbridge.commands.MessageWrapper
+import gg.obsidian.discordbridge.DiscordBridge
+import gg.obsidian.discordbridge.commands.DiscordMessageWrapper
 import gg.obsidian.discordbridge.commands.controllers.BotControllerManager
 import gg.obsidian.discordbridge.commands.controllers.FunCommandsController
 import gg.obsidian.discordbridge.commands.controllers.UtilCommandsController
@@ -13,13 +13,13 @@ import net.dv8tion.jda.core.hooks.ListenerAdapter
  *
  * @param plugin a reference to the base Plugin object
  */
-class Listener(val plugin: Plugin) : ListenerAdapter() {
+class Listener(val db: DiscordBridge) : ListenerAdapter() {
 
-    private val controllerManager = BotControllerManager(plugin)
+    private val controllerManager = BotControllerManager(db)
 
     init {
-        controllerManager.registerController(FunCommandsController(plugin), discordExclusive = true, chatExclusive = true)
-        controllerManager.registerController(UtilCommandsController(plugin), discordExclusive = true, chatExclusive = true)
+        controllerManager.registerController(FunCommandsController(db), discordExclusive = true, chatExclusive = true)
+        controllerManager.registerController(UtilCommandsController(db), discordExclusive = true, chatExclusive = true)
     }
 
     /**
@@ -28,15 +28,15 @@ class Listener(val plugin: Plugin) : ListenerAdapter() {
      * @param event the MessageReceivedEvent object
      */
     override fun onMessageReceived(event: MessageReceivedEvent) {
-        plugin.logDebug("Received message ${event.message.id} from Discord - ${event.message.rawContent}")
+        db.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")
+            db.logDebug("Ignoring message ${event.message.id} from Discord: it matches this bot's username")
             return
         }
 
-        controllerManager.dispatchMessage(MessageWrapper(event.message))
+        controllerManager.dispatchMessage(DiscordMessageWrapper(db, event.message))
     }
 
-}
+}
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/ChatColor.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/ChatColor.kt
new file mode 100644
index 0000000..fa2e34b
--- /dev/null
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/ChatColor.kt
@@ -0,0 +1,152 @@
+package gg.obsidian.discordbridge.util
+
+import org.apache.commons.lang.Validate
+import java.util.regex.Pattern
+
+private const val COLOR_CHAR = '\u00A7'
+
+/**
+ * All supported color values for chat
+ */
+enum class ChatColor private constructor(
+        val char: Char, private val intCode: Int,
+        val isFormat: Boolean = false) {
+    BLACK('0', 0x00),
+    DARK_BLUE('1', 0x1),
+    DARK_GREEN('2', 0x2),
+    DARK_AQUA('3', 0x3),
+    DARK_RED('4', 0x4),
+    DARK_PURPLE('5', 0x5),
+    GOLD('6', 0x6),
+    GRAY('7', 0x7),
+    DARK_GRAY('8', 0x8),
+    BLUE('9', 0x9),
+    GREEN('a', 0xA),
+    AQUA('b', 0xB),
+    RED('c', 0xC),
+    LIGHT_PURPLE('d', 0xD),
+    YELLOW('e', 0xE),
+    WHITE('f', 0xF),
+    MAGIC('k', 0x10, true),
+    BOLD('l', 0x11, true),
+    STRIKETHROUGH('m', 0x12, true),
+    UNDERLINE('n', 0x13, true),
+    ITALIC('o', 0x14, true),
+    RESET('r', 0x15);
+
+    private val toString: String = String(charArrayOf(COLOR_CHAR, char))
+
+    val isColor: Boolean
+        get() = !isFormat && this != RESET
+
+    override fun toString(): String {
+        return toString
+    }
+
+    companion object {
+
+        /**
+         * The special character which prefixes all chat colour codes. Use this if
+         * you need to dynamically convert colour codes from your custom format.
+         */
+        private val STRIP_COLOR_PATTERN = Pattern.compile("(?i)" + getColorChar().toString() + "[0-9A-FK-OR]")
+        private val BY_ID = HashMap<Int, ChatColor>()
+        private val BY_CHAR = HashMap<Char, ChatColor>()
+
+        fun getColorChar(): Char = '\u00A7'
+
+        /**
+         * Gets the color represented by the specified color code
+         *
+         * @param code Code to check
+         * @return Associative [org.bukkit.ChatColor] with the given code,
+         * or null if it doesn't exist
+         */
+        fun getByChar(code: Char): ChatColor? {
+            return BY_CHAR[code]
+        }
+
+        /**
+         * Gets the color represented by the specified color code
+         *
+         * @param code Code to check
+         * @return Associative [org.bukkit.ChatColor] with the given code,
+         * or null if it doesn't exist
+         */
+        fun getByChar(code: String): ChatColor {
+            Validate.notNull(code, "Code cannot be null")
+            Validate.isTrue(code.length > 0, "Code must have at least one char")
+
+            return BY_CHAR[code[0]]!!
+        }
+
+        /**
+         * Strips the given message of all color codes
+         *
+         * @param input String to strip of color
+         * @return A copy of the input string, without any coloring
+         */
+        fun stripColor(input: String): String {
+            return STRIP_COLOR_PATTERN.matcher(input).replaceAll("")
+        }
+
+        /**
+         * Translates a string using an alternate color code character into a
+         * string that uses the internal ChatColor.COLOR_CODE color code
+         * character. The alternate color code character will only be replaced if
+         * it is immediately followed by 0-9, A-F, a-f, K-O, k-o, R or r.
+         *
+         * @param altColorChar The alternate color code character to replace. Ex: &
+         * @param textToTranslate Text containing the alternate color code character.
+         * @return Text containing the ChatColor.COLOR_CODE color code character.
+         */
+        fun translateAlternateColorCodes(altColorChar: Char, textToTranslate: String): String {
+            val b = textToTranslate.toCharArray()
+            for (i in 0 until b.size - 1) {
+                if (b[i] == altColorChar && "0123456789AaBbCcDdEeFfKkLlMmNnOoRr".indexOf(b[i + 1]) > -1) {
+                    b[i] = ChatColor.getColorChar()
+                    b[i + 1] = Character.toLowerCase(b[i + 1])
+                }
+            }
+            return String(b)
+        }
+
+        /**
+         * Gets the ChatColors used at the end of the given input string.
+         *
+         * @param input Input string to retrieve the colors from.
+         * @return Any remaining ChatColors to pass onto the next line.
+         */
+        fun getLastColors(input: String): String {
+            var result = ""
+            val length = input.length
+
+            // Search backwards from the end as it is faster
+            for (index in length - 1 downTo -1 + 1) {
+                val section = input[index]
+                if (section == COLOR_CHAR && index < length - 1) {
+                    val c = input[index + 1]
+                    val color = getByChar(c)
+
+                    if (color != null) {
+                        result = color.toString() + result
+
+                        // Once we find a color or reset we can stop searching
+                        if (color.isColor || color == RESET) {
+                            break
+                        }
+                    }
+                }
+            }
+
+            return result
+        }
+
+        init {
+            for (color in values()) {
+                BY_ID.put(color.intCode, color)
+                BY_CHAR.put(color.char, color)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/utils/MarkdownToMinecraftSeralizer.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/MarkdownToMinecraftSeralizer.kt
similarity index 99%
rename from src/main/kotlin/gg/obsidian/discordbridge/utils/MarkdownToMinecraftSeralizer.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/MarkdownToMinecraftSeralizer.kt
index f56f1a7..d48be44 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/utils/MarkdownToMinecraftSeralizer.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/MarkdownToMinecraftSeralizer.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.utils
+package gg.obsidian.discordbridge.util
 
 import org.parboiled.common.Preconditions
 import org.pegdown.Printer
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Rating.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Rating.kt
new file mode 100644
index 0000000..34d92d0
--- /dev/null
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Rating.kt
@@ -0,0 +1,28 @@
+package gg.obsidian.discordbridge.util
+
+//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
+ */
+data class Rating(val message: String = "%u - I rate %m %r") {
+
+    var low: Double
+    var high: Double
+
+    init {
+        low = 0.0
+        high = 0.0
+    }
+
+    constructor(map: MutableMap<String, Any>):
+            this(map["message"] as String) {
+        low = if(map["low"] is Double) map["low"] as Double else (map["low"] as Int).toDouble()
+        high = if(map["high"] is Double) map["high"] as Double else (map["high"] as Int).toDouble()
+    }
+
+    constructor(message: String, low: Double = 0.0, high: Double = 0.0): this(message)
+}
\ No newline at end of file
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/utils/Respect.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Respect.kt
similarity index 52%
rename from src/main/kotlin/gg/obsidian/discordbridge/utils/Respect.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Respect.kt
index 9313bb2..a89c9e4 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/utils/Respect.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Respect.kt
@@ -1,7 +1,4 @@
-package gg.obsidian.discordbridge.utils
-
-import org.bukkit.configuration.serialization.ConfigurationSerializable
-import org.bukkit.configuration.serialization.SerializableAs
+package gg.obsidian.discordbridge.util
 
 //TODO: make null safe
 /**
@@ -11,14 +8,9 @@ import org.bukkit.configuration.serialization.SerializableAs
  * @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 {
+data class Respect(val message: String = "%u solemnly pays respect!", val count: Int = 1, val weight: Int = 1) {
     @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/Script.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Script.kt
similarity index 57%
rename from src/main/kotlin/gg/obsidian/discordbridge/utils/Script.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Script.kt
index b46d7cb..9eda520 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/utils/Script.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Script.kt
@@ -1,7 +1,4 @@
-package gg.obsidian.discordbridge.utils
-
-import org.bukkit.configuration.serialization.ConfigurationSerializable
-import org.bukkit.configuration.serialization.SerializableAs
+package gg.obsidian.discordbridge.util
 
 /**
  * Represents a Script entry in script.yml
@@ -14,27 +11,13 @@ import org.bukkit.configuration.serialization.SerializableAs
  * @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?,
-                  val startsWith: Boolean?): ConfigurationSerializable {
+                  val startsWith: Boolean?) {
     @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/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UserAlias.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UserAlias.kt
new file mode 100644
index 0000000..0fc90d6
--- /dev/null
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UserAlias.kt
@@ -0,0 +1,20 @@
+package gg.obsidian.discordbridge.util
+
+import java.io.Serializable
+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
+ */
+data class UserAlias(val mcUuid: UUID, val discordId: String): Serializable {
+
+    constructor(): this(UUID.fromString("null"), "null")
+
+    constructor(map: MutableMap<String, Any>):
+            this(UUID.fromString(map["mcUuid"] as String), map["discordId"] as String)
+
+}
\ No newline at end of file
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/utils/UtilFunctions.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt
similarity index 60%
rename from src/main/kotlin/gg/obsidian/discordbridge/utils/UtilFunctions.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt
index ca4668c..20ae52d 100644
--- a/src/main/kotlin/gg/obsidian/discordbridge/utils/UtilFunctions.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt
@@ -1,8 +1,7 @@
-package gg.obsidian.discordbridge.utils
+package gg.obsidian.discordbridge.util
 
-import gg.obsidian.discordbridge.Config
-import org.bukkit.ChatColor
-import org.bukkit.entity.Player
+import gg.obsidian.discordbridge.DiscordBridge
+import gg.obsidian.discordbridge.wrappers.IPlayer
 
 /**
  * Various utility functions
@@ -28,8 +27,8 @@ object UtilFunctions {
      * @return the formatted string
      */
     @JvmStatic
-    fun String.toMinecraftChatMessage(alias: String): String {
-        return formatMessage(Config.TEMPLATES_MINECRAFT_CHAT_MESSAGE, msg = this, u = alias, w = "Discord")
+    fun String.toMinecraftChatMessage(db: DiscordBridge, alias: String): String {
+        return formatMessage(db.getConfig().getString("templates.minecraft.chat-message", "[&b&lDiscord&r]<%u> %m"), msg = this, u = alias, w = "Discord")
     }
 
     /**
@@ -40,8 +39,8 @@ object UtilFunctions {
      * @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)
+    fun String.toDiscordChatMessage(db: DiscordBridge, username: String, worldName: String): String {
+        return formatMessage(db.getConfig().getString("templates.discord.chat-message", "<**%u**> %m"), msg = this, u = username, w = worldName)
     }
 
     /**
@@ -51,8 +50,8 @@ object UtilFunctions {
      * @return the formatted string
      */
     @JvmStatic
-    fun Player.toDiscordPlayerJoin(worldName: String): String {
-        return formatMessage(Config.TEMPLATES_DISCORD_PLAYER_JOIN, u = this.name.stripColor(), w = worldName)
+    fun IPlayer.toDiscordPlayerJoin(db: DiscordBridge, worldName: String): String {
+        return formatMessage(db.getConfig().getString("templates.discord.player-join", "**%u** joined the server"), u = this.getName().stripColor(), w = worldName)
     }
 
     /**
@@ -62,8 +61,8 @@ object UtilFunctions {
      * @return the formatted string
      */
     @JvmStatic
-    fun Player.toDiscordPlayerLeave(worldName: String): String {
-        return formatMessage(Config.TEMPLATES_DISCORD_PLAYER_LEAVE, u = this.name.stripColor(), w = worldName)
+    fun IPlayer.toDiscordPlayerLeave(db: DiscordBridge, worldName: String): String {
+        return formatMessage(db.getConfig().getString("templates.discord.player-leave", "**%u** left the server"), u = this.getName().stripColor(), w = worldName)
     }
 
     /**
@@ -74,8 +73,8 @@ object UtilFunctions {
      * @return the formatted string
      */
     @JvmStatic
-    fun String.toDiscordPlayerDeath(username: String, worldName: String): String {
-        return formatMessage(Config.TEMPLATES_DISCORD_CHAT_MESSAGE, msg = this, u = username, w = worldName)
+    fun String.toDiscordPlayerDeath(db: DiscordBridge, username: String, worldName: String): String {
+        return formatMessage(db.getConfig().getString("templates.discord.player-death", "%m"), msg = this, u = username, w = worldName)
     }
 
     /**
@@ -88,7 +87,7 @@ object UtilFunctions {
      */
     @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)
+        var out = ChatColor.translateAlternateColorCodes('&', template)
         out = out.replace("%u", u).replace("%m", msg).replace("%w", w)
         return out
     }
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ICommand.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ICommand.kt
new file mode 100644
index 0000000..b9e4286
--- /dev/null
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ICommand.kt
@@ -0,0 +1,5 @@
+package gg.obsidian.discordbridge.wrappers
+
+interface ICommand {
+    fun getName(): String
+}
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ICommandSender.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ICommandSender.kt
new file mode 100644
index 0000000..e698647
--- /dev/null
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ICommandSender.kt
@@ -0,0 +1,10 @@
+package gg.obsidian.discordbridge.wrappers
+
+import java.util.*
+
+interface ICommandSender {
+    fun getName(): String
+    fun getUUID(): UUID
+    fun sendMessage(message: String)
+    fun hasPermission(permission: String): Boolean
+}
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IConsoleSender.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IConsoleSender.kt
new file mode 100644
index 0000000..0252d89
--- /dev/null
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IConsoleSender.kt
@@ -0,0 +1,4 @@
+package gg.obsidian.discordbridge.wrappers
+
+interface IConsoleSender : ICommandSender {
+}
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IPlayer.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IPlayer.kt
new file mode 100644
index 0000000..ae58a6c
--- /dev/null
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IPlayer.kt
@@ -0,0 +1,6 @@
+package gg.obsidian.discordbridge.wrappers
+
+interface IPlayer : ICommandSender {
+    fun getWorld(): IWorld
+    fun isVanished(): Boolean
+}
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IScheduler.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IScheduler.kt
new file mode 100644
index 0000000..4ebf373
--- /dev/null
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IScheduler.kt
@@ -0,0 +1,5 @@
+package gg.obsidian.discordbridge.wrappers
+
+interface IScheduler {
+    fun runAsyncTask(task: Runnable)
+}
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IServer.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IServer.kt
new file mode 100644
index 0000000..e2edc32
--- /dev/null
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IServer.kt
@@ -0,0 +1,29 @@
+package gg.obsidian.discordbridge.wrappers
+
+import net.dv8tion.jda.core.entities.MessageChannel
+import java.util.*
+import java.util.logging.Logger
+
+interface IServer {
+
+    fun getScheduler(): IScheduler
+
+    fun getVersion(): String
+
+    fun getMinecraftShortVersion(): String
+
+    fun getPlayer(uuid: UUID): IPlayer
+
+    fun getPlayer(name: String): IPlayer
+
+    fun getOnlinePlayers(): List<IPlayer>
+
+    fun broadcastMessage(message: String)
+
+    fun getRemoteConsoleSender(): IConsoleSender
+
+    fun dispatchCommand(channel: MessageChannel, command: String)
+
+    fun getLogger(): Logger
+
+}
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IWorld.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IWorld.kt
new file mode 100644
index 0000000..ca87935
--- /dev/null
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IWorld.kt
@@ -0,0 +1,5 @@
+package gg.obsidian.discordbridge.wrappers
+
+interface IWorld {
+    fun getName(): String
+}
\ No newline at end of file
diff --git a/src/main/resources/8ball.yml b/discordbridge-core/src/main/resources/8ball.yml
similarity index 100%
rename from src/main/resources/8ball.yml
rename to discordbridge-core/src/main/resources/8ball.yml
diff --git a/src/main/resources/config.yml b/discordbridge-core/src/main/resources/config.yml
similarity index 100%
rename from src/main/resources/config.yml
rename to discordbridge-core/src/main/resources/config.yml
diff --git a/src/main/resources/f.yml b/discordbridge-core/src/main/resources/f.yml
similarity index 60%
rename from src/main/resources/f.yml
rename to discordbridge-core/src/main/resources/f.yml
index 9fb8942..f49fa83 100644
--- a/src/main/resources/f.yml
+++ b/discordbridge-core/src/main/resources/f.yml
@@ -15,19 +15,17 @@ total-respects: 0
 # 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
+-   message: '%u solemnly pays respect (Total respects paid: %t)'
+    respects-paid: 1
+    weight: 65
+-   message: '%u sheds a single tear and pays %c respects! (Total respects paid: %t)'
+    respects-paid: 2
+    weight: 30
+-   message: '%u manages to give %c respects through their heavy sobbing! (Total respects
+        paid: %t)'
+    respects-paid: 3
+    weight: 4
+-   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/insult.yml b/discordbridge-core/src/main/resources/insult.yml
similarity index 100%
rename from src/main/resources/insult.yml
rename to discordbridge-core/src/main/resources/insult.yml
diff --git a/src/main/resources/rate.yml b/discordbridge-core/src/main/resources/rate.yml
similarity index 60%
rename from src/main/resources/rate.yml
rename to discordbridge-core/src/main/resources/rate.yml
index 8162f6c..765160e 100644
--- a/src/main/resources/rate.yml
+++ b/discordbridge-core/src/main/resources/rate.yml
@@ -28,51 +28,51 @@ translate-first-and-second-person: true
 # 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
+  -
+    high: 0
+    low: 0
+    message: "I rate %m 0/10, absolutely awful"
+  -
+    high: 0.9
+    low: 0.1
+    message: "I rate %m a shitty %r"
+  -
+    high: 1.9
+    low: 1.0
+    message: "I rate %m a very low %r"
+  -
+    high: 2.9
+    low: 2.0
+    message: "I rate %m a low %r"
+  -
+    high: 3.9
+    low: 3.0
+    message: "I rate %m a paltry %r"
+  -
+    high: 4.9
+    low: 4.0
+    message: "I rate %m a meh %r"
+  -
+    high: 5.9
+    low: 5.0
+    message: "I rate %m a solid %r"
+  -
+    high: 6.9
+    low: 6.0
+    message: "I rate %m a somewhat good %r"
+  -
+    high: 7.9
+    low: 7.0
+    message: "I rate %m a good %r"
+  -
+    high: 8.9
+    low: 8.0
+    message: "I rate %m a great %r"
+  -
+    high: 9.9
+    low: 9.0
+    message: "I rate %m a fantastic %r"
+  -
+    high: 10
+    low: 10
+    message: "I rate %m a perfect 10/10"
\ No newline at end of file
diff --git a/src/main/resources/script.yml b/discordbridge-core/src/main/resources/script.yml
similarity index 84%
rename from src/main/resources/script.yml
rename to discordbridge-core/src/main/resources/script.yml
index 8d5cacd..1a6014b 100644
--- a/src/main/resources/script.yml
+++ b/discordbridge-core/src/main/resources/script.yml
@@ -13,9 +13,9 @@
 # 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
+  -
+    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
diff --git a/src/main/resources/usernames.yml b/discordbridge-core/src/main/resources/usernames.yml
similarity index 100%
rename from src/main/resources/usernames.yml
rename to discordbridge-core/src/main/resources/usernames.yml
diff --git a/settings.gradle b/settings.gradle
index 6a465db..fc8eddd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,4 @@
 rootProject.name = 'DiscordBridge'
+include 'discordbridge-core'
+include 'discordbridge-bukkit'
+
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Config.kt b/src/main/kotlin/gg/obsidian/discordbridge/Config.kt
deleted file mode 100644
index abdd864..0000000
--- a/src/main/kotlin/gg/obsidian/discordbridge/Config.kt
+++ /dev/null
@@ -1,87 +0,0 @@
-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 = ""
-    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
-    var ANNOUNCE_SERVER_START_STOP = true
-
-    // Toggle message types
-    var MESSAGES_CHAT = true
-    var MESSAGES_JOIN = true
-    var MESSAGES_LEAVE = true
-    var MESSAGES_DEATH = false
-
-    // What to do if player is vanished
-    var IF_VANISHED_CHAT = false
-    var IF_VANISHED_JOIN = false
-    var IF_VANISHED_LEAVE = false
-    var IF_VANISHED_DEATH = false
-
-    // Discord message templates
-    var TEMPLATES_DISCORD_CHAT_MESSAGE = ""
-    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 = ""
-
-    /**
-     * Load values into memory from the config file
-     * @param plugin the base Plugin object
-     */
-    fun load(plugin: Plugin) {
-        plugin.reloadConfig()
-
-        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", "")
-        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)
-        ANNOUNCE_SERVER_START_STOP = plugin.config.getBoolean("announce-server-start-stop", true)
-
-        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("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("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", "%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 = ChatColor.translateAlternateColorCodes('&', 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
deleted file mode 100644
index e3004e6..0000000
--- a/src/main/kotlin/gg/obsidian/discordbridge/DataConfigAccessor.kt
+++ /dev/null
@@ -1,100 +0,0 @@
-package gg.obsidian.discordbridge
-
-/*
-* 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
-* 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 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
-* SOFTWARE.
-*
-* NOTE: This code has been modified from Java to Kotlin. The functionality is largely identical.
-*/
-
-import org.bukkit.configuration.file.FileConfiguration
-import org.bukkit.configuration.file.YamlConfiguration
-import java.io.File
-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?
-    private var fileConfiguration: FileConfiguration? = null
-
-    init {
-        plugin.dataFolder ?: throw IllegalStateException()
-        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)
-        } catch (e: IllegalArgumentException) {
-            // Look for defaults in the jar
-            if (plugin.getResource(fileName) == null)
-                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
-        }
-    }
-
-    val data: FileConfiguration
-        get() {
-            if (fileConfiguration == null)
-                this.reloadConfig()
-            return fileConfiguration!!
-        }
-
-    /**
-     * Writes the current memory contents of the config back to file
-     */
-    fun saveConfig() {
-        if (fileConfiguration == null || configFile == null)
-            return
-        else {
-            try {
-                data.save(configFile)
-            } catch (ex: IOException) {
-                plugin.logger.log(Level.SEVERE, "Could not save data to $fileName", ex)
-            }
-        }
-    }
-
-    /**
-     * 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())
-            plugin.saveResource(fileName, false)
-    }
-
-}
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt b/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
deleted file mode 100644
index b84c691..0000000
--- a/src/main/kotlin/gg/obsidian/discordbridge/Plugin.kt
+++ /dev/null
@@ -1,341 +0,0 @@
-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
-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
-
-/**
- * The primary Plugin class that maintains the plugin's connection with Bukkit
- */
-class Plugin : JavaPlugin() {
-
-    // Configs
-    var users: DataConfigAccessor = DataConfigAccessor(this, dataFolder, "usernames.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
-
-    // Markdown deserializer
-    var pegDownProc = PegDownProcessor()
-
-    // Temporary storage for alias linking requests
-    var requests: MutableList<UserAlias> = mutableListOf()
-
-    /**
-     * 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")
-        ConfigurationSerialization.registerClass(UserAlias::class.java, "UserAlias")
-
-        // Load configs
-        updateConfig(description.version)
-        if (isMultiverseInstalled) worlds = DataConfigAccessor(this, File("plugins/Multiverse-Core"), "worlds.yml")
-
-        // Connect to Discord
-        Connection.plugin = this //TODO: enforce this better
-        server.scheduler.runTaskAsynchronously(this, Connection)
-        server.pluginManager.registerEvents(EventListener(this), this)
-
-        // Register commands
-        //TODO: automate this?
-        getCommand("discord").executor = CommandListener(this)
-        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)
-    }
-
-    /**
-     * 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())
-
-        // Pretend like this does anything
-        logger.log(Level.INFO, "Attempting to cancel tasks")
-        server.scheduler.cancelTasks(this)
-    }
-
-    /*======================================
-      Messaging Functions
-    ===================================== */
-
-    /**
-     * 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)
-    }
-
-    /**
-     * Broadcast a message on the Minecraft server
-     *
-     * @param message the message to send
-     */
-    fun sendToMinecraft(message: String) {
-        server.broadcastMessage(message)
-    }
-
-    /*===========================================
-      Util
-    ===========================================*/
-
-    /**
-     * Reloads all configs and the JDA connection
-     */
-    fun reload(callback: Runnable) {
-        reloadConfig()
-        users.reloadConfig()
-        eightball.reloadConfig()
-        insult.reloadConfig()
-        f.reloadConfig()
-        rate.reloadConfig()
-        script.reloadConfig()
-        if (isMultiverseInstalled) worlds!!.reloadConfig()
-        Config.load(this)
-        UserAliasConfig.load(this)
-        Connection.reconnect(callback)
-    }
-
-    /**
-     * Saves all default configs where configs do not exist and reloads data from file into memory
-     */
-    private fun updateConfig(version: String) {
-        this.saveDefaultConfig()
-        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)
-    }
-
-    /**
-     * 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("[DiscordBridge] $msg")
-    }
-
-    /**
-     * @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()
-        players.mapTo(names) { it.name }
-        return names.toList()
-    }
-
-    /**
-     * 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
-
-        val ua = 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'."
-        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 getDiscordMembersAll(): String {
-        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."
-
-        var response = "${CC.YELLOW}Discord users:"
-        for (user in users) {
-            response += if (user.user.isBot) "\n${CC.GOLD}- ${user.effectiveName} (Bot) | ${user.user.name}#${user.user.discriminator}${CC.RESET}"
-            else "\n${CC.YELLOW}- ${user.effectiveName} | ${user.user.name}#${user.user.discriminator}${CC.RESET}"
-        }
-        return response.trim()
-    }
-
-    /**
-     * @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())
-            return "${CC.YELLOW}No Discord members could be found. Either server is empty or an error has occurred."
-
-        var response = ""
-        if (onlineUsers.any { it.onlineStatus == OnlineStatus.ONLINE }) {
-            response += "\n${CC.DARK_GREEN}Online:${CC.RESET}"
-            for (user in onlineUsers.filter { it.onlineStatus == OnlineStatus.ONLINE }) {
-                response += if (user.user.isBot) "\n${CC.DARK_GREEN}- ${user.effectiveName} (Bot)${CC.RESET}"
-                else "\n${CC.DARK_GREEN}- ${user.effectiveName}${CC.RESET}"
-            }
-        }
-        if (onlineUsers.any { it.onlineStatus == OnlineStatus.IDLE }) {
-            response += "\n${CC.YELLOW}Idle:${CC.RESET}"
-            for (user in onlineUsers.filter { it.onlineStatus == OnlineStatus.IDLE }) {
-                response += if (user.user.isBot) "\n${CC.YELLOW}- ${user.effectiveName} (Bot)${CC.RESET}"
-                else "\n${CC.YELLOW}- ${user.effectiveName}${CC.RESET}"
-            }
-        }
-        if (onlineUsers.any { it.onlineStatus == OnlineStatus.DO_NOT_DISTURB }) {
-            response += "\n${CC.RED}Do Not Disturb:${CC.RESET}"
-            for (user in onlineUsers.filter { it.onlineStatus == OnlineStatus.DO_NOT_DISTURB }) {
-                response += if (user.user.isBot) "\n${CC.RED}- ${user.effectiveName} (Bot)${CC.RESET}"
-                else "\n${CC.RED}- ${user.effectiveName}${CC.RESET}"
-            }
-        }
-
-        response.replaceFirst("\n", "")
-        return response.trim()
-    }
-
-    /*======================================
-      Message Formatting Functions
-    ===================================== */
-
-    /**
-     * 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
-
-        val discordusers = Connection.listUsers()
-        val discordaliases: MutableList<Pair<String, Member>> = mutableListOf()
-
-        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)
-
-            val found2: Pair<String, Member>? = discordaliases.firstOrNull {
-                it.first.toLowerCase() == match.groupValues[1].toLowerCase()
-            }
-            if (found2 != null) newMessage = newMessage.replaceFirst("@${match.groupValues[1]}", found2.second.asMention)
-        }
-
-        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)) {
-            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 modifiedMessage
-    }
-
-    /**
-     * 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) {
-            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)
-        }
-        return modifiedMessage
-    }
-
-    /**
-     * 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) {
-            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/gg/obsidian/discordbridge/UserAliasConfig.kt b/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
deleted file mode 100644
index 05e8b41..0000000
--- a/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-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() ?:
-                throw IllegalStateException("usernames.yml could not be read - list items are not properly formatted")
-        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)
-        plugin.users.saveConfig()
-        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)
-        plugin.users.saveConfig()
-        plugin.users.reloadConfig()
-    }
-
-    /**
-     * 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
-}
diff --git a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/CommandListener.kt b/src/main/kotlin/gg/obsidian/discordbridge/minecraft/CommandListener.kt
deleted file mode 100644
index 7063646..0000000
--- a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/CommandListener.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-package gg.obsidian.discordbridge.minecraft
-
-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
-
-/**
- * Listens for commands sent to the Minecraft server
- *
- * @param plugin a reference to the base Plugin object
- */
-class CommandListener(val plugin: Plugin) : CommandExecutor {
-
-    private val controllerManager = BotControllerManager(plugin)
-
-    init {
-        controllerManager.registerController(FunCommandsController(plugin), minecraftExclusive = true)
-        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))
-    }
-
-}
\ No newline at end of file
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 bdc4df2..0000000
--- a/src/main/kotlin/gg/obsidian/discordbridge/minecraft/EventListener.kt
+++ /dev/null
@@ -1,178 +0,0 @@
-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
-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 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 {
-
-    private val controllerManager = BotControllerManager(plugin)
-
-    init {
-        controllerManager.registerController(FunCommandsController(plugin), chatExclusive = true)
-        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}")
-        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
-
-        // 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)")
-                .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")
-
-        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()))
-    }
-
-    /**
-     * 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
-
-        // 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
-
-        // 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
-
-        // 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/Rating.kt b/src/main/kotlin/gg/obsidian/discordbridge/utils/Rating.kt
deleted file mode 100644
index 2c9dc98..0000000
--- a/src/main/kotlin/gg/obsidian/discordbridge/utils/Rating.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package gg.obsidian.discordbridge.utils
-
-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")
-    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/gg/obsidian/discordbridge/utils/UserAlias.kt b/src/main/kotlin/gg/obsidian/discordbridge/utils/UserAlias.kt
deleted file mode 100644
index 8331546..0000000
--- a/src/main/kotlin/gg/obsidian/discordbridge/utils/UserAlias.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package gg.obsidian.discordbridge.utils
-
-import org.bukkit.configuration.serialization.ConfigurationSerializable
-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")
-    constructor(map: MutableMap<String, Any>):
-            this(UUID.fromString(map["mcUuid"] as String), map["discordId"] as String)
-
-    override fun serialize(): MutableMap<String, Any> {
-        return mutableMapOf("mcUuid" to mcUuid.toString(), "discordId" to discordId)
-    }
-
-}
\ No newline at end of file

From 6c4e3c4d513cb096f74858ec4387f533d5f27d28 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Sun, 31 Dec 2017 03:18:04 -0600
Subject: [PATCH 02/30] Add basic Sponge module

Sponge module can relay messages and events, but cannot listen for
commands from Minecraft.

All logging is sent to STDERR for some reason.

Additionally, fixed incorrect config node paths that control
the relay of player events in core module.
---
 .../obsidian/discordbridge/wrappers/Server.kt |  4 +-
 .../obsidian/discordbridge/DiscordBridge.kt   | 48 +++++++------
 .../discordbridge/wrappers/IServer.kt         |  4 +-
 discordbridge-sponge/build.gradle             | 29 ++++++++
 .../discordbridge/DiscordBridgePlugin.kt      | 69 +++++++++++++++++++
 .../discordbridge/util/UtilFunctions.kt       |  5 ++
 .../discordbridge/wrappers/Command.kt         |  2 +
 .../discordbridge/wrappers/ConsoleSender.kt   |  2 +
 .../obsidian/discordbridge/wrappers/Player.kt | 33 +++++++++
 .../discordbridge/wrappers/Scheduler.kt       | 11 +++
 .../obsidian/discordbridge/wrappers/Server.kt | 55 +++++++++++++++
 .../obsidian/discordbridge/wrappers/World.kt  | 10 +++
 settings.gradle                               |  1 +
 13 files changed, 249 insertions(+), 24 deletions(-)
 create mode 100644 discordbridge-sponge/build.gradle
 create mode 100644 discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
 create mode 100644 discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt
 create mode 100644 discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Command.kt
 create mode 100644 discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ConsoleSender.kt
 create mode 100644 discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Player.kt
 create mode 100644 discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Scheduler.kt
 create mode 100644 discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
 create mode 100644 discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/World.kt

diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
index 40184f4..2fa2be2 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
@@ -24,11 +24,11 @@ class Server(val plugin: DiscordBridgePlugin, val bukkitServer: Server) : IServe
         return bukkitServer.bukkitVersion.split("-")[0]
     }
 
-    override fun getPlayer(uuid: UUID): IPlayer {
+    override fun getPlayer(uuid: UUID): IPlayer? {
         return Player(bukkitServer.getPlayer(uuid))
     }
 
-    override fun getPlayer(name: String): IPlayer {
+    override fun getPlayer(name: String): IPlayer? {
         return Player(bukkitServer.getPlayer(name))
     }
 
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
index e2d83cf..3b49f8b 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
@@ -203,7 +203,7 @@ class DiscordBridge(private val server: IServer, private val dataFolder: File) {
 
         val ua = UserAlias(player.getUUID(), found.user.id)
         requests.add(ua)
-        val msg = "Minecraft user '${server.getPlayer(ua.mcUuid).getName()}' has requested to become associated with your Discord" +
+        val msg = "Minecraft user '${player.getName()}' 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'."
         val member = Connection.JDA.getUserById(ua.discordId)
@@ -287,7 +287,10 @@ class DiscordBridge(private val server: IServer, private val dataFolder: File) {
 
         for (du in discordusers)
             for ((mcUuid, discordId) in UserAliasConfig.aliases)
-                if (discordId == du.user.id) discordaliases.add(Pair(server.getPlayer(mcUuid).getName(), du))
+                if (discordId == du.user.id) {
+                    val player = server.getPlayer(mcUuid)
+                    if (player != null) discordaliases.add(Pair(player.getName(), du))
+                }
 
         for (match in Regex("""(?:^| )@(\w+)""").findAll(message)) {
             val found: Member? = discordusers.firstOrNull {
@@ -331,10 +334,13 @@ class DiscordBridge(private val server: IServer, private val dataFolder: File) {
     fun translateAliasesToDiscord(message: String): String {
         var modifiedMessage = message
         for ((mcUuid, discordId) in UserAliasConfig.aliases) {
-            val nameMC = server.getPlayer(mcUuid).getName()
-            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)
+            val player = server.getPlayer(mcUuid)
+            if (player != null) {
+                val nameMC = player.getName()
+                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)
+            }
         }
         return modifiedMessage
     }
@@ -349,11 +355,14 @@ class DiscordBridge(private val server: IServer, private val dataFolder: File) {
     fun translateAliasesToMinecraft(message: String): String {
         var modifiedMessage = message
         for ((mcUuid, discordId) in UserAliasConfig.aliases) {
-            val nameMC = server.getPlayer(mcUuid).getName()
-            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)
+            val player = server.getPlayer(mcUuid)
+            if (player != null) {
+                val nameMC = player.getName()
+                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
     }
@@ -361,9 +370,9 @@ class DiscordBridge(private val server: IServer, private val dataFolder: File) {
     fun handlePlayerChat(player: IPlayer, message: String, isCancelled: Boolean): String {
         // TODO: the order of these if statements may produce undesired behavior
         logDebug("Received a chat event from ${player.getName()}: $message")
-        if (!getConfig().getBoolean("messages.chat", true)) return message
+        if (!getConfig().getBoolean("player-messages.chat", true)) return message
         if (isCancelled && !getConfig().getBoolean("relay-cancelled-messages", true)) return message
-        if (player.isVanished() && !getConfig().getBoolean("if-vanished.chat", false)) return message
+        if (player.isVanished() && !getConfig().getBoolean("if-vanished.player-chat", false)) return message
 
         // Emoticons!
         var newMessage = message.replace(":lenny:", "( \u0361\u00B0 \u035C\u0296 \u0361\u00B0)")
@@ -394,8 +403,8 @@ class DiscordBridge(private val server: IServer, private val dataFolder: File) {
         val username = player.getName()
         val worldname = player.getWorld().getName()
         logDebug("Received a join event for $username")
-        if (!getConfig().getBoolean("messages.join", true)) return
-        if (player.isVanished() && !getConfig().getBoolean("if-vanished.join", false)) return
+        if (!getConfig().getBoolean("messages.player-join", true)) return
+        if (player.isVanished() && !getConfig().getBoolean("if-vanished.player-join", false)) return
 
         // Get world alias if Multiverse is installed
 //        if (plugin.isMultiverseInstalled) {
@@ -415,8 +424,8 @@ class DiscordBridge(private val server: IServer, private val dataFolder: File) {
         val username = player.getName()
         val worldname = player.getWorld().getName()
         logDebug("Received a leave event for $username")
-        if (!getConfig().getBoolean("messages.leave", true)) return
-        if (player.isVanished() && !getConfig().getBoolean("if-vanished.leave", false)) return
+        if (!getConfig().getBoolean("messages.player-leave", true)) return
+        if (player.isVanished() && !getConfig().getBoolean("if-vanished.player-leave", false)) return
 
         // Get world alias if Multiverse is installed
 //        if (plugin.isMultiverseInstalled) {
@@ -436,9 +445,8 @@ class DiscordBridge(private val server: IServer, private val dataFolder: File) {
         val username = player.getName()
         val worldname = player.getWorld().getName()
 
-        logDebug("Received a death event for $username")
-        if (!getConfig().getBoolean("messages.death", false)) return
-        if (player.isVanished() && !getConfig().getBoolean("if-vanished.death", false)) return
+        if (!getConfig().getBoolean("messages.player-death", false)) return
+        if (player.isVanished() && !getConfig().getBoolean("if-vanished.player-death", false)) return
 
         // Get world alias if Multiverse is installed
 //        if (plugin.isMultiverseInstalled) {
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IServer.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IServer.kt
index e2edc32..96b4bfc 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IServer.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IServer.kt
@@ -12,9 +12,9 @@ interface IServer {
 
     fun getMinecraftShortVersion(): String
 
-    fun getPlayer(uuid: UUID): IPlayer
+    fun getPlayer(uuid: UUID): IPlayer?
 
-    fun getPlayer(name: String): IPlayer
+    fun getPlayer(name: String): IPlayer?
 
     fun getOnlinePlayers(): List<IPlayer>
 
diff --git a/discordbridge-sponge/build.gradle b/discordbridge-sponge/build.gradle
new file mode 100644
index 0000000..5f1d54a
--- /dev/null
+++ b/discordbridge-sponge/build.gradle
@@ -0,0 +1,29 @@
+apply plugin: 'kotlin'
+
+repositories {
+    mavenCentral()
+    maven { url 'https://github.com/DV8FromTheWorld/Maven-Repository/raw/master/repo' }
+    maven { url 'http://repo.spongepowered.org/Sponge/maven/' }
+    jcenter()
+}
+
+dependencies {
+    compile project(':discordbridge-core')
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    compile "org.spongepowered:spongeapi:6.0.0"
+
+    compile files('../libraries/dynmap-api-2.5-SNAPSHOT.jar')
+}
+
+sourceSets {
+    main.java.srcDirs += 'src/main/kotlin'
+}
+
+shadowJar {
+    dependencies {
+        include(project(':discordbridge-core'))
+        include(dependency("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"))
+        include(dependency("net.sf.trove4j:trove4j:3.0.3"))
+    }
+}
+build.dependsOn(shadowJar)
\ No newline at end of file
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
new file mode 100644
index 0000000..ff923d4
--- /dev/null
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
@@ -0,0 +1,69 @@
+package gg.obsidian.discordbridge
+
+import gg.obsidian.discordbridge.util.unwrap
+import gg.obsidian.discordbridge.wrappers.Player
+import gg.obsidian.discordbridge.wrappers.Server
+import org.spongepowered.api.Game
+import org.spongepowered.api.config.DefaultConfig
+import org.spongepowered.api.event.Listener
+import org.spongepowered.api.event.Order
+import org.spongepowered.api.event.entity.DestructEntityEvent
+import org.spongepowered.api.event.game.state.GameInitializationEvent
+import org.spongepowered.api.event.message.MessageChannelEvent
+import org.spongepowered.api.event.network.ClientConnectionEvent
+import org.spongepowered.api.plugin.Plugin
+import java.io.File
+import java.util.logging.Logger
+import javax.inject.Inject
+
+@Plugin(id = "discordbridge-obsidian", name = "DiscordBridge", version = "@VERSION")
+class DiscordBridgePlugin {
+
+    @Inject private lateinit var game: Game
+    @Inject @DefaultConfig(sharedRoot = false) private lateinit var defaultConfig: File
+
+    @Inject private lateinit var logger: Logger
+
+    private lateinit var core: DiscordBridge
+    private lateinit var instance: DiscordBridgePlugin
+
+    fun getPlugin() : DiscordBridgePlugin = instance
+
+    fun getCore() : DiscordBridge = core
+
+    fun getLogger() : Logger = logger
+
+    @Listener
+    fun onGameInitialization(event: GameInitializationEvent) {
+        instance = this
+        core = DiscordBridge(Server(this, game), defaultConfig)
+        core.postInit()
+
+        //game.commandManager.register(this, )
+    }
+
+    @Listener(order = Order.LAST)
+    fun onPlayerJoin(event: ClientConnectionEvent.Join) {
+        core.handlePlayerJoin(Player(event.targetEntity))
+    }
+
+    @Listener(order = Order.LAST)
+    fun onPlayerQuit(event: ClientConnectionEvent.Disconnect) {
+        core.handlePlayerQuit(Player(event.targetEntity))
+    }
+
+    @Listener(order = Order.LAST)
+    fun onPlayerDeath(event: DestructEntityEvent.Death) {
+        val e = event.targetEntity
+        if (e is org.spongepowered.api.entity.living.player.Player) core.handlePlayerDeath(Player(e), event.message.toPlain())
+
+    }
+
+    @Listener(order = Order.LAST)
+    fun onPlayerChat(event: MessageChannelEvent.Chat) {
+        val p = event.cause.first(org.spongepowered.api.entity.living.player.Player::class.java).unwrap()
+        if (p != null) core.handlePlayerChat(Player(p), event.rawMessage.toPlain(), event.isCancelled)
+    }
+
+
+}
\ No newline at end of file
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt
new file mode 100644
index 0000000..e722975
--- /dev/null
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt
@@ -0,0 +1,5 @@
+package gg.obsidian.discordbridge.util
+
+import java.util.*
+
+fun <T> Optional<T>.unwrap(): T? = orElse(null)
\ No newline at end of file
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Command.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Command.kt
new file mode 100644
index 0000000..82027e4
--- /dev/null
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Command.kt
@@ -0,0 +1,2 @@
+package gg.obsidian.discordbridge.wrappers
+
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ConsoleSender.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ConsoleSender.kt
new file mode 100644
index 0000000..82027e4
--- /dev/null
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ConsoleSender.kt
@@ -0,0 +1,2 @@
+package gg.obsidian.discordbridge.wrappers
+
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Player.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Player.kt
new file mode 100644
index 0000000..c833e79
--- /dev/null
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Player.kt
@@ -0,0 +1,33 @@
+package gg.obsidian.discordbridge.wrappers
+
+import org.spongepowered.api.data.key.Keys
+import org.spongepowered.api.entity.living.player.Player
+import org.spongepowered.api.text.Text
+import java.util.*
+
+class Player(private val spongePlayer: Player) : IPlayer {
+    override fun getWorld(): IWorld {
+        return World(spongePlayer.world)
+    }
+
+    override fun isVanished(): Boolean {
+        return spongePlayer.get(Keys.INVISIBLE).orElse(false)
+    }
+
+    override fun getName(): String {
+        return spongePlayer.name
+    }
+
+    override fun getUUID(): UUID {
+        return spongePlayer.uniqueId
+    }
+
+    override fun sendMessage(message: String) {
+        spongePlayer.sendMessage(Text.of(message))
+    }
+
+    override fun hasPermission(permission: String): Boolean {
+        return spongePlayer.hasPermission(permission)
+    }
+
+}
\ No newline at end of file
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Scheduler.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Scheduler.kt
new file mode 100644
index 0000000..6032cf5
--- /dev/null
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Scheduler.kt
@@ -0,0 +1,11 @@
+package gg.obsidian.discordbridge.wrappers
+
+import gg.obsidian.discordbridge.DiscordBridgePlugin
+import org.spongepowered.api.Game
+
+class Scheduler(val plugin: DiscordBridgePlugin, val game: Game) : IScheduler {
+    override fun runAsyncTask(task: Runnable) {
+        game.scheduler.createTaskBuilder().execute(task).submit(plugin)
+    }
+
+}
\ No newline at end of file
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
new file mode 100644
index 0000000..16a20b2
--- /dev/null
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
@@ -0,0 +1,55 @@
+package gg.obsidian.discordbridge.wrappers
+
+import gg.obsidian.discordbridge.DiscordBridgePlugin
+import gg.obsidian.discordbridge.util.unwrap
+import net.dv8tion.jda.core.entities.MessageChannel
+import org.spongepowered.api.Game
+import org.spongepowered.api.Sponge
+import org.spongepowered.api.text.Text
+import java.util.*
+import java.util.logging.Logger
+
+class Server(private val plugin: DiscordBridgePlugin, private val game: Game) : IServer {
+    override fun getScheduler(): IScheduler {
+        return Scheduler(plugin, game)
+    }
+
+    override fun getVersion(): String {
+        return game.platform.minecraftVersion.name
+    }
+
+    override fun getMinecraftShortVersion(): String {
+        return game.platform.minecraftVersion.name
+    }
+
+    override fun getPlayer(uuid: UUID): IPlayer? {
+        val p = Sponge.getServer().getPlayer(uuid).unwrap()
+        return if (p != null) Player(p) else null
+    }
+
+    override fun getPlayer(name: String): IPlayer? {
+        val p = Sponge.getServer().getPlayer(name).unwrap()
+        return if (p != null) Player(p) else null
+    }
+
+    override fun getOnlinePlayers(): List<IPlayer> {
+        return Sponge.getServer().onlinePlayers.map { Player(it) }
+    }
+
+    override fun broadcastMessage(message: String) {
+        Sponge.getServer().broadcastChannel.send(Text.of(message))
+    }
+
+    override fun getRemoteConsoleSender(): IConsoleSender {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun dispatchCommand(channel: MessageChannel, command: String) {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun getLogger(): Logger {
+        return plugin.getLogger()
+    }
+
+}
\ No newline at end of file
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/World.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/World.kt
new file mode 100644
index 0000000..10100be
--- /dev/null
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/World.kt
@@ -0,0 +1,10 @@
+package gg.obsidian.discordbridge.wrappers
+
+import org.spongepowered.api.world.World
+
+class World(private val spongeWorld: World) : IWorld {
+    override fun getName(): String {
+        return spongeWorld.name
+    }
+
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index fc8eddd..2a5d739 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,5 @@
 rootProject.name = 'DiscordBridge'
 include 'discordbridge-core'
 include 'discordbridge-bukkit'
+include 'discordbridge-sponge'
 

From bee78bf937003fe588814f1239c7e82372718463 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Thu, 11 Jan 2018 14:38:06 -0600
Subject: [PATCH 03/30] Add base for Forge support

---
 build.gradle                                  |  6 ++++++
 .../discordbridge/DiscordBridgeForge.kt       | 20 +++++++++++++++++++
 settings.gradle                               |  1 +
 3 files changed, 27 insertions(+)
 create mode 100644 discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgeForge.kt

diff --git a/build.gradle b/build.gradle
index 4122ea6..f4e63ba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,6 +9,12 @@ buildscript {
         jcenter()
     }
 
+    configurations.all {
+        resolutionStrategy {
+            force 'org.ow2.asm:asm:6.0_BETA'
+        }
+    }
+
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.4'
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgeForge.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgeForge.kt
new file mode 100644
index 0000000..a3059b7
--- /dev/null
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgeForge.kt
@@ -0,0 +1,20 @@
+package gg.obsidian.discordbridge
+
+import net.minecraft.init.Blocks
+import net.minecraftforge.fml.common.Mod
+import net.minecraftforge.fml.common.event.FMLInitializationEvent
+
+@Mod(modid = DiscordBridgeForge.MODID, version = "@VERSION@", acceptableRemoteVersions = "*")
+class DiscordBridgeForge {
+
+    @Mod.EventHandler
+    fun init(event: FMLInitializationEvent) {
+        // some example code
+        System.out.println("DIRT BLOCK >> " + Blocks.DIRT.unlocalizedName)
+    }
+
+    companion object {
+        const val MODID = "discordbridge-obsidian"
+        val VERSION = "1.0"
+    }
+}
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 2a5d739..0b9b960 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,4 +2,5 @@ rootProject.name = 'DiscordBridge'
 include 'discordbridge-core'
 include 'discordbridge-bukkit'
 include 'discordbridge-sponge'
+include 'discordbridge-forge'
 

From def88b29fe50cb295e287a69cce0e9685f2fea96 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Thu, 11 Jan 2018 14:44:12 -0600
Subject: [PATCH 04/30] Add Forge's build.gradle

---
 discordbridge-forge/build.gradle | 86 ++++++++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 discordbridge-forge/build.gradle

diff --git a/discordbridge-forge/build.gradle b/discordbridge-forge/build.gradle
new file mode 100644
index 0000000..204fca9
--- /dev/null
+++ b/discordbridge-forge/build.gradle
@@ -0,0 +1,86 @@
+buildscript {
+    repositories {
+        jcenter()
+        maven { url = "http://files.minecraftforge.net/maven" }
+    }
+    dependencies {
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
+    }
+}
+apply plugin: 'net.minecraftforge.gradle.forge'
+apply plugin: 'kotlin'
+//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
+
+
+version = "1.0"
+group = "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+archivesBaseName = "modid"
+
+sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+compileJava {
+
+    sourceCompatibility = targetCompatibility = '1.8'
+}
+
+minecraft {
+    version = "1.12.2-14.23.1.2582"
+    runDir = "run"
+    
+    // the mappings can be changed at any time, and must be in the following format.
+    // snapshot_YYYYMMDD   snapshot are built nightly.
+    // stable_#            stables are built at the discretion of the MCP team.
+    // Use non-default mappings at your own risk. they may not always work.
+    // simply re-run your setup task after changing the mappings to update your workspace.
+    mappings = "snapshot_20171003"
+    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
+}
+
+repositories {
+    maven { url 'https://github.com/DV8FromTheWorld/Maven-Repository/raw/master/repo' }
+    jcenter()
+}
+
+dependencies {
+    compile project(':discordbridge-core')
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    // you may put jars on which you depend on in ./libs
+    // or you may define them like so..
+    //compile "some.group:artifact:version:classifier"
+    //compile "some.group:artifact:version"
+      
+    // real examples
+    //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
+    //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
+
+    // the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
+    //provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
+
+    // the deobf configurations:  'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided,
+    // except that these dependencies get remapped to your current MCP mappings
+    //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev'
+    //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
+
+    // for more info...
+    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
+    // http://www.gradle.org/docs/current/userguide/dependency_management.html
+
+}
+
+processResources {
+    // this will ensure that this task is redone when the versions change.
+    inputs.property "version", project.version
+    inputs.property "mcversion", project.minecraft.version
+
+    // replace stuff in mcmod.info, nothing else
+    from(sourceSets.main.resources.srcDirs) {
+        include 'mcmod.info'
+                
+        // replace version and mcversion
+        expand 'version':project.version, 'mcversion':project.minecraft.version
+    }
+        
+    // copy everything else except the mcmod.info
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
+    }
+}

From 29d28d664b5364de02cb73ad27f2e19e56bfcca4 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Thu, 11 Jan 2018 14:45:41 -0600
Subject: [PATCH 05/30] Add Forge resources

---
 .../src/main/resources/mcmod.info                | 16 ++++++++++++++++
 .../src/main/resources/pack.mcmeta               |  7 +++++++
 2 files changed, 23 insertions(+)
 create mode 100644 discordbridge-forge/src/main/resources/mcmod.info
 create mode 100644 discordbridge-forge/src/main/resources/pack.mcmeta

diff --git a/discordbridge-forge/src/main/resources/mcmod.info b/discordbridge-forge/src/main/resources/mcmod.info
new file mode 100644
index 0000000..f480667
--- /dev/null
+++ b/discordbridge-forge/src/main/resources/mcmod.info
@@ -0,0 +1,16 @@
+[
+{
+  "modid": "examplemod",
+  "name": "Example Mod",
+  "description": "Example placeholder mod.",
+  "version": "${version}",
+  "mcversion": "${mcversion}",
+  "url": "",
+  "updateUrl": "",
+  "authorList": ["ExampleDude"],
+  "credits": "The Forge and FML guys, for making this example",
+  "logoFile": "",
+  "screenshots": [],
+  "dependencies": []
+}
+]
diff --git a/discordbridge-forge/src/main/resources/pack.mcmeta b/discordbridge-forge/src/main/resources/pack.mcmeta
new file mode 100644
index 0000000..4018267
--- /dev/null
+++ b/discordbridge-forge/src/main/resources/pack.mcmeta
@@ -0,0 +1,7 @@
+{
+    "pack": {
+        "description": "examplemod resources",
+        "pack_format": 3,
+        "_comment": "A pack_format of 3 should be used starting with Minecraft 1.11. All resources, including language files, should be lowercase (eg: en_us.lang). A pack_format of 2 will load your mod resources with LegacyV2Adapter, which requires language files to have uppercase letters (eg: en_US.lang)."
+    }
+}

From 6ec224878f46de8d22f3e697afbc6b77cc75bc7c Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Sun, 4 Feb 2018 22:21:52 -0600
Subject: [PATCH 06/30] Add Forge compatibility

Lots of changes and borrowed code.
Command forwarding not ready.
Coupling heavy.
Code spaghetti.

Bukkit version crashes on compile, will need to revise.
Spigot compiles fine, though.
---
 build.gradle                                  | 12 +++--
 discordbridge-bukkit/build.gradle             |  4 ++
 .../discordbridge/DiscordBridgePlugin.kt      |  9 ++++
 .../obsidian/discordbridge/wrappers/Logger.kt | 27 ++++++++++
 .../obsidian/discordbridge/wrappers/Server.kt |  5 +-
 discordbridge-core/build.gradle               |  5 +-
 .../discordbridge/ConfigurationNode.kt        |  3 +-
 .../obsidian/discordbridge/DiscordBridge.kt   | 27 +++++-----
 .../obsidian/discordbridge/UserAliasConfig.kt |  4 +-
 .../commands/MinecraftCommandWrapper.kt       |  2 +-
 .../controllers/BotControllerManager.kt       | 10 ++--
 .../controllers/UtilCommandsController.kt     |  7 +--
 .../discordbridge/discord/Connection.kt       |  2 +-
 .../obsidian/discordbridge/util/UserAlias.kt  |  8 +--
 .../discordbridge/wrappers/ILogger.kt         | 10 ++++
 .../discordbridge/wrappers/IServer.kt         |  3 +-
 discordbridge-forge/build.gradle              | 33 ++++--------
 .../discordbridge/DiscordBridgeForge.kt       | 35 ++++++++++--
 .../gg/obsidian/discordbridge/EventHandler.kt | 53 ++++++++++++++++++
 .../wrappers/CommandSenderWrapper.kt          | 28 ++++++++++
 .../discordbridge/wrappers/CommandWrapper.kt  | 35 ++++++++++++
 .../obsidian/discordbridge/wrappers/Logger.kt | 26 +++++++++
 .../obsidian/discordbridge/wrappers/Player.kt | 36 +++++++++++++
 .../discordbridge/wrappers/Scheduler.kt       |  7 +++
 .../obsidian/discordbridge/wrappers/Server.kt | 54 +++++++++++++++++++
 .../obsidian/discordbridge/wrappers/World.kt  | 10 ++++
 .../discordbridge/DiscordBridgePlugin.kt      |  2 +-
 .../obsidian/discordbridge/wrappers/Logger.kt | 26 +++++++++
 .../obsidian/discordbridge/wrappers/Server.kt |  3 +-
 29 files changed, 419 insertions(+), 67 deletions(-)
 create mode 100644 discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Logger.kt
 create mode 100644 discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ILogger.kt
 create mode 100644 discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt
 create mode 100644 discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandSenderWrapper.kt
 create mode 100644 discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandWrapper.kt
 create mode 100644 discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Logger.kt
 create mode 100644 discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Player.kt
 create mode 100644 discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Scheduler.kt
 create mode 100644 discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
 create mode 100644 discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/World.kt
 create mode 100644 discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Logger.kt

diff --git a/build.gradle b/build.gradle
index f4e63ba..b5854cf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -57,6 +57,7 @@ subprojects {
     }
 
     shadowJar {
+        classifier = null
         dependencies {
             include(dependency("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"))
             include(dependency('net.dv8tion:JDA:3.3.1_286'))
@@ -66,16 +67,19 @@ subprojects {
             include(dependency(group: 'com.michaelwflaherty', name: 'cleverbotapi', version: '1.0.1'))
             include(dependency('org.parboiled:parboiled-core'))
             include(dependency('org.parboiled:parboiled-java'))
-            include(dependency('org.ow2.asm:asm'))
-            include(dependency('org.ow2.asm:asm-analysis'))
-            include(dependency('org.ow2.asm:asm-tree'))
-            include(dependency('org.ow2.asm:asm-util'))
+            //include(dependency('org.ow2.asm:asm'))
+            //include(dependency('org.ow2.asm:asm-analysis'))
+            //include(dependency('org.ow2.asm:asm-tree'))
+            //include(dependency('org.ow2.asm:asm-util'))
             include(dependency('com.squareup.okhttp3:okhttp:'))
             include(dependency('com.squareup.okio:okio'))
             include(dependency('com.neovisionaries:nv-websocket-client'))
             include(dependency('org.slf4j:slf4j-api'))
             include(dependency('org.json:json'))
         }
+
+        relocate 'org.parboiled:parboiled-core', "gg.obsidian.discordbridge.shadow.parboiled-core"
+        relocate 'org.parboiled:parboiled-java', "gg.obsidian.discordbridge.shadow.parboiled-java"
     }
 
 }
\ No newline at end of file
diff --git a/discordbridge-bukkit/build.gradle b/discordbridge-bukkit/build.gradle
index 259f237..9334282 100644
--- a/discordbridge-bukkit/build.gradle
+++ b/discordbridge-bukkit/build.gradle
@@ -24,6 +24,10 @@ shadowJar {
     dependencies {
         include(project(':discordbridge-core'))
         include(dependency("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"))
+        include(dependency('org.ow2.asm:asm'))
+        include(dependency('org.ow2.asm:asm-analysis'))
+        include(dependency('org.ow2.asm:asm-tree'))
+        include(dependency('org.ow2.asm:asm-util'))
     }
 }
 build.dependsOn(shadowJar)
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
index e0fc1a1..08d4018 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
@@ -2,6 +2,8 @@ package gg.obsidian.discordbridge
 
 import gg.obsidian.discordbridge.wrappers.Server
 import org.bukkit.plugin.java.JavaPlugin
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 
 /**
  * The primary Plugin class that maintains the plugin's connection with Bukkit
@@ -10,11 +12,18 @@ class DiscordBridgePlugin : JavaPlugin() {
 
     private lateinit var core: DiscordBridge
     private lateinit var instance: DiscordBridgePlugin
+    private lateinit var logger: Logger
 
     fun getPlugin() : DiscordBridgePlugin = instance
 
     fun getCore() : DiscordBridge = core
 
+    fun getSLF4JLogger(): Logger = logger
+
+    override fun onLoad() {
+        logger = LoggerFactory.getLogger("DiscordBrdige")
+    }
+
     override fun onEnable() {
         instance = this
         core = DiscordBridge(Server(this, this.server), dataFolder)
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Logger.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Logger.kt
new file mode 100644
index 0000000..b2dd485
--- /dev/null
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Logger.kt
@@ -0,0 +1,27 @@
+package gg.obsidian.discordbridge.wrappers
+
+import java.util.logging.Level
+import java.util.logging.Logger
+
+class Logger(private val logger: Logger) : ILogger {
+    override fun info(message: String) {
+        logger.info(message)
+    }
+
+    override fun warning(message: String) {
+        logger.warning(message)
+    }
+
+    override fun warning(message: String, throwable: Throwable) {
+        logger.log(Level.WARNING, message, throwable)
+    }
+
+    override fun severe(message: String) {
+        logger.severe(message)
+    }
+
+    override fun severe(message: String, throwable: Throwable) {
+        logger.log(Level.SEVERE, message, throwable)
+    }
+
+}
\ No newline at end of file
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
index 2fa2be2..e56a25c 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
@@ -5,7 +5,6 @@ import gg.obsidian.discordbridge.DiscordCommandSender
 import net.dv8tion.jda.core.entities.MessageChannel
 import org.bukkit.Server
 import java.util.*
-import java.util.logging.Logger
 
 class Server(val plugin: DiscordBridgePlugin, val bukkitServer: Server) : IServer {
     override fun getRemoteConsoleSender(): IConsoleSender {
@@ -45,8 +44,8 @@ class Server(val plugin: DiscordBridgePlugin, val bukkitServer: Server) : IServe
         bukkitServer.dispatchCommand(sender, command)
     }
 
-    override fun getLogger(): Logger {
-        return plugin.logger
+    override fun getLogger(): ILogger {
+        return Logger(plugin.logger)
     }
 
 }
\ No newline at end of file
diff --git a/discordbridge-core/build.gradle b/discordbridge-core/build.gradle
index af5efd9..1cc004e 100644
--- a/discordbridge-core/build.gradle
+++ b/discordbridge-core/build.gradle
@@ -10,9 +10,12 @@ dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     compile group: 'net.dv8tion', name: 'JDA', version: '3.3.1_286'
     compile group: 'org.yaml', name: 'snakeyaml', version: '1.19'
-    compile group: 'org.pegdown', name:'pegdown', version: '1.6.0'
+    compile (group: 'org.pegdown', name:'pegdown', version: '1.6.0') {
+        exclude group: 'org.ow2.asm'
+    }
     compile group: 'commons-lang', name:'commons-lang', version: '2.3'
     compile group: 'com.michaelwflaherty', name: 'cleverbotapi', version: '1.0.1'
+    compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
 }
 
 sourceSets {
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/ConfigurationNode.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/ConfigurationNode.kt
index 29e7691..0016be4 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/ConfigurationNode.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/ConfigurationNode.kt
@@ -49,10 +49,11 @@ class ConfigurationNode() : MutableMap<String, Any> {
             options.isPrettyFlow = true
 
             val representer = EmptyNullRepresenter()
+            representer.addClassTag(String::class.java, Tag.STR)
 //            representer.addClassTag(Rating::class.java, Tag("!!Rating"))
 //            representer.addClassTag(Respect::class.java, Tag("!!Respect"))
 //            representer.addClassTag(Script::class.java, Tag("!!Script"))
-//            representer.addClassTag(UserAlias::class.java, Tag("!!UserAlias"))
+            representer.addClassTag(UserAlias::class.java, Tag(UserAlias::class.java))
 
             //yaml = Yaml(SafeConstructor(), representer, options)
             yaml = Yaml(CustomClassLoaderConstructor(DiscordBridge::class.java.classLoader), representer, options)
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
index 3b49f8b..1f3cefe 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
@@ -9,24 +9,21 @@ import gg.obsidian.discordbridge.discord.Connection
 import gg.obsidian.discordbridge.util.MarkdownToMinecraftSeralizer
 import gg.obsidian.discordbridge.util.Respect
 import gg.obsidian.discordbridge.util.UserAlias
-import gg.obsidian.discordbridge.wrappers.IServer
 import gg.obsidian.discordbridge.util.ChatColor as CC
 import gg.obsidian.discordbridge.util.UtilFunctions.noSpace
 import gg.obsidian.discordbridge.util.UtilFunctions.toDiscordChatMessage
 import gg.obsidian.discordbridge.util.UtilFunctions.toDiscordPlayerJoin
 import gg.obsidian.discordbridge.util.UtilFunctions.toDiscordPlayerLeave
 import gg.obsidian.discordbridge.util.UtilFunctions.toDiscordPlayerDeath
-import gg.obsidian.discordbridge.wrappers.ICommand
-import gg.obsidian.discordbridge.wrappers.ICommandSender
-import gg.obsidian.discordbridge.wrappers.IPlayer
+import gg.obsidian.discordbridge.wrappers.*
 import net.dv8tion.jda.core.OnlineStatus
 import net.dv8tion.jda.core.entities.Member
 import net.dv8tion.jda.core.entities.MessageChannel
 import org.pegdown.PegDownProcessor
 import java.io.File
-import java.util.logging.Logger
 import java.io.IOException
 import java.io.FileOutputStream
+import java.util.*
 
 class DiscordBridge(private val server: IServer, private val dataFolder: File) {
 
@@ -45,11 +42,10 @@ class DiscordBridge(private val server: IServer, private val dataFolder: File) {
     // Temporary storage for alias linking requests
     var requests: MutableList<UserAlias> = mutableListOf()
 
-    val logger: Logger = server.getLogger()
+    val logger: ILogger = server.getLogger()
 
     init {
         Connection.db  = this //TODO: enforce this better
-        server.getScheduler().runAsyncTask(Connection)
 
         if (!dataFolder.exists()) dataFolder.mkdirs()
 
@@ -92,6 +88,7 @@ class DiscordBridge(private val server: IServer, private val dataFolder: File) {
         f.load()
         rate.load()
         insult.load()
+        server.getScheduler().runAsyncTask(Connection)
     }
 
     fun logDebug(msg: String) {
@@ -201,7 +198,7 @@ class DiscordBridge(private val server: IServer, private val dataFolder: File) {
         val users = Connection.listUsers()
         val found: Member = users.find { it.user.name + "#" + it.user.discriminator == discriminator } ?: return null
 
-        val ua = UserAlias(player.getUUID(), found.user.id)
+        val ua = UserAlias(player.getUUID().toString(), found.user.id)
         requests.add(ua)
         val msg = "Minecraft user '${player.getName()}' has requested to become associated with your Discord" +
                 " account. If this is you, respond '${Connection.JDA.selfUser.asMention} confirm'. If this is not" +
@@ -288,7 +285,7 @@ class DiscordBridge(private val server: IServer, private val dataFolder: File) {
         for (du in discordusers)
             for ((mcUuid, discordId) in UserAliasConfig.aliases)
                 if (discordId == du.user.id) {
-                    val player = server.getPlayer(mcUuid)
+                    val player = server.getPlayer(UUID.fromString(mcUuid))
                     if (player != null) discordaliases.add(Pair(player.getName(), du))
                 }
 
@@ -334,7 +331,7 @@ class DiscordBridge(private val server: IServer, private val dataFolder: File) {
     fun translateAliasesToDiscord(message: String): String {
         var modifiedMessage = message
         for ((mcUuid, discordId) in UserAliasConfig.aliases) {
-            val player = server.getPlayer(mcUuid)
+            val player = server.getPlayer(UUID.fromString(mcUuid))
             if (player != null) {
                 val nameMC = player.getName()
                 val discordUser = Connection.listUsers().firstOrNull { it.user.id == discordId }
@@ -355,7 +352,7 @@ class DiscordBridge(private val server: IServer, private val dataFolder: File) {
     fun translateAliasesToMinecraft(message: String): String {
         var modifiedMessage = message
         for ((mcUuid, discordId) in UserAliasConfig.aliases) {
-            val player = server.getPlayer(mcUuid)
+            val player = server.getPlayer(UUID.fromString(mcUuid))
             if (player != null) {
                 val nameMC = player.getName()
                 val nameDis = Connection.JDA.getUserById(discordId).name
@@ -466,8 +463,12 @@ class DiscordBridge(private val server: IServer, private val dataFolder: File) {
         sendToDiscord(translateAliasesToDiscord(message.toDiscordChatMessage(this, name, "Dynmap")), Connection.getRelayChannel())
     }
 
-    fun handleCommand(sender: ICommandSender, command: ICommand, args: Array<out String>): Boolean {
-        return minecraftCommandControllerManager.dispatchMessage(MinecraftCommandWrapper(sender, command, args))
+    fun handleCommand(sender: ICommandSender, commandName: String, args: Array<out String>): Boolean {
+        return minecraftCommandControllerManager.dispatchMessage(MinecraftCommandWrapper(sender, commandName, args))
+    }
+
+    fun getServerCommands(): List<BotControllerManager.Command> {
+        return minecraftCommandControllerManager.getCommands().values.toList()
     }
 
 }
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
index 310aeac..4ff2559 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
@@ -12,8 +12,8 @@ object UserAliasConfig {
      * Load the stored aliases from file into memory
      */
     fun load(db: DiscordBridge) {
-        val list = db.getUsersConfig().getList<HashMap<String, Any>>("aliases")
-        aliases = list.castTo({UserAlias(it)}) ?:
+        val list = db.getUsersConfig().getList<UserAlias>("aliases")
+        aliases = list ?:
                 throw IllegalStateException("usernames.yml could not be read - list items are not properly formatted")
     }
 
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt
index abf0bf9..292b9a0 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt
@@ -13,7 +13,7 @@ import net.dv8tion.jda.core.entities.MessageChannel
  * @param command the command that was invoked
  * @param args an array of argument strings passed to the command
  */
-class MinecraftCommandWrapper(val sender: ICommandSender, val command: ICommand,
+class MinecraftCommandWrapper(val sender: ICommandSender, val commandName: String,
                               val args: Array<out String>) : IEventWrapper {
     /**
      * The Minecraft username of the command sender
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
index 2de6258..2abc912 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
@@ -82,6 +82,10 @@ class BotControllerManager(val db: DiscordBridge) {
         commands.put(command.name, command)
     }
 
+    fun getCommands(): Map<String, Command> {
+        return commands
+    }
+
     // =============================================
     // ============== MESSAGE HANDLING =============
 
@@ -95,9 +99,9 @@ class BotControllerManager(val db: DiscordBridge) {
 
         // Short circuit if event was a Minecraft command
         if (event is MinecraftCommandWrapper) {
-            val command = commands[event.command.getName()]
+            val command = commands[event.commandName]
             if (command == null) {
-                commandNotFound(event, event.command.getName())
+                commandNotFound(event, event.commandName)
                 return true
             }
             return invokeBotCommand(command, controllers, event, event.args.asList().toTypedArray())
@@ -562,7 +566,7 @@ class BotControllerManager(val db: DiscordBridge) {
      * @param throwable the uncaught exception
      */
     private fun commandException(event: IEventWrapper, throwable: Throwable) {
-        db.logger.log(Level.SEVERE, "Command with content ${event.rawMessage} threw an exception.", throwable)
+        db.logger.severe("Command with content ${event.rawMessage} threw an exception.", throwable)
         when (event) {
             is DiscordMessageWrapper ->
                 event.channel.sendMessage(
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
index babbd4a..aec38a4 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
@@ -9,6 +9,7 @@ import gg.obsidian.discordbridge.util.ChatColor as CC
 import gg.obsidian.discordbridge.util.UtilFunctions.stripColor
 import gg.obsidian.discordbridge.wrappers.IPlayer
 import net.dv8tion.jda.core.entities.ChannelType
+import java.util.*
 
 /**
  * Controller for utility commands that configure the way the bot works
@@ -121,7 +122,7 @@ class UtilCommandsController(val db: DiscordBridge) : IBotController {
                     return null
                 }
 
-                val ua = UserAliasConfig.aliases.firstOrNull{it.mcUuid == event.sender.getUUID()}
+                val ua = UserAliasConfig.aliases.firstOrNull{UUID.fromString(it.mcUuid) == event.sender.getUUID()}
                 if (ua != null) {
                     event.sender.sendMessage("${CC.YELLOW}You already have an alias linked with Discord user " +
                             "${Connection.JDA.getUserById(ua.discordId)}. " +
@@ -129,7 +130,7 @@ class UtilCommandsController(val db: DiscordBridge) : IBotController {
                     return null
                 }
 
-                val pendingRequest = db.requests.firstOrNull{it.mcUuid == event.sender.getUUID()}
+                val pendingRequest = db.requests.firstOrNull{ UUID.fromString(it.mcUuid) == event.sender.getUUID()}
                 if (pendingRequest != null) {
                     if (args.size < 3 || args[3] != "-u") {
                         event.sender.sendMessage("${CC.YELLOW}You already have an alias link request pending with " +
@@ -166,7 +167,7 @@ class UtilCommandsController(val db: DiscordBridge) : IBotController {
             "unlinkalias" -> {
                 if (event.sender !is IPlayer) return null
 
-                val ua = UserAliasConfig.aliases.firstOrNull{it.mcUuid == event.sender.getUUID()}
+                val ua = UserAliasConfig.aliases.firstOrNull{UUID.fromString(it.mcUuid) == event.sender.getUUID()}
                 if (ua == null) {
                     event.sender.sendMessage("${CC.YELLOW}You do not have an alias to unlink.")
                     return null
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
index 4259699..09943fd 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
@@ -25,7 +25,7 @@ object Connection: Runnable {
         try {
             connect()
         } catch (e: Exception) {
-            db.logger.severe("Error connecting to Discord: " + e)
+            db.logger.severe("Error connecting to Discord: ${e.message}", e)
         }
     }
 
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UserAlias.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UserAlias.kt
index 0fc90d6..3107868 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UserAlias.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UserAlias.kt
@@ -10,11 +10,11 @@ import java.util.*
  * @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
  */
-data class UserAlias(val mcUuid: UUID, val discordId: String): Serializable {
+data class UserAlias(var mcUuid: String, var discordId: String) {
 
-    constructor(): this(UUID.fromString("null"), "null")
+    constructor(): this("null", "null")
 
-    constructor(map: MutableMap<String, Any>):
-            this(UUID.fromString(map["mcUuid"] as String), map["discordId"] as String)
+//    constructor(map: MutableMap<String, Any>):
+//            this(map["mcUuid"] as String, map["discordId"] as String)
 
 }
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ILogger.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ILogger.kt
new file mode 100644
index 0000000..ea12754
--- /dev/null
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ILogger.kt
@@ -0,0 +1,10 @@
+package gg.obsidian.discordbridge.wrappers
+
+// https://github.com/CraftIRC/4/blob/master/src/main/java/org/kitteh/craftirc/util/Logger.java
+interface ILogger {
+    fun info(message: String)
+    fun warning(message: String)
+    fun warning(message: String, throwable: Throwable)
+    fun severe(message: String)
+    fun severe(message: String, throwable: Throwable)
+}
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IServer.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IServer.kt
index 96b4bfc..60645b1 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IServer.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IServer.kt
@@ -2,7 +2,6 @@ package gg.obsidian.discordbridge.wrappers
 
 import net.dv8tion.jda.core.entities.MessageChannel
 import java.util.*
-import java.util.logging.Logger
 
 interface IServer {
 
@@ -24,6 +23,6 @@ interface IServer {
 
     fun dispatchCommand(channel: MessageChannel, command: String)
 
-    fun getLogger(): Logger
+    fun getLogger(): ILogger
 
 }
\ No newline at end of file
diff --git a/discordbridge-forge/build.gradle b/discordbridge-forge/build.gradle
index 204fca9..e519cf7 100644
--- a/discordbridge-forge/build.gradle
+++ b/discordbridge-forge/build.gradle
@@ -12,9 +12,9 @@ apply plugin: 'kotlin'
 //Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 
 
-version = "1.0"
-group = "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = "modid"
+version = "2.0"
+group = "gg.obsidian.discordbridge-o" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+archivesBaseName = "discordbridge-o"
 
 sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
 compileJava {
@@ -43,26 +43,6 @@ repositories {
 dependencies {
     compile project(':discordbridge-core')
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    // you may put jars on which you depend on in ./libs
-    // or you may define them like so..
-    //compile "some.group:artifact:version:classifier"
-    //compile "some.group:artifact:version"
-      
-    // real examples
-    //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
-    //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
-
-    // the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
-    //provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-
-    // the deobf configurations:  'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided,
-    // except that these dependencies get remapped to your current MCP mappings
-    //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-    //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-
-    // for more info...
-    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
-    // http://www.gradle.org/docs/current/userguide/dependency_management.html
 
 }
 
@@ -84,3 +64,10 @@ processResources {
         exclude 'mcmod.info'
     }
 }
+
+shadowJar {
+    dependencies {
+        include(project(':discordbridge-core'))
+    }
+}
+build.dependsOn(shadowJar)
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgeForge.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgeForge.kt
index a3059b7..3ff675f 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgeForge.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgeForge.kt
@@ -1,20 +1,49 @@
 package gg.obsidian.discordbridge
 
+import gg.obsidian.discordbridge.wrappers.CommandWrapper
+import gg.obsidian.discordbridge.wrappers.Server
 import net.minecraft.init.Blocks
 import net.minecraftforge.fml.common.Mod
 import net.minecraftforge.fml.common.event.FMLInitializationEvent
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent
+import net.minecraftforge.fml.common.event.FMLServerStartingEvent
+import org.apache.logging.log4j.Logger
+import java.io.File
 
 @Mod(modid = DiscordBridgeForge.MODID, version = "@VERSION@", acceptableRemoteVersions = "*")
 class DiscordBridgeForge {
 
     @Mod.EventHandler
-    fun init(event: FMLInitializationEvent) {
-        // some example code
-        System.out.println("DIRT BLOCK >> " + Blocks.DIRT.unlocalizedName)
+    fun preInit(event: FMLPreInitializationEvent) {
+        logger = event.modLog
+        val workingDir = File(event.modConfigurationDirectory.toString() + File.separator + "discordbridge")
+        core = DiscordBridge(Server(this), workingDir)
+        core.postInit()
     }
 
+    @Mod.EventHandler
+    fun serverStart(event: FMLServerStartingEvent) {
+        for (c in core.getServerCommands()) {
+            event.registerServerCommand(CommandWrapper(c))
+        }
+    }
+
+    public lateinit var logger: Logger
+
+
+    private lateinit var core: DiscordBridge
+    //private lateinit var instance: DiscordBridgePlugin
+
+    //fun getPlugin() : DiscordBridgePlugin = instance
+
+    fun getCore() : DiscordBridge = core
+
+
     companion object {
         const val MODID = "discordbridge-obsidian"
         val VERSION = "1.0"
+
+        @Mod.Instance(MODID)
+        lateinit var inst: DiscordBridgeForge
     }
 }
\ No newline at end of file
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt
new file mode 100644
index 0000000..701fd06
--- /dev/null
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt
@@ -0,0 +1,53 @@
+package gg.obsidian.discordbridge
+
+import gg.obsidian.discordbridge.wrappers.CommandSenderWrapper
+import gg.obsidian.discordbridge.wrappers.Player
+import net.minecraft.entity.player.EntityPlayer
+import net.minecraft.entity.player.EntityPlayerMP
+import net.minecraftforge.event.CommandEvent
+import net.minecraftforge.event.ServerChatEvent
+import net.minecraftforge.event.entity.living.LivingDeathEvent
+import net.minecraftforge.fml.common.Mod
+import net.minecraftforge.fml.common.eventhandler.EventPriority
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import net.minecraftforge.fml.common.gameevent.PlayerEvent
+
+@Mod.EventBusSubscriber
+object EventHandler {
+    @JvmStatic
+    @SubscribeEvent(priority = EventPriority.LOWEST)
+    fun onPlayerJoin(event: PlayerEvent.PlayerLoggedInEvent) {
+        DiscordBridgeForge.inst.getCore().handlePlayerJoin(Player(event.player))
+    }
+
+    @JvmStatic
+    @SubscribeEvent(priority = EventPriority.LOWEST)
+    fun onPlayerQuit(event: PlayerEvent.PlayerLoggedOutEvent) {
+        DiscordBridgeForge.inst.getCore().handlePlayerQuit(Player(event.player))
+    }
+
+    @JvmStatic
+    @SubscribeEvent(priority = EventPriority.LOWEST)
+    fun onPlayerDeath(event: LivingDeathEvent) {
+        val e = event.entityLiving
+        if (e is EntityPlayer) DiscordBridgeForge.inst.getCore().handlePlayerDeath(Player(e), e.combatTracker.deathMessage.unformattedText)
+    }
+
+    @JvmStatic
+    @SubscribeEvent(priority = EventPriority.LOWEST)
+    fun onPlayerChat(event: ServerChatEvent) {
+        val p = event.player
+        if (p != null) DiscordBridgeForge.inst.getCore().handlePlayerChat(Player(p), event.message, event.isCanceled)
+    }
+
+    // https://github.com/sk89q/WorldEdit/blob/85ef47ae0c2c02a5870b764ca4b0da0d9e01671f/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorldEdit.java
+    @JvmStatic
+    @SubscribeEvent
+    fun onCommand(event: CommandEvent) {
+        val p = event.sender
+        if (p is EntityPlayerMP) {
+            if (p.world.isRemote) return
+            DiscordBridgeForge.inst.getCore().handleCommand(Player(p), event.command.name, event.parameters)
+        }
+    }
+}
\ No newline at end of file
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandSenderWrapper.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandSenderWrapper.kt
new file mode 100644
index 0000000..37947f5
--- /dev/null
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandSenderWrapper.kt
@@ -0,0 +1,28 @@
+package gg.obsidian.discordbridge.wrappers
+
+import net.minecraft.util.text.TextComponentString
+import java.util.*
+
+class CommandSenderWrapper(private val sender: net.minecraft.command.ICommandSender) : ICommandSender {
+    override fun getName(): String {
+        return sender.name
+    }
+
+    override fun getUUID(): UUID {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun sendMessage(message: String) {
+        sender.sendMessage(TextComponentString(message))
+    }
+
+    override fun hasPermission(permission: String): Boolean {
+        // TODO
+        // TODO
+        // TODO
+        // TODO
+        // TODO
+        return true
+    }
+
+}
\ No newline at end of file
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandWrapper.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandWrapper.kt
new file mode 100644
index 0000000..68d0861
--- /dev/null
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandWrapper.kt
@@ -0,0 +1,35 @@
+package gg.obsidian.discordbridge.wrappers
+
+import gg.obsidian.discordbridge.commands.controllers.BotControllerManager
+import net.minecraft.command.CommandBase
+import net.minecraft.command.ICommand
+import net.minecraft.command.ICommandSender
+import net.minecraft.server.MinecraftServer
+
+class CommandWrapper(private val command: BotControllerManager.Command): CommandBase() {
+    override fun getUsage(sender: ICommandSender?): String {
+        return "/${command.name} ${command.usage}"
+    }
+
+    override fun getName(): String {
+        return command.name
+    }
+
+    override fun compareTo(other: ICommand?): Int {
+        return if (other == null) 0 else super.compareTo(other)
+    }
+
+    override fun checkPermission(server: MinecraftServer?, sender: ICommandSender?): Boolean {
+        return true
+    }
+
+    override fun getAliases(): MutableList<String> {
+        // TODO: Add support for command aliases
+        return mutableListOf()
+    }
+
+    override fun execute(server: MinecraftServer?, sender: ICommandSender?, args: Array<out String>?) {
+        // Let the command listener handle this.
+    }
+
+}
\ No newline at end of file
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Logger.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Logger.kt
new file mode 100644
index 0000000..322b64f
--- /dev/null
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Logger.kt
@@ -0,0 +1,26 @@
+package gg.obsidian.discordbridge.wrappers
+
+import org.apache.logging.log4j.Logger
+
+class Logger(private val logger: Logger) : ILogger {
+    override fun info(message: String) {
+        logger.info(message)
+    }
+
+    override fun warning(message: String) {
+        logger.warn(message)
+    }
+
+    override fun warning(message: String, throwable: Throwable) {
+        logger.warn(message, throwable)
+    }
+
+    override fun severe(message: String) {
+        logger.error(message)
+    }
+
+    override fun severe(message: String, throwable: Throwable) {
+        logger.error(message, throwable)
+    }
+
+}
\ No newline at end of file
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Player.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Player.kt
new file mode 100644
index 0000000..137860c
--- /dev/null
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Player.kt
@@ -0,0 +1,36 @@
+package gg.obsidian.discordbridge.wrappers
+
+import net.minecraft.entity.player.EntityPlayer
+import net.minecraft.util.text.TextComponentString
+import java.util.*
+
+class Player(private val minecraftPlayer: EntityPlayer) : IPlayer {
+    override fun getWorld(): IWorld {
+        return World(minecraftPlayer.world)
+    }
+
+    override fun isVanished(): Boolean {
+        //return minecraftPlayer.get(Keys.INVISIBLE).orElse(false)
+        //TODO
+        return false
+    }
+
+    override fun getName(): String {
+        return minecraftPlayer.name
+    }
+
+    override fun getUUID(): UUID {
+        return minecraftPlayer.uniqueID
+    }
+
+    override fun sendMessage(message: String) {
+        minecraftPlayer.sendMessage(TextComponentString(message))
+    }
+
+    override fun hasPermission(permission: String): Boolean {
+        //return minecraftPlayer.hasPermission(permission)
+        // TODO
+        return true
+    }
+
+}
\ No newline at end of file
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Scheduler.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Scheduler.kt
new file mode 100644
index 0000000..8781bab
--- /dev/null
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Scheduler.kt
@@ -0,0 +1,7 @@
+package gg.obsidian.discordbridge.wrappers
+
+class Scheduler: IScheduler {
+    override fun runAsyncTask(task: Runnable) {
+        Thread(task).start()
+    }
+}
\ No newline at end of file
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
new file mode 100644
index 0000000..f0f8eaa
--- /dev/null
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
@@ -0,0 +1,54 @@
+package gg.obsidian.discordbridge.wrappers
+
+import gg.obsidian.discordbridge.DiscordBridgeForge
+import net.dv8tion.jda.core.entities.MessageChannel
+import net.minecraft.util.text.TextComponentString
+import net.minecraftforge.common.ForgeVersion
+import net.minecraftforge.fml.common.FMLCommonHandler
+import java.util.*
+
+class Server(private val mod: DiscordBridgeForge) : IServer {
+    override fun getScheduler(): IScheduler {
+        return Scheduler()
+    }
+
+    // TODO
+    override fun getVersion(): String {
+        return "Minecraft Forge " + ForgeVersion.mcVersion
+    }
+
+    override fun getMinecraftShortVersion(): String {
+        return "Minecraft Forge " + ForgeVersion.mcVersion
+    }
+
+    override fun getPlayer(uuid: UUID): IPlayer? {
+        val p = FMLCommonHandler.instance().minecraftServerInstance.playerList.getPlayerByUUID(uuid)
+        return Player(p)
+    }
+
+    override fun getPlayer(name: String): IPlayer? {
+        val p = FMLCommonHandler.instance().minecraftServerInstance.playerList.getPlayerByUsername(name)
+        return if (p != null) Player(p) else null
+    }
+
+    override fun getOnlinePlayers(): List<IPlayer> {
+        return FMLCommonHandler.instance().minecraftServerInstance.playerList.players.map { Player(it) }
+    }
+
+    override fun broadcastMessage(message: String) {
+        FMLCommonHandler.instance().minecraftServerInstance.playerList.sendMessage(TextComponentString(message))
+    }
+
+    override fun getRemoteConsoleSender(): IConsoleSender {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun dispatchCommand(channel: MessageChannel, command: String) {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun getLogger(): Logger {
+        return Logger(mod.logger)
+    }
+
+}
\ No newline at end of file
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/World.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/World.kt
new file mode 100644
index 0000000..0a254fc
--- /dev/null
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/World.kt
@@ -0,0 +1,10 @@
+package gg.obsidian.discordbridge.wrappers
+
+import net.minecraft.world.World
+
+class World(private val minecraftWorld: World) : IWorld {
+    override fun getName(): String {
+        return minecraftWorld.worldInfo.worldName
+    }
+
+}
\ No newline at end of file
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
index ff923d4..00142e9 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
@@ -13,7 +13,7 @@ import org.spongepowered.api.event.message.MessageChannelEvent
 import org.spongepowered.api.event.network.ClientConnectionEvent
 import org.spongepowered.api.plugin.Plugin
 import java.io.File
-import java.util.logging.Logger
+import org.slf4j.Logger
 import javax.inject.Inject
 
 @Plugin(id = "discordbridge-obsidian", name = "DiscordBridge", version = "@VERSION")
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Logger.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Logger.kt
new file mode 100644
index 0000000..3b83a53
--- /dev/null
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Logger.kt
@@ -0,0 +1,26 @@
+package gg.obsidian.discordbridge.wrappers
+
+import org.slf4j.Logger
+
+class Logger(private val logger: Logger) : ILogger {
+    override fun info(message: String) {
+        logger.info(message)
+    }
+
+    override fun warning(message: String) {
+        logger.warn(message)
+    }
+
+    override fun warning(message: String, throwable: Throwable) {
+        logger.warn(message, throwable)
+    }
+
+    override fun severe(message: String) {
+        logger.error(message)
+    }
+
+    override fun severe(message: String, throwable: Throwable) {
+        logger.error(message, throwable)
+    }
+
+}
\ No newline at end of file
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
index 16a20b2..821e7c6 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
@@ -7,7 +7,6 @@ import org.spongepowered.api.Game
 import org.spongepowered.api.Sponge
 import org.spongepowered.api.text.Text
 import java.util.*
-import java.util.logging.Logger
 
 class Server(private val plugin: DiscordBridgePlugin, private val game: Game) : IServer {
     override fun getScheduler(): IScheduler {
@@ -49,7 +48,7 @@ class Server(private val plugin: DiscordBridgePlugin, private val game: Game) :
     }
 
     override fun getLogger(): Logger {
-        return plugin.getLogger()
+        return Logger(plugin.getLogger())
     }
 
 }
\ No newline at end of file

From 3108384e7a6e9972b235bdf30daa8cd472b95d31 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Sun, 4 Feb 2018 22:42:50 -0600
Subject: [PATCH 07/30] Fix UserAliases not loading on server start

Also eliminated the pesky UserAlias tag in the yaml file
---
 .../gg/obsidian/discordbridge/ConfigurationNode.kt     |  9 +++------
 .../kotlin/gg/obsidian/discordbridge/DiscordBridge.kt  |  1 +
 .../gg/obsidian/discordbridge/UserAliasConfig.kt       |  7 +++----
 .../kotlin/gg/obsidian/discordbridge/util/UserAlias.kt | 10 +---------
 4 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/ConfigurationNode.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/ConfigurationNode.kt
index 0016be4..b53104a 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/ConfigurationNode.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/ConfigurationNode.kt
@@ -50,13 +50,10 @@ class ConfigurationNode() : MutableMap<String, Any> {
 
             val representer = EmptyNullRepresenter()
             representer.addClassTag(String::class.java, Tag.STR)
-//            representer.addClassTag(Rating::class.java, Tag("!!Rating"))
-//            representer.addClassTag(Respect::class.java, Tag("!!Respect"))
-//            representer.addClassTag(Script::class.java, Tag("!!Script"))
-            representer.addClassTag(UserAlias::class.java, Tag(UserAlias::class.java))
+            representer.addClassTag(UserAlias::class.java, Tag.MAP)
 
-            //yaml = Yaml(SafeConstructor(), representer, options)
-            yaml = Yaml(CustomClassLoaderConstructor(DiscordBridge::class.java.classLoader), representer, options)
+            yaml = Yaml(SafeConstructor(), representer, options)
+            //yaml = Yaml(CustomClassLoaderConstructor(DiscordBridge::class.java.classLoader), representer, options)
         }
     }
 
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
index 1f3cefe..46034f2 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
@@ -83,6 +83,7 @@ class DiscordBridge(private val server: IServer, private val dataFolder: File) {
     fun postInit() {
         config.load()
         users.load()
+        UserAliasConfig.load(this)
         scripts.load()
         eightball.load()
         f.load()
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
index 4ff2559..39e0763 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
@@ -12,9 +12,8 @@ object UserAliasConfig {
      * Load the stored aliases from file into memory
      */
     fun load(db: DiscordBridge) {
-        val list = db.getUsersConfig().getList<UserAlias>("aliases")
-        aliases = list ?:
-                throw IllegalStateException("usernames.yml could not be read - list items are not properly formatted")
+        val list = db.getUsersConfig().getList<Map<String, Any>>("aliases")
+        aliases = list.castTo({UserAlias(it)})
     }
 
     /**
@@ -37,7 +36,7 @@ object UserAliasConfig {
         db.getUsersConfig().load()
     }
 
-    private inline fun <reified T : Any> List<HashMap<String, Any>>.castTo(factory: (HashMap<String, Any>) -> T): List<T> {
+    private inline fun <reified T : Any> List<Map<String, Any>>.castTo(factory: (Map<String, Any>) -> T): List<T> {
         return this.mapTo(mutableListOf()) { factory(it) }.toList()
     }
 }
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UserAlias.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UserAlias.kt
index 3107868..7a2e571 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UserAlias.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UserAlias.kt
@@ -1,8 +1,5 @@
 package gg.obsidian.discordbridge.util
 
-import java.io.Serializable
-import java.util.*
-
 //TODO: make null safe
 /**
  * Represents a UserAlias entry in usernames.yml
@@ -11,10 +8,5 @@ import java.util.*
  * @param discordId the unique Discord ID of the Discord account linked to this alias
  */
 data class UserAlias(var mcUuid: String, var discordId: String) {
-
-    constructor(): this("null", "null")
-
-//    constructor(map: MutableMap<String, Any>):
-//            this(map["mcUuid"] as String, map["discordId"] as String)
-
+    constructor(map: Map<String, Any>): this(map["mcUuid"] as String, map["discordId"] as String)
 }
\ No newline at end of file

From 7ed2f2429c7a845cf913d97abd22ca4652c61f6c Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Sun, 4 Feb 2018 23:09:08 -0600
Subject: [PATCH 08/30] Address a bunch of lint warnings

---
 .../discordbridge/ConfigurationNode.kt        | 47 +++----------------
 .../obsidian/discordbridge/DiscordBridge.kt   |  3 +-
 .../commands/MinecraftChatEventWrapper.kt     |  5 +-
 .../commands/MinecraftCommandWrapper.kt       |  3 +-
 .../controllers/BotControllerManager.kt       | 17 +++----
 .../controllers/FunCommandsController.kt      |  8 ----
 .../discordbridge/discord/Listener.kt         |  2 +-
 .../obsidian/discordbridge/util/ChatColor.kt  |  4 +-
 .../gg/obsidian/discordbridge/util/Rating.kt  |  2 -
 .../gg/obsidian/discordbridge/util/Respect.kt |  2 -
 .../gg/obsidian/discordbridge/util/Script.kt  |  1 -
 .../discordbridge/DiscordBridgeForge.kt       |  9 +---
 .../gg/obsidian/discordbridge/EventHandler.kt |  1 -
 13 files changed, 24 insertions(+), 80 deletions(-)

diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/ConfigurationNode.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/ConfigurationNode.kt
index b53104a..acfb4a6 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/ConfigurationNode.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/ConfigurationNode.kt
@@ -2,37 +2,21 @@
 
 package gg.obsidian.discordbridge
 
-import gg.obsidian.discordbridge.util.Rating
-import gg.obsidian.discordbridge.util.Respect
-import gg.obsidian.discordbridge.util.Script
 import gg.obsidian.discordbridge.util.UserAlias
-import java.io.File
-import java.io.FileInputStream
-import java.io.FileOutputStream
-import java.io.IOException
-import java.io.InputStream
-import java.io.OutputStreamWriter
-import java.util.ArrayList
-import java.util.LinkedHashMap
-
 import org.yaml.snakeyaml.DumperOptions
 import org.yaml.snakeyaml.Yaml
-import org.yaml.snakeyaml.constructor.CustomClassLoaderConstructor
 import org.yaml.snakeyaml.constructor.SafeConstructor
 import org.yaml.snakeyaml.error.YAMLException
 import org.yaml.snakeyaml.introspector.Property
-import org.yaml.snakeyaml.nodes.CollectionNode
-import org.yaml.snakeyaml.nodes.MappingNode
-import org.yaml.snakeyaml.nodes.Node
-import org.yaml.snakeyaml.nodes.NodeTuple
-import org.yaml.snakeyaml.nodes.SequenceNode
-import org.yaml.snakeyaml.nodes.Tag
+import org.yaml.snakeyaml.nodes.*
 import org.yaml.snakeyaml.reader.UnicodeReader
 import org.yaml.snakeyaml.representer.Represent
 import org.yaml.snakeyaml.representer.Representer
+import java.io.*
+import java.util.*
 
 class ConfigurationNode() : MutableMap<String, Any> {
-    var entries2: MutableMap<String, Any>? = null
+    private var entries2: MutableMap<String, Any>? = null
     private var f: File? = null
     private var yaml: Yaml? = null
 
@@ -62,26 +46,9 @@ class ConfigurationNode() : MutableMap<String, Any> {
     }
 
     constructor(map: MutableMap<String, Any>): this() {
-        if (map == null) {
-            throw IllegalArgumentException()
-        }
         entries2 = map
     }
 
-    constructor(input: InputStream): this() {
-        load(input)
-    }
-
-    @SuppressWarnings("unchecked")
-    fun load(input: InputStream): Boolean {
-        initparse()
-
-        val o: Any = yaml!!.load(UnicodeReader(input))
-        if(o is MutableMap<*, *>)
-            entries2 = o as MutableMap<String, Any>
-        return (entries2 != null)
-    }
-
     @SuppressWarnings("unchecked")
     fun load(): Boolean {
         initparse()
@@ -153,8 +120,7 @@ class ConfigurationNode() : MutableMap<String, Any> {
         }
 
         val subpath = path.substring(separator + 1)
-        val ret = ConfigurationNode(submap).getObject(subpath)
-        return ret
+        return ConfigurationNode(submap).getObject(subpath)
     }
 
     fun getObject(path: String, default: Any): Any {
@@ -209,8 +175,7 @@ class ConfigurationNode() : MutableMap<String, Any> {
     @SuppressWarnings("unchecked")
     fun <T> getList(path: String): List<T> {
         try {
-            val list = getObject(path) as List<T>
-            return list
+            return getObject(path) as List<T>
         } catch (e: ClassCastException) {
             try {
                 val o = getObject(path) as T ?: return ArrayList()
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
index 46034f2..ec56d21 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
@@ -7,7 +7,6 @@ import gg.obsidian.discordbridge.commands.controllers.FunCommandsController
 import gg.obsidian.discordbridge.commands.controllers.UtilCommandsController
 import gg.obsidian.discordbridge.discord.Connection
 import gg.obsidian.discordbridge.util.MarkdownToMinecraftSeralizer
-import gg.obsidian.discordbridge.util.Respect
 import gg.obsidian.discordbridge.util.UserAlias
 import gg.obsidian.discordbridge.util.ChatColor as CC
 import gg.obsidian.discordbridge.util.UtilFunctions.noSpace
@@ -25,7 +24,7 @@ import java.io.IOException
 import java.io.FileOutputStream
 import java.util.*
 
-class DiscordBridge(private val server: IServer, private val dataFolder: File) {
+class DiscordBridge(private val server: IServer, dataFolder: File) {
 
     private val config: ConfigurationNode
     private val users: ConfigurationNode
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftChatEventWrapper.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftChatEventWrapper.kt
index 1b031f7..f1ded0b 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftChatEventWrapper.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftChatEventWrapper.kt
@@ -5,9 +5,10 @@ import gg.obsidian.discordbridge.wrappers.IPlayer
 import net.dv8tion.jda.core.entities.MessageChannel
 
 /**
- * A wrapper for Bukkit's AsyncPlayerChatEvent class
+ * Event wrapper for a player chat event
  *
- * @param event the underlying AsyncPlayerChatEvent instance
+ * @param player the player who triggered the event
+ * @param chatMessage the contents of the message that was sent
  */
 class MinecraftChatEventWrapper(val player: IPlayer, val chatMessage: String) : IEventWrapper {
     /**
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt
index 292b9a0..3535d2a 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt
@@ -2,7 +2,6 @@ package gg.obsidian.discordbridge.commands
 
 import gg.obsidian.discordbridge.discord.Connection
 import gg.obsidian.discordbridge.wrappers.ICommandSender
-import gg.obsidian.discordbridge.wrappers.ICommand
 import gg.obsidian.discordbridge.wrappers.IPlayer
 import net.dv8tion.jda.core.entities.MessageChannel
 
@@ -10,7 +9,7 @@ import net.dv8tion.jda.core.entities.MessageChannel
  * 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 commandName the name of the command that was invoked
  * @param args an array of argument strings passed to the command
  */
 class MinecraftCommandWrapper(val sender: ICommandSender, val commandName: String,
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
index 2abc912..a5b5385 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
@@ -1,10 +1,12 @@
 package gg.obsidian.discordbridge.commands.controllers
 
 import gg.obsidian.discordbridge.DiscordBridge
-import gg.obsidian.discordbridge.commands.*
+import gg.obsidian.discordbridge.commands.DiscordMessageWrapper
+import gg.obsidian.discordbridge.commands.IEventWrapper
+import gg.obsidian.discordbridge.commands.MinecraftChatEventWrapper
+import gg.obsidian.discordbridge.commands.MinecraftCommandWrapper
 import gg.obsidian.discordbridge.commands.annotations.*
 import gg.obsidian.discordbridge.discord.Connection
-import gg.obsidian.discordbridge.util.ChatColor as CC
 import gg.obsidian.discordbridge.util.MarkdownToMinecraftSeralizer
 import gg.obsidian.discordbridge.util.Script
 import gg.obsidian.discordbridge.util.UtilFunctions.noSpace
@@ -14,14 +16,13 @@ import gg.obsidian.discordbridge.util.UtilFunctions.toMinecraftChatMessage
 import net.dv8tion.jda.core.Permission
 import java.lang.reflect.Method
 import java.util.*
-import java.util.logging.Level
-import kotlin.collections.HashMap
+import gg.obsidian.discordbridge.util.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
+ * @param db a reference to the base DiscordBridge object
  * @see IBotController
  */
 class BotControllerManager(val db: DiscordBridge) {
@@ -140,7 +141,7 @@ class BotControllerManager(val db: DiscordBridge) {
      * @return true if a trigger was found and successfully responded to, false otherwise
      */
     private fun sendScriptedResponse(event: IEventWrapper): Boolean {
-        val responses = db.getScriptsConfig().getList<HashMap<String, Any>>("responses").castTo({Script(it)}) ?: return false
+        val responses = db.getScriptsConfig().getList<HashMap<String, Any>>("responses").castTo({Script(it)})
 
         var response: Script? = null
         for (r in responses) {
@@ -410,7 +411,7 @@ class BotControllerManager(val db: DiscordBridge) {
 ////                    }
 //                }
 //            }
-        return false
+//        return false
     }
 
     /**
@@ -423,7 +424,7 @@ class BotControllerManager(val db: DiscordBridge) {
     private fun relay(event: IEventWrapper, logIgnore: Boolean) {
         when (event) {
             is MinecraftChatEventWrapper -> {
-                var worldname = event.player.getWorld().getName()
+                val worldname = event.player.getWorld().getName()
 
                 // TODO
                 // Get world alias if Multiverse is installed
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt
index d170296..89365ac 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt
@@ -66,7 +66,6 @@ class FunCommandsController(val db: DiscordBridge) : IBotController {
         var totalRespects = db.getFConfig().getInteger("total-respects", 0)
         db.logger.info(db.getFConfig().getList<Any>("responses").toString())
         val responses = db.getFConfig().getList<LinkedHashMap<String, Any>>("responses").castTo({Respect(it)})
-                ?: 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
@@ -120,7 +119,6 @@ class FunCommandsController(val db: DiscordBridge) : IBotController {
     private fun rate(event: IEventWrapper, thingToRate: String): String {
         db.logDebug("user ${event.senderName} requests a rating")
         val responses = db.getRateConfig().getList<LinkedHashMap<String, Any>>("responses").castTo({Rating(it)})
-                ?: return "ERROR: Responses for this command could not be read from the config."
 
         var rateOutOf = db.getRateConfig().getInteger("rate-out-of", 10)
         if (rateOutOf > 1000000) rateOutOf = 1000000
@@ -192,12 +190,6 @@ class FunCommandsController(val db: DiscordBridge) : 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
-
     private inline fun <reified T : Any> List<HashMap<String, Any>>.castTo(factory: (HashMap<String, Any>) -> T): List<T> {
         return this.mapTo(mutableListOf()) { factory(it) }.toList()
     }
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
index 9b7ffb4..32477ab 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
@@ -11,7 +11,7 @@ import net.dv8tion.jda.core.hooks.ListenerAdapter
 /**
  * Listens for events from Discord
  *
- * @param plugin a reference to the base Plugin object
+ * @param db a reference to the base DiscordBridge object
  */
 class Listener(val db: DiscordBridge) : ListenerAdapter() {
 
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/ChatColor.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/ChatColor.kt
index fa2e34b..8e41cb1 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/ChatColor.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/ChatColor.kt
@@ -8,9 +8,9 @@ private const val COLOR_CHAR = '\u00A7'
 /**
  * All supported color values for chat
  */
-enum class ChatColor private constructor(
+enum class ChatColor(
         val char: Char, private val intCode: Int,
-        val isFormat: Boolean = false) {
+        private val isFormat: Boolean = false) {
     BLACK('0', 0x00),
     DARK_BLUE('1', 0x1),
     DARK_GREEN('2', 0x2),
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Rating.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Rating.kt
index 34d92d0..983cb87 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Rating.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Rating.kt
@@ -23,6 +23,4 @@ data class Rating(val message: String = "%u - I rate %m %r") {
         low = if(map["low"] is Double) map["low"] as Double else (map["low"] as Int).toDouble()
         high = if(map["high"] is Double) map["high"] as Double else (map["high"] as Int).toDouble()
     }
-
-    constructor(message: String, low: Double = 0.0, high: Double = 0.0): this(message)
 }
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Respect.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Respect.kt
index a89c9e4..950d6bf 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Respect.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Respect.kt
@@ -9,8 +9,6 @@ package gg.obsidian.discordbridge.util
  * @param weight the probability weight that this entry will be selected
  */
 data class Respect(val message: String = "%u solemnly pays respect!", val count: Int = 1, val weight: Int = 1) {
-    @Suppress("unused")
     constructor(map: MutableMap<String, Any>):
             this(map["message"] as String, map["respects-paid"] as Int, map["weight"] as Int)
-
 }
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Script.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Script.kt
index 9eda520..f5c6e14 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Script.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Script.kt
@@ -14,7 +14,6 @@ package gg.obsidian.discordbridge.util
 data class Script(val triggerMC: String?, val triggerDis: String?, val responseMC: String?, val responseDis: String?,
                   val caseSensitive: Boolean?, val requiresMention: Boolean?,
                   val startsWith: Boolean?) {
-    @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,
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgeForge.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgeForge.kt
index 3ff675f..cde5f98 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgeForge.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgeForge.kt
@@ -2,9 +2,7 @@ package gg.obsidian.discordbridge
 
 import gg.obsidian.discordbridge.wrappers.CommandWrapper
 import gg.obsidian.discordbridge.wrappers.Server
-import net.minecraft.init.Blocks
 import net.minecraftforge.fml.common.Mod
-import net.minecraftforge.fml.common.event.FMLInitializationEvent
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent
 import net.minecraftforge.fml.common.event.FMLServerStartingEvent
 import org.apache.logging.log4j.Logger
@@ -28,20 +26,15 @@ class DiscordBridgeForge {
         }
     }
 
-    public lateinit var logger: Logger
-
+    lateinit var logger: Logger
 
     private lateinit var core: DiscordBridge
-    //private lateinit var instance: DiscordBridgePlugin
-
-    //fun getPlugin() : DiscordBridgePlugin = instance
 
     fun getCore() : DiscordBridge = core
 
 
     companion object {
         const val MODID = "discordbridge-obsidian"
-        val VERSION = "1.0"
 
         @Mod.Instance(MODID)
         lateinit var inst: DiscordBridgeForge
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt
index 701fd06..d9b22fa 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt
@@ -1,6 +1,5 @@
 package gg.obsidian.discordbridge
 
-import gg.obsidian.discordbridge.wrappers.CommandSenderWrapper
 import gg.obsidian.discordbridge.wrappers.Player
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.entity.player.EntityPlayerMP

From 57860f6ed4505e332e9c4fac989ef173a0c783df Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Sun, 4 Feb 2018 23:27:31 -0600
Subject: [PATCH 09/30] Fix server start/stop message triggers

---
 .../obsidian/discordbridge/DiscordBridgePlugin.kt  |  6 ++++++
 .../gg/obsidian/discordbridge/DiscordBridge.kt     | 10 ++++++++++
 .../obsidian/discordbridge/discord/Connection.kt   |  2 --
 .../obsidian/discordbridge/DiscordBridgeForge.kt   | 14 +++++++++++++-
 .../obsidian/discordbridge/DiscordBridgePlugin.kt  | 12 ++++++++++++
 5 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
index 08d4018..e8702a5 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
@@ -39,6 +39,12 @@ class DiscordBridgePlugin : JavaPlugin() {
         getCommand("choose").executor = EventListener(core)
         getCommand("talk").executor = EventListener(core)
         getCommand("roll").executor = EventListener(core)
+
+        core.handleServerStart()
+    }
+
+    override fun onDisable() {
+        core.handleServerStop()
     }
 
 }
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
index ec56d21..8bfb89b 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
@@ -364,6 +364,16 @@ class DiscordBridge(private val server: IServer, dataFolder: File) {
         return modifiedMessage
     }
 
+    fun handleServerStart() {
+        if (config.getBoolean("announce-server-start-stop", true))
+            sendToDiscord(config.getString("templates.discord.server-start", "Server started!"), Connection.getRelayChannel())
+    }
+
+    fun handleServerStop() {
+        if (config.getBoolean("announce-server-start-stop", true))
+            sendToDiscord(config.getString("templates.discord.server-stop", "Shutting down..."), Connection.getRelayChannel())
+    }
+
     fun handlePlayerChat(player: IPlayer, message: String, isCancelled: Boolean): String {
         // TODO: the order of these if statements may produce undesired behavior
         logDebug("Received a chat event from ${player.getName()}: $message")
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
index 09943fd..e01d9a3 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
@@ -102,8 +102,6 @@ object Connection: Runnable {
         JDA = builder.buildBlocking()
         listener = Listener(db)
         JDA.addEventListener(listener)
-        if (db.getConfig().getBoolean("announce-server-start-stop", true))
-            send(db.getConfig().getString("templates.discord.server-start", "Server started!"), getRelayChannel())
         JDA.presence.game = Game.of("Minecraft ${db.getServer().getMinecraftShortVersion()}")
     }
 
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgeForge.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgeForge.kt
index cde5f98..546c5a1 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgeForge.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgeForge.kt
@@ -4,7 +4,9 @@ import gg.obsidian.discordbridge.wrappers.CommandWrapper
 import gg.obsidian.discordbridge.wrappers.Server
 import net.minecraftforge.fml.common.Mod
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent
+import net.minecraftforge.fml.common.event.FMLServerStartedEvent
 import net.minecraftforge.fml.common.event.FMLServerStartingEvent
+import net.minecraftforge.fml.common.event.FMLServerStoppingEvent
 import org.apache.logging.log4j.Logger
 import java.io.File
 
@@ -20,12 +22,22 @@ class DiscordBridgeForge {
     }
 
     @Mod.EventHandler
-    fun serverStart(event: FMLServerStartingEvent) {
+    fun serverStarting(event: FMLServerStartingEvent) {
         for (c in core.getServerCommands()) {
             event.registerServerCommand(CommandWrapper(c))
         }
     }
 
+    @Mod.EventHandler
+    fun serverStarted(event: FMLServerStartedEvent) {
+        core.handleServerStart()
+    }
+
+    @Mod.EventHandler
+    fun serverStop(event: FMLServerStoppingEvent) {
+        core.handleServerStop()
+    }
+
     lateinit var logger: Logger
 
     private lateinit var core: DiscordBridge
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
index 00142e9..75a7ffb 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
@@ -14,6 +14,8 @@ import org.spongepowered.api.event.network.ClientConnectionEvent
 import org.spongepowered.api.plugin.Plugin
 import java.io.File
 import org.slf4j.Logger
+import org.spongepowered.api.event.game.state.GameStartedServerEvent
+import org.spongepowered.api.event.game.state.GameStoppingServerEvent
 import javax.inject.Inject
 
 @Plugin(id = "discordbridge-obsidian", name = "DiscordBridge", version = "@VERSION")
@@ -42,6 +44,16 @@ class DiscordBridgePlugin {
         //game.commandManager.register(this, )
     }
 
+    @Listener
+    fun onServerStarted(event: GameStartedServerEvent) {
+        core.handleServerStart()
+    }
+
+    @Listener
+    fun onServerStopping(event: GameStoppingServerEvent) {
+        core.handleServerStop()
+    }
+
     @Listener(order = Order.LAST)
     fun onPlayerJoin(event: ClientConnectionEvent.Join) {
         core.handlePlayerJoin(Player(event.targetEntity))

From 8c9ba8381027826c3d8cf3c27385fd36638f6e57 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Mon, 5 Feb 2018 00:11:09 -0600
Subject: [PATCH 10/30] Put all config references into one map object

---
 .../obsidian/discordbridge/DiscordBridge.kt   | 93 ++++++-------------
 .../obsidian/discordbridge/UserAliasConfig.kt | 15 +--
 .../commands/DiscordMessageWrapper.kt         |  5 +-
 .../controllers/BotControllerManager.kt       | 49 +++++-----
 .../controllers/FunCommandsController.kt      | 27 +++---
 .../controllers/UtilCommandsController.kt     |  7 +-
 .../discordbridge/discord/Connection.kt       |  9 +-
 .../discordbridge/util/ConfigTypes.kt         | 11 +++
 .../discordbridge/util/UtilFunctions.kt       | 10 +-
 9 files changed, 101 insertions(+), 125 deletions(-)
 create mode 100644 discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/ConfigTypes.kt

diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
index 8bfb89b..37444e5 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
@@ -6,6 +6,7 @@ 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.util.Cfg
 import gg.obsidian.discordbridge.util.MarkdownToMinecraftSeralizer
 import gg.obsidian.discordbridge.util.UserAlias
 import gg.obsidian.discordbridge.util.ChatColor as CC
@@ -26,17 +27,11 @@ import java.util.*
 
 class DiscordBridge(private val server: IServer, dataFolder: File) {
 
-    private val config: ConfigurationNode
-    private val users: ConfigurationNode
-    private val scripts: ConfigurationNode
-    private val eightball: ConfigurationNode
-    private val f: ConfigurationNode
-    private val rate: ConfigurationNode
-    private val insult: ConfigurationNode
     private val pegDownProc = PegDownProcessor()
     private val minecraftChatControllerManager = BotControllerManager(this)
     private val discordChatControllerManager = BotControllerManager(this)
     private val minecraftCommandControllerManager = BotControllerManager(this)
+    private val cfgNodes: MutableMap<Cfg, ConfigurationNode> = mutableMapOf()
 
     // Temporary storage for alias linking requests
     var requests: MutableList<UserAlias> = mutableListOf()
@@ -48,28 +43,13 @@ class DiscordBridge(private val server: IServer, dataFolder: File) {
 
         if (!dataFolder.exists()) dataFolder.mkdirs()
 
-        val cf = File(dataFolder, "config.yml")
-        if (!createDefaultFileFromResource("/config.yml", cf)) {logger.severe("Could not create default for config.yml")} //return false
-        val uaf = File(dataFolder, "usernames.yml")
-        if (!createDefaultFileFromResource("/usernames.yml", uaf)) {logger.severe("Could not create default for usernamess.yml")} // return false
-        val sf = File(dataFolder, "script.yml")
-        if (!createDefaultFileFromResource("/script.yml", sf)) {logger.severe("Could not create default for script.yml")} // return false
-        val ebf = File(dataFolder, "8ball.yml")
-        if (!createDefaultFileFromResource("/8ball.yml", ebf)) {logger.severe("Could not create default for 8ball.yml")} //return false
-        val ff = File(dataFolder, "f.yml")
-        if (!createDefaultFileFromResource("/f.yml", ff)) {logger.severe("Could not create default for f.yml")} // return false
-        val rf = File(dataFolder, "rate.yml")
-        if (!createDefaultFileFromResource("/rate.yml", rf)) {logger.severe("Could not create default for rate.yml")} // return false
-        val inf = File(dataFolder, "insult.yml")
-        if (!createDefaultFileFromResource("/insult.yml", inf)) {logger.severe("Could not create default for insult.yml")} // return false
-
-        config = ConfigurationNode(cf)
-        users = ConfigurationNode(uaf)
-        scripts = ConfigurationNode(sf)
-        eightball = ConfigurationNode(ebf)
-        f = ConfigurationNode(ff)
-        rate = ConfigurationNode(rf)
-        insult = ConfigurationNode(inf)
+        for (c in Cfg.values()) {
+            val filename = "${c.filename}.yml"
+            val file = File(dataFolder, filename)
+            if (!createDefaultFileFromResource("/$filename", file))
+                logger.severe("Could not create default file for $filename")
+            cfgNodes.put(c, ConfigurationNode(file))
+        }
 
         minecraftChatControllerManager.registerController(FunCommandsController(this), chatExclusive = true)
         minecraftChatControllerManager.registerController(UtilCommandsController(this), chatExclusive = true)
@@ -80,40 +60,25 @@ class DiscordBridge(private val server: IServer, dataFolder: File) {
     }
 
     fun postInit() {
-        config.load()
-        users.load()
+        for (cfg in cfgNodes.values) cfg.load()
         UserAliasConfig.load(this)
-        scripts.load()
-        eightball.load()
-        f.load()
-        rate.load()
-        insult.load()
         server.getScheduler().runAsyncTask(Connection)
     }
 
     fun logDebug(msg: String) {
-        if (!getConfig().getBoolean("debug", false)) return
+        if (!getConfig(Cfg.CONFIG).getBoolean("debug", false)) return
         logger.info("[DiscordBridge] $msg")
     }
 
     fun getServer(): IServer = server
     fun getPegDownProcessor(): PegDownProcessor = pegDownProc
-
-    fun getConfig(): ConfigurationNode = config
-    fun getUsersConfig(): ConfigurationNode = users
-    fun getScriptsConfig(): ConfigurationNode = scripts
-    fun getEightBallConfig(): ConfigurationNode = eightball
-    fun getFConfig(): ConfigurationNode = f
-    fun getRateConfig(): ConfigurationNode = rate
-    fun getInsultConfig(): ConfigurationNode = insult
+    fun getConfig(type: Cfg) = cfgNodes[type]!!
 
     // Borrowed code from dynmap-core
     /* Uses resource to create default file, if file does not yet exist */
     private fun createDefaultFileFromResource(resourcename: String, deffile: File): Boolean {
         if (deffile.canRead()) return true
-        //TODO: This is initialized before the config that controls the debug logger is!
         logger.info(deffile.path + " not found - creating default")
-        //logger.info(deffile.path + " not found - creating default")
         val inputStream = javaClass.getResourceAsStream(resourcename)
         if (inputStream == null) {
             logger.severe("Unable to find default resource - " + resourcename)
@@ -165,13 +130,7 @@ class DiscordBridge(private val server: IServer, dataFolder: File) {
 
 
     fun reload(callback: Runnable) {
-        config.load()
-        users.load()
-        eightball.load()
-        insult.load()
-        f.load()
-        rate.load()
-        scripts.load()
+        for (cfg in cfgNodes.values) cfg.load()
         //if (isMultiverseInstalled) worlds!!.reloadConfig()
         UserAliasConfig.load(this)
         Connection.reconnect(callback)
@@ -365,21 +324,21 @@ class DiscordBridge(private val server: IServer, dataFolder: File) {
     }
 
     fun handleServerStart() {
-        if (config.getBoolean("announce-server-start-stop", true))
-            sendToDiscord(config.getString("templates.discord.server-start", "Server started!"), Connection.getRelayChannel())
+        if (getConfig(Cfg.CONFIG).getBoolean("announce-server-start-stop", true))
+            sendToDiscord(getConfig(Cfg.CONFIG).getString("templates.discord.server-start", "Server started!"), Connection.getRelayChannel())
     }
 
     fun handleServerStop() {
-        if (config.getBoolean("announce-server-start-stop", true))
-            sendToDiscord(config.getString("templates.discord.server-stop", "Shutting down..."), Connection.getRelayChannel())
+        if (getConfig(Cfg.CONFIG).getBoolean("announce-server-start-stop", true))
+            sendToDiscord(getConfig(Cfg.CONFIG).getString("templates.discord.server-stop", "Shutting down..."), Connection.getRelayChannel())
     }
 
     fun handlePlayerChat(player: IPlayer, message: String, isCancelled: Boolean): String {
         // TODO: the order of these if statements may produce undesired behavior
         logDebug("Received a chat event from ${player.getName()}: $message")
-        if (!getConfig().getBoolean("player-messages.chat", true)) return message
-        if (isCancelled && !getConfig().getBoolean("relay-cancelled-messages", true)) return message
-        if (player.isVanished() && !getConfig().getBoolean("if-vanished.player-chat", false)) return message
+        if (!getConfig(Cfg.CONFIG).getBoolean("player-messages.chat", true)) return message
+        if (isCancelled && !getConfig(Cfg.CONFIG).getBoolean("relay-cancelled-messages", true)) return message
+        if (player.isVanished() && !getConfig(Cfg.CONFIG).getBoolean("if-vanished.player-chat", false)) return message
 
         // Emoticons!
         var newMessage = message.replace(":lenny:", "( \u0361\u00B0 \u035C\u0296 \u0361\u00B0)")
@@ -410,8 +369,8 @@ class DiscordBridge(private val server: IServer, dataFolder: File) {
         val username = player.getName()
         val worldname = player.getWorld().getName()
         logDebug("Received a join event for $username")
-        if (!getConfig().getBoolean("messages.player-join", true)) return
-        if (player.isVanished() && !getConfig().getBoolean("if-vanished.player-join", false)) return
+        if (!getConfig(Cfg.CONFIG).getBoolean("messages.player-join", true)) return
+        if (player.isVanished() && !getConfig(Cfg.CONFIG).getBoolean("if-vanished.player-join", false)) return
 
         // Get world alias if Multiverse is installed
 //        if (plugin.isMultiverseInstalled) {
@@ -431,8 +390,8 @@ class DiscordBridge(private val server: IServer, dataFolder: File) {
         val username = player.getName()
         val worldname = player.getWorld().getName()
         logDebug("Received a leave event for $username")
-        if (!getConfig().getBoolean("messages.player-leave", true)) return
-        if (player.isVanished() && !getConfig().getBoolean("if-vanished.player-leave", false)) return
+        if (!getConfig(Cfg.CONFIG).getBoolean("messages.player-leave", true)) return
+        if (player.isVanished() && !getConfig(Cfg.CONFIG).getBoolean("if-vanished.player-leave", false)) return
 
         // Get world alias if Multiverse is installed
 //        if (plugin.isMultiverseInstalled) {
@@ -452,8 +411,8 @@ class DiscordBridge(private val server: IServer, dataFolder: File) {
         val username = player.getName()
         val worldname = player.getWorld().getName()
 
-        if (!getConfig().getBoolean("messages.player-death", false)) return
-        if (player.isVanished() && !getConfig().getBoolean("if-vanished.player-death", false)) return
+        if (!getConfig(Cfg.CONFIG).getBoolean("messages.player-death", false)) return
+        if (player.isVanished() && !getConfig(Cfg.CONFIG).getBoolean("if-vanished.player-death", false)) return
 
         // Get world alias if Multiverse is installed
 //        if (plugin.isMultiverseInstalled) {
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
index 39e0763..7fbb909 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
@@ -1,5 +1,6 @@
 package gg.obsidian.discordbridge
 
+import gg.obsidian.discordbridge.util.Cfg
 import gg.obsidian.discordbridge.util.UserAlias
 
 /**
@@ -12,7 +13,7 @@ object UserAliasConfig {
      * Load the stored aliases from file into memory
      */
     fun load(db: DiscordBridge) {
-        val list = db.getUsersConfig().getList<Map<String, Any>>("aliases")
+        val list = db.getConfig(Cfg.ALIAS).getList<Map<String, Any>>("aliases")
         aliases = list.castTo({UserAlias(it)})
     }
 
@@ -21,9 +22,9 @@ object UserAliasConfig {
      */
     fun add(db: DiscordBridge, ua: UserAlias) {
         aliases = aliases.plus(ua)
-        db.getUsersConfig().put("aliases", aliases)
-        db.getUsersConfig().save()
-        db.getUsersConfig().load()
+        db.getConfig(Cfg.ALIAS).put("aliases", aliases)
+        db.getConfig(Cfg.ALIAS).save()
+        db.getConfig(Cfg.ALIAS).load()
     }
 
     /**
@@ -31,9 +32,9 @@ object UserAliasConfig {
      */
     fun remove(db: DiscordBridge, ua: UserAlias) {
         aliases = aliases.minus(ua)
-        db.getUsersConfig().put("aliases", aliases)
-        db.getUsersConfig().save()
-        db.getUsersConfig().load()
+        db.getConfig(Cfg.ALIAS).put("aliases", aliases)
+        db.getConfig(Cfg.ALIAS).save()
+        db.getConfig(Cfg.ALIAS).load()
     }
 
     private inline fun <reified T : Any> List<Map<String, Any>>.castTo(factory: (Map<String, Any>) -> T): List<T> {
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordMessageWrapper.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordMessageWrapper.kt
index 30cd2d8..eed19e6 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordMessageWrapper.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordMessageWrapper.kt
@@ -1,6 +1,7 @@
 package gg.obsidian.discordbridge.commands
 
 import gg.obsidian.discordbridge.DiscordBridge
+import gg.obsidian.discordbridge.util.Cfg
 import net.dv8tion.jda.core.entities.ChannelType
 import net.dv8tion.jda.core.entities.Message
 import net.dv8tion.jda.core.entities.MessageChannel
@@ -33,9 +34,9 @@ class DiscordMessageWrapper(val db: DiscordBridge, val originalMessage: Message)
      */
     override val isFromRelayChannel: Boolean
         get() = if (originalMessage.isFromType(ChannelType.PRIVATE)) false
-                else originalMessage.guild.id == db.getConfig().getString("server-id")
+                else originalMessage.guild.id == db.getConfig(Cfg.CONFIG).getString("server-id")
                 && originalMessage.isFromType(ChannelType.TEXT)
-                && originalMessage.textChannel.name.equals(db.getConfig().getString("channel"), true)
+                && originalMessage.textChannel.name.equals(db.getConfig(Cfg.CONFIG).getString("channel"), true)
 
     /**
      * The message of this event
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
index a5b5385..1643f0c 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
@@ -7,6 +7,7 @@ import gg.obsidian.discordbridge.commands.MinecraftChatEventWrapper
 import gg.obsidian.discordbridge.commands.MinecraftCommandWrapper
 import gg.obsidian.discordbridge.commands.annotations.*
 import gg.obsidian.discordbridge.discord.Connection
+import gg.obsidian.discordbridge.util.Cfg
 import gg.obsidian.discordbridge.util.MarkdownToMinecraftSeralizer
 import gg.obsidian.discordbridge.util.Script
 import gg.obsidian.discordbridge.util.UtilFunctions.noSpace
@@ -112,14 +113,14 @@ class BotControllerManager(val db: DiscordBridge) {
         if (sendScriptedResponse(event)) return true
 
         // <prefix>command
-        if (db.getConfig().getString("command-prefix", "").isNotBlank() && event.rawMessage.startsWith(db.getConfig().getString("command-prefix", ""))) {
-            val split = event.rawMessage.replaceFirst(db.getConfig().getString("command-prefix", ""), "").trim().split("\\s+".toRegex()).toTypedArray()
+        if (db.getConfig(Cfg.CONFIG).getString("command-prefix", "").isNotBlank() && event.rawMessage.startsWith(db.getConfig(Cfg.CONFIG).getString("command-prefix", ""))) {
+            val split = event.rawMessage.replaceFirst(db.getConfig(Cfg.CONFIG).getString("command-prefix", ""), "").trim().split("\\s+".toRegex()).toTypedArray()
             return parseCommand(event, split, false)
         }
 
         // @<mention> command from Minecraft
-        if (event is MinecraftChatEventWrapper && event.rawMessage.startsWith("@${db.getConfig().getString("username", "DiscordBridge").noSpace()} ")) {
-            val split = event.rawMessage.replaceFirst("@${db.getConfig().getString("username", "DiscordBridge").noSpace()} ", "").trim().split("\\s+".toRegex()).toTypedArray()
+        if (event is MinecraftChatEventWrapper && event.rawMessage.startsWith("@${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").noSpace()} ")) {
+            val split = event.rawMessage.replaceFirst("@${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").noSpace()} ", "").trim().split("\\s+".toRegex()).toTypedArray()
             return parseCommand(event, split, true)
         }
 
@@ -141,7 +142,7 @@ class BotControllerManager(val db: DiscordBridge) {
      * @return true if a trigger was found and successfully responded to, false otherwise
      */
     private fun sendScriptedResponse(event: IEventWrapper): Boolean {
-        val responses = db.getScriptsConfig().getList<HashMap<String, Any>>("responses").castTo({Script(it)})
+        val responses = db.getConfig(Cfg.SCRIPT).getList<HashMap<String, Any>>("responses").castTo({Script(it)})
 
         var response: Script? = null
         for (r in responses) {
@@ -187,7 +188,7 @@ class BotControllerManager(val db: DiscordBridge) {
                 out = db.deconvertAtMentions(out)
                 out = db.translateAliasesToMinecraft(out)
             }
-            db.sendToMinecraft(out.toMinecraftChatMessage(db, db.getConfig().getString("username", "DiscordBridge")))
+            db.sendToMinecraft(out.toMinecraftChatMessage(db, db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge")))
         }
         return true
     }
@@ -324,14 +325,14 @@ class BotControllerManager(val db: DiscordBridge) {
             is MinecraftChatEventWrapper -> {
                 if (command.isPrivate) {
                     modifiedResponse = MarkdownToMinecraftSeralizer().toMinecraft(db.getPegDownProcessor().parseMarkdown(modifiedResponse.toCharArray()))
-                    modifiedResponse = "${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                    modifiedResponse = "${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                             modifiedResponse
                     event.player.sendMessage(modifiedResponse)
                     return
                 }
                 if (command.isTagged) modifiedResponse = "${event.senderAsMention} | $modifiedResponse"
                 val mcModifiedResponse = MarkdownToMinecraftSeralizer().toMinecraft(db.getPegDownProcessor().parseMarkdown(modifiedResponse.toCharArray()))
-                db.sendToMinecraft(mcModifiedResponse.toMinecraftChatMessage(db, db.getConfig().getString("username", "DiscordBridge")))
+                db.sendToMinecraft(mcModifiedResponse.toMinecraftChatMessage(db, db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge")))
 
                 modifiedResponse = db.convertAtMentions(modifiedResponse)
                 modifiedResponse = db.translateAliasesToDiscord(modifiedResponse)
@@ -346,7 +347,7 @@ class BotControllerManager(val db: DiscordBridge) {
                 if (command.isTagged) modifiedResponse = "${event.senderAsMention} | $modifiedResponse"
                 db.sendToDiscord(modifiedResponse, event.channel)
 
-                modifiedResponse = modifiedResponse.toMinecraftChatMessage(db, db.getConfig().getString("username", "DiscordBridge"))
+                modifiedResponse = modifiedResponse.toMinecraftChatMessage(db, db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge"))
                 modifiedResponse = db.deconvertAtMentions(modifiedResponse)
                 modifiedResponse = db.translateAliasesToMinecraft(modifiedResponse)
                 modifiedResponse = MarkdownToMinecraftSeralizer().toMinecraft(db.getPegDownProcessor().parseMarkdown(modifiedResponse.toCharArray()))
@@ -356,13 +357,13 @@ class BotControllerManager(val db: DiscordBridge) {
             is MinecraftCommandWrapper -> {
                 if (command.isPrivate || command.isTagged) {
                     modifiedResponse = MarkdownToMinecraftSeralizer().toMinecraft(db.getPegDownProcessor().parseMarkdown(modifiedResponse.toCharArray()))
-                    modifiedResponse = "${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                    modifiedResponse = "${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                             modifiedResponse
                     event.sender.sendMessage(modifiedResponse)
                     return
                 }
                 val mcModifiedResponse = MarkdownToMinecraftSeralizer().toMinecraft(db.getPegDownProcessor().parseMarkdown(modifiedResponse.toCharArray()))
-                db.sendToMinecraft(mcModifiedResponse.toMinecraftChatMessage(db, db.getConfig().getString("username", "DiscordBridge")))
+                db.sendToMinecraft(mcModifiedResponse.toMinecraftChatMessage(db, db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge")))
 
                 modifiedResponse = db.convertAtMentions(modifiedResponse)
                 modifiedResponse = db.translateAliasesToDiscord(modifiedResponse)
@@ -471,13 +472,13 @@ class BotControllerManager(val db: DiscordBridge) {
                         "${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 MinecraftChatEventWrapper ->
-                event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                         "I don't seem to have a command called '$commandName'. " +
-                        "See '@${db.getConfig().getString("username", "DiscordBridge").stripColor()} help' ${orPrefixHelp()}for the commands I do have.")
+                        "See '@${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} help' ${orPrefixHelp()}for the commands I do have.")
             is MinecraftCommandWrapper ->
-                event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                         "I don't seem to have a command called '$commandName'. " +
-                        "See '@${db.getConfig().getString("username", "DiscordBridge").stripColor()} help' ${orPrefixHelp()}for the commands I do have.")
+                        "See '@${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} help' ${orPrefixHelp()}for the commands I do have.")
         }
 
     }
@@ -499,12 +500,12 @@ class BotControllerManager(val db: DiscordBridge) {
                                 "I got $given from you, but I need $required. " +
                                 "(Usage: $commandName $usage)").queue()
             is MinecraftChatEventWrapper ->
-                event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").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}${db.getConfig().getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").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)")
@@ -530,12 +531,12 @@ class BotControllerManager(val db: DiscordBridge) {
                                 "Argument $index seems like ${actualType.simpleName}, but I need ${expectedType.simpleName}. " +
                                 "(Usage: $name $usage)").queue()
             is MinecraftChatEventWrapper ->
-                event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").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}${db.getConfig().getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").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)")
@@ -552,10 +553,10 @@ class BotControllerManager(val db: DiscordBridge) {
             is DiscordMessageWrapper ->
                 event.channel.sendMessage("${event.senderAsMention} | Sorry, you don't have permission to use that command.").queue()
             is MinecraftChatEventWrapper ->
-                event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                         "Sorry, you don't have permission to use that command.")
             is MinecraftCommandWrapper ->
-                event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                         "Sorry, you don't have permission to use that command.")
         }
     }
@@ -574,11 +575,11 @@ class BotControllerManager(val db: DiscordBridge) {
                         "${event.senderAsMention} | Ouch! That command threw an exception. Sorry about that... " +
                                 "Have an admin check the logs for more info.").queue()
             is MinecraftChatEventWrapper ->
-                event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").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}${db.getConfig().getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                         "Ouch! That command threw an exception. Sorry about that... " +
                         "Have an admin check the logs for more info.")
         }
@@ -630,7 +631,7 @@ class BotControllerManager(val db: DiscordBridge) {
     /**
      * Shortcut method for adding "or <prefix>help " to the CommandNotFound output if a COMMAND_PREFIX is set in config
      */
-    private fun orPrefixHelp(): String = if (db.getConfig().getString("command-prefix", "") != "") "or ${db.getConfig().getString("command-prefix", "")}help " else ""
+    private fun orPrefixHelp(): String = if (db.getConfig(Cfg.CONFIG).getString("command-prefix", "") != "") "or ${db.getConfig(Cfg.CONFIG).getString("command-prefix", "")}help " else ""
 
     /**
      * A function to assert that all the items in a given list are of a specific type
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt
index 89365ac..75e64b0 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt
@@ -5,6 +5,7 @@ import gg.obsidian.discordbridge.DiscordBridge
 import gg.obsidian.discordbridge.commands.IEventWrapper
 import gg.obsidian.discordbridge.commands.annotations.BotCommand
 import gg.obsidian.discordbridge.commands.annotations.TaggedResponse
+import gg.obsidian.discordbridge.util.Cfg
 import gg.obsidian.discordbridge.util.Rating
 import gg.obsidian.discordbridge.util.Respect
 import java.util.*
@@ -32,7 +33,7 @@ class FunCommandsController(val db: DiscordBridge) : IBotController {
     @TaggedResponse
     private fun eightBall(event: IEventWrapper): String {
         db.logDebug("user ${event.senderName} consults the Magic 8-Ball")
-        val responses = db.getEightBallConfig().getList<String>("responses")
+        val responses = db.getConfig(Cfg.EBALL).getList<String>("responses")
         val rand = Random().nextInt(responses.count())
         return responses[rand]
     }
@@ -63,9 +64,9 @@ class FunCommandsController(val db: DiscordBridge) : IBotController {
     @BotCommand(usage="", description = "Press F to pay respects")
     private fun f(event: IEventWrapper): String {
         db.logDebug("user ${event.senderName}} pays respects")
-        var totalRespects = db.getFConfig().getInteger("total-respects", 0)
-        db.logger.info(db.getFConfig().getList<Any>("responses").toString())
-        val responses = db.getFConfig().getList<LinkedHashMap<String, Any>>("responses").castTo({Respect(it)})
+        var totalRespects = db.getConfig(Cfg.F).getInteger("total-respects", 0)
+        db.logger.info(db.getConfig(Cfg.F).getList<Any>("responses").toString())
+        val responses = db.getConfig(Cfg.F).getList<LinkedHashMap<String, Any>>("responses").castTo({Respect(it)})
         val totalWeight = responses.sumBy { it.weight }
         var rand = Random().nextInt(totalWeight) + 1
         var found: Respect? = null
@@ -86,8 +87,8 @@ class FunCommandsController(val db: DiscordBridge) : IBotController {
             "${event.senderAsMention} | ${found.message}".replace("%t", totalRespects.toString())
                     .replace("%c", found.count.toString())
 
-        db.getFConfig().put("total-respects", totalRespects)
-        db.getFConfig().save()
+        db.getConfig(Cfg.F).put("total-respects", totalRespects)
+        db.getConfig(Cfg.F).save()
 
         return msg
     }
@@ -102,7 +103,7 @@ class FunCommandsController(val db: DiscordBridge) : IBotController {
     @BotCommand(usage="<thing to insult>", description = "Make the bot insult something for you", squishExcessArgs = true)
     private fun insult(event: IEventWrapper, thingToInsult: String): String {
         db.logDebug("user ${event.senderName} requests an insult against '$thingToInsult'")
-        val responses = db.getInsultConfig().getList<String>("responses")
+        val responses = db.getConfig(Cfg.INSULT).getList<String>("responses")
         val rand = Random().nextInt(responses.count())
         return "${event.senderAsMention} \u27A4 $thingToInsult | ${responses[rand]}"
     }
@@ -118,13 +119,13 @@ class FunCommandsController(val db: DiscordBridge) : IBotController {
     @TaggedResponse
     private fun rate(event: IEventWrapper, thingToRate: String): String {
         db.logDebug("user ${event.senderName} requests a rating")
-        val responses = db.getRateConfig().getList<LinkedHashMap<String, Any>>("responses").castTo({Rating(it)})
+        val responses = db.getConfig(Cfg.RATE).getList<LinkedHashMap<String, Any>>("responses").castTo({Rating(it)})
 
-        var rateOutOf = db.getRateConfig().getInteger("rate-out-of", 10)
+        var rateOutOf = db.getConfig(Cfg.RATE).getInteger("rate-out-of", 10)
         if (rateOutOf > 1000000) rateOutOf = 1000000
         if (rateOutOf < 0) rateOutOf = 0
 
-        var granularity = db.getRateConfig().getInteger("granularity", 1)
+        var granularity = db.getConfig(Cfg.RATE).getInteger("granularity", 1)
         if (granularity > 2) granularity = 2
         if (granularity < 0) granularity = 0
 
@@ -135,7 +136,7 @@ class FunCommandsController(val db: DiscordBridge) : IBotController {
                 ?: return "ERROR: No response set for rating $rating"
 
         var thingToBeRated = thingToRate
-        if (db.getRateConfig().getBoolean("translate-first-and-second-person", true)) {
+        if (db.getConfig(Cfg.RATE).getBoolean("translate-first-and-second-person", true)) {
             val argArray = thingToRate.split(" ").toMutableList()
             val iterate = argArray.listIterator()
             while (iterate.hasNext()) {
@@ -183,9 +184,9 @@ class FunCommandsController(val db: DiscordBridge) : IBotController {
     private fun talk(event: IEventWrapper, query: String): String {
         db.logDebug("user ${event.senderName} invokes Cleverbot")
 
-        if (db.getConfig().getString("cleverbot-key", "").isEmpty())
+        if (db.getConfig(Cfg.CONFIG).getString("cleverbot-key", "").isEmpty())
             return "You do not have an API key. Go to https://www.cleverbot.com/JDA/ for more information."
-        val bot = CleverBotQuery(db.getConfig().getString("cleverbot-key", ""), query)
+        val bot = CleverBotQuery(db.getConfig(Cfg.CONFIG).getString("cleverbot-key", ""), query)
         bot.sendRequest()
         return bot.response
     }
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
index aec38a4..d291260 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
@@ -5,6 +5,7 @@ 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.util.Cfg
 import gg.obsidian.discordbridge.util.ChatColor as CC
 import gg.obsidian.discordbridge.util.UtilFunctions.stripColor
 import gg.obsidian.discordbridge.wrappers.IPlayer
@@ -102,7 +103,7 @@ class UtilCommandsController(val db: DiscordBridge) : IBotController {
         when (subCommand.toLowerCase()) {
             "reload" -> {
                 if (event.sender is IPlayer && !event.sender.hasPermission("discordbridge.discord.reload")) {
-                    event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                    event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                             "Sorry, you don't have permission to use that command.")
                 } else {
                     event.sender.sendMessage("${CC.YELLOW}Reloading Discord Bridge...")
@@ -113,7 +114,7 @@ class UtilCommandsController(val db: DiscordBridge) : IBotController {
                 if (event.sender !is IPlayer) return null
 
                 if (!event.sender.hasPermission("discordbridge.discord.linkalias")) {
-                    event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                    event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                             "Sorry, you don't have permission to use that command.")
                 }
 
@@ -154,7 +155,7 @@ class UtilCommandsController(val db: DiscordBridge) : IBotController {
                 }
 
                 if (event.sender is IPlayer && !event.sender.hasPermission("discordbridge.discord.listmembers")) {
-                    event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig().getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                    event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                             "Sorry, you don't have permission to use that command.")
                 }
 
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
index e01d9a3..aa426c0 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
@@ -1,6 +1,7 @@
 package gg.obsidian.discordbridge.discord
 
 import gg.obsidian.discordbridge.DiscordBridge
+import gg.obsidian.discordbridge.util.Cfg
 import net.dv8tion.jda.core.AccountType
 import net.dv8tion.jda.core.JDA
 import net.dv8tion.jda.core.JDABuilder
@@ -35,8 +36,8 @@ object Connection: Runnable {
      * @return the relay TextChannel, null if the value could not be read
      */
     fun getRelayChannel(): TextChannel? {
-        server = if (server == null) getServerById(db.getConfig().getString("server-id", "")) else server
-        channel = if (channel == null) getGroupByName(server!!, db.getConfig().getString("channel", "")) else channel
+        server = if (server == null) getServerById(db.getConfig(Cfg.CONFIG).getString("server-id", "")) else server
+        channel = if (channel == null) getGroupByName(server!!, db.getConfig(Cfg.CONFIG).getString("channel", "")) else channel
         return channel
     }
 
@@ -59,7 +60,7 @@ object Connection: Runnable {
      */
     fun reconnect(callback: Runnable) {
         //disconnect
-        if (db.getConfig().getBoolean("announce-server-start-stop", true))
+        if (db.getConfig(Cfg.CONFIG).getBoolean("announce-server-start-stop", true))
             send("Refreshing Discord connection...", getRelayChannel())
         JDA.removeEventListener(listener)
         server = null
@@ -98,7 +99,7 @@ object Connection: Runnable {
      */
     private fun connect() {
         var builder = JDABuilder(AccountType.BOT).setAudioEnabled(true)
-        builder = builder.setToken(db.getConfig().getString("token", ""))
+        builder = builder.setToken(db.getConfig(Cfg.CONFIG).getString("token", ""))
         JDA = builder.buildBlocking()
         listener = Listener(db)
         JDA.addEventListener(listener)
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/ConfigTypes.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/ConfigTypes.kt
new file mode 100644
index 0000000..bae04be
--- /dev/null
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/ConfigTypes.kt
@@ -0,0 +1,11 @@
+package gg.obsidian.discordbridge.util
+
+enum class Cfg(val filename: String) {
+    CONFIG("config"),
+    EBALL("8ball"),
+    F("f"),
+    INSULT("insult"),
+    RATE("rate"),
+    SCRIPT("script"),
+    ALIAS("aliases")
+}
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt
index 20ae52d..9e2e0f3 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt
@@ -28,7 +28,7 @@ object UtilFunctions {
      */
     @JvmStatic
     fun String.toMinecraftChatMessage(db: DiscordBridge, alias: String): String {
-        return formatMessage(db.getConfig().getString("templates.minecraft.chat-message", "[&b&lDiscord&r]<%u> %m"), msg = this, u = alias, w = "Discord")
+        return formatMessage(db.getConfig(Cfg.CONFIG).getString("templates.minecraft.chat-message", "[&b&lDiscord&r]<%u> %m"), msg = this, u = alias, w = "Discord")
     }
 
     /**
@@ -40,7 +40,7 @@ object UtilFunctions {
      */
     @JvmStatic
     fun String.toDiscordChatMessage(db: DiscordBridge, username: String, worldName: String): String {
-        return formatMessage(db.getConfig().getString("templates.discord.chat-message", "<**%u**> %m"), msg = this, u = username, w = worldName)
+        return formatMessage(db.getConfig(Cfg.CONFIG).getString("templates.discord.chat-message", "<**%u**> %m"), msg = this, u = username, w = worldName)
     }
 
     /**
@@ -51,7 +51,7 @@ object UtilFunctions {
      */
     @JvmStatic
     fun IPlayer.toDiscordPlayerJoin(db: DiscordBridge, worldName: String): String {
-        return formatMessage(db.getConfig().getString("templates.discord.player-join", "**%u** joined the server"), u = this.getName().stripColor(), w = worldName)
+        return formatMessage(db.getConfig(Cfg.CONFIG).getString("templates.discord.player-join", "**%u** joined the server"), u = this.getName().stripColor(), w = worldName)
     }
 
     /**
@@ -62,7 +62,7 @@ object UtilFunctions {
      */
     @JvmStatic
     fun IPlayer.toDiscordPlayerLeave(db: DiscordBridge, worldName: String): String {
-        return formatMessage(db.getConfig().getString("templates.discord.player-leave", "**%u** left the server"), u = this.getName().stripColor(), w = worldName)
+        return formatMessage(db.getConfig(Cfg.CONFIG).getString("templates.discord.player-leave", "**%u** left the server"), u = this.getName().stripColor(), w = worldName)
     }
 
     /**
@@ -74,7 +74,7 @@ object UtilFunctions {
      */
     @JvmStatic
     fun String.toDiscordPlayerDeath(db: DiscordBridge, username: String, worldName: String): String {
-        return formatMessage(db.getConfig().getString("templates.discord.player-death", "%m"), msg = this, u = username, w = worldName)
+        return formatMessage(db.getConfig(Cfg.CONFIG).getString("templates.discord.player-death", "%m"), msg = this, u = username, w = worldName)
     }
 
     /**

From e0e732623655230f9351751a2c55ba445e01b900 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Mon, 5 Feb 2018 01:22:03 -0600
Subject: [PATCH 11/30] Make core DiscordBridge object a singleton

---
 .../discordbridge/DiscordBridgePlugin.kt      |  28 ++--
 .../obsidian/discordbridge/EventListener.kt   |  16 +-
 .../discordbridge/wrappers/ConsoleSender.kt   |   4 +-
 .../obsidian/discordbridge/DiscordBridge.kt   |  43 +++---
 .../obsidian/discordbridge/UserAliasConfig.kt |  20 +--
 .../commands/DiscordMessageWrapper.kt         |   6 +-
 .../controllers/BotControllerManager.kt       | 141 +++++++++---------
 .../controllers/FunCommandsController.kt      |  44 +++---
 .../controllers/UtilCommandsController.kt     |  56 ++++---
 .../discordbridge/discord/Connection.kt       |  17 +--
 .../discordbridge/discord/Listener.kt         |  16 +-
 .../discordbridge/util/UtilFunctions.kt       |  20 +--
 .../discordbridge/DiscordBridgeForge.kt       |  14 +-
 .../gg/obsidian/discordbridge/EventHandler.kt |  10 +-
 .../discordbridge/DiscordBridgePlugin.kt      |  18 +--
 15 files changed, 214 insertions(+), 239 deletions(-)

diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
index e8702a5..588584b 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
@@ -10,14 +10,11 @@ import org.slf4j.LoggerFactory
  */
 class DiscordBridgePlugin : JavaPlugin() {
 
-    private lateinit var core: DiscordBridge
     private lateinit var instance: DiscordBridgePlugin
     private lateinit var logger: Logger
 
     fun getPlugin() : DiscordBridgePlugin = instance
 
-    fun getCore() : DiscordBridge = core
-
     fun getSLF4JLogger(): Logger = logger
 
     override fun onLoad() {
@@ -26,25 +23,24 @@ class DiscordBridgePlugin : JavaPlugin() {
 
     override fun onEnable() {
         instance = this
-        core = DiscordBridge(Server(this, this.server), dataFolder)
-        core.postInit()
+        DiscordBridge.init(Server(this, this.server), dataFolder)
 
-        server.pluginManager.registerEvents(EventListener(core), this)
+        server.pluginManager.registerEvents(EventListener(), this)
 
-        getCommand("discord").executor = EventListener(core)
-        getCommand("f").executor = EventListener(core)
-        getCommand("rate").executor = EventListener(core)
-        getCommand("8ball").executor = EventListener(core)
-        getCommand("insult").executor = EventListener(core)
-        getCommand("choose").executor = EventListener(core)
-        getCommand("talk").executor = EventListener(core)
-        getCommand("roll").executor = EventListener(core)
+        getCommand("discord").executor = EventListener()
+        getCommand("f").executor = EventListener()
+        getCommand("rate").executor = EventListener()
+        getCommand("8ball").executor = EventListener()
+        getCommand("insult").executor = EventListener()
+        getCommand("choose").executor = EventListener()
+        getCommand("talk").executor = EventListener()
+        getCommand("roll").executor = EventListener()
 
-        core.handleServerStart()
+        DiscordBridge.handleServerStart()
     }
 
     override fun onDisable() {
-        core.handleServerStop()
+        DiscordBridge.handleServerStop()
     }
 
 }
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
index da57a4c..cfd9f64 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
@@ -15,40 +15,40 @@ import org.bukkit.event.player.PlayerJoinEvent
 import org.bukkit.event.player.PlayerQuitEvent
 import org.dynmap.DynmapWebChatEvent
 
-class EventListener(val db: DiscordBridge) : Listener, CommandExecutor {
+class EventListener: Listener, CommandExecutor {
 
     override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array<out String>): Boolean {
         return if (sender is org.bukkit.entity.Player) {
             val wp = Player(sender)
-            db.handleCommand(wp, gg.obsidian.discordbridge.wrappers.Command(command), args)
+            DiscordBridge.handleCommand(wp, command.name, args)
         } else {
-            db.handleCommand(ConsoleSender(db, Bukkit.getConsoleSender()), gg.obsidian.discordbridge.wrappers.Command(command), args)
+            DiscordBridge.handleCommand(ConsoleSender(Bukkit.getConsoleSender()), command.name, args)
         }
     }
 
     @EventHandler
     fun onChat(event: AsyncPlayerChatEvent) {
-        event.message = db.handlePlayerChat(Player(event.player), event.message, event.isCancelled)
+        event.message = DiscordBridge.handlePlayerChat(Player(event.player), event.message, event.isCancelled)
     }
 
     @EventHandler
     fun onPlayerJoin(event: PlayerJoinEvent) {
-        db.handlePlayerJoin(Player(event.player))
+        DiscordBridge.handlePlayerJoin(Player(event.player))
     }
 
     @EventHandler
     fun onPlayerLeave(event: PlayerQuitEvent) {
-        db.handlePlayerQuit(Player(event.player))
+        DiscordBridge.handlePlayerQuit(Player(event.player))
     }
 
     @EventHandler
     fun onPlayerDeath(event: PlayerDeathEvent) {
-        db.handlePlayerDeath(Player(event.entity.player), event.deathMessage)
+        DiscordBridge.handlePlayerDeath(Player(event.entity.player), event.deathMessage)
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
     fun onDynmapCatEvent(event: DynmapWebChatEvent) {
-        db.handleDynmapChat(event.name, event.message)
+        DiscordBridge.handleDynmapChat(event.name, event.message)
     }
 
 }
\ No newline at end of file
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ConsoleSender.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ConsoleSender.kt
index a356c20..03c2ce4 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ConsoleSender.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ConsoleSender.kt
@@ -1,11 +1,9 @@
 package gg.obsidian.discordbridge.wrappers
 
-import gg.obsidian.discordbridge.DiscordBridge
-import net.dv8tion.jda.core.entities.MessageChannel
 import org.bukkit.command.ConsoleCommandSender
 import java.util.*
 
-class ConsoleSender(val db: DiscordBridge, val bukkitConsoleSender: ConsoleCommandSender) : IConsoleSender {
+class ConsoleSender(val bukkitConsoleSender: ConsoleCommandSender) : IConsoleSender {
 
     override fun sendMessage(message: String) {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
index 37444e5..01afd39 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
@@ -25,21 +25,22 @@ import java.io.IOException
 import java.io.FileOutputStream
 import java.util.*
 
-class DiscordBridge(private val server: IServer, dataFolder: File) {
+object DiscordBridge {
 
     private val pegDownProc = PegDownProcessor()
-    private val minecraftChatControllerManager = BotControllerManager(this)
-    private val discordChatControllerManager = BotControllerManager(this)
-    private val minecraftCommandControllerManager = BotControllerManager(this)
+    private val minecraftChatControllerManager = BotControllerManager()
+    private val discordChatControllerManager = BotControllerManager()
+    private val minecraftCommandControllerManager = BotControllerManager()
     private val cfgNodes: MutableMap<Cfg, ConfigurationNode> = mutableMapOf()
+    private lateinit var server: IServer
+    lateinit var logger: ILogger
 
     // Temporary storage for alias linking requests
     var requests: MutableList<UserAlias> = mutableListOf()
 
-    val logger: ILogger = server.getLogger()
-
-    init {
-        Connection.db  = this //TODO: enforce this better
+    fun init(server: IServer, dataFolder: File) {
+        this.server = server
+        logger = this.server.getLogger()
 
         if (!dataFolder.exists()) dataFolder.mkdirs()
 
@@ -51,17 +52,15 @@ class DiscordBridge(private val server: IServer, dataFolder: File) {
             cfgNodes.put(c, ConfigurationNode(file))
         }
 
-        minecraftChatControllerManager.registerController(FunCommandsController(this), chatExclusive = true)
-        minecraftChatControllerManager.registerController(UtilCommandsController(this), chatExclusive = true)
-        minecraftCommandControllerManager.registerController(FunCommandsController(this), minecraftExclusive = true)
-        minecraftCommandControllerManager.registerController(UtilCommandsController(this), minecraftExclusive = true)
-        discordChatControllerManager.registerController(FunCommandsController(this), discordExclusive = true, chatExclusive = true)
-        discordChatControllerManager.registerController(UtilCommandsController(this), discordExclusive = true, chatExclusive = true)
-    }
+        minecraftChatControllerManager.registerController(FunCommandsController(), chatExclusive = true)
+        minecraftChatControllerManager.registerController(UtilCommandsController(), chatExclusive = true)
+        minecraftCommandControllerManager.registerController(FunCommandsController(), minecraftExclusive = true)
+        minecraftCommandControllerManager.registerController(UtilCommandsController(), minecraftExclusive = true)
+        discordChatControllerManager.registerController(FunCommandsController(), discordExclusive = true, chatExclusive = true)
+        discordChatControllerManager.registerController(UtilCommandsController(), discordExclusive = true, chatExclusive = true)
 
-    fun postInit() {
         for (cfg in cfgNodes.values) cfg.load()
-        UserAliasConfig.load(this)
+        UserAliasConfig.load()
         server.getScheduler().runAsyncTask(Connection)
     }
 
@@ -132,7 +131,7 @@ class DiscordBridge(private val server: IServer, dataFolder: File) {
     fun reload(callback: Runnable) {
         for (cfg in cfgNodes.values) cfg.load()
         //if (isMultiverseInstalled) worlds!!.reloadConfig()
-        UserAliasConfig.load(this)
+        UserAliasConfig.load()
         Connection.reconnect(callback)
     }
 
@@ -381,7 +380,7 @@ class DiscordBridge(private val server: IServer, dataFolder: File) {
 //            if (alias is String) worldname = alias
 //        }
 
-        var formattedMessage = player.toDiscordPlayerJoin(this, worldname)
+        var formattedMessage = player.toDiscordPlayerJoin(worldname)
         formattedMessage = translateAliasesToDiscord(formattedMessage)
         sendToDiscord(formattedMessage, Connection.getRelayChannel())
     }
@@ -402,7 +401,7 @@ class DiscordBridge(private val server: IServer, dataFolder: File) {
 //            if (alias is String) worldname = alias
 //        }
 
-        var formattedMessage = player.toDiscordPlayerLeave(this, worldname)
+        var formattedMessage = player.toDiscordPlayerLeave(worldname)
         formattedMessage = translateAliasesToDiscord(formattedMessage)
         sendToDiscord(formattedMessage, Connection.getRelayChannel())
     }
@@ -423,13 +422,13 @@ class DiscordBridge(private val server: IServer, dataFolder: File) {
 //            if (alias is String) worldname = alias
 //        }
 
-        var formattedMessage = deathMessage.toDiscordPlayerDeath(this, username, worldname)
+        var formattedMessage = deathMessage.toDiscordPlayerDeath(username, worldname)
         formattedMessage = translateAliasesToDiscord(formattedMessage)
         sendToDiscord(formattedMessage, Connection.getRelayChannel())
     }
 
     fun handleDynmapChat(name: String, message: String) {
-        sendToDiscord(translateAliasesToDiscord(message.toDiscordChatMessage(this, name, "Dynmap")), Connection.getRelayChannel())
+        sendToDiscord(translateAliasesToDiscord(message.toDiscordChatMessage(name, "Dynmap")), Connection.getRelayChannel())
     }
 
     fun handleCommand(sender: ICommandSender, commandName: String, args: Array<out String>): Boolean {
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
index 7fbb909..14a73aa 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
@@ -12,29 +12,29 @@ object UserAliasConfig {
     /**
      * Load the stored aliases from file into memory
      */
-    fun load(db: DiscordBridge) {
-        val list = db.getConfig(Cfg.ALIAS).getList<Map<String, Any>>("aliases")
+    fun load() {
+        val list = DiscordBridge.getConfig(Cfg.ALIAS).getList<Map<String, Any>>("aliases")
         aliases = list.castTo({UserAlias(it)})
     }
 
     /**
      * Adds a new alias to the list and saves the updated list to file
      */
-    fun add(db: DiscordBridge, ua: UserAlias) {
+    fun add(ua: UserAlias) {
         aliases = aliases.plus(ua)
-        db.getConfig(Cfg.ALIAS).put("aliases", aliases)
-        db.getConfig(Cfg.ALIAS).save()
-        db.getConfig(Cfg.ALIAS).load()
+        DiscordBridge.getConfig(Cfg.ALIAS).put("aliases", aliases)
+        DiscordBridge.getConfig(Cfg.ALIAS).save()
+        DiscordBridge.getConfig(Cfg.ALIAS).load()
     }
 
     /**
      * Removes an alias from the list and saves the updated list to file
      */
-    fun remove(db: DiscordBridge, ua: UserAlias) {
+    fun remove(ua: UserAlias) {
         aliases = aliases.minus(ua)
-        db.getConfig(Cfg.ALIAS).put("aliases", aliases)
-        db.getConfig(Cfg.ALIAS).save()
-        db.getConfig(Cfg.ALIAS).load()
+        DiscordBridge.getConfig(Cfg.ALIAS).put("aliases", aliases)
+        DiscordBridge.getConfig(Cfg.ALIAS).save()
+        DiscordBridge.getConfig(Cfg.ALIAS).load()
     }
 
     private inline fun <reified T : Any> List<Map<String, Any>>.castTo(factory: (Map<String, Any>) -> T): List<T> {
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordMessageWrapper.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordMessageWrapper.kt
index eed19e6..e23158a 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordMessageWrapper.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordMessageWrapper.kt
@@ -11,7 +11,7 @@ import net.dv8tion.jda.core.entities.MessageChannel
  *
  * @param originalMessage the underlying Message instance
  */
-class DiscordMessageWrapper(val db: DiscordBridge, val originalMessage: Message) : IEventWrapper {
+class DiscordMessageWrapper(val originalMessage: Message) : IEventWrapper {
 
     /**
      * Returns a formatted mention tag in the form <@##########>
@@ -34,9 +34,9 @@ class DiscordMessageWrapper(val db: DiscordBridge, val originalMessage: Message)
      */
     override val isFromRelayChannel: Boolean
         get() = if (originalMessage.isFromType(ChannelType.PRIVATE)) false
-                else originalMessage.guild.id == db.getConfig(Cfg.CONFIG).getString("server-id")
+                else originalMessage.guild.id == DiscordBridge.getConfig(Cfg.CONFIG).getString("server-id")
                 && originalMessage.isFromType(ChannelType.TEXT)
-                && originalMessage.textChannel.name.equals(db.getConfig(Cfg.CONFIG).getString("channel"), true)
+                && originalMessage.textChannel.name.equals(DiscordBridge.getConfig(Cfg.CONFIG).getString("channel"), true)
 
     /**
      * The message of this event
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
index 1643f0c..d041205 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
@@ -22,11 +22,10 @@ import gg.obsidian.discordbridge.util.ChatColor as CC
 /**
  * A class that manages an assortment of IBotControllers and allows dynamic access to a configurable assortment
  * of their commands
- *
- * @param db a reference to the base DiscordBridge object
+ * 
  * @see IBotController
  */
-class BotControllerManager(val db: DiscordBridge) {
+class BotControllerManager {
 
     private val commands: MutableMap<String, Command> = mutableMapOf()
     private val controllers: MutableMap<Class<out IBotController>, IBotController> = mutableMapOf()
@@ -113,14 +112,14 @@ class BotControllerManager(val db: DiscordBridge) {
         if (sendScriptedResponse(event)) return true
 
         // <prefix>command
-        if (db.getConfig(Cfg.CONFIG).getString("command-prefix", "").isNotBlank() && event.rawMessage.startsWith(db.getConfig(Cfg.CONFIG).getString("command-prefix", ""))) {
-            val split = event.rawMessage.replaceFirst(db.getConfig(Cfg.CONFIG).getString("command-prefix", ""), "").trim().split("\\s+".toRegex()).toTypedArray()
+        if (DiscordBridge.getConfig(Cfg.CONFIG).getString("command-prefix", "").isNotBlank() && event.rawMessage.startsWith(DiscordBridge.getConfig(Cfg.CONFIG).getString("command-prefix", ""))) {
+            val split = event.rawMessage.replaceFirst(DiscordBridge.getConfig(Cfg.CONFIG).getString("command-prefix", ""), "").trim().split("\\s+".toRegex()).toTypedArray()
             return parseCommand(event, split, false)
         }
 
         // @<mention> command from Minecraft
-        if (event is MinecraftChatEventWrapper && event.rawMessage.startsWith("@${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").noSpace()} ")) {
-            val split = event.rawMessage.replaceFirst("@${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").noSpace()} ", "").trim().split("\\s+".toRegex()).toTypedArray()
+        if (event is MinecraftChatEventWrapper && event.rawMessage.startsWith("@${DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").noSpace()} ")) {
+            val split = event.rawMessage.replaceFirst("@${DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").noSpace()} ", "").trim().split("\\s+".toRegex()).toTypedArray()
             return parseCommand(event, split, true)
         }
 
@@ -142,7 +141,7 @@ class BotControllerManager(val db: DiscordBridge) {
      * @return true if a trigger was found and successfully responded to, false otherwise
      */
     private fun sendScriptedResponse(event: IEventWrapper): Boolean {
-        val responses = db.getConfig(Cfg.SCRIPT).getList<HashMap<String, Any>>("responses").castTo({Script(it)})
+        val responses = DiscordBridge.getConfig(Cfg.SCRIPT).getList<HashMap<String, Any>>("responses").castTo({Script(it)})
 
         var response: Script? = null
         for (r in responses) {
@@ -171,24 +170,24 @@ class BotControllerManager(val db: DiscordBridge) {
         }
         if (response == null) return false
 
-        db.logDebug("user ${event.senderName} has triggered a scripted response")
+        DiscordBridge.logDebug("user ${event.senderName} has triggered a scripted response")
         val responseDis: String? = response.responseDis
         val responseMC: String? = response.responseMC
         if (responseDis != null && responseDis.isNotBlank()) {
             var out = responseDis.replace("%u", event.senderAsMention)
             if (event is MinecraftChatEventWrapper) {
-                out = db.convertAtMentions(out)
-                out = db.translateAliasesToDiscord(out)
+                out = DiscordBridge.convertAtMentions(out)
+                out = DiscordBridge.translateAliasesToDiscord(out)
             }
-            db.sendToDiscord(out, event.channel)
+            DiscordBridge.sendToDiscord(out, event.channel)
         }
         if (responseMC != null && responseMC.isNotBlank() && event.isFromRelayChannel) {
             var out = responseMC.replace("%u", event.senderAsMention)
             if (event is DiscordMessageWrapper) {
-                out = db.deconvertAtMentions(out)
-                out = db.translateAliasesToMinecraft(out)
+                out = DiscordBridge.deconvertAtMentions(out)
+                out = DiscordBridge.translateAliasesToMinecraft(out)
             }
-            db.sendToMinecraft(out.toMinecraftChatMessage(db, db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge")))
+            DiscordBridge.sendToMinecraft(out.toMinecraftChatMessage(DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge")))
         }
         return true
     }
@@ -324,19 +323,19 @@ class BotControllerManager(val db: DiscordBridge) {
         when (event) {
             is MinecraftChatEventWrapper -> {
                 if (command.isPrivate) {
-                    modifiedResponse = MarkdownToMinecraftSeralizer().toMinecraft(db.getPegDownProcessor().parseMarkdown(modifiedResponse.toCharArray()))
-                    modifiedResponse = "${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                    modifiedResponse = MarkdownToMinecraftSeralizer().toMinecraft(DiscordBridge.getPegDownProcessor().parseMarkdown(modifiedResponse.toCharArray()))
+                    modifiedResponse = "${CC.ITALIC}${CC.GRAY}${DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                             modifiedResponse
                     event.player.sendMessage(modifiedResponse)
                     return
                 }
                 if (command.isTagged) modifiedResponse = "${event.senderAsMention} | $modifiedResponse"
-                val mcModifiedResponse = MarkdownToMinecraftSeralizer().toMinecraft(db.getPegDownProcessor().parseMarkdown(modifiedResponse.toCharArray()))
-                db.sendToMinecraft(mcModifiedResponse.toMinecraftChatMessage(db, db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge")))
+                val mcModifiedResponse = MarkdownToMinecraftSeralizer().toMinecraft(DiscordBridge.getPegDownProcessor().parseMarkdown(modifiedResponse.toCharArray()))
+                DiscordBridge.sendToMinecraft(mcModifiedResponse.toMinecraftChatMessage(DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge")))
 
-                modifiedResponse = db.convertAtMentions(modifiedResponse)
-                modifiedResponse = db.translateAliasesToDiscord(modifiedResponse)
-                db.sendToDiscord(modifiedResponse, event.channel)
+                modifiedResponse = DiscordBridge.convertAtMentions(modifiedResponse)
+                modifiedResponse = DiscordBridge.translateAliasesToDiscord(modifiedResponse)
+                DiscordBridge.sendToDiscord(modifiedResponse, event.channel)
                 return
             }
             is DiscordMessageWrapper -> {
@@ -345,29 +344,29 @@ class BotControllerManager(val db: DiscordBridge) {
                     return
                 }
                 if (command.isTagged) modifiedResponse = "${event.senderAsMention} | $modifiedResponse"
-                db.sendToDiscord(modifiedResponse, event.channel)
+                DiscordBridge.sendToDiscord(modifiedResponse, event.channel)
 
-                modifiedResponse = modifiedResponse.toMinecraftChatMessage(db, db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge"))
-                modifiedResponse = db.deconvertAtMentions(modifiedResponse)
-                modifiedResponse = db.translateAliasesToMinecraft(modifiedResponse)
-                modifiedResponse = MarkdownToMinecraftSeralizer().toMinecraft(db.getPegDownProcessor().parseMarkdown(modifiedResponse.toCharArray()))
-                db.sendToMinecraft(modifiedResponse)
+                modifiedResponse = modifiedResponse.toMinecraftChatMessage(DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge"))
+                modifiedResponse = DiscordBridge.deconvertAtMentions(modifiedResponse)
+                modifiedResponse = DiscordBridge.translateAliasesToMinecraft(modifiedResponse)
+                modifiedResponse = MarkdownToMinecraftSeralizer().toMinecraft(DiscordBridge.getPegDownProcessor().parseMarkdown(modifiedResponse.toCharArray()))
+                DiscordBridge.sendToMinecraft(modifiedResponse)
                 return
             }
             is MinecraftCommandWrapper -> {
                 if (command.isPrivate || command.isTagged) {
-                    modifiedResponse = MarkdownToMinecraftSeralizer().toMinecraft(db.getPegDownProcessor().parseMarkdown(modifiedResponse.toCharArray()))
-                    modifiedResponse = "${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                    modifiedResponse = MarkdownToMinecraftSeralizer().toMinecraft(DiscordBridge.getPegDownProcessor().parseMarkdown(modifiedResponse.toCharArray()))
+                    modifiedResponse = "${CC.ITALIC}${CC.GRAY}${DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                             modifiedResponse
                     event.sender.sendMessage(modifiedResponse)
                     return
                 }
-                val mcModifiedResponse = MarkdownToMinecraftSeralizer().toMinecraft(db.getPegDownProcessor().parseMarkdown(modifiedResponse.toCharArray()))
-                db.sendToMinecraft(mcModifiedResponse.toMinecraftChatMessage(db, db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge")))
+                val mcModifiedResponse = MarkdownToMinecraftSeralizer().toMinecraft(DiscordBridge.getPegDownProcessor().parseMarkdown(modifiedResponse.toCharArray()))
+                DiscordBridge.sendToMinecraft(mcModifiedResponse.toMinecraftChatMessage(DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge")))
 
-                modifiedResponse = db.convertAtMentions(modifiedResponse)
-                modifiedResponse = db.translateAliasesToDiscord(modifiedResponse)
-                db.sendToDiscord(modifiedResponse, event.channel)
+                modifiedResponse = DiscordBridge.convertAtMentions(modifiedResponse)
+                modifiedResponse = DiscordBridge.translateAliasesToDiscord(modifiedResponse)
+                DiscordBridge.sendToDiscord(modifiedResponse, event.channel)
                 return
             }
         }
@@ -381,32 +380,32 @@ class BotControllerManager(val db: DiscordBridge) {
      */
     private fun invokeServerCommand(event: IEventWrapper, args: Array<String>): Boolean {
         TODO("Not implemented yet")
-//            val sender = DiscordCommandSender(db.getServer().getRemoteConsoleSender(), event.channel)
+//            val sender = DiscordCommandSender(DiscordBridge.getServer().getRemoteConsoleSender(), event.channel)
 //            val commandName = args[0].toLowerCase()
 //            when {
 //                DefaultCommands.minecraft.contains(commandName) -> {
-//                    db.logDebug("Discord user ${event.senderName} invoked Minecraft command '${args.joinToString(" ")}'")
-//                    db.getServer().dispatchCommand(sender, args.joinToString(" "))
+//                    DiscordBridge.logDebug("Discord user ${event.senderName} invoked Minecraft command '${args.joinToString(" ")}'")
+//                    DiscordBridge.getServer().dispatchCommand(sender, args.joinToString(" "))
 //                    return true
 //                }
 //
 //                DefaultCommands.bukkit.contains(commandName) -> {
-//                    db.logDebug("Discord user ${event.senderName} invoked Bukkit command '${args.joinToString(" ")}'")
-//                    db.getServer().dispatchCommand(sender, args.joinToString(" "))
+//                    DiscordBridge.logDebug("Discord user ${event.senderName} invoked Bukkit command '${args.joinToString(" ")}'")
+//                    DiscordBridge.getServer().dispatchCommand(sender, args.joinToString(" "))
 //                    return true
 //                }
 //
 //                DefaultCommands.spigot.contains(commandName) -> {
-//                    db.logDebug("Discord user ${event.senderName} invoked Spigot command '${args.joinToString(" ")}'")
-//                    db.getServer().dispatchCommand(sender, args.joinToString(" "))
+//                    DiscordBridge.logDebug("Discord user ${event.senderName} invoked Spigot command '${args.joinToString(" ")}'")
+//                    DiscordBridge.getServer().dispatchCommand(sender, args.joinToString(" "))
 //                    return true
 //                }
 //
 //                else -> {
 //                    //TODO
-////                    val pluginCommand = db.getServer().getPluginCommand(commandName)
+////                    val pluginCommand = DiscordBridge.getServer().getPluginCommand(commandName)
 ////                    if (pluginCommand != null) {
-////                        db.logDebug("Discord user ${event.senderName} invoked ${pluginCommand.plugin.name} command '${args.joinToString(" ")}'")
+////                        DiscordBridge.logDebug("Discord user ${event.senderName} invoked ${pluginCommand.plugin.name} command '${args.joinToString(" ")}'")
 ////                        pluginCommand.execute(sender, commandName, args.sliceArray(1 until args.size))
 ////                        return true
 ////                    }
@@ -429,28 +428,28 @@ class BotControllerManager(val db: DiscordBridge) {
 
                 // TODO
                 // Get world alias if Multiverse is installed
-//                if (db.isMultiverseInstalled) {
-//                    val worldProperties = db.worlds!!.data.get("worlds.$worldname")
+//                if (DiscordBridge.isMultiverseInstalled) {
+//                    val worldProperties = DiscordBridge.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(db, event.senderName, worldname)
-                formattedMessage = db.convertAtMentions(formattedMessage)
-                formattedMessage = db.translateAliasesToDiscord(formattedMessage)
-                db.sendToDiscord(formattedMessage, Connection.getRelayChannel())
+                var formattedMessage = event.message.toDiscordChatMessage(event.senderName, worldname)
+                formattedMessage = DiscordBridge.convertAtMentions(formattedMessage)
+                formattedMessage = DiscordBridge.translateAliasesToDiscord(formattedMessage)
+                DiscordBridge.sendToDiscord(formattedMessage, Connection.getRelayChannel())
             }
             is DiscordMessageWrapper -> {
                 if (event.isFromRelayChannel) {
-                    db.logDebug("Broadcasting message from Discord to Minecraft as user ${event.senderName}")
-                    var formattedMessage = event.message.toMinecraftChatMessage(db, event.senderName)
-                    formattedMessage = db.deconvertAtMentions(formattedMessage)
-                    formattedMessage = db.translateAliasesToMinecraft(formattedMessage)
-                    formattedMessage = MarkdownToMinecraftSeralizer().toMinecraft(db.getPegDownProcessor().parseMarkdown(formattedMessage.toCharArray()))
-                    db.sendToMinecraft(formattedMessage)
-                } else if (logIgnore) db.logDebug("Not relaying message from Discord: channel does not match")
+                    DiscordBridge.logDebug("Broadcasting message from Discord to Minecraft as user ${event.senderName}")
+                    var formattedMessage = event.message.toMinecraftChatMessage(event.senderName)
+                    formattedMessage = DiscordBridge.deconvertAtMentions(formattedMessage)
+                    formattedMessage = DiscordBridge.translateAliasesToMinecraft(formattedMessage)
+                    formattedMessage = MarkdownToMinecraftSeralizer().toMinecraft(DiscordBridge.getPegDownProcessor().parseMarkdown(formattedMessage.toCharArray()))
+                    DiscordBridge.sendToMinecraft(formattedMessage)
+                } else if (logIgnore) DiscordBridge.logDebug("Not relaying message from Discord: channel does not match")
             }
             else -> return // slash commands do not get relayed
         }
@@ -472,13 +471,13 @@ class BotControllerManager(val db: DiscordBridge) {
                         "${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 MinecraftChatEventWrapper ->
-                event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                         "I don't seem to have a command called '$commandName'. " +
-                        "See '@${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} help' ${orPrefixHelp()}for the commands I do have.")
+                        "See '@${DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} help' ${orPrefixHelp()}for the commands I do have.")
             is MinecraftCommandWrapper ->
-                event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                         "I don't seem to have a command called '$commandName'. " +
-                        "See '@${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} help' ${orPrefixHelp()}for the commands I do have.")
+                        "See '@${DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} help' ${orPrefixHelp()}for the commands I do have.")
         }
 
     }
@@ -500,12 +499,12 @@ class BotControllerManager(val db: DiscordBridge) {
                                 "I got $given from you, but I need $required. " +
                                 "(Usage: $commandName $usage)").queue()
             is MinecraftChatEventWrapper ->
-                event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").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}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").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)")
@@ -531,12 +530,12 @@ class BotControllerManager(val db: DiscordBridge) {
                                 "Argument $index seems like ${actualType.simpleName}, but I need ${expectedType.simpleName}. " +
                                 "(Usage: $name $usage)").queue()
             is MinecraftChatEventWrapper ->
-                event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").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}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").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)")
@@ -553,10 +552,10 @@ class BotControllerManager(val db: DiscordBridge) {
             is DiscordMessageWrapper ->
                 event.channel.sendMessage("${event.senderAsMention} | Sorry, you don't have permission to use that command.").queue()
             is MinecraftChatEventWrapper ->
-                event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                         "Sorry, you don't have permission to use that command.")
             is MinecraftCommandWrapper ->
-                event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                         "Sorry, you don't have permission to use that command.")
         }
     }
@@ -568,18 +567,18 @@ class BotControllerManager(val db: DiscordBridge) {
      * @param throwable the uncaught exception
      */
     private fun commandException(event: IEventWrapper, throwable: Throwable) {
-        db.logger.severe("Command with content ${event.rawMessage} threw an exception.", throwable)
+        DiscordBridge.logger.severe("Command with content ${event.rawMessage} threw an exception.", throwable)
         when (event) {
             is DiscordMessageWrapper ->
                 event.channel.sendMessage(
                         "${event.senderAsMention} | Ouch! That command threw an exception. Sorry about that... " +
                                 "Have an admin check the logs for more info.").queue()
             is MinecraftChatEventWrapper ->
-                event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").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}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                         "Ouch! That command threw an exception. Sorry about that... " +
                         "Have an admin check the logs for more info.")
         }
@@ -631,7 +630,7 @@ class BotControllerManager(val db: DiscordBridge) {
     /**
      * Shortcut method for adding "or <prefix>help " to the CommandNotFound output if a COMMAND_PREFIX is set in config
      */
-    private fun orPrefixHelp(): String = if (db.getConfig(Cfg.CONFIG).getString("command-prefix", "") != "") "or ${db.getConfig(Cfg.CONFIG).getString("command-prefix", "")}help " else ""
+    private fun orPrefixHelp(): String = if (DiscordBridge.getConfig(Cfg.CONFIG).getString("command-prefix", "") != "") "or ${DiscordBridge.getConfig(Cfg.CONFIG).getString("command-prefix", "")}help " else ""
 
     /**
      * A function to assert that all the items in a given list are of a specific type
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt
index 75e64b0..39a8000 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt
@@ -13,10 +13,8 @@ import kotlin.collections.LinkedHashMap
 
 /**
  * Controller for fun commands that have no purpose outside of amusement
- *
- * @param db a reference to the base Plugin object
  */
-class FunCommandsController(val db: DiscordBridge) : IBotController {
+class FunCommandsController : IBotController {
 
     /**
      * @return a description of this class of commands, used in the Help command
@@ -32,8 +30,8 @@ class FunCommandsController(val db: DiscordBridge) : IBotController {
     @BotCommand(name = "8ball", usage = "<question>", description = "Consult the Magic 8 Ball", squishExcessArgs = true)
     @TaggedResponse
     private fun eightBall(event: IEventWrapper): String {
-        db.logDebug("user ${event.senderName} consults the Magic 8-Ball")
-        val responses = db.getConfig(Cfg.EBALL).getList<String>("responses")
+        DiscordBridge.logDebug("user ${event.senderName} consults the Magic 8-Ball")
+        val responses = DiscordBridge.getConfig(Cfg.EBALL).getList<String>("responses")
         val rand = Random().nextInt(responses.count())
         return responses[rand]
     }
@@ -49,7 +47,7 @@ class FunCommandsController(val db: DiscordBridge) : IBotController {
             description = "Have the bot choose between given options", squishExcessArgs = true)
     @TaggedResponse
     private fun choose(event: IEventWrapper, query: String): String {
-        db.logDebug("user ${event.senderName} needs a choice made")
+        DiscordBridge.logDebug("user ${event.senderName} needs a choice made")
         val choices = query.split(", or ", " or ", ",", "|")
         val rand = Random().nextInt(choices.count())
         return "I pick '${choices[rand]}'"
@@ -63,10 +61,10 @@ class FunCommandsController(val db: DiscordBridge) : IBotController {
      */
     @BotCommand(usage="", description = "Press F to pay respects")
     private fun f(event: IEventWrapper): String {
-        db.logDebug("user ${event.senderName}} pays respects")
-        var totalRespects = db.getConfig(Cfg.F).getInteger("total-respects", 0)
-        db.logger.info(db.getConfig(Cfg.F).getList<Any>("responses").toString())
-        val responses = db.getConfig(Cfg.F).getList<LinkedHashMap<String, Any>>("responses").castTo({Respect(it)})
+        DiscordBridge.logDebug("user ${event.senderName}} pays respects")
+        var totalRespects = DiscordBridge.getConfig(Cfg.F).getInteger("total-respects", 0)
+        DiscordBridge.logger.info(DiscordBridge.getConfig(Cfg.F).getList<Any>("responses").toString())
+        val responses = DiscordBridge.getConfig(Cfg.F).getList<LinkedHashMap<String, Any>>("responses").castTo({Respect(it)})
         val totalWeight = responses.sumBy { it.weight }
         var rand = Random().nextInt(totalWeight) + 1
         var found: Respect? = null
@@ -87,8 +85,8 @@ class FunCommandsController(val db: DiscordBridge) : IBotController {
             "${event.senderAsMention} | ${found.message}".replace("%t", totalRespects.toString())
                     .replace("%c", found.count.toString())
 
-        db.getConfig(Cfg.F).put("total-respects", totalRespects)
-        db.getConfig(Cfg.F).save()
+        DiscordBridge.getConfig(Cfg.F).put("total-respects", totalRespects)
+        DiscordBridge.getConfig(Cfg.F).save()
 
         return msg
     }
@@ -102,8 +100,8 @@ class FunCommandsController(val db: DiscordBridge) : IBotController {
      */
     @BotCommand(usage="<thing to insult>", description = "Make the bot insult something for you", squishExcessArgs = true)
     private fun insult(event: IEventWrapper, thingToInsult: String): String {
-        db.logDebug("user ${event.senderName} requests an insult against '$thingToInsult'")
-        val responses = db.getConfig(Cfg.INSULT).getList<String>("responses")
+        DiscordBridge.logDebug("user ${event.senderName} requests an insult against '$thingToInsult'")
+        val responses = DiscordBridge.getConfig(Cfg.INSULT).getList<String>("responses")
         val rand = Random().nextInt(responses.count())
         return "${event.senderAsMention} \u27A4 $thingToInsult | ${responses[rand]}"
     }
@@ -118,14 +116,14 @@ class FunCommandsController(val db: DiscordBridge) : IBotController {
     @BotCommand(usage="<thing to be rated>", description = "Have the bot rate something for you", squishExcessArgs = true)
     @TaggedResponse
     private fun rate(event: IEventWrapper, thingToRate: String): String {
-        db.logDebug("user ${event.senderName} requests a rating")
-        val responses = db.getConfig(Cfg.RATE).getList<LinkedHashMap<String, Any>>("responses").castTo({Rating(it)})
+        DiscordBridge.logDebug("user ${event.senderName} requests a rating")
+        val responses = DiscordBridge.getConfig(Cfg.RATE).getList<LinkedHashMap<String, Any>>("responses").castTo({Rating(it)})
 
-        var rateOutOf = db.getConfig(Cfg.RATE).getInteger("rate-out-of", 10)
+        var rateOutOf = DiscordBridge.getConfig(Cfg.RATE).getInteger("rate-out-of", 10)
         if (rateOutOf > 1000000) rateOutOf = 1000000
         if (rateOutOf < 0) rateOutOf = 0
 
-        var granularity = db.getConfig(Cfg.RATE).getInteger("granularity", 1)
+        var granularity = DiscordBridge.getConfig(Cfg.RATE).getInteger("granularity", 1)
         if (granularity > 2) granularity = 2
         if (granularity < 0) granularity = 0
 
@@ -136,7 +134,7 @@ class FunCommandsController(val db: DiscordBridge) : IBotController {
                 ?: return "ERROR: No response set for rating $rating"
 
         var thingToBeRated = thingToRate
-        if (db.getConfig(Cfg.RATE).getBoolean("translate-first-and-second-person", true)) {
+        if (DiscordBridge.getConfig(Cfg.RATE).getBoolean("translate-first-and-second-person", true)) {
             val argArray = thingToRate.split(" ").toMutableList()
             val iterate = argArray.listIterator()
             while (iterate.hasNext()) {
@@ -163,7 +161,7 @@ class FunCommandsController(val db: DiscordBridge) : IBotController {
     @BotCommand(name = "roll", usage = "<sides>", description = "Roll a die for a random number")
     @TaggedResponse
     private fun roll(event: IEventWrapper, sides: Int): String {
-        db.logDebug("user ${event.senderName} needs a choice made")
+        DiscordBridge.logDebug("user ${event.senderName} needs a choice made")
         if (sides == 1)
             return "You rolled... 1. Was it any surprise?"
         if (sides > 100 || sides < 1)
@@ -182,11 +180,11 @@ class FunCommandsController(val db: DiscordBridge) : IBotController {
     @TaggedResponse
     @BotCommand(usage="<say something>", description = "Say something to Cleverbot", squishExcessArgs = true)
     private fun talk(event: IEventWrapper, query: String): String {
-        db.logDebug("user ${event.senderName} invokes Cleverbot")
+        DiscordBridge.logDebug("user ${event.senderName} invokes Cleverbot")
 
-        if (db.getConfig(Cfg.CONFIG).getString("cleverbot-key", "").isEmpty())
+        if (DiscordBridge.getConfig(Cfg.CONFIG).getString("cleverbot-key", "").isEmpty())
             return "You do not have an API key. Go to https://www.cleverbot.com/JDA/ for more information."
-        val bot = CleverBotQuery(db.getConfig(Cfg.CONFIG).getString("cleverbot-key", ""), query)
+        val bot = CleverBotQuery(DiscordBridge.getConfig(Cfg.CONFIG).getString("cleverbot-key", ""), query)
         bot.sendRequest()
         return bot.response
     }
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
index d291260..11c091b 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
@@ -14,10 +14,8 @@ import java.util.*
 
 /**
  * Controller for utility commands that configure the way the bot works
- *
- * @param db a reference to the base Plugin object
  */
-class UtilCommandsController(val db: DiscordBridge) : IBotController {
+class UtilCommandsController : IBotController {
 
     /**
      * @return a short description of this IBotController's methods as seen in the Help command
@@ -39,12 +37,12 @@ class UtilCommandsController(val db: DiscordBridge) : IBotController {
             event.channel.sendMessage("${event.senderAsMention} | That command can only be sent to me via DM.").queue()
             return null
         }
-        db.logDebug("user ${event.senderName} confirms an alias request")
+        DiscordBridge.logDebug("user ${event.senderName} confirms an alias request")
 
-        val ua = db.requests.find { it.discordId == event.senderId } ?: return "You have no alias requests pending."
+        val ua = DiscordBridge.requests.find { it.discordId == event.senderId } ?: return "You have no alias requests pending."
 
-        UserAliasConfig.add(db, ua)
-        db.requests.remove(ua)
+        UserAliasConfig.add(ua)
+        DiscordBridge.requests.remove(ua)
         return "Successfully linked aliases!"
     }
 
@@ -63,11 +61,11 @@ class UtilCommandsController(val db: DiscordBridge) : IBotController {
             event.channel.sendMessage("${event.senderAsMention} | That command can only be sent to me via DM.").queue()
             return null
         }
-        db.logDebug("user ${event.senderName} denies an alias request")
+        DiscordBridge.logDebug("user ${event.senderName} denies an alias request")
 
-        val ua = db.requests.find { it.discordId == event.senderId } ?: return "You have no alias requests pending."
+        val ua = DiscordBridge.requests.find { it.discordId == event.senderId } ?: return "You have no alias requests pending."
 
-        db.requests.remove(ua)
+        DiscordBridge.requests.remove(ua)
         return "The alias link request has been cancelled."
     }
 
@@ -103,18 +101,18 @@ class UtilCommandsController(val db: DiscordBridge) : IBotController {
         when (subCommand.toLowerCase()) {
             "reload" -> {
                 if (event.sender is IPlayer && !event.sender.hasPermission("discordbridge.discord.reload")) {
-                    event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                    event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                             "Sorry, you don't have permission to use that command.")
                 } else {
                     event.sender.sendMessage("${CC.YELLOW}Reloading Discord Bridge...")
-                    db.reload(Runnable { event.sender.sendMessage("${CC.DARK_GREEN}Discord Bridge has reloaded!") })
+                    DiscordBridge.reload(Runnable { event.sender.sendMessage("${CC.DARK_GREEN}Discord Bridge has reloaded!") })
                 }
             }
             "linkalias" -> {
                 if (event.sender !is IPlayer) return null
 
                 if (!event.sender.hasPermission("discordbridge.discord.linkalias")) {
-                    event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                    event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                             "Sorry, you don't have permission to use that command.")
                 }
 
@@ -131,7 +129,7 @@ class UtilCommandsController(val db: DiscordBridge) : IBotController {
                     return null
                 }
 
-                val pendingRequest = db.requests.firstOrNull{ UUID.fromString(it.mcUuid) == event.sender.getUUID()}
+                val pendingRequest = DiscordBridge.requests.firstOrNull{ UUID.fromString(it.mcUuid) == event.sender.getUUID()}
                 if (pendingRequest != null) {
                     if (args.size < 3 || args[3] != "-u") {
                         event.sender.sendMessage("${CC.YELLOW}You already have an alias link request pending with " +
@@ -139,10 +137,10 @@ class UtilCommandsController(val db: DiscordBridge) : IBotController {
                                 "If you want to override this request, repeat this command with the '-u' flag.")
                         return null
                     } else if (args[3] == "-u")
-                        db.requests.remove(pendingRequest)
+                        DiscordBridge.requests.remove(pendingRequest)
                 }
 
-                val foundMember = db.registerUserRequest(event.sender, args[1])
+                val foundMember = DiscordBridge.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.")
@@ -155,13 +153,13 @@ class UtilCommandsController(val db: DiscordBridge) : IBotController {
                 }
 
                 if (event.sender is IPlayer && !event.sender.hasPermission("discordbridge.discord.listmembers")) {
-                    event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${db.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
+                    event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                             "Sorry, you don't have permission to use that command.")
                 }
 
                 when (args[1].toLowerCase()) {
-                    "all" -> event.sender.sendMessage(db.getDiscordMembersAll())
-                    "online" -> event.sender.sendMessage(db.getDiscordMembersOnline())
+                    "all" -> event.sender.sendMessage(DiscordBridge.getDiscordMembersAll())
+                    "online" -> event.sender.sendMessage(DiscordBridge.getDiscordMembersOnline())
                     else -> event.sender.sendMessage("${CC.YELLOW}Usage: /discord listmembers <all/online>")
                 }
             }
@@ -173,7 +171,7 @@ class UtilCommandsController(val db: DiscordBridge) : IBotController {
                     event.sender.sendMessage("${CC.YELLOW}You do not have an alias to unlink.")
                     return null
                 }
-                UserAliasConfig.remove(db, ua)
+                UserAliasConfig.remove(ua)
                 event.sender.sendMessage("${CC.YELLOW}Alias link with Discord user ${Connection.JDA.getUserById(ua.discordId)} " +
                         "succeessfully removed.")
             }
@@ -193,8 +191,8 @@ class UtilCommandsController(val db: DiscordBridge) : IBotController {
     @PrivateResponse
     private fun help(event: IEventWrapper, commands: MutableMap<String, BotControllerManager.Command>,
                      instances: Map<Class<out IBotController>, IBotController>) {
-        db.logger.info("Entered 'help'")
-        db.logDebug("user ${event.senderName} requested help")
+        DiscordBridge.logger.info("Entered 'help'")
+        DiscordBridge.logDebug("user ${event.senderName} requested help")
         when (event) {
             is MinecraftChatEventWrapper -> {
                 val player = event.player
@@ -210,9 +208,9 @@ class UtilCommandsController(val db: DiscordBridge) : IBotController {
                 }
             }
             is DiscordMessageWrapper -> {
-                db.logger.info("DiscordMessageWrapper detected!")
+                DiscordBridge.logger.info("DiscordMessageWrapper detected!")
                 event.originalMessage.author.openPrivateChannel().queue({p ->
-                    db.logger.info("RestAction returned: $p")
+                    DiscordBridge.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) {
@@ -224,7 +222,7 @@ class UtilCommandsController(val db: DiscordBridge) : IBotController {
                         p.sendMessage(out).queue()
                     }
                 })
-                db.logger.info("Continuing non-blocking thread")
+                DiscordBridge.logger.info("Continuing non-blocking thread")
             }
         }
     }
@@ -239,15 +237,15 @@ class UtilCommandsController(val db: DiscordBridge) : IBotController {
             relayTriggerMessage = false)
     private fun serverList(event: IEventWrapper) {
         if (event !is DiscordMessageWrapper) return
-        db.logDebug("user ${event.originalMessage.author.name} has requested a listing of online players")
+        DiscordBridge.logDebug("user ${event.originalMessage.author.name} has requested a listing of online players")
 
-        val players = db.getOnlinePlayers()
+        val players = DiscordBridge.getOnlinePlayers()
         if (players.isEmpty()) {
-            db.sendToDiscord("Nobody is currently online.", event.channel)
+            DiscordBridge.sendToDiscord("Nobody is currently online.", event.channel)
             return
         }
 
         val response = players.joinToString("\n", "The following players are currently online:\n```\n", "\n```")
-        db.sendToDiscord(response, event.channel)
+        DiscordBridge.sendToDiscord(response, event.channel)
     }
 }
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
index aa426c0..baf4b4b 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
@@ -13,7 +13,6 @@ import net.dv8tion.jda.core.entities.*
  * This object is designed to run asynchronously on its own thread.
  */
 object Connection: Runnable {
-    lateinit var db: DiscordBridge
     lateinit var JDA: JDA
     private lateinit var listener: Listener
     var server: Guild? = null
@@ -26,7 +25,7 @@ object Connection: Runnable {
         try {
             connect()
         } catch (e: Exception) {
-            db.logger.severe("Error connecting to Discord: ${e.message}", e)
+            DiscordBridge.logger.severe("Error connecting to Discord: ${e.message}", e)
         }
     }
 
@@ -36,8 +35,8 @@ object Connection: Runnable {
      * @return the relay TextChannel, null if the value could not be read
      */
     fun getRelayChannel(): TextChannel? {
-        server = if (server == null) getServerById(db.getConfig(Cfg.CONFIG).getString("server-id", "")) else server
-        channel = if (channel == null) getGroupByName(server!!, db.getConfig(Cfg.CONFIG).getString("channel", "")) else channel
+        server = if (server == null) getServerById(DiscordBridge.getConfig(Cfg.CONFIG).getString("server-id", "")) else server
+        channel = if (channel == null) getGroupByName(server!!, DiscordBridge.getConfig(Cfg.CONFIG).getString("channel", "")) else channel
         return channel
     }
 
@@ -49,7 +48,7 @@ object Connection: Runnable {
      */
     fun send(message: String, toChannel: MessageChannel?) {
         if (toChannel == null) {
-            db.logger.severe("Could not send message to Discord: Channel is not defined")
+            DiscordBridge.logger.severe("Could not send message to Discord: Channel is not defined")
             return
         }
         toChannel.sendMessage(message).queue()
@@ -60,7 +59,7 @@ object Connection: Runnable {
      */
     fun reconnect(callback: Runnable) {
         //disconnect
-        if (db.getConfig(Cfg.CONFIG).getBoolean("announce-server-start-stop", true))
+        if (DiscordBridge.getConfig(Cfg.CONFIG).getBoolean("announce-server-start-stop", true))
             send("Refreshing Discord connection...", getRelayChannel())
         JDA.removeEventListener(listener)
         server = null
@@ -99,11 +98,11 @@ object Connection: Runnable {
      */
     private fun connect() {
         var builder = JDABuilder(AccountType.BOT).setAudioEnabled(true)
-        builder = builder.setToken(db.getConfig(Cfg.CONFIG).getString("token", ""))
+        builder = builder.setToken(DiscordBridge.getConfig(Cfg.CONFIG).getString("token", ""))
         JDA = builder.buildBlocking()
-        listener = Listener(db)
+        listener = Listener()
         JDA.addEventListener(listener)
-        JDA.presence.game = Game.of("Minecraft ${db.getServer().getMinecraftShortVersion()}")
+        JDA.presence.game = Game.of("Minecraft ${DiscordBridge.getServer().getMinecraftShortVersion()}")
     }
 
     /**
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
index 32477ab..46faa0a 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
@@ -10,16 +10,14 @@ import net.dv8tion.jda.core.hooks.ListenerAdapter
 
 /**
  * Listens for events from Discord
- *
- * @param db a reference to the base DiscordBridge object
  */
-class Listener(val db: DiscordBridge) : ListenerAdapter() {
+class Listener: ListenerAdapter() {
 
-    private val controllerManager = BotControllerManager(db)
+    private val controllerManager = BotControllerManager()
 
     init {
-        controllerManager.registerController(FunCommandsController(db), discordExclusive = true, chatExclusive = true)
-        controllerManager.registerController(UtilCommandsController(db), discordExclusive = true, chatExclusive = true)
+        controllerManager.registerController(FunCommandsController(), discordExclusive = true, chatExclusive = true)
+        controllerManager.registerController(UtilCommandsController(), discordExclusive = true, chatExclusive = true)
     }
 
     /**
@@ -28,15 +26,15 @@ class Listener(val db: DiscordBridge) : ListenerAdapter() {
      * @param event the MessageReceivedEvent object
      */
     override fun onMessageReceived(event: MessageReceivedEvent) {
-        db.logDebug("Received message ${event.message.id} from Discord - ${event.message.rawContent}")
+        DiscordBridge.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) {
-            db.logDebug("Ignoring message ${event.message.id} from Discord: it matches this bot's username")
+            DiscordBridge.logDebug("Ignoring message ${event.message.id} from Discord: it matches this bot's username")
             return
         }
 
-        controllerManager.dispatchMessage(DiscordMessageWrapper(db, event.message))
+        controllerManager.dispatchMessage(DiscordMessageWrapper(event.message))
     }
 
 }
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt
index 9e2e0f3..6a2d4c3 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt
@@ -27,8 +27,8 @@ object UtilFunctions {
      * @return the formatted string
      */
     @JvmStatic
-    fun String.toMinecraftChatMessage(db: DiscordBridge, alias: String): String {
-        return formatMessage(db.getConfig(Cfg.CONFIG).getString("templates.minecraft.chat-message", "[&b&lDiscord&r]<%u> %m"), msg = this, u = alias, w = "Discord")
+    fun String.toMinecraftChatMessage(alias: String): String {
+        return formatMessage(DiscordBridge.getConfig(Cfg.CONFIG).getString("templates.minecraft.chat-message", "[&b&lDiscord&r]<%u> %m"), msg = this, u = alias, w = "Discord")
     }
 
     /**
@@ -39,8 +39,8 @@ object UtilFunctions {
      * @return the formatted string
      */
     @JvmStatic
-    fun String.toDiscordChatMessage(db: DiscordBridge, username: String, worldName: String): String {
-        return formatMessage(db.getConfig(Cfg.CONFIG).getString("templates.discord.chat-message", "<**%u**> %m"), msg = this, u = username, w = worldName)
+    fun String.toDiscordChatMessage(username: String, worldName: String): String {
+        return formatMessage(DiscordBridge.getConfig(Cfg.CONFIG).getString("templates.discord.chat-message", "<**%u**> %m"), msg = this, u = username, w = worldName)
     }
 
     /**
@@ -50,8 +50,8 @@ object UtilFunctions {
      * @return the formatted string
      */
     @JvmStatic
-    fun IPlayer.toDiscordPlayerJoin(db: DiscordBridge, worldName: String): String {
-        return formatMessage(db.getConfig(Cfg.CONFIG).getString("templates.discord.player-join", "**%u** joined the server"), u = this.getName().stripColor(), w = worldName)
+    fun IPlayer.toDiscordPlayerJoin(worldName: String): String {
+        return formatMessage(DiscordBridge.getConfig(Cfg.CONFIG).getString("templates.discord.player-join", "**%u** joined the server"), u = this.getName().stripColor(), w = worldName)
     }
 
     /**
@@ -61,8 +61,8 @@ object UtilFunctions {
      * @return the formatted string
      */
     @JvmStatic
-    fun IPlayer.toDiscordPlayerLeave(db: DiscordBridge, worldName: String): String {
-        return formatMessage(db.getConfig(Cfg.CONFIG).getString("templates.discord.player-leave", "**%u** left the server"), u = this.getName().stripColor(), w = worldName)
+    fun IPlayer.toDiscordPlayerLeave(worldName: String): String {
+        return formatMessage(DiscordBridge.getConfig(Cfg.CONFIG).getString("templates.discord.player-leave", "**%u** left the server"), u = this.getName().stripColor(), w = worldName)
     }
 
     /**
@@ -73,8 +73,8 @@ object UtilFunctions {
      * @return the formatted string
      */
     @JvmStatic
-    fun String.toDiscordPlayerDeath(db: DiscordBridge, username: String, worldName: String): String {
-        return formatMessage(db.getConfig(Cfg.CONFIG).getString("templates.discord.player-death", "%m"), msg = this, u = username, w = worldName)
+    fun String.toDiscordPlayerDeath(username: String, worldName: String): String {
+        return formatMessage(DiscordBridge.getConfig(Cfg.CONFIG).getString("templates.discord.player-death", "%m"), msg = this, u = username, w = worldName)
     }
 
     /**
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgeForge.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgeForge.kt
index 546c5a1..5b1fbd6 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgeForge.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgeForge.kt
@@ -17,34 +17,28 @@ class DiscordBridgeForge {
     fun preInit(event: FMLPreInitializationEvent) {
         logger = event.modLog
         val workingDir = File(event.modConfigurationDirectory.toString() + File.separator + "discordbridge")
-        core = DiscordBridge(Server(this), workingDir)
-        core.postInit()
+        DiscordBridge.init(Server(this), workingDir)
     }
 
     @Mod.EventHandler
     fun serverStarting(event: FMLServerStartingEvent) {
-        for (c in core.getServerCommands()) {
+        for (c in DiscordBridge.getServerCommands()) {
             event.registerServerCommand(CommandWrapper(c))
         }
     }
 
     @Mod.EventHandler
     fun serverStarted(event: FMLServerStartedEvent) {
-        core.handleServerStart()
+        DiscordBridge.handleServerStart()
     }
 
     @Mod.EventHandler
     fun serverStop(event: FMLServerStoppingEvent) {
-        core.handleServerStop()
+        DiscordBridge.handleServerStop()
     }
 
     lateinit var logger: Logger
 
-    private lateinit var core: DiscordBridge
-
-    fun getCore() : DiscordBridge = core
-
-
     companion object {
         const val MODID = "discordbridge-obsidian"
 
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt
index d9b22fa..f6770e3 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt
@@ -16,27 +16,27 @@ object EventHandler {
     @JvmStatic
     @SubscribeEvent(priority = EventPriority.LOWEST)
     fun onPlayerJoin(event: PlayerEvent.PlayerLoggedInEvent) {
-        DiscordBridgeForge.inst.getCore().handlePlayerJoin(Player(event.player))
+        DiscordBridge.handlePlayerJoin(Player(event.player))
     }
 
     @JvmStatic
     @SubscribeEvent(priority = EventPriority.LOWEST)
     fun onPlayerQuit(event: PlayerEvent.PlayerLoggedOutEvent) {
-        DiscordBridgeForge.inst.getCore().handlePlayerQuit(Player(event.player))
+        DiscordBridge.handlePlayerQuit(Player(event.player))
     }
 
     @JvmStatic
     @SubscribeEvent(priority = EventPriority.LOWEST)
     fun onPlayerDeath(event: LivingDeathEvent) {
         val e = event.entityLiving
-        if (e is EntityPlayer) DiscordBridgeForge.inst.getCore().handlePlayerDeath(Player(e), e.combatTracker.deathMessage.unformattedText)
+        if (e is EntityPlayer) DiscordBridge.handlePlayerDeath(Player(e), e.combatTracker.deathMessage.unformattedText)
     }
 
     @JvmStatic
     @SubscribeEvent(priority = EventPriority.LOWEST)
     fun onPlayerChat(event: ServerChatEvent) {
         val p = event.player
-        if (p != null) DiscordBridgeForge.inst.getCore().handlePlayerChat(Player(p), event.message, event.isCanceled)
+        if (p != null) DiscordBridge.handlePlayerChat(Player(p), event.message, event.isCanceled)
     }
 
     // https://github.com/sk89q/WorldEdit/blob/85ef47ae0c2c02a5870b764ca4b0da0d9e01671f/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorldEdit.java
@@ -46,7 +46,7 @@ object EventHandler {
         val p = event.sender
         if (p is EntityPlayerMP) {
             if (p.world.isRemote) return
-            DiscordBridgeForge.inst.getCore().handleCommand(Player(p), event.command.name, event.parameters)
+            DiscordBridge.handleCommand(Player(p), event.command.name, event.parameters)
         }
     }
 }
\ No newline at end of file
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
index 75a7ffb..95c7079 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
@@ -26,55 +26,51 @@ class DiscordBridgePlugin {
 
     @Inject private lateinit var logger: Logger
 
-    private lateinit var core: DiscordBridge
     private lateinit var instance: DiscordBridgePlugin
 
     fun getPlugin() : DiscordBridgePlugin = instance
 
-    fun getCore() : DiscordBridge = core
-
     fun getLogger() : Logger = logger
 
     @Listener
     fun onGameInitialization(event: GameInitializationEvent) {
         instance = this
-        core = DiscordBridge(Server(this, game), defaultConfig)
-        core.postInit()
+        DiscordBridge.init(Server(this, game), defaultConfig)
 
         //game.commandManager.register(this, )
     }
 
     @Listener
     fun onServerStarted(event: GameStartedServerEvent) {
-        core.handleServerStart()
+        DiscordBridge.handleServerStart()
     }
 
     @Listener
     fun onServerStopping(event: GameStoppingServerEvent) {
-        core.handleServerStop()
+        DiscordBridge.handleServerStop()
     }
 
     @Listener(order = Order.LAST)
     fun onPlayerJoin(event: ClientConnectionEvent.Join) {
-        core.handlePlayerJoin(Player(event.targetEntity))
+        DiscordBridge.handlePlayerJoin(Player(event.targetEntity))
     }
 
     @Listener(order = Order.LAST)
     fun onPlayerQuit(event: ClientConnectionEvent.Disconnect) {
-        core.handlePlayerQuit(Player(event.targetEntity))
+        DiscordBridge.handlePlayerQuit(Player(event.targetEntity))
     }
 
     @Listener(order = Order.LAST)
     fun onPlayerDeath(event: DestructEntityEvent.Death) {
         val e = event.targetEntity
-        if (e is org.spongepowered.api.entity.living.player.Player) core.handlePlayerDeath(Player(e), event.message.toPlain())
+        if (e is org.spongepowered.api.entity.living.player.Player) DiscordBridge.handlePlayerDeath(Player(e), event.message.toPlain())
 
     }
 
     @Listener(order = Order.LAST)
     fun onPlayerChat(event: MessageChannelEvent.Chat) {
         val p = event.cause.first(org.spongepowered.api.entity.living.player.Player::class.java).unwrap()
-        if (p != null) core.handlePlayerChat(Player(p), event.rawMessage.toPlain(), event.isCancelled)
+        if (p != null) DiscordBridge.handlePlayerChat(Player(p), event.rawMessage.toPlain(), event.isCancelled)
     }
 
 

From a620d8ef96abcfe19c8755a5be75fef8619553e0 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Mon, 5 Feb 2018 03:22:25 -0600
Subject: [PATCH 12/30] Add command forwarding

---
 .../DiscordRConConsoleSource.kt}              | 51 ++++++-------
 .../obsidian/discordbridge/wrappers/Server.kt | 16 ++--
 .../commands/DiscordCommandSender.kt          | 76 +------------------
 .../controllers/BotControllerManager.kt       | 44 ++---------
 .../discordbridge/wrappers/IServer.kt         |  5 +-
 .../discordbridge/wrappers/ConsoleSender.kt   | 24 ++++++
 .../wrappers/DiscordRConConsoleSource.kt      | 16 ++++
 .../obsidian/discordbridge/wrappers/Server.kt | 10 +--
 .../wrappers/DiscordRconConsoleSource.kt      | 72 ++++++++++++++++++
 .../obsidian/discordbridge/wrappers/Server.kt | 11 +--
 10 files changed, 159 insertions(+), 166 deletions(-)
 rename discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/{DiscordCommandSender.kt => wrappers/DiscordRConConsoleSource.kt} (58%)
 create mode 100644 discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ConsoleSender.kt
 create mode 100644 discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DiscordRConConsoleSource.kt
 create mode 100644 discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DiscordRconConsoleSource.kt

diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordCommandSender.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DiscordRConConsoleSource.kt
similarity index 58%
rename from discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordCommandSender.kt
rename to discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DiscordRConConsoleSource.kt
index 2a2bea7..5a7f71a 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordCommandSender.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DiscordRConConsoleSource.kt
@@ -1,7 +1,6 @@
-package gg.obsidian.discordbridge
+package gg.obsidian.discordbridge.wrappers
 
-import net.dv8tion.jda.core.entities.MessageChannel
-import org.bukkit.Bukkit
+import gg.obsidian.discordbridge.commands.DiscordCommandSender
 import org.bukkit.Server
 import org.bukkit.command.CommandSender
 import org.bukkit.command.ConsoleCommandSender
@@ -11,85 +10,79 @@ import org.bukkit.permissions.PermissionAttachment
 import org.bukkit.permissions.PermissionAttachmentInfo
 import org.bukkit.plugin.Plugin
 
-class DiscordCommandSender(val channel: MessageChannel) : RemoteConsoleCommandSender {
+class DiscordRConConsoleSource(val discordSender: DiscordCommandSender, val base: ConsoleCommandSender) : RemoteConsoleCommandSender {
 
-    private val sender:ConsoleCommandSender = Bukkit.getServer().consoleSender
-
-    init {
-
-    }
-
-    override fun sendMessage(message: String?) {
-        channel.sendMessage(message).queue()
+    override fun sendMessage(message: String) {
+        discordSender.sendMessage(message)
     }
 
     override fun sendMessage(messages: Array<out String>?) {
         if (messages != null)
-            for (m in messages) channel.sendMessage(m)
+            for (m in messages) discordSender.sendMessage(m)
     }
 
     override fun spigot(): CommandSender.Spigot {
-        return sender.spigot()
+        return base.spigot()
     }
 
     override fun addAttachment(plugin: Plugin?): PermissionAttachment {
-        return sender.addAttachment(plugin)
+        return base.addAttachment(plugin)
     }
 
     override fun addAttachment(plugin: Plugin?, ticks: Int): PermissionAttachment {
-        return sender.addAttachment(plugin, ticks)
+        return base.addAttachment(plugin, ticks)
     }
 
     override fun addAttachment(plugin: Plugin?, name: String?, value: Boolean): PermissionAttachment {
-        return sender.addAttachment(plugin, name, value)
+        return base.addAttachment(plugin, name, value)
     }
 
     override fun addAttachment(plugin: Plugin?, name: String?, value: Boolean, ticks: Int): PermissionAttachment {
-        return sender.addAttachment(plugin, name, value, ticks)
+        return base.addAttachment(plugin, name, value, ticks)
     }
 
     override fun getEffectivePermissions(): MutableSet<PermissionAttachmentInfo> {
-        return sender.effectivePermissions
+        return base.effectivePermissions
     }
 
     override fun getName(): String {
-        return sender.name
+        return discordSender.senderName
     }
 
     override fun getServer(): Server {
-        return sender.server
+        return base.server
     }
 
     override fun hasPermission(name: String?): Boolean {
-        return sender.hasPermission(name)
+        return base.hasPermission(name)
     }
 
     override fun hasPermission(perm: Permission?): Boolean {
-        return sender.hasPermission(perm)
+        return base.hasPermission(perm)
     }
 
     override fun isOp(): Boolean {
-        return sender.isOp
+        return base.isOp
     }
 
     override fun isPermissionSet(name: String?): Boolean {
-        return sender.isPermissionSet(name)
+        return base.isPermissionSet(name)
     }
 
     override fun isPermissionSet(perm: Permission?): Boolean {
-        return sender.isPermissionSet(perm)
+        return base.isPermissionSet(perm)
     }
 
     override fun recalculatePermissions() {
-        return sender.recalculatePermissions()
+        return base.recalculatePermissions()
     }
 
     override fun removeAttachment(attachment: PermissionAttachment?) {
-        return sender.removeAttachment(attachment)
+        return base.removeAttachment(attachment)
     }
 
     override fun setOp(value: Boolean) {
-        return sender.setOp(value)
+        return base.setOp(value)
     }
 
 
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
index e56a25c..4135887 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
@@ -1,22 +1,18 @@
 package gg.obsidian.discordbridge.wrappers
 
 import gg.obsidian.discordbridge.DiscordBridgePlugin
-import gg.obsidian.discordbridge.DiscordCommandSender
-import net.dv8tion.jda.core.entities.MessageChannel
+import gg.obsidian.discordbridge.commands.DiscordCommandSender
+import org.bukkit.Bukkit
 import org.bukkit.Server
 import java.util.*
 
 class Server(val plugin: DiscordBridgePlugin, val bukkitServer: Server) : IServer {
-    override fun getRemoteConsoleSender(): IConsoleSender {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-    }
-
     override fun getScheduler(): IScheduler {
         return Scheduler(plugin, bukkitServer.scheduler)
     }
 
     override fun getVersion(): String {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+        return bukkitServer.bukkitVersion.split("-")[0]
     }
 
     override fun getMinecraftShortVersion(): String {
@@ -39,9 +35,9 @@ class Server(val plugin: DiscordBridgePlugin, val bukkitServer: Server) : IServe
         bukkitServer.broadcastMessage(message)
     }
 
-    override fun dispatchCommand(channel: MessageChannel, command: String) {
-        val sender = DiscordCommandSender(channel)
-        bukkitServer.dispatchCommand(sender, command)
+    override fun dispatchCommand(sender: DiscordCommandSender, command: String) {
+        val rcon = DiscordRConConsoleSource(sender, Bukkit.getServer().consoleSender)
+        bukkitServer.dispatchCommand(rcon, command)
     }
 
     override fun getLogger(): ILogger {
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordCommandSender.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordCommandSender.kt
index 0d7074c..43196f8 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordCommandSender.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordCommandSender.kt
@@ -1,84 +1,14 @@
 package gg.obsidian.discordbridge.commands
 
-import gg.obsidian.discordbridge.wrappers.IConsoleSender
 import net.dv8tion.jda.core.entities.MessageChannel
 
-class DiscordCommandSender(val sender: IConsoleSender, val channel: MessageChannel) {
-
-    //private val sender:ConsoleCommandSender = Bukkit.getServer().consoleSender
-
-    init {
-
-    }
-
-    fun sendMessage(message: String?) {
-        channel.sendMessage(message).queue()
+class DiscordCommandSender(val senderName: String, private val channel: MessageChannel) {
+    fun sendMessage(message: String) {
+        channel.sendMessage(message)
     }
 
     fun sendMessage(messages: Array<out String>?) {
         if (messages != null)
             for (m in messages) channel.sendMessage(m)
     }
-
-//    override fun addAttachment(plugin: Plugin?): PermissionAttachment {
-//        return sender.addAttachment(plugin)
-//    }
-//
-//    override fun addAttachment(plugin: Plugin?, ticks: Int): PermissionAttachment {
-//        return sender.addAttachment(plugin, ticks)
-//    }
-//
-//    override fun addAttachment(plugin: Plugin?, name: String?, value: Boolean): PermissionAttachment {
-//        return sender.addAttachment(plugin, name, value)
-//    }
-//
-//    override fun addAttachment(plugin: Plugin?, name: String?, value: Boolean, ticks: Int): PermissionAttachment {
-//        return sender.addAttachment(plugin, name, value, ticks)
-//    }
-//
-//    override fun getEffectivePermissions(): MutableSet<PermissionAttachmentInfo> {
-//        return sender.effectivePermissions
-//    }
-
-//    fun getName(): String {
-//        return sender.name
-//    }
-//
-//    override fun getServer(): Server {
-//        return sender.server
-//    }
-//
-//    override fun hasPermission(name: String?): Boolean {
-//        return sender.hasPermission(name)
-//    }
-//
-//    override fun hasPermission(perm: Permission?): Boolean {
-//        return sender.hasPermission(perm)
-//    }
-//
-//    override fun isOp(): Boolean {
-//        return sender.isOp
-//    }
-//
-//    override fun isPermissionSet(name: String?): Boolean {
-//        return sender.isPermissionSet(name)
-//    }
-//
-//    override fun isPermissionSet(perm: Permission?): Boolean {
-//        return sender.isPermissionSet(perm)
-//    }
-//
-//    override fun recalculatePermissions() {
-//        return sender.recalculatePermissions()
-//    }
-//
-//    override fun removeAttachment(attachment: PermissionAttachment?) {
-//        return sender.removeAttachment(attachment)
-//    }
-//
-//    override fun setOp(value: Boolean) {
-//        return sender.setOp(value)
-//    }
-
-
 }
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
index d041205..71db9c5 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
@@ -1,10 +1,7 @@
 package gg.obsidian.discordbridge.commands.controllers
 
 import gg.obsidian.discordbridge.DiscordBridge
-import gg.obsidian.discordbridge.commands.DiscordMessageWrapper
-import gg.obsidian.discordbridge.commands.IEventWrapper
-import gg.obsidian.discordbridge.commands.MinecraftChatEventWrapper
-import gg.obsidian.discordbridge.commands.MinecraftCommandWrapper
+import gg.obsidian.discordbridge.commands.*
 import gg.obsidian.discordbridge.commands.annotations.*
 import gg.obsidian.discordbridge.discord.Connection
 import gg.obsidian.discordbridge.util.Cfg
@@ -373,45 +370,16 @@ class BotControllerManager {
     }
 
     /**
-     * Attempts to run a Spigot command
+     * Attempts to run a Minecraft command
      *
      * @param event the incoming event object
      * @param args the arguments associated with the command, space-delimited
      */
     private fun invokeServerCommand(event: IEventWrapper, args: Array<String>): Boolean {
-        TODO("Not implemented yet")
-//            val sender = DiscordCommandSender(DiscordBridge.getServer().getRemoteConsoleSender(), event.channel)
-//            val commandName = args[0].toLowerCase()
-//            when {
-//                DefaultCommands.minecraft.contains(commandName) -> {
-//                    DiscordBridge.logDebug("Discord user ${event.senderName} invoked Minecraft command '${args.joinToString(" ")}'")
-//                    DiscordBridge.getServer().dispatchCommand(sender, args.joinToString(" "))
-//                    return true
-//                }
-//
-//                DefaultCommands.bukkit.contains(commandName) -> {
-//                    DiscordBridge.logDebug("Discord user ${event.senderName} invoked Bukkit command '${args.joinToString(" ")}'")
-//                    DiscordBridge.getServer().dispatchCommand(sender, args.joinToString(" "))
-//                    return true
-//                }
-//
-//                DefaultCommands.spigot.contains(commandName) -> {
-//                    DiscordBridge.logDebug("Discord user ${event.senderName} invoked Spigot command '${args.joinToString(" ")}'")
-//                    DiscordBridge.getServer().dispatchCommand(sender, args.joinToString(" "))
-//                    return true
-//                }
-//
-//                else -> {
-//                    //TODO
-////                    val pluginCommand = DiscordBridge.getServer().getPluginCommand(commandName)
-////                    if (pluginCommand != null) {
-////                        DiscordBridge.logDebug("Discord user ${event.senderName} invoked ${pluginCommand.plugin.name} command '${args.joinToString(" ")}'")
-////                        pluginCommand.execute(sender, commandName, args.sliceArray(1 until args.size))
-////                        return true
-////                    }
-//                }
-//            }
-//        return false
+        val sender = DiscordCommandSender(event.senderName, event.channel)
+        DiscordBridge.logDebug("Discord user ${event.senderName} invoked Minecraft command '${args.joinToString(" ")}'")
+        DiscordBridge.getServer().dispatchCommand(sender, args.joinToString(" "))
+        return true
     }
 
     /**
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IServer.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IServer.kt
index 60645b1..8a58ba9 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IServer.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IServer.kt
@@ -1,5 +1,6 @@
 package gg.obsidian.discordbridge.wrappers
 
+import gg.obsidian.discordbridge.commands.DiscordCommandSender
 import net.dv8tion.jda.core.entities.MessageChannel
 import java.util.*
 
@@ -19,9 +20,7 @@ interface IServer {
 
     fun broadcastMessage(message: String)
 
-    fun getRemoteConsoleSender(): IConsoleSender
-
-    fun dispatchCommand(channel: MessageChannel, command: String)
+    fun dispatchCommand(sender: DiscordCommandSender, command: String)
 
     fun getLogger(): ILogger
 
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ConsoleSender.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ConsoleSender.kt
new file mode 100644
index 0000000..97cf788
--- /dev/null
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ConsoleSender.kt
@@ -0,0 +1,24 @@
+package gg.obsidian.discordbridge.wrappers
+
+import net.minecraft.network.rcon.RConConsoleSource
+import net.minecraft.util.text.TextComponentString
+import java.util.*
+
+class ConsoleSender(private val sender: RConConsoleSource) : IConsoleSender {
+    override fun getName(): String {
+        return sender.name
+    }
+
+    override fun getUUID(): UUID {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun sendMessage(message: String) {
+        sender.sendMessage(TextComponentString(message))
+    }
+
+    override fun hasPermission(permission: String): Boolean {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+}
\ No newline at end of file
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DiscordRConConsoleSource.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DiscordRConConsoleSource.kt
new file mode 100644
index 0000000..70cc9d2
--- /dev/null
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DiscordRConConsoleSource.kt
@@ -0,0 +1,16 @@
+package gg.obsidian.discordbridge.wrappers
+
+import gg.obsidian.discordbridge.commands.DiscordCommandSender
+import net.minecraft.network.rcon.RConConsoleSource
+import net.minecraft.server.MinecraftServer
+import net.minecraft.util.text.ITextComponent
+
+class DiscordRConConsoleSource(val sender: DiscordCommandSender, serverIn: MinecraftServer) : RConConsoleSource(serverIn) {
+    override fun getName(): String {
+        return sender.senderName
+    }
+
+    override fun sendMessage(component: ITextComponent) {
+        sender.sendMessage(component.unformattedText)
+    }
+}
\ No newline at end of file
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
index f0f8eaa..d2c1c40 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
@@ -1,6 +1,7 @@
 package gg.obsidian.discordbridge.wrappers
 
 import gg.obsidian.discordbridge.DiscordBridgeForge
+import gg.obsidian.discordbridge.commands.DiscordCommandSender
 import net.dv8tion.jda.core.entities.MessageChannel
 import net.minecraft.util.text.TextComponentString
 import net.minecraftforge.common.ForgeVersion
@@ -39,12 +40,9 @@ class Server(private val mod: DiscordBridgeForge) : IServer {
         FMLCommonHandler.instance().minecraftServerInstance.playerList.sendMessage(TextComponentString(message))
     }
 
-    override fun getRemoteConsoleSender(): IConsoleSender {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-    }
-
-    override fun dispatchCommand(channel: MessageChannel, command: String) {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    override fun dispatchCommand(sender: DiscordCommandSender, command: String) {
+        val rcon = DiscordRConConsoleSource(sender, FMLCommonHandler.instance().minecraftServerInstance)
+        FMLCommonHandler.instance().minecraftServerInstance.commandManager.executeCommand(rcon, command)
     }
 
     override fun getLogger(): Logger {
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DiscordRconConsoleSource.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DiscordRconConsoleSource.kt
new file mode 100644
index 0000000..46069b4
--- /dev/null
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DiscordRconConsoleSource.kt
@@ -0,0 +1,72 @@
+package gg.obsidian.discordbridge.wrappers
+
+import gg.obsidian.discordbridge.commands.DiscordCommandSender
+import org.spongepowered.api.command.CommandSource
+import org.spongepowered.api.command.source.ConsoleSource
+import org.spongepowered.api.service.context.Context
+import org.spongepowered.api.service.permission.Subject
+import org.spongepowered.api.service.permission.SubjectCollection
+import org.spongepowered.api.service.permission.SubjectData
+import org.spongepowered.api.text.Text
+import org.spongepowered.api.text.channel.MessageChannel
+import org.spongepowered.api.util.Tristate
+import java.util.*
+
+class DiscordRconConsoleSource(private val sender: DiscordCommandSender, private val base: ConsoleSource): ConsoleSource {
+    override fun sendMessage(message: Text) {
+        sender.sendMessage(message.toPlain())
+    }
+
+    override fun setMessageChannel(channel: MessageChannel) {
+        base.messageChannel = channel
+    }
+
+    override fun getIdentifier(): String {
+        return base.identifier
+    }
+
+    override fun getMessageChannel(): MessageChannel {
+        return base.messageChannel
+    }
+
+    override fun getCommandSource(): Optional<CommandSource> {
+        return base.commandSource
+    }
+
+    override fun getOption(contexts: MutableSet<Context>, key: String): Optional<String> {
+        return base.getOption(contexts, key)
+    }
+
+    override fun getName(): String {
+        return sender.senderName
+    }
+
+    override fun getTransientSubjectData(): SubjectData {
+        return base.transientSubjectData
+    }
+
+    override fun getParents(contexts: MutableSet<Context>?): MutableList<Subject> {
+        return base.parents
+    }
+
+    override fun getContainingCollection(): SubjectCollection {
+        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    }
+
+    override fun getSubjectData(): SubjectData {
+        return base.subjectData
+    }
+
+    override fun isChildOf(contexts: MutableSet<Context>, parent: Subject): Boolean {
+        return base.isChildOf(contexts, parent)
+    }
+
+    override fun getActiveContexts(): MutableSet<Context> {
+        return base.activeContexts
+    }
+
+    override fun getPermissionValue(contexts: MutableSet<Context>, permission: String): Tristate {
+        return base.getPermissionValue(contexts, permission)
+    }
+
+}
\ No newline at end of file
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
index 821e7c6..8d007fa 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
@@ -1,8 +1,8 @@
 package gg.obsidian.discordbridge.wrappers
 
 import gg.obsidian.discordbridge.DiscordBridgePlugin
+import gg.obsidian.discordbridge.commands.DiscordCommandSender
 import gg.obsidian.discordbridge.util.unwrap
-import net.dv8tion.jda.core.entities.MessageChannel
 import org.spongepowered.api.Game
 import org.spongepowered.api.Sponge
 import org.spongepowered.api.text.Text
@@ -39,12 +39,9 @@ class Server(private val plugin: DiscordBridgePlugin, private val game: Game) :
         Sponge.getServer().broadcastChannel.send(Text.of(message))
     }
 
-    override fun getRemoteConsoleSender(): IConsoleSender {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
-    }
-
-    override fun dispatchCommand(channel: MessageChannel, command: String) {
-        TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
+    override fun dispatchCommand(sender: DiscordCommandSender, command: String) {
+        val rcon = DiscordRconConsoleSource(sender, game.server.console)
+        Sponge.getCommandManager().process(rcon, command)
     }
 
     override fun getLogger(): Logger {

From 0b1dd757f6027747b61c724911ef495942cb3871 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Mon, 5 Feb 2018 04:27:18 -0600
Subject: [PATCH 13/30] Add server commands to Sponge version

---
 .../discordbridge/DiscordBridgePlugin.kt      |  9 +++-
 .../discordbridge/wrappers/CommandWrapper.kt  | 45 +++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandWrapper.kt

diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
index 95c7079..a87809d 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
@@ -1,6 +1,7 @@
 package gg.obsidian.discordbridge
 
 import gg.obsidian.discordbridge.util.unwrap
+import gg.obsidian.discordbridge.wrappers.CommandWrapper
 import gg.obsidian.discordbridge.wrappers.Player
 import gg.obsidian.discordbridge.wrappers.Server
 import org.spongepowered.api.Game
@@ -14,7 +15,9 @@ import org.spongepowered.api.event.network.ClientConnectionEvent
 import org.spongepowered.api.plugin.Plugin
 import java.io.File
 import org.slf4j.Logger
+import org.spongepowered.api.Sponge
 import org.spongepowered.api.event.game.state.GameStartedServerEvent
+import org.spongepowered.api.event.game.state.GameStartingServerEvent
 import org.spongepowered.api.event.game.state.GameStoppingServerEvent
 import javax.inject.Inject
 
@@ -37,7 +40,11 @@ class DiscordBridgePlugin {
         instance = this
         DiscordBridge.init(Server(this, game), defaultConfig)
 
-        //game.commandManager.register(this, )
+        val mgr = Sponge.getCommandManager()
+        for (c in DiscordBridge.getServerCommands()) {
+            val wrap = CommandWrapper(c)
+            logger.info(mgr.register(this, wrap, c.name).isPresent.toString())
+        }
     }
 
     @Listener
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandWrapper.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandWrapper.kt
new file mode 100644
index 0000000..71fb6ac
--- /dev/null
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandWrapper.kt
@@ -0,0 +1,45 @@
+package gg.obsidian.discordbridge.wrappers
+
+import gg.obsidian.discordbridge.DiscordBridge
+import gg.obsidian.discordbridge.commands.controllers.BotControllerManager
+import org.spongepowered.api.command.CommandCallable
+import org.spongepowered.api.command.CommandResult
+import org.spongepowered.api.command.CommandSource
+import org.spongepowered.api.entity.living.player.Player
+import org.spongepowered.api.text.Text
+import org.spongepowered.api.world.Location
+import org.spongepowered.api.world.World
+import java.util.*
+
+class CommandWrapper(private val command: BotControllerManager.Command): CommandCallable {
+    override fun process(source: CommandSource, arguments: String): CommandResult {
+        if (source is Player) {
+            DiscordBridge.handleCommand(gg.obsidian.discordbridge.wrappers.Player(source), command.name, arguments.split(" ").toTypedArray())
+            return CommandResult.success()
+        }
+        return CommandResult.empty()
+    }
+
+    override fun getSuggestions(source: CommandSource?, arguments: String?, targetPosition: Location<World>?): MutableList<String> {
+        // TODO
+        return mutableListOf()
+    }
+
+    override fun getUsage(source: CommandSource?): Text {
+        return Text.of(command.usage)
+    }
+
+    override fun testPermission(source: CommandSource?): Boolean {
+        // TODO
+        return true
+    }
+
+    override fun getShortDescription(source: CommandSource?): Optional<Text> {
+        return Optional.of(Text.of(command.description))
+    }
+
+    override fun getHelp(source: CommandSource?): Optional<Text> {
+        // Todo
+        return Optional.of(Text.of(command.usage))
+    }
+}
\ No newline at end of file

From cdbe5f0226323c0723ac3303727c4c2e9227c7b1 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Mon, 5 Feb 2018 16:20:46 -0600
Subject: [PATCH 14/30] Fix Spigot version

Spigot version will now run properly.

Also moved server start message to occur when the server is actually
ready, or when the JDA connection is ready, whatever happens last.

Lastly, usernames.yml -> aliases.yml. Because that was bothering me.
---
 discordbridge-bukkit/build.gradle             |  1 +
 .../discordbridge/DiscordBridgePlugin.kt      |  2 ++
 .../discordbridge/wrappers/Scheduler.kt       |  3 ++-
 .../obsidian/discordbridge/DiscordBridge.kt   | 15 ++++++-----
 .../discordbridge/discord/Connection.kt       | 27 ++++++++++++++-----
 .../discordbridge/discord/ReadyListener.kt    | 13 +++++++++
 .../resources/{usernames.yml => aliases.yml}  |  0
 7 files changed, 46 insertions(+), 15 deletions(-)
 create mode 100644 discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/ReadyListener.kt
 rename discordbridge-core/src/main/resources/{usernames.yml => aliases.yml} (100%)

diff --git a/discordbridge-bukkit/build.gradle b/discordbridge-bukkit/build.gradle
index 9334282..b1d4647 100644
--- a/discordbridge-bukkit/build.gradle
+++ b/discordbridge-bukkit/build.gradle
@@ -12,6 +12,7 @@ dependencies {
     compile project(':discordbridge-core')
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     compile group: 'org.spigotmc', name: 'spigot-api', version: '1.12-R0.1-SNAPSHOT'
+    compile (group: 'org.pegdown', name:'pegdown', version: '1.6.0')
 
     compile files('../libraries/dynmap-api-2.5-SNAPSHOT.jar')
 }
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
index 588584b..8dea1c1 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
@@ -19,9 +19,11 @@ class DiscordBridgePlugin : JavaPlugin() {
 
     override fun onLoad() {
         logger = LoggerFactory.getLogger("DiscordBrdige")
+        logger.info("Loading DiscordBridge")
     }
 
     override fun onEnable() {
+        logger.info("Enabling DiscordBridge")
         instance = this
         DiscordBridge.init(Server(this, this.server), dataFolder)
 
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Scheduler.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Scheduler.kt
index 42ccad4..ce8726b 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Scheduler.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Scheduler.kt
@@ -6,7 +6,8 @@ import org.bukkit.scheduler.BukkitScheduler
 class Scheduler(val plugin: DiscordBridgePlugin, val bukkitScheduler: BukkitScheduler) : IScheduler {
 
     override fun runAsyncTask(task: Runnable) {
-        bukkitScheduler.runTaskAsynchronously(plugin, task)
+        Thread(task).start()
+        //bukkitScheduler.runTaskAsynchronously(plugin, task)
     }
 
 }
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
index 01afd39..d953842 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
@@ -32,6 +32,7 @@ object DiscordBridge {
     private val discordChatControllerManager = BotControllerManager()
     private val minecraftCommandControllerManager = BotControllerManager()
     private val cfgNodes: MutableMap<Cfg, ConfigurationNode> = mutableMapOf()
+    private val isLoaded = false
     private lateinit var server: IServer
     lateinit var logger: ILogger
 
@@ -49,8 +50,12 @@ object DiscordBridge {
             val file = File(dataFolder, filename)
             if (!createDefaultFileFromResource("/$filename", file))
                 logger.severe("Could not create default file for $filename")
-            cfgNodes.put(c, ConfigurationNode(file))
+            val node = ConfigurationNode(file)
+            node.load()
+            cfgNodes.put(c, node)
         }
+        server.getScheduler().runAsyncTask(Connection)
+        UserAliasConfig.load()
 
         minecraftChatControllerManager.registerController(FunCommandsController(), chatExclusive = true)
         minecraftChatControllerManager.registerController(UtilCommandsController(), chatExclusive = true)
@@ -58,10 +63,6 @@ object DiscordBridge {
         minecraftCommandControllerManager.registerController(UtilCommandsController(), minecraftExclusive = true)
         discordChatControllerManager.registerController(FunCommandsController(), discordExclusive = true, chatExclusive = true)
         discordChatControllerManager.registerController(UtilCommandsController(), discordExclusive = true, chatExclusive = true)
-
-        for (cfg in cfgNodes.values) cfg.load()
-        UserAliasConfig.load()
-        server.getScheduler().runAsyncTask(Connection)
     }
 
     fun logDebug(msg: String) {
@@ -323,13 +324,13 @@ object DiscordBridge {
     }
 
     fun handleServerStart() {
-        if (getConfig(Cfg.CONFIG).getBoolean("announce-server-start-stop", true))
-            sendToDiscord(getConfig(Cfg.CONFIG).getString("templates.discord.server-start", "Server started!"), Connection.getRelayChannel())
+        Connection.onServerReady()
     }
 
     fun handleServerStop() {
         if (getConfig(Cfg.CONFIG).getBoolean("announce-server-start-stop", true))
             sendToDiscord(getConfig(Cfg.CONFIG).getString("templates.discord.server-stop", "Shutting down..."), Connection.getRelayChannel())
+        Connection.disconnect()
     }
 
     fun handlePlayerChat(player: IPlayer, message: String, isCancelled: Boolean): String {
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
index baf4b4b..eb203e6 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
@@ -17,12 +17,15 @@ object Connection: Runnable {
     private lateinit var listener: Listener
     var server: Guild? = null
     var channel: TextChannel? = null
+    var serverReady = false
+    var jdaReady = false
 
     /**
      * Starts the connection
      */
     override fun run() {
         try {
+            DiscordBridge.logger.info("Connecting...")
             connect()
         } catch (e: Exception) {
             DiscordBridge.logger.severe("Error connecting to Discord: ${e.message}", e)
@@ -54,19 +57,21 @@ object Connection: Runnable {
         toChannel.sendMessage(message).queue()
     }
 
+    fun disconnect() {
+        JDA.removeEventListener(listener)
+        server = null
+        channel = null
+        JDA.shutdown()
+        jdaReady = false
+    }
+
     /**
      * Shuts down the current JDA instance and creates a new one
      */
     fun reconnect(callback: Runnable) {
-        //disconnect
         if (DiscordBridge.getConfig(Cfg.CONFIG).getBoolean("announce-server-start-stop", true))
             send("Refreshing Discord connection...", getRelayChannel())
-        JDA.removeEventListener(listener)
-        server = null
-        channel = null
-        JDA.shutdown()
-
-        //reconnect
+        disconnect()
         connect()
         callback.run()
     }
@@ -93,6 +98,12 @@ object Connection: Runnable {
         return mutableListOf()
     }
 
+    fun onServerReady() {
+        //TODO: Fix this race condition
+        if (jdaReady) send(DiscordBridge.getConfig(Cfg.CONFIG).getString("templates.discord.server-start", "Server started!"), getRelayChannel())
+        serverReady = true
+    }
+
     /**
      * Builds a JDA instance to connect to the Discord API
      */
@@ -103,6 +114,8 @@ object Connection: Runnable {
         listener = Listener()
         JDA.addEventListener(listener)
         JDA.presence.game = Game.of("Minecraft ${DiscordBridge.getServer().getMinecraftShortVersion()}")
+        if (serverReady) send(DiscordBridge.getConfig(Cfg.CONFIG).getString("templates.discord.server-start", "Server started!"), getRelayChannel())
+        jdaReady = true
     }
 
     /**
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/ReadyListener.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/ReadyListener.kt
new file mode 100644
index 0000000..bb78f59
--- /dev/null
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/ReadyListener.kt
@@ -0,0 +1,13 @@
+package gg.obsidian.discordbridge.discord
+
+import net.dv8tion.jda.core.events.Event
+import net.dv8tion.jda.core.events.ReadyEvent
+import net.dv8tion.jda.core.hooks.EventListener
+
+class ReadyListener : EventListener {
+    override fun onEvent(event: Event?) {
+        if (event is ReadyEvent) {
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/discordbridge-core/src/main/resources/usernames.yml b/discordbridge-core/src/main/resources/aliases.yml
similarity index 100%
rename from discordbridge-core/src/main/resources/usernames.yml
rename to discordbridge-core/src/main/resources/aliases.yml

From edcf623087296c35e88b848c355252b0a9ec079a Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Mon, 5 Feb 2018 19:14:30 -0600
Subject: [PATCH 15/30] Tweak command system

Modify the command system to work more like WorldEdit's system.
Commands now support multiple aliases (except for Spigot)
Fix Sponge command handling
Fixed 8ball command crashing on use
Trim response of choose command
---
 .../obsidian/discordbridge/DiscordBridge.kt   |  14 +-
 .../discordbridge/commands/Command.kt         |  32 ++++
 .../commands/annotations/BotCommand.kt        |  15 +-
 .../controllers/BotControllerManager.kt       | 151 ++----------------
 .../controllers/FunCommandsController.kt      |  50 ++++--
 .../controllers/UtilCommandsController.kt     |  43 +++--
 .../discordbridge/wrappers/CommandWrapper.kt  |  13 +-
 .../discordbridge/DiscordBridgePlugin.kt      |   3 +-
 .../discordbridge/wrappers/CommandWrapper.kt  |  10 +-
 9 files changed, 149 insertions(+), 182 deletions(-)
 create mode 100644 discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/Command.kt

diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
index d953842..9090f14 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
@@ -1,5 +1,6 @@
 package gg.obsidian.discordbridge
 
+import gg.obsidian.discordbridge.commands.Command
 import gg.obsidian.discordbridge.commands.MinecraftChatEventWrapper
 import gg.obsidian.discordbridge.commands.MinecraftCommandWrapper
 import gg.obsidian.discordbridge.commands.controllers.BotControllerManager
@@ -9,21 +10,24 @@ import gg.obsidian.discordbridge.discord.Connection
 import gg.obsidian.discordbridge.util.Cfg
 import gg.obsidian.discordbridge.util.MarkdownToMinecraftSeralizer
 import gg.obsidian.discordbridge.util.UserAlias
-import gg.obsidian.discordbridge.util.ChatColor as CC
 import gg.obsidian.discordbridge.util.UtilFunctions.noSpace
 import gg.obsidian.discordbridge.util.UtilFunctions.toDiscordChatMessage
+import gg.obsidian.discordbridge.util.UtilFunctions.toDiscordPlayerDeath
 import gg.obsidian.discordbridge.util.UtilFunctions.toDiscordPlayerJoin
 import gg.obsidian.discordbridge.util.UtilFunctions.toDiscordPlayerLeave
-import gg.obsidian.discordbridge.util.UtilFunctions.toDiscordPlayerDeath
-import gg.obsidian.discordbridge.wrappers.*
+import gg.obsidian.discordbridge.wrappers.ICommandSender
+import gg.obsidian.discordbridge.wrappers.ILogger
+import gg.obsidian.discordbridge.wrappers.IPlayer
+import gg.obsidian.discordbridge.wrappers.IServer
 import net.dv8tion.jda.core.OnlineStatus
 import net.dv8tion.jda.core.entities.Member
 import net.dv8tion.jda.core.entities.MessageChannel
 import org.pegdown.PegDownProcessor
 import java.io.File
-import java.io.IOException
 import java.io.FileOutputStream
+import java.io.IOException
 import java.util.*
+import gg.obsidian.discordbridge.util.ChatColor as CC
 
 object DiscordBridge {
 
@@ -436,7 +440,7 @@ object DiscordBridge {
         return minecraftCommandControllerManager.dispatchMessage(MinecraftCommandWrapper(sender, commandName, args))
     }
 
-    fun getServerCommands(): List<BotControllerManager.Command> {
+    fun getServerCommands(): List<Command> {
         return minecraftCommandControllerManager.getCommands().values.toList()
     }
 
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/Command.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/Command.kt
new file mode 100644
index 0000000..6436de8
--- /dev/null
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/Command.kt
@@ -0,0 +1,32 @@
+package gg.obsidian.discordbridge.commands
+
+import java.lang.reflect.Method
+
+/**
+ * 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 squishExcessArgs whether this command should combine excess arguments into one
+ * @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 aliases: Array<String>,
+        val usage: String,
+        val description: String,
+        val help: String,
+        val parameters: List<Class<*>>,
+        val relayTriggerMessage: Boolean,
+        val squishExcessArgs: Boolean,
+        val ignoreExcessArgs: Boolean,
+        val isTagged: Boolean,
+        val isPrivate: Boolean,
+        val controllerClass: Class<*>,
+        val commandMethod: Method
+)
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/BotCommand.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/BotCommand.kt
index 766751f..9eaa291 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/BotCommand.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/BotCommand.kt
@@ -3,13 +3,20 @@ package gg.obsidian.discordbridge.commands.annotations
 /**
  * Annotates a function as a command the bot can run.
  *
+ * @param aliases an optional field to override the command's access name if it is not the same as the method name
  * @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 desc a short string that describes the command's function
  * @param relayTriggerMessage whether the message used to trigger this command should be relayed
  * @param squishExcessArgs if true, this command will put all extra args passed to it into a single string
  */
 @Target(AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.RUNTIME)
-annotation class BotCommand(val usage: String, val description: String, val name: String = "",
-                            val relayTriggerMessage: Boolean = true, val squishExcessArgs: Boolean = false)
+annotation class BotCommand(
+        val aliases: Array<String>,
+        val desc: String,
+        val usage: String = "",
+        val help: String = "",
+        val relayTriggerMessage: Boolean = true,
+        val squishExcessArgs: Boolean = false,
+        val ignoreExcessArgs: Boolean = false
+)
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
index 71db9c5..b299a63 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
@@ -65,7 +65,7 @@ class BotControllerManager {
      * @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 commandAliases = annotation.aliases
         val usage = annotation.usage
         val methodParameters = method.parameters
 
@@ -75,9 +75,9 @@ class BotControllerManager {
         val parameters = (1 until methodParameters.size).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.squishExcessArgs, isTagged, isPrivate, controllerClass, method)
-        commands.put(command.name, command)
+        val command = Command(commandAliases, usage, annotation.desc, annotation.help, parameters, annotation.relayTriggerMessage,
+                annotation.squishExcessArgs, annotation.ignoreExcessArgs, isTagged, isPrivate, controllerClass, method)
+        commands.put(command.aliases[0], command)
     }
 
     fun getCommands(): Map<String, Command> {
@@ -236,23 +236,23 @@ class BotControllerManager {
 
         when {
             // Check for permission
-            event is MinecraftChatEventWrapper && !event.player.hasPermission("discordbridge.${command.name}") -> {
+            event is MinecraftChatEventWrapper && !event.player.hasPermission("discordbridge.${command.aliases[0]}") -> {
                 commandRestricted(event)
                 return true
             }
-            event is MinecraftCommandWrapper && !event.sender.hasPermission("discordbridge.${command.name}") -> {
+            event is MinecraftCommandWrapper && !event.sender.hasPermission("discordbridge.${command.aliases[0]}") -> {
                 commandRestricted(event)
                 return true
             }
 
             // Short circuit "help"
-            command.name == "help" -> {
+            command.aliases[0] == "help" -> {
                 try {
                     val response = command.commandMethod.invoke(instances[command.controllerClass], event, commands, instances) as? String ?: return true
                     sendBotCommandOutput(event, command, response)
                     return true
                 } catch (e: IllegalArgumentException) {
-                    commandWrongParameterCount(event, command.name, command.usage, 2, command.parameters.size)
+                    commandWrongParameterCount(event, command.aliases[0], command.usage, 2, command.parameters.size)
                     return false
                 } catch (e: Exception) {
                     commandException(event, e)
@@ -271,8 +271,8 @@ class BotControllerManager {
             }
 
             // Fail if wrong number of arguments
-            squishedArgs.size != command.parameters.size -> {
-                commandWrongParameterCount(event, command.name, command.usage, squishedArgs.size, command.parameters.size)
+            !command.ignoreExcessArgs && squishedArgs.size != command.parameters.size -> {
+                commandWrongParameterCount(event, command.aliases[0], command.usage, squishedArgs.size, command.parameters.size)
                 return false
             }
         }
@@ -288,7 +288,7 @@ class BotControllerManager {
             try {
                 arguments[i + 1] = parseArgument(parameterClass, squishedArgs[i])
             } catch (ignored: IllegalArgumentException) {
-                commandWrongParameterType(event, command.name, command.usage, i, squishedArgs[i].javaClass, parameterClass)
+                commandWrongParameterType(event, command.aliases[0], command.usage, i, squishedArgs[i].javaClass, parameterClass)
                 return false
             }
         }
@@ -299,7 +299,7 @@ class BotControllerManager {
             sendBotCommandOutput(event, command, response)
             return true
         } catch (e: IllegalArgumentException) {
-            commandWrongParameterCount(event, command.name, command.usage, squishedArgs.size, command.parameters.size)
+            commandWrongParameterCount(event, command.aliases[0], command.usage, squishedArgs.size, command.parameters.size)
             return false
         } catch (e: Exception) {
             commandException(event, e)
@@ -600,134 +600,7 @@ class BotControllerManager {
      */
     private fun orPrefixHelp(): String = if (DiscordBridge.getConfig(Cfg.CONFIG).getString("command-prefix", "") != "") "or ${DiscordBridge.getConfig(Cfg.CONFIG).getString("command-prefix", "")}help " else ""
 
-    /**
-     * 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
-
     private inline fun <reified T : Any> List<HashMap<String, Any>>.castTo(factory: (HashMap<String, Any>) -> T): List<T> {
         return this.mapTo(mutableListOf()) { factory(it) }.toList()
     }
-
-    // =============================================
-    // =============== HELPER OBJECTS ==============
-
-    /**
-     * 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 squishExcessArgs whether this command should combine excess arguments into one
-     * @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,
-            val description: String,
-            val parameters: List<Class<*>>,
-            val relayTriggerMessage: Boolean,
-            val squishExcessArgs: Boolean,
-            val isTagged: Boolean,
-            val isPrivate: Boolean,
-            val controllerClass: Class<*>,
-            val commandMethod: Method
-    )
-
-    /**
-     * A simple list of all commands native to Minecraft, Bukkit, and Spigot
-     *
-     * TODO: Can this list be attained programmatically??
-     */
-    private object DefaultCommands {
-        val minecraft : List<String> = listOf(
-                "advancement",
-                "ban",
-                "blockdata",
-                "clear",
-                "clone",
-                //"data",
-                //"datapack",
-                "debug",
-                "defaultgamemode",
-                "deop",
-                "difficulty",
-                "effect",
-                "enchant",
-                "entitydata",
-                //"experience",
-                "execute",
-                "fill",
-                "function",
-                "gamemode",
-                "gamerule",
-                "give",
-                "help",
-                "kick",
-                "kill",
-                "list",
-                "locate",
-                "me",
-                "op",
-                "pardon",
-                "particle",
-                "playsound",
-                "publish",
-                "recipe",
-                "reload",
-                "replaceitem",
-                "save",
-                "say",
-                "scoreboard",
-                "seed",
-                "setblock",
-                "setidletimeout",
-                "setmaxplayers",
-                "setworldspawn",
-                "spawnpoint",
-                "spreadplayers",
-                "stats",
-                "stop",
-                "stopsound",
-                "summon",
-                "teleport",
-                "tell",
-                //"tag",
-                //"team",
-                "tellraw",
-                "testfor",
-                "testforblock",
-                "testforblocks",
-                "tickingarea",
-                "time",
-                "title",
-                "toggledownfall",
-                "tp",
-                "transferserver",
-                "trigger",
-                "weather",
-                "whitelist",
-                "worldborder",
-                "wsserver"
-        )
-
-        val bukkit : List<String> = listOf(
-                "version",
-                "plugins",
-                "help",
-                "reload",
-                "timings"
-        )
-
-        val spigot:List<String> = listOf(
-                "restart",
-                "tps"
-        )
-    }
 }
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt
index 39a8000..e438a89 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt
@@ -27,7 +27,12 @@ class FunCommandsController : IBotController {
      * @param event the incoming event object
      * @return the response string
      */
-    @BotCommand(name = "8ball", usage = "<question>", description = "Consult the Magic 8 Ball", squishExcessArgs = true)
+    @BotCommand(
+            aliases = ["8ball", "eightball", "8"],
+            usage = "<question>",
+            desc = "Consult the Magic 8 Ball",
+            ignoreExcessArgs = true
+    )
     @TaggedResponse
     private fun eightBall(event: IEventWrapper): String {
         DiscordBridge.logDebug("user ${event.senderName} consults the Magic 8-Ball")
@@ -43,14 +48,18 @@ class FunCommandsController : IBotController {
      * @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", squishExcessArgs = true)
+    @BotCommand(
+            aliases = ["choose"],
+            usage = "<option>, <option>, ... (delimiters include ',', 'or', '|')",
+            desc = "Have the bot choose between given options",
+            squishExcessArgs = true
+    )
     @TaggedResponse
     private fun choose(event: IEventWrapper, query: String): String {
         DiscordBridge.logDebug("user ${event.senderName} needs a choice made")
         val choices = query.split(", or ", " or ", ",", "|")
         val rand = Random().nextInt(choices.count())
-        return "I pick '${choices[rand]}'"
+        return "I pick '${choices[rand].trim()}'"
     }
 
     /**
@@ -59,11 +68,13 @@ class FunCommandsController : IBotController {
      * @param event the incoming event object
      * @return the response string
      */
-    @BotCommand(usage="", description = "Press F to pay respects")
+    @BotCommand(
+            aliases = ["f"],
+            desc = "Press F to pay respects"
+    )
     private fun f(event: IEventWrapper): String {
         DiscordBridge.logDebug("user ${event.senderName}} pays respects")
         var totalRespects = DiscordBridge.getConfig(Cfg.F).getInteger("total-respects", 0)
-        DiscordBridge.logger.info(DiscordBridge.getConfig(Cfg.F).getList<Any>("responses").toString())
         val responses = DiscordBridge.getConfig(Cfg.F).getList<LinkedHashMap<String, Any>>("responses").castTo({Respect(it)})
         val totalWeight = responses.sumBy { it.weight }
         var rand = Random().nextInt(totalWeight) + 1
@@ -98,7 +109,12 @@ class FunCommandsController : IBotController {
      * @param thingToInsult the target of the insult
      * @return the response string
      */
-    @BotCommand(usage="<thing to insult>", description = "Make the bot insult something for you", squishExcessArgs = true)
+    @BotCommand(
+            aliases = ["insult"],
+            usage = "<thing to insult>",
+            desc = "Make the bot insult something for you",
+            squishExcessArgs = true
+    )
     private fun insult(event: IEventWrapper, thingToInsult: String): String {
         DiscordBridge.logDebug("user ${event.senderName} requests an insult against '$thingToInsult'")
         val responses = DiscordBridge.getConfig(Cfg.INSULT).getList<String>("responses")
@@ -113,7 +129,12 @@ class FunCommandsController : IBotController {
      * @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", squishExcessArgs = true)
+    @BotCommand(
+            aliases = ["rate"],
+            usage = "<thing to be rated>",
+            desc = "Have the bot rate something for you",
+            squishExcessArgs = true
+    )
     @TaggedResponse
     private fun rate(event: IEventWrapper, thingToRate: String): String {
         DiscordBridge.logDebug("user ${event.senderName} requests a rating")
@@ -158,7 +179,11 @@ class FunCommandsController : IBotController {
      * @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")
+    @BotCommand(
+            aliases = ["roll"],
+            usage = "<sides>",
+            desc = "Roll a die for a random number"
+    )
     @TaggedResponse
     private fun roll(event: IEventWrapper, sides: Int): String {
         DiscordBridge.logDebug("user ${event.senderName} needs a choice made")
@@ -178,7 +203,12 @@ class FunCommandsController : IBotController {
      * @return the response string
      */
     @TaggedResponse
-    @BotCommand(usage="<say something>", description = "Say something to Cleverbot", squishExcessArgs = true)
+    @BotCommand(
+            aliases = ["talk", "cleverbot"],
+            usage = "<say something>",
+            desc = "Say something to Cleverbot",
+            squishExcessArgs = true
+    )
     private fun talk(event: IEventWrapper, query: String): String {
         DiscordBridge.logDebug("user ${event.senderName} invokes Cleverbot")
 
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
index 11c091b..8bbcef8 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
@@ -28,7 +28,11 @@ class UtilCommandsController : IBotController {
      * @param event the incoming event object
      * @return a status message if the event is type DiscordMessageWrapper and is sent via DM, null otherwise
      */
-    @BotCommand(usage="", description="Confirm an alias link request", relayTriggerMessage = false)
+    @BotCommand(
+            aliases = ["confirm"],
+            desc = "Confirm an alias link request",
+            relayTriggerMessage = false
+    )
     @DiscordExclusiveCommand
     @PrivateResponse
     private fun confirm(event: IEventWrapper): String? {
@@ -52,7 +56,11 @@ class UtilCommandsController : IBotController {
      * @param event the incoming event object
      * @return a status message if the event is type DiscordMessageWrapper and is sent via DM, null otherwise
      */
-    @BotCommand(usage="", description="Deny an alias link request", relayTriggerMessage = false)
+    @BotCommand(
+            aliases = ["deny"],
+            desc = "Deny an alias link request",
+            relayTriggerMessage = false
+    )
     @DiscordExclusiveCommand
     @PrivateResponse
     private fun deny(event: IEventWrapper): String? {
@@ -85,7 +93,13 @@ class UtilCommandsController : IBotController {
      * @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, squishExcessArgs = true)
+    @BotCommand(
+            aliases = ["discord"],
+            usage = "<reload|linkalias|listmembers|unlinkalias> [args...]",
+            desc = "For in-game functions",
+            relayTriggerMessage = false,
+            squishExcessArgs = true
+    )
     @MinecraftExclusiveCommand
     @PrivateResponse
     private fun discord(event: IEventWrapper, argString: String): String? {
@@ -186,10 +200,14 @@ class UtilCommandsController : IBotController {
      * @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)
+    @BotCommand(
+            aliases = ["help", "dbhelp"],
+            desc = "You just used it",
+            relayTriggerMessage = false
+    )
     @ChatExclusiveCommand
     @PrivateResponse
-    private fun help(event: IEventWrapper, commands: MutableMap<String, BotControllerManager.Command>,
+    private fun help(event: IEventWrapper, commands: MutableMap<String, Command>,
                      instances: Map<Class<out IBotController>, IBotController>) {
         DiscordBridge.logger.info("Entered 'help'")
         DiscordBridge.logDebug("user ${event.senderName} requested help")
@@ -200,9 +218,9 @@ class UtilCommandsController : IBotController {
                 var out: String
                 for (bc: IBotController in instances.values) {
                     out = bc.getDescription() + "\n```"
-                    commands.values.sortedBy { (name) -> name }
+                    commands.values.sortedBy { it.aliases[0] }
                             .filter { it.controllerClass == bc.javaClass }
-                            .forEach { out += "\n${it.name} ${it.usage}\n  ${it.description}\n" }
+                            .forEach { out += "\n${it.aliases[0]} ${it.usage}\n  ${it.description}\n" }
                     out += "```"
                     player.sendMessage(out)
                 }
@@ -215,9 +233,9 @@ class UtilCommandsController : IBotController {
                     var out: String
                     for (bc: IBotController in instances.values) {
                         out = bc.getDescription() + "\n```"
-                        commands.values.sortedBy { (name) -> name }
+                        commands.values.sortedBy { it.aliases[0] }
                                 .filter { it.controllerClass == bc.javaClass }
-                                .forEach { out += "\n${it.name} ${it.usage}\n  ${it.description}\n" }
+                                .forEach { out += "\n${it.aliases[0]} ${it.usage}\n  ${it.description}\n" }
                         out += "```"
                         p.sendMessage(out).queue()
                     }
@@ -233,8 +251,11 @@ class UtilCommandsController : IBotController {
      * @param event the incoming event object
      */
     @DiscordExclusiveCommand
-    @BotCommand(usage="", description = "List all Minecraft players currently online on the server",
-            relayTriggerMessage = false)
+    @BotCommand(
+            aliases = ["serverlist"],
+            desc = "List all Minecraft players currently online on the server",
+            relayTriggerMessage = false
+    )
     private fun serverList(event: IEventWrapper) {
         if (event !is DiscordMessageWrapper) return
         DiscordBridge.logDebug("user ${event.originalMessage.author.name} has requested a listing of online players")
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandWrapper.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandWrapper.kt
index 68d0861..c01f04b 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandWrapper.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandWrapper.kt
@@ -1,18 +1,18 @@
 package gg.obsidian.discordbridge.wrappers
 
-import gg.obsidian.discordbridge.commands.controllers.BotControllerManager
+import gg.obsidian.discordbridge.commands.Command
 import net.minecraft.command.CommandBase
 import net.minecraft.command.ICommand
 import net.minecraft.command.ICommandSender
 import net.minecraft.server.MinecraftServer
 
-class CommandWrapper(private val command: BotControllerManager.Command): CommandBase() {
+class CommandWrapper(private val command: Command): CommandBase() {
     override fun getUsage(sender: ICommandSender?): String {
-        return "/${command.name} ${command.usage}"
+        return "/$name ${command.usage}"
     }
 
     override fun getName(): String {
-        return command.name
+        return command.aliases[0]
     }
 
     override fun compareTo(other: ICommand?): Int {
@@ -20,16 +20,15 @@ class CommandWrapper(private val command: BotControllerManager.Command): Command
     }
 
     override fun checkPermission(server: MinecraftServer?, sender: ICommandSender?): Boolean {
+        // TODO
         return true
     }
 
     override fun getAliases(): MutableList<String> {
-        // TODO: Add support for command aliases
-        return mutableListOf()
+        return command.aliases.toMutableList()
     }
 
     override fun execute(server: MinecraftServer?, sender: ICommandSender?, args: Array<out String>?) {
         // Let the command listener handle this.
     }
-
 }
\ No newline at end of file
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
index a87809d..e385bca 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
@@ -1,5 +1,6 @@
 package gg.obsidian.discordbridge
 
+import gg.obsidian.discordbridge.commands.Command
 import gg.obsidian.discordbridge.util.unwrap
 import gg.obsidian.discordbridge.wrappers.CommandWrapper
 import gg.obsidian.discordbridge.wrappers.Player
@@ -43,7 +44,7 @@ class DiscordBridgePlugin {
         val mgr = Sponge.getCommandManager()
         for (c in DiscordBridge.getServerCommands()) {
             val wrap = CommandWrapper(c)
-            logger.info(mgr.register(this, wrap, c.name).isPresent.toString())
+            mgr.register(this, wrap, *c.aliases)
         }
     }
 
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandWrapper.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandWrapper.kt
index 71fb6ac..81cae35 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandWrapper.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandWrapper.kt
@@ -1,20 +1,20 @@
 package gg.obsidian.discordbridge.wrappers
 
 import gg.obsidian.discordbridge.DiscordBridge
-import gg.obsidian.discordbridge.commands.controllers.BotControllerManager
+import gg.obsidian.discordbridge.commands.Command
 import org.spongepowered.api.command.CommandCallable
 import org.spongepowered.api.command.CommandResult
 import org.spongepowered.api.command.CommandSource
-import org.spongepowered.api.entity.living.player.Player
+import org.spongepowered.api.entity.living.player.Player as SpongePlayer
 import org.spongepowered.api.text.Text
 import org.spongepowered.api.world.Location
 import org.spongepowered.api.world.World
 import java.util.*
 
-class CommandWrapper(private val command: BotControllerManager.Command): CommandCallable {
+class CommandWrapper(private val command: Command): CommandCallable {
     override fun process(source: CommandSource, arguments: String): CommandResult {
-        if (source is Player) {
-            DiscordBridge.handleCommand(gg.obsidian.discordbridge.wrappers.Player(source), command.name, arguments.split(" ").toTypedArray())
+        if (source is SpongePlayer) {
+            DiscordBridge.handleCommand(Player(source), command.aliases[0], arguments.split(" ").toTypedArray())
             return CommandResult.success()
         }
         return CommandResult.empty()

From 8cffacdc42a32f69b2cc6b20854e4292a036c852 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Mon, 5 Feb 2018 19:26:17 -0600
Subject: [PATCH 16/30] Make unknown commands fail silently

---
 .../controllers/BotControllerManager.kt       | 40 +------------------
 1 file changed, 2 insertions(+), 38 deletions(-)

diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
index b299a63..dbf858b 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
@@ -97,11 +97,7 @@ class BotControllerManager {
 
         // Short circuit if event was a Minecraft command
         if (event is MinecraftCommandWrapper) {
-            val command = commands[event.commandName]
-            if (command == null) {
-                commandNotFound(event, event.commandName)
-                return true
-            }
+            val command = commands[event.commandName] ?: return true
             return invokeBotCommand(command, controllers, event, event.args.asList().toTypedArray())
         }
 
@@ -208,10 +204,7 @@ class BotControllerManager {
                 if (invokeServerCommand(event, args)) return true
 
             if (defaultToTalk) command = commands["talk"]
-            if (command == null) {
-                commandNotFound(event, commandName)
-                return false
-            }
+            if (command == null) return false
         }
 
         val slicedArgs = if (args.size > 1) args.slice(1 until args.size).toTypedArray() else arrayOf()
@@ -426,30 +419,6 @@ class BotControllerManager {
     // =============================================
     // ============= Exception Handling ============
 
-    /**
-     * 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 DiscordMessageWrapper ->
-                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 MinecraftChatEventWrapper ->
-                event.player.sendMessage("${CC.ITALIC}${CC.GRAY}${DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
-                        "I don't seem to have a command called '$commandName'. " +
-                        "See '@${DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} help' ${orPrefixHelp()}for the commands I do have.")
-            is MinecraftCommandWrapper ->
-                event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
-                        "I don't seem to have a command called '$commandName'. " +
-                        "See '@${DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} help' ${orPrefixHelp()}for the commands I do have.")
-        }
-
-    }
-
     /**
      * Handler for when a command is invoked with the wrong number of parameters
      *
@@ -595,11 +564,6 @@ class BotControllerManager {
         }
     }
 
-    /**
-     * Shortcut method for adding "or <prefix>help " to the CommandNotFound output if a COMMAND_PREFIX is set in config
-     */
-    private fun orPrefixHelp(): String = if (DiscordBridge.getConfig(Cfg.CONFIG).getString("command-prefix", "") != "") "or ${DiscordBridge.getConfig(Cfg.CONFIG).getString("command-prefix", "")}help " else ""
-
     private inline fun <reified T : Any> List<HashMap<String, Any>>.castTo(factory: (HashMap<String, Any>) -> T): List<T> {
         return this.mapTo(mutableListOf()) { factory(it) }.toList()
     }

From bd3eb1a02e038332cca54a9d867ff3ba096e168f Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Mon, 5 Feb 2018 21:51:29 -0600
Subject: [PATCH 17/30] Add Multiverse-Core support to Bukkit version

---
 .../discordbridge/DiscordBridgePlugin.kt      |  7 +-
 .../obsidian/discordbridge/wrappers/World.kt  |  2 +-
 .../obsidian/discordbridge/DiscordBridge.kt   | 75 ++++++++++++-------
 .../controllers/BotControllerManager.kt       | 21 +++---
 4 files changed, 62 insertions(+), 43 deletions(-)

diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
index 8dea1c1..bffe798 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
@@ -13,10 +13,6 @@ class DiscordBridgePlugin : JavaPlugin() {
     private lateinit var instance: DiscordBridgePlugin
     private lateinit var logger: Logger
 
-    fun getPlugin() : DiscordBridgePlugin = instance
-
-    fun getSLF4JLogger(): Logger = logger
-
     override fun onLoad() {
         logger = LoggerFactory.getLogger("DiscordBrdige")
         logger.info("Loading DiscordBridge")
@@ -25,7 +21,8 @@ class DiscordBridgePlugin : JavaPlugin() {
     override fun onEnable() {
         logger.info("Enabling DiscordBridge")
         instance = this
-        DiscordBridge.init(Server(this, this.server), dataFolder)
+        val isMultiverse = server.pluginManager.getPlugin("Multiverse-Core") != null
+        DiscordBridge.init(Server(this, this.server), dataFolder, isMultiverse=isMultiverse)
 
         server.pluginManager.registerEvents(EventListener(), this)
 
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/World.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/World.kt
index a0d5935..5e72d6f 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/World.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/World.kt
@@ -4,7 +4,7 @@ import org.bukkit.World
 
 class World(val bukkitWorld: World) : IWorld {
     override fun getName(): String {
-        return "world"
+        return bukkitWorld.name
     }
 
 }
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
index 9090f14..5f0fb88 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
@@ -36,19 +36,23 @@ object DiscordBridge {
     private val discordChatControllerManager = BotControllerManager()
     private val minecraftCommandControllerManager = BotControllerManager()
     private val cfgNodes: MutableMap<Cfg, ConfigurationNode> = mutableMapOf()
-    private val isLoaded = false
     private lateinit var server: IServer
     lateinit var logger: ILogger
 
     // Temporary storage for alias linking requests
     var requests: MutableList<UserAlias> = mutableListOf()
 
-    fun init(server: IServer, dataFolder: File) {
+    // Whether Multiverse-Core is installed in Bukkit
+    var isMultiverse: Boolean = false
+        private set(value) { field = value }
+
+    lateinit var mvWorlds: ConfigurationNode
+
+    fun init(server: IServer, dataFolder: File, isMultiverse: Boolean = false) {
         this.server = server
         logger = this.server.getLogger()
 
         if (!dataFolder.exists()) dataFolder.mkdirs()
-
         for (c in Cfg.values()) {
             val filename = "${c.filename}.yml"
             val file = File(dataFolder, filename)
@@ -61,6 +65,12 @@ object DiscordBridge {
         server.getScheduler().runAsyncTask(Connection)
         UserAliasConfig.load()
 
+        if (isMultiverse) {
+            this.isMultiverse = true
+            mvWorlds = ConfigurationNode(File("plugins/Multiverse-Core/worlds.yml"))
+            mvWorlds.load().toString()
+        }
+
         minecraftChatControllerManager.registerController(FunCommandsController(), chatExclusive = true)
         minecraftChatControllerManager.registerController(UtilCommandsController(), chatExclusive = true)
         minecraftCommandControllerManager.registerController(FunCommandsController(), minecraftExclusive = true)
@@ -135,7 +145,7 @@ object DiscordBridge {
 
     fun reload(callback: Runnable) {
         for (cfg in cfgNodes.values) cfg.load()
-        //if (isMultiverseInstalled) worlds!!.reloadConfig()
+        if (isMultiverse) mvWorlds.load()
         UserAliasConfig.load()
         Connection.reconnect(callback)
     }
@@ -371,19 +381,22 @@ object DiscordBridge {
 
     fun handlePlayerJoin(player: IPlayer) {
         val username = player.getName()
-        val worldname = player.getWorld().getName()
+        var worldname = player.getWorld().getName()
         logDebug("Received a join event for $username")
         if (!getConfig(Cfg.CONFIG).getBoolean("messages.player-join", true)) return
         if (player.isVanished() && !getConfig(Cfg.CONFIG).getBoolean("if-vanished.player-join", false)) 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
-//        }
+        if (DiscordBridge.isMultiverse) {
+            val obj = DiscordBridge.mvWorlds.getObject("worlds.$worldname")
+            if (obj != null) {
+                val alias = (obj as Map<*, *>)["alias"]
+                if (alias is String && alias.isNotEmpty()) worldname = alias
+            }
+            else
+                DiscordBridge.logger.warning("Could not fetch world alias from config " +
+                        "(did you `/discord reload` yet?)")
+        }
 
         var formattedMessage = player.toDiscordPlayerJoin(worldname)
         formattedMessage = translateAliasesToDiscord(formattedMessage)
@@ -392,19 +405,22 @@ object DiscordBridge {
 
     fun handlePlayerQuit(player: IPlayer) {
         val username = player.getName()
-        val worldname = player.getWorld().getName()
+        var worldname = player.getWorld().getName()
         logDebug("Received a leave event for $username")
         if (!getConfig(Cfg.CONFIG).getBoolean("messages.player-leave", true)) return
         if (player.isVanished() && !getConfig(Cfg.CONFIG).getBoolean("if-vanished.player-leave", false)) 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
-//        }
+        if (DiscordBridge.isMultiverse) {
+            val obj = DiscordBridge.mvWorlds.getObject("worlds.$worldname")
+            if (obj != null) {
+                val alias = (obj as Map<*, *>)["alias"]
+                if (alias is String && alias.isNotEmpty()) worldname = alias
+            }
+            else
+                DiscordBridge.logger.warning("Could not fetch world alias from config " +
+                        "(did you `/discord reload` yet?)")
+        }
 
         var formattedMessage = player.toDiscordPlayerLeave(worldname)
         formattedMessage = translateAliasesToDiscord(formattedMessage)
@@ -413,19 +429,22 @@ object DiscordBridge {
 
     fun handlePlayerDeath(player: IPlayer, deathMessage: String) {
         val username = player.getName()
-        val worldname = player.getWorld().getName()
+        var worldname = player.getWorld().getName()
 
         if (!getConfig(Cfg.CONFIG).getBoolean("messages.player-death", false)) return
         if (player.isVanished() && !getConfig(Cfg.CONFIG).getBoolean("if-vanished.player-death", false)) 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
-//        }
+        if (DiscordBridge.isMultiverse) {
+            val obj = DiscordBridge.mvWorlds.getObject("worlds.$worldname")
+            if (obj != null) {
+                val alias = (obj as Map<*, *>)["alias"]
+                if (alias is String && alias.isNotEmpty()) worldname = alias
+            }
+            else
+                DiscordBridge.logger.warning("Could not fetch world alias from config " +
+                        "(did you `/discord reload` yet?)")
+        }
 
         var formattedMessage = deathMessage.toDiscordPlayerDeath(username, worldname)
         formattedMessage = translateAliasesToDiscord(formattedMessage)
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
index dbf858b..1165d94 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
@@ -385,17 +385,20 @@ class BotControllerManager {
     private fun relay(event: IEventWrapper, logIgnore: Boolean) {
         when (event) {
             is MinecraftChatEventWrapper -> {
-                val worldname = event.player.getWorld().getName()
+                var worldname = event.player.getWorld().getName()
+                DiscordBridge.logger.info(worldname)
 
-                // TODO
                 // Get world alias if Multiverse is installed
-//                if (DiscordBridge.isMultiverseInstalled) {
-//                    val worldProperties = DiscordBridge.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 (DiscordBridge.isMultiverse) {
+                    val obj = DiscordBridge.mvWorlds.getObject("worlds.$worldname")
+                    if (obj != null) {
+                        val alias = (obj as Map<*, *>)["alias"]
+                        if (alias is String && alias.isNotEmpty()) worldname = alias
+                    }
+                    else
+                        DiscordBridge.logger.warning("Could not fetch world alias from config " +
+                                "(did you `/discord reload` yet?)")
+                }
 
                 var formattedMessage = event.message.toDiscordChatMessage(event.senderName, worldname)
                 formattedMessage = DiscordBridge.convertAtMentions(formattedMessage)

From 390e1011c5532d4d26213411d111dd1cbd77cc93 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Mon, 5 Feb 2018 22:35:47 -0600
Subject: [PATCH 18/30] Add player chat message editing to Forge version

---
 .../main/kotlin/gg/obsidian/discordbridge/EventHandler.kt   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt
index f6770e3..a2c2c2e 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt
@@ -3,6 +3,7 @@ package gg.obsidian.discordbridge
 import gg.obsidian.discordbridge.wrappers.Player
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.entity.player.EntityPlayerMP
+import net.minecraft.util.text.TextComponentString
 import net.minecraftforge.event.CommandEvent
 import net.minecraftforge.event.ServerChatEvent
 import net.minecraftforge.event.entity.living.LivingDeathEvent
@@ -36,7 +37,10 @@ object EventHandler {
     @SubscribeEvent(priority = EventPriority.LOWEST)
     fun onPlayerChat(event: ServerChatEvent) {
         val p = event.player
-        if (p != null) DiscordBridge.handlePlayerChat(Player(p), event.message, event.isCanceled)
+        if (p != null) {
+            val message = DiscordBridge.handlePlayerChat(Player(p), event.message, event.isCanceled)
+            event.component = TextComponentString(event.component.unformattedText.replace(event.message, message))
+        }
     }
 
     // https://github.com/sk89q/WorldEdit/blob/85ef47ae0c2c02a5870b764ca4b0da0d9e01671f/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorldEdit.java

From 0e5721832485dfee9ae40f9315184c104540a3e1 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Mon, 5 Feb 2018 23:28:58 -0600
Subject: [PATCH 19/30] Add player chat message editing to Sponge version

---
 .../main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt | 5 ++---
 .../gg/obsidian/discordbridge/DiscordBridgePlugin.kt       | 7 ++++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
index 5f0fb88..40c677d 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
@@ -355,7 +355,7 @@ object DiscordBridge {
         if (player.isVanished() && !getConfig(Cfg.CONFIG).getBoolean("if-vanished.player-chat", false)) return message
 
         // Emoticons!
-        var newMessage = message.replace(":lenny:", "( \u0361\u00B0 \u035C\u0296 \u0361\u00B0)")
+        val newMessage = 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")
@@ -375,8 +375,7 @@ object DiscordBridge {
         //val wrapper = MinecraftChatEventWrapper(AsyncPlayerChatEvent(true, event.player, event.message, event.recipients))
         server.getScheduler().runAsyncTask(Runnable { minecraftChatControllerManager.dispatchMessage(MinecraftChatEventWrapper(player, newMessage)) })
 
-        newMessage = MarkdownToMinecraftSeralizer().toMinecraft(pegDownProc.parseMarkdown(newMessage.toCharArray()))
-        return newMessage
+        return MarkdownToMinecraftSeralizer().toMinecraft(pegDownProc.parseMarkdown(newMessage.toCharArray()))
     }
 
     fun handlePlayerJoin(player: IPlayer) {
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
index e385bca..907ebf3 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
@@ -20,6 +20,8 @@ import org.spongepowered.api.Sponge
 import org.spongepowered.api.event.game.state.GameStartedServerEvent
 import org.spongepowered.api.event.game.state.GameStartingServerEvent
 import org.spongepowered.api.event.game.state.GameStoppingServerEvent
+import org.spongepowered.api.event.message.MessageEvent
+import org.spongepowered.api.text.Text
 import javax.inject.Inject
 
 @Plugin(id = "discordbridge-obsidian", name = "DiscordBridge", version = "@VERSION")
@@ -78,7 +80,10 @@ class DiscordBridgePlugin {
     @Listener(order = Order.LAST)
     fun onPlayerChat(event: MessageChannelEvent.Chat) {
         val p = event.cause.first(org.spongepowered.api.entity.living.player.Player::class.java).unwrap()
-        if (p != null) DiscordBridge.handlePlayerChat(Player(p), event.rawMessage.toPlain(), event.isCancelled)
+        if (p != null) {
+            val msg = DiscordBridge.handlePlayerChat(Player(p), event.rawMessage.toPlain(), event.isCancelled)
+            event.setMessage(event.formatter.header.format(), Text.of(msg), event.formatter.footer.format())
+        }
     }
 
 

From c05eb76ea9cb24e348d59d187ad636ae4fe2e1a4 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Tue, 6 Feb 2018 00:29:02 -0600
Subject: [PATCH 20/30] Add relaying of attachments to all versions

---
 README.md                                     |   2 +-
 .../obsidian/discordbridge/wrappers/Server.kt |  16 +++
 .../obsidian/discordbridge/DiscordBridge.kt   |   5 +
 .../discordbridge/discord/Listener.kt         | 121 +++++++++++++++++-
 .../discordbridge/util/UrlAttachment.kt       |   7 +
 .../discordbridge/wrappers/IServer.kt         |   3 +
 .../obsidian/discordbridge/wrappers/Server.kt |  15 +++
 .../obsidian/discordbridge/wrappers/Server.kt |  15 +++
 8 files changed, 182 insertions(+), 2 deletions(-)
 create mode 100644 discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UrlAttachment.kt

diff --git a/README.md b/README.md
index 73abbc6..55b6e9e 100644
--- a/README.md
+++ b/README.md
@@ -113,6 +113,7 @@ templates:
 * 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`)
+* Uploaded images and other files in Discord will show up in Minecraft chat as clickable URLs
 * 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
@@ -158,7 +159,6 @@ templates:
 
 ## Upcoming Features
 
-* Add support for a URL shortening service so attachment URLs aren't so flipping long
 * 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!)
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
index 4135887..6f6ae2e 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
@@ -2,11 +2,27 @@ package gg.obsidian.discordbridge.wrappers
 
 import gg.obsidian.discordbridge.DiscordBridgePlugin
 import gg.obsidian.discordbridge.commands.DiscordCommandSender
+import gg.obsidian.discordbridge.util.UrlAttachment
+import net.md_5.bungee.api.chat.ClickEvent
+import net.md_5.bungee.api.chat.ComponentBuilder
+import net.md_5.bungee.api.chat.HoverEvent
 import org.bukkit.Bukkit
 import org.bukkit.Server
 import java.util.*
 
 class Server(val plugin: DiscordBridgePlugin, val bukkitServer: Server) : IServer {
+    override fun broadcastAttachment(att: UrlAttachment) {
+        val msg = ComponentBuilder("${att.sender} sent ")
+                .color(net.md_5.bungee.api.ChatColor.ITALIC)
+                .append("an attachment")
+                .color(net.md_5.bungee.api.ChatColor.RESET)
+                .color(net.md_5.bungee.api.ChatColor.UNDERLINE)
+                .event(ClickEvent(ClickEvent.Action.OPEN_URL, att.url))
+                .event(HoverEvent(HoverEvent.Action.SHOW_TEXT, ComponentBuilder(att.hoverText).create()))
+                .create()
+        bukkitServer.spigot().broadcast(*msg)
+    }
+
     override fun getScheduler(): IScheduler {
         return Scheduler(plugin, bukkitServer.scheduler)
     }
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
index 40c677d..6a2d837 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
@@ -9,6 +9,7 @@ import gg.obsidian.discordbridge.commands.controllers.UtilCommandsController
 import gg.obsidian.discordbridge.discord.Connection
 import gg.obsidian.discordbridge.util.Cfg
 import gg.obsidian.discordbridge.util.MarkdownToMinecraftSeralizer
+import gg.obsidian.discordbridge.util.UrlAttachment
 import gg.obsidian.discordbridge.util.UserAlias
 import gg.obsidian.discordbridge.util.UtilFunctions.noSpace
 import gg.obsidian.discordbridge.util.UtilFunctions.toDiscordChatMessage
@@ -142,6 +143,10 @@ object DiscordBridge {
         server.broadcastMessage(message)
     }
 
+    fun sendToMinecraft(att: UrlAttachment) {
+        server.broadcastAttachment(att)
+    }
+
 
     fun reload(callback: Runnable) {
         for (cfg in cfgNodes.values) cfg.load()
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
index 46faa0a..e8a285a 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
@@ -5,6 +5,9 @@ import gg.obsidian.discordbridge.commands.DiscordMessageWrapper
 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.util.Cfg
+import gg.obsidian.discordbridge.util.UrlAttachment
+import net.dv8tion.jda.core.entities.ChannelType
 import net.dv8tion.jda.core.events.message.MessageReceivedEvent
 import net.dv8tion.jda.core.hooks.ListenerAdapter
 
@@ -34,7 +37,123 @@ class Listener: ListenerAdapter() {
             return
         }
 
-        controllerManager.dispatchMessage(DiscordMessageWrapper(event.message))
+        // Handle attachments
+        if (event.message.attachments.isNotEmpty()) {
+            DiscordBridge.logDebug("Message has one or more attachments")
+
+            if (event.message.guild == Connection.server
+                    && event.message.isFromType(ChannelType.TEXT)
+                    && event.message.textChannel == Connection.getRelayChannel()) {
+
+                if (event.message.rawContent.isBlank()) {
+                    DiscordBridge.logDebug("Attachment message has no text; sending attachment only")
+                    processAttachments(event)
+                }
+                else {
+                    DiscordBridge.logDebug("Attachment message has text; sending attachments after initial text")
+                    controllerManager.dispatchMessage(DiscordMessageWrapper(event.message))
+                    processAttachments(event)
+                }
+            }
+        }
+
+        else controllerManager.dispatchMessage(DiscordMessageWrapper(event.message))
+    }
+
+    /**
+     * Takes the attachments on a Message and sends a clickable link to Minecraft for each one
+     *
+     * @param event the MessageRecievedEvent for the message
+     */
+    private fun processAttachments(event:MessageReceivedEvent) {
+        for (a in event.message.attachments) {
+            DiscordBridge.logDebug("Broadcasting attachment url from Discord to Minecraft as user ${event.author.name}")
+
+            val match = Regex("""^.*(\.\w*)$""").matchEntire(a.fileName)
+            val fileType = if (match != null)
+                when (match.groupValues[1].toLowerCase()) {
+                // Images
+                    ".jpg", ".jpeg" -> "JPEG image"
+                    ".png" -> "PNG image"
+                    ".bmp" -> "Bitmap image"
+                    ".gif" -> "GIF image"
+                    ".webp" -> "WebP image"
+
+                // Audio
+                    ".mp3" -> "MPEG-3 audio"
+                    ".ogg" -> "OGG Vorbis audio"
+                    ".m4a" -> "MPEG-4 audio"
+                    ".wav" -> "WAV audio"
+                    ".wma" -> "WMA audio"
+                    ".flac" -> "FLAC audio"
+
+                // Video
+                    ".mov" -> "QuickTime video (MOV)"
+                    ".mp4" -> "MPEG-4 video"
+                    ".webm" -> "WebM video"
+                    ".mkv" -> "Matroska video"
+                    ".flv" -> "Flash video"
+
+                // Text/data/programming
+                    ".txt" -> "Text file"
+                    ".yml", "yaml" -> "YAML file"
+                    ".html", ".htm" -> "HTML file"
+                    ".js" -> "JavaScript file"
+                    ".java" -> "Java file"
+                    ".cs" -> "C# file"
+                    ".py" -> "Python file"
+                    ".bat" -> "Batch file"
+
+                // Archives
+                    ".zip" -> "ZIP archive"
+                    ".rar" -> "RAR archive"
+                    ".7z" -> "7zip archive"
+                    ".tar" -> "Tarball"
+                    ".gz" -> "Gzip archive"
+                    ".jar" -> "Java archive"
+
+                // Other common types
+                    ".exe" -> "Executable file"
+                    ".pdf" -> "Adobe PDF file"
+                    ".doc" -> "Microsoft Word DOC file"
+                    ".docx" -> "Microsoft Word DOCX file"
+
+                // Minecraft types
+                    ".schematic" -> "MCEdit Schematic file"
+                    ".properties" -> "Minecraft server properties file"
+                    ".mcmeta" -> "Minecraft metadata file"
+                    ".dat" -> "NBT data file"
+
+                    else -> match.groupValues[1].toUpperCase().substring(1) + " file"
+                } else "unknown type"
+
+            val fileName = if (a.fileName.length > 34) a.fileName.substring(0..30)+"..." else a.fileName
+
+            val fileSize = when (a.size) {
+                in 0..1023 -> "${a.size} bytes"
+                in 1024..1048575 -> "${String.format("%.2f", a.size / 1024.0)} KiB"
+                in 1048576..1073741823 -> "${String.format("%.2f", a.size / 1048576.0)} MiB"
+                else -> "${String.format("%.2", a.size / 1073741824.0)} GiB"
+            }
+
+            var hoverText = "Name: $fileName\nType: $fileType\nSize: $fileSize"
+            if (a.isImage) hoverText += "\nDimensions: ${a.height}x${a.width}"
+
+            val senderName = DiscordBridge.translateAliasesToMinecraft(event.author.name)
+
+            val att = UrlAttachment(senderName, a.url, hoverText)
+
+//            val msg = ComponentBuilder(plugin.translateAliasesToMinecraft("${event.author.name} sent "))
+//                    .color(net.md_5.bungee.api.ChatColor.ITALIC)
+//                    .append("an attachment")
+//                    .color(net.md_5.bungee.api.ChatColor.RESET)
+//                    .color(net.md_5.bungee.api.ChatColor.UNDERLINE)
+//                    .event(ClickEvent(ClickEvent.Action.OPEN_URL, a.url))
+//                    .event(HoverEvent(HoverEvent.Action.SHOW_TEXT, ComponentBuilder(hoverText).create()))
+//                    .create()
+
+            DiscordBridge.sendToMinecraft(att)
+        }
     }
 
 }
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UrlAttachment.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UrlAttachment.kt
new file mode 100644
index 0000000..b504a67
--- /dev/null
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UrlAttachment.kt
@@ -0,0 +1,7 @@
+package gg.obsidian.discordbridge.util
+
+data class UrlAttachment(
+        val sender: String,
+        val url: String,
+        val hoverText: String
+)
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IServer.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IServer.kt
index 8a58ba9..c13e48e 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IServer.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IServer.kt
@@ -1,6 +1,7 @@
 package gg.obsidian.discordbridge.wrappers
 
 import gg.obsidian.discordbridge.commands.DiscordCommandSender
+import gg.obsidian.discordbridge.util.UrlAttachment
 import net.dv8tion.jda.core.entities.MessageChannel
 import java.util.*
 
@@ -20,6 +21,8 @@ interface IServer {
 
     fun broadcastMessage(message: String)
 
+    fun broadcastAttachment(att: UrlAttachment)
+
     fun dispatchCommand(sender: DiscordCommandSender, command: String)
 
     fun getLogger(): ILogger
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
index d2c1c40..9c2a990 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
@@ -2,13 +2,28 @@ package gg.obsidian.discordbridge.wrappers
 
 import gg.obsidian.discordbridge.DiscordBridgeForge
 import gg.obsidian.discordbridge.commands.DiscordCommandSender
+import gg.obsidian.discordbridge.util.UrlAttachment
 import net.dv8tion.jda.core.entities.MessageChannel
+import net.minecraft.util.text.TextComponentBase
 import net.minecraft.util.text.TextComponentString
+import net.minecraft.util.text.event.ClickEvent
+import net.minecraft.util.text.event.HoverEvent
 import net.minecraftforge.common.ForgeVersion
 import net.minecraftforge.fml.common.FMLCommonHandler
 import java.util.*
 
 class Server(private val mod: DiscordBridgeForge) : IServer {
+    override fun broadcastAttachment(att: UrlAttachment) {
+        val pt1 = TextComponentString("${att.sender} sent ")
+        pt1.style.italic = true
+        val pt2 = TextComponentString("an attachment")
+        pt2.style.underlined = true
+        pt2.style.clickEvent = ClickEvent(ClickEvent.Action.OPEN_URL, att.url)
+        pt2.style.hoverEvent = HoverEvent(HoverEvent.Action.SHOW_TEXT, TextComponentString(att.hoverText))
+
+        FMLCommonHandler.instance().minecraftServerInstance.playerList.sendMessage(pt1.appendSibling(pt2))
+    }
+
     override fun getScheduler(): IScheduler {
         return Scheduler()
     }
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
index 8d007fa..58a689f 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
@@ -2,13 +2,28 @@ package gg.obsidian.discordbridge.wrappers
 
 import gg.obsidian.discordbridge.DiscordBridgePlugin
 import gg.obsidian.discordbridge.commands.DiscordCommandSender
+import gg.obsidian.discordbridge.util.UrlAttachment
 import gg.obsidian.discordbridge.util.unwrap
 import org.spongepowered.api.Game
 import org.spongepowered.api.Sponge
 import org.spongepowered.api.text.Text
+import org.spongepowered.api.text.action.TextActions
+import org.spongepowered.api.text.format.TextStyles
+import java.net.URL
 import java.util.*
 
 class Server(private val plugin: DiscordBridgePlugin, private val game: Game) : IServer {
+    override fun broadcastAttachment(att: UrlAttachment) {
+        val msg = Text.builder("${att.sender} sent ").style(TextStyles.ITALIC).append(
+                    Text.builder("an attachment")
+                        .style(TextStyles.UNDERLINE)
+                        .onClick(TextActions.openUrl(URL(att.url)))
+                        .onHover(TextActions.showText(Text.of(att.hoverText)))
+                        .build()
+        ).build()
+        Sponge.getServer().broadcastChannel.send(msg)
+    }
+
     override fun getScheduler(): IScheduler {
         return Scheduler(plugin, game)
     }

From 031438f3b5e2c0f88653acfbe0a64f48fb6b6374 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Tue, 6 Feb 2018 13:44:56 -0600
Subject: [PATCH 21/30] Clean up gradle build files

>tfw you finally (somewhat) understand Gradle black magic
---
 build.gradle                      | 59 ++++++++++++-------------------
 discordbridge-bukkit/build.gradle | 28 ++-------------
 discordbridge-core/build.gradle   | 20 +++--------
 discordbridge-forge/build.gradle  | 16 ++-------
 discordbridge-sponge/build.gradle | 11 ------
 5 files changed, 31 insertions(+), 103 deletions(-)

diff --git a/build.gradle b/build.gradle
index b5854cf..c9495d0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 
 buildscript {
-    ext.kotlin_version = '1.2.0'
+    ext.kotlin_version = '1.2.10'
 
     repositories {
         mavenCentral()
@@ -9,38 +9,16 @@ buildscript {
         jcenter()
     }
 
-    configurations.all {
-        resolutionStrategy {
-            force 'org.ow2.asm:asm:6.0_BETA'
-        }
-    }
-
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.4'
     }
-}
 
-allprojects {
-    group = 'gg.obsidian'
-    version = '3.1.0'
-    description = """Bridge chat between Minecraft and Discord"""
-    ext.url = 'https://github.com/the-obsidian/DiscordBridge'
-}
-
-apply plugin: 'java'
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    compile project('discordbridge-bukkit')
-    compile project('discordbridge-core')
-}
-
-sourceSets {
-    main.java.srcDirs += 'src/main/kotlin'
+    configurations.all {
+        resolutionStrategy {
+            force 'org.ow2.asm:asm:6.0_BETA'
+        }
+    }
 }
 
 subprojects {
@@ -48,6 +26,14 @@ subprojects {
     apply plugin: 'kotlin'
     apply plugin: 'com.github.johnrengelman.shadow'
 
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+    }
+
+    group = 'gg.obsidian'
+    version = '3.1.0'
+    description = """Bridge chat between Minecraft and Discord"""
+    ext.url = 'https://github.com/the-obsidian/DiscordBridge'
     processResources {
         filter ReplaceTokens, tokens: [
                 'DESCRIPTION': project.property('description'),
@@ -56,10 +42,18 @@ subprojects {
         ]
     }
 
+    repositories {
+        maven { url 'https://github.com/DV8FromTheWorld/Maven-Repository/raw/master/repo' }
+        jcenter()
+    }
+
+    dependencies {
+        compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    }
+
     shadowJar {
         classifier = null
         dependencies {
-            include(dependency("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"))
             include(dependency('net.dv8tion:JDA:3.3.1_286'))
             include(dependency(group: 'org.yaml', name: 'snakeyaml', version: '1.19'))
             include(dependency(group: 'org.pegdown', name:'pegdown', version: '1.6.0'))
@@ -67,19 +61,12 @@ subprojects {
             include(dependency(group: 'com.michaelwflaherty', name: 'cleverbotapi', version: '1.0.1'))
             include(dependency('org.parboiled:parboiled-core'))
             include(dependency('org.parboiled:parboiled-java'))
-            //include(dependency('org.ow2.asm:asm'))
-            //include(dependency('org.ow2.asm:asm-analysis'))
-            //include(dependency('org.ow2.asm:asm-tree'))
-            //include(dependency('org.ow2.asm:asm-util'))
             include(dependency('com.squareup.okhttp3:okhttp:'))
             include(dependency('com.squareup.okio:okio'))
             include(dependency('com.neovisionaries:nv-websocket-client'))
             include(dependency('org.slf4j:slf4j-api'))
             include(dependency('org.json:json'))
         }
-
-        relocate 'org.parboiled:parboiled-core', "gg.obsidian.discordbridge.shadow.parboiled-core"
-        relocate 'org.parboiled:parboiled-java', "gg.obsidian.discordbridge.shadow.parboiled-java"
     }
 
 }
\ No newline at end of file
diff --git a/discordbridge-bukkit/build.gradle b/discordbridge-bukkit/build.gradle
index b1d4647..70fb609 100644
--- a/discordbridge-bukkit/build.gradle
+++ b/discordbridge-bukkit/build.gradle
@@ -1,26 +1,16 @@
-apply plugin: 'kotlin'
-
 repositories {
     mavenCentral()
     maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
     maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
-    maven { url 'https://github.com/DV8FromTheWorld/Maven-Repository/raw/master/repo' }
-    jcenter()
 }
 
 dependencies {
     compile project(':discordbridge-core')
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     compile group: 'org.spigotmc', name: 'spigot-api', version: '1.12-R0.1-SNAPSHOT'
     compile (group: 'org.pegdown', name:'pegdown', version: '1.6.0')
-
     compile files('../libraries/dynmap-api-2.5-SNAPSHOT.jar')
 }
 
-sourceSets {
-    main.java.srcDirs += 'src/main/kotlin'
-}
-
 shadowJar {
     dependencies {
         include(project(':discordbridge-core'))
@@ -30,24 +20,10 @@ shadowJar {
         include(dependency('org.ow2.asm:asm-tree'))
         include(dependency('org.ow2.asm:asm-util'))
     }
+    relocate 'org.json', 'shadow.json'
 }
 build.dependsOn(shadowJar)
 
 artifacts {
     archives shadowJar
-}
-
-//
-//compileKotlin {
-//    kotlinOptions.jvmTarget = "1.8"
-//}
-//compileTestKotlin {
-//    kotlinOptions.jvmTarget = "1.8"
-//}
-//
-//shadowJar {
-//    dependencies {
-//        include(project(':discordbridge-core'))
-//    }
-//}
-//build.dependsOn(shadowJar)
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/discordbridge-core/build.gradle b/discordbridge-core/build.gradle
index 1cc004e..5757d19 100644
--- a/discordbridge-core/build.gradle
+++ b/discordbridge-core/build.gradle
@@ -1,13 +1,8 @@
-apply plugin: 'kotlin'
-
 repositories {
     mavenCentral()
-    maven { url 'https://github.com/DV8FromTheWorld/Maven-Repository/raw/master/repo' }
-    jcenter()
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     compile group: 'net.dv8tion', name: 'JDA', version: '3.3.1_286'
     compile group: 'org.yaml', name: 'snakeyaml', version: '1.19'
     compile (group: 'org.pegdown', name:'pegdown', version: '1.6.0') {
@@ -18,15 +13,8 @@ dependencies {
     compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
 }
 
-sourceSets {
-    main.java.srcDirs += 'src/main/kotlin'
+shadowJar {
+    dependencies {
+    }
 }
-
-build.dependsOn(shadowJar)
-//
-//compileKotlin {
-//    kotlinOptions.jvmTarget = "1.8"
-//}
-//compileTestKotlin {
-//    kotlinOptions.jvmTarget = "1.8"
-//}
\ No newline at end of file
+build.dependsOn(shadowJar)
\ No newline at end of file
diff --git a/discordbridge-forge/build.gradle b/discordbridge-forge/build.gradle
index e519cf7..31f5ef1 100644
--- a/discordbridge-forge/build.gradle
+++ b/discordbridge-forge/build.gradle
@@ -8,17 +8,11 @@ buildscript {
     }
 }
 apply plugin: 'net.minecraftforge.gradle.forge'
-apply plugin: 'kotlin'
-//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 
-
-version = "2.0"
-group = "gg.obsidian.discordbridge-o" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "discordbridge-o"
 
 sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
 compileJava {
-
     sourceCompatibility = targetCompatibility = '1.8'
 }
 
@@ -35,15 +29,8 @@ minecraft {
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
 }
 
-repositories {
-    maven { url 'https://github.com/DV8FromTheWorld/Maven-Repository/raw/master/repo' }
-    jcenter()
-}
-
 dependencies {
     compile project(':discordbridge-core')
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-
 }
 
 processResources {
@@ -66,8 +53,9 @@ processResources {
 }
 
 shadowJar {
+    include ':discordbridge-core'
     dependencies {
-        include(project(':discordbridge-core'))
+        include(dependency("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"))
     }
 }
 build.dependsOn(shadowJar)
diff --git a/discordbridge-sponge/build.gradle b/discordbridge-sponge/build.gradle
index 5f1d54a..132f6ca 100644
--- a/discordbridge-sponge/build.gradle
+++ b/discordbridge-sponge/build.gradle
@@ -1,22 +1,11 @@
-apply plugin: 'kotlin'
-
 repositories {
     mavenCentral()
-    maven { url 'https://github.com/DV8FromTheWorld/Maven-Repository/raw/master/repo' }
     maven { url 'http://repo.spongepowered.org/Sponge/maven/' }
-    jcenter()
 }
 
 dependencies {
     compile project(':discordbridge-core')
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     compile "org.spongepowered:spongeapi:6.0.0"
-
-    compile files('../libraries/dynmap-api-2.5-SNAPSHOT.jar')
-}
-
-sourceSets {
-    main.java.srcDirs += 'src/main/kotlin'
 }
 
 shadowJar {

From e24fb4d561349dd770ece4a572cd105d3fc2b44b Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Tue, 6 Feb 2018 16:11:22 -0600
Subject: [PATCH 22/30] Rename and restructure files to reduce ambiguity

---
 ...BridgePlugin.kt => BukkitDiscordBridge.kt} |  8 ++---
 ...ordRConConsoleSource.kt => DiscordRCon.kt} |  4 +--
 .../obsidian/discordbridge/EventListener.kt   | 16 +++++-----
 .../{Command.kt => DbBukkitCommand.kt}        |  2 +-
 ...soleSender.kt => DbBukkitConsoleSender.kt} |  2 +-
 .../wrappers/{Logger.kt => DbBukkitLogger.kt} |  2 +-
 .../wrappers/{Player.kt => DbBukkitPlayer.kt} |  6 ++--
 .../{Scheduler.kt => DbBukkitScheduler.kt}    |  4 +--
 .../wrappers/{Server.kt => DbBukkitServer.kt} | 27 ++++++++---------
 .../wrappers/{World.kt => DbBukkitWorld.kt}   |  2 +-
 .../src/main/resources/plugin.yml             |  2 +-
 .../obsidian/discordbridge/DiscordBridge.kt   | 28 +++++++++---------
 .../commands/MinecraftChatEventWrapper.kt     |  4 +--
 .../commands/MinecraftCommandWrapper.kt       | 10 +++----
 .../controllers/UtilCommandsController.kt     | 10 +++----
 .../discordbridge/util/UtilFunctions.kt       |  6 ++--
 .../discordbridge/wrappers/IConsoleSender.kt  |  4 ---
 .../wrappers/{IWorld.kt => IDbCommand.kt}     |  2 +-
 ...{ICommandSender.kt => IDbCommandSender.kt} |  2 +-
 .../wrappers/IDbConsoleSender.kt              |  4 +++
 .../wrappers/{ILogger.kt => IDbLogger.kt}     |  2 +-
 .../wrappers/{IPlayer.kt => IDbPlayer.kt}     |  4 +--
 .../{IScheduler.kt => IDbScheduler.kt}        |  2 +-
 .../wrappers/{IServer.kt => IDbServer.kt}     | 13 ++++-----
 .../wrappers/{ICommand.kt => IDbWorld.kt}     |  2 +-
 .../{wrappers => }/CommandWrapper.kt          |  2 +-
 ...ordRConConsoleSource.kt => DiscordRCon.kt} |  4 +--
 .../gg/obsidian/discordbridge/EventHandler.kt | 12 ++++----
 ...rdBridgeForge.kt => ForgeDiscordBridge.kt} | 11 ++++---
 ...nderWrapper.kt => DbForgeCommandSender.kt} |  2 +-
 ...nsoleSender.kt => DbForgeConsoleSender.kt} |  2 +-
 .../wrappers/{Logger.kt => DbForgeLogger.kt}  |  2 +-
 .../wrappers/{Player.kt => DbForgePlayer.kt}  |  6 ++--
 .../{Scheduler.kt => DbForgeScheduler.kt}     |  2 +-
 .../wrappers/{Server.kt => DbForgeServer.kt}  | 29 +++++++++----------
 .../wrappers/{World.kt => DbForgeWorld.kt}    |  2 +-
 .../{wrappers => }/CommandWrapper.kt          |  6 ++--
 ...ordRconConsoleSource.kt => DiscordRcon.kt} |  4 +--
 ...BridgePlugin.kt => SpongeDiscordBridge.kt} | 24 +++++++--------
 .../discordbridge/wrappers/Command.kt         |  2 --
 .../discordbridge/wrappers/ConsoleSender.kt   |  2 --
 .../wrappers/{Logger.kt => DbSpongeLogger.kt} |  2 +-
 .../wrappers/{Player.kt => DbSpongePlayer.kt} |  6 ++--
 .../{Scheduler.kt => DbSpongeScheduler.kt}    |  4 +--
 .../wrappers/{Server.kt => DbSpongeServer.kt} | 27 ++++++++---------
 .../wrappers/{World.kt => DbSpongeWorld.kt}   |  2 +-
 46 files changed, 156 insertions(+), 165 deletions(-)
 rename discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/{DiscordBridgePlugin.kt => BukkitDiscordBridge.kt} (82%)
 rename discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/{wrappers/DiscordRConConsoleSource.kt => DiscordRCon.kt} (93%)
 rename discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/{Command.kt => DbBukkitCommand.kt} (72%)
 rename discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/{ConsoleSender.kt => DbBukkitConsoleSender.kt} (85%)
 rename discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/{Logger.kt => DbBukkitLogger.kt} (90%)
 rename discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/{Player.kt => DbBukkitPlayer.kt} (80%)
 rename discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/{Scheduler.kt => DbBukkitScheduler.kt} (58%)
 rename discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/{Server.kt => DbBukkitServer.kt} (64%)
 rename discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/{World.kt => DbBukkitWorld.kt} (71%)
 delete mode 100644 discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IConsoleSender.kt
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/{IWorld.kt => IDbCommand.kt} (75%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/{ICommandSender.kt => IDbCommandSender.kt} (87%)
 create mode 100644 discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbConsoleSender.kt
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/{ILogger.kt => IDbLogger.kt} (94%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/{IPlayer.kt => IDbPlayer.kt} (51%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/{IScheduler.kt => IDbScheduler.kt} (76%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/{IServer.kt => IDbServer.kt} (61%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/{ICommand.kt => IDbWorld.kt} (77%)
 rename discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => }/CommandWrapper.kt (95%)
 rename discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/{wrappers/DiscordRConConsoleSource.kt => DiscordRCon.kt} (70%)
 rename discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/{DiscordBridgeForge.kt => ForgeDiscordBridge.kt} (80%)
 rename discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/{CommandSenderWrapper.kt => DbForgeCommandSender.kt} (85%)
 rename discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/{ConsoleSender.kt => DbForgeConsoleSender.kt} (88%)
 rename discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/{Logger.kt => DbForgeLogger.kt} (89%)
 rename discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/{Player.kt => DbForgePlayer.kt} (82%)
 rename discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/{Scheduler.kt => DbForgeScheduler.kt} (76%)
 rename discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/{Server.kt => DbForgeServer.kt} (71%)
 rename discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/{World.kt => DbForgeWorld.kt} (72%)
 rename discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => }/CommandWrapper.kt (86%)
 rename discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/{wrappers/DiscordRconConsoleSource.kt => DiscordRcon.kt} (92%)
 rename discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/{DiscordBridgePlugin.kt => SpongeDiscordBridge.kt} (74%)
 delete mode 100644 discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Command.kt
 delete mode 100644 discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ConsoleSender.kt
 rename discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/{Logger.kt => DbSpongeLogger.kt} (89%)
 rename discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/{Player.kt => DbSpongePlayer.kt} (81%)
 rename discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/{Scheduler.kt => DbSpongeScheduler.kt} (59%)
 rename discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/{Server.kt => DbSpongeServer.kt} (66%)
 rename discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/{World.kt => DbSpongeWorld.kt} (71%)

diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/BukkitDiscordBridge.kt
similarity index 82%
rename from discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
rename to discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/BukkitDiscordBridge.kt
index bffe798..191488a 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/BukkitDiscordBridge.kt
@@ -1,6 +1,6 @@
 package gg.obsidian.discordbridge
 
-import gg.obsidian.discordbridge.wrappers.Server
+import gg.obsidian.discordbridge.wrappers.DbBukkitServer
 import org.bukkit.plugin.java.JavaPlugin
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
@@ -8,9 +8,9 @@ import org.slf4j.LoggerFactory
 /**
  * The primary Plugin class that maintains the plugin's connection with Bukkit
  */
-class DiscordBridgePlugin : JavaPlugin() {
+class BukkitDiscordBridge : JavaPlugin() {
 
-    private lateinit var instance: DiscordBridgePlugin
+    private lateinit var instance: BukkitDiscordBridge
     private lateinit var logger: Logger
 
     override fun onLoad() {
@@ -22,7 +22,7 @@ class DiscordBridgePlugin : JavaPlugin() {
         logger.info("Enabling DiscordBridge")
         instance = this
         val isMultiverse = server.pluginManager.getPlugin("Multiverse-Core") != null
-        DiscordBridge.init(Server(this, this.server), dataFolder, isMultiverse=isMultiverse)
+        DiscordBridge.init(DbBukkitServer(this, this.server), dataFolder, isMultiverse=isMultiverse)
 
         server.pluginManager.registerEvents(EventListener(), this)
 
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DiscordRConConsoleSource.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordRCon.kt
similarity index 93%
rename from discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DiscordRConConsoleSource.kt
rename to discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordRCon.kt
index 5a7f71a..136c403 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DiscordRConConsoleSource.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordRCon.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge
 
 import gg.obsidian.discordbridge.commands.DiscordCommandSender
 import org.bukkit.Server
@@ -10,7 +10,7 @@ import org.bukkit.permissions.PermissionAttachment
 import org.bukkit.permissions.PermissionAttachmentInfo
 import org.bukkit.plugin.Plugin
 
-class DiscordRConConsoleSource(val discordSender: DiscordCommandSender, val base: ConsoleCommandSender) : RemoteConsoleCommandSender {
+class DiscordRCon(val discordSender: DiscordCommandSender, val base: ConsoleCommandSender) : RemoteConsoleCommandSender {
 
     override fun sendMessage(message: String) {
         discordSender.sendMessage(message)
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
index cfd9f64..0580694 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
@@ -1,7 +1,7 @@
 package gg.obsidian.discordbridge
 
-import gg.obsidian.discordbridge.wrappers.ConsoleSender
-import gg.obsidian.discordbridge.wrappers.Player
+import gg.obsidian.discordbridge.wrappers.DbBukkitConsoleSender
+import gg.obsidian.discordbridge.wrappers.DbBukkitPlayer
 import org.bukkit.Bukkit
 import org.bukkit.command.Command
 import org.bukkit.command.CommandExecutor
@@ -19,31 +19,31 @@ class EventListener: Listener, CommandExecutor {
 
     override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array<out String>): Boolean {
         return if (sender is org.bukkit.entity.Player) {
-            val wp = Player(sender)
+            val wp = DbBukkitPlayer(sender)
             DiscordBridge.handleCommand(wp, command.name, args)
         } else {
-            DiscordBridge.handleCommand(ConsoleSender(Bukkit.getConsoleSender()), command.name, args)
+            DiscordBridge.handleCommand(DbBukkitConsoleSender(Bukkit.getConsoleSender()), command.name, args)
         }
     }
 
     @EventHandler
     fun onChat(event: AsyncPlayerChatEvent) {
-        event.message = DiscordBridge.handlePlayerChat(Player(event.player), event.message, event.isCancelled)
+        event.message = DiscordBridge.handlePlayerChat(DbBukkitPlayer(event.player), event.message, event.isCancelled)
     }
 
     @EventHandler
     fun onPlayerJoin(event: PlayerJoinEvent) {
-        DiscordBridge.handlePlayerJoin(Player(event.player))
+        DiscordBridge.handlePlayerJoin(DbBukkitPlayer(event.player))
     }
 
     @EventHandler
     fun onPlayerLeave(event: PlayerQuitEvent) {
-        DiscordBridge.handlePlayerQuit(Player(event.player))
+        DiscordBridge.handlePlayerQuit(DbBukkitPlayer(event.player))
     }
 
     @EventHandler
     fun onPlayerDeath(event: PlayerDeathEvent) {
-        DiscordBridge.handlePlayerDeath(Player(event.entity.player), event.deathMessage)
+        DiscordBridge.handlePlayerDeath(DbBukkitPlayer(event.entity.player), event.deathMessage)
     }
 
     @EventHandler(priority = EventPriority.MONITOR)
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Command.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitCommand.kt
similarity index 72%
rename from discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Command.kt
rename to discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitCommand.kt
index 11fe0f2..8bdcf89 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Command.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitCommand.kt
@@ -2,7 +2,7 @@ package gg.obsidian.discordbridge.wrappers
 
 import org.bukkit.command.Command
 
-class Command(val cmd: Command) : ICommand {
+class DbBukkitCommand(val cmd: Command) : IDbCommand {
     override fun getName(): String {
         return cmd.name
     }
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ConsoleSender.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitConsoleSender.kt
similarity index 85%
rename from discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ConsoleSender.kt
rename to discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitConsoleSender.kt
index 03c2ce4..28b52ae 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ConsoleSender.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitConsoleSender.kt
@@ -3,7 +3,7 @@ package gg.obsidian.discordbridge.wrappers
 import org.bukkit.command.ConsoleCommandSender
 import java.util.*
 
-class ConsoleSender(val bukkitConsoleSender: ConsoleCommandSender) : IConsoleSender {
+class DbBukkitConsoleSender(val bukkitConsoleSender: ConsoleCommandSender) : IDbConsoleSender {
 
     override fun sendMessage(message: String) {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Logger.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitLogger.kt
similarity index 90%
rename from discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Logger.kt
rename to discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitLogger.kt
index b2dd485..d5ed756 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Logger.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitLogger.kt
@@ -3,7 +3,7 @@ package gg.obsidian.discordbridge.wrappers
 import java.util.logging.Level
 import java.util.logging.Logger
 
-class Logger(private val logger: Logger) : ILogger {
+class DbBukkitLogger(private val logger: Logger) : IDbLogger {
     override fun info(message: String) {
         logger.info(message)
     }
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Player.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitPlayer.kt
similarity index 80%
rename from discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Player.kt
rename to discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitPlayer.kt
index c8ec073..4c9fe69 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Player.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitPlayer.kt
@@ -3,13 +3,13 @@ package gg.obsidian.discordbridge.wrappers
 import org.bukkit.entity.Player
 import java.util.*
 
-class Player(val bukkitPlayer: Player) : IPlayer {
+class DbBukkitPlayer(val bukkitPlayer: Player) : IDbPlayer {
     override fun hasPermission(permission: String): Boolean {
         return bukkitPlayer.hasPermission(permission)
     }
 
-    override fun getWorld(): IWorld {
-        return World(bukkitPlayer.world)
+    override fun getWorld(): IDbWorld {
+        return DbBukkitWorld(bukkitPlayer.world)
     }
 
     override fun isVanished(): Boolean {
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Scheduler.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitScheduler.kt
similarity index 58%
rename from discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Scheduler.kt
rename to discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitScheduler.kt
index ce8726b..549c88f 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Scheduler.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitScheduler.kt
@@ -1,9 +1,9 @@
 package gg.obsidian.discordbridge.wrappers
 
-import gg.obsidian.discordbridge.DiscordBridgePlugin
+import gg.obsidian.discordbridge.BukkitDiscordBridge
 import org.bukkit.scheduler.BukkitScheduler
 
-class Scheduler(val plugin: DiscordBridgePlugin, val bukkitScheduler: BukkitScheduler) : IScheduler {
+class DbBukkitScheduler(val plugin: BukkitDiscordBridge, val bukkitScheduler: BukkitScheduler) : IDbScheduler {
 
     override fun runAsyncTask(task: Runnable) {
         Thread(task).start()
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitServer.kt
similarity index 64%
rename from discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
rename to discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitServer.kt
index 6f6ae2e..60e46b8 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitServer.kt
@@ -1,6 +1,7 @@
 package gg.obsidian.discordbridge.wrappers
 
-import gg.obsidian.discordbridge.DiscordBridgePlugin
+import gg.obsidian.discordbridge.BukkitDiscordBridge
+import gg.obsidian.discordbridge.DiscordRCon
 import gg.obsidian.discordbridge.commands.DiscordCommandSender
 import gg.obsidian.discordbridge.util.UrlAttachment
 import net.md_5.bungee.api.chat.ClickEvent
@@ -10,7 +11,7 @@ import org.bukkit.Bukkit
 import org.bukkit.Server
 import java.util.*
 
-class Server(val plugin: DiscordBridgePlugin, val bukkitServer: Server) : IServer {
+class DbBukkitServer(val plugin: BukkitDiscordBridge, val bukkitServer: Server) : IDbServer {
     override fun broadcastAttachment(att: UrlAttachment) {
         val msg = ComponentBuilder("${att.sender} sent ")
                 .color(net.md_5.bungee.api.ChatColor.ITALIC)
@@ -23,8 +24,8 @@ class Server(val plugin: DiscordBridgePlugin, val bukkitServer: Server) : IServe
         bukkitServer.spigot().broadcast(*msg)
     }
 
-    override fun getScheduler(): IScheduler {
-        return Scheduler(plugin, bukkitServer.scheduler)
+    override fun getScheduler(): IDbScheduler {
+        return DbBukkitScheduler(plugin, bukkitServer.scheduler)
     }
 
     override fun getVersion(): String {
@@ -35,16 +36,16 @@ class Server(val plugin: DiscordBridgePlugin, val bukkitServer: Server) : IServe
         return bukkitServer.bukkitVersion.split("-")[0]
     }
 
-    override fun getPlayer(uuid: UUID): IPlayer? {
-        return Player(bukkitServer.getPlayer(uuid))
+    override fun getPlayer(uuid: UUID): IDbPlayer? {
+        return DbBukkitPlayer(bukkitServer.getPlayer(uuid))
     }
 
-    override fun getPlayer(name: String): IPlayer? {
-        return Player(bukkitServer.getPlayer(name))
+    override fun getPlayer(name: String): IDbPlayer? {
+        return DbBukkitPlayer(bukkitServer.getPlayer(name))
     }
 
-    override fun getOnlinePlayers(): List<IPlayer> {
-        return bukkitServer.onlinePlayers.map { Player(it) }
+    override fun getOnlinePlayers(): List<IDbPlayer> {
+        return bukkitServer.onlinePlayers.map { DbBukkitPlayer(it) }
     }
 
     override fun broadcastMessage(message: String) {
@@ -52,12 +53,12 @@ class Server(val plugin: DiscordBridgePlugin, val bukkitServer: Server) : IServe
     }
 
     override fun dispatchCommand(sender: DiscordCommandSender, command: String) {
-        val rcon = DiscordRConConsoleSource(sender, Bukkit.getServer().consoleSender)
+        val rcon = DiscordRCon(sender, Bukkit.getServer().consoleSender)
         bukkitServer.dispatchCommand(rcon, command)
     }
 
-    override fun getLogger(): ILogger {
-        return Logger(plugin.logger)
+    override fun getLogger(): IDbLogger {
+        return DbBukkitLogger(plugin.logger)
     }
 
 }
\ No newline at end of file
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/World.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitWorld.kt
similarity index 71%
rename from discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/World.kt
rename to discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitWorld.kt
index 5e72d6f..cf07131 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/World.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitWorld.kt
@@ -2,7 +2,7 @@ package gg.obsidian.discordbridge.wrappers
 
 import org.bukkit.World
 
-class World(val bukkitWorld: World) : IWorld {
+class DbBukkitWorld(val bukkitWorld: World) : IDbWorld {
     override fun getName(): String {
         return bukkitWorld.name
     }
diff --git a/discordbridge-bukkit/src/main/resources/plugin.yml b/discordbridge-bukkit/src/main/resources/plugin.yml
index 558a316..89d94b6 100644
--- a/discordbridge-bukkit/src/main/resources/plugin.yml
+++ b/discordbridge-bukkit/src/main/resources/plugin.yml
@@ -8,7 +8,7 @@ website: '@URL@'
 loadbefore: [SpaceBukkit, RemoteToolkitPlugin]
 softdepend: [Multiverse-Core]
 
-main: gg.obsidian.discordbridge.DiscordBridgePlugin
+main: gg.obsidian.discordbridge.BukkitDiscordBridge
 
 permissions:
   discordbridge.discord:
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
index 6a2d837..4da41f4 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
@@ -16,10 +16,10 @@ import gg.obsidian.discordbridge.util.UtilFunctions.toDiscordChatMessage
 import gg.obsidian.discordbridge.util.UtilFunctions.toDiscordPlayerDeath
 import gg.obsidian.discordbridge.util.UtilFunctions.toDiscordPlayerJoin
 import gg.obsidian.discordbridge.util.UtilFunctions.toDiscordPlayerLeave
-import gg.obsidian.discordbridge.wrappers.ICommandSender
-import gg.obsidian.discordbridge.wrappers.ILogger
-import gg.obsidian.discordbridge.wrappers.IPlayer
-import gg.obsidian.discordbridge.wrappers.IServer
+import gg.obsidian.discordbridge.wrappers.IDbCommandSender
+import gg.obsidian.discordbridge.wrappers.IDbLogger
+import gg.obsidian.discordbridge.wrappers.IDbPlayer
+import gg.obsidian.discordbridge.wrappers.IDbServer
 import net.dv8tion.jda.core.OnlineStatus
 import net.dv8tion.jda.core.entities.Member
 import net.dv8tion.jda.core.entities.MessageChannel
@@ -37,8 +37,8 @@ object DiscordBridge {
     private val discordChatControllerManager = BotControllerManager()
     private val minecraftCommandControllerManager = BotControllerManager()
     private val cfgNodes: MutableMap<Cfg, ConfigurationNode> = mutableMapOf()
-    private lateinit var server: IServer
-    lateinit var logger: ILogger
+    private lateinit var server: IDbServer
+    lateinit var logger: IDbLogger
 
     // Temporary storage for alias linking requests
     var requests: MutableList<UserAlias> = mutableListOf()
@@ -49,7 +49,7 @@ object DiscordBridge {
 
     lateinit var mvWorlds: ConfigurationNode
 
-    fun init(server: IServer, dataFolder: File, isMultiverse: Boolean = false) {
+    fun init(server: IDbServer, dataFolder: File, isMultiverse: Boolean = false) {
         this.server = server
         logger = this.server.getLogger()
 
@@ -85,7 +85,7 @@ object DiscordBridge {
         logger.info("[DiscordBridge] $msg")
     }
 
-    fun getServer(): IServer = server
+    fun getServer(): IDbServer = server
     fun getPegDownProcessor(): PegDownProcessor = pegDownProc
     fun getConfig(type: Cfg) = cfgNodes[type]!!
 
@@ -172,7 +172,7 @@ object DiscordBridge {
      * @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: IPlayer, discriminator: String): Member? {
+    fun registerUserRequest(player: IDbPlayer, discriminator: String): Member? {
         val users = Connection.listUsers()
         val found: Member = users.find { it.user.name + "#" + it.user.discriminator == discriminator } ?: return null
 
@@ -352,7 +352,7 @@ object DiscordBridge {
         Connection.disconnect()
     }
 
-    fun handlePlayerChat(player: IPlayer, message: String, isCancelled: Boolean): String {
+    fun handlePlayerChat(player: IDbPlayer, message: String, isCancelled: Boolean): String {
         // TODO: the order of these if statements may produce undesired behavior
         logDebug("Received a chat event from ${player.getName()}: $message")
         if (!getConfig(Cfg.CONFIG).getBoolean("player-messages.chat", true)) return message
@@ -383,7 +383,7 @@ object DiscordBridge {
         return MarkdownToMinecraftSeralizer().toMinecraft(pegDownProc.parseMarkdown(newMessage.toCharArray()))
     }
 
-    fun handlePlayerJoin(player: IPlayer) {
+    fun handlePlayerJoin(player: IDbPlayer) {
         val username = player.getName()
         var worldname = player.getWorld().getName()
         logDebug("Received a join event for $username")
@@ -407,7 +407,7 @@ object DiscordBridge {
         sendToDiscord(formattedMessage, Connection.getRelayChannel())
     }
 
-    fun handlePlayerQuit(player: IPlayer) {
+    fun handlePlayerQuit(player: IDbPlayer) {
         val username = player.getName()
         var worldname = player.getWorld().getName()
         logDebug("Received a leave event for $username")
@@ -431,7 +431,7 @@ object DiscordBridge {
         sendToDiscord(formattedMessage, Connection.getRelayChannel())
     }
 
-    fun handlePlayerDeath(player: IPlayer, deathMessage: String) {
+    fun handlePlayerDeath(player: IDbPlayer, deathMessage: String) {
         val username = player.getName()
         var worldname = player.getWorld().getName()
 
@@ -459,7 +459,7 @@ object DiscordBridge {
         sendToDiscord(translateAliasesToDiscord(message.toDiscordChatMessage(name, "Dynmap")), Connection.getRelayChannel())
     }
 
-    fun handleCommand(sender: ICommandSender, commandName: String, args: Array<out String>): Boolean {
+    fun handleCommand(sender: IDbCommandSender, commandName: String, args: Array<out String>): Boolean {
         return minecraftCommandControllerManager.dispatchMessage(MinecraftCommandWrapper(sender, commandName, args))
     }
 
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftChatEventWrapper.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftChatEventWrapper.kt
index f1ded0b..3d1569d 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftChatEventWrapper.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftChatEventWrapper.kt
@@ -1,7 +1,7 @@
 package gg.obsidian.discordbridge.commands
 
 import gg.obsidian.discordbridge.discord.Connection
-import gg.obsidian.discordbridge.wrappers.IPlayer
+import gg.obsidian.discordbridge.wrappers.IDbPlayer
 import net.dv8tion.jda.core.entities.MessageChannel
 
 /**
@@ -10,7 +10,7 @@ import net.dv8tion.jda.core.entities.MessageChannel
  * @param player the player who triggered the event
  * @param chatMessage the contents of the message that was sent
  */
-class MinecraftChatEventWrapper(val player: IPlayer, val chatMessage: String) : IEventWrapper {
+class MinecraftChatEventWrapper(val player: IDbPlayer, val chatMessage: String) : IEventWrapper {
     /**
      * The Minecraft username of the event author
      */
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt
index 3535d2a..4775826 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt
@@ -1,8 +1,8 @@
 package gg.obsidian.discordbridge.commands
 
 import gg.obsidian.discordbridge.discord.Connection
-import gg.obsidian.discordbridge.wrappers.ICommandSender
-import gg.obsidian.discordbridge.wrappers.IPlayer
+import gg.obsidian.discordbridge.wrappers.IDbCommandSender
+import gg.obsidian.discordbridge.wrappers.IDbPlayer
 import net.dv8tion.jda.core.entities.MessageChannel
 
 /**
@@ -12,7 +12,7 @@ import net.dv8tion.jda.core.entities.MessageChannel
  * @param commandName the name of the command that was invoked
  * @param args an array of argument strings passed to the command
  */
-class MinecraftCommandWrapper(val sender: ICommandSender, val commandName: String,
+class MinecraftCommandWrapper(val sender: IDbCommandSender, val commandName: String,
                               val args: Array<out String>) : IEventWrapper {
     /**
      * The Minecraft username of the command sender
@@ -20,7 +20,7 @@ class MinecraftCommandWrapper(val sender: ICommandSender, val commandName: Strin
      * Returns "Console" if the command was sent from the server console
      */
     override val senderName: String
-        get() = if (sender is IPlayer) sender.getName() else "Console"
+        get() = if (sender is IDbPlayer) sender.getName() else "Console"
     /**
      * Returns a space-delimited string of all the arguments passed with the command
      *
@@ -50,7 +50,7 @@ class MinecraftCommandWrapper(val sender: ICommandSender, val commandName: Strin
      * The command sender's Minecraft UUID
      */
     override val senderId: String
-        get() = (sender as? IPlayer)?.getUUID()?.toString() ?: ""
+        get() = (sender as? IDbPlayer)?.getUUID()?.toString() ?: ""
     /**
      * Always returns true for this wrapper type
      */
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
index 8bbcef8..914db3f 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
@@ -8,7 +8,7 @@ import gg.obsidian.discordbridge.discord.Connection
 import gg.obsidian.discordbridge.util.Cfg
 import gg.obsidian.discordbridge.util.ChatColor as CC
 import gg.obsidian.discordbridge.util.UtilFunctions.stripColor
-import gg.obsidian.discordbridge.wrappers.IPlayer
+import gg.obsidian.discordbridge.wrappers.IDbPlayer
 import net.dv8tion.jda.core.entities.ChannelType
 import java.util.*
 
@@ -114,7 +114,7 @@ class UtilCommandsController : IBotController {
 
         when (subCommand.toLowerCase()) {
             "reload" -> {
-                if (event.sender is IPlayer && !event.sender.hasPermission("discordbridge.discord.reload")) {
+                if (event.sender is IDbPlayer && !event.sender.hasPermission("discordbridge.discord.reload")) {
                     event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                             "Sorry, you don't have permission to use that command.")
                 } else {
@@ -123,7 +123,7 @@ class UtilCommandsController : IBotController {
                 }
             }
             "linkalias" -> {
-                if (event.sender !is IPlayer) return null
+                if (event.sender !is IDbPlayer) return null
 
                 if (!event.sender.hasPermission("discordbridge.discord.linkalias")) {
                     event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
@@ -166,7 +166,7 @@ class UtilCommandsController : IBotController {
                     return null
                 }
 
-                if (event.sender is IPlayer && !event.sender.hasPermission("discordbridge.discord.listmembers")) {
+                if (event.sender is IDbPlayer && !event.sender.hasPermission("discordbridge.discord.listmembers")) {
                     event.sender.sendMessage("${CC.ITALIC}${CC.GRAY}${DiscordBridge.getConfig(Cfg.CONFIG).getString("username", "DiscordBridge").stripColor()} whispers to you: " +
                             "Sorry, you don't have permission to use that command.")
                 }
@@ -178,7 +178,7 @@ class UtilCommandsController : IBotController {
                 }
             }
             "unlinkalias" -> {
-                if (event.sender !is IPlayer) return null
+                if (event.sender !is IDbPlayer) return null
 
                 val ua = UserAliasConfig.aliases.firstOrNull{UUID.fromString(it.mcUuid) == event.sender.getUUID()}
                 if (ua == null) {
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt
index 6a2d4c3..4232391 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt
@@ -1,7 +1,7 @@
 package gg.obsidian.discordbridge.util
 
 import gg.obsidian.discordbridge.DiscordBridge
-import gg.obsidian.discordbridge.wrappers.IPlayer
+import gg.obsidian.discordbridge.wrappers.IDbPlayer
 
 /**
  * Various utility functions
@@ -50,7 +50,7 @@ object UtilFunctions {
      * @return the formatted string
      */
     @JvmStatic
-    fun IPlayer.toDiscordPlayerJoin(worldName: String): String {
+    fun IDbPlayer.toDiscordPlayerJoin(worldName: String): String {
         return formatMessage(DiscordBridge.getConfig(Cfg.CONFIG).getString("templates.discord.player-join", "**%u** joined the server"), u = this.getName().stripColor(), w = worldName)
     }
 
@@ -61,7 +61,7 @@ object UtilFunctions {
      * @return the formatted string
      */
     @JvmStatic
-    fun IPlayer.toDiscordPlayerLeave(worldName: String): String {
+    fun IDbPlayer.toDiscordPlayerLeave(worldName: String): String {
         return formatMessage(DiscordBridge.getConfig(Cfg.CONFIG).getString("templates.discord.player-leave", "**%u** left the server"), u = this.getName().stripColor(), w = worldName)
     }
 
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IConsoleSender.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IConsoleSender.kt
deleted file mode 100644
index 0252d89..0000000
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IConsoleSender.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package gg.obsidian.discordbridge.wrappers
-
-interface IConsoleSender : ICommandSender {
-}
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IWorld.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbCommand.kt
similarity index 75%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IWorld.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbCommand.kt
index ca87935..b4bd7e2 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IWorld.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbCommand.kt
@@ -1,5 +1,5 @@
 package gg.obsidian.discordbridge.wrappers
 
-interface IWorld {
+interface IDbCommand {
     fun getName(): String
 }
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ICommandSender.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbCommandSender.kt
similarity index 87%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ICommandSender.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbCommandSender.kt
index e698647..f970598 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ICommandSender.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbCommandSender.kt
@@ -2,7 +2,7 @@ package gg.obsidian.discordbridge.wrappers
 
 import java.util.*
 
-interface ICommandSender {
+interface IDbCommandSender {
     fun getName(): String
     fun getUUID(): UUID
     fun sendMessage(message: String)
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbConsoleSender.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbConsoleSender.kt
new file mode 100644
index 0000000..0a450cb
--- /dev/null
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbConsoleSender.kt
@@ -0,0 +1,4 @@
+package gg.obsidian.discordbridge.wrappers
+
+interface IDbConsoleSender : IDbCommandSender {
+}
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ILogger.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbLogger.kt
similarity index 94%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ILogger.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbLogger.kt
index ea12754..03ed74a 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ILogger.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbLogger.kt
@@ -1,7 +1,7 @@
 package gg.obsidian.discordbridge.wrappers
 
 // https://github.com/CraftIRC/4/blob/master/src/main/java/org/kitteh/craftirc/util/Logger.java
-interface ILogger {
+interface IDbLogger {
     fun info(message: String)
     fun warning(message: String)
     fun warning(message: String, throwable: Throwable)
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IPlayer.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbPlayer.kt
similarity index 51%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IPlayer.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbPlayer.kt
index ae58a6c..0bd5042 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IPlayer.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbPlayer.kt
@@ -1,6 +1,6 @@
 package gg.obsidian.discordbridge.wrappers
 
-interface IPlayer : ICommandSender {
-    fun getWorld(): IWorld
+interface IDbPlayer : IDbCommandSender {
+    fun getWorld(): IDbWorld
     fun isVanished(): Boolean
 }
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IScheduler.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbScheduler.kt
similarity index 76%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IScheduler.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbScheduler.kt
index 4ebf373..0db52b4 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IScheduler.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbScheduler.kt
@@ -1,5 +1,5 @@
 package gg.obsidian.discordbridge.wrappers
 
-interface IScheduler {
+interface IDbScheduler {
     fun runAsyncTask(task: Runnable)
 }
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IServer.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbServer.kt
similarity index 61%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IServer.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbServer.kt
index c13e48e..7248584 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IServer.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbServer.kt
@@ -2,22 +2,21 @@ package gg.obsidian.discordbridge.wrappers
 
 import gg.obsidian.discordbridge.commands.DiscordCommandSender
 import gg.obsidian.discordbridge.util.UrlAttachment
-import net.dv8tion.jda.core.entities.MessageChannel
 import java.util.*
 
-interface IServer {
+interface IDbServer {
 
-    fun getScheduler(): IScheduler
+    fun getScheduler(): IDbScheduler
 
     fun getVersion(): String
 
     fun getMinecraftShortVersion(): String
 
-    fun getPlayer(uuid: UUID): IPlayer?
+    fun getPlayer(uuid: UUID): IDbPlayer?
 
-    fun getPlayer(name: String): IPlayer?
+    fun getPlayer(name: String): IDbPlayer?
 
-    fun getOnlinePlayers(): List<IPlayer>
+    fun getOnlinePlayers(): List<IDbPlayer>
 
     fun broadcastMessage(message: String)
 
@@ -25,6 +24,6 @@ interface IServer {
 
     fun dispatchCommand(sender: DiscordCommandSender, command: String)
 
-    fun getLogger(): ILogger
+    fun getLogger(): IDbLogger
 
 }
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ICommand.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbWorld.kt
similarity index 77%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ICommand.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbWorld.kt
index b9e4286..5bc4631 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ICommand.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbWorld.kt
@@ -1,5 +1,5 @@
 package gg.obsidian.discordbridge.wrappers
 
-interface ICommand {
+interface IDbWorld {
     fun getName(): String
 }
\ No newline at end of file
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandWrapper.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/CommandWrapper.kt
similarity index 95%
rename from discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandWrapper.kt
rename to discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/CommandWrapper.kt
index c01f04b..2ca4dc7 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandWrapper.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/CommandWrapper.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge
 
 import gg.obsidian.discordbridge.commands.Command
 import net.minecraft.command.CommandBase
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DiscordRConConsoleSource.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordRCon.kt
similarity index 70%
rename from discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DiscordRConConsoleSource.kt
rename to discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordRCon.kt
index 70cc9d2..7c12bf1 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DiscordRConConsoleSource.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordRCon.kt
@@ -1,11 +1,11 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge
 
 import gg.obsidian.discordbridge.commands.DiscordCommandSender
 import net.minecraft.network.rcon.RConConsoleSource
 import net.minecraft.server.MinecraftServer
 import net.minecraft.util.text.ITextComponent
 
-class DiscordRConConsoleSource(val sender: DiscordCommandSender, serverIn: MinecraftServer) : RConConsoleSource(serverIn) {
+class DiscordRCon(val sender: DiscordCommandSender, serverIn: MinecraftServer) : RConConsoleSource(serverIn) {
     override fun getName(): String {
         return sender.senderName
     }
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt
index a2c2c2e..ec1c748 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt
@@ -1,6 +1,6 @@
 package gg.obsidian.discordbridge
 
-import gg.obsidian.discordbridge.wrappers.Player
+import gg.obsidian.discordbridge.wrappers.DbForgePlayer
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.entity.player.EntityPlayerMP
 import net.minecraft.util.text.TextComponentString
@@ -17,20 +17,20 @@ object EventHandler {
     @JvmStatic
     @SubscribeEvent(priority = EventPriority.LOWEST)
     fun onPlayerJoin(event: PlayerEvent.PlayerLoggedInEvent) {
-        DiscordBridge.handlePlayerJoin(Player(event.player))
+        DiscordBridge.handlePlayerJoin(DbForgePlayer(event.player))
     }
 
     @JvmStatic
     @SubscribeEvent(priority = EventPriority.LOWEST)
     fun onPlayerQuit(event: PlayerEvent.PlayerLoggedOutEvent) {
-        DiscordBridge.handlePlayerQuit(Player(event.player))
+        DiscordBridge.handlePlayerQuit(DbForgePlayer(event.player))
     }
 
     @JvmStatic
     @SubscribeEvent(priority = EventPriority.LOWEST)
     fun onPlayerDeath(event: LivingDeathEvent) {
         val e = event.entityLiving
-        if (e is EntityPlayer) DiscordBridge.handlePlayerDeath(Player(e), e.combatTracker.deathMessage.unformattedText)
+        if (e is EntityPlayer) DiscordBridge.handlePlayerDeath(DbForgePlayer(e), e.combatTracker.deathMessage.unformattedText)
     }
 
     @JvmStatic
@@ -38,7 +38,7 @@ object EventHandler {
     fun onPlayerChat(event: ServerChatEvent) {
         val p = event.player
         if (p != null) {
-            val message = DiscordBridge.handlePlayerChat(Player(p), event.message, event.isCanceled)
+            val message = DiscordBridge.handlePlayerChat(DbForgePlayer(p), event.message, event.isCanceled)
             event.component = TextComponentString(event.component.unformattedText.replace(event.message, message))
         }
     }
@@ -50,7 +50,7 @@ object EventHandler {
         val p = event.sender
         if (p is EntityPlayerMP) {
             if (p.world.isRemote) return
-            DiscordBridge.handleCommand(Player(p), event.command.name, event.parameters)
+            DiscordBridge.handleCommand(DbForgePlayer(p), event.command.name, event.parameters)
         }
     }
 }
\ No newline at end of file
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgeForge.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/ForgeDiscordBridge.kt
similarity index 80%
rename from discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgeForge.kt
rename to discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/ForgeDiscordBridge.kt
index 5b1fbd6..d666e0b 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgeForge.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/ForgeDiscordBridge.kt
@@ -1,7 +1,6 @@
 package gg.obsidian.discordbridge
 
-import gg.obsidian.discordbridge.wrappers.CommandWrapper
-import gg.obsidian.discordbridge.wrappers.Server
+import gg.obsidian.discordbridge.wrappers.DbForgeServer
 import net.minecraftforge.fml.common.Mod
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent
 import net.minecraftforge.fml.common.event.FMLServerStartedEvent
@@ -10,14 +9,14 @@ import net.minecraftforge.fml.common.event.FMLServerStoppingEvent
 import org.apache.logging.log4j.Logger
 import java.io.File
 
-@Mod(modid = DiscordBridgeForge.MODID, version = "@VERSION@", acceptableRemoteVersions = "*")
-class DiscordBridgeForge {
+@Mod(modid = ForgeDiscordBridge.MODID, version = "@VERSION@", acceptableRemoteVersions = "*")
+class ForgeDiscordBridge {
 
     @Mod.EventHandler
     fun preInit(event: FMLPreInitializationEvent) {
         logger = event.modLog
         val workingDir = File(event.modConfigurationDirectory.toString() + File.separator + "discordbridge")
-        DiscordBridge.init(Server(this), workingDir)
+        DiscordBridge.init(DbForgeServer(this), workingDir)
     }
 
     @Mod.EventHandler
@@ -43,6 +42,6 @@ class DiscordBridgeForge {
         const val MODID = "discordbridge-obsidian"
 
         @Mod.Instance(MODID)
-        lateinit var inst: DiscordBridgeForge
+        lateinit var inst: ForgeDiscordBridge
     }
 }
\ No newline at end of file
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandSenderWrapper.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeCommandSender.kt
similarity index 85%
rename from discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandSenderWrapper.kt
rename to discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeCommandSender.kt
index 37947f5..6ba96e7 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandSenderWrapper.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeCommandSender.kt
@@ -3,7 +3,7 @@ package gg.obsidian.discordbridge.wrappers
 import net.minecraft.util.text.TextComponentString
 import java.util.*
 
-class CommandSenderWrapper(private val sender: net.minecraft.command.ICommandSender) : ICommandSender {
+class DbForgeCommandSender(private val sender: net.minecraft.command.ICommandSender) : IDbCommandSender {
     override fun getName(): String {
         return sender.name
     }
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ConsoleSender.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeConsoleSender.kt
similarity index 88%
rename from discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ConsoleSender.kt
rename to discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeConsoleSender.kt
index 97cf788..df7fe00 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ConsoleSender.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeConsoleSender.kt
@@ -4,7 +4,7 @@ import net.minecraft.network.rcon.RConConsoleSource
 import net.minecraft.util.text.TextComponentString
 import java.util.*
 
-class ConsoleSender(private val sender: RConConsoleSource) : IConsoleSender {
+class DbForgeConsoleSender(private val sender: RConConsoleSource) : IDbConsoleSender {
     override fun getName(): String {
         return sender.name
     }
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Logger.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeLogger.kt
similarity index 89%
rename from discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Logger.kt
rename to discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeLogger.kt
index 322b64f..1058ad2 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Logger.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeLogger.kt
@@ -2,7 +2,7 @@ package gg.obsidian.discordbridge.wrappers
 
 import org.apache.logging.log4j.Logger
 
-class Logger(private val logger: Logger) : ILogger {
+class DbForgeLogger(private val logger: Logger) : IDbLogger {
     override fun info(message: String) {
         logger.info(message)
     }
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Player.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgePlayer.kt
similarity index 82%
rename from discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Player.kt
rename to discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgePlayer.kt
index 137860c..2813f27 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Player.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgePlayer.kt
@@ -4,9 +4,9 @@ import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.util.text.TextComponentString
 import java.util.*
 
-class Player(private val minecraftPlayer: EntityPlayer) : IPlayer {
-    override fun getWorld(): IWorld {
-        return World(minecraftPlayer.world)
+class DbForgePlayer(private val minecraftPlayer: EntityPlayer) : IDbPlayer {
+    override fun getWorld(): IDbWorld {
+        return DbForgeWorld(minecraftPlayer.world)
     }
 
     override fun isVanished(): Boolean {
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Scheduler.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeScheduler.kt
similarity index 76%
rename from discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Scheduler.kt
rename to discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeScheduler.kt
index 8781bab..e25eb5a 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Scheduler.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeScheduler.kt
@@ -1,6 +1,6 @@
 package gg.obsidian.discordbridge.wrappers
 
-class Scheduler: IScheduler {
+class DbForgeScheduler : IDbScheduler {
     override fun runAsyncTask(task: Runnable) {
         Thread(task).start()
     }
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeServer.kt
similarity index 71%
rename from discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
rename to discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeServer.kt
index 9c2a990..1bb0dd1 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeServer.kt
@@ -1,10 +1,9 @@
 package gg.obsidian.discordbridge.wrappers
 
-import gg.obsidian.discordbridge.DiscordBridgeForge
+import gg.obsidian.discordbridge.ForgeDiscordBridge
+import gg.obsidian.discordbridge.DiscordRCon
 import gg.obsidian.discordbridge.commands.DiscordCommandSender
 import gg.obsidian.discordbridge.util.UrlAttachment
-import net.dv8tion.jda.core.entities.MessageChannel
-import net.minecraft.util.text.TextComponentBase
 import net.minecraft.util.text.TextComponentString
 import net.minecraft.util.text.event.ClickEvent
 import net.minecraft.util.text.event.HoverEvent
@@ -12,7 +11,7 @@ import net.minecraftforge.common.ForgeVersion
 import net.minecraftforge.fml.common.FMLCommonHandler
 import java.util.*
 
-class Server(private val mod: DiscordBridgeForge) : IServer {
+class DbForgeServer(private val mod: ForgeDiscordBridge) : IDbServer {
     override fun broadcastAttachment(att: UrlAttachment) {
         val pt1 = TextComponentString("${att.sender} sent ")
         pt1.style.italic = true
@@ -24,8 +23,8 @@ class Server(private val mod: DiscordBridgeForge) : IServer {
         FMLCommonHandler.instance().minecraftServerInstance.playerList.sendMessage(pt1.appendSibling(pt2))
     }
 
-    override fun getScheduler(): IScheduler {
-        return Scheduler()
+    override fun getScheduler(): IDbScheduler {
+        return DbForgeScheduler()
     }
 
     // TODO
@@ -37,18 +36,18 @@ class Server(private val mod: DiscordBridgeForge) : IServer {
         return "Minecraft Forge " + ForgeVersion.mcVersion
     }
 
-    override fun getPlayer(uuid: UUID): IPlayer? {
+    override fun getPlayer(uuid: UUID): IDbPlayer? {
         val p = FMLCommonHandler.instance().minecraftServerInstance.playerList.getPlayerByUUID(uuid)
-        return Player(p)
+        return DbForgePlayer(p)
     }
 
-    override fun getPlayer(name: String): IPlayer? {
+    override fun getPlayer(name: String): IDbPlayer? {
         val p = FMLCommonHandler.instance().minecraftServerInstance.playerList.getPlayerByUsername(name)
-        return if (p != null) Player(p) else null
+        return if (p != null) DbForgePlayer(p) else null
     }
 
-    override fun getOnlinePlayers(): List<IPlayer> {
-        return FMLCommonHandler.instance().minecraftServerInstance.playerList.players.map { Player(it) }
+    override fun getOnlinePlayers(): List<IDbPlayer> {
+        return FMLCommonHandler.instance().minecraftServerInstance.playerList.players.map { DbForgePlayer(it) }
     }
 
     override fun broadcastMessage(message: String) {
@@ -56,12 +55,12 @@ class Server(private val mod: DiscordBridgeForge) : IServer {
     }
 
     override fun dispatchCommand(sender: DiscordCommandSender, command: String) {
-        val rcon = DiscordRConConsoleSource(sender, FMLCommonHandler.instance().minecraftServerInstance)
+        val rcon = DiscordRCon(sender, FMLCommonHandler.instance().minecraftServerInstance)
         FMLCommonHandler.instance().minecraftServerInstance.commandManager.executeCommand(rcon, command)
     }
 
-    override fun getLogger(): Logger {
-        return Logger(mod.logger)
+    override fun getLogger(): DbForgeLogger {
+        return DbForgeLogger(mod.logger)
     }
 
 }
\ No newline at end of file
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/World.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeWorld.kt
similarity index 72%
rename from discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/World.kt
rename to discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeWorld.kt
index 0a254fc..e834107 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/World.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeWorld.kt
@@ -2,7 +2,7 @@ package gg.obsidian.discordbridge.wrappers
 
 import net.minecraft.world.World
 
-class World(private val minecraftWorld: World) : IWorld {
+class DbForgeWorld(private val minecraftWorld: World) : IDbWorld {
     override fun getName(): String {
         return minecraftWorld.worldInfo.worldName
     }
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandWrapper.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/CommandWrapper.kt
similarity index 86%
rename from discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandWrapper.kt
rename to discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/CommandWrapper.kt
index 81cae35..83434d2 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/CommandWrapper.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/CommandWrapper.kt
@@ -1,7 +1,7 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge
 
-import gg.obsidian.discordbridge.DiscordBridge
 import gg.obsidian.discordbridge.commands.Command
+import gg.obsidian.discordbridge.wrappers.DbSpongePlayer
 import org.spongepowered.api.command.CommandCallable
 import org.spongepowered.api.command.CommandResult
 import org.spongepowered.api.command.CommandSource
@@ -14,7 +14,7 @@ import java.util.*
 class CommandWrapper(private val command: Command): CommandCallable {
     override fun process(source: CommandSource, arguments: String): CommandResult {
         if (source is SpongePlayer) {
-            DiscordBridge.handleCommand(Player(source), command.aliases[0], arguments.split(" ").toTypedArray())
+            DiscordBridge.handleCommand(DbSpongePlayer(source), command.aliases[0], arguments.split(" ").toTypedArray())
             return CommandResult.success()
         }
         return CommandResult.empty()
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DiscordRconConsoleSource.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordRcon.kt
similarity index 92%
rename from discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DiscordRconConsoleSource.kt
rename to discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordRcon.kt
index 46069b4..03010d7 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DiscordRconConsoleSource.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordRcon.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge
 
 import gg.obsidian.discordbridge.commands.DiscordCommandSender
 import org.spongepowered.api.command.CommandSource
@@ -12,7 +12,7 @@ import org.spongepowered.api.text.channel.MessageChannel
 import org.spongepowered.api.util.Tristate
 import java.util.*
 
-class DiscordRconConsoleSource(private val sender: DiscordCommandSender, private val base: ConsoleSource): ConsoleSource {
+class DiscordRcon(private val sender: DiscordCommandSender, private val base: ConsoleSource): ConsoleSource {
     override fun sendMessage(message: Text) {
         sender.sendMessage(message.toPlain())
     }
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/SpongeDiscordBridge.kt
similarity index 74%
rename from discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
rename to discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/SpongeDiscordBridge.kt
index 907ebf3..7f5e39c 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridgePlugin.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/SpongeDiscordBridge.kt
@@ -1,10 +1,8 @@
 package gg.obsidian.discordbridge
 
-import gg.obsidian.discordbridge.commands.Command
 import gg.obsidian.discordbridge.util.unwrap
-import gg.obsidian.discordbridge.wrappers.CommandWrapper
-import gg.obsidian.discordbridge.wrappers.Player
-import gg.obsidian.discordbridge.wrappers.Server
+import gg.obsidian.discordbridge.wrappers.DbSpongePlayer
+import gg.obsidian.discordbridge.wrappers.DbSpongeServer
 import org.spongepowered.api.Game
 import org.spongepowered.api.config.DefaultConfig
 import org.spongepowered.api.event.Listener
@@ -18,30 +16,28 @@ import java.io.File
 import org.slf4j.Logger
 import org.spongepowered.api.Sponge
 import org.spongepowered.api.event.game.state.GameStartedServerEvent
-import org.spongepowered.api.event.game.state.GameStartingServerEvent
 import org.spongepowered.api.event.game.state.GameStoppingServerEvent
-import org.spongepowered.api.event.message.MessageEvent
 import org.spongepowered.api.text.Text
 import javax.inject.Inject
 
 @Plugin(id = "discordbridge-obsidian", name = "DiscordBridge", version = "@VERSION")
-class DiscordBridgePlugin {
+class SpongeDiscordBridge {
 
     @Inject private lateinit var game: Game
     @Inject @DefaultConfig(sharedRoot = false) private lateinit var defaultConfig: File
 
     @Inject private lateinit var logger: Logger
 
-    private lateinit var instance: DiscordBridgePlugin
+    private lateinit var instance: SpongeDiscordBridge
 
-    fun getPlugin() : DiscordBridgePlugin = instance
+    fun getPlugin() : SpongeDiscordBridge = instance
 
     fun getLogger() : Logger = logger
 
     @Listener
     fun onGameInitialization(event: GameInitializationEvent) {
         instance = this
-        DiscordBridge.init(Server(this, game), defaultConfig)
+        DiscordBridge.init(DbSpongeServer(this, game), defaultConfig)
 
         val mgr = Sponge.getCommandManager()
         for (c in DiscordBridge.getServerCommands()) {
@@ -62,18 +58,18 @@ class DiscordBridgePlugin {
 
     @Listener(order = Order.LAST)
     fun onPlayerJoin(event: ClientConnectionEvent.Join) {
-        DiscordBridge.handlePlayerJoin(Player(event.targetEntity))
+        DiscordBridge.handlePlayerJoin(DbSpongePlayer(event.targetEntity))
     }
 
     @Listener(order = Order.LAST)
     fun onPlayerQuit(event: ClientConnectionEvent.Disconnect) {
-        DiscordBridge.handlePlayerQuit(Player(event.targetEntity))
+        DiscordBridge.handlePlayerQuit(DbSpongePlayer(event.targetEntity))
     }
 
     @Listener(order = Order.LAST)
     fun onPlayerDeath(event: DestructEntityEvent.Death) {
         val e = event.targetEntity
-        if (e is org.spongepowered.api.entity.living.player.Player) DiscordBridge.handlePlayerDeath(Player(e), event.message.toPlain())
+        if (e is org.spongepowered.api.entity.living.player.Player) DiscordBridge.handlePlayerDeath(DbSpongePlayer(e), event.message.toPlain())
 
     }
 
@@ -81,7 +77,7 @@ class DiscordBridgePlugin {
     fun onPlayerChat(event: MessageChannelEvent.Chat) {
         val p = event.cause.first(org.spongepowered.api.entity.living.player.Player::class.java).unwrap()
         if (p != null) {
-            val msg = DiscordBridge.handlePlayerChat(Player(p), event.rawMessage.toPlain(), event.isCancelled)
+            val msg = DiscordBridge.handlePlayerChat(DbSpongePlayer(p), event.rawMessage.toPlain(), event.isCancelled)
             event.setMessage(event.formatter.header.format(), Text.of(msg), event.formatter.footer.format())
         }
     }
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Command.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Command.kt
deleted file mode 100644
index 82027e4..0000000
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Command.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-package gg.obsidian.discordbridge.wrappers
-
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ConsoleSender.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ConsoleSender.kt
deleted file mode 100644
index 82027e4..0000000
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/ConsoleSender.kt
+++ /dev/null
@@ -1,2 +0,0 @@
-package gg.obsidian.discordbridge.wrappers
-
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Logger.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongeLogger.kt
similarity index 89%
rename from discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Logger.kt
rename to discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongeLogger.kt
index 3b83a53..fd07ffc 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Logger.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongeLogger.kt
@@ -2,7 +2,7 @@ package gg.obsidian.discordbridge.wrappers
 
 import org.slf4j.Logger
 
-class Logger(private val logger: Logger) : ILogger {
+class DbSpongeLogger(private val logger: Logger) : IDbLogger {
     override fun info(message: String) {
         logger.info(message)
     }
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Player.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongePlayer.kt
similarity index 81%
rename from discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Player.kt
rename to discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongePlayer.kt
index c833e79..09b0be2 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Player.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongePlayer.kt
@@ -5,9 +5,9 @@ import org.spongepowered.api.entity.living.player.Player
 import org.spongepowered.api.text.Text
 import java.util.*
 
-class Player(private val spongePlayer: Player) : IPlayer {
-    override fun getWorld(): IWorld {
-        return World(spongePlayer.world)
+class DbSpongePlayer(private val spongePlayer: Player) : IDbPlayer {
+    override fun getWorld(): IDbWorld {
+        return DbSpongeWorld(spongePlayer.world)
     }
 
     override fun isVanished(): Boolean {
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Scheduler.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongeScheduler.kt
similarity index 59%
rename from discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Scheduler.kt
rename to discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongeScheduler.kt
index 6032cf5..e451a47 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Scheduler.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongeScheduler.kt
@@ -1,9 +1,9 @@
 package gg.obsidian.discordbridge.wrappers
 
-import gg.obsidian.discordbridge.DiscordBridgePlugin
+import gg.obsidian.discordbridge.SpongeDiscordBridge
 import org.spongepowered.api.Game
 
-class Scheduler(val plugin: DiscordBridgePlugin, val game: Game) : IScheduler {
+class DbSpongeScheduler(val plugin: SpongeDiscordBridge, val game: Game) : IDbScheduler {
     override fun runAsyncTask(task: Runnable) {
         game.scheduler.createTaskBuilder().execute(task).submit(plugin)
     }
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongeServer.kt
similarity index 66%
rename from discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
rename to discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongeServer.kt
index 58a689f..5fea852 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/Server.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongeServer.kt
@@ -1,6 +1,7 @@
 package gg.obsidian.discordbridge.wrappers
 
-import gg.obsidian.discordbridge.DiscordBridgePlugin
+import gg.obsidian.discordbridge.DiscordRcon
+import gg.obsidian.discordbridge.SpongeDiscordBridge
 import gg.obsidian.discordbridge.commands.DiscordCommandSender
 import gg.obsidian.discordbridge.util.UrlAttachment
 import gg.obsidian.discordbridge.util.unwrap
@@ -12,7 +13,7 @@ import org.spongepowered.api.text.format.TextStyles
 import java.net.URL
 import java.util.*
 
-class Server(private val plugin: DiscordBridgePlugin, private val game: Game) : IServer {
+class DbSpongeServer(private val plugin: SpongeDiscordBridge, private val game: Game) : IDbServer {
     override fun broadcastAttachment(att: UrlAttachment) {
         val msg = Text.builder("${att.sender} sent ").style(TextStyles.ITALIC).append(
                     Text.builder("an attachment")
@@ -24,8 +25,8 @@ class Server(private val plugin: DiscordBridgePlugin, private val game: Game) :
         Sponge.getServer().broadcastChannel.send(msg)
     }
 
-    override fun getScheduler(): IScheduler {
-        return Scheduler(plugin, game)
+    override fun getScheduler(): IDbScheduler {
+        return DbSpongeScheduler(plugin, game)
     }
 
     override fun getVersion(): String {
@@ -36,18 +37,18 @@ class Server(private val plugin: DiscordBridgePlugin, private val game: Game) :
         return game.platform.minecraftVersion.name
     }
 
-    override fun getPlayer(uuid: UUID): IPlayer? {
+    override fun getPlayer(uuid: UUID): IDbPlayer? {
         val p = Sponge.getServer().getPlayer(uuid).unwrap()
-        return if (p != null) Player(p) else null
+        return if (p != null) DbSpongePlayer(p) else null
     }
 
-    override fun getPlayer(name: String): IPlayer? {
+    override fun getPlayer(name: String): IDbPlayer? {
         val p = Sponge.getServer().getPlayer(name).unwrap()
-        return if (p != null) Player(p) else null
+        return if (p != null) DbSpongePlayer(p) else null
     }
 
-    override fun getOnlinePlayers(): List<IPlayer> {
-        return Sponge.getServer().onlinePlayers.map { Player(it) }
+    override fun getOnlinePlayers(): List<IDbPlayer> {
+        return Sponge.getServer().onlinePlayers.map { DbSpongePlayer(it) }
     }
 
     override fun broadcastMessage(message: String) {
@@ -55,12 +56,12 @@ class Server(private val plugin: DiscordBridgePlugin, private val game: Game) :
     }
 
     override fun dispatchCommand(sender: DiscordCommandSender, command: String) {
-        val rcon = DiscordRconConsoleSource(sender, game.server.console)
+        val rcon = DiscordRcon(sender, game.server.console)
         Sponge.getCommandManager().process(rcon, command)
     }
 
-    override fun getLogger(): Logger {
-        return Logger(plugin.getLogger())
+    override fun getLogger(): DbSpongeLogger {
+        return DbSpongeLogger(plugin.getLogger())
     }
 
 }
\ No newline at end of file
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/World.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongeWorld.kt
similarity index 71%
rename from discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/World.kt
rename to discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongeWorld.kt
index 10100be..8004f18 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/World.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongeWorld.kt
@@ -2,7 +2,7 @@ package gg.obsidian.discordbridge.wrappers
 
 import org.spongepowered.api.world.World
 
-class World(private val spongeWorld: World) : IWorld {
+class DbSpongeWorld(private val spongeWorld: World) : IDbWorld {
     override fun getName(): String {
         return spongeWorld.name
     }

From 7bd49040433091cc297c17fe851c11404a9f3733 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Tue, 6 Feb 2018 17:24:57 -0600
Subject: [PATCH 23/30] Make Bukkit use getOfflinePlayer

---
 .../discordbridge/wrappers/DbBukkitPlayer.kt       | 14 ++++++++------
 .../discordbridge/wrappers/DbBukkitServer.kt       |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitPlayer.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitPlayer.kt
index 4c9fe69..2aa3fbc 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitPlayer.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitPlayer.kt
@@ -1,19 +1,21 @@
 package gg.obsidian.discordbridge.wrappers
 
-import org.bukkit.entity.Player
+import org.bukkit.OfflinePlayer
 import java.util.*
 
-class DbBukkitPlayer(val bukkitPlayer: Player) : IDbPlayer {
+// TODO: Add safety for when OfflinePlayer is not online
+class DbBukkitPlayer(val bukkitPlayer: OfflinePlayer) : IDbPlayer {
     override fun hasPermission(permission: String): Boolean {
-        return bukkitPlayer.hasPermission(permission)
+        return bukkitPlayer.player.hasPermission(permission)
     }
 
     override fun getWorld(): IDbWorld {
-        return DbBukkitWorld(bukkitPlayer.world)
+        return DbBukkitWorld(bukkitPlayer.player.world)
     }
 
     override fun isVanished(): Boolean {
-        return bukkitPlayer.hasMetadata("vanished") && bukkitPlayer.getMetadata("vanished")[0].asBoolean()
+        return bukkitPlayer.player.hasMetadata("vanished")
+                && bukkitPlayer.player.getMetadata("vanished")[0].asBoolean()
     }
 
     override fun getName(): String {
@@ -21,7 +23,7 @@ class DbBukkitPlayer(val bukkitPlayer: Player) : IDbPlayer {
     }
 
     override fun sendMessage(message: String) {
-        bukkitPlayer.sendMessage(message)
+        bukkitPlayer.player.sendMessage(message)
     }
 
     override fun getUUID(): UUID {
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitServer.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitServer.kt
index 60e46b8..9e6c5e0 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitServer.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitServer.kt
@@ -37,11 +37,11 @@ class DbBukkitServer(val plugin: BukkitDiscordBridge, val bukkitServer: Server)
     }
 
     override fun getPlayer(uuid: UUID): IDbPlayer? {
-        return DbBukkitPlayer(bukkitServer.getPlayer(uuid))
+        return DbBukkitPlayer(bukkitServer.getOfflinePlayer(uuid))
     }
 
     override fun getPlayer(name: String): IDbPlayer? {
-        return DbBukkitPlayer(bukkitServer.getPlayer(name))
+        return DbBukkitPlayer(bukkitServer.getOfflinePlayer(name))
     }
 
     override fun getOnlinePlayers(): List<IDbPlayer> {

From bc5e27c1805a11bb2b3e4f3e0b5acc49c1950ece Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Tue, 6 Feb 2018 17:51:37 -0600
Subject: [PATCH 24/30] More filestructure housekeeping

Renamed all plural packages to singular
Moved core enums and config classes to their own packages
---
 .../discordbridge/BukkitDiscordBridge.kt      |  2 +-
 .../gg/obsidian/discordbridge/DiscordRCon.kt  |  2 +-
 .../obsidian/discordbridge/EventListener.kt   |  4 +--
 .../{wrappers => wrapper}/DbBukkitCommand.kt  |  2 +-
 .../DbBukkitConsoleSender.kt                  |  2 +-
 .../{wrappers => wrapper}/DbBukkitLogger.kt   |  2 +-
 .../{wrappers => wrapper}/DbBukkitPlayer.kt   |  2 +-
 .../DbBukkitScheduler.kt                      |  2 +-
 .../{wrappers => wrapper}/DbBukkitServer.kt   |  4 +--
 .../{wrappers => wrapper}/DbBukkitWorld.kt    |  2 +-
 .../discordbridge/ConfigurationNode.kt        |  2 +-
 .../obsidian/discordbridge/DiscordBridge.kt   | 26 +++++++++----------
 .../obsidian/discordbridge/UserAliasConfig.kt |  6 ++---
 .../{commands => command}/Command.kt          |  2 +-
 .../DiscordCommandSender.kt                   |  2 +-
 .../DiscordMessageWrapper.kt                  |  4 +--
 .../{commands => command}/IEventWrapper.kt    |  2 +-
 .../MinecraftChatEventWrapper.kt              |  4 +--
 .../MinecraftCommandWrapper.kt                |  6 ++---
 .../annotation}/BotCommand.kt                 |  2 +-
 .../annotation}/ChatExclusiveCommand.kt       |  2 +-
 .../annotation}/DiscordExclusiveCommand.kt    |  2 +-
 .../annotation}/MinecraftExclusiveCommand.kt  |  2 +-
 .../annotation}/PrivateResponse.kt            |  2 +-
 .../annotation}/TaggedResponse.kt             |  2 +-
 .../controller}/BotControllerManager.kt       | 14 +++++-----
 .../controller}/FunCommandsController.kt      | 18 ++++++-------
 .../controller}/IBotController.kt             |  2 +-
 .../controller}/UtilCommandsController.kt     | 12 ++++-----
 .../discordbridge/discord/Connection.kt       |  2 +-
 .../discordbridge/discord/Listener.kt         |  9 +++----
 .../discordbridge/discord/ReadyListener.kt    | 13 ----------
 .../discordbridge/util/UtilFunctions.kt       |  4 ++-
 .../discordbridge/util/{ => config}/Rating.kt |  2 +-
 .../util/{ => config}/Respect.kt              |  2 +-
 .../discordbridge/util/{ => config}/Script.kt |  2 +-
 .../util/{ => config}/UserAlias.kt            |  2 +-
 .../util/{ => enum}/ChatColor.kt              |  4 +--
 .../util/{ => enum}/ConfigTypes.kt            |  2 +-
 .../{wrappers => wrapper}/IDbCommand.kt       |  2 +-
 .../{wrappers => wrapper}/IDbCommandSender.kt |  2 +-
 .../{wrappers => wrapper}/IDbConsoleSender.kt |  2 +-
 .../{wrappers => wrapper}/IDbLogger.kt        |  2 +-
 .../{wrappers => wrapper}/IDbPlayer.kt        |  2 +-
 .../{wrappers => wrapper}/IDbScheduler.kt     |  2 +-
 .../{wrappers => wrapper}/IDbServer.kt        |  4 +--
 .../{wrappers => wrapper}/IDbWorld.kt         |  2 +-
 .../obsidian/discordbridge/CommandWrapper.kt  |  2 +-
 .../gg/obsidian/discordbridge/DiscordRCon.kt  |  2 +-
 .../gg/obsidian/discordbridge/EventHandler.kt |  2 +-
 .../discordbridge/ForgeDiscordBridge.kt       |  2 +-
 .../DbForgeCommandSender.kt                   |  2 +-
 .../DbForgeConsoleSender.kt                   |  2 +-
 .../{wrappers => wrapper}/DbForgeLogger.kt    |  2 +-
 .../{wrappers => wrapper}/DbForgePlayer.kt    |  2 +-
 .../{wrappers => wrapper}/DbForgeScheduler.kt |  2 +-
 .../{wrappers => wrapper}/DbForgeServer.kt    |  4 +--
 .../{wrappers => wrapper}/DbForgeWorld.kt     |  2 +-
 .../obsidian/discordbridge/CommandWrapper.kt  |  4 +--
 .../gg/obsidian/discordbridge/DiscordRcon.kt  |  2 +-
 .../discordbridge/SpongeDiscordBridge.kt      |  4 +--
 .../{wrappers => wrapper}/DbSpongeLogger.kt   |  2 +-
 .../{wrappers => wrapper}/DbSpongePlayer.kt   |  2 +-
 .../DbSpongeScheduler.kt                      |  2 +-
 .../{wrappers => wrapper}/DbSpongeServer.kt   |  4 +--
 .../{wrappers => wrapper}/DbSpongeWorld.kt    |  2 +-
 66 files changed, 115 insertions(+), 127 deletions(-)
 rename discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/DbBukkitCommand.kt (78%)
 rename discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/DbBukkitConsoleSender.kt (93%)
 rename discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/DbBukkitLogger.kt (93%)
 rename discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/DbBukkitPlayer.kt (95%)
 rename discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/DbBukkitScheduler.kt (89%)
 rename discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/DbBukkitServer.kt (95%)
 rename discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/DbBukkitWorld.kt (78%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/{commands => command}/Command.kt (96%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/{commands => command}/DiscordCommandSender.kt (89%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/{commands => command}/DiscordMessageWrapper.kt (95%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/{commands => command}/IEventWrapper.kt (97%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/{commands => command}/MinecraftChatEventWrapper.kt (93%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/{commands => command}/MinecraftCommandWrapper.kt (92%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/{commands/annotations => command/annotation}/BotCommand.kt (94%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/{commands/annotations => command/annotation}/ChatExclusiveCommand.kt (80%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/{commands/annotations => command/annotation}/DiscordExclusiveCommand.kt (80%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/{commands/annotations => command/annotation}/MinecraftExclusiveCommand.kt (81%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/{commands/annotations => command/annotation}/PrivateResponse.kt (90%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/{commands/annotations => command/annotation}/TaggedResponse.kt (86%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/{commands/controllers => command/controller}/BotControllerManager.kt (98%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/{commands/controllers => command/controller}/FunCommandsController.kt (94%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/{commands/controllers => command/controller}/IBotController.kt (82%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/{commands/controllers => command/controller}/UtilCommandsController.kt (97%)
 delete mode 100644 discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/ReadyListener.kt
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/{ => config}/Rating.kt (94%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/{ => config}/Respect.kt (91%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/{ => config}/Script.kt (96%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/{ => config}/UserAlias.kt (89%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/{ => enum}/ChatColor.kt (98%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/{ => enum}/ConfigTypes.kt (80%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/IDbCommand.kt (54%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/IDbCommandSender.kt (81%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/IDbConsoleSender.kt (53%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/IDbLogger.kt (88%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/IDbPlayer.kt (70%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/IDbScheduler.kt (59%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/IDbServer.kt (83%)
 rename discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/IDbWorld.kt (53%)
 rename discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/DbForgeCommandSender.kt (94%)
 rename discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/DbForgeConsoleSender.kt (94%)
 rename discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/DbForgeLogger.kt (92%)
 rename discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/DbForgePlayer.kt (95%)
 rename discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/DbForgeScheduler.kt (74%)
 rename discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/DbForgeServer.kt (95%)
 rename discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/DbForgeWorld.kt (82%)
 rename discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/DbSpongeLogger.kt (92%)
 rename discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/DbSpongePlayer.kt (95%)
 rename discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/DbSpongeScheduler.kt (87%)
 rename discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/DbSpongeServer.kt (95%)
 rename discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/{wrappers => wrapper}/DbSpongeWorld.kt (81%)

diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/BukkitDiscordBridge.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/BukkitDiscordBridge.kt
index 191488a..9a90749 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/BukkitDiscordBridge.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/BukkitDiscordBridge.kt
@@ -1,6 +1,6 @@
 package gg.obsidian.discordbridge
 
-import gg.obsidian.discordbridge.wrappers.DbBukkitServer
+import gg.obsidian.discordbridge.wrapper.DbBukkitServer
 import org.bukkit.plugin.java.JavaPlugin
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordRCon.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordRCon.kt
index 136c403..3aab6fa 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordRCon.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordRCon.kt
@@ -1,6 +1,6 @@
 package gg.obsidian.discordbridge
 
-import gg.obsidian.discordbridge.commands.DiscordCommandSender
+import gg.obsidian.discordbridge.command.DiscordCommandSender
 import org.bukkit.Server
 import org.bukkit.command.CommandSender
 import org.bukkit.command.ConsoleCommandSender
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
index 0580694..ee8a945 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
@@ -1,7 +1,7 @@
 package gg.obsidian.discordbridge
 
-import gg.obsidian.discordbridge.wrappers.DbBukkitConsoleSender
-import gg.obsidian.discordbridge.wrappers.DbBukkitPlayer
+import gg.obsidian.discordbridge.wrapper.DbBukkitConsoleSender
+import gg.obsidian.discordbridge.wrapper.DbBukkitPlayer
 import org.bukkit.Bukkit
 import org.bukkit.command.Command
 import org.bukkit.command.CommandExecutor
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitCommand.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitCommand.kt
similarity index 78%
rename from discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitCommand.kt
rename to discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitCommand.kt
index 8bdcf89..e410be8 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitCommand.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitCommand.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
 import org.bukkit.command.Command
 
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitConsoleSender.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitConsoleSender.kt
similarity index 93%
rename from discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitConsoleSender.kt
rename to discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitConsoleSender.kt
index 28b52ae..cc1ff56 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitConsoleSender.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitConsoleSender.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
 import org.bukkit.command.ConsoleCommandSender
 import java.util.*
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitLogger.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitLogger.kt
similarity index 93%
rename from discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitLogger.kt
rename to discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitLogger.kt
index d5ed756..664b474 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitLogger.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitLogger.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
 import java.util.logging.Level
 import java.util.logging.Logger
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitPlayer.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitPlayer.kt
similarity index 95%
rename from discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitPlayer.kt
rename to discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitPlayer.kt
index 2aa3fbc..cd49180 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitPlayer.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitPlayer.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
 import org.bukkit.OfflinePlayer
 import java.util.*
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitScheduler.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitScheduler.kt
similarity index 89%
rename from discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitScheduler.kt
rename to discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitScheduler.kt
index 549c88f..2ac11a0 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitScheduler.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitScheduler.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
 import gg.obsidian.discordbridge.BukkitDiscordBridge
 import org.bukkit.scheduler.BukkitScheduler
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitServer.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitServer.kt
similarity index 95%
rename from discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitServer.kt
rename to discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitServer.kt
index 9e6c5e0..a124cca 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitServer.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitServer.kt
@@ -1,8 +1,8 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
 import gg.obsidian.discordbridge.BukkitDiscordBridge
 import gg.obsidian.discordbridge.DiscordRCon
-import gg.obsidian.discordbridge.commands.DiscordCommandSender
+import gg.obsidian.discordbridge.command.DiscordCommandSender
 import gg.obsidian.discordbridge.util.UrlAttachment
 import net.md_5.bungee.api.chat.ClickEvent
 import net.md_5.bungee.api.chat.ComponentBuilder
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitWorld.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitWorld.kt
similarity index 78%
rename from discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitWorld.kt
rename to discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitWorld.kt
index cf07131..9f32ddb 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbBukkitWorld.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitWorld.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
 import org.bukkit.World
 
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/ConfigurationNode.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/ConfigurationNode.kt
index acfb4a6..b9cdc9f 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/ConfigurationNode.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/ConfigurationNode.kt
@@ -2,7 +2,7 @@
 
 package gg.obsidian.discordbridge
 
-import gg.obsidian.discordbridge.util.UserAlias
+import gg.obsidian.discordbridge.util.config.UserAlias
 import org.yaml.snakeyaml.DumperOptions
 import org.yaml.snakeyaml.Yaml
 import org.yaml.snakeyaml.constructor.SafeConstructor
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
index 4da41f4..4f08132 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
@@ -1,25 +1,25 @@
 package gg.obsidian.discordbridge
 
-import gg.obsidian.discordbridge.commands.Command
-import gg.obsidian.discordbridge.commands.MinecraftChatEventWrapper
-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 gg.obsidian.discordbridge.command.Command
+import gg.obsidian.discordbridge.command.MinecraftChatEventWrapper
+import gg.obsidian.discordbridge.command.MinecraftCommandWrapper
+import gg.obsidian.discordbridge.command.controller.BotControllerManager
+import gg.obsidian.discordbridge.command.controller.FunCommandsController
+import gg.obsidian.discordbridge.command.controller.UtilCommandsController
 import gg.obsidian.discordbridge.discord.Connection
-import gg.obsidian.discordbridge.util.Cfg
+import gg.obsidian.discordbridge.util.enum.Cfg
 import gg.obsidian.discordbridge.util.MarkdownToMinecraftSeralizer
 import gg.obsidian.discordbridge.util.UrlAttachment
-import gg.obsidian.discordbridge.util.UserAlias
+import gg.obsidian.discordbridge.util.config.UserAlias
 import gg.obsidian.discordbridge.util.UtilFunctions.noSpace
 import gg.obsidian.discordbridge.util.UtilFunctions.toDiscordChatMessage
 import gg.obsidian.discordbridge.util.UtilFunctions.toDiscordPlayerDeath
 import gg.obsidian.discordbridge.util.UtilFunctions.toDiscordPlayerJoin
 import gg.obsidian.discordbridge.util.UtilFunctions.toDiscordPlayerLeave
-import gg.obsidian.discordbridge.wrappers.IDbCommandSender
-import gg.obsidian.discordbridge.wrappers.IDbLogger
-import gg.obsidian.discordbridge.wrappers.IDbPlayer
-import gg.obsidian.discordbridge.wrappers.IDbServer
+import gg.obsidian.discordbridge.wrapper.IDbCommandSender
+import gg.obsidian.discordbridge.wrapper.IDbLogger
+import gg.obsidian.discordbridge.wrapper.IDbPlayer
+import gg.obsidian.discordbridge.wrapper.IDbServer
 import net.dv8tion.jda.core.OnlineStatus
 import net.dv8tion.jda.core.entities.Member
 import net.dv8tion.jda.core.entities.MessageChannel
@@ -28,7 +28,7 @@ import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
 import java.util.*
-import gg.obsidian.discordbridge.util.ChatColor as CC
+import gg.obsidian.discordbridge.util.enum.ChatColor as CC
 
 object DiscordBridge {
 
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
index 14a73aa..857b943 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
@@ -1,7 +1,7 @@
 package gg.obsidian.discordbridge
 
-import gg.obsidian.discordbridge.util.Cfg
-import gg.obsidian.discordbridge.util.UserAlias
+import gg.obsidian.discordbridge.util.enum.Cfg
+import gg.obsidian.discordbridge.util.config.UserAlias
 
 /**
  * An accessor object for the users config file
@@ -14,7 +14,7 @@ object UserAliasConfig {
      */
     fun load() {
         val list = DiscordBridge.getConfig(Cfg.ALIAS).getList<Map<String, Any>>("aliases")
-        aliases = list.castTo({UserAlias(it)})
+        aliases = list.castTo({ UserAlias(it) })
     }
 
     /**
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/Command.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/Command.kt
similarity index 96%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/Command.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/Command.kt
index 6436de8..a7689c5 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/Command.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/Command.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.commands
+package gg.obsidian.discordbridge.command
 
 import java.lang.reflect.Method
 
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordCommandSender.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/DiscordCommandSender.kt
similarity index 89%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordCommandSender.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/DiscordCommandSender.kt
index 43196f8..25b9fc4 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordCommandSender.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/DiscordCommandSender.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.commands
+package gg.obsidian.discordbridge.command
 
 import net.dv8tion.jda.core.entities.MessageChannel
 
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordMessageWrapper.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/DiscordMessageWrapper.kt
similarity index 95%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordMessageWrapper.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/DiscordMessageWrapper.kt
index e23158a..85fb321 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/DiscordMessageWrapper.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/DiscordMessageWrapper.kt
@@ -1,7 +1,7 @@
-package gg.obsidian.discordbridge.commands
+package gg.obsidian.discordbridge.command
 
 import gg.obsidian.discordbridge.DiscordBridge
-import gg.obsidian.discordbridge.util.Cfg
+import gg.obsidian.discordbridge.util.enum.Cfg
 import net.dv8tion.jda.core.entities.ChannelType
 import net.dv8tion.jda.core.entities.Message
 import net.dv8tion.jda.core.entities.MessageChannel
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/IEventWrapper.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/IEventWrapper.kt
similarity index 97%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/IEventWrapper.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/IEventWrapper.kt
index bc1c27c..8ef4d04 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/IEventWrapper.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/IEventWrapper.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.commands
+package gg.obsidian.discordbridge.command
 
 import net.dv8tion.jda.core.entities.MessageChannel
 
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftChatEventWrapper.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/MinecraftChatEventWrapper.kt
similarity index 93%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftChatEventWrapper.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/MinecraftChatEventWrapper.kt
index 3d1569d..9793a02 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftChatEventWrapper.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/MinecraftChatEventWrapper.kt
@@ -1,7 +1,7 @@
-package gg.obsidian.discordbridge.commands
+package gg.obsidian.discordbridge.command
 
 import gg.obsidian.discordbridge.discord.Connection
-import gg.obsidian.discordbridge.wrappers.IDbPlayer
+import gg.obsidian.discordbridge.wrapper.IDbPlayer
 import net.dv8tion.jda.core.entities.MessageChannel
 
 /**
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/MinecraftCommandWrapper.kt
similarity index 92%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/MinecraftCommandWrapper.kt
index 4775826..add0d52 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/MinecraftCommandWrapper.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/MinecraftCommandWrapper.kt
@@ -1,8 +1,8 @@
-package gg.obsidian.discordbridge.commands
+package gg.obsidian.discordbridge.command
 
 import gg.obsidian.discordbridge.discord.Connection
-import gg.obsidian.discordbridge.wrappers.IDbCommandSender
-import gg.obsidian.discordbridge.wrappers.IDbPlayer
+import gg.obsidian.discordbridge.wrapper.IDbCommandSender
+import gg.obsidian.discordbridge.wrapper.IDbPlayer
 import net.dv8tion.jda.core.entities.MessageChannel
 
 /**
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/BotCommand.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/annotation/BotCommand.kt
similarity index 94%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/BotCommand.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/annotation/BotCommand.kt
index 9eaa291..86947e4 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/BotCommand.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/annotation/BotCommand.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.commands.annotations
+package gg.obsidian.discordbridge.command.annotation
 
 /**
  * Annotates a function as a command the bot can run.
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/ChatExclusiveCommand.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/annotation/ChatExclusiveCommand.kt
similarity index 80%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/ChatExclusiveCommand.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/annotation/ChatExclusiveCommand.kt
index 3b6a510..66d16a1 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/ChatExclusiveCommand.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/annotation/ChatExclusiveCommand.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.commands.annotations
+package gg.obsidian.discordbridge.command.annotation
 
 /**
  * Annotates a BotCommand as a command that is exposed to Discord chat and Minecraft chat
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/DiscordExclusiveCommand.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/annotation/DiscordExclusiveCommand.kt
similarity index 80%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/DiscordExclusiveCommand.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/annotation/DiscordExclusiveCommand.kt
index f9e8f1a..1fc4e11 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/DiscordExclusiveCommand.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/annotation/DiscordExclusiveCommand.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.commands.annotations
+package gg.obsidian.discordbridge.command.annotation
 
 /**
  * Annotates a BotCommand as a command that is only exposed to Discord chat
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/MinecraftExclusiveCommand.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/annotation/MinecraftExclusiveCommand.kt
similarity index 81%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/MinecraftExclusiveCommand.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/annotation/MinecraftExclusiveCommand.kt
index 9611d52..adbc00b 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/MinecraftExclusiveCommand.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/annotation/MinecraftExclusiveCommand.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.commands.annotations
+package gg.obsidian.discordbridge.command.annotation
 
 /**
  * Annotates a BotCommand as a command that is only exposed as a Minecraft console command
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/PrivateResponse.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/annotation/PrivateResponse.kt
similarity index 90%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/PrivateResponse.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/annotation/PrivateResponse.kt
index fe5d10d..009a45a 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/PrivateResponse.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/annotation/PrivateResponse.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.commands.annotations
+package gg.obsidian.discordbridge.command.annotation
 
 /**
  * Annotates a BotCommand as a command that will return its output privately to the invoker using
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/TaggedResponse.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/annotation/TaggedResponse.kt
similarity index 86%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/TaggedResponse.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/annotation/TaggedResponse.kt
index ebcb073..526bdfc 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/annotations/TaggedResponse.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/annotation/TaggedResponse.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.commands.annotations
+package gg.obsidian.discordbridge.command.annotation
 
 /**
  * Annotates a BotCommand as a command where the response will be prepended with "@invokerName | "
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/BotControllerManager.kt
similarity index 98%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/BotControllerManager.kt
index 1165d94..65a3c3e 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/BotControllerManager.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/BotControllerManager.kt
@@ -1,12 +1,12 @@
-package gg.obsidian.discordbridge.commands.controllers
+package gg.obsidian.discordbridge.command.controller
 
 import gg.obsidian.discordbridge.DiscordBridge
-import gg.obsidian.discordbridge.commands.*
-import gg.obsidian.discordbridge.commands.annotations.*
+import gg.obsidian.discordbridge.command.*
+import gg.obsidian.discordbridge.command.annotation.*
 import gg.obsidian.discordbridge.discord.Connection
-import gg.obsidian.discordbridge.util.Cfg
+import gg.obsidian.discordbridge.util.enum.Cfg
 import gg.obsidian.discordbridge.util.MarkdownToMinecraftSeralizer
-import gg.obsidian.discordbridge.util.Script
+import gg.obsidian.discordbridge.util.config.Script
 import gg.obsidian.discordbridge.util.UtilFunctions.noSpace
 import gg.obsidian.discordbridge.util.UtilFunctions.stripColor
 import gg.obsidian.discordbridge.util.UtilFunctions.toDiscordChatMessage
@@ -14,7 +14,7 @@ import gg.obsidian.discordbridge.util.UtilFunctions.toMinecraftChatMessage
 import net.dv8tion.jda.core.Permission
 import java.lang.reflect.Method
 import java.util.*
-import gg.obsidian.discordbridge.util.ChatColor as CC
+import gg.obsidian.discordbridge.util.enum.ChatColor as CC
 
 /**
  * A class that manages an assortment of IBotControllers and allows dynamic access to a configurable assortment
@@ -134,7 +134,7 @@ class BotControllerManager {
      * @return true if a trigger was found and successfully responded to, false otherwise
      */
     private fun sendScriptedResponse(event: IEventWrapper): Boolean {
-        val responses = DiscordBridge.getConfig(Cfg.SCRIPT).getList<HashMap<String, Any>>("responses").castTo({Script(it)})
+        val responses = DiscordBridge.getConfig(Cfg.SCRIPT).getList<HashMap<String, Any>>("responses").castTo({ Script(it) })
 
         var response: Script? = null
         for (r in responses) {
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/FunCommandsController.kt
similarity index 94%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/FunCommandsController.kt
index e438a89..dd63a55 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/FunCommandsController.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/FunCommandsController.kt
@@ -1,13 +1,13 @@
-package gg.obsidian.discordbridge.commands.controllers
+package gg.obsidian.discordbridge.command.controller
 
 import com.michaelwflaherty.cleverbotapi.CleverBotQuery
 import gg.obsidian.discordbridge.DiscordBridge
-import gg.obsidian.discordbridge.commands.IEventWrapper
-import gg.obsidian.discordbridge.commands.annotations.BotCommand
-import gg.obsidian.discordbridge.commands.annotations.TaggedResponse
-import gg.obsidian.discordbridge.util.Cfg
-import gg.obsidian.discordbridge.util.Rating
-import gg.obsidian.discordbridge.util.Respect
+import gg.obsidian.discordbridge.command.IEventWrapper
+import gg.obsidian.discordbridge.command.annotation.BotCommand
+import gg.obsidian.discordbridge.command.annotation.TaggedResponse
+import gg.obsidian.discordbridge.util.enum.Cfg
+import gg.obsidian.discordbridge.util.config.Rating
+import gg.obsidian.discordbridge.util.config.Respect
 import java.util.*
 import kotlin.collections.LinkedHashMap
 
@@ -75,7 +75,7 @@ class FunCommandsController : IBotController {
     private fun f(event: IEventWrapper): String {
         DiscordBridge.logDebug("user ${event.senderName}} pays respects")
         var totalRespects = DiscordBridge.getConfig(Cfg.F).getInteger("total-respects", 0)
-        val responses = DiscordBridge.getConfig(Cfg.F).getList<LinkedHashMap<String, Any>>("responses").castTo({Respect(it)})
+        val responses = DiscordBridge.getConfig(Cfg.F).getList<LinkedHashMap<String, Any>>("responses").castTo({ Respect(it) })
         val totalWeight = responses.sumBy { it.weight }
         var rand = Random().nextInt(totalWeight) + 1
         var found: Respect? = null
@@ -138,7 +138,7 @@ class FunCommandsController : IBotController {
     @TaggedResponse
     private fun rate(event: IEventWrapper, thingToRate: String): String {
         DiscordBridge.logDebug("user ${event.senderName} requests a rating")
-        val responses = DiscordBridge.getConfig(Cfg.RATE).getList<LinkedHashMap<String, Any>>("responses").castTo({Rating(it)})
+        val responses = DiscordBridge.getConfig(Cfg.RATE).getList<LinkedHashMap<String, Any>>("responses").castTo({ Rating(it) })
 
         var rateOutOf = DiscordBridge.getConfig(Cfg.RATE).getInteger("rate-out-of", 10)
         if (rateOutOf > 1000000) rateOutOf = 1000000
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/IBotController.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/IBotController.kt
similarity index 82%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/IBotController.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/IBotController.kt
index fa9314b..690b825 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/IBotController.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/IBotController.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.commands.controllers
+package gg.obsidian.discordbridge.command.controller
 
 /**
  * Controls a number of commands that can be bulk applied to a BotControllerManager
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/UtilCommandsController.kt
similarity index 97%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/UtilCommandsController.kt
index 914db3f..a58b2d8 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/commands/controllers/UtilCommandsController.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/UtilCommandsController.kt
@@ -1,14 +1,14 @@
-package gg.obsidian.discordbridge.commands.controllers
+package gg.obsidian.discordbridge.command.controller
 
 import gg.obsidian.discordbridge.DiscordBridge
 import gg.obsidian.discordbridge.UserAliasConfig
-import gg.obsidian.discordbridge.commands.*
-import gg.obsidian.discordbridge.commands.annotations.*
+import gg.obsidian.discordbridge.command.*
+import gg.obsidian.discordbridge.command.annotation.*
 import gg.obsidian.discordbridge.discord.Connection
-import gg.obsidian.discordbridge.util.Cfg
-import gg.obsidian.discordbridge.util.ChatColor as CC
+import gg.obsidian.discordbridge.util.enum.Cfg
+import gg.obsidian.discordbridge.util.enum.ChatColor as CC
 import gg.obsidian.discordbridge.util.UtilFunctions.stripColor
-import gg.obsidian.discordbridge.wrappers.IDbPlayer
+import gg.obsidian.discordbridge.wrapper.IDbPlayer
 import net.dv8tion.jda.core.entities.ChannelType
 import java.util.*
 
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
index eb203e6..d586ab8 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
@@ -1,7 +1,7 @@
 package gg.obsidian.discordbridge.discord
 
 import gg.obsidian.discordbridge.DiscordBridge
-import gg.obsidian.discordbridge.util.Cfg
+import gg.obsidian.discordbridge.util.enum.Cfg
 import net.dv8tion.jda.core.AccountType
 import net.dv8tion.jda.core.JDA
 import net.dv8tion.jda.core.JDABuilder
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
index e8a285a..121c1a5 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
@@ -1,11 +1,10 @@
 package gg.obsidian.discordbridge.discord
 
 import gg.obsidian.discordbridge.DiscordBridge
-import gg.obsidian.discordbridge.commands.DiscordMessageWrapper
-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.util.Cfg
+import gg.obsidian.discordbridge.command.DiscordMessageWrapper
+import gg.obsidian.discordbridge.command.controller.BotControllerManager
+import gg.obsidian.discordbridge.command.controller.FunCommandsController
+import gg.obsidian.discordbridge.command.controller.UtilCommandsController
 import gg.obsidian.discordbridge.util.UrlAttachment
 import net.dv8tion.jda.core.entities.ChannelType
 import net.dv8tion.jda.core.events.message.MessageReceivedEvent
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/ReadyListener.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/ReadyListener.kt
deleted file mode 100644
index bb78f59..0000000
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/ReadyListener.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package gg.obsidian.discordbridge.discord
-
-import net.dv8tion.jda.core.events.Event
-import net.dv8tion.jda.core.events.ReadyEvent
-import net.dv8tion.jda.core.hooks.EventListener
-
-class ReadyListener : EventListener {
-    override fun onEvent(event: Event?) {
-        if (event is ReadyEvent) {
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt
index 4232391..51c1d45 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt
@@ -1,7 +1,9 @@
 package gg.obsidian.discordbridge.util
 
 import gg.obsidian.discordbridge.DiscordBridge
-import gg.obsidian.discordbridge.wrappers.IDbPlayer
+import gg.obsidian.discordbridge.util.enum.Cfg
+import gg.obsidian.discordbridge.util.enum.ChatColor
+import gg.obsidian.discordbridge.wrapper.IDbPlayer
 
 /**
  * Various utility functions
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Rating.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/Rating.kt
similarity index 94%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Rating.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/Rating.kt
index 983cb87..c00f8f0 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Rating.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/Rating.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.util
+package gg.obsidian.discordbridge.util.config
 
 //TODO: Make null safe
 /**
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Respect.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/Respect.kt
similarity index 91%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Respect.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/Respect.kt
index 950d6bf..03e32cd 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Respect.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/Respect.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.util
+package gg.obsidian.discordbridge.util.config
 
 //TODO: make null safe
 /**
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Script.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/Script.kt
similarity index 96%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Script.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/Script.kt
index f5c6e14..d029fce 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/Script.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/Script.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.util
+package gg.obsidian.discordbridge.util.config
 
 /**
  * Represents a Script entry in script.yml
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UserAlias.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/UserAlias.kt
similarity index 89%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UserAlias.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/UserAlias.kt
index 7a2e571..3d37a20 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UserAlias.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/UserAlias.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.util
+package gg.obsidian.discordbridge.util.config
 
 //TODO: make null safe
 /**
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/ChatColor.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/enum/ChatColor.kt
similarity index 98%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/ChatColor.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/enum/ChatColor.kt
index 8e41cb1..6e2df0e 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/ChatColor.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/enum/ChatColor.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.util
+package gg.obsidian.discordbridge.util.enum
 
 import org.apache.commons.lang.Validate
 import java.util.regex.Pattern
@@ -104,7 +104,7 @@ enum class ChatColor(
             val b = textToTranslate.toCharArray()
             for (i in 0 until b.size - 1) {
                 if (b[i] == altColorChar && "0123456789AaBbCcDdEeFfKkLlMmNnOoRr".indexOf(b[i + 1]) > -1) {
-                    b[i] = ChatColor.getColorChar()
+                    b[i] = getColorChar()
                     b[i + 1] = Character.toLowerCase(b[i + 1])
                 }
             }
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/ConfigTypes.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/enum/ConfigTypes.kt
similarity index 80%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/ConfigTypes.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/enum/ConfigTypes.kt
index bae04be..1eb212a 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/ConfigTypes.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/enum/ConfigTypes.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.util
+package gg.obsidian.discordbridge.util.enum
 
 enum class Cfg(val filename: String) {
     CONFIG("config"),
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbCommand.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbCommand.kt
similarity index 54%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbCommand.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbCommand.kt
index b4bd7e2..a266d7b 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbCommand.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbCommand.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
 interface IDbCommand {
     fun getName(): String
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbCommandSender.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbCommandSender.kt
similarity index 81%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbCommandSender.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbCommandSender.kt
index f970598..79eadb9 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbCommandSender.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbCommandSender.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
 import java.util.*
 
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbConsoleSender.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbConsoleSender.kt
similarity index 53%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbConsoleSender.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbConsoleSender.kt
index 0a450cb..a325213 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbConsoleSender.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbConsoleSender.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
 interface IDbConsoleSender : IDbCommandSender {
 }
\ No newline at end of file
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbLogger.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbLogger.kt
similarity index 88%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbLogger.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbLogger.kt
index 03ed74a..33fd34a 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbLogger.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbLogger.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
 // https://github.com/CraftIRC/4/blob/master/src/main/java/org/kitteh/craftirc/util/Logger.java
 interface IDbLogger {
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbPlayer.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbPlayer.kt
similarity index 70%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbPlayer.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbPlayer.kt
index 0bd5042..1c44307 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbPlayer.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbPlayer.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
 interface IDbPlayer : IDbCommandSender {
     fun getWorld(): IDbWorld
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbScheduler.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbScheduler.kt
similarity index 59%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbScheduler.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbScheduler.kt
index 0db52b4..cecf62d 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbScheduler.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbScheduler.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
 interface IDbScheduler {
     fun runAsyncTask(task: Runnable)
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbServer.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbServer.kt
similarity index 83%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbServer.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbServer.kt
index 7248584..b8c1e28 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbServer.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbServer.kt
@@ -1,6 +1,6 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
-import gg.obsidian.discordbridge.commands.DiscordCommandSender
+import gg.obsidian.discordbridge.command.DiscordCommandSender
 import gg.obsidian.discordbridge.util.UrlAttachment
 import java.util.*
 
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbWorld.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbWorld.kt
similarity index 53%
rename from discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbWorld.kt
rename to discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbWorld.kt
index 5bc4631..a000001 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrappers/IDbWorld.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbWorld.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
 interface IDbWorld {
     fun getName(): String
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/CommandWrapper.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/CommandWrapper.kt
index 2ca4dc7..6eba976 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/CommandWrapper.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/CommandWrapper.kt
@@ -1,6 +1,6 @@
 package gg.obsidian.discordbridge
 
-import gg.obsidian.discordbridge.commands.Command
+import gg.obsidian.discordbridge.command.Command
 import net.minecraft.command.CommandBase
 import net.minecraft.command.ICommand
 import net.minecraft.command.ICommandSender
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordRCon.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordRCon.kt
index 7c12bf1..defd85a 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordRCon.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordRCon.kt
@@ -1,6 +1,6 @@
 package gg.obsidian.discordbridge
 
-import gg.obsidian.discordbridge.commands.DiscordCommandSender
+import gg.obsidian.discordbridge.command.DiscordCommandSender
 import net.minecraft.network.rcon.RConConsoleSource
 import net.minecraft.server.MinecraftServer
 import net.minecraft.util.text.ITextComponent
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt
index ec1c748..0c686a8 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt
@@ -1,6 +1,6 @@
 package gg.obsidian.discordbridge
 
-import gg.obsidian.discordbridge.wrappers.DbForgePlayer
+import gg.obsidian.discordbridge.wrapper.DbForgePlayer
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.entity.player.EntityPlayerMP
 import net.minecraft.util.text.TextComponentString
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/ForgeDiscordBridge.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/ForgeDiscordBridge.kt
index d666e0b..9fe065c 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/ForgeDiscordBridge.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/ForgeDiscordBridge.kt
@@ -1,6 +1,6 @@
 package gg.obsidian.discordbridge
 
-import gg.obsidian.discordbridge.wrappers.DbForgeServer
+import gg.obsidian.discordbridge.wrapper.DbForgeServer
 import net.minecraftforge.fml.common.Mod
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent
 import net.minecraftforge.fml.common.event.FMLServerStartedEvent
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeCommandSender.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeCommandSender.kt
similarity index 94%
rename from discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeCommandSender.kt
rename to discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeCommandSender.kt
index 6ba96e7..ba862c2 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeCommandSender.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeCommandSender.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
 import net.minecraft.util.text.TextComponentString
 import java.util.*
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeConsoleSender.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeConsoleSender.kt
similarity index 94%
rename from discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeConsoleSender.kt
rename to discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeConsoleSender.kt
index df7fe00..ffbe708 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeConsoleSender.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeConsoleSender.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
 import net.minecraft.network.rcon.RConConsoleSource
 import net.minecraft.util.text.TextComponentString
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeLogger.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeLogger.kt
similarity index 92%
rename from discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeLogger.kt
rename to discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeLogger.kt
index 1058ad2..fb711d6 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeLogger.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeLogger.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
 import org.apache.logging.log4j.Logger
 
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgePlayer.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgePlayer.kt
similarity index 95%
rename from discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgePlayer.kt
rename to discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgePlayer.kt
index 2813f27..7024461 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgePlayer.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgePlayer.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
 import net.minecraft.entity.player.EntityPlayer
 import net.minecraft.util.text.TextComponentString
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeScheduler.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeScheduler.kt
similarity index 74%
rename from discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeScheduler.kt
rename to discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeScheduler.kt
index e25eb5a..8433380 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeScheduler.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeScheduler.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
 class DbForgeScheduler : IDbScheduler {
     override fun runAsyncTask(task: Runnable) {
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeServer.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeServer.kt
similarity index 95%
rename from discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeServer.kt
rename to discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeServer.kt
index 1bb0dd1..93781e8 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeServer.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeServer.kt
@@ -1,8 +1,8 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
 import gg.obsidian.discordbridge.ForgeDiscordBridge
 import gg.obsidian.discordbridge.DiscordRCon
-import gg.obsidian.discordbridge.commands.DiscordCommandSender
+import gg.obsidian.discordbridge.command.DiscordCommandSender
 import gg.obsidian.discordbridge.util.UrlAttachment
 import net.minecraft.util.text.TextComponentString
 import net.minecraft.util.text.event.ClickEvent
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeWorld.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeWorld.kt
similarity index 82%
rename from discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeWorld.kt
rename to discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeWorld.kt
index e834107..133c2db 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbForgeWorld.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeWorld.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
 import net.minecraft.world.World
 
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/CommandWrapper.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/CommandWrapper.kt
index 83434d2..72588fe 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/CommandWrapper.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/CommandWrapper.kt
@@ -1,7 +1,7 @@
 package gg.obsidian.discordbridge
 
-import gg.obsidian.discordbridge.commands.Command
-import gg.obsidian.discordbridge.wrappers.DbSpongePlayer
+import gg.obsidian.discordbridge.command.Command
+import gg.obsidian.discordbridge.wrapper.DbSpongePlayer
 import org.spongepowered.api.command.CommandCallable
 import org.spongepowered.api.command.CommandResult
 import org.spongepowered.api.command.CommandSource
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordRcon.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordRcon.kt
index 03010d7..62df04f 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordRcon.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordRcon.kt
@@ -1,6 +1,6 @@
 package gg.obsidian.discordbridge
 
-import gg.obsidian.discordbridge.commands.DiscordCommandSender
+import gg.obsidian.discordbridge.command.DiscordCommandSender
 import org.spongepowered.api.command.CommandSource
 import org.spongepowered.api.command.source.ConsoleSource
 import org.spongepowered.api.service.context.Context
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/SpongeDiscordBridge.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/SpongeDiscordBridge.kt
index 7f5e39c..eb0976d 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/SpongeDiscordBridge.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/SpongeDiscordBridge.kt
@@ -1,8 +1,8 @@
 package gg.obsidian.discordbridge
 
 import gg.obsidian.discordbridge.util.unwrap
-import gg.obsidian.discordbridge.wrappers.DbSpongePlayer
-import gg.obsidian.discordbridge.wrappers.DbSpongeServer
+import gg.obsidian.discordbridge.wrapper.DbSpongePlayer
+import gg.obsidian.discordbridge.wrapper.DbSpongeServer
 import org.spongepowered.api.Game
 import org.spongepowered.api.config.DefaultConfig
 import org.spongepowered.api.event.Listener
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongeLogger.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeLogger.kt
similarity index 92%
rename from discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongeLogger.kt
rename to discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeLogger.kt
index fd07ffc..d2e39b4 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongeLogger.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeLogger.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
 import org.slf4j.Logger
 
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongePlayer.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongePlayer.kt
similarity index 95%
rename from discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongePlayer.kt
rename to discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongePlayer.kt
index 09b0be2..a217d61 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongePlayer.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongePlayer.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
 import org.spongepowered.api.data.key.Keys
 import org.spongepowered.api.entity.living.player.Player
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongeScheduler.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeScheduler.kt
similarity index 87%
rename from discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongeScheduler.kt
rename to discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeScheduler.kt
index e451a47..b68fa8b 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongeScheduler.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeScheduler.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
 import gg.obsidian.discordbridge.SpongeDiscordBridge
 import org.spongepowered.api.Game
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongeServer.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeServer.kt
similarity index 95%
rename from discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongeServer.kt
rename to discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeServer.kt
index 5fea852..7ceb969 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongeServer.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeServer.kt
@@ -1,8 +1,8 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
 import gg.obsidian.discordbridge.DiscordRcon
 import gg.obsidian.discordbridge.SpongeDiscordBridge
-import gg.obsidian.discordbridge.commands.DiscordCommandSender
+import gg.obsidian.discordbridge.command.DiscordCommandSender
 import gg.obsidian.discordbridge.util.UrlAttachment
 import gg.obsidian.discordbridge.util.unwrap
 import org.spongepowered.api.Game
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongeWorld.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeWorld.kt
similarity index 81%
rename from discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongeWorld.kt
rename to discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeWorld.kt
index 8004f18..6016cb0 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrappers/DbSpongeWorld.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeWorld.kt
@@ -1,4 +1,4 @@
-package gg.obsidian.discordbridge.wrappers
+package gg.obsidian.discordbridge.wrapper
 
 import org.spongepowered.api.world.World
 

From 3d46425a6ab01b404d7d582796cb38f5c437884f Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Tue, 6 Feb 2018 18:33:22 -0600
Subject: [PATCH 25/30] Standardize bot playing message across all versions

---
 .../gg/obsidian/discordbridge/wrapper/DbBukkitServer.kt  | 6 +-----
 .../gg/obsidian/discordbridge/discord/Connection.kt      | 2 +-
 .../gg/obsidian/discordbridge/wrapper/IDbServer.kt       | 4 +---
 .../gg/obsidian/discordbridge/wrapper/DbForgeServer.kt   | 9 ++-------
 .../gg/obsidian/discordbridge/wrapper/DbSpongeServer.kt  | 6 +-----
 5 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitServer.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitServer.kt
index a124cca..10e79fb 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitServer.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitServer.kt
@@ -28,11 +28,7 @@ class DbBukkitServer(val plugin: BukkitDiscordBridge, val bukkitServer: Server)
         return DbBukkitScheduler(plugin, bukkitServer.scheduler)
     }
 
-    override fun getVersion(): String {
-        return bukkitServer.bukkitVersion.split("-")[0]
-    }
-
-    override fun getMinecraftShortVersion(): String {
+    override fun getMinecraftVersion(): String {
         return bukkitServer.bukkitVersion.split("-")[0]
     }
 
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
index d586ab8..bd29ff2 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
@@ -113,7 +113,7 @@ object Connection: Runnable {
         JDA = builder.buildBlocking()
         listener = Listener()
         JDA.addEventListener(listener)
-        JDA.presence.game = Game.of("Minecraft ${DiscordBridge.getServer().getMinecraftShortVersion()}")
+        JDA.presence.game = Game.of("Minecraft ${DiscordBridge.getServer().getMinecraftVersion()}")
         if (serverReady) send(DiscordBridge.getConfig(Cfg.CONFIG).getString("templates.discord.server-start", "Server started!"), getRelayChannel())
         jdaReady = true
     }
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbServer.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbServer.kt
index b8c1e28..b859671 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbServer.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbServer.kt
@@ -8,9 +8,7 @@ interface IDbServer {
 
     fun getScheduler(): IDbScheduler
 
-    fun getVersion(): String
-
-    fun getMinecraftShortVersion(): String
+    fun getMinecraftVersion(): String
 
     fun getPlayer(uuid: UUID): IDbPlayer?
 
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeServer.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeServer.kt
index 93781e8..6b7b17b 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeServer.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeServer.kt
@@ -27,13 +27,8 @@ class DbForgeServer(private val mod: ForgeDiscordBridge) : IDbServer {
         return DbForgeScheduler()
     }
 
-    // TODO
-    override fun getVersion(): String {
-        return "Minecraft Forge " + ForgeVersion.mcVersion
-    }
-
-    override fun getMinecraftShortVersion(): String {
-        return "Minecraft Forge " + ForgeVersion.mcVersion
+    override fun getMinecraftVersion(): String {
+        return ForgeVersion.mcVersion
     }
 
     override fun getPlayer(uuid: UUID): IDbPlayer? {
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeServer.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeServer.kt
index 7ceb969..bac40de 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeServer.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeServer.kt
@@ -29,11 +29,7 @@ class DbSpongeServer(private val plugin: SpongeDiscordBridge, private val game:
         return DbSpongeScheduler(plugin, game)
     }
 
-    override fun getVersion(): String {
-        return game.platform.minecraftVersion.name
-    }
-
-    override fun getMinecraftShortVersion(): String {
+    override fun getMinecraftVersion(): String {
         return game.platform.minecraftVersion.name
     }
 

From 1c1f001d45ee9d48d58ff9186aa78e7cd7d11710 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Wed, 7 Feb 2018 00:02:58 -0600
Subject: [PATCH 26/30] Miscellaneous bikeshedding

Make sure all files terminate in newlines
Fix various lint warnings
Shuffle variable declarations
---
 LICENSE-THIRD-PARTY.txt                       |   2 +-
 NOTICE-THIRD-PARTY.txt                        |   2 +-
 build.gradle                                  |   8 +-
 .../discordbridge/BukkitDiscordBridge.kt      |   2 -
 .../gg/obsidian/discordbridge/DiscordRCon.kt  |   5 +-
 .../obsidian/discordbridge/EventListener.kt   |   4 +-
 .../discordbridge/wrapper/DbBukkitCommand.kt  |   3 +-
 .../wrapper/DbBukkitConsoleSender.kt          |   6 +-
 .../discordbridge/wrapper/DbBukkitLogger.kt   |   3 +-
 .../discordbridge/wrapper/DbBukkitPlayer.kt   |   5 +-
 .../wrapper/DbBukkitScheduler.kt              |   9 +-
 .../discordbridge/wrapper/DbBukkitServer.kt   |   9 +-
 .../discordbridge/wrapper/DbBukkitWorld.kt    |   5 +-
 .../src/main/resources/plugin.yml             |   2 +-
 discordbridge-core/build.gradle               |   2 +-
 .../discordbridge/ConfigurationNode.kt        | 180 +++---------------
 .../obsidian/discordbridge/DiscordBridge.kt   |  12 +-
 .../obsidian/discordbridge/UserAliasConfig.kt |   2 +-
 .../command/DiscordCommandSender.kt           |   2 +-
 .../command/DiscordMessageWrapper.kt          |   2 -
 .../command/MinecraftChatEventWrapper.kt      |   3 +-
 .../command/MinecraftCommandWrapper.kt        |   3 +-
 .../command/annotation/PrivateResponse.kt     |   2 +-
 .../command/annotation/TaggedResponse.kt      |   2 +-
 .../controller/BotControllerManager.kt        |   1 -
 .../controller/FunCommandsController.kt       |   1 -
 .../controller/UtilCommandsController.kt      |   3 +-
 .../discordbridge/discord/Connection.kt       |   2 +-
 .../discordbridge/discord/Listener.kt         |  19 +-
 .../util/MarkdownToMinecraftSeralizer.kt      |   8 +-
 .../discordbridge/util/UrlAttachment.kt       |   2 +-
 .../discordbridge/util/UtilFunctions.kt       |   3 +-
 .../discordbridge/util/config/Rating.kt       |  20 +-
 .../discordbridge/util/config/Respect.kt      |   2 +-
 .../discordbridge/util/config/Script.kt       |  28 ++-
 .../discordbridge/util/config/UserAlias.kt    |   2 +-
 .../discordbridge/util/enum/ChatColor.kt      |   2 +-
 .../discordbridge/util/enum/ConfigTypes.kt    |   2 +-
 .../discordbridge/wrapper/IDbCommand.kt       |   2 +-
 .../discordbridge/wrapper/IDbCommandSender.kt |   7 +-
 .../discordbridge/wrapper/IDbConsoleSender.kt |   3 +-
 .../discordbridge/wrapper/IDbLogger.kt        |  10 +-
 .../discordbridge/wrapper/IDbPlayer.kt        |   3 +-
 .../discordbridge/wrapper/IDbScheduler.kt     |   2 +-
 .../discordbridge/wrapper/IDbServer.kt        |  20 +-
 .../discordbridge/wrapper/IDbWorld.kt         |   2 +-
 .../src/main/resources/8ball.yml              |   2 +-
 .../src/main/resources/aliases.yml            |   2 +-
 discordbridge-core/src/main/resources/f.yml   |   2 +-
 .../src/main/resources/insult.yml             |   2 +-
 .../src/main/resources/rate.yml               |   2 +-
 .../src/main/resources/script.yml             |   2 +-
 .../obsidian/discordbridge/CommandWrapper.kt  |   2 +-
 .../gg/obsidian/discordbridge/DiscordRCon.kt  |   4 +-
 .../gg/obsidian/discordbridge/EventHandler.kt |   3 +-
 .../discordbridge/ForgeDiscordBridge.kt       |  18 +-
 .../wrapper/DbForgeCommandSender.kt           |   3 +-
 .../wrapper/DbForgeConsoleSender.kt           |   3 +-
 .../discordbridge/wrapper/DbForgeLogger.kt    |   3 +-
 .../discordbridge/wrapper/DbForgePlayer.kt    |   5 +-
 .../discordbridge/wrapper/DbForgeScheduler.kt |   2 +-
 .../discordbridge/wrapper/DbForgeServer.kt    |   8 +-
 .../discordbridge/wrapper/DbForgeWorld.kt     |   3 +-
 discordbridge-sponge/build.gradle             |   2 +-
 .../gg/obsidian/discordbridge/DiscordRcon.kt  |   3 +-
 .../discordbridge/SpongeDiscordBridge.kt      |  23 +--
 .../discordbridge/util/UtilFunctions.kt       |   2 +-
 .../discordbridge/wrapper/DbSpongeLogger.kt   |   3 +-
 .../discordbridge/wrapper/DbSpongePlayer.kt   |   3 +-
 .../wrapper/DbSpongeScheduler.kt              |   5 +-
 .../discordbridge/wrapper/DbSpongeServer.kt   |   8 +-
 .../discordbridge/wrapper/DbSpongeWorld.kt    |   3 +-
 settings.gradle                               |   1 -
 todo                                          |   4 -
 74 files changed, 165 insertions(+), 377 deletions(-)

diff --git a/LICENSE-THIRD-PARTY.txt b/LICENSE-THIRD-PARTY.txt
index 670dc41..be6603b 100644
--- a/LICENSE-THIRD-PARTY.txt
+++ b/LICENSE-THIRD-PARTY.txt
@@ -204,4 +204,4 @@
    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
+limitations under the License.
diff --git a/NOTICE-THIRD-PARTY.txt b/NOTICE-THIRD-PARTY.txt
index 218c5b3..9a4d456 100644
--- a/NOTICE-THIRD-PARTY.txt
+++ b/NOTICE-THIRD-PARTY.txt
@@ -2,4 +2,4 @@ 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
+Copyright (c) 2008 John MacFarlane (http://github.com/jgm/peg-markdown)
diff --git a/build.gradle b/build.gradle
index c9495d0..039c3ca 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,14 +31,16 @@ subprojects {
     }
 
     group = 'gg.obsidian'
-    version = '3.1.0'
+    version = '4.0.0'
     description = """Bridge chat between Minecraft and Discord"""
     ext.url = 'https://github.com/the-obsidian/DiscordBridge'
+    ext.modid = 'discordbridge-obsidian'
     processResources {
         filter ReplaceTokens, tokens: [
                 'DESCRIPTION': project.property('description'),
                 'URL'        : project.property('url'),
-                'VERSION'    : project.property('version')
+                'VERSION'    : project.property('version'),
+                'MODID'      : project.property('modid')
         ]
     }
 
@@ -69,4 +71,4 @@ subprojects {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/BukkitDiscordBridge.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/BukkitDiscordBridge.kt
index 9a90749..6c5e456 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/BukkitDiscordBridge.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/BukkitDiscordBridge.kt
@@ -9,7 +9,6 @@ import org.slf4j.LoggerFactory
  * The primary Plugin class that maintains the plugin's connection with Bukkit
  */
 class BukkitDiscordBridge : JavaPlugin() {
-
     private lateinit var instance: BukkitDiscordBridge
     private lateinit var logger: Logger
 
@@ -41,5 +40,4 @@ class BukkitDiscordBridge : JavaPlugin() {
     override fun onDisable() {
         DiscordBridge.handleServerStop()
     }
-
 }
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordRCon.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordRCon.kt
index 3aab6fa..bbd7d4e 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordRCon.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/DiscordRCon.kt
@@ -11,7 +11,6 @@ import org.bukkit.permissions.PermissionAttachmentInfo
 import org.bukkit.plugin.Plugin
 
 class DiscordRCon(val discordSender: DiscordCommandSender, val base: ConsoleCommandSender) : RemoteConsoleCommandSender {
-
     override fun sendMessage(message: String) {
         discordSender.sendMessage(message)
     }
@@ -84,6 +83,4 @@ class DiscordRCon(val discordSender: DiscordCommandSender, val base: ConsoleComm
     override fun setOp(value: Boolean) {
         return base.setOp(value)
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
index ee8a945..4cdac14 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/EventListener.kt
@@ -16,7 +16,6 @@ import org.bukkit.event.player.PlayerQuitEvent
 import org.dynmap.DynmapWebChatEvent
 
 class EventListener: Listener, CommandExecutor {
-
     override fun onCommand(sender: CommandSender, command: Command, label: String, args: Array<out String>): Boolean {
         return if (sender is org.bukkit.entity.Player) {
             val wp = DbBukkitPlayer(sender)
@@ -50,5 +49,4 @@ class EventListener: Listener, CommandExecutor {
     fun onDynmapCatEvent(event: DynmapWebChatEvent) {
         DiscordBridge.handleDynmapChat(event.name, event.message)
     }
-
-}
\ No newline at end of file
+}
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitCommand.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitCommand.kt
index e410be8..922cabd 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitCommand.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitCommand.kt
@@ -6,5 +6,4 @@ class DbBukkitCommand(val cmd: Command) : IDbCommand {
     override fun getName(): String {
         return cmd.name
     }
-
-}
\ No newline at end of file
+}
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitConsoleSender.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitConsoleSender.kt
index cc1ff56..b49a964 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitConsoleSender.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitConsoleSender.kt
@@ -3,8 +3,7 @@ package gg.obsidian.discordbridge.wrapper
 import org.bukkit.command.ConsoleCommandSender
 import java.util.*
 
-class DbBukkitConsoleSender(val bukkitConsoleSender: ConsoleCommandSender) : IDbConsoleSender {
-
+class DbBukkitConsoleSender(private val bukkitConsoleSender: ConsoleCommandSender) : IDbConsoleSender {
     override fun sendMessage(message: String) {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
@@ -20,5 +19,4 @@ class DbBukkitConsoleSender(val bukkitConsoleSender: ConsoleCommandSender) : IDb
     override fun getName(): String {
         return "DiscordRemote"
     }
-
-}
\ No newline at end of file
+}
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitLogger.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitLogger.kt
index 664b474..ce29006 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitLogger.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitLogger.kt
@@ -23,5 +23,4 @@ class DbBukkitLogger(private val logger: Logger) : IDbLogger {
     override fun severe(message: String, throwable: Throwable) {
         logger.log(Level.SEVERE, message, throwable)
     }
-
-}
\ No newline at end of file
+}
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitPlayer.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitPlayer.kt
index cd49180..10d1ad3 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitPlayer.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitPlayer.kt
@@ -4,7 +4,7 @@ import org.bukkit.OfflinePlayer
 import java.util.*
 
 // TODO: Add safety for when OfflinePlayer is not online
-class DbBukkitPlayer(val bukkitPlayer: OfflinePlayer) : IDbPlayer {
+class DbBukkitPlayer(private val bukkitPlayer: OfflinePlayer) : IDbPlayer {
     override fun hasPermission(permission: String): Boolean {
         return bukkitPlayer.player.hasPermission(permission)
     }
@@ -29,5 +29,4 @@ class DbBukkitPlayer(val bukkitPlayer: OfflinePlayer) : IDbPlayer {
     override fun getUUID(): UUID {
         return bukkitPlayer.uniqueId
     }
-
-}
\ No newline at end of file
+}
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitScheduler.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitScheduler.kt
index 2ac11a0..3007b9d 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitScheduler.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitScheduler.kt
@@ -3,11 +3,8 @@ package gg.obsidian.discordbridge.wrapper
 import gg.obsidian.discordbridge.BukkitDiscordBridge
 import org.bukkit.scheduler.BukkitScheduler
 
-class DbBukkitScheduler(val plugin: BukkitDiscordBridge, val bukkitScheduler: BukkitScheduler) : IDbScheduler {
-
+class DbBukkitScheduler(private val plugin: BukkitDiscordBridge, private val bukkitScheduler: BukkitScheduler) : IDbScheduler {
     override fun runAsyncTask(task: Runnable) {
-        Thread(task).start()
-        //bukkitScheduler.runTaskAsynchronously(plugin, task)
+        bukkitScheduler.runTaskAsynchronously(plugin, task)
     }
-
-}
\ No newline at end of file
+}
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitServer.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitServer.kt
index 10e79fb..f77c787 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitServer.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitServer.kt
@@ -11,7 +11,7 @@ import org.bukkit.Bukkit
 import org.bukkit.Server
 import java.util.*
 
-class DbBukkitServer(val plugin: BukkitDiscordBridge, val bukkitServer: Server) : IDbServer {
+class DbBukkitServer(private val plugin: BukkitDiscordBridge, private val bukkitServer: Server) : IDbServer {
     override fun broadcastAttachment(att: UrlAttachment) {
         val msg = ComponentBuilder("${att.sender} sent ")
                 .color(net.md_5.bungee.api.ChatColor.ITALIC)
@@ -36,10 +36,6 @@ class DbBukkitServer(val plugin: BukkitDiscordBridge, val bukkitServer: Server)
         return DbBukkitPlayer(bukkitServer.getOfflinePlayer(uuid))
     }
 
-    override fun getPlayer(name: String): IDbPlayer? {
-        return DbBukkitPlayer(bukkitServer.getOfflinePlayer(name))
-    }
-
     override fun getOnlinePlayers(): List<IDbPlayer> {
         return bukkitServer.onlinePlayers.map { DbBukkitPlayer(it) }
     }
@@ -56,5 +52,4 @@ class DbBukkitServer(val plugin: BukkitDiscordBridge, val bukkitServer: Server)
     override fun getLogger(): IDbLogger {
         return DbBukkitLogger(plugin.logger)
     }
-
-}
\ No newline at end of file
+}
diff --git a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitWorld.kt b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitWorld.kt
index 9f32ddb..aaa80dd 100644
--- a/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitWorld.kt
+++ b/discordbridge-bukkit/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbBukkitWorld.kt
@@ -2,9 +2,8 @@ package gg.obsidian.discordbridge.wrapper
 
 import org.bukkit.World
 
-class DbBukkitWorld(val bukkitWorld: World) : IDbWorld {
+class DbBukkitWorld(private val bukkitWorld: World) : IDbWorld {
     override fun getName(): String {
         return bukkitWorld.name
     }
-
-}
\ No newline at end of file
+}
diff --git a/discordbridge-bukkit/src/main/resources/plugin.yml b/discordbridge-bukkit/src/main/resources/plugin.yml
index 89d94b6..94e5c11 100644
--- a/discordbridge-bukkit/src/main/resources/plugin.yml
+++ b/discordbridge-bukkit/src/main/resources/plugin.yml
@@ -69,4 +69,4 @@ commands:
     usage: /roll <sides>
   talk:
     description: Talk to Cleverbot!
-    usage: /talk <say something>
\ No newline at end of file
+    usage: /talk <say something>
diff --git a/discordbridge-core/build.gradle b/discordbridge-core/build.gradle
index 5757d19..f8598fa 100644
--- a/discordbridge-core/build.gradle
+++ b/discordbridge-core/build.gradle
@@ -17,4 +17,4 @@ shadowJar {
     dependencies {
     }
 }
-build.dependsOn(shadowJar)
\ No newline at end of file
+build.dependsOn(shadowJar)
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/ConfigurationNode.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/ConfigurationNode.kt
index b9cdc9f..7ed4b8c 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/ConfigurationNode.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/ConfigurationNode.kt
@@ -37,7 +37,6 @@ class ConfigurationNode() : MutableMap<String, Any> {
             representer.addClassTag(UserAlias::class.java, Tag.MAP)
 
             yaml = Yaml(SafeConstructor(), representer, options)
-            //yaml = Yaml(CustomClassLoaderConstructor(DiscordBridge::class.java.classLoader), representer, options)
         }
     }
 
@@ -90,15 +89,13 @@ class ConfigurationNode() : MutableMap<String, Any> {
             stream = FileOutputStream(file)
             val writer = OutputStreamWriter(stream, "UTF-8")
             yaml!!.dump(entries2, writer)
+            writer.close()
             return true
-        } catch (e: IOException) {
-        } finally {
-            try {
-                if (stream != null) {
-                    stream.close()
-                }
-            } catch (e: IOException) {
-            }
+        }
+        catch (e: IOException) { }
+        finally {
+            try { if (stream != null) stream.close() }
+            catch (e: IOException) { }
         }
         return false
     }
@@ -127,50 +124,19 @@ class ConfigurationNode() : MutableMap<String, Any> {
         return getObject(path) ?: return default
     }
 
-    @SuppressWarnings("unchecked")
-    fun <T> getGeneric(path: String, default: T): T {
-        val o = getObject(path, default as Any)
-        return try {
-            o as T
-        } catch(e: ClassCastException) {
-            default
-        }
-    }
-
-    fun getInteger(path: String, default: Int): Int {
-        return Integer.parseInt(getObject(path, default).toString())
-    }
-
-    fun getLong(path: String, default: Long): Double {
-        return getObject(path, default).toString().toLong().toDouble()
-    }
-
-    fun getFloat(path: String, default: Float): Float {
-        return getObject(path, default).toString().toFloat()
-    }
-
-    fun getDouble(path: String, default: Double): Double {
-        return getObject(path, default).toString().toDouble()
-    }
-
-    fun getBoolean(path: String, default: Boolean): Boolean {
-        return getObject(path, default).toString().toBoolean()
-    }
-
-    fun getString(path: String): String? {
-        val o = getObject(path)
-        return o.toString()
-    }
+    fun getInteger(path: String, default: Int): Int = Integer.parseInt(getObject(path, default).toString())
+    fun getLong(path: String, default: Long): Double = getObject(path, default).toString().toLong().toDouble()
+    fun getFloat(path: String, default: Float): Float = getObject(path, default).toString().toFloat()
+    fun getDouble(path: String, default: Double): Double = getObject(path, default).toString().toDouble()
+    fun getBoolean(path: String, default: Boolean): Boolean = getObject(path, default).toString().toBoolean()
+    fun getString(path: String): String? = getObject(path).toString()
 
     fun getStrings(path: String, default: List<String>): List<String> {
         val o = getObject(path) as? List<*> ?: return default
         return o.mapTo(ArrayList()) { it.toString() }
     }
 
-    fun getString(path: String, default: String): String {
-        val o = getObject(path, default)
-        return o.toString()
-    }
+    fun getString(path: String, default: String): String = getObject(path, default).toString()
 
     @SuppressWarnings("unchecked")
     fun <T> getList(path: String): List<T> {
@@ -188,42 +154,6 @@ class ConfigurationNode() : MutableMap<String, Any> {
         }
     }
 
-    fun getMapList(path: String): List<MutableMap<String, Any>> {
-        return getList(path)
-    }
-
-    fun getNode(path: String): ConfigurationNode? {
-        var v: MutableMap<String, Any>? = null
-        v = getGeneric(path, v)
-        if (v == null)
-            return null
-        return ConfigurationNode(v)
-    }
-
-    @SuppressWarnings("unchecked")
-    fun getNodes(path: String): List<ConfigurationNode> {
-        val o: List<Any> = getList(path)
-
-        val nodes = ArrayList<ConfigurationNode>()
-        for(i in o) {
-            if (i is MutableMap<*, *>) {
-                var map: MutableMap<String, Any>
-                try {
-                    map = i as MutableMap<String, Any>
-                } catch(e: ClassCastException) {
-                    continue
-                }
-                nodes.add(ConfigurationNode(map))
-            }
-        }
-        return nodes
-    }
-
-    fun extend(other: MutableMap<String, Any>) {
-        if (other != null)
-            extendMap(this, other)
-    }
-
     companion object {
         private fun copyValue(v: Any): Any {
             when (v) {
@@ -255,67 +185,14 @@ class ConfigurationNode() : MutableMap<String, Any> {
         }
     }
 
-    fun <T> createInstance(constructorParameters: Array<Class<*>>, constructorArguments: Array<Any>): T? {
-        val typeName = getString("class")
-        try {
-            val mapTypeClass = Class.forName(typeName)
-
-            val constructorParameterWithConfiguration = arrayOfNulls<Class<*>>(constructorParameters.size+1)
-            for(i in constructorParameters.indices) { constructorParameterWithConfiguration[i] = constructorParameters[i]; }
-            constructorParameterWithConfiguration[constructorParameterWithConfiguration.size-1] = javaClass
-
-            val constructorArgumentsWithConfiguration = arrayOfNulls<Any>(constructorArguments.size+1)
-            for(i in constructorArguments.indices) { constructorArgumentsWithConfiguration[i] = constructorArguments[i]; }
-            constructorArgumentsWithConfiguration[constructorArgumentsWithConfiguration.size-1] = this
-            val constructor = mapTypeClass.getConstructor(*constructorParameterWithConfiguration)
-            @SuppressWarnings("unchecked")
-            val t = constructor.newInstance(constructorArgumentsWithConfiguration) as T
-            return t
-        } catch (e: Exception) {
-            // TODO: Remove reference to MapManager.
-            //Log.severe("Error loading maptype", e)
-            e.printStackTrace()
-        }
-        return null
-    }
+    override val size: Int get() = entries2!!.size
 
-    fun <T> createInstances(path: String, constructorParameters: Array<Class<*>>, constructorArguments: Array<Any>): List<T> {
-        val nodes = getNodes(path)
-        val instances = ArrayList<T>()
-        for(node in nodes) {
-            val instance = node.createInstance<T>(constructorParameters, constructorArguments)
-            if (instance != null) instances.add(instance)
-        }
-        return instances
-    }
-
-    override val size: Int get() {
-        return entries2!!.size
-    }
-
-    override fun isEmpty(): Boolean {
-        return entries2!!.isEmpty()
-    }
-
-    override fun containsKey(key: String): Boolean {
-        return entries2!!.containsKey(key)
-    }
-
-    override fun containsValue(value: Any): Boolean {
-        return entries2!!.containsValue(value)
-    }
-
-    override fun get(key: String): Any? {
-        return entries2!![key]
-    }
-
-    override fun put(key: String, value: Any): Any? {
-        return entries2!!.put(key, value)
-    }
-
-    override fun remove(key: String): Any? {
-        return entries2!!.remove(key)
-    }
+    override fun isEmpty(): Boolean = entries2!!.isEmpty()
+    override fun containsKey(key: String): Boolean = entries2!!.containsKey(key)
+    override fun containsValue(value: Any): Boolean = entries2!!.containsValue(value)
+    override fun get(key: String): Any? = entries2!![key]
+    override fun put(key: String, value: Any): Any? = entries2!!.put(key, value)
+    override fun remove(key: String): Any? = entries2!!.remove(key)
 
     override fun putAll(from: Map<out String, Any>) {
         entries2!!.putAll(from)
@@ -325,17 +202,9 @@ class ConfigurationNode() : MutableMap<String, Any> {
         entries2!!.clear()
     }
 
-    override val keys: MutableSet<String> get() {
-        return entries2!!.keys
-    }
-
-    override val values: MutableCollection<Any> get() {
-        return entries2!!.values
-    }
-
-    override val entries: MutableSet<MutableMap.MutableEntry<String, Any>> get() {
-        return entries2!!.entries
-    }
+    override val keys: MutableSet<String> get() = entries2!!.keys
+    override val values: MutableCollection<Any> get() = entries2!!.values
+    override val entries: MutableSet<MutableMap.MutableEntry<String, Any>> get() = entries2!!.entries
 
     private class EmptyNullRepresenter : Representer() {
 
@@ -372,5 +241,4 @@ class ConfigurationNode() : MutableMap<String, Any> {
         }
         // End of borrowed code
     }
-
-}
\ No newline at end of file
+}
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
index 4f08132..3c65953 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/DiscordBridge.kt
@@ -31,24 +31,21 @@ import java.util.*
 import gg.obsidian.discordbridge.util.enum.ChatColor as CC
 
 object DiscordBridge {
-
     private val pegDownProc = PegDownProcessor()
     private val minecraftChatControllerManager = BotControllerManager()
     private val discordChatControllerManager = BotControllerManager()
     private val minecraftCommandControllerManager = BotControllerManager()
     private val cfgNodes: MutableMap<Cfg, ConfigurationNode> = mutableMapOf()
     private lateinit var server: IDbServer
-    lateinit var logger: IDbLogger
 
-    // Temporary storage for alias linking requests
+    lateinit var logger: IDbLogger
     var requests: MutableList<UserAlias> = mutableListOf()
 
-    // Whether Multiverse-Core is installed in Bukkit
+    // Multiverse-Core support
+    lateinit var mvWorlds: ConfigurationNode
     var isMultiverse: Boolean = false
         private set(value) { field = value }
 
-    lateinit var mvWorlds: ConfigurationNode
-
     fun init(server: IDbServer, dataFolder: File, isMultiverse: Boolean = false) {
         this.server = server
         logger = this.server.getLogger()
@@ -466,5 +463,4 @@ object DiscordBridge {
     fun getServerCommands(): List<Command> {
         return minecraftCommandControllerManager.getCommands().values.toList()
     }
-
-}
\ No newline at end of file
+}
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
index 857b943..e5aad0c 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/UserAliasConfig.kt
@@ -40,4 +40,4 @@ object UserAliasConfig {
     private inline fun <reified T : Any> List<Map<String, Any>>.castTo(factory: (Map<String, Any>) -> T): List<T> {
         return this.mapTo(mutableListOf()) { factory(it) }.toList()
     }
-}
\ No newline at end of file
+}
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/DiscordCommandSender.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/DiscordCommandSender.kt
index 25b9fc4..ae74ca4 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/DiscordCommandSender.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/DiscordCommandSender.kt
@@ -11,4 +11,4 @@ class DiscordCommandSender(val senderName: String, private val channel: MessageC
         if (messages != null)
             for (m in messages) channel.sendMessage(m)
     }
-}
\ No newline at end of file
+}
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/DiscordMessageWrapper.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/DiscordMessageWrapper.kt
index 85fb321..7b1be10 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/DiscordMessageWrapper.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/DiscordMessageWrapper.kt
@@ -12,7 +12,6 @@ import net.dv8tion.jda.core.entities.MessageChannel
  * @param originalMessage the underlying Message instance
  */
 class DiscordMessageWrapper(val originalMessage: Message) : IEventWrapper {
-
     /**
      * Returns a formatted mention tag in the form <@##########>
      */
@@ -65,5 +64,4 @@ class DiscordMessageWrapper(val originalMessage: Message) : IEventWrapper {
      */
     override val senderId: String
         get() = originalMessage.author.id
-
 }
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/MinecraftChatEventWrapper.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/MinecraftChatEventWrapper.kt
index 9793a02..88fdd59 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/MinecraftChatEventWrapper.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/MinecraftChatEventWrapper.kt
@@ -10,7 +10,7 @@ import net.dv8tion.jda.core.entities.MessageChannel
  * @param player the player who triggered the event
  * @param chatMessage the contents of the message that was sent
  */
-class MinecraftChatEventWrapper(val player: IDbPlayer, val chatMessage: String) : IEventWrapper {
+class MinecraftChatEventWrapper(val player: IDbPlayer, private val chatMessage: String) : IEventWrapper {
     /**
      * The Minecraft username of the event author
      */
@@ -49,5 +49,4 @@ class MinecraftChatEventWrapper(val player: IDbPlayer, val chatMessage: String)
      */
     override val isFromRelayChannel: Boolean
         get() = true
-
 }
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/MinecraftCommandWrapper.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/MinecraftCommandWrapper.kt
index add0d52..a7260e0 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/MinecraftCommandWrapper.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/MinecraftCommandWrapper.kt
@@ -20,7 +20,7 @@ class MinecraftCommandWrapper(val sender: IDbCommandSender, val commandName: Str
      * Returns "Console" if the command was sent from the server console
      */
     override val senderName: String
-        get() = if (sender is IDbPlayer) sender.getName() else "Console"
+        get() = (sender as? IDbPlayer)?.getName() ?: "Console"
     /**
      * Returns a space-delimited string of all the arguments passed with the command
      *
@@ -56,5 +56,4 @@ class MinecraftCommandWrapper(val sender: IDbCommandSender, val commandName: Str
      */
     override val isFromRelayChannel: Boolean
         get() = true
-
 }
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/annotation/PrivateResponse.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/annotation/PrivateResponse.kt
index 009a45a..4c42618 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/annotation/PrivateResponse.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/annotation/PrivateResponse.kt
@@ -14,4 +14,4 @@ package gg.obsidian.discordbridge.command.annotation
  */
 @Target(AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.RUNTIME)
-annotation class PrivateResponse
\ No newline at end of file
+annotation class PrivateResponse
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/annotation/TaggedResponse.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/annotation/TaggedResponse.kt
index 526bdfc..22f8a7e 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/annotation/TaggedResponse.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/annotation/TaggedResponse.kt
@@ -9,4 +9,4 @@ package gg.obsidian.discordbridge.command.annotation
  */
 @Target(AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.RUNTIME)
-annotation class TaggedResponse
\ No newline at end of file
+annotation class TaggedResponse
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/BotControllerManager.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/BotControllerManager.kt
index 65a3c3e..c2bab7a 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/BotControllerManager.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/BotControllerManager.kt
@@ -23,7 +23,6 @@ import gg.obsidian.discordbridge.util.enum.ChatColor as CC
  * @see IBotController
  */
 class BotControllerManager {
-
     private val commands: MutableMap<String, Command> = mutableMapOf()
     private val controllers: MutableMap<Class<out IBotController>, IBotController> = mutableMapOf()
 
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/FunCommandsController.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/FunCommandsController.kt
index dd63a55..cc91398 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/FunCommandsController.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/FunCommandsController.kt
@@ -15,7 +15,6 @@ import kotlin.collections.LinkedHashMap
  * Controller for fun commands that have no purpose outside of amusement
  */
 class FunCommandsController : IBotController {
-
     /**
      * @return a description of this class of commands, used in the Help command
      */
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/UtilCommandsController.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/UtilCommandsController.kt
index a58b2d8..cdd630d 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/UtilCommandsController.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/UtilCommandsController.kt
@@ -16,7 +16,6 @@ import java.util.*
  * Controller for utility commands that configure the way the bot works
  */
 class UtilCommandsController : IBotController {
-
     /**
      * @return a short description of this IBotController's methods as seen in the Help command
      */
@@ -269,4 +268,4 @@ class UtilCommandsController : IBotController {
         val response = players.joinToString("\n", "The following players are currently online:\n```\n", "\n```")
         DiscordBridge.sendToDiscord(response, event.channel)
     }
-}
\ No newline at end of file
+}
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
index bd29ff2..fda09d7 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Connection.kt
@@ -138,4 +138,4 @@ object Connection: Runnable {
     private fun getServerById(id: String): Guild? {
         return JDA.guilds.firstOrNull { it.id.equals(id, true) }
     }
-}
\ No newline at end of file
+}
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
index 121c1a5..587d3b0 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/discord/Listener.kt
@@ -14,7 +14,6 @@ import net.dv8tion.jda.core.hooks.ListenerAdapter
  * Listens for events from Discord
  */
 class Listener: ListenerAdapter() {
-
     private val controllerManager = BotControllerManager()
 
     init {
@@ -116,6 +115,10 @@ class Listener: ListenerAdapter() {
                     ".pdf" -> "Adobe PDF file"
                     ".doc" -> "Microsoft Word DOC file"
                     ".docx" -> "Microsoft Word DOCX file"
+                    ".ppt" -> "Microsoft PowerPoint PPT file"
+                    ".pptx" -> "Microsoft PowerPoint PPTX file"
+                    ".xls" -> "Microsfot Excel XLS file"
+                    ".xlsx" -> "Microsoft Excel XLSX file"
 
                 // Minecraft types
                     ".schematic" -> "MCEdit Schematic file"
@@ -139,20 +142,8 @@ class Listener: ListenerAdapter() {
             if (a.isImage) hoverText += "\nDimensions: ${a.height}x${a.width}"
 
             val senderName = DiscordBridge.translateAliasesToMinecraft(event.author.name)
-
             val att = UrlAttachment(senderName, a.url, hoverText)
-
-//            val msg = ComponentBuilder(plugin.translateAliasesToMinecraft("${event.author.name} sent "))
-//                    .color(net.md_5.bungee.api.ChatColor.ITALIC)
-//                    .append("an attachment")
-//                    .color(net.md_5.bungee.api.ChatColor.RESET)
-//                    .color(net.md_5.bungee.api.ChatColor.UNDERLINE)
-//                    .event(ClickEvent(ClickEvent.Action.OPEN_URL, a.url))
-//                    .event(HoverEvent(HoverEvent.Action.SHOW_TEXT, ComponentBuilder(hoverText).create()))
-//                    .create()
-
             DiscordBridge.sendToMinecraft(att)
         }
     }
-
-}
\ No newline at end of file
+}
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/MarkdownToMinecraftSeralizer.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/MarkdownToMinecraftSeralizer.kt
index d48be44..6f07ec9 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/MarkdownToMinecraftSeralizer.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/MarkdownToMinecraftSeralizer.kt
@@ -9,7 +9,6 @@ import org.pegdown.ast.*
  * Minecraft formatting codes
  */
 class MarkdownToMinecraftSeralizer : Visitor {
-
     private var printer = Printer()
 
     /**
@@ -212,9 +211,7 @@ class MarkdownToMinecraftSeralizer : Visitor {
     }
 
     private fun visitChildren(node: SuperNode) {
-        for (child in node.children) {
-            child.accept(this)
-        }
+        for (child in node.children) child.accept(this)
     }
 
     private fun printTag(node: SuperNode, tag: String) {
@@ -222,5 +219,4 @@ class MarkdownToMinecraftSeralizer : Visitor {
         visitChildren(node, tag)
         printer.print("\u00A7r")
     }
-
-}
\ No newline at end of file
+}
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UrlAttachment.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UrlAttachment.kt
index b504a67..72a2cb7 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UrlAttachment.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UrlAttachment.kt
@@ -4,4 +4,4 @@ data class UrlAttachment(
         val sender: String,
         val url: String,
         val hoverText: String
-)
\ No newline at end of file
+)
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt
index 51c1d45..b3473aa 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt
@@ -9,7 +9,6 @@ import gg.obsidian.discordbridge.wrapper.IDbPlayer
  * Various utility functions
  */
 object UtilFunctions {
-
     /**
      * @return the input string with all whitespace removed
      */
@@ -93,4 +92,4 @@ object UtilFunctions {
         out = out.replace("%u", u).replace("%m", msg).replace("%w", w)
         return out
     }
-}
\ No newline at end of file
+}
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/Rating.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/Rating.kt
index c00f8f0..6726f57 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/Rating.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/Rating.kt
@@ -8,19 +8,9 @@ package gg.obsidian.discordbridge.util.config
  * @param low the lower bound of ratings that will trigger this message
  * @param high the upper bound of ratings that will trigger this message
  */
-data class Rating(val message: String = "%u - I rate %m %r") {
-
-    var low: Double
-    var high: Double
-
-    init {
-        low = 0.0
-        high = 0.0
-    }
-
-    constructor(map: MutableMap<String, Any>):
-            this(map["message"] as String) {
-        low = if(map["low"] is Double) map["low"] as Double else (map["low"] as Int).toDouble()
-        high = if(map["high"] is Double) map["high"] as Double else (map["high"] as Int).toDouble()
+data class Rating(val message: String = "%u - I rate %m %r", var low: Double = 0.0, var high: Double = 0.0) {
+    constructor(map: MutableMap<String, Any>): this(map["message"] as String) {
+        low  = if (map["low"] is Double)  map["low"] as Double  else (map["low"] as Int).toDouble()
+        high = if (map["high"] is Double) map["high"] as Double else (map["high"] as Int).toDouble()
     }
-}
\ No newline at end of file
+}
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/Respect.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/Respect.kt
index 03e32cd..343d274 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/Respect.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/Respect.kt
@@ -11,4 +11,4 @@ package gg.obsidian.discordbridge.util.config
 data class Respect(val message: String = "%u solemnly pays respect!", val count: Int = 1, val weight: Int = 1) {
     constructor(map: MutableMap<String, Any>):
             this(map["message"] as String, map["respects-paid"] as Int, map["weight"] as Int)
-}
\ No newline at end of file
+}
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/Script.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/Script.kt
index d029fce..97d353f 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/Script.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/Script.kt
@@ -11,12 +11,22 @@ package gg.obsidian.discordbridge.util.config
  * @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
  */
-data class Script(val triggerMC: String?, val triggerDis: String?, val responseMC: String?, val responseDis: String?,
-                  val caseSensitive: Boolean?, val requiresMention: Boolean?,
-                  val startsWith: Boolean?) {
-    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)
-
-}
\ No newline at end of file
+data class Script(
+        val triggerMC: String?,
+        val triggerDis: String?,
+        val responseMC: String?,
+        val responseDis: String?,
+        val caseSensitive: Boolean?,
+        val requiresMention: Boolean?,
+        val startsWith: Boolean?
+) {
+    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
+    )
+}
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/UserAlias.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/UserAlias.kt
index 3d37a20..1768a39 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/UserAlias.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/config/UserAlias.kt
@@ -9,4 +9,4 @@ package gg.obsidian.discordbridge.util.config
  */
 data class UserAlias(var mcUuid: String, var discordId: String) {
     constructor(map: Map<String, Any>): this(map["mcUuid"] as String, map["discordId"] as String)
-}
\ No newline at end of file
+}
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/enum/ChatColor.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/enum/ChatColor.kt
index 6e2df0e..a37e7b6 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/enum/ChatColor.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/enum/ChatColor.kt
@@ -149,4 +149,4 @@ enum class ChatColor(
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/enum/ConfigTypes.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/enum/ConfigTypes.kt
index 1eb212a..4bcb808 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/enum/ConfigTypes.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/util/enum/ConfigTypes.kt
@@ -8,4 +8,4 @@ enum class Cfg(val filename: String) {
     RATE("rate"),
     SCRIPT("script"),
     ALIAS("aliases")
-}
\ No newline at end of file
+}
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbCommand.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbCommand.kt
index a266d7b..77445af 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbCommand.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbCommand.kt
@@ -2,4 +2,4 @@ package gg.obsidian.discordbridge.wrapper
 
 interface IDbCommand {
     fun getName(): String
-}
\ No newline at end of file
+}
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbCommandSender.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbCommandSender.kt
index 79eadb9..37015b7 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbCommandSender.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbCommandSender.kt
@@ -4,7 +4,10 @@ import java.util.*
 
 interface IDbCommandSender {
     fun getName(): String
+
     fun getUUID(): UUID
-    fun sendMessage(message: String)
+
     fun hasPermission(permission: String): Boolean
-}
\ No newline at end of file
+
+    fun sendMessage(message: String)
+}
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbConsoleSender.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbConsoleSender.kt
index a325213..c78ee75 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbConsoleSender.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbConsoleSender.kt
@@ -1,4 +1,3 @@
 package gg.obsidian.discordbridge.wrapper
 
-interface IDbConsoleSender : IDbCommandSender {
-}
\ No newline at end of file
+interface IDbConsoleSender : IDbCommandSender
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbLogger.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbLogger.kt
index 33fd34a..c8b8633 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbLogger.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbLogger.kt
@@ -3,8 +3,12 @@ package gg.obsidian.discordbridge.wrapper
 // https://github.com/CraftIRC/4/blob/master/src/main/java/org/kitteh/craftirc/util/Logger.java
 interface IDbLogger {
     fun info(message: String)
-    fun warning(message: String)
-    fun warning(message: String, throwable: Throwable)
+
     fun severe(message: String)
+
     fun severe(message: String, throwable: Throwable)
-}
\ No newline at end of file
+
+    fun warning(message: String)
+
+    fun warning(message: String, throwable: Throwable)
+}
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbPlayer.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbPlayer.kt
index 1c44307..0fb1d0f 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbPlayer.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbPlayer.kt
@@ -2,5 +2,6 @@ package gg.obsidian.discordbridge.wrapper
 
 interface IDbPlayer : IDbCommandSender {
     fun getWorld(): IDbWorld
+
     fun isVanished(): Boolean
-}
\ No newline at end of file
+}
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbScheduler.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbScheduler.kt
index cecf62d..7616c26 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbScheduler.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbScheduler.kt
@@ -2,4 +2,4 @@ package gg.obsidian.discordbridge.wrapper
 
 interface IDbScheduler {
     fun runAsyncTask(task: Runnable)
-}
\ No newline at end of file
+}
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbServer.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbServer.kt
index b859671..dd629ec 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbServer.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbServer.kt
@@ -5,23 +5,19 @@ import gg.obsidian.discordbridge.util.UrlAttachment
 import java.util.*
 
 interface IDbServer {
+    fun broadcastAttachment(att: UrlAttachment)
 
-    fun getScheduler(): IDbScheduler
+    fun broadcastMessage(message: String)
 
-    fun getMinecraftVersion(): String
+    fun dispatchCommand(sender: DiscordCommandSender, command: String)
 
-    fun getPlayer(uuid: UUID): IDbPlayer?
+    fun getLogger(): IDbLogger
 
-    fun getPlayer(name: String): IDbPlayer?
+    fun getMinecraftVersion(): String
 
     fun getOnlinePlayers(): List<IDbPlayer>
 
-    fun broadcastMessage(message: String)
-
-    fun broadcastAttachment(att: UrlAttachment)
-
-    fun dispatchCommand(sender: DiscordCommandSender, command: String)
-
-    fun getLogger(): IDbLogger
+    fun getPlayer(uuid: UUID): IDbPlayer?
 
-}
\ No newline at end of file
+    fun getScheduler(): IDbScheduler
+}
diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbWorld.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbWorld.kt
index a000001..b1d2147 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbWorld.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/wrapper/IDbWorld.kt
@@ -2,4 +2,4 @@ package gg.obsidian.discordbridge.wrapper
 
 interface IDbWorld {
     fun getName(): String
-}
\ No newline at end of file
+}
diff --git a/discordbridge-core/src/main/resources/8ball.yml b/discordbridge-core/src/main/resources/8ball.yml
index 97d2d1b..f515152 100644
--- a/discordbridge-core/src/main/resources/8ball.yml
+++ b/discordbridge-core/src/main/resources/8ball.yml
@@ -23,4 +23,4 @@ responses:
   - '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.'
\ No newline at end of file
+  - 'Figure it out on your own.'
diff --git a/discordbridge-core/src/main/resources/aliases.yml b/discordbridge-core/src/main/resources/aliases.yml
index cea2b93..70b6ca7 100644
--- a/discordbridge-core/src/main/resources/aliases.yml
+++ b/discordbridge-core/src/main/resources/aliases.yml
@@ -1 +1 @@
-aliases:
\ No newline at end of file
+aliases:
diff --git a/discordbridge-core/src/main/resources/f.yml b/discordbridge-core/src/main/resources/f.yml
index f49fa83..9057047 100644
--- a/discordbridge-core/src/main/resources/f.yml
+++ b/discordbridge-core/src/main/resources/f.yml
@@ -28,4 +28,4 @@ responses:
 -   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
+    weight: 1
diff --git a/discordbridge-core/src/main/resources/insult.yml b/discordbridge-core/src/main/resources/insult.yml
index c6fbe51..c8ac5c0 100644
--- a/discordbridge-core/src/main/resources/insult.yml
+++ b/discordbridge-core/src/main/resources/insult.yml
@@ -504,4 +504,4 @@ responses:
 - "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
+# http://pastebin.com/wjABXq7j
diff --git a/discordbridge-core/src/main/resources/rate.yml b/discordbridge-core/src/main/resources/rate.yml
index 765160e..8d642c2 100644
--- a/discordbridge-core/src/main/resources/rate.yml
+++ b/discordbridge-core/src/main/resources/rate.yml
@@ -75,4 +75,4 @@ responses:
   -
     high: 10
     low: 10
-    message: "I rate %m a perfect 10/10"
\ No newline at end of file
+    message: "I rate %m a perfect 10/10"
diff --git a/discordbridge-core/src/main/resources/script.yml b/discordbridge-core/src/main/resources/script.yml
index 1a6014b..eb510c6 100644
--- a/discordbridge-core/src/main/resources/script.yml
+++ b/discordbridge-core/src/main/resources/script.yml
@@ -18,4 +18,4 @@ responses:
     trigger-discord: 'hello world!'
     response-minecraft: 'Hello World!'
     response-discord: 'Hello World!'
-    requires-mention: true
\ No newline at end of file
+    requires-mention: true
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/CommandWrapper.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/CommandWrapper.kt
index 6eba976..104e924 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/CommandWrapper.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/CommandWrapper.kt
@@ -31,4 +31,4 @@ class CommandWrapper(private val command: Command): CommandBase() {
     override fun execute(server: MinecraftServer?, sender: ICommandSender?, args: Array<out String>?) {
         // Let the command listener handle this.
     }
-}
\ No newline at end of file
+}
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordRCon.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordRCon.kt
index defd85a..98a6b3d 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordRCon.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/DiscordRCon.kt
@@ -5,7 +5,7 @@ import net.minecraft.network.rcon.RConConsoleSource
 import net.minecraft.server.MinecraftServer
 import net.minecraft.util.text.ITextComponent
 
-class DiscordRCon(val sender: DiscordCommandSender, serverIn: MinecraftServer) : RConConsoleSource(serverIn) {
+class DiscordRCon(private val sender: DiscordCommandSender, serverIn: MinecraftServer) : RConConsoleSource(serverIn) {
     override fun getName(): String {
         return sender.senderName
     }
@@ -13,4 +13,4 @@ class DiscordRCon(val sender: DiscordCommandSender, serverIn: MinecraftServer) :
     override fun sendMessage(component: ITextComponent) {
         sender.sendMessage(component.unformattedText)
     }
-}
\ No newline at end of file
+}
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt
index 0c686a8..4265a9b 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/EventHandler.kt
@@ -43,7 +43,6 @@ object EventHandler {
         }
     }
 
-    // https://github.com/sk89q/WorldEdit/blob/85ef47ae0c2c02a5870b764ca4b0da0d9e01671f/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorldEdit.java
     @JvmStatic
     @SubscribeEvent
     fun onCommand(event: CommandEvent) {
@@ -53,4 +52,4 @@ object EventHandler {
             DiscordBridge.handleCommand(DbForgePlayer(p), event.command.name, event.parameters)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/ForgeDiscordBridge.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/ForgeDiscordBridge.kt
index 9fe065c..c02b3ba 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/ForgeDiscordBridge.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/ForgeDiscordBridge.kt
@@ -9,8 +9,13 @@ import net.minecraftforge.fml.common.event.FMLServerStoppingEvent
 import org.apache.logging.log4j.Logger
 import java.io.File
 
-@Mod(modid = ForgeDiscordBridge.MODID, version = "@VERSION@", acceptableRemoteVersions = "*")
+@Mod(
+        modid = "@MODID@",
+        version = "@VERSION@",
+        acceptableRemoteVersions = "*"
+)
 class ForgeDiscordBridge {
+    lateinit var logger: Logger
 
     @Mod.EventHandler
     fun preInit(event: FMLPreInitializationEvent) {
@@ -35,13 +40,4 @@ class ForgeDiscordBridge {
     fun serverStop(event: FMLServerStoppingEvent) {
         DiscordBridge.handleServerStop()
     }
-
-    lateinit var logger: Logger
-
-    companion object {
-        const val MODID = "discordbridge-obsidian"
-
-        @Mod.Instance(MODID)
-        lateinit var inst: ForgeDiscordBridge
-    }
-}
\ No newline at end of file
+}
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeCommandSender.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeCommandSender.kt
index ba862c2..dc760a5 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeCommandSender.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeCommandSender.kt
@@ -24,5 +24,4 @@ class DbForgeCommandSender(private val sender: net.minecraft.command.ICommandSen
         // TODO
         return true
     }
-
-}
\ No newline at end of file
+}
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeConsoleSender.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeConsoleSender.kt
index ffbe708..8727b46 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeConsoleSender.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeConsoleSender.kt
@@ -20,5 +20,4 @@ class DbForgeConsoleSender(private val sender: RConConsoleSource) : IDbConsoleSe
     override fun hasPermission(permission: String): Boolean {
         TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
     }
-
-}
\ No newline at end of file
+}
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeLogger.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeLogger.kt
index fb711d6..b2aad6e 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeLogger.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeLogger.kt
@@ -22,5 +22,4 @@ class DbForgeLogger(private val logger: Logger) : IDbLogger {
     override fun severe(message: String, throwable: Throwable) {
         logger.error(message, throwable)
     }
-
-}
\ No newline at end of file
+}
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgePlayer.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgePlayer.kt
index 7024461..34f1593 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgePlayer.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgePlayer.kt
@@ -10,7 +10,6 @@ class DbForgePlayer(private val minecraftPlayer: EntityPlayer) : IDbPlayer {
     }
 
     override fun isVanished(): Boolean {
-        //return minecraftPlayer.get(Keys.INVISIBLE).orElse(false)
         //TODO
         return false
     }
@@ -28,9 +27,7 @@ class DbForgePlayer(private val minecraftPlayer: EntityPlayer) : IDbPlayer {
     }
 
     override fun hasPermission(permission: String): Boolean {
-        //return minecraftPlayer.hasPermission(permission)
         // TODO
         return true
     }
-
-}
\ No newline at end of file
+}
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeScheduler.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeScheduler.kt
index 8433380..c92feb1 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeScheduler.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeScheduler.kt
@@ -4,4 +4,4 @@ class DbForgeScheduler : IDbScheduler {
     override fun runAsyncTask(task: Runnable) {
         Thread(task).start()
     }
-}
\ No newline at end of file
+}
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeServer.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeServer.kt
index 6b7b17b..8c82733 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeServer.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeServer.kt
@@ -36,11 +36,6 @@ class DbForgeServer(private val mod: ForgeDiscordBridge) : IDbServer {
         return DbForgePlayer(p)
     }
 
-    override fun getPlayer(name: String): IDbPlayer? {
-        val p = FMLCommonHandler.instance().minecraftServerInstance.playerList.getPlayerByUsername(name)
-        return if (p != null) DbForgePlayer(p) else null
-    }
-
     override fun getOnlinePlayers(): List<IDbPlayer> {
         return FMLCommonHandler.instance().minecraftServerInstance.playerList.players.map { DbForgePlayer(it) }
     }
@@ -57,5 +52,4 @@ class DbForgeServer(private val mod: ForgeDiscordBridge) : IDbServer {
     override fun getLogger(): DbForgeLogger {
         return DbForgeLogger(mod.logger)
     }
-
-}
\ No newline at end of file
+}
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeWorld.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeWorld.kt
index 133c2db..a8eaeb8 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeWorld.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbForgeWorld.kt
@@ -6,5 +6,4 @@ class DbForgeWorld(private val minecraftWorld: World) : IDbWorld {
     override fun getName(): String {
         return minecraftWorld.worldInfo.worldName
     }
-
-}
\ No newline at end of file
+}
diff --git a/discordbridge-sponge/build.gradle b/discordbridge-sponge/build.gradle
index 132f6ca..85cd355 100644
--- a/discordbridge-sponge/build.gradle
+++ b/discordbridge-sponge/build.gradle
@@ -15,4 +15,4 @@ shadowJar {
         include(dependency("net.sf.trove4j:trove4j:3.0.3"))
     }
 }
-build.dependsOn(shadowJar)
\ No newline at end of file
+build.dependsOn(shadowJar)
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordRcon.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordRcon.kt
index 62df04f..c07a7bd 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordRcon.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/DiscordRcon.kt
@@ -68,5 +68,4 @@ class DiscordRcon(private val sender: DiscordCommandSender, private val base: Co
     override fun getPermissionValue(contexts: MutableSet<Context>, permission: String): Tristate {
         return base.getPermissionValue(contexts, permission)
     }
-
-}
\ No newline at end of file
+}
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/SpongeDiscordBridge.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/SpongeDiscordBridge.kt
index eb0976d..e7b0bd3 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/SpongeDiscordBridge.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/SpongeDiscordBridge.kt
@@ -20,23 +20,20 @@ import org.spongepowered.api.event.game.state.GameStoppingServerEvent
 import org.spongepowered.api.text.Text
 import javax.inject.Inject
 
-@Plugin(id = "discordbridge-obsidian", name = "DiscordBridge", version = "@VERSION")
+@Plugin(
+        name = "DiscordBridge",
+        id = "@MODID@",
+        version = "@VERSION@"
+)
 class SpongeDiscordBridge {
-
     @Inject private lateinit var game: Game
-    @Inject @DefaultConfig(sharedRoot = false) private lateinit var defaultConfig: File
-
     @Inject private lateinit var logger: Logger
-
-    private lateinit var instance: SpongeDiscordBridge
-
-    fun getPlugin() : SpongeDiscordBridge = instance
+    @Inject @DefaultConfig(sharedRoot = false) private lateinit var defaultConfig: File
 
     fun getLogger() : Logger = logger
 
     @Listener
     fun onGameInitialization(event: GameInitializationEvent) {
-        instance = this
         DiscordBridge.init(DbSpongeServer(this, game), defaultConfig)
 
         val mgr = Sponge.getCommandManager()
@@ -69,8 +66,8 @@ class SpongeDiscordBridge {
     @Listener(order = Order.LAST)
     fun onPlayerDeath(event: DestructEntityEvent.Death) {
         val e = event.targetEntity
-        if (e is org.spongepowered.api.entity.living.player.Player) DiscordBridge.handlePlayerDeath(DbSpongePlayer(e), event.message.toPlain())
-
+        if (e is org.spongepowered.api.entity.living.player.Player)
+            DiscordBridge.handlePlayerDeath(DbSpongePlayer(e), event.message.toPlain())
     }
 
     @Listener(order = Order.LAST)
@@ -81,6 +78,4 @@ class SpongeDiscordBridge {
             event.setMessage(event.formatter.header.format(), Text.of(msg), event.formatter.footer.format())
         }
     }
-
-
-}
\ No newline at end of file
+}
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt
index e722975..f012b97 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/util/UtilFunctions.kt
@@ -2,4 +2,4 @@ package gg.obsidian.discordbridge.util
 
 import java.util.*
 
-fun <T> Optional<T>.unwrap(): T? = orElse(null)
\ No newline at end of file
+fun <T> Optional<T>.unwrap(): T? = orElse(null)
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeLogger.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeLogger.kt
index d2e39b4..0287a0d 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeLogger.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeLogger.kt
@@ -22,5 +22,4 @@ class DbSpongeLogger(private val logger: Logger) : IDbLogger {
     override fun severe(message: String, throwable: Throwable) {
         logger.error(message, throwable)
     }
-
-}
\ No newline at end of file
+}
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongePlayer.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongePlayer.kt
index a217d61..d28a1b2 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongePlayer.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongePlayer.kt
@@ -29,5 +29,4 @@ class DbSpongePlayer(private val spongePlayer: Player) : IDbPlayer {
     override fun hasPermission(permission: String): Boolean {
         return spongePlayer.hasPermission(permission)
     }
-
-}
\ No newline at end of file
+}
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeScheduler.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeScheduler.kt
index b68fa8b..232cf95 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeScheduler.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeScheduler.kt
@@ -3,9 +3,8 @@ package gg.obsidian.discordbridge.wrapper
 import gg.obsidian.discordbridge.SpongeDiscordBridge
 import org.spongepowered.api.Game
 
-class DbSpongeScheduler(val plugin: SpongeDiscordBridge, val game: Game) : IDbScheduler {
+class DbSpongeScheduler(private val plugin: SpongeDiscordBridge, private val game: Game) : IDbScheduler {
     override fun runAsyncTask(task: Runnable) {
         game.scheduler.createTaskBuilder().execute(task).submit(plugin)
     }
-
-}
\ No newline at end of file
+}
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeServer.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeServer.kt
index bac40de..621a6d8 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeServer.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeServer.kt
@@ -38,11 +38,6 @@ class DbSpongeServer(private val plugin: SpongeDiscordBridge, private val game:
         return if (p != null) DbSpongePlayer(p) else null
     }
 
-    override fun getPlayer(name: String): IDbPlayer? {
-        val p = Sponge.getServer().getPlayer(name).unwrap()
-        return if (p != null) DbSpongePlayer(p) else null
-    }
-
     override fun getOnlinePlayers(): List<IDbPlayer> {
         return Sponge.getServer().onlinePlayers.map { DbSpongePlayer(it) }
     }
@@ -59,5 +54,4 @@ class DbSpongeServer(private val plugin: SpongeDiscordBridge, private val game:
     override fun getLogger(): DbSpongeLogger {
         return DbSpongeLogger(plugin.getLogger())
     }
-
-}
\ No newline at end of file
+}
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeWorld.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeWorld.kt
index 6016cb0..e7e8b13 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeWorld.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/wrapper/DbSpongeWorld.kt
@@ -6,5 +6,4 @@ class DbSpongeWorld(private val spongeWorld: World) : IDbWorld {
     override fun getName(): String {
         return spongeWorld.name
     }
-
-}
\ No newline at end of file
+}
diff --git a/settings.gradle b/settings.gradle
index 0b9b960..1ecd40a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -3,4 +3,3 @@ include 'discordbridge-core'
 include 'discordbridge-bukkit'
 include 'discordbridge-sponge'
 include 'discordbridge-forge'
-
diff --git a/todo b/todo
index 34b9406..72b3258 100644
--- a/todo
+++ b/todo
@@ -4,7 +4,3 @@ Things to fix:
 
 Things to try:
 - Consider making !!help and !!serverlist reply using embeds
-
-Things to add:
-- Fix image embeds
-- Admin commands
\ No newline at end of file

From 90fa7d009d5a640d6bffaddcbdbbd908c51bf8dd Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Wed, 7 Feb 2018 01:11:46 -0600
Subject: [PATCH 27/30] Properly configure metadata for all versions

---
 .../src/main/resources/plugin.yml             |  2 +-
 .../discordbridge/ForgeDiscordBridge.kt       |  6 +-----
 .../src/main/resources/mcmod.info             | 21 +++++++------------
 .../src/main/resources/pack.mcmeta            |  7 -------
 .../discordbridge/SpongeDiscordBridge.kt      |  6 +-----
 .../src/main/resources/mcmod.info             |  8 +++++++
 6 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 discordbridge-forge/src/main/resources/pack.mcmeta
 create mode 100644 discordbridge-sponge/src/main/resources/mcmod.info

diff --git a/discordbridge-bukkit/src/main/resources/plugin.yml b/discordbridge-bukkit/src/main/resources/plugin.yml
index 94e5c11..3f176fc 100644
--- a/discordbridge-bukkit/src/main/resources/plugin.yml
+++ b/discordbridge-bukkit/src/main/resources/plugin.yml
@@ -2,7 +2,7 @@ name: DiscordBridge
 version: '@VERSION@'
 description: '@DESCRIPTION@'
 
-authors: [Jacob Gillespie, Adam Hart]
+authors: [Jacob Gillespie, DiamondIceNS]
 website: '@URL@'
 
 loadbefore: [SpaceBukkit, RemoteToolkitPlugin]
diff --git a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/ForgeDiscordBridge.kt b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/ForgeDiscordBridge.kt
index c02b3ba..a6acb19 100644
--- a/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/ForgeDiscordBridge.kt
+++ b/discordbridge-forge/src/main/kotlin/gg/obsidian/discordbridge/ForgeDiscordBridge.kt
@@ -9,11 +9,7 @@ import net.minecraftforge.fml.common.event.FMLServerStoppingEvent
 import org.apache.logging.log4j.Logger
 import java.io.File
 
-@Mod(
-        modid = "@MODID@",
-        version = "@VERSION@",
-        acceptableRemoteVersions = "*"
-)
+@Mod(modid = "discordbridge-obsidian", useMetadata = true, serverSideOnly = true, acceptableRemoteVersions = "*")
 class ForgeDiscordBridge {
     lateinit var logger: Logger
 
diff --git a/discordbridge-forge/src/main/resources/mcmod.info b/discordbridge-forge/src/main/resources/mcmod.info
index f480667..4a06110 100644
--- a/discordbridge-forge/src/main/resources/mcmod.info
+++ b/discordbridge-forge/src/main/resources/mcmod.info
@@ -1,16 +1,9 @@
-[
-{
-  "modid": "examplemod",
-  "name": "Example Mod",
-  "description": "Example placeholder mod.",
+[{
+  "modid": "@MODID@",
+  "name": "DiscordBridge",
+  "description": "@DESCRIPTION@",
   "version": "${version}",
   "mcversion": "${mcversion}",
-  "url": "",
-  "updateUrl": "",
-  "authorList": ["ExampleDude"],
-  "credits": "The Forge and FML guys, for making this example",
-  "logoFile": "",
-  "screenshots": [],
-  "dependencies": []
-}
-]
+  "url": "@URL@",
+  "authorList": ["Jacob Gillespie", "DiamondIceNS"]
+}]
diff --git a/discordbridge-forge/src/main/resources/pack.mcmeta b/discordbridge-forge/src/main/resources/pack.mcmeta
deleted file mode 100644
index 4018267..0000000
--- a/discordbridge-forge/src/main/resources/pack.mcmeta
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "pack": {
-        "description": "examplemod resources",
-        "pack_format": 3,
-        "_comment": "A pack_format of 3 should be used starting with Minecraft 1.11. All resources, including language files, should be lowercase (eg: en_us.lang). A pack_format of 2 will load your mod resources with LegacyV2Adapter, which requires language files to have uppercase letters (eg: en_US.lang)."
-    }
-}
diff --git a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/SpongeDiscordBridge.kt b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/SpongeDiscordBridge.kt
index e7b0bd3..cdb0736 100644
--- a/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/SpongeDiscordBridge.kt
+++ b/discordbridge-sponge/src/main/kotlin/gg/obsidian/discordbridge/SpongeDiscordBridge.kt
@@ -20,11 +20,7 @@ import org.spongepowered.api.event.game.state.GameStoppingServerEvent
 import org.spongepowered.api.text.Text
 import javax.inject.Inject
 
-@Plugin(
-        name = "DiscordBridge",
-        id = "@MODID@",
-        version = "@VERSION@"
-)
+@Plugin(id="discordbridge-obsidian")
 class SpongeDiscordBridge {
     @Inject private lateinit var game: Game
     @Inject private lateinit var logger: Logger
diff --git a/discordbridge-sponge/src/main/resources/mcmod.info b/discordbridge-sponge/src/main/resources/mcmod.info
new file mode 100644
index 0000000..90ce1b2
--- /dev/null
+++ b/discordbridge-sponge/src/main/resources/mcmod.info
@@ -0,0 +1,8 @@
+[{
+  "modid": "@MODID@",
+  "name": "DiscordBridge",
+  "description": "@DESCRIPTION@",
+  "version": "@VERSION@",
+  "url": "@URL@",
+  "authorList": ["Jacob Gillespie", "DiamondIceNS"]
+}]

From a5f41df6a25385806a167ee3486e36b9fe3fcf0d Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Wed, 7 Feb 2018 02:02:05 -0600
Subject: [PATCH 28/30] Add SLF4J-simple for JDA

---
 build.gradle                      | 24 +++++++++++++++++-------
 discordbridge-bukkit/build.gradle |  3 +--
 discordbridge-core/build.gradle   |  1 +
 discordbridge-forge/build.gradle  |  1 -
 discordbridge-sponge/build.gradle |  1 -
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index 039c3ca..96e1d96 100644
--- a/build.gradle
+++ b/build.gradle
@@ -56,19 +56,29 @@ subprojects {
     shadowJar {
         classifier = null
         dependencies {
+            // Kotlin Runtime
+            include(dependency("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"))
+
+            // Dependencies for JDA
             include(dependency('net.dv8tion:JDA:3.3.1_286'))
+            include(dependency('com.squareup.okhttp3:okhttp:'))
+            include(dependency('com.squareup.okio:okio'))
+            include(dependency('com.neovisionaries:nv-websocket-client'))
+            include(dependency('org.json:json'))
+            include(dependency('org.slf4j:slf4j-api'))
+            include(dependency('org.slf4j:slf4j-simple'))
+
+            // Dependency for SnakeYAML
             include(dependency(group: 'org.yaml', name: 'snakeyaml', version: '1.19'))
+
+            // Dependencies for PegDown
             include(dependency(group: 'org.pegdown', name:'pegdown', version: '1.6.0'))
             include(dependency(group: 'commons-lang', name:'commons-lang', version: '2.3'))
-            include(dependency(group: 'com.michaelwflaherty', name: 'cleverbotapi', version: '1.0.1'))
             include(dependency('org.parboiled:parboiled-core'))
             include(dependency('org.parboiled:parboiled-java'))
-            include(dependency('com.squareup.okhttp3:okhttp:'))
-            include(dependency('com.squareup.okio:okio'))
-            include(dependency('com.neovisionaries:nv-websocket-client'))
-            include(dependency('org.slf4j:slf4j-api'))
-            include(dependency('org.json:json'))
+
+            // Dependency for CleverbotAPI
+            include(dependency(group: 'com.michaelwflaherty', name: 'cleverbotapi', version: '1.0.1'))
         }
     }
-
 }
diff --git a/discordbridge-bukkit/build.gradle b/discordbridge-bukkit/build.gradle
index 70fb609..c56db8e 100644
--- a/discordbridge-bukkit/build.gradle
+++ b/discordbridge-bukkit/build.gradle
@@ -14,7 +14,6 @@ dependencies {
 shadowJar {
     dependencies {
         include(project(':discordbridge-core'))
-        include(dependency("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"))
         include(dependency('org.ow2.asm:asm'))
         include(dependency('org.ow2.asm:asm-analysis'))
         include(dependency('org.ow2.asm:asm-tree'))
@@ -26,4 +25,4 @@ build.dependsOn(shadowJar)
 
 artifacts {
     archives shadowJar
-}
\ No newline at end of file
+}
diff --git a/discordbridge-core/build.gradle b/discordbridge-core/build.gradle
index f8598fa..0ef03c9 100644
--- a/discordbridge-core/build.gradle
+++ b/discordbridge-core/build.gradle
@@ -11,6 +11,7 @@ dependencies {
     compile group: 'commons-lang', name:'commons-lang', version: '2.3'
     compile group: 'com.michaelwflaherty', name: 'cleverbotapi', version: '1.0.1'
     compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
+    compile group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.25'
 }
 
 shadowJar {
diff --git a/discordbridge-forge/build.gradle b/discordbridge-forge/build.gradle
index 31f5ef1..81e1b7c 100644
--- a/discordbridge-forge/build.gradle
+++ b/discordbridge-forge/build.gradle
@@ -55,7 +55,6 @@ processResources {
 shadowJar {
     include ':discordbridge-core'
     dependencies {
-        include(dependency("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"))
     }
 }
 build.dependsOn(shadowJar)
diff --git a/discordbridge-sponge/build.gradle b/discordbridge-sponge/build.gradle
index 85cd355..7e4b6c8 100644
--- a/discordbridge-sponge/build.gradle
+++ b/discordbridge-sponge/build.gradle
@@ -11,7 +11,6 @@ dependencies {
 shadowJar {
     dependencies {
         include(project(':discordbridge-core'))
-        include(dependency("org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"))
         include(dependency("net.sf.trove4j:trove4j:3.0.3"))
     }
 }

From 5f1122b51ddef1d28b92f407b95d401b94e0f963 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Wed, 7 Feb 2018 02:06:13 -0600
Subject: [PATCH 29/30] Remove forgotten debug log statement

---
 .../discordbridge/command/controller/BotControllerManager.kt     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/BotControllerManager.kt b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/BotControllerManager.kt
index c2bab7a..b265e91 100644
--- a/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/BotControllerManager.kt
+++ b/discordbridge-core/src/main/kotlin/gg/obsidian/discordbridge/command/controller/BotControllerManager.kt
@@ -385,7 +385,6 @@ class BotControllerManager {
         when (event) {
             is MinecraftChatEventWrapper -> {
                 var worldname = event.player.getWorld().getName()
-                DiscordBridge.logger.info(worldname)
 
                 // Get world alias if Multiverse is installed
                 if (DiscordBridge.isMultiverse) {

From 83b3c9d37dc2541d88569ec516395120168be6d0 Mon Sep 17 00:00:00 2001
From: DiamondIceNS <fawfulcopter@gmail.com>
Date: Wed, 7 Feb 2018 14:38:40 -0600
Subject: [PATCH 30/30] Prepare for pull request

Update README
Update travis
Fix issue with Forge not building correctly
---
 .travis.yml                      |  7 +++++--
 README.md                        | 14 ++++++++++----
 discordbridge-forge/build.gradle |  9 ++++++---
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5948683..d1f3f5d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,13 +3,16 @@ jdk:
 - oraclejdk8
 
 after_success:
-  - ./gradlew shadowJar
+  - ./gradlew build
 
 deploy:
   provider: releases
   api_key:
     secure: KJd23J+YlpBuUs+5//5BjYlSQ9mVOsYnpfanE03ZQ4E9Qp+pGpMSaH60d/CXkSkDVr32QL5jk0VRDNVl0wvTZpRJfNclQgh3fh2iPkaBDmjun0YkGHfE6VeRzJZVuIF/F34pkziEC01B7Tq2loms+RSm9pNeWgN+ulaajNENUT2J4nmb33yyKbGN9I4EdjcMCQmgdnxn/4QNXV6T3Xls9S9X7AwA9pg4WNpdACqJ0oWj2YlSWKmAdcKw0iLQtRbQfbiqj6waOLODdxieIu0KVWEVQnTdcv7ElGl9BgDrHzXBjfS+9G112TBqsNIPx60o8Z7ThR02DYPWYXrRyfvaHM0FqXrBSaUZUxfHpGn5F4CRQLZh/jOnIOZ9hHmCSDD69pcS254tVCoB+hRuS7PBstuh8iUO7VGJASb5Mv34LZYLAxfvNDAKLeY60xdz/Uiku9JW0dpLQC+FWAvFZWdQ3IvCMYRnaT1fmjDJKanYvCw31l5ypACjfhIQfnwG7FKeLdh6BJx9CG/eHV2URO4do5OCLBkuL2IYQQXqlj6jU4QpXjfWDf7XCAW3MBthjwe5lnLeNZTkcwttQqIOZdCn7Qa/zaG+HJM62tnV9uhLpj4fhaGmf7tapdUWJ5cuUUGLA3MNmSqsZ3ohF5wGlKsGwFVOb6UhoB9szmA9p7zQGpw=
-  file: build/DiscordBridge-*.jar
+  file:
+    - discordbridge-bukkit/build/libs/discordbridge-bukkit*.jar
+    - discordbridge-spigot/build/libs/discordbridge-spigot*.jar
+    - discordbridge-forge/build/libs/discordbridge-forge*.jargit
   file_glob: true
   on:
     repo: the-obsidian/DiscordBridge
diff --git a/README.md b/README.md
index 55b6e9e..3002c0b 100644
--- a/README.md
+++ b/README.md
@@ -1,18 +1,22 @@
 # DiscordBridge [![Build Status](https://travis-ci.org/the-obsidian/DiscordBridge.svg?branch=master)](https://travis-ci.org/the-obsidian/DiscordBridge)
 
-Bridges chat between Discord and Minecraft (Bukkit/Spigot).
+Bridges chat between Discord and Minecraft.
 
 ## Requirements
 
 * Java 8
+
+Any of:
 * Spigot 1.12
+* Sponge 1.12
+* Forge 1.12
 
 ## Installation
 
 
 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.
+2. Add it to your plugin/mod folder
+3. Either run your server once to generate DiscordBridge/config.yml or create it using the guide below.
 4. All done!
 
 
@@ -112,7 +116,7 @@ templates:
 * Anything said in Minecraft chat will be sent to your chosen Discord channel
 * 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`)
+* 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`) (Spigot only for now)
 * Uploaded images and other files in Discord will show up in Minecraft chat as clickable URLs
 * 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
@@ -130,6 +134,8 @@ templates:
 
 ## Permissions
 
+***NOTE:*** Only the Spigot version supports permission nodes at this time.
+
 - `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
diff --git a/discordbridge-forge/build.gradle b/discordbridge-forge/build.gradle
index 81e1b7c..f4eed2b 100644
--- a/discordbridge-forge/build.gradle
+++ b/discordbridge-forge/build.gradle
@@ -26,7 +26,7 @@ minecraft {
     // Use non-default mappings at your own risk. they may not always work.
     // simply re-run your setup task after changing the mappings to update your workspace.
     mappings = "snapshot_20171003"
-    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
+    makeObfSourceJar = false
 }
 
 dependencies {
@@ -53,8 +53,11 @@ processResources {
 }
 
 shadowJar {
-    include ':discordbridge-core'
     dependencies {
+        include(project(':discordbridge-core'))
     }
 }
-build.dependsOn(shadowJar)
+
+reobf {
+    shadowJar { mappingType = 'SEARGE' }
+}