From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Martijn Muijsers Date: Wed, 30 Nov 2022 13:00:40 +0100 Subject: [PATCH] 5 second TPS average License: MIT (https://opensource.org/licenses/MIT) Gale - https://galemc.org This patch is based on the following patch: "Add 5 second tps average in /tps" By: William Blake Galbreath As part of: Purpur (https://github.com/PurpurMC/Purpur) Licensed under: MIT (https://opensource.org/licenses/MIT) * Purpur copyright * MIT License Copyright (c) 2019-2022 PurpurMC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java index f56c771c92194587b586f3ada344fe540cd231eb..0dd0d3e2faf82432b621bad95d5d31f7d581ef2b 100644 --- a/src/main/java/org/bukkit/Bukkit.java +++ b/src/main/java/org/bukkit/Bukkit.java @@ -2409,8 +2409,30 @@ public final class Bukkit { return server.getTPS(); } + // Gale start - Purpur - 5 second TPS average + /** + * Gets the current server TPS + * @return current server TPS (5s, 1m, 5m, 15m in Gale-Server) + */ + @NotNull + public static double[] getTPSIncluding5SecondAverage() { + return server.getTPSIncluding5SecondAverage(); + } + // Gale end - Purpur - 5 second TPS average + // Gale start - specific interval TPS API + // Gale start - Purpur - 5 second TPS average + /** + * Gets the average server TPS over the last 5 seconds + * + * @return the average server TPS over the last 5 seconds + */ + public static double get5SecondTPSAverage() { + return server.get5SecondTPSAverage(); + } + // Gale end - Purpur - 5 second TPS average + /** * Gets the average server TPS over the last 1 minute * diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java index 38fbc6e4ff6f0b08813a6a37dfcca24ec58c543f..e8346ff64783c505456cc7cd2ed91bc2b063e365 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -2060,8 +2060,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @NotNull public double[] getTPS(); + // Gale start - Purpur - 5 second TPS average + /** + * Gets the current server TPS + * + * @return current server TPS (5s, 1m, 5m, 15m in Gale-Server) + */ + @NotNull + double[] getTPSIncluding5SecondAverage(); + // Gale end - Purpur - 5 second TPS average + // Gale start - specific interval TPS API + // Gale start - Purpur - 5 second TPS average + /** + * Gets the average server TPS over the last 5 seconds + * + * @return the average server TPS over the last 5 seconds + */ + double get5SecondTPSAverage(); + // Gale end - Purpur - 5 second TPS average + /** * Gets the average server TPS over the last 1 minute *