From 898e9026c9d5781f0c83266edd064de3d5fecbf2 Mon Sep 17 00:00:00 2001 From: A D C <99991945+Lokito23@users.noreply.github.com> Date: Sat, 5 Jul 2025 04:42:07 +0100 Subject: [PATCH 01/13] YACL Test --- .../controller/gyro/GyroComponent.java | 1 + .../screen/ControllerConfigScreenFactory.java | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) 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 2e6937d20..b9c97bd67 100644 --- a/src/main/java/dev/isxander/controlify/gui/screen/ControllerConfigScreenFactory.java +++ b/src/main/java/dev/isxander/controlify/gui/screen/ControllerConfigScreenFactory.java @@ -570,6 +570,22 @@ private Optional makeGyroGroup(ControllerEntity controller) { gyroOptions.add(opt); return opt; })); + gyroGroup.option(Util.make(() -> { + var opt = Option.createBuilder() + .name(Component.literal("YACL Test")) + .description(OptionDescription.createBuilder() + .text(Component.literal("YACL Test since I don't know how it works")) + .build()) + .binding(def.flickAnimationTicks, () -> config.flickAnimationTicks, v -> config.flickAnimationTicks = v) + .controller(opt -> IntergerSliderController.create(opt) + .range(0, 32) + .step(1) + .valueFormatter(val -> Component.literal(val + " ticks"))) + .available(gyroSensitivity.pendingValue() > 0) + .build(); + gyroOptions.add(opt); + return opt; + })) return Optional.of(gyroGroup.build()); } From 403a4de1edd43ebd747b87cf847ae3f46916dcc9 Mon Sep 17 00:00:00 2001 From: A D C <99991945+Lokito23@users.noreply.github.com> Date: Sat, 5 Jul 2025 06:29:11 +0100 Subject: [PATCH 02/13] fix: missing semicolon --- .../controlify/gui/screen/ControllerConfigScreenFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b9c97bd67..cbcf4e38b 100644 --- a/src/main/java/dev/isxander/controlify/gui/screen/ControllerConfigScreenFactory.java +++ b/src/main/java/dev/isxander/controlify/gui/screen/ControllerConfigScreenFactory.java @@ -585,7 +585,7 @@ private Optional makeGyroGroup(ControllerEntity controller) { .build(); gyroOptions.add(opt); return opt; - })) + })); return Optional.of(gyroGroup.build()); } From c381e0d1c796a7254036196d1a29f83c8723b457 Mon Sep 17 00:00:00 2001 From: A D C <99991945+Lokito23@users.noreply.github.com> Date: Sat, 5 Jul 2025 22:26:39 +0100 Subject: [PATCH 03/13] fix typo: interger -> integer --- .../controlify/gui/screen/ControllerConfigScreenFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 cbcf4e38b..486281c7e 100644 --- a/src/main/java/dev/isxander/controlify/gui/screen/ControllerConfigScreenFactory.java +++ b/src/main/java/dev/isxander/controlify/gui/screen/ControllerConfigScreenFactory.java @@ -571,13 +571,13 @@ private Optional makeGyroGroup(ControllerEntity controller) { return opt; })); gyroGroup.option(Util.make(() -> { - var opt = Option.createBuilder() + var opt = Option.createBuilder() .name(Component.literal("YACL Test")) .description(OptionDescription.createBuilder() .text(Component.literal("YACL Test since I don't know how it works")) .build()) .binding(def.flickAnimationTicks, () -> config.flickAnimationTicks, v -> config.flickAnimationTicks = v) - .controller(opt -> IntergerSliderController.create(opt) + .controller(opt -> IntegerSliderController.create(opt) .range(0, 32) .step(1) .valueFormatter(val -> Component.literal(val + " ticks"))) From bc46de4985f26855fbf932c77ff6837333d43b49 Mon Sep 17 00:00:00 2001 From: A D C <99991945+Lokito23@users.noreply.github.com> Date: Sat, 5 Jul 2025 23:11:49 +0100 Subject: [PATCH 04/13] fix: getting YACL prototype to work --- .../screen/ControllerConfigScreenFactory.java | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) 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 486281c7e..b1cedbaec 100644 --- a/src/main/java/dev/isxander/controlify/gui/screen/ControllerConfigScreenFactory.java +++ b/src/main/java/dev/isxander/controlify/gui/screen/ControllerConfigScreenFactory.java @@ -505,6 +505,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.literal("YACL test")) + .description(OptionDescription.createBuilder() + .text(Component.literal("YACL test since I don't know how it works")) + .build()) + .binding(def.flickAnimationTicks, () -> config.flickAnimationTicks, v -> config.flickAnimationTicks = v) + .controller(opt -> IntegerSliderControllerBuilder.create(opt) + .range(0, 32) + .step(1) + .valueFormatter(val -> Component.literal(val + " ticks"))) + .build(); + gyroGroup.option(flickAnimationTicks); gyroGroup.option(Util.make(() -> { var option = Option.createBuilder() .name(Component.translatable("controlify.gui.gyro_yaw_mode")) @@ -570,22 +582,7 @@ private Optional makeGyroGroup(ControllerEntity controller) { gyroOptions.add(opt); return opt; })); - gyroGroup.option(Util.make(() -> { - var opt = Option.createBuilder() - .name(Component.literal("YACL Test")) - .description(OptionDescription.createBuilder() - .text(Component.literal("YACL Test since I don't know how it works")) - .build()) - .binding(def.flickAnimationTicks, () -> config.flickAnimationTicks, v -> config.flickAnimationTicks = v) - .controller(opt -> IntegerSliderController.create(opt) - .range(0, 32) - .step(1) - .valueFormatter(val -> Component.literal(val + " ticks"))) - .available(gyroSensitivity.pendingValue() > 0) - .build(); - gyroOptions.add(opt); - return opt; - })); + return Optional.of(gyroGroup.build()); } From 652ab8330b771388478d5536fe612a29e5abd30c Mon Sep 17 00:00:00 2001 From: A D C <99991945+Lokito23@users.noreply.github.com> Date: Sat, 5 Jul 2025 23:41:28 +0100 Subject: [PATCH 05/13] feat: add translation support --- .../gui/screen/ControllerConfigScreenFactory.java | 6 +++--- src/main/resources/assets/controlify/lang/af_za.json | 2 ++ src/main/resources/assets/controlify/lang/ar_sa.json | 2 ++ src/main/resources/assets/controlify/lang/ca_es.json | 2 ++ src/main/resources/assets/controlify/lang/cs_cz.json | 2 ++ src/main/resources/assets/controlify/lang/da_dk.json | 2 ++ src/main/resources/assets/controlify/lang/de_de.json | 2 ++ src/main/resources/assets/controlify/lang/el_gr.json | 2 ++ src/main/resources/assets/controlify/lang/en_gb.json | 2 ++ src/main/resources/assets/controlify/lang/en_us.json | 2 ++ src/main/resources/assets/controlify/lang/es_es.json | 2 ++ src/main/resources/assets/controlify/lang/es_mx.json | 2 ++ src/main/resources/assets/controlify/lang/fi_fi.json | 2 ++ src/main/resources/assets/controlify/lang/fr_fr.json | 2 ++ src/main/resources/assets/controlify/lang/he_il.json | 2 ++ src/main/resources/assets/controlify/lang/hu_hu.json | 2 ++ src/main/resources/assets/controlify/lang/it_it.json | 2 ++ src/main/resources/assets/controlify/lang/ja_jp.json | 2 ++ src/main/resources/assets/controlify/lang/ko_kr.json | 2 ++ src/main/resources/assets/controlify/lang/ms_my.json | 2 ++ src/main/resources/assets/controlify/lang/nl_nl.json | 2 ++ src/main/resources/assets/controlify/lang/no_no.json | 2 ++ src/main/resources/assets/controlify/lang/pl_pl.json | 2 ++ src/main/resources/assets/controlify/lang/pt_br.json | 2 ++ src/main/resources/assets/controlify/lang/pt_pt.json | 2 ++ src/main/resources/assets/controlify/lang/ro_ro.json | 2 ++ src/main/resources/assets/controlify/lang/ru_ru.json | 2 ++ src/main/resources/assets/controlify/lang/sv_se.json | 2 ++ src/main/resources/assets/controlify/lang/tr_tr.json | 2 ++ src/main/resources/assets/controlify/lang/uk_ua.json | 2 ++ src/main/resources/assets/controlify/lang/vi_vn.json | 2 ++ src/main/resources/assets/controlify/lang/zh_cn.json | 2 ++ src/main/resources/assets/controlify/lang/zh_tw.json | 2 ++ 33 files changed, 67 insertions(+), 3 deletions(-) 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 b1cedbaec..63128b6eb 100644 --- a/src/main/java/dev/isxander/controlify/gui/screen/ControllerConfigScreenFactory.java +++ b/src/main/java/dev/isxander/controlify/gui/screen/ControllerConfigScreenFactory.java @@ -506,15 +506,15 @@ private Optional makeGyroGroup(ControllerEntity controller) { .build(); gyroGroup.option(relativeModeOpt); var flickAnimationTicks = Option.createBuilder() - .name(Component.literal("YACL test")) + .name(Component.translatable("controlify.gui.flick_animation_ticks")) .description(OptionDescription.createBuilder() - .text(Component.literal("YACL test since I don't know how it works")) + .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) - .valueFormatter(val -> Component.literal(val + " ticks"))) + .valueFormatter(val -> Component.literal(val + " Ticks"))) .build(); gyroGroup.option(flickAnimationTicks); gyroGroup.option(Util.make(() -> { diff --git a/src/main/resources/assets/controlify/lang/af_za.json b/src/main/resources/assets/controlify/lang/af_za.json index 2c5c99644..c730449d4 100644 --- a/src/main/resources/assets/controlify/lang/af_za.json +++ b/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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 2c5c99644..c730449d4 100644 --- a/src/main/resources/assets/controlify/lang/ar_sa.json +++ b/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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 2c5c99644..c730449d4 100644 --- a/src/main/resources/assets/controlify/lang/ca_es.json +++ b/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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 2c5c99644..c730449d4 100644 --- a/src/main/resources/assets/controlify/lang/cs_cz.json +++ b/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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 2c5c99644..c730449d4 100644 --- a/src/main/resources/assets/controlify/lang/da_dk.json +++ b/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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 b7217b349..247e7e645 100644 --- a/src/main/resources/assets/controlify/lang/de_de.json +++ b/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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 2c5c99644..c730449d4 100644 --- a/src/main/resources/assets/controlify/lang/el_gr.json +++ b/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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 1effa8e33..61a34cf69 100644 --- a/src/main/resources/assets/controlify/lang/en_gb.json +++ b/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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 f31dbbb94..ee8b3bc6c 100644 --- a/src/main/resources/assets/controlify/lang/en_us.json +++ b/src/main/resources/assets/controlify/lang/en_us.json @@ -152,6 +152,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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 2c5c99644..9c2781c6d 100644 --- a/src/main/resources/assets/controlify/lang/es_es.json +++ b/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 Ticks) que dura la animacion cuando haces flick. \nSi esta en 0, se deshabilitara la animación.", "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 af5886ff5..48f97f6a5 100644 --- a/src/main/resources/assets/controlify/lang/es_mx.json +++ b/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 Ticks) que dura la animacion cuando haces flick. \nSi esta en 0, se deshabilitara la animación.", "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 2c5c99644..c730449d4 100644 --- a/src/main/resources/assets/controlify/lang/fi_fi.json +++ b/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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 f835ea791..32f50f236 100644 --- a/src/main/resources/assets/controlify/lang/fr_fr.json +++ b/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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 2c5c99644..c730449d4 100644 --- a/src/main/resources/assets/controlify/lang/he_il.json +++ b/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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 e9b1a7434..15e64ef66 100644 --- a/src/main/resources/assets/controlify/lang/hu_hu.json +++ b/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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 d6315950a..a7156fe98 100644 --- a/src/main/resources/assets/controlify/lang/it_it.json +++ b/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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 17c26a47c..81e02c369 100644 --- a/src/main/resources/assets/controlify/lang/ja_jp.json +++ b/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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 2c5c99644..c730449d4 100644 --- a/src/main/resources/assets/controlify/lang/ko_kr.json +++ b/src/main/resources/assets/controlify/lang/ko_kr.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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 eb016189e..7b98a552c 100644 --- a/src/main/resources/assets/controlify/lang/ms_my.json +++ b/src/main/resources/assets/controlify/lang/ms_my.json @@ -149,6 +149,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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 2c5c99644..c730449d4 100644 --- a/src/main/resources/assets/controlify/lang/nl_nl.json +++ b/src/main/resources/assets/controlify/lang/nl_nl.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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 2c5c99644..c730449d4 100644 --- a/src/main/resources/assets/controlify/lang/no_no.json +++ b/src/main/resources/assets/controlify/lang/no_no.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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 93fa90ed9..e5a0e8b09 100644 --- a/src/main/resources/assets/controlify/lang/pl_pl.json +++ b/src/main/resources/assets/controlify/lang/pl_pl.json @@ -149,6 +149,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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 7f006a01f..3c8e59bb9 100644 --- a/src/main/resources/assets/controlify/lang/pt_br.json +++ b/src/main/resources/assets/controlify/lang/pt_br.json @@ -149,6 +149,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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 e41d70d31..f2a21dfaa 100644 --- a/src/main/resources/assets/controlify/lang/pt_pt.json +++ b/src/main/resources/assets/controlify/lang/pt_pt.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": "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 510a13cdf..ba191568c 100644 --- a/src/main/resources/assets/controlify/lang/ro_ro.json +++ b/src/main/resources/assets/controlify/lang/ro_ro.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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 36e38fd09..4909a377c 100644 --- a/src/main/resources/assets/controlify/lang/ru_ru.json +++ b/src/main/resources/assets/controlify/lang/ru_ru.json @@ -149,6 +149,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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 2c5c99644..c730449d4 100644 --- a/src/main/resources/assets/controlify/lang/sv_se.json +++ b/src/main/resources/assets/controlify/lang/sv_se.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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 de9c80721..cd18f1088 100644 --- a/src/main/resources/assets/controlify/lang/tr_tr.json +++ b/src/main/resources/assets/controlify/lang/tr_tr.json @@ -149,6 +149,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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 dbf9030e7..59877e807 100644 --- a/src/main/resources/assets/controlify/lang/uk_ua.json +++ b/src/main/resources/assets/controlify/lang/uk_ua.json @@ -149,6 +149,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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 277907f4c..6f88b90a2 100644 --- a/src/main/resources/assets/controlify/lang/vi_vn.json +++ b/src/main/resources/assets/controlify/lang/vi_vn.json @@ -149,6 +149,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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 2d0080a8e..945d1b390 100644 --- a/src/main/resources/assets/controlify/lang/zh_cn.json +++ b/src/main/resources/assets/controlify/lang/zh_cn.json @@ -149,6 +149,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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "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 decf4d7f7..29166008b 100644 --- a/src/main/resources/assets/controlify/lang/zh_tw.json +++ b/src/main/resources/assets/controlify/lang/zh_tw.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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", "controlify.gui.group.advanced": "進階", "controlify.gui.group.advanced.tooltip": "你可能不應該調整的設定！", "controlify.gui.screen_repeat_navi_delay": "螢幕重複導航延遲", From 165b1357bee6c7d22e78708c009ffbb1752f2187 Mon Sep 17 00:00:00 2001 From: A D C <99991945+Lokito23@users.noreply.github.com> Date: Sun, 6 Jul 2025 00:18:12 +0100 Subject: [PATCH 06/13] feat: implement configurable animation time --- .../gui/screen/ControllerConfigScreenFactory.java | 2 +- .../isxander/controlify/ingame/InGameInputHandler.java | 8 +++++--- src/main/resources/assets/controlify/lang/af_za.json | 2 +- src/main/resources/assets/controlify/lang/ar_sa.json | 2 +- src/main/resources/assets/controlify/lang/ca_es.json | 2 +- src/main/resources/assets/controlify/lang/cs_cz.json | 2 +- src/main/resources/assets/controlify/lang/da_dk.json | 2 +- src/main/resources/assets/controlify/lang/de_de.json | 2 +- src/main/resources/assets/controlify/lang/el_gr.json | 2 +- src/main/resources/assets/controlify/lang/en_gb.json | 2 +- src/main/resources/assets/controlify/lang/en_us.json | 2 +- src/main/resources/assets/controlify/lang/es_es.json | 2 +- src/main/resources/assets/controlify/lang/es_mx.json | 2 +- src/main/resources/assets/controlify/lang/fi_fi.json | 2 +- src/main/resources/assets/controlify/lang/fr_fr.json | 2 +- src/main/resources/assets/controlify/lang/he_il.json | 2 +- src/main/resources/assets/controlify/lang/hu_hu.json | 2 +- src/main/resources/assets/controlify/lang/it_it.json | 2 +- src/main/resources/assets/controlify/lang/ja_jp.json | 2 +- src/main/resources/assets/controlify/lang/ko_kr.json | 2 +- src/main/resources/assets/controlify/lang/ms_my.json | 2 +- src/main/resources/assets/controlify/lang/nl_nl.json | 2 +- src/main/resources/assets/controlify/lang/no_no.json | 2 +- src/main/resources/assets/controlify/lang/pl_pl.json | 2 +- src/main/resources/assets/controlify/lang/pt_br.json | 2 +- src/main/resources/assets/controlify/lang/pt_pt.json | 2 +- src/main/resources/assets/controlify/lang/ro_ro.json | 2 +- src/main/resources/assets/controlify/lang/ru_ru.json | 2 +- src/main/resources/assets/controlify/lang/sv_se.json | 2 +- src/main/resources/assets/controlify/lang/tr_tr.json | 2 +- src/main/resources/assets/controlify/lang/uk_ua.json | 2 +- src/main/resources/assets/controlify/lang/vi_vn.json | 2 +- src/main/resources/assets/controlify/lang/zh_cn.json | 2 +- src/main/resources/assets/controlify/lang/zh_tw.json | 2 +- 34 files changed, 38 insertions(+), 36 deletions(-) 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 63128b6eb..5c3ede61b 100644 --- a/src/main/java/dev/isxander/controlify/gui/screen/ControllerConfigScreenFactory.java +++ b/src/main/java/dev/isxander/controlify/gui/screen/ControllerConfigScreenFactory.java @@ -512,7 +512,7 @@ private Optional makeGyroGroup(ControllerEntity controller) { .build()) .binding(def.flickAnimationTicks, () -> config.flickAnimationTicks, v -> config.flickAnimationTicks = v) .controller(opt -> IntegerSliderControllerBuilder.create(opt) - .range(0, 32) + .range(1, 32) .step(1) .valueFormatter(val -> Component.literal(val + " Ticks"))) .build(); diff --git a/src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java b/src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java index 76e9c28ea..e4b5576fc 100644 --- a/src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java +++ b/src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java @@ -282,7 +282,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,7 +379,9 @@ 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() @@ -399,7 +401,7 @@ protected void handleFlickStick(LocalPlayer player) { flickAnimation.skipToEnd(); } - flickAnimation = Animation.of(8) + flickAnimation = Animation.of(config.flickAnimationTicks) .easing(EasingFunction.EASE_OUT_EXPO) .deltaConsumerD(angle -> player.turn(angle, 0), 0, flickAngle / 0.15) .play(); diff --git a/src/main/resources/assets/controlify/lang/af_za.json b/src/main/resources/assets/controlify/lang/af_za.json index c730449d4..97bba6493 100644 --- a/src/main/resources/assets/controlify/lang/af_za.json +++ b/src/main/resources/assets/controlify/lang/af_za.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 c730449d4..97bba6493 100644 --- a/src/main/resources/assets/controlify/lang/ar_sa.json +++ b/src/main/resources/assets/controlify/lang/ar_sa.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 c730449d4..97bba6493 100644 --- a/src/main/resources/assets/controlify/lang/ca_es.json +++ b/src/main/resources/assets/controlify/lang/ca_es.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 c730449d4..97bba6493 100644 --- a/src/main/resources/assets/controlify/lang/cs_cz.json +++ b/src/main/resources/assets/controlify/lang/cs_cz.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 c730449d4..97bba6493 100644 --- a/src/main/resources/assets/controlify/lang/da_dk.json +++ b/src/main/resources/assets/controlify/lang/da_dk.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 247e7e645..8a34dbc47 100644 --- a/src/main/resources/assets/controlify/lang/de_de.json +++ b/src/main/resources/assets/controlify/lang/de_de.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 c730449d4..97bba6493 100644 --- a/src/main/resources/assets/controlify/lang/el_gr.json +++ b/src/main/resources/assets/controlify/lang/el_gr.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 61a34cf69..6016f392f 100644 --- a/src/main/resources/assets/controlify/lang/en_gb.json +++ b/src/main/resources/assets/controlify/lang/en_gb.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 ee8b3bc6c..de5375deb 100644 --- a/src/main/resources/assets/controlify/lang/en_us.json +++ b/src/main/resources/assets/controlify/lang/en_us.json @@ -153,7 +153,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 9c2781c6d..888ead7a9 100644 --- a/src/main/resources/assets/controlify/lang/es_es.json +++ b/src/main/resources/assets/controlify/lang/es_es.json @@ -150,7 +150,7 @@ "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 Ticks) que dura la animacion cuando haces flick. \nSi esta en 0, se deshabilitara la animación.", + "controlify.gui.flick_animation_ticks.tooltip": "Modifica la cantidad de tiempo (en Ticks) que dura la animacion cuando haces flick. \nSi esta en 1, se deshabilitara la animación.", "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 48f97f6a5..c0d6ee238 100644 --- a/src/main/resources/assets/controlify/lang/es_mx.json +++ b/src/main/resources/assets/controlify/lang/es_mx.json @@ -150,7 +150,7 @@ "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 Ticks) que dura la animacion cuando haces flick. \nSi esta en 0, se deshabilitara la animación.", + "controlify.gui.flick_animation_ticks.tooltip": "Modifica la cantidad de tiempo (en Ticks) que dura la animacion cuando haces flick. \nSi esta en 1, se deshabilitara la animación.", "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 c730449d4..97bba6493 100644 --- a/src/main/resources/assets/controlify/lang/fi_fi.json +++ b/src/main/resources/assets/controlify/lang/fi_fi.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 32f50f236..28de78920 100644 --- a/src/main/resources/assets/controlify/lang/fr_fr.json +++ b/src/main/resources/assets/controlify/lang/fr_fr.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 c730449d4..97bba6493 100644 --- a/src/main/resources/assets/controlify/lang/he_il.json +++ b/src/main/resources/assets/controlify/lang/he_il.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 15e64ef66..6d9251610 100644 --- a/src/main/resources/assets/controlify/lang/hu_hu.json +++ b/src/main/resources/assets/controlify/lang/hu_hu.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 a7156fe98..b1549dff3 100644 --- a/src/main/resources/assets/controlify/lang/it_it.json +++ b/src/main/resources/assets/controlify/lang/it_it.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 81e02c369..ab161bbd5 100644 --- a/src/main/resources/assets/controlify/lang/ja_jp.json +++ b/src/main/resources/assets/controlify/lang/ja_jp.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 c730449d4..97bba6493 100644 --- a/src/main/resources/assets/controlify/lang/ko_kr.json +++ b/src/main/resources/assets/controlify/lang/ko_kr.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 7b98a552c..32cd40e05 100644 --- a/src/main/resources/assets/controlify/lang/ms_my.json +++ b/src/main/resources/assets/controlify/lang/ms_my.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 c730449d4..97bba6493 100644 --- a/src/main/resources/assets/controlify/lang/nl_nl.json +++ b/src/main/resources/assets/controlify/lang/nl_nl.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 c730449d4..97bba6493 100644 --- a/src/main/resources/assets/controlify/lang/no_no.json +++ b/src/main/resources/assets/controlify/lang/no_no.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 e5a0e8b09..7a6628109 100644 --- a/src/main/resources/assets/controlify/lang/pl_pl.json +++ b/src/main/resources/assets/controlify/lang/pl_pl.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 3c8e59bb9..2447f39dd 100644 --- a/src/main/resources/assets/controlify/lang/pt_br.json +++ b/src/main/resources/assets/controlify/lang/pt_br.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 f2a21dfaa..46145f6fd 100644 --- a/src/main/resources/assets/controlify/lang/pt_pt.json +++ b/src/main/resources/assets/controlify/lang/pt_pt.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 ba191568c..485abf98a 100644 --- a/src/main/resources/assets/controlify/lang/ro_ro.json +++ b/src/main/resources/assets/controlify/lang/ro_ro.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 4909a377c..cc748626e 100644 --- a/src/main/resources/assets/controlify/lang/ru_ru.json +++ b/src/main/resources/assets/controlify/lang/ru_ru.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 c730449d4..97bba6493 100644 --- a/src/main/resources/assets/controlify/lang/sv_se.json +++ b/src/main/resources/assets/controlify/lang/sv_se.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 cd18f1088..34ce7cbeb 100644 --- a/src/main/resources/assets/controlify/lang/tr_tr.json +++ b/src/main/resources/assets/controlify/lang/tr_tr.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 59877e807..ab528f531 100644 --- a/src/main/resources/assets/controlify/lang/uk_ua.json +++ b/src/main/resources/assets/controlify/lang/uk_ua.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 6f88b90a2..025b56285 100644 --- a/src/main/resources/assets/controlify/lang/vi_vn.json +++ b/src/main/resources/assets/controlify/lang/vi_vn.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 945d1b390..2ee6c7510 100644 --- a/src/main/resources/assets/controlify/lang/zh_cn.json +++ b/src/main/resources/assets/controlify/lang/zh_cn.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "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 29166008b..ece69ae56 100644 --- a/src/main/resources/assets/controlify/lang/zh_tw.json +++ b/src/main/resources/assets/controlify/lang/zh_tw.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 0, it will disable the animation.", + "controlify.gui.flick_animation_ticks.tooltip": "Changes the amount of time (in Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", "controlify.gui.group.advanced": "進階", "controlify.gui.group.advanced.tooltip": "你可能不應該調整的設定！", "controlify.gui.screen_repeat_navi_delay": "螢幕重複導航延遲", From a0ce706b2d4f520a5bad6f5b4201dd35c7585daa Mon Sep 17 00:00:00 2001 From: A D C <99991945+Lokito23@users.noreply.github.com> Date: Sun, 6 Jul 2025 21:41:09 +0100 Subject: [PATCH 07/13] feat: upgrade formatting and implement ticksToMillis to the flickAnimationTicks --- .../controlify/gui/screen/ControllerConfigScreenFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 5c3ede61b..28b04ec49 100644 --- a/src/main/java/dev/isxander/controlify/gui/screen/ControllerConfigScreenFactory.java +++ b/src/main/java/dev/isxander/controlify/gui/screen/ControllerConfigScreenFactory.java @@ -512,9 +512,9 @@ private Optional makeGyroGroup(ControllerEntity controller) { .build()) .binding(def.flickAnimationTicks, () -> config.flickAnimationTicks, v -> config.flickAnimationTicks = v) .controller(opt -> IntegerSliderControllerBuilder.create(opt) - .range(1, 32) + .range(0, 32) .step(1) - .valueFormatter(val -> Component.literal(val + " Ticks"))) + .formatValue(v -> v == 0 ? CommonComponents.OPTION_OFF : ticksToMillisFormatter.format(v))) .build(); gyroGroup.option(flickAnimationTicks); gyroGroup.option(Util.make(() -> { From 8f981ad9a44eda95c3ea746472cd536d957ac7ec Mon Sep 17 00:00:00 2001 From: A D C <99991945+Lokito23@users.noreply.github.com> Date: Sun, 6 Jul 2025 21:55:12 +0100 Subject: [PATCH 08/13] feat: implement the animation disabler --- .../controlify/ingame/InGameInputHandler.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java b/src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java index e4b5576fc..dfa580ac4 100644 --- a/src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java +++ b/src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java @@ -401,10 +401,15 @@ protected void handleFlickStick(GyroComponent gyro, LocalPlayer player) { flickAnimation.skipToEnd(); } - flickAnimation = Animation.of(config.flickAnimationTicks) - .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, flickAngle / 0.15) + .play(); + } else { + player.turn(flickAngle / 0.15, 0); + } + } public void processPlayerLook(float deltaTime) { From 44c6108a2b7f4ece1f4745275cd8121307022202 Mon Sep 17 00:00:00 2001 From: A D C <99991945+Lokito23@users.noreply.github.com> Date: Sun, 6 Jul 2025 22:17:39 +0100 Subject: [PATCH 09/13] update the translation strings to reflect milliseconds instead of ticks --- src/main/resources/assets/controlify/lang/af_za.json | 2 +- src/main/resources/assets/controlify/lang/ar_sa.json | 2 +- src/main/resources/assets/controlify/lang/ca_es.json | 2 +- src/main/resources/assets/controlify/lang/cs_cz.json | 2 +- src/main/resources/assets/controlify/lang/da_dk.json | 2 +- src/main/resources/assets/controlify/lang/de_de.json | 2 +- src/main/resources/assets/controlify/lang/el_gr.json | 2 +- src/main/resources/assets/controlify/lang/en_gb.json | 2 +- src/main/resources/assets/controlify/lang/en_us.json | 2 +- src/main/resources/assets/controlify/lang/es_es.json | 2 +- src/main/resources/assets/controlify/lang/es_mx.json | 2 +- src/main/resources/assets/controlify/lang/fi_fi.json | 2 +- src/main/resources/assets/controlify/lang/fr_fr.json | 2 +- src/main/resources/assets/controlify/lang/he_il.json | 2 +- src/main/resources/assets/controlify/lang/hu_hu.json | 2 +- src/main/resources/assets/controlify/lang/it_it.json | 2 +- src/main/resources/assets/controlify/lang/ja_jp.json | 2 +- src/main/resources/assets/controlify/lang/ko_kr.json | 2 +- src/main/resources/assets/controlify/lang/ms_my.json | 2 +- src/main/resources/assets/controlify/lang/nl_nl.json | 2 +- src/main/resources/assets/controlify/lang/no_no.json | 2 +- src/main/resources/assets/controlify/lang/pl_pl.json | 2 +- src/main/resources/assets/controlify/lang/pt_br.json | 2 +- src/main/resources/assets/controlify/lang/pt_pt.json | 2 +- src/main/resources/assets/controlify/lang/ro_ro.json | 2 +- src/main/resources/assets/controlify/lang/ru_ru.json | 2 +- src/main/resources/assets/controlify/lang/sv_se.json | 2 +- src/main/resources/assets/controlify/lang/tr_tr.json | 2 +- src/main/resources/assets/controlify/lang/uk_ua.json | 2 +- src/main/resources/assets/controlify/lang/vi_vn.json | 2 +- src/main/resources/assets/controlify/lang/zh_cn.json | 2 +- src/main/resources/assets/controlify/lang/zh_tw.json | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/main/resources/assets/controlify/lang/af_za.json b/src/main/resources/assets/controlify/lang/af_za.json index 97bba6493..4859e8070 100644 --- a/src/main/resources/assets/controlify/lang/af_za.json +++ b/src/main/resources/assets/controlify/lang/af_za.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 97bba6493..4859e8070 100644 --- a/src/main/resources/assets/controlify/lang/ar_sa.json +++ b/src/main/resources/assets/controlify/lang/ar_sa.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 97bba6493..4859e8070 100644 --- a/src/main/resources/assets/controlify/lang/ca_es.json +++ b/src/main/resources/assets/controlify/lang/ca_es.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 97bba6493..4859e8070 100644 --- a/src/main/resources/assets/controlify/lang/cs_cz.json +++ b/src/main/resources/assets/controlify/lang/cs_cz.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 97bba6493..4859e8070 100644 --- a/src/main/resources/assets/controlify/lang/da_dk.json +++ b/src/main/resources/assets/controlify/lang/da_dk.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 8a34dbc47..3f89064bf 100644 --- a/src/main/resources/assets/controlify/lang/de_de.json +++ b/src/main/resources/assets/controlify/lang/de_de.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 97bba6493..4859e8070 100644 --- a/src/main/resources/assets/controlify/lang/el_gr.json +++ b/src/main/resources/assets/controlify/lang/el_gr.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 6016f392f..a01348aef 100644 --- a/src/main/resources/assets/controlify/lang/en_gb.json +++ b/src/main/resources/assets/controlify/lang/en_gb.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 de5375deb..37e9c11c4 100644 --- a/src/main/resources/assets/controlify/lang/en_us.json +++ b/src/main/resources/assets/controlify/lang/en_us.json @@ -153,7 +153,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 888ead7a9..1e6cc988f 100644 --- a/src/main/resources/assets/controlify/lang/es_es.json +++ b/src/main/resources/assets/controlify/lang/es_es.json @@ -150,7 +150,7 @@ "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 Ticks) que dura la animacion cuando haces flick. \nSi esta en 1, se deshabilitara la animación.", + "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 c0d6ee238..a88a813fd 100644 --- a/src/main/resources/assets/controlify/lang/es_mx.json +++ b/src/main/resources/assets/controlify/lang/es_mx.json @@ -150,7 +150,7 @@ "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 Ticks) que dura la animacion cuando haces flick. \nSi esta en 1, se deshabilitara la animación.", + "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 97bba6493..4859e8070 100644 --- a/src/main/resources/assets/controlify/lang/fi_fi.json +++ b/src/main/resources/assets/controlify/lang/fi_fi.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 28de78920..e4b0c1b87 100644 --- a/src/main/resources/assets/controlify/lang/fr_fr.json +++ b/src/main/resources/assets/controlify/lang/fr_fr.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 97bba6493..4859e8070 100644 --- a/src/main/resources/assets/controlify/lang/he_il.json +++ b/src/main/resources/assets/controlify/lang/he_il.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 6d9251610..65972aa2d 100644 --- a/src/main/resources/assets/controlify/lang/hu_hu.json +++ b/src/main/resources/assets/controlify/lang/hu_hu.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 b1549dff3..8816828b0 100644 --- a/src/main/resources/assets/controlify/lang/it_it.json +++ b/src/main/resources/assets/controlify/lang/it_it.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 ab161bbd5..09e391c65 100644 --- a/src/main/resources/assets/controlify/lang/ja_jp.json +++ b/src/main/resources/assets/controlify/lang/ja_jp.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 97bba6493..4859e8070 100644 --- a/src/main/resources/assets/controlify/lang/ko_kr.json +++ b/src/main/resources/assets/controlify/lang/ko_kr.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 32cd40e05..5b3e7c91c 100644 --- a/src/main/resources/assets/controlify/lang/ms_my.json +++ b/src/main/resources/assets/controlify/lang/ms_my.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 97bba6493..4859e8070 100644 --- a/src/main/resources/assets/controlify/lang/nl_nl.json +++ b/src/main/resources/assets/controlify/lang/nl_nl.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 97bba6493..4859e8070 100644 --- a/src/main/resources/assets/controlify/lang/no_no.json +++ b/src/main/resources/assets/controlify/lang/no_no.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 7a6628109..1b56189e5 100644 --- a/src/main/resources/assets/controlify/lang/pl_pl.json +++ b/src/main/resources/assets/controlify/lang/pl_pl.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 2447f39dd..8ed465e32 100644 --- a/src/main/resources/assets/controlify/lang/pt_br.json +++ b/src/main/resources/assets/controlify/lang/pt_br.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 46145f6fd..c4508cb93 100644 --- a/src/main/resources/assets/controlify/lang/pt_pt.json +++ b/src/main/resources/assets/controlify/lang/pt_pt.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 485abf98a..e8cd5cb74 100644 --- a/src/main/resources/assets/controlify/lang/ro_ro.json +++ b/src/main/resources/assets/controlify/lang/ro_ro.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 cc748626e..57107a76d 100644 --- a/src/main/resources/assets/controlify/lang/ru_ru.json +++ b/src/main/resources/assets/controlify/lang/ru_ru.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 97bba6493..4859e8070 100644 --- a/src/main/resources/assets/controlify/lang/sv_se.json +++ b/src/main/resources/assets/controlify/lang/sv_se.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 34ce7cbeb..e3574d0b9 100644 --- a/src/main/resources/assets/controlify/lang/tr_tr.json +++ b/src/main/resources/assets/controlify/lang/tr_tr.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 ab528f531..13370219e 100644 --- a/src/main/resources/assets/controlify/lang/uk_ua.json +++ b/src/main/resources/assets/controlify/lang/uk_ua.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 025b56285..b490ed118 100644 --- a/src/main/resources/assets/controlify/lang/vi_vn.json +++ b/src/main/resources/assets/controlify/lang/vi_vn.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 2ee6c7510..112370866 100644 --- a/src/main/resources/assets/controlify/lang/zh_cn.json +++ b/src/main/resources/assets/controlify/lang/zh_cn.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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 ece69ae56..27f47d453 100644 --- a/src/main/resources/assets/controlify/lang/zh_tw.json +++ b/src/main/resources/assets/controlify/lang/zh_tw.json @@ -150,7 +150,7 @@ "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 Ticks) of the animation when using the Flick Stick. \nIf set to 1, it will disable the animation.", + "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": "螢幕重複導航延遲", From 325f21286222a04e6da47891a901888be46b1f6a Mon Sep 17 00:00:00 2001 From: A D C <99991945+Lokito23@users.noreply.github.com> Date: Thu, 10 Jul 2025 19:59:41 +0100 Subject: [PATCH 10/13] implementation plan for the upgraded flick stick --- .../controlify/ingame/InGameInputHandler.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java b/src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java index dfa580ac4..2e23779bd 100644 --- a/src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java +++ b/src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java @@ -387,8 +387,24 @@ protected void handleFlickStick(GyroComponent gyro, LocalPlayer player) { float x = ControlifyBindings.LOOK_RIGHT.on(controller).analogueNow() - ControlifyBindings.LOOK_LEFT.on(controller).analogueNow(); + // TODO: Find a way to obtain the camera's yRot. + /* + if (!ControlifyBindings.LOOK_DOWN.on(controller).digitalNow() + && !ControlifyBindings.LOOK_UP.on(controller).digitalNow() + && !ControlifyBindings.LOOK_LEFT.on(controller).digitalNow() + && !ControlifyBindings.LOOK_RIGHT.on(controller).digitalNow() + ) { + float yawOrigin = yRot; // Probably needs to be declared outside this function for it to persist. + } + + float yawCurrent = yRot; + */ + float flickAngle = Mth.wrapDegrees((float) Mth.atan2(y, x) * Mth.RAD_TO_DEG + 90f); + // yawTurn = flickAngle - (yawCurrent - yawOrigin); + + // TODO: Remove this block once it's properly implemented. if (!ControlifyBindings.LOOK_DOWN.on(controller).justPressed() && !ControlifyBindings.LOOK_UP.on(controller).justPressed() && !ControlifyBindings.LOOK_LEFT.on(controller).justPressed() @@ -401,6 +417,8 @@ protected void handleFlickStick(GyroComponent gyro, LocalPlayer player) { flickAnimation.skipToEnd(); } + + // TODO: Replace flickAngle with yawTurn once it's properly implemented if (config.flickAnimationTicks != 0) { flickAnimation = Animation.of(config.flickAnimationTicks) .easing(EasingFunction.EASE_OUT_EXPO) From ffb3e3ec7cbcecc9cb03d4897bf3a9b0e71a03a4 Mon Sep 17 00:00:00 2001 From: A D C <99991945+Lokito23@users.noreply.github.com> Date: Wed, 23 Jul 2025 09:11:20 +0100 Subject: [PATCH 11/13] remove the planning of the old method --- .../controlify/ingame/InGameInputHandler.java | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java b/src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java index 2e23779bd..dfa580ac4 100644 --- a/src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java +++ b/src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java @@ -387,24 +387,8 @@ protected void handleFlickStick(GyroComponent gyro, LocalPlayer player) { float x = ControlifyBindings.LOOK_RIGHT.on(controller).analogueNow() - ControlifyBindings.LOOK_LEFT.on(controller).analogueNow(); - // TODO: Find a way to obtain the camera's yRot. - /* - if (!ControlifyBindings.LOOK_DOWN.on(controller).digitalNow() - && !ControlifyBindings.LOOK_UP.on(controller).digitalNow() - && !ControlifyBindings.LOOK_LEFT.on(controller).digitalNow() - && !ControlifyBindings.LOOK_RIGHT.on(controller).digitalNow() - ) { - float yawOrigin = yRot; // Probably needs to be declared outside this function for it to persist. - } - - float yawCurrent = yRot; - */ - float flickAngle = Mth.wrapDegrees((float) Mth.atan2(y, x) * Mth.RAD_TO_DEG + 90f); - // yawTurn = flickAngle - (yawCurrent - yawOrigin); - - // TODO: Remove this block once it's properly implemented. if (!ControlifyBindings.LOOK_DOWN.on(controller).justPressed() && !ControlifyBindings.LOOK_UP.on(controller).justPressed() && !ControlifyBindings.LOOK_LEFT.on(controller).justPressed() @@ -417,8 +401,6 @@ protected void handleFlickStick(GyroComponent gyro, LocalPlayer player) { flickAnimation.skipToEnd(); } - - // TODO: Replace flickAngle with yawTurn once it's properly implemented if (config.flickAnimationTicks != 0) { flickAnimation = Animation.of(config.flickAnimationTicks) .easing(EasingFunction.EASE_OUT_EXPO) From dee13de892b334094599abc088d9857cbcf43939 Mon Sep 17 00:00:00 2001 From: A D C <99991945+Lokito23@users.noreply.github.com> Date: Sun, 27 Jul 2025 04:33:09 +0100 Subject: [PATCH 12/13] create new implementation plan --- .../controlify/ingame/InGameInputHandler.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java b/src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java index dfa580ac4..55f96b043 100644 --- a/src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java +++ b/src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java @@ -49,6 +49,7 @@ public class InGameInputHandler { private boolean gyroToggledOn; private boolean wasAiming; private Animation flickAnimation; + // private float yawOrigin // TODO: Uncomment this once it get's implemented private boolean shouldShowPlayerList; @@ -387,8 +388,20 @@ protected void handleFlickStick(GyroComponent gyro, LocalPlayer player) { float x = ControlifyBindings.LOOK_RIGHT.on(controller).analogueNow() - ControlifyBindings.LOOK_LEFT.on(controller).analogueNow(); + // TODO: Find a way to obtain the camera's yRot + /* + if (y == 0f && x == 0f) { + yawOrigin = yRot; + } else { + + float yawCurrent = yRot; + */ + float flickAngle = Mth.wrapDegrees((float) Mth.atan2(y, x) * Mth.RAD_TO_DEG + 90f); + // float yawTurn = Mth.wrapDegrees((float) (yawOrigin + flickAngle) - yawCurrent); + + // TODO: Remove this block once this is properly implemented if (!ControlifyBindings.LOOK_DOWN.on(controller).justPressed() && !ControlifyBindings.LOOK_UP.on(controller).justPressed() && !ControlifyBindings.LOOK_LEFT.on(controller).justPressed() @@ -401,6 +414,7 @@ protected void handleFlickStick(GyroComponent gyro, LocalPlayer player) { flickAnimation.skipToEnd(); } + // TODO: Replace flickAngle with yawTurn once this is properly implemented if (config.flickAnimationTicks != 0) { flickAnimation = Animation.of(config.flickAnimationTicks) .easing(EasingFunction.EASE_OUT_EXPO) From 594ab5d9a474d6245a88a45f35ee8e17592eaf8e Mon Sep 17 00:00:00 2001 From: A D C <99991945+Lokito23@users.noreply.github.com> Date: Sun, 27 Jul 2025 19:15:01 +0100 Subject: [PATCH 13/13] feat: implement steam input-like flick stick --- .../controlify/ingame/InGameInputHandler.java | 31 +++++++------------ 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java b/src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java index 55f96b043..1fcf92fb6 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,13 +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 // TODO: Uncomment this once it get's implemented + private float yawOrigin; private boolean shouldShowPlayerList; @@ -62,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); @@ -388,40 +392,29 @@ protected void handleFlickStick(GyroComponent gyro, LocalPlayer player) { float x = ControlifyBindings.LOOK_RIGHT.on(controller).analogueNow() - ControlifyBindings.LOOK_LEFT.on(controller).analogueNow(); - // TODO: Find a way to obtain the camera's yRot - /* if (y == 0f && x == 0f) { - yawOrigin = yRot; + yawOrigin = camera.getYRot(); } else { - float yawCurrent = yRot; - */ + float yawCurrent = camera.getYRot(); float flickAngle = Mth.wrapDegrees((float) Mth.atan2(y, x) * Mth.RAD_TO_DEG + 90f); - // float yawTurn = Mth.wrapDegrees((float) (yawOrigin + flickAngle) - yawCurrent); - - // TODO: Remove this block once this is properly implemented - 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(); } - // TODO: Replace flickAngle with yawTurn once this is properly implemented if (config.flickAnimationTicks != 0) { flickAnimation = Animation.of(config.flickAnimationTicks) .easing(EasingFunction.EASE_OUT_EXPO) - .deltaConsumerD(angle -> player.turn(angle, 0), 0, flickAngle / 0.15) + .deltaConsumerD(angle -> player.turn(angle, 0), 0, yawTurn / 0.15) .play(); } else { - player.turn(flickAngle / 0.15, 0); + player.turn(yawTurn / 0.15, 0); + } + } }