Reformat using recommended IntelliJ Kotlin style

Author: foxfirecodes

pom.xml

@@ -48,6 +48,11 @@
             <artifactId>slf4j-simple</artifactId>
             <version>1.7.25</version>
         </dependency>
+        <dependency>
+            <groupId>io.javalin</groupId>
+            <artifactId>javalin</artifactId>
+            <version>3.12.0</version>
+        </dependency>
     </dependencies>
 
     <build>

src/main/kotlin/dev/rayzr/gameboi/Gameboi.kt

@@ -38,26 +38,23 @@ fun main() {
 
     // Init JDA
     Gameboi.shardManager = DefaultShardManagerBuilder.create(
-            GatewayIntent.GUILD_MESSAGES,
-            GatewayIntent.GUILD_MESSAGE_REACTIONS
+        GatewayIntent.GUILD_MESSAGES,
+        GatewayIntent.GUILD_MESSAGE_REACTIONS
     )
-            .setShardsTotal(Gameboi.shardCount)
-            .setToken(Gameboi.token)
-            .addEventListeners(Gameboi, ReactionListener, MessageListener)
-            .build()
-
-//    val jda = JDABuilder(Gameboi.token)
-//            .addEventListeners(Gameboi, ReactionListener, MessageListener)
-//            .build()
-//            .awaitReady()
+        .setShardsTotal(Gameboi.shardCount)
+        .setToken(Gameboi.token)
+        .addEventListeners(Gameboi, ReactionListener, MessageListener)
+        .build()
 
     // Generate invite
-    println(Gameboi.shardManager.shards.first().getInviteUrl(
+    println(
+        Gameboi.shardManager.shards.first().getInviteUrl(
             Permission.MESSAGE_WRITE,
             Permission.MESSAGE_MANAGE,
             Permission.MESSAGE_EMBED_LINKS,
             Permission.MESSAGE_ATTACH_FILES
-    ))
+        )
+    )
 
     if (Gameboi.updateStatus) {
         Timer().scheduleAtFixedRate(0L, 30000L) { Gameboi.updatePresence() }
@@ -93,28 +90,28 @@ object Gameboi : EventListener {
     }
 
     val commands: List<Command> = listOf(
-            // Info
-            HelpCommand,
-            InviteCommand,
-            AboutCommand,
-            PingCommand,
-            StatsCommand,
-            // Invites
-            // Multiplayer
-            Connect4Invite,
-            FightInvite,
-            // Singleplayer
-            Twenty48Invite,
-            HangmanInvite,
-            // Match commands
-            QuitCommand,
-            // Shop commands
-            ShopCommand,
-            BuyCommand,
-            InventoryCommand,
-            EquipCommand,
-            // Settings commands
-            SetPrefixCommand
+        // Info
+        HelpCommand,
+        InviteCommand,
+        AboutCommand,
+        PingCommand,
+        StatsCommand,
+        // Invites
+        // Multiplayer
+        Connect4Invite,
+        FightInvite,
+        // Singleplayer
+        Twenty48Invite,
+        HangmanInvite,
+        // Match commands
+        QuitCommand,
+        // Shop commands
+        ShopCommand,
+        BuyCommand,
+        InventoryCommand,
+        EquipCommand,
+        // Settings commands
+        SetPrefixCommand
     )
 
     override fun onEvent(event: GenericEvent) {
@@ -131,10 +128,10 @@ object Gameboi : EventListener {
                 }
 
                 val prefixes = listOfNotNull(
-                        taggedBotRole?.asMention,
-                        "<@${event.jda.selfUser.id}>",
-                        "<@!${event.jda.selfUser.id}>",
-                        guildSettings.realPrefix
+                    taggedBotRole?.asMention,
+                    "<@${event.jda.selfUser.id}>",
+                    "<@!${event.jda.selfUser.id}>",
+                    guildSettings.realPrefix
                 )
 
                 val remainder = prefixes.find {
@@ -151,15 +148,20 @@ object Gameboi : EventListener {
                 if (command != null) {
                     command.handle(event, args)
                 } else {
-                    MatchManager[event.author]?.run { game.handleMessage(Player[event.author], this, event.message) }
+                    MatchManager[event.author]?.run {
+                        game.handleMessage(Player[event.author], this, event.message)
+                    }
                 }
             }
         }
     }
 
     fun updatePresence() {
-        shardManager.setPresence(OnlineStatus.ONLINE, Activity.watching(
+        shardManager.setPresence(
+            OnlineStatus.ONLINE,
+            Activity.watching(
                 "over ${shardManager.guilds.size} guilds | ${prefix}help"
-        ))
+            )
+        )
     }
 }

src/main/kotlin/dev/rayzr/gameboi/command/InfoCommands.kt

@@ -14,7 +14,7 @@ object HelpCommand : Command("help", "Shows you help for Gameboi", category = Ca
     override fun handle(event: GuildMessageReceivedEvent, args: List<String>) {
         GuildSettingsManager.getGuildSettingsFor(event.guild).thenAccept { guildSettings ->
             val commands = Gameboi.commands.groupBy { it.category }
-                    .toSortedMap(Comparator.comparingInt { it.priority })
+                .toSortedMap(Comparator.comparingInt { it.priority })
 
             val embed = EmbedBuilder().run {
                 setDescription(commands.map { category ->
@@ -24,7 +24,11 @@ object HelpCommand : Command("help", "Shows you help for Gameboi", category = Ca
 
                     "> __**${category.key.name}**__\n\n $categoryCommands"
                 }.joinToString("\n\n"))
-                setAuthor("Gameboi Help Commands", "https://github.com/RayzrDev/Gameboi", event.jda.selfUser.effectiveAvatarUrl)
+                setAuthor(
+                    "Gameboi Help Commands",
+                    "https://github.com/RayzrDev/Gameboi",
+                    event.jda.selfUser.effectiveAvatarUrl
+                )
                 setColor(0x353940)
                 build()
             }
@@ -53,21 +57,28 @@ object AboutCommand : Command("about", "Shows you more information about Gameboi
         val embed = EmbedBuilder().run {
             setTitle("What is Gameboi?")
 
-            setDescription("""
+            setDescription(
+                """
                 **Gameboi** is a simple Discord bot made for Discord Hack Week 2019 with a plethora of small games you can play, a charming and nostalgic pixel art style, and a global currency and rewards system!
                 
                 With **2 multiplayer** games (Fight & Connect 4) and **2 singleplayer** games (Hangman & 2048), Gameboi is sure to liven up any server, and the charm of its retro pixel-art graphics feels right at home to any old-school gamer.
                 
                 :tada: Click [here](${event.jda.getInviteUrl(Permission.MESSAGE_MANAGE)}) to add **Gameboi** to your server!
                 :link: Click [here](https://github.com/RayzrDev/Gameboi) to check out the source code for **Gameboi**!
                 :heart: Click [here](https://patreon.com/Rayzr522) if you want to support **Gameboi** and its creators!
-            """.trimIndent())
+            """.trimIndent()
+            )
 
             addField("Servers", "%,d".format(Gameboi.shardManager.guilds.size), true)
             addField("Users", "%,d".format(Gameboi.shardManager.users.size), true)
 
             val shardInfo = event.jda.shardInfo
-            setFooter("Created by Rayzr522#9429 and zp4rker#3333 || Shard %d/%d".format(shardInfo.shardId + 1, shardInfo.shardTotal))
+            setFooter(
+                "Created by Rayzr522#9429 and zp4rker#3333 || Shard %d/%d".format(
+                    shardInfo.shardId + 1,
+                    shardInfo.shardTotal
+                )
+            )
 
             setImage("https://raw.githubusercontent.com/RayzrDev/Gameboi/master/res/banner.png")
 
@@ -122,7 +133,11 @@ object StatsCommand : Command("stats", "Shows your game stats", "stats [game]",
                             addStat(this, data, "Total Guesses", "hangman.total-guesses")
                             addStat(this, data, "Correct Guesses", "hangman.correct-guesses")
                             // TODO: Method for computed stats?
-                            addField("Accuracy", "${((data.getStat("hangman.correct-guesses") * 100.0) / data.getStat("hangman.total-guesses")).roundToInt()}%", true)
+                            addField(
+                                "Accuracy",
+                                "${((data.getStat("hangman.correct-guesses") * 100.0) / data.getStat("hangman.total-guesses")).roundToInt()}%",
+                                true
+                            )
                             addStat(this, data, "Wins", "hangman.wins")
                         }
                         "2048" -> {

src/main/kotlin/dev/rayzr/gameboi/command/InviteCommands.kt

@@ -18,8 +18,15 @@ fun checkPermissions(event: GuildMessageReceivedEvent): Boolean {
         return false
     }
 
-    if (!event.guild.selfMember.hasPermission(event.channel, Permission.MESSAGE_MANAGE, Permission.MESSAGE_ATTACH_FILES, Permission.MESSAGE_EMBED_LINKS)) {
-        event.channel.sendMessage(":x: This bot is missing the permissions required to manage/delete messages, attach images, and embed links!").queue()
+    if (!event.guild.selfMember.hasPermission(
+            event.channel,
+            Permission.MESSAGE_MANAGE,
+            Permission.MESSAGE_ATTACH_FILES,
+            Permission.MESSAGE_EMBED_LINKS
+        )
+    ) {
+        event.channel.sendMessage(":x: This bot is missing the permissions required to manage/delete messages, attach images, and embed links!")
+            .queue()
         return false
     }
 
@@ -28,15 +35,17 @@ fun checkPermissions(event: GuildMessageReceivedEvent): Boolean {
 
 fun checkValidPlayer(player: User) = !player.isBot
 
-object Connect4Invite : Command("connect4", "Invites a player to play Connect4 with you!", "connect4 <other>", Categories.GAMES) {
+object Connect4Invite :
+    Command("connect4", "Invites a player to play Connect4 with you!", "connect4 <other>", Categories.GAMES) {
     override fun handle(event: GuildMessageReceivedEvent, args: List<String>) {
         if (!checkPermissions(event)) {
             return
         }
 
         if (event.message.mentionedMembers.size < 1) {
             event.channel.sendMessage(":x: Please mention the user you would like to play with!").queue {
-                it.textChannel.deleteMessages(listOf(it, event.message)).queueAfter(Gameboi.errorLife, TimeUnit.MILLISECONDS)
+                it.textChannel.deleteMessages(listOf(it, event.message))
+                    .queueAfter(Gameboi.errorLife, TimeUnit.MILLISECONDS)
             }
             return
         }
@@ -60,7 +69,8 @@ object FightInvite : Command("fight", "Invites a player to play Fight with you!"
 
         if (event.message.mentionedMembers.size < 1) {
             event.channel.sendMessage(":x: Please mention the user you would like to play with!").queue {
-                it.textChannel.deleteMessages(listOf(it, event.message)).queueAfter(Gameboi.errorLife, TimeUnit.MILLISECONDS)
+                it.textChannel.deleteMessages(listOf(it, event.message))
+                    .queueAfter(Gameboi.errorLife, TimeUnit.MILLISECONDS)
             }
             return
         }
@@ -76,7 +86,7 @@ object FightInvite : Command("fight", "Invites a player to play Fight with you!"
     }
 }
 
-object Twenty48Invite: Command("2048", "Starts a 2048 game.", "2048", Categories.GAMES) {
+object Twenty48Invite : Command("2048", "Starts a 2048 game.", "2048", Categories.GAMES) {
     override fun handle(event: GuildMessageReceivedEvent, args: List<String>) {
         if (!checkPermissions(event)) {
             return
@@ -86,7 +96,7 @@ object Twenty48Invite: Command("2048", "Starts a 2048 game.", "2048", Categories
     }
 }
 
-object HangmanInvite: Command("hangman", "Starts a hangman game.", "hangman", Categories.GAMES) {
+object HangmanInvite : Command("hangman", "Starts a hangman game.", "hangman", Categories.GAMES) {
     override fun handle(event: GuildMessageReceivedEvent, args: List<String>) {
         if (!checkPermissions(event)) {
             return

src/main/kotlin/dev/rayzr/gameboi/command/MatchCommands.kt

@@ -11,7 +11,8 @@ object QuitCommand : Command("quit", "Quits you from your current match", catego
 
         if (player.currentMatch == null) {
             event.channel.sendMessage(":x: You are not in a match currently!").queue {
-                it.textChannel.deleteMessages(listOf(it, event.message)).queueAfter(Gameboi.errorLife, TimeUnit.MILLISECONDS)
+                it.textChannel.deleteMessages(listOf(it, event.message))
+                    .queueAfter(Gameboi.errorLife, TimeUnit.MILLISECONDS)
             }
         } else {
             player.currentMatch?.end()

src/main/kotlin/dev/rayzr/gameboi/command/SettingsCommands.kt

@@ -4,7 +4,8 @@ import dev.rayzr.gameboi.data.settings.GuildSettingsManager
 import net.dv8tion.jda.api.Permission
 import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent
 
-object SetPrefixCommand : Command("setprefix", "Allows you to change Gameboi's prefix", "setprefix [new prefix]", Categories.SETTINGS) {
+object SetPrefixCommand :
+    Command("setprefix", "Allows you to change Gameboi's prefix", "setprefix [new prefix]", Categories.SETTINGS) {
     override fun handle(event: GuildMessageReceivedEvent, args: List<String>) {
         if (!event.member!!.hasPermission(Permission.MANAGE_SERVER)) {
             return fail(event, "Only admins (those with the **Manage Server** permission) can edit this!")
@@ -13,7 +14,8 @@ object SetPrefixCommand : Command("setprefix", "Allows you to change Gameboi's p
         GuildSettingsManager.editGuildSettings(event.guild) {
             if (args.isEmpty() || args[0].toLowerCase() == "none") {
                 prefix = null
-                event.channel.sendMessage(":white_check_mark: Removed custom prefix, you are now using the default `$realPrefix` prefix.").queue()
+                event.channel.sendMessage(":white_check_mark: Removed custom prefix, you are now using the default `$realPrefix` prefix.")
+                    .queue()
             } else {
                 prefix = args[0]
                 event.channel.sendMessage(":white_check_mark: Updated prefix to `$prefix`!").queue()

src/main/kotlin/dev/rayzr/gameboi/command/ShopCommands.kt

@@ -4,7 +4,8 @@ import dev.rayzr.gameboi.data.shop.ShopRegistry
 import dev.rayzr.gameboi.game.Player
 import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent
 
-object ShopCommand : Command("shop", "Lets you see what is available for purchase in the shop", category = Categories.SHOP) {
+object ShopCommand :
+    Command("shop", "Lets you see what is available for purchase in the shop", category = Categories.SHOP) {
     override fun handle(event: GuildMessageReceivedEvent, args: List<String>) {
         val items = ShopRegistry.items.joinToString("\n\n") {
             "[__${it.slot.name}__] **${it.name}** (${it.cost} coins)"
@@ -59,7 +60,7 @@ object InventoryCommand : Command("inventory", "Shows you what items you current
             val items = when {
                 it.inventory.isEmpty() -> "**You have no items.**"
                 else -> "**Your items:**\n${
-                it.inventory.map { item -> "- **${item.key.name}**x${item.value}" }.joinToString("\n")
+                    it.inventory.map { item -> "- **${item.key.name}**x${item.value}" }.joinToString("\n")
                 }"
             }
 
@@ -85,23 +86,26 @@ object EquipCommand : Command("equip", "Lets you equip different items", "equip
                 if (availableItems.isEmpty()) {
                     return@editData fail(event, "You don't have any items available for this slot.")
                 } else {
-                    event.channel.sendMessage("**Available items:**\n${availableItems.joinToString("\n") { "- ${it.name}" }}").queue()
+                    event.channel.sendMessage("**Available items:**\n${availableItems.joinToString("\n") { "- ${it.name}" }}")
+                        .queue()
                     return@editData
                 }
             }
 
             val itemName = args.subList(1, args.size).joinToString(" ").toLowerCase()
             if (itemName == "none") {
                 equipment.remove(slot.internalName)
-                event.channel.sendMessage(":white_check_mark: Removed all items from your **${slot.name}** slot.").queue()
+                event.channel.sendMessage(":white_check_mark: Removed all items from your **${slot.name}** slot.")
+                    .queue()
                 return@editData
             }
 
             val item = inventory.keys.find { it.name.toLowerCase() == itemName }
-                    ?: return@editData fail(event, "That is not a valid item!")
+                ?: return@editData fail(event, "That is not a valid item!")
 
             equipment[slot.internalName] = item
-            event.channel.sendMessage(":white_check_mark: Equipped **${item.name}** to your **${slot.name}** slot.").queue()
+            event.channel.sendMessage(":white_check_mark: Equipped **${item.name}** to your **${slot.name}** slot.")
+                .queue()
         }
     }
 }