diff --git a/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java b/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java index e67e787..01eea8f 100644 --- a/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java +++ b/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java @@ -52,7 +52,8 @@ public class MidnightControlsConfig extends MidnightConfig { @Entry(name = "midnightcontrols.menu.invert_right_y_axis") public static boolean invertRightYAxis = false; @Entry(name = "midnightcontrols.menu.invert_right_x_axis") public static boolean invertRightXAxis = false; public static double DEFAULT_MAX_VALUE = 1; - @Entry(name = "midnightcontrols.menu.right_dead_zone") public static double rotationSpeed = 40.0; + @Entry(name = "midnightcontrols.menu.rotation_speed") public static double rotationSpeed = 40.0; //used for x axis, name kept for compatability + @Entry(name = "midnightcontrols.menu.y_axis_rotation_speed") public static double yAxisRotationSpeed = 40.0; @Entry(name = "midnightcontrols.menu.mouse_speed") public static double mouseSpeed = 25.0; @Entry(name = "midnightcontrols.menu.unfocused_input") public static boolean unfocusedInput = false; @Entry(name = "midnightcontrols.menu.virtual_mouse") public static boolean virtualMouse = false; @@ -274,6 +275,7 @@ public class MidnightControlsConfig extends MidnightConfig { invertRightXAxis = false; DEFAULT_MAX_VALUE = 1; rotationSpeed = 40.0; + yAxisRotationSpeed = 40.0; mouseSpeed = 25.0; unfocusedInput = false; virtualMouse = false; diff --git a/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightInput.java b/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightInput.java index 3bc2592..d9e89fc 100644 --- a/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightInput.java +++ b/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightInput.java @@ -637,9 +637,9 @@ public class MidnightInput { double powValue = Math.pow(value, 2.0); if (axis == GLFW_GAMEPAD_AXIS_RIGHT_Y) { if (state == 2) { - this.targetPitch = -MidnightControlsConfig.getRightYAxisSign() * (MidnightControlsConfig.rotationSpeed * powValue) * 0.11D; + this.targetPitch = -MidnightControlsConfig.getRightYAxisSign() * (MidnightControlsConfig.yAxisRotationSpeed * powValue) * 0.11D; } else if (state == 1) { - this.targetPitch = MidnightControlsConfig.getRightYAxisSign() * (MidnightControlsConfig.rotationSpeed * powValue) * 0.11D; + this.targetPitch = MidnightControlsConfig.getRightYAxisSign() * (MidnightControlsConfig.yAxisRotationSpeed * powValue) * 0.11D; } } if (axis == GLFW_GAMEPAD_AXIS_RIGHT_X) { diff --git a/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsSettingsScreen.java b/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsSettingsScreen.java index a015f22..4b3b8d5 100644 --- a/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsSettingsScreen.java +++ b/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsSettingsScreen.java @@ -55,6 +55,7 @@ public class MidnightControlsSettingsScreen extends SpruceScreen { private final SpruceOption inputModeOption; private final SpruceOption autoSwitchModeOption; private final SpruceOption rotationSpeedOption; + private final SpruceOption yAxisRotationSpeedOption; private final SpruceOption mouseSpeedOption; private final SpruceOption virtualMouseOption; private final SpruceOption resetOption; @@ -172,6 +173,10 @@ public class MidnightControlsSettingsScreen extends SpruceScreen { () -> MidnightControlsConfig.rotationSpeed, value -> MidnightControlsConfig.rotationSpeed = value, option -> option.getDisplayText(Text.literal(String.valueOf(option.get()))), Text.translatable("midnightcontrols.tooltip.rotation_speed")); + this.yAxisRotationSpeedOption = new SpruceDoubleOption("midnightcontrols.menu.y_axis_rotation_speed", 0.0, 100.0, .5f, + () -> MidnightControlsConfig.yAxisRotationSpeed, + value -> MidnightControlsConfig.yAxisRotationSpeed = value, option -> option.getDisplayText(Text.literal(String.valueOf(option.get()))), + Text.translatable("midnightcontrols.tooltip.y_axis_rotation_speed")); this.mouseSpeedOption = new SpruceDoubleOption("midnightcontrols.menu.mouse_speed", 0.0, 150.0, .5f, () -> MidnightControlsConfig.mouseSpeed, value -> MidnightControlsConfig.mouseSpeed = value, option -> option.getDisplayText(Text.literal(String.valueOf(option.get()))), @@ -300,6 +305,7 @@ public class MidnightControlsSettingsScreen extends SpruceScreen { list.addSingleOptionEntry(this.inputModeOption); list.addSingleOptionEntry(this.autoSwitchModeOption); list.addSingleOptionEntry(this.rotationSpeedOption); + list.addSingleOptionEntry(this.yAxisRotationSpeedOption); list.addSingleOptionEntry(this.mouseSpeedOption); list.addSingleOptionEntry(this.virtualMouseOption); return list; diff --git a/src/main/resources/assets/midnightcontrols/lang/de_de.json b/src/main/resources/assets/midnightcontrols/lang/de_de.json index 9a71fae..2899547 100644 --- a/src/main/resources/assets/midnightcontrols/lang/de_de.json +++ b/src/main/resources/assets/midnightcontrols/lang/de_de.json @@ -112,7 +112,8 @@ "midnightcontrols.menu.reacharound.vertical": "Vertikales Umgreifen", "midnightcontrols.menu.reload_controller_mappings": "Controller-Mappings neuladen", "midnightcontrols.menu.right_dead_zone": "Rechte tote Zone", - "midnightcontrols.menu.rotation_speed": "Rotationsgeschwindigkeit", + "midnightcontrols.menu.rotation_speed": "Rotationsgeschwindigkeit (X-Achse)", + "midnightcontrols.menu.y_axis_rotation_speed": "Rotationsgeschwindigkeit (Y-Achse)", "midnightcontrols.menu.separator.controller": "Controller", "midnightcontrols.menu.separator.general": "Generell", "midnightcontrols.menu.title": "MidnightControls - Einstellungen", @@ -148,7 +149,8 @@ "midnightcontrols.tooltip.reacharound.vertical": "Aktiviert vertikales Platzieren von Blöcken, §cwird von manchen Servern als cheaten eingestuft§r.", "midnightcontrols.tooltip.reload_controller_mappings": "Lädt die Controller-Mappings neu.", "midnightcontrols.tooltip.right_dead_zone": "Die tote Zone für den rechten Analogstick.", - "midnightcontrols.tooltip.rotation_speed": "Die Kamerarotationsgeschwindigkeit im Controllermodus.", + "midnightcontrols.tooltip.rotation_speed": "Die Kamerarotationsgeschwindigkeit im Controllermodus. (X-Achse)", + "midnightcontrols.tooltip.y_axis_rotation_speed": "Die Kamerarotationsgeschwindigkeit im Controllermodus. (Y-Achse)", "midnightcontrols.tooltip.unfocused_input": "Erlaube Controllereingabe auch wenn das Fenster nicht fokussiert ist.", "midnightcontrols.tooltip.virtual_mouse": "Aktiviere die virtuelle Maus.", "midnightcontrols.virtual_mouse.skin.default_light": "Standard Hell", diff --git a/src/main/resources/assets/midnightcontrols/lang/en_us.json b/src/main/resources/assets/midnightcontrols/lang/en_us.json index 6415da8..3256143 100644 --- a/src/main/resources/assets/midnightcontrols/lang/en_us.json +++ b/src/main/resources/assets/midnightcontrols/lang/en_us.json @@ -116,7 +116,8 @@ "midnightcontrols.menu.reacharound.vertical": "Vertical Reacharound", "midnightcontrols.menu.reload_controller_mappings": "Reload Controller Mappings", "midnightcontrols.menu.right_dead_zone": "Right Dead Zone", - "midnightcontrols.menu.rotation_speed": "Rotation Speed", + "midnightcontrols.menu.rotation_speed": "X Axis Rotation Speed", + "midnightcontrols.menu.y_axis_rotation_speed": "Y Axis Rotation Speed", "midnightcontrols.menu.separator.controller": "Controller", "midnightcontrols.menu.separator.general": "General", "midnightcontrols.menu.title": "MidnightControls - Settings", @@ -152,7 +153,8 @@ "midnightcontrols.tooltip.reacharound.vertical": "Enables vertical reacharound, §cmight be considered cheating on some servers§r.", "midnightcontrols.tooltip.reload_controller_mappings": "Reloads the controller mappings file.", "midnightcontrols.tooltip.right_dead_zone": "The dead zone for the controller's right analogue stick.", - "midnightcontrols.tooltip.rotation_speed": "The camera rotation speed in controller mode.", + "midnightcontrols.tooltip.rotation_speed": "The camera X Axis rotation speed in controller mode.", + "midnightcontrols.tooltip.y_axis_rotation_speed": "The camera Y Axis rotation speed in controller mode.", "midnightcontrols.tooltip.unfocused_input": "Allow controller input when the window is not focused.", "midnightcontrols.tooltip.virtual_mouse": "Enable the virtual mouse which is handful in the case of a splitscreen.", "midnightcontrols.virtual_mouse.skin.default_light": "Default Light", diff --git a/src/main/resources/assets/midnightcontrols/lang/es_mx.json b/src/main/resources/assets/midnightcontrols/lang/es_mx.json index f61731a..b4a55cf 100644 --- a/src/main/resources/assets/midnightcontrols/lang/es_mx.json +++ b/src/main/resources/assets/midnightcontrols/lang/es_mx.json @@ -104,7 +104,8 @@ "midnightcontrols.menu.reacharound.vertical": "Alcance vertical", "midnightcontrols.menu.reload_controller_mappings": "Recargar asignaciones de controlador", "midnightcontrols.menu.right_dead_zone": "Zona muerta derecha", - "midnightcontrols.menu.rotation_speed": "Velocidad de rotación", + "midnightcontrols.menu.rotation_speed": "Velocidad de rotación (eje X)", + "midnightcontrols.menu.y_axis_rotation_speed": "Velocidad de rotación (eje Y)", "midnightcontrols.menu.separator.controller": "Controlador", "midnightcontrols.menu.separator.general": "General", "midnightcontrols.menu.title": "midnightcontrols - Configuraciones", @@ -140,7 +141,8 @@ "midnightcontrols.tooltip.reacharound.vertical": "Habilita el alcance vertical, §cpodría considerarse trampa en algunos servidores§r.", "midnightcontrols.tooltip.reload_controller_mappings": "Vuelve a cargar el archivo de asignaciones del controlador.", "midnightcontrols.tooltip.right_dead_zone": "La zona muerta de la palanca analógica derecha del controlador.", - "midnightcontrols.tooltip.rotation_speed": "La velocidad de rotación de la cámara en modo controlador.", + "midnightcontrols.tooltip.rotation_speed": "La velocidad de rotación de la cámara en modo controlador. (eje X)", + "midnightcontrols.tooltip.y_axis_rotation_speed": "La velocidad de rotación de la cámara en modo controlador. (eje Y)", "midnightcontrols.tooltip.unfocused_input": "Habilita entrada del controlador cuando la ventana no está enfocada.", "midnightcontrols.tooltip.virtual_mouse": "Habilite el ratón virtual que es útil en el caso de una pantalla dividida.", "midnightcontrols.virtual_mouse.skin.default_light": "Ligera por defecto", diff --git a/src/main/resources/assets/midnightcontrols/lang/fr_ca.json b/src/main/resources/assets/midnightcontrols/lang/fr_ca.json index d8129ad..cae89a5 100644 --- a/src/main/resources/assets/midnightcontrols/lang/fr_ca.json +++ b/src/main/resources/assets/midnightcontrols/lang/fr_ca.json @@ -104,7 +104,8 @@ "midnightcontrols.menu.reacharound.vertical": "Placement vertical", "midnightcontrols.menu.reload_controller_mappings": "Recharger les manettes", "midnightcontrols.menu.right_dead_zone": "Zone morte axe droit", - "midnightcontrols.menu.rotation_speed": "Vitesse de rotation", + "midnightcontrols.menu.rotation_speed": "Vitesse de rotation (X)", + "midnightcontrols.menu.y_axis_rotation_speed": "Vitesse de rotation (Y)", "midnightcontrols.menu.separator.general": "Général", "midnightcontrols.menu.separator.controller": "Manette", "midnightcontrols.menu.title": "midnightcontrols - Paramètres", @@ -140,7 +141,8 @@ "midnightcontrols.tooltip.reacharound.vertical": "Active le placement vertical de blocs, c'est-à-dire de blocs en dessous du bloc sur lequel vous êtes placé, §cpeut être considérer comme de la triche sur certains serveurs§r.", "midnightcontrols.tooltip.reload_controller_mappings": "Recharge le fichier de configuration des manettes.", "midnightcontrols.tooltip.right_dead_zone": "Zone morte de l'axe droit de la manette.", - "midnightcontrols.tooltip.rotation_speed": "Change la vitesse de rotation de la caméra.", + "midnightcontrols.tooltip.rotation_speed": "Change la vitesse de rotation de la caméra. (X)", + "midnightcontrols.tooltip.y_axis_rotation_speed": "Change la vitesse de rotation de la caméra. (Y)", "midnightcontrols.tooltip.unfocused_input": "Autorise les entrées manette quand la fenêtre n'est pas sélectionnée.", "midnightcontrols.tooltip.virtual_mouse": "Active la souris virtuelle qui est pratique dans le cas d'un écran partagé.", "midnightcontrols.virtual_mouse.skin.default_light": "défaut clair", diff --git a/src/main/resources/assets/midnightcontrols/lang/fr_fr.json b/src/main/resources/assets/midnightcontrols/lang/fr_fr.json index d8129ad..cae89a5 100644 --- a/src/main/resources/assets/midnightcontrols/lang/fr_fr.json +++ b/src/main/resources/assets/midnightcontrols/lang/fr_fr.json @@ -104,7 +104,8 @@ "midnightcontrols.menu.reacharound.vertical": "Placement vertical", "midnightcontrols.menu.reload_controller_mappings": "Recharger les manettes", "midnightcontrols.menu.right_dead_zone": "Zone morte axe droit", - "midnightcontrols.menu.rotation_speed": "Vitesse de rotation", + "midnightcontrols.menu.rotation_speed": "Vitesse de rotation (X)", + "midnightcontrols.menu.y_axis_rotation_speed": "Vitesse de rotation (Y)", "midnightcontrols.menu.separator.general": "Général", "midnightcontrols.menu.separator.controller": "Manette", "midnightcontrols.menu.title": "midnightcontrols - Paramètres", @@ -140,7 +141,8 @@ "midnightcontrols.tooltip.reacharound.vertical": "Active le placement vertical de blocs, c'est-à-dire de blocs en dessous du bloc sur lequel vous êtes placé, §cpeut être considérer comme de la triche sur certains serveurs§r.", "midnightcontrols.tooltip.reload_controller_mappings": "Recharge le fichier de configuration des manettes.", "midnightcontrols.tooltip.right_dead_zone": "Zone morte de l'axe droit de la manette.", - "midnightcontrols.tooltip.rotation_speed": "Change la vitesse de rotation de la caméra.", + "midnightcontrols.tooltip.rotation_speed": "Change la vitesse de rotation de la caméra. (X)", + "midnightcontrols.tooltip.y_axis_rotation_speed": "Change la vitesse de rotation de la caméra. (Y)", "midnightcontrols.tooltip.unfocused_input": "Autorise les entrées manette quand la fenêtre n'est pas sélectionnée.", "midnightcontrols.tooltip.virtual_mouse": "Active la souris virtuelle qui est pratique dans le cas d'un écran partagé.", "midnightcontrols.virtual_mouse.skin.default_light": "défaut clair", diff --git a/src/main/resources/assets/midnightcontrols/lang/tr_tr.json b/src/main/resources/assets/midnightcontrols/lang/tr_tr.json index e16c88a..a3c5fd5 100644 --- a/src/main/resources/assets/midnightcontrols/lang/tr_tr.json +++ b/src/main/resources/assets/midnightcontrols/lang/tr_tr.json @@ -98,7 +98,8 @@ "midnightcontrols.menu.reacharound.horizontal": "Alt Öne Blok Koyma", "midnightcontrols.menu.reacharound.vertical": "En Alta Blok Koyma", "midnightcontrols.menu.reload_controller_mappings": "Oyun Kolu Eşleştirmelerini Yenile", - "midnightcontrols.menu.rotation_speed": "Dönme Hızı", + "midnightcontrols.menu.rotation_speed": "Dönme Hızı (X)", + "midnightcontrols.menu.y_axis_rotation_speed": "Dönme Hızı (Y)", "midnightcontrols.menu.title": "midnightcontrols - Ayarlar", "midnightcontrols.menu.title.controller": "Oyun Kolu Seçenekleri", "midnightcontrols.menu.title.controller_controls": "Oyun Kolu Kontrolleri", @@ -124,7 +125,8 @@ "midnightcontrols.tooltip.reacharound.horizontal": "Hızlı blok koymayı etkinleştirir. §cBazı sunucular bunun hile olduğunu düşünebilir.§r.", "midnightcontrols.tooltip.reacharound.vertical": "En alta blok koymayı etkinleştirir. §cBazı sunucular bunun hile olduğunu düşünebilir.§r.", "midnightcontrols.tooltip.reload_controller_mappings": "Oyun kolu için eşleştirme dosyasını yeniler.", - "midnightcontrols.tooltip.rotation_speed": "Oyun kolu modunda olan kamera dönme hızı", + "midnightcontrols.tooltip.rotation_speed": "Oyun kolu modunda olan kamera dönme hızı (X)", + "midnightcontrols.tooltip.y_axis_rotation_speed": "Oyun kolu modunda olan kamera dönme hızı (Y)", "midnightcontrols.tooltip.unfocused_input": "Oyun penceresinde değilken oyun kolu girişine izine verir.", "midnightcontrols.tooltip.virtual_mouse": "Sanal fareyi etkinleştirir. Çift ekran oynanılacağı zaman işe yarar.", "midnightcontrols.virtual_mouse.skin.default_light": "Varsayılan Aydınlık Tema", diff --git a/src/main/resources/assets/midnightcontrols/lang/zh_cn.json b/src/main/resources/assets/midnightcontrols/lang/zh_cn.json index c04a639..1b53081 100644 --- a/src/main/resources/assets/midnightcontrols/lang/zh_cn.json +++ b/src/main/resources/assets/midnightcontrols/lang/zh_cn.json @@ -104,7 +104,8 @@ "midnightcontrols.menu.reacharound.vertical": "垂直方向方块放置辅助", "midnightcontrols.menu.reload_controller_mappings": "重新加载手柄按键映射", "midnightcontrols.menu.right_dead_zone": "右摇杆死区", - "midnightcontrols.menu.rotation_speed": "镜头旋转速度", + "midnightcontrols.menu.rotation_speed": "镜头旋转速度 (X)", + "midnightcontrols.menu.y_axis_rotation_speed": "镜头旋转速度 (Y)", "midnightcontrols.menu.separator.controller": "手柄", "midnightcontrols.menu.separator.general": "通用", "midnightcontrols.menu.title": "midnightcontrols — 设置", @@ -140,7 +141,8 @@ "midnightcontrols.tooltip.reacharound.vertical": "启用垂直方向方块放置辅助,可在脚下方块的下方放置方块。\n§c在部分服务器可能会被认定为作弊。", "midnightcontrols.tooltip.reload_controller_mappings": "重新加载手柄的按键映射文件。", "midnightcontrols.tooltip.right_dead_zone": "右摇杆配置的死区。\n死区决定摇杆要偏离中心位置多远才能让摇杆的输入有效。", - "midnightcontrols.tooltip.rotation_speed": "手柄操作模式下的镜头旋转速度。", + "midnightcontrols.tooltip.rotation_speed": "手柄操作模式下的镜头旋转速度。(X)", + "midnightcontrols.tooltip.y_axis_rotation_speed": "手柄操作模式下的镜头旋转速度。(Y)", "midnightcontrols.tooltip.unfocused_input": "即使游戏窗口处于非活动状态,也允许手柄进行按键输入。", "midnightcontrols.tooltip.virtual_mouse": "启用虚拟鼠标,在分屏的情况下很有用。", "midnightcontrols.virtual_mouse.skin.default_light": "默认样式(白色)",