eagler

.github/workflows/gradle.yml

@@ -50,21 +50,49 @@ jobs:
             echo "EXISTS=false" >> "$GITHUB_OUTPUT"
           fi
 
+      - id: mrck
+        run: |
+          echo "TOKEN=$([ -n "${{ secrets.MODRINTH_TOKEN }}" ] && echo true || echo false)" >> "$GITHUB_OUTPUT"
+
+      - id: dist
+        run: |
+          echo "TAG_NAME=${{ format('v{0}{1}', steps.vars.outputs.VERS, steps.ghck.outputs.EXISTS == 'true' && format('+{0}', steps.vars.outputs.COMMIT_HASH) || '') }}" >> "$GITHUB_OUTPUT"
+          echo "REL_NAME=${{ format('{0}{1}', steps.ghck.outputs.EXISTS == 'true' && 'Snapshot ' || 'v', steps.ghck.outputs.EXISTS == 'true' && steps.vars.outputs.COMMIT_HASH || steps.vars.outputs.VERS) }}" >> "$GITHUB_OUTPUT"
+          echo "ART_NAME=${{ format('{0}{1}.jar', steps.vars.outputs.AFCT, steps.ghck.outputs.EXISTS == 'true' && format('+{0}', steps.vars.outputs.COMMIT_HASH) || '') }}" >> "$GITHUB_OUTPUT"
+
       - run: |
           mkdir -p dist
-          cp "./build/libs/${{ steps.vars.outputs.AFCT }}" ./dist
+          cp "./build/libs/${{ steps.vars.outputs.AFCT }}.jar" ./dist/${{ steps.dist.outputs.ART_NAME }}
 
       - uses: actions/upload-artifact@v4
         with:
-          path: dist/${{ steps.vars.outputs.AFCT }}
+          path: dist/${{ steps.dist.outputs.ART_NAME }}
-          name: ${{ steps.vars.outputs.AFCT }}
+          name: ${{ steps.dist.outputs.ART_NAME }}
 
       - if: github.event_name == 'push' && github.ref == 'refs/heads/main'
         uses: softprops/action-gh-release@v2
         with:
-          tag_name: ${{ format('v{0}{1}', steps.vars.outputs.VERS, steps.ghck.outputs.EXISTS == 'true' && format('+{0}', steps.vars.outputs.COMMIT_HASH) || '') }}
+          tag_name: ${{ steps.dist.outputs.TAG_NAME }}
-          name: ${{ format('{0}{1}', steps.ghck.outputs.EXISTS == 'true' && 'Snapshot ' || 'v', steps.ghck.outputs.EXISTS == 'true' && steps.vars.outputs.COMMIT_HASH || steps.vars.outputs.VERS) }}
+          name: ${{ steps.dist.outputs.REL_NAME }}
-          files: dist/${{ steps.vars.outputs.AFCT }}
+          files: dist/${{ steps.dist.outputs.ART_NAME }}
           prerelease: ${{ steps.ghck.outputs.EXISTS == 'true' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - if: github.event_name == 'push' && github.ref == 'refs/heads/main' && steps.mrck.outputs.TOKEN == 'true'
+        uses: cloudnode-pro/modrinth-publish@v2
+        with:
+          token: ${{ secrets.MODRINTH_TOKEN }}
+          project: WfBtRGYI
+          version: ${{ steps.dist.outputs.TAG_NAME }}
+          loaders: '["bukkit", "bungeecord", "paper", "purpur", "spigot", "velocity", "waterfall"]'
+          game-versions: '["1.8.x", "1.9.x", "1.10.x", "1.11.x", "1.12.x", "1.13.x", "1.14.x", "1.15.x", "1.16.x", "1.17.x", "1.18.x", "1.19.x", "1.20.x", "1.21.x"]'
+          files: dist/${{ steps.dist.outputs.ART_NAME }}
+          primary-file: ${{ steps.dist.outputs.ART_NAME }}
+          name: ${{ steps.dist.outputs.REL_NAME }}
+          channel: ${{ steps.ghck.outputs.EXISTS == 'true' && 'beta' || 'release' }}
+          dependencies: |-
+            [{
+              "project_id": "Gtsn3SWv",
+              "dependency_type": "required"
+            }]

.gitignore

@@ -2,6 +2,7 @@
 /.vscode/
 /gradle/
 /build/
+/bin/
 /run/
 /gradlew
 /gradlew.bat

README.md

@@ -9,12 +9,14 @@
 - [x] Client brand based blacklisting
 - [x] Username based blacklisting
 - [x] IP based blacklisting
-- [x] Json5 based configuration
+- [x] Modular multi-platform support
+- [x] JSON5 based configuration
 - [x] Kick message customization
 - [x] Blacklist MOTD customization
 - [x] MiniMessage and legacy formattings supported
 - [x] Plugin update checker
-- [ ] Send blacklist logs to a webhook
+- [x] Send blacklist logs to a webhook
+- [ ] Ingame blacklist management command
 - [ ] Subscribe to an auto-updating blacklist
 - [ ] Reverse blacklist (whitelist)
 

build.gradle.kts

@@ -1,3 +1,5 @@
+import groovy.lang.Closure
+import com.palantir.gradle.gitversion.VersionDetails
 import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.language.jvm.tasks.ProcessResources
 import xyz.jpenilla.runpaper.task.RunServer
@@ -11,7 +13,7 @@ val PLUGIN_NAME = "OriginBlacklist"
 val PLUGIN_IDEN = "originblacklist"
 val PLUGIN_DOMN = "xyz.webmc"
 val PLUGIN_DESC = "An eaglercraft client blacklist plugin."
-val PLUGIN_VERS = "2.0.0"
+val PLUGIN_VERS = "2.0.3"
 val PLUGIN_SITE = "https://github.com/WebMCDevelopment/$PLUGIN_IDEN"
 val PLUGIN_DEPA = listOf("EaglercraftXServer")
 val PLUGIN_DEPB = listOf("EaglercraftXServer")
@@ -26,23 +28,27 @@ val PLUGIN_CTBR = emptyList<String>()
 
 
 
-val PLUGIN_DEPA_J = getJSONObj(PLUGIN_DEPA)
+val PLUGIN_DEPA_J = getBukkitBungeeDeps(PLUGIN_DEPA)
-val PLUGIN_DEPB_J = getJSONObj(PLUGIN_DEPB)
+val PLUGIN_DEPB_J = getBukkitBungeeDeps(PLUGIN_DEPB)
-val PLUGIN_DEPC_J = getJSONObjMerge(PLUGIN_DEPC, PLUGIN_SDPC)
+val PLUGIN_DEPC_J = getVelocityDeps(PLUGIN_DEPC, PLUGIN_SDPC)
-val PLUGIN_SDPA_J = getJSONObj(PLUGIN_SDPA)
+val PLUGIN_SDPA_J = getBukkitBungeeDeps(PLUGIN_SDPA)
-val PLUGIN_SDPB_J = getJSONObj(PLUGIN_SDPB)
+val PLUGIN_SDPB_J = getBukkitBungeeDeps(PLUGIN_SDPB)
-val PLUGIN_PROV_J = getJSONObj(PLUGIN_PROV)
+val PLUGIN_PROV_J = getBukkitBungeeDeps(PLUGIN_PROV)
-val PLUGIN_ATHR_J = getJSONObj(PLUGIN_ATHR)
+val PLUGIN_ATHR_J = getBukkitBungeeDeps(PLUGIN_ATHR)
-val PLUGIN_CTBR_J = getJSONObj(PLUGIN_CTBR)
+val PLUGIN_CTBR_J = getBukkitBungeeDeps(PLUGIN_CTBR)
 
 plugins {
   id("java")
   id("com.gradleup.shadow") version "9.3.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"
   id("xyz.jpenilla.run-velocity") version "3.0.2"
 }
 
+@Suppress("UNCHECKED_CAST")
+val GIT_INFO = (extra["versionDetails"] as Closure<VersionDetails>)()
+
 repositories {
   mavenCentral()
   maven("https://repo.papermc.io/repository/maven-public/")
@@ -85,6 +91,23 @@ java {
   toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 }
 
+val BUILD_PROPS = mapOf(
+  "plugin_name" to PLUGIN_NAME,
+  "plugin_iden" to PLUGIN_IDEN,
+  "plugin_desc" to PLUGIN_DESC,
+  "plugin_vers" to PLUGIN_VERS,
+  "plugin_site" to PLUGIN_SITE,
+  "plugin_depa" to PLUGIN_DEPA_J,
+  "plugin_depb" to PLUGIN_DEPB_J,
+  "plugin_depc" to PLUGIN_DEPC_J,
+  "plugin_sdpa" to PLUGIN_SDPA_J,
+  "plugin_sdpb" to PLUGIN_SDPB_J,
+  "plugin_prov" to PLUGIN_PROV_J,
+  "plugin_athr" to PLUGIN_ATHR_J,
+  "plugin_ctbr" to PLUGIN_CTBR_J,
+  "git_cm_hash" to GIT_INFO.gitHashFull,
+)
+
 tasks.withType<JavaCompile>().configureEach {
   options.encoding = "UTF-8"
   options.release.set(17)
@@ -93,26 +116,24 @@ tasks.withType<JavaCompile>().configureEach {
 tasks.withType<ProcessResources>() {
   duplicatesStrategy = DuplicatesStrategy.EXCLUDE
   outputs.upToDateWhen { false }
+  
   doFirst {
     filesMatching(listOf("plugin.yml", "bungee.yml", "velocity-plugin.json")) {
-			expand(mapOf(
+			expand(BUILD_PROPS)
-				"plugin_name" to PLUGIN_NAME,
-        "plugin_iden" to PLUGIN_IDEN,
-        "plugin_desc" to PLUGIN_DESC,
-        "plugin_vers" to PLUGIN_VERS,
-        "plugin_site" to PLUGIN_SITE,
-        "plugin_depa" to PLUGIN_DEPA_J,
-        "plugin_depb" to PLUGIN_DEPB_J,
-        "plugin_depc" to PLUGIN_DEPC_J,
-        "plugin_sdpa" to PLUGIN_SDPA_J,
-        "plugin_sdpb" to PLUGIN_SDPB_J,
-        "plugin_prov" to PLUGIN_PROV_J,
-        "plugin_athr" to PLUGIN_ATHR_J,
-        "plugin_ctbr" to PLUGIN_CTBR_J,
-			))
 		}
   }
 
+  doLast {
+    val file = destinationDir.resolve("build.properties")
+    file.parentFile.mkdirs()
+
+    file.writeText(
+      BUILD_PROPS.entries.joinToString("\n") { (k, v) ->
+        "$k = $v"
+      }
+    )
+  }
+
   inputs.files(tasks.named<JavaCompile>("compileJava").map { it.outputs.files })
 }
 
@@ -158,24 +179,19 @@ tasks.register("printVars") {
   group = "help"
   doLast {
     println("VERS = " + PLUGIN_VERS)
-    println("AFCT = " + tasks.named("shadowJar").get().outputs.files.singleFile.name)
+    println("AFCT = " + tasks.named("shadowJar").get().outputs.files.singleFile.name.removeSuffix(".jar"))
   }
 }
 
-fun getJSONObj(list: List<String>): String {
+fun getBukkitBungeeDeps(list: List<String>): String {
-  return if (list.isNotEmpty()) {
+  return list.joinToString(
-    list.joinToString(
+    prefix = "[",
-      separator = "\", \"",
+    postfix = "]"
-      prefix = "\"",
+  ) { "\"$it\"" }
-      postfix = "\""
-    )
-  } else {
-    ""
-  }
 }
 
-fun getJSONObjMerge(a: List<String>, b: List<String>): String {
+fun getVelocityDeps(a: List<String>, b: List<String>): String {
   val c = a.joinToString(", ") { "{\"id\":\"$it\",\"optional\":false}" }
   val d = b.joinToString(", ") { "{\"id\":\"$it\",\"optional\":true}" }
-  return listOf(c, d).filter { it.isNotEmpty() }.joinToString(",")
+  return "[" + listOf(c, d).filter { it.isNotEmpty() }.joinToString(",") + "]"
 }

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

@@ -2,51 +2,67 @@ package xyz.webmc.originblacklist.base;
 
 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.util.BuildInfo;
 import xyz.webmc.originblacklist.base.util.IOriginBlacklistPlugin;
 import xyz.webmc.originblacklist.base.util.OPlayer;
 import xyz.webmc.originblacklist.base.util.UpdateChecker;
 
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
-import org.semver4j.Semver;
-
 import de.marhali.json5.Json5Array;
 import de.marhali.json5.Json5Element;
-
 import inet.ipaddr.AddressStringException;
 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.EnumWebSocketHeader;
+import net.lax1dude.eaglercraft.backend.server.api.IEaglerLoginConnection;
 import net.lax1dude.eaglercraft.backend.server.api.query.IMOTDConnection;
+import org.semver4j.Semver;
 
 public final class OriginBlacklist {
   public static final Semver REQUIRED_API_VER = new Semver("1.0.2");
-  public static final String GENERIC_STR = "generic";
+  public static final String GENERIC_STR = "GENERIC";
-  public static final String UNKNOWN_STR = "unknown";
+  public static final String UNKNOWN_STR = "UNKNOWN";
   public static final String PLUGIN_REPO = "WebMCDevelopment/originblacklist";
   public static final int BSTATS_ID = 28776;
 
   private final IOriginBlacklistPlugin plugin;
   private final OriginBlacklistConfig config;
-  private boolean updateAvailable;
+  private String updateURL;
 
   public OriginBlacklist(final IOriginBlacklistPlugin plugin) {
     this.plugin = plugin;
     this.config = new OriginBlacklistConfig(plugin);
-    this.checkForUpdate();
     plugin.scheduleRepeat(() -> {
       this.checkForUpdate();
     }, 60, TimeUnit.MINUTES);
   }
 
+  public final void init() {
+    this.plugin.log(EnumLogLevel.INFO, "Initialized Plugin");
+    this.plugin.log(EnumLogLevel.DEBUG, "Commit " + BuildInfo.get("git_cm_hash"));
+  }
+
   public final void handleLogin(final OriginBlacklistLoginEvent event) {
     final OPlayer player = event.getPlayer();
     final EnumBlacklistType blacklisted = this.testBlacklist(player);
@@ -66,6 +82,7 @@ public final class OriginBlacklist {
       this.plugin.kickPlayer(this.getBlacklistedComponent("kick", blacklisted.getArrayString(),
           blacklisted.getAltString(), blacklisted.getString(), "not allowed", "not allowed on the server",
           blacklisted_value, blacklisted.getActionString()), event);
+      this.sendWebhooks(event, blacklisted);
       final String name = player.getName();
       if (isNonNull(name)) {
         this.plugin.log(EnumLogLevel.INFO, "Prevented blacklisted player " + name + " from joining.");
@@ -157,7 +174,7 @@ public final class OriginBlacklist {
             return EnumBlacklistType.ADDR;
           }
         } catch (final AddressStringException exception) {
-          exception.printStackTrace();
+          // exception.printStackTrace();
         }
       }
     }
@@ -185,14 +202,147 @@ public final class OriginBlacklist {
     return MiniMessage.miniMessage().deserialize(str);
   }
 
-  private final void checkForUpdate() {
+  private final void sendWebhooks(final OriginBlacklistLoginEvent event, final EnumBlacklistType type) {
-    (new Thread(() -> {
+    Json5Element element = this.config.get("discord.enabled");
-      this.updateAvailable = UpdateChecker.checkForUpdate(PLUGIN_REPO, this.plugin.getPluginVersion(),
+    if (element.getAsBoolean()) {
-          this.config.get("update_checker.allow_snapshots").getAsBoolean());
+      final OPlayer player = event.getPlayer();
-      if (this.updateAvailable) {
+      final EnumConnectionType connType = event.getConnectionType();
-        this.plugin.log(EnumLogLevel.INFO, "Update Available! Download at https://github.com/" + PLUGIN_REPO + ".git");
+      final String userAgent;
+      if (connType == EnumConnectionType.EAGLER) {
+        final IEaglerLoginConnection loginConn = event.getEaglerEvent().getLoginConnection();
+        userAgent = loginConn.getWebSocketHeader(EnumWebSocketHeader.HEADER_USER_AGENT);
+      } else {
+        userAgent = UNKNOWN_STR;
       }
-    })).run();
+      final byte[] payload = String.format(
+        """
+          {
+            "content": "Blocked a blacklisted %s from joining",
+            "embeds": [
+              {
+                "title": "-------- Player Information --------",
+                "description": "**→ Name:** %s\\n**→ Origin:** %s\\n**→ Brand:** %s\\n**→ IP Address:** %s\\n**→ Protocol Version:** %s\\n**→ User Agent:** %s\\n**→ Rewind:** %s\\n**→ Player Type:** %s",
+                "color": 15801922,
+                "fields": [],
+                "footer": {
+                  "text": "OriginBlacklist v%s",
+                  "icon_url": "https://raw.githubusercontent.com/%s/refs/heads/main/img/icon.png"
+                }
+              }
+            ],
+            "components": [
+              {
+                "type": 1,
+                "components": [
+                  {
+                    "type": 2,
+                    "style": 5,
+                    "label": "Get the Plugin",
+                    "url": "https://github.com/%s",
+                    "emoji": {
+                      "name": "🌐"
+                    }
+                  }
+                ]
+              }
+            ]
+          }
+        """,
+        type.getAltString(),
+        player.getName().replaceAll("_", "\\_"),
+        player.getOrigin(),
+        player.getBrand(),
+        this.config.get("discord.send_ips").getAsBoolean() ? player.getAddr() : "*\\*CENSORED\\**",
+        player.getPVN(),
+        userAgent,
+        player.isRewind() ? "YES" : "NO",
+        connType.toString(),
+        this.plugin.getPluginVersion(),
+        PLUGIN_REPO,
+        PLUGIN_REPO
+      ).getBytes();
+      element = this.config.get("discord.webhook_urls");
+      if (element instanceof Json5Array) {
+        for (final Json5Element _element : element.getAsJson5Array()) {
+          CompletableFuture.runAsync(() -> {
+            try {
+              final URL url = new URL(_element.getAsString());
+              final HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+              conn.setRequestMethod("POST");
+              conn.setRequestProperty("Content-Type", "application/json");
+              conn.setDoOutput(true);
+              conn.setConnectTimeout(5000);
+              conn.setReadTimeout(5000);
+              conn.connect();
+              final OutputStream os = conn.getOutputStream();
+              os.write(payload);
+              os.close();
+
+              final int code = conn.getResponseCode();
+              if (code < 200 || code >= 300) {
+                this.plugin.log(EnumLogLevel.WARN, "Webhook failed (HTTP " + code + ")");
+              }
+
+              conn.disconnect();
+            } catch (final Throwable t) {
+              t.printStackTrace();
+            }
+          });
+        }
+      }
+    }
+  }
+
+  private final void checkForUpdate() {
+    if (this.config.get("update_checker.enabled").getAsBoolean()) {
+      CompletableFuture.runAsync(() -> {
+        this.updateURL = UpdateChecker.checkForUpdate(PLUGIN_REPO, this.plugin.getPluginVersion(),
+            this.config.get("update_checker.allow_snapshots").getAsBoolean());
+        if (isNonNull((this.updateURL))) {
+          if (!this.config.get("update_checker.auto_update").getAsBoolean()) {
+            this.plugin.log(EnumLogLevel.INFO, "An update is available! Download it at " + this.updateURL);
+          } else {
+            this.updatePlugin();
+          }
+        }
+      });
+    }
+  }
+
+  private final void updatePlugin() {
+    try {
+      final URL url = new URL(this.updateURL);
+      final Path jar = this.plugin.getPluginJarPath();
+      final Path bak = jar.resolveSibling(jar.getFileName().toString() + ".bak");
+      final Path upd = jar.resolveSibling(Paths.get(URLDecoder.decode(url.getPath(), StandardCharsets.UTF_8)).getFileName());
+
+      try {
+        Files.copy(jar, bak, StandardCopyOption.REPLACE_EXISTING);
+      } catch (final Throwable t) {
+        t.printStackTrace();
+      }
+      
+      try {
+        final HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+        conn.setRequestMethod("GET");
+        conn.setConnectTimeout(15000);
+        conn.setReadTimeout(15000);
+        conn.setRequestProperty("User-Agent", OriginBlacklist.getUserAgent());
+        conn.connect();
+        try (final InputStream in = conn.getInputStream()) {
+          Files.copy(in, upd, StandardCopyOption.REPLACE_EXISTING);
+        } finally {
+          conn.disconnect();
+        }
+        Files.delete(jar);
+        Files.delete(bak);
+      } catch (final Throwable t) {
+        t.printStackTrace();
+        Files.move(bak, jar, StandardCopyOption.REPLACE_EXISTING);
+      }
+    } catch (final Throwable t) {
+      t.printStackTrace();
+    }
   }
 
   public static final String getComponentString(final Component comp) {
@@ -207,6 +357,10 @@ public final class OriginBlacklist {
     return "data:image/png;base64," + Base64.getEncoder().encodeToString(bytes);
   }
 
+  public static final String getUserAgent() {
+    return BuildInfo.get("plugin_name") + "/" + BuildInfo.get("plugin_vers") + "+" + BuildInfo.get("git_cm_hash");
+  }
+
   public static final boolean isNonNull(final String str) {
     return str != null && !str.isEmpty() && !str.isBlank() && !str.equals("null");
   }

src/main/java/xyz/webmc/originblacklist/base/command/CommandContext.java

@@ -1,8 +1,8 @@
 package xyz.webmc.originblacklist.base.command;
 
 public interface CommandContext {
-  String getPlayerName();
+  public String getPlayerName();
-  void reply(final String message);
+  public void reply(final String message);
-  boolean hasPermission(final String permission);
+  public boolean hasPermission(final String permission);
-  String[] getArgs();
+  public String[] getArgs();
 }

src/main/java/xyz/webmc/originblacklist/base/command/ICommand.java

@@ -3,8 +3,8 @@ package xyz.webmc.originblacklist.base.command;
 import java.util.List;
 
 public interface ICommand {
-  static final String NO_PERMISSION = "<red>You don't have permission to use this command.</red>";
+  public static final String NO_PERMISSION = "<red>You don't have permission to use this command.</red>";
-  boolean execute(final CommandContext ctx);
+  public boolean execute(final CommandContext ctx);
-  List<String> suggest(final CommandContext ctx);
+  public List<String> suggest(final CommandContext ctx);
-  void usage(final CommandContext ctx);
+  public void usage(final CommandContext ctx);
 }

src/main/java/xyz/webmc/originblacklist/base/command/OriginBlacklistCommand.java

@@ -69,8 +69,8 @@ public class OriginBlacklistCommand implements ICommand {
   public void usage(CommandContext ctx) {
     ctx.reply("<aqua>Commands:</aqua>");
     ctx.reply("<gray>  - /originblacklist reload</gray>");
-    //ctx.reply("<gray>  - /originblacklist add <brand/origin/name/ip> <value></gray>");
+    // ctx.reply("<gray>  - /originblacklist add <brand/origin/name/ip> <value></gray>");
-    //ctx.reply("<gray>  - /originblacklist remove <brand/origin/name/ip> <value></gray>");
+    // ctx.reply("<gray>  - /originblacklist remove <brand/origin/name/ip> <value></gray>");
     ctx.reply("<gray>  - /originblacklist list</gray>");
   }
 }

src/main/java/xyz/webmc/originblacklist/base/config/OriginBlacklistConfig.java

@@ -216,11 +216,12 @@ public final class OriginBlacklistConfig {
     final Json5Object dobj = new Json5Object();
     addJSONObj(dobj, "enabled", Json5Primitive.fromBoolean(false), null);
     addJSONObj(dobj, "webhook_urls", new Json5Array(), null);
+    addJSONObj(dobj, "send_ips", Json5Primitive.fromBoolean(true), null);
     addJSONObj(obj, "discord", dobj, null);
     final Json5Object uobj = new Json5Object();
     addJSONObj(uobj, "enabled", Json5Primitive.fromBoolean(true), null);
     addJSONObj(uobj, "allow_snapshots", Json5Primitive.fromBoolean(false), null);
-    addJSONObj(uobj, "auto_update", Json5Primitive.fromBoolean(false), null);
+    addJSONObj(uobj, "auto_update", Json5Primitive.fromBoolean(true), null);
     addJSONObj(obj, "update_checker", uobj, null);
     addJSONObj(obj, "bStats", Json5Primitive.fromBoolean(true), null);
     return obj;

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

@@ -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;
+    this.act = OriginBlacklist.isNonNull(act) ? act : OriginBlacklist.GENERIC_STR.toLowerCase();
   }
 
   public final String getString() {

src/main/java/xyz/webmc/originblacklist/base/events/OriginBlacklistEvent.java

@@ -5,6 +5,7 @@ import xyz.webmc.originblacklist.base.util.OPlayer;
 
 import net.lax1dude.eaglercraft.backend.server.api.event.IBaseServerEvent;
 
+@SuppressWarnings({ "rawtypes" })
 public abstract class OriginBlacklistEvent {
   private final EnumConnectionType connectionType;
   private final IBaseServerEvent eaglerEvent;

src/main/java/xyz/webmc/originblacklist/base/events/OriginBlacklistLoginEvent.java

@@ -5,6 +5,7 @@ import xyz.webmc.originblacklist.base.util.OPlayer;
 
 import net.lax1dude.eaglercraft.backend.server.api.event.IEaglercraftLoginEvent;
 
+@SuppressWarnings({ "rawtypes" })
 public final class OriginBlacklistLoginEvent extends OriginBlacklistEvent {
   public OriginBlacklistLoginEvent(final IEaglercraftLoginEvent eaglerEvent, final Object javaEvent,
       final EnumConnectionType connectionType, final OPlayer player) {

src/main/java/xyz/webmc/originblacklist/base/events/OriginBlacklistMOTDEvent.java

@@ -5,6 +5,7 @@ import xyz.webmc.originblacklist.base.util.OPlayer;
 
 import net.lax1dude.eaglercraft.backend.server.api.event.IEaglercraftMOTDEvent;
 
+@SuppressWarnings({ "rawtypes" })
 public final class OriginBlacklistMOTDEvent extends OriginBlacklistEvent {
   public OriginBlacklistMOTDEvent(final IEaglercraftMOTDEvent eaglerEvent, final Object javaEvent,
       final EnumConnectionType connectionType, final OPlayer player) {

src/main/java/xyz/webmc/originblacklist/base/util/BuildInfo.java

@@ -0,0 +1,19 @@
+package xyz.webmc.originblacklist.base.util;
+
+import java.io.InputStream;
+import java.util.Properties;
+
+public class BuildInfo {
+  private static final Properties properties;
+
+  public static final String get(final String key) {
+    return properties.getProperty(key).trim();
+  }
+
+  static {
+    properties = new Properties();
+    try (final InputStream in = BuildInfo.class.getClassLoader().getResourceAsStream("build.properties")) {
+      properties.load(in);
+    } catch (final Throwable t) {}
+  }
+}

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

@@ -4,15 +4,16 @@ import xyz.webmc.originblacklist.base.enums.EnumLogLevel;
 import xyz.webmc.originblacklist.base.events.OriginBlacklistLoginEvent;
 import xyz.webmc.originblacklist.base.events.OriginBlacklistMOTDEvent;
 
+import java.nio.file.Path;
 import java.util.concurrent.TimeUnit;
 
-import org.semver4j.Semver;
-
 import net.kyori.adventure.text.Component;
+import org.semver4j.Semver;
 
 public interface IOriginBlacklistPlugin {
   public String getPluginId();
   public Semver getPluginVersion();
+  public Path getPluginJarPath();
   public void log(final EnumLogLevel level, final String txt);
   public void kickPlayer(final Component txt, final OriginBlacklistLoginEvent event);
   public void setMOTD(final Component txt, final OriginBlacklistMOTDEvent event);

src/main/java/xyz/webmc/originblacklist/base/util/OPlayer.java

@@ -16,28 +16,37 @@ public final class OPlayer {
   private final String name;
   private final UUID uuid;
   private final String brand;
+  private final boolean rewind;
+  private final int pvn;
 
   public OPlayer(final IEaglerConnection conn, final String name, final UUID uuid, final String addr,
-      final String brand) {
+      final String brand, final int pvn) {
     this.name = name;
     this.uuid = uuid;
     if (conn != null) {
       this.origin = conn.getWebSocketHeader(EnumWebSocketHeader.HEADER_ORIGIN);
       this.addr = formatSocketAddress(conn.getSocketAddress());
       if (conn instanceof IEaglerLoginConnection) {
-        this.brand = ((IEaglerLoginConnection) conn).getEaglerBrandString();
+        final IEaglerLoginConnection loginConn = (IEaglerLoginConnection) conn;
+        this.brand = loginConn.getEaglerBrandString();
+        this.rewind = loginConn.isEaglerXRewindPlayer();
+        this.pvn = this.rewind ? loginConn.getRewindProtocolVersion() : loginConn.getMinecraftProtocol();
       } else {
         this.brand = OriginBlacklist.UNKNOWN_STR;
+        this.rewind = false;
+        this.pvn = pvn;
       }
     } else {
       this.origin = OriginBlacklist.UNKNOWN_STR;
       this.addr = formatIPAddress(addr);
       this.brand = brand;
+      this.rewind = false;
+      this.pvn = pvn;
     }
   }
 
   public OPlayer(final IEaglerConnection conn, final String name, final UUID uuid) {
-    this(conn, name, uuid, null, null);
+    this(conn, name, uuid, null, null, -1);
   }
 
   public final String getOrigin() {
@@ -60,26 +69,69 @@ public final class OPlayer {
     return this.brand;
   }
 
+  public final boolean isRewind() {
+    return this.rewind;
+  }
+
+  public final int getPVN() {
+    return this.pvn;
+  }
+
   private static final String formatIPAddress(String addr) {
-    if (addr.startsWith("/")) {
+    if (addr == null) {
-      addr = addr.substring(1);
+      addr = OriginBlacklist.UNKNOWN_STR;
-    }
+    } else {
+      if (addr.startsWith("/")) {
+        addr = addr.substring(1);
+      }
 
-    int i = addr.lastIndexOf('/');
+      int i = addr.lastIndexOf('/');
-    if (i != -1) {
+      if (i != -1) {
-      addr = addr.substring(i + 1);
+        addr = addr.substring(i + 1);
-    }
+      }
 
-    if (addr.startsWith("[")) {
+      if (addr.startsWith("[")) {
-      i = addr.indexOf(']');
+        i = addr.indexOf(']');
-      if (i != -1)
+        if (i != -1) {
-        return addr.substring(1, i);
+          addr = addr.substring(1, i);
-      return addr.substring(1);
+        } else {
-    }
+          addr = addr.substring(1);
+        }
+      } else {
+        i = addr.lastIndexOf(':');
+        if (i != -1) {
+          String a = addr.substring(0, i);
+          String p = addr.substring(i + 1);
 
-    i = addr.lastIndexOf(':');
+          boolean port = !p.isEmpty();
-    if (i != -1) {
+          for (int j = 0; j < p.length() && port; j++) {
-      addr = addr.substring(0, i);
+            char c = p.charAt(j);
+            port = (c >= '0' && c <= '9');
+          }
+
+          if (port) {
+            if (a.indexOf('.') != -1) {
+              addr = a;
+            }
+          }
+        }
+      }
+
+      int c = 0;
+      boolean hex = true;
+      for (int j = 0; j < addr.length(); j++) {
+        char ch = addr.charAt(j);
+        if (ch == ':') {
+          c++;
+        } else if (!((ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'f') || (ch >= 'A' && ch <= 'F'))) {
+          hex = false;
+          break;
+        }
+      }
+
+      if (hex && c == 6 && addr.indexOf("::") == -1) {
+        addr = addr + "::";
+      }
     }
 
     return addr;

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

@@ -1,47 +1,77 @@
 package xyz.webmc.originblacklist.base.util;
 
+import xyz.webmc.originblacklist.base.OriginBlacklist;
+
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
 
-import org.semver4j.Semver;
-
 import de.marhali.json5.Json5;
 import de.marhali.json5.Json5Array;
 import de.marhali.json5.Json5Element;
 import de.marhali.json5.Json5Object;
+import org.semver4j.Semver;
+import org.semver4j.Semver.VersionDiff;
 
 public class UpdateChecker {
   private static final Json5 json5 = Json5.builder(builder -> builder.build());
 
-  public static final boolean checkForUpdate(final String repo, final Semver currentVersion, final boolean allowPreRelease) {
+  public static final String checkForUpdate(final String repo, final Semver currentVersion, final boolean allowSnapshots) {
     try {
       final URL url = new URL("https://api.github.com/repos/" + repo + "/releases");
       final HttpURLConnection conn = (HttpURLConnection) url.openConnection();
       conn.setRequestMethod("GET");
       conn.setConnectTimeout(5000);
       conn.setReadTimeout(5000);
+      conn.setRequestProperty("User-Agent", OriginBlacklist.getUserAgent());
+      conn.setRequestProperty("Accept", "application/vnd.github+json");
+      conn.connect();
       final BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-     Json5Element element = json5.parse(reader);
+      String ret = null;
+      Json5Element element = json5.parse(reader);
+      reader.close();
       if (element instanceof Json5Array) {
         final Json5Array arr = element.getAsJson5Array();
         if (arr.size() > 0) {
-          element = arr.get(0);
+          for (int i = 0; i < Math.min(2, arr.size()); i++) {
-          if (element instanceof Json5Object) {
+            element = arr.get(i);
-            final Json5Object obj = element.getAsJson5Object();
+            if (element instanceof Json5Object) {
-            final String tag = obj.get("tag_name").getAsString();
+              final Json5Object obj = element.getAsJson5Object();
-            final Semver ver = new Semver(tag.substring(1));
+              if (allowSnapshots || !obj.get("prerelease").getAsBoolean()) {
-            if (ver.isGreaterThan(currentVersion)) {
+                final String tag = obj.get("tag_name").getAsString();
-              return true;
+                final Semver ver = new Semver(tag.startsWith("v") ? tag.substring(1) : tag);
+                String comm;
+                try {
+                  comm = ver.getBuild().get(0).trim();
+                } catch (Throwable t) {
+                  comm = "";
+                }
+                if (ver.isGreaterThan(currentVersion) || (allowSnapshots && currentVersion.diff(ver) == VersionDiff.BUILD && OriginBlacklist.isNonNull(comm) && !BuildInfo.get("git_cm_hash").startsWith(comm))) {
+                  element = obj.get("assets");
+                  if (element instanceof Json5Array) {
+                    final Json5Array aArr = element.getAsJson5Array();
+                    if (aArr.size() > 0) {
+                      element = aArr.get(0);
+                      if (element instanceof Json5Object) {
+                        final Json5Object vObj = element.getAsJson5Object();
+                        ret = vObj.get("browser_download_url").getAsString();
+                        break;
+                      }
+                    }
+                  }
+                }
+              }
             }
+            continue;
           }
         }
       }
-      return false;
+      conn.disconnect();
+      return ret;
     } catch (final Throwable t) {
       t.printStackTrace();
-      return false;
+      return null;
     }
   }
 }

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

@@ -5,20 +5,26 @@ 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.OPlayer;
 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 java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
-import org.semver4j.Semver;
+import net.kyori.adventure.text.Component;
+import net.lax1dude.eaglercraft.backend.server.api.IEaglerXServerAPI;
+import net.lax1dude.eaglercraft.backend.server.api.bukkit.EaglerXServerAPI;
+import net.lax1dude.eaglercraft.backend.server.api.bukkit.event.EaglercraftLoginEvent;
+import net.lax1dude.eaglercraft.backend.server.api.bukkit.event.EaglercraftMOTDEvent;
 import org.bstats.bukkit.Metrics;
 import org.bstats.charts.AdvancedPie;
 import org.bukkit.Bukkit;
@@ -32,13 +38,9 @@ import org.bukkit.event.server.ServerListPingEvent;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.util.CachedServerIcon;
+import org.semver4j.Semver;
 
-import net.kyori.adventure.text.Component;
+@SuppressWarnings({ "rawtypes" })
-import net.lax1dude.eaglercraft.backend.server.api.IEaglerXServerAPI;
-import net.lax1dude.eaglercraft.backend.server.api.bukkit.EaglerXServerAPI;
-import net.lax1dude.eaglercraft.backend.server.api.bukkit.event.EaglercraftLoginEvent;
-import net.lax1dude.eaglercraft.backend.server.api.bukkit.event.EaglercraftMOTDEvent;
-
 public final class OriginBlacklistBukkit extends JavaPlugin implements Listener, IOriginBlacklistPlugin {
   private boolean papiPlaceholdersEnabled;
   private Object papi;
@@ -74,7 +76,7 @@ public final class OriginBlacklistBukkit extends JavaPlugin implements Listener,
     this.eaglerAPI = EaglerXServerAPI.instance();
     this.getCommand("originblacklist").setExecutor(new OriginBlacklistCommandBukkit(this.blacklist));
     this.getServer().getPluginManager().registerEvents(this, this);
-    this.log(EnumLogLevel.INFO, "Initialized Plugin");
+    this.blacklist.init();
     if (this.blacklist.isMetricsEnabled()) {
       this.metrics = new Metrics(this, OriginBlacklist.BSTATS_ID);
       this.metrics.addCustomChart(new AdvancedPie("player_types", () -> {
@@ -106,14 +108,14 @@ public final class OriginBlacklistBukkit extends JavaPlugin implements Listener,
   @EventHandler(priority = EventPriority.LOWEST)
   public final void onJavaLogin(final AsyncPlayerPreLoginEvent event) {
     final OPlayer player = new OPlayer(null, event.getName(), event.getUniqueId(),
-        event.getAddress() != null ? event.getAddress().toString() : null, null);
+        event.getAddress() != null ? event.getAddress().toString() : null, OriginBlacklist.UNKNOWN_STR, -1);
     this.blacklist.handleLogin(new OriginBlacklistLoginEvent(null, event, EnumConnectionType.JAVA, player));
   }
 
   @EventHandler(priority = EventPriority.HIGHEST)
   public final void onJavaMOTD(final ServerListPingEvent event) {
     final OPlayer player = new OPlayer(null, null, null,
-        event.getAddress() != null ? event.getAddress().toString() : null, null);
+        event.getAddress() != null ? event.getAddress().toString() : null, null, -1);
     this.blacklist.handleMOTD(new OriginBlacklistMOTDEvent(null, event, EnumConnectionType.JAVA, player));
   }
 
@@ -127,6 +129,11 @@ public final class OriginBlacklistBukkit extends JavaPlugin implements Listener,
     return new Semver(this.getDescription().getVersion());
   }
 
+  @Override
+  public final Path getPluginJarPath() {
+    return Paths.get(this.getFile().getAbsolutePath());
+  }
+
   @Override
   public final void log(final EnumLogLevel level, final String txt) {
     if (level == EnumLogLevel.WARN) {
@@ -224,7 +231,7 @@ public final class OriginBlacklistBukkit extends JavaPlugin implements Listener,
   public final void scheduleRepeat(final Runnable task, final int period, final TimeUnit unit) {
     long ms = unit.toMillis((long) period);
     long ticks = Math.max(1L, ms / 50L);
-    Bukkit.getScheduler().runTaskTimer(this, task, ticks, ticks);
+    Bukkit.getScheduler().runTaskTimer(this, task, 0, ticks);
   }
 
   @Override

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

@@ -10,14 +10,12 @@ import xyz.webmc.originblacklist.base.util.IncompatibleDependencyException;
 import xyz.webmc.originblacklist.base.util.OPlayer;
 import xyz.webmc.originblacklist.bungee.command.OriginBlacklistCommandBungee;
 
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import org.bstats.bungeecord.Metrics;
-import org.bstats.charts.AdvancedPie;
-import org.semver4j.Semver;
-
 import net.kyori.adventure.text.Component;
 import net.lax1dude.eaglercraft.backend.server.api.IEaglerXServerAPI;
 import net.lax1dude.eaglercraft.backend.server.api.bungee.EaglerXServerAPI;
@@ -26,15 +24,18 @@ import net.lax1dude.eaglercraft.backend.server.api.bungee.event.EaglercraftMOTDE
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.ServerPing;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
-import net.md_5.bungee.api.event.ProxyPingEvent;
 import net.md_5.bungee.api.event.PostLoginEvent;
 import net.md_5.bungee.api.event.PreLoginEvent;
+import net.md_5.bungee.api.event.ProxyPingEvent;
 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" })
+@SuppressWarnings({ "deprecation", "rawtypes" })
 public final class OriginBlacklistBungee extends Plugin implements Listener, IOriginBlacklistPlugin {
   private ProxyServer proxy;
   private boolean papiPlaceholdersEnabled;
@@ -71,7 +72,7 @@ public final class OriginBlacklistBungee extends Plugin implements Listener, IOr
     this.eaglerAPI = EaglerXServerAPI.instance();
     this.getProxy().getPluginManager().registerCommand(this, new OriginBlacklistCommandBungee(this, this.blacklist, "originblacklist"));
     this.getProxy().getPluginManager().registerListener(this, this);
-    this.log(EnumLogLevel.INFO, "Initialized Plugin");
+    this.blacklist.init();
     if (this.blacklist.isMetricsEnabled()) {
       this.metrics = new Metrics(this, OriginBlacklist.BSTATS_ID);
       this.metrics.addCustomChart(new AdvancedPie("player_types", () -> {
@@ -104,19 +105,19 @@ public final class OriginBlacklistBungee extends Plugin implements Listener, IOr
   public final void onJavaLogin(final PostLoginEvent event) {
     final ProxiedPlayer aPlayer = event.getPlayer();
     final OPlayer bPlayer = new OPlayer(null, aPlayer.getName(), aPlayer.getUniqueId(),
-        aPlayer.getAddress().toString(), aPlayer.getClientBrand());
+        aPlayer.getAddress().toString(), aPlayer.getClientBrand(), event.getPlayer().getPendingConnection().getVersion());
     this.blacklist.handleLogin(new OriginBlacklistLoginEvent(null, event, EnumConnectionType.JAVA, bPlayer));
   }
 
   @EventHandler(priority = EventPriority.HIGHEST)
   public final void onJavaHandshake(final PreLoginEvent event) {
-    final OPlayer player = new OPlayer(null, null, null, event.getConnection().getAddress().toString(), null);
+    final OPlayer player = new OPlayer(null, null, null, event.getConnection().getAddress().toString(), OriginBlacklist.UNKNOWN_STR, event.getConnection().getVersion());
     this.blacklist.handleLogin(new OriginBlacklistLoginEvent(null, event, EnumConnectionType.JAVA, player));
   }
 
   @EventHandler(priority = EventPriority.LOWEST)
   public final void onJavaMOTD(final ProxyPingEvent event) {
-    final OPlayer player = new OPlayer(null, null, null, event.getConnection().getAddress().toString(), null);
+    final OPlayer player = new OPlayer(null, null, null, event.getConnection().getAddress().toString(), null, -1);
     this.blacklist.handleMOTD(new OriginBlacklistMOTDEvent(null, event, EnumConnectionType.JAVA, player));
   }
 
@@ -130,6 +131,11 @@ public final class OriginBlacklistBungee extends Plugin implements Listener, IOr
     return new Semver(this.getDescription().getVersion());
   }
 
+  @Override
+  public final Path getPluginJarPath() {
+    return Paths.get(this.getFile().getAbsolutePath());
+  }
+
   @Override
   public final void log(final EnumLogLevel level, final String txt) {
     if (level == EnumLogLevel.WARN) {
@@ -189,7 +195,7 @@ public final class OriginBlacklistBungee extends Plugin implements Listener, IOr
 
   @Override
   public final void scheduleRepeat(final Runnable task, final int period, final TimeUnit unit) {
-    this.proxy.getScheduler().schedule(this, task, period, period, unit);
+    this.proxy.getScheduler().schedule(this, task, 0, period, unit);
   }
 
   @Override

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

@@ -10,17 +10,13 @@ import xyz.webmc.originblacklist.base.util.IncompatibleDependencyException;
 import xyz.webmc.originblacklist.base.util.OPlayer;
 import xyz.webmc.originblacklist.velocity.command.OriginBlacklistCommandVelocity;
 
+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 org.bstats.charts.AdvancedPie;
-import org.bstats.velocity.Metrics;
-import org.bstats.velocity.Metrics.Factory;
-import org.semver4j.Semver;
-import org.slf4j.Logger;
-
 import com.google.inject.Inject;
 import com.velocitypowered.api.event.PostOrder;
 import com.velocitypowered.api.event.Subscribe;
@@ -34,14 +30,18 @@ import com.velocitypowered.api.proxy.ProxyServer;
 import com.velocitypowered.api.proxy.server.ServerPing;
 import com.velocitypowered.api.scheduler.ScheduledTask;
 import com.velocitypowered.api.util.Favicon;
-
 import net.kyori.adventure.text.Component;
 import net.lax1dude.eaglercraft.backend.server.api.IEaglerXServerAPI;
-import net.lax1dude.eaglercraft.backend.server.api.velocity.event.EaglercraftMOTDEvent;
 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" })
+@SuppressWarnings({ "deprecation", "unchecked", "rawtypes" })
 public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin {
   private final PluginContainer plugin;
   private final Factory metricsFactory;
@@ -88,7 +88,7 @@ public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin {
     this.blacklist = new OriginBlacklist(this);
     this.eaglerAPI = EaglerXServerAPI.instance();
     this.proxy.getCommandManager().register("originblacklist", new OriginBlacklistCommandVelocity(this.blacklist));
-    this.log(EnumLogLevel.INFO, "Initialized Plugin");
+    this.blacklist.init();
     if (this.blacklist.isMetricsEnabled()) {
       this.metrics = this.metricsFactory.make(this, OriginBlacklist.BSTATS_ID);
       this.metrics.addCustomChart(new AdvancedPie("player_types", () -> {
@@ -120,7 +120,7 @@ public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin {
   @Subscribe(order = PostOrder.FIRST)
   public final void onJavaLogin(final PreLoginEvent event) {
     final OPlayer player = new OPlayer(null, event.getUsername(), event.getUniqueId(),
-        event.getConnection().getRemoteAddress().toString(), null);
+        event.getConnection().getRemoteAddress().toString(), OriginBlacklist.UNKNOWN_STR, event.getConnection().getProtocolVersion().getProtocol());
     this.blacklist.handleLogin(new OriginBlacklistLoginEvent(null, event, EnumConnectionType.JAVA, player));
   }
 
@@ -128,14 +128,14 @@ public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin {
   public final void onJavaHandshake(final PlayerClientBrandEvent event) {
     final Player aPlayer = (Player) event.getPlayer();
     final OPlayer bPlayer = new OPlayer(null, aPlayer.getUsername(), aPlayer.getUniqueId(),
-        aPlayer.getRemoteAddress().getAddress().toString(), event.getBrand());
+        aPlayer.getRemoteAddress().getAddress().toString(), event.getBrand(), event.getPlayer().getProtocolVersion().getProtocol());
     this.blacklist.handleLogin(new OriginBlacklistLoginEvent(null, event, EnumConnectionType.JAVA, bPlayer));
   }
 
   @Subscribe(order = PostOrder.LAST)
   public final void onJavaMOTD(final ProxyPingEvent event) {
     final OPlayer player = new OPlayer(null, null, null, event.getConnection().getRemoteAddress().getHostString(),
-        null);
+        null, -1);
     this.blacklist.handleMOTD(new OriginBlacklistMOTDEvent(null, event, EnumConnectionType.JAVA, player));
   }
 
@@ -149,6 +149,15 @@ public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin {
     return new Semver(this.plugin.getDescription().getVersion().get());
   }
 
+  @Override
+  public final Path getPluginJarPath() {
+    try {
+      return Paths.get(this.getClass().getProtectionDomain().getCodeSource().getLocation().toURI()).toAbsolutePath();
+    } catch (final Throwable t) {
+      throw new RuntimeException("Unable to determine plugin JAR path");
+    }
+  }
+
   @Override
   public final void log(final EnumLogLevel level, final String txt) {
     if (level == EnumLogLevel.WARN) {
@@ -157,7 +166,7 @@ public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin {
       this.logger.error(txt);
     } else if (level == EnumLogLevel.DEBUG) {
       if (this.blacklist.isDebugEnabled()) {
-        this.logger.debug(txt);
+        this.logger.info(txt);
       }
     } else {
       this.logger.info(txt);

src/main/java/xyz/webmc/originblacklist/velocity/command/VCommandContext.java

@@ -3,7 +3,6 @@ package xyz.webmc.originblacklist.velocity.command;
 import xyz.webmc.originblacklist.base.command.CommandContext;
 
 import com.velocitypowered.api.command.SimpleCommand.Invocation;
-
 import net.kyori.adventure.text.minimessage.MiniMessage;
 
 public class VCommandContext implements CommandContext {

src/main/resources/bungee.yml

@@ -3,8 +3,8 @@ version: ${plugin_vers}
 main: xyz.webmc.${plugin_iden}.bungee.${plugin_name}Bungee
 description: ${plugin_desc}
 website: ${plugin_site}
-author: [${plugin_athr}]
+author: ${plugin_athr}
-contributors: [${plugin_ctbr}]
+contributors: ${plugin_ctbr}
-depends: [${plugin_depb}]
+depends: ${plugin_depb}
-provides: [${plugin_prov}]
+provides: ${plugin_prov}
-softdepend: [${plugin_sdpb}]
+softdepend: ${plugin_sdpb}

src/main/resources/plugin.yml

@@ -3,10 +3,10 @@ version: ${plugin_vers}
 main: xyz.webmc.${plugin_iden}.bukkit.${plugin_name}Bukkit
 description: ${plugin_desc}
 website: ${plugin_site}
-authors: [${plugin_athr}]
+authors: ${plugin_athr}
-contributors: [${plugin_ctbr}]
+contributors: ${plugin_ctbr}
-depend: [${plugin_depa}]
+depend: ${plugin_depa}
-provides: [${plugin_prov}]
+provides: ${plugin_prov}
-softdepend: [${plugin_sdpa}]
+softdepend: ${plugin_sdpa}
 commands:
-  originblacklist:
+  ${plugin_iden}:

src/main/resources/velocity-plugin.json

@@ -5,6 +5,6 @@
   "description": "${plugin_desc}",
   "website": "${plugin_site}",
   "main": "xyz.webmc.${plugin_iden}.velocity.${plugin_name}Velocity",
-  "authors": [${plugin_athr}],
+  "authors": ${plugin_athr},
-  "dependencies": [${plugin_depc}]
+  "dependencies": ${plugin_depc}
 }