feat/refactor: API to handle image loading asynchronously and safely.

fix: Resolved OpenGL context errors by scheduling texture creation on the main thread. refactor: Updated GuiCapeManager.kt to utilize the non-suspending callImage() function from APIConnectorUtils. feat: Implemented error handling in GuiUpdate.kt to display error messages when API reload fails. feat: Added a loading bar and progress updates in GuiUpdate.kt to enhance user feedback during API reload. chore: Improved logging in APIConnectorUtils.kt for better debugging of image loading processes. fix: Ensured that all OpenGL-related operations are performed on the main thread to prevent crashes. feat: Scheduled API checks and image loading during client startup to ensure all resources are ready before GUI initialization.
SkidderMC · Dec 30, 2024 · 7657156 · 7657156
1 parent eced4cc
commit 7657156
Show file tree

Hide file tree

Showing 4 changed files with 161 additions and 138 deletions.
diff --git a/src/main/java/net/ccbluex/liquidbounce/FDPClient.kt b/src/main/java/net/ccbluex/liquidbounce/FDPClient.kt
@@ -7,6 +7,7 @@ package net.ccbluex.liquidbounce
 
 import com.formdev.flatlaf.themes.FlatMacLightLaf
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
 import net.ccbluex.liquidbounce.event.ClientShutdownEvent
 import net.ccbluex.liquidbounce.event.EventManager
 import net.ccbluex.liquidbounce.event.StartupEvent
@@ -53,7 +54,7 @@ import net.ccbluex.liquidbounce.utils.inventory.InventoryManager
 import net.ccbluex.liquidbounce.utils.kotlin.SharedScopes
 import net.ccbluex.liquidbounce.utils.inventory.InventoryUtils
 import net.ccbluex.liquidbounce.utils.inventory.SilentHotbar
-import net.ccbluex.liquidbounce.utils.io.APIConnectorUtils
+import net.ccbluex.liquidbounce.utils.io.APIConnectorUtils.performAllChecksAsync
 import net.ccbluex.liquidbounce.utils.movement.BPSUtils
 import net.ccbluex.liquidbounce.utils.movement.MovementUtils
 import net.ccbluex.liquidbounce.utils.movement.TimerBalanceUtils
@@ -202,11 +203,9 @@ object FDPClient {
             registerModules()
 
             // API Connecter
-            APIConnectorUtils.checkStatus()
-            APIConnectorUtils.checkChangelogs()
-            APIConnectorUtils.checkBugs()
-            APIConnectorUtils.loadPictures()
-
+            runBlocking {
+                performAllChecksAsync()
+            }
             runCatching {
                 // Remapper
                 loadSrg()

diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/GuiCapeManager.kt b/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/GuiCapeManager.kt
@@ -65,7 +65,7 @@ object GuiCapeManager : AbstractScreen() {
     }
 
     override fun onGuiClosed() {
-
+        // Implement any necessary cleanup when the GUI is closed
     }
 
     override fun initGui() {
@@ -76,7 +76,7 @@ object GuiCapeManager : AbstractScreen() {
     }
 
     private fun updateCapeStyle() {
-      nowCape = CapeStyle.valueOf(styleValue.value.uppercase(Locale.getDefault()))
+        nowCape = CapeStyle.valueOf(styleValue.value.uppercase(Locale.getDefault()))
     }
 
     override fun actionPerformed(button: GuiButton) {
@@ -90,7 +90,7 @@ object GuiCapeManager : AbstractScreen() {
                 chooseIndex = styleValue.values.size - 1
             }
 
-           styleValue.value = styleValue.values[chooseIndex]
+            styleValue.value = styleValue.values[chooseIndex]
             updateCapeStyle()
         }
 
@@ -193,4 +193,4 @@ object GuiCapeManager : AbstractScreen() {
     }
 
     override fun doesGuiPauseGame() = false
-}
+}
diff --git a/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/GuiUpdate.kt b/src/main/java/net/ccbluex/liquidbounce/ui/client/gui/GuiUpdate.kt
@@ -5,16 +5,14 @@
  */
 package net.ccbluex.liquidbounce.ui.client.gui
 
+import kotlinx.coroutines.launch
 import net.ccbluex.liquidbounce.FDPClient.IN_DEV
 import net.ccbluex.liquidbounce.features.module.modules.client.HUDModule.guiColor
-import net.ccbluex.liquidbounce.handler.api.ClientUpdate
 import net.ccbluex.liquidbounce.ui.font.AWTFontRenderer.Companion.assumeNonVolatile
 import net.ccbluex.liquidbounce.ui.font.Fonts
-import net.ccbluex.liquidbounce.utils.io.APIConnectorUtils.checkBugs
-import net.ccbluex.liquidbounce.utils.io.APIConnectorUtils.checkChangelogs
-import net.ccbluex.liquidbounce.utils.io.APIConnectorUtils.checkStatus
-import net.ccbluex.liquidbounce.utils.io.APIConnectorUtils.loadPictures
+import net.ccbluex.liquidbounce.utils.io.APIConnectorUtils.performAllChecksAsync
 import net.ccbluex.liquidbounce.utils.io.MiscUtils
+import net.ccbluex.liquidbounce.utils.kotlin.SharedScopes
 import net.ccbluex.liquidbounce.utils.render.RenderUtils.drawBloom
 import net.ccbluex.liquidbounce.utils.ui.AbstractScreen
 import net.minecraft.client.gui.GuiButton
@@ -128,17 +126,16 @@ class GuiUpdate : AbstractScreen() {
                 loadProgress = 0
                 errorMessage = null
 
+                SharedScopes.IO.launch {
                     try {
-                        checkStatus()
-                        checkChangelogs()
-                        checkBugs()
-                        loadPictures()
+                        performAllChecksAsync()
                     } catch (e: Exception) {
                         errorMessage = "Failed to reload API: ${e.message}"
                     } finally {
                         isLoading = false
                         loadProgress = 100
                     }
+                }
             }
         }
     }