allow adding overrides per version

DaemonicLabs · Mar 21, 2021 · d0fd86d · d0fd86d
1 parent 8acf4a5
commit d0fd86d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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
@@ -32,6 +32,7 @@ data class VersionPack(
     val mcVersion: String,
     val modloader: Modloader,
     val packageConfiguration: VersionPackageConfig = VersionPackageConfig(),
+    val overrides: Map<String, EntryOverride> = mapOf(),
     @JsonSchema.Definition("FileEntryList")
     val mods: Map<String, List<FileEntry>>,
 ) {
@@ -148,7 +149,7 @@ data class VersionPack(
         }
     }
 
-    fun flatten(rootDir: File, id: String, metaPack: MetaPack, overrides: Map<String, EntryOverride>): FlatModPack {
+    fun flatten(rootDir: File, id: String, metaPack: MetaPack, configOverrides: Map<String, EntryOverride>): 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 {