From 1cd60a4dbac37ea2c7b05e48e0f4ec4c2d68a4f9 Mon Sep 17 00:00:00 2001 From: Colbster937 Date: Sat, 24 Jan 2026 21:47:30 -0600 Subject: [PATCH] update bstats for platform types --- .../xyz/webmc/originblacklist/base/OriginBlacklist.java | 7 ++++++- .../util/{EventPriority.java => EaglerEventPriority.java} | 2 +- .../originblacklist/bukkit/OriginBlacklistBukkit.java | 2 +- .../originblacklist/bungee/OriginBlacklistBungee.java | 5 +++-- .../originblacklist/velocity/OriginBlacklistVelocity.java | 6 +++--- 5 files changed, 14 insertions(+), 8 deletions(-) rename src/main/java/xyz/webmc/originblacklist/base/util/{EventPriority.java => EaglerEventPriority.java} (70%) diff --git a/src/main/java/xyz/webmc/originblacklist/base/OriginBlacklist.java b/src/main/java/xyz/webmc/originblacklist/base/OriginBlacklist.java index 5f75637..6c7752d 100644 --- a/src/main/java/xyz/webmc/originblacklist/base/OriginBlacklist.java +++ b/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 final class OriginBlacklist { 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; + } } diff --git a/src/main/java/xyz/webmc/originblacklist/base/util/EventPriority.java b/src/main/java/xyz/webmc/originblacklist/base/util/EaglerEventPriority.java similarity index 70% rename from src/main/java/xyz/webmc/originblacklist/base/util/EventPriority.java rename to src/main/java/xyz/webmc/originblacklist/base/util/EaglerEventPriority.java index 74cabb5..7c19486 100644 --- a/src/main/java/xyz/webmc/originblacklist/base/util/EventPriority.java +++ b/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; } \ No newline at end of file diff --git a/src/main/java/xyz/webmc/originblacklist/bukkit/OriginBlacklistBukkit.java b/src/main/java/xyz/webmc/originblacklist/bukkit/OriginBlacklistBukkit.java index 960745e..e2061f5 100644 --- a/src/main/java/xyz/webmc/originblacklist/bukkit/OriginBlacklistBukkit.java +++ b/src/main/java/xyz/webmc/originblacklist/bukkit/OriginBlacklistBukkit.java @@ -76,7 +76,7 @@ public final class OriginBlacklistBukkit extends JavaPlugin implements Listener, 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 playerMap = new HashMap<>(); diff --git a/src/main/java/xyz/webmc/originblacklist/bungee/OriginBlacklistBungee.java b/src/main/java/xyz/webmc/originblacklist/bungee/OriginBlacklistBungee.java index f2a1982..38ca54c 100644 --- a/src/main/java/xyz/webmc/originblacklist/bungee/OriginBlacklistBungee.java +++ b/src/main/java/xyz/webmc/originblacklist/bungee/OriginBlacklistBungee.java @@ -5,6 +5,7 @@ import xyz.webmc.originblacklist.base.enums.EnumConnectionType; 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 class OriginBlacklistBungee extends Plugin implements Listener, IOr 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 playerMap = new HashMap<>(); @@ -101,7 +102,7 @@ public final class OriginBlacklistBungee extends Plugin implements Listener, IOr 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)); diff --git a/src/main/java/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocity.java b/src/main/java/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocity.java index ae21b2c..f87f0ed 100644 --- a/src/main/java/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocity.java +++ b/src/main/java/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocity.java @@ -5,7 +5,7 @@ import xyz.webmc.originblacklist.base.enums.EnumConnectionType; 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 class OriginBlacklistVelocity implements IOriginBlacklistPlugin { 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 playerMap = new HashMap<>(); @@ -118,7 +118,7 @@ public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin { 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));