Doesn't compile but start work towards seperating into modules... (with legacy support hopefully for basic API)

bukkit/pom.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>viaversion</artifactId>
+        <groupId>us.myles</groupId>
+        <version>1.0.0-ALPHA-16w38a</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>viaversion-bukkit</artifactId>
+
+    <properties>
+        <!-- Change Bukkit Version HERE! -->
+        <bukkitVersion>1.8.8-R0.1-SNAPSHOT</bukkitVersion>
+    </properties>
+
+    <dependencies>
+        <!-- Common Module -->
+        <dependency>
+            <groupId>us.myles</groupId>
+            <artifactId>viaversion-common</artifactId>
+            <version>1.0.0-ALPHA-16w38a</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Bukkit API, http://www.spigotmc.org/ or http://bukkit.org/ -->
+        <dependency>
+            <groupId>org.bukkit</groupId>
+            <artifactId>bukkit</artifactId>
+            <version>${bukkitVersion}</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <artifactId>junit</artifactId>
+                    <groupId>junit</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>gson</artifactId>
+                    <groupId>com.google.code.gson</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>persistence-api</artifactId>
+                    <groupId>javax.persistence</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+</project>

bukkit/src/main/java/us/myles/ViaVersion/ViaVersionPlugin.java

@@ -13,6 +13,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.java.JavaPlugin;
 import us.myles.ViaVersion.api.Pair;
+import us.myles.ViaVersion.api.Via;
 import us.myles.ViaVersion.api.ViaVersion;
 import us.myles.ViaVersion.api.ViaVersionAPI;
 import us.myles.ViaVersion.api.boss.BossBar;
@@ -20,14 +21,15 @@ import us.myles.ViaVersion.api.boss.BossColor;
 import us.myles.ViaVersion.api.boss.BossStyle;
 import us.myles.ViaVersion.api.command.ViaVersionCommand;
 import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.platform.ViaPlatform;
 import us.myles.ViaVersion.api.protocol.ProtocolRegistry;
 import us.myles.ViaVersion.api.protocol.ProtocolVersion;
 import us.myles.ViaVersion.boss.ViaBossBar;
+import us.myles.ViaVersion.bukkit.BukkitCommandHandler;
 import us.myles.ViaVersion.classgenerator.ClassGenerator;
-import us.myles.ViaVersion.commands.ViaCommandHandler;
 import us.myles.ViaVersion.handlers.ViaVersionInitializer;
+import us.myles.ViaVersion.listeners.UpdateListener;
 import us.myles.ViaVersion.protocols.base.ProtocolInfo;
-import us.myles.ViaVersion.update.UpdateListener;
 import us.myles.ViaVersion.update.UpdateUtil;
 import us.myles.ViaVersion.util.ConcurrentList;
 import us.myles.ViaVersion.util.ListWrapper;
@@ -42,12 +44,12 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
-public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
+public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI, ViaPlatform {
 
     private final Map<UUID, UserConnection> portedPlayers = new ConcurrentHashMap<>();
     private List<ChannelFuture> injectedFutures = new ArrayList<>();
     private List<Pair<Field, Object>> injectedLists = new ArrayList<>();
-    private ViaCommandHandler commandHandler;
+    private BukkitCommandHandler commandHandler;
     private boolean debug = false;
     private boolean compatSpigotBuild = false;
     private boolean spigot = true;
@@ -74,6 +76,9 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
     public void onLoad() {
         // Config magic
         conf = new ViaConfig(this);
+        // Init platform
+        Via.init(this);
+        // For compatibility
         ViaVersion.setInstance(this);
 
         // Handle reloads
@@ -118,7 +123,7 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
         if (lateBind)
             injectPacketHandler();
         if (conf.isCheckForUpdates())
-            UpdateUtil.sendUpdateMessage(this);
+            UpdateUtil.sendUpdateMessage();
         // Gather version :)
         Bukkit.getScheduler().scheduleSyncDelayedTask(this, new Runnable() {
             @Override
@@ -136,9 +141,9 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
         });
 
 
-        Bukkit.getPluginManager().registerEvents(new UpdateListener(this), this);
+        Bukkit.getPluginManager().registerEvents(new UpdateListener(), this);
 
-        getCommand("viaversion").setExecutor(commandHandler = new ViaCommandHandler());
+        getCommand("viaversion").setExecutor(commandHandler = new BukkitCommandHandler());
         getCommand("viaversion").setTabCompleter(commandHandler);
 
         // Register Protocol Listeners
@@ -527,4 +532,48 @@ public class ViaVersionPlugin extends JavaPlugin implements ViaVersionAPI {
         }
         return false;
     }
+
+    @Override
+    public String getPlatformName() {
+        return "Bukkit";
+    }
+
+    @Override
+    public String getPluginVersion() {
+        return getDescription().getVersion();
+    }
+
+    @Override
+    public void runAsync(Runnable runnable) {
+        getServer().getScheduler().runTaskAsynchronously(this, runnable);
+    }
+
+    @Override
+    public void runSync(Runnable runnable) {
+        getServer().getScheduler().runTask(this, runnable);
+    }
+
+    @Override
+    public void sendMessage(UUID uuid, String message) {
+        Player player = Bukkit.getPlayer(uuid);
+        if (player != null) {
+            player.sendMessage(message);
+        }
+    }
+
+    @Override
+    public boolean kickPlayer(UUID uuid, String message) {
+        Player player = Bukkit.getPlayer(uuid);
+        if (player != null) {
+            player.kickPlayer(message);
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public boolean isPluginEnabled() {
+        return Bukkit.getPluginManager().getPlugin("ViaVersion").isEnabled();
+    }
 }

bukkit/src/main/java/us/myles/ViaVersion/api/ViaVersion.java

@@ -1,19 +1,19 @@
-package us.myles.ViaVersion.api;
-
-import lombok.Getter;
-import org.apache.commons.lang.Validate;
-import us.myles.ViaVersion.ViaVersionPlugin;
-
-public class ViaVersion {
-
-    @Getter
-    private static ViaVersionAPI instance;
-    @Getter
-    private static ViaVersionConfig config;
-
-    public static void setInstance(ViaVersionPlugin plugin) {
-        Validate.isTrue(instance == null, "Instance is already set");
-        ViaVersion.instance = plugin;
-        ViaVersion.config = plugin.getConf();
-    }
-}
+package us.myles.ViaVersion.api;
+
+import lombok.Getter;
+import org.apache.commons.lang.Validate;
+import us.myles.ViaVersion.ViaVersionPlugin;
+
+@Deprecated
+public class ViaVersion {
+    @Getter
+    private static ViaVersionAPI instance;
+    @Getter
+    private static ViaVersionConfig config;
+
+    public static void setInstance(ViaVersionPlugin plugin) {
+        Validate.isTrue(instance == null, "Instance is already set");
+        ViaVersion.instance = plugin;
+        ViaVersion.config = plugin.getConf();
+    }
+}

bukkit/src/main/java/us/myles/ViaVersion/api/ViaVersionAPI.java

@@ -1,143 +1,144 @@
-package us.myles.ViaVersion.api;
-
-import io.netty.buffer.ByteBuf;
-import org.bukkit.entity.Player;
-import us.myles.ViaVersion.api.boss.BossBar;
-import us.myles.ViaVersion.api.boss.BossColor;
-import us.myles.ViaVersion.api.boss.BossStyle;
-import us.myles.ViaVersion.api.command.ViaVersionCommand;
-import us.myles.ViaVersion.api.protocol.ProtocolRegistry;
-
-import java.util.SortedSet;
-import java.util.UUID;
-
-public interface ViaVersionAPI {
-    /**
-     * Is the player connection modified by ViaVersion?
-     *
-     * @param player Bukkit player object
-     * @return True if the client is modified (At the moment it also means version 1.9 and higher)
-     * @deprecated As of 0.9.9, because all players are ported use {@link #getPlayerVersion(Player)}
-     */
-    boolean isPorted(Player player);
-
-    /**
-     * Get protocol number from a player
-     * Will also retrieve version from ProtocolSupport if it's being used.
-     *
-     * @param player Bukkit player object
-     * @return Protocol ID, For example (47=1.8-1.8.8, 107=1.9, 108=1.9.1)
-     */
-    int getPlayerVersion(Player player);
-
-    /**
-     * Get protocol number from a player
-     *
-     * @param uuid UUID of a player
-     * @return Protocol ID, For example (47=1.8-1.8.8, 107=1.9, 108=1.9.1)
-     */
-    int getPlayerVersion(UUID uuid);
-
-    /**
-     * Is player using 1.9?
-     *
-     * @param playerUUID UUID of a player
-     * @return True if the client is on 1.9
-     * @deprecated As of 0.9.9, because all players are ported use {@link #getPlayerVersion(UUID)}
-     */
-    @Deprecated
-    boolean isPorted(UUID playerUUID);
-
-    /**
-     * Get the version of the plugin
-     *
-     * @return Plugin version
-     */
-    String getVersion();
-
-    /**
-     * Send a raw packet to the player (Use new IDs)
-     *
-     * @param player The player to send packet
-     * @param packet The packet, you need a VarInt ID then the packet contents.
-     * @throws IllegalArgumentException If not on 1.9 throws IllegalArg
-     */
-    void sendRawPacket(Player player, ByteBuf packet) throws IllegalArgumentException;
-
-    /**
-     * Send a raw packet to the player (Use new IDs)
-     *
-     * @param uuid   The uuid from the player to send packet
-     * @param packet The packet, you need a VarInt ID then the packet contents.
-     * @throws IllegalArgumentException If not on 1.9 throws IllegalArg
-     */
-    void sendRawPacket(UUID uuid, ByteBuf packet) throws IllegalArgumentException;
-
-    /**
-     * Create a new bossbar instance
-     *
-     * @param title The title
-     * @param color The color
-     * @param style The style
-     * @return Bossbar instance
-     */
-    BossBar createBossBar(String title, BossColor color, BossStyle style);
-
-    /**
-     * Create a new bossbar instance
-     *
-     * @param title  The title
-     * @param health Number between 0 and 1
-     * @param color  The color
-     * @param style  The style
-     * @return Bossbar instance
-     */
-    BossBar createBossBar(String title, float health, BossColor color, BossStyle style);
-
-    /**
-     * Get if global debug is enabled
-     *
-     * @return true if debug is enabled
-     */
-    boolean isDebug();
-
-    /**
-     * Get ViaVersions command handler
-     *
-     * @return command handler
-     */
-    ViaVersionCommand getCommandHandler();
-
-    /**
-     * Get if this version is a compatibility build for spigot.
-     * Eg. 1.9.1 / 1.9.2 allow certain versions to connect
-     *
-     * @return True if it is
-     */
-    boolean isCompatSpigotBuild();
-
-    /**
-     * Get the supported protocol versions
-     * This method removes any blocked protocol versions.
-     *
-     * @return a list of protocol versions
-     * @see ProtocolRegistry#getSupportedVersions() for full list.
-     */
-    SortedSet<Integer> getSupportedVersions();
-
-    /**
-     * Gets if the server uses spigot
-     * <p>
-     * Note: Will only work after ViaVersion load
-     *
-     * @return True if spigot
-     */
-    boolean isSpigot();
-
-    /**
-     * Gets if protocol support is also being used.
-     *
-     * @return True if it is being used.
-     */
-    boolean isProtocolSupport();
-}
+package us.myles.ViaVersion.api;
+
+import io.netty.buffer.ByteBuf;
+import org.bukkit.entity.Player;
+import us.myles.ViaVersion.api.boss.BossBar;
+import us.myles.ViaVersion.api.boss.BossColor;
+import us.myles.ViaVersion.api.boss.BossStyle;
+import us.myles.ViaVersion.api.command.ViaVersionCommand;
+import us.myles.ViaVersion.api.protocol.ProtocolRegistry;
+
+import java.util.SortedSet;
+import java.util.UUID;
+
+@Deprecated
+public interface ViaVersionAPI {
+    /**
+     * Is the player connection modified by ViaVersion?
+     *
+     * @param player Bukkit player object
+     * @return True if the client is modified (At the moment it also means version 1.9 and higher)
+     * @deprecated As of 0.9.9, because all players are ported use {@link #getPlayerVersion(Player)}
+     */
+    boolean isPorted(Player player);
+
+    /**
+     * Get protocol number from a player
+     * Will also retrieve version from ProtocolSupport if it's being used.
+     *
+     * @param player Bukkit player object
+     * @return Protocol ID, For example (47=1.8-1.8.8, 107=1.9, 108=1.9.1)
+     */
+    int getPlayerVersion(Player player);
+
+    /**
+     * Get protocol number from a player
+     *
+     * @param uuid UUID of a player
+     * @return Protocol ID, For example (47=1.8-1.8.8, 107=1.9, 108=1.9.1)
+     */
+    int getPlayerVersion(UUID uuid);
+
+    /**
+     * Is player using 1.9?
+     *
+     * @param playerUUID UUID of a player
+     * @return True if the client is on 1.9
+     * @deprecated As of 0.9.9, because all players are ported use {@link #getPlayerVersion(UUID)}
+     */
+    @Deprecated
+    boolean isPorted(UUID playerUUID);
+
+    /**
+     * Get the version of the plugin
+     *
+     * @return Plugin version
+     */
+    String getVersion();
+
+    /**
+     * Send a raw packet to the player (Use new IDs)
+     *
+     * @param player The player to send packet
+     * @param packet The packet, you need a VarInt ID then the packet contents.
+     * @throws IllegalArgumentException If not on 1.9 throws IllegalArg
+     */
+    void sendRawPacket(Player player, ByteBuf packet) throws IllegalArgumentException;
+
+    /**
+     * Send a raw packet to the player (Use new IDs)
+     *
+     * @param uuid   The uuid from the player to send packet
+     * @param packet The packet, you need a VarInt ID then the packet contents.
+     * @throws IllegalArgumentException If not on 1.9 throws IllegalArg
+     */
+    void sendRawPacket(UUID uuid, ByteBuf packet) throws IllegalArgumentException;
+
+    /**
+     * Create a new bossbar instance
+     *
+     * @param title The title
+     * @param color The color
+     * @param style The style
+     * @return Bossbar instance
+     */
+    BossBar createBossBar(String title, BossColor color, BossStyle style);
+
+    /**
+     * Create a new bossbar instance
+     *
+     * @param title  The title
+     * @param health Number between 0 and 1
+     * @param color  The color
+     * @param style  The style
+     * @return Bossbar instance
+     */
+    BossBar createBossBar(String title, float health, BossColor color, BossStyle style);
+
+    /**
+     * Get if global debug is enabled
+     *
+     * @return true if debug is enabled
+     */
+    boolean isDebug();
+
+    /**
+     * Get ViaVersions command handler
+     *
+     * @return command handler
+     */
+    ViaVersionCommand getCommandHandler();
+
+    /**
+     * Get if this version is a compatibility build for spigot.
+     * Eg. 1.9.1 / 1.9.2 allow certain versions to connect
+     *
+     * @return True if it is
+     */
+    boolean isCompatSpigotBuild();
+
+    /**
+     * Get the supported protocol versions
+     * This method removes any blocked protocol versions.
+     *
+     * @return a list of protocol versions
+     * @see ProtocolRegistry#getSupportedVersions() for full list.
+     */
+    SortedSet<Integer> getSupportedVersions();
+
+    /**
+     * Gets if the server uses spigot
+     * <p>
+     * Note: Will only work after ViaVersion load
+     *
+     * @return True if spigot
+     */
+    boolean isSpigot();
+
+    /**
+     * Gets if protocol support is also being used.
+     *
+     * @return True if it is being used.
+     */
+    boolean isProtocolSupport();
+}

bukkit/src/main/java/us/myles/ViaVersion/bukkit/BukkitCommandHandler.java

@@ -0,0 +1,21 @@
+package us.myles.ViaVersion.bukkit;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import us.myles.ViaVersion.commands.ViaCommandHandler;
+
+import java.util.List;
+
+public class BukkitCommandHandler extends ViaCommandHandler implements CommandExecutor, TabExecutor {
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
+        return onCommand(new BukkitCommandSender(sender), args);
+    }
+
+    @Override
+    public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
+        return onTabComplete(new BukkitCommandSender(sender), args);
+    }
+}

bukkit/src/main/java/us/myles/ViaVersion/bukkit/BukkitCommandSender.java

@@ -0,0 +1,20 @@
+package us.myles.ViaVersion.bukkit;
+
+import lombok.AllArgsConstructor;
+import org.bukkit.command.CommandSender;
+import us.myles.ViaVersion.api.command.ViaCommandSender;
+
+@AllArgsConstructor
+public class BukkitCommandSender implements ViaCommandSender {
+    private CommandSender sender;
+
+    @Override
+    public boolean hasPermission(String permission) {
+        return sender.hasPermission(permission);
+    }
+
+    @Override
+    public void sendMessage(String msg) {
+        sender.sendMessage(msg);
+    }
+}

bukkit/src/main/java/us/myles/ViaVersion/listeners/UpdateListener.java

@@ -1,23 +1,19 @@
-package us.myles.ViaVersion.update;
-
-import lombok.RequiredArgsConstructor;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerJoinEvent;
-import us.myles.ViaVersion.ViaVersionPlugin;
-import us.myles.ViaVersion.api.ViaVersion;
-
-@RequiredArgsConstructor
-public class UpdateListener implements Listener {
-
-    private final ViaVersionPlugin plugin;
-
-    @EventHandler
-    public void onJoin(PlayerJoinEvent e) {
-        if (e.getPlayer().hasPermission("viaversion.update")
-                && ViaVersion.getConfig().isCheckForUpdates()) {
-            UpdateUtil.sendUpdateMessage(e.getPlayer().getUniqueId(), plugin);
-        }
-    }
-
-}
+package us.myles.ViaVersion.listeners;
+
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerJoinEvent;
+import us.myles.ViaVersion.api.ViaVersion;
+import us.myles.ViaVersion.update.UpdateUtil;
+
+public class UpdateListener implements Listener {
+
+    @EventHandler
+    public void onJoin(PlayerJoinEvent e) {
+        if (e.getPlayer().hasPermission("viaversion.update")
+                && ViaVersion.getConfig().isCheckForUpdates()) {
+            UpdateUtil.sendUpdateMessage(e.getPlayer().getUniqueId());
+        }
+    }
+
+}

bungee/pom.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>viaversion</artifactId>
+        <groupId>us.myles</groupId>
+        <version>1.0.0-ALPHA-16w38a</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>viaversion-bungee</artifactId>
+
+    <dependencies>
+        <!-- BungeeCord -->
+        <dependency>
+            <groupId>net.md-5</groupId>
+            <artifactId>bungeecord-api</artifactId>
+            <version>1.9-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>

common/pom.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>viaversion</artifactId>
+        <groupId>us.myles</groupId>
+        <version>1.0.0-ALPHA-16w38a</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>viaversion-common</artifactId>
+
+</project>

common/src/main/java/us/myles/ViaVersion/api/Via.java

@@ -0,0 +1,15 @@
+package us.myles.ViaVersion.api;
+
+import lombok.Getter;
+import org.apache.commons.lang.Validate;
+import us.myles.ViaVersion.api.platform.ViaPlatform;
+
+public class Via {
+    @Getter
+    private static ViaPlatform platform;
+
+    public static void init(ViaPlatform platform) {
+        Validate.isTrue(platform == null, "Platform is already set");
+        Via.platform = platform;
+    }
+}

common/src/main/java/us/myles/ViaVersion/api/command/ViaCommandSender.java

@@ -0,0 +1,6 @@
+package us.myles.ViaVersion.api.command;
+
+public interface ViaCommandSender {
+    public boolean hasPermission(String permission);
+    public void sendMessage(String msg);
+}

common/src/main/java/us/myles/ViaVersion/api/command/ViaSubCommand.java

@@ -1,6 +1,5 @@
 package us.myles.ViaVersion.api.command;
 
-import org.bukkit.command.CommandSender;
 import us.myles.ViaVersion.commands.ViaCommandHandler;
 
 import java.util.Collections;
@@ -47,7 +46,7 @@ public abstract class ViaSubCommand {
      * @param args   Arguments
      * @return command executed succesfully if false, show usage
      */
-    public abstract boolean execute(CommandSender sender, String[] args);
+    public abstract boolean execute(ViaCommandSender sender, String[] args);
 
     /**
      * Yay, possibility to implement tab-completion
@@ -56,7 +55,7 @@ public abstract class ViaSubCommand {
      * @param args   args
      * @return tab complete possibilities
      */
-    public List<String> onTabComplete(CommandSender sender, String[] args) {
+    public List<String> onTabComplete(ViaCommandSender sender, String[] args) {
         return Collections.emptyList();
     }
 
@@ -71,7 +70,7 @@ public abstract class ViaSubCommand {
      * @param message string message
      * @param args    optional objects
      */
-    public void sendMessage(CommandSender sender, String message, Object... args) {
+    public void sendMessage(ViaCommandSender sender, String message, Object... args) {
         ViaCommandHandler.sendMessage(sender, message, args);
     }
 }

common/src/main/java/us/myles/ViaVersion/api/data/UserConnection.java

@@ -5,9 +5,8 @@ import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandler;
 import io.netty.channel.socket.SocketChannel;
 import lombok.Data;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
+import net.md_5.bungee.api.ChatColor;
+import us.myles.ViaVersion.api.ViaVersion;
 import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 
 import java.util.Map;
@@ -145,18 +144,15 @@ public class UserConnection {
         pendingDisconnect = true;
         if (get(ProtocolInfo.class).getUuid() != null) {
             final UUID uuid = get(ProtocolInfo.class).getUuid();
-            if (Bukkit.getPlayer(uuid) != null) {
-                Bukkit.getScheduler().runTask(Bukkit.getPluginManager().getPlugin("ViaVersion"), new Runnable() {
-                    @Override
-                    public void run() {
-                        Player player = Bukkit.getPlayer(uuid);
-                        if (player != null)
-                            player.kickPlayer(ChatColor.translateAlternateColorCodes('&', reason));
+            ViaVersion.getPlatform().runSync(new Runnable() {
+                @Override
+                public void run() {
+                    if (!ViaVersion.getPlatform().kickPlayer(uuid, ChatColor.translateAlternateColorCodes('&', reason))) {
+                        getChannel().close(); // =)
                     }
-                });
-                return;
-            }
+                }
+            });
         }
-        getChannel().close(); // =)
+
     }
 }

common/src/main/java/us/myles/ViaVersion/api/platform/ViaPlatform.java

@@ -0,0 +1,22 @@
+package us.myles.ViaVersion.api.platform;
+
+import java.util.UUID;
+import java.util.logging.Logger;
+
+public interface ViaPlatform {
+    public Logger getLogger();
+
+    public String getPlatformName();
+
+    public String getPluginVersion();
+
+    public void runAsync(Runnable runnable);
+
+    public void runSync(Runnable runnable);
+
+    public void sendMessage(UUID uuid, String message);
+
+    public boolean kickPlayer(UUID uuid, String message);
+
+    public boolean isPluginEnabled();
+}

common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolPipeline.java

@@ -1,9 +1,9 @@
 package us.myles.ViaVersion.api.protocol;
 
-import us.myles.ViaVersion.ViaVersionPlugin;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.ViaVersion;
 import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.platform.ViaPlatform;
 import us.myles.ViaVersion.packets.Direction;
 import us.myles.ViaVersion.packets.PacketType;
 import us.myles.ViaVersion.packets.State;
@@ -109,12 +109,12 @@ public class ProtocolPipeline extends Protocol {
                 }
             }
             String name = packet + "[" + userConnection.get(ProtocolInfo.class).getProtocolVersion() + "]";
-            ViaVersionPlugin plugin = (ViaVersionPlugin) ViaVersion.getInstance();
+            ViaPlatform platform = ViaVersion.getPlatform();
 
             String actualUsername = packetWrapper.user().get(ProtocolInfo.class).getUsername();
             String username = actualUsername != null ? actualUsername + " " : "";
 
-            plugin.getLogger().log(Level.INFO, "{0}{1}: {2} {3} -> {4} [{5}] Value: {6}",
+            platform.getLogger().log(Level.INFO, "{0}{1}: {2} {3} -> {4} [{5}] Value: {6}",
                     new Object[]{
                             username,
                             direction,

common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java

@@ -2,8 +2,8 @@ package us.myles.ViaVersion.api.protocol;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import org.bukkit.Bukkit;
 import us.myles.ViaVersion.api.Pair;
+import us.myles.ViaVersion.api.ViaVersion;
 import us.myles.ViaVersion.protocols.base.BaseProtocol;
 import us.myles.ViaVersion.protocols.protocol1_10to1_9_3.Protocol1_10To1_9_3_4;
 import us.myles.ViaVersion.protocols.protocol1_9_1_2to1_9_3_4.Protocol1_9_1_2TO1_9_3_4;
@@ -61,7 +61,7 @@ public class ProtocolRegistry {
             registryMap.get(version).put(output, protocol);
         }
 
-        if (Bukkit.getPluginManager().getPlugin("ViaVersion").isEnabled()) {
+        if (ViaVersion.getPlatform().isPluginEnabled()) {
             protocol.registerListeners();
             refreshVersions();
         } else {

common/src/main/java/us/myles/ViaVersion/commands/ViaCommandHandler.java

@@ -1,20 +1,17 @@
 package us.myles.ViaVersion.commands;
 
 import lombok.NonNull;
+import net.md_5.bungee.api.ChatColor;
 import org.apache.commons.lang.Validate;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabCompleter;
-import us.myles.ViaVersion.api.ViaVersion;
+import us.myles.ViaVersion.api.Via;
+import us.myles.ViaVersion.api.command.ViaCommandSender;
 import us.myles.ViaVersion.api.command.ViaSubCommand;
 import us.myles.ViaVersion.api.command.ViaVersionCommand;
 import us.myles.ViaVersion.commands.defaultsubs.*;
 
 import java.util.*;
 
-public class ViaCommandHandler implements ViaVersionCommand, CommandExecutor, TabCompleter {
+public abstract class ViaCommandHandler implements ViaVersionCommand {
     private Map<String, ViaSubCommand> commandMap;
 
     public ViaCommandHandler() {
@@ -44,8 +41,7 @@ public class ViaCommandHandler implements ViaVersionCommand, CommandExecutor, Ta
         return commandMap.get(name.toLowerCase());
     }
 
-    @Override
-    public boolean onCommand(CommandSender sender, Command cmd, String arg, String[] args) {
+    public boolean onCommand(ViaCommandSender sender, String[] args) {
         if (args.length == 0) {
             showHelp(sender);
             return false;
@@ -70,8 +66,7 @@ public class ViaCommandHandler implements ViaVersionCommand, CommandExecutor, Ta
         return result;
     }
 
-    @Override
-    public List<String> onTabComplete(CommandSender sender, Command command, String arg, String[] args) {
+    public List<String> onTabComplete(ViaCommandSender sender, String[] args) {
         Set<ViaSubCommand> allowed = calculateAllowedCommands(sender);
         List<String> output = new ArrayList<>();
 
@@ -103,20 +98,20 @@ public class ViaCommandHandler implements ViaVersionCommand, CommandExecutor, Ta
         return output;
     }
 
-    public void showHelp(CommandSender sender) {
+    public void showHelp(ViaCommandSender sender) {
         Set<ViaSubCommand> allowed = calculateAllowedCommands(sender);
         if (allowed.size() == 0) {
             sender.sendMessage(color("&cYou are not allowed to use this command!"));
             return;
         }
-        sender.sendMessage(color("&aViaVersion &c" + ViaVersion.getInstance().getVersion()));
+        sender.sendMessage(color("&aViaVersion &c" + Via.getPlatform().getPluginVersion()));
         sender.sendMessage(color("&6Commands:"));
         for (ViaSubCommand cmd : allowed)
             sender.sendMessage(color(String.format("&2/viaversion %s &7- &6%s", cmd.usage(), cmd.description())));
         allowed.clear();
     }
 
-    private Set<ViaSubCommand> calculateAllowedCommands(CommandSender sender) {
+    private Set<ViaSubCommand> calculateAllowedCommands(ViaCommandSender sender) {
         Set<ViaSubCommand> cmds = new HashSet<>();
         for (ViaSubCommand sub : commandMap.values())
             if (hasPermission(sender, sub.permission()))
@@ -124,7 +119,7 @@ public class ViaCommandHandler implements ViaVersionCommand, CommandExecutor, Ta
         return cmds;
     }
 
-    private boolean hasPermission(CommandSender sender, String permission) {
+    private boolean hasPermission(ViaCommandSender sender, String permission) {
         return permission == null || sender.hasPermission(permission);
     }
 
@@ -148,7 +143,7 @@ public class ViaCommandHandler implements ViaVersionCommand, CommandExecutor, Ta
         return string;
     }
 
-    public static void sendMessage(@NonNull CommandSender sender, String message, Object... args) {
+    public static void sendMessage(@NonNull ViaCommandSender sender, String message, Object... args) {
         sender.sendMessage(color(args == null ? message : String.format(message, args)));
     }
 }

common/src/main/java/us/myles/ViaVersion/commands/defaultsubs/AutoTeamSubCmd.java

@@ -1,8 +1,8 @@
 package us.myles.ViaVersion.commands.defaultsubs;
 
-import org.bukkit.command.CommandSender;
 import us.myles.ViaVersion.ViaVersionPlugin;
 import us.myles.ViaVersion.api.ViaVersion;
+import us.myles.ViaVersion.api.command.ViaCommandSender;
 import us.myles.ViaVersion.api.command.ViaSubCommand;
 
 public class AutoTeamSubCmd extends ViaSubCommand {
@@ -17,7 +17,7 @@ public class AutoTeamSubCmd extends ViaSubCommand {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String[] args) {
+    public boolean execute(ViaCommandSender sender, String[] args) {
         ViaVersionPlugin plugin = (ViaVersionPlugin) ViaVersion.getInstance();
 
         boolean newValue = !ViaVersion.getConfig().isAutoTeam();

common/src/main/java/us/myles/ViaVersion/commands/defaultsubs/DebugSubCmd.java

@@ -3,6 +3,7 @@ package us.myles.ViaVersion.commands.defaultsubs;
 import org.bukkit.command.CommandSender;
 import us.myles.ViaVersion.ViaVersionPlugin;
 import us.myles.ViaVersion.api.ViaVersion;
+import us.myles.ViaVersion.api.command.ViaCommandSender;
 import us.myles.ViaVersion.api.command.ViaSubCommand;
 
 public class DebugSubCmd extends ViaSubCommand {
@@ -17,7 +18,7 @@ public class DebugSubCmd extends ViaSubCommand {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String[] args) {
+    public boolean execute(ViaCommandSender sender, String[] args) {
         ViaVersionPlugin plugin = (ViaVersionPlugin) ViaVersion.getInstance();
 
         plugin.setDebug(!plugin.isDebug());

common/src/main/java/us/myles/ViaVersion/commands/defaultsubs/DisplayLeaksSubCmd.java

@@ -2,6 +2,7 @@ package us.myles.ViaVersion.commands.defaultsubs;
 
 import io.netty.util.ResourceLeakDetector;
 import org.bukkit.command.CommandSender;
+import us.myles.ViaVersion.api.command.ViaCommandSender;
 import us.myles.ViaVersion.api.command.ViaSubCommand;
 
 public class DisplayLeaksSubCmd extends ViaSubCommand {
@@ -16,7 +17,7 @@ public class DisplayLeaksSubCmd extends ViaSubCommand {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String[] args) {
+    public boolean execute(ViaCommandSender sender, String[] args) {
         if (ResourceLeakDetector.getLevel() != ResourceLeakDetector.Level.ADVANCED)
             ResourceLeakDetector.setLevel(ResourceLeakDetector.Level.ADVANCED);
         else

common/src/main/java/us/myles/ViaVersion/commands/defaultsubs/DontBugMeSubCmd.java

@@ -3,6 +3,7 @@ package us.myles.ViaVersion.commands.defaultsubs;
 import org.bukkit.command.CommandSender;
 import us.myles.ViaVersion.ViaVersionPlugin;
 import us.myles.ViaVersion.api.ViaVersion;
+import us.myles.ViaVersion.api.command.ViaCommandSender;
 import us.myles.ViaVersion.api.command.ViaSubCommand;
 
 public class DontBugMeSubCmd extends ViaSubCommand {
@@ -17,7 +18,7 @@ public class DontBugMeSubCmd extends ViaSubCommand {
     }
 
     @Override
-    public boolean execute(CommandSender sender, String[] args) {
+    public boolean execute(ViaCommandSender sender, String[] args) {
         ViaVersionPlugin plugin = (ViaVersionPlugin) ViaVersion.getInstance();
 
         boolean newValue = !ViaVersion.getConfig().isCheckForUpdates();

common/src/main/java/us/myles/ViaVersion/commands/defaultsubs/DumpSubCmd.java

@@ -9,6 +9,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.Plugin;
 import us.myles.ViaVersion.ViaVersionPlugin;
 import us.myles.ViaVersion.api.ViaVersion;
+import us.myles.ViaVersion.api.command.ViaCommandSender;
 import us.myles.ViaVersion.api.command.ViaSubCommand;
 import us.myles.ViaVersion.api.protocol.ProtocolRegistry;
 import us.myles.ViaVersion.dump.DumpTemplate;
@@ -40,7 +41,7 @@ public class DumpSubCmd extends ViaSubCommand {
     }
 
     @Override
-    public boolean execute(final CommandSender sender, String[] args) {
+    public boolean execute(final ViaCommandSender sender, String[] args) {
         VersionInfo version = new VersionInfo(
                 Bukkit.getServer().getVersion(),
                 Bukkit.getServer().getBukkitVersion(),