Use JAVA_HOME option if set for running the game

Author: PhoenixVX

gui/src/main/java/org/mcphackers/mcp/main/MainGUI.java

@@ -1,8 +1,6 @@
 package org.mcphackers.mcp.main;
 
-import java.awt.BorderLayout;
-import java.awt.Font;
-import java.awt.Frame;
+import java.awt.*;
 import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.IOException;
@@ -15,19 +13,7 @@
 import java.nio.file.Paths;
 import java.util.List;
 
-import javax.swing.BoxLayout;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextPane;
-import javax.swing.SwingConstants;
-import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.*;
 import javax.swing.border.EmptyBorder;
 import javax.tools.JavaCompiler;
 import javax.tools.ToolProvider;
@@ -303,6 +289,20 @@ public void inputOptionsValue(TaskParameter param) {
 		if (param.type == String[].class) {
 			s = MCP.TRANSLATOR.translateKey("options.enterValues") + "\n" + MCP.TRANSLATOR.translateKey("options.enterValues.info");
 		}
+		if (param.equals(TaskParameter.JAVA_HOME)) {
+			JFileChooser chooser = new JFileChooser();
+			chooser.setDialogTitle("Select JAVA_HOME Directory");
+			chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+			chooser.setAcceptAllFileFilterUsed(false);
+
+			int result = chooser.showOpenDialog(null);
+
+			if (result == JFileChooser.APPROVE_OPTION) {
+				s = chooser.getSelectedFile().getAbsolutePath() + "/bin/java";
+			} else {
+				System.out.println("No folder selected.");
+			}
+		}
 		String value = (String) JOptionPane.showInputDialog(frame, s, param.getDesc(), JOptionPane.PLAIN_MESSAGE, null, null, Util.convertToEscapedString(String.valueOf(options.getParameter(param))));
 		safeSetParameter(param, value);
 		options.save();

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

@@ -55,7 +55,7 @@ protected Stage[] setStages() {
 					Path natives = MCPPaths.get(mcp, NATIVES).toAbsolutePath();
 
 					List<String> args = new ArrayList<>();
-					args.add(Util.getJava());
+					args.add(Util.getJava(this.mcp));
 					Collections.addAll(args, runArgs);
 					args.add("-Djava.library.path=" + natives);
 					args.add("-cp");

src/main/java/org/mcphackers/mcp/tools/Util.java

@@ -1,5 +1,8 @@
 package org.mcphackers.mcp.tools;
 
+import org.mcphackers.mcp.MCP;
+import org.mcphackers.mcp.tasks.mode.TaskParameter;
+
 import java.awt.Desktop;
 import java.awt.Toolkit;
 import java.awt.datatransfer.StringSelection;
@@ -204,6 +207,14 @@ public static String getJava() {
 		return System.getProperties().getProperty("java.home") + File.separator + "bin" + File.separator + "java";
 	}
 
+	public static String getJava(MCP mcp) {
+		String javaHome = mcp.getOptions().getStringParameter(TaskParameter.JAVA_HOME);
+		if (javaHome == null || javaHome.isEmpty()) {
+			return System.getProperties().getProperty("java.home") + File.separator + "bin" + File.separator + "java";
+		}
+		return javaHome;
+	}
+
 	public static int getJavaVersion() {
 		String javaVersion = System.getProperty("java.version");
 		String[] versionParts = javaVersion.split("\\.");