From 99d1b32428287049439762aeb5fb5ff249389aad Mon Sep 17 00:00:00 2001
From: Creeperkatze <178587183+Creeperkatze@users.noreply.github.com>
Date: Sun, 22 Feb 2026 14:25:45 +0100
Subject: [PATCH 7/8] Make java uppercase
---
.../src/components/ui/instance_settings/JavaSettings.vue | 6 +++---
apps/app-frontend/src/locales/en-US/index.json | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue
index a058721884..5a8cebf218 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue
@@ -162,7 +162,7 @@ const messages = defineMessages({
},
customJavaInstallation: {
id: 'instance.settings.tabs.java.custom-java-installation',
- defaultMessage: 'Custom java installation',
+ defaultMessage: 'Custom Java installation',
},
javaPathPlaceholder: {
id: 'instance.settings.tabs.java.java-path-placeholder',
@@ -182,11 +182,11 @@ const messages = defineMessages({
},
customJavaArguments: {
id: 'instance.settings.tabs.java.custom-java-arguments',
- defaultMessage: 'Custom java arguments',
+ defaultMessage: 'Custom Java arguments',
},
enterJavaArguments: {
id: 'instance.settings.tabs.java.enter-java-arguments',
- defaultMessage: 'Enter java arguments...',
+ defaultMessage: 'Enter Java arguments...',
},
javaEnvironmentVariables: {
id: 'instance.settings.tabs.java.environment-variables',
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index c259dca72f..0646697860 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -486,10 +486,10 @@
"message": "Custom environment variables"
},
"instance.settings.tabs.java.custom-java-arguments": {
- "message": "Custom java arguments"
+ "message": "Custom Java arguments"
},
"instance.settings.tabs.java.custom-java-installation": {
- "message": "Custom java installation"
+ "message": "Custom Java installation"
},
"instance.settings.tabs.java.custom-memory-allocation": {
"message": "Custom memory allocation"
@@ -498,7 +498,7 @@
"message": "Enter environmental variables..."
},
"instance.settings.tabs.java.enter-java-arguments": {
- "message": "Enter java arguments..."
+ "message": "Enter Java arguments..."
},
"instance.settings.tabs.java.environment-variables": {
"message": "Environment variables"
From 98a90cd084ab7243a28f31db5a43b79d6121aa68 Mon Sep 17 00:00:00 2001
From: Creeperkatze <178587183+Creeperkatze@users.noreply.github.com>
Date: Sun, 22 Feb 2026 17:33:55 +0100
Subject: [PATCH 8/8] Use shared logic, only track test when clicked manually
---
.../src/components/ui/JavaSelector.vue | 79 ++++++++++---------
.../ui/instance_settings/JavaSettings.vue | 71 +++++++----------
.../src/composables/useJavaTest.js | 52 ++++++++++++
3 files changed, 123 insertions(+), 79 deletions(-)
create mode 100644 apps/app-frontend/src/composables/useJavaTest.js
diff --git a/apps/app-frontend/src/components/ui/JavaSelector.vue b/apps/app-frontend/src/components/ui/JavaSelector.vue
index 217ecb3c38..28cb5bfb4a 100644
--- a/apps/app-frontend/src/components/ui/JavaSelector.vue
+++ b/apps/app-frontend/src/components/ui/JavaSelector.vue
@@ -1,6 +1,6 @@
-
+
-
-
-
-
+
+
+
@@ -63,15 +68,21 @@ import {
} from '@modrinth/assets'
import { Button, injectNotificationManager, StyledInput } from '@modrinth/ui'
import { open } from '@tauri-apps/plugin-dialog'
-import { onMounted, ref, watch } from 'vue'
+import { ref, watch } from 'vue'
import JavaDetectionModal from '@/components/ui/JavaDetectionModal.vue'
+import useJavaTest from '@/composables/useJavaTest.js'
import { trackEvent } from '@/helpers/analytics'
-import { auto_install_java, find_filtered_jres, get_jre, test_jre } from '@/helpers/jre.js'
+import { auto_install_java, find_filtered_jres, get_jre } from '@/helpers/jre.js'
const { handleError } = injectNotificationManager()
const props = defineProps({
+ id: {
+ type: String,
+ required: false,
+ default: null,
+ },
version: {
type: Number,
required: false,
@@ -102,42 +113,34 @@ const props = defineProps({
const emit = defineEmits(['update:modelValue'])
-const testingJava = ref(false)
-const testingJavaSuccess = ref(null)
-const hoveringTest = ref(false)
+const {
+ testingJava,
+ javaTestResult: testingJavaSuccess,
+ testJavaInstallationDebounced,
+ testJavaInstallation,
+} = useJavaTest()
+
const installingJava = ref(false)
-let testDebounceTimer = null
+const hoveringTest = ref(false)
+let hasInitialized = false
async function runTest(path) {
- if (testDebounceTimer) {
- clearTimeout(testDebounceTimer)
- testDebounceTimer = null
- }
- if (!path) {
- testingJavaSuccess.value = null
- return
- }
- testingJava.value = true
- testingJavaSuccess.value = await test_jre(path, props.version).catch(() => false)
- testingJava.value = false
-
- trackEvent('JavaTest', { path, success: testingJavaSuccess.value })
-}
-
-function scheduleTest(path) {
- if (testDebounceTimer) clearTimeout(testDebounceTimer)
- testingJavaSuccess.value = null
- testDebounceTimer = setTimeout(() => runTest(path), 600)
+ await testJavaInstallation(path, props.version, true)
}
-onMounted(() => {
- const path = props.modelValue?.path
- if (path) runTest(path)
-})
-
watch(
() => props.modelValue?.path,
- (newPath) => scheduleTest(newPath),
+ (newPath) => {
+ if (newPath) {
+ if (!hasInitialized) {
+ testJavaInstallation(newPath, props.version, false)
+ hasInitialized = true
+ } else {
+ testJavaInstallationDebounced(newPath, props.version)
+ }
+ }
+ },
+ { immediate: true },
)
async function handleJavaFileInput() {
@@ -149,6 +152,7 @@ async function handleJavaFileInput() {
result = {
path: filePath.path ?? filePath,
version: props.version.toString(),
+ parsed_version: props.version,
architecture: 'x86',
}
}
@@ -182,6 +186,7 @@ async function reinstallJava() {
result = {
path: path,
version: props.version.toString(),
+ parsed_version: props.version,
architecture: 'x86',
}
}
diff --git a/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue b/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue
index 5a8cebf218..d8e331662d 100644
--- a/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue
+++ b/apps/app-frontend/src/components/ui/instance_settings/JavaSettings.vue
@@ -18,11 +18,11 @@ import {
useVIntl,
} from '@modrinth/ui'
import { open } from '@tauri-apps/plugin-dialog'
-import { computed, onMounted, readonly, ref, watch } from 'vue'
+import { computed, readonly, ref, watch } from 'vue'
import JavaDetectionModal from '@/components/ui/JavaDetectionModal.vue'
+import useJavaTest from '@/composables/useJavaTest.js'
import useMemorySlider from '@/composables/useMemorySlider'
-import { test_jre } from '@/helpers/jre.js'
import { edit, get_optimal_jre_key } from '@/helpers/profile'
import { get } from '@/helpers/settings.ts'
@@ -50,41 +50,26 @@ watch(overrideJavaInstall, (enabled) => {
}
})
-// Auto-test state
-const testingJava = ref(false)
-const javaTestResult = ref(null)
-const hoveringTest = ref(false)
-let testDebounceTimer: ReturnType | null = null
-
-async function runJavaTest(path: string) {
- if (testDebounceTimer) {
- clearTimeout(testDebounceTimer)
- testDebounceTimer = null
- }
- if (!path || !optimalJava?.parsed_version) {
- javaTestResult.value = null
- return
- }
- testingJava.value = true
- try {
- javaTestResult.value = await test_jre(path, optimalJava?.parsed_version ?? null)
- } catch {
- javaTestResult.value = false
- }
- testingJava.value = false
-}
-
-function scheduleJavaTest(path: string) {
- if (testDebounceTimer) clearTimeout(testDebounceTimer)
- javaTestResult.value = null
- testDebounceTimer = setTimeout(() => runJavaTest(path), 600)
-}
+const { testingJava, javaTestResult, testJavaInstallationDebounced, testJavaInstallation } =
+ useJavaTest()
-onMounted(() => {
- if (activePath.value) runJavaTest(activePath.value)
-})
+const hoveringTest = ref(false)
+let hasInitialized = false
-watch(activePath, (newPath) => scheduleJavaTest(newPath))
+watch(
+ activePath,
+ (newPath) => {
+ if (newPath && optimalJava?.parsed_version) {
+ if (!hasInitialized) {
+ testJavaInstallation(newPath, optimalJava?.parsed_version, false)
+ hasInitialized = true
+ } else {
+ testJavaInstallationDebounced(newPath, optimalJava?.parsed_version)
+ }
+ }
+ },
+ { immediate: true },
+)
const javaDetectionModal = ref<{ show: (version: number, current: object) => void } | null>(null)
@@ -96,7 +81,7 @@ async function handleBrowseJava() {
}
function handleDetectJava() {
- javaDetectionModal.value.show(optimalJava?.parsed_version, { path: javaPath.value })
+ javaDetectionModal.value?.show(optimalJava?.parsed_version, { path: javaPath.value })
}
const overrideJavaArgs = ref((props.instance.extra_launch_args?.length ?? 0) > 0)
@@ -240,18 +225,20 @@ const messages = defineMessages({
/>
diff --git a/apps/app-frontend/src/composables/useJavaTest.js b/apps/app-frontend/src/composables/useJavaTest.js
new file mode 100644
index 0000000000..eb2d9321a3
--- /dev/null
+++ b/apps/app-frontend/src/composables/useJavaTest.js
@@ -0,0 +1,52 @@
+import { ref } from 'vue'
+
+import { trackEvent } from '@/helpers/analytics'
+import { test_jre } from '@/helpers/jre.js'
+
+export default function useJavaTest() {
+ const testingJava = ref(false)
+ const javaTestResult = ref(null)
+ let testDebounceTimer = null
+
+ async function runJavaTest(path, version, track = true) {
+ if (testDebounceTimer) {
+ clearTimeout(testDebounceTimer)
+ testDebounceTimer = null
+ }
+ if (!path) {
+ javaTestResult.value = null
+ return
+ }
+ testingJava.value = true
+ try {
+ javaTestResult.value = await test_jre(path, version)
+ } catch {
+ javaTestResult.value = false
+ }
+ testingJava.value = false
+
+ if (track) {
+ console.log('Tracking JavaTest event', { path, success: javaTestResult.value })
+ trackEvent('JavaTest', { path, success: javaTestResult.value })
+ }
+ }
+
+ function testJavaInstallationDebounced(path, version, delay = 600) {
+ if (!path) return
+ if (testDebounceTimer) clearTimeout(testDebounceTimer)
+ testDebounceTimer = setTimeout(() => runJavaTest(path, version, false), delay)
+ }
+
+ async function testJavaInstallation(path, version, track = false) {
+ if (!path) return
+ if (testDebounceTimer) clearTimeout(testDebounceTimer)
+ await runJavaTest(path, version, track)
+ }
+
+ return {
+ testingJava,
+ javaTestResult,
+ testJavaInstallationDebounced,
+ testJavaInstallation,
+ }
+}