From 696aba75639a5ef78777ac4de3259f51d3065ee6 Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Mon, 9 Nov 2026 11:45:31 +0000
Subject: [PATCH 1/7] feat: remove the override toggles and use a reset to
 default button in instance settings

---
 .../src/components/ui/JavaSelector.vue        |   2 +-
 .../settings-modal/default-settings-intro.vue |   4 +-
 .../settings-modal/hooks-settings.vue         | 139 ++++----
 .../instances/settings-modal/index.vue        |  43 +++
 .../instance-settings-context.ts              |   2 +
 .../settings-modal/java-settings.vue          | 332 ++++++------------
 .../reset-to-default-button.vue               |  41 +++
 .../synced-options-settings.vue               |   4 +-
 .../use-instance-settings-draft.ts            |  59 ++++
 .../settings-modal/window-settings.vue        | 152 ++++----
 apps/app-frontend/src/helpers/instance.ts     |   4 +
 .../app-frontend/src/locales/ar-SA/index.json |   6 -
 .../app-frontend/src/locales/de-CH/index.json |   6 -
 .../app-frontend/src/locales/de-DE/index.json |   6 -
 .../app-frontend/src/locales/en-US/index.json |  26 +-
 .../src/locales/es-419/index.json             |   6 -
 .../app-frontend/src/locales/es-ES/index.json |   6 -
 .../app-frontend/src/locales/fr-FR/index.json |   6 -
 .../app-frontend/src/locales/hu-HU/index.json |   6 -
 .../app-frontend/src/locales/it-IT/index.json |   6 -
 .../app-frontend/src/locales/ja-JP/index.json |   6 -
 .../app-frontend/src/locales/ko-KR/index.json |   6 -
 .../app-frontend/src/locales/nl-NL/index.json |   6 -
 .../app-frontend/src/locales/pl-PL/index.json |   6 -
 .../app-frontend/src/locales/pt-BR/index.json |   6 -
 .../app-frontend/src/locales/ru-RU/index.json |   6 -
 .../app-frontend/src/locales/sv-SE/index.json |   3 -
 .../app-frontend/src/locales/tr-TR/index.json |   6 -
 .../app-frontend/src/locales/uk-UA/index.json |   6 -
 .../app-frontend/src/locales/vi-VN/index.json |   6 -
 .../app-frontend/src/locales/zh-CN/index.json |   6 -
 .../app-frontend/src/locales/zh-TW/index.json |   6 -
 apps/app/build.rs                             |   1 +
 apps/app/src/api/instance.rs                  |   8 +
 packages/app-lib/src/api/instance.rs          |   2 +-
 packages/app-lib/src/api/instance/install.rs  |  35 +-
 packages/app-lib/src/launcher/mod.rs          |  12 +-
 37 files changed, 466 insertions(+), 517 deletions(-)
 create mode 100644 apps/app-frontend/src/features/instances/settings-modal/reset-to-default-button.vue
 create mode 100644 apps/app-frontend/src/features/instances/settings-modal/use-instance-settings-draft.ts

diff --git a/apps/app-frontend/src/components/ui/JavaSelector.vue b/apps/app-frontend/src/components/ui/JavaSelector.vue
index ff0631397e4..5f7b42e330e 100644
--- a/apps/app-frontend/src/components/ui/JavaSelector.vue
+++ b/apps/app-frontend/src/components/ui/JavaSelector.vue
@@ -215,7 +215,7 @@ async function handleJavaFileInput() {
 		if (!result) {
 			result = {
 				path: filePath.path ?? filePath,
-				version: props.version.toString(),
+				version: props.version?.toString() ?? '',
 				parsed_version: props.version,
 				architecture: 'x86',
 			}
diff --git a/apps/app-frontend/src/features/instances/settings-modal/default-settings-intro.vue b/apps/app-frontend/src/features/instances/settings-modal/default-settings-intro.vue
index c9e638e67ce..ef664c45ee7 100644
--- a/apps/app-frontend/src/features/instances/settings-modal/default-settings-intro.vue
+++ b/apps/app-frontend/src/features/instances/settings-modal/default-settings-intro.vue
@@ -30,7 +30,9 @@ function showDefaultSettings() {
 </script>
 
 <template>
-	<div class="flex items-center justify-between gap-4">
+	<div
+		class="flex items-center justify-between gap-4 border-0 border-b border-solid border-surface-5 pb-6"
+	>
 		<p class="m-0 min-w-0 text-secondary">{{ description }}</p>
 		<Button class="shrink-0" @click="showDefaultSettings">
 			<Settings2Icon />
diff --git a/apps/app-frontend/src/features/instances/settings-modal/hooks-settings.vue b/apps/app-frontend/src/features/instances/settings-modal/hooks-settings.vue
index 8f304fd9d3b..4223a5a4923 100644
--- a/apps/app-frontend/src/features/instances/settings-modal/hooks-settings.vue
+++ b/apps/app-frontend/src/features/instances/settings-modal/hooks-settings.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
-import { defineMessages, injectNotificationManager, Input, Toggle, useVIntl } from '@modrinth/ui'
-import { computed, ref, watch } from 'vue'
+import { defineMessages, injectNotificationManager, Input, useVIntl } from '@modrinth/ui'
 
 import { edit } from '@/helpers/instance'
 import { get } from '@/helpers/settings.ts'
@@ -8,6 +7,8 @@ import type { AppSettings } from '@/helpers/types'
 
 import DefaultSettingsIntro from './default-settings-intro.vue'
 import { injectInstanceSettings } from './instance-settings-context'
+import ResetToDefaultButton from './reset-to-default-button.vue'
+import { useInstanceSettingsDraft } from './use-instance-settings-draft'
 
 const { handleError } = injectNotificationManager()
 const { formatMessage } = useVIntl()
@@ -16,58 +17,40 @@ const { instance } = injectInstanceSettings()
 
 const globalSettings = (await get().catch(handleError)) as AppSettings
 
-const hasCustomHooks =
-	!!instance.value.hooks.pre_launch ||
-	!!instance.value.hooks.wrapper ||
-	!!instance.value.hooks.post_exit
-const overrideHooks = ref(hasCustomHooks)
-const hooksRaw = hasCustomHooks ? instance.value.hooks : globalSettings.hooks
-const hooks = ref({
-	pre_launch: hooksRaw.pre_launch ?? '',
-	wrapper: hooksRaw.wrapper ?? '',
-	post_exit: hooksRaw.post_exit ?? '',
-})
-
-watch(overrideHooks, (enabled) => {
-	if (!enabled) {
-		hooks.value = {
-			pre_launch: globalSettings.hooks.pre_launch ?? '',
-			wrapper: globalSettings.hooks.wrapper ?? '',
-			post_exit: globalSettings.hooks.post_exit ?? '',
-		}
-	}
-})
+type HookKey = 'pre_launch' | 'wrapper' | 'post_exit'
 
-const editInstanceObject = computed(() => ({
-	hooks: overrideHooks.value
-		? {
-				pre_launch: hooks.value.pre_launch ?? '',
-				wrapper: hooks.value.wrapper ?? '',
-				post_exit: hooks.value.post_exit ?? '',
-			}
-		: {
-				pre_launch: '',
-				wrapper: '',
-				post_exit: '',
+const defaultHooks: Record<HookKey, string> = {
+	pre_launch: globalSettings.hooks.pre_launch ?? '',
+	wrapper: globalSettings.hooks.wrapper ?? '',
+	post_exit: globalSettings.hooks.post_exit ?? '',
+}
+const { draft: hooks } = useInstanceSettingsDraft<Record<HookKey, string>>(
+	{
+		pre_launch: instance.value.hooks.pre_launch || defaultHooks.pre_launch,
+		wrapper: instance.value.hooks.wrapper || defaultHooks.wrapper,
+		post_exit: instance.value.hooks.post_exit || defaultHooks.post_exit,
+	},
+	(value) => {
+		const override = (key: HookKey) => (value[key] !== defaultHooks[key] ? value[key] : '')
+		return edit(instance.value.id, {
+			hooks: {
+				pre_launch: override('pre_launch'),
+				wrapper: override('wrapper'),
+				post_exit: override('post_exit'),
 			},
-}))
-
-watch(
-	[overrideHooks, hooks],
-	async () => {
-		await edit(instance.value.id, editInstanceObject.value).catch(handleError)
+		})
 	},
-	{ deep: true },
 )
+
+function hookOverridden(key: HookKey) {
+	return hooks.value[key] !== defaultHooks[key]
+}
+
 const messages = defineMessages({
 	defaultSettingsDescription: {
 		id: 'instance.settings.tabs.hooks.default-settings-description',
 		defaultMessage: 'Your instance uses the default launch hooks unless you override them here.',
 	},
-	hooks: {
-		id: 'instance.settings.tabs.hooks.title',
-		defaultMessage: 'Custom game launch hooks',
-	},
 	hookVariablesDescription: {
 		id: 'instance.settings.tabs.hooks.variables.description',
 		defaultMessage:
@@ -142,62 +125,78 @@ const messages = defineMessages({
 			tab="hooks"
 			:description="formatMessage(messages.defaultSettingsDescription)"
 		/>
-		<div
-			class="flex items-center justify-between gap-4 border-0 border-b border-solid border-surface-5 pb-6"
-		>
-			<label for="override-launch-hooks" class="text-lg font-semibold text-contrast">
-				{{ formatMessage(messages.hooks) }}
-			</label>
-			<Toggle id="override-launch-hooks" v-model="overrideHooks" />
-		</div>
 
-		<div :class="{ 'opacity-50': !overrideHooks }">
-			<h2 class="m-0 text-lg font-semibold text-contrast">
-				{{ formatMessage(messages.preLaunch) }}
-			</h2>
+		<section class="flex flex-col gap-2.5">
+			<div class="flex items-center justify-between gap-4">
+				<h2 class="m-0 min-w-0 text-lg font-semibold text-contrast">
+					{{ formatMessage(messages.preLaunch) }}
+				</h2>
+				<ResetToDefaultButton
+					:disabled="!hookOverridden('pre_launch')"
+					:setting="formatMessage(messages.preLaunch)"
+					@reset="hooks.pre_launch = defaultHooks.pre_launch"
+				/>
+			</div>
 			<Input
 				id="pre-launch"
 				v-model="hooks.pre_launch"
 				autocomplete="off"
-				:disabled="!overrideHooks"
 				:placeholder="formatMessage(messages.preLaunchEnter)"
-				wrapper-class="w-full my-2.5"
+				wrapper-class="w-full"
 			/>
 			<p class="m-0">
 				{{ formatMessage(messages.preLaunchDescription) }}
 			</p>
+		</section>
 
-			<h2 class="mt-6 m-0 text-lg font-semibold text-contrast">
-				{{ formatMessage(messages.wrapper) }}
-			</h2>
+		<section class="flex flex-col gap-2.5">
+			<div class="flex items-center justify-between gap-4">
+				<h2 class="m-0 min-w-0 text-lg font-semibold text-contrast">
+					{{ formatMessage(messages.wrapper) }}
+				</h2>
+				<ResetToDefaultButton
+					:disabled="!hookOverridden('wrapper')"
+					:setting="formatMessage(messages.wrapper)"
+					@reset="hooks.wrapper = defaultHooks.wrapper"
+				/>
+			</div>
 			<Input
 				id="wrapper"
 				v-model="hooks.wrapper"
 				autocomplete="off"
-				:disabled="!overrideHooks"
 				:placeholder="formatMessage(messages.wrapperEnter)"
-				wrapper-class="w-full my-2.5"
+				wrapper-class="w-full"
 			/>
 			<p class="m-0">
 				{{ formatMessage(messages.wrapperDescription) }}
 			</p>
+		</section>
 
-			<h2 class="mt-6 m-0 text-lg font-semibold text-contrast">
-				{{ formatMessage(messages.postExit) }}
-			</h2>
+		<section class="flex flex-col gap-2.5">
+			<div class="flex items-center justify-between gap-4">
+				<h2 class="m-0 min-w-0 text-lg font-semibold text-contrast">
+					{{ formatMessage(messages.postExit) }}
+				</h2>
+				<ResetToDefaultButton
+					:disabled="!hookOverridden('post_exit')"
+					:setting="formatMessage(messages.postExit)"
+					@reset="hooks.post_exit = defaultHooks.post_exit"
+				/>
+			</div>
 			<Input
 				id="post-exit"
 				v-model="hooks.post_exit"
 				autocomplete="off"
-				:disabled="!overrideHooks"
 				:placeholder="formatMessage(messages.postExitEnter)"
-				wrapper-class="w-full my-2.5"
+				wrapper-class="w-full"
 			/>
 			<p class="m-0">
 				{{ formatMessage(messages.postExitDescription) }}
 			</p>
+		</section>
 
-			<div class="m-0 mt-6">
+		<div>
+			<div class="m-0">
 				{{ formatMessage(messages.hookVariablesDescription) }}
 			</div>
 			<ul class="m-0 mt-2">
diff --git a/apps/app-frontend/src/features/instances/settings-modal/index.vue b/apps/app-frontend/src/features/instances/settings-modal/index.vue
index 3a33466e291..df0944234d7 100644
--- a/apps/app-frontend/src/features/instances/settings-modal/index.vue
+++ b/apps/app-frontend/src/features/instances/settings-modal/index.vue
@@ -16,12 +16,14 @@ import {
 	defineMessages,
 	TabbedModal,
 	type TabbedModalTab,
+	UnsavedChangesPopup,
 	useVIntl,
 } from '@modrinth/ui'
 import type { PlatformTag } from '@modrinth/utils'
 import { useQuery, useQueryClient } from '@tanstack/vue-query'
 import { computed, ref, watch } from 'vue'
 
+import type { UnsavedChangesController } from '@/features/settings/app-settings-modal/context'
 import { get_project_v3 } from '@/helpers/cache'
 import { get_linked_modpack_info, getInstanceIconUrl } from '@/helpers/instance'
 import { get_loader_versions } from '@/helpers/metadata'
@@ -66,12 +68,39 @@ function handleAfterHide() {
 	callback?.()
 }
 
+const unsavedChangesPopup = ref<{ nudge: () => void } | null>(null)
+const unsavedChangesController = ref<UnsavedChangesController | null>(null)
+const emptyUnsavedChangesState: Record<string, unknown> = {}
+const originalUnsavedChangesState = computed(
+	() => unsavedChangesController.value?.getOriginal() ?? emptyUnsavedChangesState,
+)
+const modifiedUnsavedChangesState = computed(
+	() => unsavedChangesController.value?.getModified() ?? emptyUnsavedChangesState,
+)
+const savingUnsavedChanges = computed(() => unsavedChangesController.value?.isSaving() ?? false)
+const hasUnsavedChanges = computed(
+	() =>
+		(unsavedChangesController.value?.hasChanges() ?? false) ||
+		(unsavedChangesController.value?.isSaving() ?? false),
+)
+
+function canLeaveCurrentTab(): boolean {
+	if (!hasUnsavedChanges.value) return true
+	unsavedChangesPopup.value?.nudge()
+	return false
+}
+
+function registerUnsavedChangesController(controller: UnsavedChangesController | null): void {
+	unsavedChangesController.value = controller
+}
+
 provideInstanceSettings({
 	instance: instanceRef,
 	offline: props.offline,
 	isMinecraftServer,
 	onUnlinked: handleUnlinked,
 	closeModal: hide,
+	registerUnsavedChangesController,
 })
 
 watch(
@@ -234,6 +263,9 @@ defineExpose({ show, hide })
 		:tabs="tabs"
 		:header="formatMessage(commonMessages.settingsLabel)"
 		:on-after-hide="handleAfterHide"
+		:before-hide="canLeaveCurrentTab"
+		:before-tab-change="canLeaveCurrentTab"
+		:floating-action-bar-shown="hasUnsavedChanges"
 	>
 		<template #breadcrumb>
 			<Avatar
@@ -244,5 +276,16 @@ defineExpose({ show, hide })
 			/>
 			<span class="truncate">{{ instance.name }}</span>
 		</template>
+		<template #floating-action-bar>
+			<UnsavedChangesPopup
+				ref="unsavedChangesPopup"
+				:original="originalUnsavedChangesState"
+				:modified="modifiedUnsavedChangesState"
+				:saving="savingUnsavedChanges"
+				inline
+				@reset="unsavedChangesController?.reset()"
+				@save="unsavedChangesController?.save()"
+			/>
+		</template>
 	</TabbedModal>
 </template>
diff --git a/apps/app-frontend/src/features/instances/settings-modal/instance-settings-context.ts b/apps/app-frontend/src/features/instances/settings-modal/instance-settings-context.ts
index 543fd810522..6409d1d4f05 100644
--- a/apps/app-frontend/src/features/instances/settings-modal/instance-settings-context.ts
+++ b/apps/app-frontend/src/features/instances/settings-modal/instance-settings-context.ts
@@ -1,6 +1,7 @@
 import { createContext } from '@modrinth/ui'
 import type { ComputedRef, Ref } from 'vue'
 
+import type { UnsavedChangesController } from '@/features/settings/app-settings-modal/context'
 import type { GameInstance } from '@/helpers/types'
 
 export interface InstanceSettingsContext {
@@ -9,6 +10,7 @@ export interface InstanceSettingsContext {
 	isMinecraftServer: Ref<boolean>
 	onUnlinked: () => void
 	closeModal?: (onAfterClose?: () => void) => void
+	registerUnsavedChangesController: (controller: UnsavedChangesController | null) => void
 }
 
 export const [injectInstanceSettings, provideInstanceSettings] =
diff --git a/apps/app-frontend/src/features/instances/settings-modal/java-settings.vue b/apps/app-frontend/src/features/instances/settings-modal/java-settings.vue
index 0a0715cb667..e9b3373f212 100644
--- a/apps/app-frontend/src/features/instances/settings-modal/java-settings.vue
+++ b/apps/app-frontend/src/features/instances/settings-modal/java-settings.vue
@@ -1,13 +1,4 @@
 <script setup lang="ts">
-import {
-	CheckCircleIcon,
-	CoffeeIcon,
-	FolderSearchIcon,
-	RefreshCwIcon,
-	SearchIcon,
-	SpinnerIcon,
-	XCircleIcon,
-} from '@modrinth/assets'
 import {
 	Button,
 	commonMessages,
@@ -15,21 +6,21 @@ import {
 	injectNotificationManager,
 	Input,
 	Slider,
-	Toggle,
 	useVIntl,
 } from '@modrinth/ui'
-import { open } from '@tauri-apps/plugin-dialog'
-import { computed, readonly, ref, watch } from 'vue'
+import { computed } from 'vue'
 
-import JavaDetectionModal from '@/components/ui/JavaDetectionModal.vue'
-import useJavaTest from '@/composables/useJavaTest'
+import JavaSelector from '@/components/ui/JavaSelector.vue'
 import useMemorySlider from '@/composables/useMemorySlider'
-import { edit, get_optimal_jre_key } from '@/helpers/instance'
+import { edit, get_recommended_java_version } from '@/helpers/instance'
+import { get_java_versions } from '@/helpers/jre'
 import { get, parseEnvVars, serializeEnvVars } from '@/helpers/settings.ts'
 import type { AppSettings } from '@/helpers/types'
 
 import DefaultSettingsIntro from './default-settings-intro.vue'
 import { injectInstanceSettings } from './instance-settings-context'
+import ResetToDefaultButton from './reset-to-default-button.vue'
+import { useInstanceSettingsDraft } from './use-instance-settings-draft'
 
 const { handleError } = injectNotificationManager()
 const { formatMessage } = useVIntl()
@@ -38,121 +29,65 @@ const { instance } = injectInstanceSettings()
 
 const globalSettings = (await get().catch(handleError)) as unknown as AppSettings
 
-const optimalJava = readonly(await get_optimal_jre_key(instance.value.id).catch(handleError))
-
-const overrideJavaInstall = ref(!!instance.value.java_path)
-const javaPath = ref(instance.value.java_path ?? optimalJava?.path ?? '')
-
-const activePath = computed(() => javaPath.value)
-const javaTestPath = computed(() => (overrideJavaInstall.value ? javaPath.value : ''))
+const [recommendedJavaVersion, javaVersions] = await Promise.all([
+	get_recommended_java_version(instance.value.id).catch(handleError),
+	get_java_versions().catch(handleError),
+])
 
-watch(overrideJavaInstall, (enabled) => {
-	if (enabled && !javaPath.value) {
-		javaPath.value = optimalJava?.path ?? ''
-	} else if (!enabled) {
-		javaPath.value = optimalJava?.path ?? ''
-	}
-})
-
-const { testingJava, javaTestResult, testJavaInstallationDebounced, testJavaInstallation } =
-	useJavaTest()
+const defaultJavaPath: string =
+	(recommendedJavaVersion ? javaVersions?.[recommendedJavaVersion]?.path : undefined) ?? ''
+const defaultJavaArgs = globalSettings.extra_launch_args.join(' ')
+const defaultEnvVars = serializeEnvVars(globalSettings.custom_env_vars)
+const defaultMemory = globalSettings.memory.maximum
 
-const hoveringTest = ref(false)
-let hasInitialized = false
+function normalizeJavaPath(path: string) {
+	return path.replace('java.exe', 'javaw.exe')
+}
 
-watch(
-	javaTestPath,
-	(newPath) => {
-		if (newPath) {
-			if (!hasInitialized) {
-				testJavaInstallation(newPath, null, false)
-				hasInitialized = true
-			} else {
-				testJavaInstallationDebounced(newPath, null)
-			}
-		}
-	},
-	{ immediate: true },
-)
+function parseJavaArgs(input: string) {
+	return input.trim().split(/\s+/).filter(Boolean)
+}
 
-const javaDetectionModal = ref<{ show: (version: number | null, current: object) => void } | null>(
-	null,
-)
+function isJavaPathOverridden(path: string) {
+	return normalizeJavaPath(path) !== normalizeJavaPath(defaultJavaPath)
+}
 
-async function handleBrowseJava() {
-	const result = await open({ multiple: false })
-	if (result) {
-		javaPath.value = result
-	}
+function isJavaArgsOverridden(args: string) {
+	return parseJavaArgs(args).join(' ') !== parseJavaArgs(defaultJavaArgs).join(' ')
 }
 
-function handleDetectJava() {
-	javaDetectionModal.value?.show(null, { path: javaPath.value })
+function isEnvVarsOverridden(envVars: string) {
+	return serializeEnvVars(parseEnvVars(envVars)) !== defaultEnvVars
 }
 
-const overrideJavaArgs = ref((instance.value.extra_launch_args?.length ?? 0) > 0)
-const javaArgs = ref(
-	(instance.value.extra_launch_args ?? globalSettings.extra_launch_args).join(' '),
+const { draft } = useInstanceSettingsDraft(
+	{
+		javaPath: instance.value.java_path ?? defaultJavaPath,
+		javaArgs: (instance.value.extra_launch_args ?? globalSettings.extra_launch_args).join(' '),
+		envVars: serializeEnvVars(instance.value.custom_env_vars ?? globalSettings.custom_env_vars),
+		memory: instance.value.memory?.maximum ?? defaultMemory,
+	},
+	(value) =>
+		edit(instance.value.id, {
+			java_path:
+				isJavaPathOverridden(value.javaPath) && value.javaPath
+					? normalizeJavaPath(value.javaPath)
+					: null,
+			extra_launch_args: isJavaArgsOverridden(value.javaArgs)
+				? parseJavaArgs(value.javaArgs)
+				: null,
+			custom_env_vars: isEnvVarsOverridden(value.envVars) ? parseEnvVars(value.envVars) : null,
+			memory: value.memory !== defaultMemory ? { maximum: value.memory } : null,
+		}),
 )
 
-const overrideEnvVars = ref((instance.value.custom_env_vars?.length ?? 0) > 0)
-const envVars = ref(
-	serializeEnvVars(instance.value.custom_env_vars ?? globalSettings.custom_env_vars),
-)
+const javaPathOverridden = computed(() => isJavaPathOverridden(draft.value.javaPath))
+const javaArgsOverridden = computed(() => isJavaArgsOverridden(draft.value.javaArgs))
+const envVarsOverridden = computed(() => isEnvVarsOverridden(draft.value.envVars))
+const memoryOverridden = computed(() => draft.value.memory !== defaultMemory)
 
-const overrideMemorySettings = ref(!!instance.value.memory)
-const memory = ref({ ...(instance.value.memory ?? globalSettings.memory) })
 const { maxMemory, snapPoints, memoryQuery } = useMemorySlider()
 
-watch(overrideJavaArgs, (enabled) => {
-	if (!enabled) {
-		javaArgs.value = globalSettings.extra_launch_args.join(' ')
-	}
-})
-
-watch(overrideEnvVars, (enabled) => {
-	if (!enabled) {
-		envVars.value = serializeEnvVars(globalSettings.custom_env_vars)
-	}
-})
-
-watch(overrideMemorySettings, (enabled) => {
-	if (!enabled) {
-		memory.value = { ...globalSettings.memory }
-	}
-})
-
-const editInstanceObject = computed(() => {
-	return {
-		java_path:
-			overrideJavaInstall.value && javaPath.value
-				? javaPath.value.replace('java.exe', 'javaw.exe')
-				: null,
-		extra_launch_args: overrideJavaArgs.value
-			? javaArgs.value.trim().split(/\s+/).filter(Boolean)
-			: null,
-		custom_env_vars: overrideEnvVars.value ? parseEnvVars(envVars.value) : null,
-		memory: overrideMemorySettings.value ? memory.value : null,
-	}
-})
-
-watch(
-	[
-		overrideJavaInstall,
-		javaPath,
-		overrideJavaArgs,
-		javaArgs,
-		overrideEnvVars,
-		envVars,
-		overrideMemorySettings,
-		memory,
-	],
-	async () => {
-		await edit(instance.value.id, editInstanceObject.value).catch(handleError)
-	},
-	{ deep: true },
-)
-
 const messages = defineMessages({
 	defaultSettingsDescription: {
 		id: 'instance.settings.tabs.java.default-settings-description',
@@ -161,7 +96,11 @@ const messages = defineMessages({
 	},
 	javaInstallation: {
 		id: 'instance.settings.tabs.java.java-installation',
-		defaultMessage: 'Custom Java installation',
+		defaultMessage: 'Java installation',
+	},
+	recommendedJavaVersion: {
+		id: 'instance.settings.tabs.java.recommended-java-version',
+		defaultMessage: 'Java {version} is recommended for the Minecraft version of this instance.',
 	},
 	javaPathPlaceholder: {
 		id: 'instance.settings.tabs.java.java-path-placeholder',
@@ -169,11 +108,11 @@ const messages = defineMessages({
 	},
 	javaMemory: {
 		id: 'instance.settings.tabs.java.java-memory',
-		defaultMessage: 'Custom memory allocation',
+		defaultMessage: 'Memory allocation',
 	},
 	javaArguments: {
 		id: 'instance.settings.tabs.java.java-arguments',
-		defaultMessage: 'Custom Java arguments',
+		defaultMessage: 'Java arguments',
 	},
 	enterJavaArguments: {
 		id: 'instance.settings.tabs.java.enter-java-arguments',
@@ -181,7 +120,7 @@ const messages = defineMessages({
 	},
 	javaEnvironmentVariables: {
 		id: 'instance.settings.tabs.java.environment-variables',
-		defaultMessage: 'Custom environment variables',
+		defaultMessage: 'Environment variables',
 	},
 	enterEnvironmentVariables: {
 		id: 'instance.settings.tabs.java.enter-environment-variables',
@@ -196,7 +135,6 @@ const messages = defineMessages({
 
 <template>
 	<div class="flex flex-col gap-6">
-		<JavaDetectionModal ref="javaDetectionModal" @submit="(val) => (javaPath = val.path)" />
 		<DefaultSettingsIntro
 			tab="java"
 			:description="formatMessage(messages.defaultSettingsDescription)"
@@ -204,19 +142,20 @@ const messages = defineMessages({
 
 		<section class="flex flex-col">
 			<div class="flex items-center justify-between gap-4">
-				<div class="flex min-w-0 flex-col gap-1">
-					<h2 class="m-0 text-lg font-semibold text-contrast">
-						{{ formatMessage(messages.javaMemory) }}
-					</h2>
-				</div>
-				<Toggle id="override-memory-allocation" v-model="overrideMemorySettings" />
+				<h2 class="m-0 min-w-0 text-lg font-semibold text-contrast">
+					{{ formatMessage(messages.javaMemory) }}
+				</h2>
+				<ResetToDefaultButton
+					:disabled="!memoryOverridden"
+					:setting="formatMessage(messages.javaMemory)"
+					@reset="draft.memory = defaultMemory"
+				/>
 			</div>
 			<div class="pt-3">
 				<Slider
 					v-if="maxMemory"
 					id="max-memory"
-					v-model="memory.maximum"
-					:disabled="!overrideMemorySettings"
+					v-model="draft.memory"
 					:min="512"
 					:max="maxMemory"
 					:step="64"
@@ -244,106 +183,44 @@ const messages = defineMessages({
 					<h2 class="m-0 text-lg font-semibold text-contrast">
 						{{ formatMessage(messages.javaInstallation) }}
 					</h2>
+					<p v-if="recommendedJavaVersion" class="m-0 text-secondary">
+						{{
+							formatMessage(messages.recommendedJavaVersion, { version: recommendedJavaVersion })
+						}}
+					</p>
 				</div>
-				<Toggle id="override-java-installation" v-model="overrideJavaInstall" />
+				<ResetToDefaultButton
+					:disabled="!javaPathOverridden"
+					:setting="formatMessage(messages.javaInstallation)"
+					@reset="draft.javaPath = defaultJavaPath"
+				/>
 			</div>
-			<div class="pt-3" :class="{ 'opacity-50': !overrideJavaInstall }">
-				<div class="flex gap-4 rounded-2xl bg-bg p-4">
-					<div class="flex gap-3 items-start flex-1 min-w-0">
-						<div
-							class="w-10 h-10 flex items-center justify-center rounded-full bg-button-bg border-solid border-[1px] border-button-border p-2 mt-1 shrink-0 [&_svg]:h-full [&_svg]:w-full"
-						>
-							<CoffeeIcon />
-						</div>
-						<div class="flex flex-col gap-2 flex-1 min-w-0">
-							<div class="flex gap-2 items-center">
-								<Input
-									:model-value="activePath"
-									autocomplete="off"
-									:disabled="!overrideJavaInstall"
-									:placeholder="formatMessage(messages.javaPathPlaceholder)"
-									wrapper-class="flex-1 min-w-0"
-									@update:model-value="(val) => (javaPath = String(val))"
-								/>
-								<Button
-									type="quiet"
-									:color="
-										overrideJavaInstall && !hoveringTest && !testingJava
-											? javaTestResult === true
-												? 'green'
-												: 'red'
-											: undefined
-									"
-									:disabled="!overrideJavaInstall || testingJava"
-									:style="{
-										'--legacy-button-color':
-											(overrideJavaInstall && !hoveringTest && !testingJava
-												? javaTestResult === true
-													? 'green'
-													: 'red'
-												: 'standard') &&
-											(overrideJavaInstall && !hoveringTest && !testingJava
-												? javaTestResult === true
-													? 'green'
-													: 'red'
-												: 'standard') !== 'standard'
-												? `var(--color-${
-														overrideJavaInstall && !hoveringTest && !testingJava
-															? javaTestResult === true
-																? 'green'
-																: 'red'
-															: 'standard'
-													})`
-												: undefined,
-									}"
-									class="!text-[var(--legacy-button-color,var(--color-base))] [&>svg]:!text-[var(--legacy-button-color,var(--color-primary))]"
-									@click="testJavaInstallation(activePath, null, true)"
-									@mouseenter="hoveringTest = true"
-									@mouseleave="hoveringTest = false"
-								>
-									<SpinnerIcon v-if="testingJava" class="animate-spin h-4 w-4" />
-									<CheckCircleIcon
-										v-else-if="overrideJavaInstall && javaTestResult === true && !hoveringTest"
-										class="h-4 w-4"
-									/>
-									<XCircleIcon
-										v-else-if="overrideJavaInstall && javaTestResult !== true && !hoveringTest"
-										class="h-4 w-4"
-									/>
-									<RefreshCwIcon v-else class="h-4 w-4" />
-								</Button>
-							</div>
-							<div class="flex gap-2">
-								<Button :disabled="!overrideJavaInstall" @click="handleDetectJava">
-									<SearchIcon />
-									Detect
-								</Button>
-								<Button :disabled="!overrideJavaInstall" @click="handleBrowseJava">
-									<FolderSearchIcon />
-									Browse
-								</Button>
-							</div>
-						</div>
-					</div>
-				</div>
+			<div class="pt-3">
+				<JavaSelector
+					id="java-installation"
+					:model-value="{ path: draft.javaPath }"
+					:placeholder="formatMessage(messages.javaPathPlaceholder)"
+					@update:model-value="(val) => (draft.javaPath = val?.path ?? '')"
+				/>
 			</div>
 		</section>
 
 		<section class="flex flex-col">
 			<div class="flex items-center justify-between gap-4">
-				<div class="flex min-w-0 flex-col gap-1">
-					<h2 class="m-0 text-lg font-semibold text-contrast">
-						{{ formatMessage(messages.javaArguments) }}
-					</h2>
-				</div>
-				<Toggle id="override-java-arguments" v-model="overrideJavaArgs" />
+				<h2 class="m-0 min-w-0 text-lg font-semibold text-contrast">
+					{{ formatMessage(messages.javaArguments) }}
+				</h2>
+				<ResetToDefaultButton
+					:disabled="!javaArgsOverridden"
+					:setting="formatMessage(messages.javaArguments)"
+					@reset="draft.javaArgs = defaultJavaArgs"
+				/>
 			</div>
-			<div class="pt-3" :class="{ 'opacity-50': !overrideJavaArgs }">
+			<div class="pt-3">
 				<Input
 					id="java-args"
-					v-model="javaArgs"
+					v-model="draft.javaArgs"
 					autocomplete="off"
-					:disabled="!overrideJavaArgs"
 					:placeholder="formatMessage(messages.enterJavaArguments)"
 					wrapper-class="w-full"
 				/>
@@ -352,19 +229,20 @@ const messages = defineMessages({
 
 		<section class="flex flex-col">
 			<div class="flex items-center justify-between gap-4">
-				<div class="flex min-w-0 flex-col gap-1">
-					<h2 class="m-0 text-lg font-semibold text-contrast">
-						{{ formatMessage(messages.javaEnvironmentVariables) }}
-					</h2>
-				</div>
-				<Toggle id="override-environment-variables" v-model="overrideEnvVars" />
+				<h2 class="m-0 min-w-0 text-lg font-semibold text-contrast">
+					{{ formatMessage(messages.javaEnvironmentVariables) }}
+				</h2>
+				<ResetToDefaultButton
+					:disabled="!envVarsOverridden"
+					:setting="formatMessage(messages.javaEnvironmentVariables)"
+					@reset="draft.envVars = defaultEnvVars"
+				/>
 			</div>
-			<div class="pt-3" :class="{ 'opacity-50': !overrideEnvVars }">
+			<div class="pt-3">
 				<Input
 					id="env-vars"
-					v-model="envVars"
+					v-model="draft.envVars"
 					autocomplete="off"
-					:disabled="!overrideEnvVars"
 					:placeholder="formatMessage(messages.enterEnvironmentVariables)"
 					wrapper-class="w-full"
 				/>
diff --git a/apps/app-frontend/src/features/instances/settings-modal/reset-to-default-button.vue b/apps/app-frontend/src/features/instances/settings-modal/reset-to-default-button.vue
new file mode 100644
index 00000000000..440a87ebdc0
--- /dev/null
+++ b/apps/app-frontend/src/features/instances/settings-modal/reset-to-default-button.vue
@@ -0,0 +1,41 @@
+<script setup lang="ts">
+import { RotateCounterClockwiseIcon } from '@modrinth/assets'
+import { defineMessages, IconButton, useVIntl } from '@modrinth/ui'
+
+defineProps<{ disabled: boolean; setting: string }>()
+const emit = defineEmits<{ reset: [] }>()
+
+const { formatMessage } = useVIntl()
+
+const messages = defineMessages({
+	tooltip: {
+		id: 'instance.settings.reset-to-default',
+		defaultMessage: 'Reset to default',
+	},
+	usingDefaults: {
+		id: 'instance.settings.using-defaults',
+		defaultMessage: 'Using defaults',
+	},
+	label: {
+		id: 'instance.settings.reset-setting-to-default',
+		defaultMessage: 'Reset {setting} to default',
+	},
+})
+</script>
+
+<template>
+	<span
+		v-tooltip="formatMessage(disabled ? messages.usingDefaults : messages.tooltip)"
+		class="flex shrink-0"
+	>
+		<IconButton
+			type="outlined"
+			size="sm"
+			:disabled="disabled"
+			:label="formatMessage(messages.label, { setting })"
+			@click="emit('reset')"
+		>
+			<RotateCounterClockwiseIcon aria-hidden="true" />
+		</IconButton>
+	</span>
+</template>
diff --git a/apps/app-frontend/src/features/instances/settings-modal/synced-options-settings.vue b/apps/app-frontend/src/features/instances/settings-modal/synced-options-settings.vue
index 7670716ef07..cf4db688ee0 100644
--- a/apps/app-frontend/src/features/instances/settings-modal/synced-options-settings.vue
+++ b/apps/app-frontend/src/features/instances/settings-modal/synced-options-settings.vue
@@ -559,7 +559,9 @@ function resolveHotbars(resolution: SyncedOptionJoinResolution) {
 			</template>
 		</NewModal>
 
-		<div class="flex items-center justify-between gap-4">
+		<div
+			class="flex items-center justify-between gap-4 border-0 border-b border-solid border-surface-5 pb-6"
+		>
 			<p class="m-0 text-secondary">
 				{{ formatMessage(messages.sharedSettingsDescription) }}
 			</p>
diff --git a/apps/app-frontend/src/features/instances/settings-modal/use-instance-settings-draft.ts b/apps/app-frontend/src/features/instances/settings-modal/use-instance-settings-draft.ts
new file mode 100644
index 00000000000..772eedbea4e
--- /dev/null
+++ b/apps/app-frontend/src/features/instances/settings-modal/use-instance-settings-draft.ts
@@ -0,0 +1,59 @@
+import { injectNotificationManager } from '@modrinth/ui'
+import { onBeforeUnmount, onMounted, type Ref, ref } from 'vue'
+
+import { injectInstanceSettings } from './instance-settings-context'
+
+function clone<T>(value: T): T {
+	return JSON.parse(JSON.stringify(value))
+}
+
+export function useInstanceSettingsDraft<T extends Record<string, unknown>>(
+	initial: T,
+	persist: (value: T) => Promise<void>,
+) {
+	const { handleError } = injectNotificationManager()
+	const { registerUnsavedChangesController } = injectInstanceSettings()
+
+	const original = ref(clone(initial)) as Ref<T>
+	const draft = ref(clone(initial)) as Ref<T>
+	const saving = ref(false)
+
+	function hasChanges() {
+		return JSON.stringify(original.value) !== JSON.stringify(draft.value)
+	}
+
+	function reset() {
+		draft.value = clone(original.value)
+	}
+
+	async function save() {
+		if (saving.value) return
+		saving.value = true
+		const value = clone(draft.value)
+		try {
+			await persist(value)
+			original.value = value
+		} catch (error) {
+			handleError(error as Error)
+		} finally {
+			saving.value = false
+		}
+	}
+
+	onMounted(() => {
+		registerUnsavedChangesController({
+			hasChanges,
+			getOriginal: () => original.value,
+			getModified: () => draft.value,
+			isSaving: () => saving.value,
+			reset,
+			save,
+		})
+	})
+
+	onBeforeUnmount(() => {
+		registerUnsavedChangesController(null)
+	})
+
+	return { draft }
+}
diff --git a/apps/app-frontend/src/features/instances/settings-modal/window-settings.vue b/apps/app-frontend/src/features/instances/settings-modal/window-settings.vue
index 0c65199214e..90fe4d38694 100644
--- a/apps/app-frontend/src/features/instances/settings-modal/window-settings.vue
+++ b/apps/app-frontend/src/features/instances/settings-modal/window-settings.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { defineMessages, injectNotificationManager, Input, Toggle, useVIntl } from '@modrinth/ui'
-import { computed, type Ref, ref, watch } from 'vue'
+import { computed } from 'vue'
 
 import { edit } from '@/helpers/instance'
 import { get } from '@/helpers/settings.ts'
@@ -8,6 +8,8 @@ import type { AppSettings } from '@/helpers/types'
 
 import DefaultSettingsIntro from './default-settings-intro.vue'
 import { injectInstanceSettings } from './instance-settings-context'
+import ResetToDefaultButton from './reset-to-default-button.vue'
+import { useInstanceSettingsDraft } from './use-instance-settings-draft'
 
 const { handleError } = injectNotificationManager()
 const { formatMessage } = useVIntl()
@@ -16,53 +18,34 @@ const { instance } = injectInstanceSettings()
 
 const globalSettings = (await get().catch(handleError)) as AppSettings
 
-const overrideWindowSettings = ref(
-	!!instance.value.game_resolution || !!instance.value.force_fullscreen,
-)
-const resolution: Ref<[number, number]> = ref(
-	instance.value.game_resolution ?? (globalSettings.game_resolution.slice() as [number, number]),
-)
-const fullscreenSetting: Ref<boolean> = ref(
-	instance.value.force_fullscreen ?? globalSettings.force_fullscreen,
-)
+const defaultFullscreen = globalSettings.force_fullscreen
+const defaultResolution = globalSettings.game_resolution.slice() as [number, number]
 
-watch(overrideWindowSettings, (enabled) => {
-	if (!enabled) {
-		resolution.value = globalSettings.game_resolution.slice() as [number, number]
-		fullscreenSetting.value = globalSettings.force_fullscreen
-	}
-})
+function isResolutionOverridden(resolution: [number, number]) {
+	return resolution.some((dimension, index) => Number(dimension) !== defaultResolution[index])
+}
 
-const editInstanceObject = computed(() => {
-	if (!overrideWindowSettings.value) {
-		return {
-			force_fullscreen: null,
-			game_resolution: null,
-		}
-	}
-	return {
-		force_fullscreen: fullscreenSetting.value,
-		game_resolution: fullscreenSetting.value ? null : resolution.value,
-	}
-})
-
-watch(
-	[overrideWindowSettings, resolution, fullscreenSetting],
-	async () => {
-		await edit(instance.value.id, editInstanceObject.value)
+const { draft } = useInstanceSettingsDraft(
+	{
+		fullscreen: instance.value.force_fullscreen ?? defaultFullscreen,
+		resolution: instance.value.game_resolution ?? defaultResolution,
 	},
-	{ deep: true },
+	(value) =>
+		edit(instance.value.id, {
+			force_fullscreen: value.fullscreen !== defaultFullscreen ? value.fullscreen : null,
+			game_resolution: isResolutionOverridden(value.resolution) ? value.resolution : null,
+		}),
 )
 
+const fullscreenOverridden = computed(() => draft.value.fullscreen !== defaultFullscreen)
+const widthOverridden = computed(() => Number(draft.value.resolution[0]) !== defaultResolution[0])
+const heightOverridden = computed(() => Number(draft.value.resolution[1]) !== defaultResolution[1])
+
 const messages = defineMessages({
 	defaultSettingsDescription: {
 		id: 'instance.settings.tabs.window.default-settings-description',
 		defaultMessage: 'Your instance uses the default window settings unless you override them here.',
 	},
-	window: {
-		id: 'instance.settings.tabs.window',
-		defaultMessage: 'Custom window settings',
-	},
 	fullscreen: {
 		id: 'instance.settings.tabs.window.fullscreen',
 		defaultMessage: 'Fullscreen',
@@ -104,63 +87,74 @@ const messages = defineMessages({
 			tab="window"
 			:description="formatMessage(messages.defaultSettingsDescription)"
 		/>
-		<div
-			class="flex items-center justify-between gap-4 border-0 border-b border-solid border-surface-5 pb-6"
-		>
-			<label for="override-window-settings" class="text-lg font-semibold text-contrast">
-				{{ formatMessage(messages.window) }}
-			</label>
-			<Toggle id="override-window-settings" v-model="overrideWindowSettings" />
-		</div>
-		<div class="flex flex-col gap-6" :class="{ 'opacity-50': !overrideWindowSettings }">
-			<div class="flex items-center gap-4 justify-between">
-				<div class="flex flex-col gap-1">
-					<h2 class="m-0 text-lg font-semibold text-contrast">
-						{{ formatMessage(messages.fullscreen) }}
-					</h2>
-					<p class="m-0">
-						{{ formatMessage(messages.fullscreenDescription) }}
-					</p>
-				</div>
-				<Toggle id="fullscreen" v-model="fullscreenSetting" :disabled="!overrideWindowSettings" />
+		<div class="flex items-center gap-4 justify-between">
+			<div class="flex flex-col gap-1">
+				<h2 class="m-0 text-lg font-semibold text-contrast">
+					{{ formatMessage(messages.fullscreen) }}
+				</h2>
+				<p class="m-0">
+					{{ formatMessage(messages.fullscreenDescription) }}
+				</p>
 			</div>
+			<div class="flex shrink-0 items-center gap-2">
+				<Toggle id="fullscreen" v-model="draft.fullscreen" />
+				<ResetToDefaultButton
+					:disabled="!fullscreenOverridden"
+					:setting="formatMessage(messages.fullscreen)"
+					@reset="draft.fullscreen = defaultFullscreen"
+				/>
+			</div>
+		</div>
 
-			<div class="flex items-center gap-4 justify-between">
-				<div class="flex flex-col gap-1">
-					<h2 class="m-0 text-lg font-semibold text-contrast">
-						{{ formatMessage(messages.width) }}
-					</h2>
-					<p class="m-0">
-						{{ formatMessage(messages.widthDescription) }}
-					</p>
-				</div>
+		<div class="flex items-center gap-4 justify-between">
+			<div class="flex flex-col gap-1">
+				<h2 class="m-0 text-lg font-semibold text-contrast">
+					{{ formatMessage(messages.width) }}
+				</h2>
+				<p class="m-0">
+					{{ formatMessage(messages.widthDescription) }}
+				</p>
+			</div>
+			<div class="flex shrink-0 items-center gap-2">
 				<Input
 					id="width"
-					v-model="resolution[0]"
+					v-model="draft.resolution[0]"
 					autocomplete="off"
-					:disabled="!overrideWindowSettings || fullscreenSetting"
+					:disabled="draft.fullscreen"
 					type="number"
 					:placeholder="formatMessage(messages.enterWidth)"
 				/>
+				<ResetToDefaultButton
+					:disabled="!widthOverridden"
+					:setting="formatMessage(messages.width)"
+					@reset="draft.resolution[0] = defaultResolution[0]"
+				/>
 			</div>
+		</div>
 
-			<div class="flex items-center gap-4 justify-between">
-				<div class="flex flex-col gap-1">
-					<h2 class="m-0 text-lg font-semibold text-contrast">
-						{{ formatMessage(messages.height) }}
-					</h2>
-					<p class="m-0">
-						{{ formatMessage(messages.heightDescription) }}
-					</p>
-				</div>
+		<div class="flex items-center gap-4 justify-between">
+			<div class="flex flex-col gap-1">
+				<h2 class="m-0 text-lg font-semibold text-contrast">
+					{{ formatMessage(messages.height) }}
+				</h2>
+				<p class="m-0">
+					{{ formatMessage(messages.heightDescription) }}
+				</p>
+			</div>
+			<div class="flex shrink-0 items-center gap-2">
 				<Input
 					id="height"
-					v-model="resolution[1]"
+					v-model="draft.resolution[1]"
 					autocomplete="off"
-					:disabled="!overrideWindowSettings || fullscreenSetting"
+					:disabled="draft.fullscreen"
 					type="number"
 					:placeholder="formatMessage(messages.enterHeight)"
 				/>
+				<ResetToDefaultButton
+					:disabled="!heightOverridden"
+					:setting="formatMessage(messages.height)"
+					@reset="draft.resolution[1] = defaultResolution[1]"
+				/>
 			</div>
 		</div>
 	</div>
diff --git a/apps/app-frontend/src/helpers/instance.ts b/apps/app-frontend/src/helpers/instance.ts
index 72eb4686d8d..f8449c2145a 100644
--- a/apps/app-frontend/src/helpers/instance.ts
+++ b/apps/app-frontend/src/helpers/instance.ts
@@ -408,6 +408,10 @@ export async function get_optimal_jre_key(instanceId: string): Promise<JavaVersi
 	return await invoke('plugin:instance|instance_get_optimal_jre_key', { instanceId })
 }
 
+export async function get_recommended_java_version(instanceId: string): Promise<number> {
+	return await invoke('plugin:instance|instance_get_recommended_java_version', { instanceId })
+}
+
 export async function list(): Promise<GameInstance[]> {
 	return await invoke('plugin:instance|instance_list')
 }
diff --git a/apps/app-frontend/src/locales/ar-SA/index.json b/apps/app-frontend/src/locales/ar-SA/index.json
index 418ff447944..a9a0d0656f0 100644
--- a/apps/app-frontend/src/locales/ar-SA/index.json
+++ b/apps/app-frontend/src/locales/ar-SA/index.json
@@ -3863,9 +3863,6 @@
   "instance.settings.tabs.hooks.pre-launch.enter": {
     "message": "أدخل أمر ما قبل الإطلاق..."
   },
-  "instance.settings.tabs.hooks.title": {
-    "message": "إجراءات تشغيل اللعب إضافية مخصصة"
-  },
   "instance.settings.tabs.hooks.variables.description": {
     "message": "تعمل الخطافات (Hooks) في مجلد العمل الخاص بالنسخة، مع المتغيرات التالية:"
   },
@@ -3986,9 +3983,6 @@
   "instance.settings.tabs.synced-options.shared-settings.description": {
     "message": "تمكين تجاوز للحفاظ على إعدادات متزامنة منفصلة لهذه النسخة."
   },
-  "instance.settings.tabs.window": {
-    "message": "إعدادات نافذة مخصصة"
-  },
   "instance.settings.tabs.window.fullscreen": {
     "message": "ملء الشاشة"
   },
diff --git a/apps/app-frontend/src/locales/de-CH/index.json b/apps/app-frontend/src/locales/de-CH/index.json
index 3f38d4b3506..935cc9d9d8d 100644
--- a/apps/app-frontend/src/locales/de-CH/index.json
+++ b/apps/app-frontend/src/locales/de-CH/index.json
@@ -3866,9 +3866,6 @@
   "instance.settings.tabs.hooks.pre-launch.enter": {
     "message": "Ausgeführter Befehl nach dem Starten des Spiels eingeben..."
   },
-  "instance.settings.tabs.hooks.title": {
-    "message": "Eigene Hooks für den Spielstart"
-  },
   "instance.settings.tabs.hooks.variables.description": {
     "message": "Hooks werden im Arbeitsverzeichnis der Instanz mit den folgenden Variablen ausgeführt:"
   },
@@ -4001,9 +3998,6 @@
   "instance.settings.tabs.syncing": {
     "message": "Synchronisierung"
   },
-  "instance.settings.tabs.window": {
-    "message": "Benutzerdefinierte Fenstereinstellungen"
-  },
   "instance.settings.tabs.window.default-settings-description": {
     "message": "Deine Instanz verwendet die vorgegebenen Fenstereinstellungen, solange du diese hier nicht überschreibst."
   },
diff --git a/apps/app-frontend/src/locales/de-DE/index.json b/apps/app-frontend/src/locales/de-DE/index.json
index 430e165fb9e..e9d4c759447 100644
--- a/apps/app-frontend/src/locales/de-DE/index.json
+++ b/apps/app-frontend/src/locales/de-DE/index.json
@@ -3866,9 +3866,6 @@
   "instance.settings.tabs.hooks.pre-launch.enter": {
     "message": "Vor dem Start auszuführenden Befehl eingeben..."
   },
-  "instance.settings.tabs.hooks.title": {
-    "message": "Eigene Hooks für den Spielstart"
-  },
   "instance.settings.tabs.hooks.variables.description": {
     "message": "Hooks werden im Arbeitsverzeichnis der Instanz mit den folgenden Variablen ausgeführt:"
   },
@@ -4001,9 +3998,6 @@
   "instance.settings.tabs.syncing": {
     "message": "Synchronisierung"
   },
-  "instance.settings.tabs.window": {
-    "message": "Benutzerdefinierte Fenstereinstellungen"
-  },
   "instance.settings.tabs.window.default-settings-description": {
     "message": "Deine Instanz verwendet die vorgegebenen Fenstereinstellungen, solange du diese hier nicht überschreibst."
   },
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index f3dc181af08..8d484415133 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -3929,6 +3929,12 @@
   "instance.settings.defaults.open-app-settings": {
     "message": "Manage default settings"
   },
+  "instance.settings.reset-setting-to-default": {
+    "message": "Reset {setting} to default"
+  },
+  "instance.settings.reset-to-default": {
+    "message": "Reset to default"
+  },
   "instance.settings.sidebar.label.game": {
     "message": "Game"
   },
@@ -4076,9 +4082,6 @@
   "instance.settings.tabs.hooks.pre-launch.enter": {
     "message": "Enter pre-launch command..."
   },
-  "instance.settings.tabs.hooks.title": {
-    "message": "Custom game launch hooks"
-  },
   "instance.settings.tabs.hooks.variables.description": {
     "message": "Hooks run in the working directory of the instance, with the following variables:"
   },
@@ -4128,19 +4131,19 @@
     "message": "Enter Java arguments..."
   },
   "instance.settings.tabs.java.environment-variables": {
-    "message": "Custom environment variables"
+    "message": "Environment variables"
   },
   "instance.settings.tabs.java.hooks": {
     "message": "Hooks"
   },
   "instance.settings.tabs.java.java-arguments": {
-    "message": "Custom Java arguments"
+    "message": "Java arguments"
   },
   "instance.settings.tabs.java.java-installation": {
-    "message": "Custom Java installation"
+    "message": "Java installation"
   },
   "instance.settings.tabs.java.java-memory": {
-    "message": "Custom memory allocation"
+    "message": "Memory allocation"
   },
   "instance.settings.tabs.java.java-path-placeholder": {
     "message": "/path/to/java"
@@ -4148,6 +4151,9 @@
   "instance.settings.tabs.java.label": {
     "message": "Java and memory"
   },
+  "instance.settings.tabs.java.recommended-java-version": {
+    "message": "Java {version} is recommended for the Minecraft version of this instance."
+  },
   "instance.settings.tabs.sharing": {
     "message": "Sharing"
   },
@@ -4211,9 +4217,6 @@
   "instance.settings.tabs.syncing": {
     "message": "Syncing"
   },
-  "instance.settings.tabs.window": {
-    "message": "Custom window settings"
-  },
   "instance.settings.tabs.window.default-settings-description": {
     "message": "Your instance uses the default window settings unless you override them here."
   },
@@ -4244,6 +4247,9 @@
   "instance.settings.tabs.window.width.enter": {
     "message": "Enter width..."
   },
+  "instance.settings.using-defaults": {
+    "message": "Using defaults"
+  },
   "instance.shared-instance.error.title": {
     "message": "Something has gone wrong"
   },
diff --git a/apps/app-frontend/src/locales/es-419/index.json b/apps/app-frontend/src/locales/es-419/index.json
index cfe72744e8e..bf4ccee99e8 100644
--- a/apps/app-frontend/src/locales/es-419/index.json
+++ b/apps/app-frontend/src/locales/es-419/index.json
@@ -3866,9 +3866,6 @@
   "instance.settings.tabs.hooks.pre-launch.enter": {
     "message": "Introduce el comando pre-inicio..."
   },
-  "instance.settings.tabs.hooks.title": {
-    "message": "Hooks del juego personalizados"
-  },
   "instance.settings.tabs.hooks.variables.description": {
     "message": "Todas estas se ejecutan en el directorio de trabajo de la instancia, con las siguientes variables:"
   },
@@ -4001,9 +3998,6 @@
   "instance.settings.tabs.syncing": {
     "message": "Sincronización"
   },
-  "instance.settings.tabs.window": {
-    "message": "Configuración de ventanas personalizadas"
-  },
   "instance.settings.tabs.window.default-settings-description": {
     "message": "La instancia utiliza la configuración de la ventana predeterminada a menos que los sobrescriba aquí."
   },
diff --git a/apps/app-frontend/src/locales/es-ES/index.json b/apps/app-frontend/src/locales/es-ES/index.json
index c59d554f350..5e97c61b3b9 100644
--- a/apps/app-frontend/src/locales/es-ES/index.json
+++ b/apps/app-frontend/src/locales/es-ES/index.json
@@ -3815,9 +3815,6 @@
   "instance.settings.tabs.hooks.pre-launch.enter": {
     "message": "Introducir comando previo al lanzamiento..."
   },
-  "instance.settings.tabs.hooks.title": {
-    "message": "Hooks del juego personalizados"
-  },
   "instance.settings.tabs.hooks.variables.description": {
     "message": "Todas estas se ejecutan en el directorio de trabajo de la instancia, con las siguientes variables:"
   },
@@ -3947,9 +3944,6 @@
   "instance.settings.tabs.syncing": {
     "message": "Sincronizando"
   },
-  "instance.settings.tabs.window": {
-    "message": "Configuración de ventanas personalizadas"
-  },
   "instance.settings.tabs.window.fullscreen": {
     "message": "Pantalla completa"
   },
diff --git a/apps/app-frontend/src/locales/fr-FR/index.json b/apps/app-frontend/src/locales/fr-FR/index.json
index 1fc93da72e0..573fd3313ac 100644
--- a/apps/app-frontend/src/locales/fr-FR/index.json
+++ b/apps/app-frontend/src/locales/fr-FR/index.json
@@ -3863,9 +3863,6 @@
   "instance.settings.tabs.hooks.pre-launch.enter": {
     "message": "Entrez la commande de pré-lancement..."
   },
-  "instance.settings.tabs.hooks.title": {
-    "message": "Hooks de lancement du jeu personnalisé"
-  },
   "instance.settings.tabs.hooks.variables.description": {
     "message": "Les hooks s’exécutent dans le répertoire de travail de l’instance et disposent des variables suivantes :"
   },
@@ -3998,9 +3995,6 @@
   "instance.settings.tabs.syncing": {
     "message": "Synchronisation"
   },
-  "instance.settings.tabs.window": {
-    "message": "Paramètres de fenêtre personnalisée"
-  },
   "instance.settings.tabs.window.default-settings-description": {
     "message": "Votre instance utilise les paramètres de fenêtre par défaut, sauf si vous les remplacez ici."
   },
diff --git a/apps/app-frontend/src/locales/hu-HU/index.json b/apps/app-frontend/src/locales/hu-HU/index.json
index ce05d64edba..81f1a6ba9ed 100644
--- a/apps/app-frontend/src/locales/hu-HU/index.json
+++ b/apps/app-frontend/src/locales/hu-HU/index.json
@@ -3866,9 +3866,6 @@
   "instance.settings.tabs.hooks.pre-launch.enter": {
     "message": "Írjon be indítás előtti parancsokat..."
   },
-  "instance.settings.tabs.hooks.title": {
-    "message": "Egyéni játékindítási hookok"
-  },
   "instance.settings.tabs.hooks.variables.description": {
     "message": "A hookok a példány munkakönyvtárában futnak, a következő változókkal:"
   },
@@ -4001,9 +3998,6 @@
   "instance.settings.tabs.syncing": {
     "message": "Szinkronizálás"
   },
-  "instance.settings.tabs.window": {
-    "message": "Egyéni ablakbeállítások"
-  },
   "instance.settings.tabs.window.default-settings-description": {
     "message": "A példányod az alapértelmezett ablak beállításaidat használja ameddig nem írod azokat felül itt."
   },
diff --git a/apps/app-frontend/src/locales/it-IT/index.json b/apps/app-frontend/src/locales/it-IT/index.json
index 655ba5510ee..9b8cdfbfdf2 100644
--- a/apps/app-frontend/src/locales/it-IT/index.json
+++ b/apps/app-frontend/src/locales/it-IT/index.json
@@ -3935,9 +3935,6 @@
   "instance.settings.tabs.hooks.pre-launch.enter": {
     "message": "Inserisci comando pre-avvio..."
   },
-  "instance.settings.tabs.hooks.title": {
-    "message": "Hook di avvio personalizzati"
-  },
   "instance.settings.tabs.hooks.variables.description": {
     "message": "Gli hook si eseguono nella cartella principale dell'istanza, con le seguenti variabili:"
   },
@@ -4070,9 +4067,6 @@
   "instance.settings.tabs.syncing": {
     "message": "Sincronizzazione"
   },
-  "instance.settings.tabs.window": {
-    "message": "Impostazioni della finestra personalizzate"
-  },
   "instance.settings.tabs.window.default-settings-description": {
     "message": "L'istanza userà le impostazioni di finestra predefinite a meno che non le sovrascrivi qui."
   },
diff --git a/apps/app-frontend/src/locales/ja-JP/index.json b/apps/app-frontend/src/locales/ja-JP/index.json
index 1b58b42caae..77bcef7cf41 100644
--- a/apps/app-frontend/src/locales/ja-JP/index.json
+++ b/apps/app-frontend/src/locales/ja-JP/index.json
@@ -3002,9 +3002,6 @@
   "instance.settings.tabs.hooks.pre-launch.enter": {
     "message": "起動前のコマンドを入力…"
   },
-  "instance.settings.tabs.hooks.title": {
-    "message": "カスタムゲーム起動フック"
-  },
   "instance.settings.tabs.hooks.variables.description": {
     "message": "フックはインスタンスの現在のディレクトリで実行され、以下の環境変数が利用可能です："
   },
@@ -3119,9 +3116,6 @@
   "instance.settings.tabs.synced-options.shared-settings.description": {
     "message": "このインスタンスに対して同期設定を個別に保持するための上書きを有効にします。"
   },
-  "instance.settings.tabs.window": {
-    "message": "カスタムウィンドウの設定"
-  },
   "instance.settings.tabs.window.fullscreen": {
     "message": "フルスクリーン"
   },
diff --git a/apps/app-frontend/src/locales/ko-KR/index.json b/apps/app-frontend/src/locales/ko-KR/index.json
index 61b47751396..ad45bd68d6a 100644
--- a/apps/app-frontend/src/locales/ko-KR/index.json
+++ b/apps/app-frontend/src/locales/ko-KR/index.json
@@ -3866,9 +3866,6 @@
   "instance.settings.tabs.hooks.pre-launch.enter": {
     "message": "실행 전 명령어 입력..."
   },
-  "instance.settings.tabs.hooks.title": {
-    "message": "맞춤형 게임 실행 훅"
-  },
   "instance.settings.tabs.hooks.variables.description": {
     "message": "훅은 인스턴스의 작업 디렉터리에서 실행되며, 다음 변수를 따릅니다:"
   },
@@ -4001,9 +3998,6 @@
   "instance.settings.tabs.syncing": {
     "message": "동기화"
   },
-  "instance.settings.tabs.window": {
-    "message": "창 맞춤 설정"
-  },
   "instance.settings.tabs.window.default-settings-description": {
     "message": "여기에서 별도로 설정하지 않으면 이 인스턴스에는 기본 창 설정이 적용됩니다."
   },
diff --git a/apps/app-frontend/src/locales/nl-NL/index.json b/apps/app-frontend/src/locales/nl-NL/index.json
index a3dac7a2f4b..cb513ef8ed7 100644
--- a/apps/app-frontend/src/locales/nl-NL/index.json
+++ b/apps/app-frontend/src/locales/nl-NL/index.json
@@ -3866,9 +3866,6 @@
   "instance.settings.tabs.hooks.pre-launch.enter": {
     "message": "Voer commando voor het opstarten in..."
   },
-  "instance.settings.tabs.hooks.title": {
-    "message": "Aangepaste opstart haakjes"
-  },
   "instance.settings.tabs.hooks.variables.description": {
     "message": "Hooks worden uitgevoerd in de werkfolder van de instantie, met de volgende variabelen:"
   },
@@ -4001,9 +3998,6 @@
   "instance.settings.tabs.syncing": {
     "message": "Syncen"
   },
-  "instance.settings.tabs.window": {
-    "message": "Aangepaste venster instellingen"
-  },
   "instance.settings.tabs.window.default-settings-description": {
     "message": "Je instantie gebruikt de standaard vensterwaarden tenzij je ze hier overschrijft."
   },
diff --git a/apps/app-frontend/src/locales/pl-PL/index.json b/apps/app-frontend/src/locales/pl-PL/index.json
index 8c569202fc6..3eb6d14328a 100644
--- a/apps/app-frontend/src/locales/pl-PL/index.json
+++ b/apps/app-frontend/src/locales/pl-PL/index.json
@@ -3848,9 +3848,6 @@
   "instance.settings.tabs.hooks.pre-launch.enter": {
     "message": "Wpisz komendę przed uruchomieniem..."
   },
-  "instance.settings.tabs.hooks.title": {
-    "message": "Niestandardowe polecenia uruchamiania gry"
-  },
   "instance.settings.tabs.hooks.variables.description": {
     "message": "Haki uruchamiane w katalogu roboczym instancji, z następującymi zmiennymi:"
   },
@@ -3983,9 +3980,6 @@
   "instance.settings.tabs.syncing": {
     "message": "Synchronizacja"
   },
-  "instance.settings.tabs.window": {
-    "message": "Niestandardowe ustawienia okna"
-  },
   "instance.settings.tabs.window.default-settings-description": {
     "message": "Twoja instancja używa domyślnych ustawień okna, chyba że podasz je tutaj."
   },
diff --git a/apps/app-frontend/src/locales/pt-BR/index.json b/apps/app-frontend/src/locales/pt-BR/index.json
index dcc51468ddb..5a965e48772 100644
--- a/apps/app-frontend/src/locales/pt-BR/index.json
+++ b/apps/app-frontend/src/locales/pt-BR/index.json
@@ -3866,9 +3866,6 @@
   "instance.settings.tabs.hooks.pre-launch.enter": {
     "message": "Insira o comando ao iniciar..."
   },
-  "instance.settings.tabs.hooks.title": {
-    "message": "Customizar ganchos de inicialização do jogo"
-  },
   "instance.settings.tabs.hooks.variables.description": {
     "message": "Ganchos são executados no diretório de trabalho da instância, com as seguintes variáveis:"
   },
@@ -4001,9 +3998,6 @@
   "instance.settings.tabs.syncing": {
     "message": "Sincronização"
   },
-  "instance.settings.tabs.window": {
-    "message": "Personalizar configurações de janela"
-  },
   "instance.settings.tabs.window.default-settings-description": {
     "message": "Sua instância usa as configurações de janela padrão, a menos que você as altere aqui."
   },
diff --git a/apps/app-frontend/src/locales/ru-RU/index.json b/apps/app-frontend/src/locales/ru-RU/index.json
index 9df5d73cd21..4e21eb8b821 100644
--- a/apps/app-frontend/src/locales/ru-RU/index.json
+++ b/apps/app-frontend/src/locales/ru-RU/index.json
@@ -3842,9 +3842,6 @@
   "instance.settings.tabs.hooks.pre-launch.enter": {
     "message": "Введите команду перед запуском..."
   },
-  "instance.settings.tabs.hooks.title": {
-    "message": "Переопределение команд запуска игры"
-  },
   "instance.settings.tabs.hooks.variables.description": {
     "message": "Команды выполняются в рабочем каталоге сборки. Переменные:"
   },
@@ -3977,9 +3974,6 @@
   "instance.settings.tabs.syncing": {
     "message": "Синхронизация"
   },
-  "instance.settings.tabs.window": {
-    "message": "Переопределение настроек окна"
-  },
   "instance.settings.tabs.window.default-settings-description": {
     "message": "Ваша сборка использует настройки окна по умолчанию, пока вы не замените их здесь."
   },
diff --git a/apps/app-frontend/src/locales/sv-SE/index.json b/apps/app-frontend/src/locales/sv-SE/index.json
index 6356d131b44..86449578af4 100644
--- a/apps/app-frontend/src/locales/sv-SE/index.json
+++ b/apps/app-frontend/src/locales/sv-SE/index.json
@@ -3608,9 +3608,6 @@
   "instance.settings.tabs.syncing": {
     "message": "Synkronisering"
   },
-  "instance.settings.tabs.window": {
-    "message": "Anpassade fönsterinställningar"
-  },
   "instance.settings.tabs.window.fullscreen": {
     "message": "Helskärm"
   },
diff --git a/apps/app-frontend/src/locales/tr-TR/index.json b/apps/app-frontend/src/locales/tr-TR/index.json
index 6d8e08ff96a..66f770cea27 100644
--- a/apps/app-frontend/src/locales/tr-TR/index.json
+++ b/apps/app-frontend/src/locales/tr-TR/index.json
@@ -3389,9 +3389,6 @@
   "instance.settings.tabs.hooks.pre-launch.enter": {
     "message": "Başlatma öncesi komutu girin..."
   },
-  "instance.settings.tabs.hooks.title": {
-    "message": "Özel oyun başlatma kancaları"
-  },
   "instance.settings.tabs.hooks.variables.description": {
     "message": "Kancalar, örneğin çalışma dizininde aşağıdaki değişkenlerle çalıştırılır:"
   },
@@ -3506,9 +3503,6 @@
   "instance.settings.tabs.synced-options.shared-settings.description": {
     "message": "Bu örnek için, eşitlenmiş bir ayarı ayrı tutmak üzere bir geçersiz kılmayı etkinleştirin."
   },
-  "instance.settings.tabs.window": {
-    "message": "Özel pencere ayarları"
-  },
   "instance.settings.tabs.window.fullscreen": {
     "message": "Tam Ekran"
   },
diff --git a/apps/app-frontend/src/locales/uk-UA/index.json b/apps/app-frontend/src/locales/uk-UA/index.json
index 5a0941765c5..aa1ed80720b 100644
--- a/apps/app-frontend/src/locales/uk-UA/index.json
+++ b/apps/app-frontend/src/locales/uk-UA/index.json
@@ -3899,9 +3899,6 @@
   "instance.settings.tabs.hooks.pre-launch.enter": {
     "message": "Уведіть команду, що виконуватиметься перед запуском…"
   },
-  "instance.settings.tabs.hooks.title": {
-    "message": "Власні параметри запуску"
-  },
   "instance.settings.tabs.hooks.variables.description": {
     "message": "Параметри працюють в каталозі примірника з наступними змінними:"
   },
@@ -4034,9 +4031,6 @@
   "instance.settings.tabs.syncing": {
     "message": "Синхронізація"
   },
-  "instance.settings.tabs.window": {
-    "message": "Власні налаштування вікна"
-  },
   "instance.settings.tabs.window.default-settings-description": {
     "message": "Ваш примірник використовуватиме усталені налаштування вікна, якщо ви їх не перезапишете тут."
   },
diff --git a/apps/app-frontend/src/locales/vi-VN/index.json b/apps/app-frontend/src/locales/vi-VN/index.json
index e9de9d56ea5..575d1a6f546 100644
--- a/apps/app-frontend/src/locales/vi-VN/index.json
+++ b/apps/app-frontend/src/locales/vi-VN/index.json
@@ -3782,9 +3782,6 @@
   "instance.settings.tabs.hooks.pre-launch.enter": {
     "message": "Nhập lệnh trước khi khởi chạy..."
   },
-  "instance.settings.tabs.hooks.title": {
-    "message": "Hook khởi chạy trò chơi tùy chỉnh"
-  },
   "instance.settings.tabs.hooks.variables.description": {
     "message": "Hook chạy trong thư mục làm việc của bản cài đặt với các biến sau:"
   },
@@ -3908,9 +3905,6 @@
   "instance.settings.tabs.synced-options.shared-settings.description": {
     "message": "Bật ghi đè để giữ một cài đặt đã đồng bộ riêng cho bản cài đặt này."
   },
-  "instance.settings.tabs.window": {
-    "message": "Cài đặt cửa sổ tùy chỉnh"
-  },
   "instance.settings.tabs.window.fullscreen": {
     "message": "Toàn màn hình"
   },
diff --git a/apps/app-frontend/src/locales/zh-CN/index.json b/apps/app-frontend/src/locales/zh-CN/index.json
index 4e420b8e1b4..d420df13c6f 100644
--- a/apps/app-frontend/src/locales/zh-CN/index.json
+++ b/apps/app-frontend/src/locales/zh-CN/index.json
@@ -3866,9 +3866,6 @@
   "instance.settings.tabs.hooks.pre-launch.enter": {
     "message": "输入启动前命令……"
   },
-  "instance.settings.tabs.hooks.title": {
-    "message": "自定义启动钩子"
-  },
   "instance.settings.tabs.hooks.variables.description": {
     "message": "在此实例工作目录中的钩柄遵循以下这些变量："
   },
@@ -4001,9 +3998,6 @@
   "instance.settings.tabs.syncing": {
     "message": "同步"
   },
-  "instance.settings.tabs.window": {
-    "message": "自定义窗口设置"
-  },
   "instance.settings.tabs.window.default-settings-description": {
     "message": "您的实例使用默认的窗口设置，除非您在这里覆盖它们。"
   },
diff --git a/apps/app-frontend/src/locales/zh-TW/index.json b/apps/app-frontend/src/locales/zh-TW/index.json
index 600a4bbb777..3f983b7d1cc 100644
--- a/apps/app-frontend/src/locales/zh-TW/index.json
+++ b/apps/app-frontend/src/locales/zh-TW/index.json
@@ -3866,9 +3866,6 @@
   "instance.settings.tabs.hooks.pre-launch.enter": {
     "message": "輸入啟動前指令..."
   },
-  "instance.settings.tabs.hooks.title": {
-    "message": "自訂遊戲啟動掛勾"
-  },
   "instance.settings.tabs.hooks.variables.description": {
     "message": "掛勾會在實例的工作目錄中執行，可使用以下變數："
   },
@@ -4001,9 +3998,6 @@
   "instance.settings.tabs.syncing": {
     "message": "同步"
   },
-  "instance.settings.tabs.window": {
-    "message": "自訂視窗設定"
-  },
   "instance.settings.tabs.window.default-settings-description": {
     "message": "你的實例會使用預設的視窗設定，除非你在這裡覆寫這些設定。"
   },
diff --git a/apps/app/build.rs b/apps/app/build.rs
index 1fd2fb79b79..15e7bc5a283 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -226,6 +226,7 @@ fn main() {
                         "instance_get_linked_modpack_info",
                         "instance_get_linked_modpack_content",
                         "instance_get_optimal_jre_key",
+                        "instance_get_recommended_java_version",
                         "instance_get_full_path",
                         "instance_get_mod_full_path",
                         "instance_list_screenshots",
diff --git a/apps/app/src/api/instance.rs b/apps/app/src/api/instance.rs
index d9da7767e36..ad59ff57265 100644
--- a/apps/app/src/api/instance.rs
+++ b/apps/app/src/api/instance.rs
@@ -47,6 +47,7 @@ pub fn init<R: tauri::Runtime>() -> tauri::plugin::TauriPlugin<R> {
             instance_get_linked_modpack_info,
             instance_get_linked_modpack_content,
             instance_get_optimal_jre_key,
+            instance_get_recommended_java_version,
             instance_get_full_path,
             instance_get_mod_full_path,
             instance_list_screenshots,
@@ -1140,6 +1141,13 @@ pub async fn instance_get_optimal_jre_key(
     Ok(theseus::instance::get_optimal_jre_key(instance_id).await?)
 }
 
+#[tauri::command]
+pub async fn instance_get_recommended_java_version(
+    instance_id: &str,
+) -> Result<u32> {
+    Ok(theseus::instance::get_recommended_java_version(instance_id).await?)
+}
+
 #[tauri::command]
 pub async fn instance_check_installed(
     instance_id: &str,
diff --git a/packages/app-lib/src/api/instance.rs b/packages/app-lib/src/api/instance.rs
index 6314a25e766..4817d4ccf64 100644
--- a/packages/app-lib/src/api/instance.rs
+++ b/packages/app-lib/src/api/instance.rs
@@ -50,7 +50,7 @@ pub use self::icon::{
 pub(crate) use self::icon::{
     cache_icon, cache_icon_from_path, migrate_legacy_icons,
 };
-pub use self::install::get_optimal_jre_key;
+pub use self::install::{get_optimal_jre_key, get_recommended_java_version};
 pub(crate) use self::lifecycle::create;
 pub use self::lifecycle::{edit, remove, set_synced_option};
 pub use self::paths::{get_full_path, get_mod_full_path};
diff --git a/packages/app-lib/src/api/instance/install.rs b/packages/app-lib/src/api/instance/install.rs
index 4d48981e340..29df24639a5 100644
--- a/packages/app-lib/src/api/instance/install.rs
+++ b/packages/app-lib/src/api/instance/install.rs
@@ -1,10 +1,11 @@
-use crate::state::{JavaVersion, State};
+use crate::launcher::profile::ResolvedVersion;
+use crate::state::{InstanceLaunchContext, JavaVersion, State};
 use anyhow::Context;
 
-pub async fn get_optimal_jre_key(
+async fn resolve_launch_version_info(
     instance_id: &str,
-) -> crate::Result<Option<JavaVersion>> {
-    let state = State::get().await?;
+    state: &State,
+) -> crate::Result<(InstanceLaunchContext, ResolvedVersion)> {
     let context =
         crate::state::instances::commands::get_instance_launch_context(
             instance_id,
@@ -17,7 +18,7 @@ pub async fn get_optimal_jre_key(
     let (minecraft, version_index) =
         crate::launcher::resolve_minecraft_manifest(
             &context.applied_content_set.game_version,
-            &state,
+            state,
         )
         .await?;
     let version = &minecraft.versions[version_index];
@@ -29,7 +30,7 @@ pub async fn get_optimal_jre_key(
     )
     .await?;
     let version_info = crate::launcher::download::download_version_info(
-        &state,
+        state,
         version,
         loader_version.as_ref(),
         None,
@@ -38,6 +39,16 @@ pub async fn get_optimal_jre_key(
     )
     .await?;
 
+    Ok((context, version_info))
+}
+
+pub async fn get_optimal_jre_key(
+    instance_id: &str,
+) -> crate::Result<Option<JavaVersion>> {
+    let state = State::get().await?;
+    let (context, version_info) =
+        resolve_launch_version_info(instance_id, &state).await?;
+
     crate::launcher::get_java_version_from_launch_context(
         &context,
         &version_info,
@@ -45,3 +56,15 @@ pub async fn get_optimal_jre_key(
     )
     .await
 }
+
+pub async fn get_recommended_java_version(
+    instance_id: &str,
+) -> crate::Result<u32> {
+    let state = State::get().await?;
+    let (_, version_info) =
+        resolve_launch_version_info(instance_id, &state).await?;
+
+    Ok(crate::launcher::get_recommended_java_major_version(
+        &version_info,
+    ))
+}
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
index 11625c80e2a..229bb3703a8 100644
--- a/packages/app-lib/src/launcher/mod.rs
+++ b/packages/app-lib/src/launcher/mod.rs
@@ -136,6 +136,13 @@ macro_rules! processor_rules {
     }
 }
 
+pub fn get_recommended_java_major_version(version_info: &VersionInfo) -> u32 {
+    version_info
+        .java_version
+        .as_ref()
+        .map_or(8, |it| it.major_version)
+}
+
 pub async fn get_java_version_from_launch_context(
     context: &InstanceLaunchContext,
     version_info: &VersionInfo,
@@ -150,10 +157,7 @@ pub async fn get_java_version_from_launch_context(
         }
     }
 
-    let key = version_info
-        .java_version
-        .as_ref()
-        .map_or(8, |it| it.major_version);
+    let key = get_recommended_java_major_version(version_info);
 
     let java_version = JavaVersion::get(key, pool).await?;
 

From e4b9ec50adf270647ef810f34d93bb8d96f37af8 Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Mon, 9 Nov 2026 11:53:30 +0000
Subject: [PATCH 2/7] fix: rev

---
 .../settings-modal/hooks-settings.vue         | 49 +++++------
 .../settings-modal/java-settings.vue          | 88 +++++++------------
 .../use-instance-settings-draft.ts            | 74 ++++++++--------
 .../settings-modal/window-settings.vue        | 64 +++++++++-----
 4 files changed, 138 insertions(+), 137 deletions(-)

diff --git a/apps/app-frontend/src/features/instances/settings-modal/hooks-settings.vue b/apps/app-frontend/src/features/instances/settings-modal/hooks-settings.vue
index 4223a5a4923..55e082c3f23 100644
--- a/apps/app-frontend/src/features/instances/settings-modal/hooks-settings.vue
+++ b/apps/app-frontend/src/features/instances/settings-modal/hooks-settings.vue
@@ -14,6 +14,7 @@ const { handleError } = injectNotificationManager()
 const { formatMessage } = useVIntl()
 
 const { instance } = injectInstanceSettings()
+const { createDraft } = useInstanceSettingsDraft()
 
 const globalSettings = (await get().catch(handleError)) as AppSettings
 
@@ -24,28 +25,23 @@ const defaultHooks: Record<HookKey, string> = {
 	wrapper: globalSettings.hooks.wrapper ?? '',
 	post_exit: globalSettings.hooks.post_exit ?? '',
 }
-const { draft: hooks } = useInstanceSettingsDraft<Record<HookKey, string>>(
+
+const hooks = createDraft<Record<HookKey, string | null>>(
 	{
-		pre_launch: instance.value.hooks.pre_launch || defaultHooks.pre_launch,
-		wrapper: instance.value.hooks.wrapper || defaultHooks.wrapper,
-		post_exit: instance.value.hooks.post_exit || defaultHooks.post_exit,
+		pre_launch: instance.value.hooks.pre_launch || null,
+		wrapper: instance.value.hooks.wrapper || null,
+		post_exit: instance.value.hooks.post_exit || null,
 	},
-	(value) => {
-		const override = (key: HookKey) => (value[key] !== defaultHooks[key] ? value[key] : '')
-		return edit(instance.value.id, {
+	(value) =>
+		edit(instance.value.id, {
 			hooks: {
-				pre_launch: override('pre_launch'),
-				wrapper: override('wrapper'),
-				post_exit: override('post_exit'),
+				pre_launch: value.pre_launch ?? '',
+				wrapper: value.wrapper ?? '',
+				post_exit: value.post_exit ?? '',
 			},
-		})
-	},
+		}),
 )
 
-function hookOverridden(key: HookKey) {
-	return hooks.value[key] !== defaultHooks[key]
-}
-
 const messages = defineMessages({
 	defaultSettingsDescription: {
 		id: 'instance.settings.tabs.hooks.default-settings-description',
@@ -132,17 +128,18 @@ const messages = defineMessages({
 					{{ formatMessage(messages.preLaunch) }}
 				</h2>
 				<ResetToDefaultButton
-					:disabled="!hookOverridden('pre_launch')"
+					:disabled="hooks.pre_launch === null"
 					:setting="formatMessage(messages.preLaunch)"
-					@reset="hooks.pre_launch = defaultHooks.pre_launch"
+					@reset="hooks.pre_launch = null"
 				/>
 			</div>
 			<Input
 				id="pre-launch"
-				v-model="hooks.pre_launch"
+				:model-value="hooks.pre_launch ?? defaultHooks.pre_launch"
 				autocomplete="off"
 				:placeholder="formatMessage(messages.preLaunchEnter)"
 				wrapper-class="w-full"
+				@update:model-value="(value) => (hooks.pre_launch = String(value ?? ''))"
 			/>
 			<p class="m-0">
 				{{ formatMessage(messages.preLaunchDescription) }}
@@ -155,17 +152,18 @@ const messages = defineMessages({
 					{{ formatMessage(messages.wrapper) }}
 				</h2>
 				<ResetToDefaultButton
-					:disabled="!hookOverridden('wrapper')"
+					:disabled="hooks.wrapper === null"
 					:setting="formatMessage(messages.wrapper)"
-					@reset="hooks.wrapper = defaultHooks.wrapper"
+					@reset="hooks.wrapper = null"
 				/>
 			</div>
 			<Input
 				id="wrapper"
-				v-model="hooks.wrapper"
+				:model-value="hooks.wrapper ?? defaultHooks.wrapper"
 				autocomplete="off"
 				:placeholder="formatMessage(messages.wrapperEnter)"
 				wrapper-class="w-full"
+				@update:model-value="(value) => (hooks.wrapper = String(value ?? ''))"
 			/>
 			<p class="m-0">
 				{{ formatMessage(messages.wrapperDescription) }}
@@ -178,17 +176,18 @@ const messages = defineMessages({
 					{{ formatMessage(messages.postExit) }}
 				</h2>
 				<ResetToDefaultButton
-					:disabled="!hookOverridden('post_exit')"
+					:disabled="hooks.post_exit === null"
 					:setting="formatMessage(messages.postExit)"
-					@reset="hooks.post_exit = defaultHooks.post_exit"
+					@reset="hooks.post_exit = null"
 				/>
 			</div>
 			<Input
 				id="post-exit"
-				v-model="hooks.post_exit"
+				:model-value="hooks.post_exit ?? defaultHooks.post_exit"
 				autocomplete="off"
 				:placeholder="formatMessage(messages.postExitEnter)"
 				wrapper-class="w-full"
+				@update:model-value="(value) => (hooks.post_exit = String(value ?? ''))"
 			/>
 			<p class="m-0">
 				{{ formatMessage(messages.postExitDescription) }}
diff --git a/apps/app-frontend/src/features/instances/settings-modal/java-settings.vue b/apps/app-frontend/src/features/instances/settings-modal/java-settings.vue
index e9b3373f212..fd18385d134 100644
--- a/apps/app-frontend/src/features/instances/settings-modal/java-settings.vue
+++ b/apps/app-frontend/src/features/instances/settings-modal/java-settings.vue
@@ -8,7 +8,6 @@ import {
 	Slider,
 	useVIntl,
 } from '@modrinth/ui'
-import { computed } from 'vue'
 
 import JavaSelector from '@/components/ui/JavaSelector.vue'
 import useMemorySlider from '@/composables/useMemorySlider'
@@ -26,6 +25,8 @@ const { handleError } = injectNotificationManager()
 const { formatMessage } = useVIntl()
 
 const { instance } = injectInstanceSettings()
+const { createDraft } = useInstanceSettingsDraft()
+const { maxMemory, snapPoints, memoryQuery } = useMemorySlider()
 
 const globalSettings = (await get().catch(handleError)) as unknown as AppSettings
 
@@ -40,54 +41,30 @@ const defaultJavaArgs = globalSettings.extra_launch_args.join(' ')
 const defaultEnvVars = serializeEnvVars(globalSettings.custom_env_vars)
 const defaultMemory = globalSettings.memory.maximum
 
-function normalizeJavaPath(path: string) {
-	return path.replace('java.exe', 'javaw.exe')
-}
-
-function parseJavaArgs(input: string) {
-	return input.trim().split(/\s+/).filter(Boolean)
-}
-
-function isJavaPathOverridden(path: string) {
-	return normalizeJavaPath(path) !== normalizeJavaPath(defaultJavaPath)
-}
-
-function isJavaArgsOverridden(args: string) {
-	return parseJavaArgs(args).join(' ') !== parseJavaArgs(defaultJavaArgs).join(' ')
-}
-
-function isEnvVarsOverridden(envVars: string) {
-	return serializeEnvVars(parseEnvVars(envVars)) !== defaultEnvVars
-}
-
-const { draft } = useInstanceSettingsDraft(
+const draft = createDraft<{
+	javaPath: string | null
+	javaArgs: string | null
+	envVars: string | null
+	memory: number | null
+}>(
 	{
-		javaPath: instance.value.java_path ?? defaultJavaPath,
-		javaArgs: (instance.value.extra_launch_args ?? globalSettings.extra_launch_args).join(' '),
-		envVars: serializeEnvVars(instance.value.custom_env_vars ?? globalSettings.custom_env_vars),
-		memory: instance.value.memory?.maximum ?? defaultMemory,
+		javaPath: instance.value.java_path ?? null,
+		javaArgs: instance.value.extra_launch_args?.join(' ') ?? null,
+		envVars: instance.value.custom_env_vars
+			? serializeEnvVars(instance.value.custom_env_vars)
+			: null,
+		memory: instance.value.memory?.maximum ?? null,
 	},
 	(value) =>
 		edit(instance.value.id, {
-			java_path:
-				isJavaPathOverridden(value.javaPath) && value.javaPath
-					? normalizeJavaPath(value.javaPath)
-					: null,
-			extra_launch_args: isJavaArgsOverridden(value.javaArgs)
-				? parseJavaArgs(value.javaArgs)
-				: null,
-			custom_env_vars: isEnvVarsOverridden(value.envVars) ? parseEnvVars(value.envVars) : null,
-			memory: value.memory !== defaultMemory ? { maximum: value.memory } : null,
+			java_path: value.javaPath ? value.javaPath.replace('java.exe', 'javaw.exe') : null,
+			extra_launch_args:
+				value.javaArgs !== null ? value.javaArgs.trim().split(/\s+/).filter(Boolean) : null,
+			custom_env_vars: value.envVars !== null ? parseEnvVars(value.envVars) : null,
+			memory: value.memory !== null ? { maximum: value.memory } : null,
 		}),
 )
 
-const javaPathOverridden = computed(() => isJavaPathOverridden(draft.value.javaPath))
-const javaArgsOverridden = computed(() => isJavaArgsOverridden(draft.value.javaArgs))
-const envVarsOverridden = computed(() => isEnvVarsOverridden(draft.value.envVars))
-const memoryOverridden = computed(() => draft.value.memory !== defaultMemory)
-
-const { maxMemory, snapPoints, memoryQuery } = useMemorySlider()
-
 const messages = defineMessages({
 	defaultSettingsDescription: {
 		id: 'instance.settings.tabs.java.default-settings-description',
@@ -146,16 +123,16 @@ const messages = defineMessages({
 					{{ formatMessage(messages.javaMemory) }}
 				</h2>
 				<ResetToDefaultButton
-					:disabled="!memoryOverridden"
+					:disabled="draft.memory === null"
 					:setting="formatMessage(messages.javaMemory)"
-					@reset="draft.memory = defaultMemory"
+					@reset="draft.memory = null"
 				/>
 			</div>
 			<div class="pt-3">
 				<Slider
 					v-if="maxMemory"
 					id="max-memory"
-					v-model="draft.memory"
+					:model-value="draft.memory ?? defaultMemory"
 					:min="512"
 					:max="maxMemory"
 					:step="64"
@@ -164,6 +141,7 @@ const messages = defineMessages({
 					min-label="512 MB"
 					:max-label="`${Number((maxMemory / 1024).toFixed(1))} GB`"
 					unit="MB"
+					@update:model-value="(value) => (draft.memory = value)"
 				/>
 				<Button v-else-if="memoryQuery.isError.value" @click="memoryQuery.refetch()">
 					{{ formatMessage(commonMessages.refreshButton) }}
@@ -190,15 +168,15 @@ const messages = defineMessages({
 					</p>
 				</div>
 				<ResetToDefaultButton
-					:disabled="!javaPathOverridden"
+					:disabled="draft.javaPath === null"
 					:setting="formatMessage(messages.javaInstallation)"
-					@reset="draft.javaPath = defaultJavaPath"
+					@reset="draft.javaPath = null"
 				/>
 			</div>
 			<div class="pt-3">
 				<JavaSelector
 					id="java-installation"
-					:model-value="{ path: draft.javaPath }"
+					:model-value="{ path: draft.javaPath ?? defaultJavaPath }"
 					:placeholder="formatMessage(messages.javaPathPlaceholder)"
 					@update:model-value="(val) => (draft.javaPath = val?.path ?? '')"
 				/>
@@ -211,18 +189,19 @@ const messages = defineMessages({
 					{{ formatMessage(messages.javaArguments) }}
 				</h2>
 				<ResetToDefaultButton
-					:disabled="!javaArgsOverridden"
+					:disabled="draft.javaArgs === null"
 					:setting="formatMessage(messages.javaArguments)"
-					@reset="draft.javaArgs = defaultJavaArgs"
+					@reset="draft.javaArgs = null"
 				/>
 			</div>
 			<div class="pt-3">
 				<Input
 					id="java-args"
-					v-model="draft.javaArgs"
+					:model-value="draft.javaArgs ?? defaultJavaArgs"
 					autocomplete="off"
 					:placeholder="formatMessage(messages.enterJavaArguments)"
 					wrapper-class="w-full"
+					@update:model-value="(value) => (draft.javaArgs = String(value ?? ''))"
 				/>
 			</div>
 		</section>
@@ -233,18 +212,19 @@ const messages = defineMessages({
 					{{ formatMessage(messages.javaEnvironmentVariables) }}
 				</h2>
 				<ResetToDefaultButton
-					:disabled="!envVarsOverridden"
+					:disabled="draft.envVars === null"
 					:setting="formatMessage(messages.javaEnvironmentVariables)"
-					@reset="draft.envVars = defaultEnvVars"
+					@reset="draft.envVars = null"
 				/>
 			</div>
 			<div class="pt-3">
 				<Input
 					id="env-vars"
-					v-model="draft.envVars"
+					:model-value="draft.envVars ?? defaultEnvVars"
 					autocomplete="off"
 					:placeholder="formatMessage(messages.enterEnvironmentVariables)"
 					wrapper-class="w-full"
+					@update:model-value="(value) => (draft.envVars = String(value ?? ''))"
 				/>
 			</div>
 		</section>
diff --git a/apps/app-frontend/src/features/instances/settings-modal/use-instance-settings-draft.ts b/apps/app-frontend/src/features/instances/settings-modal/use-instance-settings-draft.ts
index 772eedbea4e..1519fcdb613 100644
--- a/apps/app-frontend/src/features/instances/settings-modal/use-instance-settings-draft.ts
+++ b/apps/app-frontend/src/features/instances/settings-modal/use-instance-settings-draft.ts
@@ -1,59 +1,63 @@
 import { injectNotificationManager } from '@modrinth/ui'
 import { onBeforeUnmount, onMounted, type Ref, ref } from 'vue'
 
+import type { UnsavedChangesController } from '@/features/settings/app-settings-modal/context'
+
 import { injectInstanceSettings } from './instance-settings-context'
 
 function clone<T>(value: T): T {
 	return JSON.parse(JSON.stringify(value))
 }
 
-export function useInstanceSettingsDraft<T extends Record<string, unknown>>(
-	initial: T,
-	persist: (value: T) => Promise<void>,
-) {
+export function useInstanceSettingsDraft() {
 	const { handleError } = injectNotificationManager()
 	const { registerUnsavedChangesController } = injectInstanceSettings()
 
-	const original = ref(clone(initial)) as Ref<T>
-	const draft = ref(clone(initial)) as Ref<T>
-	const saving = ref(false)
+	let controller: UnsavedChangesController | null = null
 
-	function hasChanges() {
-		return JSON.stringify(original.value) !== JSON.stringify(draft.value)
-	}
+	onMounted(() => {
+		registerUnsavedChangesController(controller)
+	})
 
-	function reset() {
-		draft.value = clone(original.value)
-	}
+	onBeforeUnmount(() => {
+		registerUnsavedChangesController(null)
+	})
 
-	async function save() {
-		if (saving.value) return
-		saving.value = true
-		const value = clone(draft.value)
-		try {
-			await persist(value)
-			original.value = value
-		} catch (error) {
-			handleError(error as Error)
-		} finally {
-			saving.value = false
+	function createDraft<T extends Record<string, unknown>>(
+		initial: T,
+		persist: (value: T) => Promise<void>,
+	) {
+		const original = ref(clone(initial)) as Ref<T>
+		const draft = ref(clone(initial)) as Ref<T>
+		const saving = ref(false)
+
+		async function save() {
+			if (saving.value) return
+			saving.value = true
+			const value = clone(draft.value)
+			try {
+				await persist(value)
+				original.value = value
+			} catch (error) {
+				handleError(error as Error)
+			} finally {
+				saving.value = false
+			}
 		}
-	}
 
-	onMounted(() => {
-		registerUnsavedChangesController({
-			hasChanges,
+		controller = {
+			hasChanges: () => JSON.stringify(original.value) !== JSON.stringify(draft.value),
 			getOriginal: () => original.value,
 			getModified: () => draft.value,
 			isSaving: () => saving.value,
-			reset,
+			reset: () => {
+				draft.value = clone(original.value)
+			},
 			save,
-		})
-	})
+		}
 
-	onBeforeUnmount(() => {
-		registerUnsavedChangesController(null)
-	})
+		return draft
+	}
 
-	return { draft }
+	return { createDraft }
 }
diff --git a/apps/app-frontend/src/features/instances/settings-modal/window-settings.vue b/apps/app-frontend/src/features/instances/settings-modal/window-settings.vue
index 90fe4d38694..805fb8cf8f3 100644
--- a/apps/app-frontend/src/features/instances/settings-modal/window-settings.vue
+++ b/apps/app-frontend/src/features/instances/settings-modal/window-settings.vue
@@ -15,31 +15,43 @@ const { handleError } = injectNotificationManager()
 const { formatMessage } = useVIntl()
 
 const { instance } = injectInstanceSettings()
+const { createDraft } = useInstanceSettingsDraft()
 
 const globalSettings = (await get().catch(handleError)) as AppSettings
 
 const defaultFullscreen = globalSettings.force_fullscreen
 const defaultResolution = globalSettings.game_resolution.slice() as [number, number]
 
-function isResolutionOverridden(resolution: [number, number]) {
-	return resolution.some((dimension, index) => Number(dimension) !== defaultResolution[index])
-}
-
-const { draft } = useInstanceSettingsDraft(
+const draft = createDraft<{
+	fullscreen: boolean | null
+	resolution: [number, number] | null
+}>(
 	{
-		fullscreen: instance.value.force_fullscreen ?? defaultFullscreen,
-		resolution: instance.value.game_resolution ?? defaultResolution,
+		fullscreen: instance.value.force_fullscreen ?? null,
+		resolution: instance.value.game_resolution ?? null,
 	},
 	(value) =>
 		edit(instance.value.id, {
-			force_fullscreen: value.fullscreen !== defaultFullscreen ? value.fullscreen : null,
-			game_resolution: isResolutionOverridden(value.resolution) ? value.resolution : null,
+			force_fullscreen: value.fullscreen,
+			game_resolution: value.resolution,
 		}),
 )
 
-const fullscreenOverridden = computed(() => draft.value.fullscreen !== defaultFullscreen)
-const widthOverridden = computed(() => Number(draft.value.resolution[0]) !== defaultResolution[0])
-const heightOverridden = computed(() => Number(draft.value.resolution[1]) !== defaultResolution[1])
+const fullscreen = computed(() => draft.value.fullscreen ?? defaultFullscreen)
+const resolution = computed(() => draft.value.resolution ?? defaultResolution)
+
+function setDimension(index: 0 | 1, value: number) {
+	const next = resolution.value.slice() as [number, number]
+	next[index] = value
+	draft.value.resolution = next
+}
+
+function resetDimension(index: 0 | 1) {
+	setDimension(index, defaultResolution[index])
+	if (resolution.value.every((dimension, i) => Number(dimension) === defaultResolution[i])) {
+		draft.value.resolution = null
+	}
+}
 
 const messages = defineMessages({
 	defaultSettingsDescription: {
@@ -97,11 +109,15 @@ const messages = defineMessages({
 				</p>
 			</div>
 			<div class="flex shrink-0 items-center gap-2">
-				<Toggle id="fullscreen" v-model="draft.fullscreen" />
+				<Toggle
+					id="fullscreen"
+					:model-value="fullscreen"
+					@update:model-value="(value) => (draft.fullscreen = value)"
+				/>
 				<ResetToDefaultButton
-					:disabled="!fullscreenOverridden"
+					:disabled="draft.fullscreen === null"
 					:setting="formatMessage(messages.fullscreen)"
-					@reset="draft.fullscreen = defaultFullscreen"
+					@reset="draft.fullscreen = null"
 				/>
 			</div>
 		</div>
@@ -118,16 +134,17 @@ const messages = defineMessages({
 			<div class="flex shrink-0 items-center gap-2">
 				<Input
 					id="width"
-					v-model="draft.resolution[0]"
+					:model-value="resolution[0]"
 					autocomplete="off"
-					:disabled="draft.fullscreen"
+					:disabled="fullscreen"
 					type="number"
 					:placeholder="formatMessage(messages.enterWidth)"
+					@update:model-value="(value) => setDimension(0, Number(value))"
 				/>
 				<ResetToDefaultButton
-					:disabled="!widthOverridden"
+					:disabled="draft.resolution === null"
 					:setting="formatMessage(messages.width)"
-					@reset="draft.resolution[0] = defaultResolution[0]"
+					@reset="resetDimension(0)"
 				/>
 			</div>
 		</div>
@@ -144,16 +161,17 @@ const messages = defineMessages({
 			<div class="flex shrink-0 items-center gap-2">
 				<Input
 					id="height"
-					v-model="draft.resolution[1]"
+					:model-value="resolution[1]"
 					autocomplete="off"
-					:disabled="draft.fullscreen"
+					:disabled="fullscreen"
 					type="number"
 					:placeholder="formatMessage(messages.enterHeight)"
+					@update:model-value="(value) => setDimension(1, Number(value))"
 				/>
 				<ResetToDefaultButton
-					:disabled="!heightOverridden"
+					:disabled="draft.resolution === null"
 					:setting="formatMessage(messages.height)"
-					@reset="draft.resolution[1] = defaultResolution[1]"
+					@reset="resetDimension(1)"
 				/>
 			</div>
 		</div>

From 5b2360b09d19b4acea038046e20948312ed701aa Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Tue, 10 Nov 2026 18:55:55 +0000
Subject: [PATCH 3/7] fix: java

---
 .../src/components/ui/JavaSelector.vue        | 477 +++++++++---------
 .../src/composables/useJavaTest.ts            |  57 +--
 .../settings/app-settings-modal/index.vue     |  12 +-
 .../app-frontend/src/locales/en-US/index.json |  38 +-
 .../ui/src/components/modal/TabbedModal.vue   |  25 +-
 .../settings/AccountSocialSettings.vue        |   2 +-
 packages/ui/src/locales/en-US/index.json      |   2 +-
 7 files changed, 310 insertions(+), 303 deletions(-)

diff --git a/apps/app-frontend/src/components/ui/JavaSelector.vue b/apps/app-frontend/src/components/ui/JavaSelector.vue
index 5f7b42e330e..d5964566e57 100644
--- a/apps/app-frontend/src/components/ui/JavaSelector.vue
+++ b/apps/app-frontend/src/components/ui/JavaSelector.vue
@@ -1,113 +1,115 @@
 <template>
 	<JavaDetectionModal ref="detectJavaModal" @submit="(val) => emit('update:modelValue', val)" />
-	<div :id="props.id" class="toggle-setting" :class="{ compact }">
-		<div class="input-with-status">
-			<Input
-				autocomplete="off"
-				:disabled="props.disabled"
-				:model-value="props.modelValue ? props.modelValue.path : ''"
-				:placeholder="placeholder ?? formatMessage(messages.pathPlaceholder)"
-				wrapper-class="installation-input"
-				@update:model-value="
-					(val) => {
-						emit('update:modelValue', {
-							...props.modelValue,
-							path: val,
-						})
-					}
-				"
-			/>
-			<Button
-				type="quiet"
-				:color="
-					!hoveringTest && !testingJava
-						? testingJavaSuccess === true
-							? 'green'
-							: 'red'
-						: undefined
-				"
-				:aria-label="formatMessage(messages.testJavaInstallation)"
-				class="!text-[var(--legacy-button-color,var(--color-base))] [&>svg]:!text-[var(--legacy-button-color,var(--color-primary))]"
-				:disabled="testingJava || props.disabled"
-				:style="{
-					'--legacy-button-color':
-						(!hoveringTest && !testingJava
-							? testingJavaSuccess === true
-								? 'green'
-								: 'red'
-							: 'standard') &&
-						(!hoveringTest && !testingJava
-							? testingJavaSuccess === true
-								? 'green'
-								: 'red'
-							: 'standard') !== 'standard'
-							? `var(--color-${
-									!hoveringTest && !testingJava
-										? testingJavaSuccess === true
-											? 'green'
-											: 'red'
-										: 'standard'
-								})`
-							: undefined,
-				}"
-				@click="runTest(props.modelValue?.path)"
-				@mouseenter="!props.disabled && (hoveringTest = true)"
-				@mouseleave="hoveringTest = false"
+	<div
+		:id="id"
+		class="flex flex-col gap-3 rounded-2xl border border-solid border-surface-5 bg-surface-3 p-4"
+	>
+		<Input
+			v-if="editingPath"
+			ref="pathInput"
+			v-model="pathDraft"
+			autocomplete="off"
+			:placeholder="placeholder ?? formatMessage(messages.pathPlaceholder)"
+			wrapper-class="w-full"
+			@keydown.enter="commitPath"
+			@keydown.esc="editingPath = false"
+			@blur="commitPath"
+		/>
+		<Button
+			v-else
+			v-tooltip="path ? formatMessage(messages.copyPath) : undefined"
+			size="lg"
+			class="w-full !justify-between text-left"
+			:disabled="!path"
+			@click="copyPath"
+		>
+			<span
+				class="min-w-0 truncate text-base font-semibold"
+				:class="path ? 'text-primary' : 'text-secondary'"
 			>
-				<SpinnerIcon v-if="testingJava" class="animate-spin h-4 w-4" />
-				<CheckCircleIcon v-else-if="testingJavaSuccess === true && !hoveringTest" class="h-4 w-4" />
-				<XCircleIcon v-else-if="testingJavaSuccess !== true && !hoveringTest" class="h-4 w-4" />
-				<RefreshCwIcon v-else-if="!props.disabled" class="h-4 w-4" />
-			</Button>
-		</div>
-		<span class="installation-buttons">
-			<Button
-				v-if="props.version"
-				v-tooltip="
-					testingJavaSuccess === true ? formatMessage(messages.alreadyInstalled) : undefined
-				"
-				:disabled="props.disabled || installingJava || testingJavaSuccess === true"
-				@click="reinstallJava"
+				{{ path || formatMessage(messages.notSet) }}
+			</span>
+			<ClipboardCopyIcon class="size-5 shrink-0 text-secondary" aria-hidden="true" />
+		</Button>
+
+		<div
+			class="flex flex-wrap items-center gap-2"
+			:class="status === 'empty' ? 'justify-end' : 'justify-between'"
+		>
+			<span v-if="status === 'checking'" class="flex items-center gap-1.5 text-secondary">
+				<SpinnerIcon class="size-4 animate-spin" aria-hidden="true" />
+				{{ formatMessage(messages.checking) }}
+			</span>
+			<span
+				v-else-if="status !== 'empty'"
+				class="flex items-center gap-1.5 font-medium"
+				:class="status === 'valid' ? 'text-green' : 'text-red'"
 			>
-				<DownloadIcon />
-				{{
-					installingJava
-						? formatMessage(messages.installing)
-						: formatMessage(messages.installRecommended)
-				}}
-			</Button>
-			<Button :disabled="props.disabled" @click="autoDetect">
-				<SearchIcon />
-				{{ formatMessage(messages.detect) }}
-			</Button>
-			<Button :disabled="props.disabled" @click="handleJavaFileInput()">
-				<FolderSearchIcon />
-				{{ formatMessage(messages.browse) }}
-			</Button>
-		</span>
+				<CheckCircleIcon v-if="status === 'valid'" class="size-4" aria-hidden="true" />
+				<XCircleIcon v-else class="size-4" aria-hidden="true" />
+				{{ formatMessage(status === 'valid' ? messages.valid : messages.invalid) }}
+			</span>
+
+			<div class="flex flex-wrap items-center gap-2">
+				<Button
+					v-if="version && (status === 'empty' || status === 'invalid')"
+					type="colored"
+					color="brand"
+					:disabled="disabled || installingJava"
+					@click="installRecommended"
+				>
+					<SpinnerIcon v-if="installingJava" class="animate-spin" aria-hidden="true" />
+					<DownloadIcon v-else aria-hidden="true" />
+					{{
+						installingJava
+							? formatMessage(messages.installing)
+							: formatMessage(messages.installJava, { version })
+					}}
+				</Button>
+				<SplitButton
+					:menu-label="formatMessage(messages.moreOptions)"
+					:options="menuOptions"
+					:disabled="disabled"
+					@click="detectJavaModal?.show(version, modelValue)"
+				>
+					<SearchIcon aria-hidden="true" />
+					{{ formatMessage(messages.detect) }}
+				</SplitButton>
+			</div>
+		</div>
 	</div>
 </template>
 
-<script setup>
+<script setup lang="ts">
 import {
 	CheckCircleIcon,
+	ClipboardCopyIcon,
 	DownloadIcon,
+	EditIcon,
 	FolderSearchIcon,
-	RefreshCwIcon,
 	SearchIcon,
 	SpinnerIcon,
 	XCircleIcon,
 } from '@modrinth/assets'
-import { Button, defineMessages, injectNotificationManager, Input, useVIntl } from '@modrinth/ui'
+import {
+	Button,
+	type ButtonMenuOption,
+	defineMessages,
+	injectNotificationManager,
+	Input,
+	SplitButton,
+	useVIntl,
+} from '@modrinth/ui'
 import { open } from '@tauri-apps/plugin-dialog'
-import { ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 
 import JavaDetectionModal from '@/components/ui/JavaDetectionModal.vue'
 import useJavaTest from '@/composables/useJavaTest'
 import { trackEvent } from '@/helpers/analytics'
-import { auto_install_java, find_filtered_jres, get_jre } from '@/helpers/jre.js'
+import type { JavaVersion } from '@/helpers/instance'
+import { auto_install_java, get_jre } from '@/helpers/jre.js'
 
-const { handleError } = injectNotificationManager()
+const { handleError, addNotification } = injectNotificationManager()
 const { formatMessage } = useVIntl()
 
 const messages = defineMessages({
@@ -115,190 +117,193 @@ const messages = defineMessages({
 		id: 'app.java-selector.path.placeholder',
 		defaultMessage: '/path/to/java',
 	},
-	testJavaInstallation: {
-		id: 'app.java-selector.test-installation',
-		defaultMessage: 'Test Java installation',
+	notSet: {
+		id: 'app.java-selector.not-set',
+		defaultMessage: 'No Java selected',
+	},
+	copyPath: {
+		id: 'app.java-selector.copy-path',
+		defaultMessage: 'Copy path',
+	},
+	pathCopiedTitle: {
+		id: 'app.java-selector.path-copied-title',
+		defaultMessage: 'Path copied',
 	},
-	alreadyInstalled: {
-		id: 'app.java-selector.already-installed',
-		defaultMessage: 'Already installed',
+	pathCopiedText: {
+		id: 'app.java-selector.path-copied-text',
+		defaultMessage: 'The Java path has been copied to your clipboard.',
+	},
+	copyFailedTitle: {
+		id: 'app.java-selector.copy-failed-title',
+		defaultMessage: 'Failed to copy path',
+	},
+	checking: {
+		id: 'app.java-selector.checking',
+		defaultMessage: 'Checking Java…',
+	},
+	valid: {
+		id: 'app.java-selector.valid',
+		defaultMessage: 'Valid',
+	},
+	invalid: {
+		id: 'app.java-selector.invalid',
+		defaultMessage: 'Invalid',
+	},
+	installJava: {
+		id: 'app.java-selector.install-java',
+		defaultMessage: 'Install Java {version}',
 	},
 	installing: {
 		id: 'app.java-selector.installing',
 		defaultMessage: 'Installing...',
 	},
-	installRecommended: {
-		id: 'app.java-selector.install-recommended',
-		defaultMessage: 'Install recommended',
+	browse: {
+		id: 'app.java-selector.browse',
+		defaultMessage: 'Browse',
+	},
+	moreOptions: {
+		id: 'app.java-selector.more-options',
+		defaultMessage: 'More Java options',
 	},
 	detect: {
 		id: 'app.java-selector.detect',
 		defaultMessage: 'Detect',
 	},
-	browse: {
-		id: 'app.java-selector.browse',
-		defaultMessage: 'Browse',
+	editPath: {
+		id: 'app.java-selector.edit-path',
+		defaultMessage: 'Edit path',
 	},
 })
 
-const props = defineProps({
-	id: {
-		type: String,
-		required: false,
-		default: null,
-	},
-	version: {
-		type: Number,
-		required: false,
-		default: null,
-	},
-	modelValue: {
-		type: Object,
-		default: () => ({
-			path: '',
-			version: '',
-		}),
-	},
-	disabled: {
-		type: Boolean,
-		required: false,
-		default: false,
-	},
-	placeholder: {
-		type: String,
-		required: false,
-		default: null,
-	},
-	compact: {
-		type: Boolean,
-		default: false,
+type JavaSelection = Partial<JavaVersion>
+
+const props = withDefaults(
+	defineProps<{
+		id?: string
+		version?: number | null
+		modelValue?: JavaSelection | null
+		disabled?: boolean
+		placeholder?: string
+	}>(),
+	{
+		id: undefined,
+		version: null,
+		modelValue: null,
+		disabled: false,
+		placeholder: undefined,
 	},
-})
+)
 
-const emit = defineEmits(['update:modelValue'])
+const emit = defineEmits<{
+	'update:modelValue': [value: JavaSelection]
+}>()
 
-const {
-	testingJava,
-	javaTestResult: testingJavaSuccess,
-	testJavaInstallationDebounced,
-	testJavaInstallation,
-} = useJavaTest()
+const { status, checkJava } = useJavaTest()
 
+const path = computed(() => props.modelValue?.path ?? '')
 const installingJava = ref(false)
-const hoveringTest = ref(false)
-let hasInitialized = false
+const editingPath = ref(false)
+const pathDraft = ref('')
+const pathInput = ref<InstanceType<typeof Input>>()
+const detectJavaModal = ref<InstanceType<typeof JavaDetectionModal>>()
 
-async function runTest(path) {
-	await testJavaInstallation(path, props.version, true)
-}
+watch(path, (newPath) => checkJava(newPath, props.version), { immediate: true })
 
-watch(
-	() => props.modelValue?.path,
-	(newPath) => {
-		if (newPath) {
-			if (!hasInitialized) {
-				testJavaInstallation(newPath, props.version, false)
-				hasInitialized = true
-			} else {
-				testJavaInstallationDebounced(newPath, props.version)
-			}
-		}
+const menuOptions = computed<ButtonMenuOption[]>(() => [
+	{
+		id: 'install',
+		label: formatMessage(messages.installJava, { version: props.version }),
+		icon: DownloadIcon,
+		shown: !!props.version && status.value === 'valid',
+		disabled: installingJava.value,
+		action: installRecommended,
 	},
-	{ immediate: true },
-)
-
-async function handleJavaFileInput() {
-	const filePath = await open()
-
-	if (filePath) {
-		let result = await get_jre(filePath.path ?? filePath).catch(handleError)
-		if (!result) {
-			result = {
-				path: filePath.path ?? filePath,
-				version: props.version?.toString() ?? '',
-				parsed_version: props.version,
-				architecture: 'x86',
-			}
-		}
-
-		trackEvent('JavaManualSelect', {
-			version: props.version,
-		})
+	{
+		id: 'browse',
+		label: formatMessage(messages.browse),
+		icon: FolderSearchIcon,
+		action: browse,
+	},
+	{
+		id: 'enter-path',
+		label: formatMessage(messages.editPath),
+		icon: EditIcon,
+		action: startEditingPath,
+	},
+])
 
-		emit('update:modelValue', result)
+function fallbackSelection(selectedPath: string): JavaSelection {
+	return {
+		path: selectedPath,
+		version: props.version?.toString() ?? '',
+		parsed_version: props.version ?? undefined,
+		architecture: 'x86',
 	}
 }
 
-const detectJavaModal = ref(null)
-async function autoDetect() {
-	if (!props.compact) {
-		detectJavaModal.value.show(props.version, props.modelValue)
-	} else {
-		const versions = await find_filtered_jres(props.version).catch(handleError)
-		if (versions.length > 0) {
-			emit('update:modelValue', versions[0])
-		}
-	}
+async function selectPath(selectedPath: string) {
+	const result: JavaVersion | null = await get_jre(selectedPath).catch(() => null)
+	emit('update:modelValue', result ?? fallbackSelection(selectedPath))
 }
 
-async function reinstallJava() {
-	installingJava.value = true
-	const path = await auto_install_java(props.version).catch(handleError)
-	let result = await get_jre(path)
+async function browse() {
+	const selected = await open()
+	if (!selected) return
 
-	if (!result) {
-		result = {
-			path: path,
-			version: props.version.toString(),
-			parsed_version: props.version,
-			architecture: 'x86',
-		}
-	}
+	trackEvent('JavaManualSelect', { version: props.version?.toString() ?? '' })
+	await selectPath(selected)
+}
 
-	trackEvent('JavaReInstall', {
-		path: path,
-		version: props.version,
+function startEditingPath() {
+	pathDraft.value = path.value
+	editingPath.value = true
+	setTimeout(() => {
+		pathInput.value?.focus()
+		pathInput.value?.select()
 	})
-
-	emit('update:modelValue', result)
-	installingJava.value = false
-	runTest(result.path)
 }
-</script>
 
-<style lang="scss" scoped>
-.input-with-status {
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	gap: 0.5rem;
-	width: 100%;
-	min-width: 0;
-}
+async function commitPath() {
+	if (!editingPath.value) return
+	editingPath.value = false
 
-.installation-input {
-	flex: 1 1 0;
-	min-width: 0;
+	const newPath = pathDraft.value.trim()
+	if (newPath === path.value) return
+	if (!newPath) {
+		emit('update:modelValue', { ...props.modelValue, path: '' })
+		return
+	}
+	await selectPath(newPath)
 }
 
-.toggle-setting {
-	display: flex;
-	flex-wrap: wrap;
-	flex-direction: row;
-	justify-content: space-between;
-	align-items: center;
-	gap: 0.5rem;
-
-	&.compact {
-		flex-wrap: wrap;
+async function copyPath() {
+	try {
+		await navigator.clipboard.writeText(path.value)
+		addNotification({
+			type: 'success',
+			title: formatMessage(messages.pathCopiedTitle),
+			text: formatMessage(messages.pathCopiedText),
+		})
+	} catch (error) {
+		addNotification({
+			type: 'error',
+			title: formatMessage(messages.copyFailedTitle),
+			text: error instanceof Error ? error.message : String(error),
+		})
 	}
 }
 
-.installation-buttons {
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	gap: 0.5rem;
-	margin: 0;
+async function installRecommended() {
+	if (!props.version || installingJava.value) return
+
+	installingJava.value = true
+	try {
+		const installedPath: string | undefined = await auto_install_java(props.version).catch(
+			handleError,
+		)
+		if (installedPath) await selectPath(installedPath)
+	} finally {
+		installingJava.value = false
+	}
 }
-</style>
+</script>
diff --git a/apps/app-frontend/src/composables/useJavaTest.ts b/apps/app-frontend/src/composables/useJavaTest.ts
index 448854454c6..9e5575148a2 100644
--- a/apps/app-frontend/src/composables/useJavaTest.ts
+++ b/apps/app-frontend/src/composables/useJavaTest.ts
@@ -1,53 +1,30 @@
 import { ref } from 'vue'
 
-import { trackEvent } from '@/helpers/analytics'
-import { get_jre, test_jre } from '@/helpers/jre.js'
+import type { JavaVersion } from '@/helpers/instance'
+import { get_jre } from '@/helpers/jre.js'
+
+export type JavaStatus = 'empty' | 'checking' | 'valid' | 'invalid'
 
 export default function useJavaTest() {
-	const testingJava = ref(false)
-	const javaTestResult = ref<boolean | null>(null)
-	let testDebounceTimer: ReturnType<typeof setTimeout> | null = null
+	const status = ref<JavaStatus>('empty')
+	let latestCheck = 0
 
-	async function runJavaTest(path: string, version: number | null, track = true) {
-		if (testDebounceTimer) {
-			clearTimeout(testDebounceTimer)
-			testDebounceTimer = null
-		}
+	async function checkJava(path: string | undefined, majorVersion: number | null) {
+		const check = ++latestCheck
 		if (!path) {
-			javaTestResult.value = null
+			status.value = 'empty'
 			return
 		}
-		testingJava.value = true
-		try {
-			javaTestResult.value =
-				version === null ? !!(await get_jre(path)) : await test_jre(path, version)
-		} catch {
-			javaTestResult.value = false
-		}
-		testingJava.value = false
 
-		if (track) {
-			trackEvent('JavaTest', { path, success: javaTestResult.value })
-		}
-	}
+		status.value = 'checking'
+		const result: JavaVersion | null = await get_jre(path).catch(() => null)
+		if (check !== latestCheck) return
 
-	function testJavaInstallationDebounced(path: string, version: number | null, delay = 600) {
-		if (testDebounceTimer) clearTimeout(testDebounceTimer)
-		if (!path) {
-			javaTestResult.value = null
-			return
-		}
-		testDebounceTimer = setTimeout(() => runJavaTest(path, version, false), delay)
+		status.value =
+			result && (majorVersion === null || result.parsed_version === majorVersion)
+				? 'valid'
+				: 'invalid'
 	}
 
-	async function testJavaInstallation(path: string, version: number | null, track = false) {
-		await runJavaTest(path, version, track)
-	}
-
-	return {
-		testingJava,
-		javaTestResult,
-		testJavaInstallationDebounced,
-		testJavaInstallation,
-	}
+	return { status, checkJava }
 }
diff --git a/apps/app-frontend/src/features/settings/app-settings-modal/index.vue b/apps/app-frontend/src/features/settings/app-settings-modal/index.vue
index 567bc7d7247..e6930ec89f2 100644
--- a/apps/app-frontend/src/features/settings/app-settings-modal/index.vue
+++ b/apps/app-frontend/src/features/settings/app-settings-modal/index.vue
@@ -385,13 +385,11 @@ const messages = defineMessages({
 		</template>
 		<template #footer>
 			<div class="mt-auto text-secondary text-sm">
-				<div class="mb-3">
-					<template v-if="progress > 0 && progress < 1">
-						<p class="m-0 mb-2">
-							{{ formatMessage(messages.downloading, { version: downloadingVersion }) }}
-						</p>
-						<ProgressBar :progress="progress" />
-					</template>
+				<div v-if="progress > 0 && progress < 1" class="mb-3">
+					<p class="m-0 mb-2">
+						{{ formatMessage(messages.downloading, { version: downloadingVersion }) }}
+					</p>
+					<ProgressBar :progress="progress" />
 				</div>
 				<p v-if="appSettings.devMode" class="text-brand font-semibold m-0 mb-2">
 					{{ formatMessage(developerModeEnabled) }}
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 8d484415133..7d3ca9f06b0 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -1022,26 +1022,50 @@
   "app.java-detection.title": {
     "message": "Select Java installation"
   },
-  "app.java-selector.already-installed": {
-    "message": "Already installed"
-  },
   "app.java-selector.browse": {
     "message": "Browse"
   },
+  "app.java-selector.checking": {
+    "message": "Checking Java…"
+  },
+  "app.java-selector.copy-failed-title": {
+    "message": "Failed to copy path"
+  },
+  "app.java-selector.copy-path": {
+    "message": "Copy path"
+  },
   "app.java-selector.detect": {
     "message": "Detect"
   },
-  "app.java-selector.install-recommended": {
-    "message": "Install recommended"
+  "app.java-selector.edit-path": {
+    "message": "Edit path"
+  },
+  "app.java-selector.install-java": {
+    "message": "Install Java {version}"
   },
   "app.java-selector.installing": {
     "message": "Installing..."
   },
+  "app.java-selector.invalid": {
+    "message": "Invalid"
+  },
+  "app.java-selector.more-options": {
+    "message": "More Java options"
+  },
+  "app.java-selector.not-set": {
+    "message": "No Java selected"
+  },
+  "app.java-selector.path-copied-text": {
+    "message": "The Java path has been copied to your clipboard."
+  },
+  "app.java-selector.path-copied-title": {
+    "message": "Path copied"
+  },
   "app.java-selector.path.placeholder": {
     "message": "/path/to/java"
   },
-  "app.java-selector.test-installation": {
-    "message": "Test Java installation"
+  "app.java-selector.valid": {
+    "message": "Valid"
   },
   "app.library.actions.label": {
     "message": "Library actions"
diff --git a/packages/ui/src/components/modal/TabbedModal.vue b/packages/ui/src/components/modal/TabbedModal.vue
index 9d5b3445c0a..689a898771f 100644
--- a/packages/ui/src/components/modal/TabbedModal.vue
+++ b/packages/ui/src/components/modal/TabbedModal.vue
@@ -180,6 +180,9 @@ const {
 	showBottomFade: showSidebarBottomFade,
 	checkScrollState: checkSidebarScrollState,
 } = useScrollIndicator(sidebarScrollContainer)
+const showSidebarBottomDivider = computed(
+	() => showSidebarTopFade.value || showSidebarBottomFade.value,
+)
 
 function setTab(index: number): boolean {
 	if (index === selectedTab.value && !props.hideTabSelection) return true
@@ -352,7 +355,7 @@ const sidebarClass = computed(() => {
 		case 'rail':
 			return 'py-3'
 		default:
-			return 'gap-2 p-4'
+			return slots.footer ? 'gap-2 px-4 pb-2 pt-4' : 'gap-2 px-4 pt-4'
 	}
 })
 
@@ -502,7 +505,7 @@ defineExpose({ show, hide, selectedTab, setTab })
 					<nav
 						v-if="layout === 'rail'"
 						ref="sidebarScrollContainer"
-						class="tabbed-modal-scrollbar flex h-full flex-col gap-1 overflow-y-auto overflow-x-hidden overscroll-contain px-3"
+						class="tabbed-modal-scrollbar flex h-full flex-col gap-1 overflow-y-auto overflow-x-hidden overscroll-contain px-3 pb-2"
 						@scroll="checkSidebarScrollState"
 					>
 						<template v-for="(tab, index) in visibleTabs" :key="index">
@@ -620,7 +623,7 @@ defineExpose({ show, hide, selectedTab, setTab })
 					<div
 						v-else
 						ref="sidebarScrollContainer"
-						class="tabbed-modal-scrollbar -mr-3 flex h-full flex-col gap-1 overflow-y-auto overscroll-contain pr-3"
+						class="tabbed-modal-scrollbar -mr-3 flex h-full flex-col gap-1 overflow-y-auto overscroll-contain pb-4 pr-3"
 						@scroll="checkSidebarScrollState"
 					>
 						<template v-for="(tab, index) in visibleTabs" :key="index">
@@ -658,16 +661,16 @@ defineExpose({ show, hide, selectedTab, setTab })
 					</div>
 
 					<Transition
-						enter-active-class="transition-all duration-200 ease-out"
-						enter-from-class="opacity-0 max-h-0"
-						enter-to-class="opacity-100 max-h-14"
-						leave-active-class="transition-all duration-200 ease-in"
-						leave-from-class="opacity-100 max-h-14"
-						leave-to-class="opacity-0 max-h-0"
+						enter-active-class="transition-opacity duration-200 ease-out"
+						enter-from-class="opacity-0"
+						leave-active-class="transition-opacity duration-200 ease-in"
+						leave-to-class="opacity-0"
 					>
 						<div
-							v-if="showSidebarBottomFade"
-							class="pointer-events-none absolute bottom-0 left-0 right-0 z-10 h-14 bg-gradient-to-t from-surface-3 via-surface-3 via-20% to-transparent"
+							v-if="showSidebarBottomDivider"
+							aria-hidden="true"
+							class="pointer-events-none absolute bottom-0 z-10 h-px bg-surface-5"
+							:class="layout === 'rail' ? 'inset-x-0' : '-inset-x-4'"
 						/>
 					</Transition>
 				</div>
diff --git a/packages/ui/src/layouts/wrapped/settings/AccountSocialSettings.vue b/packages/ui/src/layouts/wrapped/settings/AccountSocialSettings.vue
index b4e706bf8cb..956871a2ea9 100644
--- a/packages/ui/src/layouts/wrapped/settings/AccountSocialSettings.vue
+++ b/packages/ui/src/layouts/wrapped/settings/AccountSocialSettings.vue
@@ -515,7 +515,7 @@ const messages = defineMessages({
 	},
 	hostingRestriction: {
 		id: 'settings.social.blocked-users.restriction.hosting',
-		defaultMessage: 'Invite you to manage a Modrinth Hosting server.',
+		defaultMessage: 'Invite you to manage a Modrinth Hosting server',
 	},
 	userColumn: {
 		id: 'settings.social.blocked-users.column.user',
diff --git a/packages/ui/src/locales/en-US/index.json b/packages/ui/src/locales/en-US/index.json
index 12b8e3fe531..43eb9563288 100644
--- a/packages/ui/src/locales/en-US/index.json
+++ b/packages/ui/src/locales/en-US/index.json
@@ -7542,7 +7542,7 @@
     "defaultMessage": "Send you friend requests"
   },
   "settings.social.blocked-users.restriction.hosting": {
-    "defaultMessage": "Invite you to manage a Modrinth Hosting server."
+    "defaultMessage": "Invite you to manage a Modrinth Hosting server"
   },
   "settings.social.blocked-users.restriction.shared-instances": {
     "defaultMessage": "Invite you to shared instances"

From c6e1564e1ce1fe3a2440f5fbb4a824bcaa49b55d Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Wed, 11 Nov 2026 12:58:29 +0000
Subject: [PATCH 4/7] refactor: cleanup

---
 apps/app-frontend/src/App.vue                 |   2 +-
 .../src/components/ui/JavaDetectionModal.vue  | 130 ---------------
 .../src/composables/useJavaTest.ts            |  30 ----
 .../src/composables/useMemorySlider.js        |  23 ---
 .../settings-modal/hooks-settings.vue         |  33 ++--
 .../instances/settings-modal/index.vue        |  42 ++---
 .../instance-settings-context.ts              |   2 +-
 .../settings-modal/java-settings.vue          |  93 +++++------
 .../use-instance-settings-draft.ts            |  75 ++++-----
 .../settings-modal/window-settings.vue        |  32 ++--
 .../java/java-selector/detection-modal.vue    | 151 ++++++++++++++++++
 .../java/java-selector/index.vue}             |  74 +++++----
 .../src/features/java/memory-slider.vue       |  56 +++++++
 .../app-frontend/src/features/java/queries.ts |  52 ++++++
 .../settings/app-settings-modal/context.ts    |   9 +-
 .../settings/app-settings-modal/index.vue     |  52 ++----
 .../java-and-memory-settings/index.vue        |  25 +--
 .../java-installations.vue                    |  67 +++++---
 apps/app-frontend/src/helpers/instance.ts     |  15 --
 apps/app-frontend/src/helpers/jre.js          |  62 -------
 .../app-frontend/src/locales/en-US/index.json |   3 -
 .../src/pages/instance/query-options.ts       |  12 ++
 .../platform/app-lib/instances/commands.ts    |   5 +
 .../src/platform/app-lib/jre/commands.ts      |  27 ++++
 .../src/platform/app-lib/jre/types.ts         |   6 +
 apps/app-frontend/src/platform/dialogs.ts     |   5 +
 .../src/shared/unsaved-changes/types.ts       |   8 +
 .../use-unsaved-changes-host.ts               |  37 +++++
 28 files changed, 583 insertions(+), 545 deletions(-)
 delete mode 100644 apps/app-frontend/src/components/ui/JavaDetectionModal.vue
 delete mode 100644 apps/app-frontend/src/composables/useJavaTest.ts
 delete mode 100644 apps/app-frontend/src/composables/useMemorySlider.js
 create mode 100644 apps/app-frontend/src/features/java/java-selector/detection-modal.vue
 rename apps/app-frontend/src/{components/ui/JavaSelector.vue => features/java/java-selector/index.vue} (79%)
 create mode 100644 apps/app-frontend/src/features/java/memory-slider.vue
 create mode 100644 apps/app-frontend/src/features/java/queries.ts
 delete mode 100644 apps/app-frontend/src/helpers/jre.js
 create mode 100644 apps/app-frontend/src/platform/app-lib/instances/commands.ts
 create mode 100644 apps/app-frontend/src/platform/app-lib/jre/commands.ts
 create mode 100644 apps/app-frontend/src/platform/app-lib/jre/types.ts
 create mode 100644 apps/app-frontend/src/platform/dialogs.ts
 create mode 100644 apps/app-frontend/src/shared/unsaved-changes/types.ts
 create mode 100644 apps/app-frontend/src/shared/unsaved-changes/use-unsaved-changes-host.ts

diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 674ba88fe18..0844b05a1c1 100644
--- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue
@@ -105,6 +105,7 @@ import {
 	createInstanceLaunchState,
 	provideInstanceLaunchState,
 } from '@/features/instances/launch-state'
+import { maxMemoryQueryOptions } from '@/features/java/queries'
 import SharedInstanceLockNotice from '@/features/library/shared-instances/shared-instance-lock-notice.vue'
 import SharedInstanceModals from '@/features/library/shared-instances/shared-instance-modals.vue'
 import { provideMinecraftAccounts } from '@/features/minecraft-accounts/context'
@@ -131,7 +132,6 @@ import {
 	run,
 	set_global_synced_option,
 } from '@/helpers/instance'
-import { maxMemoryQueryOptions } from '@/helpers/jre.js'
 import {
 	get as getCreds,
 	getAll as getAllCreds,
diff --git a/apps/app-frontend/src/components/ui/JavaDetectionModal.vue b/apps/app-frontend/src/components/ui/JavaDetectionModal.vue
deleted file mode 100644
index 87858c7f6ea..00000000000
--- a/apps/app-frontend/src/components/ui/JavaDetectionModal.vue
+++ /dev/null
@@ -1,130 +0,0 @@
-<template>
-	<ModalWrapper
-		ref="detectJavaModal"
-		:header="formatMessage(messages.title)"
-		:show-ad-on-close="false"
-	>
-		<div class="flex flex-col gap-4">
-			<Table :columns="javaInstallColumns" :data="chosenInstallOptions" row-key="path">
-				<template #cell-version="{ value }">
-					<span class="font-semibold text-primary">{{ value }}</span>
-				</template>
-				<template #cell-path="{ value }">
-					<span v-tooltip="value" class="block truncate font-mono text-xs">{{ value }}</span>
-				</template>
-				<template #cell-actions="{ row }">
-					<div class="flex items-center justify-end">
-						<Button v-if="currentSelected.path === row.path" disabled>
-							<CheckIcon aria-hidden="true" />
-							{{ formatMessage(messages.selected) }}
-						</Button>
-						<Button v-else @click="setJavaInstall(row)">
-							<PlusIcon aria-hidden="true" />
-							{{ formatMessage(messages.select) }}
-						</Button>
-					</div>
-				</template>
-				<template #empty-state>
-					<div class="p-4 text-secondary">
-						{{ formatMessage(messages.noInstallationsFound) }}
-					</div>
-				</template>
-			</Table>
-			<div class="flex justify-end">
-				<Button
-					type="outlined"
-					class="!border-surface-4 !border"
-					@click="$refs.detectJavaModal.hide()"
-				>
-					<XIcon aria-hidden="true" />
-					{{ formatMessage(messages.cancel) }}
-				</Button>
-			</div>
-		</div>
-	</ModalWrapper>
-</template>
-<script setup>
-import { CheckIcon, PlusIcon, XIcon } from '@modrinth/assets'
-import { Button, defineMessages, injectNotificationManager, Table, useVIntl } from '@modrinth/ui'
-import { computed, ref } from 'vue'
-
-import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import { trackEvent } from '@/helpers/analytics'
-import { find_filtered_jres } from '@/helpers/jre.js'
-
-const { handleError } = injectNotificationManager()
-const { formatMessage } = useVIntl()
-
-const messages = defineMessages({
-	title: {
-		id: 'app.java-detection.title',
-		defaultMessage: 'Select Java installation',
-	},
-	versionColumn: {
-		id: 'app.java-detection.columns.version',
-		defaultMessage: 'Version',
-	},
-	pathColumn: {
-		id: 'app.java-detection.columns.path',
-		defaultMessage: 'Path',
-	},
-	actionsColumn: {
-		id: 'app.java-detection.columns.actions',
-		defaultMessage: 'Actions',
-	},
-	selected: {
-		id: 'app.java-detection.selected',
-		defaultMessage: 'Selected',
-	},
-	select: {
-		id: 'app.java-detection.select',
-		defaultMessage: 'Select',
-	},
-	noInstallationsFound: {
-		id: 'app.java-detection.no-installations-found',
-		defaultMessage: 'No Java installations found.',
-	},
-	cancel: {
-		id: 'app.java-detection.cancel',
-		defaultMessage: 'Cancel',
-	},
-})
-
-const chosenInstallOptions = ref([])
-const detectJavaModal = ref(null)
-const currentSelected = ref({})
-const javaInstallColumns = computed(() => [
-	{ key: 'version', label: formatMessage(messages.versionColumn), width: '9rem' },
-	{ key: 'path', label: formatMessage(messages.pathColumn) },
-	{
-		key: 'actions',
-		label: formatMessage(messages.actionsColumn),
-		align: 'right',
-		width: '10rem',
-	},
-])
-
-defineExpose({
-	show: async (version, currentSelectedJava) => {
-		chosenInstallOptions.value = await find_filtered_jres(version).catch(handleError)
-
-		currentSelected.value = currentSelectedJava
-		if (!currentSelected.value) {
-			currentSelected.value = { path: '', version: '' }
-		}
-
-		detectJavaModal.value.show()
-	},
-})
-
-const emit = defineEmits(['submit'])
-
-function setJavaInstall(javaInstall) {
-	emit('submit', javaInstall)
-	detectJavaModal.value.hide()
-	trackEvent('JavaAutoDetect', {
-		path: javaInstall.path,
-		version: javaInstall.version,
-	})
-}
-</script>
diff --git a/apps/app-frontend/src/composables/useJavaTest.ts b/apps/app-frontend/src/composables/useJavaTest.ts
deleted file mode 100644
index 9e5575148a2..00000000000
--- a/apps/app-frontend/src/composables/useJavaTest.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { ref } from 'vue'
-
-import type { JavaVersion } from '@/helpers/instance'
-import { get_jre } from '@/helpers/jre.js'
-
-export type JavaStatus = 'empty' | 'checking' | 'valid' | 'invalid'
-
-export default function useJavaTest() {
-	const status = ref<JavaStatus>('empty')
-	let latestCheck = 0
-
-	async function checkJava(path: string | undefined, majorVersion: number | null) {
-		const check = ++latestCheck
-		if (!path) {
-			status.value = 'empty'
-			return
-		}
-
-		status.value = 'checking'
-		const result: JavaVersion | null = await get_jre(path).catch(() => null)
-		if (check !== latestCheck) return
-
-		status.value =
-			result && (majorVersion === null || result.parsed_version === majorVersion)
-				? 'valid'
-				: 'invalid'
-	}
-
-	return { status, checkJava }
-}
diff --git a/apps/app-frontend/src/composables/useMemorySlider.js b/apps/app-frontend/src/composables/useMemorySlider.js
deleted file mode 100644
index fb9d577659c..00000000000
--- a/apps/app-frontend/src/composables/useMemorySlider.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { useQuery } from '@tanstack/vue-query'
-import { computed } from 'vue'
-
-import { maxMemoryQueryOptions } from '@/helpers/jre.js'
-
-export default function () {
-	const memoryQuery = useQuery(maxMemoryQueryOptions())
-	const maxMemory = computed(() => Math.floor((memoryQuery.data.value ?? 0) / 1024))
-
-	const snapPoints = computed(() => {
-		let points = []
-		let memory = 2048
-
-		while (memory <= maxMemory.value) {
-			points.push(memory)
-			memory *= 2
-		}
-
-		return points
-	})
-
-	return { maxMemory, snapPoints, memoryQuery }
-}
diff --git a/apps/app-frontend/src/features/instances/settings-modal/hooks-settings.vue b/apps/app-frontend/src/features/instances/settings-modal/hooks-settings.vue
index 55e082c3f23..62e259d5987 100644
--- a/apps/app-frontend/src/features/instances/settings-modal/hooks-settings.vue
+++ b/apps/app-frontend/src/features/instances/settings-modal/hooks-settings.vue
@@ -1,37 +1,29 @@
 <script setup lang="ts">
 import { defineMessages, injectNotificationManager, Input, useVIntl } from '@modrinth/ui'
+import { useQuery } from '@tanstack/vue-query'
+import { computed } from 'vue'
 
 import { edit } from '@/helpers/instance'
-import { get } from '@/helpers/settings.ts'
-import type { AppSettings } from '@/helpers/types'
+import { appSettingsQueryOptions } from '@/helpers/settings.ts'
 
 import DefaultSettingsIntro from './default-settings-intro.vue'
 import { injectInstanceSettings } from './instance-settings-context'
 import ResetToDefaultButton from './reset-to-default-button.vue'
 import { useInstanceSettingsDraft } from './use-instance-settings-draft'
 
+type HookKey = 'pre_launch' | 'wrapper' | 'post_exit'
+
 const { handleError } = injectNotificationManager()
 const { formatMessage } = useVIntl()
 
 const { instance } = injectInstanceSettings()
-const { createDraft } = useInstanceSettingsDraft()
-
-const globalSettings = (await get().catch(handleError)) as AppSettings
-
-type HookKey = 'pre_launch' | 'wrapper' | 'post_exit'
 
-const defaultHooks: Record<HookKey, string> = {
-	pre_launch: globalSettings.hooks.pre_launch ?? '',
-	wrapper: globalSettings.hooks.wrapper ?? '',
-	post_exit: globalSettings.hooks.post_exit ?? '',
-}
-
-const hooks = createDraft<Record<HookKey, string | null>>(
-	{
+const hooks = useInstanceSettingsDraft<Record<HookKey, string | null>>(
+	() => ({
 		pre_launch: instance.value.hooks.pre_launch || null,
 		wrapper: instance.value.hooks.wrapper || null,
 		post_exit: instance.value.hooks.post_exit || null,
-	},
+	}),
 	(value) =>
 		edit(instance.value.id, {
 			hooks: {
@@ -42,6 +34,15 @@ const hooks = createDraft<Record<HookKey, string | null>>(
 		}),
 )
 
+const settingsQuery = useQuery(appSettingsQueryOptions())
+await settingsQuery.suspense().catch(handleError)
+
+const defaultHooks = computed<Record<HookKey, string>>(() => ({
+	pre_launch: settingsQuery.data.value?.hooks.pre_launch ?? '',
+	wrapper: settingsQuery.data.value?.hooks.wrapper ?? '',
+	post_exit: settingsQuery.data.value?.hooks.post_exit ?? '',
+}))
+
 const messages = defineMessages({
 	defaultSettingsDescription: {
 		id: 'instance.settings.tabs.hooks.default-settings-description',
diff --git a/apps/app-frontend/src/features/instances/settings-modal/index.vue b/apps/app-frontend/src/features/instances/settings-modal/index.vue
index df0944234d7..e223e941715 100644
--- a/apps/app-frontend/src/features/instances/settings-modal/index.vue
+++ b/apps/app-frontend/src/features/instances/settings-modal/index.vue
@@ -23,12 +23,12 @@ import type { PlatformTag } from '@modrinth/utils'
 import { useQuery, useQueryClient } from '@tanstack/vue-query'
 import { computed, ref, watch } from 'vue'
 
-import type { UnsavedChangesController } from '@/features/settings/app-settings-modal/context'
 import { get_project_v3 } from '@/helpers/cache'
 import { get_linked_modpack_info, getInstanceIconUrl } from '@/helpers/instance'
 import { get_loader_versions } from '@/helpers/metadata'
 import { get_game_versions, get_loaders } from '@/helpers/tags'
 import type { GameInstance } from '@/helpers/types'
+import { useUnsavedChangesHost } from '@/shared/unsaved-changes/use-unsaved-changes-host'
 
 import GeneralSettings from './general-settings.vue'
 import HooksSettings from './hooks-settings.vue'
@@ -68,31 +68,17 @@ function handleAfterHide() {
 	callback?.()
 }
 
-const unsavedChangesPopup = ref<{ nudge: () => void } | null>(null)
-const unsavedChangesController = ref<UnsavedChangesController | null>(null)
-const emptyUnsavedChangesState: Record<string, unknown> = {}
-const originalUnsavedChangesState = computed(
-	() => unsavedChangesController.value?.getOriginal() ?? emptyUnsavedChangesState,
-)
-const modifiedUnsavedChangesState = computed(
-	() => unsavedChangesController.value?.getModified() ?? emptyUnsavedChangesState,
-)
-const savingUnsavedChanges = computed(() => unsavedChangesController.value?.isSaving() ?? false)
-const hasUnsavedChanges = computed(
-	() =>
-		(unsavedChangesController.value?.hasChanges() ?? false) ||
-		(unsavedChangesController.value?.isSaving() ?? false),
-)
-
-function canLeaveCurrentTab(): boolean {
-	if (!hasUnsavedChanges.value) return true
-	unsavedChangesPopup.value?.nudge()
-	return false
-}
-
-function registerUnsavedChangesController(controller: UnsavedChangesController | null): void {
-	unsavedChangesController.value = controller
-}
+const {
+	popup: unsavedChangesPopup,
+	original: originalUnsavedChangesState,
+	modified: modifiedUnsavedChangesState,
+	saving: savingUnsavedChanges,
+	hasUnsavedChanges,
+	canLeave: canLeaveCurrentTab,
+	register: registerUnsavedChangesController,
+	reset: resetUnsavedChanges,
+	save: saveUnsavedChanges,
+} = useUnsavedChangesHost()
 
 provideInstanceSettings({
 	instance: instanceRef,
@@ -283,8 +269,8 @@ defineExpose({ show, hide })
 				:modified="modifiedUnsavedChangesState"
 				:saving="savingUnsavedChanges"
 				inline
-				@reset="unsavedChangesController?.reset()"
-				@save="unsavedChangesController?.save()"
+				@reset="resetUnsavedChanges"
+				@save="saveUnsavedChanges"
 			/>
 		</template>
 	</TabbedModal>
diff --git a/apps/app-frontend/src/features/instances/settings-modal/instance-settings-context.ts b/apps/app-frontend/src/features/instances/settings-modal/instance-settings-context.ts
index 6409d1d4f05..bb071800b71 100644
--- a/apps/app-frontend/src/features/instances/settings-modal/instance-settings-context.ts
+++ b/apps/app-frontend/src/features/instances/settings-modal/instance-settings-context.ts
@@ -1,8 +1,8 @@
 import { createContext } from '@modrinth/ui'
 import type { ComputedRef, Ref } from 'vue'
 
-import type { UnsavedChangesController } from '@/features/settings/app-settings-modal/context'
 import type { GameInstance } from '@/helpers/types'
+import type { UnsavedChangesController } from '@/shared/unsaved-changes/types'
 
 export interface InstanceSettingsContext {
 	instance: ComputedRef<GameInstance>
diff --git a/apps/app-frontend/src/features/instances/settings-modal/java-settings.vue b/apps/app-frontend/src/features/instances/settings-modal/java-settings.vue
index fd18385d134..53e0b04b15c 100644
--- a/apps/app-frontend/src/features/instances/settings-modal/java-settings.vue
+++ b/apps/app-frontend/src/features/instances/settings-modal/java-settings.vue
@@ -1,20 +1,14 @@
 <script setup lang="ts">
-import {
-	Button,
-	commonMessages,
-	defineMessages,
-	injectNotificationManager,
-	Input,
-	Slider,
-	useVIntl,
-} from '@modrinth/ui'
+import { defineMessages, injectNotificationManager, Input, useVIntl } from '@modrinth/ui'
+import { useQuery } from '@tanstack/vue-query'
+import { computed } from 'vue'
 
-import JavaSelector from '@/components/ui/JavaSelector.vue'
-import useMemorySlider from '@/composables/useMemorySlider'
-import { edit, get_recommended_java_version } from '@/helpers/instance'
-import { get_java_versions } from '@/helpers/jre'
-import { get, parseEnvVars, serializeEnvVars } from '@/helpers/settings.ts'
-import type { AppSettings } from '@/helpers/types'
+import JavaSelector from '@/features/java/java-selector/index.vue'
+import MemorySlider from '@/features/java/memory-slider.vue'
+import { javaVersionsQueryOptions } from '@/features/java/queries'
+import { edit } from '@/helpers/instance'
+import { appSettingsQueryOptions, parseEnvVars, serializeEnvVars } from '@/helpers/settings.ts'
+import { instanceRecommendedJavaQueryOptions } from '@/pages/instance/query-options'
 
 import DefaultSettingsIntro from './default-settings-intro.vue'
 import { injectInstanceSettings } from './instance-settings-context'
@@ -25,36 +19,16 @@ const { handleError } = injectNotificationManager()
 const { formatMessage } = useVIntl()
 
 const { instance } = injectInstanceSettings()
-const { createDraft } = useInstanceSettingsDraft()
-const { maxMemory, snapPoints, memoryQuery } = useMemorySlider()
 
-const globalSettings = (await get().catch(handleError)) as unknown as AppSettings
-
-const [recommendedJavaVersion, javaVersions] = await Promise.all([
-	get_recommended_java_version(instance.value.id).catch(handleError),
-	get_java_versions().catch(handleError),
-])
-
-const defaultJavaPath: string =
-	(recommendedJavaVersion ? javaVersions?.[recommendedJavaVersion]?.path : undefined) ?? ''
-const defaultJavaArgs = globalSettings.extra_launch_args.join(' ')
-const defaultEnvVars = serializeEnvVars(globalSettings.custom_env_vars)
-const defaultMemory = globalSettings.memory.maximum
-
-const draft = createDraft<{
-	javaPath: string | null
-	javaArgs: string | null
-	envVars: string | null
-	memory: number | null
-}>(
-	{
+const draft = useInstanceSettingsDraft(
+	() => ({
 		javaPath: instance.value.java_path ?? null,
 		javaArgs: instance.value.extra_launch_args?.join(' ') ?? null,
 		envVars: instance.value.custom_env_vars
 			? serializeEnvVars(instance.value.custom_env_vars)
 			: null,
 		memory: instance.value.memory?.maximum ?? null,
-	},
+	}),
 	(value) =>
 		edit(instance.value.id, {
 			java_path: value.javaPath ? value.javaPath.replace('java.exe', 'javaw.exe') : null,
@@ -65,6 +39,28 @@ const draft = createDraft<{
 		}),
 )
 
+const settingsQuery = useQuery(appSettingsQueryOptions())
+const javaVersionsQuery = useQuery(javaVersionsQueryOptions())
+const recommendedJavaQuery = useQuery(
+	computed(() => instanceRecommendedJavaQueryOptions(instance.value.id)),
+)
+
+await Promise.all([
+	settingsQuery.suspense(),
+	javaVersionsQuery.suspense(),
+	recommendedJavaQuery.suspense(),
+]).catch(handleError)
+
+const recommendedJavaVersion = computed(() => recommendedJavaQuery.data.value)
+const defaultJavaPath = computed(() =>
+	recommendedJavaVersion.value
+		? (javaVersionsQuery.data.value?.[recommendedJavaVersion.value]?.path ?? '')
+		: '',
+)
+const defaultJavaArgs = computed(() => settingsQuery.data.value?.extra_launch_args.join(' ') ?? '')
+const defaultEnvVars = computed(() => serializeEnvVars(settingsQuery.data.value?.custom_env_vars))
+const defaultMemory = computed(() => settingsQuery.data.value?.memory.maximum ?? 0)
+
 const messages = defineMessages({
 	defaultSettingsDescription: {
 		id: 'instance.settings.tabs.java.default-settings-description',
@@ -129,29 +125,12 @@ const messages = defineMessages({
 				/>
 			</div>
 			<div class="pt-3">
-				<Slider
-					v-if="maxMemory"
+				<MemorySlider
 					id="max-memory"
 					:model-value="draft.memory ?? defaultMemory"
-					:min="512"
-					:max="maxMemory"
-					:step="64"
-					:snap-points="snapPoints"
-					:snap-range="512"
-					min-label="512 MB"
-					:max-label="`${Number((maxMemory / 1024).toFixed(1))} GB`"
-					unit="MB"
+					:aria-label="formatMessage(messages.javaMemory)"
 					@update:model-value="(value) => (draft.memory = value)"
 				/>
-				<Button v-else-if="memoryQuery.isError.value" @click="memoryQuery.refetch()">
-					{{ formatMessage(commonMessages.refreshButton) }}
-				</Button>
-				<div
-					v-else
-					role="status"
-					:aria-label="formatMessage(commonMessages.loadingLabel)"
-					class="h-10 animate-pulse rounded-lg bg-surface-3"
-				/>
 			</div>
 		</section>
 
diff --git a/apps/app-frontend/src/features/instances/settings-modal/use-instance-settings-draft.ts b/apps/app-frontend/src/features/instances/settings-modal/use-instance-settings-draft.ts
index 1519fcdb613..20aacbf57c7 100644
--- a/apps/app-frontend/src/features/instances/settings-modal/use-instance-settings-draft.ts
+++ b/apps/app-frontend/src/features/instances/settings-modal/use-instance-settings-draft.ts
@@ -1,7 +1,5 @@
 import { injectNotificationManager } from '@modrinth/ui'
-import { onBeforeUnmount, onMounted, type Ref, ref } from 'vue'
-
-import type { UnsavedChangesController } from '@/features/settings/app-settings-modal/context'
+import { onBeforeUnmount, onMounted, type Ref, ref, watch } from 'vue'
 
 import { injectInstanceSettings } from './instance-settings-context'
 
@@ -9,44 +7,45 @@ function clone<T>(value: T): T {
 	return JSON.parse(JSON.stringify(value))
 }
 
-export function useInstanceSettingsDraft() {
+function isEqual(a: unknown, b: unknown): boolean {
+	return JSON.stringify(a) === JSON.stringify(b)
+}
+
+export function useInstanceSettingsDraft<T extends Record<string, unknown>>(
+	initial: () => T,
+	persist: (value: T) => Promise<void>,
+): Ref<T> {
 	const { handleError } = injectNotificationManager()
 	const { registerUnsavedChangesController } = injectInstanceSettings()
 
-	let controller: UnsavedChangesController | null = null
-
-	onMounted(() => {
-		registerUnsavedChangesController(controller)
-	})
+	const original = ref(clone(initial())) as Ref<T>
+	const draft = ref(clone(initial())) as Ref<T>
+	const saving = ref(false)
 
-	onBeforeUnmount(() => {
-		registerUnsavedChangesController(null)
+	watch(initial, (next) => {
+		if (saving.value || isEqual(next, original.value)) return
+		if (!isEqual(draft.value, original.value)) return
+		original.value = clone(next)
+		draft.value = clone(next)
 	})
 
-	function createDraft<T extends Record<string, unknown>>(
-		initial: T,
-		persist: (value: T) => Promise<void>,
-	) {
-		const original = ref(clone(initial)) as Ref<T>
-		const draft = ref(clone(initial)) as Ref<T>
-		const saving = ref(false)
-
-		async function save() {
-			if (saving.value) return
-			saving.value = true
-			const value = clone(draft.value)
-			try {
-				await persist(value)
-				original.value = value
-			} catch (error) {
-				handleError(error as Error)
-			} finally {
-				saving.value = false
-			}
+	async function save() {
+		if (saving.value) return
+		saving.value = true
+		const value = clone(draft.value)
+		try {
+			await persist(value)
+			original.value = value
+		} catch (error) {
+			handleError(error as Error)
+		} finally {
+			saving.value = false
 		}
+	}
 
-		controller = {
-			hasChanges: () => JSON.stringify(original.value) !== JSON.stringify(draft.value),
+	onMounted(() => {
+		registerUnsavedChangesController({
+			hasChanges: () => !isEqual(original.value, draft.value),
 			getOriginal: () => original.value,
 			getModified: () => draft.value,
 			isSaving: () => saving.value,
@@ -54,10 +53,12 @@ export function useInstanceSettingsDraft() {
 				draft.value = clone(original.value)
 			},
 			save,
-		}
+		})
+	})
 
-		return draft
-	}
+	onBeforeUnmount(() => {
+		registerUnsavedChangesController(null)
+	})
 
-	return { createDraft }
+	return draft
 }
diff --git a/apps/app-frontend/src/features/instances/settings-modal/window-settings.vue b/apps/app-frontend/src/features/instances/settings-modal/window-settings.vue
index 805fb8cf8f3..2f7aeb998a5 100644
--- a/apps/app-frontend/src/features/instances/settings-modal/window-settings.vue
+++ b/apps/app-frontend/src/features/instances/settings-modal/window-settings.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import { defineMessages, injectNotificationManager, Input, Toggle, useVIntl } from '@modrinth/ui'
+import { useQuery } from '@tanstack/vue-query'
 import { computed } from 'vue'
 
 import { edit } from '@/helpers/instance'
-import { get } from '@/helpers/settings.ts'
-import type { AppSettings } from '@/helpers/types'
+import { appSettingsQueryOptions } from '@/helpers/settings.ts'
 
 import DefaultSettingsIntro from './default-settings-intro.vue'
 import { injectInstanceSettings } from './instance-settings-context'
@@ -15,21 +15,15 @@ const { handleError } = injectNotificationManager()
 const { formatMessage } = useVIntl()
 
 const { instance } = injectInstanceSettings()
-const { createDraft } = useInstanceSettingsDraft()
 
-const globalSettings = (await get().catch(handleError)) as AppSettings
-
-const defaultFullscreen = globalSettings.force_fullscreen
-const defaultResolution = globalSettings.game_resolution.slice() as [number, number]
-
-const draft = createDraft<{
+const draft = useInstanceSettingsDraft<{
 	fullscreen: boolean | null
 	resolution: [number, number] | null
 }>(
-	{
+	() => ({
 		fullscreen: instance.value.force_fullscreen ?? null,
 		resolution: instance.value.game_resolution ?? null,
-	},
+	}),
 	(value) =>
 		edit(instance.value.id, {
 			force_fullscreen: value.fullscreen,
@@ -37,8 +31,16 @@ const draft = createDraft<{
 		}),
 )
 
-const fullscreen = computed(() => draft.value.fullscreen ?? defaultFullscreen)
-const resolution = computed(() => draft.value.resolution ?? defaultResolution)
+const settingsQuery = useQuery(appSettingsQueryOptions())
+await settingsQuery.suspense().catch(handleError)
+
+const defaultFullscreen = computed(() => settingsQuery.data.value?.force_fullscreen ?? false)
+const defaultResolution = computed(
+	() => (settingsQuery.data.value?.game_resolution.slice() ?? [0, 0]) as [number, number],
+)
+
+const fullscreen = computed(() => draft.value.fullscreen ?? defaultFullscreen.value)
+const resolution = computed(() => draft.value.resolution ?? defaultResolution.value)
 
 function setDimension(index: 0 | 1, value: number) {
 	const next = resolution.value.slice() as [number, number]
@@ -47,8 +49,8 @@ function setDimension(index: 0 | 1, value: number) {
 }
 
 function resetDimension(index: 0 | 1) {
-	setDimension(index, defaultResolution[index])
-	if (resolution.value.every((dimension, i) => Number(dimension) === defaultResolution[i])) {
+	setDimension(index, defaultResolution.value[index])
+	if (resolution.value.every((dimension, i) => Number(dimension) === defaultResolution.value[i])) {
 		draft.value.resolution = null
 	}
 }
diff --git a/apps/app-frontend/src/features/java/java-selector/detection-modal.vue b/apps/app-frontend/src/features/java/java-selector/detection-modal.vue
new file mode 100644
index 00000000000..5ae5d291cd1
--- /dev/null
+++ b/apps/app-frontend/src/features/java/java-selector/detection-modal.vue
@@ -0,0 +1,151 @@
+<script setup lang="ts">
+import { CheckIcon, PlusIcon, SpinnerIcon, XIcon } from '@modrinth/assets'
+import {
+	Button,
+	commonMessages,
+	defineMessages,
+	NewModal,
+	Table,
+	type TableColumn,
+	useVIntl,
+} from '@modrinth/ui'
+import { useQuery } from '@tanstack/vue-query'
+import { computed, ref } from 'vue'
+
+import { trackEvent } from '@/helpers/analytics'
+import type { JavaVersion } from '@/platform/app-lib/jre/types'
+
+import { detectedJresQueryOptions } from '../queries'
+
+const emit = defineEmits<{
+	submit: [value: JavaVersion]
+}>()
+
+const { formatMessage } = useVIntl()
+
+const modal = ref<InstanceType<typeof NewModal> | null>(null)
+const open = ref(false)
+const version = ref<number | null>(null)
+const currentPath = ref('')
+
+const detectedJresQuery = useQuery(
+	computed(() => ({ ...detectedJresQueryOptions(version.value), enabled: open.value })),
+)
+const detectedJres = computed(() => detectedJresQuery.data.value ?? [])
+
+const columns = computed<TableColumn<'version' | 'path' | 'actions'>[]>(() => [
+	{ key: 'version', label: formatMessage(messages.versionColumn), width: '9rem' },
+	{ key: 'path', label: formatMessage(messages.pathColumn) },
+	{
+		key: 'actions',
+		label: formatMessage(messages.actionsColumn),
+		align: 'right',
+		width: '10rem',
+	},
+])
+
+function show(javaVersion: number | null, current?: Partial<JavaVersion> | null) {
+	version.value = javaVersion
+	currentPath.value = current?.path ?? ''
+	open.value = true
+	modal.value?.show()
+}
+
+function select(jre: JavaVersion) {
+	emit('submit', jre)
+	modal.value?.hide()
+	trackEvent('JavaAutoDetect', { path: jre.path, version: jre.version })
+}
+
+defineExpose({ show })
+
+const messages = defineMessages({
+	title: {
+		id: 'app.java-detection.title',
+		defaultMessage: 'Select Java installation',
+	},
+	versionColumn: {
+		id: 'app.java-detection.columns.version',
+		defaultMessage: 'Version',
+	},
+	pathColumn: {
+		id: 'app.java-detection.columns.path',
+		defaultMessage: 'Path',
+	},
+	actionsColumn: {
+		id: 'app.java-detection.columns.actions',
+		defaultMessage: 'Actions',
+	},
+	selected: {
+		id: 'app.java-detection.selected',
+		defaultMessage: 'Selected',
+	},
+	select: {
+		id: 'app.java-detection.select',
+		defaultMessage: 'Select',
+	},
+	noInstallationsFound: {
+		id: 'app.java-detection.no-installations-found',
+		defaultMessage: 'No Java installations found.',
+	},
+	cancel: {
+		id: 'app.java-detection.cancel',
+		defaultMessage: 'Cancel',
+	},
+})
+</script>
+
+<template>
+	<NewModal
+		ref="modal"
+		:header="formatMessage(messages.title)"
+		:on-hide="() => (open = false)"
+	>
+		<Table :columns="columns" :data="detectedJres" row-key="path">
+			<template #cell-version="{ value }">
+				<span class="font-semibold text-primary">{{ value }}</span>
+			</template>
+			<template #cell-path="{ value }">
+				<span v-tooltip="value" class="block truncate font-mono text-xs">{{ value }}</span>
+			</template>
+			<template #cell-actions="{ row }">
+				<div class="flex items-center justify-end">
+					<Button v-if="currentPath === row.path" disabled>
+						<CheckIcon aria-hidden="true" />
+						{{ formatMessage(messages.selected) }}
+					</Button>
+					<Button v-else @click="select(row)">
+						<PlusIcon aria-hidden="true" />
+						{{ formatMessage(messages.select) }}
+					</Button>
+				</div>
+			</template>
+			<template #empty-state>
+				<div
+					v-if="detectedJresQuery.isFetching.value"
+					role="status"
+					class="flex items-center gap-2 p-4 text-secondary"
+				>
+					<SpinnerIcon class="size-5 animate-spin" aria-hidden="true" />
+					{{ formatMessage(commonMessages.loadingLabel) }}
+				</div>
+				<div v-else-if="detectedJresQuery.isError.value" class="p-4">
+					<Button @click="detectedJresQuery.refetch()">
+						{{ formatMessage(commonMessages.refreshButton) }}
+					</Button>
+				</div>
+				<div v-else class="p-4 text-secondary">
+					{{ formatMessage(messages.noInstallationsFound) }}
+				</div>
+			</template>
+		</Table>
+		<template #actions>
+			<div class="flex justify-end">
+				<Button type="outlined" class="!border !border-surface-4" @click="modal?.hide()">
+					<XIcon aria-hidden="true" />
+					{{ formatMessage(messages.cancel) }}
+				</Button>
+			</div>
+		</template>
+	</NewModal>
+</template>
diff --git a/apps/app-frontend/src/components/ui/JavaSelector.vue b/apps/app-frontend/src/features/java/java-selector/index.vue
similarity index 79%
rename from apps/app-frontend/src/components/ui/JavaSelector.vue
rename to apps/app-frontend/src/features/java/java-selector/index.vue
index d5964566e57..ed61e642a0a 100644
--- a/apps/app-frontend/src/components/ui/JavaSelector.vue
+++ b/apps/app-frontend/src/features/java/java-selector/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<JavaDetectionModal ref="detectJavaModal" @submit="(val) => emit('update:modelValue', val)" />
+	<JavaDetectionModal ref="detectJavaModal" @submit="selectJre" />
 	<div
 		:id="id"
 		class="flex flex-col gap-3 rounded-2xl border border-solid border-surface-5 bg-surface-3 p-4"
@@ -34,14 +34,10 @@
 
 		<div
 			class="flex flex-wrap items-center gap-2"
-			:class="status === 'empty' ? 'justify-end' : 'justify-between'"
+			:class="status === 'valid' || status === 'invalid' ? 'justify-between' : 'justify-end'"
 		>
-			<span v-if="status === 'checking'" class="flex items-center gap-1.5 text-secondary">
-				<SpinnerIcon class="size-4 animate-spin" aria-hidden="true" />
-				{{ formatMessage(messages.checking) }}
-			</span>
 			<span
-				v-else-if="status !== 'empty'"
+				v-if="status === 'valid' || status === 'invalid'"
 				class="flex items-center gap-1.5 font-medium"
 				:class="status === 'valid' ? 'text-green' : 'text-red'"
 			>
@@ -100,14 +96,16 @@ import {
 	SplitButton,
 	useVIntl,
 } from '@modrinth/ui'
-import { open } from '@tauri-apps/plugin-dialog'
-import { computed, ref, watch } from 'vue'
+import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
+import { computed, nextTick, ref } from 'vue'
 
-import JavaDetectionModal from '@/components/ui/JavaDetectionModal.vue'
-import useJavaTest from '@/composables/useJavaTest'
+import { jreQueryOptions } from '@/features/java/queries'
 import { trackEvent } from '@/helpers/analytics'
-import type { JavaVersion } from '@/helpers/instance'
-import { auto_install_java, get_jre } from '@/helpers/jre.js'
+import { autoInstallJava } from '@/platform/app-lib/jre/commands'
+import type { JavaVersion } from '@/platform/app-lib/jre/types'
+import { pickFile } from '@/platform/dialogs'
+
+import JavaDetectionModal from './detection-modal.vue'
 
 const { handleError, addNotification } = injectNotificationManager()
 const { formatMessage } = useVIntl()
@@ -137,10 +135,6 @@ const messages = defineMessages({
 		id: 'app.java-selector.copy-failed-title',
 		defaultMessage: 'Failed to copy path',
 	},
-	checking: {
-		id: 'app.java-selector.checking',
-		defaultMessage: 'Checking Java…',
-	},
 	valid: {
 		id: 'app.java-selector.valid',
 		defaultMessage: 'Valid',
@@ -198,16 +192,32 @@ const emit = defineEmits<{
 	'update:modelValue': [value: JavaSelection]
 }>()
 
-const { status, checkJava } = useJavaTest()
+const queryClient = useQueryClient()
 
 const path = computed(() => props.modelValue?.path ?? '')
-const installingJava = ref(false)
 const editingPath = ref(false)
 const pathDraft = ref('')
 const pathInput = ref<InstanceType<typeof Input>>()
 const detectJavaModal = ref<InstanceType<typeof JavaDetectionModal>>()
 
-watch(path, (newPath) => checkJava(newPath, props.version), { immediate: true })
+const { data: jre } = useQuery(
+	computed(() => ({ ...jreQueryOptions(path.value), enabled: !!path.value })),
+)
+
+const installJavaMutation = useMutation({
+	mutationFn: autoInstallJava,
+	onSuccess: (installedPath) => selectPath(installedPath),
+	onError: handleError,
+})
+const installingJava = computed(() => installJavaMutation.isPending.value)
+
+const status = computed<'empty' | 'valid' | 'invalid' | null>(() => {
+	if (!path.value) return 'empty'
+	if (jre.value === undefined) return null
+	return jre.value && (props.version === null || jre.value.parsed_version === props.version)
+		? 'valid'
+		: 'invalid'
+})
 
 const menuOptions = computed<ButtonMenuOption[]>(() => [
 	{
@@ -241,13 +251,18 @@ function fallbackSelection(selectedPath: string): JavaSelection {
 	}
 }
 
+function selectJre(selected: JavaVersion) {
+	queryClient.setQueryData(jreQueryOptions(selected.path).queryKey, selected)
+	emit('update:modelValue', selected)
+}
+
 async function selectPath(selectedPath: string) {
-	const result: JavaVersion | null = await get_jre(selectedPath).catch(() => null)
+	const result = await queryClient.fetchQuery({ ...jreQueryOptions(selectedPath), staleTime: 0 })
 	emit('update:modelValue', result ?? fallbackSelection(selectedPath))
 }
 
 async function browse() {
-	const selected = await open()
+	const selected = await pickFile()
 	if (!selected) return
 
 	trackEvent('JavaManualSelect', { version: props.version?.toString() ?? '' })
@@ -257,7 +272,7 @@ async function browse() {
 function startEditingPath() {
 	pathDraft.value = path.value
 	editingPath.value = true
-	setTimeout(() => {
+	nextTick(() => {
 		pathInput.value?.focus()
 		pathInput.value?.select()
 	})
@@ -293,17 +308,8 @@ async function copyPath() {
 	}
 }
 
-async function installRecommended() {
+function installRecommended() {
 	if (!props.version || installingJava.value) return
-
-	installingJava.value = true
-	try {
-		const installedPath: string | undefined = await auto_install_java(props.version).catch(
-			handleError,
-		)
-		if (installedPath) await selectPath(installedPath)
-	} finally {
-		installingJava.value = false
-	}
+	installJavaMutation.mutate(props.version)
 }
 </script>
diff --git a/apps/app-frontend/src/features/java/memory-slider.vue b/apps/app-frontend/src/features/java/memory-slider.vue
new file mode 100644
index 00000000000..357829d9375
--- /dev/null
+++ b/apps/app-frontend/src/features/java/memory-slider.vue
@@ -0,0 +1,56 @@
+<script setup lang="ts">
+import { Button, commonMessages, Slider, useVIntl } from '@modrinth/ui'
+import { useQuery } from '@tanstack/vue-query'
+import { computed } from 'vue'
+
+import { maxMemoryQueryOptions } from './queries'
+
+const MIN_MEMORY_MB = 512
+const FIRST_SNAP_POINT_MB = 2048
+
+defineProps<{
+	id?: string
+	ariaLabel?: string
+}>()
+
+const memory = defineModel<number>({ required: true })
+
+const { formatMessage } = useVIntl()
+
+const memoryQuery = useQuery(maxMemoryQueryOptions())
+const maxMemory = computed(() => Math.floor((memoryQuery.data.value ?? 0) / 1024))
+
+const snapPoints = computed(() => {
+	const points: number[] = []
+	for (let point = FIRST_SNAP_POINT_MB; point <= maxMemory.value; point *= 2) {
+		points.push(point)
+	}
+	return points
+})
+</script>
+
+<template>
+	<Slider
+		v-if="maxMemory"
+		:id="id"
+		v-model="memory"
+		:aria-label="ariaLabel"
+		:min="MIN_MEMORY_MB"
+		:max="maxMemory"
+		:step="64"
+		:snap-points="snapPoints"
+		:snap-range="MIN_MEMORY_MB"
+		:min-label="`${MIN_MEMORY_MB} MB`"
+		:max-label="`${Number((maxMemory / 1024).toFixed(1))} GB`"
+		unit="MB"
+	/>
+	<Button v-else-if="memoryQuery.isError.value" @click="memoryQuery.refetch()">
+		{{ formatMessage(commonMessages.refreshButton) }}
+	</Button>
+	<div
+		v-else
+		role="status"
+		:aria-label="formatMessage(commonMessages.loadingLabel)"
+		class="h-10 animate-pulse rounded-lg bg-surface-3"
+	/>
+</template>
diff --git a/apps/app-frontend/src/features/java/queries.ts b/apps/app-frontend/src/features/java/queries.ts
new file mode 100644
index 00000000000..71c3a326ef6
--- /dev/null
+++ b/apps/app-frontend/src/features/java/queries.ts
@@ -0,0 +1,52 @@
+import { queryOptions } from '@tanstack/vue-query'
+
+import {
+	findFilteredJres,
+	getJavaVersions,
+	getJre,
+	getMaxMemory,
+} from '@/platform/app-lib/jre/commands'
+
+export const javaKeys = {
+	versions: ['system', 'java-versions'] as const,
+	jre: (path: string) => ['system', 'jre', path] as const,
+	detected: (version: number | null) => ['system', 'detected-jres', version] as const,
+	maxMemory: ['system', 'memory', 'total'] as const,
+}
+
+export function javaVersionsQueryOptions() {
+	return queryOptions({
+		queryKey: javaKeys.versions,
+		networkMode: 'always',
+		queryFn: getJavaVersions,
+		staleTime: 0,
+	})
+}
+
+export function jreQueryOptions(path: string) {
+	return queryOptions({
+		queryKey: javaKeys.jre(path),
+		networkMode: 'always',
+		queryFn: () => getJre(path).catch(() => null),
+		staleTime: Infinity,
+	})
+}
+
+export function detectedJresQueryOptions(version: number | null) {
+	return queryOptions({
+		queryKey: javaKeys.detected(version),
+		networkMode: 'always',
+		queryFn: () => findFilteredJres(version),
+		staleTime: 0,
+	})
+}
+
+export function maxMemoryQueryOptions() {
+	return queryOptions({
+		queryKey: javaKeys.maxMemory,
+		networkMode: 'always',
+		queryFn: getMaxMemory,
+		staleTime: Infinity,
+		gcTime: Infinity,
+	})
+}
diff --git a/apps/app-frontend/src/features/settings/app-settings-modal/context.ts b/apps/app-frontend/src/features/settings/app-settings-modal/context.ts
index 0efb19f8e22..b1be0386ecd 100644
--- a/apps/app-frontend/src/features/settings/app-settings-modal/context.ts
+++ b/apps/app-frontend/src/features/settings/app-settings-modal/context.ts
@@ -1,13 +1,6 @@
 import { createContext } from '@modrinth/ui'
 
-export type UnsavedChangesController = {
-	hasChanges: () => boolean
-	getOriginal: () => Record<string, unknown>
-	getModified: () => Record<string, unknown>
-	isSaving: () => boolean
-	reset: () => void
-	save: () => void | Promise<void>
-}
+import type { UnsavedChangesController } from '@/shared/unsaved-changes/types'
 
 export interface AppSettingsModalContext {
 	close: () => boolean
diff --git a/apps/app-frontend/src/features/settings/app-settings-modal/index.vue b/apps/app-frontend/src/features/settings/app-settings-modal/index.vue
index e6930ec89f2..a669ece1b69 100644
--- a/apps/app-frontend/src/features/settings/app-settings-modal/index.vue
+++ b/apps/app-frontend/src/features/settings/app-settings-modal/index.vue
@@ -50,8 +50,9 @@ import ResourceManagementSettings from '@/features/settings/system/resource-mana
 import TroubleshootingSettings from '@/features/settings/system/troubleshooting-settings.vue'
 import { appSettingsKeys, appSettingsQueryOptions, set } from '@/helpers/settings.ts'
 import { injectAppUpdateDownloadProgress } from '@/providers/download-progress.ts'
+import { useUnsavedChangesHost } from '@/shared/unsaved-changes/use-unsaved-changes-host'
 
-import { provideAppSettingsModal, type UnsavedChangesController } from './context'
+import { provideAppSettingsModal } from './context'
 
 // TODO: Apply COMPONENT_STRUCTURE.md here and extract out common setting option components
 const appSettings = useAppSettings()
@@ -213,54 +214,27 @@ const availableTabs = computed(() =>
 )
 
 const modal = ref<InstanceType<typeof TabbedModal> | null>(null)
-const unsavedChangesPopup = ref<{ nudge: () => void } | null>(null)
-const unsavedChangesController = ref<UnsavedChangesController | null>(null)
-const emptyUnsavedChangesState: Record<string, unknown> = {}
-const originalUnsavedChangesState = computed(
-	() => unsavedChangesController.value?.getOriginal() ?? emptyUnsavedChangesState,
-)
-const modifiedUnsavedChangesState = computed(
-	() => unsavedChangesController.value?.getModified() ?? emptyUnsavedChangesState,
-)
-const savingUnsavedChanges = computed(() => unsavedChangesController.value?.isSaving() ?? false)
-const hasUnsavedChanges = computed(
-	() =>
-		(unsavedChangesController.value?.hasChanges() ?? false) ||
-		(unsavedChangesController.value?.isSaving() ?? false),
-)
-
-function canLeaveCurrentTab(): boolean {
-	if (
-		!unsavedChangesController.value?.hasChanges() &&
-		!unsavedChangesController.value?.isSaving()
-	) {
-		return true
-	}
-	unsavedChangesPopup.value?.nudge()
-	return false
-}
+const {
+	popup: unsavedChangesPopup,
+	original: originalUnsavedChangesState,
+	modified: modifiedUnsavedChangesState,
+	saving: savingUnsavedChanges,
+	hasUnsavedChanges,
+	canLeave: canLeaveCurrentTab,
+	register: registerUnsavedChangesController,
+	reset: resetUnsavedChanges,
+	save: saveUnsavedChanges,
+} = useUnsavedChangesHost()
 
 function close(): boolean {
 	return modal.value?.hide() ?? false
 }
 
-function registerUnsavedChangesController(controller: UnsavedChangesController | null): void {
-	unsavedChangesController.value = controller
-}
-
 provideAppSettingsModal({
 	close,
 	registerUnsavedChangesController,
 })
 
-function resetUnsavedChanges(): void {
-	unsavedChangesController.value?.reset()
-}
-
-function saveUnsavedChanges(): void {
-	void unsavedChangesController.value?.save()
-}
-
 function show() {
 	modal.value?.show()
 }
diff --git a/apps/app-frontend/src/features/settings/instance-defaults/java-and-memory-settings/index.vue b/apps/app-frontend/src/features/settings/instance-defaults/java-and-memory-settings/index.vue
index f7f8c0e1acf..29b62b4133d 100644
--- a/apps/app-frontend/src/features/settings/instance-defaults/java-and-memory-settings/index.vue
+++ b/apps/app-frontend/src/features/settings/instance-defaults/java-and-memory-settings/index.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { SpinnerIcon } from '@modrinth/assets'
-import { Button, commonMessages, defineMessages, Input, Slider, useVIntl } from '@modrinth/ui'
+import { Button, commonMessages, defineMessages, Input, useVIntl } from '@modrinth/ui'
 
-import useMemorySlider from '@/composables/useMemorySlider'
+import MemorySlider from '@/features/java/memory-slider.vue'
 import { parseEnvVars, serializeEnvVars } from '@/helpers/settings'
 
 import { useDefaultInstanceSettings } from '../use-default-instance-settings'
@@ -21,7 +21,6 @@ const { settings, settingsQuery } = useDefaultInstanceSettings(
 		custom_env_vars: parseEnvVars(value.envVars),
 	}),
 )
-const { maxMemory, snapPoints, memoryQuery } = useMemorySlider()
 
 const messages = defineMessages({
 	javaInstallationsTitle: {
@@ -77,28 +76,10 @@ const messages = defineMessages({
 					<h2 class="m-0 text-lg font-semibold text-contrast">
 						{{ formatMessage(messages.memoryAllocationTitle) }}
 					</h2>
-					<Slider
-						v-if="maxMemory"
+					<MemorySlider
 						id="max-memory"
 						v-model="settings.memory.maximum"
 						:aria-label="formatMessage(messages.memoryAllocationTitle)"
-						:min="512"
-						:max="maxMemory"
-						:step="64"
-						:snap-points="snapPoints"
-						:snap-range="512"
-						min-label="512 MB"
-						:max-label="`${Number((maxMemory / 1024).toFixed(1))} GB`"
-						unit="MB"
-					/>
-					<Button v-else-if="memoryQuery.isError.value" @click="memoryQuery.refetch()">
-						{{ formatMessage(commonMessages.refreshButton) }}
-					</Button>
-					<div
-						v-else
-						role="status"
-						:aria-label="formatMessage(commonMessages.loadingLabel)"
-						class="h-10 animate-pulse rounded-lg bg-surface-3"
 					/>
 					<p class="m-0 mt-1 leading-tight">
 						{{ formatMessage(messages.memoryAllocationDescription) }}
diff --git a/apps/app-frontend/src/features/settings/instance-defaults/java-and-memory-settings/java-installations.vue b/apps/app-frontend/src/features/settings/instance-defaults/java-and-memory-settings/java-installations.vue
index c5aa92fa0c0..95d1fa3c22d 100644
--- a/apps/app-frontend/src/features/settings/instance-defaults/java-and-memory-settings/java-installations.vue
+++ b/apps/app-frontend/src/features/settings/instance-defaults/java-and-memory-settings/java-installations.vue
@@ -1,12 +1,43 @@
-<script setup>
+<script setup lang="ts">
 import { defineMessages, injectNotificationManager, useVIntl } from '@modrinth/ui'
-import { ref } from 'vue'
+import { useMutation, useQuery, useQueryClient } from '@tanstack/vue-query'
 
-import JavaSelector from '@/components/ui/JavaSelector.vue'
-import { get_java_versions, set_java_version } from '@/helpers/jre'
+import JavaSelector from '@/features/java/java-selector/index.vue'
+import { javaKeys, javaVersionsQueryOptions } from '@/features/java/queries'
+import { setJavaVersion } from '@/platform/app-lib/jre/commands'
+import type { JavaVersion } from '@/platform/app-lib/jre/types'
+
+const JAVA_MAJOR_VERSIONS = [25, 21, 17, 8]
 
 const { handleError } = injectNotificationManager()
 const { formatMessage } = useVIntl()
+const queryClient = useQueryClient()
+
+const { data: javaVersions } = useQuery(javaVersionsQueryOptions())
+
+const javaVersionMutation = useMutation({
+	mutationFn: ({ selection }: { majorVersion: number; selection: Partial<JavaVersion> }) =>
+		setJavaVersion(selection),
+	networkMode: 'always',
+	onMutate: ({ majorVersion, selection }) => {
+		queryClient.setQueryData(javaVersionsQueryOptions().queryKey, (current) => ({
+			...current,
+			[majorVersion]: selection as JavaVersion,
+		}))
+	},
+	onError: handleError,
+	onSettled: () => queryClient.invalidateQueries({ queryKey: javaKeys.versions }),
+})
+
+function updateJavaVersion(majorVersion: number, selection: Partial<JavaVersion>) {
+	javaVersionMutation.mutate({
+		majorVersion,
+		selection: {
+			...selection,
+			path: selection.path ? selection.path.replace('java.exe', 'javaw.exe') : undefined,
+		},
+	})
+}
 
 const messages = defineMessages({
 	javaLocation: {
@@ -14,35 +45,23 @@ const messages = defineMessages({
 		defaultMessage: 'Java {version, number} location',
 	},
 })
-
-const javaVersions = ref(await get_java_versions().catch(handleError))
-async function updateJavaVersion(version) {
-	if (version?.path === '') {
-		version.path = undefined
-	}
-
-	if (version?.path) {
-		version.path = version.path.replace('java.exe', 'javaw.exe')
-	}
-
-	await set_java_version(version).catch(handleError)
-}
 </script>
+
 <template>
 	<div class="flex flex-col gap-6">
 		<div
-			v-for="(javaVersion, index) in [25, 21, 17, 8]"
-			:key="`java-${javaVersion}`"
+			v-for="(majorVersion, index) in JAVA_MAJOR_VERSIONS"
+			:key="`java-${majorVersion}`"
 			class="flex flex-col gap-2.5"
 		>
 			<h3 class="m-0 text-lg font-semibold text-contrast" :class="{ 'mt-4': index !== 0 }">
-				{{ formatMessage(messages.javaLocation, { version: javaVersion }) }}
+				{{ formatMessage(messages.javaLocation, { version: majorVersion }) }}
 			</h3>
 			<JavaSelector
-				:id="'java-selector-' + javaVersion"
-				v-model="javaVersions[javaVersion]"
-				:version="javaVersion"
-				@update:model-value="updateJavaVersion"
+				:id="`java-selector-${majorVersion}`"
+				:model-value="javaVersions?.[majorVersion]"
+				:version="majorVersion"
+				@update:model-value="(selection) => updateJavaVersion(majorVersion, selection)"
 			/>
 		</div>
 	</div>
diff --git a/apps/app-frontend/src/helpers/instance.ts b/apps/app-frontend/src/helpers/instance.ts
index f8449c2145a..2e3ed494b6b 100644
--- a/apps/app-frontend/src/helpers/instance.ts
+++ b/apps/app-frontend/src/helpers/instance.ts
@@ -397,21 +397,6 @@ export async function rebuild_synced_options(instanceId?: string): Promise<void>
 	return await invoke('plugin:instance|instance_rebuild_synced_options', { instanceId })
 }
 
-export interface JavaVersion {
-	parsed_version: number
-	version: string
-	architecture: string
-	path: string
-}
-
-export async function get_optimal_jre_key(instanceId: string): Promise<JavaVersion | null> {
-	return await invoke('plugin:instance|instance_get_optimal_jre_key', { instanceId })
-}
-
-export async function get_recommended_java_version(instanceId: string): Promise<number> {
-	return await invoke('plugin:instance|instance_get_recommended_java_version', { instanceId })
-}
-
 export async function list(): Promise<GameInstance[]> {
 	return await invoke('plugin:instance|instance_list')
 }
diff --git a/apps/app-frontend/src/helpers/jre.js b/apps/app-frontend/src/helpers/jre.js
deleted file mode 100644
index 294606a5761..00000000000
--- a/apps/app-frontend/src/helpers/jre.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank instance object, where the Rust struct is serialized,
- *  and deserialized into a usable JS object.
- */
-import { queryOptions } from '@tanstack/vue-query'
-import { invoke } from '@tauri-apps/api/core'
-
-/*
-
-JavaVersion {
-    path: Path
-    version: String
-}
-
-*/
-
-export async function get_java_versions() {
-	return await invoke('plugin:jre|get_java_versions')
-}
-
-export async function set_java_version(javaVersion) {
-	return await invoke('plugin:jre|set_java_version', { javaVersion })
-}
-
-// Finds all the installation of Java 7, if it exists
-// Returns [JavaVersion]
-export async function find_filtered_jres(version) {
-	return await invoke('plugin:jre|jre_find_filtered_jres', { version })
-}
-
-// Gets java version from a specific path by trying to run 'java -version' on it.
-// This also validates it, as it returns null if no valid java version is found at the path
-export async function get_jre(path) {
-	return await invoke('plugin:jre|jre_get_jre', { path })
-}
-
-// Tests JRE version by running 'java -version' on it.
-// Returns true if the version is valid, and matches given (after extraction)
-export async function test_jre(path, majorVersion) {
-	return await invoke('plugin:jre|jre_test_jre', { path, majorVersion })
-}
-
-// Automatically installs specified java version
-export async function auto_install_java(javaVersion) {
-	return await invoke('plugin:jre|jre_auto_install_java', { javaVersion })
-}
-
-// Get max memory in KiB
-export async function get_max_memory() {
-	return await invoke('plugin:jre|jre_get_max_memory')
-}
-
-export function maxMemoryQueryOptions() {
-	return queryOptions({
-		queryKey: ['system', 'memory', 'total'],
-		networkMode: 'always',
-		queryFn: get_max_memory,
-		staleTime: Infinity,
-		gcTime: Infinity,
-	})
-}
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 11025a57018..55356c89c81 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -1025,9 +1025,6 @@
   "app.java-selector.browse": {
     "message": "Browse"
   },
-  "app.java-selector.checking": {
-    "message": "Checking Java…"
-  },
   "app.java-selector.copy-failed-title": {
     "message": "Failed to copy path"
   },
diff --git a/apps/app-frontend/src/pages/instance/query-options.ts b/apps/app-frontend/src/pages/instance/query-options.ts
index 4b24d1af5b5..2b7a67998a4 100644
--- a/apps/app-frontend/src/pages/instance/query-options.ts
+++ b/apps/app-frontend/src/pages/instance/query-options.ts
@@ -12,6 +12,7 @@ import {
 import { loadInstanceContentData } from '@/helpers/instance-content'
 import { get_by_instance_id } from '@/helpers/process'
 import { refreshWorlds } from '@/helpers/worlds'
+import { getRecommendedJavaVersion } from '@/platform/app-lib/instances/commands'
 import { refreshSharedInstanceLock } from '@/platform/app-lib/shared-instances/commands'
 
 export const instanceKeys = {
@@ -41,6 +42,8 @@ export const instanceKeys = {
 		[...instanceKeys.sharedUpdatePreviews(instanceId), userId] as const,
 	sharedLock: (instanceId: string) => ['sharedInstanceLock', instanceId] as const,
 	sharedMembers: (instanceId: string) => ['sharedInstanceUsers', instanceId] as const,
+	recommendedJava: (instanceId: string) =>
+		[...instanceKeys.detail(instanceId), 'recommended-java'] as const,
 }
 
 export const screenshotKeys = {
@@ -86,6 +89,15 @@ export function screenshotGroupsQueryOptions() {
 	})
 }
 
+export function instanceRecommendedJavaQueryOptions(instanceId: string) {
+	return queryOptions({
+		queryKey: instanceKeys.recommendedJava(instanceId),
+		networkMode: 'always',
+		queryFn: () => getRecommendedJavaVersion(instanceId),
+		staleTime: Infinity,
+	})
+}
+
 export function instanceDetailQueryOptions(instanceId: string) {
 	return queryOptions({
 		queryKey: instanceKeys.detail(instanceId),
diff --git a/apps/app-frontend/src/platform/app-lib/instances/commands.ts b/apps/app-frontend/src/platform/app-lib/instances/commands.ts
new file mode 100644
index 00000000000..de27bd48ad0
--- /dev/null
+++ b/apps/app-frontend/src/platform/app-lib/instances/commands.ts
@@ -0,0 +1,5 @@
+import { invoke } from '@tauri-apps/api/core'
+
+export function getRecommendedJavaVersion(instanceId: string): Promise<number> {
+	return invoke('plugin:instance|instance_get_recommended_java_version', { instanceId })
+}
diff --git a/apps/app-frontend/src/platform/app-lib/jre/commands.ts b/apps/app-frontend/src/platform/app-lib/jre/commands.ts
new file mode 100644
index 00000000000..531deb35037
--- /dev/null
+++ b/apps/app-frontend/src/platform/app-lib/jre/commands.ts
@@ -0,0 +1,27 @@
+import { invoke } from '@tauri-apps/api/core'
+
+import type { JavaVersion } from './types'
+
+export function getJavaVersions(): Promise<Record<number, JavaVersion>> {
+	return invoke('plugin:jre|get_java_versions')
+}
+
+export function setJavaVersion(javaVersion: Partial<JavaVersion>): Promise<void> {
+	return invoke('plugin:jre|set_java_version', { javaVersion })
+}
+
+export function findFilteredJres(version: number | null): Promise<JavaVersion[]> {
+	return invoke('plugin:jre|jre_find_filtered_jres', { version })
+}
+
+export function getJre(path: string): Promise<JavaVersion | null> {
+	return invoke('plugin:jre|jre_get_jre', { path })
+}
+
+export function autoInstallJava(javaVersion: number): Promise<string> {
+	return invoke('plugin:jre|jre_auto_install_java', { javaVersion })
+}
+
+export function getMaxMemory(): Promise<number> {
+	return invoke('plugin:jre|jre_get_max_memory')
+}
diff --git a/apps/app-frontend/src/platform/app-lib/jre/types.ts b/apps/app-frontend/src/platform/app-lib/jre/types.ts
new file mode 100644
index 00000000000..4df9e160f98
--- /dev/null
+++ b/apps/app-frontend/src/platform/app-lib/jre/types.ts
@@ -0,0 +1,6 @@
+export interface JavaVersion {
+	parsed_version: number
+	version: string
+	architecture: string
+	path: string
+}
diff --git a/apps/app-frontend/src/platform/dialogs.ts b/apps/app-frontend/src/platform/dialogs.ts
new file mode 100644
index 00000000000..0bc366a3a97
--- /dev/null
+++ b/apps/app-frontend/src/platform/dialogs.ts
@@ -0,0 +1,5 @@
+import { open } from '@tauri-apps/plugin-dialog'
+
+export function pickFile(): Promise<string | null> {
+	return open({ multiple: false, directory: false })
+}
diff --git a/apps/app-frontend/src/shared/unsaved-changes/types.ts b/apps/app-frontend/src/shared/unsaved-changes/types.ts
new file mode 100644
index 00000000000..2fe7563e8c2
--- /dev/null
+++ b/apps/app-frontend/src/shared/unsaved-changes/types.ts
@@ -0,0 +1,8 @@
+export type UnsavedChangesController = {
+	hasChanges: () => boolean
+	getOriginal: () => Record<string, unknown>
+	getModified: () => Record<string, unknown>
+	isSaving: () => boolean
+	reset: () => void
+	save: () => void | Promise<void>
+}
diff --git a/apps/app-frontend/src/shared/unsaved-changes/use-unsaved-changes-host.ts b/apps/app-frontend/src/shared/unsaved-changes/use-unsaved-changes-host.ts
new file mode 100644
index 00000000000..78834f2a6c0
--- /dev/null
+++ b/apps/app-frontend/src/shared/unsaved-changes/use-unsaved-changes-host.ts
@@ -0,0 +1,37 @@
+import { computed, ref } from 'vue'
+
+import type { UnsavedChangesController } from './types'
+
+const emptyState: Record<string, unknown> = {}
+
+export function useUnsavedChangesHost() {
+	const popup = ref<{ nudge: () => void } | null>(null)
+	const controller = ref<UnsavedChangesController | null>(null)
+
+	const original = computed(() => controller.value?.getOriginal() ?? emptyState)
+	const modified = computed(() => controller.value?.getModified() ?? emptyState)
+	const saving = computed(() => controller.value?.isSaving() ?? false)
+	const hasUnsavedChanges = computed(
+		() => (controller.value?.hasChanges() ?? false) || saving.value,
+	)
+
+	function canLeave(): boolean {
+		if (!hasUnsavedChanges.value) return true
+		popup.value?.nudge()
+		return false
+	}
+
+	function register(next: UnsavedChangesController | null): void {
+		controller.value = next
+	}
+
+	function reset(): void {
+		controller.value?.reset()
+	}
+
+	function save(): void {
+		void controller.value?.save()
+	}
+
+	return { popup, original, modified, saving, hasUnsavedChanges, canLeave, register, reset, save }
+}

From 2bda95554bc10c19d0bde789a2b251ca3b6a84a0 Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Wed, 11 Nov 2026 13:02:21 +0000
Subject: [PATCH 5/7] chore: retrigger mergeability check


From 9df8587b48bb1fe276a93a23efbfd3073d3fc4ec Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Wed, 11 Nov 2026 13:07:10 +0000
Subject: [PATCH 6/7] fix: rev

---
 .../settings-modal/java-settings.vue          |  2 +-
 .../src/pages/instance/query-options.ts       | 22 ++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/apps/app-frontend/src/features/instances/settings-modal/java-settings.vue b/apps/app-frontend/src/features/instances/settings-modal/java-settings.vue
index 53e0b04b15c..63dd337231e 100644
--- a/apps/app-frontend/src/features/instances/settings-modal/java-settings.vue
+++ b/apps/app-frontend/src/features/instances/settings-modal/java-settings.vue
@@ -42,7 +42,7 @@ const draft = useInstanceSettingsDraft(
 const settingsQuery = useQuery(appSettingsQueryOptions())
 const javaVersionsQuery = useQuery(javaVersionsQueryOptions())
 const recommendedJavaQuery = useQuery(
-	computed(() => instanceRecommendedJavaQueryOptions(instance.value.id)),
+	computed(() => instanceRecommendedJavaQueryOptions(instance.value)),
 )
 
 await Promise.all([
diff --git a/apps/app-frontend/src/pages/instance/query-options.ts b/apps/app-frontend/src/pages/instance/query-options.ts
index 2b7a67998a4..7835ce62ce1 100644
--- a/apps/app-frontend/src/pages/instance/query-options.ts
+++ b/apps/app-frontend/src/pages/instance/query-options.ts
@@ -11,10 +11,16 @@ import {
 } from '@/helpers/instance'
 import { loadInstanceContentData } from '@/helpers/instance-content'
 import { get_by_instance_id } from '@/helpers/process'
+import type { GameInstance } from '@/helpers/types'
 import { refreshWorlds } from '@/helpers/worlds'
 import { getRecommendedJavaVersion } from '@/platform/app-lib/instances/commands'
 import { refreshSharedInstanceLock } from '@/platform/app-lib/shared-instances/commands'
 
+type RecommendedJavaInstance = Pick<
+	GameInstance,
+	'id' | 'game_version' | 'loader' | 'loader_version'
+>
+
 export const instanceKeys = {
 	all: ['instances'] as const,
 	list: () => [...instanceKeys.all, 'list'] as const,
@@ -42,8 +48,14 @@ export const instanceKeys = {
 		[...instanceKeys.sharedUpdatePreviews(instanceId), userId] as const,
 	sharedLock: (instanceId: string) => ['sharedInstanceLock', instanceId] as const,
 	sharedMembers: (instanceId: string) => ['sharedInstanceUsers', instanceId] as const,
-	recommendedJava: (instanceId: string) =>
-		[...instanceKeys.detail(instanceId), 'recommended-java'] as const,
+	recommendedJava: (instance: RecommendedJavaInstance) =>
+		[
+			...instanceKeys.detail(instance.id),
+			'recommended-java',
+			instance.game_version,
+			instance.loader,
+			instance.loader_version ?? null,
+		] as const,
 }
 
 export const screenshotKeys = {
@@ -89,11 +101,11 @@ export function screenshotGroupsQueryOptions() {
 	})
 }
 
-export function instanceRecommendedJavaQueryOptions(instanceId: string) {
+export function instanceRecommendedJavaQueryOptions(instance: RecommendedJavaInstance) {
 	return queryOptions({
-		queryKey: instanceKeys.recommendedJava(instanceId),
+		queryKey: instanceKeys.recommendedJava(instance),
 		networkMode: 'always',
-		queryFn: () => getRecommendedJavaVersion(instanceId),
+		queryFn: () => getRecommendedJavaVersion(instance.id),
 		staleTime: Infinity,
 	})
 }

From 65efae3dea9daf133be21194d33fb4abca36119b Mon Sep 17 00:00:00 2001
From: "Calum H. (IMB11)" <contact@cal.engineer>
Date: Wed, 11 Nov 2026 13:26:13 +0000
Subject: [PATCH 7/7] fix: prepr

---
 .../src/features/java/java-selector/detection-modal.vue  | 6 +-----
 apps/app-frontend/src/locales/ar-SA/index.json           | 9 ---------
 apps/app-frontend/src/locales/cs-CZ/index.json           | 9 ---------
 apps/app-frontend/src/locales/de-CH/index.json           | 9 ---------
 apps/app-frontend/src/locales/de-DE/index.json           | 9 ---------
 apps/app-frontend/src/locales/es-419/index.json          | 9 ---------
 apps/app-frontend/src/locales/es-ES/index.json           | 9 ---------
 apps/app-frontend/src/locales/fi-FI/index.json           | 3 ---
 apps/app-frontend/src/locales/fr-FR/index.json           | 9 ---------
 apps/app-frontend/src/locales/he-IL/index.json           | 9 ---------
 apps/app-frontend/src/locales/hu-HU/index.json           | 9 ---------
 apps/app-frontend/src/locales/it-IT/index.json           | 9 ---------
 apps/app-frontend/src/locales/ja-JP/index.json           | 9 ---------
 apps/app-frontend/src/locales/ko-KR/index.json           | 9 ---------
 apps/app-frontend/src/locales/nl-NL/index.json           | 9 ---------
 apps/app-frontend/src/locales/pl-PL/index.json           | 9 ---------
 apps/app-frontend/src/locales/pt-BR/index.json           | 9 ---------
 apps/app-frontend/src/locales/pt-PT/index.json           | 9 ---------
 apps/app-frontend/src/locales/ru-RU/index.json           | 9 ---------
 apps/app-frontend/src/locales/sv-SE/index.json           | 9 ---------
 apps/app-frontend/src/locales/tr-TR/index.json           | 9 ---------
 apps/app-frontend/src/locales/uk-UA/index.json           | 9 ---------
 apps/app-frontend/src/locales/vi-VN/index.json           | 9 ---------
 apps/app-frontend/src/locales/zh-CN/index.json           | 9 ---------
 apps/app-frontend/src/locales/zh-TW/index.json           | 9 ---------
 25 files changed, 1 insertion(+), 215 deletions(-)

diff --git a/apps/app-frontend/src/features/java/java-selector/detection-modal.vue b/apps/app-frontend/src/features/java/java-selector/detection-modal.vue
index 5ae5d291cd1..b5f8353072a 100644
--- a/apps/app-frontend/src/features/java/java-selector/detection-modal.vue
+++ b/apps/app-frontend/src/features/java/java-selector/detection-modal.vue
@@ -96,11 +96,7 @@ const messages = defineMessages({
 </script>
 
 <template>
-	<NewModal
-		ref="modal"
-		:header="formatMessage(messages.title)"
-		:on-hide="() => (open = false)"
-	>
+	<NewModal ref="modal" :header="formatMessage(messages.title)" :on-hide="() => (open = false)">
 		<Table :columns="columns" :data="detectedJres" row-key="path">
 			<template #cell-version="{ value }">
 				<span class="font-semibold text-primary">{{ value }}</span>
diff --git a/apps/app-frontend/src/locales/ar-SA/index.json b/apps/app-frontend/src/locales/ar-SA/index.json
index a9a0d0656f0..b05f9f6c6a3 100644
--- a/apps/app-frontend/src/locales/ar-SA/index.json
+++ b/apps/app-frontend/src/locales/ar-SA/index.json
@@ -953,27 +953,18 @@
   "app.java-detection.title": {
     "message": "حدد تثبيت Java"
   },
-  "app.java-selector.already-installed": {
-    "message": "مثبت بالفعل"
-  },
   "app.java-selector.browse": {
     "message": "تصفح"
   },
   "app.java-selector.detect": {
     "message": "كشف"
   },
-  "app.java-selector.install-recommended": {
-    "message": "التثبيت موصى به"
-  },
   "app.java-selector.installing": {
     "message": "جاري التثبيت..."
   },
   "app.java-selector.path.placeholder": {
     "message": "/path/to/java"
   },
-  "app.java-selector.test-installation": {
-    "message": "اختبار تثبيت Java"
-  },
   "app.library.actions.label": {
     "message": "إجراءات المكتبة"
   },
diff --git a/apps/app-frontend/src/locales/cs-CZ/index.json b/apps/app-frontend/src/locales/cs-CZ/index.json
index d867b6325ed..91e5eefb2da 100644
--- a/apps/app-frontend/src/locales/cs-CZ/index.json
+++ b/apps/app-frontend/src/locales/cs-CZ/index.json
@@ -1019,27 +1019,18 @@
   "app.java-detection.title": {
     "message": "Vybrat instalaci Javy"
   },
-  "app.java-selector.already-installed": {
-    "message": "Již nainstalováno"
-  },
   "app.java-selector.browse": {
     "message": "Procházet"
   },
   "app.java-selector.detect": {
     "message": "Detekovat"
   },
-  "app.java-selector.install-recommended": {
-    "message": "Doporučeno nainstalovat"
-  },
   "app.java-selector.installing": {
     "message": "Instalování..."
   },
   "app.java-selector.path.placeholder": {
     "message": "/cesta/k/javě"
   },
-  "app.java-selector.test-installation": {
-    "message": "Otestovat instalaci Javy"
-  },
   "app.library.actions.label": {
     "message": "Akce knihovny"
   },
diff --git a/apps/app-frontend/src/locales/de-CH/index.json b/apps/app-frontend/src/locales/de-CH/index.json
index c6b45a7ed88..ba94be9bc8d 100644
--- a/apps/app-frontend/src/locales/de-CH/index.json
+++ b/apps/app-frontend/src/locales/de-CH/index.json
@@ -1022,27 +1022,18 @@
   "app.java-detection.title": {
     "message": "Java-Installation auswählen"
   },
-  "app.java-selector.already-installed": {
-    "message": "Bereits installiert"
-  },
   "app.java-selector.browse": {
     "message": "Durchsuchen"
   },
   "app.java-selector.detect": {
     "message": "Erkennen"
   },
-  "app.java-selector.install-recommended": {
-    "message": "Empfohlenes installieren"
-  },
   "app.java-selector.installing": {
     "message": "Wird installiert..."
   },
   "app.java-selector.path.placeholder": {
     "message": "/pfad/zu/java"
   },
-  "app.java-selector.test-installation": {
-    "message": "Java-Installation testen"
-  },
   "app.library.actions.label": {
     "message": "Bibliotheksaktionen"
   },
diff --git a/apps/app-frontend/src/locales/de-DE/index.json b/apps/app-frontend/src/locales/de-DE/index.json
index de3bc78ab23..5e6e7e90042 100644
--- a/apps/app-frontend/src/locales/de-DE/index.json
+++ b/apps/app-frontend/src/locales/de-DE/index.json
@@ -1022,27 +1022,18 @@
   "app.java-detection.title": {
     "message": "Java-Installation auswählen"
   },
-  "app.java-selector.already-installed": {
-    "message": "Bereits installiert"
-  },
   "app.java-selector.browse": {
     "message": "Durchsuchen"
   },
   "app.java-selector.detect": {
     "message": "Erkennen"
   },
-  "app.java-selector.install-recommended": {
-    "message": "Empfohlenes installieren"
-  },
   "app.java-selector.installing": {
     "message": "Wird installiert..."
   },
   "app.java-selector.path.placeholder": {
     "message": "/pfad/zu/java"
   },
-  "app.java-selector.test-installation": {
-    "message": "Java-Installation testen"
-  },
   "app.library.actions.label": {
     "message": "Bibliotheksaktionen"
   },
diff --git a/apps/app-frontend/src/locales/es-419/index.json b/apps/app-frontend/src/locales/es-419/index.json
index 71319dc3d8b..d9a0bbe2957 100644
--- a/apps/app-frontend/src/locales/es-419/index.json
+++ b/apps/app-frontend/src/locales/es-419/index.json
@@ -1022,27 +1022,18 @@
   "app.java-detection.title": {
     "message": "Seleccionar instalación de Java"
   },
-  "app.java-selector.already-installed": {
-    "message": "Ya está instalado"
-  },
   "app.java-selector.browse": {
     "message": "Buscar"
   },
   "app.java-selector.detect": {
     "message": "Detectar"
   },
-  "app.java-selector.install-recommended": {
-    "message": "Instalar recomendado"
-  },
   "app.java-selector.installing": {
     "message": "Instalando..."
   },
   "app.java-selector.path.placeholder": {
     "message": "/ruta/a/java"
   },
-  "app.java-selector.test-installation": {
-    "message": "Probar instalación de Java"
-  },
   "app.library.actions.label": {
     "message": "Acciones de la Biblioteca"
   },
diff --git a/apps/app-frontend/src/locales/es-ES/index.json b/apps/app-frontend/src/locales/es-ES/index.json
index 6b369053b7d..c7467d77255 100644
--- a/apps/app-frontend/src/locales/es-ES/index.json
+++ b/apps/app-frontend/src/locales/es-ES/index.json
@@ -1022,27 +1022,18 @@
   "app.java-detection.title": {
     "message": "Seleccionar instalación de Java"
   },
-  "app.java-selector.already-installed": {
-    "message": "Ya instalado"
-  },
   "app.java-selector.browse": {
     "message": "Explorar"
   },
   "app.java-selector.detect": {
     "message": "Detectar"
   },
-  "app.java-selector.install-recommended": {
-    "message": "Instalación recomendada"
-  },
   "app.java-selector.installing": {
     "message": "Instalando..."
   },
   "app.java-selector.path.placeholder": {
     "message": "/ruta/a/java"
   },
-  "app.java-selector.test-installation": {
-    "message": "Probar instalación de Java"
-  },
   "app.library.actions.label": {
     "message": "Acciones de la librería"
   },
diff --git a/apps/app-frontend/src/locales/fi-FI/index.json b/apps/app-frontend/src/locales/fi-FI/index.json
index 56d91e8997c..05685985a59 100644
--- a/apps/app-frontend/src/locales/fi-FI/index.json
+++ b/apps/app-frontend/src/locales/fi-FI/index.json
@@ -905,9 +905,6 @@
   "app.java-detection.selected": {
     "message": "Valittu"
   },
-  "app.java-selector.already-installed": {
-    "message": "On jo asennettu"
-  },
   "app.java-selector.installing": {
     "message": "Asennetaan..."
   },
diff --git a/apps/app-frontend/src/locales/fr-FR/index.json b/apps/app-frontend/src/locales/fr-FR/index.json
index 2401b8422da..9049284ef6e 100644
--- a/apps/app-frontend/src/locales/fr-FR/index.json
+++ b/apps/app-frontend/src/locales/fr-FR/index.json
@@ -1022,27 +1022,18 @@
   "app.java-detection.title": {
     "message": "Sélectionner l'installation Java"
   },
-  "app.java-selector.already-installed": {
-    "message": "Déjà installé"
-  },
   "app.java-selector.browse": {
     "message": "Naviguer"
   },
   "app.java-selector.detect": {
     "message": "Détecter"
   },
-  "app.java-selector.install-recommended": {
-    "message": "Télécharger les fichiers recommandés"
-  },
   "app.java-selector.installing": {
     "message": "Installation..."
   },
   "app.java-selector.path.placeholder": {
     "message": "/chemin/vers/java"
   },
-  "app.java-selector.test-installation": {
-    "message": "Tester l'installation Java"
-  },
   "app.library.actions.label": {
     "message": "Actions de la bibliothèque"
   },
diff --git a/apps/app-frontend/src/locales/he-IL/index.json b/apps/app-frontend/src/locales/he-IL/index.json
index 3142cf2405e..8112921be5d 100644
--- a/apps/app-frontend/src/locales/he-IL/index.json
+++ b/apps/app-frontend/src/locales/he-IL/index.json
@@ -860,27 +860,18 @@
   "app.java-detection.title": {
     "message": "בחירה בהתקנת ג'אבה"
   },
-  "app.java-selector.already-installed": {
-    "message": "כבר מותקן"
-  },
   "app.java-selector.browse": {
     "message": "עיון"
   },
   "app.java-selector.detect": {
     "message": "זהה"
   },
-  "app.java-selector.install-recommended": {
-    "message": "הורד מומלץ"
-  },
   "app.java-selector.installing": {
     "message": "מתקין..."
   },
   "app.java-selector.path.placeholder": {
     "message": "/path/to/java"
   },
-  "app.java-selector.test-installation": {
-    "message": "בדוק את הגרסה המותקנת של ג'אבה"
-  },
   "app.library.actions.label": {
     "message": "פעולות ספרייה"
   },
diff --git a/apps/app-frontend/src/locales/hu-HU/index.json b/apps/app-frontend/src/locales/hu-HU/index.json
index 81f1a6ba9ed..0fbc470eedf 100644
--- a/apps/app-frontend/src/locales/hu-HU/index.json
+++ b/apps/app-frontend/src/locales/hu-HU/index.json
@@ -956,27 +956,18 @@
   "app.java-detection.title": {
     "message": "Java-telepítés kiválasztása"
   },
-  "app.java-selector.already-installed": {
-    "message": "Már telepítve van"
-  },
   "app.java-selector.browse": {
     "message": "Tallózás"
   },
   "app.java-selector.detect": {
     "message": "Észlelés"
   },
-  "app.java-selector.install-recommended": {
-    "message": "Ajánlott verzió telepítése"
-  },
   "app.java-selector.installing": {
     "message": "Telepítés..."
   },
   "app.java-selector.path.placeholder": {
     "message": "/eleresi/ut/a/javahoz"
   },
-  "app.java-selector.test-installation": {
-    "message": "Java-telepítés tesztelése"
-  },
   "app.library.actions.label": {
     "message": "Könyvtárműveletek"
   },
diff --git a/apps/app-frontend/src/locales/it-IT/index.json b/apps/app-frontend/src/locales/it-IT/index.json
index c81f2a41fec..1ce95fcc7a6 100644
--- a/apps/app-frontend/src/locales/it-IT/index.json
+++ b/apps/app-frontend/src/locales/it-IT/index.json
@@ -1022,27 +1022,18 @@
   "app.java-detection.title": {
     "message": "Seleziona l'installazione di Java"
   },
-  "app.java-selector.already-installed": {
-    "message": "Già installata"
-  },
   "app.java-selector.browse": {
     "message": "Seleziona"
   },
   "app.java-selector.detect": {
     "message": "Rileva"
   },
-  "app.java-selector.install-recommended": {
-    "message": "Installa consigliata"
-  },
   "app.java-selector.installing": {
     "message": "Installazione..."
   },
   "app.java-selector.path.placeholder": {
     "message": "/percorso/di/java"
   },
-  "app.java-selector.test-installation": {
-    "message": "Conferma dell'installazione di Java"
-  },
   "app.library.actions.label": {
     "message": "Azioni sulla libreria"
   },
diff --git a/apps/app-frontend/src/locales/ja-JP/index.json b/apps/app-frontend/src/locales/ja-JP/index.json
index 6f5a82d26c6..f96c588eb16 100644
--- a/apps/app-frontend/src/locales/ja-JP/index.json
+++ b/apps/app-frontend/src/locales/ja-JP/index.json
@@ -1004,27 +1004,18 @@
   "app.java-detection.title": {
     "message": "使用するJavaを選んでください"
   },
-  "app.java-selector.already-installed": {
-    "message": "インストール済み"
-  },
   "app.java-selector.browse": {
     "message": "探す"
   },
   "app.java-selector.detect": {
     "message": "検出"
   },
-  "app.java-selector.install-recommended": {
-    "message": "推奨をインストール"
-  },
   "app.java-selector.installing": {
     "message": "インストール中…"
   },
   "app.java-selector.path.placeholder": {
     "message": "/path/to/java"
   },
-  "app.java-selector.test-installation": {
-    "message": "Javaのインストールをテスト"
-  },
   "app.library.actions.label": {
     "message": "ライブラリの操作"
   },
diff --git a/apps/app-frontend/src/locales/ko-KR/index.json b/apps/app-frontend/src/locales/ko-KR/index.json
index 03f62a9fac3..f64c18e6faa 100644
--- a/apps/app-frontend/src/locales/ko-KR/index.json
+++ b/apps/app-frontend/src/locales/ko-KR/index.json
@@ -1022,27 +1022,18 @@
   "app.java-detection.title": {
     "message": "Java 설치 위치 선택"
   },
-  "app.java-selector.already-installed": {
-    "message": "이미 설치됨"
-  },
   "app.java-selector.browse": {
     "message": "찾아보기"
   },
   "app.java-selector.detect": {
     "message": "감지"
   },
-  "app.java-selector.install-recommended": {
-    "message": "권장 버전 설치"
-  },
   "app.java-selector.installing": {
     "message": "설치 중..."
   },
   "app.java-selector.path.placeholder": {
     "message": "/path/to/java"
   },
-  "app.java-selector.test-installation": {
-    "message": "Java 설치 테스트"
-  },
   "app.library.actions.label": {
     "message": "라이브러리 동작"
   },
diff --git a/apps/app-frontend/src/locales/nl-NL/index.json b/apps/app-frontend/src/locales/nl-NL/index.json
index edd0f35e4b2..9c2b3d7d912 100644
--- a/apps/app-frontend/src/locales/nl-NL/index.json
+++ b/apps/app-frontend/src/locales/nl-NL/index.json
@@ -995,27 +995,18 @@
   "app.java-detection.title": {
     "message": "Selecteer Java-installatie"
   },
-  "app.java-selector.already-installed": {
-    "message": "Al geïnstalleerd"
-  },
   "app.java-selector.browse": {
     "message": "Bladeren"
   },
   "app.java-selector.detect": {
     "message": "Detecteren"
   },
-  "app.java-selector.install-recommended": {
-    "message": "Aanbevolen instantie"
-  },
   "app.java-selector.installing": {
     "message": "Installeren..."
   },
   "app.java-selector.path.placeholder": {
     "message": "/pad/naar/java"
   },
-  "app.java-selector.test-installation": {
-    "message": "Java-installatie testen"
-  },
   "app.library.actions.label": {
     "message": "Bibliotheek acties"
   },
diff --git a/apps/app-frontend/src/locales/pl-PL/index.json b/apps/app-frontend/src/locales/pl-PL/index.json
index f1cc3884f03..a143cb745e3 100644
--- a/apps/app-frontend/src/locales/pl-PL/index.json
+++ b/apps/app-frontend/src/locales/pl-PL/index.json
@@ -1010,27 +1010,18 @@
   "app.java-detection.title": {
     "message": "Wybierz instalację Java"
   },
-  "app.java-selector.already-installed": {
-    "message": "Już zainstalowano"
-  },
   "app.java-selector.browse": {
     "message": "Przeglądaj"
   },
   "app.java-selector.detect": {
     "message": "Wykryj"
   },
-  "app.java-selector.install-recommended": {
-    "message": "Zainstaluj zalecane"
-  },
   "app.java-selector.installing": {
     "message": "Instalowanie..."
   },
   "app.java-selector.path.placeholder": {
     "message": "/path/to/java"
   },
-  "app.java-selector.test-installation": {
-    "message": "Testuj instalację Java"
-  },
   "app.library.actions.label": {
     "message": "Opcje biblioteki"
   },
diff --git a/apps/app-frontend/src/locales/pt-BR/index.json b/apps/app-frontend/src/locales/pt-BR/index.json
index b595b10897d..db64e2ff708 100644
--- a/apps/app-frontend/src/locales/pt-BR/index.json
+++ b/apps/app-frontend/src/locales/pt-BR/index.json
@@ -1022,27 +1022,18 @@
   "app.java-detection.title": {
     "message": "Selecionar instalação Java"
   },
-  "app.java-selector.already-installed": {
-    "message": "Já instalado"
-  },
   "app.java-selector.browse": {
     "message": "Navegar"
   },
   "app.java-selector.detect": {
     "message": "Detectar"
   },
-  "app.java-selector.install-recommended": {
-    "message": "Instalação recomendada"
-  },
   "app.java-selector.installing": {
     "message": "Instalando..."
   },
   "app.java-selector.path.placeholder": {
     "message": "/caminho/ao/java"
   },
-  "app.java-selector.test-installation": {
-    "message": "Instalação de teste Java"
-  },
   "app.library.actions.label": {
     "message": "Ações da livraria"
   },
diff --git a/apps/app-frontend/src/locales/pt-PT/index.json b/apps/app-frontend/src/locales/pt-PT/index.json
index 6b3019dde8d..fe30ad3d6e1 100644
--- a/apps/app-frontend/src/locales/pt-PT/index.json
+++ b/apps/app-frontend/src/locales/pt-PT/index.json
@@ -851,27 +851,18 @@
   "app.java-detection.columns.path": {
     "message": "Caminho"
   },
-  "app.java-selector.already-installed": {
-    "message": "Já instalado"
-  },
   "app.java-selector.browse": {
     "message": "Navegar"
   },
   "app.java-selector.detect": {
     "message": "Detetar"
   },
-  "app.java-selector.install-recommended": {
-    "message": "Recomenda-se a instalação"
-  },
   "app.java-selector.installing": {
     "message": "A instalar..."
   },
   "app.java-selector.path.placeholder": {
     "message": "/caminho/para/java"
   },
-  "app.java-selector.test-installation": {
-    "message": "Testar a instalação do Java"
-  },
   "app.library.actions.label": {
     "message": "Ações da biblioteca"
   },
diff --git a/apps/app-frontend/src/locales/ru-RU/index.json b/apps/app-frontend/src/locales/ru-RU/index.json
index 4d893cf15b2..2070b25d22b 100644
--- a/apps/app-frontend/src/locales/ru-RU/index.json
+++ b/apps/app-frontend/src/locales/ru-RU/index.json
@@ -998,27 +998,18 @@
   "app.java-detection.title": {
     "message": "Выбор расположения Java"
   },
-  "app.java-selector.already-installed": {
-    "message": "Уже установлена"
-  },
   "app.java-selector.browse": {
     "message": "Обзор"
   },
   "app.java-selector.detect": {
     "message": "Обнаружить"
   },
-  "app.java-selector.install-recommended": {
-    "message": "Установить рекомендуемую"
-  },
   "app.java-selector.installing": {
     "message": "Установка..."
   },
   "app.java-selector.path.placeholder": {
     "message": "/путь/к/java"
   },
-  "app.java-selector.test-installation": {
-    "message": "Проверить установку Java"
-  },
   "app.library.actions.label": {
     "message": "Действия в библиотеке"
   },
diff --git a/apps/app-frontend/src/locales/sv-SE/index.json b/apps/app-frontend/src/locales/sv-SE/index.json
index e1a7f85b4f5..f013650a36e 100644
--- a/apps/app-frontend/src/locales/sv-SE/index.json
+++ b/apps/app-frontend/src/locales/sv-SE/index.json
@@ -977,27 +977,18 @@
   "app.java-detection.title": {
     "message": "Välj java-installation"
   },
-  "app.java-selector.already-installed": {
-    "message": "Redan installerad"
-  },
   "app.java-selector.browse": {
     "message": "Bläddra"
   },
   "app.java-selector.detect": {
     "message": "Hitta"
   },
-  "app.java-selector.install-recommended": {
-    "message": "Installation rekommenderas"
-  },
   "app.java-selector.installing": {
     "message": "Installerar..."
   },
   "app.java-selector.path.placeholder": {
     "message": "/sökväg/till/java"
   },
-  "app.java-selector.test-installation": {
-    "message": "Testa Java-installationen"
-  },
   "app.library.actions.label": {
     "message": "Biblioteksåtgärder"
   },
diff --git a/apps/app-frontend/src/locales/tr-TR/index.json b/apps/app-frontend/src/locales/tr-TR/index.json
index 3c58e1a1a9a..e8bdede5e12 100644
--- a/apps/app-frontend/src/locales/tr-TR/index.json
+++ b/apps/app-frontend/src/locales/tr-TR/index.json
@@ -971,27 +971,18 @@
   "app.java-detection.title": {
     "message": "Java kurulumunu seç"
   },
-  "app.java-selector.already-installed": {
-    "message": "Zaten kuruldu"
-  },
   "app.java-selector.browse": {
     "message": "Göz at"
   },
   "app.java-selector.detect": {
     "message": "Tespit et"
   },
-  "app.java-selector.install-recommended": {
-    "message": "Önerileni kur"
-  },
   "app.java-selector.installing": {
     "message": "Kuruluyor..."
   },
   "app.java-selector.path.placeholder": {
     "message": "/java/kurulum/yolu"
   },
-  "app.java-selector.test-installation": {
-    "message": "Java kurulumunu dene"
-  },
   "app.library.actions.label": {
     "message": "Kütüphane eylemleri"
   },
diff --git a/apps/app-frontend/src/locales/uk-UA/index.json b/apps/app-frontend/src/locales/uk-UA/index.json
index 231282f68ca..9c2990cffb6 100644
--- a/apps/app-frontend/src/locales/uk-UA/index.json
+++ b/apps/app-frontend/src/locales/uk-UA/index.json
@@ -1013,27 +1013,18 @@
   "app.java-detection.title": {
     "message": "Вибір інсталяції Java"
   },
-  "app.java-selector.already-installed": {
-    "message": "Уже встановлено"
-  },
   "app.java-selector.browse": {
     "message": "Огляд"
   },
   "app.java-selector.detect": {
     "message": "Виявити"
   },
-  "app.java-selector.install-recommended": {
-    "message": "Установити рекомендоване"
-  },
   "app.java-selector.installing": {
     "message": "Установлюємо..."
   },
   "app.java-selector.path.placeholder": {
     "message": "/шлях/до/java"
   },
-  "app.java-selector.test-installation": {
-    "message": "Протестувати інсталяцію Java"
-  },
   "app.library.actions.label": {
     "message": "Дії з бібліотекою"
   },
diff --git a/apps/app-frontend/src/locales/vi-VN/index.json b/apps/app-frontend/src/locales/vi-VN/index.json
index 3feec134a6b..3b80b44f04f 100644
--- a/apps/app-frontend/src/locales/vi-VN/index.json
+++ b/apps/app-frontend/src/locales/vi-VN/index.json
@@ -950,27 +950,18 @@
   "app.java-detection.title": {
     "message": "Chọn bản cài đặt Java"
   },
-  "app.java-selector.already-installed": {
-    "message": "Đã được cài đặt"
-  },
   "app.java-selector.browse": {
     "message": "Duyệt"
   },
   "app.java-selector.detect": {
     "message": "Dò tìm"
   },
-  "app.java-selector.install-recommended": {
-    "message": "Cài bản được đề xuất"
-  },
   "app.java-selector.installing": {
     "message": "Đang cài đặt..."
   },
   "app.java-selector.path.placeholder": {
     "message": "/đường/dẫn/đến/java"
   },
-  "app.java-selector.test-installation": {
-    "message": "Kiểm tra bản cài đặt Java"
-  },
   "app.library.actions.label": {
     "message": "Thao tác thư viện"
   },
diff --git a/apps/app-frontend/src/locales/zh-CN/index.json b/apps/app-frontend/src/locales/zh-CN/index.json
index a0c1cc4e9e5..f0ecd314d67 100644
--- a/apps/app-frontend/src/locales/zh-CN/index.json
+++ b/apps/app-frontend/src/locales/zh-CN/index.json
@@ -1013,27 +1013,18 @@
   "app.java-detection.title": {
     "message": "选择Java配置"
   },
-  "app.java-selector.already-installed": {
-    "message": "已安装"
-  },
   "app.java-selector.browse": {
     "message": "浏览"
   },
   "app.java-selector.detect": {
     "message": "检测"
   },
-  "app.java-selector.install-recommended": {
-    "message": "安装推荐版本"
-  },
   "app.java-selector.installing": {
     "message": "正在安装……"
   },
   "app.java-selector.path.placeholder": {
     "message": "/path/to/java"
   },
-  "app.java-selector.test-installation": {
-    "message": "测试"
-  },
   "app.library.actions.label": {
     "message": "实例库操作"
   },
diff --git a/apps/app-frontend/src/locales/zh-TW/index.json b/apps/app-frontend/src/locales/zh-TW/index.json
index 7dab11c67d2..5934cef81fe 100644
--- a/apps/app-frontend/src/locales/zh-TW/index.json
+++ b/apps/app-frontend/src/locales/zh-TW/index.json
@@ -1007,27 +1007,18 @@
   "app.java-detection.title": {
     "message": "選擇 Java 安裝"
   },
-  "app.java-selector.already-installed": {
-    "message": "已安裝"
-  },
   "app.java-selector.browse": {
     "message": "瀏覽"
   },
   "app.java-selector.detect": {
     "message": "偵測"
   },
-  "app.java-selector.install-recommended": {
-    "message": "建議安裝"
-  },
   "app.java-selector.installing": {
     "message": "正在安裝..."
   },
   "app.java-selector.path.placeholder": {
     "message": "/path/to/java"
   },
-  "app.java-selector.test-installation": {
-    "message": "測試 Java 安裝"
-  },
   "app.library.actions.label": {
     "message": "遊戲庫動作"
   },