Add 5.4 AIO

Bump version

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cultivation",
-  "version": "1.5.2",
+  "version": "1.5.5",
   "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.2"
+version = "1.5.5"
 dependencies = [
  "anime-launcher-sdk",
  "anyhow",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cultivation"
-version = "1.5.2"
+version = "1.5.5"
 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.0 一体化",
+    "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.0 一体化",
+    "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.0 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.0 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.0",
+    "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.0 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.0 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.0 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": "Questing 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.0 올인원 다운로드",
+    "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.0 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.0 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.0 (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.0 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.0 все в одном",
+    "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.0 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/main.rs

@@ -209,6 +209,7 @@ fn main() -> Result<(), ArgsError> {
         get_theme_list,
         system_helpers::run_command,
         system_helpers::run_program,
+        system_helpers::run_program_args,
         system_helpers::run_program_relative,
         system_helpers::start_service,
         system_helpers::service_status,

src-tauri/src/system_helpers.rs

@@ -108,6 +108,18 @@ impl SpawnItsFineReally for Command {
   }
 }
 
+#[tauri::command]
+pub fn run_program_args(path: String, args: Option<String>) {
+  match open::with(
+    format!("{}", args.unwrap_or_else(|| "".into())),
+    path.clone(),
+  ) {
+    Ok(_) => (),
+    Err(e) => println!("Failed to open program ({}): {}", &path, e),
+  };
+  return;
+}
+
 #[tauri::command]
 pub fn run_program(path: String, args: Option<String>) {
   // Without unwrap_or, this can crash when UAC prompt is denied

src-tauri/tauri.conf.json

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

src/ui/components/ServerLaunchSection.tsx

@@ -278,6 +278,13 @@ export default class ServerLaunchSection extends React.Component<IProps, IState>
         if (config.launch_args.length < 1) {
           // Run relative when there are no args
           await invoke('run_program_relative', { path: exe || config.game_install_path })
+        }
+        // Handle XXMI
+        else if (proc_name?.toLowerCase().includes('xxmi')) {
+          await invoke('run_program_args', {
+            path: exe,
+            args: config.launch_args,
+          })
         } else {
           // Run directly when there are args
           await invoke('run_program', {

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/GrasscutterLunaGC50.zip' // https://github.com/Kei-Luna/LunaGC_5.0.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/ExtrasMenu.tsx

@@ -69,7 +69,10 @@ export class ExtrasMenu extends React.Component<IProps, IState> {
 
     // This injects independent of the game
     if (this.state.launch_migoto) {
-      await this.launchMigoto()
+      if (await this.launchMigoto()) {
+        // Already launched the game (ie. via XXMI)
+        return
+      }
     }
 
     // This injects independent of the game
@@ -104,7 +107,17 @@ export class ExtrasMenu extends React.Component<IProps, IState> {
 
     if (!config.migoto_path) return alert('Migoto not installed or set!')
 
+    if (config.migoto_path?.toLowerCase().includes('xxmi')) {
+      // Get game exe from game path, so we can watch it
+      const pathArr = config.migoto_path.replace(/\\/g, '/').split('/')
+      const gameExec = pathArr[pathArr.length - 1]
+
+      this.props.playGame(config.migoto_path, gameExec)
+      return true
+    }
+
     await invoke('run_program_relative', { path: config.migoto_path })
+    return false
   }
 
   async launchReshade() {

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.2
+              version: Grasscutter 1.7.4 - Cultivation 1.5.5
             </td>
           </tr>
         )