diff --git a/package.json b/package.json
index 8677fc4..969cc97 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "drehmal-installer",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Drehmal, Minecraft map installer",
   "productName": "Drehmal Installer",
   "author": "jgaribsin",
@@ -27,6 +27,7 @@
     "extract-zip": "^2.0.1",
     "pinia": "^2.0.11",
     "quasar": "^2.14.2",
+    "tar": "^6.2.0",
     "vue": "^3.0.0",
     "vue-i18n": "^9.2.2",
     "vue-router": "^4.0.0"
@@ -35,6 +36,7 @@
     "@intlify/vite-plugin-vue-i18n": "^3.3.1",
     "@quasar/app-vite": "^1.3.0",
     "@types/node": "^12.20.21",
+    "@types/tar": "^6.1.11",
     "@typescript-eslint/eslint-plugin": "^5.10.0",
     "@typescript-eslint/parser": "^5.10.0",
     "autoprefixer": "^10.4.2",
diff --git a/src-electron/electron-main.ts b/src-electron/electron-main.ts
index e25d1c3..7a44ece 100644
--- a/src-electron/electron-main.ts
+++ b/src-electron/electron-main.ts
@@ -4,7 +4,6 @@ import log from 'electron-log';
 import Listeners from './ipcListeners';
 const path = require('path');
 const os = require('os');
-const fs = require('fs');
 
 import { version } from '../package.json';
 
@@ -18,18 +17,8 @@ const logFolder = path.join(
   'logs'
 );
 
-const getLogFileName: () => string = () => {
-  let index = 1;
-  let name = `${currDate}_${index}-installer.log`;
-  while (true) {
-    if (!fs.existsSync(path.join(logFolder, name))) break;
-    else name = `${currDate}_${index++}-installer.log`;
-  }
-  return name;
-};
-// can't use function call in resolve path as it'll create a new file for each logger instance
-const logFileName = getLogFileName();
-log.transports.file.resolvePathFn = () => path.join(logFolder, logFileName);
+log.transports.file.resolvePathFn = () =>
+  path.join(logFolder, `${currDate}-installer.log`);
 log.transports.file.format = '[{h}:{i}:{s}.{ms}] [{level}] {text}';
 
 // initialise logger for uncaught execptions
diff --git a/src-electron/ipcListeners.ts b/src-electron/ipcListeners.ts
index b3d21d5..38bb4e5 100644
--- a/src-electron/ipcListeners.ts
+++ b/src-electron/ipcListeners.ts
@@ -28,34 +28,16 @@ export default class Listeners {
     dialog = electronDialog;
 
     browserWindow.webContents.on('will-navigate', (event, url) => {
-      if (url.startsWith('open-java-page://')) {
-        event.preventDefault();
-        shell.openExternal('https://www.java.com/en/download/manual.jsp');
-      } else if (url.startsWith('open-jdk-page://')) {
-        event.preventDefault();
-        switch (process.platform) {
-          case 'win32':
-            shell.openExternal(
-              'https://www.oracle.com/java/technologies/downloads/#jdk21-windows'
-            );
-            break;
-          case 'darwin':
-            shell.openExternal(
-              'https://www.oracle.com/java/technologies/downloads/#jdk21-mac'
-            );
-            break;
-          case 'linux':
-            shell.openExternal(
-              'https://www.oracle.com/java/technologies/downloads/#jdk21-linux'
-            );
-            break;
-          default:
-            shell.openExternal(
-              'https://www.oracle.com/java/technologies/downloads/#java21'
-            );
-            break;
-        }
-      }
+      // For custom URLs, use the following (must be above generic openExternal)
+      // if (url.startsWith('open-java-page://')) {
+      //   event.preventDefault();
+      //   shell.openExternal('https://www.java.com/en/download/manual.jsp');
+      // }
+      // Will be used with: <a href="open-java-page://">Java Downloads Page</a>
+
+      // To open URLs in an external browser
+      event.preventDefault();
+      shell.openExternal(url);
     });
   }
 }
@@ -132,40 +114,7 @@ ipcMain.handle(
     })
 );
 
-ipcMain.handle('checkJava', () => {
-  return new Promise((resolve, reject) => {
-    exec(
-      'java -version',
-      (error: Error | null, stdout: string, stderr: string) => {
-        if (error) reject(error);
-        else resolve(stdout || stderr);
-      }
-    );
-  });
-});
-
 ipcMain.handle('execute', (_event, cmd) => {
   console.log(`Executing command: ${cmd}`);
   exec(cmd);
 });
-
-ipcMain.handle(
-  'checkJDK',
-  () =>
-    new Promise<number | string>((resolve) => {
-      exec(
-        'java -version',
-        (error: Error | null, stdout: string, stderr: string) => {
-          if (error) resolve(0); // Resolve with 0 on error
-          else {
-            const match = stderr.match(/version "(.*?)"/);
-            const javaVersion = match ? match[1] : null;
-            console.log(`Java Version found: ${javaVersion}!`);
-            if (javaVersion)
-              resolve(parseInt(javaVersion)); // Resolve with the JDK version
-            else resolve(0); // Resolve with 0 if the version cannot be determined
-          }
-        }
-      );
-    })
-);
diff --git a/src/components/CloseInstaller.vue b/src/components/CloseInstaller.vue
index c8afe61..5b72868 100644
--- a/src/components/CloseInstaller.vue
+++ b/src/components/CloseInstaller.vue
@@ -67,7 +67,7 @@ const click = () => {
   if (launchButton.value === true && installType.value !== 'server') {
     if (platform.value === 'win32') {
       console.log(
-        `Launching Minecraft on ${platform.value} with file: ${windowsPath}`
+        `Launching Minecraft on ${platform.value} with file: "${windowsPath}"`
       );
       ipcRenderer.invoke('minecraftWin', windowsPath).then(() => {
         console.log('Minecraft launched, exiting...');
diff --git a/src/components/ServerPath.vue b/src/components/ServerPath.vue
index 60a7adb..1b0c838 100644
--- a/src/components/ServerPath.vue
+++ b/src/components/ServerPath.vue
@@ -16,9 +16,8 @@
 
 <script setup lang="ts">
 import { storeToRefs } from 'pinia';
-import { useQuasar } from 'quasar';
 import { useInstallerStore } from 'src/stores/InstallerStore';
-import { onMounted, ref } from 'vue';
+import { ref } from 'vue';
 const { ipcRenderer } = require('electron');
 
 const { serverDir } = storeToRefs(useInstallerStore());
@@ -37,40 +36,6 @@ const folderSelectChange = async () => {
     console.log(`Server Path updated to "${serverDir.value}"`);
   }
 };
-
-const q = useQuasar();
-async function checkJDK() {
-  const platform = await ipcRenderer.invoke('getPlatformPretty');
-  const arch = await ipcRenderer.invoke('getArch');
-
-  // Verify the user has the right JDK version installed, otherwise prevent them from continuing
-  let jdkVersion = 0;
-  const jdkRequired = 17;
-  // servers require jdk version 17 or above, loop until that's found
-  while (jdkVersion < jdkRequired) {
-    // check java installation
-    jdkVersion = await ipcRenderer.invoke('checkJDK');
-    if (jdkVersion <= jdkRequired)
-      await new Promise<void>((resolve) => {
-        q.dialog({
-          title: 'JDK not installed',
-          // allow html in dialog message
-          html: true,
-          // provide user with their current OS type and architecture, then provide a link to the java downloads page
-          message:
-            'The required JDK version is not installed on your system.' +
-            ` Please download the installer for <span style="color: #ffde00;"><strong>${platform}-${arch}</strong></span> and install it.<br/><br/>` +
-            '<a href="open-jdk-page://">JDK Downloads Page</a><br/><br/>' +
-            'After installing, click the button below.',
-          ok: 'I have installed the JDK', // text for the ok button
-          persistent: true,
-          dark: true,
-        }).onOk(() => resolve()); // resolve promise on ok button click
-      });
-  }
-}
-
-onMounted(checkJDK);
 </script>
 
 <style scoped>
diff --git a/src/pages/InstallationType.vue b/src/pages/InstallationType.vue
index 9c2ac40..8fc7e9d 100644
--- a/src/pages/InstallationType.vue
+++ b/src/pages/InstallationType.vue
@@ -69,52 +69,10 @@
 </template>
 
 <script setup lang="ts">
-const { ipcRenderer } = require('electron');
 import { storeToRefs } from 'pinia';
-import { useQuasar } from 'quasar';
 import { useStateStore } from 'src/stores/StateStore';
-import { onMounted } from 'vue';
 
 const { installType } = storeToRefs(useStateStore());
-
-const q = useQuasar();
-
-async function checkJavaInstallation() {
-  const platform = await ipcRenderer.invoke('getPlatformPretty');
-  const arch = await ipcRenderer.invoke('getArch');
-
-  // Verify the user has java installed, otherwise prevent them from continuing
-  let javaCheckResult = false;
-  // Loop until java installation is verified
-  while (!javaCheckResult) {
-    try {
-      // check java installation
-      await ipcRenderer.invoke('checkJava');
-      javaCheckResult = true;
-    } catch (error) {
-      // 'checkJava' throws an error if java is not installed (fails to run 'java -version')
-      // await a new promise until user clicks ok, otherwise the dialog is spammed
-      await new Promise<void>((resolve) => {
-        q.dialog({
-          title: 'Java not installed',
-          // allow html in dialog message
-          html: true,
-          // provide user with their current OS type and architecture, then provide a link to the java downloads page
-          message:
-            'Java is not installed on your system.' +
-            ` Please download the installer for <span style="color: #ffde00;"><strong>${platform}-${arch}</strong></span> and install it.<br/><br/>` +
-            '<a href="open-java-page://">Java Downloads Page</a><br/><br/>' +
-            'After installing, click the button below.',
-          ok: 'I have installed Java', // text for the ok button
-          persistent: true,
-          dark: true,
-        }).onOk(() => resolve()); // resolve promise on ok button click
-      });
-    }
-  }
-}
-
-onMounted(checkJavaInstallation);
 </script>
 
 <style scoped>
diff --git a/src/providers/DownloadFile.ts b/src/providers/DownloadFile.ts
index ea439ec..a11fba1 100644
--- a/src/providers/DownloadFile.ts
+++ b/src/providers/DownloadFile.ts
@@ -15,11 +15,12 @@ export function downloadFile(
     file.on('error', (err: any) => {
       console.error(`file error on ${name} ${url}`, err);
     });
-
+    // User-Agent: github_username/project_name/1.56.0 (launcher.com)
     const options = {
-      // headers: {
-      //   'accept-encoding': 'gzip, deflate, br',
-      // },
+      headers: {
+        'User-Agent': 'Drehmal-Team/installer/0.2.0 (drehmal.net)',
+        // 'accept-encoding': 'gzip, deflate, br',
+      },
     };
     https.get(url, options).on('response', function (res: any) {
       // const startTime = Date.now();
diff --git a/src/providers/InstallFabric.ts b/src/providers/InstallFabric.ts
index 6468f41..cea84b4 100644
--- a/src/providers/InstallFabric.ts
+++ b/src/providers/InstallFabric.ts
@@ -5,6 +5,7 @@ import { useSourcesStore } from 'src/stores/SourcesStore';
 import { useStateStore } from 'src/stores/StateStore';
 import { Ref } from 'vue';
 import { downloadFile } from './DownloadFile';
+import { getJre } from './JavaDownload';
 const { spawn } = require('child_process');
 const fs = require('fs');
 const path = require('path');
@@ -17,9 +18,8 @@ export async function installFabric(ref: Ref) {
   const startTime = Date.now();
 
   const { launcher, map } = storeToRefs(useSourcesStore());
-  const { homeDir, minecraftDir, drehmalDir, memory } = storeToRefs(
-    useInstallerStore()
-  );
+  const { homeDir, minecraftDir, drehmalDir, memory, javaExePath } =
+    storeToRefs(useInstallerStore());
   const { processingFabric } = storeToRefs(useStateStore());
 
   const fabricPath = path.join(
@@ -30,15 +30,18 @@ export async function installFabric(ref: Ref) {
 
   console.log(`Downloading Fabric installer to "${fabricPath}"`);
 
-  ref.value.label = 'Downloading Fabric installer';
+  ref.value.label = 'Downloading Java runtime';
+  await getJre();
   ref.value.progress = 0.25;
   ref.value.percent = 25;
+
+  ref.value.label = 'Downloading Fabric installer';
   downloadFile(launcher.value.fabric.source, fabricPath).then(() => {
     ref.value.label = 'Installing Fabric';
     ref.value.progress = 0.5;
     ref.value.percent = 50;
     console.log('Calling Fabric installer');
-    const fabricProc = spawn('java', [
+    const fabricProc = spawn(javaExePath.value, [
       '-jar',
       fabricPath,
       'client',
@@ -54,7 +57,7 @@ export async function installFabric(ref: Ref) {
       console.error(`Fabric: ${data}`);
     });
 
-    fabricProc.on('close', (code: any) => {
+    fabricProc.on('close', async (code: any) => {
       const taken = ((Date.now() - startTime) / 1000).toFixed(2);
 
       console.log(`Fabric process exited with code ${code} (${taken}s total)`);
@@ -86,12 +89,17 @@ export async function installFabric(ref: Ref) {
       data['profiles'][map.value.versionName][
         'javaArgs'
       ] = `-Xmx${memoryInMb}M`;
+      // ['javaArgs'] = `-Xmx${memoryInMb}M -Xms${memoryInMb}M  -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+AlwaysActAsServerClassMachine -XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:+UseNUMA -XX:NmethodSweepActivity=1 -XX:ReservedCodeCacheSize=400M -XX:NonNMethodCodeHeapSize=12M -XX:ProfiledCodeHeapSize=194M -XX:NonProfiledCodeHeapSize=194M -XX:-DontCompileHugeMethods -XX:MaxNodeLimit=240000 -XX:NodeLimitFudgeFactor=8000 -XX:+UseVectorCmov -XX:+PerfDisableSharedMem -XX:+UseFastUnorderedTimeStamps -XX:+UseCriticalJavaThreadPriority -XX:ThreadPriorityPolicy=1 -XX:AllocatePrefetchStyle=3 -XX:+UseG1GC -XX:MaxGCPauseMillis=130 -XX:+UnlockExperimentalVMOptions -XX:+DisableExplicitGC -XX:+AlwaysPreTouch -XX:G1NewSizePercent=28 -XX:G1HeapRegionSize=16M -XX:G1ReservePercent=20 -XX:G1MixedGCCountTarget=3 -XX:InitiatingHeapOccupancyPercent=10 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1RSetUpdatingPauseTimePercent=0 -XX:SurvivorRatio=32 -XX:MaxTenuringThreshold=1 -XX:G1SATBBufferEnqueueingThresholdPercent=30 -XX:G1ConcMarkStepDurationMillis=5 -XX:G1ConcRSHotCardLimit=16 -XX:G1ConcRefinementServiceIntervalMillis=150`;
       const currDateISO = dayjs.utc().toISOString();
       data['profiles'][map.value.versionName]['lastUsed'] = currDateISO;
       data['profiles'][map.value.versionName]['created'] = currDateISO;
 
       data['profiles'][map.value.versionName]['gameDir'] = drehmalDir.value;
 
+      const javawPath = await getJre();
+      if (javawPath)
+        data['profiles'][map.value.versionName]['javaDir'] = javaExePath.value;
+
       fs.writeFileSync(profileFilePath, JSON.stringify(data), 'utf-8');
 
       ref.value.label = 'Minecraft profile created!';
diff --git a/src/providers/InstallServer.ts b/src/providers/InstallServer.ts
index 48aed8b..5ba6bc3 100644
--- a/src/providers/InstallServer.ts
+++ b/src/providers/InstallServer.ts
@@ -3,49 +3,55 @@ import { useInstallerStore } from 'src/stores/InstallerStore';
 import { useSourcesStore } from 'src/stores/SourcesStore';
 import { Ref } from 'vue';
 import { downloadFile } from './DownloadFile';
+import { getJre } from './JavaDownload';
 const { ipcRenderer } = require('electron');
 const fs = require('fs');
 const path = require('path');
 
 export async function installServer(ref: Ref) {
   const { server } = storeToRefs(useSourcesStore());
-  const { serverDir, memory } = storeToRefs(useInstallerStore());
+  const { serverDir, memory, javawExePath } = storeToRefs(useInstallerStore());
 
   const serverPath = path.join(serverDir.value, 'server.jar');
   console.log(`Downloading server jar to "${serverPath}"`);
 
+  ref.value.label = 'Downloading Java runtime';
+  await getJre();
+  ref.value.progress = 0.5;
+  ref.value.percent = 50;
+
   ref.value.label = 'Downloading server jar';
-  ref.value.progress = 0.25;
-  ref.value.percent = 25;
 
-  downloadFile(server.value.source, serverPath).then(() => {
+  downloadFile(server.value.source, serverPath).then(async () => {
+    ref.value.progress = 0.67;
+    ref.value.percent = 67;
+
     ref.value.label = 'Configuring server';
-    ref.value.progress = 0.5;
-    ref.value.percent = 50;
     console.log('Creating eula.txt');
     fs.writeFileSync(
       path.join(serverDir.value, 'eula.txt'),
       'eula=true',
       'utf-8'
     );
-
-    ref.value.label = 'Updating server properties';
+    await new Promise((resolve) => setTimeout(resolve, 100));
     ref.value.progress = 0.75;
     ref.value.percent = 75;
+
+    ref.value.label = 'Updating server properties';
     console.log(`Creating server.properties with ${server.value.properties}`);
     fs.writeFileSync(
       path.join(serverDir.value, 'server.properties'),
       server.value.properties,
       'utf-8'
     );
+    await new Promise((resolve) => setTimeout(resolve, 100));
+    ref.value.progress = 0.88;
+    ref.value.percent = 88;
 
     ref.value.label = 'Creating executable file';
-    ref.value.progress = 0.75;
-    ref.value.percent = 75;
-
     const memoryInMb = Math.round(memory.value * 1024);
-    const command = `java -Xmx${memoryInMb}M -Xms${memoryInMb}M -jar "${serverPath}" nogui`;
-
+    const command = `"${javawExePath.value}" -Xms128M -Xmx${memoryInMb}M -jar "${serverPath}" nogui`;
+    // const command = `"${javawExePath.value}" -Xms${memoryInMb}M -Xmx${memoryInMb}M -jar "${serverPath}" nogui`;
     ipcRenderer.invoke('getPlatform').then((result: NodeJS.Platform) => {
       const chmodCmd = `chmod +x "${path.join(serverDir.value, 'server.sh')}"`;
       switch (result) {
@@ -78,6 +84,7 @@ export async function installServer(ref: Ref) {
       }
     });
 
+    await new Promise((resolve) => setTimeout(resolve, 100));
     ref.value.label = 'Server successfully installed!';
     ref.value.progress = 1;
     ref.value.percent = 100;
diff --git a/src/providers/JavaDownload.ts b/src/providers/JavaDownload.ts
new file mode 100644
index 0000000..fd2d2b0
--- /dev/null
+++ b/src/providers/JavaDownload.ts
@@ -0,0 +1,139 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { storeToRefs } from 'pinia';
+import { useInstallerStore } from 'src/stores/InstallerStore';
+import { downloadFile } from './DownloadFile';
+const extract = require('extract-zip');
+const { ipcRenderer } = require('electron');
+const os = require('os');
+const path = require('path');
+const fs = require('fs');
+const https = require('https');
+const tar = require('tar');
+
+/*
+Helpful resources used to decide:
+https://github.com/brucethemoose/Minecraft-Performance-Flags-Benchmarks
+https://whichjdk.com/
+*/
+
+// https://api.adoptium.net/q/swagger-ui/#/Binary
+// /v3/binary/latest/{feature_version}/{release_type}/{os}/{arch}/{image_type}/{jvm_impl}/{heap_size}/{vendor}
+// https://api.adoptium.net/v3/binary/latest/17/ga/windows/x64/jre/hotspot/normal/eclipse?project=jdk
+
+export async function getJre(): Promise<string> {
+  const osMap: { [key: string]: string } = {
+    win32: 'windows',
+    darwin: 'mac',
+    linux: 'linux',
+    // TODO: handle other platforms?
+  };
+  const { javaExePath: javaStorePath, javawExePath: javawStorePath } =
+    storeToRefs(useInstallerStore());
+
+  const platform: NodeJS.Platform = await ipcRenderer.invoke('getPlatform');
+  // const platform: NodeJS.Platform = 'linux';
+
+  const flags = {
+    // https://api.adoptium.net/q/swagger-ui/#/Binary/getBinary
+    // /v3/binary/latest/{feature_version}/{release_type}/{os}/{arch}/{image_type}/{jvm_impl}/{heap_size}/{vendor}
+    feature_version: '17', // Drehmal is 1.17+, so use JRE 17
+    release_type: 'ga',
+    os: osMap[platform],
+    arch: os.arch(),
+    image_type: 'jre',
+    jvm_impl: 'hotspot',
+    heap_size: 'normal',
+    vendor: 'eclipse',
+  };
+
+  const { appDir } = storeToRefs(useInstallerStore());
+
+  const javaPath = path.join(appDir.value, 'java_runtimes');
+  const javaNames = [
+    platform === 'win32' ? 'java.exe' : 'java',
+    platform === 'win32' ? 'javaw.exe' : 'java', // linux/mac does not have javaw
+  ];
+  console.log(`Checking for Java runtime in "${javaPath}"`);
+  let javawExe = findFile(javaPath, javaNames[0]);
+  let javaExe = findFile(javaPath, javaNames[1]);
+
+  if (javaExe && javawExe) {
+    console.log('Java runtime found, skipping download!');
+    console.log(`Setting Java Exe path to "${javaExe}"`);
+    javaStorePath.value = javaExe;
+    console.log(`Setting Javaw Exe path to "${javawExe}"`);
+    javawStorePath.value = javawExe;
+
+    return javawExe;
+  } else {
+    console.log('Java runtime is missing, downloading...');
+    if (!fs.existsSync(javaPath)) fs.mkdirSync(javaPath);
+
+    const filePath = path.join(
+      javaPath,
+      platform === 'win32' ? 'java.zip' : 'java.tar.gz'
+    );
+    // eg for windows x64 java 17
+    // https://api.adoptium.net/v3/binary/latest/17/ga/windows/x64/jre/hotspot/normal/eclipse
+    const url = `https://api.adoptium.net/v3/binary/latest/${flags.feature_version}/${flags.release_type}/${flags.os}/${flags.arch}/${flags.image_type}/${flags.jvm_impl}/${flags.heap_size}/${flags.vendor}`;
+
+    const options = {
+      headers: {
+        'User-Agent': 'Drehmal-Team/installer/0.2.0 (drehmal.net)',
+        // 'accept-encoding': 'gzip, deflate, br',
+      },
+    };
+
+    const result = (await new Promise((resolve, reject) => {
+      // API responds with two redirects, TODO: recursively follow 302 redirects
+      https.get(url, options).on('response', (res: any) => {
+        https.get(res.headers.location, options).on('response', (res: any) => {
+          const downloadUrl = res.headers.location;
+          console.log(`Downloading Java zip from: "${downloadUrl}"`);
+          downloadFile(downloadUrl, filePath).then(async () => {
+            console.log(`Java zip successfully downloaded to: "${filePath}"`);
+
+            if (platform === 'win32')
+              await extract(filePath, { dir: javaPath });
+            else await tar.x({ file: filePath, cwd: javaPath });
+            fs.unlinkSync(filePath);
+            console.log(`Java zip successfully extracted to: "${javaPath}"`);
+
+            javawExe = findFile(javaPath, javaNames[0]);
+            javaExe = findFile(javaPath, javaNames[1]);
+            if (javaExe && javawExe) {
+              console.log(`Setting Java Exe path to "${javaExe}"`);
+              javaStorePath.value = javaExe;
+              console.log(`Setting Javaw Exe path to "${javawExe}"`);
+              javawStorePath.value = javawExe;
+              if (platform !== 'win32') {
+                console.log('Making javaw executable');
+                ipcRenderer.invoke('execute', `chmod +x "${javawExe}"`);
+              }
+
+              resolve(javawExe);
+            } else
+              reject(
+                `Could not find ${javaNames[0]} ${javaNames[1]} in "${javaPath}" after downloading`
+              );
+          });
+        });
+      });
+    })) as string;
+
+    return result;
+  }
+}
+
+function findFile(dir: string, filename: string): string {
+  const files = fs.readdirSync(dir);
+  for (const file of files) {
+    const filePath = path.join(dir, file);
+
+    if (fs.statSync(filePath).isDirectory()) {
+      const recursive = findFile(filePath, filename);
+      if (recursive) return recursive;
+    } else if (file === filename) return filePath;
+  }
+  return '';
+}
diff --git a/src/stores/InstallerStore.ts b/src/stores/InstallerStore.ts
index 31c1c25..f4e2969 100644
--- a/src/stores/InstallerStore.ts
+++ b/src/stores/InstallerStore.ts
@@ -12,6 +12,9 @@ export const useInstallerStore = defineStore('installer', () => {
   const drehmalDir = ref(path.join('', '.minecraft_drehmal'));
   const serverDir = ref(path.join('', 'Drehmal Server'));
 
+  const javaExePath = ref('');
+  const javawExePath = ref('');
+
   const memory = ref(
     parseInt(process.env.MINECRAFT_MEMORY ? process.env.MINECRAFT_MEMORY : '4')
   );
@@ -24,5 +27,7 @@ export const useInstallerStore = defineStore('installer', () => {
     serverDir,
     shardsDir,
     memory,
+    javaExePath,
+    javawExePath,
   };
 });
diff --git a/yarn.lock b/yarn.lock
index 3cd3198..9b9917e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -162,7 +162,7 @@
 
 "@intlify/bundle-utils@^2.2.2":
   version "2.2.2"
-  resolved "https://registry.yarnpkg.com/@intlify/bundle-utils/-/bundle-utils-2.2.2.tgz#fe65ce2549a73b99b75f3e66209d741b4f4d61fd"
+  resolved "https://registry.npmjs.org/@intlify/bundle-utils/-/bundle-utils-2.2.2.tgz"
   integrity sha512-vngkvlIVV8ZJoyC5VqMvqJd2nvsx+qMN7pQjPiPjOrVndeiR7Dlue0k86Q8FsFUzyksW3HJZZi833ldxwbFzTA==
   dependencies:
     "@intlify/message-compiler" "^9.1.0"
@@ -173,7 +173,7 @@
 
 "@intlify/core-base@9.9.0":
   version "9.9.0"
-  resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-9.9.0.tgz#edc55a5e3dbbf8dbbbf656529ed27832c4c4f522"
+  resolved "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.9.0.tgz"
   integrity sha512-C7UXPymDIOlMGSNjAhNLtKgzITc/8BjINK5gNKXg8GiWCTwL6n3MWr55czksxn8RM5wTMz0qcLOFT+adtaVQaA==
   dependencies:
     "@intlify/message-compiler" "9.9.0"
@@ -181,7 +181,7 @@
 
 "@intlify/message-compiler@9.9.0", "@intlify/message-compiler@^9.1.0":
   version "9.9.0"
-  resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.9.0.tgz#7952759329e7af0388afbce7a984820bbeff82eb"
+  resolved "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.9.0.tgz"
   integrity sha512-yDU/jdUm9KuhEzYfS+wuyja209yXgdl1XFhMlKtXEgSFTxz4COZQCRXXbbH8JrAjMsaJ7bdoPSLsKlY6mXG2iA==
   dependencies:
     "@intlify/shared" "9.9.0"
@@ -189,12 +189,12 @@
 
 "@intlify/shared@9.9.0", "@intlify/shared@^9.1.0":
   version "9.9.0"
-  resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.9.0.tgz#56907633c0f7b2d50f53269d31e88e7b24d39187"
+  resolved "https://registry.npmjs.org/@intlify/shared/-/shared-9.9.0.tgz"
   integrity sha512-1ECUyAHRrzOJbOizyGufYP2yukqGrWXtkmTu4PcswVnWbkcjzk3YQGmJ0bLkM7JZ0ZYAaohLGdYvBYnTOGYJ9g==
 
 "@intlify/vite-plugin-vue-i18n@^3.3.1":
   version "3.4.0"
-  resolved "https://registry.yarnpkg.com/@intlify/vite-plugin-vue-i18n/-/vite-plugin-vue-i18n-3.4.0.tgz#cf15b0d207a843227a5da0ac713f1a5b9d96e40b"
+  resolved "https://registry.npmjs.org/@intlify/vite-plugin-vue-i18n/-/vite-plugin-vue-i18n-3.4.0.tgz"
   integrity sha512-XXcZBgwJ+3FRu11c4ARoY9N00kElPii0/jNZ49qR045Ka7/YGCwb1Ku14BBlMSEHiHDSjLQknLwrJKSQGVZLyA==
   dependencies:
     "@intlify/bundle-utils" "^2.2.2"
@@ -323,7 +323,7 @@
 
 "@rollup/pluginutils@^4.1.0", "@rollup/pluginutils@^4.1.2":
   version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz#e6c6c3aba0744edce3fb2074922d3776c0af2a6d"
+  resolved "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz"
   integrity sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==
   dependencies:
     estree-walker "^2.0.1"
@@ -486,7 +486,7 @@
 
 "@types/node@^18.11.18":
   version "18.19.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.4.tgz#89672e84f11a2c19543d694dac00ab8d7bc20ddb"
+  resolved "https://registry.npmjs.org/@types/node/-/node-18.19.4.tgz"
   integrity sha512-xNzlUhzoHotIsnFoXmJB+yWmBvFZgKCI9TtPIEdYIMM1KWfwuY8zh7wvc1u1OAXlC7dlf6mZVx/s+Y5KfFz19A==
   dependencies:
     undici-types "~5.26.4"
@@ -538,6 +538,14 @@
     "@types/mime" "*"
     "@types/node" "*"
 
+"@types/tar@^6.1.11":
+  version "6.1.11"
+  resolved "https://registry.npmjs.org/@types/tar/-/tar-6.1.11.tgz"
+  integrity sha512-ThA1WD8aDdVU4VLuyq5NEqriwXErF5gEIJeyT6gHBWU7JtSmW2a5qjNv3/vR82O20mW+1vhmeZJfBQPT3HCugg==
+  dependencies:
+    "@types/node" "*"
+    minipass "^4.0.0"
+
 "@types/verror@^1.10.3":
   version "1.10.9"
   resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.9.tgz#420c32adb9a2dd50b3db4c8f96501e05a0e72941"
@@ -754,12 +762,12 @@ accepts@~1.3.5, accepts@~1.3.8:
 
 acorn-jsx@^5.2.0, acorn-jsx@^5.3.2:
   version "5.3.2"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
+  resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
 acorn@^7.1.1, acorn@^7.4.1:
   version "7.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
+  resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
 acorn@^8.9.0:
@@ -1450,7 +1458,7 @@ csstype@^3.1.3:
 
 dayjs@^1.11.10:
   version "1.11.10"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0"
+  resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz"
   integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==
 
 debug@2.6.9, debug@^2.2.0:
@@ -1637,7 +1645,7 @@ electron-builder@^24.3.0:
 
 electron-log@^5.0.3:
   version "5.0.3"
-  resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-5.0.3.tgz#972e088df24bf09dca980067df48e4eec0e2ec82"
+  resolved "https://registry.npmjs.org/electron-log/-/electron-log-5.0.3.tgz"
   integrity sha512-jUgAuRjfpCD9tmH1F6fb195YsFfM/DkqkZLhFeo0VAAstantn11bxmgx63uE6KG/JljHG7sIkgM2QEjDimJI0g==
 
 electron-packager@^17.1.1:
@@ -1685,7 +1693,7 @@ electron-to-chromium@^1.4.601:
 
 electron@^28.1.0:
   version "28.1.0"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-28.1.0.tgz#9de1ecdaafcb0ec5753827f14dfb199e6c84545e"
+  resolved "https://registry.npmjs.org/electron/-/electron-28.1.0.tgz"
   integrity sha512-82Y7o4PSWPn1o/aVwYPsgmBw6Gyf2lVHpaBu3Ef8LrLWXxytg7ZRZr/RtDqEMOzQp3+mcuy3huH84MyjdmP50Q==
   dependencies:
     "@electron/get" "^2.0.0"
@@ -2052,14 +2060,14 @@ eslint-scope@^7.1.1, eslint-scope@^7.2.2:
 
 eslint-utils@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
+  resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz"
   integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
 eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
+  resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
 eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
@@ -2113,7 +2121,7 @@ eslint@^8.10.0:
 
 espree@^6.0.0:
   version "6.2.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a"
+  resolved "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz"
   integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==
   dependencies:
     acorn "^7.1.1"
@@ -2216,7 +2224,7 @@ external-editor@^3.0.3:
 
 extract-zip@^2.0.0, extract-zip@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
+  resolved "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz"
   integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
   dependencies:
     debug "^4.1.1"
@@ -2248,7 +2256,7 @@ fast-glob@3.2.12:
 
 fast-glob@^3.2.5, fast-glob@^3.2.9:
   version "3.3.2"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
+  resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz"
   integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
@@ -2983,7 +2991,7 @@ json5@^2.2.0:
 
 jsonc-eslint-parser@^1.0.1:
   version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jsonc-eslint-parser/-/jsonc-eslint-parser-1.4.1.tgz#8cbe99f6f5199acbc5a823c4c0b6135411027fa6"
+  resolved "https://registry.npmjs.org/jsonc-eslint-parser/-/jsonc-eslint-parser-1.4.1.tgz"
   integrity sha512-hXBrvsR1rdjmB2kQmUjf1rEIa+TqHBGMge8pwi++C+Si1ad7EjZrJcpgwym+QGK/pqTx+K7keFAtLlVNdLRJOg==
   dependencies:
     acorn "^7.4.1"
@@ -3117,7 +3125,7 @@ lodash.union@^4.6.0:
 
 lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21:
   version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
 log-symbols@^4.1.0:
@@ -3221,7 +3229,7 @@ mimic-fn@^2.1.0:
 
 mimic-response@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
+  resolved "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz"
   integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
 
 mimic-response@^3.1.0:
@@ -3262,6 +3270,11 @@ minipass@^3.0.0:
   dependencies:
     yallist "^4.0.0"
 
+minipass@^4.0.0:
+  version "4.2.8"
+  resolved "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz"
+  integrity sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==
+
 minipass@^5.0.0:
   version "5.0.0"
   resolved "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz"
@@ -3689,7 +3702,7 @@ qs@6.11.0:
 
 quasar@^2.14.2:
   version "2.14.2"
-  resolved "https://registry.yarnpkg.com/quasar/-/quasar-2.14.2.tgz#794d8434eb449549fc8455aaec9bc14b71a57c98"
+  resolved "https://registry.npmjs.org/quasar/-/quasar-2.14.2.tgz"
   integrity sha512-f5KliWtM5BEuFsDU4yvuP+dlVIWZNrGu5VpWFsxzjpoykcP4B2HIOUiCl3mx2NCqERHd4Ts0aeioRkt9TTeExA==
 
 queue-microtask@^1.2.2:
@@ -3968,7 +3981,7 @@ semver-compare@^1.0.0:
 
 semver@^6.2.0, semver@^6.3.0:
   version "6.3.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
 semver@^7.1.3, semver@^7.3.2, semver@^7.3.5, semver@^7.3.6, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4:
@@ -4124,7 +4137,7 @@ source-map-support@^0.5.19:
 
 source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0:
   version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
 source-map@^0.7.4:
@@ -4282,7 +4295,7 @@ tar-stream@^2.2.0:
     inherits "^2.0.3"
     readable-stream "^3.1.1"
 
-tar@^6.1.12:
+tar@^6.1.12, tar@^6.2.0:
   version "6.2.0"
   resolved "https://registry.npmjs.org/tar/-/tar-6.2.0.tgz"
   integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ==
@@ -4423,7 +4436,7 @@ uglify-js@^3.5.1:
 
 undici-types@~5.26.4:
   version "5.26.5"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  resolved "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz"
   integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
 
 universalify@^0.1.0:
@@ -4530,7 +4543,7 @@ vue-eslint-parser@^9.3.1:
 
 vue-i18n@^9.2.2:
   version "9.9.0"
-  resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-9.9.0.tgz#20d348fa7e37fc88e4c84f69781b2f1215c7769f"
+  resolved "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.9.0.tgz"
   integrity sha512-xQ5SxszUAqK5n84N+uUyHH/PiQl9xZ24FOxyAaNonmOQgXeN+rD9z/6DStOpOxNFQn4Cgcquot05gZc+CdOujA==
   dependencies:
     "@intlify/core-base" "9.9.0"
@@ -4637,7 +4650,7 @@ yallist@^4.0.0:
 
 yaml-eslint-parser@^0.3.2:
   version "0.3.2"
-  resolved "https://registry.yarnpkg.com/yaml-eslint-parser/-/yaml-eslint-parser-0.3.2.tgz#c7f5f3904f1c06ad55dc7131a731b018426b4898"
+  resolved "https://registry.npmjs.org/yaml-eslint-parser/-/yaml-eslint-parser-0.3.2.tgz"
   integrity sha512-32kYO6kJUuZzqte82t4M/gB6/+11WAuHiEnK7FreMo20xsCKPeFH5tDBU7iWxR7zeJpNnMXfJyXwne48D0hGrg==
   dependencies:
     eslint-visitor-keys "^1.3.0"
@@ -4646,7 +4659,7 @@ yaml-eslint-parser@^0.3.2:
 
 yaml@^1.10.0:
   version "1.10.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
+  resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
 yargs-parser@^21.1.1: