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

try to fix crash

Browse Source
This commit is contained in:
khanhduytran0 2020-11-03 13:37:09 +07:00
parent d2f70636fd
commit e5fb44c353
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/net/kdt/pojavlaunch/MainActivity.java
View File

@ -30,7 +30,7 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O
public static volatile ClipboardManager GLOBAL_CLIPBOARD; public static volatile ClipboardManager GLOBAL_CLIPBOARD;
public static final String initText = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA "; public static final String initText = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA ";
volatile public static boolean isPushPollCall; volatile public static boolean isInputStackCall;
private static int[] hotbarKeys = { private static int[] hotbarKeys = {
LWJGLGLFWKeycode.GLFW_KEY_1, LWJGLGLFWKeycode.GLFW_KEY_2, LWJGLGLFWKeycode.GLFW_KEY_3, LWJGLGLFWKeycode.GLFW_KEY_1, LWJGLGLFWKeycode.GLFW_KEY_2, LWJGLGLFWKeycode.GLFW_KEY_3,
@ -162,8 +162,8 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O
setTitle("Minecraft " + mProfile.getVersion()); setTitle("Minecraft " + mProfile.getVersion());
// Minecraft 1.13+ // Minecraft 1.13+
isPushPollCall = mVersionInfo.arguments != null; isInputStackCall = mVersionInfo.arguments != null;
CallbackBridge.nativeAttachThreadToOther(true, isPushPollCall); CallbackBridge.nativeAttachThreadToOther(true, isInputStackCall);
this.displayMetrics = Tools.getDisplayMetrics(this); this.displayMetrics = Tools.getDisplayMetrics(this);
CallbackBridge.windowWidth = displayMetrics.widthPixels / scaleFactor; CallbackBridge.windowWidth = displayMetrics.widthPixels / scaleFactor;

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

@ -98,13 +98,15 @@ void getJavaInputBridge(jclass* clazz, jmethodID* method) {
} }
void sendData(int type, int i1, int i2, int i3, int i4) { void sendData(int type, int i1, int i2, int i3, int i4) {
(*runtimeJNIEnvPtr_ANDROID)->CallStaticVoidMethod( if (runtimeJNIEnvPtr_ANDROID != NULL) {
runtimeJNIEnvPtr_ANDROID, (*runtimeJNIEnvPtr_ANDROID)->CallStaticVoidMethod(
inputBridgeClass_ANDROID, runtimeJNIEnvPtr_ANDROID,
inputBridgeMethod_ANDROID, inputBridgeClass_ANDROID,
type, inputBridgeMethod_ANDROID,
i1, i2, i3, i4 type,
); i1, i2, i3, i4
);
}
} }
JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeAttachThreadToOther(JNIEnv* env, jclass clazz, jboolean isAndroid, jboolean isUseStackQueue) { JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeAttachThreadToOther(JNIEnv* env, jclass clazz, jboolean isAndroid, jboolean isUseStackQueue) {
@ -126,10 +128,10 @@ JNIEXPORT jstring JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeClipboard(JNI
// TODO: if crash here, then convert jstring to jstring (diff JVM) // TODO: if crash here, then convert jstring to jstring (diff JVM)
jclass bridgeClazz = (*dalvikJNIEnvPtr_JRE)->FindClass(dalvikJNIEnvPtr_JRE, "org/lwjgl/glfw/CallbackBridge"); jclass bridgeClazz = (*dalvikJNIEnvPtr_JRE)->FindClass(dalvikJNIEnvPtr_JRE, "org/lwjgl/glfw/CallbackBridge");
assert(bridgeClazz != NULL); assert(bridgeClazz != NULL);
jmethodID method = (*dalvikJNIEnvPtr_JRE)->GetStaticMethodID(dalvikJNIEnvPtr_JRE, bridgeClazz, "accessAndroidClipboard", "(ILjava/lang/String;)Ljava/lang/String;"); jmethodID bridgeMethod = (*dalvikJNIEnvPtr_JRE)->GetStaticMethodID(dalvikJNIEnvPtr_JRE, bridgeClazz, "accessAndroidClipboard", "(ILjava/lang/String;)Ljava/lang/String;");
assert(method != NULL); assert(bridgeMethod != NULL);
return (jstring) (*dalvikJNIEnvPtr_JRE)->CallStaticObjectMethod(dalvikJNIEnvPtr_JRE, bridgeClazz, action, copy); return (jstring) (*dalvikJNIEnvPtr_JRE)->CallStaticObjectMethod(dalvikJNIEnvPtr_JRE, bridgeClazz, bridgeMethod, action, copy);
} }
JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSetInputReady(JNIEnv* env, jclass clazz, jboolean inputReady) { JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeSetInputReady(JNIEnv* env, jclass clazz, jboolean inputReady) {