Upstream
/
ProtocolLib
mirror of https://github.com/dmulloy2/ProtocolLib.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add some more useful metrics

This commit is contained in:
Dan Mulloy 2020-01-11 13:49:36 -05:00
parent f38c393d6f
commit 7a4a285935
No known key found for this signature in database
GPG Key ID: 2B62F7DACFF133E8
2 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/comphenix/protocol/metrics/Metrics.java
View File

@ -174,10 +174,10 @@ public class Metrics {
JSONObject data = new JSONObject();
String pluginName = plugin.getDescription().getName();
Pair<String, String> pluginVersion = Statistics.splitVersion(); // ProtocolLib - remove build number
String pluginVersion = Statistics.getVersion(); // ProtocolLib - remove build number
data.put("pluginName", pluginName); // Append the name of the plugin
data.put("pluginVersion", pluginVersion.getLeft()); // Append the version of the plugin
data.put("pluginVersion", pluginVersion); // Append the version of the plugin
JSONArray customCharts = new JSONArray();
for (CustomChart customChart : charts) {
// Add the data of the custom charts

42
src/main/java/com/comphenix/protocol/metrics/Statistics.java
View File

@ -21,6 +21,9 @@ import com.comphenix.protocol.ProtocolLib;
import com.comphenix.protocol.ProtocolLibrary;
import com.comphenix.protocol.events.PacketAdapter;
import com.comphenix.protocol.events.PacketListener;
import com.comphenix.protocol.utility.Util;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.libs.org.apache.commons.lang3.tuple.Pair;
import java.io.IOException;
@ -36,22 +39,45 @@ public class Statistics {
metrics = new Metrics(plugin);
metrics.logFailedRequests(plugin.getProtocolConfig().isDebug());
// Determine who is using this library
addPluginUserGraph(metrics);
addCustomGraphs(metrics);
}
private void addPluginUserGraph(Metrics metrics) {
metrics.addCustomChart(new Metrics.AdvancedPie("Plugin Users", this::getPluginUsers));
metrics.addCustomChart(new Metrics.SimplePie("buildVersion", () -> splitVersion().getRight()));
private void addCustomGraphs(Metrics metrics) {
metrics.addCustomChart(new Metrics.AdvancedPie("pluginUsers", this::getPluginUsers));
metrics.addCustomChart(new Metrics.SimplePie("buildVersion", this::getBuildNumber));
metrics.addCustomChart(new Metrics.SimplePie("serverBrand", this::getServerBrand));
}
public static Pair<String, String> splitVersion() {
private String getServerBrand() {
// spigot doesn't overwrite the serverName, but paper does
if (!Bukkit.getServer().getName().equals("CraftBukkit")) {
return Bukkit.getServer().getName();
} else if (Util.isUsingSpigot()) {
return "Spigot";
} else {
return "CraftBukkit";
}
}
private String getBuildNumber() {
String version = ProtocolLibrary.getPlugin().getDescription().getVersion();
if (version.contains("-b")) {
String[] split = version.split("-b");
return Pair.of(split[0], split[1]);
return split[1];
} else if (!version.contains("SNAPSHOT")) {
return "Release";
} else {
return Pair.of(version, "Unknown");
return "Unknown";
}
}
public static String getVersion() {
String version = ProtocolLibrary.getPlugin().getDescription().getVersion();
if (version.contains("-b")) {
String[] split = version.split("-b");
return split[0];
} else {
return version;
}
}