From e0d1ab43eb526d39d4af0d5ff0e61be26e897c05 Mon Sep 17 00:00:00 2001 From: wode490390 <17339354+wode490390@users.noreply.github.com> Date: Tue, 21 Jan 2020 21:40:00 +0800 Subject: [PATCH] 1.7 --- bstats-nukkit-lite/pom.xml | 2 +- bstats-nukkit-lite/src/examples/java/ExamplePlugin.java | 6 ++++-- .../src/main/java/org/bstats/nukkit/MetricsLite.java | 9 ++++++++- bstats-nukkit/pom.xml | 2 +- bstats-nukkit/src/examples/java/ExamplePlugin.java | 6 ++++-- .../src/main/java/org/bstats/nukkit/Metrics.java | 9 ++++++++- 6 files changed, 26 insertions(+), 8 deletions(-) diff --git a/bstats-nukkit-lite/pom.xml b/bstats-nukkit-lite/pom.xml index a4e92ac..cce4288 100644 --- a/bstats-nukkit-lite/pom.xml +++ b/bstats-nukkit-lite/pom.xml @@ -6,7 +6,7 @@ org.bstats bstats-nukkit-lite - 1.6 + 1.7 UTF-8 diff --git a/bstats-nukkit-lite/src/examples/java/ExamplePlugin.java b/bstats-nukkit-lite/src/examples/java/ExamplePlugin.java index 049cc59..12af47d 100644 --- a/bstats-nukkit-lite/src/examples/java/ExamplePlugin.java +++ b/bstats-nukkit-lite/src/examples/java/ExamplePlugin.java @@ -5,8 +5,10 @@ public class ExamplePlugin extends PluginBase { @Override public void onEnable() { - // All you have to do is adding this line in your onEnable method: - MetricsLite metrics = new MetricsLite(this); + // All you have to do is adding the following two lines in your onEnable method. + // You can find the plugin ids of your plugins on the page https://bstats.org/what-is-my-plugin-id + int pluginId = 1234; // <-- Replace with the id of your plugin! + MetricsLite metrics = new MetricsLite(this, pluginId); } } diff --git a/bstats-nukkit-lite/src/main/java/org/bstats/nukkit/MetricsLite.java b/bstats-nukkit-lite/src/main/java/org/bstats/nukkit/MetricsLite.java index 0082f9d..b5c8308 100644 --- a/bstats-nukkit-lite/src/main/java/org/bstats/nukkit/MetricsLite.java +++ b/bstats-nukkit-lite/src/main/java/org/bstats/nukkit/MetricsLite.java @@ -76,14 +76,20 @@ public class MetricsLite { // The plugin private final Plugin plugin; + // The plugin id + private final int pluginId; + /** * Class constructor. * * @param plugin The plugin which stats should be submitted. + * @param pluginId The id of the plugin. + * It can be found at What is my plugin id? */ - public MetricsLite(Plugin plugin) { + public MetricsLite(Plugin plugin, int pluginId) { Preconditions.checkNotNull(plugin); this.plugin = plugin; + this.pluginId = pluginId; // Get the config file File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats"); @@ -192,6 +198,7 @@ public JsonObject getPluginData() { String pluginVersion = plugin.getDescription().getVersion(); data.addProperty("pluginName", pluginName); // Append the name of the plugin + data.addProperty("id", pluginId); // Append the id of the plugin data.addProperty("pluginVersion", pluginVersion); // Append the version of the plugin JsonArray customCharts = new JsonArray(); diff --git a/bstats-nukkit/pom.xml b/bstats-nukkit/pom.xml index c2e1cef..4de5c4d 100644 --- a/bstats-nukkit/pom.xml +++ b/bstats-nukkit/pom.xml @@ -6,7 +6,7 @@ org.bstats bstats-nukkit - 1.6 + 1.7 UTF-8 diff --git a/bstats-nukkit/src/examples/java/ExamplePlugin.java b/bstats-nukkit/src/examples/java/ExamplePlugin.java index 4b007d6..67ce2e6 100644 --- a/bstats-nukkit/src/examples/java/ExamplePlugin.java +++ b/bstats-nukkit/src/examples/java/ExamplePlugin.java @@ -5,8 +5,10 @@ public class ExamplePlugin extends PluginBase { @Override public void onEnable() { - // All you have to do is adding this line in your onEnable method: - Metrics metrics = new Metrics(this); + // All you have to do is adding the following two lines in your onEnable method. + // You can find the plugin ids of your plugins on the page https://bstats.org/what-is-my-plugin-id + int pluginId = 1234; // <-- Replace with the id of your plugin! + Metrics metrics = new Metrics(this, pluginId); // Optional: Add custom charts metrics.addCustomChart(new Metrics.SimplePie("chart_id", () -> "My value")); diff --git a/bstats-nukkit/src/main/java/org/bstats/nukkit/Metrics.java b/bstats-nukkit/src/main/java/org/bstats/nukkit/Metrics.java index 1323ffa..04a7fd6 100644 --- a/bstats-nukkit/src/main/java/org/bstats/nukkit/Metrics.java +++ b/bstats-nukkit/src/main/java/org/bstats/nukkit/Metrics.java @@ -79,6 +79,9 @@ public class Metrics { // The plugin private final Plugin plugin; + // The plugin id + private final int pluginId; + // A list with all custom charts private final List charts = new ArrayList<>(); @@ -86,10 +89,13 @@ public class Metrics { * Class constructor. * * @param plugin The plugin which stats should be submitted. + * @param pluginId The id of the plugin. + * It can be found at What is my plugin id? */ - public Metrics(Plugin plugin) { + public Metrics(Plugin plugin, int pluginId) { Preconditions.checkNotNull(plugin); this.plugin = plugin; + this.pluginId = pluginId; // Get the config file File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats"); @@ -208,6 +214,7 @@ public JsonObject getPluginData() { String pluginVersion = plugin.getDescription().getVersion(); data.addProperty("pluginName", pluginName); // Append the name of the plugin + data.addProperty("id", pluginId); // Append the id of the plugin data.addProperty("pluginVersion", pluginVersion); // Append the version of the plugin JsonArray customCharts = new JsonArray();