update bstats for platform types

Author: colbster937

src/main/java/xyz/webmc/originblacklist/base/OriginBlacklist.java

@@ -52,7 +52,6 @@ public final class OriginBlacklist {
   public static final String UNKNOWN_STR = "UNKNOWN";
   public static final String CENSORED_STR = "CENSORED";
   public static final String PLUGIN_REPO = "WebMCDevelopment/originblacklist";
-  public static final int BSTATS_ID = 28776;
 
   private final IOriginBlacklistPlugin plugin;
   private final OriginBlacklistConfig config;
@@ -503,4 +502,10 @@ public static final String getUserAgent() {
   public static final boolean isNonNull(final String str) {
     return str != null && !str.isEmpty() && !str.isBlank() && !str.equals("null");
   }
+
+  public static final class BSTATS {
+    public static final int VELOCITY = 29033;
+    public static final int BUNGEE = 29034;
+    public static final int BUKKIT = 29035;
+  }
 }

…inblacklist/base/util/EventPriority.java …klist/base/util/EaglerEventPriority.javasrc/main/java/xyz/webmc/originblacklist/base/util/EventPriority.java renamed to src/main/java/xyz/webmc/originblacklist/base/util/EaglerEventPriority.java src/main/java/xyz/webmc/originblacklist/base/util/EventPriority.java renamed to src/main/java/xyz/webmc/originblacklist/base/util/EaglerEventPriority.java

@@ -1,5 +1,5 @@
 package xyz.webmc.originblacklist.base.util;
 
-public final class EventPriority {
+public final class EaglerEventPriority {
   public static final int EAGLER_MOTD_EVENT = 100;
 }

src/main/java/xyz/webmc/originblacklist/bukkit/OriginBlacklistBukkit.java

@@ -76,7 +76,7 @@ public final void onEnable() {
     this.getServer().getPluginManager().registerEvents(this, this);
     this.blacklist.init();
     if (this.blacklist.isMetricsEnabled()) {
-      this.metrics = new Metrics(this, OriginBlacklist.BSTATS_ID);
+      this.metrics = new Metrics(this, OriginBlacklist.BSTATS.BUKKIT);
       this.metrics.addCustomChart(new AdvancedPie("player_types", () -> {
         final Map<String, Integer> playerMap = new HashMap<>();
 

src/main/java/xyz/webmc/originblacklist/bungee/OriginBlacklistBungee.java

@@ -5,6 +5,7 @@
 import xyz.webmc.originblacklist.base.enums.EnumLogLevel;
 import xyz.webmc.originblacklist.base.events.OriginBlacklistLoginEvent;
 import xyz.webmc.originblacklist.base.events.OriginBlacklistMOTDEvent;
+import xyz.webmc.originblacklist.base.util.EaglerEventPriority;
 import xyz.webmc.originblacklist.base.util.IOriginBlacklistPlugin;
 import xyz.webmc.originblacklist.base.util.IncompatibleDependencyException;
 import xyz.webmc.originblacklist.base.util.OPlayer;
@@ -75,7 +76,7 @@ public final void onEnable() {
     this.getProxy().getPluginManager().registerListener(this, this);
     this.blacklist.init();
     if (this.blacklist.isMetricsEnabled()) {
-      this.metrics = new Metrics(this, OriginBlacklist.BSTATS_ID);
+      this.metrics = new Metrics(this, OriginBlacklist.BSTATS.BUNGEE);
       this.metrics.addCustomChart(new AdvancedPie("player_types", () -> {
         final Map<String, Integer> playerMap = new HashMap<>();
 
@@ -101,7 +102,7 @@ public final void onEaglerLogin(final EaglercraftLoginEvent event) {
     this.blacklist.handleLogin(new OriginBlacklistLoginEvent(event, null, EnumConnectionType.EAGLER, player));
   }
 
-  @EventHandler(priority = xyz.webmc.originblacklist.base.util.EventPriority.EAGLER_MOTD_EVENT)
+  @EventHandler(priority = EaglerEventPriority.EAGLER_MOTD_EVENT)
   public final void onEaglerMOTD(final EaglercraftMOTDEvent event) {
     final OPlayer player = new OPlayer(event.getMOTDConnection(), null, null);
     this.blacklist.handleMOTD(new OriginBlacklistMOTDEvent(event, null, EnumConnectionType.EAGLER, player));

src/main/java/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocity.java

@@ -5,7 +5,7 @@
 import xyz.webmc.originblacklist.base.enums.EnumLogLevel;
 import xyz.webmc.originblacklist.base.events.OriginBlacklistLoginEvent;
 import xyz.webmc.originblacklist.base.events.OriginBlacklistMOTDEvent;
-import xyz.webmc.originblacklist.base.util.EventPriority;
+import xyz.webmc.originblacklist.base.util.EaglerEventPriority;
 import xyz.webmc.originblacklist.base.util.IOriginBlacklistPlugin;
 import xyz.webmc.originblacklist.base.util.IncompatibleDependencyException;
 import xyz.webmc.originblacklist.base.util.OPlayer;
@@ -92,7 +92,7 @@ public final void onProxyInitialization(ProxyInitializeEvent event) {
     this.proxy.getCommandManager().register("originblacklist", new OriginBlacklistCommandVelocity(this.blacklist));
     this.blacklist.init();
     if (this.blacklist.isMetricsEnabled()) {
-      this.metrics = this.metricsFactory.make(this, OriginBlacklist.BSTATS_ID);
+      this.metrics = this.metricsFactory.make(this, OriginBlacklist.BSTATS.VELOCITY);
       this.metrics.addCustomChart(new AdvancedPie("player_types", () -> {
         final Map<String, Integer> playerMap = new HashMap<>();
 
@@ -118,7 +118,7 @@ public final void onEaglerLogin(final EaglercraftLoginEvent event) {
     this.blacklist.handleLogin(new OriginBlacklistLoginEvent(event, null, EnumConnectionType.EAGLER, player));
   }
 
-  @Subscribe(priority = EventPriority.EAGLER_MOTD_EVENT, order = PostOrder.LAST)
+  @Subscribe(priority = EaglerEventPriority.EAGLER_MOTD_EVENT, order = PostOrder.LAST)
   public final void onEaglerMOTD(final EaglercraftMOTDEvent event) {
     final OPlayer player = new OPlayer(event.getMOTDConnection(), null, null);
     this.blacklist.handleMOTD(new OriginBlacklistMOTDEvent(event, null, EnumConnectionType.EAGLER, player));