diff --git a/bin/main/blacklisted.png b/bin/main/blacklisted.png
new file mode 100644
index 0000000..001ee13
Binary files /dev/null and b/bin/main/blacklisted.png differ
diff --git a/bin/main/bungee.yml b/bin/main/bungee.yml
new file mode 100644
index 0000000..bb401b5
--- /dev/null
+++ b/bin/main/bungee.yml
@@ -0,0 +1,10 @@
+name: ${plugin_name}
+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}]
\ No newline at end of file
diff --git a/bin/main/plugin.yml b/bin/main/plugin.yml
new file mode 100644
index 0000000..dfdc264
--- /dev/null
+++ b/bin/main/plugin.yml
@@ -0,0 +1,12 @@
+name: ${plugin_name}
+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}]
+commands:
+  originblacklist:
\ No newline at end of file
diff --git a/bin/main/velocity-plugin.json b/bin/main/velocity-plugin.json
new file mode 100644
index 0000000..8dda797
--- /dev/null
+++ b/bin/main/velocity-plugin.json
@@ -0,0 +1,10 @@
+{
+  "id": "${plugin_iden}",
+  "name": "${plugin_name}",
+  "version": "${plugin_vers}",
+  "description": "${plugin_desc}",
+  "website": "${plugin_site}",
+  "main": "xyz.webmc.${plugin_iden}.velocity.${plugin_name}Velocity",
+  "authors": [${plugin_athr}],
+  "dependencies": [${plugin_depc}]
+}
\ No newline at end of file
diff --git a/bin/main/xyz/webmc/originblacklist/base/OriginBlacklist.class b/bin/main/xyz/webmc/originblacklist/base/OriginBlacklist.class
new file mode 100644
index 0000000..f59754b
Binary files /dev/null and b/bin/main/xyz/webmc/originblacklist/base/OriginBlacklist.class differ
diff --git a/bin/main/xyz/webmc/originblacklist/base/command/CommandContext.class b/bin/main/xyz/webmc/originblacklist/base/command/CommandContext.class
new file mode 100644
index 0000000..c2bcd70
Binary files /dev/null and b/bin/main/xyz/webmc/originblacklist/base/command/CommandContext.class differ
diff --git a/bin/main/xyz/webmc/originblacklist/base/command/ICommand.class b/bin/main/xyz/webmc/originblacklist/base/command/ICommand.class
new file mode 100644
index 0000000..36343e2
Binary files /dev/null and b/bin/main/xyz/webmc/originblacklist/base/command/ICommand.class differ
diff --git a/bin/main/xyz/webmc/originblacklist/base/command/OriginBlacklistCommand.class b/bin/main/xyz/webmc/originblacklist/base/command/OriginBlacklistCommand.class
new file mode 100644
index 0000000..665acff
Binary files /dev/null and b/bin/main/xyz/webmc/originblacklist/base/command/OriginBlacklistCommand.class differ
diff --git a/bin/main/xyz/webmc/originblacklist/base/config/OriginBlacklistConfig.class b/bin/main/xyz/webmc/originblacklist/base/config/OriginBlacklistConfig.class
new file mode 100644
index 0000000..d7f97a0
Binary files /dev/null and b/bin/main/xyz/webmc/originblacklist/base/config/OriginBlacklistConfig.class differ
diff --git a/bin/main/xyz/webmc/originblacklist/base/enums/EnumBlacklistType.class b/bin/main/xyz/webmc/originblacklist/base/enums/EnumBlacklistType.class
new file mode 100644
index 0000000..544ae55
Binary files /dev/null and b/bin/main/xyz/webmc/originblacklist/base/enums/EnumBlacklistType.class differ
diff --git a/bin/main/xyz/webmc/originblacklist/base/enums/EnumConnectionType.class b/bin/main/xyz/webmc/originblacklist/base/enums/EnumConnectionType.class
new file mode 100644
index 0000000..ae1689e
Binary files /dev/null and b/bin/main/xyz/webmc/originblacklist/base/enums/EnumConnectionType.class differ
diff --git a/bin/main/xyz/webmc/originblacklist/base/enums/EnumLogLevel.class b/bin/main/xyz/webmc/originblacklist/base/enums/EnumLogLevel.class
new file mode 100644
index 0000000..4fa6a07
Binary files /dev/null and b/bin/main/xyz/webmc/originblacklist/base/enums/EnumLogLevel.class differ
diff --git a/bin/main/xyz/webmc/originblacklist/base/events/OriginBlacklistEvent.class b/bin/main/xyz/webmc/originblacklist/base/events/OriginBlacklistEvent.class
new file mode 100644
index 0000000..22cc05f
Binary files /dev/null and b/bin/main/xyz/webmc/originblacklist/base/events/OriginBlacklistEvent.class differ
diff --git a/bin/main/xyz/webmc/originblacklist/base/events/OriginBlacklistLoginEvent.class b/bin/main/xyz/webmc/originblacklist/base/events/OriginBlacklistLoginEvent.class
new file mode 100644
index 0000000..283d8bb
Binary files /dev/null and b/bin/main/xyz/webmc/originblacklist/base/events/OriginBlacklistLoginEvent.class differ
diff --git a/bin/main/xyz/webmc/originblacklist/base/events/OriginBlacklistMOTDEvent.class b/bin/main/xyz/webmc/originblacklist/base/events/OriginBlacklistMOTDEvent.class
new file mode 100644
index 0000000..ef75883
Binary files /dev/null and b/bin/main/xyz/webmc/originblacklist/base/events/OriginBlacklistMOTDEvent.class differ
diff --git a/bin/main/xyz/webmc/originblacklist/base/util/ChatFormat.class b/bin/main/xyz/webmc/originblacklist/base/util/ChatFormat.class
new file mode 100644
index 0000000..7cae6ec
Binary files /dev/null and b/bin/main/xyz/webmc/originblacklist/base/util/ChatFormat.class differ
diff --git a/bin/main/xyz/webmc/originblacklist/base/util/IOriginBlacklistPlugin.class b/bin/main/xyz/webmc/originblacklist/base/util/IOriginBlacklistPlugin.class
new file mode 100644
index 0000000..f0888a8
Binary files /dev/null and b/bin/main/xyz/webmc/originblacklist/base/util/IOriginBlacklistPlugin.class differ
diff --git a/bin/main/xyz/webmc/originblacklist/base/util/IncompatibleDependencyException.class b/bin/main/xyz/webmc/originblacklist/base/util/IncompatibleDependencyException.class
new file mode 100644
index 0000000..672e6af
Binary files /dev/null and b/bin/main/xyz/webmc/originblacklist/base/util/IncompatibleDependencyException.class differ
diff --git a/bin/main/xyz/webmc/originblacklist/base/util/OPlayer.class b/bin/main/xyz/webmc/originblacklist/base/util/OPlayer.class
new file mode 100644
index 0000000..ebd1de0
Binary files /dev/null and b/bin/main/xyz/webmc/originblacklist/base/util/OPlayer.class differ
diff --git a/bin/main/xyz/webmc/originblacklist/base/util/UpdateChecker.class b/bin/main/xyz/webmc/originblacklist/base/util/UpdateChecker.class
new file mode 100644
index 0000000..febc5a2
Binary files /dev/null and b/bin/main/xyz/webmc/originblacklist/base/util/UpdateChecker.class differ
diff --git a/bin/main/xyz/webmc/originblacklist/bukkit/OriginBlacklistBukkit.class b/bin/main/xyz/webmc/originblacklist/bukkit/OriginBlacklistBukkit.class
new file mode 100644
index 0000000..1bfdefc
Binary files /dev/null and b/bin/main/xyz/webmc/originblacklist/bukkit/OriginBlacklistBukkit.class differ
diff --git a/bin/main/xyz/webmc/originblacklist/bukkit/command/BKTCommandContext.class b/bin/main/xyz/webmc/originblacklist/bukkit/command/BKTCommandContext.class
new file mode 100644
index 0000000..49c6cbc
Binary files /dev/null and b/bin/main/xyz/webmc/originblacklist/bukkit/command/BKTCommandContext.class differ
diff --git a/bin/main/xyz/webmc/originblacklist/bukkit/command/OriginBlacklistCommandBukkit.class b/bin/main/xyz/webmc/originblacklist/bukkit/command/OriginBlacklistCommandBukkit.class
new file mode 100644
index 0000000..7bec7e8
Binary files /dev/null and b/bin/main/xyz/webmc/originblacklist/bukkit/command/OriginBlacklistCommandBukkit.class differ
diff --git a/bin/main/xyz/webmc/originblacklist/bungee/OriginBlacklistBungee.class b/bin/main/xyz/webmc/originblacklist/bungee/OriginBlacklistBungee.class
new file mode 100644
index 0000000..3654746
Binary files /dev/null and b/bin/main/xyz/webmc/originblacklist/bungee/OriginBlacklistBungee.class differ
diff --git a/bin/main/xyz/webmc/originblacklist/bungee/command/BNGCommandContext.class b/bin/main/xyz/webmc/originblacklist/bungee/command/BNGCommandContext.class
new file mode 100644
index 0000000..affeed1
Binary files /dev/null and b/bin/main/xyz/webmc/originblacklist/bungee/command/BNGCommandContext.class differ
diff --git a/bin/main/xyz/webmc/originblacklist/bungee/command/OriginBlacklistCommandBungee.class b/bin/main/xyz/webmc/originblacklist/bungee/command/OriginBlacklistCommandBungee.class
new file mode 100644
index 0000000..09a3b65
Binary files /dev/null and b/bin/main/xyz/webmc/originblacklist/bungee/command/OriginBlacklistCommandBungee.class differ
diff --git a/bin/main/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocity.class b/bin/main/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocity.class
new file mode 100644
index 0000000..e777827
Binary files /dev/null and b/bin/main/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocity.class differ
diff --git a/bin/main/xyz/webmc/originblacklist/velocity/command/OriginBlacklistCommandVelocity.class b/bin/main/xyz/webmc/originblacklist/velocity/command/OriginBlacklistCommandVelocity.class
new file mode 100644
index 0000000..d6380bd
Binary files /dev/null and b/bin/main/xyz/webmc/originblacklist/velocity/command/OriginBlacklistCommandVelocity.class differ
diff --git a/bin/main/xyz/webmc/originblacklist/velocity/command/VCommandContext.class b/bin/main/xyz/webmc/originblacklist/velocity/command/VCommandContext.class
new file mode 100644
index 0000000..4d4972c
Binary files /dev/null and b/bin/main/xyz/webmc/originblacklist/velocity/command/VCommandContext.class differ
diff --git a/src/main/java/xyz/webmc/originblacklist/base/util/OPlayer.java b/src/main/java/xyz/webmc/originblacklist/base/util/OPlayer.java
index d252c93..a70ee86 100644
--- a/src/main/java/xyz/webmc/originblacklist/base/util/OPlayer.java
+++ b/src/main/java/xyz/webmc/originblacklist/base/util/OPlayer.java
@@ -78,25 +78,42 @@ public final class OPlayer {
   }
 
   private static final String formatIPAddress(String addr) {
-    if (addr.startsWith("/")) {
-      addr = addr.substring(1);
-    }
+    if (addr == null) {
+      addr = OriginBlacklist.UNKNOWN_STR;
+    } else {
+      if (addr.startsWith("/")) {
+        addr = addr.substring(1);
+      }
 
-    int i = addr.lastIndexOf('/');
-    if (i != -1) {
-      addr = addr.substring(i + 1);
-    }
+      int i = addr.lastIndexOf('/');
+      if (i != -1) {
+        addr = addr.substring(i + 1);
+      }
 
-    if (addr.startsWith("[")) {
-      i = addr.indexOf(']');
-      if (i != -1)
-        return addr.substring(1, i);
-      return addr.substring(1);
-    }
+      if (addr.startsWith("[")) {
+        i = addr.indexOf(']');
+        if (i != -1) {
+          addr = addr.substring(1, i);
+        } 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(':');
-    if (i != -1) {
-      addr = addr.substring(0, i);
+          boolean port = !p.isEmpty();
+          for (int j = 0; j < p.length() && port; j++) {
+            char c = p.charAt(j);
+            port = (c >= '0' && c <= '9');
+          }
+
+          if (port && a.indexOf('.') != -1) {
+            addr = a;
+          }
+        }
+      }
     }
 
     return addr;