Support extra data in modrinth packs swap default jvm to openjdk, fix…

… bug when leaving coroutine scope while downloading, minor ui fixes

build.gradle.kts

@@ -34,7 +34,6 @@ dependencies {
 
     implementation("com.darkrockstudios:mpfilepicker:3.1.0")
     implementation("org.rauschig:jarchivelib:1.2.0")
-    implementation("edu.stanford.ejalbert:BrowserLauncher2:1.3")
 
     implementation("net.raphimc:MinecraftAuth:4.0.0")
     implementation("dev.3-3:jmccc-mcdownloader:3.1.4")

gradle.properties

@@ -1,3 +1,3 @@
 group=com.mineinabyss
-version=2.0.0-alpha.3
+version=2.0.0-alpha.4
 idofrontVersion=0.22.3

src/main/kotlin/com/mineinabyss/launchy/data/Dirs.kt

@@ -24,15 +24,16 @@ object Dirs {
         OS.LINUX -> home / ".config"
     } / "mineinabyss"
 
+    val cacheDir = config / "cache"
+    val imageCache = cacheDir / "images"
+
     val jdks = mineinabyss / ".jdks"
-    val jdkGraal = mineinabyss / ".jdks" / "graalvm-jdk-17.zip"
 
     val tmp = config / ".tmp"
 
     val accounts = config / "accounts"
-    val avatars = config / "avatars"
 
-    fun avatar(uuid: UUID) = avatars / "$uuid.png"
+    fun avatar(uuid: UUID) = imageCache / "avatar-$uuid"
 
     val configFile = config / "mia-launcher.yml"
     val versionsFile = config / "mia-versions.yml"
@@ -48,6 +49,8 @@ object Dirs {
         tmp.createDirectories()
         modpackConfigsDir.createDirectories()
         jdks.createDirectories()
+        cacheDir.createDirectories()
+        imageCache.createDirectories()
     }
 
     fun createConfigFiles() {

src/main/kotlin/com/mineinabyss/launchy/data/config/Config.kt

@@ -19,6 +19,7 @@ data class Config(
     val jvmArguments: String? = null,
     val memoryAllocation: Int? = null,
     val useRecommendedJvmArguments: Boolean = true,
+    val preferHue: Float? = null,
 ) {
     fun save() {
         Dirs.configFile.writeText(Formats.yaml.encodeToString(this))

src/main/kotlin/com/mineinabyss/launchy/data/config/GameInstance.kt

@@ -1,13 +1,9 @@
 package com.mineinabyss.launchy.data.config
 
-import androidx.compose.ui.graphics.FilterQuality
-import androidx.compose.ui.graphics.painter.BitmapPainter
-import androidx.compose.ui.res.loadImageBitmap
 import com.charleskorn.kaml.decodeFromStream
 import com.charleskorn.kaml.encodeToStream
 import com.mineinabyss.launchy.data.Dirs
 import com.mineinabyss.launchy.data.Formats
-import com.mineinabyss.launchy.logic.Downloader
 import com.mineinabyss.launchy.state.LaunchyState
 import com.mineinabyss.launchy.state.modpack.ModpackState
 import com.mineinabyss.launchy.ui.screens.Dialog
@@ -18,6 +14,8 @@ import kotlin.io.path.*
 class GameInstance(
     val configDir: Path,
 ) {
+    val overridesDir = configDir / "overrides"
+
     init {
         require(configDir.isDirectory()) { "Game instance at $configDir must be a directory" }
     }
@@ -27,37 +25,18 @@ class GameInstance(
     val minecraftDir = config.overrideMinecraftDir?.let { Path(it) } ?: Dirs.modpackDir(configDir.name)
 
     val userConfigFile = (configDir / "config.yml")
-    private val backgroundImagePath = configDir / "background.png"
-    private val logoPath = configDir / "logo.png"
-    private var cachedBackground: BitmapPainter? = null
-    private var cachedLogo: BitmapPainter? = null
-
-    suspend fun getOrDownloadBackground(): BitmapPainter {
-        cachedBackground?.let { return it }
-        if (!backgroundImagePath.exists()) Downloader.download(config.backgroundURL, backgroundImagePath)
-        val painter =
-            BitmapPainter(loadImageBitmap(backgroundImagePath.inputStream()), filterQuality = FilterQuality.High)
-        cachedBackground = painter
-        return painter
-    }
-
-    suspend fun getOrDownloadLogo(): BitmapPainter {
-        cachedLogo?.let { return it }
-        if (!logoPath.exists()) Downloader.download(config.logoURL, logoPath)
-        val painter = BitmapPainter(loadImageBitmap(logoPath.inputStream()), filterQuality = FilterQuality.High)
-        cachedLogo = painter
-        return painter
-    }
 
     suspend fun createModpackState(): ModpackState? {
         val userConfig =
             if (userConfigFile.exists()) Formats.yaml.decodeFromStream<ModpackUserConfig>(userConfigFile.inputStream())
             else ModpackUserConfig()
         val modpack = config.source.loadInstance(this)
             .getOrElse {
-                dialog = Dialog.Error("Failed read instance", it
-                    .stackTraceToString()
-                    .split("\n").take(5).joinToString("\n"))
+                dialog = Dialog.Error(
+                    "Failed read instance", it
+                        .stackTraceToString()
+                        .split("\n").take(5).joinToString("\n")
+                )
                 it.printStackTrace()
                 return null
             }

src/main/kotlin/com/mineinabyss/launchy/data/config/GameInstanceConfig.kt

@@ -1,18 +1,22 @@
 package com.mineinabyss.launchy.data.config
 
-import androidx.compose.ui.graphics.FilterQuality
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.produceState
 import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.res.loadImageBitmap
 import com.mineinabyss.launchy.data.Dirs
 import com.mineinabyss.launchy.data.Formats
 import com.mineinabyss.launchy.data.modpacks.source.PackSource
 import com.mineinabyss.launchy.logic.Downloader
+import com.mineinabyss.launchy.state.LaunchyState
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Transient
 import java.nio.file.Path
 import kotlin.io.path.div
-import kotlin.io.path.exists
 import kotlin.io.path.inputStream
+import kotlin.time.Duration.Companion.seconds
 
 @Serializable
 @OptIn(ExperimentalStdlibApi::class)
@@ -27,34 +31,47 @@ data class GameInstanceConfig(
     val overrideMinecraftDir: String? = null,
 ) {
     @Transient
-    private val backgroundImagePath = Dirs.tmp / "background-${backgroundURL.hashCode().toHexString()}.png"
+    val backgroundPath = Dirs.imageCache / "background-${backgroundURL.hashCode().toHexString()}"
 
     @Transient
-    private val logoPath = Dirs.tmp / "icon-${backgroundURL.hashCode().toHexString()}.png"
+    val logoPath = Dirs.imageCache / "icon-${logoURL.hashCode().toHexString()}"
 
     @Transient
     private var cachedBackground: BitmapPainter? = null
 
     @Transient
     private var cachedLogo: BitmapPainter? = null
 
-    suspend fun loadBackgroundFromTmpFile(): BitmapPainter {
+    suspend fun loadBackgroundImage(): BitmapPainter {
         cachedBackground?.let { return it }
-        if (!backgroundImagePath.exists()) Downloader.download(backgroundURL, backgroundImagePath)
-        val painter =
-            BitmapPainter(loadImageBitmap(backgroundImagePath.inputStream()), filterQuality = FilterQuality.High)
+        Downloader.download(backgroundURL, backgroundPath, override = false)
+        val painter = BitmapPainter(loadImageBitmap(backgroundPath.inputStream()))
         cachedBackground = painter
         return painter
     }
 
-    suspend fun loadIconFromTmpFile(): BitmapPainter {
+    suspend fun loadLogo(): BitmapPainter {
         cachedLogo?.let { return it }
-        if (!logoPath.exists()) Downloader.download(logoURL, logoPath)
-        val painter = BitmapPainter(loadImageBitmap(logoPath.inputStream()), filterQuality = FilterQuality.High)
+        Downloader.download(logoURL, logoPath, override = false)
+        val painter = BitmapPainter(loadImageBitmap(logoPath.inputStream()))
         cachedLogo = painter
         return painter
     }
 
+    @Composable
+    fun produceBackgroundState(state: LaunchyState) = produceState(cachedBackground) {
+        state.downloadContext.launch {
+            value = loadBackgroundImage()
+        }
+    }
+
+    @Composable
+    fun produceLogoState(state: LaunchyState) = produceState(cachedLogo) {
+        state.downloadContext.launch {
+            value = loadLogo()
+        }
+    }
+
     companion object {
         fun read(path: Path) =
             Formats.yaml.decodeFromStream(serializer(), path.inputStream())

src/main/kotlin/com/mineinabyss/launchy/data/config/PlayerProfile.kt

@@ -1,25 +1,27 @@
 package com.mineinabyss.launchy.data.config
 
-import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.FilterQuality
+import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.res.loadImageBitmap
 import com.mineinabyss.launchy.data.Dirs
 import com.mineinabyss.launchy.data.serializers.UUIDSerializer
 import com.mineinabyss.launchy.logic.Downloader
+import com.mineinabyss.launchy.state.LaunchyState
+import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
 import java.util.*
-import kotlin.io.path.exists
 import kotlin.io.path.inputStream
 
 @Serializable
 data class PlayerProfile(
     val name: String,
     val uuid: @Serializable(with = UUIDSerializer::class) UUID,
 ) {
-    suspend fun getAvatar(): ImageBitmap {
+    suspend fun getAvatar(state: LaunchyState): BitmapPainter {
         val avatarPath = Dirs.avatar(uuid)
-
-        if (!avatarPath.exists()) Downloader.downloadAvatar(uuid)
-
-        return loadImageBitmap(avatarPath.inputStream())
+        state.downloadContext.launch {
+            Downloader.downloadAvatar(uuid)
+        }.join()
+        return BitmapPainter(loadImageBitmap(avatarPath.inputStream()), filterQuality = FilterQuality.None)
     }
 }

src/main/kotlin/com/mineinabyss/launchy/data/modpacks/ExtraPackInfo.kt

@@ -0,0 +1,14 @@
+package com.mineinabyss.launchy.data.modpacks
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+class ModReference(
+    val urlContains: String,
+    val info: ModInfo? = null,
+)
+@Serializable
+class ExtraPackInfo(
+    val groups: List<Group> = listOf(),
+    val modGroups: Map<String, Set<ModReference>> = mapOf(),
+)

src/main/kotlin/com/mineinabyss/launchy/data/modpacks/Mod.kt

@@ -5,7 +5,7 @@ import java.nio.file.Path
 import kotlin.io.path.div
 import kotlin.io.path.exists
 
-class Mod(
+data class Mod(
     val packDir: Path,
     val info: ModInfo
 ) {

src/main/kotlin/com/mineinabyss/launchy/data/modpacks/ModInfo.kt

@@ -7,7 +7,7 @@ data class ModInfo(
     val name: String,
     val license: String = "Unknown",
     val homepage: String = "",
-    val desc: String,
+    val desc: String = "",
     val url: String,
     val configUrl: String = "",
     val configDesc: String = "",

src/main/kotlin/com/mineinabyss/launchy/data/modpacks/Modpack.kt

@@ -1,10 +1,9 @@
 package com.mineinabyss.launchy.data.modpacks
 
-import com.mineinabyss.launchy.data.config.GameInstance
 import java.nio.file.Path
 
 class Modpack(
     val dependencies: PackDependencies,
     val mods: Mods,
-    val overridesPath: Path? = null,
+    val overridesPaths: List<Path> = listOf(),
 )

src/main/kotlin/com/mineinabyss/launchy/data/modpacks/Mods.kt

@@ -3,7 +3,7 @@ package com.mineinabyss.launchy.data.modpacks
 import com.mineinabyss.launchy.data.GroupName
 import com.mineinabyss.launchy.data.ModName
 
-class Mods(
+data class Mods(
     val modGroups: Map<Group, Set<Mod>>,
 ) {
     val groups = modGroups.keys

src/main/kotlin/com/mineinabyss/launchy/data/modpacks/formats/ExtraInfoFormat.kt

@@ -0,0 +1,34 @@
+package com.mineinabyss.launchy.data.modpacks.formats
+
+import com.mineinabyss.launchy.data.modpacks.ExtraPackInfo
+import com.mineinabyss.launchy.data.modpacks.Group
+import com.mineinabyss.launchy.data.modpacks.Mod
+import com.mineinabyss.launchy.data.modpacks.Mods
+import java.nio.file.Path
+
+
+data class ExtraInfoFormat(
+    val format: PackFormat,
+    val extraInfoPack: ExtraPackInfo,
+) : PackFormat by format {
+    override fun toGenericMods(minecraftDir: Path): Mods {
+        val originalMods = format.toGenericMods(minecraftDir)
+        val foundMods = mutableSetOf<Mod>()
+        val mods: Map<Group, Set<Mod>> = extraInfoPack.modGroups
+            .mapKeys { (name, _) -> extraInfoPack.groups.single { it.name == name } }
+            .mapValues { (_, mods) ->
+                mods.mapNotNull { ref ->
+                    val found = originalMods.mods.find { mod -> ref.urlContains in mod.info.url }
+                    if (found != null) foundMods.add(found)
+                    if (found != null && ref.info != null)
+                        found.copy(info = ref.info.copy(url = found.info.url))
+                    else found
+                }.toSet()
+            }
+
+        val originalGroups = originalMods.modGroups.mapValues {
+            it.value.filterTo(mutableSetOf()) { mod -> mod !in foundMods }
+        }
+        return Mods(originalGroups + mods)
+    }
+}

src/main/kotlin/com/mineinabyss/launchy/data/modpacks/formats/LaunchyPackFormat.kt

@@ -22,5 +22,5 @@ data class LaunchyPackFormat(
         return PackDependencies(minecraft = minecraftVersion, fabricLoader = fabricVersion)
     }
 
-    override fun getOverridesPath(configDir: Path): Path? = null
+    override fun getOverridesPaths(configDir: Path): List<Path> = emptyList()
 }

src/main/kotlin/com/mineinabyss/launchy/data/modpacks/formats/ModrinthPackFormat.kt

@@ -40,6 +40,6 @@ data class ModrinthPackFormat(
     override fun toGenericMods(minecraftDir: Path) =
         Mods.withSingleGroup(files.map { it.toMod(minecraftDir) })
 
-    override fun getOverridesPath(configDir: Path): Path = configDir / "mrpack" / "overrides"
+    override fun getOverridesPaths(configDir: Path): List<Path> = listOf(configDir / "mrpack" / "overrides")
 }
 

src/main/kotlin/com/mineinabyss/launchy/data/modpacks/formats/PackFormat.kt

@@ -9,5 +9,5 @@ sealed interface PackFormat {
 
     fun getDependencies(minecraftDir: Path): PackDependencies
 
-    fun getOverridesPath(configDir: Path): Path?
+    fun getOverridesPaths(configDir: Path): List<Path>
 }

src/main/kotlin/com/mineinabyss/launchy/data/modpacks/source/PackSource.kt

@@ -5,9 +5,6 @@ import com.mineinabyss.launchy.data.modpacks.Modpack
 import com.mineinabyss.launchy.logic.Downloader
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlin.io.path.createFile
-import kotlin.io.path.createParentDirectories
-import kotlin.io.path.exists
 
 @Serializable
 sealed class PackSource {
@@ -18,7 +15,7 @@ sealed class PackSource {
             val format = type.getFormat(instance.configDir).getOrThrow()
             val mods = format.toGenericMods(instance.minecraftDir)
             val dependencies = format.getDependencies(instance.minecraftDir)
-            Modpack(dependencies, mods, format.getOverridesPath(instance.configDir))
+            Modpack(dependencies, mods, format.getOverridesPaths(instance.configDir))
         }
     }