diff --git a/app/src/main/java/net/kdt/pojavlaunch/JREUtils.java b/app/src/main/java/net/kdt/pojavlaunch/JREUtils.java index 94d3244b3..d264265d5 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/JREUtils.java +++ b/app/src/main/java/net/kdt/pojavlaunch/JREUtils.java @@ -43,20 +43,20 @@ public class JREUtils Log.i("jrelog-logcat","Starting logcat"); Process p = new ProcessBuilder().command("logcat", /* "-G", "1mb", */ "-v", "brief", "*:S").redirectErrorStream(true).start(); - // idk which better, but 512bytes may make a bug that printf(\n) in a single line + // idk which better, both have a bug that printf(\n) in a single line + /* BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream())); String line; while ((line = reader.readLine()) != null) { act.appendlnToLog(line); } - - /* - byte[] buf = new byte[512]; - int len; - while ((len = p.getInputStream().read(buf)) != -1) { - appendToLog(new String(buf, 0, len)); - } - */ + */ + + byte[] buf = new byte[512]; + int len; + while ((len = p.getInputStream().read(buf)) != -1) { + act.appendToLog(new String(buf, 0, len)); + } } catch (IOException e) { Log.e("jrelog-logcat", "IOException on logging thread"); e.printStackTrace(); diff --git a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java index 54b47f97a..cfab42942 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/MainActivity.java @@ -433,12 +433,10 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O CallbackBridge.mouseLeft = true; } - if (CallbackBridge.isGrabbing()) { - CallbackBridge.putMouseEventWithCoords(rightOverride ? (byte) 1 : (byte) 0, (byte) 1, x, y, 0, System.nanoTime()); - initialX = x; - initialY = y; - theHandler.sendEmptyMessageDelayed(MainActivity.MSG_LEFT_MOUSE_BUTTON_CHECK, LauncherPreferences.PREF_LONGPRESS_TRIGGER); - } + CallbackBridge.putMouseEventWithCoords(rightOverride ? (byte) 1 : (byte) 0, (byte) 1, x, y, 0, System.nanoTime()); + initialX = x; + initialY = y; + theHandler.sendEmptyMessageDelayed(MainActivity.MSG_LEFT_MOUSE_BUTTON_CHECK, LauncherPreferences.PREF_LONGPRESS_TRIGGER); } break; case MotionEvent.ACTION_UP: // 1 @@ -455,25 +453,23 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O } } - if (CallbackBridge.isGrabbing()) { - // System.out.println((String) ("[Math.abs(" + initialX + " - " + x + ") = " + Math.abs(initialX - x) + "] < " + fingerStillThreshold)); - // System.out.println((String) ("[Math.abs(" + initialY + " - " + y + ") = " + Math.abs(initialY - y) + "] < " + fingerStillThreshold)); - if (isTouchInHotbar && Math.abs(hotbarX - x) < fingerStillThreshold && Math.abs(hotbarY - y) < fingerStillThreshold) { - sendKeyPress(hudKeyHandled, 0, false); - } else if (!triggeredLeftMouseButton && Math.abs(initialX - x) < fingerStillThreshold && Math.abs(initialY - y) < fingerStillThreshold) { - sendMouseButton(1, true); - sendMouseButton(1, false); - } - if (!isTouchInHotbar) { - if (triggeredLeftMouseButton) { - sendMouseButton(0, false); - } - triggeredLeftMouseButton = false; - theHandler.removeMessages(MainActivity.MSG_LEFT_MOUSE_BUTTON_CHECK); - } else { - sendKeyPress(LWJGLGLFWKeycode.GLFW_KEY_Q, 0, false); - theHandler.removeMessages(MSG_DROP_ITEM_BUTTON_CHECK); + // System.out.println((String) ("[Math.abs(" + initialX + " - " + x + ") = " + Math.abs(initialX - x) + "] < " + fingerStillThreshold)); + // System.out.println((String) ("[Math.abs(" + initialY + " - " + y + ") = " + Math.abs(initialY - y) + "] < " + fingerStillThreshold)); + if (isTouchInHotbar && Math.abs(hotbarX - x) < fingerStillThreshold && Math.abs(hotbarY - y) < fingerStillThreshold) { + sendKeyPress(hudKeyHandled, 0, false); + } else if (!triggeredLeftMouseButton && Math.abs(initialX - x) < fingerStillThreshold && Math.abs(initialY - y) < fingerStillThreshold) { + sendMouseButton(1, true); + sendMouseButton(1, false); + } + if (!isTouchInHotbar) { + if (triggeredLeftMouseButton) { + sendMouseButton(0, false); } + triggeredLeftMouseButton = false; + theHandler.removeMessages(MainActivity.MSG_LEFT_MOUSE_BUTTON_CHECK); + } else { + sendKeyPress(LWJGLGLFWKeycode.GLFW_KEY_Q, 0, false); + theHandler.removeMessages(MSG_DROP_ITEM_BUTTON_CHECK); } break; @@ -1036,22 +1032,6 @@ public class MainActivity extends LoggableActivity implements OnTouchListener, O }); } - public void handleMessage(Message msg) { - switch (msg.what) { - case MainActivity.MSG_LEFT_MOUSE_BUTTON_CHECK /*1028*/: - int x = CallbackBridge.mouseX; - int y = CallbackBridge.mouseY; - if (CallbackBridge.isGrabbing() && Math.abs(initialX - x) < fingerStillThreshold && Math.abs(initialY - y) < fingerStillThreshold) { - triggeredLeftMouseButton = true; - sendMouseButton(0, true); - return; - } - return; - default: - return; - } - } - public String getMinecraftOption(String key) { try { String[] options = Tools.read(Tools.MAIN_PATH + "/options.txt").split("\n");