diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-07-20 17:44:04 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-07-20 17:44:04 +0800 |
| commit | 07bc4eab7b23fee28d0036890337c5af97cc3d2f (patch) | |
| tree | 3d3fe446554db0cb665c7d1ced616f7c645360f6 /src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java | |
| parent | 3a354be4d757dcb93c8bf96bd74d50888a3f6e2f (diff) | |
| parent | 2259a4efc8f4dad35880b41cb8be59bc5b857f9b (diff) | |
| download | architectury-loom-07bc4eab7b23fee28d0036890337c5af97cc3d2f.tar.gz architectury-loom-07bc4eab7b23fee28d0036890337c5af97cc3d2f.tar.bz2 architectury-loom-07bc4eab7b23fee28d0036890337c5af97cc3d2f.zip | |
Merge branch 'upstream-0.9' into dev/0.9
# Conflicts:
# src/main/java/net/fabricmc/loom/LoomGradlePlugin.java
# src/main/java/net/fabricmc/loom/configuration/LoomDependencyManager.java
# src/main/java/net/fabricmc/loom/task/RemapJarTask.java
Diffstat (limited to 'src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java')
| -rw-r--r-- | src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java b/src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java index cecfba3c..0d31192d 100644 --- a/src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java +++ b/src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java @@ -158,7 +158,7 @@ public class RunConfig { if (extension.getLoaderLaunchMethod().equals("launchwrapper")) { // if installer.json found... - JsonObject installerJson = extension.getInstallerJson(); + JsonObject installerJson = extension.getInstallerData().installerJson(); if (installerJson != null) { List<String> sideKeys = ImmutableList.of(environment, "common"); @@ -305,7 +305,7 @@ public class RunConfig { } private static String getMainClass(String side, LoomGradleExtension extension, String defaultMainClass) { - JsonObject installerJson = extension.getInstallerJson(); + JsonObject installerJson = extension.getInstallerData().installerJson(); if (installerJson != null && installerJson.has("mainClass")) { JsonElement mainClassJson = installerJson.get("mainClass"); |