mirror of
https://github.com/AngelAuraMC/Amethyst-Android.git
synced 2025-09-15 07:39:00 -04:00
Revert to 9e3fdedaff1bdc123a8bbe60bf2d98413112a603
This commit is contained in:
parent
30a537cdfb
commit
0f2f8f48d6
@ -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'
|
||||
|
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
||||
20201201:1
|
||||
20201218:1
|
||||
|
@ -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;
|
||||
|
@ -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");
|
||||
|
@ -196,7 +196,11 @@ public abstract class HandleView extends View implements ViewPositionListener, V
|
||||
if (mActionPopupShower == null) {
|
||||
mActionPopupShower = new Runnable() {
|
||||
public void run() {
|
||||
try {
|
||||
mActionPopupWindow.show();
|
||||
} catch (Throwable th) {
|
||||
th.printStackTrace();
|
||||
}
|
||||
}
|
||||
};
|
||||
} else {
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user