diff --git a/app/build.gradle b/app/build.gradle index c6d09281f..eab16626b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,7 +24,7 @@ android { minSdkVersion 19 targetSdkVersion 26 versionCode 156235 - versionName "3.2.0_6404b_20200923" + versionName "3.2.0t6_6405b_20200930" multiDexEnabled true //important ndk { @@ -36,8 +36,8 @@ android { debug { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - signingConfig signingConfigs.customDebug - } + signingConfig signingConfigs.customDebug + } release { // Don't set to true or java.awt will be a.a or something similar. diff --git a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java index 4c62d4086..2b4eba22e 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java @@ -960,7 +960,7 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O appendlnToLog("--------- beggining with launcher debug"); checkLWJGL3Installed(); checkJavaArchitecture(); - checkJavaArgsIsLaunchable(); + // checkJavaArgsIsLaunchable(); JREUtils.redirectAndPrintJRELog(this); 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)); } } - +/* private void checkJavaArgsIsLaunchable() throws Throwable { 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)); } } - +*/ private void checkLWJGL3Installed() { 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!"); throw new RuntimeException(getString(R.string.mcn_check_fail_lwjgl)); } else { - appendlnToLog("Info: LWJGL3 directory: " + lwjgl3dir.list()); + appendlnToLog("Info: LWJGL3 directory: " + Arrays.toString(lwjgl3dir.list())); } }