correct jar for 2.8 run

.editorconfig

@@ -2,9 +2,20 @@ root = true
 
 [*]
 charset = utf-8
-end_of_line = lf
+end_of_line = crlf
 indent_size = 2
 indent_style = space
+insert_final_newline = false
 max_line_length = 120
 tab_width = 2
-trim_trailing_whitespace = true
+trim_trailing_whitespace = false
+
+[*.rs]
+max_line_length = 100
+indent_size = 2
+
+[{*.ats,*.cts,*.mts,*.ts}]
+indent_size = 2
+
+[*.json]
+indent_size = 2

.eslintrc.json

@@ -1,40 +1,38 @@
 {
-  "env": {
+    "env": {
-    "browser": true,
+        "browser": true,
-    "es2021": true,
+        "es2021": true,
-    "node": true
+        "node": true
-  },
-  "extends": ["eslint:recommended", "plugin:react/recommended", "plugin:@typescript-eslint/recommended", "prettier"],
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "ecmaFeatures": {
-      "jsx": true
     },
-    "ecmaVersion": "latest",
+    "extends": [
-    "sourceType": "module"
+        "eslint:recommended",
-  },
+        "plugin:react/recommended",
-  "plugins": ["react", "@typescript-eslint"],
+        "plugin:@typescript-eslint/recommended"
-  "rules": {
-    "@typescript-eslint/ban-types": [
-      "warn",
-      {
-        "extendDefaults": true,
-        "types": {
-          "{}": false
-        }
-      }
     ],
-    "@typescript-eslint/no-unused-vars": [
+    "parser": "@typescript-eslint/parser",
-      "warn",
+    "parserOptions": {
-      {
+        "ecmaFeatures": {
-        "argsIgnorePattern": "^_",
+            "jsx": true
-        "varsIgnorePattern": "^_"
+        },
-      }
+        "ecmaVersion": "latest",
-    ]
+        "sourceType": "module"
-  },
+    },
-  "settings": {
+    "plugins": [
-    "react": {
+        "react",
-      "version": "detect"
+        "@typescript-eslint"
+    ],
+    "rules": {
+        "indent": [
+            "error",
+            2
+        ],
+        "quotes": [
+            "error",
+            "single"
+        ],
+        "semi": [
+            "error",
+            "never"
+        ]
     }
-  }
 }

.gitattributes

@@ -1 +0,0 @@
-* text=auto eol=lf

.github/workflows/backend-checks.yml

@@ -1,61 +0,0 @@
-name: Check backend
-
-on:
-  push:
-    paths:
-      - '.github/workflows/backend-checks.yml'
-      - 'src-tauri/**'
-  pull_request:
-    paths:
-      - '.github/workflows/backend-checks.yml'
-      - 'src-tauri/**'
-
-concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}
-  cancel-in-progress: true
-
-jobs:
-  rustfmt:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --manifest-path ./src-tauri/Cargo.toml --all -- --check
-
-  clippy:
-    runs-on: ${{ matrix.platform }}
-
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [windows-latest, ubuntu-latest, macos-latest]
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Install Linux dependencies
-        if: matrix.platform == 'ubuntu-latest'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.0-dev \
-            build-essential \
-            curl \
-            wget \
-            libssl-dev \
-            libgtk-3-dev \
-            libayatana-appindicator3-dev \
-            librsvg2-dev
-
-      - uses: Swatinem/rust-cache@v1
-        with:
-          working-directory: src-tauri
-
-      - uses: actions-rs/clippy-check@v1
-        with:
-          name: clippy (${{ runner.os }})
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --manifest-path ./src-tauri/Cargo.toml --no-default-features -- -D warnings

.github/workflows/build.yml

@@ -1,85 +0,0 @@
-name: Build
-
-on:
-  push:
-    paths:
-      - '.github/workflows/build.yml'
-      - 'src-tauri/**/*'
-      - 'src/**/*'
-  pull_request:
-    paths:
-      - '.github/workflows/build.yml'
-      - 'src-tauri/**/*'
-      - 'src/**/*'
-
-concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}
-  cancel-in-progress: true
-
-jobs:
-  build-win:
-    runs-on: windows-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: setup node
-        uses: actions/setup-node@v1
-        with:
-          node-version: 16
-
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-
-      - name: Install deps and build
-        run: yarn && yarn build --debug
-
-      - name: Compress build
-        uses: vimtor/action-zip@v1
-        with:
-          files: src-tauri/target/debug/lang/ src-tauri/target/debug/keys/ src-tauri/target/debug/Cultivation.exe src-tauri/target/debug/bundle/msi/
-          recursive: true
-          dest: Cultivation.zip
-
-      - name: Upload build
-        uses: actions/upload-artifact@v3
-        with:
-          name: CultivationWin
-          path: Cultivation.zip
-
-  build-ubuntu:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: setup node
-        uses: actions/setup-node@v1
-        with:
-          node-version: 16
-
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-
-      - name: Install libraries
-        run: sudo apt install libwebkit2gtk-4.0-dev build-essential curl wget libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev
-
-      - name: Install deps and build
-        run: yarn && yarn build --debug
-
-      - name: Compress build
-        uses: vimtor/action-zip@v1
-        with:
-          files: src-tauri/target/debug/lang/ src-tauri/target/debug/keys/ src-tauri/target/debug/cultivation
-          recursive: true
-          dest: Cultivation.zip
-
-      - name: Upload build
-        uses: actions/upload-artifact@v3
-        with:
-          name: CultivationLinux
-          path: Cultivation.zip

.github/workflows/frontend-checks.yml

@@ -1,32 +0,0 @@
-name: Check frontend
-
-on:
-  push:
-    paths-ignore:
-      - '**.lock'
-      - '**.rs'
-      - '**.toml'
-  pull_request:
-    paths-ignore:
-      - '**.lock'
-      - '**.rs'
-      - '**.toml'
-
-concurrency:
-  group: ${{ github.ref }}-${{ github.workflow }}
-  cancel-in-progress: true
-
-jobs:
-  prettier-tsc-eslint-checks:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Install modules
-        run: yarn
-      - name: Run prettier
-        run: yarn prettier --check .
-      - name: Run tsc
-        run: yarn tsc --noEmit
-      - name: Run ESLint
-        run: yarn eslint src

.gitignore

@@ -23,5 +23,4 @@ yarn-debug.log*
 yarn-error.log*
 
 # moved lang files
-/lang
+/lang
-package-lock.json

.husky/pre-commit

@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-yarn lint-staged --allow-empty

.lintstagedrc.json

@@ -1,4 +0,0 @@
-{
-  "src-tauri/**/*.rs": "rustfmt --edition 2021",
-  "*": "yarn prettier --write --ignore-unknown"
-}

.prettierignore

@@ -1,4 +0,0 @@
-node_modules/
-src-tauri/resources/
-src-tauri/target/
-src-tauri/WixTools/

.prettierrc.json

@@ -1,4 +0,0 @@
-{
-  "semi": false,
-  "singleQuote": true
-}

README.md

@@ -1,107 +1,60 @@
-EN | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) |
+# NOTICE
+Yes! The Cultivation repository is **open**. This does **not** mean it has released.\
+Cultivation will be releasing at some point after opening this repo.
+
+**This also means you will not be provided explicit support for Cultivation.**\
+Consider Cultivation to be the bleeding-edge version of GrassClipper.
+
+During this open-beta testing period, **helpful issues are appreciated**, while unhelpful ones will be closed.
+
+## Fair Warning
+Cultivation is **VERY MUCH IN BETA**.
+There are **no official releases of Cultivation**. You are **required** to build the application from **scratch** unless you want to deal with the alpha state of the current builds.
+Please do **NOT install, download, or use pre-compiled versions of Cultivation found elsewhere**. Only use releases from this GitHub repository.
 
 # Cultivation
-
 A game launcher designed to easily proxy traffic from anime game to private servers.
 
 # Table Of Contents
-
+* [Download](#download)
-- [Client Patching Notice](#client-patching-notice)
+* [Developer Quick-start](#developer-quickstart)
-- [Download](#download)
+  * [Setup](#setup)
-- [Setup](#setup)
+  * [Building](#building)
-- [Developer Quick-start](#developer-quickstart)
+* [Troubleshooting](#troubleshooting)
-  - [Setup](#setup)
+* [Theming](#theming)
-  - [Building](#building)
-  - [Code Formatting and Linting](#code-formatting-and-linting)
-  - [Generating Update Artifacts](#generating-update-artifacts)
-- [Theming](#theming)
-- [Screenshots](#screenshots)
-- [Credits](#credits)
-
-# Client Patching Notice
-
-For game versions 2.8 and above, Cultivation automatically makes a small patch to your game client when launching using Grasscutter, and restores it upon closing the game. In theory, you should still be totally safe, however it would be dishonest to not explicitly state that **modifying the game client could, theoretically, lead to a ban if you connect to official servers with it**. It is extremely unlikely AND there are no instances known of it happening, but the possibility exists.
 
 # Download
-
 [Find release builds here!](https://github.com/Grasscutters/Cultivation/releases)
 
-Download and open the MSI, and once installed, run Cultivation as administrator. Refer below for more [detailed setup instructions](#setup).
+Once downloaded, extract somewhere and open as administrator.
-
-**Windows 7 Users:** You will need to download [WebView](https://developer.microsoft.com/en-us/microsoft-edge/webview2/#download-section) manually, and download the `.zip` instead of the `.msi`.
-
-# Setup
-
-5-minute video for those who don't like to/cannot read: https://youtu.be/e0irOYbQe7I
-
-- Download Cultivation
-  - If you are on Windows 10 or 11, use the MSI
-  - If you are on Windows 7, or the MSI doesn't work, use the zip and download [WebView](https://developer.microsoft.com/en-us/microsoft-edge/webview2/)
-  - If you are on Linux or MacOS, [help us port Windows-specific system calls to Linux/MacOS!](https://github.com/Grasscutters/Cultivation/issues/7)
-- Install or extract Cultivation
-- Open Cultivation **_as administrator_**
-- Before clicking randomly on stuff, in options (top right cog icon), set your Game Install Path.
-  - If you are using an existing server installation from somewhere else, you can set the `.jar` file in settings as well. All downloads made through Culti will automatically use that path, no additional config needed.
-  - If you use multiple Java versions, you can set the Java path to your Java 17 installation (only required if you are running your own server)
-- Decide if you want to download your own server, or just join a public one
-  - If joining a public one, you're done. Just click "Connect with Grasscutter" and input the address and port. You do not have to continue these instructions.
-    - If you are getting System Error, or 4214, ask the [Discord support channels](https://discord.gg/grasscutter)
-- Open the "Downloads" menu (top right)
-  - Download "latest grasscutter" (second from the top)
-  - Download "resources" (very bottom)
-- Once all of that is done, click the icon next to "Launch"
-- To play on your new server:
-  - Click "Connect with Grasscutter"
-  - Input `localhost` as the address, and `443` as the port
-  - Ensure HTTPS is disabled
-- Any generic "I am getting XYZ error!" should go in the [Discord support channels](https://discord.gg/grasscutter)
-- Any specific Cultivation issues should go in [the issues section](/issues)
-- Any Grasscutter server related issues should go in [the Grasscutter issues section](https://github.com/Grasscutters/Grasscutter)
 
 # Developer Quickstart
 
 ### Setup
-
+* Install [NodeJS >12](https://nodejs.org/en/)
-- Install [NodeJS >12](https://nodejs.org/en/)
+* Install [Cargo](https://doc.rust-lang.org/cargo/getting-started/installation.html) & [Rust compiler](https://www.rust-lang.org/tools/install)
-- Install [yarn](https://classic.yarnpkg.com/lang/en/docs/install) (cry about it `npm` lovers)
+* `npm install` or `yarn install`
-- Install [Rust](https://www.rust-lang.org/tools/install)
+* `npm run start:dev` or `yarn start:dev`
-- `yarn install`
-- `yarn start:dev`
 
 ### Building
+`npm run build` or `yarn build`
 
-For a release build,
+Add `--release` or `--debug` depending on what release you are creating. This defaults to `--release`
 
-- `yarn build`
+### Updating
+* Add the `TAURI_PRIVATE_KEY` as an environment variable with a path to your private key.
+* Add the `TAURI_KEY_PASSWORD` as an environment variable with the password for your private key.
+* Run `npm run update` or `yarn build`
+* The update will be in `src-tauri/target/(release|debug)/msi/Cultivation_X.X.X_x64_xx-XX.msi.zip`
 
-For a debug build,
+# Troubleshooting
-
+TODO. Collect common issues before updating.
-- `yarn build --debug`
-
-### Code Formatting and Linting
-
-Formatting:
-
-- `yarn format`
-
-Check Lints, fix (some) lints:
-
-- `yarn lint`, `yarn lint:fix`
-
-### Generating Update Artifacts
-
-- Add the `TAURI_PRIVATE_KEY` as an environment variable with a path to your private key.
-- Add the `TAURI_KEY_PASSWORD` as an environment variable with the password for your private key.
-- `yarn build`
-
-The update will be at `src-tauri/target/(release|debug)/msi/Cultivation_X.X.X_x64_xx-XX.msi.zip`
 
 # Theming
 
 A full theming reference can be found [here!](/THEMES.md)
 
 # Screenshots
-
 ![image](https://user-images.githubusercontent.com/25207995/173211603-e5e85df7-7fd3-430b-9246-749ebbc1e483.png)
 ![image](https://user-images.githubusercontent.com/25207995/173211543-b7e88943-cfd2-418b-ac48-7f856868129b.png)
 ![image](https://user-images.githubusercontent.com/25207995/173211561-a1778fdc-5cfe-4687-9a00-44500d29e470.png)
@@ -109,9 +62,6 @@ A full theming reference can be found [here!](/THEMES.md)
 ![image](https://user-images.githubusercontent.com/25207995/173211590-6a2242b5-1e8f-4db9-a5c7-06284688b131.png)
 
 ## Credits
-
+* [SpikeHD](https://github.com/SpikeHD): For originally creating **GrassClipper** and creating the amazing UI of Cultivation.
-- [SpikeHD](https://github.com/SpikeHD): For originally creating **GrassClipper** and creating the amazing UI of Cultivation.
+* [KingRainbow44](https://github.com/KingRainbow44): For building a proxy daemon from scratch and integrating it with Cultivation.
-- [KingRainbow44](https://github.com/KingRainbow44): For building a proxy daemon from scratch and integrating it with Cultivation.
+* [Tauri](https://tauri.app): For providing an amazing, efficient, and simple desktop application framework/library.
-- [Benj](https://github.com/4Benj): For assistance in client patching.
-- [lilmayofuksu](https://github.com/lilmayofuksu): For assistance in client patching.
-- [Tauri](https://tauri.app): For providing an amazing, efficient, and simple desktop application framework/library.

README_zh-CN.md

@@ -1,88 +0,0 @@
-[EN](README.md) | 简中 | [繁中](README_zh-TW.md)
-
-# 客户端修补通知
-
-对于游戏版本为 2.8 及以上时，使用 Grasscutter 启动时，Cultivation 会自动为您的游戏客户端制作一个小补丁，并在关闭游戏时恢复它。 从理论上讲，你应该是完全安全的，但是不明确**如果您使用它连接到官方服务器，修改游戏客户端可能会导致封号**，但可能性是非常小的，并且从未接到发生过此类情况的问题，但存在这种可能性！
-
-# Cultivation
-
-一个游戏启动器，旨在轻松将某动漫游戏的流量代理到私人服务器。
-
-虽然此存储库是**开放的**。 但这**并不**意味着它已经发布。
-请不要**安装、下载或使用在其他地方找到的预编译版本的 Cultivation**。 仅使用此 GitHub 存储库中的版本。
-
-# 目录
-
-- [下载](#下载)
-- [开发人员快速入门](#开发人员快速入门)
-  - [安装](#安装)
-  - [编译](#编译)
-  - [代码格式化与纠错](#代码格式化与纠错)
-  - [生成更新项目](#生成更新项目)
-- [启动器主题](#启动器主题)
-- [画面](#画面)
-- [成员](#成员)
-
-# 下载
-
-[在此处查找发布版本！](https://github.com/Grasscutters/Cultivation/releases)
-
-下载后，从某个位置解压缩并以管理员身份打开。
-
-# 开发人员快速入门
-
-### 安装
-
-- 安装 [NodeJS >12](https://nodejs.org/en/)
-- 安装 [yarn](https://classic.yarnpkg.com/lang/en/docs/install)
-- 安装 [Rust](https://www.rust-lang.org/tools/install)
-- `yarn install`
-- `yarn start:dev`
-
-### 编译
-
-发布版本，
-
-- `yarn build`
-
-调试版本，
-
-- `yarn build --debug`
-
-### 代码格式化与纠错
-
-格式化:
-
-- `yarn format`
-
-纠错, 修复（一些）错误:
-
-- `yarn lint`, `yarn lint:fix`
-
-### 生成更新项目
-
-- 将 `TAURI_PRIVATE_KEY` 添加到环境变量，其中包含私钥的路径。
-- 将 `TAURI_KEY_PASSWORD` 添加到环境变量，其中包含私钥的密码。
-- `yarn build`
-
-更新将生成在 `src-tauri/target/(release|debug)/msi/Cultivation_X.X.X_x64_xx-XX.msi.zip`
-
-# 启动器主题
-
-完整的主题参考可以[在这里找到!](/THEMES.md)
-
-# 画面
-
-![image](https://user-images.githubusercontent.com/25207995/173211603-e5e85df7-7fd3-430b-9246-749ebbc1e483.png)
-![image](https://user-images.githubusercontent.com/25207995/173211543-b7e88943-cfd2-418b-ac48-7f856868129b.png)
-![image](https://user-images.githubusercontent.com/25207995/173211561-a1778fdc-5cfe-4687-9a00-44500d29e470.png)
-![image](https://user-images.githubusercontent.com/25207995/173211573-8cedfa9a-51c9-4670-a4f7-a334a2fabec5.png)
-![image](https://user-images.githubusercontent.com/25207995/173211590-6a2242b5-1e8f-4db9-a5c7-06284688b131.png)
-
-## 成员
-
-- [SpikeHD](https://github.com/SpikeHD): For originally creating **GrassClipper** and creating the amazing UI of Cultivation.
-- [KingRainbow44](https://github.com/KingRainbow44): For building a proxy daemon from scratch and integrating it with Cultivation.
-- [Benj](https://github.com/4Benj): For assistance in client patching.
-- [lilmayofuksu](https://github.com/lilmayofuksu): For assistance in client patching.
-- [Tauri](https://tauri.app): For providing an amazing, efficient, and simple desktop application framework/library.

README_zh-TW.md

@@ -1,88 +0,0 @@
-[EN](README.md) | [简中](README_zh-CN.md) | 繁中
-
-# 客戶端修補通知
-
-對於遊戲版本為 2.8 及以上時，使用 Grasscutter 啟動時，Cultivation 會自動為您的遊戲客戶端製作一個小修補，並在關閉遊戲時恢復它。 從理論上講，你應該是完全安全的，但是不明確**如果您使用它連接到官方伺服器，修改遊戲客戶端可能會導致封號**，但可能性是非常小的，並且從未接到發生過此類情況的問題，但存在這種可能性！
-
-# Cultivation
-
-一個遊戲啟動器，旨在輕松將某動漫遊戲的流量代理到私人伺服器。
-
-雖然此存儲庫是**開放的**。 但這**並不**意味著它已經發布。
-請不要**安裝、下載或使用在其他地方找到的預編譯版本的 Cultivation**。 僅使用此 GitHub 存儲庫中的版本。
-
-# 目錄
-
-- [下載](#下載)
-- [開發人員快速入門](#開發人員快速入門)
-  - [安裝](#安裝)
-  - [編譯](#編譯)
-  - [代碼格式化與糾錯](#代碼格式化與糾錯)
-  - [生成更新項目](#生成更新項目)
-- [啟動器主題](#啟動器主題)
-- [畫面](#畫面)
-- [成員](#成員)
-
-# 下載
-
-[在此處查找發布版本！](https://github.com/Grasscutters/Cultivation/releases)
-
-下載後，從某個位置解壓縮並以管理員身份打開。
-
-# 開發人員快速入門
-
-### 安裝
-
-- 安裝 [NodeJS >12](https://nodejs.org/en/)
-- 安裝 [yarn](https://classic.yarnpkg.com/lang/en/docs/install) (`npm`愛好者去哭吧！（滑稽）)
-- 安裝 [Rust](https://www.rust-lang.org/tools/install)
-- `yarn install`
-- `yarn start:dev`
-
-### 編譯
-
-發布版本，
-
-- `yarn build`
-
-調試版本，
-
-- `yarn build --debug`
-
-### 代碼格式化與糾錯
-
-格式化:
-
-- `yarn format`
-
-糾錯, 修復（一些）錯誤:
-
-- `yarn lint`, `yarn lint:fix`
-
-### 生成更新項目
-
-- 將 `TAURI_PRIVATE_KEY` 添加到環境變數，其中包含私鑰的路徑。
-- 將 `TAURI_KEY_PASSWORD` 添加到環境變數，其中包含私鑰的密碼。
-- `yarn build`
-
-更新將生成在 `src-tauri/target/(release|debug)/msi/Cultivation_X.X.X_x64_xx-XX.msi.zip`
-
-# 啟動器主題
-
-完整的主題參考可以[在這裏找到!](/THEMES.md)
-
-# 畫面
-
-![image](https://user-images.githubusercontent.com/25207995/173211603-e5e85df7-7fd3-430b-9246-749ebbc1e483.png)
-![image](https://user-images.githubusercontent.com/25207995/173211543-b7e88943-cfd2-418b-ac48-7f856868129b.png)
-![image](https://user-images.githubusercontent.com/25207995/173211561-a1778fdc-5cfe-4687-9a00-44500d29e470.png)
-![image](https://user-images.githubusercontent.com/25207995/173211573-8cedfa9a-51c9-4670-a4f7-a334a2fabec5.png)
-![image](https://user-images.githubusercontent.com/25207995/173211590-6a2242b5-1e8f-4db9-a5c7-06284688b131.png)
-
-## 成員
-
-- [SpikeHD](https://github.com/SpikeHD): For originally creating **GrassClipper** and creating the amazing UI of Cultivation.
-- [KingRainbow44](https://github.com/KingRainbow44): For building a proxy daemon from scratch and integrating it with Cultivation.
-- [Benj](https://github.com/4Benj): For assistance in client patching.
-- [lilmayofuksu](https://github.com/lilmayofuksu): For assistance in client patching.
-- [Tauri](https://tauri.app): For providing an amazing, efficient, and simple desktop application framework/library.

THEMES.md

@@ -2,7 +2,7 @@
 
 1. Download your favorite theme! (You can find some in the `#themes` channel on Discord)
 2. Place the unzipped theme folder inside of `%appdata%/cultivation/themes` (The path should look something like this: `cultivation/themes/theme_name/index.json`)
-3. Enable within Cultivation!
+4. Enable within Cultivation!
 
 # Creating your own theme
 
@@ -16,16 +16,16 @@ You will need CSS and JS experience if you want to do anything cool.
 
 `index.json` is where you tell Cultivation which files and images to include. It supports the following properties:
 
-| Property               | Description                                                                                                                                        |
+| Property | Description |
-| :--------------------- | :------------------------------------------------------------------------------------------------------------------------------------------------- |
+| :--- | :--- |
-| `name`                 | The name of the theme.                                                                                                                             |
+| `name` | The name of the theme. |
-| `version`              | Not shown anywhere, the version of the theme.                                                                                                      |
+| `version` | Not shown anywhere, the version of the theme. |
-| `description`          | Not shown anywhere, the description of the theme.                                                                                                  |
+| `description` | Not shown anywhere, the description of the theme. |
-| `includes`             | The files and folders to include.                                                                                                                  |
+| `includes` | The files and folders to include. |
-| `includes.css`         | Array of CSS files to include. Example: `css: ["index.css"]`                                                                                       |
+| `includes.css` | Array of CSS files to include. Example: `css: ["index.css"]` |
-| `includes.js`          | Array of JS files to includes. Example `js: ["index.js"]`                                                                                          |
+| `includes.js` | Array of JS files to includes. Example `js: ["index.js"]` |
-| `customBackgroundURL`  | A custom image URL to set as the background. Backgrounds that users set in their config supercede this. Example: `"https://website.com/image.png"` |
+| `customBackgroundURL` | A custom image URL to set as the background. Backgrounds that users set in their config supercede this. Example: `"https://website.com/image.png"` |
-| `customBackgroundFile` | Path to a custom background image file. Backgrounds that users set in their config supercede this. Example: `"/image.png"`                         |
+| `customBackgroundFile` | Path to a custom background image file. Backgrounds that users set in their config supercede this. Example: `"/image.png"` |
 
 A full, complete `index.json` will look something like this:
 
@@ -55,17 +55,15 @@ Below are some small examples of what you can do:
 ```css
 /* Change the font */
 body {
-  font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif !important;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif !important;
 }
 ```
-
 ```css
 /* Remove the news section */
 .NewsSection {
   display: none;
 }
 ```
-
 ```css
 /* Change the right bar width */
 .RightBar {
@@ -74,7 +72,6 @@ body {
 ```
 
 ## How can I change XYZ element?
-
 Every element is documented and describe [here](/docs/elementIds.md). Every\* single DOM element is assigned an ID to allow for easy and hyper-specific editing.
 
 ## Writing your JS
@@ -86,26 +83,24 @@ Below are some examples of what you can do:
 ```js
 /* Change the version number every 500ms */
 setInterval(() => {
-  document.getElementById('version').innerHTML = 'v' + Math.floor(Math.random() * 100)
+  document.getElementById("version").innerHTML = "v" + Math.floor(Math.random() * 100);
-}, 500)
+}, 500);
 ```
-
 ```js
 /* Load a custom font */
 const head = document.head
-const link = document.createElement('link')
+const link = document.createElement("link")
 
-link.href = 'https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&display=swap'
+link.href = "https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&display=swap"
-link.rel = 'stylesheet'
+link.rel = "stylesheet"
-link.type = 'text/css'
+link.type = "text/css"
 
 head.appendChild(link)
 ```
-
 ```js
 /* Create a new button that does nothing */
-const newButton = document.createElement('button')
+const newButton = document.createElement("button");
-newButton.innerHTML = 'New Button'
+newButton.innerHTML = "New Button";
 
-document.body.appendChild(newButton)
+document.body.appendChild(newButton);
 ```

docs/elementIds.md

@@ -1,135 +1,133 @@
 # Documentation of Element ID's and Classes for custom theming
 
 ## IDs
-
 This does not include commonly used components (buttons, divider lines, commit author and message, etc...) for accessing and modifying those elements, please check `Classes` section bellow.
 
-| #ID                                  | Description                                                     |
+| #ID                                    | Description                                                     |
-| ------------------------------------ | --------------------------------------------------------------- |
+|----------------------------------------|-----------------------------------------------------------------|
-| `#miniDialogContainer`               | Main container of MiniDialog                                    |
+| `#miniDialogContainer`                 | Main container of MiniDialog                                    |
-| `#miniDialogContainerTop`            | Affects only top section of MiniDialog                          |
+| `#miniDialogContainerTop`              | Affects only top section of MiniDialog                          |
-| `#miniDialogButtonClose`             | Close button (SVG) of MiniDialog                                |
+| `#miniDialogButtonClose`               | Close button (SVG) of MiniDialog                                |
-| `#miniDialogContent`                 | MiniDialog content                                              |
+| `#miniDialogContent`                   | MiniDialog content                                              |
-| `#rightBarContainer`                 | Main container of RightBar                                      |
+| `#rightBarContainer`                   | Main container of RightBar                                      |
-| `#rightBarContent`                   | RightBar content                                                |
+| `#rightBarContent`                     | RightBar content                                                |
-| `#rightBarButtonDiscord`             | Discord button on the RightBar                                  |
+| `#rightBarButtonDiscord`               | Discord button on the RightBar                                  |
-| `#rightBarButtonGithub`              | Github button on the RightBar                                   |
+| `#rightBarButtonGithub`                | Github button on the RightBar                                   |
-| `#playButton`                        | Main container for whole launch buttons section                 |
+| `#playButton`                          | Main container for whole launch buttons section                 |
-| `#serverControls`                    | Container of "play on grasscutter" checkbox                     |
+| `#serverControls`                      | Container of "play on grasscutter" checkbox                     |
-| `#enableGC`                          | "play on grasscutter" checkbox                                  |
+| `#enableGC`                            | "play on grasscutter" checkbox                                  |
-| `#ip`                                | Server ip input if play on grasscutter is enabled               |
+| `#ip`                                  | Server ip input if play on grasscutter is enabled               |
-| `#port`                              | Server port input if play on grasscutter is enabled             |
+| `#port`                                | Server port input if play on grasscutter is enabled             |
-| `#httpsEnable`                       | "Enable https" checkbox if play on grasscutter is enabled       |
+| `#httpsEnable`                         | "Enable https" checkbox if play on grasscutter is enabled       |
-| `#officialPlay`                      | Launch button                                                   |
+| `#officialPlay`                        | Launch button                                                   |
-| `#serverLaunch`                      | Launch server button                                            |
+| `#serverLaunch`                        | Launch server button                                            |
-| `#serverlaunchIcon`                  | Icon (SVG) of server launch button                              |
+| `#serverlaunchIcon`                    | Icon (SVG) of server launch button                              |
-| `#serverConfigContainer`             | Main container of server configuration section                  |
+| `#serverConfigContainer`               | Main container of server configuration section                  |
-| `#serverLaunchContainer`             | Main container of launch buttons (includes launch server)       |
+| `#serverLaunchContainer`               | Main container of launch buttons (includes launch server)       |
-| `#topBarContainer`                   | Main container of launcher TopBar (minimize, exit, settings...) |
+| `#topBarContainer`                     | Main container of launcher TopBar (minimize, exit, settings...) |
-| `#title`                             | Title of the TopBar                                             |
+| `#title`                               | Title of the TopBar                                             |
-| `#version`                           | Version of the launcher in TopBar                               |
+| `#version`                             | Version of the launcher in TopBar                               |
-| `#topBarButtonContainer`             | Container of launcher TopBar buttons only                       |
+| `#topBarButtonContainer`               | Container of launcher TopBar buttons only                       |
-| `#closeBtn`                          | Exit launcher button                                            |
+| `#closeBtn`                            | Exit launcher button                                            |
-| `#minBtn`                            | Minimize launcher button                                        |
+| `#minBtn`                              | Minimize launcher button                                        |
-| `#settingsBtn`                       | Settings button                                                 |
+| `#settingsBtn`                         | Settings button                                                 |
-| `#downloadsBtn`                      | Downloads button (grasscutter resources, grasscutter...)        |
+| `#downloadsBtn`                        | Downloads button (grasscutter resources, grasscutter...)        |
-| `#newsContainer`                     | Main container of the news section                              |
+| `#newsContainer`                       | Main container of the news section                              |
-| `#newsTabsContainer`                 | Container for news tabs                                         |
+| `#newsTabsContainer`                   | Container for news tabs                                         |
-| `#commits`                           | News tabs container commits button                              |
+| `#commits`                             | News tabs container commits button                              |
-| `#latest_version`                    | News tabs for latest version button                             |
+| `#latest_version`                      | News tabs for latest version button                             |
-| `#newsContent`                       | Content section of news container                               |
+| `#newsContent`                         | Content section of news container                               |
-| `#newsCommitsTable`                  | Commits table of news section                                   |
+| `#newsCommitsTable`                    | Commits table of news section                                   |
-| `#downloadMenuContainerGCStable`     | Grasscutter stable update container                             |
+| `#downloadMenuContainerGCStable`       | Grasscutter stable update container                             |
-| `#downloadMenuLabelGCStable`         | Label for stable update button                                  |
+| `#downloadMenuLabelGCStable`           | Label for stable update button                                  |
-| `#downloadMenuButtonGCStable`        | Button container for stable update button                       |
+| `#downloadMenuButtonGCStable`          | Button container for stable update button                       |
-| `#grasscutterStableBtn`              | "Update grasscutter stable" button                              |
+| `#grasscutterStableBtn`                | "Update grasscutter stable" button                              |
-| `#downloadMenuContainerGCDev`        | Grasscutter development update container                        |
+| `#downloadMenuContainerGCDev`          | Grasscutter development update container                        |
-| `#downloadMenuLabelGCDev`            | Label for latest update button                                  |
+| `#downloadMenuLabelGCDev`              | Label for latest update button                                  |
-| `#downloadMenuButtonGCDev`           | Button container for latest update button                       |
+| `#downloadMenuButtonGCDev`             | Button container for latest update button                       |
-| `grasscutterLatestBtn`               | "Update grasscutter latest" button                              |
+| `grasscutterLatestBtn`                 | "Update grasscutter latest" button                              |
-| `#downloadMenuContainerGCStableData` | Grasscutter stable data update container                        |
+| `#downloadMenuContainerGCStableData`   | Grasscutter stable data update container                        |
-| `#downloadMenuLabelGCStableData`     | Label for stable data update                                    |
+| `#downloadMenuLabelGCStableData`       | Label for stable data update                                    |
-| `#downloadMenuButtonGCStableData`    | Button container for stable data update button                  |
+| `#downloadMenuButtonGCStableData`      | Button container for stable data update button                  |
-| `#grasscutterStableRepo`             | "Update grasscutter stable data" button                         |
+| `#grasscutterStableRepo`               | "Update grasscutter stable data" button                         |
-| `#downloadMenuContainerGCDevData`    | Grasscutter latest data update container                        |
+| `#downloadMenuContainerGCDevData`      | Grasscutter latest data update container                        |
-| `#downloadMenuLabelGCDevData`        | Label for latest data update                                    |
+| `#downloadMenuLabelGCDevData`          | Label for latest data update                                    |
-| `#downloadMenuButtonGCDevData`       | Button container for latest data update button                  |
+| `#downloadMenuButtonGCDevData`         | Button container for latest data update button                  |
-| `#grasscutterDevRepo`                | "Update grasscutter latest data" button                         |
+| `#grasscutterDevRepo`                  | "Update grasscutter latest data" button                         |
-| `#downloadMenuContainerResources`    | Container for grasscutter resources download                    |
+| `#downloadMenuContainerResources`      | Container for grasscutter resources download                    |
-| `#downloadMenuLabelResources`        | label for resources download                                    |
+| `#downloadMenuLabelResources`          | label for resources download                                    |
-| `#downloadMenuButtonResources`       | Button container for resources download button                  |
+| `#downloadMenuButtonResources`         | Button container for resources download button                  |
-| `#resourcesBtn`                      | "Download grasscutter resources" button                         |
+| `#resourcesBtn`                        | "Download grasscutter resources" button                         |
-| `#menuContainer`                     | Generic Popup modal like menu container                         |
+| `#menuContainer`                       | Generic Popup modal like menu container                         |
-| `#menuContainerTop`                  | Top section of menu container                                   |
+| `#menuContainerTop`                    | Top section of menu container                                   |
-| `#menuHeading`                       | Menu title                                                      |
+| `#menuHeading`                         | Menu title                                                      |
-| `#menuButtonCloseContainer`          | Container for menu close button                                 |
+| `#menuButtonCloseContainer`            | Container for menu close button                                 |
-| `#menuButtonCloseIcon`               | Menu close icon (SVG)                                           |
+| `#menuButtonCloseIcon`                 | Menu close icon (SVG)                                           |
-| `#menuContent`                       | Content section of the menu                                     |
+| `#menuContent`                         | Content section of the menu                                     |
-| `#menuOptionsContainerGameExec`      | Container for game executable option section                    |
+| `#menuOptionsContainerGameExec`        | Container for game executable option section                    |
-| `#menuOptionsLabelGameExec`          | Label for game executable option                                |
+| `#menuOptionsLabelGameExec`            | Label for game executable option                                |
-| `#menuOptionsDirGameExec`            | Set game executable file browser                                |
+| `#menuOptionsDirGameExec`              | Set game executable file browser                                |
-| `#menuOptionsContainerGCJar`         | Container for grasscutter jar option                            |
+| `#menuOptionsContainerGCJar`           | Container for grasscutter jar option                            |
-| `#menuOptionsLabelGCJar`             | Label for grasscutter jar option                                |
+| `#menuOptionsLabelGCJar`               | Label for grasscutter jar option                                |
-| `#menuOptionsDirGCJar`               | Set grasscutter jar file browser                                |
+| `#menuOptionsDirGCJar`                 | Set grasscutter jar file browser                                |
-| `#menuOptionsContainerToggleEnc`     | Container for toggle encryption option                          |
+| `#menuOptionsContainerToggleEnc`       | Container for toggle encryption option                          |
-| `#menuOptionsLabelToggleEnc`         | Label for toggle encryption option                              |
+| `#menuOptionsLabelToggleEnc`           | Label for toggle encryption option                              |
-| `#menuOptionsButtonToggleEnc`        | Toggle encryption button container                              |
+| `#menuOptionsButtonToggleEnc`          | Toggle encryption button container                              |
-| `#toggleEnc`                         | Toggle encryption button                                        |
+| `#toggleEnc`                           | Toggle encryption button                                        |
-| `#menuOptionsContainerGCWGame`       | Container for "grasscutter with game" option                    |
+| `#menuOptionsContainerGCWGame`         | Container for "grasscutter with game" option                    |
-| `#menuOptionsLabelGCWDame`           | Label for "grasscutter with game" option                        |
+| `#menuOptionsLabelGCWDame`             | Label for "grasscutter with game" option                        |
-| `#menuOptionsCheckboxGCWGame`        | Container for "grasscutter with game" option checkbox           |
+| `#menuOptionsCheckboxGCWGame`          | Container for "grasscutter with game" option checkbox           |
-| `#gcWithGame`                        | Grasscutter with game checkbox                                  |
+| `#gcWithGame`                          | Grasscutter with game checkbox                                  |
-| `#menuOptionsContainerThemes`        | Container for themes section                                    |
+| `#menuOptionsContainerThemes`          | Container for themes section                                    |
-| `#menuOptionsLabelThemes`            | Label for set themes option                                     |
+| `#menuOptionsLabelThemes`              | Label for set themes option                                     |
-| `#menuOptionsSelectThemes`           | Container for themes select menu                                |
+| `#menuOptionsSelectThemes`             | Container for themes select menu                                |
-| `#menuOptionsSelectMenuThemes`       | Set theme select menu                                           |
+| `#menuOptionsSelectMenuThemes`         | Set theme select menu                                           |
-| `#menuOptionsContainerJavaPath`      | Container for Java Path option                                  |
+| `#menuOptionsContainerJavaPath`        | Container for Java Path option                                  |
-| `#menuOptionsLabelJavaPath`          | Label for Java path option                                      |
+| `#menuOptionsLabelJavaPath`            | Label for Java path option                                      |
-| `#menuOptionsDirJavaPath`            | Container for java path file browser                            |
+| `#menuOptionsDirJavaPath`              | Container for java path file browser                            |
-| `#menuOptionsContainerBG`            | Container for Background option                                 |
+| `#menuOptionsContainerBG`              | Container for Background option                                 |
-| `#menuOptionsLabelBG`                | Label for background option                                     |
+| `#menuOptionsLabelBG`                  | Label for background option                                     |
-| `#menuOptionsDirBG`                  | Container for background url/local path option                  |
+| `#menuOptionsDirBG`                    | Container for background url/local path option                  |
-| `#menuOptionsContainerLang`          | Container for language change option                            |
+| `#menuOptionsContainerLang`            | Container for language change option                            |
-| `#menuOptionsLabelLang`              | Label for language change option                                |
+| `#menuOptionsLabelLang`                | Label for language change option                                |
-| `#menuOptionsSelectLang`             | Container for language change select menu                       |
+| `#menuOptionsSelectLang`               | Container for language change select menu                       |
-| `#menuOptionsSelectMenuLang`         | Language select menu                                            |
+| `#menuOptionsSelectMenuLang`           | Language select menu                                            |
-| `#DownloadProgress`                  | Download progress container                                     |
+| `#DownloadProgress`                    | Download progress container                                     |
-| `#bottomSectionContainer`            | Bottom section container                                        |
+| `#bottomSectionContainer`              | Bottom section container                                        |
-| `#miniDownloadContainer`             | Container for mini download                                     |
+| `#miniDownloadContainer`               | Container for mini download                                     |
 
 ## Classes
-
 This is not full list of all classes, rather its list of classes for commonly used components that can not be accessed using element id system.
 
-| .Class                    | Description                                             |
+| .Class                      | Description                                             |
-| ------------------------- | ------------------------------------------------------- |
+|-----------------------------|---------------------------------------------------------|
-| `.BigButton`              | Class for all buttons                                   |
+| `.BigButton`                | Class for all buttons                                   |
-| `.BigButtonText`          | Text inside a button                                    |
+| `.BigButtonText`            | Text inside a button                                    |                              |
-| `.Checkbox`               | Checkbox container                                      |
+| `.Checkbox`                 | Checkbox container                                      |
-| `.CheckboxDisplay`        | Content of checkbox                                     |
+| `.CheckboxDisplay`          | Content of checkbox                                     |
-| `.DirInput`               | Container for DirInput                                  |
+| `.DirInput`                 | Container for DirInput                                  |
-| `.FileSelectIcon`         | Icon of DirInput                                        |
+| `.FileSelectIcon`           | Icon of DirInput                                        |
-| `.DownloadList`           | List of all downloads                                   |
+| `.DownloadList`             | List of all downloads                                   |
-| `.DownloadSection`        | Container for each download                             |
+| `.DownloadSection`          | Container for each download                             |
-| `.DownloadTitle`          | Contains file download path and current status          |
+| `.DownloadTitle`            | Contains file download path and current status          |
-| `.DownloadPath`           | Path of a download                                      |
+| `.DownloadPath`             | Path of a download                                      |
-| `.DownloadStatus`         | Status of a download                                    |
+| `.DownloadStatus`           | Status of a download                                    |
-| `.DownloadSectionInner`   | Contains progressbar of the download section            |
+| `.DownloadSectionInner`     | Contains progressbar of the download section            |
-| `.HelpSection`            | Container for help "?" circle button                    |
+| `.HelpSection`              | Container for help "?" circle button                    |
-| `.HelpButton`             | HelpButton itself                                       |
+| `.HelpButton`               | HelpButton itself                                       |
-| `.HelpContents`           | Content of help button once expanded                    |
+| `.HelpContents`             | Content of help button once expanded                    |
-| `.MainProgressBarWrapper` | Container for MainProgressBar                           |
+| `.MainProgressBarWrapper`   | Container for MainProgressBar                           |
-| `.ProgressBar`            | ProgressBar (creativity left the brain)                 |
+| `.ProgressBar`              | ProgressBar (creativity left the brain)                 |
-| `.InnerProgress`          | ProgressBar percentage                                  |
+| `.InnerProgress`            | ProgressBar percentage                                  |
-| `.MainProgressText`       | Text for MainProgressBar                                |
+| `.MainProgressText`         | Text for MainProgressBar                                |
-| `.ProgressBarWrapper`     | Container for ProgressBar                               |
+| `.ProgressBarWrapper`       | Container for ProgressBar                               |
-| `.DownloadControls`       | DownloadControls of ProgressBar                         |
+| `.DownloadControls`         | DownloadControls of ProgressBar                         |
-| `.downloadStop`           | Container for download stop icon (SVG)                  |
+| `.downloadStop`             | Container for download stop icon (SVG)                  |
-| `.ProgressText`           | Text of the ProgressBar display current download status |
+| `.ProgressText`             | Text of the ProgressBar display current download status |
-| `.TextInputWrapper`       | Container for TextInput                                 |
+| `.TextInputWrapper`         | Container for TextInput                                 |
-| `.TextClear`              | Container for clear input content button                |
+| `.TextClear`                | Container for clear input content button                |
-| `.TextInputClear`         | TextInput clear button icon (SVG)                       |
+| `.TextInputClear`           | TextInput clear button icon (SVG)                       |
-| `.Divider`                | Container for line dividers                             |
+| `.Divider`                  | Container for line dividers                             |
-| `.DividerLine`            | Divider line itself                                     |
+| `.DividerLine`              | Divider line itself                                     |
-| `.CommitAuthor`           | Author of a commit                                      |
+| `.CommitAuthor`             | Author of a commit                                      |
-| `.CommitMessage`          | Message of a commit                                     |
+| `.CommitMessage`            | Message of a commit                                     |

docs/troubleshooting.md

@@ -1,19 +1,15 @@
 # Troubleshooting
-
 A guide dedicated for trying to troubleshoot Cultivation.
 
 ## The launcher doesn't appear to open.
-
 Try running the launcher with **administrative privileges**.\
 If this fixes your issue, you can force enable it in the **Compatability**\
 tab for the launcher's executable.
 
 ## Unable to play on `localhost`.
-
 Make sure your server is running with **encryption disabled** and `useInRouting` to **false**.\
 Additionally, make sure Cultivation **is set to not use HTTPS**.
 
 ## "I can't do anything requiring the internet after closing Cultivation!"
-
 You probably didn't close Cultivation properly.\
-Go to your _Windows Settings_, then _Network_, then _Proxy_, then disable it.
+Go to your *Windows Settings*, then *Network*, then *Proxy*, then disable it.

package.json

@@ -1,14 +1,14 @@
 {
   "name": "cultivation",
-  "version": "1.0.10",
+  "version": "1.0.2",
   "private": true,
   "dependencies": {
     "@tauri-apps/api": "^1.0.0-rc.5",
     "@testing-library/jest-dom": "^5.14.1",
     "@testing-library/react": "^13.0.0",
-    "@testing-library/user-event": "^14.2.6",
+    "@testing-library/user-event": "^13.2.1",
-    "@types/jest": "^28.1.6",
+    "@types/jest": "^27.0.1",
-    "@types/node": "^18.0.6",
+    "@types/node": "^16.7.13",
     "@types/react": "^18.0.0",
     "@types/react-dom": "^18.0.0",
     "react": "^18.1.0",
@@ -20,18 +20,14 @@
   "scripts": {
     "start": "cross-env BROWSER=none react-scripts start",
     "postbuild:windows": "xcopy /E /H /C /I /Y \".\\src-tauri\\lang\" \".\\src-tauri\\target\\release\\lang\"",
-    "postbuild:linux": "cp -r \"./src-tauri/lang\" \"./lang\"",
+    "postbuild:linux": "cp -r \".\\src-tauri\\lang\" \".\\lang\"",
     "build:windows": "yarn tauri build",
     "build:linux": "yarn tauri build",
     "build": "react-scripts build && run-script-os",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
     "tauri": "tauri",
-    "start:dev": "tauri dev",
+    "start:dev": "tauri dev"
-    "format": "cargo fmt --manifest-path ./src-tauri/Cargo.toml --all && yarn prettier --write --cache --loglevel warn .",
-    "lint": "cargo clippy --manifest-path ./src-tauri/Cargo.toml --no-default-features && yarn tsc --noEmit && yarn eslint src",
-    "lint:fix": "cargo clippy --manifest-path ./src-tauri/Cargo.toml --no-default-features --fix --allow-dirty && yarn tsc --noEmit && yarn eslint --fix src",
-    "prepare": "husky install"
   },
   "eslintConfig": {
     "extends": [
@@ -57,11 +53,7 @@
     "@typescript-eslint/parser": "^5.22.0",
     "cross-env": "^7.0.3",
     "eslint": "^8.15.0",
-    "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-react": "^7.29.4",
-    "husky": "^8.0.0",
-    "lint-staged": "^13.0.3",
-    "prettier": "^2.7.1",
     "run-script-os": "^1.1.6"
   }
 }

public/index.html

@@ -5,7 +5,10 @@
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
-    <meta name="description" content="Tauri-powered anime game launcher" />
+    <meta
+      name="description"
+      content="Tauri-powered anime game launcher"
+    />
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
     <title>Cultivation</title>

src-tauri/Cargo.lock

@@ -26,17 +26,6 @@ dependencies = [
  "opaque-debug",
 ]
 
-[[package]]
-name = "ahash"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
-dependencies = [
- "getrandom 0.2.7",
- "once_cell",
- "version_check",
-]
-
 [[package]]
 name = "aho-corasick"
 version = "0.7.18"
@@ -86,7 +75,7 @@ dependencies = [
  "asn1-rs-impl",
  "displaydoc",
  "nom",
- "num-traits 0.2.15",
+ "num-traits",
  "rusticata-macros",
  "thiserror",
  "time 0.3.11",
@@ -517,9 +506,9 @@ dependencies = [
 
 [[package]]
 name = "concurrent-queue"
-version = "1.2.3"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83827793632c72fa4f73c2edb31e7a997527dd8ffe7077344621fc62c5478157"
+checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3"
 dependencies = [
  "cache-padded",
 ]
@@ -668,9 +657,9 @@ dependencies = [
 
 [[package]]
 name = "crypto-common"
-version = "0.1.6"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+checksum = "5999502d32b9c48d492abe66392408144895020ec4709e549e840799f3bb74c0"
 dependencies = [
  "generic-array",
  "typenum",
@@ -713,16 +702,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "ctrlc"
-version = "3.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d91974fbbe88ec1df0c24a4f00f99583667a7e2e6272b2b92d294d81e462173"
-dependencies = [
- "nix",
- "winapi",
-]
-
 [[package]]
 name = "cty"
 version = "0.2.2"
@@ -733,21 +712,16 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
 name = "cultivation"
 version = "0.1.0"
 dependencies = [
- "cc",
- "ctrlc",
  "duct",
- "file_diff",
  "futures-util",
  "http",
  "hudsucker",
  "is_elevated",
  "once_cell",
- "open",
+ "open 2.1.3",
  "rcgen",
- "regex",
  "registry",
  "reqwest",
- "rust-ini",
  "rustls-pemfile",
  "serde",
  "serde_json",
@@ -759,7 +733,6 @@ dependencies = [
  "tokio-rustls",
  "tokio-tungstenite",
  "tracing",
- "unrar",
  "zip 0.6.2",
  "zip-extract",
 ]
@@ -807,9 +780,9 @@ checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57"
 
 [[package]]
 name = "dbus"
-version = "0.9.6"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f8bcdd56d2e5c4ed26a529c5a9029f5db8290d433497506f958eae3be148eb6"
+checksum = "de0a745c25b32caa56b82a3950f5fec7893a960f4c10ca3b02060b0c38d8c2ce"
 dependencies = [
  "libc",
  "libdbus-sys",
@@ -844,8 +817,8 @@ dependencies = [
  "asn1-rs",
  "displaydoc",
  "nom",
- "num-bigint 0.4.3",
+ "num-bigint",
- "num-traits 0.2.15",
+ "num-traits",
  "rusticata-macros",
 ]
 
@@ -911,12 +884,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "dlv-list"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257"
-
 [[package]]
 name = "dtoa"
 version = "0.4.8"
@@ -978,15 +945,6 @@ dependencies = [
  "cfg-if 1.0.0",
 ]
 
-[[package]]
-name = "enum_primitive"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180"
-dependencies = [
- "num-traits 0.1.43",
-]
-
 [[package]]
 name = "error-chain"
 version = "0.12.4"
@@ -1021,12 +979,6 @@ dependencies = [
  "rustc_version 0.3.3",
 ]
 
-[[package]]
-name = "file_diff"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31a7a908b8f32538a2143e59a6e4e2508988832d5d4d6f7c156b3cbc762643a5"
-
 [[package]]
 name = "filetime"
 version = "0.2.17"
@@ -1080,12 +1032,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "fuchsia-cprng"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-
 [[package]]
 name = "futf"
 version = "0.1.5"
@@ -1283,15 +1229,15 @@ dependencies = [
 
 [[package]]
 name = "generator"
-version = "0.7.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc184cace1cea8335047a471cc1da80f18acf8a76f3bab2028d499e328948ec7"
+checksum = "c1d9279ca822891c1a4dae06d185612cf8fc6acfe5dff37781b41297811b12ee"
 dependencies = [
  "cc",
  "libc",
  "log",
  "rustversion",
- "windows 0.32.0",
+ "winapi",
 ]
 
 [[package]]
@@ -1507,12 +1453,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.12.3"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+checksum = "607c8a29735385251a339424dd462993c0fed8fa09d378f259377df08c126022"
-dependencies = [
- "ahash",
-]
 
 [[package]]
 name = "heck"
@@ -1747,8 +1690,8 @@ dependencies = [
  "byteorder",
  "color_quant",
  "num-iter",
- "num-rational 0.4.1",
+ "num-rational",
- "num-traits 0.2.15",
+ "num-traits",
 ]
 
 [[package]]
@@ -1921,9 +1864,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.132"
+version = "0.2.126"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
+checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
 
 [[package]]
 name = "libdbus-sys"
@@ -1985,9 +1928,9 @@ checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4"
 
 [[package]]
 name = "mac-notification-sys"
-version = "0.5.5"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fff231a88fe2e9985f9d159a2f02986fe46daa0f6af976a0d934be4870cc9d02"
+checksum = "042f74a606175d72ca483e14e0873fe0f6c003f7af45865b17b16fdaface7203"
 dependencies = [
  "cc",
  "dirs-next",
@@ -2183,18 +2126,6 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
 
-[[package]]
-name = "nix"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb"
-dependencies = [
- "autocfg",
- "bitflags",
- "cfg-if 1.0.0",
- "libc",
-]
-
 [[package]]
 name = "nodrop"
 version = "0.1.14"
@@ -2231,32 +2162,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "num"
-version = "0.1.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e"
-dependencies = [
- "num-bigint 0.1.44",
- "num-complex",
- "num-integer",
- "num-iter",
- "num-rational 0.1.42",
- "num-traits 0.2.15",
-]
-
-[[package]]
-name = "num-bigint"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e63899ad0da84ce718c14936262a41cee2c79c981fc0a0e7c7beb47d5a07e8c1"
-dependencies = [
- "num-integer",
- "num-traits 0.2.15",
- "rand 0.4.6",
- "rustc-serialize",
-]
-
 [[package]]
 name = "num-bigint"
 version = "0.4.3"
@@ -2265,17 +2170,7 @@ checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
 dependencies = [
  "autocfg",
  "num-integer",
- "num-traits 0.2.15",
+ "num-traits",
-]
-
-[[package]]
-name = "num-complex"
-version = "0.1.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b288631d7878aaf59442cffd36910ea604ecd7745c36054328595114001c9656"
-dependencies = [
- "num-traits 0.2.15",
- "rustc-serialize",
 ]
 
 [[package]]
@@ -2285,7 +2180,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
 dependencies = [
  "autocfg",
- "num-traits 0.2.15",
+ "num-traits",
 ]
 
 [[package]]
@@ -2296,19 +2191,7 @@ checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
 dependencies = [
  "autocfg",
  "num-integer",
- "num-traits 0.2.15",
+ "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.1.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee314c74bd753fc86b4780aa9475da469155f3848473a261d2d18e35245a784e"
-dependencies = [
- "num-bigint 0.1.44",
- "num-integer",
- "num-traits 0.2.15",
- "rustc-serialize",
 ]
 
 [[package]]
@@ -2319,16 +2202,7 @@ checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
 dependencies = [
  "autocfg",
  "num-integer",
- "num-traits 0.2.15",
+ "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.1.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
-dependencies = [
- "num-traits 0.2.15",
 ]
 
 [[package]]
@@ -2442,9 +2316,19 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "open"
-version = "3.0.2"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f23a407004a1033f53e93f9b45580d14de23928faad187384f891507c9b0c045"
+checksum = "f2423ffbf445b82e58c3b1543655968923dd06f85432f10be2bb4f1b7122f98c"
+dependencies = [
+ "pathdiff",
+ "windows-sys",
+]
+
+[[package]]
+name = "open"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "360bcc8316bf6363aa3954c3ccc4de8add167b087e0259190a043c9514f910fe"
 dependencies = [
  "pathdiff",
  "windows-sys",
@@ -2452,9 +2336,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.41"
+version = "0.10.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0"
+checksum = "fb81a6430ac911acb25fe5ac8f1d2af1b4ea8a4fdfda0f1ee4292af2e2d8eb0e"
 dependencies = [
  "bitflags",
  "cfg-if 1.0.0",
@@ -2484,9 +2368,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.75"
+version = "0.9.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f"
+checksum = "835363342df5fba8354c5b453325b110ffd54044e588c539cf2f20a8014e4cb1"
 dependencies = [
  "autocfg",
  "cc",
@@ -2495,16 +2379,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "ordered-multimap"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a"
-dependencies = [
- "dlv-list",
- "hashbrown",
-]
-
 [[package]]
 name = "os_info"
 version = "3.4.0"
@@ -2652,9 +2526,9 @@ dependencies = [
 
 [[package]]
 name = "pem"
-version = "1.1.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4"
+checksum = "e9a3b09a20e374558580a4914d3b7d89bd61b954a5a5e1dcbea98753addb1947"
 dependencies = [
  "base64",
 ]
@@ -2958,19 +2832,6 @@ dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "rand"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
-dependencies = [
- "fuchsia-cprng",
- "libc",
- "rand_core 0.3.1",
- "rdrand",
- "winapi",
-]
-
 [[package]]
 name = "rand"
 version = "0.7.3"
@@ -3016,21 +2877,6 @@ dependencies = [
  "rand_core 0.6.3",
 ]
 
-[[package]]
-name = "rand_core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-dependencies = [
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-
 [[package]]
 name = "rand_core"
 version = "0.5.1"
@@ -3111,9 +2957,9 @@ dependencies = [
 
 [[package]]
 name = "rcgen"
-version = "0.9.3"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd"
+checksum = "d7fa2d386df8533b02184941c76ae2e0d0c1d053f5d43339169d80f21275fc5e"
 dependencies = [
  "pem",
  "ring",
@@ -3122,15 +2968,6 @@ dependencies = [
  "yasna",
 ]
 
-[[package]]
-name = "rdrand"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-dependencies = [
- "rand_core 0.3.1",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.2.13"
@@ -3277,22 +3114,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "rust-ini"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df"
-dependencies = [
- "cfg-if 1.0.0",
- "ordered-multimap",
-]
-
-[[package]]
-name = "rustc-serialize"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
-
 [[package]]
 name = "rustc_version"
 version = "0.3.3"
@@ -3343,9 +3164,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.8"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24c8ad4f0c00e1eb5bc7614d236a7f1300e3dbd76b68cac8e06fb00b015ad8d8"
+checksum = "a0a5f7c728f5d284929a1cccb5bc19884422bfe6ef4d6c409da2c41838983fcf"
 
 [[package]]
 name = "ryu"
@@ -3481,18 +3302,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.139"
+version = "1.0.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0171ebb889e45aa68b44aee0859b3eede84c6f5f5c228e6f140c0b2a0a46cad6"
+checksum = "1578c6245786b9d168c5447eeacfb96856573ca56c9d68fdcf394be134882a47"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.139"
+version = "1.0.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1d3230c1de7932af58ad8ffbe1d784bd55efd5a9d84ac24f69c72d83543dfb"
+checksum = "023e9b1467aef8a10fb88f25611870ada9800ef7e22afce356bb0d2387b6f27c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3948,9 +3769,9 @@ dependencies = [
 
 [[package]]
 name = "tauri"
-version = "1.0.4"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "827f61bd3dd40276694be5c7ffc40d65b94ab00d9f8c1a4a4db07f2cdc306c83"
+checksum = "d61fc211e0bd2c04c0aecd202d2cd72dd797a89da02989a39e1b9691462386d6"
 dependencies = [
  "anyhow",
  "attohttpc",
@@ -3969,7 +3790,7 @@ dependencies = [
  "notify-rust",
  "objc",
  "once_cell",
- "open",
+ "open 3.0.1",
  "os_info",
  "os_pipe 1.0.1",
  "percent-encoding",
@@ -4001,9 +3822,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-build"
-version = "1.0.4"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acafb1c515c5d14234a294461bd43c723639a84891a45f6a250fd3441ad2e8ed"
+checksum = "2f2b32e551ec810ba4ab2ad735de5e3576e54bf0322ab0f4b7ce41244bc65ecf"
 dependencies = [
  "anyhow",
  "cargo_toml",
@@ -4017,9 +3838,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-codegen"
-version = "1.0.4"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16d62a3c8790d6cba686cea6e3f7f569d12c662c3274c2d165a4fd33e3871b72"
+checksum = "f6f1f7928dd040fc03c94207adfad506c0cf5b152982fd1dc0a621f7fd777e22"
 dependencies = [
  "base64",
  "brotli",
@@ -4043,9 +3864,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-macros"
-version = "1.0.4"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7296fa17996629f43081e1c66d554703900187ed900c5bf46f97f0bcfb069278"
+checksum = "e50b9f52871c088857360319a37472d59f4644f1ed004489599d62831a1b6996"
 dependencies = [
  "heck 0.4.0",
  "proc-macro2",
@@ -4227,11 +4048,10 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.20.0"
+version = "1.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57aec3cfa4c296db7255446efb4928a6be304b431a806216105542a67b6ca82e"
+checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439"
 dependencies = [
- "autocfg",
  "bytes",
  "libc",
  "memchr",
@@ -4267,9 +4087,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-tungstenite"
-version = "0.17.2"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f714dd15bead90401d77e04243611caec13726c2408afd5b31901dfcdcb3b181"
+checksum = "06cda1232a49558c46f8a504d5b93101d42c0bf7f911f12a105ba48168f821ae"
 dependencies = [
  "futures-util",
  "log",
@@ -4396,9 +4216,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 
 [[package]]
 name = "tungstenite"
-version = "0.17.3"
+version = "0.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e27992fd6a8c29ee7eef28fc78349aa244134e10ad447ce3b9f0ac0ed0fa4ce0"
+checksum = "d96a2dea40e7570482f28eb57afbe42d97551905da6a9400acc5c328d24004f5"
 dependencies = [
  "base64",
  "byteorder",
@@ -4444,9 +4264,9 @@ checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.2"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7"
+checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
 
 [[package]]
 name = "unicode-normalization"
@@ -4469,31 +4289,6 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "957e51f3646910546462e67d5f7599b9e4fb8acdd304b087a6494730f9eebf04"
 
-[[package]]
-name = "unrar"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "433cea4f0b7bec88d47becb380887b8786a3cfb1c82e1ef9d32a682ba6801814"
-dependencies = [
- "bitflags",
- "enum_primitive",
- "lazy_static",
- "num",
- "regex",
- "unrar_sys",
-]
-
-[[package]]
-name = "unrar_sys"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0009399408dc0bcc5c8910672544fceceeba18b91f741ff943916e917d982c60"
-dependencies = [
- "cc",
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "untrusted"
 version = "0.7.1"
@@ -4875,19 +4670,6 @@ dependencies = [
  "windows_x86_64_msvc 0.24.0",
 ]
 
-[[package]]
-name = "windows"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbedf6db9096bc2364adce0ae0aa636dcd89f3c3f2cd67947062aaf0ca2a10ec"
-dependencies = [
- "windows_aarch64_msvc 0.32.0",
- "windows_i686_gnu 0.32.0",
- "windows_i686_msvc 0.32.0",
- "windows_x86_64_gnu 0.32.0",
- "windows_x86_64_msvc 0.32.0",
-]
-
 [[package]]
 name = "windows"
 version = "0.37.0"
@@ -4947,12 +4729,6 @@ version = "0.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3263d25f1170419995b78ff10c06b949e8a986c35c208dc24333c64753a87169"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.36.1"
@@ -4971,12 +4747,6 @@ version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0866510a3eca9aed73a077490bbbf03e5eaac4e1fd70849d89539e5830501fd"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.36.1"
@@ -4995,12 +4765,6 @@ version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf0ffed56b7e9369a29078d2ab3aaeceea48eb58999d2cff3aa2494a275b95c6"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.36.1"
@@ -5019,12 +4783,6 @@ version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "384a173630588044205a2993b6864a2f56e5a8c1e7668c07b93ec18cf4888dc4"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.36.1"
@@ -5043,12 +4801,6 @@ version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9bd8f062d8ca5446358159d79a90be12c543b3a965c847c8f3eedf14b321d399"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.36.1"

src-tauri/Cargo.toml

@@ -13,7 +13,6 @@ rust-version = "1.57"
 
 [build-dependencies]
 tauri-build = { version = "1.0.0-rc.8", features = [] }
-cc = "1.0"
 
 [target.'cfg(windows)'.dependencies]
 is_elevated = "0.1.2"
@@ -31,14 +30,13 @@ sysinfo = "0.24.6"
 
 # ZIP-archive library.
 zip-extract = "0.1.1"
-unrar = "0.4.4"
 zip = "0.6.2"
 
 # For creating a "global" downloads list.
 once_cell = "1.13.0"
 
 # Program opener.
-open = "3.0.2"
+open = "2.1.2"
 duct = "0.13.5"
 
 # Serialization.
@@ -56,14 +54,6 @@ reqwest = { version = "0.11.3", features = ["stream"] }
 futures-util = "0.3.14"
 rcgen = { version = "0.9", features = ["x509-parser"] }
 
-# metadata stuff
-regex = "1"
-
-# other
-file_diff = "1.0.0"
-rust-ini = "0.18.0"
-ctrlc = "3.2.3"
-
 [features]
 # by default Tauri runs in production mode
 # when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL

src-tauri/build.rs

@@ -1,16 +1,3 @@
 fn main() {
-  cc::Build::new()
-    .include("mhycrypto")
-    .cpp(true)
-    .file("mhycrypto/memecrypto.cpp")
-    .file("mhycrypto/metadata.cpp")
-    .file("mhycrypto/metadatastringdec.cpp")
-    .compile("mhycrypto");
-
-  cc::Build::new()
-    .include("mhycrypto")
-    .file("mhycrypto/aes.c")
-    .compile("mhycrypto-aes");
-
   tauri_build::build()
 }

src-tauri/keys/dispatchKey.txt

@@ -1 +0,0 @@
-<RSAKeyValue><Modulus>AMW28dptX3h8q0O4z/vJrQxf6cmC6yVilgHRL98GazrYzmc3ixj87JpHIJ3IKEYV+HU/tYrUjEfY/ZtPzsLB9lKBelN9i8QjkFkA9QDICGYwJCXibxU67Z/HzENe9NQpG2i01SI0TJU8PJDV7zQPwPVGraIg5ouExRupq8UymaSHEyJ7zxKZCtgO0LKdROLJBSvI5srMu7kYTGmB7T07Ab8T9M595YSgd1vh06qZ3nsF1h4wg3y+zW28vdY28+RCj2V1i7oVyL0dQruLYq7qK8FycZl2j9R0GaJ8rRAjVP1Dsz+hjS3atHhQxOG9OFo6d/euedRvfWIhT9p6h1SeTjE=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue>

src-tauri/keys/passwordKey.txt

@@ -1,7 +0,0 @@
-<RSAKeyValue>
-                                                <Exponent>AQAB</Exponent>
-                                                <Modulus>yytg/H9lz7Lm0XcA8LMqIyXPVNApYTcSepT4VDLB4qqqFC3s
-                                                /Huv8vN7zA/P4uoREIu8KMenADFk7uwrZSxoMWwJgn6A7sbAt1cqAaUXB
-                                                9J4NzhL0x3AFTiHEQbw86hRvm2VGkbA5sWnr0NZw8SGBBY+EODwNIt51G
-                                                dBA7eoUQU=</Modulus>
-                                                </RSAKeyValue>

src-tauri/lang/chs.json

@@ -11,21 +11,13 @@
     "files_extracting": "文件解压中："
   },
   "options": {
-    "enabled": "已启用",
+    "game_exec": "选择游戏可执行文件",
-    "disabled": "已禁用",
-    "game_path": "选择游戏安装路径",
-    "game_executable": "选择游戏可执行文件",
-    "recover_metadata": "紧急情况下恢复元数据文件",
     "grasscutter_jar": "选择 Grasscutter JAR 文件",
-    "toggle_encryption": "启用加密",
+    "java_path": "设置自定义 Java 路径",
-    "install_certificate": "安装代理证书",
-    "java_path": "选择自定义 Java 路径",
     "grasscutter_with_game": "随游戏自动启动 Grasscutter",
-    "language": "选择语言",
+    "language": "语言",
     "background": "设置自定义背景（链接或文件）",
-    "theme": "设置主题",
+    "theme": "设置主题"
-    "patch_metadata": "自动修改元数据",
-    "use_proxy": "使用内置代理"
   },
   "downloads": {
     "grasscutter_stable_data": "下载 Grasscutter 稳定版数据",
@@ -36,8 +28,7 @@
     "grasscutter_latest": "下载 Grasscutter 开发版",
     "grasscutter_stable_update": "更新 Grasscutter 稳定版",
     "grasscutter_latest_update": "更新 Grasscutter 开发版",
-    "resources": "下载 Grasscutter 资源",
+    "resources": "下载 Grasscutter 资源"
-    "game": "下载游戏"
   },
   "download_status": {
     "downloading": "下载中",
@@ -49,11 +40,10 @@
   "components": {
     "select_file": "选择文件或文件夹...",
     "select_folder": "选择文件夹...",
-    "download": "下载",
+    "download": "下载"
-    "install": "安装"
   },
   "news": {
-    "latest_commits": "最近提交",
+    "latest_commits": "最近的PR",
     "latest_version": "最新版本"
   },
   "help": {
@@ -63,17 +53,6 @@
     "gc_dev_jar": "下载最新的 Grasscutter 开发版，包括 JAR 文件和数据。",
     "gc_stable_data": "下载当前的 Grasscutter 稳定版数据，不包括 JAR 文件。此选项在更新时有帮助。",
     "gc_dev_data": "下载最新的 Grasscutter 开发版数据，不包括 JAR 文件。此选项在更新时有帮助。",
-    "resources": "资源文件在运行 Grasscutter 服务器时是必要的。此选项在已经存在资源文件时不可选。",
+    "resources": "资源文件在运行 Grasscutter 服务器时是必要的。此选项在已经存在资源文件时不可选。"
-    "emergency_metadata": "在出现意外情况时，自动将元数据恢复至原始版本",
-    "use_proxy": "使用 Cultivation 的内置代理。除非你使用 Fiddler 等软件，否则应启用此项。",
-    "patch_metadata": "自动修改和恢复游戏元数据。除非要游玩旧版本/非官方版本，抑或你已经手动修改了元数据，否则应启用此项。"
-  },
-  "swag": {
-    "akebi_name": "Akebi",
-    "migoto_name": "Migoto",
-    "reshade_name": "Reshade",
-    "akebi": "选择 Akebi 可执行文件",
-    "migoto": "选择 3DMigoto 可执行文件",
-    "reshade": "选择 Reshade 注入器"
   }
 }

src-tauri/lang/cht.json

@@ -13,19 +13,14 @@
   "options": {
     "enabled": "已啟用",
     "disabled": "未啟用",
-    "game_path": "選擇遊戲安裝路徑",
+    "game_exec": "選擇遊戲執行檔",
-    "game_executable": "選擇遊戲執行檔",
-    "recover_metadata": "緊急恢復Metadata",
     "grasscutter_jar": "選擇伺服器JAR檔案",
     "toggle_encryption": "設定加密",
-    "install_certificate": "安裝代理憑證",
+    "java_path": "設定自定義Java路徑",
-    "java_path": "選擇自定義Java路徑",
     "grasscutter_with_game": "伴隨遊戲一起啟動Grasscutter",
     "language": "語言",
-    "background": "選擇自定義背景（網址或檔案）",
+    "background": "設定自定義背景（網址或檔案）",
-    "theme": "選擇主題",
+    "theme": "設定主題"
-    "patch_metadata": "自動修補Metadata",
-    "use_proxy": "使用內建代理伺服器"
   },
   "downloads": {
     "grasscutter_stable_data": "下載Grasscutter穩定版數據（Data）",
@@ -36,8 +31,7 @@
     "grasscutter_latest": "下載Grasscutter開發板",
     "grasscutter_stable_update": "更新Grasscutter穩定版",
     "grasscutter_latest_update": "更新Grasscutter開發板",
-    "resources": "下載Grasscutter資源（Resources）",
+    "resources": "下載Grasscutter資源（Resources）"
-    "game": "下載遊戲"
   },
   "download_status": {
     "downloading": "下載中",
@@ -49,8 +43,7 @@
   "components": {
     "select_file": "選擇檔案或資料夾...",
     "select_folder": "選擇資料夾...",
-    "download": "下載",
+    "download": "下載"
-    "install": "安裝"
   },
   "news": {
     "latest_commits": "最近的PR",
@@ -58,23 +51,11 @@
   },
   "help": {
     "port_help_text": "確保這是Dispatch伺服器端口，不是遊戲伺服器端口。 大部分伺服器的端口都是443。",
-    "game_help_text": "您不需要另外一個遊戲備份來使用Grasscutter。這是給想要降級到2.6或者還沒安裝遊戲的人使用的。",
+    "game_help_text": "你不需要另外一個遊戲備份來使用Grasscutter。這是給想要降級到2.6或者還沒安裝遊戲的人使用的。",
     "gc_stable_jar": "下載當前的Grasscutter穩定版本，包括JAR答案還有資料文件。",
     "gc_dev_jar": "下載當前的Grasscutter穩定版本資料文件，其中不會附帶JAR文件。這個選項在更新時很有用。",
     "gc_stable_data": "下載當前最新的Grasscutter開發版本資料文件，其中不會附帶JAR文件。這個選項在更新時很有用。",
     "gc_dev_data": "下載當前最新的Grasscutter開發版本的資料文件，其中不會附帶JAR文件。這個選項在更新時很有用。",
-    "encryption": "在正常情況下，此選項應該被關閉。",
+    "resources": "資源文件在架設一個Grasscutter伺服器時是必要的。 這個選項會在你已經有裡面有檔案的資源資料夾時不可選。"
-    "resources": "資源文件在架設一個Grasscutter伺服器時是必要的。 這個選項會在您已經有裡面有檔案的資源資料夾時不可選。",
-    "emergency_metadata": "一旦有東西出了問題，此選項可以把您的Metadata恢復成官方版本。",
-    "use_proxy": "使用Cultivation內建的代理伺服器。此選項應該被啟用，除非你使用其他的代理伺服器。",
-    "patch_metadata": "自動修補和恢復Metadata。除非您的遊戲版本是舊的或者是非官方的，此選項應該被啟用。"
-  },
-  "swag": {
-    "akebi_name": "Akebi",
-    "migoto_name": "Migoto",
-    "reshade_name": "Reshade",
-    "akebi": "選擇Akebi執行檔",
-    "migoto": "選擇3DMigoto執行檔",
-    "reshade": "選擇Reshade注入器"
   }
 }

src-tauri/lang/de.json

@@ -1,77 +1,61 @@
-{
+{
-  "lang_name": "Deutsch",
+    "lang_name": "Deutsch",
-  "main": {
+    "main": {
-    "title": "Cultivation",
+      "title": "Cultivation",
-    "launch_button": "Starten",
+      "launch_button": "Starten",
-    "gc_enable": "Über Grasscutter verbinden",
+      "gc_enable": "Über Grasscutter verbinden",
-    "https_enable": "HTTPS nutzen",
+      "https_enable": "HTTPS nutzen",
-    "ip_placeholder": "Server Adresse...",
+      "ip_placeholder": "Server Adresse...",
-    "port_placeholder": "Port...",
+      "port_placeholder": "Port...",
-    "files_downloading": "Herunterladen von Dateien: ",
+      "files_downloading": "Herunterladen von Dateien: ",
-    "files_extracting": "Extrahieren von Dateien: "
+      "files_extracting": "Extrahieren von Dateien: "
-  },
+    },
-  "options": {
+    "options": {
-    "enabled": "Aktiviert",
+      "enabled": "Aktiviert",
-    "disabled": "Deaktiviert",
+      "disabled": "Deaktiviert",
-    "game_path": "Spielpfad",
+      "game_exec": "Spiel Datei auswählen",
-    "game_executable": "Spiel Datei auswählen",
+      "grasscutter_jar": "Grasscuter JAR auswählen",
-    "recover_metadata": "Notfall Wiederherstellung der Metadaten",
+      "toggle_encryption": "Verschlüsselung umschalten",
-    "grasscutter_jar": "Grasscuter JAR auswählen",
+      "java_path": "Benutzerdefinierten Java Pfad setzen",
-    "toggle_encryption": "Verschlüsselung umschalten",
+      "grasscutter_with_game": "Grasscutter automatisch mit dem Spiel starten",
-    "java_path": "Benutzerdefinierten Java Pfad setzen",
+      "language": "Sprache auswählen",
-    "grasscutter_with_game": "Grasscutter automatisch mit dem Spiel starten",
+      "background": "Benutzerdefinierten Hintergrund festlegen (link oder bild)",
-    "language": "Sprache auswählen",
+      "theme": "Theme auswählen"
-    "background": "Benutzerdefinierten Hintergrund festlegen (link oder bild)",
+    },
-    "theme": "Theme auswählen",
+    "downloads": {
-    "patch_metadata": "Metadaten automatisch patchen"
+      "grasscutter_stable_data": "Stabile Grasscutter Daten herunterladen",
-  },
+      "grasscutter_latest_data": "Aktuellste Grasscutter Daten herunterladen",
-  "downloads": {
+      "grasscutter_stable_data_update": "Stabile Grasscutter Daten aktualisieren",
-    "grasscutter_stable_data": "Stabile Grasscutter Daten herunterladen",
+      "grasscutter_latest_data_update": "Aktuellste Grasscutter Daten aktualisieren",
-    "grasscutter_latest_data": "Aktuellste Grasscutter Daten herunterladen",
+      "grasscutter_stable": "Stabile Grasscutter Version herunterladen",
-    "grasscutter_stable_data_update": "Stabile Grasscutter Daten aktualisieren",
+      "grasscutter_latest": "Aktuellste Grasscutter Version herunterladen",
-    "grasscutter_latest_data_update": "Aktuellste Grasscutter Daten aktualisieren",
+      "grasscutter_stable_update": "Stabile Grasscutter Version aktualisieren",
-    "grasscutter_stable": "Stabile Grasscutter Version herunterladen",
+      "grasscutter_latest_update": "Aktuellste Grasscutter Version aktualisieren",
-    "grasscutter_latest": "Aktuellste Grasscutter Version herunterladen",
+      "resources": "Grasscutter Ressourcen herunterladen"
-    "grasscutter_stable_update": "Stabile Grasscutter Version aktualisieren",
+    },
-    "grasscutter_latest_update": "Aktuellste Grasscutter Version aktualisieren",
+    "download_status": {
-    "resources": "Grasscutter Ressourcen herunterladen",
+      "downloading": "Lädt herunter",
-    "game": "Spiel herunterladen"
+      "extracting": "Extrahiert",
-  },
+      "error": "Fehler",
-  "download_status": {
+      "finished": "Fertig",
-    "downloading": "Lädt herunter",
+      "stopped": "Gestoppt"
-    "extracting": "Extrahiert",
+    },
-    "error": "Fehler",
+    "components": {
-    "finished": "Fertig",
+      "select_file": "Datei oder Ordner auswählen...",
-    "stopped": "Gestoppt"
+      "select_folder": "Ordner auswählen...",
-  },
+      "download": "Herunterladen"
-  "components": {
+    },
-    "select_file": "Datei oder Ordner auswählen...",
+    "news": {
-    "select_folder": "Ordner auswählen...",
+      "latest_commits": "Letzte Commits",
-    "download": "Herunterladen",
+      "latest_version": "Letzte Version"
-    "install": "Installieren"
+    },
-  },
+    "help": {
-  "news": {
+      "port_help_text": "Vergewissern Sie sich, dass es sich um den Port des Dispatch-Servers handelt, nicht um den Port des Spiel-Servers. Dieser ist fast immer '443'.",
-    "latest_commits": "Letzte Commits",
+      "game_help_text": "Sie müssen keine separate Kopie verwenden, um mit Grasscutter zu spielen. Dies ist entweder für ein Downgrade auf die Version 2.6 oder wenn Sie das Spiel nicht installiert haben.",
-    "latest_version": "Letzte Version"
+      "gc_stable_jar": "Laden Sie den aktuellen stabilen Grasscutter-Build herunter, der eine Jar-Datei und Datendateien enthält.",
-  },
+      "gc_dev_jar": "Laden Sie die neueste Grasscutter-Entwicklungsversion herunter, welche eine Jar-Datei und Datendateien enthält.",
-  "help": {
+      "gc_stable_data": "Laden Sie die stabilen Grasscutter Daten herunter, welche keine Jar-Datei enthalten. Dies ist nützlich zum Aktualisieren.",
-    "port_help_text": "Vergewissern Sie sich, dass es sich um den Port des Dispatch-Servers handelt, nicht um den Port des Spiel-Servers. Dieser ist fast immer '443'.",
+      "gc_dev_data": "Laden Sie die neuesten Grasscutter-Entwicklungsdateien herunter, welche keine Jar-Datei enthält. Dies ist nützlich zum Aktualisieren.",
-    "game_help_text": "Sie müssen keine separate Kopie verwenden, um mit Grasscutter zu spielen. Dies ist entweder für ein Downgrade auf die Version 2.6 oder wenn Sie das Spiel nicht installiert haben.",
+      "resources": "Diese werden auch benötigt, um einen Grasscutter-Server auszuführen. Diese Schaltfläche ist grau, wenn Sie einen bestehenden Ressourcenordner mit Inhalten haben"
-    "gc_stable_jar": "Laden Sie den aktuellen stabilen Grasscutter-Build herunter, der eine Jar-Datei und Datendateien enthält.",
+    }
-    "gc_dev_jar": "Laden Sie die neueste Grasscutter-Entwicklungsversion herunter, welche eine Jar-Datei und Datendateien enthält.",
+  }
-    "gc_stable_data": "Laden Sie die stabilen Grasscutter Daten herunter, welche keine Jar-Datei enthalten. Dies ist nützlich zum Aktualisieren.",
-    "gc_dev_data": "Laden Sie die neuesten Grasscutter-Entwicklungsdateien herunter, welche keine Jar-Datei enthält. Dies ist nützlich zum Aktualisieren.",
-    "resources": "Diese werden auch benötigt, um einen Grasscutter-Server auszuführen. Diese Schaltfläche ist grau, wenn Sie einen bestehenden Ressourcenordner mit Inhalten haben",
-    "emergency_metadata": "Im Fall, dass etwas schief laufen sollte, kannst du deine Metadaten auf die letzte offizielle Version zurücksetzen",
-    "use_proxy": "Nutze den internen Proxy von Cultivation. Du solltest dies aktivieren, es sei denn du nutzt Programme wie Fiddler",
-    "patch_metadata": "Patche und aktualisiere deine Metadaten automatisch. Solange du nicht mit einer alten/nicht offiziellen Version spielst oder deine Metadaten manuell gepatcht hast, sollte dies aktiviert sein."
-  },
-  "swag": {
-    "akebi_name": "Akebi",
-    "migoto_name": "Migoto",
-    "reshade_name": "Reshade",
-    "akebi": "Akebi.exe festlegen",
-    "migoto": "Migoto.exe festlegen",
-    "reshade": "Reshade injector festlegen"
-  }
-}

src-tauri/lang/en.json

@@ -13,22 +13,16 @@
   "options": {
     "enabled": "Enabled",
     "disabled": "Disabled",
-    "game_path": "Set Game Install Path",
+    "game_exec": "Set Game Executable",
-    "game_command": "Game Launch Command",
+    "game_version": "Set Game Version",
-    "game_executable": "Set Game Executable",
+    "emergency_metadata": "Emergency Metadata Restore",
-    "recover_metadata": "Emergency Metadata Recovery",
     "grasscutter_jar": "Set Grasscutter JAR",
     "toggle_encryption": "Toggle Encryption",
-    "install_certificate": "Install Proxy Certificate",
     "java_path": "Set Custom Java Path",
     "grasscutter_with_game": "Automatically launch Grasscutter with game",
     "language": "Select Language",
     "background": "Set Custom Background (link or image file)",
-    "theme": "Set Theme",
+    "theme": "Set Theme"
-    "patch_metadata": "Automatically Patch Metadata",
-    "use_proxy": "Use Internal Proxy",
-    "wipe_login": "Wipe Login Cache",
-    "horny_mode": "Horny Mode"
   },
   "downloads": {
     "grasscutter_stable_data": "Download Grasscutter Stable Data",
@@ -39,8 +33,7 @@
     "grasscutter_latest": "Download Grasscutter Latest",
     "grasscutter_stable_update": "Update Grasscutter Stable",
     "grasscutter_latest_update": "Update Grasscutter Latest",
-    "resources": "Download Grasscutter Resources",
+    "resources": "Download Grasscutter Resources"
-    "game": "Download Game"
   },
   "download_status": {
     "downloading": "Downloading",
@@ -52,8 +45,7 @@
   "components": {
     "select_file": "Select file or folder...",
     "select_folder": "Select folder...",
-    "download": "Download",
+    "download": "Download"
-    "install": "Install"
   },
   "news": {
     "latest_commits": "Recent Commits",
@@ -66,18 +58,9 @@
     "gc_dev_jar": "Download the latest development Grasscutter build, which includes jar file and data files.",
     "gc_stable_data": "Download the current stable Grasscutter data files, which does not come with a jar file. This is useful for updating.",
     "gc_dev_data": "Download the latest development Grasscutter data files, which does not come with a jar file. This is useful for updating.",
-    "encryption": "This should usually be disabled.",
+    "resources": "These are also required to run a Grasscutter server. This button will be grey if you have an existing resources folder with contents inside"
-    "resources": "These are also required to run a Grasscutter server. This button will be grey if you have an existing resources folder with contents inside",
-    "emergency_metadata": "In case something went wrong, restore your metadata to the latest official versions metadata.",
-    "use_proxy": "Use the Cultivation internal proxy. You should have this enabled unless you use something like Fiddler",
-    "patch_metadata": "Patch and unpatch your game metadata automatically. Unless playing with old/non-official versions, or you have manually patched your metadata, this should be enabled."
   },
   "swag": {
-    "akebi_name": "Akebi",
+    "akebi": "Set Akebi Executable"
-    "migoto_name": "Migoto",
-    "reshade_name": "Reshade",
-    "akebi": "Set Akebi Executable",
-    "migoto": "Set 3DMigoto Executable",
-    "reshade": "Set Reshade Injector"
   }
-}
+}

src-tauri/lang/es.json

@@ -1,69 +0,0 @@
-{
-  "lang_name": "Español",
-  "main": {
-    "title": "Cultivation",
-    "launch_button": "Launch",
-    "gc_enable": "Conectar Via Grasscutter",
-    "https_enable": "Usar HTTPS",
-    "ip_placeholder": "Dirección del servidor...",
-    "port_placeholder": "Puerto...",
-    "files_downloading": "Archivos Descargandose: ",
-    "files_extracting": "Archivos Extrayendose: "
-  },
-  "options": {
-    "enabled": "Activado",
-    "disabled": "Desactivado",
-    "game_path": "Ruta de instalación del juego",
-    "game_executable": "Establecer ejecutable del juego",
-    "recover_metadata": "Recuperación de Metadatos de Emergencia",
-    "grasscutter_jar": "Establecer JAR de Grasscutter",
-    "toggle_encryption": "Alternar Cifrado",
-    "install_certificate": "Instalar Certificado Proxie",
-    "java_path": "Establecer Ruta Personalizada de Java",
-    "grasscutter_with_game": "Iniciar automáticamente Grasscutter con el juego",
-    "language": "Seleccionar Idioma",
-    "background": "Establecer Fondo Personalizado (link o archivo de imagen)",
-    "theme": "Establecer Tema"
-  },
-  "downloads": {
-    "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",
-    "grasscutter_latest_data_update": "Actualizar Datos más Recientes de Grasscutter",
-    "grasscutter_stable": "Descargar Grasscutter Estable",
-    "grasscutter_latest": "Descargar Grasscutter más reciente",
-    "grasscutter_stable_update": "Actualizar Grasscutter Estable",
-    "grasscutter_latest_update": "Actualizar Grasscutter más reciente",
-    "resources": "Descargar Recursos de Grasscutter",
-    "game": "Descarga el juego"
-  },
-  "download_status": {
-    "downloading": "Descargando",
-    "extracting": "Extrayendo",
-    "error": "Error",
-    "finished": "Finalizado",
-    "stopped": "Detenido"
-  },
-  "components": {
-    "select_file": "Seleccionar el archivo o carpeta...",
-    "select_folder": "Seleccionar la carpeta...",
-    "download": "Descargar",
-    "install": "Instalar"
-  },
-  "news": {
-    "latest_commits": "Commits Recientes",
-    "latest_version": "Ultima versión"
-  },
-  "help": {
-    "port_help_text": "Asegúrese de que este sea el Dispatch server port, no el Game server port. Este es casi siempre '443'.",
-    "game_help_text": "No necesitas usar una copia separada para jugar con Grasscutter. Esto es para cambiar a 2.6 o si no tienes el juego instalado.",
-    "gc_stable_jar": "Descargue la versión Estable actual de Grasscutter, que incluye el archivo jar y los archivos de datos.",
-    "gc_dev_jar": "Descargue la última versión de Desarrollo de Grasscutter, que incluye archivos jar y archivos de datos.",
-    "gc_stable_data": "Descargue los archivos de Datos Estables actuales de Grasscutter, que no vienen con un archivo jar. Esto es útil para actualizar.",
-    "gc_dev_data": "Descargue los últimos archivos de Datos de Desarrollo de Grasscutter, que no vienen con un archivo jar. Esto es útil para actualizar.",
-    "resources": "Estos también son necesarios para ejecutar un servidor Grasscutter. Este botón estará gris si tiene una carpeta de recursos existente con contenido dentro."
-  },
-  "swag": {
-    "akebi": "Establecer el ejecutable de Akebi"
-  }
-}

src-tauri/lang/fr.json

@@ -13,7 +13,7 @@
   "options": {
     "enabled": "active",
     "disabled": "desactiver",
-    "game_executable": "definir l'executable du jeu",
+    "game_exec": "definir l'executable du jeu",
     "grasscutter_jar": "definir le Jar Grasscutter",
     "toggle_encryption": "activer l'encryption",
     "java_path": "definir un chemin java personnalise",

src-tauri/lang/id.json

@@ -10,7 +10,7 @@
     "files_extracting": "MengExtract File: "
   },
   "options": {
-    "game_executable": "Set Game Executable",
+    "game_exec": "Set Game Executable",
     "grasscutter_jar": "Path ke Grasscutter JAR",
     "java_path": "Atur kustom Java path",
     "grasscutter_with_game": "Otomatis Menjalankan Grasscutter Dengan Game",
@@ -18,7 +18,7 @@
     "background": "Atur Kustom Latar Belakang (link atau gambar file)",
     "theme": "Atur Tema"
   },
-  "downloads": {
+  "downloads": {  
     "grasscutter_stable_data": "Sedang Mendownload Grasscutter Versi Stabil",
     "grasscutter_latest_data": "Sedang Mendownload Grasscutter Data Terbaru",
     "grasscutter_stable_data_update": "Memperbaharui Grasscutter Data Stabil",
@@ -54,4 +54,4 @@
     "gc_dev_data": "Unduh file data Grasscutter Development saat ini, dimana Tidak Ada JAR file. Ini Berguna Untuk memperbarui.",
     "resources": "Ini juga diperlukan untuk menjalankan server Grasscutter. Tombol ini akan berwarna abu-abu jika Anda memiliki folder Resource yang ada dengan File di dalamnya"
   }
-}
+}

src-tauri/lang/lv.json

@@ -13,7 +13,7 @@
   "options": {
     "enabled": "Iespējots",
     "disabled": "Atspējots",
-    "game_executable": "Iestatīt spēles izpildāmu",
+    "game_exec": "Iestatīt spēles izpildāmu",
     "grasscutter_jar": "Iestatiet Grasscutter JAR",
     "toggle_encryption": "Pārslēgt Šifrēšanu",
     "java_path": "Iestatiet pielāgotu Java ceļu",

src-tauri/lang/nl.json

@@ -1,80 +0,0 @@
-{
-  "lang_name": "Nederlands",
-  "main": {
-    "title": "Cultivation",
-    "launch_button": "Start",
-    "gc_enable": "Verbind Met Grasscutter",
-    "https_enable": "Gebruik HTTPS",
-    "ip_placeholder": "Server Address...",
-    "port_placeholder": "Poort...",
-    "files_downloading": "Bestanden Aan Downloaden: ",
-    "files_extracting": "Bestanden Uitpakken: "
-  },
-  "options": {
-    "enabled": "Ingeschakeld",
-    "disabled": "Uitgeschakeld",
-    "game_path": "Spel Installatie Pad Instellen",
-    "game_executable": "Stel De Exe Van Het Spel In",
-    "recover_metadata": "Noodherstel Van De Metadata",
-    "grasscutter_jar": "Stel De Grasscutter JAR In",
-    "toggle_encryption": "Versleuteling Inschakelen",
-    "install_certificate": "Proxy-certificaat installeren",
-    "java_path": "Aangepast Java-pad Instellen",
-    "grasscutter_with_game": "Start Automatisch Grasscutter Met Spel",
-    "language": "Selecteer Taal",
-    "background": "Aangepaste Achtergrond Instellen (link of afbeeldingsbestand)",
-    "theme": "Thema instellen",
-    "patch_metadata": "Metadata Automatisch Bijwerken",
-    "use_proxy": "Gebruik Interne Proxy"
-  },
-  "downloads": {
-    "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",
-    "grasscutter_latest_data_update": "Nieuwste gegevens Van Grasscutter bijwerken",
-    "grasscutter_stable": "Download Stabiele Versie Van Grasscutter",
-    "grasscutter_latest": "Download De Nieuwste Versie Van Grasscutter",
-    "grasscutter_stable_update": "Update Grasscutter Naar De Stabiele Versie",
-    "grasscutter_latest_update": "Update Grasscutter Naar De Nieuwste Versie",
-    "resources": "Download Grasscutter bronnen",
-    "game": "Download Spel"
-  },
-  "download_status": {
-    "downloading": "Aan Het Downloading",
-    "extracting": "Uitpakken",
-    "error": "Fout",
-    "finished": "Voltooid",
-    "stopped": "Gestopt"
-  },
-  "components": {
-    "select_file": "Select file or folder...",
-    "select_folder": "Select folder...",
-    "download": "Download",
-    "install": "Install"
-  },
-  "news": {
-    "latest_commits": "Recente Opdrachten",
-    "latest_version": "Nieuwste Versie"
-  },
-  "help": {
-    "port_help_text": "Zorg ervoor dat dit de Dispatch server poort is, niet de Game server poort. Dit is bijna altijd '443'.",
-    "game_help_text": "U hoeft geen aparte kopie te gebruiken om met Grasscutter te spelen. Dit is voor downgraden naar 2.6 of als u het spel niet geinstalleerd heeft.",
-    "gc_stable_jar": "Download de huidige stabiele Grasscutter build, die jar file en data bestanden bevat.",
-    "gc_dev_jar": "Download de laatste ontwikkeling Grasscutter build, die jar file en data  bestanden bevat.",
-    "gc_stable_data": "Download de huidige stabiele versie van de Grasscutter data bestanden, die niet met een jar file komen. Dit is handig voor het bijwerken.",
-    "gc_dev_data": "Download de nieuwste versie van de Grasscutter data bestanden, die niet met een jar file komen. Dit is handig voor het bijwerken.",
-    "encryption": "Dit wordt meestal uitgeschakeld.",
-    "resources": "Deze zijn ook nodig om een Grasscutter server te draaien. Deze knop zal grijs zijn als u een bestaande resources map heeft met inhoud erin",
-    "emergency_metadata": "Voor het geval er iets fout is gegaan, herstel uw metadata naar de laatste offici<63>le versies metadata.",
-    "use_proxy": "Gebruik de Cultivation interne proxy. U zou dit ingeschakeld moeten hebben, tenzij u iets als Fiddler gebruikt",
-    "patch_metadata": "Patch en unpatch je spel metadata automatisch. Tenzij je met oude/niet-offici<63>le versies speelt, of je hebt je metadata handmatig gepatcht, zou dit ingeschakeld moeten zijn."
-  },
-  "swag": {
-    "akebi_name": "Akebi",
-    "migoto_name": "Migoto",
-    "reshade_name": "Reshade",
-    "akebi": "Stel Akebi Exe Bestand In",
-    "migoto": "Stel 3DMigoto Exe Bestand In",
-    "reshade": "Stel Reshade Injector In"
-  }
-}

src-tauri/lang/ru.json

@@ -1,80 +1,61 @@
-{
+{
-  "lang_name": "Русский",
+  "lang_name": "Русский",
-  "main": {
+  "main": {
-    "title": "Cultivation",
+    "title": "Cultivation",
-    "launch_button": "Запустить",
+    "launch_button": "Запустить",
-    "gc_enable": "Подключиться с Grasscutter",
+    "gc_enable": "Подключиться с Grasscutter",
-    "https_enable": "Исп. HTTPS",
+    "https_enable": "Исп. HTTPS",
-    "ip_placeholder": "Айпи адрес...",
+    "ip_placeholder": "Айпи адрес...",
-    "port_placeholder": "Порт...",
+    "port_placeholder": "Порт...",
-    "files_downloading": "Файлов скачано: ",
+    "files_downloading": "Файлов скачано: ",
-    "files_extracting": "Извлечено файлов: "
+    "files_extracting": "Извлечено файлов: "
-  },
+  },
-  "options": {
+  "options": {
-    "enabled": "Включено",
+    "enabled": "Включено",
-    "disabled": "Выключено",
+    "disabled": "Выключено",
-    "game_path": "Установить путь к файлам игры",
+    "game_exec": "Установить исполняемый файл игры",
-    "game_executable": "Установить исполняемый файл игры",
+    "grasscutter_jar": "Установить Grasscutter JAR",
-    "recover_metadata": "Принудительное восстановление Метаданных",
+    "toggle_encryption": "Переключить шифрование",
-    "grasscutter_jar": "Установить Grasscutter JAR",
+    "java_path": "Установить пользовательский путь Java",
-    "toggle_encryption": "Переключить шифрование",
+    "grasscutter_with_game": "Автоматически запускать Grasscutter вместе с игрой",
-    "install_certificate": "Установить сертификат для работы Прокси",
+    "language": "Установить язык",
-    "java_path": "Установить пользовательский путь Java",
+    "background": "Установить свой фон (ссылка или файл)",
-    "grasscutter_with_game": "Автоматически запускать Grasscutter вместе с игрой",
+    "theme": "Установить тему"
-    "language": "Установить язык",
+  },
-    "background": "Установить свой фон (ссылка или файл)",
+  "downloads": {
-    "theme": "Установить тему",
+    "grasscutter_stable_data": "Скачать стабильные данные Grasscutter",
-    "patch_metadata": "Автоматический патч Метаданных при запуске",
+    "grasscutter_latest_data": "Скачать последние данные Grasscutter",
-    "use_proxy": "Использовать встроенный Прокси"
+    "grasscutter_stable_data_update": "Обновить стабильные данные Grasscutter",
-  },
+    "grasscutter_latest_data_update": "Обновить последние данные Grasscutter",
-  "downloads": {
+    "grasscutter_stable": "Скачать стабильную версию Grasscutter",
-    "grasscutter_stable_data": "Скачать стабильные данные Grasscutter",
+    "grasscutter_latest": "Скачать последнюю версию Grasscutter",
-    "grasscutter_latest_data": "Скачать последние данные Grasscutter",
+    "grasscutter_stable_update": "Обновить стабильную версию Grasscutter",
-    "grasscutter_stable_data_update": "Обновить стабильные данные Grasscutter",
+    "grasscutter_latest_update": "Обновить последнюю версию Grasscutter",
-    "grasscutter_latest_data_update": "Обновить последние данные Grasscutter",
+    "resources": "Скачать ресурсы Grasscutter"
-    "grasscutter_stable": "Скачать стабильную версию Grasscutter",
+  },
-    "grasscutter_latest": "Скачать последнюю версию Grasscutter",
+  "download_status": {
-    "grasscutter_stable_update": "Обновить стабильную версию Grasscutter",
+    "downloading": "Скачивание",
-    "grasscutter_latest_update": "Обновить последнюю версию Grasscutter",
+    "extracting": "Извлечение",
-    "resources": "Скачать ресурсы Grasscutter",
+    "error": "Ошибка",
-    "game": "Скачать Игру"
+    "finished": "Закончено",
-  },
+    "stopped": "Остановлено"
-  "download_status": {
+  },
-    "downloading": "Скачивание",
+  "components": {
-    "extracting": "Извлечение",
+    "select_file": "Выберите файл или папку...",
-    "error": "Ошибка",
+    "select_folder": "Выберите папку...",
-    "finished": "Закончено",
+    "download": "Скачать"
-    "stopped": "Остановлено"
+  },
-  },
+  "news": {
-  "components": {
+    "latest_commits": "Последние коммиты",
-    "select_file": "Выберите файл или папку...",
+    "latest_version": "Последняя версия"
-    "select_folder": "Выберите папку...",
+  },
-    "download": "Скачать",
+  "help": {
-    "install": "Установить"
+    "port_help_text": "Убедитесь, что это порт Dispatch-сервера, не порт игрового сервера. Обычно это '443'.",
-  },
+    "game_help_text": "Вам не нужно устанавливать еще одну копию, что бы играть с Grascutter. Это нужно или для версии 2.6, или если у Вас не установлена игра.",
-  "news": {
+    "gc_stable_jar": "Скачать последнюю стабильную версию Grasscutter, которая содержит jar файл и данные.",
-    "latest_commits": "Последние коммиты",
+    "gc_dev_jar": "Скачать последнюю версию для разработки Grasscutter, которая содержит jar файл и данные.",
-    "latest_version": "Последняя версия"
+    "gc_stable_data": "Скачать стабильные данные Grasscutter, в которой нету jar файла. Это полезно для обновления.",
-  },
+    "gc_dev_data": "Скачать последнюю версию для разработки Grasscutter, в которой нету jar файла. Это полезно для обновления.",
-  "help": {
+    "resources": "Это необходимо для запуска сервера Grasscutter. Эта кнопка будет серой, если у Вас уже есть не пустая папка с ресурсами."
-    "port_help_text": "Убедитесь, что это порт Dispatch-сервера, не порт игрового сервера. Обычно это '443'.",
+  }
-    "game_help_text": "Вам не нужно устанавливать еще одну копию, что бы играть с Grascutter. Это нужно или для версии 2.6, или если у Вас не установлена игра.",
+}
-    "gc_stable_jar": "Скачать последнюю стабильную версию Grasscutter, которая содержит jar файл и данные.",
-    "gc_dev_jar": "Скачать последнюю версию для разработки Grasscutter, которая содержит jar файл и данные.",
-    "gc_stable_data": "Скачать стабильные данные Grasscutter, в которой нету jar файла. Это полезно для обновления.",
-    "gc_dev_data": "Скачать последнюю версию для разработки Grasscutter, в которой нету jar файла. Это полезно для обновления.",
-    "encryption": "Обычно это должно быть выключено.",
-    "resources": "Это необходимо для запуска сервера Grasscutter. Эта кнопка будет серой, если у Вас уже есть не пустая папка с ресурсами.",
-    "emergency_metadata": "Если что-то пошло не так, восстановит Метаданные до последней официальной версии.",
-    "use_proxy": "Использовать встроенный Прокси. Отключите если используете Fiddler или подобную программу",
-    "patch_metadata": "Патчит и восстанавливает Метаданные автоматически. Если вы не играете на старых/модифицированых версиях, или сами в ручную патчите Метаданные, эта опция должна быть включена."
-  },
-  "swag": {
-    "akebi_name": "Akebi",
-    "migoto_name": "Migoto",
-    "reshade_name": "Reshade",
-    "akebi": "Путь к исполняемому файлу Akebi",
-    "migoto": "Путь к исполняемому файлу 3DMigoto ",
-    "reshade": "Путь к инжектору Reshade"
-  }
-}

src-tauri/lang/vi.json

@@ -3,70 +3,59 @@
   "main": {
     "title": "Cultivation",
     "launch_button": "Khởi Chạy",
-    "gc_enable": "Kết nối qua Grasscutter",
+    "gc_enable": "Kết nối đến Grasscutter",
-    "https_enable": "Dùng HTTPS",
+    "https_enable": "Sử dụng HTTPS",
     "ip_placeholder": "Địa chỉ máy chủ...",
     "port_placeholder": "Cổng...",
-    "files_downloading": "Đang tải tập tin: ",
+    "files_downloading": "Đang tải file: ",
-    "files_extracting": "Đang giải nén tập tin: "
+    "files_extracting": "Đang giải nén tệp tin: "
   },
   "options": {
     "enabled": "Bật",
     "disabled": "Tắt",
-    "game_path": "Đường dẫn cài game",
+    "game_exec": "Đường dẫn đến GenshinImpact.exe",
-    "game_executable": "Tập tin thực thi game",
+    "grasscutter_jar": "Đường dẫn đến Grasscutter.jar",
-    "recover_metadata": "Khôi phục Metadata khẩn cấp",
+    "toggle_encryption": "Bật/Tắt mã hoá",
-    "grasscutter_jar": "Tập tin JAR Grasscutter",
+    "java_path": "Đường dẫn Java tuỳ chỉnh",
-    "toggle_encryption": "Bật/tắt mã hóa",
+    "grasscutter_with_game": "Tự động khởi chạy Grasscutter cùng game",
-    "install_certificate": "Cài chứng chỉ proxy",
-    "java_path": "Đường dẫn Java tùy chỉnh",
-    "grasscutter_with_game": "Tự động chạy Grasscutter cùng với game",
     "language": "Chọn ngôn ngữ",
-    "background": "Hình nền tùy chỉnh (liên kết hoặc tập tin hình ảnh)",
+    "background": "Ảnh nền tuỳ chỉnh (đường dẫn hoặc tệp tin ảnh)",
-    "theme": "Giao diện",
+    "theme": "Chọn giao diện"
-    "patch_metadata": "Tự động sửa Metadata",
-    "use_proxy": "Sử dụng proxy nội bộ"
   },
   "downloads": {
-    "grasscutter_stable_data": "Tải dữ liệu Grasscutter bản ổn định",
+    "grasscutter_stable_data": "Tải xuống dữ liệu Grasscutter bản ổn định",
-    "grasscutter_latest_data": "Tải dữ liệu Grasscutter bản mới nhất",
+    "grasscutter_latest_data": "Tải xuống 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",
     "grasscutter_latest_data_update": "Cập nhật dữ liệu Grasscutter bản mới nhất",
-    "grasscutter_stable": "Tải Grasscutter bản ổn định",
+    "grasscutter_stable": "Tải xuống Grasscutter phiên bản ổn định",
-    "grasscutter_latest": "Tải Grasscutter bản mới nhất",
+    "grasscutter_latest": "Tải xuống Grasscutter phiển bản mới nhất",
-    "grasscutter_stable_update": "Cập nhật Grasscutter bản ổn định",
+    "grasscutter_stable_update": "Cập nhật Grasscutter ổn định",
-    "grasscutter_latest_update": "Cập nhật Grasscutter bản mới nhất",
+    "grasscutter_latest_update": "Cập nhật Grasscutter mới nhất",
-    "resources": "Tải tài nguyên Grasscutter",
+    "resources": "Tải xuống tài nguyên cho Grasscutter"
-    "game": "Tải game"
   },
   "download_status": {
-    "downloading": "Đang tải xuống",
+    "downloading": "Đang tải",
     "extracting": "Đang giải nén",
     "error": "Lỗi",
-    "finished": "Hoàn thành",
+    "finished": "Đã xong",
     "stopped": "Đã dừng"
   },
   "components": {
-    "select_file": "Chọn tập tin hoặc thư mục...",
+    "select_file": "Chọn tệp tin hoặc thư mục...",
     "select_folder": "Chọn thư mục...",
-    "download": "Tải xuống",
+    "download": "Tải xuống"
-    "install": "Cài đặt"
   },
   "news": {
-    "latest_commits": "Thay Đổi Gần Đây",
+    "latest_commits": "Cập nhật gần đây",
-    "latest_version": "Phiên Bản Mới Nhất"
+    "latest_version": "Phiên bản mới nhất"
   },
   "help": {
-    "port_help_text": "Hãy đảm bảo đây là cổng của máy chủ Dispatch, không phải cổng của máy chủ game. Thường sẽ là '443'.",
+    "port_help_text": "Đảm bảo đây là cổng của server Dispatch, không phải cổng của server Game. Thường là '443'.",
-    "game_help_text": "Bạn không cần phải sử dụng một bản sao riêng để chơi với Grasscutter. Việc này chỉ xảy ra nếu bạn hạ phiên bản xuống 2.6 hoặc chưa cài game.",
+    "game_help_text": "Bạn không cần phải sử dụng một bản sao riêng để chơi với Grasscutter. Việc này chỉ xảy ra nếu bạn hạ phiên bản xuống 2.6 hoặc chưa cài đặt trò chơi.",
-    "gc_stable_jar": "Tải xuống phiên bản ổn định của Grasscutter, bao gồm tập tin jar và các tệp dữ liệu.",
+    "gc_stable_jar": "Tải xuống phiên bản ổn định của Grasscutter, bảo gồm file jar và các file dữ liệu.",
-    "gc_dev_jar": "Tải xuống phiên bản phát triển mới nhất của Grasscutter, bao gồm tập tin jar và các tệp dữ liệu.",
+    "gc_dev_jar": "Tải xuống phiên bản phát triển mới nhất của Grasscutter, bảo gồm file jar và các file dữ liệu.",
-    "gc_stable_data": "Tải xuống tệp dữ liệu phiên bản ổn định hiện hành của Grasscutter. Bản này không đi kèm với tập tin jar, hữu dụng khi muốn cập nhật.",
+    "gc_stable_data": "Tải xuống bản ổn định các tệp dữ liệu của Grasscutter, không bao gồm file jar. Phù hợp khi cập nhật.",
-    "gc_dev_data": "Tải xuống tệp dữ liệu phiên bản mới nhất của Grasscutter. Bản này không đi kèm với tập tin jar, hữu dụng khi muốn cập nhật.",
+    "gc_dev_data": "Tải xuống bản phát triển mới nhất các tệp dữ liệu của Grasscutter, không bao gồm file jar. Phù hợp khi cập nhật.",
-    "resources": "Chúng được yêu cầu để chạy máy chủ Grasscutter. Nút này sẽ có màu xám nếu bạn đã có sẵn một thư mục tài nguyên có nội dung bên trong"
+    "resources": "Chúng được yêu cầu để chạy máy chủ Grasscutter. Nút này sẽ có màu xám nếu bạn có một thư mục tài nguyên có nội dung bên trong"
-  },
-  "swag": {
-    "akebi": "Tập tin thực thi Akebi",
-    "migoto": "Tập tin thực thi 3dMigoto"
   }
-}
+}

src-tauri/mhycrypto/aes.c

@@ -1,387 +0,0 @@
-// Simple, thoroughly commented implementation of 128-bit AES / Rijndael using C
-// Chris Hulbert - chris.hulbert@gmail.com - http://splinter.com.au/blog
-// References:
-// http://en.wikipedia.org/wiki/Advanced_Encryption_Standard
-// http://en.wikipedia.org/wiki/Rijndael_key_schedule
-// http://en.wikipedia.org/wiki/Rijndael_mix_columns
-// http://en.wikipedia.org/wiki/Rijndael_S-box
-
-// This code is public domain, or any OSI-approved license, your choice. No warranty.
-
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "aes.h"
-
-typedef unsigned char byte;
-
-// Here are all the lookup tables for the row shifts, rcon, s-boxes, and galois field multiplications
-static const byte shift_rows_table[] = {0, 5, 10, 15, 4, 9, 14, 3, 8, 13, 2, 7, 12, 1, 6, 11};
-static const byte shift_rows_table_inv[] = {0, 13, 10, 7, 4, 1, 14, 11, 8, 5, 2, 15, 12, 9, 6, 3};
-static const byte lookup_rcon[] = {
-    0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a};
-static const byte lookup_sbox[] = {
-    0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,
-    0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,
-    0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
-    0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,
-    0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,
-    0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
-    0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8,
-    0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,
-    0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
-    0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,
-    0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79,
-    0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
-    0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a,
-    0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,
-    0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
-    0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16};
-static const byte lookup_sbox_inv[] = {
-    0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb,
-    0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87, 0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb,
-    0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e,
-    0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25,
-    0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92,
-    0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84,
-    0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06,
-    0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02, 0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b,
-    0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73,
-    0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e,
-    0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89, 0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b,
-    0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4,
-    0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f,
-    0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d, 0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef,
-    0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61,
-    0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d};
-static const byte lookup_g2[] = {
-    0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0e, 0x10, 0x12, 0x14, 0x16, 0x18, 0x1a, 0x1c, 0x1e,
-    0x20, 0x22, 0x24, 0x26, 0x28, 0x2a, 0x2c, 0x2e, 0x30, 0x32, 0x34, 0x36, 0x38, 0x3a, 0x3c, 0x3e,
-    0x40, 0x42, 0x44, 0x46, 0x48, 0x4a, 0x4c, 0x4e, 0x50, 0x52, 0x54, 0x56, 0x58, 0x5a, 0x5c, 0x5e,
-    0x60, 0x62, 0x64, 0x66, 0x68, 0x6a, 0x6c, 0x6e, 0x70, 0x72, 0x74, 0x76, 0x78, 0x7a, 0x7c, 0x7e,
-    0x80, 0x82, 0x84, 0x86, 0x88, 0x8a, 0x8c, 0x8e, 0x90, 0x92, 0x94, 0x96, 0x98, 0x9a, 0x9c, 0x9e,
-    0xa0, 0xa2, 0xa4, 0xa6, 0xa8, 0xaa, 0xac, 0xae, 0xb0, 0xb2, 0xb4, 0xb6, 0xb8, 0xba, 0xbc, 0xbe,
-    0xc0, 0xc2, 0xc4, 0xc6, 0xc8, 0xca, 0xcc, 0xce, 0xd0, 0xd2, 0xd4, 0xd6, 0xd8, 0xda, 0xdc, 0xde,
-    0xe0, 0xe2, 0xe4, 0xe6, 0xe8, 0xea, 0xec, 0xee, 0xf0, 0xf2, 0xf4, 0xf6, 0xf8, 0xfa, 0xfc, 0xfe,
-    0x1b, 0x19, 0x1f, 0x1d, 0x13, 0x11, 0x17, 0x15, 0x0b, 0x09, 0x0f, 0x0d, 0x03, 0x01, 0x07, 0x05,
-    0x3b, 0x39, 0x3f, 0x3d, 0x33, 0x31, 0x37, 0x35, 0x2b, 0x29, 0x2f, 0x2d, 0x23, 0x21, 0x27, 0x25,
-    0x5b, 0x59, 0x5f, 0x5d, 0x53, 0x51, 0x57, 0x55, 0x4b, 0x49, 0x4f, 0x4d, 0x43, 0x41, 0x47, 0x45,
-    0x7b, 0x79, 0x7f, 0x7d, 0x73, 0x71, 0x77, 0x75, 0x6b, 0x69, 0x6f, 0x6d, 0x63, 0x61, 0x67, 0x65,
-    0x9b, 0x99, 0x9f, 0x9d, 0x93, 0x91, 0x97, 0x95, 0x8b, 0x89, 0x8f, 0x8d, 0x83, 0x81, 0x87, 0x85,
-    0xbb, 0xb9, 0xbf, 0xbd, 0xb3, 0xb1, 0xb7, 0xb5, 0xab, 0xa9, 0xaf, 0xad, 0xa3, 0xa1, 0xa7, 0xa5,
-    0xdb, 0xd9, 0xdf, 0xdd, 0xd3, 0xd1, 0xd7, 0xd5, 0xcb, 0xc9, 0xcf, 0xcd, 0xc3, 0xc1, 0xc7, 0xc5,
-    0xfb, 0xf9, 0xff, 0xfd, 0xf3, 0xf1, 0xf7, 0xf5, 0xeb, 0xe9, 0xef, 0xed, 0xe3, 0xe1, 0xe7, 0xe5};
-static const byte lookup_g3[] = {
-    0x00, 0x03, 0x06, 0x05, 0x0c, 0x0f, 0x0a, 0x09, 0x18, 0x1b, 0x1e, 0x1d, 0x14, 0x17, 0x12, 0x11,
-    0x30, 0x33, 0x36, 0x35, 0x3c, 0x3f, 0x3a, 0x39, 0x28, 0x2b, 0x2e, 0x2d, 0x24, 0x27, 0x22, 0x21,
-    0x60, 0x63, 0x66, 0x65, 0x6c, 0x6f, 0x6a, 0x69, 0x78, 0x7b, 0x7e, 0x7d, 0x74, 0x77, 0x72, 0x71,
-    0x50, 0x53, 0x56, 0x55, 0x5c, 0x5f, 0x5a, 0x59, 0x48, 0x4b, 0x4e, 0x4d, 0x44, 0x47, 0x42, 0x41,
-    0xc0, 0xc3, 0xc6, 0xc5, 0xcc, 0xcf, 0xca, 0xc9, 0xd8, 0xdb, 0xde, 0xdd, 0xd4, 0xd7, 0xd2, 0xd1,
-    0xf0, 0xf3, 0xf6, 0xf5, 0xfc, 0xff, 0xfa, 0xf9, 0xe8, 0xeb, 0xee, 0xed, 0xe4, 0xe7, 0xe2, 0xe1,
-    0xa0, 0xa3, 0xa6, 0xa5, 0xac, 0xaf, 0xaa, 0xa9, 0xb8, 0xbb, 0xbe, 0xbd, 0xb4, 0xb7, 0xb2, 0xb1,
-    0x90, 0x93, 0x96, 0x95, 0x9c, 0x9f, 0x9a, 0x99, 0x88, 0x8b, 0x8e, 0x8d, 0x84, 0x87, 0x82, 0x81,
-    0x9b, 0x98, 0x9d, 0x9e, 0x97, 0x94, 0x91, 0x92, 0x83, 0x80, 0x85, 0x86, 0x8f, 0x8c, 0x89, 0x8a,
-    0xab, 0xa8, 0xad, 0xae, 0xa7, 0xa4, 0xa1, 0xa2, 0xb3, 0xb0, 0xb5, 0xb6, 0xbf, 0xbc, 0xb9, 0xba,
-    0xfb, 0xf8, 0xfd, 0xfe, 0xf7, 0xf4, 0xf1, 0xf2, 0xe3, 0xe0, 0xe5, 0xe6, 0xef, 0xec, 0xe9, 0xea,
-    0xcb, 0xc8, 0xcd, 0xce, 0xc7, 0xc4, 0xc1, 0xc2, 0xd3, 0xd0, 0xd5, 0xd6, 0xdf, 0xdc, 0xd9, 0xda,
-    0x5b, 0x58, 0x5d, 0x5e, 0x57, 0x54, 0x51, 0x52, 0x43, 0x40, 0x45, 0x46, 0x4f, 0x4c, 0x49, 0x4a,
-    0x6b, 0x68, 0x6d, 0x6e, 0x67, 0x64, 0x61, 0x62, 0x73, 0x70, 0x75, 0x76, 0x7f, 0x7c, 0x79, 0x7a,
-    0x3b, 0x38, 0x3d, 0x3e, 0x37, 0x34, 0x31, 0x32, 0x23, 0x20, 0x25, 0x26, 0x2f, 0x2c, 0x29, 0x2a,
-    0x0b, 0x08, 0x0d, 0x0e, 0x07, 0x04, 0x01, 0x02, 0x13, 0x10, 0x15, 0x16, 0x1f, 0x1c, 0x19, 0x1a};
-static const byte lookup_g9[] = {
-    0x00, 0x09, 0x12, 0x1b, 0x24, 0x2d, 0x36, 0x3f, 0x48, 0x41, 0x5a, 0x53, 0x6c, 0x65, 0x7e, 0x77,
-    0x90, 0x99, 0x82, 0x8b, 0xb4, 0xbd, 0xa6, 0xaf, 0xd8, 0xd1, 0xca, 0xc3, 0xfc, 0xf5, 0xee, 0xe7,
-    0x3b, 0x32, 0x29, 0x20, 0x1f, 0x16, 0x0d, 0x04, 0x73, 0x7a, 0x61, 0x68, 0x57, 0x5e, 0x45, 0x4c,
-    0xab, 0xa2, 0xb9, 0xb0, 0x8f, 0x86, 0x9d, 0x94, 0xe3, 0xea, 0xf1, 0xf8, 0xc7, 0xce, 0xd5, 0xdc,
-    0x76, 0x7f, 0x64, 0x6d, 0x52, 0x5b, 0x40, 0x49, 0x3e, 0x37, 0x2c, 0x25, 0x1a, 0x13, 0x08, 0x01,
-    0xe6, 0xef, 0xf4, 0xfd, 0xc2, 0xcb, 0xd0, 0xd9, 0xae, 0xa7, 0xbc, 0xb5, 0x8a, 0x83, 0x98, 0x91,
-    0x4d, 0x44, 0x5f, 0x56, 0x69, 0x60, 0x7b, 0x72, 0x05, 0x0c, 0x17, 0x1e, 0x21, 0x28, 0x33, 0x3a,
-    0xdd, 0xd4, 0xcf, 0xc6, 0xf9, 0xf0, 0xeb, 0xe2, 0x95, 0x9c, 0x87, 0x8e, 0xb1, 0xb8, 0xa3, 0xaa,
-    0xec, 0xe5, 0xfe, 0xf7, 0xc8, 0xc1, 0xda, 0xd3, 0xa4, 0xad, 0xb6, 0xbf, 0x80, 0x89, 0x92, 0x9b,
-    0x7c, 0x75, 0x6e, 0x67, 0x58, 0x51, 0x4a, 0x43, 0x34, 0x3d, 0x26, 0x2f, 0x10, 0x19, 0x02, 0x0b,
-    0xd7, 0xde, 0xc5, 0xcc, 0xf3, 0xfa, 0xe1, 0xe8, 0x9f, 0x96, 0x8d, 0x84, 0xbb, 0xb2, 0xa9, 0xa0,
-    0x47, 0x4e, 0x55, 0x5c, 0x63, 0x6a, 0x71, 0x78, 0x0f, 0x06, 0x1d, 0x14, 0x2b, 0x22, 0x39, 0x30,
-    0x9a, 0x93, 0x88, 0x81, 0xbe, 0xb7, 0xac, 0xa5, 0xd2, 0xdb, 0xc0, 0xc9, 0xf6, 0xff, 0xe4, 0xed,
-    0x0a, 0x03, 0x18, 0x11, 0x2e, 0x27, 0x3c, 0x35, 0x42, 0x4b, 0x50, 0x59, 0x66, 0x6f, 0x74, 0x7d,
-    0xa1, 0xa8, 0xb3, 0xba, 0x85, 0x8c, 0x97, 0x9e, 0xe9, 0xe0, 0xfb, 0xf2, 0xcd, 0xc4, 0xdf, 0xd6,
-    0x31, 0x38, 0x23, 0x2a, 0x15, 0x1c, 0x07, 0x0e, 0x79, 0x70, 0x6b, 0x62, 0x5d, 0x54, 0x4f, 0x46};
-static const byte lookup_g11[] = {
-    0x00, 0x0b, 0x16, 0x1d, 0x2c, 0x27, 0x3a, 0x31, 0x58, 0x53, 0x4e, 0x45, 0x74, 0x7f, 0x62, 0x69,
-    0xb0, 0xbb, 0xa6, 0xad, 0x9c, 0x97, 0x8a, 0x81, 0xe8, 0xe3, 0xfe, 0xf5, 0xc4, 0xcf, 0xd2, 0xd9,
-    0x7b, 0x70, 0x6d, 0x66, 0x57, 0x5c, 0x41, 0x4a, 0x23, 0x28, 0x35, 0x3e, 0x0f, 0x04, 0x19, 0x12,
-    0xcb, 0xc0, 0xdd, 0xd6, 0xe7, 0xec, 0xf1, 0xfa, 0x93, 0x98, 0x85, 0x8e, 0xbf, 0xb4, 0xa9, 0xa2,
-    0xf6, 0xfd, 0xe0, 0xeb, 0xda, 0xd1, 0xcc, 0xc7, 0xae, 0xa5, 0xb8, 0xb3, 0x82, 0x89, 0x94, 0x9f,
-    0x46, 0x4d, 0x50, 0x5b, 0x6a, 0x61, 0x7c, 0x77, 0x1e, 0x15, 0x08, 0x03, 0x32, 0x39, 0x24, 0x2f,
-    0x8d, 0x86, 0x9b, 0x90, 0xa1, 0xaa, 0xb7, 0xbc, 0xd5, 0xde, 0xc3, 0xc8, 0xf9, 0xf2, 0xef, 0xe4,
-    0x3d, 0x36, 0x2b, 0x20, 0x11, 0x1a, 0x07, 0x0c, 0x65, 0x6e, 0x73, 0x78, 0x49, 0x42, 0x5f, 0x54,
-    0xf7, 0xfc, 0xe1, 0xea, 0xdb, 0xd0, 0xcd, 0xc6, 0xaf, 0xa4, 0xb9, 0xb2, 0x83, 0x88, 0x95, 0x9e,
-    0x47, 0x4c, 0x51, 0x5a, 0x6b, 0x60, 0x7d, 0x76, 0x1f, 0x14, 0x09, 0x02, 0x33, 0x38, 0x25, 0x2e,
-    0x8c, 0x87, 0x9a, 0x91, 0xa0, 0xab, 0xb6, 0xbd, 0xd4, 0xdf, 0xc2, 0xc9, 0xf8, 0xf3, 0xee, 0xe5,
-    0x3c, 0x37, 0x2a, 0x21, 0x10, 0x1b, 0x06, 0x0d, 0x64, 0x6f, 0x72, 0x79, 0x48, 0x43, 0x5e, 0x55,
-    0x01, 0x0a, 0x17, 0x1c, 0x2d, 0x26, 0x3b, 0x30, 0x59, 0x52, 0x4f, 0x44, 0x75, 0x7e, 0x63, 0x68,
-    0xb1, 0xba, 0xa7, 0xac, 0x9d, 0x96, 0x8b, 0x80, 0xe9, 0xe2, 0xff, 0xf4, 0xc5, 0xce, 0xd3, 0xd8,
-    0x7a, 0x71, 0x6c, 0x67, 0x56, 0x5d, 0x40, 0x4b, 0x22, 0x29, 0x34, 0x3f, 0x0e, 0x05, 0x18, 0x13,
-    0xca, 0xc1, 0xdc, 0xd7, 0xe6, 0xed, 0xf0, 0xfb, 0x92, 0x99, 0x84, 0x8f, 0xbe, 0xb5, 0xa8, 0xa3};
-static const byte lookup_g13[] = {
-    0x00, 0x0d, 0x1a, 0x17, 0x34, 0x39, 0x2e, 0x23, 0x68, 0x65, 0x72, 0x7f, 0x5c, 0x51, 0x46, 0x4b,
-    0xd0, 0xdd, 0xca, 0xc7, 0xe4, 0xe9, 0xfe, 0xf3, 0xb8, 0xb5, 0xa2, 0xaf, 0x8c, 0x81, 0x96, 0x9b,
-    0xbb, 0xb6, 0xa1, 0xac, 0x8f, 0x82, 0x95, 0x98, 0xd3, 0xde, 0xc9, 0xc4, 0xe7, 0xea, 0xfd, 0xf0,
-    0x6b, 0x66, 0x71, 0x7c, 0x5f, 0x52, 0x45, 0x48, 0x03, 0x0e, 0x19, 0x14, 0x37, 0x3a, 0x2d, 0x20,
-    0x6d, 0x60, 0x77, 0x7a, 0x59, 0x54, 0x43, 0x4e, 0x05, 0x08, 0x1f, 0x12, 0x31, 0x3c, 0x2b, 0x26,
-    0xbd, 0xb0, 0xa7, 0xaa, 0x89, 0x84, 0x93, 0x9e, 0xd5, 0xd8, 0xcf, 0xc2, 0xe1, 0xec, 0xfb, 0xf6,
-    0xd6, 0xdb, 0xcc, 0xc1, 0xe2, 0xef, 0xf8, 0xf5, 0xbe, 0xb3, 0xa4, 0xa9, 0x8a, 0x87, 0x90, 0x9d,
-    0x06, 0x0b, 0x1c, 0x11, 0x32, 0x3f, 0x28, 0x25, 0x6e, 0x63, 0x74, 0x79, 0x5a, 0x57, 0x40, 0x4d,
-    0xda, 0xd7, 0xc0, 0xcd, 0xee, 0xe3, 0xf4, 0xf9, 0xb2, 0xbf, 0xa8, 0xa5, 0x86, 0x8b, 0x9c, 0x91,
-    0x0a, 0x07, 0x10, 0x1d, 0x3e, 0x33, 0x24, 0x29, 0x62, 0x6f, 0x78, 0x75, 0x56, 0x5b, 0x4c, 0x41,
-    0x61, 0x6c, 0x7b, 0x76, 0x55, 0x58, 0x4f, 0x42, 0x09, 0x04, 0x13, 0x1e, 0x3d, 0x30, 0x27, 0x2a,
-    0xb1, 0xbc, 0xab, 0xa6, 0x85, 0x88, 0x9f, 0x92, 0xd9, 0xd4, 0xc3, 0xce, 0xed, 0xe0, 0xf7, 0xfa,
-    0xb7, 0xba, 0xad, 0xa0, 0x83, 0x8e, 0x99, 0x94, 0xdf, 0xd2, 0xc5, 0xc8, 0xeb, 0xe6, 0xf1, 0xfc,
-    0x67, 0x6a, 0x7d, 0x70, 0x53, 0x5e, 0x49, 0x44, 0x0f, 0x02, 0x15, 0x18, 0x3b, 0x36, 0x21, 0x2c,
-    0x0c, 0x01, 0x16, 0x1b, 0x38, 0x35, 0x22, 0x2f, 0x64, 0x69, 0x7e, 0x73, 0x50, 0x5d, 0x4a, 0x47,
-    0xdc, 0xd1, 0xc6, 0xcb, 0xe8, 0xe5, 0xf2, 0xff, 0xb4, 0xb9, 0xae, 0xa3, 0x80, 0x8d, 0x9a, 0x97};
-static const byte lookup_g14[] = {
-    0x00, 0x0e, 0x1c, 0x12, 0x38, 0x36, 0x24, 0x2a, 0x70, 0x7e, 0x6c, 0x62, 0x48, 0x46, 0x54, 0x5a,
-    0xe0, 0xee, 0xfc, 0xf2, 0xd8, 0xd6, 0xc4, 0xca, 0x90, 0x9e, 0x8c, 0x82, 0xa8, 0xa6, 0xb4, 0xba,
-    0xdb, 0xd5, 0xc7, 0xc9, 0xe3, 0xed, 0xff, 0xf1, 0xab, 0xa5, 0xb7, 0xb9, 0x93, 0x9d, 0x8f, 0x81,
-    0x3b, 0x35, 0x27, 0x29, 0x03, 0x0d, 0x1f, 0x11, 0x4b, 0x45, 0x57, 0x59, 0x73, 0x7d, 0x6f, 0x61,
-    0xad, 0xa3, 0xb1, 0xbf, 0x95, 0x9b, 0x89, 0x87, 0xdd, 0xd3, 0xc1, 0xcf, 0xe5, 0xeb, 0xf9, 0xf7,
-    0x4d, 0x43, 0x51, 0x5f, 0x75, 0x7b, 0x69, 0x67, 0x3d, 0x33, 0x21, 0x2f, 0x05, 0x0b, 0x19, 0x17,
-    0x76, 0x78, 0x6a, 0x64, 0x4e, 0x40, 0x52, 0x5c, 0x06, 0x08, 0x1a, 0x14, 0x3e, 0x30, 0x22, 0x2c,
-    0x96, 0x98, 0x8a, 0x84, 0xae, 0xa0, 0xb2, 0xbc, 0xe6, 0xe8, 0xfa, 0xf4, 0xde, 0xd0, 0xc2, 0xcc,
-    0x41, 0x4f, 0x5d, 0x53, 0x79, 0x77, 0x65, 0x6b, 0x31, 0x3f, 0x2d, 0x23, 0x09, 0x07, 0x15, 0x1b,
-    0xa1, 0xaf, 0xbd, 0xb3, 0x99, 0x97, 0x85, 0x8b, 0xd1, 0xdf, 0xcd, 0xc3, 0xe9, 0xe7, 0xf5, 0xfb,
-    0x9a, 0x94, 0x86, 0x88, 0xa2, 0xac, 0xbe, 0xb0, 0xea, 0xe4, 0xf6, 0xf8, 0xd2, 0xdc, 0xce, 0xc0,
-    0x7a, 0x74, 0x66, 0x68, 0x42, 0x4c, 0x5e, 0x50, 0x0a, 0x04, 0x16, 0x18, 0x32, 0x3c, 0x2e, 0x20,
-    0xec, 0xe2, 0xf0, 0xfe, 0xd4, 0xda, 0xc8, 0xc6, 0x9c, 0x92, 0x80, 0x8e, 0xa4, 0xaa, 0xb8, 0xb6,
-    0x0c, 0x02, 0x10, 0x1e, 0x34, 0x3a, 0x28, 0x26, 0x7c, 0x72, 0x60, 0x6e, 0x44, 0x4a, 0x58, 0x56,
-    0x37, 0x39, 0x2b, 0x25, 0x0f, 0x01, 0x13, 0x1d, 0x47, 0x49, 0x5b, 0x55, 0x7f, 0x71, 0x63, 0x6d,
-    0xd7, 0xd9, 0xcb, 0xc5, 0xef, 0xe1, 0xf3, 0xfd, 0xa7, 0xa9, 0xbb, 0xb5, 0x9f, 0x91, 0x83, 0x8d};
-
-// Xor's all elements in a n byte array a by b
-static void xor_s(byte * a, const byte *b, int n) {
-	int i;
-	for (i = 0; i < n; i++) {
-		a[i] ^= b[i];
-	}
-}
-
-// Xor the current cipher state by a specific round key
-static void xor_round_key(byte *state, const byte *keys, int round) {
-	xor_s(state, keys + round * 16, 16);
-}
-
-// Apply the rijndael s-box to all elements in an array
-// http://en.wikipedia.org/wiki/Rijndael_S-box
-static void sub_bytes(byte *a, int n) {
-	int i;
-	for (i = 0; i < n; i++) {
-		a[i] = lookup_sbox[a[i]];
-	}
-}
-static void sub_bytes_inv(byte *a, int n) {
-	int i;
-	for (i = 0; i < n; i++) {
-		a[i] = lookup_sbox_inv[a[i]];
-	}
-}
-
-// Perform the core key schedule transform on 4 bytes, as part of the key expansion process
-// http://en.wikipedia.org/wiki/Rijndael_key_schedule#Key_schedule_core
-static void key_schedule_core(byte *a, int i) {
-	byte temp = a[0]; // Rotate the output eight bits to the left
-	a[0] = a[1];
-	a[1] = a[2];
-	a[2] = a[3];
-	a[3] = temp;
-	sub_bytes(a, 4);        // Apply Rijndael's S-box on all four individual bytes in the output word
-	a[0] ^= lookup_rcon[i]; // On just the first (leftmost) byte of the output word, perform the rcon operation with i
-	                        // as the input, and exclusive or the rcon output with the first byte of the output word
-}
-
-// Expand the 16-byte key to 11 round keys (176 bytes)
-// http://en.wikipedia.org/wiki/Rijndael_key_schedule#The_key_schedule
-void oqs_aes128_load_schedule_c(const uint8_t *key, void **_schedule) {
-	*_schedule = malloc(16 * 11);
-	assert(*_schedule != NULL);
-	uint8_t *schedule = (uint8_t *) *_schedule;
-	int bytes = 16;            // The count of how many bytes we've created so far
-	int i = 1;                 // The rcon iteration value i is set to 1
-	int j;                     // For repeating the second stage 3 times
-	byte t[4];                 // Temporary working area known as 't' in the Wiki article
-	memcpy(schedule, key, 16); // The first 16 bytes of the expanded key are simply the encryption key
-
-	while (bytes < 176) {                   // Until we have 176 bytes of expanded key, we do the following:
-		memcpy(t, schedule + bytes - 4, 4); // We assign the value of the previous four bytes in the expanded key to t
-		key_schedule_core(t, i);            // We perform the key schedule core on t, with i as the rcon iteration value
-		i++;                                // We increment i by 1
-		xor_s(t, schedule + bytes - 16, 4);   // We exclusive-or t with the four-byte block 16 bytes before the new expanded key.
-		memcpy(schedule + bytes, t, 4);     // This becomes the next 4 bytes in the expanded key
-		bytes += 4;                         // Keep track of how many expanded key bytes we've added
-
-		// We then do the following three times to create the next twelve bytes
-		for (j = 0; j < 3; j++) {
-			memcpy(t, schedule + bytes - 4, 4); // We assign the value of the previous 4 bytes in the expanded key to t
-			xor_s(t, schedule + bytes - 16, 4);   // We exclusive-or t with the four-byte block n bytes before
-			memcpy(schedule + bytes, t, 4);     // This becomes the next 4 bytes in the expanded key
-			bytes += 4;                         // Keep track of how many expanded key bytes we've added
-		}
-	}
-}
-
-void oqs_aes128_free_schedule_c(void *schedule) {
-	if (schedule != NULL) {
-		free(schedule);
-	}
-}
-
-// Apply the shift rows step on the 16 byte cipher state
-// http://en.wikipedia.org/wiki/Advanced_Encryption_Standard#The_ShiftRows_step
-static void shift_rows(byte *state) {
-	int i;
-	byte temp[16];
-	memcpy(temp, state, 16);
-	for (i = 0; i < 16; i++) {
-		state[i] = temp[shift_rows_table[i]];
-	}
-}
-static void shift_rows_inv(byte *state) {
-	int i;
-	byte temp[16];
-	memcpy(temp, state, 16);
-	for (i = 0; i < 16; i++) {
-		state[i] = temp[shift_rows_table_inv[i]];
-	}
-}
-
-// Perform the mix columns matrix on one column of 4 bytes
-// http://en.wikipedia.org/wiki/Rijndael_mix_columns
-static void mix_col(byte *state) {
-	byte a0 = state[0];
-	byte a1 = state[1];
-	byte a2 = state[2];
-	byte a3 = state[3];
-	state[0] = lookup_g2[a0] ^ lookup_g3[a1] ^ a2 ^ a3;
-	state[1] = lookup_g2[a1] ^ lookup_g3[a2] ^ a3 ^ a0;
-	state[2] = lookup_g2[a2] ^ lookup_g3[a3] ^ a0 ^ a1;
-	state[3] = lookup_g2[a3] ^ lookup_g3[a0] ^ a1 ^ a2;
-}
-
-// Perform the mix columns matrix on each column of the 16 bytes
-static void mix_cols(byte *state) {
-	mix_col(state);
-	mix_col(state + 4);
-	mix_col(state + 8);
-	mix_col(state + 12);
-}
-
-// Perform the inverse mix columns matrix on one column of 4 bytes
-// http://en.wikipedia.org/wiki/Rijndael_mix_columns
-static void mix_col_inv(byte *state) {
-	byte a0 = state[0];
-	byte a1 = state[1];
-	byte a2 = state[2];
-	byte a3 = state[3];
-	state[0] = lookup_g14[a0] ^ lookup_g9[a3] ^ lookup_g13[a2] ^ lookup_g11[a1];
-	state[1] = lookup_g14[a1] ^ lookup_g9[a0] ^ lookup_g13[a3] ^ lookup_g11[a2];
-	state[2] = lookup_g14[a2] ^ lookup_g9[a1] ^ lookup_g13[a0] ^ lookup_g11[a3];
-	state[3] = lookup_g14[a3] ^ lookup_g9[a2] ^ lookup_g13[a1] ^ lookup_g11[a0];
-}
-
-// Perform the inverse mix columns matrix on each column of the 16 bytes
-static void mix_cols_inv(byte *state) {
-	mix_col_inv(state);
-	mix_col_inv(state + 4);
-	mix_col_inv(state + 8);
-	mix_col_inv(state + 12);
-}
-
-void oqs_aes128_enc_c(const uint8_t *plaintext, const void *_schedule, uint8_t *ciphertext) {
-	const uint8_t *schedule = (const uint8_t *) _schedule;
-	int i; // To count the rounds
-
-	// First Round
-	memcpy(ciphertext, plaintext, 16);
-	xor_round_key(ciphertext, schedule, 0);
-
-	// Middle rounds
-	for (i = 0; i < 9; i++) {
-		sub_bytes(ciphertext, 16);
-		shift_rows(ciphertext);
-		mix_cols(ciphertext);
-		xor_round_key(ciphertext, schedule, i + 1);
-	}
-
-	// Final Round
-	sub_bytes(ciphertext, 16);
-	shift_rows(ciphertext);
-	xor_round_key(ciphertext, schedule, 10);
-}
-
-
-void oqs_aes128_dec_c(const uint8_t *ciphertext, const void *_schedule, uint8_t *plaintext) {
-	const uint8_t *schedule = (const uint8_t *) _schedule;
-	int i; // To count the rounds
-
-	// Reverse the final Round
-	memcpy(plaintext, ciphertext, 16);
-	xor_round_key(plaintext, schedule, 10);
-	shift_rows_inv(plaintext);
-	sub_bytes_inv(plaintext, 16);
-
-	// Reverse the middle rounds
-	for (i = 0; i < 9; i++) {
-		xor_round_key(plaintext, schedule, 9 - i);
-		mix_cols_inv(plaintext);
-		shift_rows_inv(plaintext);
-		sub_bytes_inv(plaintext, 16);
-	}
-
-	// Reverse the first Round
-	xor_round_key(plaintext, schedule, 0);
-}
-
-// It's not enc nor dec, it's something in between
-void oqs_mhy128_enc_c(const uint8_t *plaintext, const void *_schedule, uint8_t *ciphertext) {
-	const uint8_t *schedule = (const uint8_t *) _schedule;
-	int i; // To count the rounds
-
-	// First Round
-	memcpy(ciphertext, plaintext, 16);
-	xor_round_key(ciphertext, schedule, 0);
-
-	// Middle rounds
-	for (i = 0; i < 9; i++) {
-		sub_bytes_inv(ciphertext, 16);
-		shift_rows_inv(ciphertext);
-		mix_cols_inv(ciphertext);
-		xor_round_key(ciphertext, schedule, i + 1);
-	}
-
-	// Final Round
-	sub_bytes_inv(ciphertext, 16);
-	shift_rows_inv(ciphertext);
-	xor_round_key(ciphertext, schedule, 10);
-}
-
-void oqs_mhy128_dec_c(const uint8_t *ciphertext, const void *_schedule, uint8_t *plaintext) {
-	const uint8_t *schedule = (const uint8_t *) _schedule;
-	int i; // To count the rounds
-
-	// Reverse the final Round
-	memcpy(plaintext, ciphertext, 16);
-	xor_round_key(plaintext, schedule, 10);
-	shift_rows(plaintext);
-	sub_bytes(plaintext, 16);
-
-	// Reverse the middle rounds
-	for (i = 0; i < 9; i++) {
-		xor_round_key(plaintext, schedule, 9 - i);
-		mix_cols(plaintext);
-		shift_rows(plaintext);
-		sub_bytes(plaintext, 16);
-	}
-
-	// Reverse the first Round
-	xor_round_key(plaintext, schedule, 0);
-}

src-tauri/mhycrypto/aes.h

@@ -1,66 +0,0 @@
-/**
- * \file aes.h
- * \brief Header defining the API for OQS AES
- */
-
-#ifndef __OQS_AES_H
-#define __OQS_AES_H
-
-#include <stdint.h>
-#include <stdlib.h>
-
-/**
- * Function to fill a key schedule given an initial key.
- *
- * @param key            Initial Key.
- * @param schedule       Abstract data structure for a key schedule.
- * @param forEncryption  1 if key schedule is for encryption, 0 if for decryption.
- */
-void OQS_AES128_load_schedule(const uint8_t *key, void **schedule, int for_encryption);
-
-/**
- * Function to free a key schedule.
- *
- * @param schedule       Schedule generated with OQS_AES128_load_schedule().
- */
-void OQS_AES128_free_schedule(void *schedule);
-
-/**
- * Function to encrypt blocks of plaintext using ECB mode.
- * A schedule based on the key is generated and used internally.
- *
- * @param plaintext     Plaintext to be encrypted.
- * @param plaintext_len Length on the plaintext in bytes. Must be a multiple of 16.
- * @param key           Key to be used for encryption.
- * @param ciphertext    Pointer to a block of memory which >= in size to the plaintext block. The result will be written here.
- */
-void OQS_AES128_ECB_enc(const uint8_t *plaintext, const size_t plaintext_len, const uint8_t *key, uint8_t *ciphertext);
-
-/**
- * Function to decrypt blocks of plaintext using ECB mode.
- * A schedule based on the key is generated and used internally.
- *
- * @param ciphertext     Ciphertext to be decrypted.
- * @param ciphertext_len Length on the ciphertext in bytes. Must be a multiple of 16.
- * @param key            Key to be used for encryption.
- * @param ciphertext     Pointer to a block of memory which >= in size to the ciphertext block. The result will be written here.
- */
-void OQS_AES128_ECB_dec(const uint8_t *ciphertext, const size_t ciphertext_len, const uint8_t *key, uint8_t *plaintext);
-
-/**
- * Same as OQS_AES128_ECB_enc() except a schedule generated by
- * OQS_AES128_load_schedule() is passed rather then a key. This is faster
- * if the same schedule is used for multiple encryptions since it does
- * not have to be regenerated from the key.
- */
-void OQS_AES128_ECB_enc_sch(const uint8_t *plaintext, const size_t plaintext_len, const void *schedule, uint8_t *ciphertext);
-
-/**
- * Same as OQS_AES128_ECB_dec() except a schedule generated by
- * OQS_AES128_load_schedule() is passed rather then a key. This is faster
- * if the same schedule is used for multiple encryptions since it does
- * not have to be regenerated from the key.
- */
-void OQS_AES128_ECB_dec_sch(const uint8_t *ciphertext, const size_t ciphertext_len, const void *schedule, uint8_t *plaintext);
-
-#endif

src-tauri/mhycrypto/memecrypto.cpp

@@ -1,31 +0,0 @@
-#include "memecrypto.h"
-
-#include <cstring>
-#include <stdio.h>
-
-extern "C" void oqs_mhy128_enc_c(const uint8_t *plaintext, const void *_schedule, uint8_t *ciphertext);
-extern "C" void oqs_mhy128_dec_c(const uint8_t *ciphertext, const void *_schedule, uint8_t *plaintext);
-
-static uint8_t dexor16(const uint8_t *c) {
-    uint8_t ret = 0;
-    for (int i = 0; i < 16; i++)
-        ret ^= c[i];
-    return ret;
-}
-
-void memecrypto_prepare_key(const uint8_t *in, uint8_t *out) {
-    for (int i = 0; i < 0xB0; i++)
-        out[i] = dexor16(&in[0x10 * i]);
-}
-
-void memecrypto_decrypt(const uint8_t *key, uint8_t *data) {
-  uint8_t plaintext[16];
-  oqs_mhy128_enc_c(data, key, plaintext);
-  memcpy(data, plaintext, 16);
-}
-
-void memecrypto_encrypt(const uint8_t *key, uint8_t *data) {
-  uint8_t ciphertext[16];
-  oqs_mhy128_dec_c(data, key, ciphertext);
-  memcpy(data, ciphertext, 16);
-}

src-tauri/mhycrypto/memecrypto.h

@@ -1,12 +0,0 @@
-#ifndef MEMECRYPTO_H
-#define MEMECRYPTO_H
-
-#include <cstdint>
-
-void memecrypto_prepare_key(const uint8_t *in, uint8_t *out);
-
-void memecrypto_decrypt(const uint8_t *key, uint8_t *data);
-
-void memecrypto_encrypt(const uint8_t *key, uint8_t *data);
-
-#endif //MEMECRYPTO_H

src-tauri/mhycrypto/metadata.cpp

@@ -1,146 +0,0 @@
-#include "metadata.h"
-
-#include <cstring>
-#include <random>
-#include <stdio.h>
-
-#include "memecrypto.h"
-#include "metadatastringdec.h"
-
-unsigned char initial_prev_xor[] = { 0xad, 0x2f, 0x42, 0x30, 0x67, 0x04, 0xb0, 0x9c, 0x9d, 0x2a, 0xc0, 0xba, 0x0e, 0xbf, 0xa5, 0x68 };
-
-bool get_global_metadata_keys(uint8_t *src, size_t srcn, uint8_t *longkey, uint8_t *shortkey) {
-    if (srcn != 0x4000)
-        return false;
-
-    if (*(uint16_t *) (src + 0xc8) != 0xfc2e || *(uint16_t *) (src + 0xca) != 0x2cfe)
-        return true;
-
-    auto offB00 = *(uint16_t *) (src + 0xd2);
-
-    for (size_t i = 0; i < 16; i++)
-        shortkey[i] = src[offB00 + i] ^ src[0x3000 + i];
-
-    for (size_t i = 0; i < 0xb00; i++)
-        longkey[i] = src[offB00 + 0x10 + i] ^ src[0x3000 + 0x10 + i] ^ shortkey[i % 16];
-
-    return true;
-}
-
-bool gen_global_metadata_key(uint8_t* src, size_t srcn) {
-    if (srcn != 0x4000)
-        return false;
-    
-    #if 0
-        std::vector<uint8_t> read_file(const char* n);
-        auto data = read_file("xorpad.bin");
-        memcpy(src, data.data(), 0x4000);
-
-        return false;
-    #endif
-
-    std::mt19937_64 rand (0xDEADBEEF);
-
-    uint64_t* key = (uint64_t*)src;
-
-    for (size_t i = 0; i < srcn / sizeof(uint64_t); i++)
-        key[i] = rand();
-
-    *(uint16_t *) (src + 0xc8) = 0xfc2e; // Magic
-    *(uint16_t *) (src + 0xca) = 0x2cfe; // Magic
-    *(uint16_t *) (src + 0xd2) = rand() & 0x1FFFu; // Just some random value
-
-    return true;
-}
-
-void decrypt_global_metadata_inner(uint8_t *data, size_t size) {
-    uint8_t longkey[0xB00];
-    uint8_t longkeyp[0xB0];
-    uint8_t shortkey[16];
-    get_global_metadata_keys(data + size - 0x4000, 0x4000, longkey, shortkey);
-    for (int i = 0; i < 16; i++)
-        shortkey[i] ^= initial_prev_xor[i];
-    memecrypto_prepare_key(longkey, longkeyp);
-
-    auto perentry = (uint32_t) (size / 0x100 / 0x40);
-    for (int i = 0; i < 0x100; i++) {
-        auto off = (0x40u * perentry) * i;
-
-        uint8_t prev[16];
-        memcpy(prev, shortkey, 16);
-        for (int j = 0; j < 4; j++) {
-            uint8_t curr[16];
-            memcpy(curr, &data[off + j * 0x10], 16);
-
-            memecrypto_decrypt(longkeyp, curr);
-
-            for (int k = 0; k < 16; k++)
-                curr[k] ^= prev[k];
-
-            memcpy(prev, &data[off + j * 0x10], 16);
-            memcpy(&data[off + j * 0x10], curr, 16);
-        }
-    }
-
-    uint8_t literal_dec_key[0x5000];
-    recrypt_global_metadata_header_string_fields(data, size, literal_dec_key);
-    recrypt_global_metadata_header_string_literals(data, size, literal_dec_key);
-}
-
-extern "C" int decrypt_global_metadata(uint8_t *data, size_t size) {
-    try {
-        decrypt_global_metadata_inner(data, size);
-        return 0;
-    } catch (...) {
-        return -1;
-    }
-}
-
-void encrypt_global_metadata_inner(uint8_t* data, size_t size) {
-    uint8_t literal_dec_key[0x5000];
-
-    gen_global_metadata_key(data + size - 0x4000, 0x4000);
-
-    generate_key_for_global_metadata_header_string(data, size, literal_dec_key);
-
-    recrypt_global_metadata_header_string_literals(data, size, literal_dec_key);
-    recrypt_global_metadata_header_string_fields(data, size, literal_dec_key);
-
-    uint8_t longkey[0xB00];
-    uint8_t longkeyp[0xB0];
-    uint8_t shortkey[16];
-
-    get_global_metadata_keys(data + size - 0x4000, 0x4000, longkey, shortkey);
-    for (int i = 0; i < 16; i++)
-        shortkey[i] ^= initial_prev_xor[i];
-    memecrypto_prepare_key(longkey, longkeyp);
-
-    auto perentry = (uint32_t) (size / 0x100 / 0x40);
-    for (int i = 0; i < 0x100; i++) {
-        auto off = (0x40u * perentry) * i;
-
-        uint8_t prev[16];
-        memcpy(prev, shortkey, 16);
-        for (int j = 0; j < 4; j++) {
-            uint8_t curr[16];
-            memcpy(curr, &data[off + j * 0x10], 16);
-
-            for (int k = 0; k < 16; k++)
-                curr[k] ^= prev[k];
-
-            memecrypto_encrypt(longkeyp, curr);
-
-            memcpy(prev, curr, 16);
-            memcpy(&data[off + j * 0x10], curr, 16);
-        }
-    }
-}
-
-extern "C" int encrypt_global_metadata(uint8_t* data, size_t size) {
-    try {
-        encrypt_global_metadata_inner(data, size);
-        return 0;
-    } catch (...) {
-        return -1;
-    }
-}

src-tauri/mhycrypto/metadata.h

@@ -1,10 +0,0 @@
-#ifndef METADATA_H
-#define METADATA_H
-
-#include <cstdint>
-#include <cstdlib>
-
-extern "C" int decrypt_global_metadata(uint8_t *data, size_t size);
-extern "C" int encrypt_global_metadata(uint8_t *data, size_t size);
-
-#endif //METADATA_H

src-tauri/mhycrypto/metadatastringdec.cpp

@@ -1,121 +0,0 @@
-#include "metadatastringdec.h"
-
-#include <stdexcept>
-#include <random>
-#include <stdio.h>
-
-struct m_header_fields {
-    char filler1[0x18];
-    uint32_t stringLiteralDataOffset; // 18
-    uint32_t stringLiteralDataCount; // 1c
-    uint32_t stringLiteralOffset; // 20
-    uint32_t stringLiteralCount; // 24
-    char filler2[0xd8 - 0x28];
-    uint32_t stringOffset, stringCount;
-};
-
-struct m_literal {
-    uint32_t offset, length;
-};
-
-void generate_key_for_global_metadata_header_string(uint8_t* data, size_t len, uint8_t* literal_dec_key) {
-    if (len < sizeof(m_header_fields))
-        throw std::out_of_range("data not big enough for global metadata header");
-
-    uint32_t values[0x12] = {
-            *(uint32_t *) (data + 0x60),
-            *(uint32_t *) (data + 0x64),
-            *(uint32_t *) (data + 0x68),
-            *(uint32_t *) (data + 0x6c),
-            *(uint32_t *) (data + 0x140),
-            *(uint32_t *) (data + 0x144),
-            *(uint32_t *) (data + 0x148),
-            *(uint32_t *) (data + 0x14c),
-            *(uint32_t *) (data + 0x100),
-            *(uint32_t *) (data + 0x104),
-            *(uint32_t *) (data + 0x108),
-            *(uint32_t *) (data + 0x10c),
-            *(uint32_t *) (data + 0xf0),
-            *(uint32_t *) (data + 0xf4),
-            *(uint32_t *) (data + 8),
-            *(uint32_t *) (data + 0xc),
-            *(uint32_t *) (data + 0x10),
-            *(uint32_t *) (data + 0x14)
-    };
-
-    uint64_t seed = ((uint64_t) values[values[0] & 0xfu] << 0x20u) | values[(values[0x11] & 0xf) + 2];
-
-    std::mt19937_64 rand (seed);
-
-    for (int i = 0; i < 6; i++) // Skip
-        rand();
-
-    auto key64 = (uint64_t *) literal_dec_key;
-    for (int i = 0; i < 0xa00; i++)
-        key64[i] = rand();
-}
-
-void recrypt_global_metadata_header_string_fields(uint8_t *data, size_t len, uint8_t *literal_dec_key) {
-    if (len < sizeof(m_header_fields))
-        throw std::out_of_range("data not big enough for global metadata header");
-
-    uint32_t values[0x12] = {
-            *(uint32_t *) (data + 0x60),
-            *(uint32_t *) (data + 0x64),
-            *(uint32_t *) (data + 0x68),
-            *(uint32_t *) (data + 0x6c),
-            *(uint32_t *) (data + 0x140),
-            *(uint32_t *) (data + 0x144),
-            *(uint32_t *) (data + 0x148),
-            *(uint32_t *) (data + 0x14c),
-            *(uint32_t *) (data + 0x100),
-            *(uint32_t *) (data + 0x104),
-            *(uint32_t *) (data + 0x108),
-            *(uint32_t *) (data + 0x10c),
-            *(uint32_t *) (data + 0xf0),
-            *(uint32_t *) (data + 0xf4),
-            *(uint32_t *) (data + 8),
-            *(uint32_t *) (data + 0xc),
-            *(uint32_t *) (data + 0x10),
-            *(uint32_t *) (data + 0x14)
-    };
-
-    uint64_t seed = ((uint64_t) values[values[0] & 0xfu] << 0x20u) | values[(values[0x11] & 0xf) + 2];
-
-    std::mt19937_64 rand (seed);
-
-    auto header = (m_header_fields *) data;
-    header->stringCount ^= (uint32_t) rand();
-    header->stringOffset ^= (uint32_t) rand();
-    rand();
-    header->stringLiteralOffset ^= (uint32_t) rand();
-    header->stringLiteralDataCount ^= (uint32_t) rand();
-    header->stringLiteralDataOffset ^= (uint32_t) rand();
-
-    auto key64 = (uint64_t *) literal_dec_key;
-    for (int i = 0; i < 0xa00; i++)
-        key64[i] = rand();
-}
-
-void recrypt_global_metadata_header_string_literals(uint8_t *data, size_t len, uint8_t *literal_dec_key) {
-    if (len < sizeof(m_header_fields))
-        throw std::out_of_range("data not big enough for global metadata header");
-
-    auto header = (m_header_fields *) data;
-    if ((size_t) header->stringLiteralCount + header->stringLiteralOffset > len)
-        throw std::out_of_range("file trimmed or string literal offset/count field invalid");
-
-    auto literals = (m_literal *) (data + header->stringLiteralOffset);
-    auto count = header->stringLiteralCount / sizeof(m_literal);
-    for (size_t i = 0; i < count; i++) {
-        auto slen = literals[i].length;
-        uint8_t *str = data + header->stringLiteralDataOffset + literals[i].offset;
-        uint8_t *okey = literal_dec_key + (i % 0x2800);
-
-        if ((size_t) header->stringLiteralDataOffset + literals[i].offset + slen > len)
-            throw std::out_of_range("file trimmed or contains invalid string entry");
-
-        for (size_t j = 0; j < slen; j++)
-            str[j] ^= literal_dec_key[(j + 0x1400u) % 0x5000u] ^ (okey[j % 0x2800u] + (uint8_t) j);
-    }
-}

src-tauri/mhycrypto/metadatastringdec.h

@@ -1,13 +0,0 @@
-#ifndef METADATASTRINGDEC_H
-#define METADATASTRINGDEC_H
-
-#include <cstdint>
-#include <cstdlib>
-
-void recrypt_global_metadata_header_string_fields(uint8_t *data, size_t len, uint8_t *literal_dec_key);
-
-void recrypt_global_metadata_header_string_literals(uint8_t *data, size_t len, uint8_t *literal_dec_key);
-
-void generate_key_for_global_metadata_header_string(uint8_t* data, size_t len, uint8_t* literal_dec_key);
-
-#endif //METADATASTRINGDEC_H

src-tauri/rustfmt.toml

@@ -1,4 +0,0 @@
-newline_style = "Unix"
-tab_spaces = 2
-use_field_init_shorthand = true
-use_try_shorthand = true

src-tauri/src/admin.rs

@@ -1,23 +0,0 @@
-use std::process::exit;
-use std::process::Command;
-
-#[cfg(windows)]
-pub fn reopen_as_admin() {
-  let install = std::env::current_exe().unwrap();
-
-  println!("Opening as admin: {}", install.to_str().unwrap());
-
-  Command::new("powershell.exe")
-    .arg("powershell")
-    .arg(format!(
-      "-command \"&{{Start-Process -filepath '{}' -verb runas}}\"",
-      install.to_str().unwrap()
-    ))
-    .spawn()
-    .expect("Error starting exec as admin");
-
-  exit(0);
-}
-
-#[cfg(target_os = "linux")]
-pub fn reopen_as_admin() {}

src-tauri/src/downloader.rs

@@ -1,9 +1,9 @@
 use once_cell::sync::Lazy;
 
+use std::sync::Mutex;
 use std::cmp::min;
 use std::fs::File;
 use std::io::Write;
-use std::sync::Mutex;
 
 use futures_util::StreamExt;
 
@@ -15,14 +15,17 @@ static DOWNLOADS: Lazy<Mutex<Vec<String>>> = Lazy::new(|| Mutex::new(Vec::new())
 #[tauri::command]
 pub async fn download_file(window: tauri::Window, url: &str, path: &str) -> Result<(), String> {
   // Reqwest setup
-  let res = match reqwest::get(url).await {
+  let res = match reqwest::get(url)
+    .await {
     Ok(r) => r,
     Err(_e) => {
       emit_download_err(window, format!("Failed to request {}", url), path);
       return Err(format!("Failed to request {}", url));
     }
   };
-  let total_size = res.content_length().unwrap_or(0);
+  let total_size = res
+    .content_length()
+    .unwrap_or(0);
 
   // Create file path
   let mut file = match File::create(path) {
@@ -74,10 +77,25 @@ pub async fn download_file(window: tauri::Window, url: &str, path: &str) -> Resu
 
     let mut res_hash = std::collections::HashMap::new();
 
-    res_hash.insert("downloaded".to_string(), downloaded.to_string());
+    res_hash.insert(
-    res_hash.insert("total".to_string(), total_size.to_string());
+      "downloaded".to_string(),
-    res_hash.insert("path".to_string(), path.to_string());
+      downloaded.to_string(),
-    res_hash.insert("total_downloaded".to_string(), total_downloaded.to_string());
+    );
+
+    res_hash.insert(
+      "total".to_string(),
+      total_size.to_string(),
+    );
+
+    res_hash.insert(
+      "path".to_string(),
+      path.to_string(),
+    );
+
+    res_hash.insert(
+      "total_downloaded".to_string(),
+      total_downloaded.to_string(),
+    );
 
     // Create event to send to frontend
     window.emit("download_progress", &res_hash).unwrap();
@@ -93,8 +111,15 @@ pub async fn download_file(window: tauri::Window, url: &str, path: &str) -> Resu
 pub fn emit_download_err(window: tauri::Window, msg: String, path: &str) {
   let mut res_hash = std::collections::HashMap::new();
 
-  res_hash.insert("error".to_string(), msg);
+  res_hash.insert(
-  res_hash.insert("path".to_string(), path.to_string());
+    "error".to_string(),
+    msg,
+  );
+
+  res_hash.insert(
+    "path".to_string(),
+    path.to_string(),
+  );
 
   window.emit("download_error", &res_hash).unwrap();
 }
@@ -114,4 +139,4 @@ pub fn stop_download(path: String) {
   if let Err(_e) = std::fs::remove_file(&path) {
     // Do nothing
   }
-}
+}

src-tauri/src/file_helpers.rs

@@ -1,7 +1,4 @@
-use file_diff::diff;
 use std::fs;
-use std::io::{Read, Write};
-use std::path::PathBuf;
 
 #[tauri::command]
 pub fn rename(path: String, new_name: String) {
@@ -19,147 +16,40 @@ pub fn rename(path: String, new_name: String) {
 
   let path_replaced = &path.replace(&new_path.split('/').last().unwrap(), &new_name);
 
-  match fs::rename(&path, &path_replaced) {
+  fs::rename(path, &path_replaced).unwrap();
-    Ok(_) => {
-      println!("Renamed {} to {}", &path, path_replaced);
-    }
-    Err(e) => {
-      println!("Error: {}", e);
-    }
-  };
-}
-
-#[tauri::command]
-pub fn dir_create(path: String) {
-  fs::create_dir_all(path).unwrap();
 }
 
 #[tauri::command]
 pub fn dir_exists(path: &str) -> bool {
-  let path_buf = PathBuf::from(path);
+  fs::metadata(&path).is_ok()
-  fs::metadata(path_buf).is_ok()
 }
 
 #[tauri::command]
 pub fn dir_is_empty(path: &str) -> bool {
-  let path_buf = PathBuf::from(path);
+  fs::read_dir(&path).unwrap().count() == 0
-  fs::read_dir(path_buf).unwrap().count() == 0
 }
 
 #[tauri::command]
 pub fn dir_delete(path: &str) {
-  let path_buf = PathBuf::from(path);
+  fs::remove_dir_all(path).unwrap();
-  fs::remove_dir_all(path_buf).unwrap();
-}
-
-#[tauri::command]
-pub fn are_files_identical(path1: &str, path2: &str) -> bool {
-  diff(path1, path2)
 }
 
 #[tauri::command]
 pub fn copy_file(path: String, new_path: String) -> bool {
-  let filename = &path.split('/').last().unwrap();
+  let filename = &path.split("/").last().unwrap();
-  let path_buf = PathBuf::from(&path);
+  let mut new_path_buf = std::path::PathBuf::from(&new_path);
 
   // If the new path doesn't exist, create it.
-  if !dir_exists(PathBuf::from(&new_path).pop().to_string().as_str()) {
+  if !dir_exists(new_path_buf.pop().to_string().as_str()) {
     std::fs::create_dir_all(&new_path).unwrap();
   }
 
   // Copy old to new
-  match std::fs::copy(&path_buf, format!("{}/{}", new_path, filename)) {
+  match std::fs::copy(&path, format!("{}/{}", new_path, filename)) {
     Ok(_) => true,
     Err(e) => {
       println!("Failed to copy file: {}", e);
-      println!("Path: {}", path);
-      println!("New Path: {}", new_path);
       false
     }
   }
 }
-
-#[tauri::command]
-pub fn copy_file_with_new_name(path: String, new_path: String, new_name: String) -> bool {
-  let mut new_path_buf = PathBuf::from(&new_path);
-  let path_buf = PathBuf::from(&path);
-
-  // If the new path doesn't exist, create it.
-  if !dir_exists(PathBuf::from(&new_path).pop().to_string().as_str()) {
-    match std::fs::create_dir_all(&new_path) {
-      Ok(_) => {}
-      Err(e) => {
-        println!("Failed to create directory: {}", e);
-        return false;
-      }
-    };
-  }
-
-  new_path_buf.push(new_name);
-
-  // Copy old to new
-  match std::fs::copy(&path_buf, &new_path_buf) {
-    Ok(_) => true,
-    Err(e) => {
-      println!("Failed to copy file: {}", e);
-      println!("Path: {}", path);
-      println!("New Path: {}", new_path);
-      false
-    }
-  }
-}
-
-#[tauri::command]
-pub fn delete_file(path: String) -> bool {
-  let path_buf = PathBuf::from(&path);
-
-  match std::fs::remove_file(path_buf) {
-    Ok(_) => true,
-    Err(e) => {
-      println!("Failed to delete file: {}", e);
-      false
-    }
-  };
-
-  false
-}
-
-#[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: {}", e);
-      return String::new();
-    }
-  };
-
-  let mut contents = String::new();
-  file.read_to_string(&mut contents).unwrap();
-
-  contents
-}
-
-#[tauri::command]
-pub fn write_file(path: String, contents: String) {
-  let path_buf = PathBuf::from(&path);
-
-  // Create file if it exists, otherwise just open and rewrite
-  let mut file = match fs::File::create(&path_buf) {
-    Ok(file) => file,
-    Err(e) => {
-      println!("Failed to open file: {}", e);
-      return;
-    }
-  };
-
-  // Write contents to file
-  match file.write_all(contents.as_bytes()) {
-    Ok(_) => (),
-    Err(e) => {
-      println!("Failed to write to file: {}", e);
-    }
-  }
-}

src-tauri/src/gamebanana.rs

@@ -1,84 +0,0 @@
-use crate::file_helpers;
-use crate::web;
-use std::collections::HashMap;
-use std::fs::read_dir;
-use std::io::Read;
-use std::path::PathBuf;
-
-static SITE_URL: &str = "https://gamebanana.com";
-
-#[tauri::command]
-pub async fn get_download_links(mod_id: String) -> String {
-  web::query(format!("{}/apiv9/Mod/{}/DownloadPage", SITE_URL, mod_id).as_str()).await
-}
-
-#[tauri::command]
-pub async fn list_submissions(mode: String, page: String) -> String {
-  web::query(
-    format!(
-      "{}/apiv9/Util/Game/Submissions?_idGameRow=8552&_nPage={}&_nPerpage=50&_sMode={}",
-      SITE_URL, page, mode
-    )
-    .as_str(),
-  )
-  .await
-}
-
-#[tauri::command]
-pub async fn list_mods(path: String) -> HashMap<String, String> {
-  let mut path_buf = PathBuf::from(path);
-
-  // If the path includes a file, remove it
-  if path_buf.file_name().is_some() {
-    path_buf.pop();
-  }
-
-  // Ensure we are in the Mods folder
-  path_buf.push("Mods");
-
-  // Check if dir is empty
-  if file_helpers::dir_is_empty(path_buf.to_str().unwrap()) {
-    return HashMap::new();
-  }
-
-  let mut mod_info_files = vec![];
-  let mut mod_info_strings = HashMap::new();
-
-  for entry in read_dir(path_buf).unwrap() {
-    let entry = entry.unwrap();
-    let path = entry.path();
-
-    // Check each dir for a modinfo.json file
-    if path.is_dir() {
-      let mut mod_info_path = path.clone();
-      mod_info_path.push("modinfo.json");
-      if mod_info_path.exists() {
-        // Push path AND file contents into the hashmap using path as key
-        mod_info_files.push(mod_info_path.to_str().unwrap().to_string());
-      } else {
-        // No modinfo, but we can still push a JSON obj with the folder name
-        mod_info_strings.insert(
-          path.to_str().unwrap().to_string(),
-          format!(
-            "{{ \"name\": \"{}\" }}",
-            path.file_name().unwrap().to_str().unwrap()
-          ),
-        );
-      }
-    }
-  }
-
-  // Read each modinfo.json file
-  for mod_info_file in mod_info_files {
-    let mut mod_info_string = String::new();
-
-    // It is safe to unwrap here since we *know* that the file exists
-    let mut file = std::fs::File::open(&mod_info_file).unwrap();
-    file.read_to_string(&mut mod_info_string).unwrap();
-
-    // Push into hashmap using path as key
-    mod_info_strings.insert(mod_info_file, mod_info_string);
-  }
-
-  mod_info_strings
-}

src-tauri/src/lang.rs

@@ -1,14 +1,12 @@
-use crate::system_helpers::*;
 use std::path::{Path, PathBuf};
+use crate::system_helpers::*;
 
 #[tauri::command]
 pub async fn get_lang(window: tauri::Window, lang: String) -> String {
   let lang = lang.to_lowercase();
 
   // Send contents of language file back
-  let lang_path: PathBuf = [&install_location(), "lang", &format!("{}.json", lang)]
+  let lang_path: PathBuf = [&install_location(), "lang", &format!("{}.json", lang)].iter().collect();
-    .iter()
-    .collect();
   match std::fs::read_to_string(&lang_path) {
     Ok(x) => x,
     Err(e) => {
@@ -47,7 +45,10 @@ pub async fn get_languages() -> std::collections::HashMap<String, String> {
 pub fn emit_lang_err(window: tauri::Window, msg: String) {
   let mut res_hash = std::collections::HashMap::new();
 
-  res_hash.insert("error".to_string(), msg);
+  res_hash.insert(
+    "error".to_string(),
+    msg,
+  );
 
   window.emit("lang_error", &res_hash).unwrap();
-}
+}

src-tauri/src/main.rs

@@ -1,140 +1,59 @@
 #![cfg_attr(
-  all(not(debug_assertions), target_os = "windows"),
+all(not(debug_assertions), target_os = "windows"),
-  windows_subsystem = "windows"
+windows_subsystem = "windows"
 )]
 
-use file_helpers::dir_exists;
 use once_cell::sync::Lazy;
-use std::fs;
+use std::{sync::Mutex, collections::HashMap};
-use std::io::Write;
-use std::{collections::HashMap, sync::Mutex};
-use system_helpers::is_elevated;
-use tauri::api::path::data_dir;
-use tauri::async_runtime::block_on;
 
 use std::thread;
-use structs::APIQuery;
 use sysinfo::{System, SystemExt};
+use structs::{APIQuery};
 
-use crate::admin::reopen_as_admin;
-
-mod admin;
-mod downloader;
-mod file_helpers;
-mod gamebanana;
-mod lang;
-mod metadata_patcher;
-mod proxy;
 mod structs;
 mod system_helpers;
+mod file_helpers;
 mod unzip;
+mod downloader;
+mod lang;
+mod proxy;
 mod web;
 
 static WATCH_GAME_PROCESS: Lazy<Mutex<String>> = Lazy::new(|| Mutex::new(String::new()));
 
-fn try_flush() {
-  std::io::stdout().flush().unwrap_or(())
-}
-
-fn has_arg(args: &[String], arg: &str) -> bool {
-  args.contains(&arg.to_string())
-}
-
-async fn arg_handler(args: &[String]) {
-  if has_arg(args, "--proxy") {
-    let mut pathbuf = tauri::api::path::data_dir().unwrap();
-    pathbuf.push("cultivation");
-    pathbuf.push("ca");
-
-    connect(8035, pathbuf.to_str().unwrap().to_string()).await;
-  }
-}
-
 fn main() {
-  if !is_elevated() {
+  tauri::Builder::default()
-    println!("===============================================================================");
+    .invoke_handler(tauri::generate_handler![
-    println!("You running as a non-elevated user. Some stuff will almost definitely not work.");
+      enable_process_watcher,
-    println!("===============================================================================");
+      connect,
-
+      disconnect,
-    reopen_as_admin();
+      req_get,
-  }
+      get_bg_file,
-
+      is_game_running,
-  // Setup datadir/cultivation just in case something went funky and it wasn't made
+      get_theme_list,
-  if !dir_exists(data_dir().unwrap().join("cultivation").to_str().unwrap()) {
+      system_helpers::run_command,
-    fs::create_dir_all(&data_dir().unwrap().join("cultivation")).unwrap();
+      system_helpers::run_program,
-  }
+      system_helpers::run_jar,
-
+      system_helpers::open_in_browser,
-  // Always set CWD to the location of the executable.
+      system_helpers::install_location,
-  let mut exe_path = std::env::current_exe().unwrap();
+      system_helpers::is_elevated,
-  exe_path.pop();
+      proxy::set_proxy_addr,
-  std::env::set_current_dir(&exe_path).unwrap();
+      proxy::generate_ca_files,
-
+      unzip::unzip,
-  let args: Vec<String> = std::env::args().collect();
+      file_helpers::rename,
-
+      file_helpers::dir_exists,
-  block_on(arg_handler(&args));
+      file_helpers::dir_is_empty,
-
+      file_helpers::dir_delete,
-  // For disabled GUI
+      file_helpers::copy_file,
-  ctrlc::set_handler(|| {
+      downloader::download_file,
-    disconnect();
+      downloader::stop_download,
-    std::process::exit(0);
+      lang::get_lang,
-  })
+      lang::get_languages,
-  .unwrap_or(());
+      web::valid_url,
-
+      web::web_get
-  if !has_arg(&args, "--no-gui") {
+    ])
-    tauri::Builder::default()
+    .run(tauri::generate_context!())
-      .invoke_handler(tauri::generate_handler![
+    .expect("error while running tauri application");
-        enable_process_watcher,
-        connect,
-        disconnect,
-        req_get,
-        get_bg_file,
-        is_game_running,
-        get_theme_list,
-        system_helpers::run_command,
-        system_helpers::run_program,
-        system_helpers::run_program_relative,
-        system_helpers::run_jar,
-        system_helpers::open_in_browser,
-        system_helpers::install_location,
-        system_helpers::is_elevated,
-        system_helpers::set_migoto_target,
-        system_helpers::wipe_registry,
-        system_helpers::get_platform,
-        proxy::set_proxy_addr,
-        proxy::generate_ca_files,
-        unzip::unzip,
-        file_helpers::rename,
-        file_helpers::dir_create,
-        file_helpers::dir_exists,
-        file_helpers::dir_is_empty,
-        file_helpers::dir_delete,
-        file_helpers::copy_file,
-        file_helpers::copy_file_with_new_name,
-        file_helpers::delete_file,
-        file_helpers::are_files_identical,
-        file_helpers::read_file,
-        file_helpers::write_file,
-        downloader::download_file,
-        downloader::stop_download,
-        lang::get_lang,
-        lang::get_languages,
-        web::valid_url,
-        web::web_get,
-        gamebanana::get_download_links,
-        gamebanana::list_submissions,
-        gamebanana::list_mods,
-        metadata_patcher::patch_metadata
-      ])
-      .run(tauri::generate_context!())
-      .expect("error while running tauri application");
-  } else {
-    try_flush();
-    println!("Press enter or CTRL-C twice to quit...");
-    std::io::stdin().read_line(&mut String::new()).unwrap();
-  }
-
-  // Always disconnect upon closing the program
-  disconnect();
 }
 
 #[tauri::command]
@@ -146,7 +65,7 @@ fn is_game_running() -> bool {
 }
 
 #[tauri::command]
-fn enable_process_watcher(window: tauri::Window, process: String) {
+fn enable_process_watcher(window: tauri::Window,process: String) {
   *WATCH_GAME_PROCESS.lock().unwrap() = process;
 
   window.listen("disable_process_watcher", |_e| {
@@ -156,9 +75,6 @@ fn enable_process_watcher(window: tauri::Window, process: String) {
   println!("Starting process watcher...");
 
   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));
-
     let mut system = System::new_all();
 
     loop {
@@ -181,7 +97,6 @@ fn enable_process_watcher(window: tauri::Window, process: String) {
           *WATCH_GAME_PROCESS.lock().unwrap() = "".to_string();
           disconnect();
 
-          window.emit("game_closed", &()).unwrap();
           break;
         }
       }
@@ -242,7 +157,7 @@ async fn get_theme_list(data_dir: String) -> Vec<HashMap<String, String>> {
 
         map.insert("json".to_string(), theme_json);
         map.insert("path".to_string(), path.to_str().unwrap().to_string());
-
+        
         // Push key-value pair containing "json" and "path"
         themes.push(map);
       }
@@ -260,8 +175,7 @@ async fn get_bg_file(bg_path: String, appdata: String) -> String {
   let response_data: APIQuery = match serde_json::from_str(&query) {
     Ok(data) => data,
     Err(e) => {
-      println!("Failed to get bg file response: {}", e);
+      println!("Failed to parse response: {}", e);
-      println!("^ please stop reporting this as an error it's so annoying LMFAO");
       return "".to_string();
     }
   };

src-tauri/src/metadata_patcher.rs

@@ -1,153 +0,0 @@
-use regex::Regex;
-use std::{fs, fs::File, fs::OpenOptions, io::Read, io::Write, path::Path};
-
-// For these two functions, a non-zero return value indicates failure.
-extern "C" {
-  fn decrypt_global_metadata(data: *mut u8, size: usize) -> i32;
-  fn encrypt_global_metadata(data: *mut u8, size: usize) -> i32;
-}
-
-#[tauri::command]
-pub fn patch_metadata(metadata_folder: &str) -> bool {
-  let metadata_file = &(metadata_folder.to_owned() + "\\global-metadata-unpatched.dat");
-  // check if metadata_file exists
-  if !Path::new(metadata_file).exists() {
-    println!("Metadata file not found");
-    return false;
-  }
-
-  println!("Patching metadata file: {}", metadata_file);
-  let decrypted = decrypt_metadata(metadata_file);
-  if do_vecs_match(&decrypted, &Vec::new()) {
-    println!("Failed to decrypt metadata file.");
-    return false;
-  }
-
-  let modified = replace_keys(&decrypted);
-  if do_vecs_match(&modified, &Vec::new()) {
-    println!("Failed to replace keys in metadata file.");
-    return false;
-  }
-
-  let encrypted = encrypt_metadata(&modified);
-  if do_vecs_match(&encrypted, &Vec::new()) {
-    println!("Failed to re-encrypt metadata file.");
-    return false;
-  }
-
-  //write encrypted to file
-  let mut file = match OpenOptions::new()
-    .create(true)
-    .write(true)
-    .open(&(metadata_folder.to_owned() + "\\global-metadata-patched.dat"))
-  {
-    Ok(file) => file,
-    Err(e) => {
-      println!("Failed to open global-metadata: {}", e);
-      return false;
-    }
-  };
-
-  file.write_all(&encrypted).unwrap();
-
-  true
-}
-
-fn decrypt_metadata(file_path: &str) -> Vec<u8> {
-  let mut file = match File::open(file_path) {
-    Ok(file) => file,
-    Err(e) => {
-      println!("Failed to open global-metadata: {}", e);
-      return Vec::new();
-    }
-  };
-  let mut data = Vec::new();
-
-  // Read metadata file
-  match file.read_to_end(&mut data) {
-    Ok(_) => (),
-    Err(e) => {
-      println!("Failed to read global-metadata: {}", e);
-      return Vec::new();
-    }
-  }
-
-  // Decrypt metadata file
-  let success = unsafe { decrypt_global_metadata(data.as_mut_ptr(), data.len()) } == 0;
-  if success {
-    println!("Successfully decrypted global-metadata");
-    data
-  } else {
-    println!("Failed to decrypt global-metadata");
-    Vec::new()
-  }
-}
-
-fn replace_keys(data: &[u8]) -> Vec<u8> {
-  let mut new_data = String::new();
-
-  unsafe {
-    let data_str = String::from_utf8_unchecked(data.to_vec());
-
-    let re = Regex::new(r"<RSAKeyValue>((.|\n|\r)*?)</RSAKeyValue>").unwrap();
-    let matches = re.find_iter(&data_str);
-
-    // dispatch key is index 3
-    // password key is index 2
-
-    for (i, rmatch) in matches.enumerate() {
-      let key = rmatch.as_str();
-
-      if i == 2 {
-        println!("Replacing password key");
-        new_data = replace_rsa_key(&data_str, key, "passwordKey.txt");
-      } else if i == 3 {
-        println!("Replacing dispatch key");
-        new_data = replace_rsa_key(&new_data, key, "dispatchKey.txt");
-      }
-    }
-  }
-
-  return new_data.as_bytes().to_vec();
-}
-
-fn replace_rsa_key(old_data: &str, to_replace: &str, file_name: &str) -> String {
-  // Read dispatch key file
-  unsafe {
-    // Get key path from current directory
-    let key_file_path = std::env::current_dir()
-      .unwrap()
-      .join("keys")
-      .join(file_name);
-
-    let key_data = match fs::read(&key_file_path) {
-      Ok(file) => file,
-      Err(e) => {
-        println!("Failed to open {}: {}", key_file_path.to_str().unwrap(), e);
-        return String::new();
-      }
-    };
-
-    let new_key = String::from_utf8_unchecked(key_data.to_vec());
-
-    // Replace old key with new key
-    old_data.replace(to_replace, &new_key)
-  }
-}
-
-fn encrypt_metadata(old_data: &[u8]) -> Vec<u8> {
-  let mut data = old_data.to_vec();
-
-  let success = unsafe { encrypt_global_metadata(data.as_mut_ptr(), data.len()) } == 0;
-  if success {
-    println!("Successfully encrypted global-metadata");
-    data
-  } else {
-    println!("Failed to encrypt global-metadata");
-    Vec::new()
-  }
-}
-
-fn do_vecs_match<T: PartialEq>(a: &Vec<T>, b: &Vec<T>) -> bool {
-  a == b
-}

src-tauri/src/proxy.rs

@@ -3,33 +3,29 @@
  * https://github.com/omjadas/hudsucker/blob/main/examples/log.rs
  */
 
-#[cfg(target_os = "linux")]
-use crate::system_helpers::run_command;
-
 use once_cell::sync::Lazy;
-use std::{path::PathBuf, str::FromStr, sync::Mutex};
+use std::{sync::Mutex, str::FromStr};
 
+use rcgen::*;
 use hudsucker::{
   async_trait::async_trait,
   certificate_authority::RcgenAuthority,
   hyper::{Body, Request, Response},
   *,
 };
-use rcgen::*;
 
 use std::fs;
 use std::net::SocketAddr;
 use std::path::Path;
 
 use rustls_pemfile as pemfile;
-use tauri::{api::path::data_dir, http::Uri};
+use tauri::http::Uri;
 
 #[cfg(windows)]
-use registry::{Data, Hive, Security};
+use registry::{Hive, Data, Security};
 
 async fn shutdown_signal() {
-  tokio::signal::ctrl_c()
+  tokio::signal::ctrl_c().await
-    .await
     .expect("Failed to install CTRL+C signal handler");
 }
 
@@ -46,18 +42,16 @@ pub fn set_proxy_addr(addr: String) {
 
 #[async_trait]
 impl HttpHandler for ProxyHandler {
-  async fn handle_request(
+  async fn handle_request(&mut self,
-    &mut self,
+                          _context: &HttpContext,
-    _context: &HttpContext,
+                          mut request: Request<Body>,
-    mut request: Request<Body>,
   ) -> RequestOrResponse {
     let uri = request.uri().to_string();
     let uri_path = request.uri().path();
-
+    
     if uri.contains("hoyoverse.com") || uri.contains("mihoyo.com") || uri.contains("yuanshen.com") {
       // Create new URI.
-      let new_uri =
+      let new_uri = Uri::from_str(format!("{}{}", SERVER.lock().unwrap(), uri_path).as_str()).unwrap();
-        Uri::from_str(format!("{}{}", SERVER.lock().unwrap(), uri_path).as_str()).unwrap();
       // Set request URI to the new one.
       *request.uri_mut() = new_uri;
     }
@@ -65,57 +59,31 @@ impl HttpHandler for ProxyHandler {
     RequestOrResponse::Request(request)
   }
 
-  async fn handle_response(
+  async fn handle_response(&mut self,
-    &mut self,
+                           _context: &HttpContext,
-    _context: &HttpContext,
+                           response: Response<Body>,
-    response: Response<Body>,
+  ) -> Response<Body> { response }
-  ) -> Response<Body> {
-    response
-  }
 }
 
 /**
  * Starts an HTTP(S) proxy server.
  */
 pub async fn create_proxy(proxy_port: u16, certificate_path: String) {
-  let cert_path = PathBuf::from(certificate_path);
-  let pk_path = cert_path.join("private.key");
-  let ca_path = cert_path.join("cert.crt");
-
   // Get the certificate and private key.
-  let mut private_key_bytes: &[u8] = &match fs::read(&pk_path) {
+  let mut private_key_bytes: &[u8] = &fs::read(format!("{}\\private.key", certificate_path)).expect("Could not read private key");
-    // Try regenerating the CA stuff and read it again. If that doesn't work, quit.
+  let mut ca_cert_bytes: &[u8] = &fs::read(format!("{}\\cert.crt", certificate_path)).expect("Could not read certificate");
-    Ok(b) => b,
-    Err(e) => {
-      println!("Encountered {}. Regenerating CA cert and retrying...", e);
-      generate_ca_files(&data_dir().unwrap().join("cultivation"));
-
-      fs::read(&pk_path).expect("Could not read private key")
-    }
-  };
-
-  let mut ca_cert_bytes: &[u8] = &match fs::read(&ca_path) {
-    // Try regenerating the CA stuff and read it again. If that doesn't work, quit.
-    Ok(b) => b,
-    Err(e) => {
-      println!("Encountered {}. Regenerating CA cert and retrying...", e);
-      generate_ca_files(&data_dir().unwrap().join("cultivation"));
-
-      fs::read(&ca_path).expect("Could not read certificate")
-    }
-  };
 
   // Parse the private key and certificate.
   let private_key = rustls::PrivateKey(
     pemfile::pkcs8_private_keys(&mut private_key_bytes)
       .expect("Failed to parse private key")
-      .remove(0),
+      .remove(0)
   );
 
   let ca_cert = rustls::Certificate(
     pemfile::certs(&mut ca_cert_bytes)
       .expect("Failed to parse CA certificate")
-      .remove(0),
+      .remove(0)
   );
 
   // Create the certificate authority.
@@ -140,51 +108,21 @@ pub async fn create_proxy(proxy_port: u16, certificate_path: String) {
 #[cfg(windows)]
 pub fn connect_to_proxy(proxy_port: u16) {
   // Create 'ProxyServer' string.
-  let server_string: String = format!(
+  let server_string: String = format!("http=127.0.0.1:{};https=127.0.0.1:{}", proxy_port, proxy_port);
-    "http=127.0.0.1:{};https=127.0.0.1:{}",
-    proxy_port, proxy_port
-  );
 
   // Fetch the 'Internet Settings' registry key.
-  let settings = Hive::CurrentUser
+  let settings = Hive::CurrentUser.open(r"Software\Microsoft\Windows\CurrentVersion\Internet Settings", Security::Write).unwrap();
-    .open(
-      r"Software\Microsoft\Windows\CurrentVersion\Internet Settings",
-      Security::Write,
-    )
-    .unwrap();
 
   // Set registry values.
-  settings
+  settings.set_value("ProxyServer", &Data::String(server_string.parse().unwrap())).unwrap();
-    .set_value("ProxyServer", &Data::String(server_string.parse().unwrap()))
-    .unwrap();
   settings.set_value("ProxyEnable", &Data::U32(1)).unwrap();
 
   println!("Connected to the proxy.");
 }
 
-#[cfg(unix)]
+#[cfg(not(windows))]
-pub fn connect_to_proxy(proxy_port: u16) {
-  // Edit /etc/environment to set $http_proxy and $https_proxy
-  let mut env_file = match fs::read_to_string("/etc/environment") {
-    Ok(f) => f,
-    Err(e) => {
-      println!("Error opening /etc/environment: {}", e);
-      return;
-    }
-  };
-
-  // Append the proxy configuration.
-  // We will not remove the current proxy config if it exists, so we can just remove these last lines when we disconnect
-  env_file += format!("\nhttps_proxy=127.0.0.1:{}", proxy_port).as_str();
-  env_file += format!("\nhttp_proxy=127.0.0.1:{}", proxy_port).as_str();
-
-  // Save
-  fs::write("/etc/environment", env_file).unwrap();
-}
-
-#[cfg(target_od = "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)")
+  println!("Connecting to the proxy is not implemented on this platform.");
 }
 
 /**
@@ -193,12 +131,7 @@ pub fn connect_to_proxy(_proxy_port: u16) {
 #[cfg(windows)]
 pub fn disconnect_from_proxy() {
   // Fetch the 'Internet Settings' registry key.
-  let settings = Hive::CurrentUser
+  let settings = Hive::CurrentUser.open(r"Software\Microsoft\Windows\CurrentVersion\Internet Settings", Security::Write).unwrap();
-    .open(
-      r"Software\Microsoft\Windows\CurrentVersion\Internet Settings",
-      Security::Write,
-    )
-    .unwrap();
 
   // Set registry values.
   settings.set_value("ProxyEnable", &Data::U32(0)).unwrap();
@@ -206,26 +139,7 @@ pub fn disconnect_from_proxy() {
   println!("Disconnected from proxy.");
 }
 
-#[cfg(target_os = "linux")]
+#[cfg(not(windows))]
-pub fn disconnect_from_proxy() {
-  println!("Re-writing environment variables");
-
-  let regexp = regex::Regex::new(
-    // This has to be specific as possible or we risk fuckin up their environment LOL
-    r"(https|http)_proxy=.*127.0.0.1:.*",
-  )
-  .unwrap();
-  let environment = &fs::read_to_string("/etc/environment").expect("Failed to open environment");
-
-  let new_environment = regexp.replace_all(environment, "").to_string();
-
-  // Write new environment
-  fs::write("/etc/environment", new_environment.trim_end()).expect(
-    "Could not write environment, remove proxy declarations manually if they are still set",
-  );
-}
-
-#[cfg(target_os = "macos")]
 pub fn disconnect_from_proxy() {}
 
 /*
@@ -243,7 +157,7 @@ pub fn generate_ca_files(path: &Path) {
   details.push(DnType::OrganizationName, "Grasscutters");
   details.push(DnType::CountryName, "CN");
   details.push(DnType::LocalityName, "CN");
-
+  
   // Set details in the parameter.
   params.distinguished_name = details;
   // Set other properties.
@@ -251,9 +165,9 @@ pub fn generate_ca_files(path: &Path) {
   params.key_usages = vec![
     KeyUsagePurpose::DigitalSignature,
     KeyUsagePurpose::KeyCertSign,
-    KeyUsagePurpose::CrlSign,
+    KeyUsagePurpose::CrlSign
   ];
-
+  
   // Create certificate.
   let cert = Certificate::from_params(params).unwrap();
   let cert_crt = cert.serialize_pem().unwrap();
@@ -262,37 +176,26 @@ pub fn generate_ca_files(path: &Path) {
   // Make certificate directory.
   let cert_dir = path.join("ca");
   match fs::create_dir(&cert_dir) {
-    Ok(_) => {}
+    Ok(_) => {},
     Err(e) => {
       println!("{}", e);
     }
   };
-
+  
   // Write the certificate to a file.
   let cert_path = cert_dir.join("cert.crt");
   match fs::write(&cert_path, cert_crt) {
     Ok(_) => println!("Wrote certificate to {}", cert_path.to_str().unwrap()),
-    Err(e) => println!(
+    Err(e) => println!("Error writing certificate to {}: {}", cert_path.to_str().unwrap(), e),
-      "Error writing certificate to {}: {}",
-      cert_path.to_str().unwrap(),
-      e
-    ),
   }
 
   // Write the private key to a file.
   let private_key_path = cert_dir.join("private.key");
   match fs::write(&private_key_path, private_key) {
-    Ok(_) => println!(
+    Ok(_) => println!("Wrote private key to {}", private_key_path.to_str().unwrap()),
-      "Wrote private key to {}",
+    Err(e) => println!("Error writing private key to {}: {}", private_key_path.to_str().unwrap(), e),
-      private_key_path.to_str().unwrap()
-    ),
-    Err(e) => println!(
-      "Error writing private key to {}: {}",
-      private_key_path.to_str().unwrap(),
-      e
-    ),
   }
-
+  
   // Install certificate into the system's Root CA store.
   install_ca_files(&cert_path);
 }
@@ -302,48 +205,17 @@ pub fn generate_ca_files(path: &Path) {
  */
 #[cfg(windows)]
 pub fn install_ca_files(cert_path: &Path) {
-  crate::system_helpers::run_command(
+  crate::system_helpers::run_command("certutil", vec!["-user", "-addstore", "Root", cert_path.to_str().unwrap()]);
-    "certutil",
-    vec!["-user", "-addstore", "Root", cert_path.to_str().unwrap()],
-    None,
-  );
   println!("Installed certificate.");
 }
 
 #[cfg(target_os = "macos")]
 pub fn install_ca_files(cert_path: &Path) {
-  crate::system_helpers::run_command(
+  crate::system_helpers::run_command("security", vec!["add-trusted-cert", "-d", "-r", "trustRoot", "-k", "/Library/Keychains/System.keychain", cert_path.to_str().unwrap()]);
-    "security",
-    vec![
-      "add-trusted-cert",
-      "-d",
-      "-r",
-      "trustRoot",
-      "-k",
-      "/Library/Keychains/System.keychain",
-      cert_path.to_str().unwrap(),
-    ],
-    None,
-  );
   println!("Installed certificate.");
 }
 
-// If this is borked on non-debian platforms, so be it
+#[cfg(not(any(windows, target_os = "macos")))]
-#[cfg(target_os = "linux")]
-pub fn install_ca_files(cert_path: &Path) {
-  let usr_certs = PathBuf::from("/usr/local/share/ca-certificates");
-  let usr_cert_path = usr_certs.join("cultivation.crt");
-
-  // Create dir if it doesn't exist
-  fs::create_dir_all(&usr_certs).expect("Unable to create local certificate directory");
-
-  fs::copy(cert_path, &usr_cert_path).expect("Unable to copy cert to local certificate directory");
-  run_command("update-ca-certificates", vec![], None);
-
-  println!("Installed certificate.");
-}
-
-#[cfg(not(any(windows, target_os = "macos", target_os = "linux")))]
 pub fn install_ca_files(_cert_path: &Path) {
   println!("Certificate installation is not supported on this platform.");
 }

src-tauri/src/structs.rs

@@ -5,4 +5,4 @@ use serde::Deserialize;
 #[derive(Deserialize)]
 pub(crate) struct APIQuery {
   pub bg_file: String,
-}
+}

src-tauri/src/system_helpers.rs

@@ -1,61 +1,20 @@
 use duct::cmd;
-use ini::Ini;
-use std::path::PathBuf;
-
-#[cfg(windows)]
-use registry::{Data, Hive, Security};
 
 #[tauri::command]
-pub fn run_program(path: String, args: Option<String>) {
+pub fn run_program(path: String) {
-  // Without unwrap_or, this can crash when UAC prompt is denied
+  // Open in new thread to prevent blocking.
-  open::that(format!("{} {}", &path, &args.unwrap_or_else(|| "".into()))).unwrap_or(());
-}
-
-#[tauri::command]
-pub fn run_program_relative(path: String, args: Option<String>) {
-  // Save the current working directory
-  let cwd = std::env::current_dir().unwrap();
-
-  // Set the new working directory to the path before the executable
-  let mut path_buf = std::path::PathBuf::from(&path);
-  path_buf.pop();
-
-  // Set new working directory
-  std::env::set_current_dir(&path_buf).unwrap();
-
-  // Without unwrap_or, this can crash when UAC prompt is denied
-  open::that(format!("{} {}", &path, args.unwrap_or_else(|| "".into()))).unwrap_or(());
-
-  // Restore the original working directory
-  std::env::set_current_dir(&cwd).unwrap();
-}
-
-#[tauri::command]
-pub fn run_command(program: &str, args: Vec<&str>, relative: Option<bool>) {
-  let prog = program.to_string();
-  let args = args.iter().map(|s| s.to_string()).collect::<Vec<String>>();
-
-  // Commands should not block (this is for the reshade injector mostly)
   std::thread::spawn(move || {
-    // Save the current working directory
+    // Without unwrap_or, this can crash when UAC prompt is denied
-    let cwd = std::env::current_dir().unwrap();
+    open::that(&path).unwrap_or(());
-
-    if relative.unwrap_or(false) {
-      // Set the new working directory to the path before the executable
-      let mut path_buf = std::path::PathBuf::from(&prog);
-      path_buf.pop();
-
-      // Set new working directory
-      std::env::set_current_dir(&path_buf).unwrap();
-    }
-
-    cmd(prog, args).run().unwrap();
-
-    // Restore the original working directory
-    std::env::set_current_dir(&cwd).unwrap();
   });
 }
 
+#[tauri::command]
+pub fn run_command(program: &str, args: Vec<&str>) {
+  cmd(program, args).run()
+    .expect("Failed to run command");
+}
+
 #[tauri::command]
 pub fn run_jar(path: String, execute_in: String, java_path: String) {
   let command = if java_path.is_empty() {
@@ -65,10 +24,7 @@ pub fn run_jar(path: String, execute_in: String, java_path: String) {
   };
 
   // Open the program from the specified path.
-  match open::with(
+  match open::with(format!("/k cd /D \"{}\" & {}", &execute_in, &command), "C:\\Windows\\System32\\cmd.exe") {
-    format!("/k cd /D \"{}\" & {}", &execute_in, &command),
-    "C:\\Windows\\System32\\cmd.exe",
-  ) {
     Ok(_) => (),
     Err(e) => println!("Failed to open jar ({} from {}): {}", &path, &execute_in, e),
   };
@@ -83,6 +39,7 @@ pub fn open_in_browser(url: String) {
   };
 }
 
+
 #[tauri::command]
 pub fn install_location() -> String {
   let mut exe_path = std::env::current_exe().unwrap();
@@ -93,70 +50,6 @@ pub fn install_location() -> String {
   return exe_path.to_str().unwrap().to_string();
 }
 
-#[tauri::command]
-pub fn set_migoto_target(path: String, migoto_path: String) -> bool {
-  let pathbuf = PathBuf::from(path);
-  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;
-    }
-  };
-
-  // Set options
-  conf
-    .with_section(Some("Loader"))
-    .set("target", pathbuf.to_str().unwrap());
-
-  // Write file
-  match conf.write_to_file(&migoto_pathbuf) {
-    Ok(_) => {
-      println!("Wrote config!");
-      true
-    }
-    Err(e) => {
-      println!("Error writing config: {}", e);
-      false
-    }
-  }
-}
-
-#[cfg(windows)]
-#[tauri::command]
-pub fn wipe_registry(exec_name: String) {
-  // Fetch the 'Internet Settings' registry key.
-  let settings =
-    match Hive::CurrentUser.open(format!("Software\\miHoYo\\{}", exec_name), Security::Write) {
-      Ok(s) => s,
-      Err(e) => {
-        println!("Error getting registry setting: {}", e);
-        return;
-      }
-    };
-
-  // Wipe login cache
-  match settings.set_value(
-    "MIHOYOSDK_ADL_PROD_OVERSEA_h1158948810",
-    &Data::String("".parse().unwrap()),
-  ) {
-    Ok(_) => (),
-    Err(e) => println!("Error wiping registry: {}", e),
-  }
-}
-
-#[cfg(unix)]
-#[tauri::command]
-pub fn wipe_registry(_exec_name: String) {}
-
 #[cfg(windows)]
 #[tauri::command]
 pub fn is_elevated() -> bool {
@@ -168,8 +61,3 @@ pub fn is_elevated() -> bool {
 pub fn is_elevated() -> bool {
   sudo::check() == sudo::RunningAs::Root
 }
-
-#[tauri::command]
-pub fn get_platform() -> &'static str {
-  std::env::consts::OS
-}

src-tauri/src/unzip.rs

@@ -1,16 +1,9 @@
-use std::fs::{read_dir, File};
+use std::fs::File;
 use std::path;
 use std::thread;
-use unrar::archive::Archive;
 
 #[tauri::command]
-pub fn unzip(
+pub fn unzip(window: tauri::Window, zipfile: String, destpath: String) {
-  window: tauri::Window,
-  zipfile: String,
-  destpath: String,
-  top_level: Option<bool>,
-  folder_if_loose: Option<bool>,
-) {
   // Read file TODO: replace test file
   let f = match File::open(&zipfile) {
     Ok(f) => f,
@@ -22,78 +15,42 @@ pub fn unzip(
 
   let write_path = path::PathBuf::from(&destpath);
 
-  // Get a list of all current directories
-  let mut dirs = vec![];
-  for entry in read_dir(&write_path).unwrap() {
-    let entry = entry.unwrap();
-    let entry_path = entry.path();
-    if entry_path.is_dir() {
-      dirs.push(entry_path);
-    }
-  }
-
   // Run extraction in seperate thread
   thread::spawn(move || {
-    let mut full_path = write_path.clone();
+    let full_path = write_path;
 
     window.emit("extract_start", &zipfile).unwrap();
 
-    if folder_if_loose.unwrap_or(false) {
+    match zip_extract::extract(&f, &full_path, true) {
-      // Create a new folder with the same name as the zip file
+      Ok(_) => {
-      let mut file_name = path::Path::new(&zipfile)
+        println!("Extracted zip file to: {}", full_path.to_str().unwrap_or("Error"));
-        .file_name()
+      }
-        .unwrap()
+      Err(e) => {
-        .to_str()
+        println!("Failed to extract zip file: {}", e);
-        .unwrap();
+        let mut res_hash = std::collections::HashMap::new();
 
-      // remove ".zip" from the end of the file name
+        res_hash.insert(
-      file_name = &file_name[..file_name.len() - 4];
+          "error".to_string(),
+          e.to_string(),
+        );
 
-      let new_path = full_path.join(file_name);
+        res_hash.insert(
-      match std::fs::create_dir_all(&new_path) {
+          "path".to_string(),
-        Ok(_) => {}
+          zipfile.to_string(),
-        Err(e) => {
+        );
-          println!("Failed to create directory: {}", e);
-          return;
-        }
-      };
 
-      full_path = new_path;
+        window.emit("download_error", &res_hash).unwrap();
-    }
+      }
+    };
 
-    println!("Is rar file? {}", zipfile.ends_with(".rar"));
+    // Get the name of the inenr file in the zip file
-
+    let mut zip = zip::ZipArchive::new(&f).unwrap();
-    let name;
+    let file = zip.by_index(0).unwrap();
-    let success;
+    let name = file.name();
-
-    // If file ends in zip, OR is unknown, extract as zip, otherwise extract as rar
-    if zipfile.ends_with(".rar") {
-      success = extract_rar(&zipfile, &f, &full_path, top_level.unwrap_or(true));
-
-      let archive = Archive::new(zipfile.clone());
-      name = archive.list().unwrap().next().unwrap().unwrap().filename;
-    } else {
-      success = extract_zip(&zipfile, &f, &full_path, top_level.unwrap_or(true));
-
-      // Get the name of the inenr file in the zip file
-      let mut zip = zip::ZipArchive::new(&f).unwrap();
-      let file = zip.by_index(0).unwrap();
-      name = file.name().to_string();
-    }
-
-    if !success {
-      let mut res_hash = std::collections::HashMap::new();
-
-      res_hash.insert("path".to_string(), zipfile.to_string());
-
-      window.emit("download_error", &res_hash).unwrap();
-    }
 
     // If the contents is a jar file, emit that we have extracted a new jar file
     if name.ends_with(".jar") {
-      window
+      window.emit("jar_extracted", destpath.to_string() + name).unwrap();
-        .emit("jar_extracted", destpath.to_string() + name.as_str())
-        .unwrap();
     }
 
     // Delete zip file
@@ -106,60 +63,6 @@ pub fn unzip(
       }
     };
 
-    // Get any new directory that could have been created
+    window.emit("extract_end", &zipfile).unwrap();
-    let mut new_dir: String = String::new();
-    for entry in read_dir(&write_path).unwrap() {
-      let entry = entry.unwrap();
-      let entry_path = entry.path();
-      if entry_path.is_dir() && !dirs.contains(&entry_path) {
-        new_dir = entry_path.to_str().unwrap().to_string();
-      }
-    }
-
-    let mut res_hash = std::collections::HashMap::new();
-    res_hash.insert("file", zipfile.to_string());
-    res_hash.insert("new_folder", new_dir);
-
-    window.emit("extract_end", &res_hash).unwrap();
   });
-}
+}
-
-fn extract_rar(rarfile: &str, _f: &File, full_path: &path::Path, _top_level: bool) -> bool {
-  let archive = Archive::new(rarfile.to_string());
-
-  let mut open_archive = archive
-    .extract_to(full_path.to_str().unwrap().to_string())
-    .unwrap();
-
-  match open_archive.process() {
-    Ok(_) => {
-      println!(
-        "Extracted rar file to: {}",
-        full_path.to_str().unwrap_or("Error")
-      );
-
-      true
-    }
-    Err(e) => {
-      println!("Failed to extract rar file: {}", e);
-      false
-    }
-  }
-}
-
-fn extract_zip(_zipfile: &str, f: &File, full_path: &path::Path, top_level: bool) -> bool {
-  match zip_extract::extract(f, full_path, top_level) {
-    Ok(_) => {
-      println!(
-        "Extracted zip file to: {}",
-        full_path.to_str().unwrap_or("Error")
-      );
-
-      true
-    }
-    Err(e) => {
-      println!("Failed to extract zip file: {}", e);
-      false
-    }
-  }
-}

src-tauri/src/web.rs

@@ -1,15 +1,9 @@
-use reqwest::header::{CONTENT_TYPE, USER_AGENT};
+use reqwest::header::USER_AGENT;
 
 pub(crate) async fn query(site: &str) -> String {
   let client = reqwest::Client::new();
 
-  let response = client
+  let response = client.get(site).header(USER_AGENT, "cultivation").send().await.unwrap();
-    .get(site)
-    .header(USER_AGENT, "cultivation")
-    .header(CONTENT_TYPE, "application/json")
-    .send()
-    .await
-    .unwrap();
   response.text().await.unwrap()
 }
 
@@ -18,12 +12,7 @@ pub(crate) async fn valid_url(url: String) -> bool {
   // Check if we get a 200 response
   let client = reqwest::Client::new();
 
-  let response = client
+  let response = client.get(url).header(USER_AGENT, "cultivation").send().await.unwrap();
-    .get(url)
-    .header(USER_AGENT, "cultivation")
-    .send()
-    .await
-    .unwrap();
 
   response.status().as_str() == "200"
 }
@@ -32,4 +21,4 @@ pub(crate) async fn valid_url(url: String) -> bool {
 pub async fn web_get(url: String) -> String {
   // Send a GET request to the specified URL and send the response body back to the client.
   query(&url).await
-}
+}

src-tauri/tauri.conf.json

@@ -7,17 +7,25 @@
   },
   "package": {
     "productName": "Cultivation",
-    "version": "1.0.10"
+    "version": "1.0.2"
   },
   "tauri": {
     "allowlist": {
       "fs": {
-        "scope": ["$DATA", "$DATA/cultivation", "$DATA/cultivation/*"]
+        "scope": [
+          "$DATA",
+          "$DATA/cultivation",
+          "$DATA/cultivation/*"
+        ]
       },
       "protocol": {
         "all": true,
         "asset": true,
-        "assetScope": ["$DATA", "$DATA/cultivation", "$DATA/cultivation/*"]
+        "assetScope": [
+          "$DATA",
+          "$DATA/cultivation",
+          "$DATA/cultivation/*"
+        ]
       },
       "all": true
     },
@@ -29,7 +37,13 @@
         "depends": []
       },
       "externalBin": [],
-      "icon": ["icons/32x32.png", "icons/128x128.png", "icons/128x128@2x.png", "icons/icon.icns", "icons/icon.ico"],
+      "icon": [
+        "icons/32x32.png",
+        "icons/128x128.png",
+        "icons/128x128@2x.png",
+        "icons/icon.icns",
+        "icons/icon.ico"
+      ],
       "identifier": "io.grasscutter",
       "shortDescription": "A game launcher.",
       "longDescription": "A launcher for a certain anime game that proxies all related game traffic to external servers.",
@@ -40,7 +54,9 @@
         "providerShortName": null,
         "signingIdentity": null
       },
-      "resources": ["lang/*.json", "keys/*"],
+      "resources": [
+        "lang/*.json"
+      ],
       "targets": "all",
       "windows": {
         "allowDowngrades": false,
@@ -75,4 +91,4 @@
       }
     ]
   }
-}
+}

src/index.css

@@ -1,11 +1,13 @@
 body {
   margin: 0;
-  font-family: 'MiHoYo_SDK_Web', 'Helvetica Neue', BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu',
+  font-family: 'MiHoYo_SDK_Web', 'Helvetica Neue', BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
-    'Cantarell', 'Fira Sans', 'Droid Sans', sans-serif;
+    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans',
+    sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
 
 code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
+  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
+    monospace;
 }

src/index.tsx

@@ -7,15 +7,23 @@ import Debug from './ui/Debug'
 
 import { getConfigOption } from './utils/configuration'
 
-const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement)
+const root = ReactDOM.createRoot(
+  document.getElementById('root') as HTMLElement
+)
 
-let isDebug = false
+let isDebug = false;
 
-;async () => {
+(async() => {
   isDebug = await getConfigOption('debug_enabled')
-}
+})
 
-root.render(<React.StrictMode>{isDebug ? <Debug /> : <App />}</React.StrictMode>)
+root.render(
+  <React.StrictMode>
+    {
+      isDebug ? <Debug /> : <App />
+    }
+  </React.StrictMode>
+)
 
 import reportWebVitals from './utils/reportWebVitals'
-isDebug && reportWebVitals(console.log)
+isDebug && reportWebVitals(console.log)

src/resources/icons/back.svg

@@ -1,10 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="256" height="256" viewBox="0 0 256 256" xml:space="preserve">
-<desc>Created with Fabric.js 1.7.22</desc>
-<defs>
-</defs>
-<g transform="translate(128 128) scale(0.72 0.72)" style="">
-	<g style="stroke: none; stroke-width: 0; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: none; fill-rule: nonzero; opacity: 1;" transform="translate(-175.05 -175.05) scale(3.89 3.89)" >
-	<path d="M 45 0 c 24.813 0 45 20.187 45 45 c 0 24.813 -20.187 45 -45 45 C 20.186 90 0 69.813 0 45 C 0 20.187 20.186 0 45 0 z M 51.263 73.4 l 8.6 -8.6 L 40.064 45 l 19.799 -19.799 l -8.6 -8.6 L 22.864 45 L 51.263 73.4 z" style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: rgb(0,0,0); fill-rule: nonzero; opacity: 1;" transform=" matrix(1 0 0 1 0 0) " stroke-linecap="round" />
-</g>
-</g>
-</svg>

src/resources/icons/eye.svg

@@ -1,11 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="256" height="256" viewBox="0 0 256 256" xml:space="preserve">
-<desc>Created with Fabric.js 1.7.22</desc>
-<defs>
-</defs>
-<g transform="translate(128 128) scale(0.72 0.72)" style="">
-	<g style="stroke: none; stroke-width: 0; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: none; fill-rule: nonzero; opacity: 1;" transform="translate(-175.05 -175.05) scale(3.89 3.89)" >
-	<path d="M 89.307 43.082 C 74.775 25.601 59.868 16.737 45 16.737 c -14.869 0 -29.775 8.864 -44.307 26.345 c -0.924 1.112 -0.924 2.724 0 3.836 C 15.225 64.399 30.131 73.264 45 73.264 c 14.868 0 29.775 -8.864 44.307 -26.346 C 90.231 45.806 90.231 44.194 89.307 43.082 z M 45 62 c -9.374 0 -17 -7.626 -17 -17 s 7.626 -17 17 -17 s 17 7.626 17 17 S 54.374 62 45 62 z" style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: rgb(0,0,0); fill-rule: nonzero; opacity: 1;" transform=" matrix(1 0 0 1 0 0) " stroke-linecap="round" />
-	<circle cx="45" cy="45" r="9" style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: rgb(0,0,0); fill-rule: nonzero; opacity: 1;" transform="  matrix(1 0 0 1 0 0) "/>
-</g>
-</g>
-</svg>

src/resources/icons/like.svg

@@ -1,11 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="256" height="256" viewBox="0 0 256 256" xml:space="preserve">
-<desc>Created with Fabric.js 1.7.22</desc>
-<defs>
-</defs>
-<g transform="translate(128 128) scale(0.72 0.72)" style="">
-	<g style="stroke: none; stroke-width: 0; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: none; fill-rule: nonzero; opacity: 1;" transform="translate(-175.05 -175.05) scale(3.89 3.89)" >
-	<path d="M 0 87.201 h 18.478 c 1.44 0 2.607 -1.167 2.607 -2.607 V 35.343 c 0 -1.44 -1.167 -2.607 -2.607 -2.607 H 0 L 0 87.201 z" style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: rgb(0,0,0); fill-rule: nonzero; opacity: 1;" transform=" matrix(1 0 0 1 0 0) " stroke-linecap="round" />
-	<path d="M 83.186 46.32 c 3.763 0 6.814 -3.051 6.814 -6.814 c 0 -3.763 -3.051 -6.814 -6.814 -6.814 H 61.591 c 3.758 -6.768 3.872 -27.328 -5.046 -29.797 c -1.689 -0.468 -3.365 0.823 -3.554 2.565 c -1.568 14.428 -10.395 32.362 -19.37 32.881 h -6.991 v 43.003 h 3.627 c 1.952 0 3.817 0.666 5.444 1.743 c 4.063 2.691 10.906 4.265 17.465 4.101 h 3.172 v 0.012 h 21.788 c 3.763 0 6.814 -3.051 6.814 -6.814 c 0 -3.763 -3.051 -6.814 -6.814 -6.814 h 3.037 c 3.763 0 6.814 -3.051 6.814 -6.814 c 0 -3.763 -3.051 -6.814 -6.814 -6.814 h 2.025 c 3.763 0 6.814 -3.051 6.814 -6.814 S 86.949 46.32 83.186 46.32 z" style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: rgb(0,0,0); fill-rule: nonzero; opacity: 1;" transform=" matrix(1 0 0 1 0 0) " stroke-linecap="round" />
-</g>
-</g>
-</svg>

src/resources/icons/plus.svg

@@ -1,11 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="256" height="256" viewBox="0 0 256 256" xml:space="preserve">
-<desc>Created with Fabric.js 1.7.22</desc>
-<defs>
-</defs>
-<g transform="translate(128 128) scale(0.72 0.72)" style="">
-	<g style="stroke: none; stroke-width: 0; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: none; fill-rule: nonzero; opacity: 1;" transform="translate(-175.05 -175.05) scale(3.89 3.89)" >
-	<path d="M 58.921 90 H 31.079 c -1.155 0 -2.092 -0.936 -2.092 -2.092 V 2.092 C 28.988 0.936 29.924 0 31.079 0 h 27.841 c 1.155 0 2.092 0.936 2.092 2.092 v 85.817 C 61.012 89.064 60.076 90 58.921 90 z" style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: rgb(0,0,0); fill-rule: nonzero; opacity: 1;" transform=" matrix(1 0 0 1 0 0) " stroke-linecap="round" />
-	<path d="M 90 31.079 v 27.841 c 0 1.155 -0.936 2.092 -2.092 2.092 H 2.092 C 0.936 61.012 0 60.076 0 58.921 V 31.079 c 0 -1.155 0.936 -2.092 2.092 -2.092 h 85.817 C 89.064 28.988 90 29.924 90 31.079 z" style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: rgb(0,0,0); fill-rule: nonzero; opacity: 1;" transform=" matrix(1 0 0 1 0 0) " stroke-linecap="round" />
-</g>
-</g>
-</svg>

src/resources/icons/wrench.svg

@@ -1,10 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="256" height="256" viewBox="0 0 256 256" xml:space="preserve">
-<desc>Created with Fabric.js 1.7.22</desc>
-<defs>
-</defs>
-<g transform="translate(128 128) scale(0.72 0.72)" style="">
-	<g style="stroke: none; stroke-width: 0; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: none; fill-rule: nonzero; opacity: 1;" transform="translate(-175.05 -175.05) scale(3.89 3.89)" >
-	<path d="M 87.12 73.212 L 48.774 34.866 c 3.723 -9.153 1.873 -20.042 -5.553 -27.468 c -7.008 -7.008 -17.094 -9.025 -25.9 -6.104 L 28.96 12.934 c 4.387 4.387 4.833 11.594 0.579 16.112 c -4.402 4.674 -11.761 4.757 -16.268 0.25 L 1.295 17.32 c -2.922 8.807 -0.904 18.892 6.104 25.9 c 7.426 7.426 18.315 9.276 27.468 5.553 L 73.212 87.12 c 3.84 3.84 10.067 3.84 13.908 0 l 0 0 C 90.96 83.279 90.96 77.052 87.12 73.212 z" style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 10; fill: rgb(0,0,0); fill-rule: nonzero; opacity: 1;" transform=" matrix(1 0 0 1 0 0) " stroke-linecap="round" />
-</g>
-</g>
-</svg>

src/ui/App.css

@@ -22,8 +22,7 @@ select:focus {
   border-bottom-color: #ffd326;
 }
 
-#root,
+#root, .App {
-.App {
   height: 100%;
 }
 
@@ -35,29 +34,12 @@ select:focus {
 .TopButton {
   height: 60%;
   margin: 0px 10px;
-
-  color: #c5c5c5;
-  transition: color 0.1s ease-in-out;
-}
-
-.TopButton span {
-  display: inline-block;
-  line-height: normal;
-  border-bottom: 1px solid #c5c5c5;
-}
-
-.TopButton img {
   filter: invert(95%) sepia(0%) saturate(18%) hue-rotate(153deg) brightness(88%) contrast(81%);
 
   transition: filter 0.1s ease-in-out;
 }
 
 .TopButton:hover {
-  color: #fff;
-  cursor: pointer;
-}
-
-.TopButton:hover img {
   filter: invert(100%) sepia(0%) saturate(18%) hue-rotate(153deg) brightness(100%) contrast(100%);
   cursor: pointer;
 }
@@ -82,8 +64,8 @@ select:focus {
 }
 
 .arrow-down {
-  width: 0;
+  width: 0; 
-  height: 0;
+  height: 0; 
   border-left: 50px solid transparent;
   border-right: 50px solid transparent;
   border-top: 50px solid transparent;
@@ -100,28 +82,28 @@ select:focus {
 
 .BottomSection {
   position: absolute;
-  bottom: 0%;
+	bottom: 0%;
-  left: 50%;
+	left: 50%;
-  transform: translate(-50%, 0%);
+	transform: translate(-50%, 0%);
 
-  width: 100%;
+	width: 100%;
-  height: 160px;
+	height: 160px;
 
   backdrop-filter: blur(10px);
   box-shadow: inset 0px 5px 12px -3px rgb(50 50 50 / 75%);
 
-  margin: 0;
+	margin: 0;
-  padding: 0;
+	padding: 0;
 }
 
-@media (max-height: 580px) {
+@media(max-height: 580px) {
-  .BottomSection {
+    .BottomSection {
-    height: 150px;
+        height: 150px;
-  }
+    }
 }
 
-@media (max-height: 500px) {
+@media(max-height: 500px) {
-  .BottomSection {
+    .BottomSection {
-    height: 140px;
+        height: 140px;
-  }
+    }
-}
+}

src/ui/App.tsx

@@ -1,33 +1,83 @@
 import React from 'react'
+import { listen } from '@tauri-apps/api/event'
 import './App.css'
 
 import DownloadHandler from '../utils/download'
-import { getConfigOption } from '../utils/configuration'
-import { getTheme, loadTheme } from '../utils/themes'
-import { convertFileSrc, invoke } from '@tauri-apps/api/tauri'
-import { dataDir } from '@tauri-apps/api/path'
-import { Main } from './Main'
-import { Mods } from './Mods'
 
-interface IState {
+// Major Components
-  page: string
+import TopBar from './components/TopBar'
-  bgFile: string
+import ServerLaunchSection from './components/ServerLaunchSection'
+import MainProgressBar from './components/common/MainProgressBar'
+import Options from './components/menu/Options'
+import MiniDialog from './components/MiniDialog'
+import DownloadList from './components/common/DownloadList'
+import Downloads from './components/menu/Downloads'
+import NewsSection from './components/news/NewsSection'
+import Game from './components/menu/Game'
+
+import RightBar from './components/RightBar'
+import { getConfigOption, setConfigOption } from '../utils/configuration'
+import { invoke } from '@tauri-apps/api'
+import { dataDir } from '@tauri-apps/api/path'
+import { appWindow } from '@tauri-apps/api/window'
+import { convertFileSrc } from '@tauri-apps/api/tauri'
+import { getTheme, loadTheme } from '../utils/themes'
+
+interface IProps {
+  [key: string]: never;
+}
+
+interface IState {
+  isDownloading: boolean;
+  optionsOpen: boolean;
+  miniDownloadsOpen: boolean;
+  downloadsOpen: boolean;
+  gameDownloadsOpen: boolean;
+  bgFile: string;
 }
 
-const downloadHandler = new DownloadHandler()
 const DEFAULT_BG = 'https://api.grasscutter.io/cultivation/bgfile'
 
-class App extends React.Component<Readonly<unknown>, IState> {
+const downloadHandler = new DownloadHandler()
-  constructor(props: Readonly<unknown>) {
-    super(props)
 
+class App extends React.Component<IProps, IState> {
+  constructor(props: IProps) {
+    super(props)
     this.state = {
-      page: 'main',
+      isDownloading: false,
+      optionsOpen: false,
+      miniDownloadsOpen: false,
+      downloadsOpen: false,
+      gameDownloadsOpen: false,
       bgFile: DEFAULT_BG,
     }
+
+    listen('lang_error', (payload) => {
+      console.log(payload)
+    })
+
+    listen('jar_extracted', ({ payload }) => {
+      setConfigOption('grasscutter_path', payload)
+    })
+
+    let min = false
+
+    // periodically check if we need to min/max based on whether the game is open
+    setInterval(async () => {
+      const gameOpen = await invoke('is_game_running')
+
+      if (gameOpen && !min) {
+        appWindow.minimize()
+        min = true
+      } else if (!gameOpen && min) {
+        appWindow.unminimize()
+        min = false
+      }
+    }, 1000)
   }
 
   async componentDidMount() {
+    const cert_generated = await getConfigOption('cert_generated')
     const game_exe = await getConfigOption('game_install_path')
     const game_path = game_exe?.substring(0, game_exe.replace(/\\/g, '/').lastIndexOf('/')) || ''
     const root_path = game_path?.substring(0, game_path.replace(/\\/g, '/').lastIndexOf('/')) || ''
@@ -42,79 +92,134 @@ class App extends React.Component<Readonly<unknown>, IState> {
     // Get custom bg AFTER theme is loaded !! important !!
     const custom_bg = await getConfigOption('customBackground')
 
-    if (!custom_bg || !/png|jpg|jpeg$/.test(custom_bg)) {
+    if(!custom_bg || !/png|jpg|jpeg$/.test(custom_bg)) {
-      if (game_path) {
+      if(game_path) {
         // Get the bg by invoking, then set the background to that bg.
         const bgLoc: string = await invoke('get_bg_file', {
           bgPath: root_path,
-          appdata: await dataDir(),
+          appdata: await dataDir()
         })
 
-        bgLoc &&
+        bgLoc && this.setState({
-          this.setState(
+          bgFile: bgLoc
-            {
+        }, this.forceUpdate)
-              bgFile: bgLoc,
-            },
-            this.forceUpdate
-          )
       }
     } else {
       const isUrl = /^http(s)?:\/\//gm.test(custom_bg)
 
       if (!isUrl) {
         const isValid = await invoke('dir_exists', {
-          path: custom_bg,
+          path: custom_bg
         })
 
-        this.setState(
+        this.setState({
-          {
+          bgFile: isValid ? convertFileSrc(custom_bg) : DEFAULT_BG
-            bgFile: isValid ? convertFileSrc(custom_bg) : DEFAULT_BG,
+        }, this.forceUpdate)
-          },
-          this.forceUpdate
-        )
       } else {
         // Check if URL returns a valid image.
         const isValid = await invoke('valid_url', {
-          url: custom_bg,
+          url: custom_bg
         })
 
-        this.setState(
+        this.setState({
-          {
+          bgFile: isValid ? custom_bg : DEFAULT_BG
-            bgFile: isValid ? custom_bg : DEFAULT_BG,
+        }, this.forceUpdate)
-          },
-          this.forceUpdate
-        )
       }
     }
 
-    window.addEventListener('changePage', (e) => {
+    if (!cert_generated) {
-      this.setState({
+      // Generate the certificate
-        // @ts-expect-error - TS doesn't like our custom event
+      await invoke('generate_ca_files', {
-        page: e.detail,
+        path: await dataDir() + 'cultivation'
       })
-    })
+
+      await setConfigOption('cert_generated', true)
+    }
+
+    // Period check to only show progress bar when downloading files
+    setInterval(() => {
+      this.setState({
+        isDownloading: downloadHandler.getDownloads().filter(d => d.status !== 'finished')?.length > 0
+      })
+    }, 1000)
   }
 
   render() {
     return (
-      <div
+      <div className="App" style={
-        className="App"
+        this.state.bgFile ? {
-        style={
+          background: `url("${this.state.bgFile}") fixed`,
-          this.state.bgFile
+        } : {}
-            ? {
+      }>
-                background: `url("${this.state.bgFile}") fixed`,
+        <TopBar
-              }
+          optFunc={() => {
-            : {}
+            this.setState({ optionsOpen: !this.state.optionsOpen })
+          }}
+          downFunc={() => this.setState({ downloadsOpen: !this.state.downloadsOpen })}
+          gameFunc={() => this.setState({ gameDownloadsOpen: !this.state.gameDownloadsOpen })}
+        />
+
+        <RightBar />
+
+        <NewsSection />
+
+        {
+          // Mini downloads section
+          this.state.miniDownloadsOpen ? (
+            <div className="MiniDownloads" id="miniDownloadContainer">
+              <MiniDialog
+                title="Downloads"
+                closeFn={() => {
+                  this.setState({ miniDownloadsOpen: false })
+                }}
+              >
+                <DownloadList downloadManager={downloadHandler} />
+              </MiniDialog>
+              <div className="arrow-down"></div>
+            </div>
+          ) : null
         }
-      >
+
-        {(() => {
+        {
-          switch (this.state.page) {
+          // Download menu
-            case 'modding':
+          this.state.downloadsOpen ? (
-              return <Mods downloadHandler={downloadHandler} />
+            <Downloads
-            default:
+              downloadManager={downloadHandler}
-              return <Main downloadHandler={downloadHandler} />
+              closeFn={() => this.setState({ downloadsOpen: false })}
-          }
+            />
-        })()}
+          ) : null
+        }
+
+        {
+          // Options menu
+          this.state.optionsOpen ? (
+            <Options
+              closeFn={() => this.setState({ optionsOpen: !this.state.optionsOpen })}
+            />
+          ) : null
+        }
+
+        {
+          // Game downloads menu
+          this.state.gameDownloadsOpen ? (
+            <Game
+              downloadManager={downloadHandler}
+              closeFn={() => this.setState({ gameDownloadsOpen: false })}
+            />
+          ) : null
+        }
+
+        <div className="BottomSection" id="bottomSectionContainer">
+          <ServerLaunchSection />
+
+          <div id="DownloadProgress"
+            onClick={() => this.setState({ miniDownloadsOpen: !this.state.miniDownloadsOpen })}
+          >
+            { this.state.isDownloading ?
+              <MainProgressBar downloadManager={downloadHandler} />
+              : null }
+          </div>
+        </div>
       </div>
     )
   }

src/ui/Debug.tsx

@@ -3,8 +3,8 @@ import './App.css'
 
 import TopBar from './components/TopBar'
 
-import { invoke } from '@tauri-apps/api/tauri'
+import {invoke} from '@tauri-apps/api/tauri'
-import { dataDir } from '@tauri-apps/api/path'
+import {dataDir} from '@tauri-apps/api/path'
 import TextInput from './components/common/TextInput'
 
 let proxyAddress = ''
@@ -15,7 +15,7 @@ async function setProxyAddress(address: string) {
 }
 
 async function startProxy() {
-  await invoke('connect', { port: 2222, certificatePath: (await dataDir()) + '\\cultivation\\ca' })
+  await invoke('connect', { port: 2222, certificatePath: await dataDir() + '\\cultivation\\ca' })
   await invoke('open_in_browser', { url: 'https://hoyoverse.com' })
 }
 
@@ -24,23 +24,27 @@ async function stopProxy() {
 }
 
 async function generateCertificates() {
-  await invoke('generate_ca_files', { path: (await dataDir()) + '\\cultivation' })
+  await invoke('generate_ca_files', { path: await dataDir() + '\\cultivation' })
 }
 
 async function generateInfo() {
   console.log({
-    certificatePath: (await dataDir()) + '\\cultivation\\ca',
+    certificatePath: await dataDir() + '\\cultivation\\ca',
     isAdmin: await invoke('is_elevated'),
-    connectingTo: proxyAddress,
+    connectingTo: proxyAddress
   })
   alert('check your dev console and send that in #cultivation')
 }
 
-class Debug extends React.Component {
+function none() {
+  alert('none')
+}
+
+class Debug extends React.Component<any, any>{
   render() {
     return (
       <div className="App">
-        <TopBar />
+        <TopBar optFunc={none} downFunc={none} gameFunc={none} />
         <TextInput readOnly={false} initalValue={'change to set proxy address'} onChange={setProxyAddress} />
         <button onClick={startProxy}>start proxy</button>
         <button onClick={stopProxy}>stop proxy</button>
@@ -51,4 +55,4 @@ class Debug extends React.Component {
   }
 }
 
-export default Debug
+export default Debug

src/ui/Main.tsx

@@ -1,241 +0,0 @@
-import React from 'react'
-
-// Major Components
-import TopBar from './components/TopBar'
-import ServerLaunchSection from './components/ServerLaunchSection'
-import MainProgressBar from './components/common/MainProgressBar'
-import Options from './components/menu/Options'
-import MiniDialog from './components/MiniDialog'
-import DownloadList from './components/common/DownloadList'
-import Downloads from './components/menu/Downloads'
-import NewsSection from './components/news/NewsSection'
-import Game from './components/menu/Game'
-import RightBar from './components/RightBar'
-
-import { getConfigOption, setConfigOption } from '../utils/configuration'
-import { invoke } from '@tauri-apps/api'
-import { listen } from '@tauri-apps/api/event'
-import { dataDir } from '@tauri-apps/api/path'
-import { appWindow } from '@tauri-apps/api/window'
-import { unpatchGame } from '../utils/metadata'
-import DownloadHandler from '../utils/download'
-
-// Graphics
-import cogBtn from '../resources/icons/cog.svg'
-import downBtn from '../resources/icons/download.svg'
-import wrenchBtn from '../resources/icons/wrench.svg'
-import { ExtrasMenu } from './components/menu/ExtrasMenu'
-
-interface IProps {
-  downloadHandler: DownloadHandler
-}
-
-interface IState {
-  isDownloading: boolean
-  optionsOpen: boolean
-  miniDownloadsOpen: boolean
-  downloadsOpen: boolean
-  gameDownloadsOpen: boolean
-  extrasOpen: boolean
-  migotoSet: boolean
-  playGame: (exe?: string, proc_name?: string) => void
-}
-
-export class Main extends React.Component<IProps, IState> {
-  constructor(props: IProps) {
-    super(props)
-    this.state = {
-      isDownloading: false,
-      optionsOpen: false,
-      miniDownloadsOpen: false,
-      downloadsOpen: false,
-      gameDownloadsOpen: false,
-      extrasOpen: false,
-      migotoSet: false,
-      playGame: () => {
-        alert('Error launching game')
-      },
-    }
-
-    listen('lang_error', (payload) => {
-      console.log(payload)
-    })
-
-    listen('jar_extracted', ({ payload }: { payload: string }) => {
-      setConfigOption('grasscutter_path', payload)
-    })
-
-    // Emitted for metadata replacing-purposes
-    listen('game_closed', async () => {
-      const wasPatched = await getConfigOption('patch_metadata')
-
-      if (wasPatched) {
-        const unpatched = await unpatchGame()
-
-        if (!unpatched) {
-          alert(
-            `Could not unpatch game! (You should be able to find your metadata backup in ${await dataDir()}\\cultivation\\)`
-          )
-        }
-      }
-    })
-
-    let min = false
-
-    // periodically check if we need to min/max based on whether the game is open
-    setInterval(async () => {
-      const gameOpen = await invoke('is_game_running')
-
-      if (gameOpen && !min) {
-        appWindow.minimize()
-        min = true
-      } else if (!gameOpen && min) {
-        appWindow.unminimize()
-        min = false
-      }
-    }, 1000)
-
-    this.openExtrasMenu = this.openExtrasMenu.bind(this)
-  }
-
-  async componentDidMount() {
-    const cert_generated = await getConfigOption('cert_generated')
-
-    this.setState({
-      migotoSet: !!(await getConfigOption('migoto_path')),
-    })
-
-    if (!cert_generated) {
-      // Generate the certificate
-      await invoke('generate_ca_files', {
-        path: (await dataDir()) + 'cultivation',
-      })
-
-      await setConfigOption('cert_generated', true)
-    }
-
-    // Period check to only show progress bar when downloading files
-    setInterval(() => {
-      this.setState({
-        isDownloading: this.props.downloadHandler.getDownloads().filter((d) => d.status !== 'finished')?.length > 0,
-      })
-    }, 1000)
-  }
-
-  async openExtrasMenu(playGame: () => void) {
-    this.setState({
-      extrasOpen: true,
-      playGame,
-    })
-  }
-
-  render() {
-    return (
-      <>
-        <TopBar>
-          <div
-            id="settingsBtn"
-            onClick={() => this.setState({ optionsOpen: !this.state.optionsOpen })}
-            className="TopButton"
-          >
-            <img src={cogBtn} alt="settings" />
-          </div>
-          <div
-            id="downloadsBtn"
-            className="TopButton"
-            onClick={() => this.setState({ downloadsOpen: !this.state.downloadsOpen })}
-          >
-            <img src={downBtn} alt="downloads" />
-          </div>
-          {this.state.migotoSet && (
-            <div
-              id="modsBtn"
-              onClick={() => {
-                // Create and dispatch a custom "openMods" event
-                const event = new CustomEvent('changePage', { detail: 'modding' })
-                window.dispatchEvent(event)
-              }}
-              className="TopButton"
-            >
-              <img src={wrenchBtn} alt="mods" />
-            </div>
-          )}
-          {/* <div id="gameBtn" className="TopButton" onClick={() => this.setState({ gameDownloadsOpen: !this.state.gameDownloadsOpen })}>
-            <img src={gameBtn} alt="game" />
-          </div> */}
-        </TopBar>
-
-        <RightBar />
-
-        <NewsSection />
-
-        {
-          // Extras section
-          this.state.extrasOpen && (
-            <ExtrasMenu closeFn={() => this.setState({ extrasOpen: false })} playGame={this.state.playGame}>
-              Yo
-            </ExtrasMenu>
-          )
-        }
-
-        {
-          // Mini downloads section
-          this.state.miniDownloadsOpen ? (
-            <div className="MiniDownloads" id="miniDownloadContainer">
-              <MiniDialog
-                title="Downloads"
-                closeFn={() => {
-                  this.setState({ miniDownloadsOpen: false })
-                }}
-              >
-                <DownloadList downloadManager={this.props.downloadHandler} />
-              </MiniDialog>
-              <div className="arrow-down"></div>
-            </div>
-          ) : null
-        }
-
-        {
-          // Download menu
-          this.state.downloadsOpen ? (
-            <Downloads
-              downloadManager={this.props.downloadHandler}
-              closeFn={() => this.setState({ downloadsOpen: false })}
-            />
-          ) : null
-        }
-
-        {
-          // Options menu
-          this.state.optionsOpen ? (
-            <Options
-              downloadManager={this.props.downloadHandler}
-              closeFn={() => this.setState({ optionsOpen: !this.state.optionsOpen })}
-            />
-          ) : null
-        }
-
-        {
-          // Game downloads menu
-          this.state.gameDownloadsOpen ? (
-            <Game
-              downloadManager={this.props.downloadHandler}
-              closeFn={() => this.setState({ gameDownloadsOpen: false })}
-            />
-          ) : null
-        }
-
-        <div className="BottomSection" id="bottomSectionContainer">
-          <ServerLaunchSection openExtras={this.openExtrasMenu} />
-
-          <div
-            id="DownloadProgress"
-            onClick={() => this.setState({ miniDownloadsOpen: !this.state.miniDownloadsOpen })}
-          >
-            {this.state.isDownloading ? <MainProgressBar downloadManager={this.props.downloadHandler} /> : null}
-          </div>
-        </div>
-      </>
-    )
-  }
-}

src/ui/Mods.css

@@ -1,41 +0,0 @@
-.Mods {
-  backdrop-filter: blur(10px);
-  height: 90%;
-  width: 100%;
-}
-
-/* Stuff for the top bar progress bar */
-.TopDownloads {
-  position: absolute;
-  top: 10px;
-  left: 35.5%;
-
-  width: 30%;
-}
-
-.TopDownloads .ProgressBar {
-  width: 100%;
-  height: 10px;
-}
-
-.ModMenu {
-  width: 40%;
-}
-
-.ModMenu .BigButton {
-  font-size: 16px;
-  padding: 6px 30px;
-}
-
-.ModDownloadList {
-  width: 80%;
-}
-
-.ModDownloadItem {
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-
-  margin: 10px;
-}

src/ui/Mods.tsx

@@ -1,169 +0,0 @@
-import { invoke } from '@tauri-apps/api'
-import React from 'react'
-import DownloadHandler from '../utils/download'
-import { getModDownload, ModData } from '../utils/gamebanana'
-import { getModsFolder } from '../utils/mods'
-import { unzip } from '../utils/zipUtils'
-import ProgressBar from './components/common/MainProgressBar'
-import { ModHeader } from './components/mods/ModHeader'
-import { ModList } from './components/mods/ModList'
-import TopBar from './components/TopBar'
-
-import './Mods.css'
-import Back from '../resources/icons/back.svg'
-import Menu from './components/menu/Menu'
-import BigButton from './components/common/BigButton'
-import Tr from '../utils/language'
-
-interface IProps {
-  downloadHandler: DownloadHandler
-}
-
-interface IState {
-  isDownloading: boolean
-  category: string
-  downloadList: { name: string; url: string; mod: ModData }[] | null
-}
-
-const headers = [
-  {
-    name: 'ripe',
-    title: 'Hot',
-  },
-  {
-    name: 'new',
-    title: 'New',
-  },
-  {
-    name: 'installed',
-    title: 'Installed',
-  },
-]
-
-/**
- * Mods currently install into folder labelled with their GB ID
- *
- * @TODO Categorizaiton/sorting (by likes, views, etc)
- */
-export class Mods extends React.Component<IProps, IState> {
-  constructor(props: IProps) {
-    super(props)
-
-    this.state = {
-      isDownloading: false,
-      category: '',
-      downloadList: null,
-    }
-
-    this.setCategory = this.setCategory.bind(this)
-    this.addDownload = this.addDownload.bind(this)
-  }
-
-  async addDownload(mod: ModData) {
-    const dlLinks = await getModDownload(String(mod.id))
-
-    // Not gonna bother allowing sorting for now
-    const firstLink = dlLinks[0].downloadUrl
-    const fileExt = firstLink.split('.').pop()
-
-    const modName = `${mod.id}.${fileExt}`
-
-    if (dlLinks.length === 0) return
-
-    // If there is one download we don't care to choose
-    if (dlLinks.length === 1) {
-      this.downloadMod(firstLink, modName, mod)
-      return
-    }
-
-    this.setState({
-      downloadList: dlLinks.map((link) => ({
-        name: link.filename,
-        url: link.downloadUrl,
-        mod: mod,
-      })),
-    })
-  }
-
-  async downloadMod(link: string, modName: string, mod: ModData) {
-    const modFolder = await getModsFolder()
-    const path = `${modFolder}/${modName}`
-
-    if (!modFolder) return
-
-    this.props.downloadHandler.addDownload(link, path, async () => {
-      const unzipRes = await unzip(path, modFolder, false, true)
-
-      // Write a modinfo.json file
-      invoke('write_file', {
-        path: `${unzipRes.new_folder}/modinfo.json`,
-        contents: JSON.stringify(mod),
-      })
-    })
-  }
-
-  async setCategory(value: string) {
-    this.setState(
-      {
-        category: value,
-      },
-      this.forceUpdate
-    )
-  }
-
-  render() {
-    return (
-      <div className="Mods">
-        <TopBar>
-          <div
-            id="backbtn"
-            className="TopButton"
-            onClick={() => {
-              // Create and dispatch a custom "changePage" event
-              const event = new CustomEvent('changePage', { detail: 'main' })
-              window.dispatchEvent(event)
-            }}
-          >
-            <img src={Back} alt="back" />
-          </div>
-        </TopBar>
-
-        {this.state.downloadList && (
-          <Menu className="ModMenu" heading="Links" closeFn={() => this.setState({ downloadList: null })}>
-            <div className="ModDownloadList">
-              {this.state.downloadList.map((o) => {
-                return (
-                  <div className="ModDownloadItem" key={o.name}>
-                    <div className="ModDownloadName">{o.name}</div>
-                    <BigButton
-                      id={o.url}
-                      onClick={() => {
-                        const fileExt = o.url.split('.').pop()
-                        const modName = `${o.mod.id}.${fileExt}`
-
-                        this.downloadMod(o.url, modName, o.mod)
-                        this.setState({
-                          downloadList: null,
-                        })
-                      }}
-                    >
-                      <Tr text="components.download" />
-                    </BigButton>
-                  </div>
-                )
-              })}
-            </div>
-          </Menu>
-        )}
-
-        <div className="TopDownloads">
-          <ProgressBar downloadManager={this.props.downloadHandler} withStats={false} />
-        </div>
-
-        <ModHeader onChange={this.setCategory} headers={headers} defaultHeader={'ripe'} />
-
-        <ModList key={this.state.category} mode={this.state.category} addDownload={this.addDownload} />
-      </div>
-    )
-  }
-}

src/ui/components/MiniDialog.css

@@ -1,7 +1,7 @@
 .MiniDialog {
   position: fixed;
   z-index: 99;
-
+  
   /* Len and width */
   height: 30%;
   width: 30%;
@@ -32,4 +32,4 @@
 
 .MiniDialog .ProgressText {
   color: #000;
-}
+}

src/ui/components/MiniDialog.tsx

@@ -4,10 +4,10 @@ import Close from '../../resources/icons/close.svg'
 import './MiniDialog.css'
 
 interface IProps {
-  children: React.ReactNode[] | React.ReactNode
+  children: React.ReactNode[] | React.ReactNode;
-  title?: string
+  title?: string;
-  closeable?: boolean
+  closeable?: boolean;
-  closeFn: () => void
+  closeFn: () => void;
 }
 
 export default class MiniDialog extends React.Component<IProps, never> {
@@ -19,7 +19,7 @@ export default class MiniDialog extends React.Component<IProps, never> {
     document.addEventListener('mousedown', (evt) => {
       const tgt = evt.target as HTMLElement
       const isInside = tgt.closest('.MiniDialog') !== null
-
+      
       if (!isInside) {
         this.props.closeFn()
       }
@@ -33,12 +33,13 @@ export default class MiniDialog extends React.Component<IProps, never> {
   render() {
     return (
       <div className="MiniDialog" id="miniDialogContainer">
-        {this.props.closeable !== undefined && this.props.closeable ? (
+        {
-          <div className="MiniDialogTop" id="miniDialogContainerTop" onClick={this.props.closeFn}>
+          this.props.closeable !== undefined && this.props.closeable ?
-            <span>{this.props?.title}</span>
+            <div className="MiniDialogTop" id="miniDialogContainerTop" onClick={this.props.closeFn}>
-            <img src={Close} className="MiniDialogClose" id="miniDialogButtonClose" />
+              <span>{this.props?.title}</span>
-          </div>
+              <img src={Close} className="MiniDialogClose" id="miniDialogButtonClose" />
-        ) : null}
+            </div> : null
+        }
 
         <div className="MiniDialogInner" id="miniDialogContent">
           {this.props.children}
@@ -46,4 +47,4 @@ export default class MiniDialog extends React.Component<IProps, never> {
       </div>
     )
   }
-}
+}

src/ui/components/RightBar.css

@@ -2,7 +2,7 @@
   position: absolute;
   transform: translate(0%, 0%);
 
-  display: flex;
+  display:flex;
   flex-direction: column;
   align-items: center;
   justify-content: flex-start;
@@ -36,14 +36,14 @@
   filter: invert(75%) sepia(0%) saturate(100%) hue-rotate(0deg) brightness(100%) contrast(100%);
 }
 
-@media (max-height: 580px) {
+@media(max-height: 580px) {
-  .RightBar {
+    .RightBar {
-    height: calc(100vh - 180px);
+        height: calc(100vh - 180px);
-  }
+    }
 }
 
-@media (max-height: 500px) {
+@media(max-height: 500px) {
-  .RightBar {
+    .RightBar {
-    height: calc(100vh - 170px);
+        height: calc(100vh - 170px);
-  }
+    }
-}
+}

src/ui/components/RightBar.tsx

@@ -1,8 +1,8 @@
 import { invoke } from '@tauri-apps/api'
 import React from 'react'
 
-import Discord from '../../resources/icons/discord.svg'
+import Discord from  '../../resources/icons/discord.svg'
-import Github from '../../resources/icons/github.svg'
+import Github from  '../../resources/icons/github.svg'
 
 import './RightBar.css'
 
@@ -28,4 +28,4 @@ export default class RightBar extends React.Component {
       </div>
     )
   }
-}
+}

src/ui/components/ServerLaunchSection.css

@@ -82,12 +82,7 @@
   width: 5%;
 }
 
-#ExtrasMenuButton {
+.AkebiIcon,
-  width: 5%;
-  padding: 0 20px;
-}
-
-.ExtrasIcon,
 .ServerIcon {
   height: 20px;
   filter: invert(28%) sepia(28%) saturate(1141%) hue-rotate(352deg) brightness(96%) contrast(88%);
@@ -114,17 +109,17 @@
 }
 
 @media (max-width: 1040px) {
-  #playButton {
+    #playButton {
-    right: 5%;
+        right: 5%;
-  }
+    }
 }
 
 @media (max-width: 870px) {
-  #playButton {
+    #playButton {
-    min-width: 235px;
+        min-width: 235px;
-  }
+    }
 
-  #officialPlay {
+    #officialPlay {
-    width: 40%;
+        width: 40%;
-  }
+    }
 }

src/ui/components/ServerLaunchSection.tsx

@@ -8,35 +8,31 @@ import { translate } from '../../utils/language'
 import { invoke } from '@tauri-apps/api/tauri'
 
 import Server from '../../resources/icons/server.svg'
-import Plus from '../../resources/icons/plus.svg'
+import Akebi from '../../resources/icons/akebi.svg'
 
 import './ServerLaunchSection.css'
-import { dataDir } from '@tauri-apps/api/path'
+import {dataDir} from '@tauri-apps/api/path'
-import { getGameExecutable, getGameVersion } from '../../utils/game'
-import { patchGame, unpatchGame } from '../../utils/metadata'
 
 interface IProps {
-  openExtras: (playGame: () => void) => void
+  [key: string]: any
 }
 
 interface IState {
-  grasscutterEnabled: boolean
+  grasscutterEnabled: boolean;
-  buttonLabel: string
+  buttonLabel: string;
-  checkboxLabel: string
+  checkboxLabel: string;
-  ip: string
+  ip: string;
-  port: string
+  port: string;
 
-  ipPlaceholder: string
+  ipPlaceholder: string;
-  portPlaceholder: string
+  portPlaceholder: string;
 
-  portHelpText: string
+  portHelpText: string;
 
-  httpsLabel: string
+  httpsLabel: string;
-  httpsEnabled: boolean
+  httpsEnabled: boolean;
 
-  swag: boolean
+  swag: boolean;
-  akebiSet: boolean
-  migotoSet: boolean
 }
 
 export default class ServerLaunchSection extends React.Component<IProps, IState> {
@@ -54,13 +50,12 @@ export default class ServerLaunchSection extends React.Component<IProps, IState>
       portHelpText: '',
       httpsLabel: '',
       httpsEnabled: false,
-      swag: false,
+      swag: false
-      akebiSet: false,
-      migotoSet: false,
     }
 
     this.toggleGrasscutter = this.toggleGrasscutter.bind(this)
     this.playGame = this.playGame.bind(this)
+    this.launchAkebi = this.launchAkebi.bind(this)
     this.setIp = this.setIp.bind(this)
     this.setPort = this.setPort.bind(this)
     this.toggleHttps = this.toggleHttps.bind(this)
@@ -80,9 +75,7 @@ export default class ServerLaunchSection extends React.Component<IProps, IState>
       portHelpText: await translate('help.port_help_text'),
       httpsLabel: await translate('main.https_enable'),
       httpsEnabled: config.https_enabled || false,
-      swag: config.swag_mode || false,
+      swag: config.swag_mode || false
-      akebiSet: config.akebi_path !== '',
-      migotoSet: config.migoto_path !== '',
     })
   }
 
@@ -93,7 +86,7 @@ export default class ServerLaunchSection extends React.Component<IProps, IState>
 
     // Set state as well
     this.setState({
-      grasscutterEnabled: config.toggle_grasscutter,
+      grasscutterEnabled: config.toggle_grasscutter
     })
 
     await saveConfig(config)
@@ -101,104 +94,56 @@ export default class ServerLaunchSection extends React.Component<IProps, IState>
 
   async playGame(exe?: string, proc_name?: string) {
     const config = await getConfig()
-
+  
-    if (!(await getGameExecutable())) {
+    if (!config.game_install_path) return alert('Game path not set!')
-      alert('Game executable not set!')
+    
-      return
-    }
-
     // Connect to proxy
     if (config.toggle_grasscutter) {
-      if (config.patch_metadata) {
+      let game_exe = config.game_install_path
-        const gameVersion = await getGameVersion()
-        console.log(gameVersion)
 
-        if (gameVersion == null) {
+      if (game_exe.includes('\\')) {
-          alert(
+        game_exe = game_exe.substring(config.game_install_path.lastIndexOf('\\') + 1)
-            'Game version could not be determined. Please make sure you have the game correctly selected and try again.'
+      } else {
-          )
+        game_exe = game_exe.substring(config.game_install_path.lastIndexOf('/') + 1)
-          return
-        }
-
-        if (gameVersion?.major == 2 && gameVersion?.minor < 8) {
-          alert(
-            'Game version is too old for metadata patching. Please disable metadata patching in the settings and try again.'
-          )
-          return
-        }
-
-        if (gameVersion?.major == 3 && gameVersion?.minor >= 1) {
-          alert(
-            'Game version is too new for metadata patching. Please disable metadata patching in the settings to launch the game.\nNOTE: You will require a UA patch to play the game.'
-          )
-          return
-        }
-
-        const patched = await patchGame()
-
-        if (!patched) {
-          alert('Could not patch game!')
-          return
-        }
       }
 
-      const game_exe = await getGameExecutable()
-
       // Save last connected server and port
       await setConfigOption('last_ip', this.state.ip)
       await setConfigOption('last_port', this.state.port)
 
+      // Set IP
+      await invoke('set_proxy_addr', { addr: (this.state.httpsEnabled ? 'https':'http') + '://' + this.state.ip + ':' + this.state.port })
       await invoke('enable_process_watcher', {
-        process: proc_name || game_exe,
+        process: proc_name || game_exe
       })
 
-      if (config.use_internal_proxy) {
+      // Connect to proxy
-        // Set IP
+      await invoke('connect', { port: 8365, certificatePath: await dataDir() + '\\cultivation\\ca' })
-        await invoke('set_proxy_addr', {
-          addr: (this.state.httpsEnabled ? 'https' : 'http') + '://' + this.state.ip + ':' + this.state.port,
-        })
-        // Connect to proxy
-        await invoke('connect', { port: 8365, certificatePath: (await dataDir()) + '\\cultivation\\ca' })
-      }
 
       // Open server as well if the options are set
       if (config.grasscutter_with_game) {
-        const jarFolderArr = config.grasscutter_path.replace(/\\/g, '/').split('/')
+        let jarFolder = config.grasscutter_path
-        jarFolderArr.pop()
 
-        const jarFolder = jarFolderArr.join('/')
+        if (jarFolder.includes('/')) {
+          jarFolder = jarFolder.substring(0, config.grasscutter_path.lastIndexOf('/'))
+        } else {
+          jarFolder = jarFolder.substring(0, config.grasscutter_path.lastIndexOf('\\'))
+        }
 
         await invoke('run_jar', {
           path: config.grasscutter_path,
           executeIn: jarFolder,
-          javaPath: config.java_path || '',
+          javaPath: config.java_path || ''
         })
       }
-    } else {
-      const unpatched = await unpatchGame()
-
-      if (!unpatched) {
-        alert(
-          `Could not unpatch game, aborting launch! (You can find your metadata backup in ${await dataDir()}\\cultivation\\)`
-        )
-        return
-      }
     }
-
+  
-    if (config.wipe_login) {
-      // First wipe registry if we have to
-      await invoke('wipe_registry', {
-        // The exe is always PascalCase so we can get the dir using regex
-        execName: (await getGameExecutable())?.split('.exe')[0].replace(/([a-z\d])([A-Z])/g, '$1 $2'),
-      })
-    }
-
     // Launch the program
     const gameExists = await invoke('dir_exists', {
-      path: exe || config.game_install_path,
+      path: exe || config.game_install_path
     })
 
-    if (gameExists) await invoke('run_program_relative', { path: exe || config.game_install_path })
+    if (gameExists) await invoke('run_program', { path: exe || config.game_install_path })
     else alert('Game not found! At: ' + (exe || config.game_install_path))
   }
 
@@ -219,19 +164,29 @@ export default class ServerLaunchSection extends React.Component<IProps, IState>
     await invoke('run_jar', {
       path: config.grasscutter_path,
       executeIn: jarFolder,
-      javaPath: config.java_path || '',
+      javaPath: config.java_path || ''
     })
   }
 
+  async launchAkebi() {
+    const config = await getConfig()
+
+    // Get game exe from game path, so we can watch it
+    const pathArr = config.game_install_path.replace(/\\/g, '/').split('/')
+    const gameExec = pathArr[pathArr.length - 1]
+
+    await this.playGame(config.akebi_path, gameExec)
+  }
+
   setIp(text: string) {
     this.setState({
-      ip: text,
+      ip: text
     })
   }
 
   setPort(text: string) {
     this.setState({
-      port: text,
+      port: text
     })
   }
 
@@ -242,7 +197,7 @@ export default class ServerLaunchSection extends React.Component<IProps, IState>
 
     // Set state as well
     this.setState({
-      httpsEnabled: config.https_enabled,
+      httpsEnabled: config.https_enabled
     })
 
     await saveConfig(config)
@@ -252,54 +207,34 @@ export default class ServerLaunchSection extends React.Component<IProps, IState>
     return (
       <div id="playButton">
         <div id="serverControls">
-          <Checkbox
+          <Checkbox id="enableGC" label={this.state.checkboxLabel} onChange={this.toggleGrasscutter} checked={this.state.grasscutterEnabled}/>
-            id="enableGC"
-            label={this.state.checkboxLabel}
-            onChange={this.toggleGrasscutter}
-            checked={this.state.grasscutterEnabled}
-          />
         </div>
 
-        {this.state.grasscutterEnabled && (
+        {
-          <div>
+          this.state.grasscutterEnabled && (
-            <div className="ServerConfig" id="serverConfigContainer">
+            <div>
-              <TextInput
+              <div className="ServerConfig" id="serverConfigContainer">
-                id="ip"
+                <TextInput id="ip" key="ip" placeholder={this.state.ipPlaceholder} onChange={this.setIp} initalValue={this.state.ip} />
-                key="ip"
+                <TextInput style={{
-                placeholder={this.state.ipPlaceholder}
-                onChange={this.setIp}
-                initalValue={this.state.ip}
-              />
-              <TextInput
-                style={{
                   width: '10%',
-                }}
+                }} id="port" key="port" placeholder={this.state.portPlaceholder} onChange={this.setPort} initalValue={this.state.port} />
-                id="port"
+                <HelpButton contents={this.state.portHelpText} />
-                key="port"
+                <Checkbox id="httpsEnable" label={this.state.httpsLabel} onChange={this.toggleHttps} checked={this.state.httpsEnabled} />
-                placeholder={this.state.portPlaceholder}
+              </div>
-                onChange={this.setPort}
-                initalValue={this.state.port}
-              />
-              <HelpButton contents={this.state.portHelpText} />
-              <Checkbox
-                id="httpsEnable"
-                label={this.state.httpsLabel}
-                onChange={this.toggleHttps}
-                checked={this.state.httpsEnabled}
-              />
             </div>
-          </div>
+          )
-        )}
+        }
+
 
         <div className="ServerLaunchButtons" id="serverLaunchContainer">
-          <BigButton onClick={this.playGame} id="officialPlay">
+          <BigButton onClick={this.playGame} id="officialPlay">{this.state.buttonLabel}</BigButton>
-            {this.state.buttonLabel}
+          {
-          </BigButton>
+            this.state.swag && (
-          {this.state.swag && (
+              <BigButton onClick={this.launchAkebi} id="akebiLaunch">
-            <BigButton onClick={() => this.props.openExtras(this.playGame)} id="ExtrasMenuButton">
+                <img className="AkebiIcon" id="akebiIcon" src={Akebi} />
-              <img className="ExtrasIcon" id="extrasIcon" src={Plus} />
+              </BigButton>
-            </BigButton>
+            )
-          )}
+          }
           <BigButton onClick={this.launchServer} id="serverLaunch">
             <img className="ServerIcon" id="serverLaunchIcon" src={Server} />
           </BigButton>
@@ -307,4 +242,4 @@ export default class ServerLaunchSection extends React.Component<IProps, IState>
       </div>
     )
   }
-}
+}

src/ui/components/TopBar.css

@@ -51,4 +51,4 @@
   to {
     transform: rotate(360deg);
   }
-}
+}

src/ui/components/TopBar.tsx

@@ -1,21 +1,27 @@
 import React from 'react'
 import { app } from '@tauri-apps/api'
 import { appWindow } from '@tauri-apps/api/window'
-import { getConfig, setConfigOption } from '../../utils/configuration'
+import closeIcon from '../../resources/icons/close.svg'
+import minIcon from '../../resources/icons/min.svg'
+import cogBtn from '../../resources/icons/cog.svg'
+import downBtn from '../../resources/icons/download.svg'
+import gameBtn from '../../resources/icons/game.svg'
+
 import Tr from '../../utils/language'
 
 import './TopBar.css'
-import closeIcon from '../../resources/icons/close.svg'
+import { getConfig, setConfigOption } from '../../utils/configuration'
-import minIcon from '../../resources/icons/min.svg'
 
 interface IProps {
-  children?: React.ReactNode | React.ReactNode[]
+  optFunc: () => void;
+  downFunc: () => void;
+  gameFunc: () => void;
 }
 
 interface IState {
-  version: string
+  version: string;
-  clicks: number
+  clicks: number;
-  intv: NodeJS.Timeout | null
+  intv: NodeJS.Timeout | null;
 }
 
 export default class TopBar extends React.Component<IProps, IState> {
@@ -25,7 +31,7 @@ export default class TopBar extends React.Component<IProps, IState> {
     this.state = {
       version: '0.0.0',
       clicks: 0,
-      intv: null,
+      intv: null
     }
 
     this.activateClick = this.activateClick.bind(this)
@@ -54,10 +60,10 @@ export default class TopBar extends React.Component<IProps, IState> {
       setTimeout(() => {
         // Gotta clear it so it goes back to regular colors
         this.setState({
-          clicks: 0,
+          clicks: 0
         })
       }, 600)
-
+  
       // Activate... SWAG MODE
       await setConfigOption('swag_mode', true)
 
@@ -70,7 +76,7 @@ export default class TopBar extends React.Component<IProps, IState> {
     if (this.state.clicks < 3) {
       this.setState({
         clicks: this.state.clicks + 1,
-        intv: setTimeout(() => this.setState({ clicks: 0 }), 1500),
+        intv: setTimeout(() => this.setState({ clicks: 0 }), 1500)
       })
 
       return
@@ -84,30 +90,36 @@ export default class TopBar extends React.Component<IProps, IState> {
           <span data-tauri-drag-region>
             <Tr text="main.title" />
           </span>
-          <span data-tauri-drag-region id="version">
+          <span data-tauri-drag-region id="version">{this.state?.version}</span>
-            {this.state?.version}
-          </span>
-        </div>
-        {/**
-         * HEY YOU
-         *
-         * If you're looking at the source code to find the swag mode thing, that's okay! If you're not, move along...
-         * Just do me a favor and don't go telling everyone about how you found it. If you are just helping someone who
-         * for some reason needs it, that's fine, but not EVERYONE needs it, which is why it exists in the first place.
-         */}
-        <div id="unassumingButton" className={this.state.clicks === 2 ? 'spin' : ''} onClick={this.activateClick}>
-          ?
         </div>
+        {
+          /**
+           * HEY YOU
+           * 
+           * If you're looking at the source code to find the swag mode thing, that's okay! If you're not, move along...
+           * Just do me a favor and don't go telling everyone about how you found it. If you are just helping someone who
+           * for some reason needs it, that's fine, but not EVERYONE needs it, which is why it exists in the first place.
+           */
+        }
+        <div id="unassumingButton" className={this.state.clicks === 2 ? 'spin' : ''} onClick={this.activateClick}>?</div>
         <div className="TopBtns" id="topBarButtonContainer">
-          <div id="closeBtn" onClick={this.handleClose} className="TopButton">
+          <div id="closeBtn" onClick={this.handleClose} className='TopButton'>
             <img src={closeIcon} alt="close" />
           </div>
-          <div id="minBtn" onClick={this.handleMinimize} className="TopButton">
+          <div id="minBtn" onClick={this.handleMinimize} className='TopButton'>
             <img src={minIcon} alt="minimize" />
           </div>
-          {this.props.children}
+          <div id="settingsBtn" onClick={this.props.optFunc} className='TopButton'>
+            <img src={cogBtn} alt="settings" />
+          </div>
+          <div id="downloadsBtn" className='TopButton' onClick={this.props.downFunc}>
+            <img src={downBtn} alt="downloads" />
+          </div>
+          <div id="gameBtn" className="TopButton" onClick={this.props.gameFunc}>
+            <img src={gameBtn} alt="game" />
+          </div>
         </div>
       </div>
     )
   }
-}
+}

src/ui/components/common/BigButton.css

@@ -27,4 +27,4 @@
 
 .BigButton.disabled:hover {
   background: linear-gradient(#949494, #9c9c9c);
-}
+}

src/ui/components/common/BigButton.tsx

@@ -2,14 +2,14 @@ import React from 'react'
 import './BigButton.css'
 
 interface IProps {
-  children: React.ReactNode
+  children: React.ReactNode;
-  onClick: () => unknown
+  onClick: () => any;
-  id: string
+  id: string;
-  disabled?: boolean
+  disabled?: boolean;
 }
 
 interface IState {
-  disabled?: boolean
+  disabled?: boolean;
 }
 
 export default class BigButton extends React.Component<IProps, IState> {
@@ -17,15 +17,15 @@ export default class BigButton extends React.Component<IProps, IState> {
     super(props)
 
     this.state = {
-      disabled: this.props.disabled,
+      disabled: this.props.disabled
     }
 
     this.handleClick = this.handleClick.bind(this)
   }
 
-  static getDerivedStateFromProps(props: IProps, _state: IState) {
+  static getDerivedStateFromProps(props: IProps, state: IState) {
     return {
-      disabled: props.disabled,
+      disabled: props.disabled
     }
   }
 
@@ -37,13 +37,9 @@ export default class BigButton extends React.Component<IProps, IState> {
 
   render() {
     return (
-      <div
+      <div className={'BigButton ' + (this.state.disabled ? 'disabled' : '')} onClick={this.handleClick} id={this.props.id}>
-        className={'BigButton ' + (this.state.disabled ? 'disabled' : '')}
-        onClick={this.handleClick}
-        id={this.props.id}
-      >
         <div className="BigButtonText">{this.props.children}</div>
       </div>
     )
   }
-}
+}

src/ui/components/common/Checkbox.css

@@ -1,4 +1,4 @@
-.Checkbox input[type='checkbox'] {
+.Checkbox input[type="checkbox"] {
   display: none;
 }
 
@@ -17,10 +17,10 @@
 
 .CheckboxDisplay img {
   height: 100%;
-  filter: invert(99%) sepia(0%) saturate(1188%) hue-rotate(186deg) brightness(97%) contrast(67%);
+  filter: invert(99%) sepia(0%) saturate(1188%) hue-rotate(186deg) brightness(97%) contrast(67%)
 }
 
 .Checkbox label {
   display: flex;
   flex-direction: row;
-}
+}

src/ui/components/common/Checkbox.tsx

@@ -4,10 +4,10 @@ import checkmark from '../../../resources/icons/check.svg'
 import './Checkbox.css'
 
 interface IProps {
-  label?: string
+  label?: string,
-  checked: boolean
+  checked: boolean,
-  onChange: () => void
+  onChange: () => void,
-  id?: string
+  id: string
 }
 
 interface IState {
@@ -19,14 +19,14 @@ export default class Checkbox extends React.Component<IProps, IState> {
     super(props)
 
     this.state = {
-      checked: props.checked,
+      checked: props.checked
     }
   }
 
   static getDerivedStateFromProps(props: IProps, state: IState) {
     if (props.checked !== state.checked) {
       return {
-        checked: props.checked,
+        checked: props.checked
       }
     }
 
@@ -41,12 +41,14 @@ export default class Checkbox extends React.Component<IProps, IState> {
   render() {
     return (
       <div className="Checkbox">
-        <input type="checkbox" id={this.props.id} checked={this.state.checked} onChange={this.handleChange} />
+        <input type='checkbox' id={this.props.id} checked={this.state.checked} onChange={this.handleChange} />
         <label htmlFor={this.props.id}>
-          <div className="CheckboxDisplay">{this.state.checked ? <img src={checkmark} alt="Checkmark" /> : null}</div>
+          <div className="CheckboxDisplay">
+            {this.state.checked ? <img src={checkmark} alt='Checkmark' /> : null}
+          </div>
           <span>{this.props.label || ''}</span>
         </label>
       </div>
     )
   }
-}
+}

src/ui/components/common/DirInput.css

@@ -24,4 +24,4 @@
 
 .FileSelectIcon img {
   height: 100%;
-}
+}

src/ui/components/common/DirInput.tsx

@@ -15,7 +15,6 @@ interface IProps {
   placeholder?: string
   folder?: boolean
   customClearBehaviour?: () => void
-  openFolder?: string
 }
 
 interface IState {
@@ -31,7 +30,7 @@ export default class DirInput extends React.Component<IProps, IState> {
     this.state = {
       value: props.value || '',
       placeholder: this.props.placeholder || 'Select file or folder...',
-      folder: this.props.folder || false,
+      folder: this.props.folder || false
     }
 
     this.handleIconClick = this.handleIconClick.bind(this)
@@ -54,8 +53,8 @@ export default class DirInput extends React.Component<IProps, IState> {
   async componentDidMount() {
     if (!this.props.placeholder) {
       const translation = await translate('components.select_file')
-      this.setState({
+      this.setState( {
-        placeholder: translation,
+        placeholder: translation
       })
     }
   }
@@ -65,12 +64,13 @@ export default class DirInput extends React.Component<IProps, IState> {
 
     if (this.state.folder) {
       path = await open({
-        directory: true,
+        directory: true
       })
     } else {
       path = await open({
-        filters: [{ name: 'Files', extensions: this.props.extensions || ['*'] }],
+        filters: [
-        defaultPath: this.props.openFolder,
+          { name: 'Files', extensions: this.props.extensions || ['*'] }
+        ]
       })
     }
 
@@ -78,7 +78,7 @@ export default class DirInput extends React.Component<IProps, IState> {
     if (!path) return
 
     this.setState({
-      value: path,
+      value: path
     })
 
     if (this.props.onChange) this.props.onChange(path)
@@ -86,13 +86,12 @@ export default class DirInput extends React.Component<IProps, IState> {
 
   render() {
     return (
-      <div className="DirInput">
+      <div className='DirInput'>
         <TextInput
           value={this.state.value}
           placeholder={this.state.placeholder}
           clearable={this.props.clearable !== undefined ? this.props.clearable : true}
-          readOnly={this.props.readonly !== undefined ? this.props.readonly : true}
+          readOnly={this.props.readonly !== undefined ? this.props.readonly : true } onChange={(text: string) => {
-          onChange={(text: string) => {
             this.setState({ value: text })
 
             if (this.props.onChange) this.props.onChange(text)
@@ -106,4 +105,4 @@ export default class DirInput extends React.Component<IProps, IState> {
       </div>
     )
   }
-}
+}

src/ui/components/common/DownloadList.css

@@ -4,4 +4,4 @@
   flex: 1;
   overflow-y: auto;
   padding: 10px;
-}
+}

src/ui/components/common/DownloadList.tsx

@@ -5,7 +5,7 @@ import DownloadSection from './DownloadSection'
 import './DownloadList.css'
 
 interface IProps {
-  downloadManager: DownloadHandler
+  downloadManager: DownloadHandler;
 }
 
 export default class DownloadList extends React.Component<IProps, never> {
@@ -16,14 +16,17 @@ export default class DownloadList extends React.Component<IProps, never> {
   render() {
     const list = this.props.downloadManager.getDownloads().map((download) => {
       return (
-        <DownloadSection
+        <DownloadSection key={download.path} downloadName={download.path} downloadManager={this.props.downloadManager} />
-          key={download.path}
-          downloadName={download.path}
-          downloadManager={this.props.downloadManager}
-        />
       )
     })
 
-    return <div className="DownloadList">{list.length > 0 ? list : 'No downloads present'}</div>
+
+    return (
+      <div className="DownloadList">
+        {
+          list.length > 0 ? list : 'No downloads present'
+        }
+      </div>
+    )
   }
-}
+}

src/ui/components/common/DownloadSection.css

@@ -26,4 +26,4 @@
 
 .DownloadStatus {
   text-align: right;
-}
+}

src/ui/components/common/DownloadSection.tsx

@@ -5,8 +5,8 @@ import ProgressBar from './ProgressBar'
 import './DownloadSection.css'
 
 interface IProps {
-  downloadManager: DownloadHandler
+  downloadManager: DownloadHandler;
-  downloadName: string
+  downloadName: string;
 }
 
 export default class DownloadSection extends React.Component<IProps, never> {
@@ -32,4 +32,4 @@ export default class DownloadSection extends React.Component<IProps, never> {
       </div>
     )
   }
-}
+}

src/ui/components/common/HelpButton.css

@@ -30,4 +30,4 @@
   right: -450%;
   width: 200px;
   height: 120px;
-}
+}

src/ui/components/common/HelpButton.tsx

@@ -2,32 +2,53 @@ import React from 'react'
 
 import './HelpButton.css'
 import Help from '../../../resources/icons/help.svg'
-import { translate } from '../../../utils/language'
+import MiniDialog from '../MiniDialog'
 
 interface IProps {
-  children?: React.ReactNode[] | React.ReactNode
+  children?: React.ReactNode[] | React.ReactNode;
   contents?: string
   id?: string
 }
 
-export default class HelpButton extends React.Component<IProps, never> {
+interface IState {
+  opened: boolean
+}
+
+export default class HelpButton extends React.Component<IProps, IState> {
   constructor(props: IProps) {
     super(props)
 
-    this.showAlert = this.showAlert.bind(this)
+    this.state = {
+      opened: false
+    }
+
+    this.setOpen = this.setOpen.bind(this)
+    this.setClosed = this.setClosed.bind(this)
   }
 
-  async showAlert() {
+  setOpen() {
-    if (this.props.contents) alert(await translate(this.props.contents))
+    this.setState({ opened: true })
+  }
+
+  setClosed() {
+    this.setState({ opened: false })
   }
 
   render() {
     return (
       <div className="HelpSection">
-        <div className="HelpButton" onClick={this.showAlert}>
+        <div className="HelpButton" onMouseEnter={this.setOpen} onMouseLeave={this.setClosed}>
           <img src={Help} />
         </div>
+
+        <div className="HelpContents" style={{
+          display: this.state.opened ? 'block' : 'none'
+        }}>
+          <MiniDialog closeFn={this.setClosed}>
+            {this.props.contents || this.props.children}
+          </MiniDialog>
+        </div>
       </div>
     )
   }
-}
+}

src/ui/components/common/MainProgressBar.tsx

@@ -4,16 +4,15 @@ import Tr from '../../../utils/language'
 import './ProgressBar.css'
 
 interface IProps {
-  downloadManager: DownloadHandler
+  downloadManager: DownloadHandler,
-  withStats?: boolean
 }
 
 interface IState {
-  average: number
+  average: number,
-  files: number
+  files: number,
-  extracting: number
+  extracting: number,
-  total: number
+  total: number,
-  speed: string
+  speed: string,
 }
 
 /**
@@ -30,7 +29,7 @@ export default class ProgressBar extends React.Component<IProps, IState> {
       files,
       extracting,
       total: totalSize,
-      speed: '0 B/s',
+      speed: '0 B/s'
     }
   }
 
@@ -52,33 +51,28 @@ export default class ProgressBar extends React.Component<IProps, IState> {
     return (
       <div className="MainProgressBarWrapper">
         <div className="ProgressBar">
-          <div
+          <div className="InnerProgress" style={{
-            className="InnerProgress"
+            width: `${(() => {
-            style={{
+              // Handles no files downloading
-              width: `${(() => {
+              if (this.state.files === 0) {
-                // Handles no files downloading
+                return '100'
-                if (this.state.files === 0 || this.state.average >= 100) {
+              }
-                  return '100'
-                }
 
-                if (this.state.total <= 0) {
+              if (this.state.total <= 0) {
-                  return '0'
+                return '0'
-                }
+              }
 
-                return this.state.average
+              return this.state.average
-              })()}%`,
+            })()}%`,
-            }}
+          }}></div>
-          ></div>
         </div>
 
-        {(this.props.withStats === undefined || this.props.withStats) && (
+        <div className="MainProgressText">
-          <div className="MainProgressText">
+          <Tr text="main.files_downloading" /> {this.state.files} ({this.state.speed})
-            <Tr text="main.files_downloading" /> {this.state.files} ({this.state.speed})
+          <br />
-            <br />
+          <Tr text="main.files_extracting" /> {this.state.extracting}
-            <Tr text="main.files_extracting" /> {this.state.extracting}
+        </div>
-          </div>
-        )}
       </div>
     )
   }
-}
+}

src/ui/components/common/ProgressBar.css

@@ -1,5 +1,4 @@
-.ProgressBar,
+.ProgressBar, .InnerProgress {
-.InnerProgress {
   border-radius: 4px;
 }
 
@@ -92,4 +91,4 @@
 
 .downloadStop:hover {
   cursor: pointer;
-}
+}

src/ui/components/common/ProgressBar.tsx

@@ -1,20 +1,20 @@
 import React from 'react'
 import { capitalize } from '../../../utils/string'
 
-import Stop from '../../../resources/icons/close.svg'
+import Stop from '../../../resources/icons/close.svg' 
 import './ProgressBar.css'
 import DownloadHandler from '../../../utils/download'
 import { translate } from '../../../utils/language'
 
 interface IProps {
-  path: string
+  path: string,
-  downloadManager: DownloadHandler
+  downloadManager: DownloadHandler,
 }
 
 interface IState {
-  progress: number
+  progress: number,
-  status: string
+  status: string,
-  total: number
+  total: number,
 }
 
 export default class ProgressBar extends React.Component<IProps, IState> {
@@ -36,7 +36,7 @@ export default class ProgressBar extends React.Component<IProps, IState> {
       const prog = this.props.downloadManager.getDownloadProgress(this.props.path)
       this.setState({
         progress: prog?.progress || 0,
-        status: (await translate(`download_status.${prog?.status || 'stopped'}`)) || 'stopped',
+        status: await translate(`download_status.${prog?.status || 'stopped'}`) || 'stopped',
         total: prog?.total || 0,
       })
 
@@ -54,29 +54,24 @@ export default class ProgressBar extends React.Component<IProps, IState> {
   render() {
     return (
       <div className="ProgressBarWrapper">
-        <div
+        <div style={{
-          style={{
+          width: '80%'
-            width: '80%',
+        }}>
-          }}
-        >
           <div className="ProgressBar">
-            <div
+            <div className="InnerProgress" style={{
-              className="InnerProgress"
+              width: `${(() => {
-              style={{
+                // Handles files with content-lengths of 0
-                width: `${(() => {
+                if (this.state.status === 'finished') {
-                  // Handles files with content-lengths of 0
+                  return '100'
-                  if (this.state.status === 'finished') {
+                }
-                    return '100'
-                  }
 
-                  if (this.state.total <= 0) {
+                if (this.state.total <= 0) {
-                    return '0'
+                  return '0'
-                  }
+                }
 
-                  return (this.state.progress / this.state.total) * 100
+                return this.state.progress / this.state.total * 100
-                })()}%`,
+              })()}%`,
-              }}
+            }}></div>
-            ></div>
           </div>
           <div className="DownloadControls">
             <div onClick={this.stopDownload} className="downloadStop">
@@ -85,8 +80,10 @@ export default class ProgressBar extends React.Component<IProps, IState> {
           </div>
         </div>
 
-        <div className="ProgressText">{capitalize(this.state.status) || 'Waiting'}</div>
+        <div className="ProgressText">
+          {capitalize(this.state.status) || 'Waiting'}
+        </div>
       </div>
     )
   }
-}
+}

src/ui/components/common/TextInput.css

@@ -17,7 +17,7 @@
   display: inline-block;
   position: absolute;
   right: 16%;
-
+  
   filter: invert(99%) sepia(0%) saturate(1188%) hue-rotate(186deg) brightness(97%) contrast(67%);
 }
 
@@ -28,4 +28,4 @@
 
 .TextInputClear {
   height: 100%;
-}
+}

src/ui/components/common/TextInput.tsx

@@ -4,15 +4,17 @@ import './TextInput.css'
 import Close from '../../../resources/icons/close.svg'
 
 interface IProps {
-  value?: string
+  value?: string;
-  initalValue?: string
+  initalValue?: string;
-  placeholder?: string
+  placeholder?: string;
-  onChange?: (value: string) => void
+  onChange?: (value: string) => void;
-  readOnly?: boolean
+  readOnly?: boolean;
-  id?: string
+  id?: string;
-  clearable?: boolean
+  clearable?: boolean;
-  customClearBehaviour?: () => void
+  customClearBehaviour?: () => void;
-  style?: React.CSSProperties
+  style?: {
+    [key: string]: any;
+  }
 }
 
 interface IState {
@@ -24,14 +26,14 @@ export default class TextInput extends React.Component<IProps, IState> {
     super(props)
 
     this.state = {
-      value: props.value || '',
+      value: props.value || ''
     }
   }
 
   async componentDidMount() {
     if (this.props.initalValue) {
       this.setState({
-        value: this.props.initalValue,
+        value: this.props.initalValue
       })
     }
   }
@@ -43,35 +45,26 @@ export default class TextInput extends React.Component<IProps, IState> {
   render() {
     return (
       <div className="TextInputWrapper" style={this.props.style || {}}>
-        <input
+        <input id={this.props?.id} readOnly={this.props.readOnly || false} placeholder={this.props.placeholder || ''} className="TextInput" value={this.state.value} onChange={(e) => {
-          id={this.props?.id}
+          this.setState({ value: e.target.value })
-          readOnly={this.props.readOnly || false}
+          if (this.props.onChange) this.props.onChange(e.target.value)
-          placeholder={this.props.placeholder || ''}
+        }} />
-          className="TextInput"
+        {
-          value={this.state.value}
+          this.props.clearable ?
-          onChange={(e) => {
+            <div className="TextClear" onClick={() => {
-            this.setState({ value: e.target.value })
-            if (this.props.onChange) this.props.onChange(e.target.value)
-          }}
-        />
-        {this.props.clearable ? (
-          <div
-            className="TextClear"
-            onClick={() => {
               // Run custom behaviour first
               if (this.props.customClearBehaviour) return this.props.customClearBehaviour()
 
               this.setState({ value: '' })
-
+    
               if (this.props.onChange) this.props.onChange('')
 
               this.forceUpdate()
-            }}
+            }}>
-          >
+              <img src={Close} className="TextInputClear" />
-            <img src={Close} className="TextInputClear" />
+            </div> : null
-          </div>
+        }
-        ) : null}
       </div>
     )
   }
-}
+}

src/ui/components/menu/Divider.css

@@ -1,3 +1,4 @@
+
 .Divider {
   display: flex;
   flex-direction: row;
@@ -12,4 +13,4 @@
 .DividerLine {
   width: 60%;
   border-top: 1px solid #ccc;
-}
+}

src/ui/components/menu/Divider.tsx

@@ -10,4 +10,4 @@ export default class Divider extends React.Component {
       </div>
     )
   }
-}
+}

src/ui/components/menu/Downloads.css

@@ -28,4 +28,4 @@
 
 .DownloadMenuSection .HelpButton img {
   filter: none;
-}
+}

src/ui/components/menu/Downloads.tsx

@@ -8,20 +8,15 @@ import { dataDir } from '@tauri-apps/api/path'
 
 import './Downloads.css'
 import Divider from './Divider'
-import { getConfigOption } from '../../../utils/configuration'
+import { getConfigOption, setConfigOption } from '../../../utils/configuration'
 import { invoke } from '@tauri-apps/api'
 import { listen } from '@tauri-apps/api/event'
 import HelpButton from '../common/HelpButton'
-
+import { getVersionCache, VersionData } from '../../../utils/resources'
-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 STABLE_DOWNLOAD = 'https://nightly.link/Grasscutters/Grasscutter/workflows/build/stable/Grasscutter.zip'
-const DEV_DOWNLOAD = 'https://nightly.link/Grasscutters/Grasscutter/workflows/build/development/Grasscutter.zip'
-const RESOURCES_DOWNLOAD = 'https://github.com/tamilpp25/Grasscutter_Resources/archive/refs/heads/3.0.zip'
 
 interface IProps {
-  closeFn: () => void
+  closeFn: () => void;
-  downloadManager: DownloadHandler
+  downloadManager: DownloadHandler;
 }
 
 interface IState {
@@ -30,6 +25,7 @@ interface IState {
   repo_downloading: boolean
   grasscutter_set: boolean
   resources_exist: boolean
+  version_data: VersionData | null
 }
 
 export default class Downloads extends React.Component<IProps, IState> {
@@ -42,6 +38,7 @@ export default class Downloads extends React.Component<IProps, IState> {
       repo_downloading: this.props.downloadManager.downloadingRepo(),
       grasscutter_set: false,
       resources_exist: false,
+      version_data: null
     }
 
     this.getGrasscutterFolder = this.getGrasscutterFolder.bind(this)
@@ -55,6 +52,11 @@ export default class Downloads extends React.Component<IProps, IState> {
 
   async componentDidMount() {
     const gc_path = await getConfigOption('grasscutter_path')
+    const versionData = await getVersionCache()
+
+    this.setState({
+      version_data: versionData,
+    })
 
     listen('jar_extracted', () => {
       this.setState({ grasscutter_set: true }, this.forceUpdate)
@@ -63,7 +65,7 @@ export default class Downloads extends React.Component<IProps, IState> {
     if (!gc_path || gc_path === '') {
       this.setState({
         grasscutter_set: false,
-        resources_exist: false,
+        resources_exist: false
       })
 
       return
@@ -72,17 +74,15 @@ export default class Downloads extends React.Component<IProps, IState> {
     const path = gc_path.substring(0, gc_path.lastIndexOf('\\'))
 
     if (gc_path) {
-      const resources_exist: boolean =
+      const resources_exist: boolean = await invoke('dir_exists', {
-        ((await invoke('dir_exists', {
+        path: path + '\\resources'
-          path: path + '\\resources',
+      }) as boolean && !(await invoke('dir_is_empty', {
-        })) as boolean) &&
+        path: path + '\\resources'
-        (!(await invoke('dir_is_empty', {
+      })) as boolean
-          path: path + '\\resources',
-        })) as boolean)
 
       this.setState({
         grasscutter_set: gc_path !== '',
-        resources_exist,
+        resources_exist
       })
     }
   }
@@ -111,9 +111,8 @@ export default class Downloads extends React.Component<IProps, IState> {
 
   async downloadGrasscutterStableRepo() {
     const folder = await this.getGrasscutterFolder()
-    this.props.downloadManager.addDownload(STABLE_REPO_DOWNLOAD, folder + '\\grasscutter_repo.zip', async () => {
+    this.props.downloadManager.addDownload(this.state.version_data?.stable, folder + '\\grasscutter_repo.zip', () =>{
-      await unzip(folder + '\\grasscutter_repo.zip', folder + '\\', true)
+      unzip(folder + '\\grasscutter_repo.zip', folder + '\\', this.toggleButtons)
-      this.toggleButtons()
     })
 
     this.toggleButtons()
@@ -121,9 +120,8 @@ export default class Downloads extends React.Component<IProps, IState> {
 
   async downloadGrasscutterDevRepo() {
     const folder = await this.getGrasscutterFolder()
-    this.props.downloadManager.addDownload(DEV_REPO_DOWNLOAD, folder + '\\grasscutter_repo.zip', async () => {
+    this.props.downloadManager.addDownload(this.state.version_data?.dev, folder + '\\grasscutter_repo.zip', () =>{
-      await unzip(folder + '\\grasscutter_repo.zip', folder + '\\', true)
+      unzip(folder + '\\grasscutter_repo.zip', folder + '\\', this.toggleButtons)
-      this.toggleButtons()
     })
 
     this.toggleButtons()
@@ -131,22 +129,20 @@ export default class Downloads extends React.Component<IProps, IState> {
 
   async downloadGrasscutterStable() {
     const folder = await this.getGrasscutterFolder()
-    this.props.downloadManager.addDownload(STABLE_DOWNLOAD, folder + '\\grasscutter.zip', async () => {
+    this.props.downloadManager.addDownload(this.state.version_data?.stableJar, folder + '\\grasscutter.zip', () =>{
-      await unzip(folder + '\\grasscutter.zip', folder + '\\', true)
+      unzip(folder + '\\grasscutter.zip', folder + '\\', this.toggleButtons)
-      this.toggleButtons
     })
 
     // Also add repo download
     this.downloadGrasscutterStableRepo()
 
     this.toggleButtons()
-  }
+  } 
 
   async downloadGrasscutterLatest() {
     const folder = await this.getGrasscutterFolder()
-    this.props.downloadManager.addDownload(DEV_DOWNLOAD, folder + '\\grasscutter.zip', async () => {
+    this.props.downloadManager.addDownload(this.state.version_data?.devJar, folder + '\\grasscutter.zip', () =>{
-      await unzip(folder + '\\grasscutter.zip', folder + '\\', true)
+      unzip(folder + '\\grasscutter.zip', folder + '\\', this.toggleButtons)
-      this.toggleButtons()
     })
 
     // Also add repo download
@@ -157,26 +153,25 @@ export default class Downloads extends React.Component<IProps, IState> {
 
   async downloadResources() {
     const folder = await this.getGrasscutterFolder()
-    this.props.downloadManager.addDownload(RESOURCES_DOWNLOAD, folder + '\\resources.zip', async () => {
+    this.props.downloadManager.addDownload(this.state.version_data?.resources, folder + '\\resources.zip', async () => {
-      // Delete the existing folder if it exists
+      // Delete the existing folder if it exists 
-      if (
+      if (await invoke('dir_exists', {
-        await invoke('dir_exists', {
+        path: folder + '\\resources'
-          path: folder + '\\resources',
+      })) {
-        })
-      ) {
         await invoke('dir_delete', {
-          path: folder + '\\resources',
+          path: folder + '\\resources'
         })
       }
 
-      await unzip(folder + '\\resources.zip', folder + '\\', true)
+      await unzip(folder + '\\resources.zip', folder + '\\', () => {
-      // Rename folder to resources
+        // Rename folder to resources
-      invoke('rename', {
+        invoke('rename', {
-        path: folder + '\\Resources',
+          path: folder + '\\Resources',
-        newName: 'resources',
+          newName: 'resources'
-      })
+        })
 
-      this.toggleButtons()
+        this.toggleButtons()
+      })
     })
 
     this.toggleButtons()
@@ -190,43 +185,39 @@ export default class Downloads extends React.Component<IProps, IState> {
       grasscutter_downloading: this.props.downloadManager.downloadingJar(),
       resources_downloading: this.props.downloadManager.downloadingResources(),
       repo_downloading: this.props.downloadManager.downloadingRepo(),
-      grasscutter_set: gc_path !== '',
+      grasscutter_set: gc_path && gc_path !== '',
     })
   }
 
   render() {
     return (
       <Menu closeFn={this.props.closeFn} className="Downloads" heading="Downloads">
-        <div className="DownloadMenuSection" id="downloadMenuContainerGCStable">
+        <div className='DownloadMenuSection' id="downloadMenuContainerGCStable">
-          <div className="DownloadLabel" id="downloadMenuLabelGCStable">
+          <div className='DownloadLabel' id="downloadMenuLabelGCStable">
-            <Tr
+            <Tr text={
-              text={this.state.grasscutter_set ? 'downloads.grasscutter_stable' : 'downloads.grasscutter_stable_update'}
+              this.state.grasscutter_set ? 'downloads.grasscutter_stable' : 'downloads.grasscutter_stable_update'
-            />
+            } />
-            <HelpButton contents="help.gc_stable_jar" />
+            <HelpButton>
+              <Tr text="help.gc_stable_jar" />
+            </HelpButton>
           </div>
-          <div className="DownloadValue" id="downloadMenuButtonGCStable">
+          <div className='DownloadValue' id="downloadMenuButtonGCStable">
-            <BigButton
+            <BigButton disabled={this.state.grasscutter_downloading || !this.state.version_data?.stableJar} onClick={this.downloadGrasscutterStable} id="grasscutterStableBtn" >
-              disabled={this.state.grasscutter_downloading}
-              onClick={this.downloadGrasscutterStable}
-              id="grasscutterStableBtn"
-            >
               <Tr text="components.download" />
             </BigButton>
           </div>
         </div>
-        <div className="DownloadMenuSection" id="downloadMenuContainerGCDev">
+        <div className='DownloadMenuSection' id="downloadMenuContainerGCDev">
-          <div className="DownloadLabel" id="downloadMenuLabelGCDev">
+          <div className='DownloadLabel' id="downloadMenuLabelGCDev">
-            <Tr
+            <Tr text={
-              text={this.state.grasscutter_set ? 'downloads.grasscutter_latest' : 'downloads.grasscutter_latest_update'}
+              this.state.grasscutter_set ? 'downloads.grasscutter_latest' : 'downloads.grasscutter_latest_update'
-            />
+            } />
-            <HelpButton contents="help.gc_dev_jar" />
+            <HelpButton>
+              <Tr text="help.gc_dev_jar" />
+            </HelpButton>
           </div>
-          <div className="DownloadValue" id="downloadMenuButtonGCDev">
+          <div className='DownloadValue' id="downloadMenuButtonGCDev">
-            <BigButton
+            <BigButton disabled={this.state.grasscutter_downloading || !this.state.version_data?.devJar} onClick={this.downloadGrasscutterLatest} id="grasscutterLatestBtn" >
-              disabled={this.state.grasscutter_downloading}
-              onClick={this.downloadGrasscutterLatest}
-              id="grasscutterLatestBtn"
-            >
               <Tr text="components.download" />
             </BigButton>
           </div>
@@ -234,44 +225,32 @@ export default class Downloads extends React.Component<IProps, IState> {
 
         <Divider />
 
-        <div className="DownloadMenuSection" id="downloadMenuContainerGCStableData">
+        <div className='DownloadMenuSection' id="downloadMenuContainerGCStableData">
-          <div className="DownloadLabel" id="downloadMenuLabelGCStableData">
+          <div className='DownloadLabel' id="downloadMenuLabelGCStableData">
-            <Tr
+            <Tr text={
-              text={
+              this.state.grasscutter_set ? 'downloads.grasscutter_stable_data' : 'downloads.grasscutter_stable_data_update'
-                this.state.grasscutter_set
+            } />
-                  ? 'downloads.grasscutter_stable_data'
+            <HelpButton>
-                  : 'downloads.grasscutter_stable_data_update'
+              <Tr text="help.gc_stable_data" />
-              }
+            </HelpButton>
-            />
-            <HelpButton contents="help.gc_stable_data" />
           </div>
-          <div className="DownloadValue" id="downloadMenuButtonGCStableData">
+          <div className='DownloadValue' id="downloadMenuButtonGCStableData">
-            <BigButton
+            <BigButton disabled={this.state.repo_downloading || !this.state.version_data?.stable} onClick={this.downloadGrasscutterStableRepo} id="grasscutterStableRepo" >
-              disabled={this.state.repo_downloading}
-              onClick={this.downloadGrasscutterStableRepo}
-              id="grasscutterStableRepo"
-            >
               <Tr text="components.download" />
             </BigButton>
           </div>
         </div>
-        <div className="DownloadMenuSection" id="downloadMenuContainerGCDevData">
+        <div className='DownloadMenuSection' id="downloadMenuContainerGCDevData">
-          <div className="DownloadLabel" id="downloadMenuLabelGCDevData">
+          <div className='DownloadLabel' id="downloadMenuLabelGCDevData">
-            <Tr
+            <Tr text={
-              text={
+              this.state.grasscutter_set ? 'downloads.grasscutter_latest_data' : 'downloads.grasscutter_latest_data_update'
-                this.state.grasscutter_set
+            } />
-                  ? 'downloads.grasscutter_latest_data'
+            <HelpButton>
-                  : 'downloads.grasscutter_latest_data_update'
+              <Tr text="help.gc_dev_data" />
-              }
+            </HelpButton>
-            />
-            <HelpButton contents="help.gc_dev_data" />
           </div>
-          <div className="DownloadValue" id="downloadMenuButtonGCDevData">
+          <div className='DownloadValue' id="downloadMenuButtonGCDevData">
-            <BigButton
+            <BigButton disabled={this.state.repo_downloading || !this.state.version_data?.dev} onClick={this.downloadGrasscutterStableRepo} id="grasscutterDevRepo" >
-              disabled={this.state.repo_downloading}
-              onClick={this.downloadGrasscutterStableRepo}
-              id="grasscutterDevRepo"
-            >
               <Tr text="components.download" />
             </BigButton>
           </div>
@@ -279,17 +258,19 @@ export default class Downloads extends React.Component<IProps, IState> {
 
         <Divider />
 
-        <div className="DownloadMenuSection" id="downloadMenuContainerResources">
+        <div className='DownloadMenuSection' id="downloadMenuContainerResources">
-          <div className="DownloadLabel" id="downloadMenuLabelResources">
+          <div className='DownloadLabel' id="downloadMenuLabelResources">
             <Tr text="downloads.resources" />
-            <HelpButton contents="help.resources" />
+            <HelpButton>
+              <Tr text="help.resources" />
+            </HelpButton>
           </div>
-          <div className="DownloadValue" id="downloadMenuButtonResources">
+          <div className='DownloadValue' id="downloadMenuButtonResources">
-            <BigButton
+            <BigButton disabled={
-              disabled={this.state.resources_downloading || !this.state.grasscutter_set || this.state.resources_exist}
+              this.state.resources_downloading
-              onClick={this.downloadResources}
+              || !this.state.grasscutter_set
-              id="resourcesBtn"
+              || this.state.resources_exist
-            >
+              || !this.state.version_data?.resources} onClick={this.downloadResources} id="resourcesBtn" >
               <Tr text="components.download" />
             </BigButton>
           </div>
@@ -297,4 +278,4 @@ export default class Downloads extends React.Component<IProps, IState> {
       </Menu>
     )
   }
-}
+}