Compare commits

..

2 Commits

Author SHA1 Message Date
Colbster937
1cd60a4dba update bstats for platform types 2026-01-24 21:47:30 -06:00
Colbster937
ebcae682aa . 2026-01-21 19:32:30 -06:00
5 changed files with 18 additions and 6 deletions

View File

@@ -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;
}
}

View File

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

View File

@@ -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<String, Integer> playerMap = new HashMap<>();

View File

@@ -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<String, Integer> 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 = EventPriority.LOWEST)
@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));

View File

@@ -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;
@@ -91,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<String, Integer> playerMap = new HashMap<>();
@@ -117,7 +118,7 @@ public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin {
this.blacklist.handleLogin(new OriginBlacklistLoginEvent(event, null, EnumConnectionType.EAGLER, player));
}
@Subscribe(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));