Merge remote-tracking branch 'origin/master'

dev/0.11
modmuss50 2018-05-14 21:29:52 +01:00
commit 4f5d72d82f
2 changed files with 3 additions and 3 deletions

View File

@ -67,9 +67,9 @@ public class GenVSCodeProjectTask extends DefaultTask {
JsonObject jsonObject = new JsonObject(); JsonObject jsonObject = new JsonObject();
JsonArray jsonArray = new JsonArray(); JsonArray jsonArray = new JsonArray();
jsonArray.add("src/main/java"); jsonArray.add("src/main/java");
jsonArray.add("src/main/resorces"); jsonArray.add("src/main/resources");
jsonArray.add("src/test/java"); jsonArray.add("src/test/java");
jsonArray.add("src/test/resorces"); jsonArray.add("src/test/resources");
jsonObject.add("sourcePath", jsonArray); jsonObject.add("sourcePath", jsonArray);
JsonElement element = new JsonPrimitive(classPathFile.getName()); JsonElement element = new JsonPrimitive(classPathFile.getName());
jsonObject.add("classPathFile", element); jsonObject.add("classPathFile", element);

View File

@ -46,7 +46,7 @@ public class RunClientTask extends JavaExec {
try { try {
version = gson.fromJson(new FileReader(Constants.MINECRAFT_JSON.get(extension)), Version.class); version = gson.fromJson(new FileReader(Constants.MINECRAFT_JSON.get(extension)), Version.class);
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
e.printStackTrace(); getLogger().error("Failed to retrieve version from minecraft json", e);
} }
List<String> libs = new ArrayList<>(); List<String> libs = new ArrayList<>();