Version 3.2.0

- Add Metrics for bStats
Andre601 · Feb 15, 2021 · 65bcabc · 65bcabc
1 parent 183b920
commit 65bcabc
Show file tree

Hide file tree

Showing 8 changed files with 116 additions and 4 deletions.
diff --git a/bungeecord/pom.xml b/bungeecord/pom.xml
@@ -70,6 +70,12 @@
             <artifactId>configurate-yaml</artifactId>
             <version>3.7.2</version>
         </dependency>
+        <dependency>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-bungeecord</artifactId>
+            <version>2.2.1</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -95,7 +101,11 @@
                     <relocations>
                         <relocation>
                             <pattern>ninja.leaping.configurate</pattern>
-                            <shadedPattern>com.andre601.oneversionremake.dependencies.configurate</shadedPattern>
+                            <shadedPattern>com.andre601.oneversionremake.bungeecord.dependencies.configurate</shadedPattern>
+                        </relocation>
+                        <relocation>
+                            <pattern>org.bstats</pattern>
+                            <shadedPattern>com.andre601.oneversionremake.bungeecord.dependencies.bstats</shadedPattern>
                         </relocation>
                     </relocations>
                 </configuration>

diff --git a/bungeecord/src/main/java/com/andre601/oneversionremake/bungeecord/BungeeCore.java b/bungeecord/src/main/java/com/andre601/oneversionremake/bungeecord/BungeeCore.java
@@ -23,14 +23,20 @@
 import com.andre601.oneversionremake.bungeecord.listener.BungeePingListener;
 import com.andre601.oneversionremake.bungeecord.logging.BungeeLogger;
 import com.andre601.oneversionremake.core.OneVersionRemake;
+import com.andre601.oneversionremake.core.enums.ProtocolVersion;
 import com.andre601.oneversionremake.core.enums.ProxyPlatform;
 import com.andre601.oneversionremake.core.files.ConfigHandler;
 import com.andre601.oneversionremake.core.interfaces.PluginCore;
 import com.andre601.oneversionremake.core.interfaces.ProxyLogger;
 import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
 import net.md_5.bungee.api.plugin.Plugin;
+import org.bstats.bungeecord.Metrics;
+import org.bstats.charts.DrilldownPie;
 
 import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class BungeeCore extends Plugin implements PluginCore{
 
@@ -63,6 +69,39 @@ public void setConfigHandler(ConfigHandler configHandler){
         this.configHandler = configHandler;
     }
 
+    @Override
+    public void loadMetrics(){
+        Metrics metrics = new Metrics(this, 10340);
+
+        metrics.addCustomChart(new DrilldownPie("allowed_versions", () -> {
+            Map<String, Map<String, Integer>> map = new HashMap<>();
+            Map<String, Integer> entry = new HashMap<>();
+
+            List<Integer> protocolVersions = getConfigHandler().getIntList("Protocol", "Versions");
+            if(protocolVersions.isEmpty()){
+                String unknown = ProtocolVersion.getFriendlyName(0);
+                entry.put(unknown, 1);
+                map.put("other", entry);
+
+                return map;
+            }
+
+            for(int version : protocolVersions){
+                String major = ProtocolVersion.getMajor(version);
+                String name = ProtocolVersion.getFriendlyName(version);
+
+                entry.put(name, 1);
+                if(major.equalsIgnoreCase("?")){
+                    map.put("other", entry);
+                }else{
+                    map.put(major, entry);
+                }
+            }
+
+            return map;
+        }));
+    }
+
     @Override
     public boolean reloadConfig(){
         return core.reloadConfig();
@@ -96,4 +135,6 @@ public ConfigHandler getConfigHandler(){
     public String getVersion(){
         return core.getVersion();
     }
+
+    // 10340
 }
diff --git a/core/src/main/java/com/andre601/oneversionremake/core/OneVersionRemake.java b/core/src/main/java/com/andre601/oneversionremake/core/OneVersionRemake.java
@@ -90,6 +90,10 @@ private void start(){
         pluginCore.loadEventListeners();
         logger.info("Event Listeners loaded!");
 
+        logger.info("Loading Metrics...");
+        pluginCore.loadMetrics();
+        logger.info("Metrics loaded!");
+
         logger.info("OneVersionRemake is ready!");
     }
 

diff --git a/core/src/main/java/com/andre601/oneversionremake/core/enums/ProtocolVersion.java b/core/src/main/java/com/andre601/oneversionremake/core/enums/ProtocolVersion.java
@@ -88,7 +88,7 @@ public static String getFriendlyNames(List<Integer> protocols, boolean majorOnly
                 .collect(Collectors.joining(", "));
     }
 
-    private static String getMajor(int protocol){
+    public static String getMajor(int protocol){
         for(ProtocolVersion version : values()){
             if(version.getProtocol() == protocol)
                 return version.getMajor();

diff --git a/core/src/main/java/com/andre601/oneversionremake/core/interfaces/PluginCore.java b/core/src/main/java/com/andre601/oneversionremake/core/interfaces/PluginCore.java
@@ -31,6 +31,8 @@ public interface PluginCore{
 
     void setConfigHandler(ConfigHandler configHandler);
 
+    void loadMetrics();
+
     boolean reloadConfig();
 
     Path getPath();

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <plugin.version>3.1.1</plugin.version>
+        <plugin.version>3.2.0</plugin.version>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
     </properties>

diff --git a/velocity/pom.xml b/velocity/pom.xml
@@ -62,6 +62,12 @@
             <version>4.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-velocity</artifactId>
+            <version>2.2.1</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -84,6 +90,12 @@
                 <version>3.2.4</version>
                 <configuration>
                     <minimizeJar>true</minimizeJar>
+                    <relocations>
+                        <relocation>
+                            <pattern>org.bstats</pattern>
+                            <shadedPattern>com.andre601.oneversionremake.velocity.dependencies.bstats</shadedPattern>
+                        </relocation>
+                    </relocations>
                 </configuration>
                 <executions>
                     <execution>

diff --git a/velocity/src/main/java/com/andre601/oneversionremake/velocity/VelocityCore.java b/velocity/src/main/java/com/andre601/oneversionremake/velocity/VelocityCore.java
@@ -19,6 +19,7 @@
 package com.andre601.oneversionremake.velocity;
 
 import com.andre601.oneversionremake.core.OneVersionRemake;
+import com.andre601.oneversionremake.core.enums.ProtocolVersion;
 import com.andre601.oneversionremake.core.enums.ProxyPlatform;
 import com.andre601.oneversionremake.core.files.ConfigHandler;
 import com.andre601.oneversionremake.core.interfaces.PluginCore;
@@ -33,25 +34,34 @@
 import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
 import com.velocitypowered.api.plugin.annotation.DataDirectory;
 import com.velocitypowered.api.proxy.ProxyServer;
+import org.bstats.charts.DrilldownPie;
+import org.bstats.velocity.Metrics;
 import org.slf4j.LoggerFactory;
 
 import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public class VelocityCore implements PluginCore{
 
     private final ProxyLogger logger;
     private final ProxyServer proxy;
     private final Path path;
 
+    private final Metrics.Factory factory;
+
     private OneVersionRemake core;
 
     private ConfigHandler configHandler = null;
 
     @Inject
-    public VelocityCore(ProxyServer proxy, @DataDirectory Path path){
+    public VelocityCore(ProxyServer proxy, @DataDirectory Path path, Metrics.Factory factory){
         this.logger = new VelocityLogger(LoggerFactory.getLogger("OneVersionRemake"));
         this.proxy = proxy;
         this.path = path;
+
+        this.factory = factory;
     }
 
     @Subscribe
@@ -81,6 +91,39 @@ public void setConfigHandler(ConfigHandler configHandler){
         this.configHandler = configHandler;
     }
 
+    @Override
+    public void loadMetrics(){
+        Metrics metrics = factory.make(this, 10341);
+
+        metrics.addCustomChart(new DrilldownPie("allowed_versions", () -> {
+            Map<String, Map<String, Integer>> map = new HashMap<>();
+            Map<String, Integer> entry = new HashMap<>();
+
+            List<Integer> protocolVersions = getConfigHandler().getIntList("Protocol", "Versions");
+            if(protocolVersions.isEmpty()){
+                String unknown = ProtocolVersion.getFriendlyName(0);
+                entry.put(unknown, 1);
+                map.put("other", entry);
+
+                return map;
+            }
+
+            for(int version : protocolVersions){
+                String major = ProtocolVersion.getMajor(version);
+                String name = ProtocolVersion.getFriendlyName(version);
+
+                entry.put(name, 1);
+                if(major.equalsIgnoreCase("?")){
+                    map.put("other", entry);
+                }else{
+                    map.put(major, entry);
+                }
+            }
+
+            return map;
+        }));
+    }
+
     @Override
     public boolean reloadConfig(){
         return core.reloadConfig();