add manual update command

README.md

@@ -9,16 +9,19 @@
 - [x] Client brand based blacklisting
 - [x] Username based blacklisting
 - [x] IP based blacklisting
-- [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
 - [x] Send blacklist logs to a webhook
+- [x] Reverse blacklist (whitelist)
 - [ ] Ingame blacklist management command
 - [ ] Subscribe to an auto-updating blacklist
-- [ ] Reverse blacklist (whitelist)
+
+<h2>Changes from v1</h2>
+
+- [x] Modular multi-platform support
+- [x] JSON5 based configuration
 
 <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

@@ -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.3"
+val PLUGIN_VERS = "2.0.4"
 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_DEPB_J = getJSONObj(PLUGIN_DEPB)
-val PLUGIN_DEPC_J = getJSONObjMerge(PLUGIN_DEPC, PLUGIN_SDPC)
-val PLUGIN_SDPA_J = getJSONObj(PLUGIN_SDPA)
-val PLUGIN_SDPB_J = getJSONObj(PLUGIN_SDPB)
-val PLUGIN_PROV_J = getJSONObj(PLUGIN_PROV)
-val PLUGIN_ATHR_J = getJSONObj(PLUGIN_ATHR)
-val PLUGIN_CTBR_J = getJSONObj(PLUGIN_CTBR)
+val PLUGIN_DEPA_J = getBukkitBungeeDeps(PLUGIN_DEPA)
+val PLUGIN_DEPB_J = getBukkitBungeeDeps(PLUGIN_DEPB)
+val PLUGIN_DEPC_J = getVelocityDeps(PLUGIN_DEPC, PLUGIN_SDPC)
+val PLUGIN_SDPA_J = getBukkitBungeeDeps(PLUGIN_SDPA)
+val PLUGIN_SDPB_J = getBukkitBungeeDeps(PLUGIN_SDPB)
+val PLUGIN_PROV_J = getBukkitBungeeDeps(PLUGIN_PROV)
+val PLUGIN_ATHR_J = getBukkitBungeeDeps(PLUGIN_ATHR)
+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,17 +91,7 @@ java {
   toolchain.languageVersion.set(JavaLanguageVersion.of(17))
 }
 
-tasks.withType<JavaCompile>().configureEach {
-  options.encoding = "UTF-8"
-  options.release.set(17)
-}
-
-tasks.withType<ProcessResources>() {
-  duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-  outputs.upToDateWhen { false }
-  doFirst {
-    filesMatching(listOf("plugin.yml", "bungee.yml", "velocity-plugin.json")) {
-			expand(mapOf(
+val BUILD_PROPS = mapOf(
   "plugin_name" to PLUGIN_NAME,
   "plugin_iden" to PLUGIN_IDEN,
   "plugin_desc" to PLUGIN_DESC,
@@ -109,10 +105,35 @@ tasks.withType<ProcessResources>() {
   "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)
+}
+
+tasks.withType<ProcessResources>() {
+  duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+  outputs.upToDateWhen { false }
+  
+  doFirst {
+    filesMatching(listOf("plugin.yml", "bungee.yml", "velocity-plugin.json")) {
+			expand(BUILD_PROPS)
 		}
   }
 
+  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 })
 }
 
@@ -162,20 +183,15 @@ tasks.register("printVars") {
   }
 }
 
-fun getJSONObj(list: List<String>): String {
-  return if (list.isNotEmpty()) {
-    list.joinToString(
-      separator = "\", \"",
-      prefix = "\"",
-      postfix = "\""
-    )
-  } else {
-    ""
-  }
+fun getBukkitBungeeDeps(list: List<String>): String {
+  return list.joinToString(
+    prefix = "[",
+    postfix = "]"
+  ) { "\"$it\"" }
 }
 
-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

@@ -6,6 +6,7 @@ import xyz.webmc.originblacklist.base.enums.EnumConnectionType;
 import xyz.webmc.originblacklist.base.enums.EnumLogLevel;
 import xyz.webmc.originblacklist.base.events.OriginBlacklistLoginEvent;
 import xyz.webmc.originblacklist.base.events.OriginBlacklistMOTDEvent;
+import xyz.webmc.originblacklist.base.util.BuildInfo;
 import xyz.webmc.originblacklist.base.util.IOriginBlacklistPlugin;
 import xyz.webmc.originblacklist.base.util.OPlayer;
 import xyz.webmc.originblacklist.base.util.UpdateChecker;
@@ -14,13 +15,15 @@ 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 de.marhali.json5.Json5Array;
@@ -50,8 +53,13 @@ public final class OriginBlacklist {
     this.plugin = plugin;
     this.config = new OriginBlacklistConfig(plugin);
     plugin.scheduleRepeat(() -> {
-      this.checkForUpdate();
-    }, 60, TimeUnit.MINUTES);
+      this.checkForUpdates();
+    }, this.config.getInteger("update_checker.check_timer"), TimeUnit.SECONDS);
+  }
+
+  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) {
@@ -100,11 +108,11 @@ public final class OriginBlacklist {
   }
 
   public final boolean isDebugEnabled() {
-    return this.config.get("debug").getAsBoolean();
+    return this.config.getBoolean("debug");
   }
 
   public final boolean isMetricsEnabled() {
-    return this.config.get("bStats").getAsBoolean();
+    return this.config.getBoolean("bStats");
   }
 
   public final OriginBlacklistConfig getConfig() {
@@ -126,57 +134,133 @@ public final class OriginBlacklist {
     conn.disconnect();
   }
 
+  public final void checkForUpdates(Runnable action1, Runnable action2) {
+    if (this.config.getBoolean("update_checker.enabled")) {
+      this.plugin.runAsync(() -> {
+        this.updateURL = UpdateChecker.checkForUpdates(PLUGIN_REPO, this.plugin.getPluginVersion(),
+            this.config.getBoolean("update_checker.allow_snapshots"));
+        if (isNonNull((this.updateURL))) {
+          action1.run();
+          return;
+        }
+        action2.run();
+      });
+    } else {
+      action2.run();
+    }
+  }
+
+  public final void updatePlugin(Runnable action1, Runnable action2) {
+    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);
+        action1.run();
+        return;
+      } catch (final Throwable t) {
+        t.printStackTrace();
+        Files.move(bak, jar, StandardCopyOption.REPLACE_EXISTING);
+      }
+    } catch (final Throwable t) {
+      t.printStackTrace();
+    }
+    action2.run();
+  }
+
+  public final void updatePlugin() {
+    this.updatePlugin(() -> {}, () -> {});
+  }
+
   private final EnumBlacklistType testBlacklist(final OPlayer player) {
     final String name = player.getName();
     final String addr = player.getAddr();
     final String origin = player.getOrigin();
     final String brand = player.getBrand();
 
+    final boolean whitelist = this.config.getBoolean("blacklist_to_whitelist");
+    EnumBlacklistType type = EnumBlacklistType.NONE;
+
     if (isNonNull(origin)) {
-      for (final Json5Element element : this.config.get("blacklist.origins").getAsJson5Array()) {
+      if (whitelist && !type.isBlacklisted()) type = EnumBlacklistType.ORIGIN;
+      for (final Json5Element element : this.config.getArray("blacklist.origins").getAsJson5Array()) {
         if (origin.matches(element.getAsString())) {
-          return EnumBlacklistType.ORIGIN;
+          if (whitelist) type = EnumBlacklistType.NONE;
+          else if (!type.isBlacklisted()) type = EnumBlacklistType.ORIGIN;
+          break;
         }
       }
+    } else if (this.config.getBoolean("block_undefined_origin")) {
+      return whitelist ? EnumBlacklistType.NONE : EnumBlacklistType.ORIGIN;
     }
 
     if (isNonNull(brand)) {
-      for (final Json5Element element : this.config.get("blacklist.brands").getAsJson5Array()) {
+      if (whitelist && !type.isBlacklisted()) type = EnumBlacklistType.BRAND;
+      for (final Json5Element element : this.config.getArray("blacklist.brands")) {
         if (brand.matches(element.getAsString())) {
-          return EnumBlacklistType.BRAND;
+          if (whitelist) type = EnumBlacklistType.NONE;
+          else if (!type.isBlacklisted()) type = EnumBlacklistType.BRAND;
+          break;
         }
       }
     }
 
     if (isNonNull(name)) {
-      for (final Json5Element element : this.config.get("blacklist.player_names").getAsJson5Array()) {
+      if (whitelist && !type.isBlacklisted()) type = EnumBlacklistType.NAME;
+      for (final Json5Element element : this.config.getArray("blacklist.player_names")) {
         this.plugin.log(EnumLogLevel.DEBUG, element.getAsString());
         if (name.matches(element.getAsString())) {
-          return EnumBlacklistType.NAME;
+          if (whitelist) type = EnumBlacklistType.NONE;
+          else if (!type.isBlacklisted()) type = EnumBlacklistType.NAME;
+          break;
         }
       }
     }
 
     if (isNonNull(addr)) {
-      for (final Json5Element element : this.config.get("blacklist.ip_addresses").getAsJson5Array()) {
+      if (whitelist && !type.isBlacklisted()) type = EnumBlacklistType.ADDR;
+      for (final Json5Element element : this.config.getArray("blacklist.ip_addresses")) {
         try {
           if ((new IPAddressString(element.getAsString()).toAddress())
               .contains((new IPAddressString(addr)).toAddress())) {
-            return EnumBlacklistType.ADDR;
+            if (whitelist) type = EnumBlacklistType.NONE;
+            else if (!type.isBlacklisted()) type = EnumBlacklistType.ADDR;
+            break;
           }
         } catch (final AddressStringException exception) {
-          exception.printStackTrace();
+          if (this.isDebugEnabled()) exception.printStackTrace();
         }
       }
     }
 
-    return EnumBlacklistType.NONE;
+    return type;
   }
 
   private final Component getBlacklistedComponent(final String type, final String id, final String blockType,
       final String blockTypeAlt, final String notAllowed, final String notAllowedAlt, final String blockValue,
       final String action) {
-    final Json5Array arr = this.config.get("messages." + type).getAsJson5Array();
+    final Json5Array arr = this.config.getArray("messages." + type);
     final StringBuilder sb = new StringBuilder();
     for (int i = 0; i < arr.size(); i++) {
       if (i > 0)
@@ -184,7 +268,7 @@ public final class OriginBlacklist {
       sb.append(arr.get(i).getAsString());
     }
     final String str = sb.toString()
-        .replaceAll("%action%", this.config.get("messages.actions." + action).getAsString())
+        .replaceAll("%action%", this.config.getString("messages.actions." + action))
         .replaceAll("%block_type%", blockType)
         .replaceAll("%block_type%", blockType)
         .replaceAll("%not_allowed%", notAllowed)
@@ -194,8 +278,7 @@ public final class OriginBlacklist {
   }
 
   private final void sendWebhooks(final OriginBlacklistLoginEvent event, final EnumBlacklistType type) {
-    Json5Element element = this.config.get("discord.enabled");
-    if (element.getAsBoolean()) {
+    if (this.config.getBoolean("discord.enabled")) {
       final OPlayer player = event.getPlayer();
       final EnumConnectionType connType = event.getConnectionType();
       final String userAgent;
@@ -243,7 +326,7 @@ public final class OriginBlacklist {
         player.getName().replaceAll("_", "\\_"),
         player.getOrigin(),
         player.getBrand(),
-        this.config.get("discord.send_ips").getAsBoolean() ? player.getAddr() : "*\\*CENSORED\\**",
+        this.config.getBoolean("discord.send_ips") ? player.getAddr() : "*\\*CENSORED\\**",
         player.getPVN(),
         userAgent,
         player.isRewind() ? "YES" : "NO",
@@ -252,10 +335,10 @@ public final class OriginBlacklist {
         PLUGIN_REPO,
         PLUGIN_REPO
       ).getBytes();
-      element = this.config.get("discord.webhook_urls");
+      final Json5Element element = this.config.get("discord.webhook_urls");
       if (element instanceof Json5Array) {
         for (final Json5Element _element : element.getAsJson5Array()) {
-          CompletableFuture.runAsync(() -> {
+          this.plugin.runAsync(() -> {
             try {
               final URL url = new URL(_element.getAsString());
               final HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@@ -275,7 +358,7 @@ public final class OriginBlacklist {
               }
 
               conn.disconnect();
-            } catch (Throwable t) {
+            } catch (final Throwable t) {
               t.printStackTrace();
             }
           });
@@ -284,49 +367,14 @@ public final class OriginBlacklist {
     }
   }
 
-  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()) {
+  private final void checkForUpdates() {
+    this.checkForUpdates(() -> {
+      if (!this.config.getBoolean("update_checker.auto_update")) {
         this.plugin.log(EnumLogLevel.INFO, "An update is available! Download it at " + this.updateURL);
       } else {
-            final Path jar = this.plugin.getPluginJarPath();
-            final Path bak = jar.resolveSibling(jar.getFileName().toString() + ".bak");
-            final Path tmp = jar.resolveSibling(jar.getFileName().toString() + ".tmp");
-            try {
-              Files.copy(jar, bak, StandardCopyOption.REPLACE_EXISTING);
-            } catch (final Throwable t) {
-              t.printStackTrace();
-            }
-            try {
-              final URL url = new URL(this.updateURL);
-              final HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-              conn.setRequestMethod("GET");
-              conn.setConnectTimeout(15000);
-              conn.setReadTimeout(15000);
-              conn.connect();
-              try (final InputStream in = conn.getInputStream()) {
-                Files.copy(in, tmp, StandardCopyOption.REPLACE_EXISTING);
-              } finally {
-                conn.disconnect();
-              }
-              Files.move(tmp, jar, StandardCopyOption.REPLACE_EXISTING);
-              Files.delete(bak);
-            } catch (final Throwable t) {
-              t.printStackTrace();
-              try {
-                Files.move(bak, jar, StandardCopyOption.REPLACE_EXISTING);
-              } catch (final Throwable _t) {
-                _t.printStackTrace();
-              }
-            }
-          }
-        }
-      });
+        this.updatePlugin();
       }
+    }, () -> {});
   }
 
   public static final String getComponentString(final Component comp) {
@@ -341,6 +389,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,6 +1,9 @@
 package xyz.webmc.originblacklist.base.command;
 
+import xyz.webmc.originblacklist.base.OriginBlacklist;
+
 public interface CommandContext {
+  public OriginBlacklist getPlugin();
   public String getPlayerName();
   public void reply(final String message);
   public boolean hasPermission(final String permission);

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

@@ -30,24 +30,41 @@ public class OriginBlacklistCommand implements ICommand {
           if (ctx.hasPermission("originblacklist.command.reload")) {
             ctx.reply("<aqua>Blacklist:</aqua>");
             ctx.reply("<gold>  - Origins:</gold>");
-            for (final Json5Element element : this.plugin.getConfig().get("blacklist.origins").getAsJson5Array()) {
+            for (final Json5Element element : this.plugin.getConfig().getArray("blacklist.origins")) {
               ctx.reply("<gray>    - " + element.getAsString() + "</gray>");
             }
             ctx.reply("<gold>  - Brands:</gold>");
-            for (final Json5Element element : this.plugin.getConfig().get("blacklist.brands").getAsJson5Array()) {
+            for (final Json5Element element : this.plugin.getConfig().getArray("blacklist.brands")) {
               ctx.reply("<gray>    - " + element.getAsString() + "</gray>");
             }
             ctx.reply("<gold>  - Players:</gold>");
-            for (final Json5Element element : this.plugin.getConfig().get("blacklist.player_names").getAsJson5Array()) {
+            for (final Json5Element element : this.plugin.getConfig().getArray("blacklist.player_names")) {
               ctx.reply("<gray>    - " + element.getAsString() + "</gray>");
             }
             ctx.reply("<gold>  - IPs:</gold>");
-            for (final Json5Element element : this.plugin.getConfig().get("blacklist.ip_addresses").getAsJson5Array()) {
+            for (final Json5Element element : this.plugin.getConfig().getArray("blacklist.ip_addresses")) {
               ctx.reply("<gray>    - " + element.getAsString() + "</gray>");
             }
           } else {
             ctx.reply(NO_PERMISSION);
           }
+        } else if ("update".equals(command)) {
+          if (ctx.hasPermission("originblacklist.command.update")) {
+            ctx.reply("<aqua>Checking for updates...</aqua>");
+            final OriginBlacklist plugin = ctx.getPlugin();
+            plugin.checkForUpdates(() -> {
+              ctx.reply("<yellow>Updating plugin...</yellow>");
+              plugin.updatePlugin(() -> {
+                ctx.reply("<green>Successfully updated plugin.</green>");
+              }, () -> {
+                ctx.reply("<red>Failed to update plugin.</red>");
+              });
+            }, () -> {
+              ctx.reply("<green>Plugin is up to date.</green>");
+            });
+          } else {
+            ctx.reply(NO_PERMISSION);
+          }
         } else {
           this.usage(ctx);
         }
@@ -69,6 +86,7 @@ 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 update</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 list</gray>");

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

@@ -31,7 +31,7 @@ public final class OriginBlacklistConfig {
   private byte[] icon;
   private String icon64;
 
-  public OriginBlacklistConfig(IOriginBlacklistPlugin plugin) {
+  public OriginBlacklistConfig(final IOriginBlacklistPlugin plugin) {
     this.json5 = Json5.builder(builder -> builder
         .quoteless()
         .quoteSingle()
@@ -155,6 +155,26 @@ public final class OriginBlacklistConfig {
     return element;
   }
 
+  public final String getString(final String key) {
+    return this.get(key).getAsString();
+  }
+
+  public final boolean getBoolean(final String key) {
+    return this.get(key).getAsBoolean();
+  }
+
+  public final int getInteger(final String key) {
+    return this.get(key).getAsInt();
+  }
+
+  public final Json5Array getArray(final String key) {
+    return this.get(key).getAsJson5Array();
+  }
+
+  public final Json5Object getObject(final String key) {
+    return this.get(key).getAsJson5Object();
+  }
+
   public final byte[] getIconBytes() {
     return this.icon;
   }
@@ -221,9 +241,13 @@ 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, "auto_update", Json5Primitive.fromBoolean(true), null);
     addJSONObj(obj, "update_checker", uobj, null);
+    addJSONObj(obj, "blacklist_to_whitelist", Json5Primitive.fromBoolean(false), null);
+    addJSONObj(obj, "block_undefined_origin", Json5Primitive.fromBoolean(false), null);
     addJSONObj(obj, "bStats", Json5Primitive.fromBoolean(true), null);
+    addJSONObj(obj, "config_version", Json5Primitive.fromNumber(1), "DO NOT CHANGE");
     return obj;
   }
 

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

@@ -36,4 +36,8 @@ public enum EnumBlacklistType {
   public final String getActionString() {
     return this.act;
   }
+
+  public final boolean isBlacklisted() {
+    return this != NONE;
+  }
 }

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

@@ -19,5 +19,6 @@ public interface IOriginBlacklistPlugin {
   public void setMOTD(final Component txt, final OriginBlacklistMOTDEvent event);
   public String parsePlaceholders(final OPlayer player, final String str);
   public void scheduleRepeat(final Runnable task, final int period, final TimeUnit unit);
+  public void runAsync(final Runnable task);
   public void shutdown();
 }

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

@@ -17,54 +17,77 @@ import org.semver4j.Semver.VersionDiff;
 public class UpdateChecker {
   private static final Json5 json5 = Json5.builder(builder -> builder.build());
 
-  public static final String checkForUpdate(final String repo, final Semver currentVersion, final boolean allowPreRelease) {
+  public static final String checkForUpdates(final String repo, final Semver currentVersion, final boolean allowSnapshots) {
     try {
-      URL url = new URL("https://api.github.com/repos/" + repo + "/releases");
-      HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+      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();
-      BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+      final BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
       String ret = null;
       Json5Element element = json5.parse(reader);
+      reader.close();
+
+      Json5Object rel = null;
+      Json5Object snap = null;
+
       if (element instanceof Json5Array) {
         final Json5Array arr = element.getAsJson5Array();
-        if (arr.size() > 0) {
-          element = arr.get(0);
+        for (int i = 0; i < arr.size(); i++) {
+          element = arr.get(i);
           if (element instanceof Json5Object) {
             final Json5Object obj = element.getAsJson5Object();
+            if (!obj.has("published_at")) {
+              continue;
+            }
+            final boolean pre = obj.get("prerelease").getAsBoolean();
+            if (!pre) {
+              if (rel == null || obj.get("published_at").getAsString().compareTo(rel.get("published_at").getAsString()) > 0) {
+                rel = obj;
+              }
+            } else {
+              if (snap == null || obj.get("published_at").getAsString().compareTo(snap.get("published_at").getAsString()) > 0) {
+                snap = obj;
+              }
+            }
+          }
+          continue;
+        }
+
+        for (int i = 0; i < 2; i++) {
+          final Json5Object obj = i == 0 ? rel : snap;
+          if (obj == null || (i == 1 && !allowSnapshots)) {
+            continue;
+          }
           final String tag = obj.get("tag_name").getAsString();
-            final Semver ver = new Semver(tag.substring(1));
-            if (ver.isGreaterThan(currentVersion) && (allowPreRelease || currentVersion.diff(ver) != VersionDiff.BUILD)) {
+          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("url").getAsString();
+                  ret = element.getAsJson5Object().get("browser_download_url").getAsString();
+                  break;
                 }
               }
             }
           }
         }
       }
+
       conn.disconnect();
-      if (OriginBlacklist.isNonNull(ret)) {
-        url = new URL(ret);
-        conn = (HttpURLConnection) url.openConnection();
-        conn.setRequestMethod("GET");
-        conn.setConnectTimeout(5000);
-        conn.setReadTimeout(5000);
-        conn.connect();
-        reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-        element = json5.parse(reader);
-        if (element instanceof Json5Object) {
-          final Json5Object obj = element.getAsJson5Object();
-          ret = obj.get("browser_download_url").getAsString();
-        }
-      }
       return ret;
     } catch (final Throwable t) {
       t.printStackTrace();

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

@@ -76,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", () -> {
@@ -234,6 +234,11 @@ public final class OriginBlacklistBukkit extends JavaPlugin implements Listener,
     Bukkit.getScheduler().runTaskTimer(this, task, 0, ticks);
   }
 
+  @Override
+  public final void runAsync(final Runnable task) {
+    Bukkit.getScheduler().runTaskAsynchronously(this, task);
+  }
+
   @Override
   public final void shutdown() {
     this.metrics.shutdown();

src/main/java/xyz/webmc/originblacklist/bukkit/command/BKTCommandContext.java

@@ -6,14 +6,21 @@ import xyz.webmc.originblacklist.base.command.CommandContext;
 import org.bukkit.command.CommandSender;
 
 public class BKTCommandContext implements CommandContext {
+  private final OriginBlacklist plugin;
   private final CommandSender sender;
   private final String[] args;
 
-  public BKTCommandContext(final CommandSender sender, final String[] args) {
+  public BKTCommandContext(final OriginBlacklist plugin, final CommandSender sender, final String[] args) {
+    this.plugin = plugin;
     this.sender = sender;
     this.args = args;
   }
 
+  @Override
+  public OriginBlacklist getPlugin() {
+    return this.plugin;
+  }
+
   @Override
   public String getPlayerName() {
     return this.sender.getName();

src/main/java/xyz/webmc/originblacklist/bukkit/command/OriginBlacklistCommandBukkit.java

@@ -10,17 +10,20 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
 
 public class OriginBlacklistCommandBukkit extends OriginBlacklistCommand implements TabExecutor {
+  private final OriginBlacklist plugin;
+
   public OriginBlacklistCommandBukkit(OriginBlacklist plugin) {
     super(plugin);
+    this.plugin = plugin;
   }
 
   @Override
   public boolean onCommand(final CommandSender sender, final Command command, final String label, final String[] args) {
-    return super.execute(new BKTCommandContext(sender, args));
+    return super.execute(new BKTCommandContext(this.plugin, sender, args));
   }
 
   @Override
   public List<String> onTabComplete(final CommandSender sender, final Command command, final String label, final String[] args) {
-    return super.suggest(new BKTCommandContext(sender, args));
+    return super.suggest(new BKTCommandContext(this.plugin, sender, args));
   }
 }

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

@@ -72,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", () -> {
@@ -198,6 +198,11 @@ public final class OriginBlacklistBungee extends Plugin implements Listener, IOr
     this.proxy.getScheduler().schedule(this, task, 0, period, unit);
   }
 
+  @Override
+  public final void runAsync(final Runnable task) {
+    this.proxy.getScheduler().runAsync(this, task);
+  }
+
   @Override
   public final void shutdown() {
     this.metrics.shutdown();

src/main/java/xyz/webmc/originblacklist/bungee/command/BNGCommandContext.java

@@ -7,14 +7,21 @@ import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.chat.TextComponent;
 
 public class BNGCommandContext implements CommandContext {
+  private final OriginBlacklist plugin;
   private final CommandSender sender;
   private final String[] args;
 
-  public BNGCommandContext(final CommandSender sender, final String[] args) {
+  public BNGCommandContext(final OriginBlacklist plugin, final CommandSender sender, final String[] args) {
+    this.plugin = plugin;
     this.sender = sender;
     this.args = args;
   }
 
+  @Override
+  public OriginBlacklist getPlugin() {
+    return this.plugin;
+  }
+
   @Override
   public String getPlayerName() {
     return this.sender.getName();

src/main/java/xyz/webmc/originblacklist/bungee/command/OriginBlacklistCommandBungee.java

@@ -12,19 +12,21 @@ import net.md_5.bungee.api.plugin.TabExecutor;
 
 public class OriginBlacklistCommandBungee extends Command implements TabExecutor {
   private final OriginBlacklistCommand cmd;
+  private final OriginBlacklist blacklist;
 
   public OriginBlacklistCommandBungee(final OriginBlacklistBungee plugin, final OriginBlacklist blacklist, final String command) {
     super(command);
     this.cmd = new OriginBlacklistCommand(blacklist);
+    this.blacklist = blacklist;
   }
 
   @Override
   public void execute(final CommandSender sender, final String[] args) {
-    this.cmd.execute(new BNGCommandContext(sender, args));
+    this.cmd.execute(new BNGCommandContext(this.blacklist, sender, args));
   }
 
   @Override
   public List<String> onTabComplete(final CommandSender sender, final String[] args) {
-    return this.cmd.suggest(new BNGCommandContext(sender, args));
+    return this.cmd.suggest(new BNGCommandContext(this.blacklist, sender, args));
   }
 }

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

@@ -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,8 @@ 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(), OriginBlacklist.UNKNOWN_STR, event.getConnection().getProtocolVersion().getProtocol());
+        event.getConnection().getRemoteAddress().toString(), OriginBlacklist.UNKNOWN_STR,
+        event.getConnection().getProtocolVersion().getProtocol());
     this.blacklist.handleLogin(new OriginBlacklistLoginEvent(null, event, EnumConnectionType.JAVA, player));
   }
 
@@ -128,7 +129,8 @@ 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(), event.getPlayer().getProtocolVersion().getProtocol());
+        aPlayer.getRemoteAddress().getAddress().toString(), event.getBrand(),
+        event.getPlayer().getProtocolVersion().getProtocol());
     this.blacklist.handleLogin(new OriginBlacklistLoginEvent(null, event, EnumConnectionType.JAVA, bPlayer));
   }
 
@@ -153,7 +155,7 @@ public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin {
   public final Path getPluginJarPath() {
     try {
       return Paths.get(this.getClass().getProtectionDomain().getCodeSource().getLocation().toURI()).toAbsolutePath();
-    } catch (Throwable t) {
+    } catch (final Throwable t) {
       throw new RuntimeException("Unable to determine plugin JAR path");
     }
   }
@@ -166,7 +168,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);
@@ -225,6 +227,13 @@ public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin {
         .schedule();
   }
 
+  @Override
+  public final void runAsync(final Runnable task) {
+    this.proxy.getScheduler()
+        .buildTask(this, task)
+        .schedule();
+  }
+
   @Override
   public final void shutdown() {
     this.metrics.shutdown();

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

@@ -8,17 +8,20 @@ import java.util.List;
 import com.velocitypowered.api.command.SimpleCommand;
 
 public class OriginBlacklistCommandVelocity extends OriginBlacklistCommand implements SimpleCommand {
+  private final OriginBlacklist plugin;
+
   public OriginBlacklistCommandVelocity(OriginBlacklist plugin) {
     super(plugin);
+    this.plugin = plugin;
   }
 
   @Override
   public void execute(final Invocation invocation) {
-    super.execute(new VCommandContext(invocation));
+    super.execute(new VCommandContext(this.plugin, invocation));
   }
 
   @Override
   public List<String> suggest(final Invocation invocation) {
-    return super.suggest(new VCommandContext(invocation));
+    return super.suggest(new VCommandContext(this.plugin, invocation));
   }
 }

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

@@ -1,17 +1,25 @@
 package xyz.webmc.originblacklist.velocity.command;
 
+import xyz.webmc.originblacklist.base.OriginBlacklist;
 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 {
+  private final OriginBlacklist plugin;
   private final Invocation invocation;
 
-  public VCommandContext(final Invocation invocation) {
+  public VCommandContext(final OriginBlacklist plugin, final Invocation invocation) {
+    this.plugin = plugin;
     this.invocation = invocation;
   }
 
+  @Override
+  public OriginBlacklist getPlugin() {
+    return this.plugin;
+  }
+
   @Override
   public String getPlayerName() {
     return this.invocation.source().toString();

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}]
-contributors: [${plugin_ctbr}]
-depends: [${plugin_depb}]
-provides: [${plugin_prov}]
-softdepend: [${plugin_sdpb}]
+author: ${plugin_athr}
+contributors: ${plugin_ctbr}
+depends: ${plugin_depb}
+provides: ${plugin_prov}
+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}]
-contributors: [${plugin_ctbr}]
-depend: [${plugin_depa}]
-provides: [${plugin_prov}]
-softdepend: [${plugin_sdpa}]
+authors: ${plugin_athr}
+contributors: ${plugin_ctbr}
+depend: ${plugin_depa}
+provides: ${plugin_prov}
+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}],
-  "dependencies": [${plugin_depc}]
+  "authors": ${plugin_athr},
+  "dependencies": ${plugin_depc}
 }