Add tick times API and /mspt command
This commit is contained in:
@@ -0,0 +1,102 @@
|
||||
package io.papermc.paper.command;
|
||||
|
||||
import net.kyori.adventure.text.Component;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandSender;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import org.checkerframework.checker.nullness.qual.NonNull;
|
||||
import org.checkerframework.framework.qual.DefaultQualifier;
|
||||
|
||||
import static net.kyori.adventure.text.Component.text;
|
||||
import static net.kyori.adventure.text.format.NamedTextColor.GOLD;
|
||||
import static net.kyori.adventure.text.format.NamedTextColor.GRAY;
|
||||
import static net.kyori.adventure.text.format.NamedTextColor.GREEN;
|
||||
import static net.kyori.adventure.text.format.NamedTextColor.RED;
|
||||
import static net.kyori.adventure.text.format.NamedTextColor.YELLOW;
|
||||
|
||||
@DefaultQualifier(NonNull.class)
|
||||
public final class MSPTCommand extends Command {
|
||||
private static final DecimalFormat DF = new DecimalFormat("########0.0");
|
||||
private static final Component SLASH = text("/");
|
||||
|
||||
public MSPTCommand(final String name) {
|
||||
super(name);
|
||||
this.description = "View server tick times";
|
||||
this.usageMessage = "/mspt";
|
||||
this.setPermission("bukkit.command.mspt");
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> tabComplete(CommandSender sender, String alias, String[] args, Location location) throws IllegalArgumentException {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean execute(CommandSender sender, String commandLabel, String[] args) {
|
||||
if (!testPermission(sender)) return true;
|
||||
|
||||
MinecraftServer server = MinecraftServer.getServer();
|
||||
|
||||
List<Component> times = new ArrayList<>();
|
||||
times.addAll(eval(server.tickTimes5s.getTimes()));
|
||||
times.addAll(eval(server.tickTimes10s.getTimes()));
|
||||
times.addAll(eval(server.tickTimes60s.getTimes()));
|
||||
|
||||
sender.sendMessage(text().content("Server tick times ").color(GOLD)
|
||||
.append(text().color(YELLOW)
|
||||
.append(
|
||||
text("("),
|
||||
text("avg", GRAY),
|
||||
text("/"),
|
||||
text("min", GRAY),
|
||||
text("/"),
|
||||
text("max", GRAY),
|
||||
text(")")
|
||||
)
|
||||
).append(
|
||||
text(" from last 5s"),
|
||||
text(",", GRAY),
|
||||
text(" 10s"),
|
||||
text(",", GRAY),
|
||||
text(" 1m"),
|
||||
text(":", YELLOW)
|
||||
)
|
||||
);
|
||||
sender.sendMessage(text().content("◴ ").color(GOLD)
|
||||
.append(text().color(GRAY)
|
||||
.append(
|
||||
times.get(0), SLASH, times.get(1), SLASH, times.get(2), text(", ", YELLOW),
|
||||
times.get(3), SLASH, times.get(4), SLASH, times.get(5), text(", ", YELLOW),
|
||||
times.get(6), SLASH, times.get(7), SLASH, times.get(8)
|
||||
)
|
||||
)
|
||||
);
|
||||
return true;
|
||||
}
|
||||
|
||||
private static List<Component> eval(long[] times) {
|
||||
long min = Integer.MAX_VALUE;
|
||||
long max = 0L;
|
||||
long total = 0L;
|
||||
for (long value : times) {
|
||||
if (value > 0L && value < min) min = value;
|
||||
if (value > max) max = value;
|
||||
total += value;
|
||||
}
|
||||
double avgD = ((double) total / (double) times.length) * 1.0E-6D;
|
||||
double minD = ((double) min) * 1.0E-6D;
|
||||
double maxD = ((double) max) * 1.0E-6D;
|
||||
return Arrays.asList(getColor(avgD), getColor(minD), getColor(maxD));
|
||||
}
|
||||
|
||||
private static Component getColor(double avg) {
|
||||
return text(DF.format(avg), avg >= 50 ? RED : avg >= 40 ? YELLOW : GREEN);
|
||||
}
|
||||
}
|
||||
@@ -18,6 +18,7 @@ public final class PaperCommands {
|
||||
static {
|
||||
COMMANDS.put("paper", new PaperCommand("paper"));
|
||||
COMMANDS.put("callback", new CallbackCommand("callback"));
|
||||
COMMANDS.put("mspt", new MSPTCommand("mspt"));
|
||||
}
|
||||
|
||||
public static void registerCommands(final MinecraftServer server) {
|
||||
|
||||
@@ -2714,6 +2714,18 @@ public final class CraftServer implements Server {
|
||||
return CraftMagicNumbers.INSTANCE;
|
||||
}
|
||||
|
||||
// Paper start
|
||||
@Override
|
||||
public long[] getTickTimes() {
|
||||
return this.getServer().tickTimes5s.getTimes();
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getAverageTickTime() {
|
||||
return this.getServer().tickTimes5s.getAverage();
|
||||
}
|
||||
// Paper end
|
||||
|
||||
// Spigot start
|
||||
private final org.bukkit.Server.Spigot spigot = new org.bukkit.Server.Spigot()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user