feat: Java Version editor (Should probably make it more intuitive tho…

…ugh)

Cargo.toml

@@ -42,6 +42,8 @@ tauri = { version = "=2.0.0-rc.8", features = [
 	"protocol-asset"
 ] }
 
+# tauri-utils is a collection of utilities for tauri apps.
+tauri-utils = { version = "=2.0.0-rc.7" }
 # tauri-build is the codegen utility for our tauri buildscript.
 tauri-build = { version = "=2.0.0-rc.7" }
 # tauri-plugin-shell adds a bridge for opening urls and paths in the frontend.
@@ -174,8 +176,8 @@ cocoa = { version = "0.26" }
 objc = { version = "0.2" }
 cc = { version = "1.1" }
 libc = { version = "0.2" }
-# https://github.com/tauri-apps/tauri/blob/tauri-v2.0.0-rc.0/core/tauri/Cargo.toml#L86
-webkit2gtk = { version = "=2.0.1", features = [ "v2_38" ] }
+# https://github.com/tauri-apps/tauri/blob/dev/crates/tauri/Cargo.toml#L102
+webkit2gtk = { version = "=2.0.1", features = [ "v2_40" ] }
 
 [workspace.dependencies.prisma-client-rust]
 git = "https://github.com/brendonovich/prisma-client-rust"

apps/desktop/Cargo.toml

@@ -28,6 +28,7 @@ tauri-plugin-updater = { workspace = true }
 tauri-plugin-clipboard-manager = { workspace = true }
 tauri-plugin-dialog = { workspace = true }
 tauri-plugin-deep-link = { workspace = true }
+tauri-utils = { workspace = true }
 tauri-specta = { workspace = true }
 specta = { workspace = true }
 specta-typescript = { workspace = true }

apps/frontend/src/ui/components/content/SearchResults.tsx

@@ -1,11 +1,11 @@
 import { ChevronDownIcon, Download01Icon, HeartIcon } from '@untitled-theme/icons-solid';
-import useBrowser from '~ui/hooks/useBrowser';
-import useSettings from '~ui/hooks/useSettings';
-import { abbreviateNumber } from '~utils';
-import { createSignal, For, Match, Show, Switch } from 'solid-js';
+import { For, Match, Show, Switch, createSignal } from 'solid-js';
 import type { Providers, SearchResult } from '@onelauncher/client/bindings';
 import type { JSX } from 'solid-js';
 import Button from '../base/Button';
+import { abbreviateNumber } from '~utils';
+import useSettings from '~ui/hooks/useSettings';
+import useBrowser from '~ui/hooks/useBrowser';
 
 interface SearchResultsContainerProps {
 	provider: Providers;

apps/frontend/src/ui/pages/Home.tsx

@@ -6,19 +6,19 @@ import {
 	RefreshCw01Icon,
 	SearchMdIcon,
 } from '@untitled-theme/icons-solid';
+import { For, Show, onMount } from 'solid-js';
+import type { Cluster } from '@onelauncher/client/bindings';
+import BannerBackground from '../../assets/images/header.png';
+import Button from '../components/base/Button';
+import TextField from '../components/base/TextField';
+import ClusterRoot from './cluster/ClusterRoot';
 import { bridge } from '~imports';
 
 import ClusterCover from '~ui/components/game/ClusterCover';
 import { useClusterCreator } from '~ui/components/overlay/cluster/ClusterCreationModal';
 import { useLaunchCluster, useRecentCluster } from '~ui/hooks/useCluster';
 import useCommand from '~ui/hooks/useCommand';
 import { formatAsDuration, upperFirst } from '~utils';
-import { For, onMount, Show } from 'solid-js';
-import type { Cluster } from '@onelauncher/client/bindings';
-import BannerBackground from '../../assets/images/header.png';
-import Button from '../components/base/Button';
-import TextField from '../components/base/TextField';
-import ClusterRoot from './cluster/ClusterRoot';
 
 type GroupedClusters = Record<string, Cluster[]>;
 
@@ -72,11 +72,13 @@ function HomePage() {
 
 			<Show
 				children={(
-					<For each={Object.entries(clusters() ?? {})}>
-						{([group, clusters]) => (
-							<ClusterGroup clusters={clusters} title={group} />
-						)}
-					</For>
+					<div class="flex flex-col gap-y-8 pb-8">
+						<For each={Object.entries(clusters() ?? {})}>
+							{([group, clusters]) => (
+								<ClusterGroup clusters={clusters} title={group} />
+							)}
+						</For>
+					</div>
 				)}
 				fallback={(
 					<div class="max-h-64 flex flex-1 flex-col items-center justify-center gap-y-4">

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

@@ -1,13 +1,13 @@
 import { useBeforeLeave } from '@solidjs/router';
+import { type Accessor, Show } from 'solid-js';
+import type { Cluster } from '@onelauncher/client/bindings';
+import { GameSettings, JvmSettings, LauncherSettings, ProcessSettings, createSetting } from '../settings/game/SettingsMinecraft';
 import { bridge } from '~imports';
 import ScrollableContainer from '~ui/components/ScrollableContainer';
 import Sidebar from '~ui/components/Sidebar';
 import useClusterContext from '~ui/hooks/useCluster';
 import { tryResult } from '~ui/hooks/useCommand';
 import useSettings from '~ui/hooks/useSettings';
-import { type Accessor, Show } from 'solid-js';
-import type { Cluster } from '@onelauncher/client/bindings';
-import { createSetting, GameSettings, JvmSettings, LauncherSettings, ProcessSettings } from '../settings/game/SettingsMinecraft';
 
 function ClusterSettings() {
 	const [cluster] = useClusterContext();
@@ -40,6 +40,7 @@ function PageSettings(cluster: Accessor<Cluster>) {
 	const postCommand = createSetting(cluster().init_hooks?.post, settings().init_hooks.post ?? '');
 
 	// JVM
+	const javaVersion = createSetting(cluster().java?.custom_version || null);
 	const javaArgs = createSetting(cluster().java?.custom_arguments, settings().custom_java_args);
 	const envVars = createSetting(cluster().java?.custom_env_arguments, settings().custom_env_args);
 
@@ -61,6 +62,7 @@ function PageSettings(cluster: Accessor<Cluster>) {
 
 			// JVM
 			java: {
+				custom_version: javaVersion.getRaw(),
 				custom_arguments: javaArgs.getRaw(),
 				custom_env_arguments: envVars.getRaw(),
 			},
@@ -94,6 +96,8 @@ function PageSettings(cluster: Accessor<Cluster>) {
 
 			<JvmSettings
 				{...{
+					javaVersion,
+					javaVersions: undefined,
 					javaArgs,
 					envVars,
 				}}

apps/frontend/src/ui/pages/settings/game/SettingsAccounts.tsx

@@ -1,11 +1,11 @@
 import { InfoCircleIcon, Trash01Icon, UserPlus02Icon } from '@untitled-theme/icons-solid';
+import { For, Match, Show, Switch, createSignal, mergeProps } from 'solid-js';
 import Button from '~ui/components/base/Button';
 import Tooltip from '~ui/components/base/Tooltip';
 import PlayerHead from '~ui/components/game/PlayerHead';
 import useAccountController from '~ui/components/overlay/account/AddAccountModal';
 import ScrollableContainer from '~ui/components/ScrollableContainer';
 import Sidebar from '~ui/components/Sidebar';
-import { createSignal, For, Match, mergeProps, Show, Switch } from 'solid-js';
 
 function SettingsAccounts() {
 	const controller = useAccountController();