updated the gui to look better wowowowowow (now with animations!)

added some crazy keybind stuffs
readded the player model (but it gets hidden when the dropdown is run since it would render in front and look bad... maybe fix later)

added a uuid cache to stop unnecessary mojang api calls.

Author: SubAt0m1c

gradle.properties

@@ -3,8 +3,8 @@ org.gradle.jvmargs=-Xmx2g
 baseGroup = com.github.subat0m1c.hatecheaters
 mcVersion = 1.8.9
 modid = hatecheaters
-version=0.2.2
+version=0.2.3
 # requiredOdin and the latest action must have the same name if useActions is true.
 requiredOdin=Odin-1.3.3.jar
 odinRepository = odtheking/Odin
-useActions=true
+useActions=false

src/main/kotlin/com/github/subat0m1c/hatecheaters/commands/impl/HCCommand.kt

@@ -6,7 +6,9 @@ import com.github.subat0m1c.hatecheaters.utils.ChatUtils.modMessage
 val HCCommand = Commodore("hc", "hatecheaters") {
     runs {
         modMessage("""
-            Commands List:
+            §bHate§3Cheaters §fmodules are accessible through the odin config menu §8(§7/odin§8)§f.
+            
+            §fCommands List:
             §3| §f/hc §7: §8Main command.
             §3| §f/hcpv <name>  §8|§f /pv <name> §7: §8Opens the profile viewer. Will use your own ign if name is left blank.
             §3| §f/hcs <name> §8|§f /ds <name> §7: §8Displays dungeon stats about the ign. Will use your own ign if name is left blank.

src/main/kotlin/com/github/subat0m1c/hatecheaters/commands/impl/pvcommands.kt

@@ -1,6 +1,7 @@
 package com.github.subat0m1c.hatecheaters.commands.impl
 
 import com.github.stivais.commodore.Commodore
+import com.github.subat0m1c.hatecheaters.modules.render.ProfileViewer
 import com.github.subat0m1c.hatecheaters.modules.render.ProfileViewer.pvCommand
 import com.github.subat0m1c.hatecheaters.modules.render.launchPV
 import com.github.subat0m1c.hatecheaters.utils.ChatUtils.modMessage
@@ -18,7 +19,7 @@ val PVCommand = Commodore("pv") {
 
         runs { name: String?, profile: String? ->
             if (!pvCommand) return@runs modMessage("This command has been disabled! Restart your game to fully remove this command and allow neu's pv.")
-            launchPV(name, profile)
+            launchPV(ProfileViewer.PvPlayer(name ?: mc.thePlayer.name, profile = profile))
         }
     }
 }
@@ -32,7 +33,7 @@ val HCPVCommand = Commodore("hcpv") {
         param("profile").suggests { profileNames }
 
         runs { name: String?, profile: String? ->
-            launchPV(name, profile)
+            launchPV(ProfileViewer.PvPlayer(name ?: mc.thePlayer.name, profile = profile))
         }
     }
 }

src/main/kotlin/com/github/subat0m1c/hatecheaters/modules/dungeons/BetterPartyFinder.kt

@@ -1,6 +1,7 @@
 package com.github.subat0m1c.hatecheaters.modules.dungeons
 
 import com.github.subat0m1c.hatecheaters.HateCheaters.Companion.launch
+import com.github.subat0m1c.hatecheaters.modules.render.ProfileViewer
 import com.github.subat0m1c.hatecheaters.pvgui.v2.utils.Utils.formatted
 import com.github.subat0m1c.hatecheaters.pvgui.v2.utils.Utils.without
 import com.github.subat0m1c.hatecheaters.utils.ChatUtils.modMessage
@@ -313,6 +314,8 @@ object BetterPartyFinder : Module(
                         partyMessage("Kicked $name for: ${kickedReasons.joinToString(", ")}")
                     } else sendCommand("party kick $name")
 
+                    ProfileViewer.addForKeybind(name)
+
                     return@launch modMessage("Kicking $name for: \n${kickedReasons.joinToString(" \n")}")
                 }
 

src/main/kotlin/com/github/subat0m1c/hatecheaters/modules/dungeons/ClearSecrets.kt

@@ -7,7 +7,9 @@ import com.github.subat0m1c.hatecheaters.utils.ChatUtils.chatConstructor
 import com.github.subat0m1c.hatecheaters.utils.ChatUtils.modMessage
 import com.github.subat0m1c.hatecheaters.utils.ExtraStatsHandler
 import com.github.subat0m1c.hatecheaters.utils.apiutils.HypixelApi.getSecrets
-import kotlinx.coroutines.*
+import com.github.subat0m1c.hatecheaters.utils.networkutils.WebUtils
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.Deferred
 import me.odinmain.clickgui.settings.impl.BooleanSetting
 import me.odinmain.features.Module
 import me.odinmain.utils.noControlCodes
@@ -62,6 +64,9 @@ object ClearSecrets : Module(
         event.teammates.forEach {
             val teammate = it.asTeammate()
             if (teammate in teammateList) return@forEach
+            teammate.dungeonPlayer.entity?.uniqueID?.let { uuid ->
+                WebUtils.UuidCache.addToCache(teammate.name, uuid.toString())
+            }
             teammateList.add(teammate.apply { if (it.name != mc.thePlayer.name) pullSecrets() })
         }
     }

src/main/kotlin/com/github/subat0m1c/hatecheaters/modules/render/ProfileViewer.kt

@@ -3,17 +3,15 @@ package com.github.subat0m1c.hatecheaters.modules.render
 import com.github.subat0m1c.hatecheaters.HateCheaters.Companion.screen
 import com.github.subat0m1c.hatecheaters.pvgui.v2.PVGui
 import com.github.subat0m1c.hatecheaters.pvgui.v2.PVGui.loadPlayer
-import com.github.subat0m1c.hatecheaters.utils.ChatUtils.setHover
 import com.github.subat0m1c.hatecheaters.utils.LogHandler.Logger
 import me.odinmain.clickgui.settings.AlwaysActive
 import me.odinmain.clickgui.settings.Setting.Companion.withDependency
 import me.odinmain.clickgui.settings.impl.*
 import me.odinmain.features.Module
 import me.odinmain.utils.render.Color
 import me.odinmain.utils.render.Colors
-import net.minecraft.event.ClickEvent
-import net.minecraftforge.client.event.ClientChatReceivedEvent
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import net.minecraft.entity.player.EntityPlayer
+import java.util.*
 
 @AlwaysActive
 object ProfileViewer : Module(
@@ -30,19 +28,22 @@ object ProfileViewer : Module(
         default = false,
         desc = "Uses /hcpv in the stats command instead of /pv."
     )
-    val messagePv by BooleanSetting(
-        "Message PV",
-        default = false,
-        desc = "Runs /pv when you click a name in chat. might have lots of compatibility issues."
-    )
+//    val messagePv by BooleanSetting(
+//        "Message PV",
+//        default = false,
+//        desc = "Runs /pv when you click a name in chat. might have lots of compatibility issues."
+//    )
+
+    val animations by BooleanSetting("Animations", default = true, desc = "Animations for the gui.")
+
     val invwalk by BooleanSetting(
         "GUI Move",
         default = false,
         desc = "Lets you move in the gui. USE AT YOUR OWN RISK. It should be fine in theory but hypixel is funky."
     )
     val scale by NumberSetting(
         "Scale",
-        default = 1.5,
+        default = 1.0,
         increment = 0.1,
         min = 0.1,
         max = 1.5,
@@ -125,18 +126,18 @@ object ProfileViewer : Module(
     //https://regex101.com/r/dl1MqJ/1
     private inline val messageRegex get() = Regex("^(((?:Party|Guild|Co-op) >|(?:From|To)|(?:\\[\\d+])?) ?(\\[[^]]*?])? ?(\\w{1,16}) ?(\\[[^]]*?]|[ቾ⚒])?): ?(.+)$")
 
-    @SubscribeEvent
-    fun onMessage(event: ClientChatReceivedEvent) {
-        if (!messagePv) return
-        val (_, _, _, name) = messageRegex.matchEntire(event.message.unformattedText)?.destructured ?: return
-        event.message.siblings.find { it.unformattedText.contains(name) }?.chatStyle?.apply {
-            chatClickEvent = ClickEvent(
-                ClickEvent.Action.RUN_COMMAND,
-                "/${if (statsPv) "hcpv" else "pv"} $name"
-            )
-            setHover(listOf("Click to view ${name}'s profile"))
-        }
-    }
+//    @SubscribeEvent
+//    fun onMessage(event: ClientChatReceivedEvent) {
+//        if (!messagePv) return
+//        val (_, _, _, name) = messageRegex.matchEntire(event.message.unformattedText)?.destructured ?: return
+//        event.message.siblings.find { it.unformattedText.contains(name) }?.chatStyle?.apply {
+//            chatClickEvent = ClickEvent(
+//                ClickEvent.Action.RUN_COMMAND,
+//                "/${if (statsPv) "hcpv" else "pv"} $name"
+//            )
+//            setHover(listOf("Click to view ${name}'s profile"))
+//        }
+//    }
 
     val themeEntries = listOf(
         Theme(
@@ -202,20 +203,50 @@ object ProfileViewer : Module(
         inventoryRound
     )
 
+    data class PvPlayer(val name: String, val uuid: UUID? = null, val profile: String? = null)
+    data class LoadPlayer(var player: PvPlayer, var added: Long = System.currentTimeMillis())
+
+    private val toPv by lazy { LoadPlayer(PvPlayer(mc.thePlayer.name, mc.thePlayer.uniqueID), 0) }
+    private val lastLoaded by lazy { LoadPlayer(PvPlayer(mc.thePlayer.name, mc.thePlayer.uniqueID), 0) }
+
+    fun loaded(name: String, profile: String?) {
+        lastLoaded.player = PvPlayer(
+            name,
+            profile = profile
+        ) // we technically could pass uuid in, but it will be in the uuid cache here anyways.
+        lastLoaded.added = System.currentTimeMillis()
+    }
+
+    fun addForKeybind(player: String) {
+        toPv.player = PvPlayer(player) // we also have uuid here but it will be in the cache by now.
+        toPv.added = System.currentTimeMillis()
+    }
+
     override fun onKeybind() {
-        launchPV()
+        val entity = mc.objectMouseOver.entityHit
+        val player: PvPlayer = when {
+            System.currentTimeMillis() - toPv.added <= 5000 -> toPv.player
+            entity != null && entity is EntityPlayer && entity.uniqueID.version() != 2 -> PvPlayer(
+                entity.name,
+                entity.uniqueID
+            )
+
+            System.currentTimeMillis() - lastLoaded.added <= 5000 -> lastLoaded.player
+            else -> PvPlayer(mc.thePlayer.name, mc.thePlayer.uniqueID)
+        }
+
+        launchPV(player)
     }
 
     override fun onEnable() {
-        launchPV()
-        super.onEnable()
+        launchPV(PvPlayer(mc.thePlayer.name, mc.thePlayer.uniqueID))
         toggle()
     }
 
 }
 
-fun launchPV(name: String? = null, profile: String? = null) {
-    loadPlayer(name, profile)
+fun launchPV(player: ProfileViewer.PvPlayer) {
+    loadPlayer(player)
     screen = PVGui
     Logger.info("Trying to display pvgui")
 }

src/main/kotlin/com/github/subat0m1c/hatecheaters/modules/skyblock/HateCheatersModule.kt

@@ -21,7 +21,6 @@ object HateCheatersModule : Module(
         ArrayList(ToastRenderer.ToastCorner.entries.map { it.displayName }),
         desc = "The corner the toasts will be in."
     ).withDependency { toasts }
-
     // val logJson by BooleanSetting("Log Json", default = false, desc = "Logs requested json data to Config/hatecheaters/json_logs")
     val debugMessages by BooleanSetting(
         "Debug messages",

src/main/kotlin/com/github/subat0m1c/hatecheaters/pvgui/v2/PVGui.kt

@@ -1,29 +1,33 @@
 package com.github.subat0m1c.hatecheaters.pvgui.v2
 
 import com.github.subat0m1c.hatecheaters.HateCheaters.Companion.launch
+import com.github.subat0m1c.hatecheaters.modules.render.ProfileViewer
 import com.github.subat0m1c.hatecheaters.modules.render.ProfileViewer.invwalk
 import com.github.subat0m1c.hatecheaters.modules.render.ProfileViewer.scale
-import com.github.subat0m1c.hatecheaters.pvgui.v2.Pages.currentPage
 import com.github.subat0m1c.hatecheaters.pvgui.v2.pages.Overview.setPlayer
 import com.github.subat0m1c.hatecheaters.pvgui.v2.utils.InvWalkInput
-import com.github.subat0m1c.hatecheaters.pvgui.v2.utils.ProfileLazy
+import com.github.subat0m1c.hatecheaters.pvgui.v2.utils.ResettableLazy
 import com.github.subat0m1c.hatecheaters.utils.ChatUtils.modMessage
 import com.github.subat0m1c.hatecheaters.utils.apiutils.HypixelApi.getProfile
+import com.github.subat0m1c.hatecheaters.utils.apiutils.HypixelApi.getProfileUUID
 import com.github.subat0m1c.hatecheaters.utils.apiutils.HypixelData.PlayerInfo
 import com.github.subat0m1c.hatecheaters.utils.odinwrappers.Shaders
 import me.odinmain.OdinMain
+import me.odinmain.clickgui.settings.impl.KeybindSetting
+import me.odinmain.utils.ui.animations.LinearAnimation
 import net.minecraft.client.gui.GuiScreen
 import net.minecraft.client.gui.ScaledResolution
 import net.minecraft.client.renderer.GlStateManager
 import net.minecraft.util.MovementInputFromOptions
 
 object PVGui : GuiScreen() {
+    val animation = LinearAnimation<Float>(400)
 
     var playerData: PlayerInfo? = null
     var profileName: String? = null
         set(value) {
             field = value
-            ProfileLazy.resetAll()
+            ResettableLazy.resetAll()
         }
 
     var loadText = "Loading..."
@@ -40,7 +44,12 @@ object PVGui : GuiScreen() {
         GlStateManager.translate(OdinMain.mc.displayWidth / 2.0, OdinMain.mc.displayHeight / 2.0, 0.0)
         GlStateManager.scale(scale, scale, 1.0)
 
-        currentPage.page.preDraw()
+        if (animation.isAnimating()) {
+            Shaders.translate(0f, animation.get(-10f, 0f))
+            Shaders.globalAlpha(animation.get(0f, 1f))
+        }
+
+        PageHandler.preDraw()
         Shaders.popMatrix()
         Shaders.stopDraw()
 //        scale(1f / scale, 1f / scale, 1.0)
@@ -50,12 +59,13 @@ object PVGui : GuiScreen() {
     }
 
     override fun mouseClicked(mouseX: Int, mouseY: Int, mouseButton: Int) {
-        currentPage.page.handleClick(mouseX, mouseY, mouseButton)
+        PageHandler.handleClick(mouseButton)
         super.mouseClicked(mouseX, mouseY, mouseButton)
     }
 
     override fun initGui() {
-        currentPage = Pages.PageEntries.Overview
+        animation.start()
+        PageHandler.reset()
 
         if (!invwalk) return
         mc.thePlayer?.let { player ->
@@ -69,28 +79,44 @@ object PVGui : GuiScreen() {
 
     override fun onGuiClosed() {
         mc.thePlayer.movementInput = MovementInputFromOptions(mc.gameSettings)
+        playerData?.name?.let { ProfileViewer.loaded(it, profileName) }
+
         loadText = "Loading..."
         playerData = null
         profileName = null
     }
 
     fun updateProfile(profile: String?) = playerData?.profileOrSelected(profile)?.cuteName?.let { profileName = it }
 
-    fun loadPlayer(name: String?, profileName: String? = null) = launch {
-        getProfile(name ?: mc.thePlayer.name).fold(
-            onSuccess = {
-                if (it.profileData.profiles.isEmpty()) {
-                    loadText = "No profiles found for ${name}."
-                    return@launch
-                }
-                playerData = it
-                setPlayer(it)
-                updateProfile(profileName)
-            }, onFailure = {
-                modMessage(it.message)
-                loadText = "Failed to grab profile data."
-            }
-        )
+    fun loadPlayer(player: ProfileViewer.PvPlayer) = launch {
+        if (player.uuid != null) getProfileUUID(
+            player.uuid.toString().replace("-", ""),
+            player.name
+        ).fold(::successfulLoad, ::loadFail)
+        else getProfile(player.name).fold(::successfulLoad, ::loadFail)
+    }
+
+    private fun successfulLoad(player: PlayerInfo) {
+        if (player.profileData.profiles.isEmpty()) {
+            loadText = "No profiles found for ${player.name}."
+            return
+        }
+        playerData = player
+        setPlayer(player)
+        updateProfile(profileName)
+    }
+
+    private fun loadFail(error: Throwable) {
+        modMessage(error.message)
+        loadText = "Failed to grab profile data."
+    }
+
+    override fun keyTyped(typedChar: Char, keyCode: Int) {
+        if ((ProfileViewer.settings.find { it.name == "Keybind" } as KeybindSetting).value.key == keyCode) {
+            mc.displayGuiScreen(null)
+        }
+
+        super.keyTyped(typedChar, keyCode)
     }
 
     override fun doesGuiPauseGame(): Boolean = false

src/main/kotlin/com/github/subat0m1c/hatecheaters/pvgui/v2/PVPage.kt

@@ -0,0 +1,38 @@
+package com.github.subat0m1c.hatecheaters.pvgui.v2
+
+import com.github.subat0m1c.hatecheaters.pvgui.v2.PVGui.playerData
+import com.github.subat0m1c.hatecheaters.pvgui.v2.PVGui.profileName
+import com.github.subat0m1c.hatecheaters.pvgui.v2.PageHandler.pageData
+import com.github.subat0m1c.hatecheaters.utils.apiutils.HypixelData.MemberData
+import com.github.subat0m1c.hatecheaters.utils.apiutils.HypixelData.PlayerInfo
+import com.github.subat0m1c.hatecheaters.utils.apiutils.HypixelData.PlayerInfo.Companion.dummyPlayer
+import com.github.subat0m1c.hatecheaters.utils.odinwrappers.Colors
+import com.github.subat0m1c.hatecheaters.utils.odinwrappers.Text
+
+abstract class PVPage(val name: String) {
+    protected inline val player: PlayerInfo
+        get() = playerData ?: dummyPlayer
+    protected inline val profile: MemberData
+        get() = player.profileOrSelected(profileName)?.members?.get(player.uuid) ?: MemberData(playerId = "")
+
+    protected inline val ct get() = pageData.ct
+    protected inline val totalHeight get() = pageData.totalHeight
+    protected inline val spacer get() = pageData.spacer
+    protected inline val mainWidth get() = pageData.mainWidth
+    protected inline val mainHeight get() = pageData.mainHeight
+    protected inline val mainX get() = pageData.mainStart
+
+    protected val mainCenterX = pageData.mainStart + mainWidth / 2
+    protected val quadrantWidth = (mainWidth / 2) - (spacer / 2)
+
+    open fun draw(mouseX: Int, mouseY: Int) = Text.text(
+        "This page is not yet implemented!",
+        mainCenterX,
+        totalHeight / 2,
+        3f,
+        Colors.WHITE,
+        alignment = Text.Alignment.MIDDLE
+    )
+
+    open fun mouseClick(x: Int, y: Int, button: Int) {}
+}