From 4daec03a0f1fdc6ded627b71d1d0ae05a936b851 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 11 Feb 2021 18:18:07 +0000 Subject: [PATCH] Rename `runs` -> `runConfigs` --- .../java/net/fabricmc/loom/LoomGradleExtension.java | 12 ++++++------ .../configuration/ide/SetupIntelijRunConfigs.java | 2 +- .../net/fabricmc/loom/task/GenEclipseRunsTask.java | 2 +- .../net/fabricmc/loom/task/GenIdeaProjectTask.java | 2 +- .../net/fabricmc/loom/task/GenVsCodeProjectTask.java | 2 +- src/main/java/net/fabricmc/loom/task/LoomTasks.java | 8 ++++---- .../java/net/fabricmc/loom/task/RunClientTask.java | 2 +- .../java/net/fabricmc/loom/task/RunServerTask.java | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java index acb588c..98a0e1b 100644 --- a/src/main/java/net/fabricmc/loom/LoomGradleExtension.java +++ b/src/main/java/net/fabricmc/loom/LoomGradleExtension.java @@ -80,7 +80,7 @@ public class LoomGradleExtension { private Mercury[] srcMercuryCache = new Mercury[2]; private Set mixinMappings = Collections.synchronizedSet(new HashSet<>()); - private NamedDomainObjectContainer runs; + private NamedDomainObjectContainer runConfigs; /** * Loom will generate a new genSources task (with a new name, based off of {@link LoomDecompiler#name()}) @@ -117,7 +117,7 @@ public class LoomGradleExtension { this.project = project; this.autoGenIDERuns = isRootProject(); this.unmappedMods = project.files(); - this.runs = project.container(RunConfigSettings.class, + this.runConfigs = project.container(RunConfigSettings.class, baseName -> new RunConfigSettings(project, baseName)); } @@ -351,12 +351,12 @@ public class LoomGradleExtension { } @ApiStatus.Experimental - public void runs(Action> action) { - action.execute(runs); + public void runConfigs(Action> action) { + action.execute(runConfigs); } @ApiStatus.Experimental - public NamedDomainObjectContainer getRuns() { - return runs; + public NamedDomainObjectContainer getRunConfigs() { + return runConfigs; } } diff --git a/src/main/java/net/fabricmc/loom/configuration/ide/SetupIntelijRunConfigs.java b/src/main/java/net/fabricmc/loom/configuration/ide/SetupIntelijRunConfigs.java index c531cee..e4bcd21 100644 --- a/src/main/java/net/fabricmc/loom/configuration/ide/SetupIntelijRunConfigs.java +++ b/src/main/java/net/fabricmc/loom/configuration/ide/SetupIntelijRunConfigs.java @@ -71,7 +71,7 @@ public class SetupIntelijRunConfigs { runConfigsDir.mkdirs(); } - for (RunConfigSettings settings : extension.getRuns()) { + for (RunConfigSettings settings : extension.getRunConfigs()) { RunConfig config = RunConfig.runConfig(project, settings); String name = config.configName.replaceAll("[^a-zA-Z0-9$_]", "_"); diff --git a/src/main/java/net/fabricmc/loom/task/GenEclipseRunsTask.java b/src/main/java/net/fabricmc/loom/task/GenEclipseRunsTask.java index 5cb4599..9a4dde9 100644 --- a/src/main/java/net/fabricmc/loom/task/GenEclipseRunsTask.java +++ b/src/main/java/net/fabricmc/loom/task/GenEclipseRunsTask.java @@ -42,7 +42,7 @@ public class GenEclipseRunsTask extends AbstractLoomTask { EclipseModel eclipseModel = getProject().getExtensions().getByType(EclipseModel.class); LoomGradleExtension extension = getExtension(); - for (RunConfigSettings settings : extension.getRuns()) { + for (RunConfigSettings settings : extension.getRunConfigs()) { String name = settings.getName(); File configs = new File(getProject().getRootDir(), eclipseModel.getProject().getName() + "_" + name + ".launch"); diff --git a/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java b/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java index 8ad3586..cf08f56 100644 --- a/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java +++ b/src/main/java/net/fabricmc/loom/task/GenIdeaProjectTask.java @@ -83,7 +83,7 @@ public class GenIdeaProjectTask extends AbstractLoomTask { throw new RuntimeException("Failed to generate IntelliJ run configurations (runManager was not found)"); } - for (RunConfigSettings settings : getExtension().getRuns()) { + for (RunConfigSettings settings : getExtension().getRunConfigs()) { runManager.appendChild(RunConfig.runConfig(project, settings).genRuns(runManager)); settings.makeRunDir(); } diff --git a/src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java b/src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java index fe142df..f7d8fe0 100644 --- a/src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java +++ b/src/main/java/net/fabricmc/loom/task/GenVsCodeProjectTask.java @@ -63,7 +63,7 @@ public class GenVsCodeProjectTask extends AbstractLoomTask { VsCodeLaunch launch = new VsCodeLaunch(); - for (RunConfigSettings settings : getExtension().getRuns()) { + for (RunConfigSettings settings : getExtension().getRunConfigs()) { launch.add(RunConfig.runConfig(project, settings)); settings.makeRunDir(); } diff --git a/src/main/java/net/fabricmc/loom/task/LoomTasks.java b/src/main/java/net/fabricmc/loom/task/LoomTasks.java index a3aca53..198f92e 100644 --- a/src/main/java/net/fabricmc/loom/task/LoomTasks.java +++ b/src/main/java/net/fabricmc/loom/task/LoomTasks.java @@ -86,9 +86,9 @@ public final class LoomTasks { private static void registerRunTasks(TaskContainer tasks, Project project) { LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class); - Preconditions.checkArgument(extension.getRuns().size() == 0, "Run configurations must not be registered before loom"); + Preconditions.checkArgument(extension.getRunConfigs().size() == 0, "Run configurations must not be registered before loom"); - extension.getRuns().whenObjectAdded(config -> { + extension.getRunConfigs().whenObjectAdded(config -> { String configName = config.getName(); String taskName = "run" + configName.substring(0, 1).toUpperCase() + configName.substring(1); @@ -102,8 +102,8 @@ public final class LoomTasks { }); }); - extension.getRuns().create("client", RunConfigSettings::client); - extension.getRuns().create("server", RunConfigSettings::server); + extension.getRunConfigs().create("client", RunConfigSettings::client); + extension.getRunConfigs().create("server", RunConfigSettings::server); } private static void registerDecompileTasks(TaskContainer tasks, Project project) { diff --git a/src/main/java/net/fabricmc/loom/task/RunClientTask.java b/src/main/java/net/fabricmc/loom/task/RunClientTask.java index 0bfaca0..12504b6 100644 --- a/src/main/java/net/fabricmc/loom/task/RunClientTask.java +++ b/src/main/java/net/fabricmc/loom/task/RunClientTask.java @@ -32,7 +32,7 @@ public class RunClientTask extends AbstractRunTask { public RunClientTask() { super(project -> { LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class); - return RunConfig.runConfig(project, extension.getRuns().getByName("client")); + return RunConfig.runConfig(project, extension.getRunConfigs().getByName("client")); }); } } diff --git a/src/main/java/net/fabricmc/loom/task/RunServerTask.java b/src/main/java/net/fabricmc/loom/task/RunServerTask.java index aa9fc94..7188ce6 100644 --- a/src/main/java/net/fabricmc/loom/task/RunServerTask.java +++ b/src/main/java/net/fabricmc/loom/task/RunServerTask.java @@ -32,7 +32,7 @@ public class RunServerTask extends AbstractRunTask { public RunServerTask() { super(project -> { LoomGradleExtension extension = project.getExtensions().getByType(LoomGradleExtension.class); - return RunConfig.runConfig(project, extension.getRuns().getByName("client")); + return RunConfig.runConfig(project, extension.getRunConfigs().getByName("client")); }); } }