Add 5.3 patch

Bump version

package.json

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

src-tauri/Cargo.toml

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

src-tauri/tauri.conf.json

@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "Cultivation",
-    "version": "1.5.1"
+    "version": "1.5.3"
   },
   "tauri": {
     "allowlist": {

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

src/utils/download.ts

@@ -109,25 +109,35 @@ export default class DownloadHandler {
 
   downloadingJar() {
     // Kinda hacky but it works
-    return this.downloads.some((d) => d.path.includes('grasscutter.zip') && d.status != ('finished' || 'error'))
+    return this.downloads.some(
+      (d) => d.path.includes('grasscutter.zip') && !(d.status.includes('finished') || d.status.includes('error'))
+    )
   }
 
   downloadingFullBuild() {
     // Kinda hacky but it works
-    return this.downloads.some((d) => d.path.includes('GrasscutterCulti') && d.status != ('finished' || 'error'))
+    return this.downloads.some(
+      (d) => d.path.includes('GrasscutterCulti') && !(d.status.includes('finished') || d.status.includes('error'))
+    )
   }
 
   downloadingResources() {
     // Kinda hacky but it works
-    return this.downloads.some((d) => d.path.includes('resources') && d.status != ('finished' || 'error'))
+    return this.downloads.some(
+      (d) => d.path.includes('resources') && !(d.status.includes('finished') || d.status.includes('error'))
+    )
   }
 
   downloadingRepo() {
-    return this.downloads.some((d) => d.path.includes('grasscutter_repo.zip') && d.status != ('finished' || 'error'))
+    return this.downloads.some(
+      (d) => d.path.includes('grasscutter_repo.zip') && !(d.status.includes('finished') || d.status.includes('error'))
+    )
   }
 
   downloadingMigoto() {
-    return this.downloads.some((d) => d.path.includes('3dmigoto') && d.status != ('finished' || 'error'))
+    return this.downloads.some(
+      (d) => d.path.includes('3dmigoto') && !(d.status.includes('finished') || d.status.includes('error'))
+    )
   }
 
   addDownload(url: string, path: string, onFinish?: () => void) {

src/utils/game.ts

@@ -50,20 +50,34 @@ export async function getGameDataFolder() {
 
 export async function getGameVersion() {
   const GameData = await getGameDataFolder()
+  const platform = await invoke('get_platform')
 
   if (!GameData) {
     return null
   }
 
-  const hasAsb = await invoke('dir_exists', {
+  let hasAsb = await invoke('dir_exists', {
     path: GameData + '\\StreamingAssets\\asb_settings.json',
   })
 
+  if (platform != 'windows') {
+    hasAsb = await invoke('dir_exists', {
+      path: GameData + '/StreamingAssets/asb_settings.json',
+    })
+  }
+
   if (!hasAsb) {
     // For games that cannot determine game version
-    const otherGameVer: string = await invoke('read_file', {
+    let otherGameVer: string = await invoke('read_file', {
       path: GameData + '\\StreamingAssets\\BinaryVersion.bytes',
     })
+
+    if (platform != 'windows') {
+      otherGameVer = await invoke('read_file', {
+        path: GameData + '/StreamingAssets/BinaryVersion.bytes',
+      })
+    }
+
     const versionRaw = otherGameVer.split('.')
     const version = {
       major: parseInt(versionRaw[0]),

yarn.lock

@@ -7908,9 +7908,9 @@ rollup-plugin-terser@^7.0.0:
     terser "^5.0.0"
 
 rollup@^2.43.1:
-  version "2.79.2"
+  version "2.77.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.2.tgz#f150e4a5db4b121a21a747d762f701e5e9f49090"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.77.0.tgz#749eaa5ac09b6baa52acc076bc46613eddfd53f4"
-  integrity sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==
+  integrity sha512-vL8xjY4yOQEw79DvyXLijhnhh+R/O9zpF/LEgkCebZFtb6ELeN9H3/2T0r8+mp+fFTBHZ5qGpOpW2ela2zRt3g==
   optionalDependencies:
     fsevents "~2.3.2"