Specify required JDK more explicitly in build settings. Add VSCode search exclusions

Author: Lassebq

src/main/java/org/mcphackers/mcp/tasks/TaskDecompile.java

@@ -73,7 +73,7 @@ protected Stage[] setStages() {
 			}
 			// Force Java 8 or later in order to support VSC
 			// Java extension does not allow compiling under Java 8
-			classVersion = Math.max(8, classVersion);
+			classVersion = Math.max(52, classVersion);
 		}), stage(getLocalizedStage("decompile"), () -> {
 			new Decompiler(this, rdiOut, ffOut, mcp.getLibraries(), mcp).decompile();
 			new EclipseProjectWriter().createProject(mcp, side, ClassUtils.getSourceFromClassVersion(classVersion));

src/main/java/org/mcphackers/mcp/tasks/TaskRun.java

@@ -118,8 +118,8 @@ public static List<String> getLaunchArgs(MCP mcp, Side side) {
 			String arg = argsList.get(i);
 			switch (arg) {
 				case "${auth_player_name}":
-					arg = "Player107";
-					break; //Player107 is a free username with no skin
+					arg = "Player";
+					break;
 				case "${auth_session}":
 				case "${auth_uuid}":
 				case "${auth_access_token}":

src/main/java/org/mcphackers/mcp/tools/project/EclipseProjectWriter.java

@@ -30,7 +30,7 @@ public void createProject(MCP mcp, Side side, int sourceVersion) throws IOExcept
 		String projectName = "Minecraft " + (side == Task.Side.CLIENT ? "Client" : side == Task.Side.SERVER ? "Server" : side == Task.Side.MERGED ? "Merged" : "Project");
 
 		try (XMLWriter writer = new XMLWriter(Files.newBufferedWriter(proj.resolve(".classpath")))) {
-			EclipseClasspath classpath = new EclipseClasspath(mcp, projectName);
+			EclipseClasspath classpath = new EclipseClasspath(mcp, projectName, sourceVersion);
 			for (DependDownload dependency : version.libraries) {
 				classpath.addDependency(dependency);
 			}

src/main/java/org/mcphackers/mcp/tools/project/VSCProjectWriter.java

@@ -26,6 +26,15 @@ public void createProject(MCP mcp, Side side, int sourceVersion) throws IOExcept
 		String projectName = "Minecraft " + (side == Task.Side.CLIENT ? "Client" : side == Task.Side.SERVER ? "Server" : side == Task.Side.MERGED ? "Merged" : "Project");
 
 		Files.createDirectories(proj.resolve(".vscode"));
+		try (BufferedWriter writer = Files.newBufferedWriter(proj.resolve(".vscode/settings.json"))) {
+			JSONObject settingsJson = new JSONObject();
+			JSONObject searchExclude = new JSONObject();
+			searchExclude.put("src_original/**", true);
+			searchExclude.put("bin/**", true);
+			searchExclude.put("output/**", true);
+			settingsJson.put("search.exclude", searchExclude);
+			settingsJson.write(writer);
+		}
 		try (BufferedWriter writer = Files.newBufferedWriter(proj.resolve(".vscode/launch.json"))) {
 			JSONObject launchJson = new JSONObject();
 			launchJson.put("version", "0.2.0");

src/main/java/org/mcphackers/mcp/tools/project/eclipse/EclipseClasspath.java

@@ -16,11 +16,27 @@
 public class EclipseClasspath {
 	private final MCP mcp;
 	private final String projectName;
+	private final int javaVersion;
 	private final List<DependDownload> dependencies = new ArrayList<>();
 
-	public EclipseClasspath(MCP mcp, String projectName) {
+	private final static String[] VM_TYPES = {
+		"J2SE-1.5",
+		"JavaSE-1.6",
+		"JavaSE-1.7",
+		"JavaSE-1.8"
+	};
+
+	private String getStandardVMType() {
+		if(javaVersion >= 5 && javaVersion <= 8) {
+			return VM_TYPES[javaVersion - 5];
+		}
+		return "JavaSE-" + javaVersion;
+	}
+
+	public EclipseClasspath(MCP mcp, String projectName, int javaVersion) {
 		this.mcp = mcp;
 		this.projectName = projectName;
+		this.javaVersion = javaVersion;
 	}
 
 	public void addDependency(DependDownload dependency) {
@@ -55,7 +71,7 @@ public void toXML(XMLWriter writer, Task.Side side) throws IOException {
 			}
 		}
 		writer.writeAttribute("classpathentry kind=\"lib\" path=\"jars/deobfuscated.jar\" sourcepath=\"jars/deobfuscated-source.jar\"");
-		writer.writeAttribute("classpathentry kind=\"con\" path=\"org.eclipse.jdt.launching.JRE_CONTAINER\"");
+		writer.writeAttribute("classpathentry kind=\"con\" path=\"org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/" + getStandardVMType() + "\"");
 		writer.writeAttribute("classpathentry kind=\"output\" path=\"output\"");
 		writer.closeAttribute("classpath");
 	}