ensure completions are regenerated before compile

DaemonicLabs · Mar 14, 2021 · 9ac7e69 · 9ac7e69
1 parent f7fbb3d
commit 9ac7e69
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/voodoo/src/main/kotlin/voodoo/cli/CompileCommand.kt b/voodoo/src/main/kotlin/voodoo/cli/CompileCommand.kt
@@ -16,6 +16,7 @@ import mu.KotlinLogging
 import mu.withLoggingContext
 import voodoo.builder.Builder
 import voodoo.builder.compile
+import voodoo.config.Autocompletions
 import voodoo.config.Configuration
 import voodoo.pack.MetaPack
 import voodoo.pack.VersionPack
@@ -52,6 +53,7 @@ class CompileCommand() : CliktCommand(
             stopwatch {
 
                 val config = Configuration.parse(rootDir = rootDir)
+                Autocompletions.generate(config)
 
                 val packs: Map<Pair<String, MetaPack>, List<VersionPack>> = packFiles.map { packFile ->
                     val baseDir = rootDir.resolve(packFile.absoluteFile.parentFile)

diff --git a/voodoo/src/main/kotlin/voodoo/pack/FileEntry.kt b/voodoo/src/main/kotlin/voodoo/pack/FileEntry.kt
@@ -14,8 +14,7 @@ import voodoo.data.curse.ProjectID
 import voodoo.data.flat.FlatEntry
 
 @Serializable
-sealed class FileEntry(
-) {
+sealed class FileEntry {
     private val logger = KotlinLogging.logger{}
 
     interface Common {

diff --git a/voodoo/src/main/kotlin/voodoo/pack/Modloader.kt b/voodoo/src/main/kotlin/voodoo/pack/Modloader.kt
@@ -19,7 +19,7 @@ sealed class Modloader {
     ) : Modloader() {
         override fun replaceAutoCompletes(): Forge {
             return copy(
-                version = Autocompletions.forge[version] ?: version
+                version = Autocompletions.forge[version] ?: error("cannot look up forge version: $version")
             )
         }
     }
@@ -44,9 +44,9 @@ sealed class Modloader {
     ) : Modloader() {
         override fun replaceAutoCompletes(): Fabric {
             return copy(
-                intermediateMappings = Autocompletions.fabricIntermediaries[intermediateMappings] ?: intermediateMappings,
-                loader = Autocompletions.fabricLoaders[loader] ?: loader,
-                installer = Autocompletions.fabricInstallers[installer] ?: installer
+                intermediateMappings = Autocompletions.fabricIntermediaries[intermediateMappings] ?: error("cannot look up intermediate mapping $intermediateMappings"),
+                loader = Autocompletions.fabricLoaders[loader] ?: error("cannot look up loader $loader"),
+                installer = Autocompletions.fabricInstallers[installer] ?: error("cannot look up installer $installer"),
             )
         }
     }

diff --git a/voodoo/src/main/kotlin/voodoo/pack/VersionPack.kt b/voodoo/src/main/kotlin/voodoo/pack/VersionPack.kt
@@ -10,6 +10,8 @@ import kotlinx.serialization.json.JsonElement
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.JsonPrimitive
 import mu.KotlinLogging
+import voodoo.config.Autocompletions
+import voodoo.config.Configuration
 import voodoo.data.ModloaderPattern
 import voodoo.data.PackOptions
 import voodoo.data.flat.FlatModPack