Rebase/mojo base

.github/FUNDING.yml

@@ -1 +1 @@
-patreon: pojavlauncher
+patreon: angelauramc

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -17,7 +17,7 @@ body:
   attributes:
     label: The log file and images/videos
     description: |
-      The log file called `latestlog.txt` is located under `/storage/emulated/0/Android/data/net.kdt.pojavlaunch/files` (on Android 10 and higher) or `/storage/emulated/0/games/PojavLauncher/` (on Android 9 and lower). You may have to activate an option in your file explorer to see hidden files and folders. Recommended file managers are ZArchiver and MiXplorer. |
+      The log file called `latestlog.txt` is located under `/storage/emulated/0/Android/data/org.angelauramc.amethyst/files` (on Android 10 and higher) or `/storage/emulated/0/games/Copper/` (on Android 9 and lower). You may have to activate an option in your file explorer to see hidden files and folders. Recommended file managers are ZArchiver and MiXplorer. |
       You can also upload here screenshots or videos of the buggy behavior, if possible.
 
       Tip: You can attach files by clicking this area to highlight it and then dragging files in or select them on 🖼 option at the toolbar. Do not click anything before the file successfully uploads, otherwise the upload is going to stop and the file won't attach.
@@ -29,7 +29,7 @@ body:
     label: Steps To Reproduce
     description: Steps to reproduce the issue.
     placeholder: |
-      1. Start PojavLauncher
+      1. Start Copper
       ... *(your set of actions to reproduce the bug)*
     render: markdown
   validations:
@@ -51,12 +51,12 @@ body:
         - **Device model**: Huawei P30 Pro 8/512G
         - **CPU architecture**: arm64 (can be arm64, arm, x86_64 or x86 depending on the device)
         - **Android version**: 10
-        - **PojavLauncher version**: (can be found in Android Apps settings, for example `dahlia-20230813-5e8842b-v3_openjdk`)
+        - **Copper version**: (can be found in Android Apps settings, for example `dahlia-20230813-5e8842b-v3_openjdk`)
     value: |
         - Device model: 
         - CPU architecture: 
         - Android version: 
-        - PojavLauncher version: 
+        - Copper version: 
     render: markdown
   validations:
     required: true

.github/workflows/android.yml

@@ -3,11 +3,11 @@ name: Android CI
 on:
   pull_request:
     branches-ignore:
-      - 'l10n_v3_openjdk2'
+      - 'l10n_v3_openjdk' 
     types: [ opened, reopened ]
   push:
     branches-ignore:
-      - 'l10n_v3_openjdk2'
+      - 'l10n_v3_openjdk'
   workflow_dispatch:
 
 jobs:
@@ -18,124 +18,90 @@ jobs:
       CURSEFORGE_API_KEY: ${{ secrets.CURSEFORGE_API_KEY }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+        with:
+          submodules: "recursive"
 
-      - name: Set up JDK 8
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '8'
+          java-version: '21'
 
       - name: Get LTW
-        uses: dawidd6/action-download-artifact@v2
-        continue-on-error: true
-        with:
-          github_token: ${{secrets.LTW_CLONER_SECRET}}
-          repo: PojavLauncherTeam/BigTinyWrapper
-          workflow: android.yml
-          workflow_conclusion: success
-          name: output-aar
-          path: app_pojavlauncher/libs
-          allow_forks: false
-
-      - name: Get JRE 8
-        uses: dawidd6/action-download-artifact@v2
+        run: |
+          sudo apt update && sudo apt install -y wget
+          mkdir -p app_pojavlauncher/libs
+          cd app_pojavlauncher/libs
+          wget https://github.com/CopperLauncher/LTW/releases/latest/download/ltw-release.aar
+
+      - name: Get JRE8
+        uses: dawidd6/action-download-artifact@v6
         with:
           workflow: build.yml
           path: app_pojavlauncher/src/main/assets/components/jre
           workflow_conclusion: success
-          repo: PojavLauncherTeam/android-openjdk-build-multiarch
+          repo: AngelAuraMC/angelauramc-openjdk-build
           branch: buildjre8
           name: jre8-pojav
 
-      - name: Get JRE17
-        uses: dawidd6/action-download-artifact@v2
-        with:
-          workflow: build.yml
-          path: app_pojavlauncher/src/main/assets/components/jre-new
-          workflow_conclusion: success
-          repo: PojavLauncherTeam/android-openjdk-build-multiarch
-          branch: buildjre17-21
-          name: jre17-pojav
-
-      - name: Get JRE21
-        uses: dawidd6/action-download-artifact@v2
-        with:
-          workflow: build.yml
-          path: app_pojavlauncher/src/main/assets/components/jre-21
-          workflow_conclusion: success
-          repo: PojavLauncherTeam/android-openjdk-build-multiarch
-          branch: buildjre17-21
-          name: jre21-pojav
-
       - uses: gradle/actions/setup-gradle@v4
         with:
+          validate-wrappers: false
           gradle-version: "8.11"
 
-      - name: Build JRE JAR files
+      - name: Run scripts
         run: |
           ./scripts/languagelist_updater.sh
-
           mkdir out
-          # Build JRE JAR files (security manager, etc...)
-          gradle :jre_lwjgl3glfw:build --no-daemon
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: '17'
+      - name: Build Release .apk
+        run: |
+          # Build the launcher
+          gradle :app_pojavlauncher:assembleRelease
+          mv app_pojavlauncher/build/outputs/apk/release/app_pojavlauncher-release.apk out/app-release.apk
 
-      - name: Build Google Play .aab
-        if: github.repository_owner == 'PojavLauncherTeam' && github.ref_name == 'v3_openjdk'
+      - name: Gen md5sums
         run: |
-          gradle :app_pojavlauncher:bundleGplay
-          mv app_pojavlauncher/build/outputs/bundle/gplay/app_pojavlauncher-gplay.aab out/app-gplay.aab
+          md5sum out/app-release.apk > out/app-release.md5
+
+      - name: Upload release APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: app-release
+          path: out/app-release.*
 
       - name: Build Debug .apk
         run: |
           # Build the launcher
           gradle :app_pojavlauncher:assembleDebug
           mv app_pojavlauncher/build/outputs/apk/debug/app_pojavlauncher-debug.apk out/app-debug.apk
 
-      - name: Build APK without runtime
-        run: |
-          rm -r app_pojavlauncher/src/main/assets/components/jre
-          rm -r app_pojavlauncher/src/main/assets/components/jre-new
-          rm -r app_pojavlauncher/src/main/assets/components/jre-21
-          gradle assembleDebug
-          mv app_pojavlauncher/build/outputs/apk/debug/app_pojavlauncher-debug.apk out/app-debug-noruntime.apk
       - name: Gen md5sums
         run: |
           md5sum out/app-debug.apk > out/app-debug.md5
-          md5sum out/app-debug-noruntime.apk > out/app-debug-noruntime.md5
 
-      - name: Upload APK
+      - name: Upload debug APK
         uses: actions/upload-artifact@v4
         with:
-          name: app-debug
+          name: app-debug (recommended)
           path: out/app-debug.*
 
-      - name: Upload AAB
-        uses: actions/upload-artifact@v4
-        with:
-          name: app-release-aab
-          path: out/app-gplay.aab
-
-      - name: Upload onto the Google Play testing track
-        continue-on-error: true
-        if: github.repository_owner == 'PojavLauncherTeam' && github.ref_name == 'v3_openjdk'
-        uses: r0adkll/upload-google-play@v1.1.2
-        with:
-          serviceAccountJsonPlainText: ${{ secrets.GPLAY_SERVICE_JSON }}
-          packageName: net.kdt.pojavlaunch
-          releaseFiles: out/app-gplay.aab
-          track: internal
-          inAppUpdatePriority: 5
+      - name: Build APK without runtime
+        run: |
+          rm -rf app_pojavlauncher/src/main/assets/components/jre
+          rm -rf app_pojavlauncher/src/main/assets/components/jre-new
+          rm -rf app_pojavlauncher/src/main/assets/components/jre-21
+          rm -rf app_pojavlauncher/src/main/assets/components/jre-25
+          ./gradlew assembleDebug
+          mv app_pojavlauncher/build/outputs/apk/debug/app_pojavlauncher-debug.apk out/app-debug-noruntime.apk
+
+      - name: Gen md5sums
+        run: |
+          md5sum out/app-debug-noruntime.apk > out/app-debug-noruntime.md5
 
       - name: Upload APK (without runtime)
         uses: actions/upload-artifact@v4
         with:
           name: app-debug-noruntime
           path: out/app-debug-noruntime.*
-

.gitignore

@@ -10,3 +10,7 @@ app_pojavlauncher/.cxx/
 .vs/
 /curseforge_key.txt
 /app_pojavlauncher/libs/ltw-release.aar
+/jre_lwjgl3glfw/gradle/
+/jre_lwjgl3glfw/**/build/
+/jre_lwjgl3glfw/**/.gradle/
+/app_pojavlauncher/curseforge_key.txt

.gitmodules

@@ -0,0 +1,9 @@
+[submodule "MobileGlues"]
+	path = MobileGlues
+	url = https://github.com/MobileGL-Dev/MobileGlues.git
+[submodule "SDL"]
+	path = app_pojavlauncher/src/main/jni/SDL
+	url = https://github.com/libsdl-org/SDL.git
+[submodule "sdl2-compat"]
+	path = app_pojavlauncher/src/main/jni/sdl2-compat
+	url = https://github.com/libsdl-org/sdl2-compat.git

GPLAY_PRIVACY_POLICY.md

@@ -0,0 +1,5 @@
+# MojoLauncher Privacy Policy
+1. This app does not send any sensitive data, and uses network only for downloading game resources, mods or other content.
+2. This app does not collect any sensitive data while you are running the game.
+3. Some sensitive data is stored in crash reports after the game crashes, but it's not shared to the developer or any third parties
+4. MojoLauncher developers reserve the right to update this privacy policy without prior notification.

PRIVACY_POLICY_ru.md

@@ -0,0 +1,5 @@
+# Политика конфиденциальности MojoLauncher
+1. Данное приложение не отправляет данные о пользователе, и использует сеть только для загрузки ресурсов игры, модификаций и другого контента
+2. Во время работы игры приложение не собирает данные о пользователе.
+3. Данные пользователя могут быть записаны в хранилище приложения при сбое, но эти данные не отправляются разработчику или третьим лицам
+4. Разработчики MojoLauncher оставляют за собой право изменить эту политику конфиденциальности в любое время без предварительного оповещения.