From aaad9fe7d892d4d2e2e9c0748e866d4b885b6531 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20M=C3=BCller?= Date: Mon, 23 Sep 2024 19:18:19 +0200 Subject: [PATCH] show more info in technical tab view --- .../eu/mhsl/craftattack/spawn/util/text/ComponentUtil.java | 6 +++++- .../mhsl/craftattack/spawn/util/text/DataSizeConverter.java | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/eu/mhsl/craftattack/spawn/util/text/ComponentUtil.java b/src/main/java/eu/mhsl/craftattack/spawn/util/text/ComponentUtil.java index c7dc29c..613585c 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/util/text/ComponentUtil.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/util/text/ComponentUtil.java @@ -151,7 +151,11 @@ public class ComponentUtil { )) .append(Component.text(" | ", NamedTextColor.GRAY)) .append(Component.text( - String.format("%.2f load avg", monitor.getSystemLoadAverage()), + String.format( + "1min %.2f load avg (%.0f%%)", + monitor.getSystemLoadAverage(), + (monitor.getSystemLoadAverage() / monitor.getAvailableProcessors()) * 100 + ), NamedTextColor.LIGHT_PURPLE )) .append(Component.text(" | ", NamedTextColor.GRAY)) diff --git a/src/main/java/eu/mhsl/craftattack/spawn/util/text/DataSizeConverter.java b/src/main/java/eu/mhsl/craftattack/spawn/util/text/DataSizeConverter.java index 8412326..2154c3c 100644 --- a/src/main/java/eu/mhsl/craftattack/spawn/util/text/DataSizeConverter.java +++ b/src/main/java/eu/mhsl/craftattack/spawn/util/text/DataSizeConverter.java @@ -31,9 +31,11 @@ public class DataSizeConverter { long seconds = nanoseconds / 1_000_000_000; long minutes = seconds / 60; long hours = minutes / 60; + long days = hours / 24; seconds %= 60; minutes %= 60; - return String.format("%dh%dm%ds", hours, minutes, seconds); + hours %= 60; + return String.format("%dd%dh%dm%ds", days, hours, minutes, seconds); } } \ No newline at end of file