2009Scape/2009Scape-mobile
1
0
Fork 0
mirror of https://github.com/2009scape/2009Scape-mobile.git synced 2025-12-21 09:01:56 -07:00
Code Issues Projects Releases Packages Wiki Activity

Rename CURRENT_ARCH into DEVICE_ARCH

Browse source
This commit is contained in:
SerpentSpirale 2021-08-12 00:06:27 +02:00
parent 8d2843889b
commit 42e07ea04e
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
View file

@ -765,7 +765,7 @@ public class BaseMainActivity extends LoggableActivity {
}
private void checkVulkanZinkIsSupported() {
if (Tools.CURRENT_ARCHITECTURE == ARCH_X86
if (Tools.DEVICE_ARCHITECTURE == ARCH_X86
|| Build.VERSION.SDK_INT < 25
|| !getPackageManager().hasSystemFeature(PackageManager.FEATURE_VULKAN_HARDWARE_LEVEL)
|| !getPackageManager().hasSystemFeature(PackageManager.FEATURE_VULKAN_HARDWARE_VERSION)) {

4
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavApplication.java
View file

@ -6,7 +6,7 @@ import android.content.pm.*;
import android.content.res.*;
import android.os.*;
import androidx.core.app.*;
import androidx.preference.*;
import android.util.*;
import java.io.*;
import java.text.*;
@ -61,7 +61,7 @@ public class PojavApplication extends Application
// Tools.FILE_ACCOUNT_JSON = getFilesDir().getAbsolutePath() + "/account_profiles.json";
Tools.CURRENT_ARCHITECTURE = Architecture.getDeviceArchitecture();
Tools.DEVICE_ARCHITECTURE = Architecture.getDeviceArchitecture();
//Force x86 lib directory for Asus x86 based zenfones
if(Architecture.isx86Device() && Architecture.is32BitsDevice()){
String originalJNIDirectory = getApplicationInfo().nativeLibraryDir;

2
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
View file

@ -389,7 +389,7 @@ public class PojavLoginActivity extends BaseActivity
if(rt_version == null) return false;
if(!rt_version.equals(current_rt_version)) { //If we already have an integrated one installed, check if it's up-to-date
try {
MultiRTUtils.installRuntimeNamedBinpack(am.open("components/jre/universal.tar.xz"), am.open("components/jre/bin-" + archAsString(Tools.CURRENT_ARCHITECTURE) + ".tar.xz"), "Internal", rt_version,
MultiRTUtils.installRuntimeNamedBinpack(am.open("components/jre/universal.tar.xz"), am.open("components/jre/bin-" + archAsString(Tools.DEVICE_ARCHITECTURE) + ".tar.xz"), "Internal", rt_version,
(resid, vararg) -> runOnUiThread(()->{if(startupTextView!=null)startupTextView.setText(getString(resid,vararg));}));
MultiRTUtils.postPrepare(PojavLoginActivity.this,"Internal");
return true;

2
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java
View file

@ -45,7 +45,7 @@ public final class Tools {
public static String DIR_DATA = "/data/data/" + BuildConfig.APPLICATION_ID;
public static String MULTIRT_HOME = DIR_DATA+"/runtimes";
public static String LOCAL_RENDERER = null;
public static int CURRENT_ARCHITECTURE;
public static int DEVICE_ARCHITECTURE;
// New since 3.3.1
public static String DIR_ACCOUNT_NEW;

8
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java
View file

@ -36,11 +36,11 @@ public class JREUtils {
* @param jreArch The java architecture to compare as a String.
*/
public static void checkJavaArchitecture(LoggableActivity act, String jreArch) {
act.appendlnToLog("Architecture: " + archAsString(Tools.CURRENT_ARCHITECTURE));
if(Tools.CURRENT_ARCHITECTURE == Architecture.archAsInt(jreArch)) return;
act.appendlnToLog("Architecture: " + archAsString(Tools.DEVICE_ARCHITECTURE));
if(Tools.DEVICE_ARCHITECTURE == Architecture.archAsInt(jreArch)) return;
act.appendlnToLog("Architecture " + archAsString(Tools.CURRENT_ARCHITECTURE) + " is incompatible with Java Runtime " + jreArch);
throw new RuntimeException(act.getString(R.string.mcn_check_fail_incompatiblearch, archAsString(Tools.CURRENT_ARCHITECTURE), jreArch));
act.appendlnToLog("Architecture " + archAsString(Tools.DEVICE_ARCHITECTURE) + " is incompatible with Java Runtime " + jreArch);
throw new RuntimeException(act.getString(R.string.mcn_check_fail_incompatiblearch, archAsString(Tools.DEVICE_ARCHITECTURE), jreArch));
}