diff --git a/src/main/java/dev/isxander/controlify/controller/gyro/GyroComponent.java b/src/main/java/dev/isxander/controlify/controller/gyro/GyroComponent.java index dc99dae9a..4292ba44b 100644 --- a/src/main/java/dev/isxander/controlify/controller/gyro/GyroComponent.java +++ b/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; diff --git a/src/main/java/dev/isxander/controlify/gui/screen/ControllerConfigScreenFactory.java b/src/main/java/dev/isxander/controlify/gui/screen/ControllerConfigScreenFactory.java index 6a5ca2e8d..2d38909e3 100644 --- a/src/main/java/dev/isxander/controlify/gui/screen/ControllerConfigScreenFactory.java +++ b/src/main/java/dev/isxander/controlify/gui/screen/ControllerConfigScreenFactory.java @@ -516,6 +516,18 @@ private Optional 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.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.createBuilder() .name(Component.translatable("controlify.gui.gyro_yaw_mode")) @@ -582,6 +594,7 @@ private Optional makeGyroGroup(ControllerEntity controller) { return opt; })); + return Optional.of(gyroGroup.build()); } diff --git a/src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java b/src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java index 84664e46c..a29bc5751 100644 --- a/src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java +++ b/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)); } @@ -380,30 +385,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) { diff --git a/src/main/resources/assets/controlify/lang/af_za.json b/src/main/resources/assets/controlify/lang/af_za.json index 24c0118c1..b16b9b793 100644 --- a/src/main/resources/assets/controlify/lang/af_za.json +++ b/src/main/resources/assets/controlify/lang/af_za.json @@ -153,6 +153,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", diff --git a/src/main/resources/assets/controlify/lang/ar_sa.json b/src/main/resources/assets/controlify/lang/ar_sa.json index 24c0118c1..b16b9b793 100644 --- a/src/main/resources/assets/controlify/lang/ar_sa.json +++ b/src/main/resources/assets/controlify/lang/ar_sa.json @@ -153,6 +153,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", diff --git a/src/main/resources/assets/controlify/lang/ca_es.json b/src/main/resources/assets/controlify/lang/ca_es.json index 24c0118c1..b16b9b793 100644 --- a/src/main/resources/assets/controlify/lang/ca_es.json +++ b/src/main/resources/assets/controlify/lang/ca_es.json @@ -153,6 +153,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", diff --git a/src/main/resources/assets/controlify/lang/cs_cz.json b/src/main/resources/assets/controlify/lang/cs_cz.json index 24c0118c1..b16b9b793 100644 --- a/src/main/resources/assets/controlify/lang/cs_cz.json +++ b/src/main/resources/assets/controlify/lang/cs_cz.json @@ -153,6 +153,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", diff --git a/src/main/resources/assets/controlify/lang/da_dk.json b/src/main/resources/assets/controlify/lang/da_dk.json index 24c0118c1..b16b9b793 100644 --- a/src/main/resources/assets/controlify/lang/da_dk.json +++ b/src/main/resources/assets/controlify/lang/da_dk.json @@ -153,6 +153,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", diff --git a/src/main/resources/assets/controlify/lang/de_de.json b/src/main/resources/assets/controlify/lang/de_de.json index 40fe01dae..4dd6ef31d 100644 --- a/src/main/resources/assets/controlify/lang/de_de.json +++ b/src/main/resources/assets/controlify/lang/de_de.json @@ -153,6 +153,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", diff --git a/src/main/resources/assets/controlify/lang/el_gr.json b/src/main/resources/assets/controlify/lang/el_gr.json index 24c0118c1..b16b9b793 100644 --- a/src/main/resources/assets/controlify/lang/el_gr.json +++ b/src/main/resources/assets/controlify/lang/el_gr.json @@ -153,6 +153,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", diff --git a/src/main/resources/assets/controlify/lang/en_gb.json b/src/main/resources/assets/controlify/lang/en_gb.json index 75a98b097..7cd3d2a62 100644 --- a/src/main/resources/assets/controlify/lang/en_gb.json +++ b/src/main/resources/assets/controlify/lang/en_gb.json @@ -153,6 +153,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", diff --git a/src/main/resources/assets/controlify/lang/en_us.json b/src/main/resources/assets/controlify/lang/en_us.json index bd277a652..8f77c5c72 100644 --- a/src/main/resources/assets/controlify/lang/en_us.json +++ b/src/main/resources/assets/controlify/lang/en_us.json @@ -156,6 +156,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", diff --git a/src/main/resources/assets/controlify/lang/es_es.json b/src/main/resources/assets/controlify/lang/es_es.json index 24c0118c1..7359938b9 100644 --- a/src/main/resources/assets/controlify/lang/es_es.json +++ b/src/main/resources/assets/controlify/lang/es_es.json @@ -153,6 +153,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", diff --git a/src/main/resources/assets/controlify/lang/es_mx.json b/src/main/resources/assets/controlify/lang/es_mx.json index d8455b5b3..76e569ab4 100644 --- a/src/main/resources/assets/controlify/lang/es_mx.json +++ b/src/main/resources/assets/controlify/lang/es_mx.json @@ -153,6 +153,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", diff --git a/src/main/resources/assets/controlify/lang/fi_fi.json b/src/main/resources/assets/controlify/lang/fi_fi.json index 24c0118c1..b16b9b793 100644 --- a/src/main/resources/assets/controlify/lang/fi_fi.json +++ b/src/main/resources/assets/controlify/lang/fi_fi.json @@ -153,6 +153,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", diff --git a/src/main/resources/assets/controlify/lang/fr_fr.json b/src/main/resources/assets/controlify/lang/fr_fr.json index 80b7e038d..e6ab2eaaf 100644 --- a/src/main/resources/assets/controlify/lang/fr_fr.json +++ b/src/main/resources/assets/controlify/lang/fr_fr.json @@ -153,6 +153,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", diff --git a/src/main/resources/assets/controlify/lang/he_il.json b/src/main/resources/assets/controlify/lang/he_il.json index 24c0118c1..b16b9b793 100644 --- a/src/main/resources/assets/controlify/lang/he_il.json +++ b/src/main/resources/assets/controlify/lang/he_il.json @@ -153,6 +153,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", diff --git a/src/main/resources/assets/controlify/lang/hu_hu.json b/src/main/resources/assets/controlify/lang/hu_hu.json index d3ce219f6..ce7bac416 100644 --- a/src/main/resources/assets/controlify/lang/hu_hu.json +++ b/src/main/resources/assets/controlify/lang/hu_hu.json @@ -153,6 +153,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", diff --git a/src/main/resources/assets/controlify/lang/it_it.json b/src/main/resources/assets/controlify/lang/it_it.json index b79936aaa..a30cdbefc 100644 --- a/src/main/resources/assets/controlify/lang/it_it.json +++ b/src/main/resources/assets/controlify/lang/it_it.json @@ -153,6 +153,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", diff --git a/src/main/resources/assets/controlify/lang/ja_jp.json b/src/main/resources/assets/controlify/lang/ja_jp.json index 61c19fcfc..173cb3621 100644 --- a/src/main/resources/assets/controlify/lang/ja_jp.json +++ b/src/main/resources/assets/controlify/lang/ja_jp.json @@ -153,6 +153,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": "画面リピートナビゲーション遅延", diff --git a/src/main/resources/assets/controlify/lang/ko_kr.json b/src/main/resources/assets/controlify/lang/ko_kr.json index 24c0118c1..b16b9b793 100644 --- a/src/main/resources/assets/controlify/lang/ko_kr.json +++ b/src/main/resources/assets/controlify/lang/ko_kr.json @@ -153,6 +153,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", diff --git a/src/main/resources/assets/controlify/lang/ms_my.json b/src/main/resources/assets/controlify/lang/ms_my.json index cbcfaca4b..001018106 100644 --- a/src/main/resources/assets/controlify/lang/ms_my.json +++ b/src/main/resources/assets/controlify/lang/ms_my.json @@ -153,6 +153,8 @@ "controlify.gui.gyro_requires_button.tooltip.off": "Sentiasa gunakan giroskop.", "controlify.gui.flick_stick": "Kuis Kayu Bedik", "controlify.gui.flick_stick.tooltip": "Mengubah tingkah laku pandangan ke atas/bawah/kiri/kanan untuk memutarkan arah pandangan 90 darjah ke arah yang dihormati apabila ditekan. Ini harus digabungkan dengan pandangan giro untuk mendapatkan sasaran yang paling tepat dan pantas.", + "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": "Lanjutan", "controlify.gui.group.advanced.tooltip": "Tetapan yang mungkin anda tidak patut sentuh!.", "controlify.gui.screen_repeat_navi_delay": "Kelewatan Navigasi Ulang Skrin", diff --git a/src/main/resources/assets/controlify/lang/nl_nl.json b/src/main/resources/assets/controlify/lang/nl_nl.json index 24c0118c1..b16b9b793 100644 --- a/src/main/resources/assets/controlify/lang/nl_nl.json +++ b/src/main/resources/assets/controlify/lang/nl_nl.json @@ -153,6 +153,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", diff --git a/src/main/resources/assets/controlify/lang/no_no.json b/src/main/resources/assets/controlify/lang/no_no.json index 24c0118c1..b16b9b793 100644 --- a/src/main/resources/assets/controlify/lang/no_no.json +++ b/src/main/resources/assets/controlify/lang/no_no.json @@ -153,6 +153,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", diff --git a/src/main/resources/assets/controlify/lang/pl_pl.json b/src/main/resources/assets/controlify/lang/pl_pl.json index 738208b2b..c8835b168 100644 --- a/src/main/resources/assets/controlify/lang/pl_pl.json +++ b/src/main/resources/assets/controlify/lang/pl_pl.json @@ -153,6 +153,8 @@ "controlify.gui.gyro_requires_button.tooltip.off": "Zawsze używaj żyroskopu.", "controlify.gui.flick_stick": "Flick Stick", "controlify.gui.flick_stick.tooltip": "Zmienia zachowanie przypisanych przycisków do patrzenia w górę/dół/lewo/prawo, aby obracać kierunek widzenia o 90 stopni w odpowiednim kierunku po naciśnięciu. Należy to łączyć z żyroskopem, aby uzyskać najdokładniejsze i najszybsze celowanie.", + "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": "Zaawansowane", "controlify.gui.group.advanced.tooltip": "Ustawienia, których prawdopodobnie nie powinieneś(aś) zmieniać!", "controlify.gui.screen_repeat_navi_delay": "Opóźnienie powtarzania nawigacji po ekranie", diff --git a/src/main/resources/assets/controlify/lang/pt_br.json b/src/main/resources/assets/controlify/lang/pt_br.json index decfa1a49..ede0def18 100644 --- a/src/main/resources/assets/controlify/lang/pt_br.json +++ b/src/main/resources/assets/controlify/lang/pt_br.json @@ -153,6 +153,8 @@ "controlify.gui.gyro_requires_button.tooltip.off": "Sempre use o giroscópio.", "controlify.gui.flick_stick": "Flick Stick", "controlify.gui.flick_stick.tooltip": "Altere o comportamento do olhar para cima/para baixo/esquerda/direita para rotacionar a direção visual de 90 graus na direção respeitada após o toque. Isto deve ser combinado com o giroscópio para obter o objetivo mais preciso e mais rápido.", + "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": "Avançado", "controlify.gui.group.advanced.tooltip": "Configurações que você provavelmente não deveria tocar!.", "controlify.gui.screen_repeat_navi_delay": "Atraso na Navegação de Repetição de Tela", diff --git a/src/main/resources/assets/controlify/lang/pt_pt.json b/src/main/resources/assets/controlify/lang/pt_pt.json index b934f5f64..c2e2f2a07 100644 --- a/src/main/resources/assets/controlify/lang/pt_pt.json +++ b/src/main/resources/assets/controlify/lang/pt_pt.json @@ -153,6 +153,8 @@ "controlify.gui.gyro_requires_button.tooltip.off": "Always use the gyroscope.", "controlify.gui.flick_stick": "Flick Stick", "controlify.gui.flick_stick.tooltip": "Altera o comportamento dos vínculos de olhar para cima/baixo/esquerda/direita para rodar a direção do olhar 90 graus na direção respeitada ao premir. Isto deve ser combinado com o olhar giroscópico para obter a mira mais precisa e rápida.", + "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": "Avançado", "controlify.gui.group.advanced.tooltip": "Definições que provavelmente não deve alterar!.", "controlify.gui.screen_repeat_navi_delay": "Atraso da repetição na navegação no ecrã", diff --git a/src/main/resources/assets/controlify/lang/ro_ro.json b/src/main/resources/assets/controlify/lang/ro_ro.json index 6da3bed8c..55d97437d 100644 --- a/src/main/resources/assets/controlify/lang/ro_ro.json +++ b/src/main/resources/assets/controlify/lang/ro_ro.json @@ -153,6 +153,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": "Avansat", "controlify.gui.group.advanced.tooltip": "Settings you probably shouldn't touch!.", "controlify.gui.screen_repeat_navi_delay": "Screen Repeat Navigation Delay", diff --git a/src/main/resources/assets/controlify/lang/ru_ru.json b/src/main/resources/assets/controlify/lang/ru_ru.json index 58c94a529..d198cfe4a 100644 --- a/src/main/resources/assets/controlify/lang/ru_ru.json +++ b/src/main/resources/assets/controlify/lang/ru_ru.json @@ -153,6 +153,8 @@ "controlify.gui.gyro_requires_button.tooltip.off": "Always use the gyroscope.", "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": "Задержка при повторе навигации по экрану", diff --git a/src/main/resources/assets/controlify/lang/sv_se.json b/src/main/resources/assets/controlify/lang/sv_se.json index 24c0118c1..b16b9b793 100644 --- a/src/main/resources/assets/controlify/lang/sv_se.json +++ b/src/main/resources/assets/controlify/lang/sv_se.json @@ -153,6 +153,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", diff --git a/src/main/resources/assets/controlify/lang/tr_tr.json b/src/main/resources/assets/controlify/lang/tr_tr.json index 03b6e823c..a1ee89658 100644 --- a/src/main/resources/assets/controlify/lang/tr_tr.json +++ b/src/main/resources/assets/controlify/lang/tr_tr.json @@ -153,6 +153,8 @@ "controlify.gui.gyro_requires_button.tooltip.off": "Her zaman jiroskopu kullan.", "controlify.gui.flick_stick": "Flick Stick", "controlify.gui.flick_stick.tooltip": "Yukarı/aşağı/sola/sağa bakış bağlantılarının davranışını, basıldığında bakış yönünü istenen yönde 90 derece döndürmek için değiştirir. Bu, en doğru ve hızlı hedeflemeyi elde etmek için gyro bakışı ile birleştirilmelidir.", + "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": "Gelişmiş", "controlify.gui.group.advanced.tooltip": "Muhtemelen dokunmamanız gereken ayarlar!.", "controlify.gui.screen_repeat_navi_delay": "Ekran Yineleme Navigasyon Gecikmesi", diff --git a/src/main/resources/assets/controlify/lang/uk_ua.json b/src/main/resources/assets/controlify/lang/uk_ua.json index 136377942..1937efa48 100644 --- a/src/main/resources/assets/controlify/lang/uk_ua.json +++ b/src/main/resources/assets/controlify/lang/uk_ua.json @@ -153,6 +153,8 @@ "controlify.gui.gyro_requires_button.tooltip.off": "Always use the gyroscope.", "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": "Затримка навігації при повторенні екрана", diff --git a/src/main/resources/assets/controlify/lang/vi_vn.json b/src/main/resources/assets/controlify/lang/vi_vn.json index 082d61627..46af39e34 100644 --- a/src/main/resources/assets/controlify/lang/vi_vn.json +++ b/src/main/resources/assets/controlify/lang/vi_vn.json @@ -153,6 +153,8 @@ "controlify.gui.gyro_requires_button.tooltip.off": "Always use the gyroscope.", "controlify.gui.flick_stick": "Thanh trượt", "controlify.gui.flick_stick.tooltip": "Thay đổi hành vi của liên kết tìm kiếm lên/xuống/trái/phải để xoay hướng nhìn 90 độ theo hướng tương ứng khi nhấn. Điều này nên được kết hợp với con quay hồi chuyển để có được mục tiêu chính xác và nhanh nhất.", + "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": "Nâng cao", "controlify.gui.group.advanced.tooltip": "Cài đặt bạn có thể không nên chạm vào!.", "controlify.gui.screen_repeat_navi_delay": "Độ trễ điều hướng lặp lại màn hình", diff --git a/src/main/resources/assets/controlify/lang/zh_cn.json b/src/main/resources/assets/controlify/lang/zh_cn.json index a9ce25db5..732512e8b 100644 --- a/src/main/resources/assets/controlify/lang/zh_cn.json +++ b/src/main/resources/assets/controlify/lang/zh_cn.json @@ -153,6 +153,8 @@ "controlify.gui.gyro_requires_button.tooltip.off": "Always use the gyroscope.", "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": "屏幕重复导航延迟", diff --git a/src/main/resources/assets/controlify/lang/zh_tw.json b/src/main/resources/assets/controlify/lang/zh_tw.json index 97cd1ce35..76817e4b7 100644 --- a/src/main/resources/assets/controlify/lang/zh_tw.json +++ b/src/main/resources/assets/controlify/lang/zh_tw.json @@ -153,6 +153,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": "螢幕重複導航延遲",