From 92d368ca79fe7eb3a85e1d96935852ade840cc8d Mon Sep 17 00:00:00 2001 From: Sorzon <64833512+Sorzon@users.noreply.github.com> Date: Mon, 11 May 2020 19:47:17 +0200 Subject: [PATCH] Hide doLocale setting when in H24 timeunit mode. (#812) --- .../me/zeroeightsix/kami/module/modules/client/InfoOverlay.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/client/InfoOverlay.java b/src/main/java/me/zeroeightsix/kami/module/modules/client/InfoOverlay.java index cfdedead3..a2bb25561 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/client/InfoOverlay.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/client/InfoOverlay.java @@ -56,7 +56,7 @@ public class InfoOverlay extends Module { private Setting time = register(Settings.booleanBuilder("Time").withValue(true).withVisibility(v -> page.getValue().equals(Page.THREE)).build()); public Setting timeTypeSetting = register(Settings.enumBuilder(TimeUtil.TimeType.class).withName("Time Format").withValue(TimeUtil.TimeType.HHMMSS).withVisibility(v -> page.getValue().equals(Page.THREE) && time.getValue()).build()); public Setting timeUnitSetting = register(Settings.enumBuilder(TimeUtil.TimeUnit.class).withName("Time Unit").withValue(TimeUtil.TimeUnit.H12).withVisibility(v -> page.getValue().equals(Page.THREE) && time.getValue()).build()); - public Setting doLocale = register(Settings.booleanBuilder("Time Show AMPM").withValue(true).withVisibility(v -> page.getValue().equals(Page.THREE) && time.getValue()).build()); + public Setting doLocale = register(Settings.booleanBuilder("Time Show AM/PM").withValue(true).withVisibility(v -> page.getValue().equals(Page.THREE) && time.getValue() && timeUnitSetting.getValue().equals(TimeUtil.TimeUnit.H12)).build()); public Setting firstColour = register(Settings.enumBuilder(ColourTextFormatting.ColourCode.class).withName("First Colour").withValue(ColourTextFormatting.ColourCode.WHITE).withVisibility(v -> page.getValue().equals(Page.THREE)).build()); public Setting secondColour = register(Settings.enumBuilder(ColourTextFormatting.ColourCode.class).withName("Second Colour").withValue(ColourTextFormatting.ColourCode.BLUE).withVisibility(v -> page.getValue().equals(Page.THREE)).build());