fix: Fix Parchment mapping resolution

This commit is contained in:
2026-03-29 16:48:05 +02:00
parent 6113a810ff
commit 94a2f996e9

View File

@@ -4,14 +4,12 @@ import net.fabricmc.loom.api.LoomGradleExtensionAPI
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.artifacts.MinimalExternalModuleDependency import org.gradle.api.artifacts.MinimalExternalModuleDependency
import org.gradle.api.file.RegularFile import org.gradle.api.file.RegularFile
import org.gradle.api.logging.Logging
import org.gradle.api.provider.Provider import org.gradle.api.provider.Provider
import org.gradle.api.tasks.SourceSet import org.gradle.api.tasks.SourceSet
import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.ApiStatus
@ApiStatus.Internal @ApiStatus.Internal
class SmcmtkLoomProxy(val project: Project, loomGradleExtensionApi: Any) { class SmcmtkLoomProxy(val project: Project, loomGradleExtensionApi: Any) {
val logger = lazy { Logging.getLogger(javaClass) }
val loom = loomGradleExtensionApi as LoomGradleExtensionAPI val loom = loomGradleExtensionApi as LoomGradleExtensionAPI
fun configureOfficialMojangMappings(parchment: Provider<MinimalExternalModuleDependency>?) { fun configureOfficialMojangMappings(parchment: Provider<MinimalExternalModuleDependency>?) {
@@ -20,7 +18,7 @@ class SmcmtkLoomProxy(val project: Project, loomGradleExtensionApi: Any) {
} else { } else {
project.dependencies.add("mappings", loom.layered { layered -> project.dependencies.add("mappings", loom.layered { layered ->
layered.officialMojangMappings() layered.officialMojangMappings()
layered.parchment(parchment.map { it.artifact { artifact -> artifact.type = "zip" } }) layered.parchment(project.dependencies.variantOf(parchment) { it.artifactType("zip") })
}) })
} }
} }