Merge pull request #112 from DeathsGun/bugs/108

DeathsGun · web-flow · commit f32da99ce0ef · 2021-12-09T14:50:44.000+01:00
Improve update checking
diff --git a/src/main/java/xyz/deathsgun/modmanager/mixin/ModsScreenMixin.java b/src/main/java/xyz/deathsgun/modmanager/mixin/ModsScreenMixin.java
@@ -74,18 +74,18 @@ public void onInit(CallbackInfo ci) {
                 }));
         this.hideButton = this.addDrawableChild(new TexturedButton(width - 24 - 22, paneY, 20, 20, 0,
                 0, MODMANAGER_HIDE_BUTTON, 32, 64, button -> {
-            if (ModManager.modManager.config.getHidden().contains(selected.getMod().getId())) {
-                ModManager.modManager.config.getHidden().remove(selected.getMod().getId());
+            if (ModManager.modManager.getConfig().getHidden().contains(selected.getMod().getId())) {
+                ModManager.modManager.getConfig().getHidden().remove(selected.getMod().getId());
             } else {
-                ModManager.modManager.config.getHidden().add(selected.getMod().getId());
+                ModManager.modManager.getConfig().getHidden().add(selected.getMod().getId());
             }
-            Config.Companion.saveConfig(ModManager.modManager.config);
+            Config.Companion.saveConfig(ModManager.modManager.getConfig());
         }, ((button, matrices, mouseX, mouseY) -> {
             if (!hideButton.isJustHovered() || !button.isHovered()) {
                 return;
             }
             TranslatableText text = new TranslatableText("modmanager.button.hide");
-            if (ModManager.modManager.config.getHidden().contains(selected.getMod().getId())) {
+            if (ModManager.modManager.getConfig().getHidden().contains(selected.getMod().getId())) {
                 text = new TranslatableText("modmanager.button.show");
             }
             this.renderTooltip(matrices, text, mouseX, mouseY);
@@ -96,7 +96,7 @@ public void onInit(CallbackInfo ci) {
     public void onTick(CallbackInfo ci) {
         this.hideButton.visible = ModManager.modManager.getUpdate().getUpdates()
                 .stream().anyMatch(it -> it.getFabricId().equalsIgnoreCase(selected.mod.getId()));
-        if (ModManager.modManager.config.getHidden().contains(selected.getMod().getId())) {
+        if (ModManager.modManager.getConfig().getHidden().contains(selected.getMod().getId())) {
             this.hideButton.setImage(MODMANAGER_SHOW_BUTTON);
         } else {
             this.hideButton.setImage(MODMANAGER_HIDE_BUTTON);
diff --git a/src/main/java/xyz/deathsgun/modmanager/mixin/TitleScreenMixin.java b/src/main/java/xyz/deathsgun/modmanager/mixin/TitleScreenMixin.java
@@ -41,7 +41,7 @@ protected TitleScreenMixin(Text title) {
 
     @Inject(at = @At("TAIL"), method = "render")
     public void onRender(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
-        if (ModManager.shownUpdateNotification) {
+        if (ModManager.shownUpdateNotification && ModManager.modManager.getUpdate().getFinishedUpdateCheck()) {
             return;
         }
         ModManager.shownUpdateNotification = true;
diff --git a/src/main/kotlin/xyz/deathsgun/modmanager/ModManager.kt b/src/main/kotlin/xyz/deathsgun/modmanager/ModManager.kt
@@ -34,13 +34,19 @@ import xyz.deathsgun.modmanager.update.UpdateManager
 class ModManager : ClientModInitializer {
 
     private val states = ArrayList<SavedState>()
-    lateinit var config: Config
+    var config: Config = Config.loadConfig()
     var changed: Boolean = false
     val update: UpdateManager = UpdateManager()
     val icons: IconCache = IconCache()
     val provider: HashMap<String, IModProvider> = HashMap()
     val updateProvider: HashMap<String, IModUpdateProvider> = HashMap()
 
+    init {
+        val modrinth = Modrinth()
+        provider[modrinth.getName().lowercase()] = modrinth
+        updateProvider[modrinth.getName().lowercase()] = modrinth
+    }
+
     companion object {
         @JvmField
         var shownUpdateNotification: Boolean = false
@@ -62,13 +68,7 @@ class ModManager : ClientModInitializer {
 
     @OptIn(DelicateCoroutinesApi::class)
     override fun onInitializeClient() {
-        modManager = this
-        config = Config.loadConfig()
-        val modrinth = Modrinth()
-        provider[modrinth.getName().lowercase()] = modrinth
-        updateProvider[modrinth.getName().lowercase()] = modrinth
         GlobalScope.launch {
-            update.checkUpdates()
             icons.cleanupCache()
         }
     }
diff --git a/src/main/kotlin/xyz/deathsgun/modmanager/PreLaunchHook.kt b/src/main/kotlin/xyz/deathsgun/modmanager/PreLaunchHook.kt
@@ -16,6 +16,9 @@
 
 package xyz.deathsgun.modmanager
 
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
@@ -30,7 +33,12 @@ class PreLaunchHook : PreLaunchEntrypoint {
 
     private val logger = LogManager.getLogger("ModManager")
 
+    @OptIn(DelicateCoroutinesApi::class)
     override fun onPreLaunch() {
+        GlobalScope.launch {
+            ModManager.modManager = ModManager()
+            ModManager.modManager.update.checkUpdates()
+        }
         val filesToDelete = try {
             loadFiles()
         } catch (e: Exception) {
diff --git a/src/main/kotlin/xyz/deathsgun/modmanager/update/UpdateManager.kt b/src/main/kotlin/xyz/deathsgun/modmanager/update/UpdateManager.kt
@@ -17,14 +17,17 @@
 package xyz.deathsgun.modmanager.update
 
 import com.terraformersmc.modmenu.util.mod.fabric.CustomValueUtil
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import net.fabricmc.loader.api.FabricLoader
 import net.fabricmc.loader.api.metadata.ModMetadata
+import net.minecraft.client.MinecraftClient
+import net.minecraft.client.toast.SystemToast
 import net.minecraft.text.TranslatableText
 import org.apache.commons.io.FileUtils
 import org.apache.logging.log4j.LogManager
@@ -58,31 +61,40 @@ class UpdateManager {
     private val blockedIds = arrayOf("java", "minecraft", "fabricloader")
     private val deletableMods = ArrayList<String>()
     val updates = ArrayList<Update>()
+    var finishedUpdateCheck = false
 
     init {
         Runtime.getRuntime().addShutdownHook(Thread(this::saveDeletableFiles))
     }
 
     //region Update Checking
 
-    suspend fun checkUpdates() = coroutineScope {
+    suspend fun checkUpdates() = runBlocking {
+        logger.info("Checking for mod updates...")
         val mods = getCheckableMods()
-        mods.forEach { metadata ->
-            launch {
+        mods.map { metadata ->
+            async {
                 if (findJarByModContainer(metadata) == null) {
-                    logger.info("Skipping update for {} because it has no jar in mods", metadata.id)
-                    return@launch
+                    logger.debug("Skipping update for {} because it has no jar in mods", metadata.id)
+                    return@async
                 }
                 val configIds = getIdBy(metadata)
                 if (configIds == null) {
-                    logger.info("Searching for updates for {} using fallback method", metadata.id)
+                    logger.debug("Searching for updates for {} using fallback method", metadata.id)
                     checkForUpdatesManually(metadata)
-                    return@launch
+                    return@async
                 }
-                logger.info("Searching for updates for {} using defined mod id", metadata.id)
+                logger.debug("Searching for updates for {} using defined mod id", metadata.id)
                 checkForUpdates(metadata, configIds)
             }
-        }
+        }.awaitAll()
+        MinecraftClient.getInstance().toastManager.add(
+            SystemToast(
+                SystemToast.Type.TUTORIAL_HINT,
+                TranslatableText("modmanager.toast.update.title"),
+                TranslatableText("modmanager.toast.update.description", getWhitelistedUpdates().size)
+            )
+        )
     }
 
     private fun checkForUpdatesManually(metadata: ModMetadata) {
@@ -126,7 +138,6 @@ class UpdateManager {
             logger.warn(
                 "Error while searching for fallback id for mod {}: {}",
                 metadata.id,
-                queryResult.text.key,
                 queryResult.cause
             )
             ModManager.modManager.setModState(metadata.id, metadata.id, State.INSTALLED)
diff --git a/src/main/resources/modmanager.mixins.json b/src/main/resources/modmanager.mixins.json
@@ -6,7 +6,6 @@
   "mixins": [
   ],
   "client": [
-    "TitleScreenMixin",
 	"ModsScreenMixin"
   ],
   "injectors": {

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ protected TitleScreenMixin(Text title) {`
`41`	`41`
`42`	`42`	`@Inject(at = @At("TAIL"), method = "render")`
`43`	`43`	`public void onRender(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {`
`44`		`- if (ModManager.shownUpdateNotification) {`
	`44`	`+ if (ModManager.shownUpdateNotification && ModManager.modManager.getUpdate().getFinishedUpdateCheck()) {`
`45`	`45`	`return;`
`46`	`46`	`}`
`47`	`47`	`ModManager.shownUpdateNotification = true;`