Refactor JavaRuntimeFinder into subclasses & clean up

The getAvailableRuntimes function is now parseable, & the new
PlatformRuntimeFinder interface makes it clear what each stage does.

launcher/src/main/java/com/skcraft/launcher/Configuration.java

@@ -7,8 +7,8 @@
 package com.skcraft.launcher;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.skcraft.launcher.launch.JavaRuntime;
-import com.skcraft.launcher.launch.JavaRuntimeFinder;
+import com.skcraft.launcher.launch.runtime.JavaRuntime;
+import com.skcraft.launcher.launch.runtime.JavaRuntimeFinder;
 import lombok.Data;
 
 /**

launcher/src/main/java/com/skcraft/launcher/InstanceSettings.java

@@ -1,8 +1,8 @@
 package com.skcraft.launcher;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.skcraft.launcher.launch.JavaRuntime;
 import com.skcraft.launcher.launch.MemorySettings;
+import com.skcraft.launcher.launch.runtime.JavaRuntime;
 import lombok.Data;
 
 @Data

launcher/src/main/java/com/skcraft/launcher/dialog/ConfigurationDialog.java

@@ -9,9 +9,9 @@
 import com.skcraft.launcher.Configuration;
 import com.skcraft.launcher.Launcher;
 import com.skcraft.launcher.dialog.component.BetterComboBox;
-import com.skcraft.launcher.launch.AddJavaRuntime;
-import com.skcraft.launcher.launch.JavaRuntime;
-import com.skcraft.launcher.launch.JavaRuntimeFinder;
+import com.skcraft.launcher.launch.runtime.AddJavaRuntime;
+import com.skcraft.launcher.launch.runtime.JavaRuntime;
+import com.skcraft.launcher.launch.runtime.JavaRuntimeFinder;
 import com.skcraft.launcher.persistence.Persistence;
 import com.skcraft.launcher.swing.*;
 import com.skcraft.launcher.util.SharedLocale;

launcher/src/main/java/com/skcraft/launcher/dialog/InstanceSettingsDialog.java

@@ -3,9 +3,9 @@
 import com.skcraft.launcher.Instance;
 import com.skcraft.launcher.InstanceSettings;
 import com.skcraft.launcher.dialog.component.BetterComboBox;
-import com.skcraft.launcher.launch.JavaRuntime;
-import com.skcraft.launcher.launch.JavaRuntimeFinder;
 import com.skcraft.launcher.launch.MemorySettings;
+import com.skcraft.launcher.launch.runtime.JavaRuntime;
+import com.skcraft.launcher.launch.runtime.JavaRuntimeFinder;
 import com.skcraft.launcher.persistence.Persistence;
 import com.skcraft.launcher.swing.FormPanel;
 import com.skcraft.launcher.swing.LinedBoxPanel;

launcher/src/main/java/com/skcraft/launcher/launch/JavaProcessBuilder.java

@@ -6,6 +6,7 @@
 
 package com.skcraft.launcher.launch;
 
+import com.skcraft.launcher.launch.runtime.JavaRuntime;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;

launcher/src/main/java/com/skcraft/launcher/launch/Runner.java

@@ -16,6 +16,8 @@
 import com.skcraft.launcher.*;
 import com.skcraft.launcher.auth.Session;
 import com.skcraft.launcher.install.ZipExtract;
+import com.skcraft.launcher.launch.runtime.JavaRuntime;
+import com.skcraft.launcher.launch.runtime.JavaRuntimeFinder;
 import com.skcraft.launcher.model.minecraft.*;
 import com.skcraft.launcher.persistence.Persistence;
 import com.skcraft.launcher.util.Environment;

launcher/src/main/java/com/skcraft/launcher/launch/AddJavaRuntime.java → launcher/src/main/java/com/skcraft/launcher/launch/runtime/AddJavaRuntime.java

@@ -1,4 +1,4 @@
-package com.skcraft.launcher.launch;
+package com.skcraft.launcher.launch.runtime;
 
 import java.io.File;
 

launcher/src/main/java/com/skcraft/launcher/launch/runtime/JavaReleaseFile.java

@@ -0,0 +1,47 @@
+package com.skcraft.launcher.launch.runtime;
+
+import com.skcraft.launcher.util.EnvironmentParser;
+import lombok.extern.java.Log;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+import java.util.logging.Level;
+
+@Log
+public class JavaReleaseFile {
+	private Map<String, String> backingMap;
+
+	private JavaReleaseFile(Map<String, String> releaseDetails) {
+		this.backingMap = releaseDetails;
+	}
+
+	public String getVersion() {
+		return backingMap.get("JAVA_VERSION");
+	}
+
+	public String getArch() {
+		return backingMap.get("OS_ARCH");
+	}
+
+	public boolean isArch64Bit() {
+		return getArch() == null || getArch().matches("x64|x86_64|amd64|aarch64");
+	}
+
+	public static JavaReleaseFile parseFromRelease(File javaPath) {
+		File releaseFile = new File(javaPath, "release");
+
+		if (releaseFile.exists()) {
+			try {
+				Map<String, String> releaseDetails = EnvironmentParser.parse(releaseFile);
+
+				return new JavaReleaseFile(releaseDetails);
+			} catch (IOException e) {
+				log.log(Level.WARNING, "Failed to read release file " + releaseFile.getAbsolutePath(), e);
+				return null;
+			}
+		}
+
+		return null;
+	}
+}

launcher/src/main/java/com/skcraft/launcher/launch/JavaRuntime.java → launcher/src/main/java/com/skcraft/launcher/launch/runtime/JavaRuntime.java

@@ -1,4 +1,4 @@
-package com.skcraft.launcher.launch;
+package com.skcraft.launcher.launch.runtime;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;