feat: allow searching others' trophy fish data with /trophyfish

Author: My-Name-Is-Jeff

src/main/kotlin/gg/skytils/skytilsmod/Skytils.kt

@@ -485,7 +485,9 @@ class Skytils {
                 ?: currentServerData?.serverIP?.lowercase()?.contains("hypixel") ?: false)
         }.onFailure { it.printStackTrace() }.getOrDefault(false)
 
-        TrophyFish.loadFromApi()
+        IO.launch {
+            TrophyFish.loadFromApi()
+        }
     }
 
     @SubscribeEvent(priority = EventPriority.HIGHEST)

src/main/kotlin/gg/skytils/skytilsmod/commands/impl/TrophyFishCommand.kt

@@ -18,30 +18,53 @@
 
 package gg.skytils.skytilsmod.commands.impl
 
-import gg.essential.universal.ChatColor
 import gg.essential.universal.UChat
 import gg.essential.universal.wrappers.message.UMessage
-import gg.skytils.skytilsmod.commands.BaseCommand
+import gg.skytils.hypixel.types.skyblock.Member
+import gg.skytils.skytilsmod.Skytils
+import gg.skytils.skytilsmod.commands.stats.StatCommand
+import gg.skytils.skytilsmod.core.MC
 import gg.skytils.skytilsmod.features.impl.crimson.TrophyFish
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import net.minecraft.client.entity.EntityPlayerSP
+import java.util.*
 
-object TrophyFishCommand : BaseCommand("trophy", listOf("tf", "trophyfish")) {
-    override fun processCommand(player: EntityPlayerSP, args: Array<String>) {
-        if (args.isEmpty()) {
-            UChat.chat(TrophyFish.generateTrophyFishList().joinToString("\n"))
-            return
+object TrophyFishCommand : StatCommand("trophy", aliases = listOf("tf", "trophyfish")) {
+
+    override fun displayStats(username: String, uuid: UUID, profileData: Member) {
+        Skytils.IO.launch {
+            val trophyFishData = TrophyFish.getTrophyFishData(uuid)
+            withContext(Dispatchers.MC) {
+                if (trophyFishData == null) {
+                    printMessage("${Skytils.failPrefix} §cFailed to retrieve trophy fish data for ${username}.")
+                } else printMessage("${Skytils.prefix} §bTrophy Fish for $username\n${TrophyFish.generateTrophyFishList(trophyFishData)}")
+            }
         }
-        when(args[0]) {
+    }
+
+    override fun processCommand(player: EntityPlayerSP, args: Array<String>) {
+        when(args.getOrNull(0)) {
             "reload" -> {
-                val text = UMessage("${ChatColor.BLUE}Loading data...").mutable()
+                val text = UMessage("${Skytils.prefix} §9Loading data...").mutable()
                 text.chat()
-                TrophyFish.loadFromApi()
-                text.edit("${ChatColor.BLUE}Loaded!")
+                Skytils.IO.launch {
+                    TrophyFish.loadFromApi()
+                    withContext(Dispatchers.MC) {
+                        text.edit("${Skytils.successPrefix} §aLoaded!")
+                    }
+                }
             }
             "total" -> {
-                UChat.chat(TrophyFish.generateTrophyFishList(true).joinToString("\n"))
+                UChat.chat(TrophyFish.generateLocalTrophyFishList(true).joinToString("\n"))
+            }
+            null -> {
+                UChat.chat(TrophyFish.generateLocalTrophyFishList().joinToString("\n"))
+            }
+            else -> {
+                super.processCommand(player, args)
             }
-            else -> getCommandUsage(player)
         }
     }
 }

src/main/kotlin/gg/skytils/skytilsmod/features/impl/crimson/TrophyFish.kt

@@ -30,6 +30,7 @@ import gg.skytils.skytilsmod.utils.graphics.SmartFontRenderer
 import gg.skytils.skytilsmod.utils.graphics.colors.CommonColors
 import net.minecraftforge.client.event.ClientChatReceivedEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import java.util.UUID
 
 object TrophyFish {
     private val trophyFish = mutableMapOf<String, Fish>()
@@ -40,11 +41,15 @@ object TrophyFish {
         Skytils.guiManager.registerElement(TrophyFishDisplay())
     }
 
-    fun loadFromApi() {
+    suspend fun loadFromApi() {
         trophyFish.clear()
-        val trophyFishData = API.getSelectedSkyblockProfileSync(UPlayer.getUUID())?.members?.get(UPlayer.getUUID().nonDashedString())?.trophy_fish
-        trophyFishData?.fish_count?.forEach { (fish, data) ->
-            trophyFish[fish] = Fish(data.bronze, data.silver, data.gold, data.diamond)
+        trophyFish.putAll(getTrophyFishData(UPlayer.getUUID()) ?: return)
+    }
+
+    suspend fun getTrophyFishData(uuid: UUID): Map<String, Fish>? {
+        val trophyFishData = API.getSelectedSkyblockProfile(uuid)?.members?.get(uuid.nonDashedString())?.trophy_fish
+        return trophyFishData?.fish_count?.entries?.associate { (fish, data) ->
+            fish to Fish(data.bronze, data.silver, data.gold, data.diamond)
         }
     }
 
@@ -70,8 +75,11 @@ object TrophyFish {
         }
     }
 
-    fun generateTrophyFishList(total: Boolean = false) =
-        trophyFish.entries.sortedBy { (fish, _) -> TrophyFish.entries.indexOfFirst { it.name == fish } }.mapNotNull { (fish, data) ->
+    fun generateLocalTrophyFishList(total: Boolean = false) =
+        generateTrophyFishList(trophyFish, total)
+
+    fun generateTrophyFishList(data: Map<String, Fish>, total: Boolean = false) =
+        data.entries.sortedBy { (fish, _) -> TrophyFish.entries.indexOfFirst { it.name == fish } }.mapNotNull { (fish, data) ->
             val name = TrophyFish.entries.find { it.name == fish }?.formattedName ?: return@mapNotNull null
             name + (if (total) " ${ChatColor.DARK_AQUA}[${ChatColor.LIGHT_PURPLE}${data.total}${ChatColor.DARK_AQUA}] " else " ${ChatColor.DARK_AQUA}» ") +
                     "${ChatColor.DARK_GRAY}${data.bronze}${ChatColor.DARK_AQUA}-" +
@@ -113,7 +121,7 @@ object TrophyFish {
         val alignment = if (scaleX > sr.scaledWidth / 2f) SmartFontRenderer.TextAlignment.RIGHT_LEFT else SmartFontRenderer.TextAlignment.LEFT_RIGHT
         override fun render() {
             if (!toggled || !Utils.inSkyblock || SBInfo.mode != SkyblockIsland.CrimsonIsle.mode) return
-            generateTrophyFishList(Config.showTrophyFishTotals).forEachIndexed { idx, str ->
+            generateLocalTrophyFishList(Config.showTrophyFishTotals).forEachIndexed { idx, str ->
                 fr.drawString(
                     str,
                     0f,