From 82066972bc42664e9983af3226c7acbc8da4cf5b Mon Sep 17 00:00:00 2001 From: Ennui Langeweile <85590273+EnnuiL@users.noreply.github.com> Date: Tue, 2 Apr 2024 18:31:56 -0300 Subject: [PATCH] Add the "Classic Zoomer" preset --- .../java/io/github/ennuil/ok_zoomer/config/ConfigEnums.java | 1 + .../ok_zoomer/config/screen/OkZoomerConfigScreen.java | 6 +++++- src/main/resources/assets/ok_zoomer/lang/en_us.json | 3 ++- src/main/resources/assets/ok_zoomer/lang/pt_br.json | 3 ++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/github/ennuil/ok_zoomer/config/ConfigEnums.java b/src/main/java/io/github/ennuil/ok_zoomer/config/ConfigEnums.java index 8bb98a35..03b9a34b 100644 --- a/src/main/java/io/github/ennuil/ok_zoomer/config/ConfigEnums.java +++ b/src/main/java/io/github/ennuil/ok_zoomer/config/ConfigEnums.java @@ -64,6 +64,7 @@ public Enum next() { public enum ZoomPresets implements ConfigEnum { DEFAULT, + CLASSIC_ZOOMER, CLASSIC, PERSISTENT, SPYGLASS; diff --git a/src/main/java/io/github/ennuil/ok_zoomer/config/screen/OkZoomerConfigScreen.java b/src/main/java/io/github/ennuil/ok_zoomer/config/screen/OkZoomerConfigScreen.java index 1ab65ef7..4d15bac9 100644 --- a/src/main/java/io/github/ennuil/ok_zoomer/config/screen/OkZoomerConfigScreen.java +++ b/src/main/java/io/github/ennuil/ok_zoomer/config/screen/OkZoomerConfigScreen.java @@ -299,7 +299,11 @@ public void resetToPreset(ZoomPresets preset) { case SPYGLASS -> 8; default -> 4; }), - Map.entry(OkZoomerConfigManager.CONFIG.values.smooth_multiplier, preset == ZoomPresets.SPYGLASS ? 0.5D : 0.75D), + Map.entry(OkZoomerConfigManager.CONFIG.values.smooth_multiplier, switch (preset) { + case CLASSIC_ZOOMER -> 0.75; + case SPYGLASS -> 0.5; + default -> 0.6; + }), Map.entry(OkZoomerConfigManager.CONFIG.values.cinematic_multiplier, 4.0D), Map.entry(OkZoomerConfigManager.CONFIG.values.minimum_linear_step, 0.125D), Map.entry(OkZoomerConfigManager.CONFIG.values.maximum_linear_step, 0.25D), diff --git a/src/main/resources/assets/ok_zoomer/lang/en_us.json b/src/main/resources/assets/ok_zoomer/lang/en_us.json index ed0d560b..ae9c6baf 100644 --- a/src/main/resources/assets/ok_zoomer/lang/en_us.json +++ b/src/main/resources/assets/ok_zoomer/lang/en_us.json @@ -83,10 +83,11 @@ "config.ok_zoomer.reset.tooltip": "Contains a way to reset this mod's settings", "config.ok_zoomer.reset.preset": "Preset", "config.ok_zoomer.reset.preset.default": "Default", + "config.ok_zoomer.reset.preset.classic_zoomer": "Classic Zoomer", "config.ok_zoomer.reset.preset.classic": "Classic", "config.ok_zoomer.reset.preset.persistent": "Persistent", "config.ok_zoomer.reset.preset.spyglass": "Spyglass", - "config.ok_zoomer.reset.preset.tooltip": "The preconfiguration which will be used after a reset.\n\"Default\" resets to the default settings.\n\"Classic\" makes the mod imitate OptiFine's zoom.\n\"Persistent\" is based on the \"Persistent\" zoom mode.\n\"Spyglass\" emulates the spyglass zoom.", + "config.ok_zoomer.reset.preset.tooltip": "The preconfiguration which will be used after a reset.\n\"Default\" resets to the default settings.\n\"Classic Zoomer\" resets to the old default settings.\n\"Classic\" makes the mod imitate OptiFine's zoom.\n\"Persistent\" is based on the \"Persistent\" zoom mode.\n\"Spyglass\" emulates the spyglass zoom.", "config.ok_zoomer.reset.reset_settings": "Reset Settings", "config.ok_zoomer.reset.reset_settings.tooltip": "Resets the settings to the preset.", "config.ok_zoomer.discard_changes": "Discard Changes", diff --git a/src/main/resources/assets/ok_zoomer/lang/pt_br.json b/src/main/resources/assets/ok_zoomer/lang/pt_br.json index ba66d348..fcc888b5 100644 --- a/src/main/resources/assets/ok_zoomer/lang/pt_br.json +++ b/src/main/resources/assets/ok_zoomer/lang/pt_br.json @@ -83,10 +83,11 @@ "config.ok_zoomer.reset.tooltip": "Contém uma maneira de redefinir as definições do mod.", "config.ok_zoomer.reset.preset": "Predefinição", "config.ok_zoomer.reset.preset.default": "Padrão", + "config.ok_zoomer.reset.preset.classic_zoomer": "Zoomer clássico", "config.ok_zoomer.reset.preset.classic": "Clássica", "config.ok_zoomer.reset.preset.persistent": "Persistente", "config.ok_zoomer.reset.preset.spyglass": "Luneta", - "config.ok_zoomer.reset.preset.tooltip": "A préconfiguração que será utilizada após a redefinição.\n\"Padrão\" reinicia para os padrões.\n\"Clássica\" faz o zoom imitar o zoom do OptiFine.\n\"Persistente\" é baseada no modo de zoom \"Persistente\".\n\"Luneta\" emula o zoom da luneta.", + "config.ok_zoomer.reset.preset.tooltip": "A préconfiguração que será utilizada após a redefinição.\n\"Padrão\" reinicia para os padrões.\n\"Zoomer clássico\" reinicia para os padrões antigos.\n\"Clássica\" faz o zoom imitar o zoom do OptiFine.\n\"Persistente\" é baseada no modo de zoom \"Persistente\".\n\"Luneta\" emula o zoom da luneta.", "config.ok_zoomer.reset.reset_settings": "Redefinir definições", "config.ok_zoomer.reset.reset_settings.tooltip": "Redefine as definições com a predefinição.", "config.ok_zoomer.discard_changes": "Descartar Mudanças",