Improvements to the current Flick Stick implementation

src/main/java/dev/isxander/controlify/controller/gyro/GyroComponent.java

@@ -45,6 +45,7 @@ public static class Config implements ConfigClass {
         public GyroYawMode yawMode = GyroYawMode.YAW;
 
         public boolean flickStick = false;
+	public int flickAnimationTicks = 8;
 
         public boolean invertX = false;
         public boolean invertY = false;

src/main/java/dev/isxander/controlify/gui/screen/ControllerConfigScreenFactory.java

@@ -506,6 +506,18 @@ private Optional<OptionGroup> makeGyroGroup(ControllerEntity controller) {
                         .formatValue(v -> v ? Component.translatable("controlify.gui.gyro_behaviour.relative") : Component.translatable("controlify.gui.gyro_behaviour.absolute")))
                 .build();
         gyroGroup.option(relativeModeOpt);
+	var flickAnimationTicks = Option.<Integer>createBuilder()
+	    .name(Component.translatable("controlify.gui.flick_animation_ticks"))
+	    .description(OptionDescription.createBuilder()
+	        .text(Component.translatable("controlify.gui.flick_animation_ticks.tooltip"))
+		.build())
+	    .binding(def.flickAnimationTicks, () -> config.flickAnimationTicks, v -> config.flickAnimationTicks = v)
+	    .controller(opt -> IntegerSliderControllerBuilder.create(opt)
+	        .range(0, 32)
+		.step(1)
+		.formatValue(v -> v == 0 ? CommonComponents.OPTION_OFF : ticksToMillisFormatter.format(v)))
+	    .build();
+	gyroGroup.option(flickAnimationTicks);
         gyroGroup.option(Util.make(() -> {
             var option = Option.<GyroYawMode>createBuilder()
                     .name(Component.translatable("controlify.gui.gyro_yaw_mode"))
@@ -572,6 +584,7 @@ private Optional<OptionGroup> makeGyroGroup(ControllerEntity controller) {
             return opt;
         }));
 
+
         return Optional.of(gyroGroup.build());
     }
 

src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java

@@ -19,8 +19,10 @@
 import dev.isxander.controlify.utils.HoldRepeatHelper;
 import dev.isxander.controlify.utils.animation.api.Animation;
 import dev.isxander.controlify.utils.animation.api.EasingFunction;
+import net.minecraft.client.Camera;
 import net.minecraft.client.CameraType;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.Screenshot;
 import net.minecraft.client.gui.screens.inventory.InventoryScreen;
 import net.minecraft.client.player.LocalPlayer;
@@ -43,12 +45,14 @@ public class InGameInputHandler {
     private final ControllerEntity controller;
     private final Controlify controlify;
     private final Minecraft minecraft;
+    private final Camera camera;
 
     private double lookInputX, lookInputY; // in degrees per tick
     private final GyroState gyroInput = new GyroState();
     private boolean gyroToggledOn;
     private boolean wasAiming;
     private Animation flickAnimation;
+    private float yawOrigin;
 
     private boolean shouldShowPlayerList;
 
@@ -61,6 +65,7 @@ public class InGameInputHandler {
     public InGameInputHandler(ControllerEntity controller) {
         this.controller = controller;
         this.minecraft = Minecraft.getInstance();
+	this.camera = minecraft.gameRenderer.getMainCamera();
         this.controlify = Controlify.instance();
         this.dropRepeatHelper = new HoldRepeatHelper(20, 1);
         this.hotbarNextRepeatHelper = new HoldRepeatHelper(10, 4);
@@ -282,7 +287,7 @@ protected void handlePlayerLookInput(boolean isController) {
         controller.gyro().ifPresent(gyro -> handleGyroLook(gyro, lookImpulse, aiming));
 
         if (controller.gyro().map(gyro -> gyro.confObj().lookSensitivity > 0 && gyro.confObj().flickStick).orElse(false)) {
-            handleFlickStick(player);
+            controller.gyro().ifPresent(gyro -> handleFlickStick(gyro, player));
         } else {
             controller.input().ifPresent(input -> handleRegularLook(input, lookImpulse, aiming, player));
         }
@@ -379,30 +384,39 @@ protected void handleGyroLook(GyroComponent gyro, Vector2d impulse, boolean aimi
         } * (config.invertX ? -1 : 1);
     }
 
-    protected void handleFlickStick(LocalPlayer player) {
+    protected void handleFlickStick(GyroComponent gyro, LocalPlayer player) {
+	GyroComponent.Config config = gyro.confObj();
+
         float y = ControlifyBindings.LOOK_DOWN.on(controller).analogueNow()
                 - ControlifyBindings.LOOK_UP.on(controller).analogueNow();
         float x = ControlifyBindings.LOOK_RIGHT.on(controller).analogueNow()
                 - ControlifyBindings.LOOK_LEFT.on(controller).analogueNow();
 
+	if (y == 0f && x == 0f) {
+		yawOrigin = camera.getYRot();
+	} else {
+
+		float yawCurrent = camera.getYRot();
+
         float flickAngle = Mth.wrapDegrees((float) Mth.atan2(y, x) * Mth.RAD_TO_DEG + 90f);
 
-        if (!ControlifyBindings.LOOK_DOWN.on(controller).justPressed()
-                && !ControlifyBindings.LOOK_UP.on(controller).justPressed()
-                && !ControlifyBindings.LOOK_LEFT.on(controller).justPressed()
-                && !ControlifyBindings.LOOK_RIGHT.on(controller).justPressed()
-        ) {
-            return;
-        }
+	float yawTurn = Mth.wrapDegrees((float) (yawOrigin + flickAngle) - yawCurrent);
 
         if (flickAnimation != null && flickAnimation.isPlaying()) {
             flickAnimation.skipToEnd();
         }
 
-        flickAnimation = Animation.of(8)
-                .easing(EasingFunction.EASE_OUT_EXPO)
-                .deltaConsumerD(angle -> player.turn(angle, 0), 0, flickAngle / 0.15)
-                .play();
+	if (config.flickAnimationTicks != 0) {
+        	flickAnimation = Animation.of(config.flickAnimationTicks)
+                	.easing(EasingFunction.EASE_OUT_EXPO)
+                	.deltaConsumerD(angle -> player.turn(angle, 0), 0, yawTurn / 0.15)
+                	.play();
+	} else {
+		player.turn(yawTurn / 0.15, 0);
+	}
+
+	}
+
     }
 
     public void processPlayerLook(float deltaTime) {

src/main/resources/assets/controlify/lang/af_za.json

@@ -149,6 +149,8 @@
   "controlify.gui.gyro_requires_button.tooltip.off": "Always use the gyroscope.",
   "controlify.gui.flick_stick": "Flick Stick",
   "controlify.gui.flick_stick.tooltip": "Changes the behaviour of the look up/down/left/right binds to rotate the look direction 90 degrees in the respected direction upon press. This should be combined with gyro look to get the most accurate and fast aiming.",
+  "controlify.gui.flick_animation_ticks": "Flick Duration",
+  "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Milliseconds) of the animation when using the Flick Stick.",
   "controlify.gui.group.advanced": "Advanced",
   "controlify.gui.group.advanced.tooltip": "Settings you probably shouldn't touch!.",
   "controlify.gui.screen_repeat_navi_delay": "Screen Repeat Navigation Delay",

src/main/resources/assets/controlify/lang/ar_sa.json

@@ -149,6 +149,8 @@
   "controlify.gui.gyro_requires_button.tooltip.off": "Always use the gyroscope.",
   "controlify.gui.flick_stick": "Flick Stick",
   "controlify.gui.flick_stick.tooltip": "Changes the behaviour of the look up/down/left/right binds to rotate the look direction 90 degrees in the respected direction upon press. This should be combined with gyro look to get the most accurate and fast aiming.",
+  "controlify.gui.flick_animation_ticks": "Flick Duration",
+  "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Milliseconds) of the animation when using the Flick Stick.",
   "controlify.gui.group.advanced": "Advanced",
   "controlify.gui.group.advanced.tooltip": "Settings you probably shouldn't touch!.",
   "controlify.gui.screen_repeat_navi_delay": "Screen Repeat Navigation Delay",

src/main/resources/assets/controlify/lang/ca_es.json

@@ -149,6 +149,8 @@
   "controlify.gui.gyro_requires_button.tooltip.off": "Always use the gyroscope.",
   "controlify.gui.flick_stick": "Flick Stick",
   "controlify.gui.flick_stick.tooltip": "Changes the behaviour of the look up/down/left/right binds to rotate the look direction 90 degrees in the respected direction upon press. This should be combined with gyro look to get the most accurate and fast aiming.",
+  "controlify.gui.flick_animation_ticks": "Flick Duration",
+  "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Milliseconds) of the animation when using the Flick Stick.",
   "controlify.gui.group.advanced": "Advanced",
   "controlify.gui.group.advanced.tooltip": "Settings you probably shouldn't touch!.",
   "controlify.gui.screen_repeat_navi_delay": "Screen Repeat Navigation Delay",

src/main/resources/assets/controlify/lang/cs_cz.json

@@ -149,6 +149,8 @@
   "controlify.gui.gyro_requires_button.tooltip.off": "Always use the gyroscope.",
   "controlify.gui.flick_stick": "Flick Stick",
   "controlify.gui.flick_stick.tooltip": "Changes the behaviour of the look up/down/left/right binds to rotate the look direction 90 degrees in the respected direction upon press. This should be combined with gyro look to get the most accurate and fast aiming.",
+  "controlify.gui.flick_animation_ticks": "Flick Duration",
+  "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Milliseconds) of the animation when using the Flick Stick.",
   "controlify.gui.group.advanced": "Advanced",
   "controlify.gui.group.advanced.tooltip": "Settings you probably shouldn't touch!.",
   "controlify.gui.screen_repeat_navi_delay": "Screen Repeat Navigation Delay",

src/main/resources/assets/controlify/lang/da_dk.json

@@ -149,6 +149,8 @@
   "controlify.gui.gyro_requires_button.tooltip.off": "Always use the gyroscope.",
   "controlify.gui.flick_stick": "Flick Stick",
   "controlify.gui.flick_stick.tooltip": "Changes the behaviour of the look up/down/left/right binds to rotate the look direction 90 degrees in the respected direction upon press. This should be combined with gyro look to get the most accurate and fast aiming.",
+  "controlify.gui.flick_animation_ticks": "Flick Duration",
+  "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Milliseconds) of the animation when using the Flick Stick.",
   "controlify.gui.group.advanced": "Advanced",
   "controlify.gui.group.advanced.tooltip": "Settings you probably shouldn't touch!.",
   "controlify.gui.screen_repeat_navi_delay": "Screen Repeat Navigation Delay",

src/main/resources/assets/controlify/lang/de_de.json

@@ -149,6 +149,8 @@
   "controlify.gui.gyro_requires_button.tooltip.off": "Always use the gyroscope.",
   "controlify.gui.flick_stick": "Flick Stick",
   "controlify.gui.flick_stick.tooltip": "Ändert das Verhalten der hoch/runter/links/rechts Tasten zu einer 90° Drehung in die jeweilige Richtung. Dies sollte am besten zusammen mit Gyro-Steuerung verwendet werden, für akkurates und schnelles Zielen.",
+  "controlify.gui.flick_animation_ticks": "Flick Duration",
+  "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Milliseconds) of the animation when using the Flick Stick.",
   "controlify.gui.group.advanced": "Advanced",
   "controlify.gui.group.advanced.tooltip": "Einstellungen, die du besser nicht anrühren solltest.",
   "controlify.gui.screen_repeat_navi_delay": "Bildschirmeingabe Wiederholungsverzögerung",

src/main/resources/assets/controlify/lang/el_gr.json

@@ -149,6 +149,8 @@
   "controlify.gui.gyro_requires_button.tooltip.off": "Always use the gyroscope.",
   "controlify.gui.flick_stick": "Flick Stick",
   "controlify.gui.flick_stick.tooltip": "Changes the behaviour of the look up/down/left/right binds to rotate the look direction 90 degrees in the respected direction upon press. This should be combined with gyro look to get the most accurate and fast aiming.",
+  "controlify.gui.flick_animation_ticks": "Flick Duration",
+  "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Milliseconds) of the animation when using the Flick Stick.",
   "controlify.gui.group.advanced": "Advanced",
   "controlify.gui.group.advanced.tooltip": "Settings you probably shouldn't touch!.",
   "controlify.gui.screen_repeat_navi_delay": "Screen Repeat Navigation Delay",

src/main/resources/assets/controlify/lang/en_gb.json

@@ -149,6 +149,8 @@
   "controlify.gui.gyro_requires_button.tooltip.off": "Always use the gyroscope.",
   "controlify.gui.flick_stick": "Flick Stick",
   "controlify.gui.flick_stick.tooltip": "Changes the behaviour of the look up/down/left/right binds to rotate the look direction 90 degrees in the respected direction upon press. This should be combined with gyro look to get the most accurate and fast aiming.",
+  "controlify.gui.flick_animation_ticks": "Flick Duration",
+  "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Milliseconds) of the animation when using the Flick Stick.",
   "controlify.gui.group.advanced": "Advanced",
   "controlify.gui.group.advanced.tooltip": "Settings you probably shouldn't touch!.",
   "controlify.gui.screen_repeat_navi_delay": "Screen Repeat Navigation Delay",

src/main/resources/assets/controlify/lang/en_us.json

@@ -154,6 +154,8 @@
   "controlify.gui.gyro_requires_button.tooltip.off": "Always use the gyroscope.",
   "controlify.gui.flick_stick": "Flick Stick",
   "controlify.gui.flick_stick.tooltip": "Changes the behaviour of the look up/down/left/right binds to rotate the look direction 90 degrees in the respected direction upon press. This should be combined with gyro look to get the most accurate and fast aiming.",
+  "controlify.gui.flick_animation_ticks": "Flick Duration",
+  "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Milliseconds) of the animation when using the Flick Stick.",
   "controlify.gui.group.advanced": "Advanced",
   "controlify.gui.group.advanced.tooltip": "Settings you probably shouldn't touch!.",
   "controlify.gui.screen_repeat_navi_delay": "Screen Repeat Navigation Delay",

src/main/resources/assets/controlify/lang/es_es.json

@@ -149,6 +149,8 @@
   "controlify.gui.gyro_requires_button.tooltip.off": "Always use the gyroscope.",
   "controlify.gui.flick_stick": "Flick Stick",
   "controlify.gui.flick_stick.tooltip": "Changes the behaviour of the look up/down/left/right binds to rotate the look direction 90 degrees in the respected direction upon press. This should be combined with gyro look to get the most accurate and fast aiming.",
+  "controlify.gui.flick_animation_ticks": "Duración del Flick",
+  "controlify.gui.flick_animation_ticks.tooltip": "Modifica la cantidad de tiempo (en Milisegundos) que dura la animacion cuando haces flick.",
   "controlify.gui.group.advanced": "Advanced",
   "controlify.gui.group.advanced.tooltip": "Settings you probably shouldn't touch!.",
   "controlify.gui.screen_repeat_navi_delay": "Screen Repeat Navigation Delay",

src/main/resources/assets/controlify/lang/es_mx.json

@@ -149,6 +149,8 @@
   "controlify.gui.gyro_requires_button.tooltip.off": "Always use the gyroscope.",
   "controlify.gui.flick_stick": "Flick Stick",
   "controlify.gui.flick_stick.tooltip": "Cambia el comportamiento de las asignaciones de mira arriba/abajo/izquierda/derecha para rotar la dirección de mira 90 grados en la dirección correspondiente al presionar. Esto debe combinarse con la mira del giroscopio para obtener una puntería más precisa y rápida.",
+  "controlify.gui.flick_animation_ticks": "Duración del Flick",
+  "controlify.gui.flick_animation_ticks.tooltip": "Modifica la cantidad de tiempo (en Milisegundos) que dura la animacion cuando haces flick.",
   "controlify.gui.group.advanced": "Avanzado",
   "controlify.gui.group.advanced.tooltip": "¡Ajustes que probablemente no debas tocar!.",
   "controlify.gui.screen_repeat_navi_delay": "Retraso de Navegación de Repetición de Pantalla",

src/main/resources/assets/controlify/lang/fi_fi.json

@@ -149,6 +149,8 @@
   "controlify.gui.gyro_requires_button.tooltip.off": "Always use the gyroscope.",
   "controlify.gui.flick_stick": "Flick Stick",
   "controlify.gui.flick_stick.tooltip": "Changes the behaviour of the look up/down/left/right binds to rotate the look direction 90 degrees in the respected direction upon press. This should be combined with gyro look to get the most accurate and fast aiming.",
+  "controlify.gui.flick_animation_ticks": "Flick Duration",
+  "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Milliseconds) of the animation when using the Flick Stick.",
   "controlify.gui.group.advanced": "Advanced",
   "controlify.gui.group.advanced.tooltip": "Settings you probably shouldn't touch!.",
   "controlify.gui.screen_repeat_navi_delay": "Screen Repeat Navigation Delay",

src/main/resources/assets/controlify/lang/fr_fr.json

@@ -149,6 +149,8 @@
   "controlify.gui.gyro_requires_button.tooltip.off": "Always use the gyroscope.",
   "controlify.gui.flick_stick": "Flick Stick",
   "controlify.gui.flick_stick.tooltip": "Modifie le comportement des boutons vue haut/bas/gauche/droite pour faire tourner la vue à 90 degrés dans la direction appuyée.",
+  "controlify.gui.flick_animation_ticks": "Flick Duration",
+  "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Milliseconds) of the animation when using the Flick Stick.",
   "controlify.gui.group.advanced": "Avancé",
   "controlify.gui.group.advanced.tooltip": "Paramètres que vous ne devriez probablement pas modifier !",
   "controlify.gui.screen_repeat_navi_delay": "Délai de répétition de la navigation sur l'écran",

src/main/resources/assets/controlify/lang/he_il.json

@@ -149,6 +149,8 @@
   "controlify.gui.gyro_requires_button.tooltip.off": "Always use the gyroscope.",
   "controlify.gui.flick_stick": "Flick Stick",
   "controlify.gui.flick_stick.tooltip": "Changes the behaviour of the look up/down/left/right binds to rotate the look direction 90 degrees in the respected direction upon press. This should be combined with gyro look to get the most accurate and fast aiming.",
+  "controlify.gui.flick_animation_ticks": "Flick Duration",
+  "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Milliseconds) of the animation when using the Flick Stick.",
   "controlify.gui.group.advanced": "Advanced",
   "controlify.gui.group.advanced.tooltip": "Settings you probably shouldn't touch!.",
   "controlify.gui.screen_repeat_navi_delay": "Screen Repeat Navigation Delay",

src/main/resources/assets/controlify/lang/hu_hu.json

@@ -149,6 +149,8 @@
   "controlify.gui.gyro_requires_button.tooltip.off": "Mindig giroszkópos irányírás",
   "controlify.gui.flick_stick": "Flick Stick",
   "controlify.gui.flick_stick.tooltip": "Changes the behaviour of the look up/down/left/right binds to rotate the look direction 90 degrees in the respected direction upon press. This should be combined with gyro look to get the most accurate and fast aiming.",
+  "controlify.gui.flick_animation_ticks": "Flick Duration",
+  "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Milliseconds) of the animation when using the Flick Stick.",
   "controlify.gui.group.advanced": "Haladó",
   "controlify.gui.group.advanced.tooltip": "Settings you probably shouldn't touch!.",
   "controlify.gui.screen_repeat_navi_delay": "Screen Repeat Navigation Delay",

src/main/resources/assets/controlify/lang/it_it.json

@@ -149,6 +149,8 @@
   "controlify.gui.gyro_requires_button.tooltip.off": "Always use the gyroscope.",
   "controlify.gui.flick_stick": "Flick Stick",
   "controlify.gui.flick_stick.tooltip": "Modifica il comportamento dei controlli di Vista Su/Giù/Sinistra/Destra per ruotare la vista di 90 gradi nella direzione rispettiva del controllo. Questa impostazione dovrebbe essere combinata con la vista giroscopica per avere la mira più rapida e precisa.",
+  "controlify.gui.flick_animation_ticks": "Flick Duration",
+  "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Milliseconds) of the animation when using the Flick Stick.",
   "controlify.gui.group.advanced": "Avanzate",
   "controlify.gui.group.advanced.tooltip": "Impostazioni che probabilmente non dovresti toccare!",
   "controlify.gui.screen_repeat_navi_delay": "Ritardo Ripetizione Scorrimento Schermate",

src/main/resources/assets/controlify/lang/ja_jp.json

@@ -149,6 +149,8 @@
   "controlify.gui.gyro_requires_button.tooltip.off": "常にジャイロスコープを使用します",
   "controlify.gui.flick_stick": "スティックを回転",
   "controlify.gui.flick_stick.tooltip": "ルックアップ/ダウン/左/右の動作を変更し、尊重された方向で90度回転させるためにバインドします。 最も正確で迅速な照準を得るためにはジャイロ視点操作と組み合わせる必要があります",
+  "controlify.gui.flick_animation_ticks": "Flick Duration",
+  "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Milliseconds) of the animation when using the Flick Stick.",
   "controlify.gui.group.advanced": "高度な設定",
   "controlify.gui.group.advanced.tooltip": "おそらく触れてはいけない設定です！",
   "controlify.gui.screen_repeat_navi_delay": "画面リピートナビゲーション遅延",