Miscellaneous bikeshedding

Make sure all files terminate in newlines
Fix various lint warnings
Shuffle variable declarations

Author: DiamondIceNS

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.
+limitations under the License.

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)
+Copyright (c) 2008 John MacFarlane (http://github.com/jgm/peg-markdown)

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 {
         }
     }
 
-}
+}

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()
     }
-
 }

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)
     }
-
-
-}
+}

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)
     }
-
-}
+}

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
     }
-
-}
+}

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"
     }
-
-}
+}

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)
     }
-
-}
+}

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
     }
-
-}
+}