From f875e34a67d85e5388fd8b539968c4a42d94251e Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 12 Dec 2018 18:10:47 +0000 Subject: [PATCH] Only add -XstartOnFirstThread on mac os --- src/main/java/net/fabricmc/loom/task/RunClientTask.java | 5 ++++- src/main/java/net/fabricmc/loom/task/RunServerTask.java | 1 - src/main/java/net/fabricmc/loom/util/RunConfig.java | 9 ++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/fabricmc/loom/task/RunClientTask.java b/src/main/java/net/fabricmc/loom/task/RunClientTask.java index 6e327ef5..9a29f9d7 100644 --- a/src/main/java/net/fabricmc/loom/task/RunClientTask.java +++ b/src/main/java/net/fabricmc/loom/task/RunClientTask.java @@ -28,6 +28,7 @@ import net.fabricmc.loom.LoomGradleExtension; import net.fabricmc.loom.providers.MappingsProvider; import net.fabricmc.loom.util.Constants; import net.fabricmc.loom.util.MinecraftVersionInfo; +import net.fabricmc.loom.util.OperatingSystem; import org.gradle.api.tasks.JavaExec; import java.io.File; @@ -78,7 +79,9 @@ public class RunClientTask extends JavaExec { LoomGradleExtension extension = this.getProject().getExtensions().getByType(LoomGradleExtension.class); List args = new ArrayList<>(super.getJvmArgs()); args.add("-Dfabric.development=true"); - args.add("-XstartOnFirstThread"); + if(OperatingSystem.getOS().equalsIgnoreCase("osx")){ + args.add("-XstartOnFirstThread"); + } return args; } diff --git a/src/main/java/net/fabricmc/loom/task/RunServerTask.java b/src/main/java/net/fabricmc/loom/task/RunServerTask.java index 5f901bbf..38c56078 100644 --- a/src/main/java/net/fabricmc/loom/task/RunServerTask.java +++ b/src/main/java/net/fabricmc/loom/task/RunServerTask.java @@ -74,7 +74,6 @@ public class RunServerTask extends JavaExec { LoomGradleExtension extension = this.getProject().getExtensions().getByType(LoomGradleExtension.class); List args = new ArrayList<>(super.getJvmArgs()); args.add("-Dfabric.development=true"); - args.add("-XstartOnFirstThread"); return args; } diff --git a/src/main/java/net/fabricmc/loom/util/RunConfig.java b/src/main/java/net/fabricmc/loom/util/RunConfig.java index 91e70480..7906ba1a 100644 --- a/src/main/java/net/fabricmc/loom/util/RunConfig.java +++ b/src/main/java/net/fabricmc/loom/util/RunConfig.java @@ -92,7 +92,7 @@ public class RunConfig { ideaClient.projectName = project.getName(); ideaClient.configName = "Minecraft Client"; ideaClient.runDir = "file://$PROJECT_DIR$/" + extension.runDir; - ideaClient.vmArgs = "-Dfabric.development=true -XstartOnFirstThread"; + ideaClient.vmArgs = "-Dfabric.development=true" + getOSClientJVMArgs(); ideaClient.programArgs = "--tweakClass " + Constants.FABRIC_CLIENT_TWEAKER + " --assetIndex " + minecraftVersionInfo.assetIndex.getFabricId(extension.getMinecraftProvider().minecraftVersion) + " --assetsDir \"" + new File(extension.getUserCache(), "assets").getAbsolutePath() + "\""; return ideaClient; @@ -125,4 +125,11 @@ public class RunConfig { return dummyConfig; } + + public static String getOSClientJVMArgs(){ + if(OperatingSystem.getOS().equalsIgnoreCase("osx")){ + return " -XstartOnFirstThread"; + } + return ""; + } } \ No newline at end of file