Changes from 1.2.1 - 1.5.1

Contains slightly modified commits from between 1.2.1 and 1.5.1.
2025-12-13 07:34:36 +01:00 · 2024-10-30 13:18:07 -06:00
parent 31c60755af
commit f6f5eae31c
46 changed files with 2619 additions and 1669 deletions
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cultivation"
-version = "1.2.0"
+version = "1.5.1"
 description = "A custom launcher for anime game."
 authors = ["KingRainbow44", "SpikeHD"]
 license = ""
--- a/src-tauri/lang/chs.json
+++ b/src-tauri/lang/chs.json
@@ -35,11 +35,13 @@
    "un_elevated": "非提升运行游戏（无管理员）",
    "redirect_more": "还可以重定向其他MHY游戏",
    "web_cache": "删除 webCaches 文件夹",
-    "launch_args": "Launch Args"
+    "launch_args": "启动参数",
+    "offline_mode": "离线模式",
+    "fix_res": "修复登录超时"
  },
  "downloads": {
    "grasscutter_fullbuild": "下载 Grasscutter 一体化",
-    "grasscutter_fullquest": "下载 Quest 一体化",
+    "grasscutter_fullquest": "下载 5.0 一体化",
    "grasscutter_stable_data": "下载 Grasscutter 稳定版数据",
    "grasscutter_latest_data": "下载 Grasscutter 开发版数据",
    "grasscutter_stable_data_update": "更新 Grasscutter 稳定版数据",
@@ -67,7 +69,8 @@
    "select_folder": "选择文件夹...",
    "download": "下载",
    "delete": "删除",
-    "install": "安装"
+    "install": "安装",
+    "fix": "Fix"
  },
  "news": {
    "latest_commits": "最近提交",
--- a/src-tauri/lang/cht.json
+++ b/src-tauri/lang/cht.json
@@ -35,11 +35,13 @@
    "un_elevated": "在不升高的情况下运行游戏（没有管理员）。",
    "redirect_more": "同時重定向其他 MHY 遊戲",
    "web_cache": "刪除 webCaches 文件夾",
-    "launch_args": "Launch Args"
+    "launch_args": "啟動參數",
+    "offline_mode": "離線模式",
+    "fix_res": "修復登入逾時"
  },
  "downloads": {
    "grasscutter_fullbuild": "下載Grasscutter多合一下載",
-    "grasscutter_fullquest": "下载 Quest 一体化",
+    "grasscutter_fullquest": "下载 5.0 一体化",
    "grasscutter_stable_data": "下載Grasscutter穩定版數據（Data）",
    "grasscutter_latest_data": "下載Grasscutter開發板數據（Data）",
    "grasscutter_stable_data_update": "更新Grasscutter穩定版數據（Data）",
@@ -67,7 +69,8 @@
    "select_folder": "選擇資料夾...",
    "download": "下載",
    "delete": "刪除",
-    "install": "安裝"
+    "install": "安裝",
+    "fix": "Fix"
  },
  "news": {
    "latest_commits": "最近的PR",
--- a/src-tauri/lang/de.json
+++ b/src-tauri/lang/de.json
@@ -37,11 +37,13 @@
    "check_aagl": "Für weitere Optionen, schaue weiter",
    "grasscutter_elevation": "Methode zur Ausführung von GC auf eingeschränkten Ports",
    "web_cache": "WebCaches-Ordner löschen",
-    "launch_args": "Launch Args"
+    "launch_args": "Start-Argumente",
+    "offline_mode": "Offline-Modus",
+    "fix_res": "Login-Zeitüberschreitung beheben"
  },
  "downloads": {
    "grasscutter_fullbuild": "Grasscutter All-in-One herunterladen",
-    "grasscutter_fullquest": "Questing All-in-One herunterladen",
+    "grasscutter_fullquest": "5.0 All-in-One herunterladen",
    "grasscutter_stable_data": "Stabile Grasscutter-Daten herunterladen",
    "grasscutter_latest_data": "Neueste Grasscutter-Daten herunterladen",
    "grasscutter_stable_data_update": "Stabile Grasscutter-Daten aktualisieren",
@@ -69,7 +71,8 @@
    "select_folder": "Ordner auswählen...",
    "download": "Herunterladen",
    "delete": "Löschen",
-    "install": "Installieren"
+    "install": "Installieren",
+    "fix": "Fix"
  },
  "news": {
    "latest_commits": "Neueste Commits",
--- a/src-tauri/lang/en.json
+++ b/src-tauri/lang/en.json
@@ -37,11 +37,13 @@
    "check_aagl": "For more options, check the other launcher",
    "grasscutter_elevation": "Method of running GC on restricted ports",
    "web_cache": "Delete webCaches folder",
-    "launch_args": "Launch Args"
+    "launch_args": "Launch Args",
+    "offline_mode": "Offline Mode",
+    "fix_res": "Fix Login Timeout"
  },
  "downloads": {
    "grasscutter_fullbuild": "Download Grasscutter All-in-One",
-    "grasscutter_fullquest": "Download Questing All-in-One",
+    "grasscutter_fullquest": "Download 5.0 All-in-One",
    "grasscutter_stable_data": "Download Grasscutter Stable Data",
    "grasscutter_latest_data": "Download Grasscutter Latest Data",
    "grasscutter_stable_data_update": "Update Grasscutter Stable Data",
@@ -69,7 +71,8 @@
    "select_folder": "Select folder...",
    "download": "Download",
    "delete": "Delete",
-    "install": "Install"
+    "install": "Install",
+    "fix": "Fix"
  },
  "news": {
    "latest_commits": "Recent Commits",
@@ -96,7 +99,7 @@
    "akebi_name": "Akebi",
    "migoto_name": "Migoto",
    "reshade_name": "Reshade",
-    "akebi": "Set Akebi/Acrepi Executable",
+    "akebi": "Set Akebi/Other Cheat Executable",
    "migoto": "Set 3DMigoto Executable",
    "reshade": "Set Reshade Injector"
  }
--- a/src-tauri/lang/es.json
+++ b/src-tauri/lang/es.json
@@ -35,11 +35,13 @@
    "un_elevated": "Ejecutar el juego sin permisos de administrador",
    "redirect_more": "También redirigir otros juegos MHY",
    "web_cache": "Eliminar la carpeta webCaches",
-    "launch_args": "Launch Args"
+    "launch_args": "Args de lanzamiento",
+    "offline_mode": "Modo sin conexión",
+    "fix_res": "Reparar el tiempo de espera"
  },
  "downloads": {
    "grasscutter_fullbuild": "Descargar datos todo en uno de Grasscutter",
-    "grasscutter_fullquest": "Descargar datos todo en uno de Questing",
+    "grasscutter_fullquest": "Descargar datos todo en uno de 5.0",
    "grasscutter_stable_data": "Descargar datos Estables de Grasscutter",
    "grasscutter_latest_data": "Descargar datos más Recientes de Grasscutter",
    "grasscutter_stable_data_update": "Actualizar datos estables de Grasscutter",
@@ -67,7 +69,8 @@
    "select_folder": "Seleccionar la carpeta",
    "download": "Descargar",
    "delete": "Borrar",
-    "install": "Instalar"
+    "install": "Instalar",
+    "fix": "Fix"
  },
  "news": {
    "latest_commits": "Commits recientes",
--- a/src-tauri/lang/fr.json
+++ b/src-tauri/lang/fr.json
@@ -35,11 +35,13 @@
    "un_elevated": "Exécuter le jeu sans élévation (pas d'administrateur)",
    "redirect_more": "Réorienter également les autres jeux MHY",
    "web_cache": "Supprimer le dossier webCaches",
-    "launch_args": "Launch Args"
+    "launch_args": "Arguments de lancement",
+    "offline_mode": "Mode hors ligne",
+    "fix_res": "Réparation du login"
  },
  "downloads": {
    "grasscutter_fullbuild": "Telecharger Grasscutter tout-en-un",
-    "grasscutter_fullquest": "Télécharger les Quêtes tout-en-un",
+    "grasscutter_fullquest": "Télécharger les 5.0 tout-en-un",
    "grasscutter_stable_data": "Télécharger les donnees de Grasscutter (version stable)",
    "grasscutter_latest_data": "Télécharger les donnees de Grasscutter (derniere version)",
    "grasscutter_stable_data_update": "Mettre à jour les données de Grasscutter (version stable)",
@@ -66,7 +68,8 @@
    "select_folder": "Choisir un dossier...",
    "download": "Télécharger",
    "delete": "Supprimer",
-    "install": "Installer"
+    "install": "Installer",
+    "fix": "Fix"
  },
  "news": {
    "latest_commits": "Commits récents",
--- a/src-tauri/lang/id.json
+++ b/src-tauri/lang/id.json
@@ -34,11 +34,13 @@
    "un_elevated": "Jalankan game yang tidak ditinggikan (tanpa admin)",
    "redirect_more": "Juga mengarahkan ulang game MHY lainnya",
    "web_cache": "Hapus folder webCaches",
-    "launch_args": "Launch Args"
+    "launch_args": "Luncurkan Args",
+    "offline_mode": "Mode Offline",
+    "fix_res": "Perbaiki batas waktu login"
  },
  "downloads": {
    "grasscutter_fullbuild": "Sedang Mendownload Grasscutter Semua Dalam Satu",
-    "grasscutter_fullquest": "Unduh pencarian semua dalam satu",
+    "grasscutter_fullquest": "Unduh 5.0 semua dalam satu",
    "grasscutter_stable_data": "Sedang Mendownload Grasscutter Versi Stabil",
    "grasscutter_latest_data": "Sedang Mendownload Grasscutter Data Terbaru",
    "grasscutter_stable_data_update": "Memperbaharui Grasscutter Data Stabil",
@@ -64,7 +66,8 @@
    "select_file": "Pilih File Atau Folder...",
    "select_folder": "Pilih Folder...",
    "download": "download",
-    "delete": "Menghapus"
+    "delete": "Menghapus",
+    "fix": "Fix"
  },
  "news": {
    "latest_commits": "Commit Terbaru",
--- a/src-tauri/lang/it.json
+++ b/src-tauri/lang/it.json
@@ -35,11 +35,13 @@
    "un_elevated": "Avvia il gioco non-elevato (non admin)",
    "redirect_more": "Reindirizza anche altri giochi MHY",
    "web_cache": "Elimina la cartella webCaches",
-    "launch_args": "Launch Args"
+    "launch_args": "Argomenti di lancio",
+    "offline_mode": "Modalità Offline",
+    "fix_res": "Correggere il timeout dell'accesso"
  },
  "downloads": {
    "grasscutter_fullbuild": "Scarica Grasscutter Tutto-in-Uno",
-    "grasscutter_fullquest": "Scarica Questing Tutto-in-Uno",
+    "grasscutter_fullquest": "Scarica 5.0 Tutto-in-Uno",
    "grasscutter_stable_data": "Scarica i dati di Grasscutter Stabili",
    "grasscutter_latest_data": "Scarica i dati di Grasscutter Più Recenti",
    "grasscutter_stable_data_update": "Aggiorna i dati di Grasscutter Stabili",
@@ -67,7 +69,8 @@
    "select_folder": "Seleziona cartella...",
    "download": "Scarica",
    "delete": "Cancella",
-    "install": "Installa"
+    "install": "Installa",
+    "fix": "Fix"
  },
  "news": {
    "latest_commits": "Commit Recenti",
--- a/src-tauri/lang/ko.json
+++ b/src-tauri/lang/ko.json
@@ -35,11 +35,13 @@
    "un_elevated": "게임 비상승 실행(관리자 없음)",
    "redirect_more": "다른 MHY 게임도 리디렉션",
    "web_cache": "webCaches 폴더 삭제",
-    "launch_args": "Launch Args"
+    "launch_args": "실행 인수",
+    "offline_mode": "오프라인 모드",
+    "fix_res": "로그인 시간 초과 수정"
  },
  "downloads": {
    "grasscutter_fullbuild": "올인원 Grasscutter 다운로드",
-    "grasscutter_fullquest": "퀘스트 올인원 다운로드",
+    "grasscutter_fullquest": "5.0 올인원 다운로드",
    "grasscutter_stable_data": "안정적인 데이터 다운로드",
    "grasscutter_latest_data": "최신 데이터 다운로드",
    "grasscutter_stable_data_update": "안정적 데이터 업데이트",
@@ -67,7 +69,8 @@
    "select_folder": "폴더 선택...",
    "download": "다운로드",
    "delete": "삭제",
-    "install": "설치"
+    "install": "설치",
+    "fix": "Fix"
  },
  "news": {
    "latest_commits": "공지 사항",
--- a/src-tauri/lang/lv.json
+++ b/src-tauri/lang/lv.json
@@ -33,11 +33,13 @@
    "un_elevated": "Palaist spēli bez paaugstinājuma (bez administratora)",
    "redirect_more": "Arī novirzīt citas MHY spēles",
    "web_cache": "Dzēsiet mapi WebCaches",
-    "launch_args": "Launch Args"
+    "launch_args": "Palaišanas args",
+    "offline_mode": "Bezsaistes režīms",
+    "fix_res": "Fiksēt pieteikšanās laika"
  },
  "downloads": {
    "grasscutter_fullbuild": "Lejupielādējiet Grasscutter viss vienā",
-    "grasscutter_fullquest": "Lejupielādēt questing viss vienā",
+    "grasscutter_fullquest": "Lejupielādēt 5.0 viss vienā",
    "grasscutter_stable_data": "Lejupielādējiet Grasscutter stabilos datus",
    "grasscutter_latest_data": "Lejupielādējiet Grasscutter jaunākos datus",
    "grasscutter_stable_data_update": "Atjauniniet Grasscutter stabilos datus",
@@ -63,7 +65,8 @@
    "select_file": "Izvēlēties failu vai mapu...",
    "select_folder": "Izvēlēties mapu...",
    "download": "Lejupielādēt",
-    "delete": "Dzēst"
+    "delete": "Dzēst",
+    "fix": "Fix"
  },
  "news": {
    "latest_commits": "Nesen kommitus",
--- a/src-tauri/lang/nl.json
+++ b/src-tauri/lang/nl.json
@@ -34,11 +34,13 @@
    "un_elevated": "Voer het spel uit zonder hoogtevrees (geen admin)",
    "redirect_more": "Richt ook andere MHY-spellen",
    "web_cache": "Verwijder de webCaches-map",
-    "launch_args": "Launch Args"
+    "launch_args": "Args starten",
+    "offline_mode": "Offline Modus",
+    "fix_res": "Time-out inloggen verhelpen"
  },
  "downloads": {
    "grasscutter_fullbuild": "Grasscutter Alles-in-één Downloaden",
-    "grasscutter_fullquest": "Alles-in-één zoeken downloaden",
+    "grasscutter_fullquest": "Alles-in-één 5.0 downloaden",
    "grasscutter_stable_data": "Download Stabiele Gegevens Van Grasscutter",
    "grasscutter_latest_data": "Download De Nieuwste Gegevens Van Grasscutter",
    "grasscutter_stable_data_update": "Stabiele gegevens Van Grasscutter bijwerken",
@@ -66,7 +68,8 @@
    "select_folder": "Select folder...",
    "download": "Download",
    "delete": "Verwijder",
-    "install": "Install"
+    "install": "Install",
+    "fix": "Fix"
  },
  "news": {
    "latest_commits": "Recente Opdrachten",
--- a/src-tauri/lang/pl.json
+++ b/src-tauri/lang/pl.json
@@ -37,11 +37,13 @@
    "check_aagl": "Więcej opcji znajdziesz w drugim launcherze",
    "grasscutter_elevation": "Sposób uruchomienia GC na ograniczonym porcie",
    "web_cache": "Usuń folder webCaches",
-    "launch_args": "Launch Args"
+    "launch_args": "Argumenty uruchamiania",
+    "offline_mode": "Tryb offline",
+    "fix_res": "Napraw limit czasu logowania"
  },
  "downloads": {
    "grasscutter_fullbuild": "Pobierz Grasscutter (wszystko w jednym)",
-    "grasscutter_fullquest": "Pobierz Questing (wszystko w jednym)",
+    "grasscutter_fullquest": "Pobierz 5.0 (wszystko w jednym)",
    "grasscutter_stable_data": "Pobierz stabilne dane Grasscuttera",
    "grasscutter_latest_data": "Pobierz najnowsze dane Grasscuttera",
    "grasscutter_stable_data_update": "Zaaktualizuj stabilne dane Grasscuttera",
@@ -69,7 +71,8 @@
    "select_folder": "Wybierz folder...",
    "download": "Pobierz",
    "delete": "Usuń",
-    "install": "Zainstaluj"
+    "install": "Zainstaluj",
+    "fix": "Fix"
  },
  "news": {
    "latest_commits": "Ostatnie Commity",
--- a/src-tauri/lang/pt-br.json
+++ b/src-tauri/lang/pt-br.json
@@ -35,11 +35,13 @@
    "un_elevated": "Executar o jogo não-elevated (sem admin)",
    "redirect_more": "Também redirecionar outros jogos MHY",
    "web_cache": "Excluir pasta webCaches",
-    "launch_args": "Launch Args"
+    "launch_args": "Argumentos de lançamento",
+    "offline_mode": "Modo offline",
+    "fix_res": "Corrigir o tempo limite de login"
  },
  "downloads": {
    "grasscutter_fullbuild": "Baixar o Grasscutter Tudo-em-Um",
-    "grasscutter_fullquest": "Baixar de missões em um só lugar",
+    "grasscutter_fullquest": "Baixar de 5.0 em um só lugar",
    "grasscutter_stable_data": "Baixar os Dados do Grasscutter Estável",
    "grasscutter_latest_data": "Baixar os Dados do Grasscutter Mais Recente",
    "grasscutter_stable_data_update": "Atualizar os Dados do Grasscutter Estável",
@@ -67,7 +69,8 @@
    "select_folder": "Selecione a pasta...",
    "download": "Baixar",
    "delete": "Deletar",
-    "install": "Instalar"
+    "install": "Instalar",
+    "fix": "Fix"
  },
  "news": {
    "latest_commits": "Commits Recentes",
--- a/src-tauri/lang/ru.json
+++ b/src-tauri/lang/ru.json
@@ -34,11 +34,13 @@
    "un_elevated": "Запустите игру в неэлегантном режиме (без администратора)",
    "redirect_more": "Также перенаправьте другие игры MHY",
    "web_cache": "Удалить папку webCaches",
-    "launch_args": "Launch Args"
+    "launch_args": "Параметры запуска",
+    "offline_mode": "Автономный режим",
+    "fix_res": "Исправить таймаут входа в систему"
  },
  "downloads": {
    "grasscutter_fullbuild": "Скачать все в одном Grasscutter",
-    "grasscutter_fullquest": "Скачать квесты все в одном",
+    "grasscutter_fullquest": "Скачать 5.0 все в одном",
    "grasscutter_stable_data": "Скачать стабильные данные Grasscutter",
    "grasscutter_latest_data": "Скачать последние данные Grasscutter",
    "grasscutter_stable_data_update": "Обновить стабильные данные Grasscutter",
@@ -66,7 +68,8 @@
    "select_folder": "Выберите папку...",
    "download": "Скачать",
    "delete": "Удалить",
-    "install": "Установить"
+    "install": "Установить",
+    "fix": "Fix"
  },
  "news": {
    "latest_commits": "Последние коммиты",
--- a/src-tauri/lang/vi.json
+++ b/src-tauri/lang/vi.json
@@ -35,11 +35,13 @@
    "un_elevated": "Chạy trò chơi không nâng cao (không có quản trị viên)",
    "redirect_more": "Đồng thời chuyển hướng các trò chơi MHY khác",
    "web_cache": "Xóa thư mục webCaches",
-    "launch_args": "Launch Args"
+    "launch_args": "Khởi chạy đối số",
+    "offline_mode": "Chế độ ngoại tuyến",
+    "fix_res": "Sửa lỗi hết thời gian đăng nhập"
  },
  "downloads": {
    "grasscutter_fullbuild": "Tải Grasscutter tất cả trong một",
-    "grasscutter_fullquest": "Tải xuống truy vấn tất cả trong một",
+    "grasscutter_fullquest": "Tải 5.0 tất cả trong một",
    "grasscutter_stable_data": "Tải dữ liệu Grasscutter bản ổn định",
    "grasscutter_latest_data": "Tải dữ liệu Grasscutter bản mới nhất",
    "grasscutter_stable_data_update": "Cập nhật dữ liệu Grasscutter bản ổn định",
@@ -67,7 +69,8 @@
    "select_folder": "Chọn thư mục...",
    "download": "Tải",
    "delete": "Xóa bỏ",
-    "install": "Cài"
+    "install": "Cài",
+    "fix": "Fix"
  },
  "news": {
    "latest_commits": "Thay Đổi Gần Đây",
--- a/src-tauri/patch/46version.dll
+++ b/src-tauri/patch/46version.dll
--- a/src-tauri/patch/47version.dll
+++ b/src-tauri/patch/47version.dll
--- a/src-tauri/patch/50version.dll
+++ b/src-tauri/patch/50version.dll
--- a/src-tauri/src/file_helpers.rs
+++ b/src-tauri/src/file_helpers.rs
@@ -1,6 +1,6 @@
 use file_diff::diff;
 use std::fs;
-use std::io::{Read, Write};
+use std::io::{Read, Seek, SeekFrom, Write};
 use std::path::PathBuf;

 #[tauri::command]
@@ -57,6 +57,11 @@ pub fn are_files_identical(path1: &str, path2: &str) -> bool {
  diff(path1, path2)
 }

+#[tauri::command]
+pub fn does_file_exist(path1: &str) -> bool {
+  fs::metadata(path1).is_ok()
+}
+
 #[tauri::command]
 pub fn copy_file(path: String, new_path: String) -> bool {
  let filename = &path.split('/').last().unwrap();
@@ -127,21 +132,46 @@ pub fn delete_file(path: String) -> bool {
 #[tauri::command]
 pub fn read_file(path: String) -> String {
  let path_buf = PathBuf::from(&path);
-
-  let mut file = match fs::File::open(path_buf) {
-    Ok(file) => file,
-    Err(e) => {
-      println!("Failed to open file {}: {}", &path, e);
-      if path.contains("config") {
-        // Server.ts won't print the error so handle the message here for the user
-        println!("Server config not found or invalid. Be sure to run the server at least once to generate it before making edits.");
-      }
-      return String::new(); // Send back error for handling by the caller
-    }
-  };
+  println!("Debug: Reading file of path {}", path.clone(),);

  let mut contents = String::new();
-  file.read_to_string(&mut contents).unwrap();
+
+  // Version data is 3 bytes long, 3 bytes in
+  let ext = path_buf.extension().unwrap();
+  if ext.eq("bytes") {
+    let offset_bytes = 3;
+    let num_bytes = 3;
+
+    let mut byte_file = match std::fs::File::open(path_buf) {
+      Ok(byte_file) => byte_file,
+      Err(e) => {
+        println!("{}", e);
+        return String::new();
+      }
+    };
+    byte_file
+      .seek(SeekFrom::Start(offset_bytes))
+      .unwrap_or_default();
+    let mut buf = vec![0; num_bytes];
+    byte_file.read_exact(&mut buf).unwrap_or_default();
+
+    contents = String::from_utf8_lossy(&buf).to_string();
+  } else {
+    let mut file = match fs::File::open(path_buf) {
+      Ok(file) => file,
+      Err(e) => {
+        if path.contains("config") {
+          // Server.ts won't print the error so handle the message here for the user
+          println!("Server config not found or invalid. Be sure to run the server at least once to generate it before making edits.");
+        } else {
+          println!("Failed to open file: {}", e);
+        }
+        return String::new(); // Send back error for handling by the caller
+      }
+    };
+
+    file.read_to_string(&mut contents).unwrap();
+  }

  contents
 }
--- a/src-tauri/src/lang.rs
+++ b/src-tauri/src/lang.rs
@@ -28,12 +28,7 @@ pub async fn get_languages() -> std::collections::HashMap<String, String> {
  for entry in lang_files {
    let entry = entry.unwrap();
    let path = entry.path();
-    let filename = path
-      .file_name()
-      .unwrap_or_else(|| panic!("Failed to get filename from path: {:?}", path))
-      .to_str()
-      .unwrap_or_else(|| panic!("Failed to convert filename to string: {:?}", path))
-      .to_string();
+    let filename = path.file_name().unwrap().to_str().unwrap();

    let content = match std::fs::read_to_string(&path) {
      Ok(x) => x,
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -108,14 +108,14 @@ async fn parse_args(inp: &Vec<String>) -> Result<Args, ArgsError> {
    std::process::exit(0);
  }

+  // Patch if needed
+  if args.value_of("patch")? {
+    patch::patch_game(false, 0.to_string()).await;
+  }
+
  if args.value_of("launch-game")? {
    let game_path = config.game_install_path;
-    let game_args: String = args.value_of("game-args").unwrap_or_default();
-
-    // Patch if needed
-    if args.value_of("patch")? {
-      patch::patch_game().await;
-    }
+    let game_args: String = args.value_of("game-args").unwrap_or(String::new());

    if game_path.is_some() {
      if args.value_of("non-elevated-game")? {
@@ -154,8 +154,8 @@ async fn parse_args(inp: &Vec<String>) -> Result<Args, ArgsError> {
    pathbuf.push("cultivation");
    pathbuf.push("ca");

-    if args.value_of("other_redirects")? {
-      proxy::set_redirect_more();
+    if args.value_of("other-redirects")? {
+      // proxy::set_redirect_more(); // Unused
    }

    connect(8035, pathbuf.to_str().unwrap().to_string()).await;
@@ -218,7 +218,6 @@ fn main() -> Result<(), ArgsError> {
        system_helpers::open_in_browser,
        system_helpers::install_location,
        system_helpers::is_elevated,
-        system_helpers::set_migoto_target,
        system_helpers::set_migoto_delay,
        system_helpers::wipe_registry,
        system_helpers::get_platform,
@@ -229,7 +228,6 @@ fn main() -> Result<(), ArgsError> {
        patch::unpatch_game,
        proxy::set_proxy_addr,
        proxy::generate_ca_files,
-        proxy::set_redirect_more,
        release::get_latest_release,
        unzip::unzip,
        file_helpers::rename,
@@ -243,6 +241,7 @@ fn main() -> Result<(), ArgsError> {
        file_helpers::are_files_identical,
        file_helpers::read_file,
        file_helpers::write_file,
+        file_helpers::does_file_exist,
        downloader::download_file,
        downloader::stop_download,
        lang::get_lang,
@@ -297,7 +296,7 @@ fn enable_process_watcher(window: tauri::Window, process: String) {

  thread::spawn(move || {
    // Initial sleep for 8 seconds, since running 20 different injectors or whatever can take a while
-    std::thread::sleep(std::time::Duration::from_secs(10));
+    std::thread::sleep(std::time::Duration::from_secs(60));

    let mut system = System::new_all();

@@ -336,7 +335,7 @@ fn enable_process_watcher(window: tauri::Window, process: String) {
 fn enable_process_watcher(window: tauri::Window, process: String) {
  drop(process);
  thread::spawn(move || {
-    let end_time = Instant::now() + Duration::from_secs(60);
+    let end_time = Instant::now() + Duration::from_secs(90);
    let game_thread = loop {
      let mut lock = AAGL_THREAD.lock().unwrap();
      if lock.is_some() {
--- a/src-tauri/src/patch.rs
+++ b/src-tauri/src/patch.rs
@@ -50,8 +50,90 @@ struct WhatToUnpach {

 #[cfg(windows)]
 #[tauri::command]
-pub async fn patch_game() -> bool {
-  let patch_path = PathBuf::from(system_helpers::install_location()).join("patch/version.dll");
+pub async fn patch_game(newer_game: bool, version: String) -> bool {
+  let mut patch_path;
+  // Altpatch first - Now using as hoyonet switch
+  if newer_game {
+    let alt_patch_path = PathBuf::from(system_helpers::install_location()).join("altpatch");
+
+    // Should handle overwriting backup with new version backup later
+    let backup_path = PathBuf::from(system_helpers::install_location())
+      .join("altpatch/original-mihoyonet.dll")
+      .to_str()
+      .unwrap()
+      .to_string();
+    let backup_exists = file_helpers::does_file_exist(&backup_path);
+
+    if !backup_exists {
+      let backup = file_helpers::copy_file_with_new_name(
+        get_game_rsa_path().await.unwrap()
+          + &String::from("/GenshinImpact_Data/Plugins/mihoyonet.dll"),
+        alt_patch_path.clone().to_str().unwrap().to_string(),
+        String::from("original-mihoyonet.dll"),
+      );
+
+      if !backup {
+        println!("Unable to backup file!");
+      }
+    }
+
+    patch_path = PathBuf::from(system_helpers::install_location()).join("altpatch/mihoyonet.dll");
+    // Copy the other part of patch to game files
+    let alt_replaced = file_helpers::copy_file_with_new_name(
+      patch_path.clone().to_str().unwrap().to_string(),
+      get_game_rsa_path().await.unwrap() + &String::from("/GenshinImpact_Data/Plugins"),
+      String::from("mihoyonet.dll"),
+    );
+
+    if !alt_replaced {
+      return false;
+    }
+
+    /***  For replacing old backup file with new one, for example when version changes
+     *    Currently replaces when it shouldn't. Will figure it out when it matters
+     *                                                                                   ***/
+    // else {
+    //   // Check if game file matches backup
+    //   let matching_alt_backup = file_helpers::are_files_identical(
+    //     &backup_path.clone(),
+    //     PathBuf::from(get_game_rsa_path().await.unwrap())
+    //       .join("/GenshinImpact_Data/Plugins/mihoyonet.dll")
+    //       .to_str()
+    //       .unwrap(),
+    //   );
+
+    //   let is_alt_patched = file_helpers::are_files_identical(
+    //     PathBuf::from(system_helpers::install_location()).join("altpatch/mihoyonet.dll").to_str().unwrap(),
+    //     PathBuf::from(get_game_rsa_path().await.unwrap())
+    //       .join("/GenshinImpact_Data/Plugins/mihoyonet.dll")
+    //       .to_str()
+    //       .unwrap(),
+    //   );
+
+    //   // Check if already alt patched
+    //   if !matching_alt_backup {
+    //     // Copy new backup if it is not patched
+    //     if !is_alt_patched {
+    //       file_helpers::copy_file_with_new_name(
+    //         get_game_rsa_path().await.unwrap() + &String::from("/GenshinImpact_Data/Plugins/mihoyonet.dll"),
+    //         alt_patch_path.clone().to_str().unwrap().to_string(),
+    //         String::from("original-mihoyonet.dll"),
+    //       );
+    //     }
+    //   }
+    // }
+  }
+
+  // Standard patch
+  patch_path = PathBuf::from(system_helpers::install_location()).join("patch/version.dll");
+
+  let i_ver = version.parse::<i32>().unwrap();
+
+  // For newer than 4.0, use specific patch files
+  if i_ver > 40 {
+    let patch_version = format!("patch/{version}version.dll");
+    patch_path = PathBuf::from(system_helpers::install_location()).join(patch_version);
+  }

  // Are we already patched with mhypbase? If so, that's fine, just continue as normal
  let game_is_patched = file_helpers::are_files_identical(
@@ -70,6 +152,21 @@ pub async fn patch_game() -> bool {
    return true;
  }

+  // For 5.0 and up
+  if i_ver > 49 {
+    let replaced50 = file_helpers::copy_file_with_new_name(
+      patch_path.clone().to_str().unwrap().to_string(),
+      get_game_rsa_path().await.unwrap(),
+      String::from("Astrolabe.dll"),
+    );
+
+    if replaced50 {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
  // Copy the patch to game files
  let replaced = file_helpers::copy_file_with_new_name(
    patch_path.clone().to_str().unwrap().to_string(),
@@ -86,7 +183,7 @@ pub async fn patch_game() -> bool {

 #[cfg(target_os = "linux")]
 #[tauri::command]
-pub async fn patch_game() -> bool {
+pub async fn patch_game(_newer_game: bool, _version: String) -> bool {
  let mut patch_state_mutex = PATCH_STATE.lock().await;
  if patch_state_mutex.is_some() {
    println!("Game already patched!");
@@ -170,6 +267,36 @@ pub async fn unpatch_game() -> bool {
      .to_string(),
  );

+  file_helpers::delete_file(
+    PathBuf::from(get_game_rsa_path().await.unwrap())
+      .join("Astrolabe.dll")
+      .to_str()
+      .unwrap()
+      .to_string(),
+  );
+
+  let core_patch_path = PathBuf::from(system_helpers::install_location());
+  let patch_path = core_patch_path.clone().join("altpatch/mihoyonet.dll");
+  let backup_path = core_patch_path
+    .clone()
+    .join("altpatch/original-mihoyonet.dll");
+
+  let is_alt_patched = file_helpers::are_files_identical(
+    patch_path.clone().to_str().unwrap(),
+    PathBuf::from(get_game_rsa_path().await.unwrap())
+      .join("GenshinImpact_Data/Plugins/mihoyonet.dll")
+      .to_str()
+      .unwrap(),
+  );
+
+  if is_alt_patched {
+    file_helpers::copy_file_with_new_name(
+      backup_path.clone().to_str().unwrap().to_string(),
+      get_game_rsa_path().await.unwrap() + &String::from("/GenshinImpact_Data/Plugins"),
+      String::from("mihoyonet.dll"),
+    );
+  }
+
  deleted
 }

--- a/src-tauri/src/proxy.rs
+++ b/src-tauri/src/proxy.rs
@@ -3,8 +3,6 @@
 * https://github.com/omjadas/hudsucker/blob/main/examples/log.rs
 */

-use crate::config::get_config;
-
 use once_cell::sync::Lazy;
 use std::{path::PathBuf, str::FromStr, sync::Mutex};

@@ -41,8 +39,6 @@ async fn shutdown_signal() {

 // Global ver for getting server address.
 static SERVER: Lazy<Mutex<String>> = Lazy::new(|| Mutex::new("http://localhost:443".to_string()));
-static REDIRECT_MORE: Lazy<Mutex<bool>> = Lazy::new(|| Mutex::new(false));
-
 #[derive(Clone)]
 struct ProxyHandler;

@@ -58,11 +54,6 @@ pub fn set_proxy_addr(addr: String) {
  println!("Set server to {}", SERVER.lock().unwrap());
 }

-#[tauri::command]
-pub fn set_redirect_more() {
-  *REDIRECT_MORE.lock().unwrap() = true;
-}
-
 #[async_trait]
 impl HttpHandler for ProxyHandler {
  async fn handle_request(
@@ -72,93 +63,33 @@ impl HttpHandler for ProxyHandler {
  ) -> RequestOrResponse {
    let uri = req.uri().to_string();

-    let mut more = get_config().redirect_more;
+    if uri.contains("hoyoverse.com")
+      || uri.contains("mihoyo.com")
+      || uri.contains("yuanshen.com")
+      || uri.ends_with(".yuanshen.com:12401")
+      || uri.contains("starrails.com")
+      || uri.contains("bhsr.com")
+      || uri.contains("bh3.com")
+      || uri.contains("honkaiimpact3.com")
+      || uri.contains("zenlesszonezero.com")
+    {
+      // Handle CONNECTs
+      if req.method().as_str() == "CONNECT" {
+        let builder = Response::builder()
+          .header("DecryptEndpoint", "Created")
+          .status(StatusCode::OK);
+        let res = builder.body(()).unwrap();

-    if *REDIRECT_MORE.lock().unwrap() {
-      more = Some(true);
-    }
-
-    match more {
-      Some(true) => {
-        if uri.contains("hoyoverse.com")
-          || uri.contains("mihoyo.com")
-          || uri.contains("yuanshen.com")
-          || uri.contains("starrails.com")
-          || uri.contains("bhsr.com")
-          || uri.contains("bh3.com")
-          || uri.contains("honkaiimpact3.com")
-          || uri.contains("zenlesszonezero.com")
-        {
-          // Handle CONNECTs
-          if req.method().as_str() == "CONNECT" {
-            let builder = Response::builder()
-              .header("DecryptEndpoint", "Created")
-              .status(StatusCode::OK);
-            let res = builder.body(()).unwrap();
-
-            // Respond to CONNECT
-            *res.body()
-          } else {
-            let uri_path_and_query = req.uri().path_and_query().unwrap().as_str();
-            // Create new URI.
-            let new_uri =
-              Uri::from_str(format!("{}{}", SERVER.lock().unwrap(), uri_path_and_query).as_str())
-                .unwrap();
-            // Set request URI to the new one.
-            *req.uri_mut() = new_uri;
-          }
-        }
-      }
-      Some(false) => {
-        if uri.contains("hoyoverse.com")
-          || uri.contains("mihoyo.com")
-          || uri.contains("yuanshen.com")
-        {
-          // Handle CONNECTs
-          if req.method().as_str() == "CONNECT" {
-            let builder = Response::builder()
-              .header("DecryptEndpoint", "Created")
-              .status(StatusCode::OK);
-            let res = builder.body(()).unwrap();
-
-            // Respond to CONNECT
-            *res.body()
-          } else {
-            let uri_path_and_query = req.uri().path_and_query().unwrap().as_str();
-            // Create new URI.
-            let new_uri =
-              Uri::from_str(format!("{}{}", SERVER.lock().unwrap(), uri_path_and_query).as_str())
-                .unwrap();
-            // Set request URI to the new one.
-            *req.uri_mut() = new_uri;
-          }
-        }
-      }
-      // Use default as fallback
-      None => {
-        if uri.contains("hoyoverse.com")
-          || uri.contains("mihoyo.com")
-          || uri.contains("yuanshen.com")
-        {
-          // Handle CONNECTs
-          if req.method().as_str() == "CONNECT" {
-            let builder = Response::builder()
-              .header("DecryptEndpoint", "Created")
-              .status(StatusCode::OK);
-            let res = builder.body(()).unwrap();
-
-            // Respond to CONNECT
-            *res.body()
-          } else {
-            let uri_path_and_query = req.uri().path_and_query().unwrap().as_str();
-            // Create new URI.
-            let new_uri =
-              Uri::from_str(format!("{}{}", SERVER.lock().unwrap(), uri_path_and_query).as_str())
-                .unwrap();
-            // Set request URI to the new one.
-            *req.uri_mut() = new_uri;
-          }
-        }
+        // Respond to CONNECT
+        *res.body()
+      } else {
+        let uri_path_and_query = req.uri().path_and_query().unwrap().as_str();
+        // Create new URI.
+        let new_uri =
+          Uri::from_str(format!("{}{}", SERVER.lock().unwrap(), uri_path_and_query).as_str())
+            .unwrap();
+        // Set request URI to the new one.
+        *req.uri_mut() = new_uri;
      }
    }

@@ -176,26 +107,14 @@ impl HttpHandler for ProxyHandler {
  async fn should_intercept(&mut self, _ctx: &HttpContext, _req: &Request<Body>) -> bool {
    let uri = _req.uri().to_string();

-    let more = get_config().redirect_more;
-
-    match more {
-      Some(true) => {
-        uri.contains("hoyoverse.com")
-          || uri.contains("mihoyo.com")
-          || uri.contains("yuanshen.com")
-          || uri.contains("starrails.com")
-          || uri.contains("bhsr.com")
-          || uri.contains("bh3.com")
-          || uri.contains("honkaiimpact3.com")
-          || uri.contains("zenlesszonezero.com")
-      }
-      Some(false) => {
-        uri.contains("hoyoverse.com") || uri.contains("mihoyo.com") || uri.contains("yuanshen.com")
-      }
-      None => {
-        uri.contains("hoyoverse.com") || uri.contains("mihoyo.com") || uri.contains("yuanshen.com")
-      }
-    }
+    uri.contains("hoyoverse.com")
+      || uri.contains("mihoyo.com")
+      || uri.contains("yuanshen.com")
+      || uri.contains("starrails.com")
+      || uri.contains("bhsr.com")
+      || uri.contains("bh3.com")
+      || uri.contains("honkaiimpact3.com")
+      || uri.contains("zenlesszonezero.com")
  }
 }

@@ -307,7 +226,7 @@ pub fn connect_to_proxy(proxy_port: u16) {
  Config::update(config);
 }

-#[cfg(target_od = "macos")]
+#[cfg(target_os = "macos")]
 pub fn connect_to_proxy(_proxy_port: u16) {
  println!("No Mac support yet. Someone mail me a Macbook and I will do it B)")
 }
--- a/src-tauri/src/release.rs
+++ b/src-tauri/src/release.rs
@@ -16,7 +16,6 @@ pub async fn get_latest_release() -> Release {
    .unwrap();
  let text = response.text().await.unwrap();

-  // This includes ip when github rate limits you, so avoid it for now to avoid leaks through screenshots
  //println!("Response: {}", text);

  // Parse "tag_name" from JSON
--- a/src-tauri/src/system_helpers.rs
+++ b/src-tauri/src/system_helpers.rs
@@ -390,44 +390,6 @@ pub fn install_location() -> String {
  }
 }

-#[tauri::command]
-pub fn set_migoto_target(window: tauri::Window, migoto_path: String) -> bool {
-  let mut migoto_pathbuf = PathBuf::from(migoto_path);
-
-  migoto_pathbuf.pop();
-  migoto_pathbuf.push("d3dx.ini");
-
-  let mut conf = match Ini::load_from_file(&migoto_pathbuf) {
-    Ok(c) => {
-      println!("Loaded migoto ini");
-      c
-    }
-    Err(e) => {
-      println!("Error loading migoto config: {}", e);
-      return false;
-    }
-  };
-
-  window.emit("migoto_set", &()).unwrap();
-
-  // Set options
-  conf
-    .with_section(Some("Loader"))
-    .set("target", "GenshinImpact.exe");
-
-  // Write file
-  match conf.write_to_file(&migoto_pathbuf) {
-    Ok(_) => {
-      println!("Wrote config!");
-      true
-    }
-    Err(e) => {
-      println!("Error writing config: {}", e);
-      false
-    }
-  }
-}
-
 #[tauri::command]
 pub fn set_migoto_delay(migoto_path: String) -> bool {
  let mut migoto_pathbuf = PathBuf::from(migoto_path);
@@ -448,9 +410,18 @@ pub fn set_migoto_delay(migoto_path: String) -> bool {

  // Set options
  conf.with_section(Some("Loader")).set("delay", "20");
+  conf
+    .with_section(Some("Include"))
+    .set("include", "ShaderFixes\\help.ini");

  // Write file
-  match conf.write_to_file(&migoto_pathbuf) {
+  match conf.write_to_file_opt(
+    &migoto_pathbuf,
+    ini::WriteOption {
+      escape_policy: (ini::EscapePolicy::Nothing),
+      line_separator: (ini::LineSeparator::SystemDefault),
+    },
+  ) {
    Ok(_) => {
      println!("Wrote delay!");
      true
@@ -483,6 +454,31 @@ pub fn wipe_registry(exec_name: String) {
    Ok(_) => (),
    Err(e) => println!("Error wiping registry: {}", e),
  }
+
+  match settings.set_value(
+    "MIHOYOSDK_ADL_PROD_CN_h3123967166",
+    &Data::String("".parse().unwrap()),
+  ) {
+    Ok(_) => (),
+    Err(e) => println!("Error wiping registry: {}", e),
+  }
+
+  let hsr_settings =
+    match Hive::CurrentUser.open(format!("Software\\Cognosphere\\Star Rail"), Security::Write) {
+      Ok(s) => s,
+      Err(e) => {
+        println!("Error getting registry setting: {}", e);
+        return;
+      }
+    };
+
+  match hsr_settings.set_value(
+    "MIHOYOSDK_ADL_PROD_OVERSEA_h1158948810",
+    &Data::String("".parse().unwrap()),
+  ) {
+    Ok(_) => (),
+    Err(e) => println!("Error wiping registry: {}", e),
+  }
 }

 #[cfg(windows)]
--- a/src-tauri/src/unzip.rs
+++ b/src-tauri/src/unzip.rs
@@ -107,7 +107,8 @@ pub fn unzip(
        .unwrap();
    }

-    if zipfile.contains("GrasscutterQuests") {
+    // Alternate builds
+    if zipfile.contains("GrasscutterQuests") || zipfile.contains("Grasscutter50") {
      window
        .emit("jar_extracted", destpath.to_string() + "grasscutter.jar")
        .unwrap();
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "../node_modules/@tauri-apps/cli/schema.json",
+  "$schema": "..\\node_modules/@tauri-apps/cli\\schema.json",
  "build": {
    "beforeDevCommand": "yarn start",
    "devPath": "http://localhost:3000",
@@ -7,7 +7,7 @@
  },
  "package": {
    "productName": "Cultivation",
-    "version": "1.2.0"
+    "version": "1.5.1"
  },
  "tauri": {
    "allowlist": {