From e01fd67bc623f2488aafe7e9c116962b25b70805 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sun, 28 Feb 2021 02:23:28 +0800 Subject: [PATCH] Fix remapping EnvType.SERVER -> Dist.DEDICATED_SERVER --- .../architect/plugin/ArchitectPluginExtension.kt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/me/shedaniel/architect/plugin/ArchitectPluginExtension.kt b/src/main/kotlin/me/shedaniel/architect/plugin/ArchitectPluginExtension.kt index 84bb256..2fe4e3e 100644 --- a/src/main/kotlin/me/shedaniel/architect/plugin/ArchitectPluginExtension.kt +++ b/src/main/kotlin/me/shedaniel/architect/plugin/ArchitectPluginExtension.kt @@ -8,6 +8,7 @@ import net.fabricmc.loom.LoomGradleExtension import net.fabricmc.loom.task.RemapJarTask import org.gradle.api.Action import org.gradle.api.Project +import org.gradle.api.artifacts.ModuleDependency import org.gradle.api.tasks.bundling.AbstractArchiveTask import java.io.File import java.nio.file.Path @@ -108,10 +109,11 @@ open class ArchitectPluginExtension(val project: Project) { add("runtimeOnly", "me.shedaniel:architectury-transformer:$transformerVersion:runtime") add("architecturyJavaAgents", "me.shedaniel:architectury-transformer:$transformerVersion:agent") if (plsAddInjectables && injectInjectables) { - add( - "architecturyTransformerClasspath", - "me.shedaniel:architectury-injectables:$injectablesVersion" - ) + add("architecturyTransformerClasspath", "me.shedaniel:architectury-injectables:$injectablesVersion") + add("architecturyTransformerClasspath", "net.fabricmc:fabric-loader:+")?.also { + it as ModuleDependency + it.isTransitive = false + } } } @@ -202,6 +204,10 @@ open class ArchitectPluginExtension(val project: Project) { if (plsAddInjectables) { add("architecturyTransformerClasspath", "me.shedaniel:architectury-injectables:$injectablesVersion") + add("architecturyTransformerClasspath", "net.fabricmc:fabric-loader:+")?.also { + it as ModuleDependency + it.isTransitive = false + } } } }