diff options
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/debug/Debug.java | 7 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/utils/Formatters.java | 15 |
2 files changed, 18 insertions, 4 deletions
diff --git a/src/main/java/de/hysky/skyblocker/debug/Debug.java b/src/main/java/de/hysky/skyblocker/debug/Debug.java index 03b49532..7bbacbb2 100644 --- a/src/main/java/de/hysky/skyblocker/debug/Debug.java +++ b/src/main/java/de/hysky/skyblocker/debug/Debug.java @@ -47,6 +47,13 @@ public class Debug { return DEBUG_ENABLED || FabricLoader.getInstance().isDevelopmentEnvironment() || SnapshotDebug.isInSnapshot(); } + /** + * Used for checking if unit tests are being run. + */ + public static boolean isTestEnvironment() { + return Boolean.getBoolean("IS_TEST_ENV"); + } + public static boolean webSocketDebug() { return SkyblockerConfigManager.get().debug.webSocketDebug; } diff --git a/src/main/java/de/hysky/skyblocker/utils/Formatters.java b/src/main/java/de/hysky/skyblocker/utils/Formatters.java index b51d4250..58b0abe5 100644 --- a/src/main/java/de/hysky/skyblocker/utils/Formatters.java +++ b/src/main/java/de/hysky/skyblocker/utils/Formatters.java @@ -2,7 +2,7 @@ package de.hysky.skyblocker.utils; import ca.weblite.objc.Client; import com.ibm.icu.text.DateTimePatternGenerator; -import net.fabricmc.loader.api.FabricLoader; +import de.hysky.skyblocker.debug.Debug; import net.minecraft.client.MinecraftClient; import net.minecraft.util.Util; @@ -60,7 +60,7 @@ public class Formatters { * <p> * Examples: Thu Jan 30 2025 2:00:10 PM, Thu Jan 30 2025 14:00:10 */ - public static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("E MMM d yyyy " + getTimeFormat(), Locale.US).withZone(ZoneId.systemDefault()); + public static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("E MMM d yyyy " + getTimeFormat(), Locale.US).withZone(getTimeZone()); /** * Parses a number from a string. @@ -76,10 +76,17 @@ public class Formatters { } /** - * Returns the formatting for the time, always returns 12 hour in development environments for testing purposes. + * Returns the formatting for the time, always returns 12 hour in test environments. */ private static String getTimeFormat() { - return is12HourClock() || FabricLoader.getInstance().isDevelopmentEnvironment() ? "h:mm:ss a" : "HH:mm:ss"; + return is12HourClock() || Debug.isTestEnvironment() ? "h:mm:ss a" : "HH:mm:ss"; + } + + /** + * Returns the time zone to be used for date formatting, always returns UTC in test environments. + */ + private static ZoneId getTimeZone() { + return Debug.isTestEnvironment() ? ZoneId.of("UTC") : ZoneId.systemDefault(); } /** |