TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-14 07:05:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Disable java args test

Browse Source
This commit is contained in:
khanhduytran0 2020-09-30 05:43:39 +07:00
parent 04503d0a76
commit 8053a8b013
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@ -24,7 +24,7 @@ android {
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 26 targetSdkVersion 26
versionCode 156235 versionCode 156235
versionName "3.2.0_6404b_20200923" versionName "3.2.0t6_6405b_20200930"
multiDexEnabled true //important multiDexEnabled true //important
ndk { ndk {
@ -36,8 +36,8 @@ android {
debug { debug {
minifyEnabled false minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
signingConfig signingConfigs.customDebug signingConfig signingConfigs.customDebug
} }
release { release {
// Don't set to true or java.awt will be a.a or something similar. // Don't set to true or java.awt will be a.a or something similar.

10
app/src/main/java/net/kdt/pojavlaunch/MainActivity.java
View File

@ -960,7 +960,7 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O
appendlnToLog("--------- beggining with launcher debug"); appendlnToLog("--------- beggining with launcher debug");
checkLWJGL3Installed(); checkLWJGL3Installed();
checkJavaArchitecture(); checkJavaArchitecture();
checkJavaArgsIsLaunchable(); // checkJavaArgsIsLaunchable();
JREUtils.redirectAndPrintJRELog(this); JREUtils.redirectAndPrintJRELog(this);
Tools.launchMinecraft(this, mProfile, mVersionInfo); Tools.launchMinecraft(this, mProfile, mVersionInfo);
@ -978,7 +978,7 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O
throw new RuntimeException(getString(R.string.mcn_check_fail_incompatiblearch, Tools.currentArch, releaseContent)); throw new RuntimeException(getString(R.string.mcn_check_fail_incompatiblearch, Tools.currentArch, releaseContent));
} }
} }
/*
private void checkJavaArgsIsLaunchable() throws Throwable { private void checkJavaArgsIsLaunchable() throws Throwable {
appendlnToLog("Info: Custom Java arguments: \"" + LauncherPreferences.PREF_CUSTOM_JAVA_ARGS + "\""); appendlnToLog("Info: Custom Java arguments: \"" + LauncherPreferences.PREF_CUSTOM_JAVA_ARGS + "\"");
@ -1012,14 +1012,14 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O
// throw new RuntimeException(getString(R.string.mcn_check_fail_java)); // throw new RuntimeException(getString(R.string.mcn_check_fail_java));
} }
} }
*/
private void checkLWJGL3Installed() { private void checkLWJGL3Installed() {
File lwjgl3dir = new File(Tools.MAIN_PATH, "lwjgl3"); File lwjgl3dir = new File(Tools.MAIN_PATH, "lwjgl3");
if (!lwjgl3dir.exists() || lwjgl3dir.isFile()) { if (!lwjgl3dir.exists() || lwjgl3dir.isFile() || lwjgl3dir.list().length == 0) {
appendlnToLog("Error: LWJGL3 was not installed!"); appendlnToLog("Error: LWJGL3 was not installed!");
throw new RuntimeException(getString(R.string.mcn_check_fail_lwjgl)); throw new RuntimeException(getString(R.string.mcn_check_fail_lwjgl));
} else { } else {
appendlnToLog("Info: LWJGL3 directory: " + lwjgl3dir.list()); appendlnToLog("Info: LWJGL3 directory: " + Arrays.toString(lwjgl3dir.list()));
} }
} }