pre6 - UltraPermissions hook & bstats

platforms/bungeecord/build.gradle.kts

@@ -24,6 +24,8 @@ dependencies {
     implementation("net.kyori:adventure-platform-bungeecord:4.0.0-SNAPSHOT")
     compileOnly("net.kyori:adventure-text-serializer-plain:4.0.0-SNAPSHOT")
 
+    implementation("org.bstats:bstats-bungeecord:2.2.1")
+
     implementation(project(":common"))
     implementation(project(":api"))
 }

platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/BungeeQueue.java

@@ -8,6 +8,8 @@ import net.md_5.bungee.api.event.*;
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.event.EventHandler;
+import org.bstats.bungeecord.Metrics;
+import org.bstats.charts.SimplePie;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import us.ajg0702.queue.api.commands.IBaseCommand;
 import us.ajg0702.queue.api.util.QueueLogger;
@@ -61,6 +63,11 @@ public class BungeeQueue extends Plugin implements Listener {
 
         getProxy().getPluginManager().registerListener(this, this);
 
+
+        Metrics metrics = new Metrics(this, 7404);
+
+        metrics.addCustomChart(new SimplePie("premium", () -> String.valueOf(main.getLogic().isPremium())));
+        metrics.addCustomChart(new SimplePie("implementation", () -> main.getPlatformMethods().getImplementationName()));
     }
 
     private static BungeeAudiences adventure;

platforms/velocity/build.gradle.kts

@@ -21,6 +21,8 @@ dependencies {
     annotationProcessor("com.velocitypowered:velocity-api:3.0.0")
     compileOnly("net.kyori:adventure-text-minimessage:4.0.0-SNAPSHOT")
 
+    implementation("org.bstats:bstats-velocity:2.2.1")
+
     implementation(project(":common"))
     implementation(project(":api"))
 }

platforms/velocity/src/main/java/us/ajg0702/queue/platforms/velocity/VelocityQueue.java

@@ -15,6 +15,8 @@ import com.velocitypowered.api.proxy.Player;
 import com.velocitypowered.api.proxy.ProxyServer;
 import com.velocitypowered.api.proxy.messages.MinecraftChannelIdentifier;
 import net.kyori.adventure.text.Component;
+import org.bstats.charts.SimplePie;
+import org.bstats.velocity.Metrics;
 import org.slf4j.Logger;
 import us.ajg0702.queue.api.commands.IBaseCommand;
 import us.ajg0702.queue.commands.BaseCommand;
@@ -50,12 +52,16 @@ public class VelocityQueue  {
 
     final File dataFolder;
 
+    private final Metrics.Factory metricsFactory;
+
     @Inject
-    public VelocityQueue(ProxyServer proxyServer, Logger logger, @DataDirectory Path dataFolder) {
+    public VelocityQueue(ProxyServer proxyServer, Logger logger, @DataDirectory Path dataFolder, Metrics.Factory metricsFactory) {
         this.proxyServer = proxyServer;
         this.logger = new VelocityLogger(logger);
 
         this.dataFolder = dataFolder.toFile();
+
+        this.metricsFactory = metricsFactory;
     }
 
     List<IBaseCommand> commands;
@@ -90,6 +96,12 @@ public class VelocityQueue  {
                     new VelocityCommand(main, (BaseCommand) command)
             );
         }
+
+
+        Metrics metrics = metricsFactory.make(this, 7404);
+
+        metrics.addCustomChart(new SimplePie("premium", () -> String.valueOf(main.getLogic().isPremium())));
+        metrics.addCustomChart(new SimplePie("implementation", () -> main.getPlatformMethods().getImplementationName()));
     }
 
     @Subscribe
@@ -126,6 +138,7 @@ public class VelocityQueue  {
         main.getEventHandler().onPlayerLeave(new VelocityPlayer(e.getPlayer()));
     }
 
+    @SuppressWarnings("SimplifyOptionalCallChains")
     @Subscribe
     public void onKick(KickedFromServerEvent e) {
         if(!e.getPlayer().getCurrentServer().isPresent()) return; // if the player is kicked on initial join, we dont care