From 4ab4dacf6ce2c36929d398d72b7d4e0a259434f5 Mon Sep 17 00:00:00 2001 From: Jonathing Date: Mon, 23 Dec 2024 21:57:04 -0500 Subject: [PATCH] Simplify memory usage display on loading screen (#10233) Co-authored-by: Paint_Ninja --- .../minecraftforge/fml/earlydisplay/PerformanceInfo.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/PerformanceInfo.java b/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/PerformanceInfo.java index e322fb294b..6cac12893a 100644 --- a/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/PerformanceInfo.java +++ b/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/PerformanceInfo.java @@ -13,10 +13,10 @@ import java.lang.management.MemoryMXBean; import java.lang.management.MemoryUsage; public class PerformanceInfo { + private static final MemoryMXBean MEMORY_BEAN = ManagementFactory.getMemoryMXBean(); private final boolean showCPUUsage; private final OperatingSystemMXBean osBean; - private final MemoryMXBean memoryBean; float memory; private String text; @@ -24,15 +24,14 @@ public class PerformanceInfo { PerformanceInfo() { showCPUUsage = FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SHOW_CPU); osBean = showCPUUsage ? ManagementFactory.getPlatformMXBean(OperatingSystemMXBean.class) : null; - memoryBean = ManagementFactory.getMemoryMXBean(); } void update() { - final MemoryUsage heapusage = memoryBean.getHeapMemoryUsage(); + final MemoryUsage heapusage = MEMORY_BEAN.getHeapMemoryUsage(); memory = (float) heapusage.getUsed() / heapusage.getMax(); if (!showCPUUsage) { - text = "Heap: %d/%d MB (%.1f%%) OffHeap: %d MB".formatted(heapusage.getUsed() >> 20, heapusage.getMax() >> 20, memory * 100.0, memoryBean.getNonHeapMemoryUsage().getUsed() >> 20); + text = "Memory: %d/%dMB (%.1f%%)".formatted(heapusage.getUsed() >>> 20, heapusage.getMax() >>> 20, memory * 100f); return; } @@ -44,7 +43,7 @@ public class PerformanceInfo { cpuText = "CPU: %.1f%%".formatted(cpuLoad * 100f); } - text = "Heap: %d/%d MB (%.1f%%) OffHeap: %d MB %s".formatted(heapusage.getUsed() >> 20, heapusage.getMax() >> 20, memory * 100.0, memoryBean.getNonHeapMemoryUsage().getUsed() >> 20, cpuText); + text = "Memory: %d/%dMB (%.1f%%) %s".formatted(heapusage.getUsed() >>> 20, heapusage.getMax() >>> 20, memory * 100f, cpuText); } String text() {