mirror of
https://github.com/colbster937/originblacklist.git
synced 2026-02-04 19:17:40 +00:00
Compare commits
1 Commits
ebcae682aa
...
v2.0.7+1cd
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1cd60a4dba |
@@ -52,7 +52,6 @@ public final class OriginBlacklist {
|
|||||||
public static final String UNKNOWN_STR = "UNKNOWN";
|
public static final String UNKNOWN_STR = "UNKNOWN";
|
||||||
public static final String CENSORED_STR = "CENSORED";
|
public static final String CENSORED_STR = "CENSORED";
|
||||||
public static final String PLUGIN_REPO = "WebMCDevelopment/originblacklist";
|
public static final String PLUGIN_REPO = "WebMCDevelopment/originblacklist";
|
||||||
public static final int BSTATS_ID = 28776;
|
|
||||||
|
|
||||||
private final IOriginBlacklistPlugin plugin;
|
private final IOriginBlacklistPlugin plugin;
|
||||||
private final OriginBlacklistConfig config;
|
private final OriginBlacklistConfig config;
|
||||||
@@ -503,4 +502,10 @@ public final class OriginBlacklist {
|
|||||||
public static final boolean isNonNull(final String str) {
|
public static final boolean isNonNull(final String str) {
|
||||||
return str != null && !str.isEmpty() && !str.isBlank() && !str.equals("null");
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
package xyz.webmc.originblacklist.base.util;
|
package xyz.webmc.originblacklist.base.util;
|
||||||
|
|
||||||
public final class EventPriority {
|
public final class EaglerEventPriority {
|
||||||
public static final int EAGLER_MOTD_EVENT = 100;
|
public static final int EAGLER_MOTD_EVENT = 100;
|
||||||
}
|
}
|
||||||
@@ -76,7 +76,7 @@ public final class OriginBlacklistBukkit extends JavaPlugin implements Listener,
|
|||||||
this.getServer().getPluginManager().registerEvents(this, this);
|
this.getServer().getPluginManager().registerEvents(this, this);
|
||||||
this.blacklist.init();
|
this.blacklist.init();
|
||||||
if (this.blacklist.isMetricsEnabled()) {
|
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", () -> {
|
this.metrics.addCustomChart(new AdvancedPie("player_types", () -> {
|
||||||
final Map<String, Integer> playerMap = new HashMap<>();
|
final Map<String, Integer> playerMap = new HashMap<>();
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import xyz.webmc.originblacklist.base.enums.EnumConnectionType;
|
|||||||
import xyz.webmc.originblacklist.base.enums.EnumLogLevel;
|
import xyz.webmc.originblacklist.base.enums.EnumLogLevel;
|
||||||
import xyz.webmc.originblacklist.base.events.OriginBlacklistLoginEvent;
|
import xyz.webmc.originblacklist.base.events.OriginBlacklistLoginEvent;
|
||||||
import xyz.webmc.originblacklist.base.events.OriginBlacklistMOTDEvent;
|
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.IOriginBlacklistPlugin;
|
||||||
import xyz.webmc.originblacklist.base.util.IncompatibleDependencyException;
|
import xyz.webmc.originblacklist.base.util.IncompatibleDependencyException;
|
||||||
import xyz.webmc.originblacklist.base.util.OPlayer;
|
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.getProxy().getPluginManager().registerListener(this, this);
|
||||||
this.blacklist.init();
|
this.blacklist.init();
|
||||||
if (this.blacklist.isMetricsEnabled()) {
|
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", () -> {
|
this.metrics.addCustomChart(new AdvancedPie("player_types", () -> {
|
||||||
final Map<String, Integer> playerMap = new HashMap<>();
|
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));
|
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) {
|
public final void onEaglerMOTD(final EaglercraftMOTDEvent event) {
|
||||||
final OPlayer player = new OPlayer(event.getMOTDConnection(), null, null);
|
final OPlayer player = new OPlayer(event.getMOTDConnection(), null, null);
|
||||||
this.blacklist.handleMOTD(new OriginBlacklistMOTDEvent(event, null, EnumConnectionType.EAGLER, player));
|
this.blacklist.handleMOTD(new OriginBlacklistMOTDEvent(event, null, EnumConnectionType.EAGLER, player));
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import xyz.webmc.originblacklist.base.enums.EnumConnectionType;
|
|||||||
import xyz.webmc.originblacklist.base.enums.EnumLogLevel;
|
import xyz.webmc.originblacklist.base.enums.EnumLogLevel;
|
||||||
import xyz.webmc.originblacklist.base.events.OriginBlacklistLoginEvent;
|
import xyz.webmc.originblacklist.base.events.OriginBlacklistLoginEvent;
|
||||||
import xyz.webmc.originblacklist.base.events.OriginBlacklistMOTDEvent;
|
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.IOriginBlacklistPlugin;
|
||||||
import xyz.webmc.originblacklist.base.util.IncompatibleDependencyException;
|
import xyz.webmc.originblacklist.base.util.IncompatibleDependencyException;
|
||||||
import xyz.webmc.originblacklist.base.util.OPlayer;
|
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.proxy.getCommandManager().register("originblacklist", new OriginBlacklistCommandVelocity(this.blacklist));
|
||||||
this.blacklist.init();
|
this.blacklist.init();
|
||||||
if (this.blacklist.isMetricsEnabled()) {
|
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", () -> {
|
this.metrics.addCustomChart(new AdvancedPie("player_types", () -> {
|
||||||
final Map<String, Integer> playerMap = new HashMap<>();
|
final Map<String, Integer> playerMap = new HashMap<>();
|
||||||
|
|
||||||
@@ -118,7 +118,7 @@ public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin {
|
|||||||
this.blacklist.handleLogin(new OriginBlacklistLoginEvent(event, null, EnumConnectionType.EAGLER, player));
|
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) {
|
public final void onEaglerMOTD(final EaglercraftMOTDEvent event) {
|
||||||
final OPlayer player = new OPlayer(event.getMOTDConnection(), null, null);
|
final OPlayer player = new OPlayer(event.getMOTDConnection(), null, null);
|
||||||
this.blacklist.handleMOTD(new OriginBlacklistMOTDEvent(event, null, EnumConnectionType.EAGLER, player));
|
this.blacklist.handleMOTD(new OriginBlacklistMOTDEvent(event, null, EnumConnectionType.EAGLER, player));
|
||||||
|
|||||||
Reference in New Issue
Block a user