From c4556d1cd5f278f993c8283608539e7a80101e93 Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Thu, 22 Aug 2024 11:58:17 -0500 Subject: [PATCH] fix implicit combineWIth --- .../unimined/internal/minecraft/MinecraftProvider.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt b/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt index 9bd939ac..703f41d2 100644 --- a/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt +++ b/src/minecraft/kotlin/xyz/wagyourtail/unimined/internal/minecraft/MinecraftProvider.kt @@ -825,7 +825,7 @@ open class MinecraftProvider(project: Project, sourceSet: SourceSet) : Minecraft for (project in projects) { for (sourceSet in project.extensions.findByType(SourceSetContainer::class.java)?.asMap?.values ?: listOf()) { - if (sourceSet.output.files.intersect(sourceSet.runtimeClasspath.files).isNotEmpty()) { + if (sourceSet.output.files.intersect(this.sourceSet.runtimeClasspath.files).isNotEmpty()) { sourceSets.add(project to sourceSet) } } @@ -841,10 +841,10 @@ open class MinecraftProvider(project: Project, sourceSet: SourceSet) : Minecraft 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}") + throw IllegalArgumentException("All combined minecraft configs must be on the same mappings, found ${this.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}") + throw IllegalArgumentException("All combined minecraft configs must be on the same version, found ${this.sourceSet} on ${version} and $sourceSet on ${minecraftConfig.version}") } } }