Merge remote-tracking branch 'origin/v3_openjdk' into v3_openjdk

Author: crystall1nedev

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.

app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/tasks/MinecraftDownloader.java

@@ -27,6 +27,7 @@
 
 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 void start(@Nullable Activity activity, @Nullable JMinecraftVersionList.V
 
         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 @@ private void verifyFileSha1() throws Exception {
         }
 
         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,

app_pojavlauncher/src/main/res/values/strings.xml

@@ -439,9 +439,9 @@
     <string name="mg_renderer_glsl_cache">Max GLSL cache size</string>
     <string name="mg_renderer_angle">Use ANGLE as driver</string>
     <string name="mg_renderer_multidraw">Multidraw emulation mode</string>
-    <string name="mg_renderer_title_gl43exts">Enable incomplete OpenGL 4.3 emulation</string>
+    <string name="mg_renderer_title_gl43exts">Advertise Experimental OpenGL 4.3 extensions</string>
     <string name="mg_renderer_summary_gl43exts">May help with mod crashes. Disable if not needed, can cause crashes.</string>
-    <string name="mg_renderer_title_computeShaderext">Enable Compute Shader emulation</string>
+    <string name="mg_renderer_title_computeShaderext">Advertise Experimental Compute Shader extension</string>
     <string name="mg_renderer_summary_computeShaderext">May help with shaderpack glitches. Disable if not needed, can cause crashes.</string>
     <string name="mg_renderer_title_errorSetting">Error Filtering</string>
     <string name="app_short_name">Amethyst</string>