* Check out https://bStats.org/ to learn more about bStats!
*/
+@SuppressWarnings({"WeakerAccess", "unused"})
public class Metrics {
static {
@@ -182,14 +173,9 @@ public class Metrics {
}
// Nevertheless we want our code to run in the Bukkit main thread, so we have to use the Bukkit scheduler
// Don't be afraid! The connection to the bStats server is still async, only the stats collection is sync ;)
- Bukkit.getScheduler().runTask(plugin, new Runnable() {
- @Override
- public void run() {
- submitData();
- }
- });
+ Bukkit.getScheduler().runTask(plugin, () -> submitData());
}
- }, 1000*60*5, 1000*60*30);
+ }, 1000 * 60 * 5, 1000 * 60 * 30);
// Submit the data every 30 minutes, first time after 5 minutes to give other plugins enough time to start
// WARNING: Changing the frequency has no effect but your plugin WILL be blocked/deleted!
// WARNING: Just don't do it!
@@ -201,24 +187,24 @@ public class Metrics {
*
* @return The plugin specific data.
*/
- public JSONObject getPluginData() {
- JSONObject data = new JSONObject();
+ public JsonObject getPluginData() {
+ JsonObject data = new JsonObject();
String pluginName = plugin.getDescription().getName() + "-legacy";
String pluginVersion = plugin.getDescription().getVersion();
- data.put("pluginName", pluginName); // Append the name of the plugin
- data.put("pluginVersion", pluginVersion); // Append the version of the plugin
- JSONArray customCharts = new JSONArray();
+ data.addProperty("pluginName", pluginName); // Append the name of the plugin
+ data.addProperty("pluginVersion", pluginVersion); // Append the version of the plugin
+ JsonArray customCharts = new JsonArray();
for (CustomChart customChart : charts) {
// Add the data of the custom charts
- JSONObject chart = customChart.getRequestJsonObject();
+ JsonObject chart = customChart.getRequestJsonObject();
if (chart == null) { // If the chart is null, we skip it
continue;
}
customCharts.add(chart);
}
- data.put("customCharts", customCharts);
+ data.add("customCharts", customCharts);
return data;
}
@@ -228,7 +214,7 @@ public class Metrics {
*
* @return The server specific data.
*/
- private JSONObject getServerData() {
+ private JsonObject getServerData() {
// Minecraft specific data
int playerAmount;
try {
@@ -243,6 +229,7 @@ public class Metrics {
}
int onlineMode = Bukkit.getOnlineMode() ? 1 : 0;
String bukkitVersion = Bukkit.getVersion();
+ String bukkitName = Bukkit.getName();
// OS/Java specific data
String javaVersion = System.getProperty("java.version");
@@ -251,19 +238,20 @@ public class Metrics {
String osVersion = System.getProperty("os.version");
int coreCount = Runtime.getRuntime().availableProcessors();
- JSONObject data = new JSONObject();
+ JsonObject data = new JsonObject();
- data.put("serverUUID", serverUUID);
+ data.addProperty("serverUUID", serverUUID);
- data.put("playerAmount", playerAmount);
- data.put("onlineMode", onlineMode);
- data.put("bukkitVersion", bukkitVersion);
+ data.addProperty("playerAmount", playerAmount);
+ data.addProperty("onlineMode", onlineMode);
+ data.addProperty("bukkitVersion", bukkitVersion);
+ data.addProperty("bukkitName", bukkitName);
- data.put("javaVersion", javaVersion);
- data.put("osName", osName);
- data.put("osArch", osArch);
- data.put("osVersion", osVersion);
- data.put("coreCount", coreCount);
+ data.addProperty("javaVersion", javaVersion);
+ data.addProperty("osName", osName);
+ data.addProperty("osArch", osArch);
+ data.addProperty("osVersion", osVersion);
+ data.addProperty("coreCount", coreCount);
return data;
}
@@ -272,9 +260,9 @@ public class Metrics {
* Collects the data and sends it afterwards.
*/
private void submitData() {
- final JSONObject data = getServerData();
+ final JsonObject data = getServerData();
- JSONArray pluginData = new JSONArray();
+ JsonArray pluginData = new JsonArray();
// Search for all other bStats Metrics classes to get their plugin data
for (Class service : Bukkit.getServicesManager().getKnownServices()) {
try {
@@ -282,13 +270,33 @@ public class Metrics {
for (RegisteredServiceProvider provider : Bukkit.getServicesManager().getRegistrations(service)) {
try {
- pluginData.add(provider.getService().getMethod("getPluginData").invoke(provider.getProvider()));
+ Object plugin = provider.getService().getMethod("getPluginData").invoke(provider.getProvider());
+ if (plugin instanceof JsonObject) {
+ pluginData.add((JsonObject) plugin);
+ } else { // old bstats version compatibility
+ try {
+ Class jsonObjectJsonSimple = Class.forName("org.json.simple.JSONObject");
+ if (plugin.getClass().isAssignableFrom(jsonObjectJsonSimple)) {
+ Method jsonStringGetter = jsonObjectJsonSimple.getDeclaredMethod("toJSONString");
+ jsonStringGetter.setAccessible(true);
+ String jsonString = (String) jsonStringGetter.invoke(plugin);
+ JsonObject object = new JsonParser().parse(jsonString).getAsJsonObject();
+ pluginData.add(object);
+ }
+ } catch (ClassNotFoundException e) {
+ // minecraft version 1.14+
+ if (logFailedRequests) {
+ this.plugin.getLogger().log(Level.SEVERE, "Encountered unexpected exception", e);
+ }
+ continue; // continue looping since we cannot do any other thing.
+ }
+ }
} catch (NullPointerException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) { }
}
} catch (NoSuchFieldException ignored) { }
}
- data.put("plugins", pluginData);
+ data.add("plugins", pluginData);
// Create a new thread for the connection to the bStats server
new Thread(new Runnable() {
@@ -314,7 +322,7 @@ public class Metrics {
* @param data The data to send.
* @throws Exception If the request failed.
*/
- private static void sendData(Plugin plugin, JSONObject data) throws Exception {
+ private static void sendData(Plugin plugin, JsonObject data) throws Exception {
if (data == null) {
throw new IllegalArgumentException("Data cannot be null!");
}
@@ -372,7 +380,7 @@ public class Metrics {
}
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
GZIPOutputStream gzip = new GZIPOutputStream(outputStream);
- gzip.write(str.getBytes("UTF-8"));
+ gzip.write(str.getBytes(StandardCharsets.UTF_8));
gzip.close();
return outputStream.toByteArray();
}
@@ -397,16 +405,16 @@ public class Metrics {
this.chartId = chartId;
}
- private JSONObject getRequestJsonObject() {
- JSONObject chart = new JSONObject();
- chart.put("chartId", chartId);
+ private JsonObject getRequestJsonObject() {
+ JsonObject chart = new JsonObject();
+ chart.addProperty("chartId", chartId);
try {
- JSONObject data = getChartData();
+ JsonObject data = getChartData();
if (data == null) {
// If the data is null we don't send the chart.
return null;
}
- chart.put("data", data);
+ chart.add("data", data);
} catch (Throwable t) {
if (logFailedRequests) {
Bukkit.getLogger().log(Level.WARNING, "Failed to get data for custom chart with id " + chartId, t);
@@ -416,7 +424,7 @@ public class Metrics {
return chart;
}
- protected abstract JSONObject getChartData() throws Exception;
+ protected abstract JsonObject getChartData() throws Exception;
}
@@ -439,14 +447,14 @@ public class Metrics {
}
@Override
- protected JSONObject getChartData() throws Exception {
- JSONObject data = new JSONObject();
+ protected JsonObject getChartData() throws Exception {
+ JsonObject data = new JsonObject();
String value = callable.call();
if (value == null || value.isEmpty()) {
// Null = skip the chart
return null;
}
- data.put("value", value);
+ data.addProperty("value", value);
return data;
}
}
@@ -470,9 +478,9 @@ public class Metrics {
}
@Override
- protected JSONObject getChartData() throws Exception {
- JSONObject data = new JSONObject();
- JSONObject values = new JSONObject();
+ protected JsonObject getChartData() throws Exception {
+ JsonObject data = new JsonObject();
+ JsonObject values = new JsonObject();
Map