Skip to content
This repository was archived by the owner on Jun 1, 2026. It is now read-only.

Commit 86f797e

Browse files
committed
Merge remote-tracking branch 'amethyst/v3_openjdk' into v5_velvet
2 parents eb32ebb + 3a8db25 commit 86f797e

156 files changed

Lines changed: 1281 additions & 172 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/android.yml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ name: Android CI
33
on:
44
pull_request:
55
branches-ignore:
6-
- 'l10n_v3_openjdk2'
6+
- 'l10n_v3_openjdk'
77
types: [ opened, reopened ]
88
push:
99
branches-ignore:
10-
- 'l10n_v3_openjdk2'
10+
- 'l10n_v3_openjdk'
1111
workflow_dispatch:
1212

1313
jobs:
@@ -28,19 +28,13 @@ jobs:
2828
distribution: 'temurin'
2929
java-version: '21'
3030

31-
- name: Get LTW
32-
run: |
33-
apt update && apt install wget
34-
cd app_pojavlauncher/libs
35-
wget https://github.com/PojavLauncherTeam/LTW/releases/latest/download/ltw-release.aar
36-
3731
- name: Get JRE 8
3832
uses: dawidd6/action-download-artifact@v9
3933
with:
4034
workflow: build.yml
4135
path: app_pojavlauncher/src/main/assets/components/jre
4236
workflow_conclusion: success
43-
repo: PojavLauncherTeam/android-openjdk-build-multiarch
37+
repo: AngelAuraMC/angelauramc-openjdk-build
4438
branch: buildjre8
4539
name: jre8-pojav
4640

@@ -50,7 +44,7 @@ jobs:
5044
workflow: build.yml
5145
path: app_pojavlauncher/src/main/assets/components/jre-new
5246
workflow_conclusion: success
53-
repo: PojavLauncherTeam/android-openjdk-build-multiarch
47+
repo: AngelAuraMC/angelauramc-openjdk-build
5448
branch: buildjre17-21
5549
name: jre17-pojav
5650

@@ -60,7 +54,7 @@ jobs:
6054
workflow: build.yml
6155
path: app_pojavlauncher/src/main/assets/components/jre-21
6256
workflow_conclusion: success
63-
repo: PojavLauncherTeam/android-openjdk-build-multiarch
57+
repo: AngelAuraMC/angelauramc-openjdk-build
6458
branch: buildjre17-21
6559
name: jre21-pojav
6660

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ SolCraftLauncher is a fork of PojavLauncher/Angel Aura Amethyst with more techni
1616

1717
[![Android CI](https://github.com/AngelAuraMC/Amethyst-Android/workflows/Android%20CI/badge.svg)](https://github.com/AngelAuraMC/Amethyst-Android/actions)
1818
[![GitHub commit activity](https://img.shields.io/github/commit-activity/m/AngelAuraMC/Amethyst-Android)](https://github.com/AngelAuraMC/Amethyst-Android/actions)
19-
[![Crowdin](https://badges.crowdin.net/amethyst/localized.svg)](https://crowdin.com/project/amethyst)
20-
[![Discord](https://img.shields.io/discord/724163890803638273.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/98pZ8YY3Cq)
19+
[![Crowdin](https://badges.crowdin.net/pojavlauncher/localized.svg)](https://crowdin.com/project/pojavlauncher)
20+
[![Discord](https://img.shields.io/discord/724163890803638273.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/5ptqkyZxEy)
2121

2222
*From [Boardwalk](https://github.com/zhuowei/Boardwalk)'s ashes and [PojavLauncher](https://github.com/PojavLauncherTeam/PojavLauncher)'s ruined reputation, here comes Amethyst!*
2323

@@ -52,14 +52,14 @@ For more details, check out our [wiki](https://angelauramc.dev/wiki)!
5252

5353
You can get Amethyst via two methods:
5454

55-
1. **Releases:** Download the prebuilt app from our [stable releases](https://github.com/AngelAuraMC/Amethyst-Android/releases) or [automatic builds](https://github.com/AngelAuraMC/Amethyst-Android/actions).
55+
1. **Releases:** Download the latest prebuilt app from [nightly.link](https://nightly.link/AngelAuraMC/Amethyst-Android/workflows/android/v3_openjdk/app-debug.zip) or select an older version from our [automatic builds](https://github.com/AngelAuraMC/Amethyst-Android/actions).
5656
2. **Build from Source:** Follow the [building instructions](#building) below.
5757

5858
## Building
5959

6060
### Quick Build (Recommended)
6161

62-
The easiest way to build PojavLauncher is to use the pre-built JREs provided by our CI.
62+
The easiest way to build Amethyst is to use the pre-built JREs provided by our CI.
6363

6464
1. Clone the repository: `git clone --recursive https://github.com/AngelAuraMC/Amethyst-Android.git`
6565
2. Build the launcher: `./gradlew :app_pojavlauncher:assembleDebug` (Use `gradlew.bat` on Windows)

app_pojavlauncher/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,8 @@ dependencies {
228228

229229
// implementation 'net.sourceforge.streamsupport:streamsupport-cfuture:1.7.0'
230230

231+
implementation 'top.fifthlight.touchcontroller:proxy-client-android:0.0.4'
232+
231233
implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
232234

233235
implementation project(":MobileGlues")

app_pojavlauncher/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
2121
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
2222
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"/>
23+
<uses-permission android:name="android.permission.VIBRATE" />
2324

2425
<application
2526
android:name=".PojavApplication"
-3.68 MB
Loading
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
53f2f037cef9b7447a6abbdf82150ca8a2f2a587
1+
2016eba00f043842122d7aecb9410cf9371a7693
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)