Merge pull request #60 from Kawaa-qwq/main

Translation languages are supported in the README file and all matched files use Prettier code style!

README.md

@@ -1,3 +1,5 @@
+EN | [简中](README_zh-CN.md) | [繁中](README_zh-TW.md) |
+
 # 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.

README_zh-CN.md

@@ -0,0 +1,88 @@
+[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

@@ -0,0 +1,88 @@
+[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.

package.json

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

src-tauri/Cargo.lock

@@ -26,6 +26,17 @@ 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"
@@ -702,6 +713,16 @@ 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"
@@ -713,6 +734,7 @@ name = "cultivation"
 version = "0.1.0"
 dependencies = [
  "cc",
+ "ctrlc",
  "duct",
  "file_diff",
  "futures-util",
@@ -725,6 +747,7 @@ dependencies = [
  "regex",
  "registry",
  "reqwest",
+ "rust-ini",
  "rustls-pemfile",
  "serde",
  "serde_json",
@@ -888,6 +911,12 @@ 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"
@@ -1481,6 +1510,9 @@ name = "hashbrown"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+dependencies = [
+ "ahash",
+]
 
 [[package]]
 name = "heck"
@@ -1889,9 +1921,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.126"
+version = "0.2.132"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
+checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
 
 [[package]]
 name = "libdbus-sys"
@@ -2151,6 +2183,18 @@ 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"
@@ -2451,6 +2495,16 @@ 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"
@@ -3223,6 +3277,16 @@ 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"

src-tauri/Cargo.toml

@@ -61,6 +61,8 @@ 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

src-tauri/lang/chs.json

@@ -11,13 +11,21 @@
     "files_extracting": "文件解压中："
   },
   "options": {
+    "enabled": "已启用",
+    "disabled": "已禁用",
+    "game_path": "选择游戏安装路径",
     "game_executable": "选择游戏可执行文件",
+    "recover_metadata": "紧急情况下恢复元数据文件",
     "grasscutter_jar": "选择 Grasscutter JAR 文件",
-    "java_path": "设置自定义 Java 路径",
+    "toggle_encryption": "启用加密",
+    "install_certificate": "安装代理证书",
+    "java_path": "选择自定义 Java 路径",
     "grasscutter_with_game": "随游戏自动启动 Grasscutter",
-    "language": "语言",
+    "language": "选择语言",
     "background": "设置自定义背景（链接或文件）",
-    "theme": "设置主题"
+    "theme": "设置主题",
+    "patch_metadata": "自动修改元数据",
+    "use_proxy": "使用内置代理"
   },
   "downloads": {
     "grasscutter_stable_data": "下载 Grasscutter 稳定版数据",
@@ -28,7 +36,8 @@
     "grasscutter_latest": "下载 Grasscutter 开发版",
     "grasscutter_stable_update": "更新 Grasscutter 稳定版",
     "grasscutter_latest_update": "更新 Grasscutter 开发版",
-    "resources": "下载 Grasscutter 资源"
+    "resources": "下载 Grasscutter 资源",
+    "game": "下载游戏"
   },
   "download_status": {
     "downloading": "下载中",
@@ -40,10 +49,11 @@
   "components": {
     "select_file": "选择文件或文件夹...",
     "select_folder": "选择文件夹...",
-    "download": "下载"
+    "download": "下载",
+    "install": "安装"
   },
   "news": {
-    "latest_commits": "最近的PR",
+    "latest_commits": "最近提交",
     "latest_version": "最新版本"
   },
   "help": {
@@ -53,6 +63,17 @@
     "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,14 +13,19 @@
   "options": {
     "enabled": "已啟用",
     "disabled": "未啟用",
+    "game_path": "選擇遊戲安裝路徑",
     "game_executable": "選擇遊戲執行檔",
+    "recover_metadata": "緊急恢復Metadata",
     "grasscutter_jar": "選擇伺服器JAR檔案",
     "toggle_encryption": "設定加密",
-    "java_path": "設定自定義Java路徑",
+    "install_certificate": "安裝代理憑證",
+    "java_path": "選擇自定義Java路徑",
     "grasscutter_with_game": "伴隨遊戲一起啟動Grasscutter",
     "language": "語言",
-    "background": "設定自定義背景（網址或檔案）",
-    "theme": "設定主題"
+    "background": "選擇自定義背景（網址或檔案）",
+    "theme": "選擇主題",
+    "patch_metadata": "自動修補Metadata",
+    "use_proxy": "使用內建代理伺服器"
   },
   "downloads": {
     "grasscutter_stable_data": "下載Grasscutter穩定版數據（Data）",
@@ -31,7 +36,8 @@
     "grasscutter_latest": "下載Grasscutter開發板",
     "grasscutter_stable_update": "更新Grasscutter穩定版",
     "grasscutter_latest_update": "更新Grasscutter開發板",
-    "resources": "下載Grasscutter資源（Resources）"
+    "resources": "下載Grasscutter資源（Resources）",
+    "game": "下載遊戲"
   },
   "download_status": {
     "downloading": "下載中",
@@ -43,7 +49,8 @@
   "components": {
     "select_file": "選擇檔案或資料夾...",
     "select_folder": "選擇資料夾...",
-    "download": "下載"
+    "download": "下載",
+    "install": "安裝"
   },
   "news": {
     "latest_commits": "最近的PR",
@@ -51,11 +58,23 @@
   },
   "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文件。這個選項在更新時很有用。",
-    "resources": "資源文件在架設一個Grasscutter伺服器時是必要的。 這個選項會在你已經有裡面有檔案的資源資料夾時不可選。"
+    "encryption": "在正常情況下，此選項應該被關閉。",
+    "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

@@ -13,14 +13,17 @@
   "options": {
     "enabled": "Aktiviert",
     "disabled": "Deaktiviert",
+    "game_path": "Spielpfad",
     "game_executable": "Spiel Datei auswählen",
+    "recover_metadata": "Notfall Wiederherstellung der Metadaten",
     "grasscutter_jar": "Grasscuter JAR auswählen",
     "toggle_encryption": "Verschlüsselung umschalten",
     "java_path": "Benutzerdefinierten Java Pfad setzen",
     "grasscutter_with_game": "Grasscutter automatisch mit dem Spiel starten",
     "language": "Sprache auswählen",
     "background": "Benutzerdefinierten Hintergrund festlegen (link oder bild)",
-    "theme": "Theme auswählen"
+    "theme": "Theme auswählen",
+    "patch_metadata": "Metadaten automatisch patchen"
   },
   "downloads": {
     "grasscutter_stable_data": "Stabile Grasscutter Daten herunterladen",
@@ -31,7 +34,8 @@
     "grasscutter_latest": "Aktuellste Grasscutter Version herunterladen",
     "grasscutter_stable_update": "Stabile Grasscutter Version aktualisieren",
     "grasscutter_latest_update": "Aktuellste Grasscutter Version aktualisieren",
-    "resources": "Grasscutter Ressourcen herunterladen"
+    "resources": "Grasscutter Ressourcen herunterladen",
+    "game": "Spiel herunterladen"
   },
   "download_status": {
     "downloading": "Lädt herunter",
@@ -43,7 +47,8 @@
   "components": {
     "select_file": "Datei oder Ordner auswählen...",
     "select_folder": "Ordner auswählen...",
-    "download": "Herunterladen"
+    "download": "Herunterladen",
+    "install": "Installieren"
   },
   "news": {
     "latest_commits": "Letzte Commits",
@@ -56,6 +61,17 @@
     "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"
+    "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

@@ -25,7 +25,8 @@
     "background": "Set Custom Background (link or image file)",
     "theme": "Set Theme",
     "patch_metadata": "Automatically Patch Metadata",
-    "use_proxy": "Use Internal Proxy"
+    "use_proxy": "Use Internal Proxy",
+    "wipe_login": "Wipe Login Cache"
   },
   "downloads": {
     "grasscutter_stable_data": "Download Grasscutter Stable Data",

src-tauri/lang/nl.json

@@ -0,0 +1,80 @@
+{
+  "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

@@ -13,14 +13,19 @@
   "options": {
     "enabled": "Включено",
     "disabled": "Выключено",
+    "game_path": "Установить путь к файлам игры",
     "game_executable": "Установить исполняемый файл игры",
+    "recover_metadata": "Принудительное восстановление Метаданных",
     "grasscutter_jar": "Установить Grasscutter JAR",
     "toggle_encryption": "Переключить шифрование",
+    "install_certificate": "Установить сертификат для работы Прокси",
     "java_path": "Установить пользовательский путь Java",
     "grasscutter_with_game": "Автоматически запускать Grasscutter вместе с игрой",
     "language": "Установить язык",
     "background": "Установить свой фон (ссылка или файл)",
-    "theme": "Установить тему"
+    "theme": "Установить тему",
+    "patch_metadata": "Автоматический патч Метаданных при запуске",
+    "use_proxy": "Использовать встроенный Прокси"
   },
   "downloads": {
     "grasscutter_stable_data": "Скачать стабильные данные Grasscutter",
@@ -31,7 +36,8 @@
     "grasscutter_latest": "Скачать последнюю версию Grasscutter",
     "grasscutter_stable_update": "Обновить стабильную версию Grasscutter",
     "grasscutter_latest_update": "Обновить последнюю версию Grasscutter",
-    "resources": "Скачать ресурсы Grasscutter"
+    "resources": "Скачать ресурсы Grasscutter",
+    "game": "Скачать Игру"
   },
   "download_status": {
     "downloading": "Скачивание",
@@ -43,7 +49,8 @@
   "components": {
     "select_file": "Выберите файл или папку...",
     "select_folder": "Выберите папку...",
-    "download": "Скачать"
+    "download": "Скачать",
+    "install": "Установить"
   },
   "news": {
     "latest_commits": "Последние коммиты",
@@ -56,6 +63,18 @@
     "gc_dev_jar": "Скачать последнюю версию для разработки Grasscutter, которая содержит jar файл и данные.",
     "gc_stable_data": "Скачать стабильные данные Grasscutter, в которой нету jar файла. Это полезно для обновления.",
     "gc_dev_data": "Скачать последнюю версию для разработки Grasscutter, в которой нету jar файла. Это полезно для обновления.",
-    "resources": "Это необходимо для запуска сервера Grasscutter. Эта кнопка будет серой, если у Вас уже есть не пустая папка с ресурсами."
+    "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/src/file_helpers.rs

@@ -18,7 +18,14 @@ pub fn rename(path: String, new_name: String) {
 
   let path_replaced = &path.replace(&new_path.split('/').last().unwrap(), &new_name);
 
-  fs::rename(path, &path_replaced).unwrap();
+  match fs::rename(&path, &path_replaced) {
+    Ok(_) => {
+      println!("Renamed {} to {}", &path, path_replaced);
+    }
+    Err(e) => {
+      println!("Error: {}", e);
+    }
+  };
 }
 
 #[tauri::command]

src-tauri/src/gamebanana.rs

@@ -15,11 +15,11 @@ pub async fn get_download_links(mod_id: String) -> String {
 }
 
 #[tauri::command]
-pub async fn list_submissions(mode: String) -> String {
+pub async fn list_submissions(mode: String, page: String) -> String {
   let res = web::query(
     format!(
-      "{}/apiv9/Util/Game/Submissions?_idGameRow=8552&_nPage=1&_nPerpage=50&_sMode={}",
-      SITE_URL, mode
+      "{}/apiv9/Util/Game/Submissions?_idGameRow=8552&_nPage={}&_nPerpage=50&_sMode={}",
+      SITE_URL, page, mode
     )
     .as_str(),
   )

src-tauri/src/main.rs

@@ -4,7 +4,9 @@
 )]
 
 use once_cell::sync::Lazy;
+use std::io::Write;
 use std::{collections::HashMap, sync::Mutex};
+use tauri::async_runtime::block_on;
 
 use std::thread;
 use structs::APIQuery;
@@ -23,50 +25,94 @@ 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: &Vec<String>, arg: &str) -> bool {
+  args.contains(&arg.to_string())
+}
+
+async fn arg_handler(args: &Vec<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() {
-  tauri::Builder::default()
-    .invoke_handler(tauri::generate_handler![
-      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,
-      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");
+  // Always set CWD to the location of the executable.
+  let mut exe_path = std::env::current_exe().unwrap();
+  exe_path.pop();
+  std::env::set_current_dir(&exe_path).unwrap();
+
+  let args: Vec<String> = std::env::args().collect();
+
+  block_on(arg_handler(&args));
+
+  // For disabled GUI
+  ctrlc::set_handler(|| {
+    std::process::exit(0);
+  })
+  .unwrap_or(());
+
+  if !has_arg(&args, "--no-gui") {
+    tauri::Builder::default()
+      .invoke_handler(tauri::generate_handler![
+        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,
+        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]
@@ -88,6 +134,9 @@ 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 {
@@ -189,7 +238,8 @@ 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 parse response: {}", e);
+      println!("Failed to get bg file response: {}", e);
+      println!("^ please stop reporting this as an error it's so annoying LMFAO");
       return "".to_string();
     }
   };

src-tauri/src/metadata_patcher.rs

@@ -111,7 +111,12 @@ fn replace_keys(data: &[u8]) -> Vec<u8> {
 fn replace_rsa_key(old_data: &str, to_replace: &str, file_name: &str) -> String {
   // Read dispatch key file
   unsafe {
-    let mut new_key_file = match File::open(&("keys/".to_owned() + file_name)) {
+    // Get key folder from exe path
+    let mut exe_path = std::env::current_exe().unwrap();
+    exe_path.pop();
+
+    let key_folder = exe_path.to_str().unwrap().to_string();
+    let mut new_key_file = match File::open(format!("{}/keys/{}", key_folder, file_name)) {
       Ok(file) => file,
       Err(e) => {
         println!("Failed to open keys/{}: {}", file_name, e);
@@ -140,6 +145,5 @@ fn encrypt_metadata(old_data: &[u8]) -> Vec<u8> {
 }
 
 fn do_vecs_match<T: PartialEq>(a: &Vec<T>, b: &Vec<T>) -> bool {
-  let matching = a.iter().zip(b.iter()).filter(|&(a, b)| a == b).count();
-  matching == a.len() && matching == b.len()
+  a == b
 }

src-tauri/src/system_helpers.rs

@@ -1,4 +1,9 @@
 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>) {
@@ -88,6 +93,65 @@ 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
+    }
+  }
+}
+
+#[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(windows)]
 #[tauri::command]
 pub fn is_elevated() -> bool {

src-tauri/src/unzip.rs

@@ -63,28 +63,17 @@ pub fn unzip(
 
     println!("Is rar file? {}", zipfile.ends_with(".rar"));
 
-    let mut name = "".into();
+    let name;
+    let success;
 
     // If file ends in zip, OR is unknown, extract as zip, otherwise extract as rar
     if zipfile.ends_with(".rar") {
-      extract_rar(
-        &window,
-        &zipfile,
-        &f,
-        &full_path,
-        top_level.unwrap_or(false),
-      );
+      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 {
-      extract_zip(
-        &window,
-        &zipfile,
-        &f,
-        &full_path,
-        top_level.unwrap_or(false),
-      );
+      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();
@@ -92,6 +81,14 @@ pub fn unzip(
       name = file.name().to_string().clone();
     }
 
+    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
@@ -129,13 +126,7 @@ pub fn unzip(
   });
 }
 
-fn extract_rar(
-  window: &tauri::Window,
-  rarfile: &String,
-  _f: &File,
-  full_path: &path::PathBuf,
-  _top_level: bool,
-) {
+fn extract_rar(rarfile: &String, _f: &File, full_path: &path::PathBuf, _top_level: bool) -> bool {
   let archive = Archive::new(rarfile.clone());
 
   let mut open_archive = archive
@@ -148,41 +139,29 @@ fn extract_rar(
         "Extracted rar file to: {}",
         full_path.to_str().unwrap_or("Error")
       );
+
+      true
     }
     Err(e) => {
       println!("Failed to extract rar file: {}", e);
-      let mut res_hash = std::collections::HashMap::new();
-
-      res_hash.insert("error".to_string(), e.to_string());
-      res_hash.insert("path".to_string(), rarfile.to_string());
-
-      window.emit("download_error", &res_hash).unwrap();
+      false
     }
   }
 }
 
-fn extract_zip(
-  window: &tauri::Window,
-  zipfile: &String,
-  f: &File,
-  full_path: &path::PathBuf,
-  top_level: bool,
-) {
+fn extract_zip(_zipfile: &String, f: &File, full_path: &path::PathBuf, 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);
-      let mut res_hash = std::collections::HashMap::new();
-
-      res_hash.insert("error".to_string(), e.to_string());
-      res_hash.insert("path".to_string(), zipfile.to_string());
-
-      window.emit("download_error", &res_hash).unwrap();
+      false
     }
-  };
+  }
 }

src-tauri/tauri.conf.json

@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "Cultivation",
-    "version": "1.0.5"
+    "version": "1.0.8"
   },
   "tauri": {
     "allowlist": {

src/ui/components/ServerLaunchSection.tsx

@@ -161,6 +161,12 @@ export default class ServerLaunchSection extends React.Component<IProps, IState>
       }
     }
 
+    // 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,

src/ui/components/menu/Downloads.tsx

@@ -17,7 +17,7 @@ const STABLE_REPO_DOWNLOAD = 'https://github.com/Grasscutters/Grasscutter/archiv
 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://gitlab.com/yukiz/GrasscutterResources/-/archive/2.8/GrasscutterResources-2.8.zip'
+const RESOURCES_DOWNLOAD = 'https://gitlab.com/yukiz/GrasscutterResources/-/archive/3.0/GrasscutterResources-3.0.zip'
 
 interface IProps {
   closeFn: () => void

src/ui/components/menu/Options.tsx

@@ -34,6 +34,7 @@ interface IState {
   encryption: boolean
   patch_metadata: boolean
   use_internal_proxy: boolean
+  wipe_login: boolean
   swag: boolean
 
   // Swag stuff
@@ -59,6 +60,7 @@ export default class Options extends React.Component<IProps, IState> {
       encryption: false,
       patch_metadata: false,
       use_internal_proxy: false,
+      wipe_login: false,
       swag: false,
 
       // Swag stuff
@@ -78,6 +80,7 @@ export default class Options extends React.Component<IProps, IState> {
     this.restoreMetadata = this.restoreMetadata.bind(this)
     this.toggleMetadata = this.toggleMetadata.bind(this)
     this.toggleProxy = this.toggleProxy.bind(this)
+    this.toggleLoginWipe = this.toggleLoginWipe.bind(this)
   }
 
   async componentDidMount() {
@@ -102,6 +105,7 @@ export default class Options extends React.Component<IProps, IState> {
       encryption: await translate(encEnabled ? 'options.enabled' : 'options.disabled'),
       patch_metadata: config.patch_metadata || false,
       use_internal_proxy: config.use_internal_proxy || false,
+      wipe_login: config.wipe_login || false,
       swag: config.swag_mode || false,
 
       // Swag stuff
@@ -151,6 +155,12 @@ export default class Options extends React.Component<IProps, IState> {
     this.setState({
       migoto_path: value,
     })
+
+    // Set game exe in Migoto ini
+    invoke('set_migoto_target', {
+      path: this.state.game_install_path,
+      migotoPath: value,
+    })
   }
 
   setReshade(value: string) {
@@ -256,6 +266,16 @@ export default class Options extends React.Component<IProps, IState> {
     })
   }
 
+  async toggleLoginWipe() {
+    const changedVal = !(await getConfigOption('wipe_login'))
+
+    await setConfigOption('wipe_login', changedVal)
+
+    this.setState({
+      wipe_login: changedVal,
+    })
+  }
+
   render() {
     return (
       <Menu closeFn={this.props.closeFn} className="Options" heading="Options">
@@ -296,6 +316,14 @@ export default class Options extends React.Component<IProps, IState> {
             <Checkbox onChange={this.toggleProxy} checked={this.state?.use_internal_proxy} id="useProxy" />
           </div>
         </div>
+        <div className="OptionSection" id="menuOptionsContainerWipeLogin">
+          <div className="OptionLabel" id="menuOptionsLabelWipeLogin">
+            <Tr text="options.wipe_login" />
+          </div>
+          <div className="OptionValue" id="menuOptionsCheckboxWipeLogin">
+            <Checkbox onChange={this.toggleLoginWipe} checked={this.state?.wipe_login} id="wipeLogin" />
+          </div>
+        </div>
 
         <Divider />
 

src/utils/configuration.ts

@@ -22,6 +22,7 @@ let defaultConfig: Configuration
     debug_enabled: false,
     patch_metadata: true,
     use_internal_proxy: true,
+    wipe_login: false,
   }
 })()
 
@@ -46,6 +47,7 @@ export interface Configuration {
   debug_enabled: boolean
   patch_metadata: boolean
   use_internal_proxy: boolean
+  wipe_login: boolean
   swag_mode?: boolean
 
   // Swag stuff

src/utils/download.ts

@@ -77,14 +77,20 @@ export default class DownloadHandler {
 
     // Extraction events
     listen('extract_start', ({ payload }) => {
-      // Find the download that is no extracting and set it's status as such
+      // Find the download that is extracting and set it's status as such
       const index = this.downloads.findIndex((download) => download.path === payload)
       this.downloads[index].status = 'extracting'
     })
 
     listen('extract_end', ({ payload }) => {
-      // Find the download that is no extracting and set it's status as such
-      const index = this.downloads.findIndex((download) => download.path === payload)
+      // @ts-expect-error shut up typescript
+      const obj: {
+        file: string
+        new_folder: string
+      } = payload
+
+      // Find the download that is not extracting and set it's status as such
+      const index = this.downloads.findIndex((download) => download.path === obj.file || obj.new_folder)
       this.downloads[index].status = 'finished'
     })
   }

src/utils/gamebanana.ts

@@ -118,13 +118,30 @@ interface ModDownload {
 }
 
 export async function getMods(mode: string) {
-  const resp = JSON.parse(
-    await invoke('list_submissions', {
-      mode,
-    })
-  )
+  let modList: GamebananaResponse[] = []
+  let hadMods = true
+  let page = 1
 
-  return formatGamebananaData(resp)
+  while (hadMods) {
+    const resp = JSON.parse(
+      await invoke('list_submissions', {
+        mode,
+        page: '' + page,
+      })
+    )
+
+    if (resp.length === 0) hadMods = false
+
+    modList = [...modList, ...resp]
+    page++
+
+    console.log(page)
+    console.log(resp)
+  }
+
+  console.log(modList)
+
+  return formatGamebananaData(modList)
 }
 
 export async function formatGamebananaData(obj: GamebananaResponse[]) {

src/utils/zipUtils.ts

@@ -21,6 +21,9 @@ export function unzip(
     })
 
     listen('extract_end', ({ payload }) => {
+      console.log(payload)
+      console.log(file)
+
       // @ts-expect-error Payload is an object
       if (payload?.file === file) {
         resolve(payload as UnzipPayload)