diff --git a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java index f34be070..2ba1575b 100644 --- a/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java +++ b/src/main/java/net/fabricmc/loom/configuration/CompileConfiguration.java @@ -149,8 +149,10 @@ public abstract class CompileConfiguration implements Runnable { finalizedBy("eclipse", "genEclipseRuns"); - // Add the "dev" jar to the "namedElements" configuration - getProject().artifacts(artifactHandler -> artifactHandler.add(Configurations.NAMED_ELEMENTS, getTasks().named("jar"))); + if (!extension.disableObfuscation()) { + // Add the "dev" jar to the "namedElements" configuration + getProject().artifacts(artifactHandler -> artifactHandler.add(Configurations.NAMED_ELEMENTS, getTasks().named("jar"))); + } // Ensure that the encoding is set to UTF-8, no matter what the system default is // this fixes some edge cases with special characters not displaying correctly diff --git a/src/main/java/net/fabricmc/loom/configuration/LoomConfigurations.java b/src/main/java/net/fabricmc/loom/configuration/LoomConfigurations.java index fad2cb1a..92b166e0 100644 --- a/src/main/java/net/fabricmc/loom/configuration/LoomConfigurations.java +++ b/src/main/java/net/fabricmc/loom/configuration/LoomConfigurations.java @@ -126,15 +126,15 @@ public abstract class LoomConfigurations implements Runnable { }); }); - registerNonTransitive(Constants.Configurations.MAPPING_CONSTANTS, Role.RESOLVABLE); - - register(Constants.Configurations.NAMED_ELEMENTS, Role.CONSUMABLE).configure(configuration -> { - configuration.extendsFrom(getConfigurations().getByName(JavaPlugin.API_CONFIGURATION_NAME)); - }); - - extendsFrom(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME, Constants.Configurations.MAPPING_CONSTANTS); - if (!extension.disableObfuscation()) { + registerNonTransitive(Constants.Configurations.MAPPING_CONSTANTS, Role.RESOLVABLE); + + register(Constants.Configurations.NAMED_ELEMENTS, Role.CONSUMABLE).configure(configuration -> { + configuration.extendsFrom(getConfigurations().getByName(JavaPlugin.API_CONFIGURATION_NAME)); + }); + + extendsFrom(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME, Constants.Configurations.MAPPING_CONSTANTS); + register(Constants.Configurations.MAPPINGS, Role.RESOLVABLE); register(Constants.Configurations.MAPPINGS_FINAL, Role.RESOLVABLE); extendsFrom(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME, Constants.Configurations.MAPPINGS_FINAL); diff --git a/src/main/java/net/fabricmc/loom/util/gradle/SourceSetHelper.java b/src/main/java/net/fabricmc/loom/util/gradle/SourceSetHelper.java index fa5a66aa..8560a4e9 100644 --- a/src/main/java/net/fabricmc/loom/util/gradle/SourceSetHelper.java +++ b/src/main/java/net/fabricmc/loom/util/gradle/SourceSetHelper.java @@ -146,7 +146,9 @@ public final class SourceSetHelper { // Add dev jars from dependency projects if the source set is "main". if (forExport && SourceSet.MAIN_SOURCE_SET_NAME.equals(reference.sourceSet().getName()) && GradleUtils.isLoomCompanionProject(reference.project())) { - String configurationName = GradleUtils.isLoomProject(reference.project()) + boolean isLoom = GradleUtils.isLoomProject(reference.project()); + boolean isDebof = isLoom && LoomGradleExtension.get(reference.project()).disableObfuscation(); + String configurationName = isLoom && !isDebof ? Constants.Configurations.NAMED_ELEMENTS : JavaPlugin.RUNTIME_ELEMENTS_CONFIGURATION_NAME; final Configuration namedElements = reference.project().getConfigurations().getByName(configurationName);