Added bStats to pom, added metrics for Bungee and Sponge

Plan/dependency-reduced-pom.xml

@@ -87,6 +87,10 @@
                 <exclude>org.slf4j.Logger</exclude>
               </excludes>
             </relocation>
+              <relocation>
+                  <pattern>org.bstats</pattern>
+                  <shadedPattern>com.djrapitops.plan.utilities.metrics</shadedPattern>
+              </relocation>
           </relocations>
         </configuration>
       </plugin>
@@ -146,8 +150,12 @@
       <url>https://repo.spongepowered.org/maven</url>
     </repository>
       <repository>
-          <id>md_5-releases</id>
+          <id>md_5-snapshots</id>
-          <url>http://repo.md-5.net/content/repositories/releases/</url>
+          <url>http://repo.md-5.net/content/repositories/snapshots/</url>
+      </repository>
+      <repository>
+          <id>bstats-repo</id>
+          <url>http://repo.bstats.org/content/repositories/releases/</url>
       </repository>
   </repositories>
   <dependencies>
@@ -354,7 +362,7 @@
       <dependency>
           <groupId>com.imaginarycode.minecraft</groupId>
           <artifactId>RedisBungee</artifactId>
-          <version>RELEASE</version>
+          <version>0.3.8-SNAPSHOT</version>
           <scope>provided</scope>
       </dependency>
     <dependency>
@@ -380,7 +388,7 @@
     <dependency>
       <groupId>org.xerial</groupId>
       <artifactId>sqlite-jdbc</artifactId>
-      <version>3.21.0.1</version>
+        <version>3.23.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Plan/pom.xml

@@ -26,8 +26,13 @@
         </repository>
         <!--        RedisBungee Repository -->
         <repository>
-            <id>md_5-releases</id>
+            <id>md_5-snapshots</id>
-            <url>http://repo.md-5.net/content/repositories/releases/</url>
+            <url>http://repo.md-5.net/content/repositories/snapshots/</url>
+        </repository>
+        <!--        Metrics -->
+        <repository>
+            <id>bstats-repo</id>
+            <url>http://repo.bstats.org/content/repositories/releases/</url>
         </repository>
     </repositories>
 
@@ -86,7 +91,7 @@
         <dependency>
             <groupId>com.imaginarycode.minecraft</groupId>
             <artifactId>RedisBungee</artifactId>
-            <version>RELEASE</version>
+            <version>0.3.8-SNAPSHOT</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
@@ -117,6 +122,23 @@
             <version>2.9.0</version>
         </dependency>
 
+        <!--        Metrics -->
+        <dependency>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-bukkit</artifactId>
+            <version>1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-bungeecord</artifactId>
+            <version>1.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-sponge</artifactId>
+            <version>1.2</version>
+        </dependency>
+
         <!-- Mockito (Test Dependency) -->
         <dependency>
             <groupId>org.mockito</groupId>
@@ -230,6 +252,10 @@
                                 <exclude>org.slf4j.Logger</exclude>
                             </excludes>
                         </relocation>
+                        <relocation>
+                            <pattern>org.bstats</pattern>
+                            <shadedPattern>com.djrapitops.plan.utilities.metrics</shadedPattern>
+                        </relocation>
                     </relocations>
                 </configuration>
             </plugin>

Plan/src/main/java/com/djrapitops/plan/Plan.java

@@ -27,7 +27,7 @@ import com.djrapitops.plan.system.locale.lang.PluginLang;
 import com.djrapitops.plan.system.processing.importing.ImporterManager;
 import com.djrapitops.plan.system.processing.importing.importers.OfflinePlayerImporter;
 import com.djrapitops.plan.system.settings.theme.PlanColorScheme;
-import com.djrapitops.plan.utilities.metrics.BStats;
+import com.djrapitops.plan.utilities.metrics.BStatsBukkit;
 import com.djrapitops.plugin.BukkitPlugin;
 import com.djrapitops.plugin.StaticHolder;
 import com.djrapitops.plugin.api.Benchmark;
@@ -70,8 +70,7 @@ public class Plan extends BukkitPlugin implements PlanPlugin {
 
             ImporterManager.registerImporter(new OfflinePlayerImporter());
 
-            BStats bStats = new BStats(this);
+            new BStatsBukkit(this).registerMetrics();
-            bStats.registerMetrics();
 
             Log.debug("Verbose debug messages are enabled.");
             Benchmark.stop("Enable", "Enable");

Plan/src/main/java/com/djrapitops/plan/PlanBungee.java

@@ -10,6 +10,7 @@ import com.djrapitops.plan.system.BungeeSystem;
 import com.djrapitops.plan.system.locale.Locale;
 import com.djrapitops.plan.system.locale.lang.PluginLang;
 import com.djrapitops.plan.system.settings.theme.PlanColorScheme;
+import com.djrapitops.plan.utilities.metrics.BStatsBungee;
 import com.djrapitops.plugin.BungeePlugin;
 import com.djrapitops.plugin.StaticHolder;
 import com.djrapitops.plugin.api.Benchmark;
@@ -43,6 +44,8 @@ public class PlanBungee extends BungeePlugin implements PlanPlugin {
             system.enable();
             locale = system.getLocaleSystem().getLocale();
 
+            new BStatsBungee(this).registerMetrics();
+
             Log.info(locale.getString(PluginLang.ENABLED));
         } catch (AbstractMethodError e) {
             Log.error("Plugin ran into AbstractMethodError - Server restart is required. Likely cause is updating the jar without a restart.");

Plan/src/main/java/com/djrapitops/plan/PlanSponge.java

@@ -6,6 +6,7 @@ import com.djrapitops.plan.system.SpongeSystem;
 import com.djrapitops.plan.system.locale.Locale;
 import com.djrapitops.plan.system.locale.lang.PluginLang;
 import com.djrapitops.plan.system.settings.theme.PlanColorScheme;
+import com.djrapitops.plan.utilities.metrics.BStatsSponge;
 import com.djrapitops.plugin.SpongePlugin;
 import com.djrapitops.plugin.StaticHolder;
 import com.djrapitops.plugin.api.Benchmark;
@@ -57,6 +58,8 @@ public class PlanSponge extends SpongePlugin implements PlanPlugin {
             system.enable();
             locale = system.getLocaleSystem().getLocale();
 
+            new BStatsSponge().registerMetrics();
+
             Log.info(locale.getString(PluginLang.ENABLED));
         } catch (AbstractMethodError e) {
             Log.error("Plugin ran into AbstractMethodError - Server restart is required. Likely cause is updating the jar without a restart.");

Plan/src/main/java/com/djrapitops/plan/utilities/metrics/BStats.java

@@ -1,73 +0,0 @@
-package com.djrapitops.plan.utilities.metrics;
-
-import com.djrapitops.plan.Plan;
-import com.djrapitops.plan.system.database.databases.Database;
-import com.djrapitops.plan.system.info.connection.ConnectionSystem;
-import com.djrapitops.plan.system.settings.Settings;
-import com.djrapitops.plan.system.webserver.WebServer;
-import com.djrapitops.plugin.api.Check;
-import com.djrapitops.plugin.api.utility.log.Log;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class BStats {
-
-    private final Plan plugin;
-    private Metrics metrics;
-
-    public BStats(Plan plugin) {
-        this.plugin = plugin;
-    }
-
-    public void registerMetrics() {
-        Log.logDebug("Enable", "Enabling bStats Metrics.");
-        if (metrics == null) {
-            metrics = new Metrics(plugin);
-        }
-        registerConfigSettingGraphs();
-    }
-
-    private void registerConfigSettingGraphs() {
-        String serverType = plugin.getServer().getName();
-        if ("CraftBukkit".equals(serverType) && Check.isSpigotAvailable()) {
-            serverType = "Spigot";
-        }
-        String databaseType = Database.getActive().getName();
-        String analysisRefreshPeriod = Integer.toString(Settings.ANALYSIS_AUTO_REFRESH.getNumber());
-        String themeBase = Settings.THEME_BASE.toString();
-
-        addStringSettingPie("server_type", serverType);
-        addStringSettingPie("database_type", databaseType);
-        addStringSettingPie("analysis_periodic_refresh", analysisRefreshPeriod);
-        addStringSettingPie("theme_base", themeBase);
-
-        addFeatureBarChart("features");
-    }
-
-    private void addStringSettingPie(String id, String setting) {
-        metrics.addCustomChart(new Metrics.SimplePie(id, () -> setting));
-    }
-
-    private void addFeatureBarChart(String id) {
-        metrics.addCustomChart(new Metrics.AdvancedBarChart(id, () -> {
-            Map<String, int[]> map = new HashMap<>();
-
-            map.put("HTTPS", isEnabled("HTTPS".equals(WebServer.getInstance().getProtocol().toUpperCase())));
-            map.put("HTML Export", isEnabled(Settings.ANALYSIS_EXPORT.isTrue()));
-            boolean isConnectedToBungee = ConnectionSystem.getInstance().isServerAvailable();
-            map.put("BungeeCord Connected", isEnabled(isConnectedToBungee));
-            if (isConnectedToBungee) {
-                map.put("Copy Bungee Config Values", isEnabled(Settings.BUNGEE_COPY_CONFIG.isTrue()));
-                map.put("Standalone Override", isEnabled(Settings.BUNGEE_OVERRIDE_STANDALONE_MODE.isTrue()));
-            }
-            map.put("Log Unknown Commands", isEnabled(Settings.LOG_UNKNOWN_COMMANDS.isTrue()));
-            map.put("Combine Command Aliases", isEnabled(Settings.COMBINE_COMMAND_ALIASES.isTrue()));
-            return map;
-        }));
-    }
-
-    private int[] isEnabled(boolean t) {
-        return t ? new int[]{1, 0} : new int[]{0, 1};
-    }
-}

Plan/src/main/java/com/djrapitops/plan/utilities/metrics/BStatsBukkit.java

@@ -0,0 +1,40 @@
+package com.djrapitops.plan.utilities.metrics;
+
+import com.djrapitops.plan.Plan;
+import com.djrapitops.plan.system.database.databases.Database;
+import com.djrapitops.plugin.api.Check;
+import com.djrapitops.plugin.api.utility.log.Log;
+import org.bstats.bukkit.Metrics;
+
+public class BStatsBukkit {
+
+    private final Plan plugin;
+    private Metrics metrics;
+
+    public BStatsBukkit(Plan plugin) {
+        this.plugin = plugin;
+    }
+
+    public void registerMetrics() {
+        Log.logDebug("Enable", "Enabling bStats Metrics.");
+        if (metrics == null) {
+            metrics = new Metrics(plugin);
+        }
+        registerConfigSettingGraphs();
+    }
+
+    private void registerConfigSettingGraphs() {
+        String serverType = plugin.getServer().getName();
+        if ("CraftBukkit".equals(serverType) && Check.isSpigotAvailable()) {
+            serverType = "Spigot";
+        }
+        String databaseType = Database.getActive().getName();
+
+        addStringSettingPie("server_type", serverType);
+        addStringSettingPie("database_type", databaseType);
+    }
+
+    protected void addStringSettingPie(String id, String setting) {
+        metrics.addCustomChart(new Metrics.SimplePie(id, () -> setting));
+    }
+}

Plan/src/main/java/com/djrapitops/plan/utilities/metrics/BStatsBungee.java

@@ -0,0 +1,40 @@
+package com.djrapitops.plan.utilities.metrics;
+
+import com.djrapitops.plan.PlanBungee;
+import com.djrapitops.plan.system.database.databases.Database;
+import com.djrapitops.plan.system.info.connection.ConnectionSystem;
+import com.djrapitops.plugin.api.utility.log.Log;
+import org.bstats.bungeecord.Metrics;
+
+import java.io.Serializable;
+
+public class BStatsBungee {
+
+    private final PlanBungee plugin;
+    private Metrics metrics;
+
+    public BStatsBungee(PlanBungee plugin) {
+        this.plugin = plugin;
+    }
+
+    public void registerMetrics() {
+        Log.logDebug("Enable", "Enabling bStats Metrics.");
+        if (metrics == null) {
+            metrics = new Metrics(plugin);
+        }
+        registerConfigSettingGraphs();
+    }
+
+    private void registerConfigSettingGraphs() {
+        String serverType = plugin.getProxy().getName();
+        String databaseType = Database.getActive().getName();
+
+        addStringSettingPie("server_type", serverType);
+        addStringSettingPie("database_type", databaseType);
+        addStringSettingPie("network_servers", ConnectionSystem.getInstance().getBukkitServers().size());
+    }
+
+    protected void addStringSettingPie(String id, Serializable setting) {
+        metrics.addCustomChart(new Metrics.SimplePie(id, setting::toString));
+    }
+}

Plan/src/main/java/com/djrapitops/plan/utilities/metrics/BStatsSponge.java

@@ -0,0 +1,35 @@
+package com.djrapitops.plan.utilities.metrics;
+
+import com.djrapitops.plan.system.database.databases.Database;
+import com.djrapitops.plan.system.info.connection.ConnectionSystem;
+import com.djrapitops.plugin.api.utility.log.Log;
+import org.bstats.sponge.Metrics;
+
+import javax.inject.Inject;
+import java.io.Serializable;
+
+public class BStatsSponge {
+
+    @Inject
+    private Metrics metrics;
+
+    public void registerMetrics() {
+        Log.logDebug("Enable", "Enabling bStats Metrics.");
+        if (metrics != null) {
+            registerConfigSettingGraphs();
+        }
+    }
+
+    private void registerConfigSettingGraphs() {
+        String serverType = "Sponge";
+        String databaseType = Database.getActive().getName();
+
+        addStringSettingPie("server_type", serverType);
+        addStringSettingPie("database_type", databaseType);
+        addStringSettingPie("network_servers", ConnectionSystem.getInstance().getBukkitServers().size());
+    }
+
+    protected void addStringSettingPie(String id, Serializable setting) {
+        metrics.addCustomChart(new Metrics.SimplePie(id, setting::toString));
+    }
+}

Plan/src/main/java/com/djrapitops/plan/utilities/metrics/Metrics.java

@@ -1,627 +0,0 @@
-package com.djrapitops.plan.utilities.metrics;
-
-import com.djrapitops.plugin.api.TimeAmount;
-import org.bukkit.Bukkit;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.RegisteredServiceProvider;
-import org.bukkit.plugin.ServicePriority;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-
-import javax.net.ssl.HttpsURLConnection;
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-import java.util.concurrent.Callable;
-import java.util.logging.Level;
-import java.util.zip.GZIPOutputStream;
-
-/**
- * bStats collects some data for plugin authors.
- * <p>
- * Condition out https://bStats.org/ to learn more about bStats!
- */
-@SuppressWarnings("unchecked")
-public class Metrics {
-
-    // The version of this bStats class
-    public static final int B_STATS_VERSION = 1;
-    // The url to which the data is sent
-    private static final String URL = "https://bStats.org/submitData/bukkit";
-    // Should failed requests be logged?
-    private static boolean logFailedRequests;
-    // The uuid of the server
-    private static String serverUUID;
-
-    static {
-        // You can use the property to disable the check in your test environment
-        if (System.getProperty("bstats.relocatecheck") == null || !System.getProperty("bstats.relocatecheck").equals("false")) {
-            // Maven's Relocate is clever and changes strings, too. So we have to use this little "trick" ... :D
-            final String defaultPackage = new String(
-                    new byte[]{'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's', '.', 'b', 'u', 'k', 'k', 'i', 't'});
-            final String examplePackage = new String(new byte[]{'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'});
-            // We want to make sure nobody just copy & pastes the example and use the wrong package names
-            if (Metrics.class.getPackage().getName().equals(defaultPackage) || Metrics.class.getPackage().getName().equals(examplePackage)) {
-                throw new IllegalStateException("bStats Metrics class has not been relocated correctly!");
-            }
-        }
-    }
-
-    // The plugin
-    private final JavaPlugin plugin;
-
-    // A list with all custom charts
-    private final List<CustomChart> charts = new ArrayList<>();
-
-    public Metrics(JavaPlugin plugin) {
-        if (plugin == null) {
-            throw new IllegalArgumentException("Plugin cannot be null!");
-        }
-        this.plugin = plugin;
-
-        // Get the config file
-        File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats");
-        File configFile = new File(bStatsFolder, "config.yml");
-        YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile);
-
-        // Condition if the config file exists
-        if (!config.isSet("serverUuid")) {
-
-            // Add default values
-            config.addDefault("enabled", true);
-            // Every server gets it's unique random id.
-            config.addDefault("serverUuid", UUID.randomUUID().toString());
-            // Should failed request be logged?
-            config.addDefault("logFailedRequests", false);
-
-            // Inform the server owners about bStats
-            config.options().header(
-                    "bStats collects some data for plugin authors like how many servers are using their plugins.\n" +
-                            "To honor their work, you should not disable it.\n" +
-                            "This has nearly no effect on the server performance!\n" +
-                            "Check out https://bStats.org/ to learn more :)"
-            ).copyDefaults(true);
-            try {
-                config.save(configFile);
-            } catch (IOException ignored) {
-                /* Ignored */
-            }
-        }
-
-        // Load the data
-        serverUUID = config.getString("serverUuid");
-        logFailedRequests = config.getBoolean("logFailedRequests", false);
-        if (config.getBoolean("enabled", true)) {
-            boolean found = false;
-            // Search for all other bStats Metrics classes to see if we are the first one
-            for (Class<?> service : Bukkit.getServicesManager().getKnownServices()) {
-                try {
-                    service.getField("B_STATS_VERSION"); // Our identifier :)
-                    found = true; // We aren't the first
-                    break;
-                } catch (NoSuchFieldException ignored) {
-                    /* Ignored */
-                }
-            }
-            // Register our service
-            Bukkit.getServicesManager().register(Metrics.class, this, plugin, ServicePriority.Normal);
-            if (!found) {
-                // We are the first!
-                startSubmitting();
-            }
-        }
-    }
-
-    /**
-     * Sends the data to the bStats server.
-     *
-     * @param data The data to send.
-     * @throws Exception If the request failed.
-     */
-    private static void sendData(JSONObject data) throws Exception {
-        if (data == null) {
-            throw new IllegalArgumentException("Data cannot be null!");
-        }
-        if (Bukkit.isPrimaryThread()) {
-            throw new IllegalAccessException("This method must not be called from the main thread!");
-        }
-        HttpsURLConnection connection = (HttpsURLConnection) new URL(URL).openConnection();
-
-        // Compress the data to save bandwidth
-        byte[] compressedData = compress(data.toString());
-
-        // Add headers
-        connection.setRequestMethod("POST");
-        connection.addRequestProperty("Accept", "application/json");
-        connection.addRequestProperty("Connection", "close");
-        connection.addRequestProperty("Content-Encoding", "gzip"); // We gzip our request
-        connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length));
-        connection.setRequestProperty("Content-Type", "application/json"); // We send our data in JSON format
-        connection.setRequestProperty("User-Agent", "MC-Server/" + B_STATS_VERSION);
-
-        // Send data
-        connection.setDoOutput(true);
-        DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream());
-        outputStream.write(compressedData);
-        outputStream.flush();
-        outputStream.close();
-
-        connection.getInputStream().close(); // We don't care about the response - Just send our data :)
-    }
-
-    /**
-     * Gzips the given String.
-     *
-     * @param str The string to gzip.
-     * @return The gzipped String.
-     * @throws IOException If the compression failed.
-     */
-    private static byte[] compress(final String str) throws IOException {
-        if (str == null) {
-            return null;
-        }
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        GZIPOutputStream gzip = new GZIPOutputStream(outputStream);
-        gzip.write(str.getBytes(StandardCharsets.UTF_8));
-        gzip.close();
-        return outputStream.toByteArray();
-    }
-
-    /**
-     * Adds a custom chart.
-     *
-     * @param chart The chart to add.
-     */
-    public void addCustomChart(CustomChart chart) {
-        if (chart == null) {
-            throw new IllegalArgumentException("Chart cannot be null!");
-        }
-        charts.add(chart);
-    }
-
-    /**
-     * Starts the Scheduler which submits our data every 30 minutes.
-     */
-    private void startSubmitting() {
-        final Metrics metrics = this;
-
-        final Timer timer = new Timer(true); // We use a timer cause the Bukkit scheduler is affected by server lags
-        timer.scheduleAtFixedRate(new TimerTask() {
-            @Override
-            public void run() {
-                if (!plugin.isEnabled()) { // Plugin was disabled
-                    timer.cancel();
-                    return;
-                }
-                // 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, metrics::submitData);
-            }
-        }, TimeAmount.MINUTE.ms() * 5, TimeAmount.MINUTE.ms() * 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!
-    }
-
-    /**
-     * Gets the plugin specific data.
-     * This method is called using Reflection.
-     *
-     * @return The plugin specific data.
-     */
-    public JSONObject getPluginData() {
-        JSONObject data = new JSONObject();
-
-        String pluginName = plugin.getDescription().getName();
-        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();
-        for (CustomChart customChart : charts) {
-            // Add the data of the custom charts
-            JSONObject chart = customChart.getRequestJsonObject();
-            if (chart == null) { // If the chart is null, we skip it
-                continue;
-            }
-            customCharts.add(chart);
-        }
-        data.put("customCharts", customCharts);
-
-        return data;
-    }
-
-    /**
-     * Gets the server specific data.
-     *
-     * @return The server specific data.
-     */
-    private JSONObject getServerData() {
-        // Minecraft specific data
-        int playerAmount;
-        try {
-            // Around MC 1.8 the return type was changed to a collection from an array,
-            // This fixes java.lang.NoSuchMethodError: org.bukkit.Bukkit.getOnlinePlayers()Ljava/util/Collection;
-            Method onlinePlayersMethod = Class.forName("org.bukkit.Server").getMethod("getOnlinePlayers");
-            playerAmount = onlinePlayersMethod.getReturnType().equals(Collection.class)
-                    ? ((Collection<?>) onlinePlayersMethod.invoke(Bukkit.getServer())).size()
-                    : ((Player[]) onlinePlayersMethod.invoke(Bukkit.getServer())).length;
-        } catch (Exception e) {
-            playerAmount = Bukkit.getOnlinePlayers().size(); // Just use the new method if the Reflection failed
-        }
-        int onlineMode = Bukkit.getOnlineMode() ? 1 : 0;
-        String bukkitVersion = org.bukkit.Bukkit.getVersion();
-        bukkitVersion = bukkitVersion.substring(bukkitVersion.indexOf("MC: ") + 4, bukkitVersion.length() - 1);
-
-        // OS/Java specific data
-        String javaVersion = System.getProperty("java.version");
-        String osName = System.getProperty("os.name");
-        String osArch = System.getProperty("os.arch");
-        String osVersion = System.getProperty("os.version");
-        int coreCount = Runtime.getRuntime().availableProcessors();
-
-        JSONObject data = new JSONObject();
-
-        data.put("serverUUID", serverUUID);
-
-        data.put("playerAmount", playerAmount);
-        data.put("onlineMode", onlineMode);
-        data.put("bukkitVersion", bukkitVersion);
-
-        data.put("javaVersion", javaVersion);
-        data.put("osName", osName);
-        data.put("osArch", osArch);
-        data.put("osVersion", osVersion);
-        data.put("coreCount", coreCount);
-
-        return data;
-    }
-
-    /**
-     * Collects the data and sends it afterwards.
-     */
-    private void submitData() {
-        final JSONObject data = getServerData();
-
-        JSONArray pluginData = new JSONArray();
-        // Search for all other bStats Metrics classes to get their plugin data
-        for (Class<?> service : Bukkit.getServicesManager().getKnownServices()) {
-            try {
-                service.getField("B_STATS_VERSION"); // Our identifier :)
-
-                for (RegisteredServiceProvider<?> provider : Bukkit.getServicesManager().getRegistrations(service)) {
-                    try {
-                        pluginData.add(provider.getService().getMethod("getPluginData").invoke(provider.getProvider()));
-                    } catch (NullPointerException | NoSuchMethodException | IllegalAccessException | InvocationTargetException ignored) {
-                        /* Ignored */
-                    }
-                }
-            } catch (NoSuchFieldException ignored) {
-                /* Ignored */
-            }
-        }
-
-        data.put("plugins", pluginData);
-
-        // Create a new thread for the connection to the bStats server
-        new Thread(() -> {
-            try {
-                // Send the data
-                sendData(data);
-            } catch (Exception e) {
-                // Something went wrong! :(
-                if (logFailedRequests) {
-                    plugin.getLogger().log(Level.WARNING, "Could not submit plugin stats of " + plugin.getName(), e);
-                }
-            }
-        }).start();
-    }
-
-    public abstract static class CustomChart {
-
-        final String chartId;
-
-        CustomChart(String chartId) {
-            if (chartId == null || chartId.isEmpty()) {
-                throw new IllegalArgumentException("ChartId cannot be null or empty!");
-            }
-            this.chartId = chartId;
-        }
-
-        private JSONObject getRequestJsonObject() {
-            JSONObject chart = new JSONObject();
-            chart.put("chartId", chartId);
-            try {
-                JSONObject data = getChartData();
-                if (data == null) {
-                    // If the data is null we don't send the chart.
-                    return null;
-                }
-                chart.put("data", data);
-            } catch (Exception e) {
-                if (logFailedRequests) {
-                    Bukkit.getLogger().log(Level.WARNING, "Failed to get data for custom chart with id " + chartId, e);
-                }
-                return null;
-            }
-            return chart;
-        }
-
-        protected abstract JSONObject getChartData() throws Exception;
-
-    }
-
-    public static class SimplePie extends CustomChart {
-
-        private final Callable<String> callable;
-
-        /**
-         * Class constructor.
-         *
-         * @param chartId  The id of the chart.
-         * @param callable The callable which is used to request the chart data.
-         */
-        public SimplePie(String chartId, Callable<String> callable) {
-            super(chartId);
-            this.callable = callable;
-        }
-
-        @Override
-        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);
-            return data;
-        }
-    }
-
-    public static class AdvancedPie extends CustomChart {
-
-        private final Callable<Map<String, Integer>> callable;
-
-        /**
-         * Class constructor.
-         *
-         * @param chartId  The id of the chart.
-         * @param callable The callable which is used to request the chart data.
-         */
-        public AdvancedPie(String chartId, Callable<Map<String, Integer>> callable) {
-            super(chartId);
-            this.callable = callable;
-        }
-
-        @Override
-        protected JSONObject getChartData() throws Exception {
-            JSONObject data = new JSONObject();
-            JSONObject values = new JSONObject();
-            Map<String, Integer> map = callable.call();
-            if (map == null || map.isEmpty()) {
-                // Null = skip the chart
-                return null;
-            }
-            boolean allSkipped = true;
-            for (Map.Entry<String, Integer> entry : map.entrySet()) {
-                if (entry.getValue() == 0) {
-                    continue; // Skip this invalid
-                }
-                allSkipped = false;
-                values.put(entry.getKey(), entry.getValue());
-            }
-            if (allSkipped) {
-                // Null = skip the chart
-                return null;
-            }
-            data.put("values", values);
-            return data;
-        }
-    }
-
-    public static class DrilldownPie extends CustomChart {
-
-        private final Callable<Map<String, Map<String, Integer>>> callable;
-
-        /**
-         * Class constructor.
-         *
-         * @param chartId  The id of the chart.
-         * @param callable The callable which is used to request the chart data.
-         */
-        public DrilldownPie(String chartId, Callable<Map<String, Map<String, Integer>>> callable) {
-            super(chartId);
-            this.callable = callable;
-        }
-
-        @Override
-        public JSONObject getChartData() throws Exception {
-            JSONObject data = new JSONObject();
-            JSONObject values = new JSONObject();
-            Map<String, Map<String, Integer>> map = callable.call();
-            if (map == null || map.isEmpty()) {
-                // Null = skip the chart
-                return null;
-            }
-            boolean reallyAllSkipped = true;
-            for (Map.Entry<String, Map<String, Integer>> entryValues : map.entrySet()) {
-                JSONObject value = new JSONObject();
-                boolean allSkipped = true;
-                for (Map.Entry<String, Integer> valueEntry : map.get(entryValues.getKey()).entrySet()) {
-                    value.put(valueEntry.getKey(), valueEntry.getValue());
-                    allSkipped = false;
-                }
-                if (!allSkipped) {
-                    reallyAllSkipped = false;
-                    values.put(entryValues.getKey(), value);
-                }
-            }
-            if (reallyAllSkipped) {
-                // Null = skip the chart
-                return null;
-            }
-            data.put("values", values);
-            return data;
-        }
-    }
-
-    public static class SingleLineChart extends CustomChart {
-
-        private final Callable<Integer> callable;
-
-        /**
-         * Class constructor.
-         *
-         * @param chartId  The id of the chart.
-         * @param callable The callable which is used to request the chart data.
-         */
-        public SingleLineChart(String chartId, Callable<Integer> callable) {
-            super(chartId);
-            this.callable = callable;
-        }
-
-        @Override
-        protected JSONObject getChartData() throws Exception {
-            JSONObject data = new JSONObject();
-            int value = callable.call();
-            if (value == 0) {
-                // Null = skip the chart
-                return null;
-            }
-            data.put("value", value);
-            return data;
-        }
-
-    }
-
-    public static class MultiLineChart extends CustomChart {
-
-        private final Callable<Map<String, Integer>> callable;
-
-        /**
-         * Class constructor.
-         *
-         * @param chartId  The id of the chart.
-         * @param callable The callable which is used to request the chart data.
-         */
-        public MultiLineChart(String chartId, Callable<Map<String, Integer>> callable) {
-            super(chartId);
-            this.callable = callable;
-        }
-
-        @Override
-        protected JSONObject getChartData() throws Exception {
-            JSONObject data = new JSONObject();
-            JSONObject values = new JSONObject();
-            Map<String, Integer> map = callable.call();
-            if (map == null || map.isEmpty()) {
-                // Null = skip the chart
-                return null;
-            }
-            boolean allSkipped = true;
-            for (Map.Entry<String, Integer> entry : map.entrySet()) {
-                if (entry.getValue() == 0) {
-                    continue; // Skip this invalid
-                }
-                allSkipped = false;
-                values.put(entry.getKey(), entry.getValue());
-            }
-            if (allSkipped) {
-                // Null = skip the chart
-                return null;
-            }
-            data.put("values", values);
-            return data;
-        }
-
-    }
-
-    public static class SimpleBarChart extends CustomChart {
-
-        private final Callable<Map<String, Integer>> callable;
-
-        /**
-         * Class constructor.
-         *
-         * @param chartId  The id of the chart.
-         * @param callable The callable which is used to request the chart data.
-         */
-        public SimpleBarChart(String chartId, Callable<Map<String, Integer>> callable) {
-            super(chartId);
-            this.callable = callable;
-        }
-
-        @Override
-        protected JSONObject getChartData() throws Exception {
-            JSONObject data = new JSONObject();
-            JSONObject values = new JSONObject();
-            Map<String, Integer> map = callable.call();
-            if (map == null || map.isEmpty()) {
-                // Null = skip the chart
-                return null;
-            }
-            for (Map.Entry<String, Integer> entry : map.entrySet()) {
-                JSONArray categoryValues = new JSONArray();
-                categoryValues.add(entry.getValue());
-                values.put(entry.getKey(), categoryValues);
-            }
-            data.put("values", values);
-            return data;
-        }
-
-    }
-
-    public static class AdvancedBarChart extends CustomChart {
-
-        private final Callable<Map<String, int[]>> callable;
-
-        /**
-         * Class constructor.
-         *
-         * @param chartId  The id of the chart.
-         * @param callable The callable which is used to request the chart data.
-         */
-        public AdvancedBarChart(String chartId, Callable<Map<String, int[]>> callable) {
-            super(chartId);
-            this.callable = callable;
-        }
-
-        @Override
-        protected JSONObject getChartData() throws Exception {
-            JSONObject data = new JSONObject();
-            JSONObject values = new JSONObject();
-            Map<String, int[]> map = callable.call();
-            if (map == null || map.isEmpty()) {
-                // Null = skip the chart
-                return null;
-            }
-            boolean allSkipped = true;
-            for (Map.Entry<String, int[]> entry : map.entrySet()) {
-                if (entry.getValue().length == 0) {
-                    continue; // Skip this invalid
-                }
-                allSkipped = false;
-                JSONArray categoryValues = new JSONArray();
-                for (int categoryValue : entry.getValue()) {
-                    categoryValues.add(categoryValue);
-                }
-                values.put(entry.getKey(), categoryValues);
-            }
-            if (allSkipped) {
-                // Null = skip the chart
-                return null;
-            }
-            data.put("values", values);
-            return data;
-        }
-    }
-}