1.2.2 changes

brainage04 · Jan 26, 2024 · dee5e6e · dee5e6e
1 parent e2db889
commit dee5e6e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,4 +3,4 @@ org.gradle.jvmargs=-Xmx2g
 baseGroup = com.github.brainage04.togglesprint
 mcVersion = 1.8.9
 modid = togglesprint
-version = 1.2.1
+version = 1.2.2
diff --git a/src/main/kotlin/com/github/brainage04/togglesprint/config/categories/GUIElements.java b/src/main/kotlin/com/github/brainage04/togglesprint/config/categories/GUIElements.java
@@ -235,12 +235,12 @@ public static class RealTimeTracker {
         public CoreSettings coreSettings;
 
         @Expose
-        @ConfigOption(name = "24 Hour Format", desc = "Switches to 24-hour format instead of 12.")
-        @ConfigEditorDropdown(values = {"None", "12-hour", "24-hour"})
-        public int dateFormat;
+        @ConfigOption(name = "Time Format", desc = "Switches between 12 and 24 hour format. Select \"None\" to remove the time from this element.")
+        @ConfigEditorDropdown(values = {"12-hour", "24-hour", "None"})
+        public int timeFormat;
 
         @Expose
-        @ConfigOption(name = "Include Date", desc = "Appends today's date to the start of the element.")
+        @ConfigOption(name = "Include Date", desc = "Appends your computer's date to the start of the element.")
         @ConfigEditorBoolean
         public boolean includeDate;
 
@@ -249,9 +249,9 @@ public static class RealTimeTracker {
         @ConfigEditorBoolean
         public boolean includeTimezone;
 
-        public RealTimeTracker(CoreSettings coreSettings, int dateFormat, boolean includeDate, boolean includeTimezone) {
+        public RealTimeTracker(CoreSettings coreSettings, int timeFormat, boolean includeDate, boolean includeTimezone) {
             this.coreSettings = coreSettings;
-            this.dateFormat = dateFormat;
+            this.timeFormat = timeFormat;
             this.includeDate = includeDate;
             this.includeTimezone = includeTimezone;
         }

diff --git a/src/main/kotlin/com/github/brainage04/togglesprint/gui/RealTimeTracker.kt b/src/main/kotlin/com/github/brainage04/togglesprint/gui/RealTimeTracker.kt
@@ -16,9 +16,9 @@ object RealTimeTracker {
 
         if (guiElements.realTimeTracker.includeDate) textArray.add(GUIUtils.primaryChars + SimpleDateFormat("E d/M/y").format(Date()))
 
-        when (guiElements.realTimeTracker.dateFormat) {
+        when (guiElements.realTimeTracker.timeFormat) {
+            0 -> textArray.add(GUIUtils.primaryChars + SimpleDateFormat("h:mm:ss a").format(Date()))
             1 -> textArray.add(GUIUtils.primaryChars + SimpleDateFormat("HH:mm:ss").format(Date()))
-            2 -> textArray.add(GUIUtils.primaryChars + SimpleDateFormat("h:mm:ss a").format(Date()))
             else -> {}
         }