Merged 1.17 to 1.18

Signed-off-by: DeathsGun <deathsgun@protonmail.com>

Author: DeathsGun

src/main/kotlin/xyz/deathsgun/modmanager/ModManager.kt

@@ -67,7 +67,7 @@ class ModManager : ClientModInitializer {
 
         @JvmStatic
         fun getMinecraftVersionId(): String {
-            return MinecraftClient.getInstance()?.game?.version?.id ?: "1.18-pre1"
+            return MinecraftClient.getInstance()?.game?.version?.id ?: "1.18.1"
         }
     }
 

src/main/kotlin/xyz/deathsgun/modmanager/PreLaunchHook.kt

@@ -35,8 +35,8 @@ class PreLaunchHook : PreLaunchEntrypoint {
 
     @OptIn(DelicateCoroutinesApi::class)
     override fun onPreLaunch() {
+        ModManager.modManager = ModManager()
         GlobalScope.launch {
-            ModManager.modManager = ModManager()
             ModManager.modManager.update.checkUpdates()
         }
         val filesToDelete = try {

src/main/kotlin/xyz/deathsgun/modmanager/gui/widget/UpdateProgressListEntry.kt

@@ -6,12 +6,10 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import net.minecraft.client.MinecraftClient
 import net.minecraft.client.gui.DrawableHelper
-import net.minecraft.client.gui.hud.BackgroundHelper.ColorMixer
 import net.minecraft.client.gui.screen.ScreenTexts
 import net.minecraft.client.util.math.MatrixStack
 import net.minecraft.text.LiteralText
 import net.minecraft.text.Text
-import net.minecraft.util.math.MathHelper
 import xyz.deathsgun.modmanager.ModManager
 import xyz.deathsgun.modmanager.api.gui.list.ListWidget
 import xyz.deathsgun.modmanager.update.ProgressListener
@@ -63,7 +61,7 @@ class UpdateProgressListEntry(list: ListWidget<UpdateProgressListEntry>, val upd
     }
 
     private fun renderProgressBar(matrices: MatrixStack, width: Int, minX: Int, minY: Int, maxX: Int, maxY: Int) {
-        val color = ColorMixer.getArgb(255, 255, 255, 255)
+        val color = 0xFFFFFFFF.toInt()
         var barWidth = width / 10
         val overlap = (minX + pos + barWidth) - maxX + 2
         if (overlap > 0) {

src/main/kotlin/xyz/deathsgun/modmanager/update/UpdateManager.kt

@@ -89,7 +89,7 @@ class UpdateManager {
             }
         }.awaitAll()
         finishedUpdateCheck = true
-        if (MinecraftClient.getInstance()?.currentScreen == null) {
+        if (MinecraftClient.getInstance()?.currentScreen == null || updates.isEmpty()) {
             return@runBlocking
         }
         MinecraftClient.getInstance().toastManager.add(

src/main/resources/modmanager.mixins.json

@@ -2,13 +2,13 @@
   "required": true,
   "minVersion": "0.8",
   "package": "xyz.deathsgun.modmanager.mixin",
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
   "mixins": [
   ],
   "client": [
-	"ModsScreenMixin"
+    "ModsScreenMixin"
   ],
   "injectors": {
-	"defaultRequire": 1
+    "defaultRequire": 1
   }
 }