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

Revert to 9e3fdedaff1bdc123a8bbe60bf2d98413112a603

Browse Source
This commit is contained in:
khanhduytran0 2020-12-18 17:06:43 +07:00
parent 30a537cdfb
commit 0f2f8f48d6
8 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/build.gradle
View File

@ -24,7 +24,7 @@ android {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 29 targetSdkVersion 29
versionCode 156236 versionCode 156236
versionName "3.3.1b_6409b_20201210" versionName "3.3.1b_6409b_20201218"
multiDexEnabled true //important multiDexEnabled true //important
} }
@ -60,14 +60,13 @@ android {
dependencies { dependencies {
implementation 'javax.annotation:javax.annotation-api:1.3.2' implementation 'javax.annotation:javax.annotation-api:1.3.2'
implementation 'commons-codec:commons-codec:1.14' 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.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.preference:preference:1.0.0' implementation 'androidx.preference:preference:1.0.0'
implementation 'androidx.appcompat:appcompat:1.0.0' implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'androidx.legacy:legacy-preference-v14:1.0.0' implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
implementation 'com.google.android.material:material:1.0.0' implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.annotation:annotation: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 'androidx.browser:browser:1.0.0'
// implementation 'com.intuit.sdp:sdp-android:1.0.5' // implementation 'com.intuit.sdp:sdp-android:1.0.5'

BIN
app/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar
View File

Binary file not shown.

BIN
app/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar.z
View File

Binary file not shown.

2
app/src/main/assets/components/lwjgl3/version
View File

@ -1 +1 @@
20201201:1 20201218:1

1
app/src/main/java/net/kdt/pojavlaunch/BaseMainActivity.java
View File

@ -99,6 +99,7 @@ public class BaseMainActivity extends LoggableActivity {
private LinearLayout contentCanvas; private LinearLayout contentCanvas;
private AWTSurfaceView contentCanvasView; private AWTSurfaceView contentCanvasView;
*/ */
private boolean resuming;
private boolean lastEnabled = false; private boolean lastEnabled = false;
private boolean lastGrab = false; private boolean lastGrab = false;
private boolean isExited = false; private boolean isExited = false;

2
app/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
View File

@ -298,7 +298,9 @@ public class PojavLoginActivity extends BaseActivity
} }
private void initMain() throws Throwable { private void initMain() throws Throwable {
mkdirs(Tools.DIR_ACCOUNT_NEW);
PojavMigrator.migrateAccountData(this); PojavMigrator.migrateAccountData(this);
if (!PojavMigrator.migrateGameDir()) { if (!PojavMigrator.migrateGameDir()) {
mkdirs(Tools.DIR_GAME_NEW); mkdirs(Tools.DIR_GAME_NEW);
mkdirs(Tools.DIR_GAME_NEW + "/config"); mkdirs(Tools.DIR_GAME_NEW + "/config");

6
app/src/main/java/net/kdt/pojavlaunch/customcontrols/handleview/HandleView.java
View File

@ -196,7 +196,11 @@ public abstract class HandleView extends View implements ViewPositionListener, V
if (mActionPopupShower == null) { if (mActionPopupShower == null) {
mActionPopupShower = new Runnable() { mActionPopupShower = new Runnable() {
public void run() { public void run() {
mActionPopupWindow.show(); try {
mActionPopupWindow.show();
} catch (Throwable th) {
th.printStackTrace();
}
} }
}; };
} else { } else {

9
app/src/main/jni/input_bridge_v3.c
View File

@ -6,7 +6,7 @@
* - Works with some bugs: * - Works with some bugs:
* + Modded versions gives broken stuff.. * + Modded versions gives broken stuff..
* *
* TODO: *
* - Implements glfwSetCursorPos() to handle grab camera pos correctly. * - Implements glfwSetCursorPos() to handle grab camera pos correctly.
*/ */
@ -201,12 +201,11 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSetInputRead
return isUseStackQueueCall; 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; isGrabbing = grabbing;
if (isGrabbing == JNI_TRUE) { if (isGrabbing == JNI_TRUE) {
// Center the cursor pointer grabCursorX = xset; // savedWidth / 2;
grabCursorX = savedWidth / 2; grabCursorY = yset; // savedHeight / 2;
grabCursorY = savedHeight / 2;
isPrepareGrabPos = true; isPrepareGrabPos = true;
} }
} }