aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJonas Herzig <jonas@spark-squared.com>2022-01-11 16:25:07 +0100
committerJonas Herzig <jonas@spark-squared.com>2022-01-11 16:25:07 +0100
commit98173e3874d59d98bdb05298a6bf8e85d2502de8 (patch)
tree58acf41dc3587a6c91b501c652eaa3073c71c6de /src
parent6a2a900535f4c3452000ff8a12a384146da27ccc (diff)
downloadarchitectury-loom-98173e3874d59d98bdb05298a6bf8e85d2502de8.tar.gz
architectury-loom-98173e3874d59d98bdb05298a6bf8e85d2502de8.tar.bz2
architectury-loom-98173e3874d59d98bdb05298a6bf8e85d2502de8.zip
Use explicit if to separate modern and legacy runs setup
Diffstat (limited to 'src')
-rw-r--r--src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java22
1 files changed, 14 insertions, 8 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java
index ec98da78..b30e78f2 100644
--- a/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java
+++ b/src/main/java/net/fabricmc/loom/configuration/providers/forge/ForgeUserdevProvider.java
@@ -164,8 +164,14 @@ public class ForgeUserdevProvider extends DependencyProvider {
// TODO: Should I copy the patches from here as well?
// That'd require me to run the "MCP environment" fully up to merging.
- JsonObject runs = isLegacyForge ? new JsonObject() : json.getAsJsonObject("runs");
+ if (!isLegacyForge) {
+ configureRuns(json.getAsJsonObject("runs"));
+ } else {
+ configureRunsForLegacyForge();
+ }
+ }
+ private void configureRuns(JsonObject runs) {
for (Map.Entry<String, JsonElement> entry : runs.entrySet()) {
LaunchProviderSettings launchSettings = getExtension().getLaunchConfigs().findByName(entry.getKey());
RunConfigSettings settings = getExtension().getRunConfigs().findByName(entry.getKey());
@@ -211,14 +217,14 @@ public class ForgeUserdevProvider extends DependencyProvider {
});
}
}
+ }
- if (isLegacyForge) {
- getExtension().getRunConfigs().configureEach(config -> {
- if (Constants.Forge.LAUNCH_TESTING.equals(config.getDefaultMainClass())) {
- config.setDefaultMainClass(Constants.LegacyForge.LAUNCH_WRAPPER);
- }
- });
- }
+ private void configureRunsForLegacyForge() {
+ getExtension().getRunConfigs().configureEach(config -> {
+ if (Constants.Forge.LAUNCH_TESTING.equals(config.getDefaultMainClass())) {
+ config.setDefaultMainClass(Constants.LegacyForge.LAUNCH_WRAPPER);
+ }
+ });
}
public boolean isLegacyForge() {