Bump com.gradleup.shadow from 9.3.2 to 9.4.0 (#26)

Bumps [com.gradleup.shadow](https://github.com/GradleUp/shadow) from 9.3.2 to 9.4.0.
- [Release notes](https://github.com/GradleUp/shadow/releases)
- [Commits](https://github.com/GradleUp/shadow/compare/9.3.2...9.4.0)

---
updated-dependencies:
- dependency-name: com.gradleup.shadow
  dependency-version: 9.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/dependabot.yml

@@ -5,8 +5,15 @@ updates:
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major"]
+
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
       interval: "weekly"
     open-pull-requests-limit: 10
+    ignore:
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major"]

.github/workflows/dependabot.yml

@@ -1,7 +1,5 @@
-name: Dependabot Auto Merge
-
 on:
-  pull_request_target:
+  pull_request:
 
 permissions:
   contents: write
@@ -9,11 +7,16 @@ permissions:
 
 jobs:
   dependabot:
-    if: github.actor == 'dependabot[bot]'
     runs-on: ubuntu-latest
+    if: github.event.pull_request.user.login == 'dependabot[bot]'
     steps:
-      - uses: fastify/github-action-merge-dependabot@v3
+      - id: metadata
+        uses: dependabot/fetch-metadata@21025c705c08248db411dc16f3619e6b5f9ea21a
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
-          merge-method: squash
+
-          target: minor
+      - if: steps.metadata.outputs.update-type != 'version-update:semver-major'
+        run: gh pr merge --auto --squash "$PR_URL"
+        env:
+          PR_URL: ${{ github.event.pull_request.html_url }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/gradle.yml

@@ -1,5 +1,3 @@
-name: Build Plugin
-
 on:
   workflow_dispatch:
   push:

README.md

@@ -24,6 +24,11 @@
 - [x] Modular multi-platform support
 - [x] JSON5 based configuration
 
+<h2>Requirements</h2>
+
+- Eagler(craft)XServer v1.0.2 or newer
+- JDK 21 or newer
+
 <h2>Download</h2>
 The latest release can be found at <b><a href="https://github.com/WebMCDevelopment/originblacklist/releases/latest/">https://github.com/WebMCDevelopment/originblacklist/releases/latest/</a></b>
 

build.gradle.kts

@@ -14,7 +14,7 @@ val PLUGIN_NAME = "OriginBlacklist"
 val PLUGIN_IDEN = "originblacklist"
 val PLUGIN_DOMN = "xyz.webmc.$PLUGIN_IDEN"
 val PLUGIN_DESC = "An eaglercraft client blacklist plugin."
-val PLUGIN_VERS = "2.0.8"
+val PLUGIN_VERS = "2.0.9"
 val PLUGIN_SITE = "https://github.com/WebMCDevelopment/$PLUGIN_IDEN"
 val PLUGIN_DEPA = listOf("EaglercraftXServer")
 val PLUGIN_DEPB = listOf("EaglercraftXServer")
@@ -42,7 +42,7 @@ val EAGXS_VER = "1.0.8"
 
 plugins {
   id("java")
-  id("com.gradleup.shadow") version "9.3.0"
+  id("com.gradleup.shadow") version "9.4.0"
   id("com.palantir.git-version") version "4.2.0"
   id("xyz.jpenilla.run-paper") version "3.0.2"
   id("xyz.jpenilla.run-waterfall") version "3.0.2"
@@ -65,22 +65,22 @@ repositories {
 }
 
 dependencies {
-  compileOnly("com.velocitypowered:velocity-api:3.4.0-SNAPSHOT")
+  compileOnly("com.velocitypowered:velocity-api:3.5.0-SNAPSHOT")
   compileOnly("org.bukkit:bukkit:1.8-R0.1-SNAPSHOT")
   compileOnly("net.md-5:bungeecord-api:1.21-R0.5-SNAPSHOT")
   compileOnly("net.lax1dude.eaglercraft.backend:api-velocity:1.0.0")
   compileOnly("net.lax1dude.eaglercraft.backend:api-bungee:1.0.0")
   compileOnly("net.lax1dude.eaglercraft.backend:api-bukkit:1.0.0")
-  compileOnly("me.clip:placeholderapi:2.11.7")
+  compileOnly("me.clip:placeholderapi:2.12.2")
   compileOnly("net.william278:papiproxybridge:1.8.4")
   implementation("org.semver4j:semver4j:6.0.0")
   implementation("de.marhali:json5-java:3.0.0")
   implementation("net.kyori:adventure-text-minimessage:4.26.1")
   implementation("net.kyori:adventure-text-serializer-legacy:4.26.1")
-  implementation("com.github.seancfoley:ipaddress:5.5.1")
+  implementation("com.github.seancfoley:ipaddress:5.6.2")
-  implementation("org.bstats:bstats-bukkit:3.1.0")
+  implementation("org.bstats:bstats-bukkit:3.2.1")
-  implementation("org.bstats:bstats-bungeecord:3.1.0")
+  implementation("org.bstats:bstats-bungeecord:3.2.1")
-  implementation("org.bstats:bstats-velocity:3.1.0")
+  implementation("org.bstats:bstats-velocity:3.2.1")
 }
 
 sourceSets {
@@ -91,7 +91,7 @@ sourceSets {
 }
 
 java {
-  toolchain.languageVersion.set(JavaLanguageVersion.of(17))
+  toolchain.languageVersion.set(JavaLanguageVersion.of(21))
 }
 
 val BUILD_PROPS = mapOf(
@@ -111,12 +111,12 @@ val BUILD_PROPS = mapOf(
   "git_cm_hash" to GIT_INFO.gitHashFull,
 )
 
-tasks.withType<JavaCompile>().configureEach {
+tasks.named<JavaCompile>("compileJava") {
   options.encoding = "UTF-8"
-  options.release.set(17)
+  options.release.set(21)
 }
 
-tasks.withType<ProcessResources>().configureEach {
+tasks.named<ProcessResources>("processResources") {
   duplicatesStrategy = DuplicatesStrategy.EXCLUDE
   outputs.upToDateWhen { false }
   
@@ -139,11 +139,12 @@ tasks.withType<ProcessResources>().configureEach {
   inputs.files(tasks.named<JavaCompile>("compileJava").map { it.outputs.files })
 }
 
-tasks.withType<Jar>().configureEach {
+tasks.named<Jar>("jar") {
-  if (this !is ShadowJar) enabled = false
+  enabled = false
 }
 
-tasks.withType<ShadowJar>().configureEach {
+tasks.named<ShadowJar>("shadowJar") {
+  enabled = true
   doFirst {
     delete(layout.buildDirectory.dir("libs"))
     mkdir(layout.buildDirectory.dir("libs"))
@@ -168,17 +169,17 @@ tasks.register("printVars") {
   }
 }
 
-tasks.withType<RunServer>().configureEach {
+tasks.named<RunServer>("runServer") {
   minecraftVersion("1.12.2")
   runDirectory.set(layout.projectDirectory.dir("run/paper"))
   jvmArgs("-Dcom.mojang.eula.agree=true")
   downloadPlugins {
     github("lax1dude", "eaglerxserver", "v" + EAGXS_VER, "EaglerXServer.jar")
-    modrinth("placeholderapi", "2.11.7")
+    modrinth("placeholderapi", "2.12.2")
   }
 }
 
-tasks.withType<RunWaterfall>().configureEach {
+tasks.named<RunWaterfall>("runWaterfall") {
   waterfallVersion("1.21")
   runDirectory.set(layout.projectDirectory.dir("run/waterfall"))
   downloadPlugins {
@@ -186,8 +187,8 @@ tasks.withType<RunWaterfall>().configureEach {
   }
 }
 
-tasks.withType<RunVelocity>().configureEach {
+tasks.named<RunVelocity>("runVelocity") {
-  velocityVersion("3.4.0-SNAPSHOT")
+  velocityVersion("3.5.0-SNAPSHOT")
   runDirectory.set(layout.projectDirectory.dir("run/velocity"))
   downloadPlugins {
     github("lax1dude", "eaglerxserver", "v" + EAGXS_VER, "EaglerXServer.jar")

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/xyz/webmc/originblacklist/base/enums/EnumLogLevel.java

@@ -1,8 +0,0 @@
-package xyz.webmc.originblacklist.base.enums;
-
-public enum EnumLogLevel {
-  INFO,
-  WARN,
-  ERROR,
-  DEBUG
-}

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

@@ -0,0 +1,36 @@
+package xyz.webmc.originblacklist.bukkit;
+
+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 OriginBlacklistBukkitPlugin plugin;
+  private Metrics metrics;
+
+  public BukkitMetricsAdapter(final OriginBlacklistBukkitPlugin plugin) {
+    super();
+    this.plugin = plugin;
+  }
+
+  @Override
+  public void start() {
+    if (this.metrics == null) {
+      this.metrics = new Metrics(this.plugin, OriginBlacklist.BSTATS.BUKKIT);
+      for (final CustomChart chart : this.charts) {
+        this.metrics.addCustomChart(chart);
+      }
+    }
+  }
+
+  @Override
+  public void shutdown() {
+    if (this.metrics != null) {
+      this.metrics.shutdown();
+      this.metrics = null;
+    }
+  }
+}

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);
@@ -136,24 +138,19 @@ public final class OriginBlacklistBukkit extends JavaPlugin implements Listener,
     return Paths.get(this.getFile().getAbsolutePath());
   }
 
+  @Override
+  public final BukkitMetricsAdapter getMetrics() {
+    return new BukkitMetricsAdapter(this);
+  }
+
   @Override
   public final IEaglerXServerAPI getEaglerAPI() {
     return EaglerXServerAPI.instance();
   }
 
   @Override
-  public final void log(final EnumLogLevel level, final String txt) {
+  public final JavaLogger getTheLogger() {
-    if (level == EnumLogLevel.WARN) {
+    return this.logger;
-      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);
-    }
   }
 
   @Override
@@ -248,7 +245,6 @@ public final class OriginBlacklistBukkit extends JavaPlugin implements Listener,
 
   @Override
   public final void shutdown() {
-    this.metrics.shutdown();
     Bukkit.getScheduler().cancelTasks(this);
   }
 }

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.core.OriginBlacklist;
-import xyz.webmc.originblacklist.base.command.CommandContext;
+import xyz.webmc.originblacklist.core.command.CommandContext;
 
 import org.bukkit.command.CommandSender;
 

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.core.OriginBlacklist;
-import xyz.webmc.originblacklist.base.command.OriginBlacklistCommand;
+import xyz.webmc.originblacklist.core.command.OriginBlacklistCommand;
 
 import java.util.List;
 

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

@@ -0,0 +1,36 @@
+package xyz.webmc.originblacklist.bungee;
+
+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 OriginBlacklistBungeePlugin plugin;
+  private Metrics metrics;
+
+  public BungeeMetricsAdapter(final OriginBlacklistBungeePlugin plugin) {
+    super();
+    this.plugin = plugin;
+  }
+
+  @Override
+  public void start() {
+    if (this.metrics == null) {
+      this.metrics = new Metrics(this.plugin, OriginBlacklist.BSTATS.BUNGEE);
+      for (final CustomChart chart : this.charts) {
+        this.metrics.addCustomChart(chart);
+      }
+    }
+  }
+
+  @Override
+  public void shutdown() {
+    if (this.metrics != null) {
+      this.metrics.shutdown();
+      this.metrics = null;
+    }
+  }
+}

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

@@ -1,21 +1,19 @@
 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;
 import java.nio.file.Paths;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import net.kyori.adventure.text.Component;
@@ -34,17 +32,15 @@ import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.event.EventHandler;
 import net.md_5.bungee.event.EventPriority;
-import org.bstats.bungeecord.Metrics;
-import org.bstats.charts.AdvancedPie;
 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 Metrics metrics;
+  private JavaLogger logger;
 
   @Override
   public final void onEnable() {
@@ -70,25 +66,12 @@ 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"));
     this.getProxy().getPluginManager().registerListener(this, this);
     this.blacklist.init();
-    if (this.blacklist.isMetricsEnabled()) {
-      this.metrics = new Metrics(this, OriginBlacklist.BSTATS.BUNGEE);
-      this.metrics.addCustomChart(new AdvancedPie("player_types", () -> {
-        final Map<String, Integer> playerMap = new HashMap<>();
-
-        for (final ProxiedPlayer player : this.proxy.getPlayers()) {
-          final boolean eagler = this.getEaglerAPI().isEaglerPlayerByUUID(player.getUniqueId());
-          final String key = eagler ? "Eagler" : "Java";
-          playerMap.put(key, playerMap.getOrDefault(key, 0) + 1);
-        }
-
-        return playerMap;
-      }));
-    }
   }
 
   @Override
@@ -113,8 +96,9 @@ public final class OriginBlacklistBungee extends Plugin implements Listener, IOr
     final PendingConnection conn = event.getPlayer().getPendingConnection();
     final InetSocketAddress vhost = conn.getVirtualHost();
     final ProxiedPlayer aPlayer = event.getPlayer();
+    final String origin = vhost != null ? vhost.getHostString() + vhost.getPort() : OriginBlacklist.UNKNOWN_STR;
     final OPlayer bPlayer = new OPlayer(null, aPlayer.getName(), aPlayer.getUniqueId(),
-        aPlayer.getAddress().toString(), aPlayer.getClientBrand(), vhost.getHostString() + vhost.getPort(),
+        aPlayer.getAddress().toString(), aPlayer.getClientBrand(), origin,
         conn.getVersion());
     this.blacklist.handleLogin(new OriginBlacklistLoginEvent(null, event, EnumConnectionType.JAVA, bPlayer));
   }
@@ -123,8 +107,9 @@ public final class OriginBlacklistBungee extends Plugin implements Listener, IOr
   public final void onJavaHandshake(final PreLoginEvent event) {
     final PendingConnection conn = event.getConnection();
     final InetSocketAddress vhost = conn.getVirtualHost();
+    final String origin = vhost != null ? vhost.getHostString() + vhost.getPort() : OriginBlacklist.UNKNOWN_STR;
     final OPlayer player = new OPlayer(null, null, null, conn.getAddress().toString(), OriginBlacklist.UNKNOWN_STR,
-        vhost.getHostString() + vhost.getPort(), conn.getVersion());
+        origin, conn.getVersion());
     this.blacklist.handleLogin(new OriginBlacklistLoginEvent(null, event, EnumConnectionType.JAVA, player));
   }
 
@@ -132,8 +117,9 @@ public final class OriginBlacklistBungee extends Plugin implements Listener, IOr
   public final void onJavaMOTD(final ProxyPingEvent event) {
     final PendingConnection conn = event.getConnection();
     final InetSocketAddress vhost = conn.getVirtualHost();
+    final String origin = vhost != null ? vhost.getHostString() + vhost.getPort() : OriginBlacklist.UNKNOWN_STR;
     final OPlayer player = new OPlayer(null, null, null, conn.getAddress().toString(), null,
-        vhost.getHostString() + vhost.getPort(), -1);
+        origin, -1);
     this.blacklist.handleMOTD(new OriginBlacklistMOTDEvent(null, event, EnumConnectionType.JAVA, player));
   }
 
@@ -152,24 +138,19 @@ public final class OriginBlacklistBungee extends Plugin implements Listener, IOr
     return Paths.get(this.getFile().getAbsolutePath());
   }
 
+  @Override
+  public final BungeeMetricsAdapter getMetrics() {
+    return new BungeeMetricsAdapter(this);
+  }
+
   @Override
   public final IEaglerXServerAPI getEaglerAPI() {
     return EaglerXServerAPI.instance();
   }
 
   @Override
-  public final void log(final EnumLogLevel level, final String txt) {
+  public final JavaLogger getTheLogger() {
-    if (level == EnumLogLevel.WARN) {
+    return this.logger;
-      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);
-    }
   }
 
   @Override
@@ -226,7 +207,6 @@ public final class OriginBlacklistBungee extends Plugin implements Listener, IOr
 
   @Override
   public final void shutdown() {
-    this.metrics.shutdown();
     this.proxy.getScheduler().cancel(this);
   }
 }

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.core.OriginBlacklist;
-import xyz.webmc.originblacklist.base.command.CommandContext;
+import xyz.webmc.originblacklist.core.command.CommandContext;
 
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.chat.TextComponent;

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.bungee.OriginBlacklistBungeePlugin;
-import xyz.webmc.originblacklist.base.command.OriginBlacklistCommand;
+import xyz.webmc.originblacklist.core.OriginBlacklist;
-import xyz.webmc.originblacklist.bungee.OriginBlacklistBungee;
+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);

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

@@ -1,20 +1,22 @@
-package xyz.webmc.originblacklist.base;
+package xyz.webmc.originblacklist.core;
 
-import xyz.webmc.originblacklist.base.config.OriginBlacklistConfig;
+import xyz.webmc.originblacklist.core.config.OriginBlacklistConfig;
-import xyz.webmc.originblacklist.base.enums.EnumBlacklistType;
+import xyz.webmc.originblacklist.core.enums.EnumBlacklistType;
-import xyz.webmc.originblacklist.base.enums.EnumConnectionType;
+import xyz.webmc.originblacklist.core.enums.EnumConnectionType;
-import xyz.webmc.originblacklist.base.enums.EnumLogLevel;
+import xyz.webmc.originblacklist.core.events.OriginBlacklistLoginEvent;
-import xyz.webmc.originblacklist.base.events.OriginBlacklistLoginEvent;
+import xyz.webmc.originblacklist.core.events.OriginBlacklistMOTDEvent;
-import xyz.webmc.originblacklist.base.events.OriginBlacklistMOTDEvent;
+import xyz.webmc.originblacklist.core.http.OriginBlacklistRequestHandler;
-import xyz.webmc.originblacklist.base.http.OriginBlacklistRequestHandler;
+import xyz.webmc.originblacklist.core.logger.AbstractLogger;
-import xyz.webmc.originblacklist.base.util.BuildInfo;
+import xyz.webmc.originblacklist.core.metrics.GenericMetricsAdapter;
-import xyz.webmc.originblacklist.base.util.IOriginBlacklistPlugin;
+import xyz.webmc.originblacklist.core.util.BuildInfo;
-import xyz.webmc.originblacklist.base.util.OPlayer;
+import xyz.webmc.originblacklist.core.util.IOriginBlacklistPlugin;
-import xyz.webmc.originblacklist.base.util.UpdateChecker;
+import xyz.webmc.originblacklist.core.util.OPlayer;
+import xyz.webmc.originblacklist.core.util.UpdateChecker;
 
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
+import java.net.URI;
 import java.net.URL;
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
@@ -23,10 +25,13 @@ 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;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import de.marhali.json5.Json5;
@@ -38,11 +43,14 @@ import inet.ipaddr.IPAddressString;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
+import net.lax1dude.eaglercraft.backend.server.api.IBasePlayer;
+import net.lax1dude.eaglercraft.backend.server.api.IEaglerPlayer;
 import net.lax1dude.eaglercraft.backend.server.api.IEaglerXServerAPI;
 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);
@@ -55,6 +63,8 @@ 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;
@@ -62,26 +72,43 @@ public final class OriginBlacklist {
   public OriginBlacklist(final IOriginBlacklistPlugin plugin) {
     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.plugin.scheduleRepeat(this::repeatTick, 3600, TimeUnit.SECONDS);
-      this.checkForUpdates();
-    }, this.config.getInteger("update_checker.check_timer"), TimeUnit.SECONDS);
     if (this.isBlacklistAPIEnabled()) {
       OriginBlacklistRequestHandler.register(this);
     }
-    this.plugin.log(EnumLogLevel.INFO, "Initialized Plugin");
+    this.metrics.addCustomChart(new AdvancedPie("player_types", () -> {
-    this.plugin.log(EnumLogLevel.DEBUG, "Commit " + COMMIT_L);
+      final Map<String, Integer> playerMap = new HashMap<>();
+      for (final Object player : this.getEaglerAPI().getAllPlayers()) {
+        if (player instanceof IBasePlayer bPlayer) {
+          final String key = (bPlayer instanceof IEaglerPlayer) ? "Eagler" : "Java";
+          playerMap.put(key, playerMap.getOrDefault(key, 0) + 1);
+        }
+      }
+      return playerMap;
+    }));
+    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);
     }
+    if (this.isMetricsEnabled()) {
+      this.metrics.shutdown();
+    }
     this.plugin.shutdown();
   }
 
@@ -94,6 +121,14 @@ public final class OriginBlacklist {
       }
     } catch (final Throwable t) {
     }
+    try {
+      if (this.isMetricsEnabled()) {
+        this.metrics.start();
+      } else {
+        this.metrics.shutdown();
+      }
+    } catch (final Throwable t) {
+    }
   }
 
   public final void handleLogin(final OriginBlacklistLoginEvent event) {
@@ -117,8 +152,8 @@ public final class OriginBlacklist {
           blacklisted_value, blacklisted.getActionString(), false), event);
       this.sendWebhooks(event, blacklisted);
       final String name = player.getName();
-      if (isNonNull(name)) {
+      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);
       }
     }
@@ -181,7 +216,8 @@ public final class OriginBlacklist {
     }
     final List<String> pLst = new ArrayList<>();
     for (final Json5Element ln : this.config.getArray("motd.players.hover").getAsJson5Array()) {
-      pLst.add(getLegacyFromMiniMessage(ln.getAsString().replaceAll("%discord_invite%", this.config.getString("discord.invite"))));
+      pLst.add(getLegacyFromMiniMessage(
+          ln.getAsString().replaceAll("%discord_invite%", this.config.getString("discord.invite"))));
     }
     conn.setServerMOTD(lst);
     conn.setPlayerTotal(this.config.getInteger("motd.players.online"));
@@ -197,11 +233,11 @@ public final class OriginBlacklist {
       this.plugin.runAsync(() -> {
         this.updateURL = UpdateChecker.checkForUpdates(PLUGIN_REPO, this.plugin.getPluginVersion(),
             this.config.getBoolean("update_checker.allow_snapshots"));
-        if (isNonNull((this.updateURL))) {
+        if (isNonNullStr((this.updateURL))) {
           action1.run();
-          return;
+        } else {
+          action2.run();
         }
-        action2.run();
       });
     } else {
       action2.run();
@@ -210,7 +246,7 @@ public final class OriginBlacklist {
 
   public final void updatePlugin(final Runnable action1, final Runnable action2) {
     try {
-      final URL url = new URL(this.updateURL);
+      final URL url = (new URI(this.updateURL)).toURL();
       final Path jar = this.jarFile;
       final Path bak = jar.resolveSibling(jar.getFileName().toString() + ".bak");
       final Path upd = jar
@@ -234,14 +270,16 @@ public final class OriginBlacklist {
         } finally {
           conn.disconnect();
         }
-        Files.delete(jar);
+        if (Files.exists(upd)) {
-        Files.delete(bak);
+          Files.delete(jar);
-        this.jarFile = upd;
+          Files.delete(bak);
-        action1.run();
+          this.jarFile = upd;
-        return;
+          action1.run();
+          return;
+        }
       } catch (final Throwable t) {
-        t.printStackTrace();
         Files.move(bak, jar, StandardCopyOption.REPLACE_EXISTING);
+        throw t;
       }
     } catch (final Throwable t) {
       t.printStackTrace();
@@ -264,7 +302,7 @@ public final class OriginBlacklist {
     final boolean whitelist = this.config.getBoolean("blacklist_to_whitelist");
     EnumBlacklistType type = EnumBlacklistType.NONE;
 
-    if (isNonNull(origin)) {
+    if (isNonNullStr(origin)) {
       if (whitelist && !type.isBlacklisted())
         type = EnumBlacklistType.ORIGIN;
       for (final Json5Element element : this.config.getArray("blacklist.origins").getAsJson5Array()) {
@@ -280,7 +318,7 @@ public final class OriginBlacklist {
       return whitelist ? EnumBlacklistType.NONE : EnumBlacklistType.ORIGIN;
     }
 
-    if (isNonNull(brand)) {
+    if (isNonNullStr(brand)) {
       if (whitelist && !type.isBlacklisted())
         type = EnumBlacklistType.BRAND;
       for (final Json5Element element : this.config.getArray("blacklist.brands")) {
@@ -294,7 +332,7 @@ public final class OriginBlacklist {
       }
     }
 
-    if (isNonNull(name)) {
+    if (isNonNullStr(name)) {
       if (whitelist && !type.isBlacklisted())
         type = EnumBlacklistType.NAME;
       for (final Json5Element element : this.config.getArray("blacklist.player_names")) {
@@ -308,7 +346,7 @@ public final class OriginBlacklist {
       }
     }
 
-    if (isNonNull(addr)) {
+    if (isNonNullStr(addr)) {
       if (whitelist && !type.isBlacklisted())
         type = EnumBlacklistType.ADDR;
       for (final Json5Element element : this.config.getArray("blacklist.ip_addresses")) {
@@ -334,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("plugin_version", this.plugin.getPluginVersion().getVersion() + "+" + COMMIT_S);
-      obj.addProperty("git_commit", COMMIT_L);
       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();
@@ -351,7 +388,7 @@ public final class OriginBlacklist {
   }
 
   public final String getDataDir() {
-    return "plugins/" + plugin.getPluginId();
+    return "plugins/" + this.plugin.getPluginId();
   }
 
   public final IEaglerXServerAPI getEaglerAPI() {
@@ -446,7 +483,7 @@ public final class OriginBlacklist {
       for (final Json5Element element : arr) {
         this.plugin.runAsync(() -> {
           try {
-            final URL url = new URL(element.getAsString());
+            final URL url = (new URI(element.getAsString())).toURL();
             final HttpURLConnection conn = (HttpURLConnection) url.openConnection();
             conn.setRequestMethod("POST");
             conn.setRequestProperty("Content-Type", "application/json");
@@ -460,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();
@@ -472,10 +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 (!this.config.getBoolean("update_checker.auto_update")) {
-        this.plugin.log(EnumLogLevel.INFO, "An update is available! Download it at " + this.updateURL);
+      if (true) {
+        this.logger.info("An update is available! Download it at " + this.updateURL);
       } else {
         this.updatePlugin();
       }
@@ -519,10 +561,26 @@ public final class OriginBlacklist {
     return BuildInfo.get("plugin_name") + "/" + BuildInfo.get("plugin_vers") + "+" + BuildInfo.get("git_cm_hash");
   }
 
-  public static final boolean isNonNull(final String str) {
+  public static final boolean isNonNullStr(final String str) {
     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;

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();

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;
 

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.core.OriginBlacklist;
-import xyz.webmc.originblacklist.base.config.OriginBlacklistConfig;
+import xyz.webmc.originblacklist.core.config.OriginBlacklistConfig;
-import xyz.webmc.originblacklist.base.enums.EnumBlacklistType;
+import xyz.webmc.originblacklist.core.enums.EnumBlacklistType;
-import xyz.webmc.originblacklist.base.util.OPlayer;
+import xyz.webmc.originblacklist.core.util.OPlayer;
 
 import java.util.List;
 
@@ -54,7 +54,7 @@ public class OriginBlacklistCommand implements ICommand {
           } else {
             ctx.reply(NO_PERMISSION);
           }
-        } else if ((add || remove) && OriginBlacklist.isNonNull(argB)) {
+        } else if ((add || remove) && OriginBlacklist.isNonNullStr(argB)) {
           if ((add && ctx.hasPermission("originblacklist.command.add"))
               || (remove && ctx.hasPermission("originblacklist.command.add"))) {
             final String arrName;
@@ -69,7 +69,7 @@ public class OriginBlacklistCommand implements ICommand {
             } else {
               arrName = null;
             }
-            if (OriginBlacklist.isNonNull(arrName)) {
+            if (OriginBlacklist.isNonNullStr(arrName)) {
               final String arrPath = "blacklist." + arrName;
               final Json5Array arr = config.getArray(arrPath);
               if (add) {
@@ -95,7 +95,7 @@ public class OriginBlacklistCommand implements ICommand {
           } else {
             ctx.reply(NO_PERMISSION);
           }
-        } else if ("test".equalsIgnoreCase(command) && OriginBlacklist.isNonNull(argA)) {
+        } else if ("test".equalsIgnoreCase(command) && OriginBlacklist.isNonNullStr(argA)) {
           if (ctx.hasPermission("originblacklist.command.test")) {
             if (this.isBlacklisted(argA)) {
               ctx.reply("<green>" + argA + " is on the blacklist.</green>");

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;
@@ -132,7 +132,7 @@ public final class OriginBlacklistConfig {
   public final Json5Element get(final String key) {
     Json5Element element = null;
 
-    if (this.config != null && OriginBlacklist.isNonNull(key)) {
+    if (this.config != null && OriginBlacklist.isNonNullStr(key)) {
       element = this.config;
       final String[] parts = splitPath(key);
 
@@ -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,8 +327,8 @@ 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(true), null);
+    addJSONObj(uObj, "auto_update", Json5Primitive.fromBoolean(false), null);
     addJSONObj(obj, "update_checker", uObj, null);
     addJSONObj(obj, "blacklist_http_api", Json5Primitive.fromBoolean(false), null);
     addJSONObj(obj, "blacklist_to_whitelist", Json5Primitive.fromBoolean(false), null);
@@ -493,7 +495,7 @@ public final class OriginBlacklistConfig {
 
   private static final void addJSONObj(final Json5Object obj, final String key, final Json5Element value,
       final String comment) {
-    if (OriginBlacklist.isNonNull(comment)) {
+    if (OriginBlacklist.isNonNullStr(comment)) {
       value.setComment(comment);
     }
     obj.add(key, value);
@@ -502,7 +504,7 @@ public final class OriginBlacklistConfig {
   private static final String[] splitPath(final String key) {
     final String[] ret;
 
-    if (OriginBlacklist.isNonNull(key)) {
+    if (OriginBlacklist.isNonNullStr(key)) {
       ret = key.split("\\.");
     } else {
       ret = new String[0];

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;

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),
@@ -18,7 +18,7 @@ public enum EnumBlacklistType {
     this.str = str;
     this.alt = alt;
     this.arr = arr;
-    this.act = OriginBlacklist.isNonNull(act) ? act : OriginBlacklist.GENERIC_STR.toLowerCase();
+    this.act = OriginBlacklist.isNonNullStr(act) ? act : OriginBlacklist.GENERIC_STR.toLowerCase();
   }
 
   public final String getString() {

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,

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.core.enums.EnumConnectionType;
-import xyz.webmc.originblacklist.base.util.OPlayer;
+import xyz.webmc.originblacklist.core.util.OPlayer;
 
 import net.lax1dude.eaglercraft.backend.server.api.event.IBaseServerEvent;
 

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.core.enums.EnumConnectionType;
-import xyz.webmc.originblacklist.base.util.OPlayer;
+import xyz.webmc.originblacklist.core.util.OPlayer;
 
 import net.lax1dude.eaglercraft.backend.server.api.event.IEaglercraftLoginEvent;
 

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.core.enums.EnumConnectionType;
-import xyz.webmc.originblacklist.base.util.OPlayer;
+import xyz.webmc.originblacklist.core.util.OPlayer;
 
 import net.lax1dude.eaglercraft.backend.server.api.event.IEaglercraftMOTDEvent;
 

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;
 
@@ -8,7 +8,7 @@ import net.lax1dude.eaglercraft.backend.server.api.webserver.IRequestContext;
 import net.lax1dude.eaglercraft.backend.server.api.webserver.IRequestHandler;
 import net.lax1dude.eaglercraft.backend.server.api.webserver.RouteDesc;
 
-public class OriginBlacklistRequestHandler implements IRequestHandler {
+public final class OriginBlacklistRequestHandler implements IRequestHandler {
   private static final RouteDesc route = RouteDesc.create("/originblacklist/v2/");
   private final OriginBlacklist plugin;
 

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);
+    }
+  }
+}

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);
+  }
+}

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);
+  }
+}

src/main/java/xyz/webmc/originblacklist/core/metrics/GenericMetricsAdapter.java

@@ -0,0 +1,21 @@
+package xyz.webmc.originblacklist.core.metrics;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bstats.charts.CustomChart;
+
+public abstract class GenericMetricsAdapter {
+  protected final List<CustomChart> charts;
+
+  protected GenericMetricsAdapter() {
+    this.charts = new ArrayList<>();
+  }
+  
+  public final void addCustomChart(final CustomChart chart) {
+    this.charts.add(chart);
+  }
+
+  public abstract void start();
+  public abstract void shutdown();
+}

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;

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 = "§";

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;

src/main/java/xyz/webmc/originblacklist/core/util/IOriginBlacklistPlugin.java

@@ -1,8 +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.core.events.OriginBlacklistLoginEvent;
-import xyz.webmc.originblacklist.base.events.OriginBlacklistLoginEvent;
+import xyz.webmc.originblacklist.core.events.OriginBlacklistMOTDEvent;
-import xyz.webmc.originblacklist.base.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;
@@ -19,9 +20,11 @@ public interface IOriginBlacklistPlugin {
 
   public Path getPluginJarPath();
 
-  public IEaglerXServerAPI getEaglerAPI();
+  public GenericMetricsAdapter getMetrics();
 
-  public void log(final EnumLogLevel level, final String txt);
+  public AbstractLogger getTheLogger();
+
+  public IEaglerXServerAPI getEaglerAPI();
 
   public void kickPlayer(final Component txt, final OriginBlacklistLoginEvent event);
 

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;
 

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;
@@ -85,7 +85,7 @@ public final class OPlayer {
   }
 
   private static final String formatIPAddress(String addr) {
-    if (OriginBlacklist.isNonNull(addr)) {
+    if (OriginBlacklist.isNonNullStr(addr)) {
       if (addr.startsWith("/")) {
         addr = addr.substring(1);
       }

src/main/java/xyz/webmc/originblacklist/core/util/UpdateChecker.java

@@ -1,10 +1,11 @@
-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;
 import java.net.HttpURLConnection;
+import java.net.URI;
 import java.net.URL;
 
 import de.marhali.json5.Json5;
@@ -20,7 +21,7 @@ public final class UpdateChecker {
   public static final String checkForUpdates(final String repo, final Semver currentVersion,
       final boolean allowSnapshots) {
     try {
-      final URL url = new URL("https://api.github.com/repos/" + repo + "/releases");
+      final URL url = (new URI("https://api.github.com/repos/" + repo + "/releases")).toURL();
       final HttpURLConnection conn = (HttpURLConnection) url.openConnection();
       conn.setRequestMethod("GET");
       conn.setConnectTimeout(5000);
@@ -75,7 +76,7 @@ public final class UpdateChecker {
             comm = "";
           }
           if (ver.isGreaterThan(currentVersion) || (allowSnapshots && currentVersion.diff(ver) == VersionDiff.BUILD
-              && OriginBlacklist.isNonNull(comm) && !BuildInfo.get("git_cm_hash").startsWith(comm))) {
+              && OriginBlacklist.isNonNullStr(comm) && !BuildInfo.get("git_cm_hash").startsWith(comm))) {
             element = obj.get("assets");
             if (element instanceof Json5Array) {
               final Json5Array aArr = element.getAsJson5Array();

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

@@ -1,22 +1,20 @@
 package xyz.webmc.originblacklist.velocity;
 
-import xyz.webmc.originblacklist.base.OriginBlacklist;
+import xyz.webmc.originblacklist.core.OriginBlacklist;
-import xyz.webmc.originblacklist.base.enums.EnumConnectionType;
+import xyz.webmc.originblacklist.core.enums.EnumConnectionType;
-import xyz.webmc.originblacklist.base.enums.EnumLogLevel;
+import xyz.webmc.originblacklist.core.events.OriginBlacklistLoginEvent;
-import xyz.webmc.originblacklist.base.events.OriginBlacklistLoginEvent;
+import xyz.webmc.originblacklist.core.events.OriginBlacklistMOTDEvent;
-import xyz.webmc.originblacklist.base.events.OriginBlacklistMOTDEvent;
+import xyz.webmc.originblacklist.core.logger.SLF4JLogger;
-import xyz.webmc.originblacklist.base.util.EaglerEventPriority;
+import xyz.webmc.originblacklist.core.util.EaglerEventPriority;
-import xyz.webmc.originblacklist.base.util.IOriginBlacklistPlugin;
+import xyz.webmc.originblacklist.core.util.IOriginBlacklistPlugin;
-import xyz.webmc.originblacklist.base.util.IncompatibleDependencyException;
+import xyz.webmc.originblacklist.core.util.IncompatibleDependencyException;
-import xyz.webmc.originblacklist.base.util.OPlayer;
+import xyz.webmc.originblacklist.core.util.OPlayer;
 import xyz.webmc.originblacklist.velocity.command.OriginBlacklistCommandVelocity;
 
 import java.net.InetSocketAddress;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import com.google.inject.Inject;
@@ -39,35 +37,32 @@ import net.lax1dude.eaglercraft.backend.server.api.IEaglerXServerAPI;
 import net.lax1dude.eaglercraft.backend.server.api.velocity.EaglerXServerAPI;
 import net.lax1dude.eaglercraft.backend.server.api.velocity.event.EaglercraftLoginEvent;
 import net.lax1dude.eaglercraft.backend.server.api.velocity.event.EaglercraftMOTDEvent;
-import org.bstats.charts.AdvancedPie;
-import org.bstats.velocity.Metrics;
 import org.bstats.velocity.Metrics.Factory;
 import org.semver4j.Semver;
 import org.slf4j.Logger;
 
-@SuppressWarnings({ "deprecation", "unchecked", "rawtypes" })
+@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;
-  private Metrics metrics;
 
   @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
-  public final void onProxyInitialization(ProxyInitializeEvent event) {
+  public final void onProxyInitialization(final ProxyInitializeEvent event) {
     this.proxy.getPluginManager().getPlugin("eaglerxserver").ifPresentOrElse(plugin -> {
       final Semver version = new Semver(plugin.getDescription().getVersion().orElse("1.0.0"));
       if (version.isLowerThan(OriginBlacklist.REQUIRED_API_VER)) {
@@ -91,20 +86,6 @@ public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin {
     this.blacklist = new OriginBlacklist(this);
     this.proxy.getCommandManager().register("originblacklist", new OriginBlacklistCommandVelocity(this.blacklist));
     this.blacklist.init();
-    if (this.blacklist.isMetricsEnabled()) {
-      this.metrics = this.metricsFactory.make(this, OriginBlacklist.BSTATS.VELOCITY);
-      this.metrics.addCustomChart(new AdvancedPie("player_types", () -> {
-        final Map<String, Integer> playerMap = new HashMap<>();
-
-        for (final Player player : this.proxy.getAllPlayers()) {
-          final boolean eagler = this.getEaglerAPI().isEaglerPlayerByUUID(player.getUniqueId());
-          final String key = eagler ? "Eagler" : "Java";
-          playerMap.put(key, playerMap.getOrDefault(key, 0) + 1);
-        }
-
-        return playerMap;
-      }));
-    }
   }
 
   @Subscribe
@@ -127,19 +108,21 @@ public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin {
   @Subscribe(order = PostOrder.FIRST)
   public final void onJavaLogin(final PreLoginEvent event) {
     final InboundConnection conn = event.getConnection();
-    final InetSocketAddress vhost = conn.getVirtualHost().orElseThrow();
+    final InetSocketAddress vhost = conn.getVirtualHost().orElse(null);
+    final String origin = vhost != null ? vhost.getHostString() + vhost.getPort() : OriginBlacklist.UNKNOWN_STR;
     final OPlayer player = new OPlayer(null, event.getUsername(), event.getUniqueId(),
-        conn.getRemoteAddress().toString(), OriginBlacklist.UNKNOWN_STR, vhost.getHostString() + vhost.getPort(),
+        conn.getRemoteAddress().toString(), OriginBlacklist.UNKNOWN_STR, origin,
         conn.getProtocolVersion().getProtocol());
     this.blacklist.handleLogin(new OriginBlacklistLoginEvent(null, event, EnumConnectionType.JAVA, player));
   }
 
   @Subscribe(order = PostOrder.FIRST)
   public final void onJavaHandshake(final PlayerClientBrandEvent event) {
-    final InetSocketAddress vhost = event.getPlayer().getVirtualHost().orElseThrow();
+    final InetSocketAddress vhost = event.getPlayer().getVirtualHost().orElse(null);
+    final String origin = vhost != null ? vhost.getHostString() + vhost.getPort() : OriginBlacklist.UNKNOWN_STR;
     final Player aPlayer = event.getPlayer();
     final OPlayer bPlayer = new OPlayer(null, aPlayer.getUsername(), aPlayer.getUniqueId(),
-        aPlayer.getRemoteAddress().getAddress().toString(), event.getBrand(), vhost.getHostString() + vhost.getPort(),
+        aPlayer.getRemoteAddress().getAddress().toString(), event.getBrand(), origin,
         event.getPlayer().getProtocolVersion().getProtocol());
     this.blacklist.handleLogin(new OriginBlacklistLoginEvent(null, event, EnumConnectionType.JAVA, bPlayer));
   }
@@ -147,10 +130,10 @@ public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin {
   @Subscribe(order = PostOrder.LAST)
   public final void onJavaMOTD(final ProxyPingEvent event) {
     final InboundConnection conn = event.getConnection();
-    final InetSocketAddress vhost = conn.getVirtualHost().orElseThrow();
+    final InetSocketAddress vhost = conn.getVirtualHost().orElse(null);
+    final String origin = vhost != null ? vhost.getHostString() + vhost.getPort() : OriginBlacklist.UNKNOWN_STR;
     final OPlayer player = new OPlayer(null, null, null, conn.getRemoteAddress().getHostString(),
-        vhost.getHostString() + vhost.getPort(),
+        null, origin, -1);
-        null, -1);
     this.blacklist.handleMOTD(new OriginBlacklistMOTDEvent(null, event, EnumConnectionType.JAVA, player));
   }
 
@@ -173,24 +156,19 @@ public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin {
     }
   }
 
+  @Override
+  public final VelocityMetricsAdapter getMetrics() {
+    return new VelocityMetricsAdapter(this, this.metricsFactory);
+  }
+
   @Override
   public final IEaglerXServerAPI getEaglerAPI() {
     return EaglerXServerAPI.instance();
   }
 
   @Override
-  public final void log(final EnumLogLevel level, final String txt) {
+  public final SLF4JLogger getTheLogger() {
-    if (level == EnumLogLevel.WARN) {
+    return this.logger;
-      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);
-    }
   }
 
   @Override
@@ -254,8 +232,7 @@ public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin {
 
   @Override
   public final void shutdown() {
-    this.metrics.shutdown();
+    for (final ScheduledTask task : this.proxy.getScheduler().tasksByPlugin(this.plugin)) {
-    for (ScheduledTask task : this.proxy.getScheduler().tasksByPlugin(this.plugin)) {
       task.cancel();
     }
   }

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

@@ -0,0 +1,38 @@
+package xyz.webmc.originblacklist.velocity;
+
+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 OriginBlacklistVelocityPlugin plugin;
+  private final Factory factory;
+  private Metrics metrics;
+
+  public VelocityMetricsAdapter(final OriginBlacklistVelocityPlugin plugin, final Factory factory) {
+    super();
+    this.plugin = plugin;
+    this.factory = factory;
+  }
+
+  @Override
+  public void start() {
+    if (this.metrics == null) {
+      this.metrics = this.factory.make(this.plugin, OriginBlacklist.BSTATS.VELOCITY);
+      for (final CustomChart chart : this.charts) {
+        this.metrics.addCustomChart(chart);
+      }
+    }
+  }
+
+  @Override
+  public void shutdown() {
+    if (this.metrics != null) {
+      this.metrics.shutdown();
+      this.metrics = null;
+    }
+  }
+}

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.core.OriginBlacklist;
-import xyz.webmc.originblacklist.base.command.OriginBlacklistCommand;
+import xyz.webmc.originblacklist.core.command.OriginBlacklistCommand;
 
 import java.util.List;
 

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.core.OriginBlacklist;
-import xyz.webmc.originblacklist.base.command.CommandContext;
+import xyz.webmc.originblacklist.core.command.CommandContext;
 
 import com.velocitypowered.api.command.SimpleCommand.Invocation;
 import net.kyori.adventure.text.minimessage.MiniMessage;

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}

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}

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