Merge branch 'start-on-first-thread' of https://github.com/shadowfacts/fabric-loom into shadowfacts-start-on-first-thread

dev/0.11
modmuss50 2018-12-12 13:44:42 +00:00
commit a2fc5ddf9c
3 changed files with 3 additions and 1 deletions

View File

@ -78,6 +78,7 @@ public class RunClientTask extends JavaExec {
LoomGradleExtension extension = this.getProject().getExtensions().getByType(LoomGradleExtension.class); LoomGradleExtension extension = this.getProject().getExtensions().getByType(LoomGradleExtension.class);
List<String> args = new ArrayList<>(super.getJvmArgs()); List<String> args = new ArrayList<>(super.getJvmArgs());
args.add("-Dfabric.development=true"); args.add("-Dfabric.development=true");
args.add("-XstartOnFirstThread");
return args; return args;
} }

View File

@ -74,6 +74,7 @@ public class RunServerTask extends JavaExec {
LoomGradleExtension extension = this.getProject().getExtensions().getByType(LoomGradleExtension.class); LoomGradleExtension extension = this.getProject().getExtensions().getByType(LoomGradleExtension.class);
List<String> args = new ArrayList<>(super.getJvmArgs()); List<String> args = new ArrayList<>(super.getJvmArgs());
args.add("-Dfabric.development=true"); args.add("-Dfabric.development=true");
args.add("-XstartOnFirstThread");
return args; return args;
} }

View File

@ -92,7 +92,7 @@ public class RunConfig {
ideaClient.projectName = project.getName(); ideaClient.projectName = project.getName();
ideaClient.configName = "Minecraft Client"; ideaClient.configName = "Minecraft Client";
ideaClient.runDir = "file://$PROJECT_DIR$/" + extension.runDir; ideaClient.runDir = "file://$PROJECT_DIR$/" + extension.runDir;
ideaClient.vmArgs = "-Dfabric.development=true"; ideaClient.vmArgs = "-Dfabric.development=true -XstartOnFirstThread";
ideaClient.programArgs = "--tweakClass " + Constants.FABRIC_CLIENT_TWEAKER + " --assetIndex " + minecraftVersionInfo.assetIndex.getFabricId(extension.getMinecraftProvider().minecraftVersion) + " --assetsDir \"" + new File(extension.getUserCache(), "assets").getAbsolutePath() + "\""; ideaClient.programArgs = "--tweakClass " + Constants.FABRIC_CLIENT_TWEAKER + " --assetIndex " + minecraftVersionInfo.assetIndex.getFabricId(extension.getMinecraftProvider().minecraftVersion) + " --assetsDir \"" + new File(extension.getUserCache(), "assets").getAbsolutePath() + "\"";
return ideaClient; return ideaClient;