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

Feat[input]: interrupt dropping when switching hotbar slots + endless dropping

Browse Source
This commit is contained in:
artdeell 2024-04-06 12:22:03 -04:00 committed by Maksim Belov
parent 1fdb483c1f
commit e89c409807
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/mouse/DropGesture.java
View File

@ -5,24 +5,33 @@ import static org.lwjgl.glfw.CallbackBridge.sendKeyPress;
import android.os.Handler; import android.os.Handler;
import net.kdt.pojavlaunch.LwjglGlfwKeycode; import net.kdt.pojavlaunch.LwjglGlfwKeycode;
import net.kdt.pojavlaunch.prefs.LauncherPreferences;
public class DropGesture implements Runnable{
private final Handler mHandler;
private boolean mActive;
public class DropGesture extends ValidatorGesture {
public DropGesture(Handler mHandler) { public DropGesture(Handler mHandler) {
super(mHandler, 250); this.mHandler = mHandler;
} }
boolean mGuiBarHit;
public void submit(boolean hasGuiBarHit) { public void submit(boolean hasGuiBarHit) {
submit(); if(hasGuiBarHit && !mActive) {
mGuiBarHit = hasGuiBarHit; mActive = true;
mHandler.postDelayed(this, LauncherPreferences.PREF_LONGPRESS_TRIGGER);
}
if(!hasGuiBarHit && mActive) cancel();
}
public void cancel() {
mActive = false;
mHandler.removeCallbacks(this);
} }
@Override @Override
public boolean checkAndTrigger() { public void run() {
if(mGuiBarHit) sendKeyPress(LwjglGlfwKeycode.GLFW_KEY_Q); if(!mActive) return;
return true; sendKeyPress(LwjglGlfwKeycode.GLFW_KEY_Q);
mHandler.postDelayed(this, 250);
} }
@Override
public void onGestureCancelled(boolean isSwitching) {}
} }

5
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/mouse/InGameEventProcessor.java
View File

@ -92,7 +92,7 @@ public class InGameEventProcessor implements TouchEventProcessor {
private void cancelGestures(boolean isSwitching) { private void cancelGestures(boolean isSwitching) {
mLeftClickGesture.cancel(isSwitching); mLeftClickGesture.cancel(isSwitching);
mRightClickGesture.cancel(isSwitching); mRightClickGesture.cancel(isSwitching);
mDropGesture.cancel(isSwitching); mDropGesture.cancel();
} }
private boolean handleGuiBar(MotionEvent motionEvent) { private boolean handleGuiBar(MotionEvent motionEvent) {
@ -106,6 +106,9 @@ public class InGameEventProcessor implements TouchEventProcessor {
boolean hasGuiBarHit = hudKeyHandled != -1; boolean hasGuiBarHit = hudKeyHandled != -1;
if(hasGuiBarHit && hudKeyHandled != mLastHudKey) { if(hasGuiBarHit && hudKeyHandled != mLastHudKey) {
CallbackBridge.sendKeyPress(hudKeyHandled); CallbackBridge.sendKeyPress(hudKeyHandled);
// The GUI bar is handled before the gesture will be submitted, so this
// will be resubmitted again soon (with the timer restarted)
mDropGesture.cancel();
mLastHudKey = hudKeyHandled; mLastHudKey = hudKeyHandled;
} }
return hasGuiBarHit; return hasGuiBarHit;