change multimc cfg to map

DaemonicLabs · Feb 14, 2021 · 748e622 · 748e622
1 parent a411f15
commit 748e622
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/core/src/main/kotlin/voodoo/data/PackOptions.kt b/core/src/main/kotlin/voodoo/data/PackOptions.kt
@@ -18,6 +18,6 @@ data class PackOptions(
     @Serializable
     data class MultiMC(
         var relativeSelfupdateUrl: String? = null,
-        var instanceCfg: List<Pair<String, String>> = listOf()
+        var instanceCfg: Map<String, String> = emptyMap()
     )
 }
diff --git a/multimc/src/main/kotlin/voodoo/mmc/MMCUtil.kt b/multimc/src/main/kotlin/voodoo/mmc/MMCUtil.kt
@@ -144,7 +144,7 @@ object MMCUtil {
         icon: File? = null,
         mcVersion: String? = null,
         modloader: Modloader?,
-        extraCfg: List<Pair<String, String>> = listOf(),
+        extraCfg: Map<String, String> = emptyMap(),
         instanceDir: File = with(findDir()) {
             this.resolve(
                 readCfg(this.resolve("multimc.cfg"))["InstanceDir"] ?: "instances"

diff --git a/voodoo/src/main/kotlin/voodoo/pack/VersionPackageConfig.kt b/voodoo/src/main/kotlin/voodoo/pack/VersionPackageConfig.kt
@@ -2,6 +2,7 @@ package voodoo.pack
 
 import kotlinx.serialization.Serializable
 import moe.nikky.voodoo.format.FnPatternList
+import java.util.*
 
 @Serializable
 data class VersionPackageConfig(
@@ -16,6 +17,6 @@ data class VersionPackageConfig(
 
     @Serializable
     data class MultimcPackageOption(
-        var instanceCfg: List<Pair<String, String>> = listOf()
+        var instanceCfg: Map<String, String> = emptyMap()
     )
 }