Merge remote-tracking branch 'architectury/dev/0.9' into dev/0.9

# Conflicts:
#	src/main/java/net/fabricmc/loom/configuration/ide/RunConfig.java
This commit is contained in:
shedaniel
2021-07-20 23:48:33 +08:00

View File

@@ -269,7 +269,7 @@ public class RunConfig {
}
private static String getMainClass(String side, LoomGradleExtension extension, String defaultMainClass) {
JsonObject installerJson = extension.getInstallerData().installerJson();
JsonObject installerJson = extension.getInstallerData() == null ? null : extension.getInstallerData().installerJson();
if (installerJson != null && installerJson.has("mainClass")) {
JsonElement mainClassJson = installerJson.get("mainClass");