From b0fcff588b5e56d43f803b1e58deeca0a0a8c28a Mon Sep 17 00:00:00 2001 From: Colbster937 Date: Tue, 17 Feb 2026 17:21:34 -0600 Subject: [PATCH] start on subscriptions --- .../base/enums/EnumLogLevel.java | 8 -- .../bukkit/BukkitMetricsAdapter.java | 11 +-- ....java => OriginBlacklistBukkitPlugin.java} | 34 ++++---- .../bukkit/command/BKTCommandContext.java | 4 +- .../command/OriginBlacklistCommandBukkit.java | 4 +- .../bungee/BungeeMetricsAdapter.java | 11 +-- ....java => OriginBlacklistBungeePlugin.java} | 36 ++++----- .../bungee/command/BNGCommandContext.java | 4 +- .../command/OriginBlacklistCommandBungee.java | 8 +- .../{base => core}/OriginBlacklist.java | 77 ++++++++++++------- .../command/CommandContext.java | 4 +- .../{base => core}/command/ICommand.java | 2 +- .../command/OriginBlacklistCommand.java | 10 +-- .../config/OriginBlacklistConfig.java | 8 +- .../OriginBlacklistConfigTransformer.java | 2 +- .../enums/EnumBlacklistType.java | 4 +- .../enums/EnumConnectionType.java | 2 +- .../events/OriginBlacklistEvent.java | 6 +- .../events/OriginBlacklistLoginEvent.java | 6 +- .../events/OriginBlacklistMOTDEvent.java | 6 +- .../http/OriginBlacklistRequestHandler.java | 4 +- .../core/logger/AbstractLogger.java | 19 +++++ .../core/logger/JavaLogger.java | 27 +++++++ .../core/logger/SLF4JLogger.java | 26 +++++++ .../metrics/GenericMetricsAdapter.java | 2 +- .../{base => core}/util/BuildInfo.java | 2 +- .../{base => core}/util/ChatFormat.java | 2 +- .../util/EaglerEventPriority.java | 2 +- .../util/IOriginBlacklistPlugin.java | 14 ++-- .../util/IncompatibleDependencyException.java | 2 +- .../{base => core}/util/OPlayer.java | 4 +- .../{base => core}/util/UpdateChecker.java | 4 +- ...ava => OriginBlacklistVelocityPlugin.java} | 40 ++++------ .../velocity/VelocityMetricsAdapter.java | 8 +- .../OriginBlacklistCommandVelocity.java | 4 +- .../velocity/command/VCommandContext.java | 4 +- src/main/resources/bungee.yml | 2 +- src/main/resources/plugin.yml | 2 +- src/main/resources/velocity-plugin.json | 2 +- 39 files changed, 240 insertions(+), 177 deletions(-) delete mode 100644 src/main/java/xyz/webmc/originblacklist/base/enums/EnumLogLevel.java rename src/main/java/xyz/webmc/originblacklist/bukkit/{OriginBlacklistBukkit.java => OriginBlacklistBukkitPlugin.java} (89%) rename src/main/java/xyz/webmc/originblacklist/bungee/{OriginBlacklistBungee.java => OriginBlacklistBungeePlugin.java} (87%) rename src/main/java/xyz/webmc/originblacklist/{base => core}/OriginBlacklist.java (90%) rename src/main/java/xyz/webmc/originblacklist/{base => core}/command/CommandContext.java (70%) rename src/main/java/xyz/webmc/originblacklist/{base => core}/command/ICommand.java (86%) rename src/main/java/xyz/webmc/originblacklist/{base => core}/command/OriginBlacklistCommand.java (95%) rename src/main/java/xyz/webmc/originblacklist/{base => core}/config/OriginBlacklistConfig.java (98%) rename src/main/java/xyz/webmc/originblacklist/{base => core}/config/OriginBlacklistConfigTransformer.java (97%) rename src/main/java/xyz/webmc/originblacklist/{base => core}/enums/EnumBlacklistType.java (90%) rename src/main/java/xyz/webmc/originblacklist/{base => core}/enums/EnumConnectionType.java (53%) rename src/main/java/xyz/webmc/originblacklist/{base => core}/events/OriginBlacklistEvent.java (85%) rename src/main/java/xyz/webmc/originblacklist/{base => core}/events/OriginBlacklistLoginEvent.java (77%) rename src/main/java/xyz/webmc/originblacklist/{base => core}/events/OriginBlacklistMOTDEvent.java (77%) rename src/main/java/xyz/webmc/originblacklist/{base => core}/http/OriginBlacklistRequestHandler.java (93%) create mode 100644 src/main/java/xyz/webmc/originblacklist/core/logger/AbstractLogger.java create mode 100644 src/main/java/xyz/webmc/originblacklist/core/logger/JavaLogger.java create mode 100644 src/main/java/xyz/webmc/originblacklist/core/logger/SLF4JLogger.java rename src/main/java/xyz/webmc/originblacklist/{base => core}/metrics/GenericMetricsAdapter.java (89%) rename src/main/java/xyz/webmc/originblacklist/{base => core}/util/BuildInfo.java (91%) rename src/main/java/xyz/webmc/originblacklist/{base => core}/util/ChatFormat.java (96%) rename src/main/java/xyz/webmc/originblacklist/{base => core}/util/EaglerEventPriority.java (67%) rename src/main/java/xyz/webmc/originblacklist/{base => core}/util/IOriginBlacklistPlugin.java (71%) rename src/main/java/xyz/webmc/originblacklist/{base => core}/util/IncompatibleDependencyException.java (91%) rename src/main/java/xyz/webmc/originblacklist/{base => core}/util/OPlayer.java (97%) rename src/main/java/xyz/webmc/originblacklist/{base => core}/util/UpdateChecker.java (97%) rename src/main/java/xyz/webmc/originblacklist/velocity/{OriginBlacklistVelocity.java => OriginBlacklistVelocityPlugin.java} (88%) diff --git a/src/main/java/xyz/webmc/originblacklist/base/enums/EnumLogLevel.java b/src/main/java/xyz/webmc/originblacklist/base/enums/EnumLogLevel.java deleted file mode 100644 index 5a57d13..0000000 --- a/src/main/java/xyz/webmc/originblacklist/base/enums/EnumLogLevel.java +++ /dev/null @@ -1,8 +0,0 @@ -package xyz.webmc.originblacklist.base.enums; - -public enum EnumLogLevel { - INFO, - WARN, - ERROR, - DEBUG -} diff --git a/src/main/java/xyz/webmc/originblacklist/bukkit/BukkitMetricsAdapter.java b/src/main/java/xyz/webmc/originblacklist/bukkit/BukkitMetricsAdapter.java index bf9708c..d23d88c 100644 --- a/src/main/java/xyz/webmc/originblacklist/bukkit/BukkitMetricsAdapter.java +++ b/src/main/java/xyz/webmc/originblacklist/bukkit/BukkitMetricsAdapter.java @@ -1,16 +1,17 @@ package xyz.webmc.originblacklist.bukkit; -import xyz.webmc.originblacklist.base.OriginBlacklist; -import xyz.webmc.originblacklist.base.metrics.GenericMetricsAdapter; - import org.bstats.charts.CustomChart; + +import xyz.webmc.originblacklist.core.OriginBlacklist; +import xyz.webmc.originblacklist.core.metrics.GenericMetricsAdapter; + import org.bstats.bukkit.Metrics; public final class BukkitMetricsAdapter extends GenericMetricsAdapter { - private final OriginBlacklistBukkit plugin; + private final OriginBlacklistBukkitPlugin plugin; private Metrics metrics; - public BukkitMetricsAdapter(final OriginBlacklistBukkit plugin) { + public BukkitMetricsAdapter(final OriginBlacklistBukkitPlugin plugin) { super(); this.plugin = plugin; } diff --git a/src/main/java/xyz/webmc/originblacklist/bukkit/OriginBlacklistBukkit.java b/src/main/java/xyz/webmc/originblacklist/bukkit/OriginBlacklistBukkitPlugin.java similarity index 89% rename from src/main/java/xyz/webmc/originblacklist/bukkit/OriginBlacklistBukkit.java rename to src/main/java/xyz/webmc/originblacklist/bukkit/OriginBlacklistBukkitPlugin.java index 1bf57e2..7386027 100644 --- a/src/main/java/xyz/webmc/originblacklist/bukkit/OriginBlacklistBukkit.java +++ b/src/main/java/xyz/webmc/originblacklist/bukkit/OriginBlacklistBukkitPlugin.java @@ -1,14 +1,14 @@ package xyz.webmc.originblacklist.bukkit; -import xyz.webmc.originblacklist.base.OriginBlacklist; -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.IOriginBlacklistPlugin; -import xyz.webmc.originblacklist.base.util.IncompatibleDependencyException; -import xyz.webmc.originblacklist.base.util.OPlayer; import xyz.webmc.originblacklist.bukkit.command.OriginBlacklistCommandBukkit; +import xyz.webmc.originblacklist.core.OriginBlacklist; +import xyz.webmc.originblacklist.core.enums.EnumConnectionType; +import xyz.webmc.originblacklist.core.events.OriginBlacklistLoginEvent; +import xyz.webmc.originblacklist.core.events.OriginBlacklistMOTDEvent; +import xyz.webmc.originblacklist.core.logger.JavaLogger; +import xyz.webmc.originblacklist.core.util.IOriginBlacklistPlugin; +import xyz.webmc.originblacklist.core.util.IncompatibleDependencyException; +import xyz.webmc.originblacklist.core.util.OPlayer; import java.awt.image.BufferedImage; import java.io.ByteArrayInputStream; @@ -41,10 +41,11 @@ import org.bukkit.util.CachedServerIcon; import org.semver4j.Semver; @SuppressWarnings({ "rawtypes" }) -public final class OriginBlacklistBukkit extends JavaPlugin implements Listener, IOriginBlacklistPlugin { +public final class OriginBlacklistBukkitPlugin extends JavaPlugin implements Listener, IOriginBlacklistPlugin { private boolean papiPlaceholdersEnabled; private Object papi; private OriginBlacklist blacklist; + private JavaLogger logger; private Metrics metrics; private CachedServerIcon iconCache; @@ -71,6 +72,7 @@ public final class OriginBlacklistBukkit extends JavaPlugin implements Listener, } else { this.papi = null; } + this.logger = new JavaLogger(this.getLogger()); this.blacklist = new OriginBlacklist(this); this.getCommand("originblacklist").setExecutor(new OriginBlacklistCommandBukkit(this.blacklist)); this.getServer().getPluginManager().registerEvents(this, this); @@ -147,18 +149,8 @@ public final class OriginBlacklistBukkit extends JavaPlugin implements Listener, } @Override - public final void log(final EnumLogLevel level, final String txt) { - if (level == EnumLogLevel.WARN) { - this.getLogger().warning(txt); - } else if (level == EnumLogLevel.ERROR) { - this.getLogger().severe(txt); - } else if (level == EnumLogLevel.DEBUG) { - if (this.blacklist != null && this.blacklist.isDebugEnabled()) { - this.getLogger().info(txt); - } - } else { - this.getLogger().info(txt); - } + public final JavaLogger getTheLogger() { + return this.logger; } @Override diff --git a/src/main/java/xyz/webmc/originblacklist/bukkit/command/BKTCommandContext.java b/src/main/java/xyz/webmc/originblacklist/bukkit/command/BKTCommandContext.java index 0170829..dcd815d 100644 --- a/src/main/java/xyz/webmc/originblacklist/bukkit/command/BKTCommandContext.java +++ b/src/main/java/xyz/webmc/originblacklist/bukkit/command/BKTCommandContext.java @@ -1,7 +1,7 @@ package xyz.webmc.originblacklist.bukkit.command; -import xyz.webmc.originblacklist.base.OriginBlacklist; -import xyz.webmc.originblacklist.base.command.CommandContext; +import xyz.webmc.originblacklist.core.OriginBlacklist; +import xyz.webmc.originblacklist.core.command.CommandContext; import org.bukkit.command.CommandSender; diff --git a/src/main/java/xyz/webmc/originblacklist/bukkit/command/OriginBlacklistCommandBukkit.java b/src/main/java/xyz/webmc/originblacklist/bukkit/command/OriginBlacklistCommandBukkit.java index 5fbacb3..7beb885 100644 --- a/src/main/java/xyz/webmc/originblacklist/bukkit/command/OriginBlacklistCommandBukkit.java +++ b/src/main/java/xyz/webmc/originblacklist/bukkit/command/OriginBlacklistCommandBukkit.java @@ -1,7 +1,7 @@ package xyz.webmc.originblacklist.bukkit.command; -import xyz.webmc.originblacklist.base.OriginBlacklist; -import xyz.webmc.originblacklist.base.command.OriginBlacklistCommand; +import xyz.webmc.originblacklist.core.OriginBlacklist; +import xyz.webmc.originblacklist.core.command.OriginBlacklistCommand; import java.util.List; diff --git a/src/main/java/xyz/webmc/originblacklist/bungee/BungeeMetricsAdapter.java b/src/main/java/xyz/webmc/originblacklist/bungee/BungeeMetricsAdapter.java index 11cd61a..d37ca98 100644 --- a/src/main/java/xyz/webmc/originblacklist/bungee/BungeeMetricsAdapter.java +++ b/src/main/java/xyz/webmc/originblacklist/bungee/BungeeMetricsAdapter.java @@ -1,16 +1,17 @@ package xyz.webmc.originblacklist.bungee; -import xyz.webmc.originblacklist.base.OriginBlacklist; -import xyz.webmc.originblacklist.base.metrics.GenericMetricsAdapter; - import org.bstats.charts.CustomChart; + +import xyz.webmc.originblacklist.core.OriginBlacklist; +import xyz.webmc.originblacklist.core.metrics.GenericMetricsAdapter; + import org.bstats.bungeecord.Metrics; public final class BungeeMetricsAdapter extends GenericMetricsAdapter { - private final OriginBlacklistBungee plugin; + private final OriginBlacklistBungeePlugin plugin; private Metrics metrics; - public BungeeMetricsAdapter(final OriginBlacklistBungee plugin) { + public BungeeMetricsAdapter(final OriginBlacklistBungeePlugin plugin) { super(); this.plugin = plugin; } diff --git a/src/main/java/xyz/webmc/originblacklist/bungee/OriginBlacklistBungee.java b/src/main/java/xyz/webmc/originblacklist/bungee/OriginBlacklistBungeePlugin.java similarity index 87% rename from src/main/java/xyz/webmc/originblacklist/bungee/OriginBlacklistBungee.java rename to src/main/java/xyz/webmc/originblacklist/bungee/OriginBlacklistBungeePlugin.java index 954f522..0f88ce6 100644 --- a/src/main/java/xyz/webmc/originblacklist/bungee/OriginBlacklistBungee.java +++ b/src/main/java/xyz/webmc/originblacklist/bungee/OriginBlacklistBungeePlugin.java @@ -1,15 +1,15 @@ package xyz.webmc.originblacklist.bungee; -import xyz.webmc.originblacklist.base.OriginBlacklist; -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; import xyz.webmc.originblacklist.bungee.command.OriginBlacklistCommandBungee; +import xyz.webmc.originblacklist.core.OriginBlacklist; +import xyz.webmc.originblacklist.core.enums.EnumConnectionType; +import xyz.webmc.originblacklist.core.events.OriginBlacklistLoginEvent; +import xyz.webmc.originblacklist.core.events.OriginBlacklistMOTDEvent; +import xyz.webmc.originblacklist.core.logger.JavaLogger; +import xyz.webmc.originblacklist.core.util.EaglerEventPriority; +import xyz.webmc.originblacklist.core.util.IOriginBlacklistPlugin; +import xyz.webmc.originblacklist.core.util.IncompatibleDependencyException; +import xyz.webmc.originblacklist.core.util.OPlayer; import java.net.InetSocketAddress; import java.nio.file.Path; @@ -35,11 +35,12 @@ import net.md_5.bungee.event.EventPriority; import org.semver4j.Semver; @SuppressWarnings({ "deprecation", "rawtypes" }) -public final class OriginBlacklistBungee extends Plugin implements Listener, IOriginBlacklistPlugin { +public final class OriginBlacklistBungeePlugin extends Plugin implements Listener, IOriginBlacklistPlugin { private ProxyServer proxy; private boolean papiPlaceholdersEnabled; private Object papi; private OriginBlacklist blacklist; + private JavaLogger logger; @Override public final void onEnable() { @@ -65,6 +66,7 @@ public final class OriginBlacklistBungee extends Plugin implements Listener, IOr } else { this.papi = null; } + this.logger = new JavaLogger(this.getLogger()); this.blacklist = new OriginBlacklist(this); this.getProxy().getPluginManager().registerCommand(this, new OriginBlacklistCommandBungee(this, this.blacklist, "originblacklist")); @@ -147,18 +149,8 @@ public final class OriginBlacklistBungee extends Plugin implements Listener, IOr } @Override - public final void log(final EnumLogLevel level, final String txt) { - if (level == EnumLogLevel.WARN) { - this.getLogger().warning(txt); - } else if (level == EnumLogLevel.ERROR) { - this.getLogger().severe(txt); - } else if (level == EnumLogLevel.DEBUG) { - if (this.blacklist != null && this.blacklist.isDebugEnabled()) { - this.getLogger().info(txt); - } - } else { - this.getLogger().info(txt); - } + public final JavaLogger getTheLogger() { + return this.logger; } @Override diff --git a/src/main/java/xyz/webmc/originblacklist/bungee/command/BNGCommandContext.java b/src/main/java/xyz/webmc/originblacklist/bungee/command/BNGCommandContext.java index 7017863..f41c283 100644 --- a/src/main/java/xyz/webmc/originblacklist/bungee/command/BNGCommandContext.java +++ b/src/main/java/xyz/webmc/originblacklist/bungee/command/BNGCommandContext.java @@ -1,7 +1,7 @@ package xyz.webmc.originblacklist.bungee.command; -import xyz.webmc.originblacklist.base.OriginBlacklist; -import xyz.webmc.originblacklist.base.command.CommandContext; +import xyz.webmc.originblacklist.core.OriginBlacklist; +import xyz.webmc.originblacklist.core.command.CommandContext; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.chat.TextComponent; diff --git a/src/main/java/xyz/webmc/originblacklist/bungee/command/OriginBlacklistCommandBungee.java b/src/main/java/xyz/webmc/originblacklist/bungee/command/OriginBlacklistCommandBungee.java index 4d43224..f02165b 100644 --- a/src/main/java/xyz/webmc/originblacklist/bungee/command/OriginBlacklistCommandBungee.java +++ b/src/main/java/xyz/webmc/originblacklist/bungee/command/OriginBlacklistCommandBungee.java @@ -1,8 +1,8 @@ package xyz.webmc.originblacklist.bungee.command; -import xyz.webmc.originblacklist.base.OriginBlacklist; -import xyz.webmc.originblacklist.base.command.OriginBlacklistCommand; -import xyz.webmc.originblacklist.bungee.OriginBlacklistBungee; +import xyz.webmc.originblacklist.bungee.OriginBlacklistBungeePlugin; +import xyz.webmc.originblacklist.core.OriginBlacklist; +import xyz.webmc.originblacklist.core.command.OriginBlacklistCommand; import java.util.List; @@ -14,7 +14,7 @@ public final class OriginBlacklistCommandBungee extends Command implements TabEx private final OriginBlacklistCommand cmd; private final OriginBlacklist blacklist; - public OriginBlacklistCommandBungee(final OriginBlacklistBungee plugin, final OriginBlacklist blacklist, + public OriginBlacklistCommandBungee(final OriginBlacklistBungeePlugin plugin, final OriginBlacklist blacklist, final String command) { super(command); this.cmd = new OriginBlacklistCommand(blacklist); diff --git a/src/main/java/xyz/webmc/originblacklist/base/OriginBlacklist.java b/src/main/java/xyz/webmc/originblacklist/core/OriginBlacklist.java similarity index 90% rename from src/main/java/xyz/webmc/originblacklist/base/OriginBlacklist.java rename to src/main/java/xyz/webmc/originblacklist/core/OriginBlacklist.java index 1750c60..54359ff 100644 --- a/src/main/java/xyz/webmc/originblacklist/base/OriginBlacklist.java +++ b/src/main/java/xyz/webmc/originblacklist/core/OriginBlacklist.java @@ -1,17 +1,17 @@ -package xyz.webmc.originblacklist.base; +package xyz.webmc.originblacklist.core; -import xyz.webmc.originblacklist.base.config.OriginBlacklistConfig; -import xyz.webmc.originblacklist.base.enums.EnumBlacklistType; -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.http.OriginBlacklistRequestHandler; -import xyz.webmc.originblacklist.base.metrics.GenericMetricsAdapter; -import xyz.webmc.originblacklist.base.util.BuildInfo; -import xyz.webmc.originblacklist.base.util.IOriginBlacklistPlugin; -import xyz.webmc.originblacklist.base.util.OPlayer; -import xyz.webmc.originblacklist.base.util.UpdateChecker; +import xyz.webmc.originblacklist.core.config.OriginBlacklistConfig; +import xyz.webmc.originblacklist.core.enums.EnumBlacklistType; +import xyz.webmc.originblacklist.core.enums.EnumConnectionType; +import xyz.webmc.originblacklist.core.events.OriginBlacklistLoginEvent; +import xyz.webmc.originblacklist.core.events.OriginBlacklistMOTDEvent; +import xyz.webmc.originblacklist.core.http.OriginBlacklistRequestHandler; +import xyz.webmc.originblacklist.core.logger.AbstractLogger; +import xyz.webmc.originblacklist.core.metrics.GenericMetricsAdapter; +import xyz.webmc.originblacklist.core.util.BuildInfo; +import xyz.webmc.originblacklist.core.util.IOriginBlacklistPlugin; +import xyz.webmc.originblacklist.core.util.OPlayer; +import xyz.webmc.originblacklist.core.util.UpdateChecker; import java.io.InputStream; import java.io.OutputStream; @@ -25,6 +25,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; import java.nio.file.StandardOpenOption; +import java.security.MessageDigest; import java.time.Instant; import java.util.ArrayList; import java.util.Base64; @@ -49,7 +50,7 @@ import net.lax1dude.eaglercraft.backend.server.api.query.IMOTDConnection; import org.bstats.charts.AdvancedPie; import org.semver4j.Semver; -@SuppressWarnings({ "rawtypes" }) +@SuppressWarnings({ "rawtypes", "unused" }) public final class OriginBlacklist { private static final String COMMIT_L = BuildInfo.get("git_cm_hash"); private static final String COMMIT_S = COMMIT_L.substring(0, 8); @@ -63,6 +64,7 @@ public final class OriginBlacklist { private final IOriginBlacklistPlugin plugin; private final OriginBlacklistConfig config; private final GenericMetricsAdapter metrics; + private final AbstractLogger logger; private final Json5 json5; private String updateURL; private Path jarFile; @@ -71,14 +73,14 @@ public final class OriginBlacklist { this.plugin = plugin; this.config = new OriginBlacklistConfig(this); this.metrics = plugin.getMetrics(); + this.logger = plugin.getTheLogger().setPlugin(this); + ; this.json5 = Json5.builder(builder -> builder.prettyPrinting().indentFactor(0).build()); } public final void init() { this.jarFile = this.plugin.getPluginJarPath(); - this.plugin.scheduleRepeat(() -> { - this.checkForUpdates(); - }, this.config.getInteger("update_checker.check_timer"), TimeUnit.SECONDS); + this.plugin.scheduleRepeat(this::repeatTick, 3600, TimeUnit.SECONDS); if (this.isBlacklistAPIEnabled()) { OriginBlacklistRequestHandler.register(this); } @@ -92,15 +94,15 @@ public final class OriginBlacklist { } return playerMap; })); - this.plugin.log(EnumLogLevel.INFO, "Initialized Plugin"); - this.plugin.log(EnumLogLevel.DEBUG, "Commit " + COMMIT_L); + this.logger.info("Initialized Plugin"); + this.logger.debug("Commit " + COMMIT_L); if (this.isMetricsEnabled()) { this.metrics.start(); } } public final void shutdown() { - this.plugin.log(EnumLogLevel.INFO, "Shutting down..."); + this.logger.info("Shutting down..."); if (this.isBlacklistAPIEnabled()) { OriginBlacklistRequestHandler.unRegister(this); } @@ -151,7 +153,7 @@ public final class OriginBlacklist { this.sendWebhooks(event, blacklisted); final String name = player.getName(); if (isNonNullStr(name)) { - this.plugin.log(EnumLogLevel.INFO, "Prevented blacklisted player " + name + " from joining."); + this.logger.info("Prevented blacklisted player " + name + " from joining."); this.updateLogFile(event, blacklisted); } } @@ -233,9 +235,9 @@ public final class OriginBlacklist { this.config.getBoolean("update_checker.allow_snapshots")); if (isNonNullStr((this.updateURL))) { action1.run(); - return; + } else { + action2.run(); } - action2.run(); }); } else { action2.run(); @@ -370,8 +372,7 @@ public final class OriginBlacklist { public final String getBlacklistShare() { try { final Json5Object obj = new Json5Object(); - obj.addProperty("plugin_version", this.plugin.getPluginVersion().getVersion()); - obj.addProperty("git_commit", COMMIT_L); + obj.addProperty("plugin_version", this.plugin.getPluginVersion().getVersion() + "+" + COMMIT_S); obj.addProperty("blacklist_to_whitelist", this.config.getBoolean("blacklist_to_whitelist")); obj.addProperty("block_undefined_origin", this.config.getBoolean("block_undefined_origin")); final Json5Object bObj = new Json5Object(); @@ -387,7 +388,7 @@ public final class OriginBlacklist { } public final String getDataDir() { - return "plugins/" + plugin.getPluginId(); + return "plugins/" + this.plugin.getPluginId(); } public final IEaglerXServerAPI getEaglerAPI() { @@ -496,7 +497,7 @@ public final class OriginBlacklist { final int code = conn.getResponseCode(); if (code < 200 || code >= 300) { - this.plugin.log(EnumLogLevel.WARN, "Webhook failed (HTTP " + code + ")"); + this.logger.warn("Webhook failed (HTTP " + code + ")"); } conn.disconnect(); @@ -508,11 +509,15 @@ public final class OriginBlacklist { } } + private final void repeatTick() { + this.checkForUpdates(); + } + private final void checkForUpdates() { this.checkForUpdates(() -> { // if (!this.config.getBoolean("update_checker.auto_update")) { if (true) { - this.plugin.log(EnumLogLevel.INFO, "An update is available! Download it at " + this.updateURL); + this.logger.info("An update is available! Download it at " + this.updateURL); } else { this.updatePlugin(); } @@ -560,6 +565,22 @@ public final class OriginBlacklist { return str != null && !str.isEmpty() && !str.isBlank() && !str.equals("null"); } + public static final String sha256(String input) { + try { + final MessageDigest md = MessageDigest.getInstance("SHA-256"); + final byte[] hash = md.digest(input.getBytes(StandardCharsets.UTF_8)); + + final StringBuilder sb = new StringBuilder(); + for (final byte b : hash) { + sb.append(String.format("%02x", b)); + } + + return sb.toString(); + } catch (final Throwable t) { + throw new RuntimeException(t); + } + } + public static final class BSTATS { public static final int VELOCITY = 29033; public static final int BUNGEE = 29034; diff --git a/src/main/java/xyz/webmc/originblacklist/base/command/CommandContext.java b/src/main/java/xyz/webmc/originblacklist/core/command/CommandContext.java similarity index 70% rename from src/main/java/xyz/webmc/originblacklist/base/command/CommandContext.java rename to src/main/java/xyz/webmc/originblacklist/core/command/CommandContext.java index 037900b..a22a3d1 100644 --- a/src/main/java/xyz/webmc/originblacklist/base/command/CommandContext.java +++ b/src/main/java/xyz/webmc/originblacklist/core/command/CommandContext.java @@ -1,6 +1,6 @@ -package xyz.webmc.originblacklist.base.command; +package xyz.webmc.originblacklist.core.command; -import xyz.webmc.originblacklist.base.OriginBlacklist; +import xyz.webmc.originblacklist.core.OriginBlacklist; public interface CommandContext { public OriginBlacklist getPlugin(); diff --git a/src/main/java/xyz/webmc/originblacklist/base/command/ICommand.java b/src/main/java/xyz/webmc/originblacklist/core/command/ICommand.java similarity index 86% rename from src/main/java/xyz/webmc/originblacklist/base/command/ICommand.java rename to src/main/java/xyz/webmc/originblacklist/core/command/ICommand.java index 48f4625..32d5cb8 100644 --- a/src/main/java/xyz/webmc/originblacklist/base/command/ICommand.java +++ b/src/main/java/xyz/webmc/originblacklist/core/command/ICommand.java @@ -1,4 +1,4 @@ -package xyz.webmc.originblacklist.base.command; +package xyz.webmc.originblacklist.core.command; import java.util.List; diff --git a/src/main/java/xyz/webmc/originblacklist/base/command/OriginBlacklistCommand.java b/src/main/java/xyz/webmc/originblacklist/core/command/OriginBlacklistCommand.java similarity index 95% rename from src/main/java/xyz/webmc/originblacklist/base/command/OriginBlacklistCommand.java rename to src/main/java/xyz/webmc/originblacklist/core/command/OriginBlacklistCommand.java index 57b90f8..b136c50 100644 --- a/src/main/java/xyz/webmc/originblacklist/base/command/OriginBlacklistCommand.java +++ b/src/main/java/xyz/webmc/originblacklist/core/command/OriginBlacklistCommand.java @@ -1,9 +1,9 @@ -package xyz.webmc.originblacklist.base.command; +package xyz.webmc.originblacklist.core.command; -import xyz.webmc.originblacklist.base.OriginBlacklist; -import xyz.webmc.originblacklist.base.config.OriginBlacklistConfig; -import xyz.webmc.originblacklist.base.enums.EnumBlacklistType; -import xyz.webmc.originblacklist.base.util.OPlayer; +import xyz.webmc.originblacklist.core.OriginBlacklist; +import xyz.webmc.originblacklist.core.config.OriginBlacklistConfig; +import xyz.webmc.originblacklist.core.enums.EnumBlacklistType; +import xyz.webmc.originblacklist.core.util.OPlayer; import java.util.List; diff --git a/src/main/java/xyz/webmc/originblacklist/base/config/OriginBlacklistConfig.java b/src/main/java/xyz/webmc/originblacklist/core/config/OriginBlacklistConfig.java similarity index 98% rename from src/main/java/xyz/webmc/originblacklist/base/config/OriginBlacklistConfig.java rename to src/main/java/xyz/webmc/originblacklist/core/config/OriginBlacklistConfig.java index 42b0ccc..db820ab 100644 --- a/src/main/java/xyz/webmc/originblacklist/base/config/OriginBlacklistConfig.java +++ b/src/main/java/xyz/webmc/originblacklist/core/config/OriginBlacklistConfig.java @@ -1,6 +1,6 @@ -package xyz.webmc.originblacklist.base.config; +package xyz.webmc.originblacklist.core.config; -import xyz.webmc.originblacklist.base.OriginBlacklist; +import xyz.webmc.originblacklist.core.OriginBlacklist; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; @@ -313,6 +313,8 @@ public final class OriginBlacklistConfig { final Json5Array ips = new Json5Array(); ips.add("192.0.2.0/24"); addJSONObj(bObj, "ip_addresses", ips, null); + final Json5Array sub = new Json5Array(); + addJSONObj(bObj, "subscriptions", sub, null); addJSONObj(obj, "blacklist", bObj, null); final Json5Object dObj = new Json5Object(); addJSONObj(dObj, "invite", Json5Primitive.fromString("discord.gg/changeme"), null); @@ -325,7 +327,7 @@ public final class OriginBlacklistConfig { final Json5Object uObj = new Json5Object(); addJSONObj(uObj, "enabled", Json5Primitive.fromBoolean(true), null); addJSONObj(uObj, "allow_snapshots", Json5Primitive.fromBoolean(false), null); - addJSONObj(uObj, "check_timer", Json5Primitive.fromNumber(3600), null); + // addJSONObj(uObj, "check_timer", Json5Primitive.fromNumber(3600), null); addJSONObj(uObj, "auto_update", Json5Primitive.fromBoolean(false), null); addJSONObj(obj, "update_checker", uObj, null); addJSONObj(obj, "blacklist_http_api", Json5Primitive.fromBoolean(false), null); diff --git a/src/main/java/xyz/webmc/originblacklist/base/config/OriginBlacklistConfigTransformer.java b/src/main/java/xyz/webmc/originblacklist/core/config/OriginBlacklistConfigTransformer.java similarity index 97% rename from src/main/java/xyz/webmc/originblacklist/base/config/OriginBlacklistConfigTransformer.java rename to src/main/java/xyz/webmc/originblacklist/core/config/OriginBlacklistConfigTransformer.java index de27559..91998ac 100644 --- a/src/main/java/xyz/webmc/originblacklist/base/config/OriginBlacklistConfigTransformer.java +++ b/src/main/java/xyz/webmc/originblacklist/core/config/OriginBlacklistConfigTransformer.java @@ -1,4 +1,4 @@ -package xyz.webmc.originblacklist.base.config; +package xyz.webmc.originblacklist.core.config; import de.marhali.json5.Json5Array; import de.marhali.json5.Json5Object; diff --git a/src/main/java/xyz/webmc/originblacklist/base/enums/EnumBlacklistType.java b/src/main/java/xyz/webmc/originblacklist/core/enums/EnumBlacklistType.java similarity index 90% rename from src/main/java/xyz/webmc/originblacklist/base/enums/EnumBlacklistType.java rename to src/main/java/xyz/webmc/originblacklist/core/enums/EnumBlacklistType.java index 8f54135..9eff2f4 100644 --- a/src/main/java/xyz/webmc/originblacklist/base/enums/EnumBlacklistType.java +++ b/src/main/java/xyz/webmc/originblacklist/core/enums/EnumBlacklistType.java @@ -1,6 +1,6 @@ -package xyz.webmc.originblacklist.base.enums; +package xyz.webmc.originblacklist.core.enums; -import xyz.webmc.originblacklist.base.OriginBlacklist; +import xyz.webmc.originblacklist.core.OriginBlacklist; public enum EnumBlacklistType { ORIGIN("origin", "website", "origins", null), diff --git a/src/main/java/xyz/webmc/originblacklist/base/enums/EnumConnectionType.java b/src/main/java/xyz/webmc/originblacklist/core/enums/EnumConnectionType.java similarity index 53% rename from src/main/java/xyz/webmc/originblacklist/base/enums/EnumConnectionType.java rename to src/main/java/xyz/webmc/originblacklist/core/enums/EnumConnectionType.java index f647c41..0689f44 100644 --- a/src/main/java/xyz/webmc/originblacklist/base/enums/EnumConnectionType.java +++ b/src/main/java/xyz/webmc/originblacklist/core/enums/EnumConnectionType.java @@ -1,4 +1,4 @@ -package xyz.webmc.originblacklist.base.enums; +package xyz.webmc.originblacklist.core.enums; public enum EnumConnectionType { JAVA, diff --git a/src/main/java/xyz/webmc/originblacklist/base/events/OriginBlacklistEvent.java b/src/main/java/xyz/webmc/originblacklist/core/events/OriginBlacklistEvent.java similarity index 85% rename from src/main/java/xyz/webmc/originblacklist/base/events/OriginBlacklistEvent.java rename to src/main/java/xyz/webmc/originblacklist/core/events/OriginBlacklistEvent.java index 798b9e4..67f4db2 100644 --- a/src/main/java/xyz/webmc/originblacklist/base/events/OriginBlacklistEvent.java +++ b/src/main/java/xyz/webmc/originblacklist/core/events/OriginBlacklistEvent.java @@ -1,7 +1,7 @@ -package xyz.webmc.originblacklist.base.events; +package xyz.webmc.originblacklist.core.events; -import xyz.webmc.originblacklist.base.enums.EnumConnectionType; -import xyz.webmc.originblacklist.base.util.OPlayer; +import xyz.webmc.originblacklist.core.enums.EnumConnectionType; +import xyz.webmc.originblacklist.core.util.OPlayer; import net.lax1dude.eaglercraft.backend.server.api.event.IBaseServerEvent; diff --git a/src/main/java/xyz/webmc/originblacklist/base/events/OriginBlacklistLoginEvent.java b/src/main/java/xyz/webmc/originblacklist/core/events/OriginBlacklistLoginEvent.java similarity index 77% rename from src/main/java/xyz/webmc/originblacklist/base/events/OriginBlacklistLoginEvent.java rename to src/main/java/xyz/webmc/originblacklist/core/events/OriginBlacklistLoginEvent.java index 7f9fd8c..657bbb7 100644 --- a/src/main/java/xyz/webmc/originblacklist/base/events/OriginBlacklistLoginEvent.java +++ b/src/main/java/xyz/webmc/originblacklist/core/events/OriginBlacklistLoginEvent.java @@ -1,7 +1,7 @@ -package xyz.webmc.originblacklist.base.events; +package xyz.webmc.originblacklist.core.events; -import xyz.webmc.originblacklist.base.enums.EnumConnectionType; -import xyz.webmc.originblacklist.base.util.OPlayer; +import xyz.webmc.originblacklist.core.enums.EnumConnectionType; +import xyz.webmc.originblacklist.core.util.OPlayer; import net.lax1dude.eaglercraft.backend.server.api.event.IEaglercraftLoginEvent; diff --git a/src/main/java/xyz/webmc/originblacklist/base/events/OriginBlacklistMOTDEvent.java b/src/main/java/xyz/webmc/originblacklist/core/events/OriginBlacklistMOTDEvent.java similarity index 77% rename from src/main/java/xyz/webmc/originblacklist/base/events/OriginBlacklistMOTDEvent.java rename to src/main/java/xyz/webmc/originblacklist/core/events/OriginBlacklistMOTDEvent.java index 10afbb5..d44d6ef 100644 --- a/src/main/java/xyz/webmc/originblacklist/base/events/OriginBlacklistMOTDEvent.java +++ b/src/main/java/xyz/webmc/originblacklist/core/events/OriginBlacklistMOTDEvent.java @@ -1,7 +1,7 @@ -package xyz.webmc.originblacklist.base.events; +package xyz.webmc.originblacklist.core.events; -import xyz.webmc.originblacklist.base.enums.EnumConnectionType; -import xyz.webmc.originblacklist.base.util.OPlayer; +import xyz.webmc.originblacklist.core.enums.EnumConnectionType; +import xyz.webmc.originblacklist.core.util.OPlayer; import net.lax1dude.eaglercraft.backend.server.api.event.IEaglercraftMOTDEvent; diff --git a/src/main/java/xyz/webmc/originblacklist/base/http/OriginBlacklistRequestHandler.java b/src/main/java/xyz/webmc/originblacklist/core/http/OriginBlacklistRequestHandler.java similarity index 93% rename from src/main/java/xyz/webmc/originblacklist/base/http/OriginBlacklistRequestHandler.java rename to src/main/java/xyz/webmc/originblacklist/core/http/OriginBlacklistRequestHandler.java index 22cfcca..dc76cc3 100644 --- a/src/main/java/xyz/webmc/originblacklist/base/http/OriginBlacklistRequestHandler.java +++ b/src/main/java/xyz/webmc/originblacklist/core/http/OriginBlacklistRequestHandler.java @@ -1,6 +1,6 @@ -package xyz.webmc.originblacklist.base.http; +package xyz.webmc.originblacklist.core.http; -import xyz.webmc.originblacklist.base.OriginBlacklist; +import xyz.webmc.originblacklist.core.OriginBlacklist; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/xyz/webmc/originblacklist/core/logger/AbstractLogger.java b/src/main/java/xyz/webmc/originblacklist/core/logger/AbstractLogger.java new file mode 100644 index 0000000..6809b3b --- /dev/null +++ b/src/main/java/xyz/webmc/originblacklist/core/logger/AbstractLogger.java @@ -0,0 +1,19 @@ +package xyz.webmc.originblacklist.core.logger; + +import xyz.webmc.originblacklist.core.OriginBlacklist; + +public abstract class AbstractLogger { + private OriginBlacklist plugin = null; + public abstract void info(final String txt, final Object ...args); + public abstract void warn(final String txt, final Object ...args); + public abstract void error(final String txt, final Object ...args); + public final AbstractLogger setPlugin(final OriginBlacklist plugin) { + this.plugin = plugin; + return this; + } + public final void debug(final String txt, final Object ...args) { + if (this.plugin.isDebugEnabled()) { + this.info(txt, args); + } + } +} diff --git a/src/main/java/xyz/webmc/originblacklist/core/logger/JavaLogger.java b/src/main/java/xyz/webmc/originblacklist/core/logger/JavaLogger.java new file mode 100644 index 0000000..1fe9b08 --- /dev/null +++ b/src/main/java/xyz/webmc/originblacklist/core/logger/JavaLogger.java @@ -0,0 +1,27 @@ +package xyz.webmc.originblacklist.core.logger; + +import java.util.logging.Level; +import java.util.logging.Logger; + +public final class JavaLogger extends AbstractLogger { + private final Logger logger; + + public JavaLogger(final Logger logger) { + this.logger = logger; + } + + @Override + public final void info(final String txt, final Object ...args) { + this.logger.log(Level.INFO, txt, args); + } + + @Override + public final void warn(final String txt, final Object ...args) { + this.logger.log(Level.WARNING, txt, args); + } + + @Override + public final void error(final String txt, final Object ...args) { + this.logger.log(Level.SEVERE, txt, args); + } +} diff --git a/src/main/java/xyz/webmc/originblacklist/core/logger/SLF4JLogger.java b/src/main/java/xyz/webmc/originblacklist/core/logger/SLF4JLogger.java new file mode 100644 index 0000000..d561c17 --- /dev/null +++ b/src/main/java/xyz/webmc/originblacklist/core/logger/SLF4JLogger.java @@ -0,0 +1,26 @@ +package xyz.webmc.originblacklist.core.logger; + +import org.slf4j.Logger; + +public final class SLF4JLogger extends AbstractLogger { + private final Logger logger; + + public SLF4JLogger(final Logger logger) { + this.logger = logger; + } + + @Override + public final void info(final String txt, final Object ...args) { + this.logger.info(txt, args); + } + + @Override + public final void warn(final String txt, final Object ...args) { + this.logger.warn(txt, args); + } + + @Override + public final void error(final String txt, final Object ...args) { + this.logger.error(txt, args); + } +} diff --git a/src/main/java/xyz/webmc/originblacklist/base/metrics/GenericMetricsAdapter.java b/src/main/java/xyz/webmc/originblacklist/core/metrics/GenericMetricsAdapter.java similarity index 89% rename from src/main/java/xyz/webmc/originblacklist/base/metrics/GenericMetricsAdapter.java rename to src/main/java/xyz/webmc/originblacklist/core/metrics/GenericMetricsAdapter.java index ac5b2b8..f645efb 100644 --- a/src/main/java/xyz/webmc/originblacklist/base/metrics/GenericMetricsAdapter.java +++ b/src/main/java/xyz/webmc/originblacklist/core/metrics/GenericMetricsAdapter.java @@ -1,4 +1,4 @@ -package xyz.webmc.originblacklist.base.metrics; +package xyz.webmc.originblacklist.core.metrics; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/xyz/webmc/originblacklist/base/util/BuildInfo.java b/src/main/java/xyz/webmc/originblacklist/core/util/BuildInfo.java similarity index 91% rename from src/main/java/xyz/webmc/originblacklist/base/util/BuildInfo.java rename to src/main/java/xyz/webmc/originblacklist/core/util/BuildInfo.java index 4255e61..b65b5e3 100644 --- a/src/main/java/xyz/webmc/originblacklist/base/util/BuildInfo.java +++ b/src/main/java/xyz/webmc/originblacklist/core/util/BuildInfo.java @@ -1,4 +1,4 @@ -package xyz.webmc.originblacklist.base.util; +package xyz.webmc.originblacklist.core.util; import java.io.InputStream; import java.util.Properties; diff --git a/src/main/java/xyz/webmc/originblacklist/base/util/ChatFormat.java b/src/main/java/xyz/webmc/originblacklist/core/util/ChatFormat.java similarity index 96% rename from src/main/java/xyz/webmc/originblacklist/base/util/ChatFormat.java rename to src/main/java/xyz/webmc/originblacklist/core/util/ChatFormat.java index 3b45208..43636d5 100644 --- a/src/main/java/xyz/webmc/originblacklist/base/util/ChatFormat.java +++ b/src/main/java/xyz/webmc/originblacklist/core/util/ChatFormat.java @@ -1,4 +1,4 @@ -package xyz.webmc.originblacklist.base.util; +package xyz.webmc.originblacklist.core.util; public final class ChatFormat { private static final String SYMBOL = "ยง"; diff --git a/src/main/java/xyz/webmc/originblacklist/base/util/EaglerEventPriority.java b/src/main/java/xyz/webmc/originblacklist/core/util/EaglerEventPriority.java similarity index 67% rename from src/main/java/xyz/webmc/originblacklist/base/util/EaglerEventPriority.java rename to src/main/java/xyz/webmc/originblacklist/core/util/EaglerEventPriority.java index 7c19486..e526a51 100644 --- a/src/main/java/xyz/webmc/originblacklist/base/util/EaglerEventPriority.java +++ b/src/main/java/xyz/webmc/originblacklist/core/util/EaglerEventPriority.java @@ -1,4 +1,4 @@ -package xyz.webmc.originblacklist.base.util; +package xyz.webmc.originblacklist.core.util; public final class EaglerEventPriority { public static final int EAGLER_MOTD_EVENT = 100; diff --git a/src/main/java/xyz/webmc/originblacklist/base/util/IOriginBlacklistPlugin.java b/src/main/java/xyz/webmc/originblacklist/core/util/IOriginBlacklistPlugin.java similarity index 71% rename from src/main/java/xyz/webmc/originblacklist/base/util/IOriginBlacklistPlugin.java rename to src/main/java/xyz/webmc/originblacklist/core/util/IOriginBlacklistPlugin.java index 6c38f1c..5cfe0fe 100644 --- a/src/main/java/xyz/webmc/originblacklist/base/util/IOriginBlacklistPlugin.java +++ b/src/main/java/xyz/webmc/originblacklist/core/util/IOriginBlacklistPlugin.java @@ -1,9 +1,9 @@ -package xyz.webmc.originblacklist.base.util; +package xyz.webmc.originblacklist.core.util; -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.metrics.GenericMetricsAdapter; +import xyz.webmc.originblacklist.core.events.OriginBlacklistLoginEvent; +import xyz.webmc.originblacklist.core.events.OriginBlacklistMOTDEvent; +import xyz.webmc.originblacklist.core.logger.AbstractLogger; +import xyz.webmc.originblacklist.core.metrics.GenericMetricsAdapter; import java.nio.file.Path; import java.util.concurrent.TimeUnit; @@ -22,9 +22,9 @@ public interface IOriginBlacklistPlugin { public GenericMetricsAdapter getMetrics(); - public IEaglerXServerAPI getEaglerAPI(); + public AbstractLogger getTheLogger(); - public void log(final EnumLogLevel level, final String txt); + public IEaglerXServerAPI getEaglerAPI(); public void kickPlayer(final Component txt, final OriginBlacklistLoginEvent event); diff --git a/src/main/java/xyz/webmc/originblacklist/base/util/IncompatibleDependencyException.java b/src/main/java/xyz/webmc/originblacklist/core/util/IncompatibleDependencyException.java similarity index 91% rename from src/main/java/xyz/webmc/originblacklist/base/util/IncompatibleDependencyException.java rename to src/main/java/xyz/webmc/originblacklist/core/util/IncompatibleDependencyException.java index f1d07e6..381fdca 100644 --- a/src/main/java/xyz/webmc/originblacklist/base/util/IncompatibleDependencyException.java +++ b/src/main/java/xyz/webmc/originblacklist/core/util/IncompatibleDependencyException.java @@ -1,4 +1,4 @@ -package xyz.webmc.originblacklist.base.util; +package xyz.webmc.originblacklist.core.util; import org.semver4j.Semver; diff --git a/src/main/java/xyz/webmc/originblacklist/base/util/OPlayer.java b/src/main/java/xyz/webmc/originblacklist/core/util/OPlayer.java similarity index 97% rename from src/main/java/xyz/webmc/originblacklist/base/util/OPlayer.java rename to src/main/java/xyz/webmc/originblacklist/core/util/OPlayer.java index df3a577..16a026f 100644 --- a/src/main/java/xyz/webmc/originblacklist/base/util/OPlayer.java +++ b/src/main/java/xyz/webmc/originblacklist/core/util/OPlayer.java @@ -1,6 +1,6 @@ -package xyz.webmc.originblacklist.base.util; +package xyz.webmc.originblacklist.core.util; -import xyz.webmc.originblacklist.base.OriginBlacklist; +import xyz.webmc.originblacklist.core.OriginBlacklist; import java.net.InetSocketAddress; import java.net.SocketAddress; diff --git a/src/main/java/xyz/webmc/originblacklist/base/util/UpdateChecker.java b/src/main/java/xyz/webmc/originblacklist/core/util/UpdateChecker.java similarity index 97% rename from src/main/java/xyz/webmc/originblacklist/base/util/UpdateChecker.java rename to src/main/java/xyz/webmc/originblacklist/core/util/UpdateChecker.java index 3549d9a..9e9517a 100644 --- a/src/main/java/xyz/webmc/originblacklist/base/util/UpdateChecker.java +++ b/src/main/java/xyz/webmc/originblacklist/core/util/UpdateChecker.java @@ -1,6 +1,6 @@ -package xyz.webmc.originblacklist.base.util; +package xyz.webmc.originblacklist.core.util; -import xyz.webmc.originblacklist.base.OriginBlacklist; +import xyz.webmc.originblacklist.core.OriginBlacklist; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/src/main/java/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocity.java b/src/main/java/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocityPlugin.java similarity index 88% rename from src/main/java/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocity.java rename to src/main/java/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocityPlugin.java index 6fc13a7..18cad25 100644 --- a/src/main/java/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocity.java +++ b/src/main/java/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocityPlugin.java @@ -1,14 +1,14 @@ package xyz.webmc.originblacklist.velocity; -import xyz.webmc.originblacklist.base.OriginBlacklist; -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; +import xyz.webmc.originblacklist.core.OriginBlacklist; +import xyz.webmc.originblacklist.core.enums.EnumConnectionType; +import xyz.webmc.originblacklist.core.events.OriginBlacklistLoginEvent; +import xyz.webmc.originblacklist.core.events.OriginBlacklistMOTDEvent; +import xyz.webmc.originblacklist.core.logger.SLF4JLogger; +import xyz.webmc.originblacklist.core.util.EaglerEventPriority; +import xyz.webmc.originblacklist.core.util.IOriginBlacklistPlugin; +import xyz.webmc.originblacklist.core.util.IncompatibleDependencyException; +import xyz.webmc.originblacklist.core.util.OPlayer; import xyz.webmc.originblacklist.velocity.command.OriginBlacklistCommandVelocity; import java.net.InetSocketAddress; @@ -42,23 +42,23 @@ import org.semver4j.Semver; import org.slf4j.Logger; @SuppressWarnings({ "deprecation", "rawtypes" }) -public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin { +public final class OriginBlacklistVelocityPlugin implements IOriginBlacklistPlugin { private final PluginContainer plugin; private final Factory metricsFactory; private final ProxyServer proxy; - private final Logger logger; + private final SLF4JLogger logger; private boolean papiPlaceholdersEnabled; private Object papi; private OriginBlacklist blacklist; @Inject - public OriginBlacklistVelocity(final PluginContainer plugin, Factory metricsFactory, final ProxyServer proxy, + public OriginBlacklistVelocityPlugin(final PluginContainer plugin, Factory metricsFactory, final ProxyServer proxy, final Logger logger) { this.plugin = plugin; this.metricsFactory = metricsFactory; this.proxy = proxy; - this.logger = logger; + this.logger = new SLF4JLogger(logger); } @Subscribe @@ -167,18 +167,8 @@ public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin { } @Override - public final void log(final EnumLogLevel level, final String txt) { - if (level == EnumLogLevel.WARN) { - this.logger.warn(txt); - } else if (level == EnumLogLevel.ERROR) { - this.logger.error(txt); - } else if (level == EnumLogLevel.DEBUG) { - if (this.blacklist.isDebugEnabled()) { - this.logger.info(txt); - } - } else { - this.logger.info(txt); - } + public final SLF4JLogger getTheLogger() { + return this.logger; } @Override diff --git a/src/main/java/xyz/webmc/originblacklist/velocity/VelocityMetricsAdapter.java b/src/main/java/xyz/webmc/originblacklist/velocity/VelocityMetricsAdapter.java index bf2916c..6451201 100644 --- a/src/main/java/xyz/webmc/originblacklist/velocity/VelocityMetricsAdapter.java +++ b/src/main/java/xyz/webmc/originblacklist/velocity/VelocityMetricsAdapter.java @@ -1,18 +1,18 @@ package xyz.webmc.originblacklist.velocity; -import xyz.webmc.originblacklist.base.OriginBlacklist; -import xyz.webmc.originblacklist.base.metrics.GenericMetricsAdapter; +import xyz.webmc.originblacklist.core.OriginBlacklist; +import xyz.webmc.originblacklist.core.metrics.GenericMetricsAdapter; import org.bstats.charts.CustomChart; import org.bstats.velocity.Metrics; import org.bstats.velocity.Metrics.Factory; public final class VelocityMetricsAdapter extends GenericMetricsAdapter { - private final OriginBlacklistVelocity plugin; + private final OriginBlacklistVelocityPlugin plugin; private final Factory factory; private Metrics metrics; - public VelocityMetricsAdapter(final OriginBlacklistVelocity plugin, final Factory factory) { + public VelocityMetricsAdapter(final OriginBlacklistVelocityPlugin plugin, final Factory factory) { super(); this.plugin = plugin; this.factory = factory; diff --git a/src/main/java/xyz/webmc/originblacklist/velocity/command/OriginBlacklistCommandVelocity.java b/src/main/java/xyz/webmc/originblacklist/velocity/command/OriginBlacklistCommandVelocity.java index f71f91c..a9f2c5d 100644 --- a/src/main/java/xyz/webmc/originblacklist/velocity/command/OriginBlacklistCommandVelocity.java +++ b/src/main/java/xyz/webmc/originblacklist/velocity/command/OriginBlacklistCommandVelocity.java @@ -1,7 +1,7 @@ package xyz.webmc.originblacklist.velocity.command; -import xyz.webmc.originblacklist.base.OriginBlacklist; -import xyz.webmc.originblacklist.base.command.OriginBlacklistCommand; +import xyz.webmc.originblacklist.core.OriginBlacklist; +import xyz.webmc.originblacklist.core.command.OriginBlacklistCommand; import java.util.List; diff --git a/src/main/java/xyz/webmc/originblacklist/velocity/command/VCommandContext.java b/src/main/java/xyz/webmc/originblacklist/velocity/command/VCommandContext.java index df15a5e..7415cf4 100644 --- a/src/main/java/xyz/webmc/originblacklist/velocity/command/VCommandContext.java +++ b/src/main/java/xyz/webmc/originblacklist/velocity/command/VCommandContext.java @@ -1,7 +1,7 @@ package xyz.webmc.originblacklist.velocity.command; -import xyz.webmc.originblacklist.base.OriginBlacklist; -import xyz.webmc.originblacklist.base.command.CommandContext; +import xyz.webmc.originblacklist.core.OriginBlacklist; +import xyz.webmc.originblacklist.core.command.CommandContext; import com.velocitypowered.api.command.SimpleCommand.Invocation; import net.kyori.adventure.text.minimessage.MiniMessage; diff --git a/src/main/resources/bungee.yml b/src/main/resources/bungee.yml index 9c007d2..594e4ac 100644 --- a/src/main/resources/bungee.yml +++ b/src/main/resources/bungee.yml @@ -1,6 +1,6 @@ name: ${plugin_name} version: ${plugin_vers} -main: xyz.webmc.${plugin_iden}.bungee.${plugin_name}Bungee +main: xyz.webmc.${plugin_iden}.bungee.${plugin_name}BungeePlugin description: ${plugin_desc} website: ${plugin_site} author: ${plugin_athr} diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 659e87c..88d7797 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: ${plugin_name} version: ${plugin_vers} -main: xyz.webmc.${plugin_iden}.bukkit.${plugin_name}Bukkit +main: xyz.webmc.${plugin_iden}.bukkit.${plugin_name}BukkitPlugin description: ${plugin_desc} website: ${plugin_site} authors: ${plugin_athr} diff --git a/src/main/resources/velocity-plugin.json b/src/main/resources/velocity-plugin.json index 364eeb1..68a070d 100644 --- a/src/main/resources/velocity-plugin.json +++ b/src/main/resources/velocity-plugin.json @@ -4,7 +4,7 @@ "version": "${plugin_vers}", "description": "${plugin_desc}", "website": "${plugin_site}", - "main": "xyz.webmc.${plugin_iden}.velocity.${plugin_name}Velocity", + "main": "xyz.webmc.${plugin_iden}.velocity.${plugin_name}VelocityPlugin", "authors": ${plugin_athr}, "dependencies": ${plugin_depc} } \ No newline at end of file