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. 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, 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