Java selection UI overhaul

apps/desktop/src/api/commands/mod.rs

@@ -89,6 +89,8 @@ macro_rules! collect_commands {
 			get_zulu_packages,
 			install_java_from_package,
 			open_dev_tools,
+			check_java,
+			locate_java,
 		]
 	}};
 }
@@ -118,6 +120,18 @@ pub async fn get_featured_packages() -> Result<Vec<onelauncher::package::content
 	Ok(onelauncher::package::content::get_featured_packages().await?)
 }
 
+#[specta::specta]
+#[tauri::command]
+pub async fn check_java(path: std::path::PathBuf) -> Result<Option<onelauncher::prelude::JavaVersion>, String> {
+	Ok(onelauncher::java::check_java(path).await?)
+}
+
+#[specta::specta]
+#[tauri::command]
+pub async fn locate_java() -> Result<Vec<onelauncher::prelude::JavaVersion>, String> {
+	Ok(onelauncher::utils::java::locate_java().await.map_err(|e| e.to_string())?)
+}
+
 #[specta::specta]
 #[tauri::command]
 pub fn get_program_info() -> Result<super::statics::ProgramInfo, String> {

apps/desktop/tauri.conf.json

@@ -6,7 +6,7 @@
 		"withGlobalTauri": true,
 		"macOSPrivateApi": true,
 		"security": {
-			"csp": "img-src 'self' asset: http://asset.localhost",
+			"csp": null,
 			"assetProtocol": {
 				"enable": true,
 				"scope": {

apps/frontend/src/ui/pages/cluster/ClusterSettings.tsx

@@ -80,7 +80,6 @@ function PageSettings(cluster: Accessor<Cluster>) {
 			<GameSettings
 				{...{
 					fullscreen,
-					memory,
 					resolution,
 				}}
 			/>
@@ -107,6 +106,7 @@ function PageSettings(cluster: Accessor<Cluster>) {
 					javaVersions,
 					javaArgs,
 					envVars,
+					memory,
 				}}
 			/>
 		</>