diff --git a/app/build.gradle b/app/build.gradle index 39a1de4cc..b48fa308e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,7 +24,7 @@ android { minSdkVersion 21 targetSdkVersion 29 versionCode 156236 - versionName "3.3.1b_6409b_20201210" + versionName "3.3.1b_6409b_20201218" multiDexEnabled true //important } @@ -60,14 +60,13 @@ android { dependencies { implementation 'javax.annotation:javax.annotation-api:1.3.2' implementation 'commons-codec:commons-codec:1.14' - implementation 'com.wu-man:android-bsf-api:3.1.3' + // implementation 'com.wu-man:android-bsf-api:3.1.3' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.preference:preference:1.0.0' implementation 'androidx.appcompat:appcompat:1.0.0' implementation 'androidx.legacy:legacy-preference-v14:1.0.0' implementation 'com.google.android.material:material:1.0.0' implementation 'androidx.annotation:annotation:1.0.0' - // implementation 'androidx.browser:browser:1.0.0' implementation 'androidx.browser:browser:1.0.0' // implementation 'com.intuit.sdp:sdp-android:1.0.5' diff --git a/app/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar b/app/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar index bd2ccd092..74bac3b04 100644 Binary files a/app/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar and b/app/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar differ diff --git a/app/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar.z b/app/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar.z deleted file mode 100644 index 04524cfcf..000000000 Binary files a/app/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar.z and /dev/null differ diff --git a/app/src/main/assets/components/lwjgl3/version b/app/src/main/assets/components/lwjgl3/version index 17f17108a..d725a6550 100644 --- a/app/src/main/assets/components/lwjgl3/version +++ b/app/src/main/assets/components/lwjgl3/version @@ -1 +1 @@ -20201201:1 +20201218:1 diff --git a/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java b/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java index d96018fdf..bfdab191f 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java @@ -99,6 +99,7 @@ public class BaseMainActivity extends LoggableActivity { private LinearLayout contentCanvas; private AWTSurfaceView contentCanvasView; */ + private boolean resuming; private boolean lastEnabled = false; private boolean lastGrab = false; private boolean isExited = false; diff --git a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java index e76745514..da4346c85 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java @@ -298,7 +298,9 @@ public class PojavLoginActivity extends BaseActivity } private void initMain() throws Throwable { + mkdirs(Tools.DIR_ACCOUNT_NEW); PojavMigrator.migrateAccountData(this); + if (!PojavMigrator.migrateGameDir()) { mkdirs(Tools.DIR_GAME_NEW); mkdirs(Tools.DIR_GAME_NEW + "/config"); diff --git a/app/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/HandleView.java b/app/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/HandleView.java index 82275aa0a..3dfe05c73 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/HandleView.java +++ b/app/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/HandleView.java @@ -196,7 +196,11 @@ public abstract class HandleView extends View implements ViewPositionListener, V if (mActionPopupShower == null) { mActionPopupShower = new Runnable() { public void run() { - mActionPopupWindow.show(); + try { + mActionPopupWindow.show(); + } catch (Throwable th) { + th.printStackTrace(); + } } }; } else { diff --git a/app/src/main/jni/input_bridge_v3.c b/app/src/main/jni/input_bridge_v3.c index 0f53bae51..64bd5f7bc 100644 --- a/app/src/main/jni/input_bridge_v3.c +++ b/app/src/main/jni/input_bridge_v3.c @@ -6,7 +6,7 @@ * - Works with some bugs: * + Modded versions gives broken stuff.. * - * TODO: + * * - Implements glfwSetCursorPos() to handle grab camera pos correctly. */ @@ -201,12 +201,11 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSetInputRead return isUseStackQueueCall; } -JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSetGrabbing(JNIEnv* env, jclass clazz, jboolean grabbing) { +JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSetGrabbing(JNIEnv* env, jclass clazz, jboolean grabbing, jint xset, jint yset) { isGrabbing = grabbing; if (isGrabbing == JNI_TRUE) { - // Center the cursor pointer - grabCursorX = savedWidth / 2; - grabCursorY = savedHeight / 2; + grabCursorX = xset; // savedWidth / 2; + grabCursorY = yset; // savedHeight / 2; isPrepareGrabPos = true; } }