Merge pull request #21 from Slimefun/patch/bstats-v2

Update to bStats v2

Author: TheBusyBiscuit

pom.xml

@@ -18,11 +18,6 @@
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
-
-        <repository>
-            <id>bstats-repo</id>
-            <url>https://repo.codemc.org/repository/maven-public</url>
-        </repository>
     </repositories>
 
     <dependencies>
@@ -49,7 +44,7 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>1.8</version>
+            <version>2.1.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

src/main/java/dev/walshy/sfmetrics/MetricsModule.java

@@ -6,7 +6,7 @@
 import javax.annotation.ParametersAreNonnullByDefault;
 
 import org.bstats.bukkit.Metrics;
-import org.bstats.bukkit.Metrics.CustomChart;
+import org.bstats.charts.CustomChart;
 
 import dev.walshy.sfmetrics.charts.AddonsChart;
 import dev.walshy.sfmetrics.charts.AutoUpdaterChart;

src/main/java/dev/walshy/sfmetrics/SlimefunMetricsChart.java

@@ -2,9 +2,8 @@
 
 import javax.annotation.Nonnull;
 
-import org.bstats.bukkit.Metrics.CustomChart;
-
-import com.google.gson.JsonObject;
+import org.bstats.charts.CustomChart;
+import org.bstats.json.JsonObjectBuilder;
 
 /**
  * This represents a {@link CustomChart} from Slimefun.
@@ -31,6 +30,6 @@ public interface SlimefunMetricsChart {
      * @return The data of this chart
      */
     @Nonnull
-    JsonObject getDataSample() throws Exception;
+    JsonObjectBuilder.JsonObject getDataSample() throws Exception;
 
 }

src/main/java/dev/walshy/sfmetrics/charts/AddonsChart.java

@@ -3,16 +3,17 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.bstats.bukkit.Metrics.AdvancedPie;
+import org.bstats.charts.AdvancedPie;
+import org.bstats.json.JsonObjectBuilder;
 import org.bukkit.Server;
 import org.bukkit.plugin.Plugin;
 
-import com.google.gson.JsonObject;
-
 import dev.walshy.sfmetrics.SlimefunMetricsChart;
 import io.github.thebusybiscuit.slimefun4.api.SlimefunAddon;
 import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin;
 
+import javax.annotation.Nonnull;
+
 /**
  * This {@link AdvancedPie} shows us what {@link SlimefunAddon Addons} are installed on the
  * {@link Server}.
@@ -38,13 +39,15 @@ public AddonsChart() {
         });
     }
 
+    @Nonnull
     @Override
     public String getName() {
         return "Addons";
     }
 
+    @Nonnull
     @Override
-    public JsonObject getDataSample() throws Exception {
+    public JsonObjectBuilder.JsonObject getDataSample() throws Exception {
         return getChartData();
     }
 

src/main/java/dev/walshy/sfmetrics/charts/AutoUpdaterChart.java

@@ -2,11 +2,10 @@
 
 import javax.annotation.Nonnull;
 
-import org.bstats.bukkit.Metrics.SimplePie;
+import org.bstats.charts.SimplePie;
+import org.bstats.json.JsonObjectBuilder;
 import org.bukkit.Server;
 
-import com.google.gson.JsonObject;
-
 import dev.walshy.sfmetrics.VersionDependentChart;
 import io.github.thebusybiscuit.slimefun4.api.SlimefunBranch;
 import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin;
@@ -35,13 +34,15 @@ public boolean isCompatible(@Nonnull SlimefunBranch branch, int build) {
         return branch.isOfficial();
     }
 
+    @Nonnull
     @Override
     public String getName() {
         return "Auto Updates";
     }
 
+    @Nonnull
     @Override
-    public JsonObject getDataSample() throws Exception {
+    public JsonObjectBuilder.JsonObject getDataSample() throws Exception {
         return getChartData();
     }
 

src/main/java/dev/walshy/sfmetrics/charts/CommandChart.java

@@ -3,13 +3,13 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.bstats.bukkit.Metrics.AdvancedPie;
-
-import com.google.gson.JsonObject;
-
 import dev.walshy.sfmetrics.SlimefunMetricsChart;
 import io.github.thebusybiscuit.slimefun4.core.commands.SubCommand;
 import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin;
+import org.bstats.charts.AdvancedPie;
+import org.bstats.json.JsonObjectBuilder;
+
+import javax.annotation.Nonnull;
 
 /**
  * This {@link AdvancedPie} shows us what {@link SubCommand} of Slimefun is run very often.
@@ -33,13 +33,15 @@ public CommandChart() {
         });
     }
 
+    @Nonnull
     @Override
     public String getName() {
         return "Commands";
     }
 
+    @Nonnull
     @Override
-    public JsonObject getDataSample() throws Exception {
+    public JsonObjectBuilder.JsonObject getDataSample() throws Exception {
         return getChartData();
     }
 

src/main/java/dev/walshy/sfmetrics/charts/CompatibilityModeChart.java

@@ -1,19 +1,18 @@
 package dev.walshy.sfmetrics.charts;
 
-import org.bstats.bukkit.Metrics.SimplePie;
-import org.bukkit.Server;
-
-import com.google.gson.JsonObject;
-
 import dev.walshy.sfmetrics.SlimefunMetricsChart;
 import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin;
+import org.bstats.charts.SimplePie;
+import org.bstats.json.JsonObjectBuilder;
+import org.bukkit.Server;
+
+import javax.annotation.Nonnull;
 
 /**
  * This {@link SimplePie} shows us how many {@link Server Servers} have enabled or disabled
  * backwards-compatibility.
- * 
- * @author TheBusyBiscuit
  *
+ * @author TheBusyBiscuit
  */
 public class CompatibilityModeChart extends SimplePie implements SlimefunMetricsChart {
 
@@ -24,13 +23,15 @@ public CompatibilityModeChart() {
         });
     }
 
+    @Nonnull
     @Override
     public String getName() {
         return "Compatibility Mode";
     }
 
+    @Nonnull
     @Override
-    public JsonObject getDataSample() throws Exception {
+    public JsonObjectBuilder.JsonObject getDataSample() throws Exception {
         return getChartData();
     }
 

src/main/java/dev/walshy/sfmetrics/charts/ErrorReportsChart.java

@@ -2,13 +2,11 @@
 
 import javax.annotation.Nonnull;
 
-import org.bstats.bukkit.Metrics.SingleLineChart;
-
-import com.google.gson.JsonObject;
-
 import dev.walshy.sfmetrics.VersionDependentChart;
 import io.github.thebusybiscuit.slimefun4.api.ErrorReport;
 import io.github.thebusybiscuit.slimefun4.api.SlimefunBranch;
+import org.bstats.charts.SingleLineChart;
+import org.bstats.json.JsonObjectBuilder;
 
 /**
  * This single line graph shows the amount of {@link ErrorReport ErrorReports} generated.
@@ -41,13 +39,15 @@ public boolean isCompatible(@Nonnull SlimefunBranch branch, int build) {
         }
     }
 
+    @Nonnull
     @Override
     public String getName() {
         return "Error-Reports";
     }
 
+    @Nonnull
     @Override
-    public JsonObject getDataSample() throws Exception {
+    public JsonObjectBuilder.JsonObject getDataSample() throws Exception {
         return getChartData();
     }
 

src/main/java/dev/walshy/sfmetrics/charts/IntegrationsChart.java

@@ -4,14 +4,14 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.annotation.Nonnull;
 import javax.annotation.ParametersAreNonnullByDefault;
 
-import org.bstats.bukkit.Metrics.AdvancedPie;
+import org.bstats.charts.AdvancedPie;
+import org.bstats.json.JsonObjectBuilder;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginManager;
 
-import com.google.gson.JsonObject;
-
 import dev.walshy.sfmetrics.SlimefunMetricsChart;
 import io.github.thebusybiscuit.slimefun4.implementation.SlimefunPlugin;
 
@@ -49,13 +49,15 @@ private static void findDependencies(Map<String, Integer> plugins, PluginManager
         }
     }
 
+    @Nonnull
     @Override
     public String getName() {
         return "Integrations";
     }
 
+    @Nonnull
     @Override
-    public JsonObject getDataSample() throws Exception {
+    public JsonObjectBuilder.JsonObject getDataSample() throws Exception {
         return getChartData();
     }
 

src/main/java/dev/walshy/sfmetrics/charts/MetricsAutoUpdatesChart.java

@@ -2,11 +2,10 @@
 
 import javax.annotation.Nonnull;
 
-import org.bstats.bukkit.Metrics.SimplePie;
+import org.bstats.charts.SimplePie;
+import org.bstats.json.JsonObjectBuilder;
 import org.bukkit.Server;
 
-import com.google.gson.JsonObject;
-
 import dev.walshy.sfmetrics.MetricsModule;
 import dev.walshy.sfmetrics.VersionDependentChart;
 import io.github.thebusybiscuit.slimefun4.api.SlimefunBranch;
@@ -39,13 +38,15 @@ public boolean isCompatible(@Nonnull SlimefunBranch branch, int build) {
         }
     }
 
+    @Nonnull
     @Override
     public String getName() {
         return "Metrics Auto Updates";
     }
 
+    @Nonnull
     @Override
-    public JsonObject getDataSample() throws Exception {
+    public JsonObjectBuilder.JsonObject getDataSample() throws Exception {
         return getChartData();
     }
 }