Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/main/java/net/fabricmc/loom/LoomGradleExtension.java
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ default List<Path> getMinecraftJars(MappingsNamespace mappingsNamespace) {

FileCollection getMinecraftJarsCollection(MappingsNamespace mappingsNamespace);

boolean isRootProject();

@Override
MixinExtension getMixin();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
import net.fabricmc.loom.configuration.providers.BundleMetadata;
import net.fabricmc.loom.configuration.providers.minecraft.library.LibraryContext;
import net.fabricmc.loom.util.Constants;
import net.fabricmc.loom.util.gradle.GradleUtils;
import net.fabricmc.loom.util.gradle.SourceSetReference;

public class RunConfig {
Expand Down Expand Up @@ -132,7 +133,7 @@ public static RunConfig runConfig(Project project, RunConfigSettings settings) {
RunConfig runConfig = new RunConfig();
runConfig.configName = configName;

if (appendProjectPath && !extension.isRootProject()) {
if (appendProjectPath && !GradleUtils.isRootProject(project)) {
runConfig.configName += " (" + project.getPath() + ")";
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import net.fabricmc.loom.configuration.providers.minecraft.MinecraftSourceSets;
import net.fabricmc.loom.util.Constants;
import net.fabricmc.loom.util.Platform;
import net.fabricmc.loom.util.gradle.GradleUtils;
import net.fabricmc.loom.util.gradle.SourceSetHelper;

public abstract class RunConfigSettings implements Named {
Expand Down Expand Up @@ -139,7 +140,7 @@ public RunConfigSettings(Project project, String name) {
this.project = project;
this.appendProjectPathToConfigName = project.getObjects().property(Boolean.class).convention(true);
this.extension = LoomGradleExtension.get(project);
this.ideConfigGenerated = extension.isRootProject();
this.ideConfigGenerated = GradleUtils.isRootProject(project);
this.mainClass = project.getObjects().property(String.class).convention(project.provider(() -> {
Objects.requireNonNull(environment, "Run config " + name + " must specify environment");
Objects.requireNonNull(defaultMainClass, "Run config " + name + " must specify default main class");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,7 @@ public void run() {
}

private void hookDownloadSources() {
LoomGradleExtension extension = LoomGradleExtension.get(getProject());

if (!extension.isRootProject()) {
if (!GradleUtils.isRootProject(getProject())) {
return;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,11 +216,6 @@ public InstallerData getInstallerData() {
return installerData;
}

@Override
public boolean isRootProject() {
return project.getRootProject() == project;
}

@Override
public MixinExtension getMixin() {
return this.mixinApExtension;
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/net/fabricmc/loom/util/gradle/GradleUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,8 @@ public static File configurationInputFile(Project project, File file) {
property.set(file);
return property.getAsFile().get();
}

public static boolean isRootProject(Project project) {
return project.getRootProject() == project;
}
}