From 2a2cab33b10c03d2ef9f5e3faca8f9c36197dfb6 Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Mon, 12 Oct 2020 12:31:05 +0700 Subject: [PATCH] Some changes, on descirption - (custom_env.txt) Add a way to add custom environment variables. - [V2 UI] Fix crashing on click settings menu --- app/src/main/java/net/kdt/pojavlaunch/JREUtils.java | 9 +++++++++ .../java/net/kdt/pojavlaunch/PojavLauncherActivity.java | 2 +- app/src/main/jni/egl_bridge.c | 1 + 3 files changed, 11 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 e973787ab..cc4d1bdf4 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/JREUtils.java +++ b/app/src/main/java/net/kdt/pojavlaunch/JREUtils.java @@ -123,6 +123,15 @@ public class JREUtils setEnvironment(launchType, "AWTSTUB_WIDTH", Integer.toString(CallbackBridge.windowWidth)); setEnvironment(launchType, "AWTSTUB_HEIGHT", Integer.toString(CallbackBridge.windowHeight)); + BufferedReader reader = new BufferedReader(new FileReader(new File(Tools.MAIN_PATH, "custom_env.txt"))); + String line; + while ((line = reader.readLine()) != null) { + // Not use split() as only split first one + int index = line.indexOf("="); + setEnvironment(launchType, line.substring(0, index), line.substring(index + 1)); + } + reader.close(); + // REGAL_GL_EXTENSIONS setLdLibraryPath(ldLibraryPath); diff --git a/app/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java b/app/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java index 2cf5f7b02..6fd5e41d8 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/PojavLauncherActivity.java @@ -116,7 +116,7 @@ public class PojavLauncherActivity extends AppCompatActivity viewPageAdapter.addFragment(new LauncherPreferenceFragment(), R.drawable.ic_menu_settings, getString(R.string.mcl_option_settings)); viewPager.setAdapter(viewPageAdapter); - tabLayout.setTabMode(VerticalTabLayout.MODE_SCROLLABLE); + // tabLayout.setTabMode(VerticalTabLayout.MODE_SCROLLABLE); tabLayout.setupWithViewPager(viewPager); tabLayout.setLastTabAsBottom(); diff --git a/app/src/main/jni/egl_bridge.c b/app/src/main/jni/egl_bridge.c index ab432d7a2..6830d782c 100644 --- a/app/src/main/jni/egl_bridge.c +++ b/app/src/main/jni/egl_bridge.c @@ -179,6 +179,7 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglTerminate(JNIEnv* e } JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_nativeRegalMakeCurrent(JNIEnv *env, jclass clazz) { + printf("Regal: making current"); RegalMakeCurrent_func *RegalMakeCurrent = (RegalMakeCurrent_func *) dlsym(RTLD_DEFAULT, "RegalMakeCurrent"); RegalMakeCurrent(potatoBridge.eglContext); }