Bump version

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cultivation",
-  "version": "1.5.5",
+  "version": "1.5.8",
   "private": true,
   "dependencies": {
     "@tauri-apps/api": "^1.0.0-rc.5",

src-tauri/Cargo.lock

@@ -959,7 +959,7 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
 
 [[package]]
 name = "cultivation"
-version = "1.5.5"
+version = "1.5.8"
 dependencies = [
  "anime-launcher-sdk",
  "anyhow",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cultivation"
-version = "1.5.5"
+version = "1.5.8"
 description = "A custom launcher for anime game."
 authors = ["KingRainbow44", "SpikeHD"]
 license = ""

src-tauri/lang/chs.json

@@ -41,7 +41,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "下载 Grasscutter 一体化",
-    "grasscutter_fullquest": "下载 5.3 一体化",
+    "grasscutter_fullquest": "下载 5.4 一体化",
     "grasscutter_stable_data": "下载 Grasscutter 稳定版数据",
     "grasscutter_latest_data": "下载 Grasscutter 开发版数据",
     "grasscutter_stable_data_update": "更新 Grasscutter 稳定版数据",

src-tauri/lang/cht.json

@@ -41,7 +41,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "下載Grasscutter多合一下載",
-    "grasscutter_fullquest": "下载 5.3 一体化",
+    "grasscutter_fullquest": "下载 5.4 一体化",
     "grasscutter_stable_data": "下載Grasscutter穩定版數據（Data）",
     "grasscutter_latest_data": "下載Grasscutter開發板數據（Data）",
     "grasscutter_stable_data_update": "更新Grasscutter穩定版數據（Data）",

src-tauri/lang/de.json

@@ -43,7 +43,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "Grasscutter All-in-One herunterladen",
-    "grasscutter_fullquest": "5.3 All-in-One herunterladen",
+    "grasscutter_fullquest": "5.4 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",

src-tauri/lang/en.json

@@ -43,7 +43,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "Download Grasscutter All-in-One",
-    "grasscutter_fullquest": "Download 5.3 All-in-One",
+    "grasscutter_fullquest": "Download 5.4 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",

src-tauri/lang/es.json

@@ -41,7 +41,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "Descargar datos todo en uno de Grasscutter",
-    "grasscutter_fullquest": "Descargar datos todo en uno de 5.3",
+    "grasscutter_fullquest": "Descargar datos todo en uno de 5.4",
     "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",

src-tauri/lang/fr.json

@@ -41,7 +41,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "Telecharger Grasscutter tout-en-un",
-    "grasscutter_fullquest": "Télécharger les 5.3 tout-en-un",
+    "grasscutter_fullquest": "Télécharger les 5.4 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)",

src-tauri/lang/id.json

@@ -40,7 +40,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "Sedang Mendownload Grasscutter Semua Dalam Satu",
-    "grasscutter_fullquest": "Unduh 5.3 semua dalam satu",
+    "grasscutter_fullquest": "Unduh 5.4 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",

src-tauri/lang/it.json

@@ -41,7 +41,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "Scarica Grasscutter Tutto-in-Uno",
-    "grasscutter_fullquest": "Scarica 5.3 Tutto-in-Uno",
+    "grasscutter_fullquest": "Scarica 5.4 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",

src-tauri/lang/ja.json

@@ -41,7 +41,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "Grasscutter All-in-Oneをダウンロード",
-    "grasscutter_fullquest": "5.3 All-in-Oneをダウンロード",
+    "grasscutter_fullquest": "5.4 All-in-Oneをダウンロード",
     "grasscutter_stable_data": "Grasscutter安定版データファイルをダウンロード",
     "grasscutter_latest_data": "Grasscutter最新版データファイルをダウンロード",
     "grasscutter_stable_data_update": "Grasscutter安定版データファイルをアップデート",

src-tauri/lang/ko.json

@@ -41,7 +41,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "올인원 Grasscutter 다운로드",
-    "grasscutter_fullquest": "5.3 올인원 다운로드",
+    "grasscutter_fullquest": "5.4 올인원 다운로드",
     "grasscutter_stable_data": "안정적인 데이터 다운로드",
     "grasscutter_latest_data": "최신 데이터 다운로드",
     "grasscutter_stable_data_update": "안정적 데이터 업데이트",

src-tauri/lang/lv.json

@@ -39,7 +39,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "Lejupielādējiet Grasscutter viss vienā",
-    "grasscutter_fullquest": "Lejupielādēt 5.3 viss vienā",
+    "grasscutter_fullquest": "Lejupielādēt 5.4 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",

src-tauri/lang/nl.json

@@ -40,7 +40,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "Grasscutter Alles-in-één Downloaden",
-    "grasscutter_fullquest": "Alles-in-één 5.3 downloaden",
+    "grasscutter_fullquest": "Alles-in-één 5.4 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",

src-tauri/lang/pl.json

@@ -43,7 +43,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "Pobierz Grasscutter (wszystko w jednym)",
-    "grasscutter_fullquest": "Pobierz 5.3 (wszystko w jednym)",
+    "grasscutter_fullquest": "Pobierz 5.4 (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",

src-tauri/lang/pt-br.json

@@ -41,7 +41,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "Baixar o Grasscutter Tudo-em-Um",
-    "grasscutter_fullquest": "Baixar de 5.3 em um só lugar",
+    "grasscutter_fullquest": "Baixar de 5.4 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",

src-tauri/lang/ru.json

@@ -40,7 +40,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "Скачать все в одном Grasscutter",
-    "grasscutter_fullquest": "Скачать 5.3 все в одном",
+    "grasscutter_fullquest": "Скачать 5.4 все в одном",
     "grasscutter_stable_data": "Скачать стабильные данные Grasscutter",
     "grasscutter_latest_data": "Скачать последние данные Grasscutter",
     "grasscutter_stable_data_update": "Обновить стабильные данные Grasscutter",

src-tauri/lang/vi.json

@@ -41,7 +41,7 @@
   },
   "downloads": {
     "grasscutter_fullbuild": "Tải Grasscutter tất cả trong một",
-    "grasscutter_fullquest": "Tải 5.3 tất cả trong một",
+    "grasscutter_fullquest": "Tải 5.4 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",

src-tauri/src/patch.rs

@@ -50,79 +50,80 @@ struct WhatToUnpach {
 
 #[cfg(windows)]
 #[tauri::command]
-pub async fn patch_game(newer_game: bool, version: String) -> bool {
+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");
+  // People keep using this when they shouldn't, 99.8% of people will never need it. Just remove for now.
+  // 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);
+  //   // 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_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!");
-      }
-    }
+  //     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"),
-    );
+  //   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;
-    }
+  //   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(),
-    //   );
+  /***  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(),
-    //   );
+  //   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"),
-    //       );
-    //     }
-    //   }
-    // }
-  }
+  //   // 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");
@@ -152,8 +153,9 @@ pub async fn patch_game(newer_game: bool, version: String) -> bool {
     return true;
   }
 
-  // For 5.0 and up
+  // For 5.0 and up use universal
   if i_ver > 49 {
+    patch_path = PathBuf::from(system_helpers::install_location()).join("patch/5version.dll");
     let replaced50 = file_helpers::copy_file_with_new_name(
       patch_path.clone().to_str().unwrap().to_string(),
       get_game_rsa_path().await.unwrap(),

src-tauri/tauri.conf.json

@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "Cultivation",
-    "version": "1.5.5"
+    "version": "1.5.8"
   },
   "tauri": {
     "allowlist": {

src/ui/components/ServerLaunchSection.tsx

@@ -149,7 +149,7 @@ export default class ServerLaunchSection extends React.Component<IProps, IState>
     // Connect to proxy
     if (config.toggle_grasscutter) {
       const game_exe = await getGameExecutable()
-      let newerGame = false
+      const newerGame = false
 
       const patchable = game_exe?.toLowerCase().includes('yuanshen') || game_exe?.toLowerCase().includes('genshin')
 
@@ -183,35 +183,36 @@ export default class ServerLaunchSection extends React.Component<IProps, IState>
 
         const versionString = gameVersion?.major.toString() + gameVersion?.minor.toString()
 
-        if ((gameVersion?.major == 4 && gameVersion?.minor > 5) || config.newer_game) {
-          newerGame = true
+        // Keeps being misused, remove for now.
+        // if ((gameVersion?.major == 4 && gameVersion?.minor > 5) || config.newer_game) {
+        //   newerGame = true
 
-          const path = (await invoke('install_location')) as string
+        //   const path = (await invoke('install_location')) as string
 
-          const patchstring = '\\altpatch\\'
-          const altPatch = path + patchstring
+        //   const patchstring = '\\altpatch\\'
+        //   const altPatch = path + patchstring
 
-          const ALT_PATCH =
-            'https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20231030132335_iOEfPMcbrXpiA8Ca/ScatteredFiles/GenshinImpact_Data/Plugins/mihoyonet.dll'
-          const pExists = (await invoke('dir_exists', {
-            path: altPatch,
-          })) as boolean
+        //   const ALT_PATCH =
+        //     'https://autopatchhk.yuanshen.com/client_app/download/pc_zip/20231030132335_iOEfPMcbrXpiA8Ca/ScatteredFiles/GenshinImpact_Data/Plugins/mihoyonet.dll'
+        //   const pExists = (await invoke('dir_exists', {
+        //     path: altPatch,
+        //   })) as boolean
 
-          if (!pExists) {
-            await invoke('dir_create', {
-              path: altPatch,
-            })
-            this.props.downloadHandler.addDownload(ALT_PATCH, path + '/altpatch/mihoyonet.dll')
-            await confirm('Please wait for the download in the bottom left to disappear, then click yes')
-          }
+        //   if (!pExists) {
+        //     await invoke('dir_create', {
+        //       path: altPatch,
+        //     })
+        //     this.props.downloadHandler.addDownload(ALT_PATCH, path + '/altpatch/mihoyonet.dll')
+        //     await confirm('Please wait for the download in the bottom left to disappear, then click yes')
+        //   }
 
-          /* For custom address patch only, used in 4.5 */
-          // let httpString = 'http://'
-          // if (this.state.httpsEnabled) {
-          //   httpString = 'https://'
-          // }
-          // config.launch_args = '-server=' + httpString + this.state.ip + ':' + this.state.port
-        }
+        //   /* For custom address patch only, used in 4.5 */
+        //   // let httpString = 'http://'
+        //   // if (this.state.httpsEnabled) {
+        //   //   httpString = 'https://'
+        //   // }
+        //   // config.launch_args = '-server=' + httpString + this.state.ip + ':' + this.state.port
+        // }
 
         const patched = await patchGame(newerGame, versionString)
 

src/ui/components/menu/Downloads.tsx

@@ -16,7 +16,7 @@ import { ask } from '@tauri-apps/api/dialog'
 
 const FULL_BUILD_DOWNLOAD = 'https://github.com/NotThorny/Grasscutter/releases/download/culti-aio/GrasscutterCulti.zip' // Change to link that can be updated without modifying here
 const FULL_QUEST_DOWNLOAD = 'https://github.com/NotThorny/Grasscutter/releases/download/culti-aio/GrasscutterQuests.zip'
-const FULL_50_DOWNLOAD = 'https://github.com/NotThorny/Grasscutter/releases/download/culti-aio/GrasscutterLunaGC53.zip' // https://github.com/Kei-Luna/LunaGC_5.3.0
+const FULL_50_DOWNLOAD = 'https://github.com/NotThorny/Grasscutter/releases/download/culti-aio/GrasscutterLunaGC54.zip' // https://github.com/pmagixc/LunaGC_5.4.0
 const STABLE_REPO_DOWNLOAD = 'https://github.com/Grasscutters/Grasscutter/archive/refs/heads/stable.zip'
 const DEV_REPO_DOWNLOAD = 'https://github.com/Grasscutters/Grasscutter/archive/refs/heads/development.zip'
 const UNSTABLE_DOWNLOAD = 'https://nightly.link/Grasscutters/Grasscutter/workflows/build/unstable/Grasscutter.zip'

src/ui/components/menu/Options.tsx

@@ -712,7 +712,7 @@ export default class Options extends React.Component<IProps, IState> {
           </div>
         </div>
 
-        <div className="OptionSection" id="menuOptionsContainerNewerGame">
+        {/* <div className="OptionSection" id="menuOptionsContainerNewerGame">
           <div className="OptionLabel" id="menuOptionsLabelNewerGame">
             <Tr text="Patch Mihoyonet" />
           </div>
@@ -723,7 +723,7 @@ export default class Options extends React.Component<IProps, IState> {
               id="newerGame"
             />
           </div>
-        </div>
+        </div> */}
 
         <Divider />
 

src/ui/components/news/NewsSection.tsx

@@ -143,7 +143,7 @@ export default class NewsSection extends React.Component<IProps, IState> {
           <tr>
             <td>
               Work in progress area! These numbers may be outdated, so please do not use them as reference. Latest
-              version: Grasscutter 1.7.4 - Cultivation 1.5.5
+              version: Grasscutter 1.7.4 - Cultivation 1.5.8
             </td>
           </tr>
         )