Merge pull request #720 from Zagrios/bugfix/fix-oculus-launch

[bugfix] fix oculus launch by using sideloading
Zagrios · Dec 30, 2024 · f77ff25 · f77ff25
2 parents d3ab803 + e0a7d46
commit f77ff25
Show file tree

Hide file tree

Showing 30 changed files with 409 additions and 599 deletions.
diff --git a/assets/jsons/translations/de.json b/assets/jsons/translations/de.json
@@ -854,13 +854,12 @@
             "stay": "Angemeldet bleiben",
             "connect-to-meta": "Mit Meta verbinden"
         },
-        "original-version-backup-oculus": {
-            "title": "Achtung",
-            "body": {
-                "must-be-installed-once": "Sie müssen Beat Saber aus dem Oculus Store auf diesem Gerät installiert haben, andernfalls wird Beat Saber nach dem Start automatisch geschlossen.",
-                "will-backup": "Um diese Version zu starten, wird der ursprüngliche Installationsordner von Beat Saber in deiner Oculus-Bibliothek umbenannt und beim Schließen von Beat Saber automatisch wiederhergestellt."
-            },
-            "not-remind-me": "Nicht mehr erinnern",
+        "enable-oculus-sideloaded-apps": {
+            "title": "Sideloading aktivieren",
+            "info-1": "Um Beat Saber starten zu können, muss die Möglichkeit aktiviert werden, Sideloading-Apps auszuführen. BSManager wird Administratorrechte anfordern, um diese Funktion automatisch zu aktivieren.",
+            "info-2": "Die Sideloading-Funktion ermöglicht das Starten von Spielen, die sich außerhalb Ihres Oculus-Bibliotheksordners befinden.",
+            "info-3": "Nachdem das Sideloading aktiviert wurde, bleibt die Funktion aktiv, und Sie werden nicht mehr aufgefordert, sie zu aktivieren.",
+            "i-want-to-do-it-myself": "Ich möchte es selbst machen",
             "understood": "Verstanden"
         },
         "enter-meta-token": {

diff --git a/assets/jsons/translations/en.json b/assets/jsons/translations/en.json
@@ -849,13 +849,12 @@
             "stay": "Remember me",
             "connect-to-meta": "Connect to Meta"
         },
-        "original-version-backup-oculus": {
-            "title": "Warning",
-            "body": {
-                "must-be-installed-once": "You must have Beat Saber installed from the Oculus Store on this device, otherwise Beat Saber might automatically close after launching.",
-                "will-backup": "To launch this version, the original installation folder of Beat Saber located in your Oculus library will be renamed and will be automatically restored when Beat Saber is closed."
-            },
-            "not-remind-me": "Do not remind me",
+        "enable-oculus-sideloaded-apps": {
+            "title": "Enable Sideloading",
+            "info-1": "In order to launch Beat Saber, the ability to run sideloaded apps must be enabled. BSManager will request administrator rights to enable this feature automatically.",
+            "info-2": "The sideloaded apps feature allows launching games located outside your Oculus library folder.",
+            "info-3": "After sideloading is activated, the feature will remain active, and you will no longer be prompted to enable it.",
+            "i-want-to-do-it-myself": "I want to do it myself",
             "understood": "Understood"
         },
         "enter-meta-token": {

diff --git a/assets/jsons/translations/es.json b/assets/jsons/translations/es.json
@@ -854,13 +854,12 @@
             "stay": "Recuérdame",
             "connect-to-meta": "Conectarse a Meta"
         },
-        "original-version-backup-oculus": {
-            "title": "Atención",
-            "body": {
-                "must-be-installed-once": "Debes tener Beat Saber instalado desde la tienda de Oculus en este dispositivo, de lo contrario, Beat Saber se cerrará automáticamente después de iniciarse.",
-                "will-backup": "Para lanzar esta versión, la carpeta de instalación original de Beat Saber ubicada en tu biblioteca de Oculus será renombrada y se restaurará automáticamente al cerrar Beat Saber."
-            },
-            "not-remind-me": "No volver a recordármelo",
+        "enable-oculus-sideloaded-apps": {
+            "title": "Habilitar Sideloading",
+            "info-1": "Para poder iniciar Beat Saber, se debe habilitar la capacidad de ejecutar aplicaciones en sideloading. BSManager solicitará permisos de administrador para habilitar esta función automáticamente.",
+            "info-2": "La función de sideloading permite iniciar juegos ubicados fuera de la carpeta de la biblioteca de Oculus.",
+            "info-3": "Una vez que se active el sideloading, la función permanecerá activa y ya no se le pedirá que la habilite.",
+            "i-want-to-do-it-myself": "Quiero hacerlo yo mismo",
             "understood": "Entendido"
         },
         "enter-meta-token": {

diff --git a/assets/jsons/translations/fr.json b/assets/jsons/translations/fr.json
@@ -855,13 +855,12 @@
             "stay": "Se souvenir de moi",
             "connect-to-meta": "Se connecter à Meta"
         },
-        "original-version-backup-oculus": {
-            "title": "Attention",
-            "body": {
-                "must-be-installed-once": "Vous devez avoir Beat Saber installé depuis le Oculus Store sur cet appareil, sinon Beat Saber se fermera automatiquement après le lancement.",
-                "will-backup": "Afin de lancer cette version, le dossier d'installation original de Beat Saber se trouvant dans votre bibliothèque Oculus va être renommé et sera automatiquement restauré à l'arrêt de Beat Saber."
-            },
-            "not-remind-me": "Ne plus me rappeler",
+        "enable-oculus-sideloaded-apps": {
+            "title": "Activer le sideloading",
+            "info-1": "Pour lancer Beat Saber, la possibilité d'exécuter des applications en sideloading doit être activée. BSManager demandera les droits administrateur pour activer cette fonctionnalité automatiquement.",
+            "info-2": "La fonctionnalité de sideloading permet de lancer des jeux situés en dehors de votre dossier de bibliothèque Oculus.",
+            "info-3": "Une fois le sideloading activé, la fonctionnalité restera active et vous ne serez plus invité à l’activer.",
+            "i-want-to-do-it-myself": "Je veux le faire moi-même",
             "understood": "J'ai compris"
         },
         "enter-meta-token": {

diff --git a/assets/jsons/translations/ja.json b/assets/jsons/translations/ja.json
@@ -854,14 +854,13 @@
             "stay": "記憶する",
             "connect-to-meta": "Metaに接続する"
         },
-        "original-version-backup-oculus": {
-            "title": "注意",
-            "body": {
-                "must-be-installed-once": "このデバイスにOculusストアからBeat Saberをインストールしておく必要があります。そうしないと、Beat Saberは起動後に自動的に閉じます。",
-                "will-backup": "このバージョンを起動するために、OculusライブラリにあるBeat Saberの元のインストールフォルダは名前が変更され、Beat Saberの終了時に自動的に復元されます。"
-            },
-            "not-remind-me": "二度と表示しないでください",
-            "understood": "分かった"
+        "enable-oculus-sideloaded-apps": {
+            "title": "サイドローディングを有効化",
+            "info-1": "Beat Saberを起動するには、サイドローディングアプリを実行する機能を有効にする必要があります。BSManagerは、この機能を自動的に有効にするために管理者権限を要求します。",
+            "info-2": "サイドローディング機能により、Oculusライブラリフォルダ外にあるゲームを起動できます。",
+            "info-3": "サイドローディングを有効化すると、この機能はアクティブなままとなり、再度有効化を求められることはありません。",
+            "i-want-to-do-it-myself": "自分でやりたい",
+            "understood": "了解しました"
         },
         "enter-meta-token": {
             "title": "Oculusトークン",

diff --git a/assets/jsons/translations/ko.json b/assets/jsons/translations/ko.json
@@ -854,13 +854,12 @@
             "stay": "기억하기",
             "connect-to-meta": "Meta에 연결하기"
         },
-        "original-version-backup-oculus": {
-            "title": "주의",
-            "body": {
-                "must-be-installed-once": "이 장치에 Oculus 스토어에서 Beat Saber를 설치해야 합니다. 그렇지 않으면 Beat Saber가 실행 후 자동으로 종료됩니다..",
-                "will-backup": "이 버전을 실행하기 위해 Oculus 라이브러리에 있는 Beat Saber의 원래 설치 폴더의 이름이 변경되며, Beat Saber가 종료되면 자동으로 복원됩니다."
-            },
-            "not-remind-me": "다시 표시하지 않기",
+        "enable-oculus-sideloaded-apps": {
+            "title": "사이드로딩 활성화",
+            "info-1": "Beat Saber를 실행하려면 사이드로딩 앱을 실행할 수 있는 기능을 활성화해야 합니다. BSManager는 이 기능을 자동으로 활성화하기 위해 관리자 권한을 요청할 것입니다.",
+            "info-2": "사이드로딩 기능을 사용하면 Oculus 라이브러리 폴더 외부에 있는 게임을 실행할 수 있습니다.",
+            "info-3": "사이드로딩(sideloading)이 활성화되면 이 기능은 계속 활성 상태를 유지하며, 더 이상 활성화를 요청받지 않습니다.",
+            "i-want-to-do-it-myself": "스스로 하고 싶습니다",
             "understood": "알겠습니다"
         },
         "enter-meta-token": {

diff --git a/assets/jsons/translations/ru.json b/assets/jsons/translations/ru.json
@@ -854,14 +854,13 @@
             "stay": "Запомнить меня",
             "connect-to-meta": "Подключиться к Meta"
         },
-        "original-version-backup-oculus": {
-            "title": "Внимание",
-            "body": {
-                "must-be-installed-once": "Вы должны установить Beat Saber из магазина Oculus на этом устройстве, в противном случае Beat Saber автоматически закроется после запуска.",
-                "will-backup": "Для запуска этой версии исходная папка установки Beat Saber, находящаяся в вашей библиотеке Oculus, будет переименована и автоматически восстановлена при выходе из Beat Saber."
-            },
-            "not-remind-me": "Больше не напоминать",
-            "understood": "Понял"
+        "enable-oculus-sideloaded-apps": {
+            "title": "Включить Sideloading",
+            "info-1": "Чтобы запустить Beat Saber, необходимо включить возможность запуска приложений через sideloading. BSManager запросит права администратора для автоматического включения этой функции.",
+            "info-2": "Функция sideloading позволяет запускать игры, расположенные за пределами папки библиотеки Oculus.",
+            "info-3": "После активации сайдлоадинга функция останется активной, и вам больше не будет предложено её включить.",
+            "i-want-to-do-it-myself": "Я хочу сделать это сам",
+            "understood": "Понято"
         },
         "enter-meta-token": {
             "title": "Токен Oculus",

diff --git a/assets/jsons/translations/zh-tw.json b/assets/jsons/translations/zh-tw.json
@@ -854,14 +854,13 @@
             "stay": "記住我",
             "connect-to-meta": "連接到 Meta"
         },
-        "original-version-backup-oculus": {
-            "title": "警告",
-            "body": {
-                "must-be-installed-once": "您必須在此設備上從Oculus商店安裝Beat Saber，否則Beat Saber將在啟動後自動關閉。",
-                "will-backup": "為了啟動這個版本，位於您的Oculus庫中的Beat Saber的原始安裝文件夾將被重新命名，並且在Beat Saber關閉時會自動恢復。"
-            },
-            "not-remind-me": "不再提醒我",
-            "understood": "明白了"
+        "enable-oculus-sideloaded-apps": {
+            "title": "啟用旁載",
+            "info-1": "為了啟動 Beat Saber，必須啟用執行旁載應用程式的功能。BSManager 將請求管理員權限以自動啟用此功能。",
+            "info-2": "旁載功能允許啟動位於 Oculus 資料庫資料夾之外的遊戲。",
+            "info-3": "啟用 sideloading 後，此功能將保持啟用狀態，您將不再被提示啟用它。",
+            "i-want-to-do-it-myself": "我想自己完成",
+            "understood": "了解"
         },
         "enter-meta-token": {
             "title": "Oculus令牌",

diff --git a/assets/jsons/translations/zh.json b/assets/jsons/translations/zh.json
@@ -854,13 +854,12 @@
             "stay": "记住我",
             "connect-to-meta": "连接到 Meta"
         },
-        "original-version-backup-oculus": {
-            "title": "警告",
-            "body": {
-                "must-be-installed-once": "您必须在此设备上从Oculus商店安装Beat Saber，否则Beat Saber将在启动后自动关闭。",
-                "will-backup": "为了启动这个版本，位于您的Oculus库中的Beat Saber的原始安装文件夹将被重命名，并且在Beat Saber关闭时会自动恢复。"
-            },
-            "not-remind-me": "不再提醒我",
+        "enable-oculus-sideloaded-apps": {
+            "title": "启用旁加载",
+            "info-1": "为了启动 Beat Saber，必须启用运行旁加载应用程序的功能。BSManager 将请求管理员权限以自动启用此功能。",
+            "info-2": "旁加载功能允许启动位于 Oculus 库文件夹之外的游戏。",
+            "info-3": "激活 sideloading 后，该功能将保持激活状态，您将不再被提示启用它。",
+            "i-want-to-do-it-myself": "我想自己完成",
             "understood": "明白了"
         },
         "enter-meta-token": {

diff --git a/assets/scripts/oculus-allow-dev-sideloaded.exe b/assets/scripts/oculus-allow-dev-sideloaded.exe
diff --git a/assets/scripts/oculus_symlink_cleaner.exe b/assets/scripts/oculus_symlink_cleaner.exe
diff --git a/docs/assets/enable-oculus-sideloading.png b/docs/assets/enable-oculus-sideloading.png
diff --git a/docs/wiki/Activate-Oculus-sideloading.md b/docs/wiki/Activate-Oculus-sideloading.md
@@ -0,0 +1,11 @@
+Enabling Oculus sideloading allows games located outside if your Oculus library to be played on your Oculus Quest.
+
+- **Step 1:** Start the regedit application by pressing `Win + R` and typing `regedit` in the dialog box.
+- **Step 2:** Navigate to `HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Oculus VR, LLC\Oculus`.
+- **Step 3:** Right-click on the right panel and select `New > DWORD (32-bit) Value`.
+- **Step 4:** Name the new value `AllowDevSideloaded` and set the value to `1`.
+
+You should end up with something like this:
+![image](https://raw.githubusercontent.com/Zagrios/bs-manager/refs/heads/master/docs/assets/enable-oculus-sideloading.png)
+
+After completing these steps, you should be able to start Beat Saber from BSManager and play it on your Oculus Quest. If you are still having issues, please join our [Discord](https://discord.gg/uSqbHVpKdV) server for further assistance.
diff --git a/externals/oculus-allow-dev-sideloaded/.cargo/config.toml b/externals/oculus-allow-dev-sideloaded/.cargo/config.toml
@@ -0,0 +1,2 @@
+[target.x86_64-pc-windows-msvc]
+rustflags = ["-C", "target-feature=+crt-static"]
diff --git a/externals/oculus-allow-dev-sideloaded/Cargo.lock b/externals/oculus-allow-dev-sideloaded/Cargo.lock
diff --git a/externals/oculus-symlink-cleaner/Cargo.toml → ...ls/oculus-allow-dev-sideloaded/Cargo.toml b/externals/oculus-symlink-cleaner/Cargo.toml → ...ls/oculus-allow-dev-sideloaded/Cargo.toml
@@ -1,22 +1,20 @@
 [package]
-name = "oculus_symlink_cleaner"
+name = "oculus-allow-dev-sideloaded"
 version = "0.1.0"
 edition = "2021"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [build-dependencies]
 winres = "0.1.12"
 
 [dependencies]
-sysinfo = "0.30.6"
+winreg = "0.52.0"
+
+[package.metadata.winres]
+FileDescription = "Enable Sideloaded Apps"
+LegalCopyright = "Copyright © 2024 Zagrios"
+CompanyName = "Zagrios"
 
 [profile.release]
 codegen-units = 1
 lto = true
 opt-level = "z"
-
-[package.metadata.winres]
-FileDescription = "Clean Oculus Symlink after Beat Saber ends"
-LegalCopyright = "Copyright © 2024 Zagrios"
-CompanyName = "Zagrios"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		[target.x86_64-pc-windows-msvc]
		rustflags = ["-C", "target-feature=+crt-static"]