1.8.1

bun.lock

@@ -17,6 +17,7 @@
         "@tauri-apps/plugin-notification": "2.3.3",
         "@tauri-apps/plugin-opener": "2.5.3",
         "@tauri-apps/plugin-os": "2.3.2",
+        "@tauri-apps/plugin-store": "2.4.2",
         "@tauri-apps/plugin-window-state": "2.4.1",
         "next": "16.2.1",
         "pretty-bytes": "7.1.0",
@@ -280,6 +281,8 @@
 
     "@tauri-apps/plugin-os": ["@tauri-apps/plugin-os@2.3.2", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-n+nXWeuSeF9wcEsSPmRnBEGrRgOy6jjkSU+UVCOV8YUGKb2erhDOxis7IqRXiRVHhY8XMKks00BJ0OAdkpf6+A=="],
 
+    "@tauri-apps/plugin-store": ["@tauri-apps/plugin-store@2.4.2", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-0ClHS50Oq9HEvLPhNzTNFxbWVOqoAp3dRvtewQBeqfIQ0z5m3JRnOISIn2ZVPCrQC0MyGyhTS9DWhHjpigQE7A=="],
+
     "@tauri-apps/plugin-window-state": ["@tauri-apps/plugin-window-state@2.4.1", "", { "dependencies": { "@tauri-apps/api": "^2.8.0" } }, "sha512-OuvdrzyY8Q5Dbzpj+GcrnV1iCeoZbcFdzMjanZMMcAEUNy/6PH5pxZPXpaZLOR7whlzXiuzx0L9EKZbH7zpdRw=="],
 
     "@tybys/wasm-util": ["@tybys/wasm-util@0.10.1", "", { "dependencies": { "tslib": "^2.4.0" } }, "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg=="],

package.json

@@ -1,7 +1,7 @@
 {
   "name": "lncvrt-games-launcher",
   "private": true,
-  "version": "1.8.0",
+  "version": "1.8.1",
   "type": "module",
   "scripts": {
     "dev": "next dev",
@@ -23,6 +23,7 @@
     "@tauri-apps/plugin-notification": "2.3.3",
     "@tauri-apps/plugin-opener": "2.5.3",
     "@tauri-apps/plugin-os": "2.3.2",
+    "@tauri-apps/plugin-store": "2.4.2",
     "@tauri-apps/plugin-window-state": "2.4.1",
     "next": "16.2.1",
     "pretty-bytes": "7.1.0",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lncvrt-games-launcher"
-version = "1.8.0"
+version = "1.8.1"
 authors = ["Lncvrt"]
 edition = "2024"
 
@@ -25,14 +25,18 @@ tauri-plugin-fs = "2.4.5"
 zip = "8.4.0"
 tauri-plugin-dialog = "2.6.0"
 tauri-plugin-notification = "2.3.3"
-sysinfo = "0.38.4"
-sha2 = "0.10.9"
+sha2 = "0.11.0"
 tauri-plugin-clipboard-manager = "2.3.2"
 tauri-plugin-prevent-default = "4.0.4"
 openssl = { version = "0.10.76", features = ["v110", "vendored"] }
 base64 = "0.22.1"
 tauri-plugin-http = "2.5.7"
 dashmap = "6.1.0"
+tauri-plugin-store = "2.4.2"
+hex = "0.4.3"
+
+[target.'cfg(any(target_os = "windows", target_os = "linux"))'.dependencies]
+sysinfo = "0.38.4"
 
 [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
 tauri-plugin-single-instance = "2.4.0"
@@ -40,3 +44,9 @@ tauri-plugin-window-state = "2.4.1"
 
 [target.'cfg(target_os = "windows")'.dependencies]
 tauri-plugin-decorum = "1.1.1"
+
+[profile.release]
+opt-level = 3
+lto = true
+codegen-units = 1
+strip = true

src-tauri/capabilities/default.json

@@ -2,9 +2,7 @@
   "$schema": "../gen/schemas/desktop-schema.json",
   "identifier": "default",
   "description": "Capability for the main window",
-  "windows": [
-    "main"
-  ],
+  "windows": ["main"],
   "permissions": [
     "core:default",
     "opener:default",
@@ -26,19 +24,18 @@
     "notification:default",
     "clipboard-manager:default",
     "clipboard-manager:allow-write-text",
+    "store:default",
+    "store:allow-load",
+    "store:allow-save",
     "fs:allow-applocaldata-read",
     "fs:allow-applocaldata-write",
     {
       "identifier": "fs:scope",
-      "allow": [
-        { "path": "$APPLOCALDATA/game/**" }
-      ]
+      "allow": [{ "path": "$APPLOCALDATA/game/**" }]
     },
     {
       "identifier": "opener:allow-open-path",
-      "allow": [
-        { "path": "$APPLOCALDATA/game/**" }
-      ]
+      "allow": [{ "path": "$APPLOCALDATA/game/**" }]
     },
     {
       "identifier": "http:default",
@@ -51,8 +48,9 @@
         { "url": "https://games.lncvrt.xyz/api/berrydash/leaderboard/berry" },
         { "url": "https://games.lncvrt.xyz/api/berrydash/leaderboard/coin" },
         { "url": "https://games.lncvrt.xyz/api/berrydash/leaderboard/legacy" },
-        { "url": "https://games.lncvrt.xyz/api/berrydash/leaderboard/total" }
+        { "url": "https://games.lncvrt.xyz/api/berrydash/leaderboard/total" },
+        { "url": "https://games.lncvrt.xyz/api/launcher/mods" }
       ]
     }
   ]
-}
+}

src-tauri/src/lib.rs

@@ -15,7 +15,6 @@ use std::{
     process::Command,
     time::Duration,
 };
-use sysinfo::System;
 use tauri::window::{ProgressBarState, ProgressBarStatus};
 use tauri::{AppHandle, Emitter, Manager};
 use tauri_plugin_os::platform;
@@ -25,6 +24,9 @@ use tokio::{io::AsyncWriteExt, time::timeout};
 use zip::ZipArchive;
 use zip::result::ZipError;
 
+#[cfg(any(target_os = "windows", target_os = "linux"))]
+use sysinfo::System;
+
 #[cfg(unix)]
 use std::os::unix::fs::PermissionsExt;
 
@@ -38,6 +40,7 @@ fn is_cancelled(name: &str) -> bool {
     cancel_map().get(name).map(|v| *v).unwrap_or(false)
 }
 
+#[cfg(any(target_os = "windows", target_os = "linux"))]
 fn is_running_by_path(path: &Path) -> bool {
     let sys = System::new_all();
     let target = match path.canonicalize() {
@@ -151,25 +154,19 @@ async fn download(
     download_type: i8,
     mod_id: String,
 ) -> String {
-    println!("[download] Starting download for '{}' from '{}'", name, url);
     let _ = app.emit("download-start", format!("{}", name));
     let window = app.get_webview_window("main").expect("main window missing");
 
     let downloads_path = match app.path().app_local_data_dir() {
         Ok(p) => p.join("downloads"),
-        Err(e) => {
-            println!(
-                "[download] ERROR: Failed to resolve app_local_data_dir: {}",
-                e
-            );
+        Err(_) => {
             let _ = &app.emit("download-stop", format!("{}", name));
             return "-1".to_string();
         }
     };
     let game_path = match app.path().app_local_data_dir() {
         Ok(p) => p.join("game"),
-        Err(e) => {
-            println!("[download] ERROR: Failed to resolve game path: {}", e);
+        Err(_) => {
             let _ = &app.emit("download-stop", format!("{}", name));
             return "-1".to_string();
         }
@@ -177,18 +174,12 @@ async fn download(
 
     let download_part_path = downloads_path.join(format!("{}.part", name));
     let download_zip_path = downloads_path.join(format!("{}.zip", name));
-    println!("[download] Part file: {:?}", download_part_path);
-    println!("[download] Zip file:  {:?}", download_zip_path);
 
     let _ = tokio::fs::create_dir_all(&downloads_path).await;
 
     let resume_from: u64 = match tokio::fs::metadata(&download_part_path).await {
         Ok(meta) => {
             let size = meta.len();
-            println!(
-                "[download] Found existing .part file ({} bytes), will attempt to resume",
-                size
-            );
             size
         }
         Err(_) => 0,
@@ -198,16 +189,11 @@ async fn download(
     let mut request = client.get(&url);
     if resume_from > 0 {
         request = request.header("Range", format!("bytes={}-", resume_from));
-        println!("[download] Requesting range: bytes={}-", resume_from);
     }
 
     let resp = match request.send().await {
-        Ok(r) => {
-            println!("[download] HTTP request succeeded, status: {}", r.status());
-            r
-        }
-        Err(e) => {
-            println!("[download] ERROR: HTTP request failed: {:?}", e);
+        Ok(r) => r,
+        Err(_) => {
             let _ = &app.emit("download-stop", format!("{}", name));
             return "-1".to_string();
         }
@@ -216,19 +202,11 @@ async fn download(
     let status = resp.status();
 
     let actual_resume_from = if resume_from > 0 && status == reqwest::StatusCode::OK {
-        println!(
-            "[download] Server does not support range requests (got 200), restarting from scratch"
-        );
         let _ = tokio::fs::remove_file(&download_part_path).await;
         0
     } else if resume_from > 0 && status == reqwest::StatusCode::PARTIAL_CONTENT {
-        println!("[download] Server accepted range request (206 Partial Content)");
         resume_from
     } else if resume_from > 0 {
-        println!(
-            "[download] Unexpected status {} while resuming, restarting",
-            status
-        );
         let _ = tokio::fs::remove_file(&download_part_path).await;
         0
     } else {
@@ -237,13 +215,6 @@ async fn download(
 
     let remaining_size = resp.content_length().unwrap_or(0);
     let total_size = actual_resume_from + remaining_size;
-    println!(
-        "[download] Resume offset: {} bytes | Remaining: {} bytes | Total: {} bytes ({:.2} MB)",
-        actual_resume_from,
-        remaining_size,
-        total_size,
-        total_size as f64 / 1_048_576.0
-    );
     let _ = app.emit("download-size", format!("{}:{}", &name, &total_size));
 
     let mut file = if actual_resume_from > 0 {
@@ -252,15 +223,8 @@ async fn download(
             .open(&download_part_path)
             .await
         {
-            Ok(f) => {
-                println!("[download] Opened .part file in append mode for resume");
-                f
-            }
-            Err(e) => {
-                println!(
-                    "[download] ERROR: Failed to open .part file for append: {}",
-                    e
-                );
+            Ok(f) => f,
+            Err(_) => {
                 let _ = &app.emit("download-stop", format!("{}", name));
                 return "-1".to_string();
             }
@@ -268,22 +232,14 @@ async fn download(
     } else {
         if download_type == 0 {
             if let Ok(true) = tokio::fs::try_exists(&game_path.join(&name)).await {
-                println!(
-                    "[download] Existing game dir found, removing: {:?}",
-                    game_path.join(&name)
-                );
                 let _ = tokio::fs::remove_dir_all(&game_path.join(&name)).await;
             }
             let _ = tokio::fs::create_dir_all(&game_path.join(&name)).await;
         }
 
         match tokio::fs::File::create(&download_part_path).await {
-            Ok(f) => {
-                println!("[download] Created new .part file");
-                f
-            }
-            Err(e) => {
-                println!("[download] ERROR: Failed to create .part file: {}", e);
+            Ok(f) => f,
+            Err(_) => {
                 let _ = &app.emit("download-stop", format!("{}", name));
                 return "-1".to_string();
             }
@@ -298,7 +254,6 @@ async fn download(
 
     while let Ok(Some(chunk_result)) = timeout(Duration::from_secs(5), stream.next()).await {
         if is_cancelled(&name) {
-            println!("[download] Cancelled '{}' during chunk loop", name);
             cancel_map().remove(&name);
             let _ = window.set_progress_bar(ProgressBarState {
                 status: Some(ProgressBarStatus::None),
@@ -309,11 +264,7 @@ async fn download(
 
         let chunk = match chunk_result {
             Ok(c) => c,
-            Err(e) => {
-                println!(
-                    "[download] ERROR: Failed to read chunk #{}: {}",
-                    chunk_count, e
-                );
+            Err(_) => {
                 let _ = &app.emit("download-stop", format!("{}", name));
                 return "-1".to_string();
             }
@@ -321,11 +272,7 @@ async fn download(
 
         chunk_count += 1;
 
-        if let Err(e) = file.write_all(&chunk).await {
-            println!(
-                "[download] ERROR: Failed to write chunk #{} to disk: {}",
-                chunk_count, e
-            );
+        if let Err(_) = file.write_all(&chunk).await {
             let _ = &app.emit("download-stop", format!("{}", name));
             return "-1".to_string();
         }
@@ -352,15 +299,6 @@ async fn download(
         };
 
         if chunk_count % 50 == 0 || downloaded == total_size {
-            println!(
-                "[download] [{:.1}%] {:.2} MB / {:.2} MB | Speed: {:.1} KB/s | ETA: {:.1}s | Chunks: {}",
-                progress,
-                downloaded as f64 / 1_048_576.0,
-                total_size as f64 / 1_048_576.0,
-                speed / 1024.0,
-                eta_secs,
-                chunk_count,
-            );
             let _ = window.set_progress_bar(ProgressBarState {
                 status: Some(ProgressBarStatus::Normal),
                 progress: Some(progress as u64),
@@ -377,12 +315,6 @@ async fn download(
     }
 
     if total_size > 0 && downloaded < total_size {
-        println!(
-            "[download] ERROR: Download incomplete — got {} of {} bytes ({:.1}% complete)",
-            downloaded,
-            total_size,
-            (downloaded as f64 / total_size as f64) * 100.0
-        );
         let _ = window.set_progress_bar(ProgressBarState {
             status: Some(ProgressBarStatus::None),
             progress: Some(0),
@@ -390,36 +322,21 @@ async fn download(
         return "-1".to_string();
     }
 
-    println!(
-        "[download] Download complete: {} bytes total in {:.2}s (this session)",
-        downloaded,
-        start.elapsed().as_secs_f64()
-    );
-    println!("[download] Verifying SHA-512 hash...");
     let _ = app.emit("download-hash-checking", format!("{}", &name));
 
     let download_hash = {
         let mut file = match tokio::fs::File::open(&download_part_path).await {
             Ok(f) => f,
-            Err(e) => {
-                println!(
-                    "[download] ERROR: Failed to open .part file for hashing: {}",
-                    e
-                );
+            Err(_) => {
                 return "-1".to_string();
             }
         };
         let mut hasher = Sha512::new();
-        let mut bytes_hashed: u64 = 0;
         let mut buffer = [0u8; 8192];
         loop {
             let bytes_read = match file.read(&mut buffer).await {
                 Ok(n) => n,
-                Err(e) => {
-                    println!(
-                        "[download] ERROR: Failed to read file during hashing: {}",
-                        e
-                    );
+                Err(_) => {
                     return "-1".to_string();
                 }
             };
@@ -427,18 +344,12 @@ async fn download(
                 break;
             }
             hasher.update(&buffer[..bytes_read]);
-            bytes_hashed += bytes_read as u64;
         }
         drop(file);
-        println!("[download] Hashed {} bytes", bytes_hashed);
-        format!("{:x}", hasher.finalize())
+        hex::encode(hasher.finalize())
     };
 
-    println!("[download] Expected hash: {}", hash);
-    println!("[download] Computed hash: {}", download_hash);
-
     if hash != download_hash {
-        println!("[download] ERROR: Hash mismatch! Deleting corrupt .part file.");
         let _ = tokio::fs::remove_file(&download_part_path).await;
         let _ = window.set_progress_bar(ProgressBarState {
             status: Some(ProgressBarStatus::None),
@@ -447,10 +358,7 @@ async fn download(
         return "-1".to_string();
     }
 
-    println!("[download] Hash verified OK");
-    println!("[download] Renaming .part -> .zip: {:?}", download_zip_path);
-    if let Err(e) = tokio::fs::rename(&download_part_path, &download_zip_path).await {
-        println!("[download] ERROR: Failed to rename .part to .zip: {}", e);
+    if let Err(_) = tokio::fs::rename(&download_part_path, &download_zip_path).await {
         let _ = window.set_progress_bar(ProgressBarState {
             status: Some(ProgressBarStatus::None),
             progress: Some(0),
@@ -460,7 +368,6 @@ async fn download(
 
     let _ = tokio::fs::create_dir_all(&game_path.join(&name)).await;
 
-    println!("[download] Unzipping to: {:?}", game_path.join(&name));
     let unzip_res = unzip_to_dir(
         app.clone(),
         download_zip_path.clone(),
@@ -477,11 +384,9 @@ async fn download(
     )
     .await;
 
-    println!("[download] Removing zip file: {:?}", download_zip_path);
     let _ = tokio::fs::remove_file(&download_zip_path).await;
 
     if unzip_res == "-1" {
-        println!("[download] ERROR: Unzip failed for '{}'", name);
         let _ = window.set_progress_bar(ProgressBarState {
             status: Some(ProgressBarStatus::None),
             progress: Some(0),
@@ -489,10 +394,6 @@ async fn download(
         return "-1".to_string();
     }
 
-    println!(
-        "[download] SUCCESS: '{}' downloaded, verified, and extracted",
-        &name
-    );
     let _ = window.set_progress_bar(ProgressBarState {
         status: Some(ProgressBarStatus::None),
         progress: Some(0),
@@ -612,7 +513,6 @@ fn verify_signature(body: String, signature: String, public_key: String) -> bool
 
 #[tauri::command]
 async fn cancel_download(name: String) {
-    println!("[cancel_download] Cancellation requested for '{}'", name);
     cancel_map().insert(name.clone(), true);
 }
 
@@ -620,6 +520,7 @@ async fn cancel_download(name: String) {
 pub fn run() {
     #[allow(unused_variables)]
     tauri::Builder::default()
+        .plugin(tauri_plugin_store::Builder::new().build())
         .plugin(tauri_plugin_http::init())
         .plugin(
             tauri_plugin_prevent_default::Builder::new()

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "Lncvrt Games Launcher",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "identifier": "xyz.lncvrt.games-launcher",
   "build": {
     "beforeDevCommand": "next dev --webpack",

src-tauri/tauri.linux.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "Lncvrt Games Launcher",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "identifier": "xyz.lncvrt.games-launcher",
   "build": {
     "beforeDevCommand": "next dev --webpack",

src-tauri/tauri.macos.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "Lncvrt Games Launcher",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "identifier": "xyz.lncvrt.games-launcher",
   "build": {
     "beforeDevCommand": "next dev --webpack",

src-tauri/tauri.windows.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "Lncvrt Games Launcher",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "identifier": "xyz.lncvrt.games-launcher",
   "build": {
     "beforeDevCommand": "next dev --webpack",

src/app/GlobalProvider.tsx

@@ -9,11 +9,11 @@ import {
 } from 'react'
 import { DownloadProgress } from '@/types/DownloadProgress'
 import { VersionsConfig } from '@/types/VersionsConfig'
-import { NormalConfig } from '@/types/NormalConfig'
 import { ServerVersionsResponse } from '@/types/ServerVersionsResponse'
 import { GameVersion } from '@/types/GameVersion'
 import { Game } from '@/types/Game'
 import { Mod } from '@/types/Mod'
+import { Store } from '@tauri-apps/plugin-store'
 
 type GlobalCtxType = {
   serverVersionList: ServerVersionsResponse | null
@@ -29,8 +29,6 @@ type GlobalCtxType = {
   setFadeOut: Dispatch<SetStateAction<boolean>>
   downloadedVersionsConfig: VersionsConfig | null
   setDownloadedVersionsConfig: Dispatch<SetStateAction<VersionsConfig | null>>
-  normalConfig: NormalConfig | null
-  setNormalConfig: Dispatch<SetStateAction<NormalConfig | null>>
   managingVersion: string | null
   setManagingVersion: Dispatch<SetStateAction<string | null>>
   setSelectedGame: Dispatch<SetStateAction<number | null>>
@@ -63,6 +61,12 @@ type GlobalCtxType = {
   setViewingInfoFromDownloads: Dispatch<SetStateAction<boolean>>
   showModInfo: Mod | null
   setShowModInfo: Dispatch<SetStateAction<Mod | null>>
+  settings: Store | null
+  notificationsAllowed: boolean
+  sidebarAlwaysShowGames: boolean
+  linuxUseWine: boolean
+  linuxWineCommand: string
+  theme: string
 }
 
 const GlobalCtx = createContext<GlobalCtxType | null>(null)

src/app/Globals.css

@@ -1,5 +1,9 @@
 @import "tailwindcss";
 
+html {
+  overscroll-behavior: none;
+}
+
 body {
   @apply bg-(--col0) text-white select-none;
 }

src/app/game/page.tsx

@@ -21,7 +21,6 @@ export default function Installs () {
     setFadeOut,
     setSelectedVersionList,
     downloadedVersionsConfig,
-    normalConfig,
     setManagingVersion,
     getVersionInfo,
     getGameInfo,
@@ -31,7 +30,9 @@ export default function Installs () {
     setCategory,
     setDownloadedVersionsConfig,
     downloadVersions,
-    downloadProgress
+    downloadProgress,
+    linuxUseWine,
+    linuxWineCommand
   } = useGlobal()
 
   const params = useSearchParams()
@@ -43,7 +44,7 @@ export default function Installs () {
   useEffect(() => {
     if (!showPopup) return
     setSelectedVersionList([])
-  }, [normalConfig, setSelectedVersionList, showPopup])
+  }, [setSelectedVersionList, showPopup])
 
   if (!id || !game) return <p>Invalid game</p>
 
@@ -129,11 +130,7 @@ export default function Installs () {
                   const info = getVersionInfo(v)
                   if (!info) return false
 
-                  if (
-                    platform() == 'linux' &&
-                    info.wine &&
-                    !normalConfig?.settings.useWineOnUnixWhenNeeded
-                  )
+                  if (platform() == 'linux' && info.wine && !linuxUseWine)
                     return false
 
                   return info.game === id && info.category === Number(key)
@@ -168,8 +165,7 @@ export default function Installs () {
                                 if (
                                   platform() == 'linux' &&
                                   info.wine &&
-                                  !normalConfig?.settings
-                                    .useWineOnUnixWhenNeeded
+                                  !linuxUseWine
                                 )
                                   return false
                                 return (
@@ -194,17 +190,13 @@ export default function Installs () {
               .sort((a, b) => {
                 const infoA = getVersionInfo(a)
                 const infoB = getVersionInfo(b)
-                if (!infoA || !infoB) return -1
+                if (!infoA || !infoB) return 0
                 return infoB.place - infoA.place
               })
               .filter(v => {
                 const info = getVersionInfo(v)
                 if (!info) return false
-                if (
-                  platform() == 'linux' &&
-                  info.wine &&
-                  !normalConfig?.settings.useWineOnUnixWhenNeeded
-                )
+                if (platform() == 'linux' && info.wine && !linuxUseWine)
                   return false
                 return (
                   info.game === id &&
@@ -299,9 +291,9 @@ export default function Installs () {
                       useWine: !!(
                         platform() == 'linux' &&
                         verInfo.wine &&
-                        normalConfig?.settings.useWineOnUnixWhenNeeded
+                        linuxUseWine
                       ),
-                      wineCommand: normalConfig?.settings.wineOnUnixCommand
+                      wineCommand: linuxWineCommand
                     })
                   }}
                   onContextMenu={e => {

src/app/layout.tsx

@@ -2,18 +2,13 @@
 
 import './Globals.css'
 import { useCallback, useEffect, useRef, useState } from 'react'
-import Sidebar from '@/componets/Sidebar'
+import Sidebar from '@/components/Sidebar'
 import { DownloadProgress } from '@/types/DownloadProgress'
 import { invoke } from '@tauri-apps/api/core'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faChevronLeft, faXmark } from '@fortawesome/free-solid-svg-icons'
-import {
-  readNormalConfig,
-  readVersionsConfig,
-  writeVersionsConfig
-} from '@/lib/BazookaManager'
+import { readVersionsConfig, writeVersionsConfig } from '@/lib/BazookaManager'
 import { VersionsConfig } from '@/types/VersionsConfig'
-import { NormalConfig } from '@/types/NormalConfig'
 import { app } from '@tauri-apps/api'
 import { openUrl } from '@tauri-apps/plugin-opener'
 import { GlobalProvider } from './GlobalProvider'
@@ -24,22 +19,28 @@ import { Game } from '@/types/Game'
 import { listen } from '@tauri-apps/api/event'
 import { usePathname } from 'next/navigation'
 import { arch, platform } from '@tauri-apps/plugin-os'
-import { notifyUser } from '@/lib/Notifications'
 import {
   isPermissionGranted,
   requestPermission
 } from '@tauri-apps/plugin-notification'
-import { BaseDirectory, exists, remove } from '@tauri-apps/plugin-fs'
+import {
+  BaseDirectory,
+  exists,
+  readTextFile,
+  remove
+} from '@tauri-apps/plugin-fs'
 import { fetch } from '@tauri-apps/plugin-http'
 import { verifySignature } from '@/lib/Util'
 import { getCurrentWindow, UserAttentionType } from '@tauri-apps/api/window'
 
-import VersionsDownloadPopup from '@/componets/popups/VersionsDownload'
-import GamesDownloadPopup from '@/componets/popups/GamesDownload'
-import DownloadsPopup from '@/componets/popups/Downloads'
-import ManageVersionPopup from '@/componets/popups/ManageVersion'
-import ModDownloadsPopup from '@/componets/popups/ModDownloads'
+import VersionsDownloadPopup from '@/components/popups/VersionsDownload'
+import GamesDownloadPopup from '@/components/popups/GamesDownload'
+import DownloadsPopup from '@/components/popups/Downloads'
+import ManageVersionPopup from '@/components/popups/ManageVersion'
+import ModDownloadsPopup from '@/components/popups/ModDownloads'
 import { Mod } from '@/types/Mod'
+import { load, Store } from '@tauri-apps/plugin-store'
+import { notifyUser } from '@/lib/Notifications'
 
 const roboto = Roboto({
   subsets: ['latin']
@@ -62,7 +63,6 @@ export default function RootLayout ({
 
   const [downloadedVersionsConfig, setDownloadedVersionsConfig] =
     useState<VersionsConfig | null>(null)
-  const [normalConfig, setNormalConfig] = useState<NormalConfig | null>(null)
 
   const [showPopup, setShowPopup] = useState(false)
   const [popupMode, setPopupMode] = useState<null | number>(null)
@@ -84,20 +84,26 @@ export default function RootLayout ({
   const pathname = usePathname()
   const revisionCheck = useRef(false)
 
+  const [settings, setSettings] = useState<Store | null>(null)
+
+  const [notificationsAllowed, setNotificationsAllowed] =
+    useState<boolean>(false)
+  const [sidebarAlwaysShowGames, setSidebarAlwaysShowGames] =
+    useState<boolean>(false)
+  const [linuxUseWine, setLinuxUseWine] = useState<boolean>(false)
+  const [linuxWineCommand, setLinuxWineCommand] =
+    useState<string>('wine %path%')
+  const [theme, setTheme] = useState<string>('dark')
+
   function getSpecialVersionsList (game?: number): GameVersion[] {
-    if (!normalConfig || !serverVersionList) return []
+    if (!serverVersionList) return []
 
     return serverVersionList.versions
       .filter(
         v => !Object.keys(downloadedVersionsConfig?.list ?? []).includes(v.id)
       )
       .filter(v => {
-        if (
-          platformName == 'linux' &&
-          v.wine &&
-          !normalConfig.settings.useWineOnUnixWhenNeeded
-        )
-          return false
+        if (platformName == 'linux' && v.wine && linuxUseWine) return false
 
         if (game && v.game != game) return false
         if (category != -1 && v.category != category) return false
@@ -150,8 +156,7 @@ export default function RootLayout ({
   } | null {
     if (!downloadedVersionsConfig || !serverVersionList) return null
 
-    const allowWine =
-      platformName !== 'linux' || normalConfig?.settings.useWineOnUnixWhenNeeded
+    const allowWine = platformName !== 'linux' || linuxUseWine
 
     const installed = Object.keys(downloadedVersionsConfig.list).filter(v => {
       const info = getVersionInfo(v)
@@ -353,10 +358,85 @@ export default function RootLayout ({
         setLoadingText('Failed to download versions list.')
         return
       }
-      const normalConfig = await readNormalConfig()
+      const settingsLocal = await load('settings.json', {
+        autoSave: true,
+        defaults: {
+          version: client,
+          notificationsAllowed: true,
+          sidebarAlwaysShowGames: true,
+          linuxUseWine: false,
+          linuxWineCommand: 'wine %path%',
+          theme: 'dark'
+        }
+      })
+      settingsLocal.set('version', client)
+      const oldSettingsOptions = {
+        baseDir: BaseDirectory.AppLocalData
+      }
+      if (await exists('config.json', oldSettingsOptions)) {
+        const config = await readTextFile('config.json', oldSettingsOptions)
+        const raw = JSON.parse(config)
+        if (
+          raw.settings &&
+          raw.settings.theme &&
+          (raw.version == '1.0.0' ||
+            raw.version == '1.1.0' ||
+            raw.version == '1.1.1' ||
+            raw.version == '1.2.0' ||
+            raw.version == '1.3.0' ||
+            raw.version == '1.3.1' ||
+            raw.version == '1.4.0' ||
+            raw.version == '1.5.0' ||
+            raw.version == '1.5.1' ||
+            raw.version == '1.5.2' ||
+            raw.version == '1.5.3' ||
+            raw.version == '1.5.4')
+        ) {
+          const parsed = Number(raw.settings.theme)
+          if (parsed == 3) raw.settings.theme = 2
+          if (parsed == 4) raw.settings.theme = 3
+          else if (parsed != 0 && parsed != 1) raw.settings.theme = 0
+        }
+        if (raw.settings.allowNotifications)
+          settingsLocal?.set(
+            'notificationsAllowed',
+            Boolean(raw.settings.allowNotifications)
+          )
+        if (raw.settings.alwaysShowGamesInSidebar)
+          settingsLocal?.set(
+            'sidebarAlwaysShowGames',
+            Boolean(raw.settings.alwaysShowGamesInSidebar)
+          )
+        if (raw.settings.useWineOnUnixWhenNeeded)
+          settingsLocal?.set(
+            'linuxUseWine',
+            Boolean(raw.settings.useWineOnUnixWhenNeeded)
+          )
+        if (raw.settings.wineOnUnixCommand)
+          settingsLocal?.set(
+            'linuxWineCommand',
+            String(raw.settings.wineOnUnixCommand)
+          )
+        if (raw.settings.theme) {
+          const tempTheme = (() => {
+            switch (Number(raw.settings.theme)) {
+              case 1:
+                return 'red'
+              case 2:
+                return 'blue'
+              case 3:
+                return 'purple'
+              default:
+                return 'dark'
+            }
+          })()
+          settingsLocal?.set('theme', tempTheme)
+        }
+        await remove('config.json', oldSettingsOptions)
+      }
       const versionsConfig = await readVersionsConfig()
       setDownloadedVersionsConfig(versionsConfig)
-      setNormalConfig(normalConfig)
+      setSettings(settingsLocal)
       setLoading(false)
 
       if (!(await isPermissionGranted())) {
@@ -475,7 +555,7 @@ export default function RootLayout ({
               : d
           )
         )
-        if (normalConfig?.settings.allowNotifications)
+        if (await settings?.get<boolean>('notifications-allowed'))
           await notifyUser(
             'Download Failed',
             `The download for version ${info.displayName} has failed.`
@@ -560,7 +640,7 @@ export default function RootLayout ({
               : d
           )
         )
-        if (normalConfig?.settings.allowNotifications)
+        if (await settings?.get<boolean>('notifications-allowed'))
           await notifyUser(
             'Download Failed',
             `The download for version ${info.displayName} has failed.`
@@ -581,7 +661,7 @@ export default function RootLayout ({
     getVersionInfo,
     getGameInfo,
     downloadProgress,
-    normalConfig
+    settings
   ])
 
   useEffect(() => {
@@ -612,20 +692,62 @@ export default function RootLayout ({
     })()
   }, [serverVersionList, downloadedVersionsConfig, downloadVersions])
 
+  useEffect(() => {
+    if (
+      downloadProgress.length === 0 &&
+      downloadQueue.length === 0 &&
+      showPopup &&
+      popupMode === 1
+    ) {
+      setTimeout(async () => {
+        if (notificationsAllowed) {
+          await notifyUser('Downloads Complete', 'All downloads finished!')
+        }
+        await getCurrentWindow().requestUserAttention(
+          UserAttentionType.Informational
+        )
+        closePopup()
+      }, 0)
+    }
+  }, [
+    downloadProgress,
+    downloadQueue,
+    showPopup,
+    popupMode,
+    closePopup,
+    notificationsAllowed
+  ])
+
+  useEffect(() => {
+    if (!settings) return
+    const unlisteners: Promise<() => void>[] = []
+
+    function watch<T> (key: string, fn: (v: T | undefined) => void) {
+      settings!.get<T>(key).then(fn)
+      unlisteners.push(settings!.onKeyChange<T>(key, fn))
+    }
+
+    watch<string>('theme', v => setTheme(v ?? 'dark'))
+    watch<boolean>('notificationsAllowed', v =>
+      setNotificationsAllowed(v ?? true)
+    )
+    watch<boolean>('sidebarAlwaysShowGames', v =>
+      setSidebarAlwaysShowGames(v ?? true)
+    )
+    watch<boolean>('linuxUseWine', v => setLinuxUseWine(v ?? false))
+    watch<string>('linuxWineCommand', v =>
+      setLinuxWineCommand(v ?? 'wine %path%')
+    )
+
+    return () => {
+      unlisteners.forEach(u => u.then(fn => fn()))
+    }
+  }, [settings])
+
   return (
     <>
       <html lang='en' className={roboto.className}>
-        <body
-          className={
-            normalConfig?.settings.theme === 1
-              ? 'red-theme'
-              : normalConfig?.settings.theme === 2
-              ? 'blue-theme'
-              : normalConfig?.settings.theme === 3
-              ? 'purple-theme'
-              : 'dark-theme'
-          }
-        >
+        <body className={theme + '-theme'}>
           {loading ? (
             <>
               <div
@@ -675,8 +797,6 @@ export default function RootLayout ({
                 setFadeOut,
                 downloadedVersionsConfig,
                 setDownloadedVersionsConfig,
-                normalConfig,
-                setNormalConfig,
                 managingVersion,
                 setManagingVersion,
                 getVersionInfo,
@@ -696,7 +816,13 @@ export default function RootLayout ({
                 selectedGame,
                 setViewingInfoFromDownloads,
                 showModInfo,
-                setShowModInfo
+                setShowModInfo,
+                settings,
+                notificationsAllowed,
+                sidebarAlwaysShowGames,
+                linuxUseWine,
+                linuxWineCommand,
+                theme
               }}
             >
               <div

src/app/page.tsx

@@ -20,7 +20,6 @@ export default function Installs () {
     setFadeOut,
     setSelectedVersionList,
     downloadedVersionsConfig,
-    normalConfig,
     setSelectedGame,
     getListOfGames,
     getVersionsAmountData,
@@ -32,7 +31,7 @@ export default function Installs () {
   useEffect(() => {
     if (!showPopup) return
     setSelectedVersionList([])
-  }, [normalConfig, setSelectedVersionList, showPopup])
+  }, [setSelectedVersionList, showPopup])
 
   return (
     <div className='mx-4 mt-4'>

src/app/settings/page.tsx

@@ -1,181 +1,84 @@
 'use client'
 
-import { useEffect, useState } from 'react'
-import { Setting } from '@/componets/Setting'
-import { writeNormalConfig } from '@/lib/BazookaManager'
+import { Setting } from '@/components/Setting'
 import { useGlobal } from '@/app/GlobalProvider'
 import { copyToClipboard } from '@/lib/Clipboard'
 import { platform } from '@tauri-apps/plugin-os'
 
 export default function Settings () {
-  const [allowNotifications, setAllowNotifications] = useState(false)
-  const [alwaysShowGamesInSidebar, setAlwaysShowGamesInSidebar] =
-    useState(false)
-  const [useWineOnUnixWhenNeeded, setUseWineOnUnixWhenNeeded] = useState(false)
-  const [wineOnUnixCommand, setWineOnUnixCommand] = useState('wine %path%')
-  const [theme, setTheme] = useState(0)
-
-  const [loaded, setLoaded] = useState(false)
-  const { normalConfig, setNormalConfig, version } = useGlobal()
-
-  useEffect(() => {
-    ;(async () => {
-      while (normalConfig != null) {
-        setAllowNotifications(normalConfig.settings.allowNotifications)
-        setAlwaysShowGamesInSidebar(
-          normalConfig.settings.alwaysShowGamesInSidebar
-        )
-        setUseWineOnUnixWhenNeeded(
-          normalConfig.settings.useWineOnUnixWhenNeeded
-        )
-        setWineOnUnixCommand(normalConfig.settings.wineOnUnixCommand)
-        setTheme(normalConfig.settings.theme)
-        setLoaded(true)
-        break
-      }
-    })()
-  }, [normalConfig])
+  const {
+    settings,
+    version,
+    notificationsAllowed,
+    sidebarAlwaysShowGames,
+    linuxUseWine,
+    linuxWineCommand,
+    theme
+  } = useGlobal()
 
   return (
     <>
       <p className='text-3xl ml-4 mt-4'>Settings</p>
-      {loaded && (
-        <div className='ml-4 mt-4 bg-(--col1) border border-(--col3) rounded-lg p-4 w-fit h-fit'>
-          <Setting
-            label='Allow sending notifications'
-            value={allowNotifications}
-            onChange={async () => {
-              if (!normalConfig) return
-              setAllowNotifications(!allowNotifications)
-              setNormalConfig({
-                ...normalConfig,
-                settings: {
-                  ...normalConfig.settings,
-                  allowNotifications: !allowNotifications
-                }
-              })
-              await writeNormalConfig({
-                ...normalConfig,
-                settings: {
-                  ...normalConfig.settings,
-                  allowNotifications: !allowNotifications
-                }
-              })
-            }}
-            title='This setting does as you expect, allow the launcher to send notifications for when stuff like downloading is done.'
-          />
-          <Setting
-            label='Always show games in sidebar'
-            value={alwaysShowGamesInSidebar}
-            onChange={async () => {
-              if (!normalConfig) return
-              setAlwaysShowGamesInSidebar(!alwaysShowGamesInSidebar)
-              setNormalConfig({
-                ...normalConfig,
-                settings: {
-                  ...normalConfig.settings,
-                  alwaysShowGamesInSidebar: !alwaysShowGamesInSidebar
-                }
-              })
-              await writeNormalConfig({
-                ...normalConfig,
-                settings: {
-                  ...normalConfig.settings,
-                  alwaysShowGamesInSidebar: !alwaysShowGamesInSidebar
-                }
-              })
-            }}
-            title="This setting will make it so when you are on a page like this, the games won't disappear."
-          />
-          <Setting
-            label='Use wine when needed to launch games'
-            value={useWineOnUnixWhenNeeded}
-            onChange={async () => {
-              if (!normalConfig) return
-              setUseWineOnUnixWhenNeeded(!useWineOnUnixWhenNeeded)
-              setNormalConfig({
-                ...normalConfig,
-                settings: {
-                  ...normalConfig.settings,
-                  useWineOnUnixWhenNeeded: !useWineOnUnixWhenNeeded
-                }
-              })
-              await writeNormalConfig({
-                ...normalConfig,
-                settings: {
-                  ...normalConfig.settings,
-                  useWineOnUnixWhenNeeded: !useWineOnUnixWhenNeeded
-                }
-              })
-            }}
-            className={platform() == 'linux' ? '' : 'hidden'}
-          />
-          <p hidden={!(platform() == 'linux' && useWineOnUnixWhenNeeded)}>
-            Wine Command:
-          </p>
-          <input
-            type='text'
-            value={wineOnUnixCommand}
+      <div className='ml-4 mt-4 bg-(--col1) border border-(--col3) rounded-lg p-4 w-fit h-fit'>
+        <Setting
+          label='Allow sending notifications'
+          value={notificationsAllowed}
+          onChange={async () => {
+            await settings?.set('notificationsAllowed', !notificationsAllowed)
+          }}
+          title='This setting does as you expect, allow the launcher to send notifications for when stuff like downloading is done.'
+        />
+        <Setting
+          label='Always show games in sidebar'
+          value={sidebarAlwaysShowGames}
+          onChange={async () => {
+            await settings?.set(
+              'sidebarAlwaysShowGames',
+              !sidebarAlwaysShowGames
+            )
+          }}
+          title="This setting will make it so when you are on a page like this, the games won't disappear."
+        />
+        <Setting
+          label='Use wine if needed'
+          value={linuxUseWine}
+          onChange={async () => {
+            await settings?.set('linuxUseWine', !linuxUseWine)
+          }}
+          className={platform() == 'linux' ? '' : 'hidden'}
+        />
+        <p hidden={!(platform() == 'linux' && linuxUseWine)}>Wine Command:</p>
+        <input
+          type='text'
+          value={linuxWineCommand}
+          onChange={async e => {
+            await settings?.set('linuxWineCommand', e.target.value)
+          }}
+          className={`input-field my-1 ${
+            platform() == 'linux' && linuxWineCommand ? '' : 'hidden'
+          }`}
+        ></input>
+        <div title='The theme you want the launcher to use.'>
+          <label className='text-lg'>Theme:</label>
+          <select
+            className='ml-2 bg-(--col2) border border-(--col4) rounded-md'
+            value={theme}
             onChange={async e => {
-              if (!normalConfig) return
-              setWineOnUnixCommand(e.target.value)
-              setNormalConfig({
-                ...normalConfig,
-                settings: {
-                  ...normalConfig.settings,
-                  wineOnUnixCommand: e.target.value
-                }
-              })
-              await writeNormalConfig({
-                ...normalConfig,
-                settings: {
-                  ...normalConfig.settings,
-                  wineOnUnixCommand: e.target.value
-                }
-              })
+              await settings?.set('theme', e.target.value)
             }}
-            className={`input-field my-1 ${
-              platform() == 'linux' && useWineOnUnixWhenNeeded ? '' : 'hidden'
-            }`}
-          ></input>
-          <div title='The theme you want the launcher to use.'>
-            <label className='text-lg'>Theme:</label>
-            <select
-              className='ml-2 bg-(--col2) border border-(--col4) rounded-md'
-              value={theme}
-              onChange={async e => {
-                if (!normalConfig) return
-                const newTheme = parseInt(e.target.value)
-                setTheme(newTheme)
-                setNormalConfig({
-                  ...normalConfig,
-                  settings: {
-                    ...normalConfig.settings,
-                    theme: newTheme
-                  }
-                })
-                await writeNormalConfig({
-                  ...normalConfig,
-                  settings: {
-                    ...normalConfig.settings,
-                    theme: newTheme
-                  }
-                })
-              }}
-            >
-              <option value={0}>Dark (default)</option>
-              <option value={1}>Red</option>
-              <option value={2}>Blue</option>
-              <option value={3}>Purple</option>
-            </select>
-          </div>
+          >
+            <option value={'dark'}>Dark (default)</option>
+            <option value={'red'}>Red</option>
+            <option value={'blue'}>Blue</option>
+            <option value={'purple'}>Purple</option>
+          </select>
         </div>
-      )}
+      </div>
       <p
         className='fixed bottom-1.5 right-1.5 rounded-md cursor-pointer px-1 border z-100 transition-colors btntheme1'
-        onClick={async () => {
-          await copyToClipboard(`v${version}`, normalConfig)
-        }}
+        onClick={async () =>
+          await copyToClipboard(`v${version}`, notificationsAllowed)
+        }
         title='The current launcher version.'
       >
         v{version}

src/components/Sidebar.tsx

@@ -27,7 +27,6 @@ const lexend = Lexend({
 
 export default function Sidebar () {
   const {
-    normalConfig,
     getListOfGames,
     setShowPopup,
     setPopupMode,
@@ -36,7 +35,9 @@ export default function Sidebar () {
     downloadedVersionsConfig,
     getVersionInfo,
     category,
-    setCategory
+    setCategory,
+    sidebarAlwaysShowGames,
+    linuxUseWine
   } = useGlobal()
 
   const pathname = usePathname()
@@ -104,7 +105,7 @@ export default function Sidebar () {
                     ? 'active'
                     : ''
                 } ml-auto w-50 ${
-                  normalConfig?.settings.alwaysShowGamesInSidebar ||
+                  sidebarAlwaysShowGames ||
                   pathname === '/' ||
                   pathname.startsWith('/game')
                     ? ''
@@ -136,11 +137,7 @@ export default function Sidebar () {
                     const info = getVersionInfo(v)
                     if (!info) return false
 
-                    if (
-                      platform() == 'linux' &&
-                      info.wine &&
-                      !normalConfig?.settings.useWineOnUnixWhenNeeded
-                    )
+                    if (platform() == 'linux' && info.wine && !linuxUseWine)
                       return false
 
                     return info.game === i.id && info.category === Number(key)
@@ -161,7 +158,7 @@ export default function Sidebar () {
                         ? 'active'
                         : ''
                     } ml-auto w-47.5 ${
-                      normalConfig?.settings.alwaysShowGamesInSidebar ||
+                      sidebarAlwaysShowGames ||
                       pathname === '/' ||
                       pathname.startsWith('/game')
                         ? ''

src/components/popups/Downloads.tsx

@@ -21,8 +21,8 @@ export default function DownloadsPopup () {
     setDownloadProgress,
     downloadQueue,
     setDownloadQueue,
-    normalConfig,
-    setDownloadedVersionsConfig
+    setDownloadedVersionsConfig,
+    notificationsAllowed
   } = useGlobal()
 
   return (
@@ -58,28 +58,42 @@ export default function DownloadsPopup () {
                       const res = await invoke<string>('download', {
                         url: v.url,
                         name: v.version,
-                        executable: v.executable,
-                        hash: v.hash
+                        hash: v.hash,
+                        downloadType: v.type,
+                        modId: String(v.modId ?? '')
                       })
 
                       if (res === '1') {
                         setDownloadProgress(prev =>
                           prev.filter(d => d.version !== v.version)
                         )
-                        setDownloadedVersionsConfig(prev => {
-                          if (!prev) return prev
+                        if (v.type != 1) {
+                          setDownloadedVersionsConfig(prev => {
+                            if (!prev) return prev
 
-                          const updated = {
-                            ...prev,
-                            list: {
-                              ...prev.list,
-                              [v.version]: Date.now()
-                            }
-                          }
+                            const updated =
+                              v.type == 2
+                                ? {
+                                    ...prev,
+                                    mods: {
+                                      ...prev.mods,
+                                      [v.modGame! + '-' + v.modId!]: {
+                                        [v.modVersion!]: Date.now()
+                                      }
+                                    }
+                                  }
+                                : {
+                                    ...prev,
+                                    list: {
+                                      ...prev.list,
+                                      [v.version]: Date.now()
+                                    }
+                                  }
 
-                          writeVersionsConfig(updated)
-                          return updated
-                        })
+                            writeVersionsConfig(updated)
+                            return updated
+                          })
+                        }
                       } else if (res == '0') {
                         setDownloadProgress(prev => {
                           const i = prev.findIndex(d => d.version === v.version)
@@ -109,7 +123,7 @@ export default function DownloadsPopup () {
                               : d
                           )
                         )
-                        if (normalConfig?.settings.allowNotifications)
+                        if (notificationsAllowed)
                           await notifyUser(
                             'Download Failed',
                             `The download for version ${

src/components/popups/ModDownloads.tsx

@@ -17,6 +17,7 @@ import {
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { message } from '@tauri-apps/plugin-dialog'
 import { BaseDirectory, exists, remove } from '@tauri-apps/plugin-fs'
+import { fetch } from '@tauri-apps/plugin-http'
 import { arch, platform } from '@tauri-apps/plugin-os'
 import { useEffect, useState } from 'react'
 

src/lib/BazookaManager.ts

@@ -1,5 +1,4 @@
 import { app } from '@tauri-apps/api'
-import { NormalConfig } from '@/types/NormalConfig'
 import {
   BaseDirectory,
   create,
@@ -10,80 +9,6 @@ import {
 } from '@tauri-apps/plugin-fs'
 import { VersionsConfig } from '@/types/VersionsConfig'
 
-export async function readNormalConfig (): Promise<NormalConfig> {
-  const version = await app.getVersion()
-  try {
-    const options = {
-      baseDir: BaseDirectory.AppLocalData
-    }
-    const doesFolderExist = await exists('', options)
-    const doesConfigExist = await exists('config.json', options)
-    if (!doesFolderExist || !doesConfigExist) {
-      if (!doesFolderExist) {
-        await mkdir('', options)
-      }
-      const file = await create('config.json', options)
-      await file.write(
-        new TextEncoder().encode(
-          JSON.stringify(new NormalConfig(version), null, 2)
-        )
-      )
-      await file.close()
-      return new NormalConfig(version)
-    }
-    const config = await readTextFile('config.json', options)
-    const raw = JSON.parse(config)
-    if (
-      raw.settings &&
-      raw.settings.theme &&
-      (raw.version == '1.0.0' ||
-        raw.version == '1.1.0' ||
-        raw.version == '1.1.1' ||
-        raw.version == '1.2.0' ||
-        raw.version == '1.3.0' ||
-        raw.version == '1.3.1' ||
-        raw.version == '1.4.0' ||
-        raw.version == '1.5.0' ||
-        raw.version == '1.5.1' ||
-        raw.version == '1.5.2' ||
-        raw.version == '1.5.3' ||
-        raw.version == '1.5.4')
-    ) {
-      const parsed = Number(raw.settings.theme)
-      if (parsed == 3) raw.settings.theme = 2
-      if (parsed == 4) raw.settings.theme = 3
-      else if (parsed != 0 && parsed != 1) raw.settings.theme = 0
-    }
-    raw.version = version
-    writeNormalConfig(raw)
-    return NormalConfig.import(raw)
-  } catch {
-    return new NormalConfig(version)
-  }
-}
-
-export async function writeNormalConfig (data: NormalConfig) {
-  const options = {
-    baseDir: BaseDirectory.AppLocalData
-  }
-  const doesFolderExist = await exists('', options)
-  const doesConfigExist = await exists('config.json', options)
-  if (!doesFolderExist || !doesConfigExist) {
-    if (!doesFolderExist) {
-      await mkdir('', options)
-    }
-    const file = await create('config.json', options)
-    await file.write(new TextEncoder().encode(JSON.stringify(data, null, 2)))
-    await file.close()
-  } else {
-    await writeFile(
-      'config.json',
-      new TextEncoder().encode(JSON.stringify(data, null, 2)),
-      options
-    )
-  }
-}
-
 export async function readVersionsConfig (): Promise<VersionsConfig> {
   const version = await app.getVersion()
   try {

src/lib/Clipboard.ts

@@ -1,10 +1,11 @@
-import { NormalConfig } from '@/types/NormalConfig'
+import { writeText } from '@tauri-apps/plugin-clipboard-manager'
 import { notifyUser } from './Notifications'
 
 export async function copyToClipboard (
   text: string,
-  normalConfig: NormalConfig | null
+  notificationsAllowed: boolean
 ) {
-  if (normalConfig?.settings.allowNotifications)
+  await writeText(text)
+  if (notificationsAllowed)
     await notifyUser('Copied', 'Text "' + text + '" copied to clipboard')
 }

src/types/NormalConfig.ts

@@ -1,21 +0,0 @@
-import { SettingsType } from './SettingsType'
-
-type NormalConfigData = {
-  version: string
-  settings?: Partial<SettingsType>
-}
-
-export class NormalConfig {
-  constructor (
-    public version: string,
-    public settings: SettingsType = new SettingsType()
-  ) {}
-
-  static import (data: NormalConfigData) {
-    const cfg = new NormalConfig(data.version)
-    if (data.settings) {
-      cfg.settings = { ...cfg.settings, ...data.settings }
-    }
-    return cfg
-  }
-}

src/types/SettingsType.ts

@@ -1,9 +0,0 @@
-export class SettingsType {
-  constructor (
-    public allowNotifications: boolean = true,
-    public alwaysShowGamesInSidebar: boolean = true,
-    public useWineOnUnixWhenNeeded: boolean = false,
-    public wineOnUnixCommand: string = 'wine %path%',
-    public theme: number = 0
-  ) {}
-}