From e4d070f9ef4ec2f5c15afc25daee804432c6aaa2 Mon Sep 17 00:00:00 2001
From: alexytomi <60690056+alexytomi@users.noreply.github.com>
Date: Tue, 20 May 2025 17:08:33 +0800
Subject: [PATCH 1/3] fix[Login]: Fix offline profile launching modded
instances
Addresses https://github.com/PojavLauncherTeam/PojavLauncher/issues/6829
---
.../kdt/pojavlaunch/tasks/MinecraftDownloader.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloader.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloader.java
index 6b49703af..70a4f0834 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloader.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloader.java
@@ -27,6 +27,7 @@ import net.kdt.pojavlaunch.value.MinecraftLibraryArtifact;
import java.io.File;
import java.io.IOException;
+import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Map;
import java.util.Set;
@@ -76,8 +77,14 @@ public class MinecraftDownloader {
sExecutorService.execute(() -> {
try {
+ if(isLocalProfile){
+ throw new RuntimeException("Download failed. Please make sure you are logged in with a Microsoft Account.");
+ }
downloadGame(activity, version, realVersion);
listener.onDownloadDone();
+ }catch (UnknownHostException e){
+ Log.i("DownloadMirror", e.toString());
+ Tools.showErrorRemote("Can't download Minecraft, no internet connection found", e);
}catch (Exception e) {
listener.onDownloadFailed(e);
}
@@ -516,10 +523,6 @@ public class MinecraftDownloader {
}
private void downloadFile() throws Exception {
- if(isLocalProfile){
- throw new RuntimeException("Download failed. Please make sure you are logged in with a Microsoft Account.");
- }
-
try {
DownloadUtils.ensureSha1(mTargetPath, mTargetSha1, () -> {
DownloadMirror.downloadFileMirrored(mDownloadClass, mTargetUrl, mTargetPath,
From 7c7bc4204d979b82891d796c1e7744763953609f Mon Sep 17 00:00:00 2001
From: Gary <86944088+thegarykun@users.noreply.github.com>
Date: Wed, 21 May 2025 00:15:46 +0530
Subject: [PATCH 2/3] Update README.md
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index b136be4bb..b2acb3b03 100644
--- a/README.md
+++ b/README.md
@@ -36,9 +36,9 @@ For more details, check out our [wiki](https://angelauramc.dev/wiki)!
* Modding via Forge and Fabric are also supported.
* This repository contains source code for Android. For iOS/iPadOS, check out [Amethyst-iOS](https://github.com/AngelAuraMC/Amethyst-iOS).
-## Getting PojavLauncher
+## Getting Amethyst
-You can get PojavLauncher via two methods:
+You can get Amethyst via two methods:
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).
2. **Build from Source:** Follow the [building instructions](#building) below.
From 54c2de1271140df7045e9c5208489c4f4fcf0454 Mon Sep 17 00:00:00 2001
From: alexytomi <60690056+alexytomi@users.noreply.github.com>
Date: Thu, 22 May 2025 08:45:34 +0800
Subject: [PATCH 3/3] fix[strings]: Change MobileGlues options title to be more
accurate
Addresses https://github.com/PojavLauncherTeam/PojavLauncher/pull/6751#discussion_r2062853362
---
app_pojavlauncher/src/main/res/values/strings.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app_pojavlauncher/src/main/res/values/strings.xml b/app_pojavlauncher/src/main/res/values/strings.xml
index 53b81b4ca..423ad4208 100644
--- a/app_pojavlauncher/src/main/res/values/strings.xml
+++ b/app_pojavlauncher/src/main/res/values/strings.xml
@@ -439,9 +439,9 @@
Max GLSL cache size
Use ANGLE as driver
Multidraw emulation mode
- Enable incomplete OpenGL 4.3 emulation
+ Advertise Experimental OpenGL 4.3 extensions
May help with mod crashes. Disable if not needed, can cause crashes.
- Enable Compute Shader emulation
+ Advertise Experimental Compute Shader extension
May help with shaderpack glitches. Disable if not needed, can cause crashes.
Error Filtering
Amethyst