Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

More GUI work

Browse Source
This commit is contained in:
William Blake Galbreath
2020-02-01 03:34:10 -06:00
parent c7b2e77360
commit 68682cec14
3 changed files with 770 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
patches/server/0098-Add-tick-times-API.patch
View File

@@ -1,41 +1,29 @@
From fe123a5e92ad8528ba7093f834591f403525f6e9 Mon Sep 17 00:00:00 2001
From 13adbf70a09ba38f64b77b40cb5db808987850c7 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 30 Jan 2020 00:41:24 -0600
Subject: [PATCH] Add tick times API
---
.../net/pl3x/purpur/gui/info/RAMDetails.java | 13 +++----------
.../net/pl3x/purpur/gui/info/RAMDetails.java | 10 +---------
.../org/bukkit/craftbukkit/CraftServer.java | 15 +++++++++++++++
.../org/spigotmc/TicksPerSecondCommand.java | 18 +++++++++++++++++-
3 files changed, 35 insertions(+), 11 deletions(-)
3 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java b/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java
index b1ea91b49b..2981afaaaa 100644
index 00f79e4336..9fe2550a4c 100644
--- a/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java
+++ b/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java
@@ -2,6 +2,7 @@ package net.pl3x.purpur.gui.info;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.SystemUtils;
+import org.bukkit.Bukkit;
import javax.swing.DefaultListCellRenderer;
import javax.swing.JList;
@@ -13,7 +14,7 @@ import java.util.Locale;
@@ -15,7 +15,7 @@ import java.util.Locale;
import java.util.Vector;
public class RAMDetails extends JList<String> {
- private static final DecimalFormat DECIMAL_FORMAT = SystemUtils.a(new DecimalFormat("########0.000"), (format)
+ public static final DecimalFormat DECIMAL_FORMAT = SystemUtils.a(new DecimalFormat("########0.000"), (format)
-> format.setDecimalFormatSymbols(DecimalFormatSymbols.getInstance(Locale.ROOT)));
private final MinecraftServer server;
@@ -38,15 +39,7 @@ public class RAMDetails extends JList<String> {
Vector<String> vector = new Vector<>();
vector.add("Memory use: " + (graph.usedMem / 1024L / 1024L) + " mb (" + (graph.free * 100L / graph.max) + "% free)");
vector.add("Heap: " + (graph.total / 1024L / 1024L) + " / " + (graph.max / 1024L / 1024L) + " mb");
- vector.add("Avg tick: " + DECIMAL_FORMAT.format(getAverage(server.getTickTimes()) * 1.0E-6D) + " ms");
+ vector.add("Avg tick: " + DECIMAL_FORMAT.format(Bukkit.getAverageTickTime()) + " ms");
public RAMDetails() {
@@ -43,12 +43,4 @@ public class RAMDetails extends JList<String> {
vector.add("Avg tick: " + DECIMAL_FORMAT.format(Bukkit.getAverageTickTime()) + " ms");
setListData(vector);
}
-