TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-19 01:27:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up code with the new architecture system

Browse Source
This commit is contained in:
SerpentSpirale 2021-08-11 18:02:45 +02:00
parent 346b5bf2c0
commit 93bb166339
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java
View File

@ -1,5 +1,9 @@
package net.kdt.pojavlaunch.utils; package net.kdt.pojavlaunch.utils;
import static net.kdt.pojavlaunch.Architecture.ARCH_X86;
import static net.kdt.pojavlaunch.Architecture.archAsString;
import static net.kdt.pojavlaunch.Architecture.is64BitsDevice;
import android.app.*; import android.app.*;
import android.content.*; import android.content.*;
import android.opengl.EGL14; import android.opengl.EGL14;
@ -37,11 +41,11 @@ public class JREUtils {
* @param jreArch The java architecture to compare as a String. * @param jreArch The java architecture to compare as a String.
*/ */
public static void checkJavaArchitecture(LoggableActivity act, String jreArch) { public static void checkJavaArchitecture(LoggableActivity act, String jreArch) {
act.appendlnToLog("Architecture: " + Tools.CURRENT_ARCHITECTURE); act.appendlnToLog("Architecture: " + archAsString(Tools.CURRENT_ARCHITECTURE));
if(Tools.CURRENT_ARCHITECTURE == Architecture.archAsInt(jreArch)) return; if(Tools.CURRENT_ARCHITECTURE == Architecture.archAsInt(jreArch)) return;
act.appendlnToLog("Architecture " + Tools.CURRENT_ARCHITECTURE + " is incompatible with Java Runtime " + jreArch); act.appendlnToLog("Architecture " + archAsString(Tools.CURRENT_ARCHITECTURE) + " is incompatible with Java Runtime " + jreArch);
throw new RuntimeException(act.getString(R.string.mcn_check_fail_incompatiblearch, String.valueOf(Tools.CURRENT_ARCHITECTURE), jreArch)); throw new RuntimeException(act.getString(R.string.mcn_check_fail_incompatiblearch, archAsString(Tools.CURRENT_ARCHITECTURE), jreArch));
} }
@ -161,7 +165,7 @@ public class JREUtils {
public static void relocateLibPath(final Context ctx) throws IOException { public static void relocateLibPath(final Context ctx) throws IOException {
if (JRE_ARCHITECTURE == null) { if (JRE_ARCHITECTURE == null) {
JRE_ARCHITECTURE = readJREReleaseProperties().get("OS_ARCH"); JRE_ARCHITECTURE = readJREReleaseProperties().get("OS_ARCH");
if (JRE_ARCHITECTURE.startsWith("i") && JRE_ARCHITECTURE.endsWith("86") && Tools.CURRENT_ARCHITECTURE.contains("x86") && !Tools.CURRENT_ARCHITECTURE.contains("64")) { if (Architecture.archAsInt(JRE_ARCHITECTURE) == ARCH_X86){
JRE_ARCHITECTURE = "i386/i486/i586"; JRE_ARCHITECTURE = "i386/i486/i586";
} }
} }
@ -175,7 +179,7 @@ public class JREUtils {
} }
} }
String libName = Tools.CURRENT_ARCHITECTURE.contains("64") ? "lib64" : "lib"; String libName = is64BitsDevice() ? "lib64" : "lib";
StringBuilder ldLibraryPath = new StringBuilder(); StringBuilder ldLibraryPath = new StringBuilder();
ldLibraryPath.append( ldLibraryPath.append(
Tools.DIR_HOME_JRE + "/" + Tools.DIRNAME_HOME_JRE + "/jli:" + Tools.DIR_HOME_JRE + "/" + Tools.DIRNAME_HOME_JRE + "/jli:" +