diff --git a/core/src/main/kotlin/voodoo/data/PackOptions.kt b/core/src/main/kotlin/voodoo/data/PackOptions.kt index 6a28409f..4619a326 100644 --- 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> = listOf() + var instanceCfg: Map = emptyMap() ) } diff --git a/multimc/src/main/kotlin/voodoo/mmc/MMCUtil.kt b/multimc/src/main/kotlin/voodoo/mmc/MMCUtil.kt index 09031abd..713789b9 100644 --- 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> = listOf(), + extraCfg: Map = 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 index 08cbb4d8..5745323e 100644 --- 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> = listOf() + var instanceCfg: Map = emptyMap() ) } \ No newline at end of file