Update metrics data collection in Velocity and Bukkit

Author: NonSwag

bukkit/src/main/java/dev/faststats/bukkit/BukkitMetricsImpl.java

@@ -65,13 +65,12 @@ protected void appendDefaultData(JsonObject charts) {
                 .orElseGet(() -> plugin.getDescription().getVersion());
         var minecraftVersion = tryOrEmpty(server::getMinecraftVersion)
                 .orElseGet(() -> server.getBukkitVersion().split("-", 2)[0]);
-        var players = server.getOnlinePlayers().size();
 
+        charts.addProperty("minecraft_version", minecraftVersion);
         charts.addProperty("online_mode", checkOnlineMode());
+        charts.addProperty("player_count", server.getOnlinePlayers().size());
         charts.addProperty("plugin_version", pluginVersion);
         charts.addProperty("server_type", server.getName());
-        charts.addProperty("minecraft_version", minecraftVersion);
-        if (players != 0) charts.addProperty("player_count", players);
     }
 
     @Override

velocity/src/main/java/dev/faststats/velocity/VelocityMetricsImpl.java

@@ -46,14 +46,12 @@ private void startSubmitting() {
     @Override
     protected void appendDefaultData(JsonObject charts) {
         var pluginVersion = plugin.getDescription().getVersion().orElse("unknown");
-        var size = server.getPlayerCount();
-
         charts.addProperty("online_mode", server.getConfiguration().isOnlineMode());
+        charts.addProperty("player_count", server.getPlayerCount());
         charts.addProperty("plugin_version", pluginVersion);
-        charts.addProperty("server_type", server.getVersion().getName());
-        charts.addProperty("proxy_version", server.getVersion().getVersion());
         charts.addProperty("proxy_vendor", server.getVersion().getVendor());
-        if (size != 0) charts.addProperty("player_count", size);
+        charts.addProperty("proxy_version", server.getVersion().getVersion());
+        charts.addProperty("server_type", server.getVersion().getName());
     }
 
     @Override