Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-06 16:37:38 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #319 from Minestom/resource_gatherer_java

Browse Source 
Resource gatherer fixes
This commit is contained in:
TheMode 2021-06-13 14:58:49 +02:00 committed by GitHub
commit af61c77a26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/minestom/server/registry/ResourceGatherer.java
View File

@ -105,7 +105,8 @@ public class ResourceGatherer {
} }
private static void runDataGenerator(File serverJar) throws IOException { private static void runDataGenerator(File serverJar) throws IOException {
ProcessBuilder dataGenerator = new ProcessBuilder("java", "-cp", serverJar.getName(), "net.minecraft.data.Main", "--all", "--server", "--dev"); final String javaExecutable = System.getProperty("java.home") + "/bin/java";
ProcessBuilder dataGenerator = new ProcessBuilder(javaExecutable, "-cp", serverJar.getName(), "net.minecraft.data.Main", "--all", "--server", "--dev");
dataGenerator.directory(TMP_FOLDER); dataGenerator.directory(TMP_FOLDER);
LOGGER.info("Now running data generator with options '--dev', '--server', '--all'"); LOGGER.info("Now running data generator with options '--dev', '--server', '--all'");
LOGGER.info("Executing: {}", String.join(StringUtils.SPACE, dataGenerator.command())); LOGGER.info("Executing: {}", String.join(StringUtils.SPACE, dataGenerator.command()));
@ -115,6 +116,9 @@ public class ResourceGatherer {
new BufferedReader( new BufferedReader(
new InputStreamReader(dataGeneratorProcess.getInputStream()) new InputStreamReader(dataGeneratorProcess.getInputStream())
).lines().forEach(LOGGER::info); ).lines().forEach(LOGGER::info);
new BufferedReader(
new InputStreamReader(dataGeneratorProcess.getErrorStream())
).lines().forEach(LOGGER::error);
LOGGER.info(""); LOGGER.info("");
try { try {