Skip to content
This repository was archived by the owner on Sep 23, 2025. It is now read-only.

Commit 4551f73

Browse files
artdeellartdeell
committed
Resolve merge conflicrts
2 parents 3a38740 + 1dec292 commit 4551f73

165 files changed

Lines changed: 27202 additions & 3908 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/FUNDING.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
open_collective: pojavlauncher
2+
patreon: pojavlauncher

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
name: Bug report
2+
description: ' Create a report to help us improve '
3+
title: "[BUG] <Short description>"
4+
labels: [bug]
5+
body:
6+
- type: textarea
7+
id: version
8+
attributes:
9+
label: Describe the bug
10+
description: >-
11+
A clear and concise description of what the bug is.
12+
placeholder: 'Example: Application exited with code 1'
13+
validations:
14+
required: true
15+
16+
- type: textarea
17+
attributes:
18+
label: The log file and images/videos
19+
description: |
20+
The log file called `latestlog.txt` is located under `Android/data/net.kdt.pojavlaunch/files`, `games/PojavLauncher/` or `games/PojavLauncher/.minecraft`. You may need to activate an option in your file explorer to see hidden files and folders. |
21+
You can also upload here screenshots or videos of the buggy behavior, if possible.
22+
23+
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.
24+
validations:
25+
required: false
26+
27+
- type: textarea
28+
attributes:
29+
label: Steps To Reproduce
30+
description: Steps to reproduce the behavior.
31+
placeholder: |
32+
1. Start PojavLauncher
33+
... *(your set of actions to reproduce the bug)*
34+
render: markdown
35+
validations:
36+
required: true
37+
38+
- type: textarea
39+
attributes:
40+
label: Expected Behavior
41+
description: A concise description of what you expected to happen.
42+
placeholder: 'Example: I expect the game to launches'
43+
validations:
44+
required: true
45+
46+
- type: textarea
47+
attributes:
48+
label: Platform
49+
description: |
50+
Examples:
51+
- **Device model**: Mi 8 Pro 8/128G
52+
- **CPU architecture**: aarch64
53+
- **Android version**: 10
54+
- **PojavLauncher version**: [Latest Release || version 3.3.1.1_rel_20210206 ]
55+
value: |
56+
- Device model:
57+
- CPU architecture:
58+
- Android version:
59+
- PojavLauncher version:
60+
render: markdown
61+
validations:
62+
required: true
63+
64+
- type: textarea
65+
attributes:
66+
label: Anything else?
67+
description: |
68+
Add any other context about the problem here.
69+
validations:
70+
required: false

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
blank_issues_enabled: false

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/feature_request.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Feature request
2+
description: 'Ask for new features.'
3+
title: "[F-Req] <Short description>"
4+
labels: [enhancement]
5+
body:
6+
- type: textarea
7+
id: version
8+
attributes:
9+
label: Is this request related to a bug?
10+
description: |
11+
Give us some details into the problem, and how this affects it.
12+
placeholder: 'Example: You should add a version selector because of the text box being too small.'
13+
validations:
14+
required: false
15+
16+
- type: textarea
17+
attributes:
18+
label: Describe the request.
19+
description: |
20+
What do you want to see changed, added, or removed? Make sure to be specific.
21+
placeholder: 'Example: A scrollable version picker.'
22+
validations:
23+
required: false
24+
25+
- type: textarea
26+
attributes:
27+
label: Anything else?
28+
description: |
29+
Add any other context about the problem here.
30+
validations:
31+
required: false

‎.github/workflows/android.yml‎

Lines changed: 97 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,107 @@ on:
1212
jobs:
1313
build:
1414
runs-on: ubuntu-20.04
15-
15+
env:
16+
GPLAY_KEYSTORE_PASSWORD: ${{ secrets.GPLAY_KEYSTORE_PASSWORD }}
1617
steps:
17-
- uses: actions/checkout@v2
18-
1918
- uses: actions/checkout@v2
2019
with:
21-
repository: PojavLauncherTeam/gl4es
22-
path: gl4es
20+
fetch-depth: 0
2321

2422
- name: set up JDK 1.8
2523
uses: actions/setup-java@v1
2624
with:
2725
java-version: 1.8
2826

29-
- name: Build latest GL4ES
27+
- name: Get gl4es latest commit hash
28+
id: gl4es-sha
29+
run: echo "::set-output name=sha::$(echo $(git ls-remote https://github.com/PojavLauncherTeam/gl4es refs/heads/master | grep -io '^\S*' && git ls-remote https://github.com/ptitSeb/gl4es refs/heads/master | grep -io '^\S*'))"
30+
shell: bash
31+
32+
- name: Cache gl4es
33+
uses: actions/cache@v2
34+
id: gl4es-cache
35+
with:
36+
path: gl4es/libs
37+
key: gl4es-android-shared-nodbg-test1-2-${{ steps.gl4es-sha.outputs.sha }}
38+
39+
- name: Get gl4es
40+
if: steps.gl4es-cache.outputs.cache-hit != 'true'
41+
uses: actions/checkout@v2
42+
with:
43+
repository: 'ptitSeb/gl4es'
44+
path: 'gl4es'
45+
46+
- name: Build gl4es
47+
if: steps.gl4es-cache.outputs.cache-hit != 'true'
3048
continue-on-error: true
3149
run: |
3250
cd gl4es
33-
git remote add upstream https://github.com/ptitSeb/gl4es
51+
git config --global user.email "github-actions@users.noreply.github.com"
52+
git config --global user.name "github-actions"
53+
git remote add upstream https://github.com/PojavLauncherTeam/gl4es
3454
git fetch upstream
3555
git checkout master
36-
git merge upstream/main || echo "Merge exit code $?"
37-
export ANDROID_NDK_HOME="$ANDROID_SDK_ROOT/ndk-bundle"
38-
$ANDROID_NDK_HOME/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk NDK_DEBUG=1
39-
cp -R libs/* ../app_pojavlauncher/src/main/jniLibs/
56+
git merge --allow-unrelated-histories upstream/master || echo "Merge exit code $?"
57+
$ANDROID_NDK_HOME/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk
58+
59+
- name: Install gl4es
60+
if: steps.gl4es-cache.outputs.cache-hit != 'true'
61+
run: |
62+
cp -R gl4es/libs/* app_pojavlauncher/src/main/jniLibs/
63+
mv gl4es ..
64+
git add .
65+
git commit -am "CI: Update gl4es"
66+
git push
67+
68+
- name: Get vgpu latest commit hash
69+
id: vgpu-sha
70+
run: echo "::set-output name=sha::$(echo $(git ls-remote https://github.com/PojavLauncherTeam/VGPU refs/heads/main | grep -io '^\S*'))"
71+
shell: bash
72+
73+
- name: Cache vgpu
74+
uses: actions/cache@v2
75+
id: vgpu-cache
76+
with:
77+
path: vgpu/libs
78+
key: vgpu-android-shared-1-${{ steps.vgpu-sha.outputs.sha }}
79+
80+
- name: Get vgpu
81+
if: steps.vgpu-cache.outputs.cache-hit != 'true'
82+
uses: actions/checkout@v2
83+
with:
84+
repository: 'PojavLauncherTeam/VGPU'
85+
path: 'vgpu'
4086

87+
- name: Build vgpu
88+
if: steps.vgpu-cache.outputs.cache-hit != 'true'
89+
continue-on-error: true
90+
run: |
91+
cd vgpu
92+
$ANDROID_NDK_HOME/ndk-build NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=./Android.mk
93+
94+
- name: Install vgpu
95+
if: steps.vgpu-cache.outputs.cache-hit != 'true'
96+
run: |
97+
cp -R vgpu/libs/* app_pojavlauncher/src/main/jniLibs/
98+
mv vgpu ..
99+
git config --global user.email "github-actions@users.noreply.github.com"
100+
git config --global user.name "github-actions"
101+
git add .
102+
git commit -am "CI: Update vgpu"
103+
git push
104+
105+
- name: Get JRE8
106+
uses: dawidd6/action-download-artifact@v2
107+
with:
108+
github_token: ${{secrets.GITHUB_TOKEN}}
109+
workflow: build.yml
110+
path: app_pojavlauncher/src/main/assets/components/jre
111+
workflow_conclusion: success
112+
repo: PojavLauncherTeam/android-openjdk-build-multiarch
113+
branch: buildjre8
114+
name: jre8-pojav
115+
41116
- name: Build APK with Gradle
42117
run: |
43118
chmod +x scripts/languagelist_updater.sh
@@ -46,33 +121,39 @@ jobs:
46121
mkdir -p out
47122
chmod +x gradlew
48123
./gradlew clean
49-
50124
# Build JRE JAR files (security manager, etc...)
51125
./gradlew :jre_lwjgl3glfw:build
52126
# mkdir app_pojavlauncher/src/main/assets/components/internal_libs
53127
rm app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar
54128
cp jre_lwjgl3glfw/build/libs/jre_lwjgl3glfw-3.2.3.jar app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar
55129
130+
./gradlew :app_pojavlauncher:bundleGplay
131+
mv app_pojavlauncher/build/outputs/bundle/gplay/app_pojavlauncher-gplay.aab out/app-gplay.aab
132+
56133
# Build the launcher
57134
./gradlew :app_pojavlauncher:assembleDebug
58135
mv app_pojavlauncher/build/outputs/apk/debug/app_pojavlauncher-debug.apk out/app-debug.apk
59136
# mv app_pojavlauncher/build/intermediates/merged_native_libs/debug/out/lib out/debug_lib
60-
61137
- name: Build APK without runtime
62138
run: |
63139
rm -r app_pojavlauncher/src/main/assets/components/jre
64140
./gradlew assembleDebug
65141
mv app_pojavlauncher/build/outputs/apk/debug/app_pojavlauncher-debug.apk out/app-debug-noruntime.apk
66-
67142
- name: Upload APK
68143
uses: actions/upload-artifact@v2
69144
with:
70145
name: app-debug
71146
path: out/app-debug.apk
72-
147+
- name: Upload onto the Google Play testing track
148+
uses: r0adkll/upload-google-play@v1
149+
with:
150+
serviceAccountJsonPlainText: ${{ secrets.GPLAY_SERVICE_JSON }}
151+
packageName: net.kdt.pojavlaunch
152+
releaseFiles: out/app-gplay.aab
153+
track: internal
154+
inAppUpdatePriority: 5
73155
- name: Upload APK (without runtime)
74156
uses: actions/upload-artifact@v2
75157
with:
76158
name: app-debug-noruntime
77159
path: out/app-debug-noruntime.apk
78-

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
/.gradle
22
/build
33
/*/build
4+
app_pojavlauncher/src/main/assets/components/jre
5+
local.properties
6+
.idea/
7+
app_pojavlauncher/.cxx/

‎LICENSE‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively
631631
state the exclusion of warranty; and each file should have at least
632632
the "copyright" line and a pointer to where the full notice is found.
633633

634-
<one line to give the program's name and a brief idea of what it does.>
635-
Copyright (C) <year> <name of author>
634+
PojavLauncher - A Minecraft: Java Edition Launcher for Android and iOS
635+
Copyright (C) 2021 Tran Hoang Khanh Duy and contributors
636636

637637
This program is free software: you can redistribute it and/or modify
638638
it under the terms of the GNU General Public License as published by
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
652652
If the program does terminal interaction, make it output a short
653653
notice like this when it starts in an interactive mode:
654654

655-
<program> Copyright (C) <year> <name of author>
655+
PojavLauncher Copyright (C) 2021 Tran Hoang Khanh Duy
656656
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
657657
This is free software, and you are welcome to redistribute it
658658
under certain conditions; type `show c' for details.

0 commit comments

Comments
 (0)