diff --git a/voodoo/src/main/kotlin/voodoo/cli/CompileCommand.kt b/voodoo/src/main/kotlin/voodoo/cli/CompileCommand.kt index 109baa9b..fb6c18de 100644 --- a/voodoo/src/main/kotlin/voodoo/cli/CompileCommand.kt +++ b/voodoo/src/main/kotlin/voodoo/cli/CompileCommand.kt @@ -110,7 +110,7 @@ class CompileCommand() : CliktCommand( val modpack = versionPack.flatten( rootDir = rootDir, id = id, - overrides = config.overrides, + configOverrides = config.overrides, metaPack = metaPack ) // logger.debug { "modpack: $modpack" } diff --git a/voodoo/src/main/kotlin/voodoo/pack/FileEntry.kt b/voodoo/src/main/kotlin/voodoo/pack/FileEntry.kt index 206bb067..a846a330 100644 --- a/voodoo/src/main/kotlin/voodoo/pack/FileEntry.kt +++ b/voodoo/src/main/kotlin/voodoo/pack/FileEntry.kt @@ -224,7 +224,7 @@ sealed class FileEntry { curse_useOriginalUrl = override.curse_useOriginalUrl ?: curse_useOriginalUrl, curse_skipFingerprintCheck = override.curse_skipFingerprintCheck ?: curse_skipFingerprintCheck, ).run { - assignCommonValues(applyCommonOverride(override)) + applyCommonOverride(override) } is EntryOverride.Common -> run { applyCommonOverride(override) as Curse diff --git a/voodoo/src/main/kotlin/voodoo/pack/VersionPack.kt b/voodoo/src/main/kotlin/voodoo/pack/VersionPack.kt index 4f855fca..8837faeb 100644 --- a/voodoo/src/main/kotlin/voodoo/pack/VersionPack.kt +++ b/voodoo/src/main/kotlin/voodoo/pack/VersionPack.kt @@ -32,6 +32,7 @@ data class VersionPack( val mcVersion: String, val modloader: Modloader, val packageConfiguration: VersionPackageConfig = VersionPackageConfig(), + val overrides: Map = mapOf(), @JsonSchema.Definition("FileEntryList") val mods: Map>, ) { @@ -148,7 +149,7 @@ data class VersionPack( } } - fun flatten(rootDir: File, id: String, metaPack: MetaPack, overrides: Map): FlatModPack { + fun flatten(rootDir: File, id: String, metaPack: MetaPack, configOverrides: Map): FlatModPack { return FlatModPack( rootFolder = rootDir, id = id, @@ -183,7 +184,7 @@ data class VersionPack( entry.postParse(overrideKey) } }.map { intitalEntry -> - intitalEntry.toEntry(overrides) + intitalEntry.toEntry(configOverrides + overrides) }.toMutableSet() ).apply {