Merge remote-tracking branch 'origin/master'

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

Author: Cezqr

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

@@ -5,6 +5,7 @@ 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 com.github.subat0m1c.hatecheaters.utils.odinwrappers.OdinGray
 import me.odinmain.clickgui.settings.AlwaysActive
 import me.odinmain.clickgui.settings.Setting.Companion.withDependency
 import me.odinmain.clickgui.settings.impl.*
@@ -148,14 +149,14 @@ object ProfileViewer : Module(
     val themeEntries = listOf(
         Theme(
             "Classic",
-            Color("555555FF"),
+            OdinGray,
             Colors.MINECRAFT_BLUE,
             Colors.WHITE,
             Colors.MINECRAFT_GRAY,
             Colors.WHITE,
             "f",
             Colors.MINECRAFT_DARK_AQUA.withAlpha(0.8f),
-            Color("555555FF"),
+            Color(75, 75, 75),
             10f,
             0f,
         ),

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

@@ -79,17 +79,19 @@ object PVGui : GuiScreen() {
     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)
-                failed()
+                loadText = "Failed to grab profile data."
             }
         )
     }
 
-    private fun failed() { loadText = "Failed to grab profile data." }
-
     override fun doesGuiPauseGame(): Boolean = false
 }

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

@@ -97,15 +97,15 @@ object Pages {
             }
 
             Shaders.rect(lineY, lastY, pageWidth, lastHeight, ct.roundness, ct.button.hc())
-            val betaText = if (currentPage != PageEntries.Overview) player.name else "HCPV 0.0.1"
+            val betaText = if (currentPage != PageEntries.Overview) player.name else "HCPV 0.0.2"
             centeredText(
                 betaText,
                 pageCenter,
                 lastY + lastHeight / 2,
                 color = ct.font.hc(),
                 scale = if (betaText.length >= 8) 3f else 3.5f
             )
-            if (playerData != null) draw() else centeredText(loadText, mainCenterX, totalHeight / 2, 7f)
+            if (playerData != null) draw() else centeredText(loadText, mainCenterX, totalHeight / 2, 5f)
             Shaders.popMatrix()
         }
 

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

@@ -30,7 +30,8 @@ object Pets: Pages.PVPage("Pets") {
     }
 
     private val pets by profileLazy {
-        profile.pets.pets.map { pet -> "${pet.colorName}${pet.petItem?.let { " §7(§${ct.fontCode}${it}§7)" } ?: ""}" }
+        profile.pets.pets.sortedByDescending { it.exp }
+            .map { pet -> "${pet.colorName}${pet.petItem?.let { " §7(§${ct.fontCode}${it}§7)" } ?: ""}" }
     }
 
     private val entryHeight by profileLazy {

src/main/kotlin/com/github/subat0m1c/hatecheaters/utils/odinwrappers/Colors.kt

@@ -42,6 +42,8 @@ object Colors {
     val TRANSPARENT = Color(OdinColors.TRANSPARENT)
 }
 
+inline val OdinGray get() = OdinColor(35, 35, 35)
+
 /**
  * this is so we can use odin's ColorSetting with our own wrapped class.
  */

src/main/kotlin/com/github/subat0m1c/hatecheaters/utils/odinwrappers/Text.kt

@@ -31,7 +31,7 @@ object Text {
                 if (char == 'r') {
                     bold = false
                 }
-                val colorCode = "0123456789abcdefr".indexOf(text.lowercase()[i + 1])
+                val colorCode = "0123456789abcdefr".indexOf(text.lowercase()[i + 1]).takeUnless { it == -1 } ?: 16
                 color = colorCodes[colorCode]
                 i += 2
                 continue