stuff probably

Author: SubAt0m1c

src/main/kotlin/com/github/subat0m1c/hatecheaters/HateCheaters.kt

@@ -17,7 +17,6 @@ import me.odinmain.features.ModuleManager
 import net.minecraft.client.gui.GuiScreen
 import net.minecraftforge.common.MinecraftForge
 import net.minecraftforge.fml.common.Mod
-import net.minecraftforge.event.world.WorldEvent
 import net.minecraftforge.fml.common.event.FMLInitializationEvent
 import net.minecraftforge.fml.common.event.FMLLoadCompleteEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -37,22 +36,6 @@ class HateCheaters {
         ).forEach { MinecraftForge.EVENT_BUS.register(it) }
     }
 
-    private var isUpdateCheckInProgress = false
-    private var timesCheckedForUpdate = 0
-
-    @SubscribeEvent
-    fun onWorldLoad(event: WorldEvent.Load) {
-        if (timesCheckedForUpdate > 1 || isUpdateCheckInProgress) return
-
-        isUpdateCheckInProgress = true
-        launch {
-            CheckUpdate.lookForUpdates()
-            isUpdateCheckInProgress = false
-        }
-
-        timesCheckedForUpdate++
-    }
-
     @SubscribeEvent
     fun onTick(event: ClientTickEvent){
         if (screen == null) return

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

@@ -1,10 +1,13 @@
 package com.github.subat0m1c.hatecheaters.modules
 
+import com.github.subat0m1c.hatecheaters.HateCheaters.Companion.launch
+import com.github.subat0m1c.hatecheaters.utils.CheckUpdate
 import me.odinmain.features.Category
 import me.odinmain.features.Module
 import me.odinmain.features.settings.AlwaysActive
 import me.odinmain.features.settings.impl.BooleanSetting
 import me.odinmain.features.settings.impl.StringSetting
+import me.odinmain.utils.skyblock.LocationUtils
 
 @AlwaysActive
 object HateCheatersModule : Module(
@@ -16,4 +19,17 @@ object HateCheatersModule : Module(
     val debugMessages: Boolean by BooleanSetting("Debug messages", default = false, description = "Prints debug messages in your chat instead of needing to open logs.")
     val checkUpdates: Boolean by BooleanSetting("Update Checker", default = true, description = "Checks GitHub for latest HateCheaters releases and notifies you if you are on an old version!")
     val server: String by StringSetting("Api Server", default = "default", hidden = false, description = "Server to be used to connect to the api. set to \"default\" to use the default. Only change if you know what you're doing. format: \"subdomain.domain.tld\"")
+
+    private var checkedForUpdate = false
+
+    init {
+        execute(250) {
+            if (checkedForUpdate || !checkUpdates) destroyExecutor()
+            if (!LocationUtils.isInSkyblock) return@execute
+            checkedForUpdate = true
+            launch {
+                CheckUpdate.lookForUpdates()
+            }
+        }
+    }
 }

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

@@ -207,7 +207,7 @@ object Inventory: Pages.PVPage("Inventory") {
         private val buttons: ButtonDSL<Int> by profileLazy {
             buttons(
                 Box(mainX, startY, mainWidth, buttonHeight), lineY, ot, default = 1,
-                profile.inventory.backpackContents.keys.mapNotNull { it.toIntOrNull()?.plus(1) }.sorted(), 2, // adding and subtracting so the display matches the game menu.
+                profile.inventory.backpackContents.keys.mapNotNull { it.toIntOrNull()?.plus(1) }.sorted(), 2, // adding and subtracting so the display matches the game menu instead of index.
                 ct.button, ct.selected, ct.roundness, 1f,
             ) {
                 onSelect {

src/main/kotlin/com/github/subat0m1c/hatecheaters/utils/ChatUtils.kt

@@ -59,7 +59,7 @@ object ChatUtils {
 
         val message get() = chat
 
-        fun print() = runOnMCThread { mc.thePlayer.addChatMessage(chat) }
+        fun print() = runOnMCThread { mc.thePlayer?.addChatMessage(chat) }
     }
 
     fun ChatStyle.setHover(text: List<String>): ChatStyle =

src/main/kotlin/com/github/subat0m1c/hatecheaters/utils/CheckUpdate.kt

@@ -1,18 +1,15 @@
 package com.github.subat0m1c.hatecheaters.utils
 
-import com.github.subat0m1c.hatecheaters.utils.ChatUtils
 import com.github.subat0m1c.hatecheaters.utils.LogHandler.Logger
-import com.github.subat0m1c.hatecheaters.utils.WebUtils
 import me.odinmain.utils.skyblock.getChatBreak
 import com.github.subat0m1c.hatecheaters.utils.OdinCheck.compareVersions
-import com.github.subat0m1c.hatecheaters.modules.HateCheatersModule.checkUpdates
 import com.github.subat0m1c.hatecheaters.HateCheaters
+import com.github.subat0m1c.hatecheaters.HateCheaters.Companion.launch
+import com.github.subat0m1c.hatecheaters.utils.ChatUtils.modMessage
 import net.minecraft.event.ClickEvent
 import kotlinx.serialization.*
 import kotlinx.serialization.json.*
-import kotlinx.coroutines.*
-import java.net.HttpURLConnection
-import java.net.URL
+import me.odinmain.utils.runIn
 
 val json = Json {
     isLenient = true
@@ -21,60 +18,55 @@ val json = Json {
 
 @Serializable
 data class ReleaseInfo(
-    val tag_name: String
+    @SerialName("tag_name")
+    val tagName: String
 )
 
 object CheckUpdate {
-    private const val githubAPIURL = "https://api.github.com/repos/subat0m1c/HateCheaters/releases/latest"
+    private const val GITHUBAPIURL = "https://api.github.com/repos/subat0m1c/HateCheaters/releases/latest"
     private inline val currentVersion: String get() = HateCheaters.version
 
-    fun lookForUpdates() {
-        if (!checkUpdates) {
-            return
-        }
-
-        HateCheaters.scope.launch {
-            try {
-                Logger.info("Currently on HateCheaters $currentVersion")
-                val jsonResponse = WebUtils.getInputStream(githubAPIURL).getOrElse {
-                    return@launch Logger.warning("Failed to fetch data from GitHub API: ${it.message}")
-                }
-                val jsonString = jsonResponse.bufferedReader().use { it.readText() }
-                checkVersion(jsonString)
-            } catch (e: Exception) {
-                Logger.warning("Error while checking for updates: ${e.message}")
-            }
+    fun lookForUpdates() = launch {
+        try {
+            Logger.info("Currently on HateCheaters $currentVersion")
+            val jsonResponse = WebUtils.getInputStream(GITHUBAPIURL).getOrElse { return@launch }
+            val jsonString = jsonResponse.bufferedReader().use { it.readText() }
+            checkVersion(jsonString)
+        } catch (e: Exception) {
+            Logger.warning("Error while checking for updates: ${e.message}")
         }
     }
 
 
-    private suspend fun checkVersion(jsonResponse: String) {
+    private fun checkVersion(jsonResponse: String) {
         val releaseInfo = json.decodeFromString<ReleaseInfo>(jsonResponse)
-        val latestVersion = releaseInfo.tag_name
+        val latestVersion = releaseInfo.tagName
 
         val isNewVersionAvailable = compareVersions(latestVersion, currentVersion)
-        if (isNewVersionAvailable < 0) {
-            delay(2000)
-            ChatUtils.modMessage("You are on a development build! Hi!")
-            Logger.info("HC > Development Build Detected!")
-        } else if (isNewVersionAvailable > 0) {
-            val releaseLink = "https://github.com/SubAt0m1c/HateCheaters/releases/tag/$latestVersion"
-            delay(2000)
-            ChatUtils.chatConstructor {
-                displayText(getChatBreak())
-                displayText("§bH§3C §8»§r Update available! ($currentVersion → $latestVersion) ")
-                clickText(
-                    "Click here to open the latest release link!",
-                    releaseLink,
-                    listOf("Click to open the release link."),
-                    ClickEvent.Action.OPEN_URL
-                )
-                displayText(getChatBreak())
-            }.print()
+        runIn(40) {
+           when {
+               isNewVersionAvailable < 0 -> {
+                   Logger.info("HC > Development Build Detected!")
+                   modMessage("You are on a development build! Hi!")
+               }
+               isNewVersionAvailable > 0 -> {
+                   ChatUtils.chatConstructor {
+                       displayText(getChatBreak())
+                       displayText("§bH§3C §8»§r Update available! ($currentVersion → $latestVersion) ")
+                       clickText(
+                           "Click here to open the latest release link!",
+                           "https://github.com/SubAt0m1c/HateCheaters/releases/tag/$latestVersion",
+                           listOf("Click to open the release link."),
+                           ClickEvent.Action.OPEN_URL
+                       )
+                       displayText(getChatBreak())
+                   }.print()
 
-            Logger.info("HC > Update available.")
-        } else {
-            Logger.info("HC > No update needed.")
+                   Logger.info("HC > Update available.")
+               } else -> {
+                   Logger.info("HC > No update needed.")
+               }
+           }
         }
     }
 }

src/main/kotlin/com/github/subat0m1c/hatecheaters/utils/OdinCheck.kt

@@ -116,9 +116,11 @@ object OdinCheck {
     private val versionRegex = Regex("(\\d)\\.(\\d)\\.(\\d)(?:\\.(\\d))?(?:\\.beta(\\d+))?")
 
     /**
-     * @return -1 if version1 is older, 1 if version1 is newer, 0 if they're the same.
      * UPDATE: it now generally compares versions between the 2 args, might be good idk
+     *
      * I think this code is bad but i cant be bothered fixing it. also can return lower than -1.
+     *
+     * @return -1 if version1 is older, 1 if version1 is newer, 0 if they're the same.
      */
     fun compareVersions(version1: String, version2: String): Int {
         val v1 = versionRegex.find(version1)?.groupValues?.drop(1)?.map { it.toIntOrNull() } ?: return -2

src/main/kotlin/com/github/subat0m1c/hatecheaters/utils/apiutils/ParseUtils.kt

@@ -6,7 +6,6 @@ import com.github.subat0m1c.hatecheaters.utils.LogHandler.Logger
 import com.github.subat0m1c.hatecheaters.utils.WebUtils.Server
 import com.github.subat0m1c.hatecheaters.utils.WebUtils.getInputStream
 import com.github.subat0m1c.hatecheaters.utils.WebUtils.getUUIDbyName
-import com.github.subat0m1c.hatecheaters.utils.apiutils.ApiUtils.memberData
 import com.github.subat0m1c.hatecheaters.utils.apiutils.HypixelData.PlayerInfo
 import com.github.subat0m1c.hatecheaters.utils.apiutils.SkyCryptData.skyCryptToHypixel
 import kotlinx.coroutines.Dispatchers