bStats metrics

magmamaintained · Dec 13, 2023 · 80cab32 · 80cab32
1 parent 23c65df
commit 80cab32
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 144 deletions.
diff --git a/patches/minecraft/net/minecraft/network/protocol/handshake/ClientIntentionPacket.java.patch b/patches/minecraft/net/minecraft/network/protocol/handshake/ClientIntentionPacket.java.patch
@@ -40,7 +40,7 @@
        this.f_134722_ = p_179801_.readUnsignedShort();
        this.f_134723_ = ConnectionProtocol.m_129583_(p_179801_.m_130242_());
 +      this.fmlVersion = NetworkHooks.getFMLVersion(f_134721_);
-+      //this.hostName = hostName.split("\0")[0]; //Magma moved to [ServerHandshakePacketListenerImpl.java#L93]
++      //this.hostName = hostName.split("\0")[0]; // Magma moved to [ServerHandshakePacketListenerImpl.java#L93]
 +      //Magma start - add Velocity support
 +      if (SpigotConfig.bungee && !Objects.equals(this.fmlVersion, NetworkConstants.NETVERSION)) {
 +         String[] split = this.f_134721_.split("\0");

diff --git a/src/fmllaunchertest/java/net/minecraftforge/fml/test/TopologicalSortTests.java b/src/fmllaunchertest/java/net/minecraftforge/fml/test/TopologicalSortTests.java
diff --git a/...va/org/magmafoundation/magma/Metrics.java → ...agmafoundation/magma/metrics/Metrics.java b/...va/org/magmafoundation/magma/Metrics.java → ...agmafoundation/magma/metrics/Metrics.java
@@ -16,13 +16,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.magmafoundation.magma;
+package org.magmafoundation.magma.metrics;
 
 import net.minecraft.server.MinecraftServer;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.plugin.Plugin;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
+import org.magmafoundation.magma.Magma;
 import org.magmafoundation.magma.api.ServerAPI;
 
 import javax.net.ssl.HttpsURLConnection;
@@ -56,7 +58,7 @@ public class Metrics {
     private static String serverUUID;
     // A list with all custom charts
     private final List<CustomChart> charts = new ArrayList<>();
-    private final String pluginName = "Magma";
+    private final String pluginName = "Magma Maintained";
     private final String pluginVersion = Magma.getVersion();
     // Is bStats enabled on this server?
     private boolean enabled;
@@ -106,7 +108,30 @@ public Metrics() {
             version = version.substring(version.indexOf("MC: ") + 4, version.length() - 1);
             return version;
         }));
-        addCustomChart(new Metrics.SimplePie("number_of_mods", () -> String.valueOf(ServerAPI.getModSize()))); // Report how many mods are running // MAGMA TODO: Add Server API
+        addCustomChart(new DrilldownPie("mods_vs_plugins", () -> {
+            Map<String, Map<String, Integer>> map = new HashMap<>();
+
+            Map<String, Integer> modslist = new HashMap<>();
+            String[] mods = ServerAPI.getModList().replace("[", "").replace("]", "").split(", ");
+            for (String x : mods) {
+                if (x.equals("minecraft") || x.equals("forge")) {
+                    continue;
+                }
+                modslist.put(x, 1);
+            }
+
+            Map<String, Integer> pluginlist = new HashMap<>();
+            for (Plugin plugin : Bukkit.getPluginManager().getPlugins()) {
+                if (plugin.isEnabled()) {
+                    pluginlist.put(plugin.getDescription().getName(), 1);
+                }
+            }
+
+            map.put("mods", modslist);
+            map.put("plugins", pluginlist);
+
+            return map;
+        }));
         addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size()));
         addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ?  "online": "offline"));
         addCustomChart(new Metrics.SimplePie("server_version", Magma::getVersion));