move footgun check again

unimined · Jul 31, 2024 · 2e0aec9 · 2e0aec9
1 parent 21cde93
commit 2e0aec9
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 19 deletions.
diff --git a/src/main/kotlin/xyz/wagyourtail/unimined/UniminedExtensionImpl.kt b/src/main/kotlin/xyz/wagyourtail/unimined/UniminedExtensionImpl.kt
@@ -7,10 +7,13 @@ import org.gradle.configurationcache.extensions.capitalized
 import xyz.wagyourtail.unimined.api.UniminedExtension
 import xyz.wagyourtail.unimined.api.source.task.MigrateMappingsTask
 import xyz.wagyourtail.unimined.api.minecraft.MinecraftConfig
+import xyz.wagyourtail.unimined.api.unimined
+import xyz.wagyourtail.unimined.api.uniminedMaybe
 import xyz.wagyourtail.unimined.internal.mapping.task.MigrateMappingsTaskImpl
 import xyz.wagyourtail.unimined.internal.minecraft.MinecraftProvider
 import xyz.wagyourtail.unimined.internal.minecraft.patch.reindev.ReIndevProvider
 import xyz.wagyourtail.unimined.util.defaultedMapOf
+import xyz.wagyourtail.unimined.util.nonNullValues
 import xyz.wagyourtail.unimined.util.withSourceSet
 import java.net.URI
 import java.nio.file.Path
@@ -450,5 +453,30 @@ open class UniminedExtensionImpl(project: Project) : UniminedExtension(project)
                 throw IllegalStateException("multiple minecraft jars in runtime classpath of $sourceSet, from $mcFiles")
             }
         }
+
+
+        for ((sourceSet, mc) in minecrafts) {
+            // ensure all combineWith's on same mappings/version
+            // get current mappings
+            if (project.unimined.footgunChecks) {
+                val minecraftConfigs = mutableMapOf<Pair<Project, SourceSet>, MinecraftConfig?>()
+                for ((project, sourceSet) in (mc as MinecraftProvider).detectCombineWithSourceSets()) {
+                    if (project == this.project) {
+                        minecraftConfigs[project to sourceSet] = minecrafts[sourceSet]
+                    } else {
+                        minecraftConfigs[project to sourceSet] = project.uniminedMaybe?.minecrafts?.get(sourceSet)
+                    }
+                }
+
+                for ((sourceSet, minecraftConfig) in minecraftConfigs.nonNullValues()) {
+                    if (mc.mappings.devNamespace != minecraftConfig.mappings.devNamespace || mc.mappings.devFallbackNamespace != minecraftConfig.mappings.devFallbackNamespace) {
+                        throw IllegalArgumentException("All combined minecraft configs must be on the same mappings, found $sourceSet on ${mc.mappings.devNamespace}/${mc.mappings.devFallbackNamespace} and $sourceSet on ${minecraftConfig.mappings.devNamespace}/${minecraftConfig.mappings.devFallbackNamespace}")
+                    }
+                    if (mc.version != minecraftConfig.version) {
+                        throw IllegalArgumentException("All combined minecraft configs must be on the same version, found $sourceSet on ${mc.version} and $sourceSet on ${minecraftConfig.version}")
+                    }
+                }
+            }
+        }
     }
 }
diff --git a/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt b/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt
@@ -637,25 +637,6 @@ open class MinecraftProvider(project: Project, sourceSet: SourceSet) : Minecraft
         // run patcher after evaluate
         (mcPatcher as AbstractMinecraftTransformer).afterEvaluate()
 
-
-        // ensure all combineWith's on same mappings/version
-        // get current mappings
-        if (project.unimined.footgunChecks) {
-            val minecraftConfigs = mutableMapOf<Pair<Project, SourceSet>, MinecraftConfig?>()
-            for ((project, sourceSet) in detectCombineWithSourceSets()) {
-                minecraftConfigs[project to sourceSet] = project.uniminedMaybe?.minecrafts?.get(sourceSet)
-            }
-
-            for ((sourceSet, minecraftConfig) in minecraftConfigs.nonNullValues()) {
-                if (mappings.devNamespace != minecraftConfig.mappings.devNamespace || mappings.devFallbackNamespace != minecraftConfig.mappings.devFallbackNamespace) {
-                    throw IllegalArgumentException("All combined minecraft configs must be on the same mappings, found ${sourceSet} on ${mappings.devNamespace}/${mappings.devFallbackNamespace} and $sourceSet on ${minecraftConfig.mappings.devNamespace}/${minecraftConfig.mappings.devFallbackNamespace}")
-                }
-                if (version != minecraftConfig.version) {
-                    throw IllegalArgumentException("All combined minecraft configs must be on the same version, found ${sourceSet} on ${version} and $sourceSet on ${minecraftConfig.version}")
-                }
-            }
-        }
-
     }
 
     fun getMcDevFile(): Path {