From 09dc4c39d082e2a26110ccbd0a2e019646b08b16 Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Fri, 18 Sep 2020 12:09:00 +0700 Subject: [PATCH] Fix Fabric repo; Fix OpenAL --- app/src/main/java/net/kdt/pojavlaunch/JREUtils.java | 2 ++ app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java | 3 ++- .../main/java/net/kdt/pojavlaunch/value/DependentLibrary.java | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/net/kdt/pojavlaunch/JREUtils.java b/app/src/main/java/net/kdt/pojavlaunch/JREUtils.java index ce907c29b..240e2b715 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/JREUtils.java +++ b/app/src/main/java/net/kdt/pojavlaunch/JREUtils.java @@ -19,6 +19,8 @@ public class JREUtils dlopen(Tools.homeJreDir + "/lib/libawt.so"); dlopen(Tools.homeJreDir + "/lib/libawt_headless.so"); + dlopen("libopenal.so"); + if (!dlopen(LauncherPreferences.PREF_CUSTOM_OPENGL_LIBNAME)) { System.err.println("Failed to load custom OpenGL library " + LauncherPreferences.PREF_CUSTOM_OPENGL_LIBNAME + ". Fallbacking to GL4ES."); dlopen("libgl04es.so"); diff --git a/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java b/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java index 8cce15e4d..3a3eb8db1 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/MCLauncherActivity.java @@ -553,7 +553,7 @@ public class MCLauncherActivity extends AppCompatActivity if (libItem.downloads == null || libItem.downloads.artifact == null) { MinecraftLibraryArtifact artifact = new MinecraftLibraryArtifact(); - artifact.url = "https://libraries.minecraft.net/" + libArtifact; + artifact.url = (libItem.url == null ? "https://libraries.minecraft.net/" : libItem.url) + libArtifact; libItem.downloads = new DependentLibrary.LibraryDownloads(artifact); skipIfFailed = true; @@ -570,6 +570,7 @@ public class MCLauncherActivity extends AppCompatActivity throw th; } else { th.printStackTrace(); + publishProgress("0", th.getMessage()); } } } diff --git a/app/src/main/java/net/kdt/pojavlaunch/value/DependentLibrary.java b/app/src/main/java/net/kdt/pojavlaunch/value/DependentLibrary.java index c67343331..4dd0a9773 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/value/DependentLibrary.java +++ b/app/src/main/java/net/kdt/pojavlaunch/value/DependentLibrary.java @@ -3,6 +3,7 @@ package net.kdt.pojavlaunch.value; public class DependentLibrary { public String name; public LibraryDownloads downloads; + public String url; public static class LibraryDownloads {